diff --git a/api/AndroidManifest.xml b/api/AndroidManifest.xml
index c084e7d72..d63ccf83e 100644
--- a/api/AndroidManifest.xml
+++ b/api/AndroidManifest.xml
@@ -5,10 +5,10 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.todoroo.astrid.api"
-      android:versionCode="1"
-      android:versionName="1.0">
+          package="com.todoroo.astrid.api"
+          android:versionCode="1"
+          android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="3" />
+    <uses-sdk android:minSdkVersion="3"/>
 
 </manifest> 
\ No newline at end of file
diff --git a/api/res/layout/status_preference.xml b/api/res/layout/status_preference.xml
index c8be5f06a..9435355e7 100644
--- a/api/res/layout/status_preference.xml
+++ b/api/res/layout/status_preference.xml
@@ -16,46 +16,49 @@
 
 <!-- Layout for a visually child-like Preference in a PreferenceActivity. -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/status"  
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize">
-    
+              android:id="@+id/status"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:minHeight="?android:attr/listPreferredItemHeight"
+              android:gravity="center_vertical"
+              android:paddingRight="?android:attr/scrollbarSize">
+
     <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="20dip"
-        android:layout_marginRight="6dip"
-        android:layout_marginTop="6dip"
-        android:layout_marginBottom="6dip"
-        android:layout_weight="1">
-    
-        <TextView android:id="@+android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="false"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:ellipsize="none"
-            android:fadingEdge="horizontal" />
-            
-        <TextView android:id="@+android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:maxLines="2"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="6dip"
+            android:layout_marginTop="6dip"
+            android:layout_marginBottom="6dip"
+            android:layout_weight="1">
+
+        <TextView
+                android:id="@+android:id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="false"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:ellipsize="none"
+                android:fadingEdge="horizontal"/>
+
+        <TextView
+                android:id="@+android:id/summary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@android:id/title"
+                android:layout_alignLeft="@android:id/title"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:maxLines="2"
+                android:textColor="?android:attr/textColorSecondary"/>
 
     </RelativeLayout>
-    
+
     <!-- Preference should place its actual preference widget here. -->
-    <LinearLayout android:id="@+android:id/widget_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:gravity="center_vertical"
-        android:orientation="vertical" />
+    <LinearLayout
+            android:id="@+android:id/widget_frame"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:gravity="center_vertical"
+            android:orientation="vertical"/>
 
 </LinearLayout>
diff --git a/api/res/values-ca/strings.xml b/api/res/values-ca/strings.xml
index 88c3b39be..6da4721d7 100644
--- a/api/res/values-ca/strings.xml
+++ b/api/res/values-ca/strings.xml
@@ -1,101 +1,108 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <plurals name="DUt_years">
-    <item quantity="one">1 any</item>
-    <item quantity="other">%d anys</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <item quantity="one">1 mes</item>
-    <item quantity="other">%d mesos</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <item quantity="one">1 setmana</item>
-    <item quantity="other">%d setmanes</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <item quantity="one">1 dia</item>
-    <item quantity="other">%d dies</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <item quantity="one">1 Weekday</item>
-    <item quantity="other">%d Weekdays</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <item quantity="one">1 hora</item>
-    <item quantity="other">%d Hores</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <item quantity="one">1 minut</item>
-    <item quantity="other">%d Minuts</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <item quantity="one">1 segon</item>
-    <item quantity="other">%d Segons</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <item quantity="one">1 Hr</item>
-    <item quantity="other">%d Hrs</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <item quantity="one">1 Min</item>
-    <item quantity="other">%d Min</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <item quantity="one">1 Seg</item>
-    <item quantity="other">%d Seg</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <item quantity="one">1 tasca</item>
-    <item quantity="other">%d tasques</item>
-  </plurals>
-  <plurals name="Npeople">
-    <item quantity="one">1 person</item>
-    <item quantity="other">%d people</item>
-  </plurals>
-  <string name="today">Avui</string>
-  <string name="tomorrow">Demà</string>
-  <string name="yesterday">Ahir</string>
-  <string name="DLG_confirm_title">Confirmar?</string>
-  <string name="DLG_question_title">Pregunta:</string>
-  <string name="DLG_information_title">Informació</string>
-  <string name="DLG_error_title">S\'ha produït un error</string>
-  <string name="DLG_save">Desar</string>
-  <string name="DLG_yes">Sí</string>
-  <string name="DLG_no">No</string>
-  <string name="DLG_close">Tancar</string>
-  <string name="DLG_done">Fet</string>
-  <string name="DLG_error">¡Ui, sembla que hi ha hagut un problema! Això es el que ha passat:\n\n%s</string>
-  <string name="DLG_error_generic">¡Ui, sembla que hi ha hagut un problema!</string>
-  <string name="DLG_wait">Si us plau, espera...</string>
-  <string name="SyP_progress">Sincronitzant les seves tasques...</string>
-  <string name="SyP_progress_toast">S\'està sincronitzant...</string>
-  <string name="SyP_ioerror">Error de conexió! Verifiqui la conexió d\'internet.</string>
-  <string name="sync_SPr_group_status">Estat</string>
-  <string name="sync_status_ongoing">Sincronització en curs...</string>
-  <string name="sync_status_success">Última sincronització:\n%s</string>
-  <string name="sync_status_failed">Fallida el: %s</string>
-  <string name="sync_status_failed_subtitle">Última sincronització correcte: %s</string>
-  <string name="sync_status_never">Mai sincronitzat!</string>
-  <string name="sync_SPr_group_options">Opcions</string>
-  <string name="sync_SPr_interval_title">Sincronitzar en segon pla</string>
-  <string name="sync_SPr_interval_desc_disabled">Desactivada la sincronització en segon pla</string>
-  <string name="sync_SPr_interval_desc">Actualment configurat en: %s</string>
-  <string name="sync_SPr_bgwifi_desc_enabled">La sincronització en segon pla només funciona amb el Wifi activat.</string>
-  <string name="sync_SPr_bgwifi_desc_disabled">Sempre es produirà la sincronització en segon pla</string>
-  <string name="sync_SPr_group_actions">Accions</string>
-  <string name="sync_SPr_forget">Surt</string>
-  <string name="sync_SPr_forget_description">Esborra tota la informació de sincronització</string>
-  <string name="sync_forget_confirm">Tancar sessió / esborra la informació de sincronització?</string>
-  <string-array name="sync_SPr_interval_entries">
-    <item>desactivat</item>
-    <item>cada quince minuts</item>
-    <item>cada trenta minuts</item>
-    <item>cada hora</item>
-    <item>cada tres hores</item>
-    <item>cada sis hores</item>
-    <item>cada dotze hores</item>
-    <item>diàriament</item>
-    <item>cada tres dies</item>
-    <item>setmanalment</item>
-  </string-array>
+    <plurals name="DUt_years">
+        <item quantity="one">1 any</item>
+        <item quantity="other">%d anys</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <item quantity="one">1 mes</item>
+        <item quantity="other">%d mesos</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <item quantity="one">1 setmana</item>
+        <item quantity="other">%d setmanes</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <item quantity="one">1 dia</item>
+        <item quantity="other">%d dies</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <item quantity="one">1 Weekday</item>
+        <item quantity="other">%d Weekdays</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <item quantity="one">1 hora</item>
+        <item quantity="other">%d Hores</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <item quantity="one">1 minut</item>
+        <item quantity="other">%d Minuts</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <item quantity="one">1 segon</item>
+        <item quantity="other">%d Segons</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <item quantity="one">1 Hr</item>
+        <item quantity="other">%d Hrs</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <item quantity="one">1 Min</item>
+        <item quantity="other">%d Min</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <item quantity="one">1 Seg</item>
+        <item quantity="other">%d Seg</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <item quantity="one">1 tasca</item>
+        <item quantity="other">%d tasques</item>
+    </plurals>
+    <plurals name="Npeople">
+        <item quantity="one">1 person</item>
+        <item quantity="other">%d people</item>
+    </plurals>
+    <string name="today">Avui</string>
+    <string name="tomorrow">Demà</string>
+    <string name="yesterday">Ahir</string>
+    <string name="DLG_confirm_title">Confirmar?</string>
+    <string name="DLG_question_title">Pregunta:</string>
+    <string name="DLG_information_title">Informació</string>
+    <string name="DLG_error_title">S\'ha produït un error</string>
+    <string name="DLG_save">Desar</string>
+    <string name="DLG_yes">Sí</string>
+    <string name="DLG_no">No</string>
+    <string name="DLG_close">Tancar</string>
+    <string name="DLG_done">Fet</string>
+    <string name="DLG_error">¡Ui, sembla que hi ha hagut un problema! Això es el que ha
+        passat:\n\n%s
+    </string>
+    <string name="DLG_error_generic">¡Ui, sembla que hi ha hagut un problema!</string>
+    <string name="DLG_wait">Si us plau, espera...</string>
+    <string name="SyP_progress">Sincronitzant les seves tasques...</string>
+    <string name="SyP_progress_toast">S\'està sincronitzant...</string>
+    <string name="SyP_ioerror">Error de conexió! Verifiqui la conexió d\'internet.</string>
+    <string name="sync_SPr_group_status">Estat</string>
+    <string name="sync_status_ongoing">Sincronització en curs...</string>
+    <string name="sync_status_success">Última sincronització:\n%s</string>
+    <string name="sync_status_failed">Fallida el: %s</string>
+    <string name="sync_status_failed_subtitle">Última sincronització correcte: %s</string>
+    <string name="sync_status_never">Mai sincronitzat!</string>
+    <string name="sync_SPr_group_options">Opcions</string>
+    <string name="sync_SPr_interval_title">Sincronitzar en segon pla</string>
+    <string name="sync_SPr_interval_desc_disabled">Desactivada la sincronització en segon pla
+    </string>
+    <string name="sync_SPr_interval_desc">Actualment configurat en: %s</string>
+    <string name="sync_SPr_bgwifi_desc_enabled">La sincronització en segon pla només funciona amb el
+        Wifi activat.
+    </string>
+    <string name="sync_SPr_bgwifi_desc_disabled">Sempre es produirà la sincronització en segon pla
+    </string>
+    <string name="sync_SPr_group_actions">Accions</string>
+    <string name="sync_SPr_forget">Surt</string>
+    <string name="sync_SPr_forget_description">Esborra tota la informació de sincronització</string>
+    <string name="sync_forget_confirm">Tancar sessió / esborra la informació de sincronització?
+    </string>
+    <string-array name="sync_SPr_interval_entries">
+        <item>desactivat</item>
+        <item>cada quince minuts</item>
+        <item>cada trenta minuts</item>
+        <item>cada hora</item>
+        <item>cada tres hores</item>
+        <item>cada sis hores</item>
+        <item>cada dotze hores</item>
+        <item>diàriament</item>
+        <item>cada tres dies</item>
+        <item>setmanalment</item>
+    </string-array>
 </resources>
diff --git a/api/res/values-cs/strings.xml b/api/res/values-cs/strings.xml
index 855555168..c53eae2ae 100644
--- a/api/res/values-cs/strings.xml
+++ b/api/res/values-cs/strings.xml
@@ -1,116 +1,121 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <plurals name="DUt_years">
-    <item quantity="one">1 rok</item>
-    <item quantity="other">%d Roky</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <item quantity="one">1 měsíc</item>
-    <item quantity="other">%d Měsíce</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <item quantity="one">1 týden</item>
-    <item quantity="other">%d Týdny</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <item quantity="one">1 den</item>
-    <item quantity="other">%d Dnů</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <item quantity="one">1 pracovní den</item>
-    <item quantity="other">%d pracovních dnů</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <item quantity="one">1 hodina</item>
-    <item quantity="other">%d hodin</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <item quantity="one">1 minuta</item>
-    <item quantity="other">%d minut</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <item quantity="one">1 vteřina</item>
-    <item quantity="other">%d vteřin</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <item quantity="one">1 hod.</item>
-    <item quantity="other">%d hod.</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <item quantity="one">1 min.</item>
-    <item quantity="other">%d min.</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <item quantity="one">1 s</item>
-    <item quantity="other">%d s</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <item quantity="one">1 úkol</item>
-    <item quantity="other">%d úkolů</item>
-  </plurals>
-  <plurals name="Npeople">
-    <item quantity="one">1 osoba</item>
-    <item quantity="other">%d lidí</item>
-  </plurals>
-  <string name="today">Dnes</string>
-  <string name="tomorrow">Zítra</string>
-  <string name="yesterday">Včera</string>
-  <string name="tmrw">Zítra</string>
-  <string name="yest">Včera</string>
-  <string name="DLG_confirm_title">Potvrdit?</string>
-  <string name="DLG_question_title">Otázka:</string>
-  <string name="DLG_information_title">Informace</string>
-  <string name="DLG_error_title">Chyba!</string>
-  <string name="DLG_save">Uložit</string>
-  <string name="DLG_yes">Ano</string>
-  <string name="DLG_no">Ne</string>
-  <string name="DLG_close">Zavřít</string>
-  <string name="DLG_done">Hotovo</string>
-  <string name="DLG_error">Jejda, vypadá to, že se vyskytla chyba! Tady je co se stalo:\n\n%s</string>
-  <string name="DLG_error_generic">Jejda, vypadá to, že se vyskytla chyba!</string>
-  <string name="DLG_wait">Čekejte prosím...</string>
-  <string name="SyP_progress">Probíhá synchronizace Vašich úkolů...</string>
-  <string name="SyP_progress_toast">Sychronizuji...</string>
-  <string name="SyP_label">Synchronizace</string>
-  <string name="SyP_summary">Astrid.com, Google Tasks, uložená data, lokální záloha</string>
-  <string name="SyP_ioerror">Chyba připojení! Zkontrolujte vaše internetové připojení.</string>
-  <string name="sync_SPr_group_status">Stav</string>
-  <string name="sync_SPr_status_subtitle">Stav: %s</string>
-  <string name="sync_status_loggedout">Nepřihlášen</string>
-  <string name="sync_status_ongoing">Probíhá synchronizace...</string>
-  <string name="sync_status_success">Poslední synchronizace:\n%s</string>
-  <string name="sync_status_failed">Selhalo: %s</string>
-  <string name="sync_status_errors">Sync w/ chyby: %s</string>
-  <string name="sync_status_failed_subtitle">Poslední úspěšná synchronizace: %s</string>
-  <string name="sync_status_never">Nikdo nesynchronizováno!</string>
-  <string name="sync_SPr_group_options">Nastavení</string>
-  <string name="sync_SPr_interval_title">Synchronizace na pozadí</string>
-  <string name="sync_SPr_interval_desc_disabled">Synchronizace na pozadí je zakázána</string>
-  <string name="sync_SPr_interval_desc">Současně nastaveno na: %s</string>
-  <string name="sync_SPr_bgwifi_title">Nastavení jen pro Wifi</string>
-  <string name="sync_SPr_bgwifi_desc_enabled">Synchronizovat na pozadí se bude pouze při zapnuté Wifi</string>
-  <string name="sync_SPr_bgwifi_desc_disabled">Synchronizovat na pozadí se bude vždy</string>
-  <string name="sync_SPr_group_actions">Akce</string>
-  <string name="sync_SPr_sync">Synchronizovat nyní</string>
-  <string name="sync_SPr_sync_log_in">Přihlásit se &amp; Synchronizovat!</string>
-  <string name="sync_SPr_logged_in_prefix">Přihlášen jako:</string>
-  <string name="sync_SPr_last_error">Stavové hlášení</string>
-  <string name="sync_SPr_last_error_subtitle">Klepnutím odešlete zprávu týmu Astrid</string>
-  <string name="sync_SPr_send_report">Odeslat zprávu</string>
-  <string name="sync_SPr_forget">Odhlásit se</string>
-  <string name="sync_SPr_forget_description">Smazat všechny synchronizační data</string>
-  <string name="sync_forget_confirm">Odhlásit se / vymazat synchronizační data?</string>
-  <string name="sync_error_offline">Během posledního pokusu o synchronizaci se službou %s nastal problém s připojením k síti. Zkuste to prosím později.</string>
-  <string-array name="sync_SPr_interval_entries">
-    <item>zakázat</item>
-    <item>každých patnáct minut</item>
-    <item>každých třicet minut</item>
-    <item>každou hodinu</item>
-    <item>každé tři hodiny</item>
-    <item>každých šest hodin</item>
-    <item>každých dvanáct hodin</item>
-    <item>každý den</item>
-    <item>každé tři dny</item>
-    <item>každý týden</item>
-  </string-array>
+    <plurals name="DUt_years">
+        <item quantity="one">1 rok</item>
+        <item quantity="other">%d Roky</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <item quantity="one">1 měsíc</item>
+        <item quantity="other">%d Měsíce</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <item quantity="one">1 týden</item>
+        <item quantity="other">%d Týdny</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <item quantity="one">1 den</item>
+        <item quantity="other">%d Dnů</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <item quantity="one">1 pracovní den</item>
+        <item quantity="other">%d pracovních dnů</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <item quantity="one">1 hodina</item>
+        <item quantity="other">%d hodin</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <item quantity="one">1 minuta</item>
+        <item quantity="other">%d minut</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <item quantity="one">1 vteřina</item>
+        <item quantity="other">%d vteřin</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <item quantity="one">1 hod.</item>
+        <item quantity="other">%d hod.</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <item quantity="one">1 min.</item>
+        <item quantity="other">%d min.</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <item quantity="one">1 s</item>
+        <item quantity="other">%d s</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <item quantity="one">1 úkol</item>
+        <item quantity="other">%d úkolů</item>
+    </plurals>
+    <plurals name="Npeople">
+        <item quantity="one">1 osoba</item>
+        <item quantity="other">%d lidí</item>
+    </plurals>
+    <string name="today">Dnes</string>
+    <string name="tomorrow">Zítra</string>
+    <string name="yesterday">Včera</string>
+    <string name="tmrw">Zítra</string>
+    <string name="yest">Včera</string>
+    <string name="DLG_confirm_title">Potvrdit?</string>
+    <string name="DLG_question_title">Otázka:</string>
+    <string name="DLG_information_title">Informace</string>
+    <string name="DLG_error_title">Chyba!</string>
+    <string name="DLG_save">Uložit</string>
+    <string name="DLG_yes">Ano</string>
+    <string name="DLG_no">Ne</string>
+    <string name="DLG_close">Zavřít</string>
+    <string name="DLG_done">Hotovo</string>
+    <string name="DLG_error">Jejda, vypadá to, že se vyskytla chyba! Tady je co se stalo:\n\n%s
+    </string>
+    <string name="DLG_error_generic">Jejda, vypadá to, že se vyskytla chyba!</string>
+    <string name="DLG_wait">Čekejte prosím...</string>
+    <string name="SyP_progress">Probíhá synchronizace Vašich úkolů...</string>
+    <string name="SyP_progress_toast">Sychronizuji...</string>
+    <string name="SyP_label">Synchronizace</string>
+    <string name="SyP_summary">Astrid.com, Google Tasks, uložená data, lokální záloha</string>
+    <string name="SyP_ioerror">Chyba připojení! Zkontrolujte vaše internetové připojení.</string>
+    <string name="sync_SPr_group_status">Stav</string>
+    <string name="sync_SPr_status_subtitle">Stav: %s</string>
+    <string name="sync_status_loggedout">Nepřihlášen</string>
+    <string name="sync_status_ongoing">Probíhá synchronizace...</string>
+    <string name="sync_status_success">Poslední synchronizace:\n%s</string>
+    <string name="sync_status_failed">Selhalo: %s</string>
+    <string name="sync_status_errors">Sync w/ chyby: %s</string>
+    <string name="sync_status_failed_subtitle">Poslední úspěšná synchronizace: %s</string>
+    <string name="sync_status_never">Nikdo nesynchronizováno!</string>
+    <string name="sync_SPr_group_options">Nastavení</string>
+    <string name="sync_SPr_interval_title">Synchronizace na pozadí</string>
+    <string name="sync_SPr_interval_desc_disabled">Synchronizace na pozadí je zakázána</string>
+    <string name="sync_SPr_interval_desc">Současně nastaveno na: %s</string>
+    <string name="sync_SPr_bgwifi_title">Nastavení jen pro Wifi</string>
+    <string name="sync_SPr_bgwifi_desc_enabled">Synchronizovat na pozadí se bude pouze při zapnuté
+        Wifi
+    </string>
+    <string name="sync_SPr_bgwifi_desc_disabled">Synchronizovat na pozadí se bude vždy</string>
+    <string name="sync_SPr_group_actions">Akce</string>
+    <string name="sync_SPr_sync">Synchronizovat nyní</string>
+    <string name="sync_SPr_sync_log_in">Přihlásit se &amp; Synchronizovat!</string>
+    <string name="sync_SPr_logged_in_prefix">Přihlášen jako:</string>
+    <string name="sync_SPr_last_error">Stavové hlášení</string>
+    <string name="sync_SPr_last_error_subtitle">Klepnutím odešlete zprávu týmu Astrid</string>
+    <string name="sync_SPr_send_report">Odeslat zprávu</string>
+    <string name="sync_SPr_forget">Odhlásit se</string>
+    <string name="sync_SPr_forget_description">Smazat všechny synchronizační data</string>
+    <string name="sync_forget_confirm">Odhlásit se / vymazat synchronizační data?</string>
+    <string name="sync_error_offline">Během posledního pokusu o synchronizaci se službou %s nastal
+        problém s připojením k síti. Zkuste to prosím později.
+    </string>
+    <string-array name="sync_SPr_interval_entries">
+        <item>zakázat</item>
+        <item>každých patnáct minut</item>
+        <item>každých třicet minut</item>
+        <item>každou hodinu</item>
+        <item>každé tři hodiny</item>
+        <item>každých šest hodin</item>
+        <item>každých dvanáct hodin</item>
+        <item>každý den</item>
+        <item>každé tři dny</item>
+        <item>každý týden</item>
+    </string-array>
 </resources>
diff --git a/api/res/values-da/strings.xml b/api/res/values-da/strings.xml
index f9be3ad99..67d833194 100644
--- a/api/res/values-da/strings.xml
+++ b/api/res/values-da/strings.xml
@@ -1,89 +1,91 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <plurals name="DUt_years">
-    <item quantity="one">1 år</item>
-    <item quantity="other">%d År</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <item quantity="one">1 måned</item>
-    <item quantity="other">%d måneder</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <item quantity="one">1 uge</item>
-    <item quantity="other">%d uger</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <item quantity="one">1 dag</item>
-    <item quantity="other">%d dage</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <item quantity="one">1 Weekday</item>
-    <item quantity="other">%d Weekdays</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <item quantity="one">1 time</item>
-    <item quantity="other">%d timer</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <item quantity="one">1 minut</item>
-    <item quantity="other">%d minutter</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <item quantity="one">1 sekund</item>
-    <item quantity="other">%d sekunder</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <item quantity="one">1 time</item>
-    <item quantity="other">%d timer</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <item quantity="one">1 min.</item>
-    <item quantity="other">%d min.</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <item quantity="one">1 sek.</item>
-    <item quantity="other">%d sek.</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <item quantity="one">1 opgave</item>
-    <item quantity="other">%d opgaver</item>
-  </plurals>
-  <plurals name="Npeople">
-    <item quantity="one">1 person</item>
-    <item quantity="other">%d people</item>
-  </plurals>
-  <string name="today">I dag</string>
-  <string name="tomorrow">I morgen</string>
-  <string name="yesterday">I går</string>
-  <string name="DLG_confirm_title">Bekræft?</string>
-  <string name="DLG_question_title">Spørsmål:</string>
-  <string name="DLG_save">Gem</string>
-  <string name="DLG_yes">Ja</string>
-  <string name="DLG_no">Nej</string>
-  <string name="DLG_close">Luk</string>
-  <string name="DLG_done">Færdig</string>
-  <string name="DLG_wait">Vent venligst...</string>
-  <string name="SyP_progress_toast">Synkroniserer...</string>
-  <string name="SyP_label">Synkronisering</string>
-  <string name="SyP_ioerror">Forbindelsesfejl! Tjek din internetforbindelse.</string>
-  <string name="sync_SPr_group_options">Indstillinger</string>
-  <string name="sync_SPr_interval_title">Baggrunds Synk</string>
-  <string name="sync_SPr_interval_desc_disabled">Baggrunds synkronisering er slået fra</string>
-  <string name="sync_SPr_bgwifi_desc_enabled">Baggrunds synkronisering sker kun ved Wifi</string>
-  <string name="sync_SPr_bgwifi_desc_disabled">Baggrunds synkronisering sker uanset forbindelsestype</string>
-  <string name="sync_SPr_group_actions">Handlinger</string>
-  <string name="sync_SPr_forget">Log af</string>
-  <string name="sync_SPr_forget_description">Sletter al synkroniserings data</string>
-  <string-array name="sync_SPr_interval_entries">
-    <item>disable</item>
-    <item>every fifteen minutes</item>
-    <item>every thirty minutes</item>
-    <item>hver time</item>
-    <item>hver 3. time</item>
-    <item>hver 6. time</item>
-    <item>hver 12. time</item>
-    <item>hver dag</item>
-    <item>hver 3. dag</item>
-    <item>hver uge</item>
-  </string-array>
+    <plurals name="DUt_years">
+        <item quantity="one">1 år</item>
+        <item quantity="other">%d År</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <item quantity="one">1 måned</item>
+        <item quantity="other">%d måneder</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <item quantity="one">1 uge</item>
+        <item quantity="other">%d uger</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <item quantity="one">1 dag</item>
+        <item quantity="other">%d dage</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <item quantity="one">1 Weekday</item>
+        <item quantity="other">%d Weekdays</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <item quantity="one">1 time</item>
+        <item quantity="other">%d timer</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <item quantity="one">1 minut</item>
+        <item quantity="other">%d minutter</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <item quantity="one">1 sekund</item>
+        <item quantity="other">%d sekunder</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <item quantity="one">1 time</item>
+        <item quantity="other">%d timer</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <item quantity="one">1 min.</item>
+        <item quantity="other">%d min.</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <item quantity="one">1 sek.</item>
+        <item quantity="other">%d sek.</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <item quantity="one">1 opgave</item>
+        <item quantity="other">%d opgaver</item>
+    </plurals>
+    <plurals name="Npeople">
+        <item quantity="one">1 person</item>
+        <item quantity="other">%d people</item>
+    </plurals>
+    <string name="today">I dag</string>
+    <string name="tomorrow">I morgen</string>
+    <string name="yesterday">I går</string>
+    <string name="DLG_confirm_title">Bekræft?</string>
+    <string name="DLG_question_title">Spørsmål:</string>
+    <string name="DLG_save">Gem</string>
+    <string name="DLG_yes">Ja</string>
+    <string name="DLG_no">Nej</string>
+    <string name="DLG_close">Luk</string>
+    <string name="DLG_done">Færdig</string>
+    <string name="DLG_wait">Vent venligst...</string>
+    <string name="SyP_progress_toast">Synkroniserer...</string>
+    <string name="SyP_label">Synkronisering</string>
+    <string name="SyP_ioerror">Forbindelsesfejl! Tjek din internetforbindelse.</string>
+    <string name="sync_SPr_group_options">Indstillinger</string>
+    <string name="sync_SPr_interval_title">Baggrunds Synk</string>
+    <string name="sync_SPr_interval_desc_disabled">Baggrunds synkronisering er slået fra</string>
+    <string name="sync_SPr_bgwifi_desc_enabled">Baggrunds synkronisering sker kun ved Wifi</string>
+    <string name="sync_SPr_bgwifi_desc_disabled">Baggrunds synkronisering sker uanset
+        forbindelsestype
+    </string>
+    <string name="sync_SPr_group_actions">Handlinger</string>
+    <string name="sync_SPr_forget">Log af</string>
+    <string name="sync_SPr_forget_description">Sletter al synkroniserings data</string>
+    <string-array name="sync_SPr_interval_entries">
+        <item>disable</item>
+        <item>every fifteen minutes</item>
+        <item>every thirty minutes</item>
+        <item>hver time</item>
+        <item>hver 3. time</item>
+        <item>hver 6. time</item>
+        <item>hver 12. time</item>
+        <item>hver dag</item>
+        <item>hver 3. dag</item>
+        <item>hver uge</item>
+    </string-array>
 </resources>
diff --git a/api/res/values-de/strings.xml b/api/res/values-de/strings.xml
index 45dff2116..205001822 100755
--- a/api/res/values-de/strings.xml
+++ b/api/res/values-de/strings.xml
@@ -4,243 +4,252 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ==================================================== Generic Units == -->
-  
-  <plurals name="DUt_years">
-    <!-- plurals: years -->
-    <item quantity="one">1 Jahr</item>
-    <!-- plurals: years -->
-    <item quantity="other">%d Jahre</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <!-- plurals: months -->
-    <item quantity="one">1 Monat</item>
-    <!-- plurals: months -->
-    <item quantity="other">%d Monate</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <!-- plurals: days -->
-    <item quantity="one">Eine Woche</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d Wochen</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <!-- plurals: days -->
-    <item quantity="one">Ein Tag</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d Tage</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <!-- plurals: days -->
-    <item quantity="one">Ein Wochentag</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d Wochentage</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <!-- plurals: hours -->
-    <item quantity="one">Eine Stunde</item>
-    <!-- plurals: hours -->
-    <item quantity="other">%d Stunden</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <!-- plurals: minutes -->
-    <item quantity="one">Eine Minute</item>
-    <!-- plurals: minutes -->
-    <item quantity="other">%d Minuten</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <!-- plurals: seconds -->
-    <item quantity="one">Eine Sekunde</item>
-    <!-- plurals: seconds -->
-    <item quantity="other">%d Sekunden</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="one">1 Std</item>
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="other">%d Std</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="one">1 Min</item>
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="other">%d min</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="one">1 Sek</item>
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="other">%d Sek</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <!-- plurals: tasks -->
-    <item quantity="one">1 Aufgabe</item>
-    <!-- plurals: tasks -->
-    <item quantity="other">%d Aufgaben</item>
-  </plurals>
-  <plurals name="Npeople">
-    <!-- plurals: people -->
-    <item quantity="one">Eine Person</item>
-    <!-- plurals: people -->
-    <item quantity="other">%d Personen</item>
-  </plurals>
-  
-  <!-- slide 10a, 12c: today -->
-  <string name="today">Heute</string>
-  
-  <!-- tomorrow -->
-  <string name="tomorrow">Morgen</string>
-  
-  <!-- yesterday -->
-  <string name="yesterday">Gestern</string>
-  
-  <!-- slide 12c: tomorrow, abbreviated -->
-  <string name="tmrw">Morg.</string>
-  
-  <!-- slide 12c: yesterday, abbreviated -->
-  <string name="yest">Gest.</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-  
-  <!-- confirmation dialog title -->
-  <string name="DLG_confirm_title">Bestätigen?</string>
-  
-  <!-- question dialog title -->
-  <string name="DLG_question_title">Frage:</string>
-  
-  <!-- information dialog title -->
-  <string name="DLG_information_title">Informationen</string>
-  
-  <!-- error dialog title -->
-  <string name="DLG_error_title">Fehler!</string>
-  
-  <!-- general dialog save-->
-  <string name="DLG_save">Speichern</string>
-  
-  <!-- general dialog yes-->
-  <string name="DLG_yes">Ja</string>
-  
-  <!-- general dialog no-->
-  <string name="DLG_no">Nein</string>
-  
-  <!-- general dialog close-->
-  <string name="DLG_close">Schließen</string>
-  
-  <!-- general dialog done -->
-  <string name="DLG_done">Erledigt</string>
-  
-  <!-- error dialog (%s => error message)-->
-  <string name="DLG_error">Ups, sieht aus, als ob ein Fehler aufgetreten ist! Folgendes ist passiert:\n\n%s</string>
-  
-  <!-- error dialog (no message indicated)-->
-  <string name="DLG_error_generic">Ups, sieht aus, als ob ein Fehler aufgetreten ist!</string>
-  
-  <!-- Progress dialog shown when doing something slow -->
-  <string name="DLG_wait">Bitte warten...</string>
-
- <!-- ====================================================== SyncProvider == -->
-          
-  <!-- Sync Notification: message when sync service active -->
-  <string name="SyP_progress">Synchronisiere deine Aufgaben</string>
-  
-  <!-- Sync Notification: toast when sync activated from activity -->
-  <string name="SyP_progress_toast">Synchronisiere…</string>
-  
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="SyP_label">Synchronisation</string>  
-
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="Sync_now_label">Jetzt synchronisieren</string>  
-
-  <!-- Sync label subtitle -->
-  <string name="SyP_summary">Astrid.com, Google Tasks, gespeicherte Daten, lokale Backups</string>  
-
-  <!-- Error msg when io exception  -->
-  <string name="SyP_ioerror">Verbindungsfehler! Überprüfen Sie Ihre Internetverbindung.</string>
-
-  <!-- ================================================== SyncPreferences == -->
-  
-  <!-- Status Group Label -->    
-  <string name="sync_SPr_group_status">Status</string>
-  
-  <!-- Sync status subtitle, %s-> status message -->
-  <string name="sync_SPr_status_subtitle">Status: %s</string>
-  <!-- Sync Status: log in -->    
-  <string name="sync_status_loggedout">Nicht angemeldet</string>
-  <!-- Status: ongoing -->    
-  <string name="sync_status_ongoing">Synchronisierung läuft...</string>
-  <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Letzte Synchronisierung:\n%s</string>
-  <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
-  <string name="sync_status_failed">Fehlgeschlagen am: %s</string>
-  <!-- Sync Status: error status (%s -> last sync date) -->    
-  <string name="sync_status_errors">Synchronisation m. Fehler: %s</string>
-  <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
-  <string name="sync_status_failed_subtitle">Letzte erfolgreiche Synchronisierung: %s</string>
-  <!-- Sync Status: never sync\'d -->    
-  <string name="sync_status_never">Noch nie synchronisiert!</string>
-
-  <!-- Options Group Label -->    
-  <string name="sync_SPr_group_options">Einstellungen</string>
-
-  <!-- Preference: Synchronization Interval Title -->    
-  <string name="sync_SPr_interval_title">Hintergrund-Synchronisierung</string>
-  <!-- Preference: Synchronization Interval Description (when disabled) -->
-  <string name="sync_SPr_interval_desc_disabled">Hintergrund-Synchronisierung ist deaktiviert</string>    
-  <!-- Preference: Synchronization Interval Description (%s => setting) -->
-  <string name="sync_SPr_interval_desc">Gesetzt auf: %s</string>
-  
-  <!-- Preference: Background Wifi Title -->  
-  <string name="sync_SPr_bgwifi_title">WLAN-Einstellungen</string>    
-  <!-- Preference: Background Wifi Description (enabled) -->
-  <string name="sync_SPr_bgwifi_desc_enabled">Hintergrund-Synchronisierung nur bei WLAN-Verbindung</string>    
-  <!-- Preference: Background Wifi Description (disabled) -->
-  <string name="sync_SPr_bgwifi_desc_disabled">Hintergrund-Synchronisierung findet immer statt</string>
-  
-  <!-- Actions Group Label  -->
-  <string name="sync_SPr_group_actions">Aktionen</string>
-
-  <!-- Synchronize Now Button -->    
-  <string name="sync_SPr_sync">Jetzt synchronisieren</string>
-  <!-- Synchronize Now Button if not logged in-->    
-  <string name="sync_SPr_sync_log_in">Einloggen &amp; synchronisieren!</string>
-  
-  <!-- Sync: Prefix string before logged in identifier -->
-  <string name="sync_SPr_logged_in_prefix">Angemeldet als:</string>
-  
-  <!-- Sync: Last error -->
-  <string name="sync_SPr_last_error">Statusbericht</string>
-  
-  <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Klicke um einen Bericht ans Astrid-Team zu senden</string>
-  <!-- Sync: send error report button -->
-  <string name="sync_SPr_send_report">Bericht senden</string>
-  
-  <!-- Sync: Clear Data Title -->
-  <string name="sync_SPr_forget">Abmelden</string>
-  <!-- Sync: Clear Data Description -->
-  <string name="sync_SPr_forget_description">Alle Synchronisationsdaten löschen</string>
-
-  <!-- confirmation dialog for sync log out -->
-  <string name="sync_forget_confirm">Ausloggen/synchronisierte Daten löschen?</string>
-  
-  <!-- Sync error: network connectivity problems. %s-> name of sync service-->
-  <string name="sync_error_offline">Es gab ein Problem mit der Netzwerkverbindung während der letzten Synchronisation mit %s. Versuche es bitte später noch einmal.</string>
-  
-  <string-array name="sync_SPr_interval_entries">
-      <!-- sync_SPr_interval_entries: Synchronization Intervals -->
-      <item>deaktivieren</item>
-      <item>alle 15 Minuten</item>
-      <item>alle 30 Minuten</item>
-      <item>stündlich</item>
-      <item>alle 3 Stunden</item>
-      <item>alle 6 Stunden</item>
-      <item>alle 12 Stunden</item>
-      <item>täglich</item>
-      <item>jeden dritten Tag</item>
-      <item>wöchentlich</item>
-  </string-array>    
-    
+<resources>
+
+    <!-- ==================================================== Generic Units == -->
+
+    <plurals name="DUt_years">
+        <!-- plurals: years -->
+        <item quantity="one">1 Jahr</item>
+        <!-- plurals: years -->
+        <item quantity="other">%d Jahre</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <!-- plurals: months -->
+        <item quantity="one">1 Monat</item>
+        <!-- plurals: months -->
+        <item quantity="other">%d Monate</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <!-- plurals: days -->
+        <item quantity="one">Eine Woche</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d Wochen</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <!-- plurals: days -->
+        <item quantity="one">Ein Tag</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d Tage</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <!-- plurals: days -->
+        <item quantity="one">Ein Wochentag</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d Wochentage</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <!-- plurals: hours -->
+        <item quantity="one">Eine Stunde</item>
+        <!-- plurals: hours -->
+        <item quantity="other">%d Stunden</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <!-- plurals: minutes -->
+        <item quantity="one">Eine Minute</item>
+        <!-- plurals: minutes -->
+        <item quantity="other">%d Minuten</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <!-- plurals: seconds -->
+        <item quantity="one">Eine Sekunde</item>
+        <!-- plurals: seconds -->
+        <item quantity="other">%d Sekunden</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="one">1 Std</item>
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="other">%d Std</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="one">1 Min</item>
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="other">%d min</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="one">1 Sek</item>
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="other">%d Sek</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <!-- plurals: tasks -->
+        <item quantity="one">1 Aufgabe</item>
+        <!-- plurals: tasks -->
+        <item quantity="other">%d Aufgaben</item>
+    </plurals>
+    <plurals name="Npeople">
+        <!-- plurals: people -->
+        <item quantity="one">Eine Person</item>
+        <!-- plurals: people -->
+        <item quantity="other">%d Personen</item>
+    </plurals>
+
+    <!-- slide 10a, 12c: today -->
+    <string name="today">Heute</string>
+
+    <!-- tomorrow -->
+    <string name="tomorrow">Morgen</string>
+
+    <!-- yesterday -->
+    <string name="yesterday">Gestern</string>
+
+    <!-- slide 12c: tomorrow, abbreviated -->
+    <string name="tmrw">Morg.</string>
+
+    <!-- slide 12c: yesterday, abbreviated -->
+    <string name="yest">Gest.</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- confirmation dialog title -->
+    <string name="DLG_confirm_title">Bestätigen?</string>
+
+    <!-- question dialog title -->
+    <string name="DLG_question_title">Frage:</string>
+
+    <!-- information dialog title -->
+    <string name="DLG_information_title">Informationen</string>
+
+    <!-- error dialog title -->
+    <string name="DLG_error_title">Fehler!</string>
+
+    <!-- general dialog save-->
+    <string name="DLG_save">Speichern</string>
+
+    <!-- general dialog yes-->
+    <string name="DLG_yes">Ja</string>
+
+    <!-- general dialog no-->
+    <string name="DLG_no">Nein</string>
+
+    <!-- general dialog close-->
+    <string name="DLG_close">Schließen</string>
+
+    <!-- general dialog done -->
+    <string name="DLG_done">Erledigt</string>
+
+    <!-- error dialog (%s => error message)-->
+    <string name="DLG_error">Ups, sieht aus, als ob ein Fehler aufgetreten ist! Folgendes ist
+        passiert:\n\n%s
+    </string>
+
+    <!-- error dialog (no message indicated)-->
+    <string name="DLG_error_generic">Ups, sieht aus, als ob ein Fehler aufgetreten ist!</string>
+
+    <!-- Progress dialog shown when doing something slow -->
+    <string name="DLG_wait">Bitte warten...</string>
+
+    <!-- ====================================================== SyncProvider == -->
+
+    <!-- Sync Notification: message when sync service active -->
+    <string name="SyP_progress">Synchronisiere deine Aufgaben</string>
+
+    <!-- Sync Notification: toast when sync activated from activity -->
+    <string name="SyP_progress_toast">Synchronisiere…</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="SyP_label">Synchronisation</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="Sync_now_label">Jetzt synchronisieren</string>
+
+    <!-- Sync label subtitle -->
+    <string name="SyP_summary">Astrid.com, Google Tasks, gespeicherte Daten, lokale Backups</string>
+
+    <!-- Error msg when io exception  -->
+    <string name="SyP_ioerror">Verbindungsfehler! Überprüfen Sie Ihre Internetverbindung.</string>
+
+    <!-- ================================================== SyncPreferences == -->
+
+    <!-- Status Group Label -->
+    <string name="sync_SPr_group_status">Status</string>
+
+    <!-- Sync status subtitle, %s-> status message -->
+    <string name="sync_SPr_status_subtitle">Status: %s</string>
+    <!-- Sync Status: log in -->
+    <string name="sync_status_loggedout">Nicht angemeldet</string>
+    <!-- Status: ongoing -->
+    <string name="sync_status_ongoing">Synchronisierung läuft...</string>
+    <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
+    <string name="sync_status_success">Letzte Synchronisierung:\n%s</string>
+    <!-- Sync Status: failure status (%s -> last attempted sync date) -->
+    <string name="sync_status_failed">Fehlgeschlagen am: %s</string>
+    <!-- Sync Status: error status (%s -> last sync date) -->
+    <string name="sync_status_errors">Synchronisation m. Fehler: %s</string>
+    <!-- Sync Status: error subtitle (%s -> last successful sync date) -->
+    <string name="sync_status_failed_subtitle">Letzte erfolgreiche Synchronisierung: %s</string>
+    <!-- Sync Status: never sync\'d -->
+    <string name="sync_status_never">Noch nie synchronisiert!</string>
+
+    <!-- Options Group Label -->
+    <string name="sync_SPr_group_options">Einstellungen</string>
+
+    <!-- Preference: Synchronization Interval Title -->
+    <string name="sync_SPr_interval_title">Hintergrund-Synchronisierung</string>
+    <!-- Preference: Synchronization Interval Description (when disabled) -->
+    <string name="sync_SPr_interval_desc_disabled">Hintergrund-Synchronisierung ist deaktiviert
+    </string>
+    <!-- Preference: Synchronization Interval Description (%s => setting) -->
+    <string name="sync_SPr_interval_desc">Gesetzt auf: %s</string>
+
+    <!-- Preference: Background Wifi Title -->
+    <string name="sync_SPr_bgwifi_title">WLAN-Einstellungen</string>
+    <!-- Preference: Background Wifi Description (enabled) -->
+    <string name="sync_SPr_bgwifi_desc_enabled">Hintergrund-Synchronisierung nur bei
+        WLAN-Verbindung
+    </string>
+    <!-- Preference: Background Wifi Description (disabled) -->
+    <string name="sync_SPr_bgwifi_desc_disabled">Hintergrund-Synchronisierung findet immer statt
+    </string>
+
+    <!-- Actions Group Label  -->
+    <string name="sync_SPr_group_actions">Aktionen</string>
+
+    <!-- Synchronize Now Button -->
+    <string name="sync_SPr_sync">Jetzt synchronisieren</string>
+    <!-- Synchronize Now Button if not logged in-->
+    <string name="sync_SPr_sync_log_in">Einloggen &amp; synchronisieren!</string>
+
+    <!-- Sync: Prefix string before logged in identifier -->
+    <string name="sync_SPr_logged_in_prefix">Angemeldet als:</string>
+
+    <!-- Sync: Last error -->
+    <string name="sync_SPr_last_error">Statusbericht</string>
+
+    <!-- Sync: last error click for more -->
+    <string name="sync_SPr_last_error_subtitle">Klicke um einen Bericht ans Astrid-Team zu senden
+    </string>
+    <!-- Sync: send error report button -->
+    <string name="sync_SPr_send_report">Bericht senden</string>
+
+    <!-- Sync: Clear Data Title -->
+    <string name="sync_SPr_forget">Abmelden</string>
+    <!-- Sync: Clear Data Description -->
+    <string name="sync_SPr_forget_description">Alle Synchronisationsdaten löschen</string>
+
+    <!-- confirmation dialog for sync log out -->
+    <string name="sync_forget_confirm">Ausloggen/synchronisierte Daten löschen?</string>
+
+    <!-- Sync error: network connectivity problems. %s-> name of sync service-->
+    <string name="sync_error_offline">Es gab ein Problem mit der Netzwerkverbindung während der
+        letzten Synchronisation mit %s. Versuche es bitte später noch einmal.
+    </string>
+
+    <string-array name="sync_SPr_interval_entries">
+        <!-- sync_SPr_interval_entries: Synchronization Intervals -->
+        <item>deaktivieren</item>
+        <item>alle 15 Minuten</item>
+        <item>alle 30 Minuten</item>
+        <item>stündlich</item>
+        <item>alle 3 Stunden</item>
+        <item>alle 6 Stunden</item>
+        <item>alle 12 Stunden</item>
+        <item>täglich</item>
+        <item>jeden dritten Tag</item>
+        <item>wöchentlich</item>
+    </string-array>
+
 </resources>
diff --git a/api/res/values-es/strings.xml b/api/res/values-es/strings.xml
index ca543ccbc..ccd1a4522 100755
--- a/api/res/values-es/strings.xml
+++ b/api/res/values-es/strings.xml
@@ -4,243 +4,253 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ==================================================== Generic Units == -->
-  
-  <plurals name="DUt_years">
-    <!-- plurals: years -->
-    <item quantity="one">1 año</item>
-    <!-- plurals: years -->
-    <item quantity="other">%d años</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <!-- plurals: months -->
-    <item quantity="one">1 mes</item>
-    <!-- plurals: months -->
-    <item quantity="other">%d meses</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <!-- plurals: days -->
-    <item quantity="one">1 semana</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d semanas</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <!-- plurals: days -->
-    <item quantity="one">Un día</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d días</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <!-- plurals: days -->
-    <item quantity="one">1 día laborable</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d días laborables</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <!-- plurals: hours -->
-    <item quantity="one">1 hora</item>
-    <!-- plurals: hours -->
-    <item quantity="other">%d horas</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <!-- plurals: minutes -->
-    <item quantity="one">1 minuto</item>
-    <!-- plurals: minutes -->
-    <item quantity="other">%d minutos</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <!-- plurals: seconds -->
-    <item quantity="one">1 segundo</item>
-    <!-- plurals: seconds -->
-    <item quantity="other">%d segundos</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="one">1 hr</item>
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="other">%d hrs</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="one">1 min</item>
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="other">%d min</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="one">1 seg</item>
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="other">%d seg</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <!-- plurals: tasks -->
-    <item quantity="one">1 tarea</item>
-    <!-- plurals: tasks -->
-    <item quantity="other">%d tareas</item>
-  </plurals>
-  <plurals name="Npeople">
-    <!-- plurals: people -->
-    <item quantity="one">1 persona</item>
-    <!-- plurals: people -->
-    <item quantity="other">%d personas</item>
-  </plurals>
-  
-  <!-- slide 10a, 12c: today -->
-  <string name="today">Hoy</string>
-  
-  <!-- tomorrow -->
-  <string name="tomorrow">Mañana</string>
-  
-  <!-- yesterday -->
-  <string name="yesterday">Ayer</string>
-  
-  <!-- slide 12c: tomorrow, abbreviated -->
-  <string name="tmrw">Mañana</string>
-  
-  <!-- slide 12c: yesterday, abbreviated -->
-  <string name="yest">Ayer</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-  
-  <!-- confirmation dialog title -->
-  <string name="DLG_confirm_title">¿Confirmar?</string>
-  
-  <!-- question dialog title -->
-  <string name="DLG_question_title">Pregunta:</string>
-  
-  <!-- information dialog title -->
-  <string name="DLG_information_title">Información</string>
-  
-  <!-- error dialog title -->
-  <string name="DLG_error_title">¡Error!</string>
-  
-  <!-- general dialog save-->
-  <string name="DLG_save">Guardar</string>
-  
-  <!-- general dialog yes-->
-  <string name="DLG_yes">Sí</string>
-  
-  <!-- general dialog no-->
-  <string name="DLG_no">No</string>
-  
-  <!-- general dialog close-->
-  <string name="DLG_close">Cerrar</string>
-  
-  <!-- general dialog done -->
-  <string name="DLG_done">Terminado</string>
-  
-  <!-- error dialog (%s => error message)-->
-  <string name="DLG_error">¡Uy, parece que ocurró un error! Esto es lo que pasó:\n\n%s</string>
-  
-  <!-- error dialog (no message indicated)-->
-  <string name="DLG_error_generic">¡Uy, parece que ocurrió un error!</string>
-  
-  <!-- Progress dialog shown when doing something slow -->
-  <string name="DLG_wait">Espere un momento...</string>
-
- <!-- ====================================================== SyncProvider == -->
-          
-  <!-- Sync Notification: message when sync service active -->
-  <string name="SyP_progress">Sincronizando sus tareas...</string>
-  
-  <!-- Sync Notification: toast when sync activated from activity -->
-  <string name="SyP_progress_toast">Sincronizando...</string>
-  
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="SyP_label">Sincronización &amp; copia de seguridad</string>  
-
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="Sync_now_label">Sincronizar ahora</string>  
-
-  <!-- Sync label subtitle -->
-  <string name="SyP_summary">Astrid.com, Google Tasks, información guardada, copia de seguridad local</string>  
-
-  <!-- Error msg when io exception  -->
-  <string name="SyP_ioerror">¡Error de conexión! Verifique su conexión a internet.</string>
-
-  <!-- ================================================== SyncPreferences == -->
-  
-  <!-- Status Group Label -->    
-  <string name="sync_SPr_group_status">Estado</string>
-  
-  <!-- Sync status subtitle, %s-> status message -->
-  <string name="sync_SPr_status_subtitle">Estado: %s</string>
-  <!-- Sync Status: log in -->    
-  <string name="sync_status_loggedout">Sesión no iniciada</string>
-  <!-- Status: ongoing -->    
-  <string name="sync_status_ongoing">Sincronización en marcha</string>
-  <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Ultima sincronización:\n%s</string>
-  <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
-  <string name="sync_status_failed">Falló en: %s</string>
-  <!-- Sync Status: error status (%s -> last sync date) -->    
-  <string name="sync_status_errors">Sincronización c/ errores: %s</string>
-  <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
-  <string name="sync_status_failed_subtitle">Última sincronización correcta: %s</string>
-  <!-- Sync Status: never sync\'d -->    
-  <string name="sync_status_never">¡Nunca sincronizado!</string>
-
-  <!-- Options Group Label -->    
-  <string name="sync_SPr_group_options">Opciones</string>
-
-  <!-- Preference: Synchronization Interval Title -->    
-  <string name="sync_SPr_interval_title">Sincronización en segundo plano</string>
-  <!-- Preference: Synchronization Interval Description (when disabled) -->
-  <string name="sync_SPr_interval_desc_disabled">Sincronización en segundo plano deshabilitada</string>    
-  <!-- Preference: Synchronization Interval Description (%s => setting) -->
-  <string name="sync_SPr_interval_desc">Actualmente configurado a: %s</string>
-  
-  <!-- Preference: Background Wifi Title -->  
-  <string name="sync_SPr_bgwifi_title">Configuración solo wifi</string>    
-  <!-- Preference: Background Wifi Description (enabled) -->
-  <string name="sync_SPr_bgwifi_desc_enabled">La sincronización en segundo plano sólo funciona con el Wifi activado</string>    
-  <!-- Preference: Background Wifi Description (disabled) -->
-  <string name="sync_SPr_bgwifi_desc_disabled">La sincronización en segundo plano siempre funcionará</string>
-  
-  <!-- Actions Group Label  -->
-  <string name="sync_SPr_group_actions">Acciones</string>
-
-  <!-- Synchronize Now Button -->    
-  <string name="sync_SPr_sync">Sincronizar ahora</string>
-  <!-- Synchronize Now Button if not logged in-->    
-  <string name="sync_SPr_sync_log_in">Iniciar sesión &amp; sincronizar!</string>
-  
-  <!-- Sync: Prefix string before logged in identifier -->
-  <string name="sync_SPr_logged_in_prefix">Sesión iniciada como:</string>
-  
-  <!-- Sync: Last error -->
-  <string name="sync_SPr_last_error">Reporte de estado</string>
-  
-  <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Click para enviar un reporte al equipo de Astrid</string>
-  <!-- Sync: send error report button -->
-  <string name="sync_SPr_send_report">Enviar reporte</string>
-  
-  <!-- Sync: Clear Data Title -->
-  <string name="sync_SPr_forget">Cerrar sesión</string>
-  <!-- Sync: Clear Data Description -->
-  <string name="sync_SPr_forget_description">Limpia todos los datos de la sincronización</string>
-
-  <!-- confirmation dialog for sync log out -->
-  <string name="sync_forget_confirm">Cerrar sesión/Limpiar datos de sincronización?</string>
-  
-  <!-- Sync error: network connectivity problems. %s-> name of sync service-->
-  <string name="sync_error_offline">Ha ocurrido un problema conectando a la red durante la última sincronización con %s. Por favor inténtelo nuevamente después.</string>
-  
-  <string-array name="sync_SPr_interval_entries">
-      <!-- sync_SPr_interval_entries: Synchronization Intervals -->
-      <item>deshabilitar</item>
-      <item>cada quince minutos</item>
-      <item>cada treinta minutos</item>
-      <item>cada hora</item>
-      <item>cada tres horas</item>
-      <item>cada seis horas</item>
-      <item>cada doce horas</item>
-      <item>cada día</item>
-      <item>cada tres días</item>
-      <item>cada semana</item>
-  </string-array>    
-    
+<resources>
+
+    <!-- ==================================================== Generic Units == -->
+
+    <plurals name="DUt_years">
+        <!-- plurals: years -->
+        <item quantity="one">1 año</item>
+        <!-- plurals: years -->
+        <item quantity="other">%d años</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <!-- plurals: months -->
+        <item quantity="one">1 mes</item>
+        <!-- plurals: months -->
+        <item quantity="other">%d meses</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <!-- plurals: days -->
+        <item quantity="one">1 semana</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d semanas</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <!-- plurals: days -->
+        <item quantity="one">Un día</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d días</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <!-- plurals: days -->
+        <item quantity="one">1 día laborable</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d días laborables</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <!-- plurals: hours -->
+        <item quantity="one">1 hora</item>
+        <!-- plurals: hours -->
+        <item quantity="other">%d horas</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <!-- plurals: minutes -->
+        <item quantity="one">1 minuto</item>
+        <!-- plurals: minutes -->
+        <item quantity="other">%d minutos</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <!-- plurals: seconds -->
+        <item quantity="one">1 segundo</item>
+        <!-- plurals: seconds -->
+        <item quantity="other">%d segundos</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="one">1 hr</item>
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="other">%d hrs</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="one">1 min</item>
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="other">%d min</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="one">1 seg</item>
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="other">%d seg</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <!-- plurals: tasks -->
+        <item quantity="one">1 tarea</item>
+        <!-- plurals: tasks -->
+        <item quantity="other">%d tareas</item>
+    </plurals>
+    <plurals name="Npeople">
+        <!-- plurals: people -->
+        <item quantity="one">1 persona</item>
+        <!-- plurals: people -->
+        <item quantity="other">%d personas</item>
+    </plurals>
+
+    <!-- slide 10a, 12c: today -->
+    <string name="today">Hoy</string>
+
+    <!-- tomorrow -->
+    <string name="tomorrow">Mañana</string>
+
+    <!-- yesterday -->
+    <string name="yesterday">Ayer</string>
+
+    <!-- slide 12c: tomorrow, abbreviated -->
+    <string name="tmrw">Mañana</string>
+
+    <!-- slide 12c: yesterday, abbreviated -->
+    <string name="yest">Ayer</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- confirmation dialog title -->
+    <string name="DLG_confirm_title">¿Confirmar?</string>
+
+    <!-- question dialog title -->
+    <string name="DLG_question_title">Pregunta:</string>
+
+    <!-- information dialog title -->
+    <string name="DLG_information_title">Información</string>
+
+    <!-- error dialog title -->
+    <string name="DLG_error_title">¡Error!</string>
+
+    <!-- general dialog save-->
+    <string name="DLG_save">Guardar</string>
+
+    <!-- general dialog yes-->
+    <string name="DLG_yes">Sí</string>
+
+    <!-- general dialog no-->
+    <string name="DLG_no">No</string>
+
+    <!-- general dialog close-->
+    <string name="DLG_close">Cerrar</string>
+
+    <!-- general dialog done -->
+    <string name="DLG_done">Terminado</string>
+
+    <!-- error dialog (%s => error message)-->
+    <string name="DLG_error">¡Uy, parece que ocurró un error! Esto es lo que pasó:\n\n%s</string>
+
+    <!-- error dialog (no message indicated)-->
+    <string name="DLG_error_generic">¡Uy, parece que ocurrió un error!</string>
+
+    <!-- Progress dialog shown when doing something slow -->
+    <string name="DLG_wait">Espere un momento...</string>
+
+    <!-- ====================================================== SyncProvider == -->
+
+    <!-- Sync Notification: message when sync service active -->
+    <string name="SyP_progress">Sincronizando sus tareas...</string>
+
+    <!-- Sync Notification: toast when sync activated from activity -->
+    <string name="SyP_progress_toast">Sincronizando...</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="SyP_label">Sincronización &amp; copia de seguridad</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="Sync_now_label">Sincronizar ahora</string>
+
+    <!-- Sync label subtitle -->
+    <string name="SyP_summary">Astrid.com, Google Tasks, información guardada, copia de seguridad
+        local
+    </string>
+
+    <!-- Error msg when io exception  -->
+    <string name="SyP_ioerror">¡Error de conexión! Verifique su conexión a internet.</string>
+
+    <!-- ================================================== SyncPreferences == -->
+
+    <!-- Status Group Label -->
+    <string name="sync_SPr_group_status">Estado</string>
+
+    <!-- Sync status subtitle, %s-> status message -->
+    <string name="sync_SPr_status_subtitle">Estado: %s</string>
+    <!-- Sync Status: log in -->
+    <string name="sync_status_loggedout">Sesión no iniciada</string>
+    <!-- Status: ongoing -->
+    <string name="sync_status_ongoing">Sincronización en marcha</string>
+    <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
+    <string name="sync_status_success">Ultima sincronización:\n%s</string>
+    <!-- Sync Status: failure status (%s -> last attempted sync date) -->
+    <string name="sync_status_failed">Falló en: %s</string>
+    <!-- Sync Status: error status (%s -> last sync date) -->
+    <string name="sync_status_errors">Sincronización c/ errores: %s</string>
+    <!-- Sync Status: error subtitle (%s -> last successful sync date) -->
+    <string name="sync_status_failed_subtitle">Última sincronización correcta: %s</string>
+    <!-- Sync Status: never sync\'d -->
+    <string name="sync_status_never">¡Nunca sincronizado!</string>
+
+    <!-- Options Group Label -->
+    <string name="sync_SPr_group_options">Opciones</string>
+
+    <!-- Preference: Synchronization Interval Title -->
+    <string name="sync_SPr_interval_title">Sincronización en segundo plano</string>
+    <!-- Preference: Synchronization Interval Description (when disabled) -->
+    <string name="sync_SPr_interval_desc_disabled">Sincronización en segundo plano deshabilitada
+    </string>
+    <!-- Preference: Synchronization Interval Description (%s => setting) -->
+    <string name="sync_SPr_interval_desc">Actualmente configurado a: %s</string>
+
+    <!-- Preference: Background Wifi Title -->
+    <string name="sync_SPr_bgwifi_title">Configuración solo wifi</string>
+    <!-- Preference: Background Wifi Description (enabled) -->
+    <string name="sync_SPr_bgwifi_desc_enabled">La sincronización en segundo plano sólo funciona con
+        el Wifi activado
+    </string>
+    <!-- Preference: Background Wifi Description (disabled) -->
+    <string name="sync_SPr_bgwifi_desc_disabled">La sincronización en segundo plano siempre
+        funcionará
+    </string>
+
+    <!-- Actions Group Label  -->
+    <string name="sync_SPr_group_actions">Acciones</string>
+
+    <!-- Synchronize Now Button -->
+    <string name="sync_SPr_sync">Sincronizar ahora</string>
+    <!-- Synchronize Now Button if not logged in-->
+    <string name="sync_SPr_sync_log_in">Iniciar sesión &amp; sincronizar!</string>
+
+    <!-- Sync: Prefix string before logged in identifier -->
+    <string name="sync_SPr_logged_in_prefix">Sesión iniciada como:</string>
+
+    <!-- Sync: Last error -->
+    <string name="sync_SPr_last_error">Reporte de estado</string>
+
+    <!-- Sync: last error click for more -->
+    <string name="sync_SPr_last_error_subtitle">Click para enviar un reporte al equipo de Astrid
+    </string>
+    <!-- Sync: send error report button -->
+    <string name="sync_SPr_send_report">Enviar reporte</string>
+
+    <!-- Sync: Clear Data Title -->
+    <string name="sync_SPr_forget">Cerrar sesión</string>
+    <!-- Sync: Clear Data Description -->
+    <string name="sync_SPr_forget_description">Limpia todos los datos de la sincronización</string>
+
+    <!-- confirmation dialog for sync log out -->
+    <string name="sync_forget_confirm">Cerrar sesión/Limpiar datos de sincronización?</string>
+
+    <!-- Sync error: network connectivity problems. %s-> name of sync service-->
+    <string name="sync_error_offline">Ha ocurrido un problema conectando a la red durante la última
+        sincronización con %s. Por favor inténtelo nuevamente después.
+    </string>
+
+    <string-array name="sync_SPr_interval_entries">
+        <!-- sync_SPr_interval_entries: Synchronization Intervals -->
+        <item>deshabilitar</item>
+        <item>cada quince minutos</item>
+        <item>cada treinta minutos</item>
+        <item>cada hora</item>
+        <item>cada tres horas</item>
+        <item>cada seis horas</item>
+        <item>cada doce horas</item>
+        <item>cada día</item>
+        <item>cada tres días</item>
+        <item>cada semana</item>
+    </string-array>
+
 </resources>
diff --git a/api/res/values-fr/strings.xml b/api/res/values-fr/strings.xml
index 1a191e5e1..a7b1e5cb8 100755
--- a/api/res/values-fr/strings.xml
+++ b/api/res/values-fr/strings.xml
@@ -4,243 +4,255 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ==================================================== Generic Units == -->
-  
-  <plurals name="DUt_years">
-    <!-- plurals: years -->
-    <item quantity="one">1 an</item>
-    <!-- plurals: years -->
-    <item quantity="other">%d ans</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <!-- plurals: months -->
-    <item quantity="one">1 mois</item>
-    <!-- plurals: months -->
-    <item quantity="other">%d mois</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <!-- plurals: days -->
-    <item quantity="one">1 semaine</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d semaines</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <!-- plurals: days -->
-    <item quantity="one">1 jour</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d jours</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <!-- plurals: days -->
-    <item quantity="one">1 jour de la semaine</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d jours de la semaine</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <!-- plurals: hours -->
-    <item quantity="one">1 heure</item>
-    <!-- plurals: hours -->
-    <item quantity="other">%d heures</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <!-- plurals: minutes -->
-    <item quantity="one">1 minute</item>
-    <!-- plurals: minutes -->
-    <item quantity="other">%d minutes</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <!-- plurals: seconds -->
-    <item quantity="one">1 seconde</item>
-    <!-- plurals: seconds -->
-    <item quantity="other">%d secondes</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="one">1 h</item>
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="other">%d h</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="one">1 min</item>
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="other">%d min</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="one">1 s</item>
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="other">%d s</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <!-- plurals: tasks -->
-    <item quantity="one">1 tâche</item>
-    <!-- plurals: tasks -->
-    <item quantity="other">%d tâches</item>
-  </plurals>
-  <plurals name="Npeople">
-    <!-- plurals: people -->
-    <item quantity="one">1 personne</item>
-    <!-- plurals: people -->
-    <item quantity="other">%d personnes</item>
-  </plurals>
-  
-  <!-- slide 10a, 12c: today -->
-  <string name="today">Aujourd\'hui</string>
-  
-  <!-- tomorrow -->
-  <string name="tomorrow">Demain</string>
-  
-  <!-- yesterday -->
-  <string name="yesterday">Hier</string>
-  
-  <!-- slide 12c: tomorrow, abbreviated -->
-  <string name="tmrw">Demain</string>
-  
-  <!-- slide 12c: yesterday, abbreviated -->
-  <string name="yest">Hier</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-  
-  <!-- confirmation dialog title -->
-  <string name="DLG_confirm_title">Confirmer ?</string>
-  
-  <!-- question dialog title -->
-  <string name="DLG_question_title">Question :</string>
-  
-  <!-- information dialog title -->
-  <string name="DLG_information_title">Information</string>
-  
-  <!-- error dialog title -->
-  <string name="DLG_error_title">Erreur !</string>
-  
-  <!-- general dialog save-->
-  <string name="DLG_save">Enregistrer</string>
-  
-  <!-- general dialog yes-->
-  <string name="DLG_yes">Oui</string>
-  
-  <!-- general dialog no-->
-  <string name="DLG_no">Non</string>
-  
-  <!-- general dialog close-->
-  <string name="DLG_close">Fermer</string>
-  
-  <!-- general dialog done -->
-  <string name="DLG_done">Fnalizado</string>
-  
-  <!-- error dialog (%s => error message)-->
-  <string name="DLG_error">Oups, une erreur est survenue ! Voici ce qu\'il s\'est passé :\n\n%s</string>
-  
-  <!-- error dialog (no message indicated)-->
-  <string name="DLG_error_generic">Oups, une erreur est survenue !</string>
-  
-  <!-- Progress dialog shown when doing something slow -->
-  <string name="DLG_wait">Veuillez patienter...</string>
-
- <!-- ====================================================== SyncProvider == -->
-          
-  <!-- Sync Notification: message when sync service active -->
-  <string name="SyP_progress">Synchronisation de vos tâches...</string>
-  
-  <!-- Sync Notification: toast when sync activated from activity -->
-  <string name="SyP_progress_toast">Synchronisation...</string>
-  
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="SyP_label">Synchronisation</string>  
-
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="Sync_now_label">Sync now</string>  
-
-  <!-- Sync label subtitle -->
-  <string name="SyP_summary">Astrid.com, Tâches Google, données enregistrées, sauvegarde locale</string>  
-
-  <!-- Error msg when io exception  -->
-  <string name="SyP_ioerror">Erreur de connexion ! Veuillez vérifier votre connexion Internet.</string>
-
-  <!-- ================================================== SyncPreferences == -->
-  
-  <!-- Status Group Label -->    
-  <string name="sync_SPr_group_status">Statut</string>
-  
-  <!-- Sync status subtitle, %s-> status message -->
-  <string name="sync_SPr_status_subtitle">État : %s</string>
-  <!-- Sync Status: log in -->    
-  <string name="sync_status_loggedout">Non connecté</string>
-  <!-- Status: ongoing -->    
-  <string name="sync_status_ongoing">Synchronisation en cours...</string>
-  <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Dernière synchro. :\n%s</string>
-  <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
-  <string name="sync_status_failed">Échec sur : %s</string>
-  <!-- Sync Status: error status (%s -> last sync date) -->    
-  <string name="sync_status_errors">Synchro avec Erreurs: %s</string>
-  <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
-  <string name="sync_status_failed_subtitle">Dernière synchro. réussie : %s</string>
-  <!-- Sync Status: never sync\'d -->    
-  <string name="sync_status_never">Jamais synchronisé !</string>
-
-  <!-- Options Group Label -->    
-  <string name="sync_SPr_group_options">Options</string>
-
-  <!-- Preference: Synchronization Interval Title -->    
-  <string name="sync_SPr_interval_title">Synchro. en arrière-plan</string>
-  <!-- Preference: Synchronization Interval Description (when disabled) -->
-  <string name="sync_SPr_interval_desc_disabled">Synchronisation en arrière-plan désactivée</string>    
-  <!-- Preference: Synchronization Interval Description (%s => setting) -->
-  <string name="sync_SPr_interval_desc">Actuellement configuré sur : %s</string>
-  
-  <!-- Preference: Background Wifi Title -->  
-  <string name="sync_SPr_bgwifi_title">Paramètre Wifi seul</string>    
-  <!-- Preference: Background Wifi Description (enabled) -->
-  <string name="sync_SPr_bgwifi_desc_enabled">La synchronisation en arrière-plan ne s\'effectue uniquement sous Wifi</string>    
-  <!-- Preference: Background Wifi Description (disabled) -->
-  <string name="sync_SPr_bgwifi_desc_disabled">La synchronisation en arrière-plan s\'effectuera toujours</string>
-  
-  <!-- Actions Group Label  -->
-  <string name="sync_SPr_group_actions">Actions</string>
-
-  <!-- Synchronize Now Button -->    
-  <string name="sync_SPr_sync">Synchroniser maintenant</string>
-  <!-- Synchronize Now Button if not logged in-->    
-  <string name="sync_SPr_sync_log_in">Se connecter et synchroniser !</string>
-  
-  <!-- Sync: Prefix string before logged in identifier -->
-  <string name="sync_SPr_logged_in_prefix">Connecté en tant que :</string>
-  
-  <!-- Sync: Last error -->
-  <string name="sync_SPr_last_error">Rapport d\'état</string>
-  
-  <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Cliquez pour envoyer un rapport à l\'équipe Astrid</string>
-  <!-- Sync: send error report button -->
-  <string name="sync_SPr_send_report">Envoyer le rapport</string>
-  
-  <!-- Sync: Clear Data Title -->
-  <string name="sync_SPr_forget">Se déconnecter</string>
-  <!-- Sync: Clear Data Description -->
-  <string name="sync_SPr_forget_description">Purger toutes les données de synchronisation</string>
-
-  <!-- confirmation dialog for sync log out -->
-  <string name="sync_forget_confirm">Se déconnecter/purger les données de synchronisation ?</string>
-  
-  <!-- Sync error: network connectivity problems. %s-> name of sync service-->
-  <string name="sync_error_offline">Un problème de connexion réseau est survenu lors de la dernière synchronisation avec %s. Merci de réessayer plus tard.</string>
-  
-  <string-array name="sync_SPr_interval_entries">
-      <!-- sync_SPr_interval_entries: Synchronization Intervals -->
-      <item>désactiver</item>
-      <item>toutes les quinze minutes</item>
-      <item>toutes les trente minutes</item>
-      <item>toutes les heures</item>
-      <item>toutes les trois heures</item>
-      <item>toutes les six heures</item>
-      <item>toutes les douze heures</item>
-      <item>tous les jours</item>
-      <item>tous les trois jours</item>
-      <item>toutes les semaines</item>
-  </string-array>    
-    
+<resources>
+
+    <!-- ==================================================== Generic Units == -->
+
+    <plurals name="DUt_years">
+        <!-- plurals: years -->
+        <item quantity="one">1 an</item>
+        <!-- plurals: years -->
+        <item quantity="other">%d ans</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <!-- plurals: months -->
+        <item quantity="one">1 mois</item>
+        <!-- plurals: months -->
+        <item quantity="other">%d mois</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <!-- plurals: days -->
+        <item quantity="one">1 semaine</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d semaines</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <!-- plurals: days -->
+        <item quantity="one">1 jour</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d jours</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <!-- plurals: days -->
+        <item quantity="one">1 jour de la semaine</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d jours de la semaine</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <!-- plurals: hours -->
+        <item quantity="one">1 heure</item>
+        <!-- plurals: hours -->
+        <item quantity="other">%d heures</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <!-- plurals: minutes -->
+        <item quantity="one">1 minute</item>
+        <!-- plurals: minutes -->
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <!-- plurals: seconds -->
+        <item quantity="one">1 seconde</item>
+        <!-- plurals: seconds -->
+        <item quantity="other">%d secondes</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="one">1 h</item>
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="other">%d h</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="one">1 min</item>
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="other">%d min</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="one">1 s</item>
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="other">%d s</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <!-- plurals: tasks -->
+        <item quantity="one">1 tâche</item>
+        <!-- plurals: tasks -->
+        <item quantity="other">%d tâches</item>
+    </plurals>
+    <plurals name="Npeople">
+        <!-- plurals: people -->
+        <item quantity="one">1 personne</item>
+        <!-- plurals: people -->
+        <item quantity="other">%d personnes</item>
+    </plurals>
+
+    <!-- slide 10a, 12c: today -->
+    <string name="today">Aujourd\'hui</string>
+
+    <!-- tomorrow -->
+    <string name="tomorrow">Demain</string>
+
+    <!-- yesterday -->
+    <string name="yesterday">Hier</string>
+
+    <!-- slide 12c: tomorrow, abbreviated -->
+    <string name="tmrw">Demain</string>
+
+    <!-- slide 12c: yesterday, abbreviated -->
+    <string name="yest">Hier</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- confirmation dialog title -->
+    <string name="DLG_confirm_title">Confirmer ?</string>
+
+    <!-- question dialog title -->
+    <string name="DLG_question_title">Question :</string>
+
+    <!-- information dialog title -->
+    <string name="DLG_information_title">Information</string>
+
+    <!-- error dialog title -->
+    <string name="DLG_error_title">Erreur !</string>
+
+    <!-- general dialog save-->
+    <string name="DLG_save">Enregistrer</string>
+
+    <!-- general dialog yes-->
+    <string name="DLG_yes">Oui</string>
+
+    <!-- general dialog no-->
+    <string name="DLG_no">Non</string>
+
+    <!-- general dialog close-->
+    <string name="DLG_close">Fermer</string>
+
+    <!-- general dialog done -->
+    <string name="DLG_done">Fnalizado</string>
+
+    <!-- error dialog (%s => error message)-->
+    <string name="DLG_error">Oups, une erreur est survenue ! Voici ce qu\'il s\'est passé :\n\n%s
+    </string>
+
+    <!-- error dialog (no message indicated)-->
+    <string name="DLG_error_generic">Oups, une erreur est survenue !</string>
+
+    <!-- Progress dialog shown when doing something slow -->
+    <string name="DLG_wait">Veuillez patienter...</string>
+
+    <!-- ====================================================== SyncProvider == -->
+
+    <!-- Sync Notification: message when sync service active -->
+    <string name="SyP_progress">Synchronisation de vos tâches...</string>
+
+    <!-- Sync Notification: toast when sync activated from activity -->
+    <string name="SyP_progress_toast">Synchronisation...</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="SyP_label">Synchronisation</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="Sync_now_label">Sync now</string>
+
+    <!-- Sync label subtitle -->
+    <string name="SyP_summary">Astrid.com, Tâches Google, données enregistrées, sauvegarde locale
+    </string>
+
+    <!-- Error msg when io exception  -->
+    <string name="SyP_ioerror">Erreur de connexion ! Veuillez vérifier votre connexion Internet.
+    </string>
+
+    <!-- ================================================== SyncPreferences == -->
+
+    <!-- Status Group Label -->
+    <string name="sync_SPr_group_status">Statut</string>
+
+    <!-- Sync status subtitle, %s-> status message -->
+    <string name="sync_SPr_status_subtitle">État : %s</string>
+    <!-- Sync Status: log in -->
+    <string name="sync_status_loggedout">Non connecté</string>
+    <!-- Status: ongoing -->
+    <string name="sync_status_ongoing">Synchronisation en cours...</string>
+    <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
+    <string name="sync_status_success">Dernière synchro. :\n%s</string>
+    <!-- Sync Status: failure status (%s -> last attempted sync date) -->
+    <string name="sync_status_failed">Échec sur : %s</string>
+    <!-- Sync Status: error status (%s -> last sync date) -->
+    <string name="sync_status_errors">Synchro avec Erreurs: %s</string>
+    <!-- Sync Status: error subtitle (%s -> last successful sync date) -->
+    <string name="sync_status_failed_subtitle">Dernière synchro. réussie : %s</string>
+    <!-- Sync Status: never sync\'d -->
+    <string name="sync_status_never">Jamais synchronisé !</string>
+
+    <!-- Options Group Label -->
+    <string name="sync_SPr_group_options">Options</string>
+
+    <!-- Preference: Synchronization Interval Title -->
+    <string name="sync_SPr_interval_title">Synchro. en arrière-plan</string>
+    <!-- Preference: Synchronization Interval Description (when disabled) -->
+    <string name="sync_SPr_interval_desc_disabled">Synchronisation en arrière-plan désactivée
+    </string>
+    <!-- Preference: Synchronization Interval Description (%s => setting) -->
+    <string name="sync_SPr_interval_desc">Actuellement configuré sur : %s</string>
+
+    <!-- Preference: Background Wifi Title -->
+    <string name="sync_SPr_bgwifi_title">Paramètre Wifi seul</string>
+    <!-- Preference: Background Wifi Description (enabled) -->
+    <string name="sync_SPr_bgwifi_desc_enabled">La synchronisation en arrière-plan ne s\'effectue
+        uniquement sous Wifi
+    </string>
+    <!-- Preference: Background Wifi Description (disabled) -->
+    <string name="sync_SPr_bgwifi_desc_disabled">La synchronisation en arrière-plan s\'effectuera
+        toujours
+    </string>
+
+    <!-- Actions Group Label  -->
+    <string name="sync_SPr_group_actions">Actions</string>
+
+    <!-- Synchronize Now Button -->
+    <string name="sync_SPr_sync">Synchroniser maintenant</string>
+    <!-- Synchronize Now Button if not logged in-->
+    <string name="sync_SPr_sync_log_in">Se connecter et synchroniser !</string>
+
+    <!-- Sync: Prefix string before logged in identifier -->
+    <string name="sync_SPr_logged_in_prefix">Connecté en tant que :</string>
+
+    <!-- Sync: Last error -->
+    <string name="sync_SPr_last_error">Rapport d\'état</string>
+
+    <!-- Sync: last error click for more -->
+    <string name="sync_SPr_last_error_subtitle">Cliquez pour envoyer un rapport à l\'équipe Astrid
+    </string>
+    <!-- Sync: send error report button -->
+    <string name="sync_SPr_send_report">Envoyer le rapport</string>
+
+    <!-- Sync: Clear Data Title -->
+    <string name="sync_SPr_forget">Se déconnecter</string>
+    <!-- Sync: Clear Data Description -->
+    <string name="sync_SPr_forget_description">Purger toutes les données de synchronisation</string>
+
+    <!-- confirmation dialog for sync log out -->
+    <string name="sync_forget_confirm">Se déconnecter/purger les données de synchronisation ?
+    </string>
+
+    <!-- Sync error: network connectivity problems. %s-> name of sync service-->
+    <string name="sync_error_offline">Un problème de connexion réseau est survenu lors de la
+        dernière synchronisation avec %s. Merci de réessayer plus tard.
+    </string>
+
+    <string-array name="sync_SPr_interval_entries">
+        <!-- sync_SPr_interval_entries: Synchronization Intervals -->
+        <item>désactiver</item>
+        <item>toutes les quinze minutes</item>
+        <item>toutes les trente minutes</item>
+        <item>toutes les heures</item>
+        <item>toutes les trois heures</item>
+        <item>toutes les six heures</item>
+        <item>toutes les douze heures</item>
+        <item>tous les jours</item>
+        <item>tous les trois jours</item>
+        <item>toutes les semaines</item>
+    </string-array>
+
 </resources>
diff --git a/api/res/values-it/strings.xml b/api/res/values-it/strings.xml
index eaed227c2..295caded3 100755
--- a/api/res/values-it/strings.xml
+++ b/api/res/values-it/strings.xml
@@ -4,243 +4,254 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ==================================================== Generic Units == -->
-  
-  <plurals name="DUt_years">
-    <!-- plurals: years -->
-    <item quantity="one">1 Anno</item>
-    <!-- plurals: years -->
-    <item quantity="other">%d Anni</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <!-- plurals: months -->
-    <item quantity="one">1 Mese</item>
-    <!-- plurals: months -->
-    <item quantity="other">%d mesi</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <!-- plurals: days -->
-    <item quantity="one">1 Settimana</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d settimane</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <!-- plurals: days -->
-    <item quantity="one">1 Giorno</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d Giorni</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <!-- plurals: days -->
-    <item quantity="one">1 giorno della settimana</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d giorni della settimana</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <!-- plurals: hours -->
-    <item quantity="one">1 ora</item>
-    <!-- plurals: hours -->
-    <item quantity="other">%d ore</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <!-- plurals: minutes -->
-    <item quantity="one">1 minuto</item>
-    <!-- plurals: minutes -->
-    <item quantity="other">%d minuti</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <!-- plurals: seconds -->
-    <item quantity="one">1 secondo</item>
-    <!-- plurals: seconds -->
-    <item quantity="other">%d secondi</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="one">1 ora</item>
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="other">%d ore</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="one">1 min</item>
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="other">%d min</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="one">1 sec</item>
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="other">%d sec</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <!-- plurals: tasks -->
-    <item quantity="one">1 attività</item>
-    <!-- plurals: tasks -->
-    <item quantity="other">%d attività</item>
-  </plurals>
-  <plurals name="Npeople">
-    <!-- plurals: people -->
-    <item quantity="one">1 persona</item>
-    <!-- plurals: people -->
-    <item quantity="other">%d persone</item>
-  </plurals>
-  
-  <!-- slide 10a, 12c: today -->
-  <string name="today">Oggi</string>
-  
-  <!-- tomorrow -->
-  <string name="tomorrow">Domani</string>
-  
-  <!-- yesterday -->
-  <string name="yesterday">Ieri</string>
-  
-  <!-- slide 12c: tomorrow, abbreviated -->
-  <string name="tmrw">Domani</string>
-  
-  <!-- slide 12c: yesterday, abbreviated -->
-  <string name="yest">Ieri</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-  
-  <!-- confirmation dialog title -->
-  <string name="DLG_confirm_title">Confermi?</string>
-  
-  <!-- question dialog title -->
-  <string name="DLG_question_title">Domanda:</string>
-  
-  <!-- information dialog title -->
-  <string name="DLG_information_title">Informazione</string>
-  
-  <!-- error dialog title -->
-  <string name="DLG_error_title">Errore!</string>
-  
-  <!-- general dialog save-->
-  <string name="DLG_save">Salva</string>
-  
-  <!-- general dialog yes-->
-  <string name="DLG_yes">Sì</string>
-  
-  <!-- general dialog no-->
-  <string name="DLG_no">No</string>
-  
-  <!-- general dialog close-->
-  <string name="DLG_close">Chiudi</string>
-  
-  <!-- general dialog done -->
-  <string name="DLG_done">Completata</string>
-  
-  <!-- error dialog (%s => error message)-->
-  <string name="DLG_error">Oops, sembra che ci sia stato un errore! E\' successo questo:\n\n%s</string>
-  
-  <!-- error dialog (no message indicated)-->
-  <string name="DLG_error_generic">Oops, sembra che ci sia stato un errore!</string>
-  
-  <!-- Progress dialog shown when doing something slow -->
-  <string name="DLG_wait">Attendi...</string>
-
- <!-- ====================================================== SyncProvider == -->
-          
-  <!-- Sync Notification: message when sync service active -->
-  <string name="SyP_progress">Sincronizzando le tue attività...</string>
-  
-  <!-- Sync Notification: toast when sync activated from activity -->
-  <string name="SyP_progress_toast">Sincronizzando...</string>
-  
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="SyP_label">Sincronizza &amp; archivia</string>  
-
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="Sync_now_label">Sync now</string>  
-
-  <!-- Sync label subtitle -->
-  <string name="SyP_summary">Astrid.com, Attività Google, dati salvati, backup locale </string>  
-
-  <!-- Error msg when io exception  -->
-  <string name="SyP_ioerror">Errore di Connessione! Controlla la tua connessione Internet.</string>
-
-  <!-- ================================================== SyncPreferences == -->
-  
-  <!-- Status Group Label -->    
-  <string name="sync_SPr_group_status">Stato</string>
-  
-  <!-- Sync status subtitle, %s-> status message -->
-  <string name="sync_SPr_status_subtitle">Stato: %s</string>
-  <!-- Sync Status: log in -->    
-  <string name="sync_status_loggedout">Non connesso</string>
-  <!-- Status: ongoing -->    
-  <string name="sync_status_ongoing">Sincronizzazione in corso...</string>
-  <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Ultima Sincronizzazione:\n%s</string>
-  <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
-  <string name="sync_status_failed">Fallita Su: %s</string>
-  <!-- Sync Status: error status (%s -> last sync date) -->    
-  <string name="sync_status_errors">Sincronizza con gli errori: %s</string>
-  <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
-  <string name="sync_status_failed_subtitle">Ultima sincronizzazione eseguita con successo in data: %s</string>
-  <!-- Sync Status: never sync\'d -->    
-  <string name="sync_status_never">Mai sincronizzato!</string>
-
-  <!-- Options Group Label -->    
-  <string name="sync_SPr_group_options">Preferenze</string>
-
-  <!-- Preference: Synchronization Interval Title -->    
-  <string name="sync_SPr_interval_title">Sincronizzazione eseguita in background</string>
-  <!-- Preference: Synchronization Interval Description (when disabled) -->
-  <string name="sync_SPr_interval_desc_disabled">La sincronizzazione in background è disattivata</string>    
-  <!-- Preference: Synchronization Interval Description (%s => setting) -->
-  <string name="sync_SPr_interval_desc">Attualmente impostata su: %s</string>
-  
-  <!-- Preference: Background Wifi Title -->  
-  <string name="sync_SPr_bgwifi_title">Unica Impostazione Wifi</string>    
-  <!-- Preference: Background Wifi Description (enabled) -->
-  <string name="sync_SPr_bgwifi_desc_enabled">La sincronizzazione in background avviene solo con rete Wifi attiva</string>    
-  <!-- Preference: Background Wifi Description (disabled) -->
-  <string name="sync_SPr_bgwifi_desc_disabled">La sincronizzazione in background avviene sempre</string>
-  
-  <!-- Actions Group Label  -->
-  <string name="sync_SPr_group_actions">Azioni</string>
-
-  <!-- Synchronize Now Button -->    
-  <string name="sync_SPr_sync">Sincronizza ora</string>
-  <!-- Synchronize Now Button if not logged in-->    
-  <string name="sync_SPr_sync_log_in">Esegui l\'accesso &amp; Sincronizza!</string>
-  
-  <!-- Sync: Prefix string before logged in identifier -->
-  <string name="sync_SPr_logged_in_prefix">Accesso come:</string>
-  
-  <!-- Sync: Last error -->
-  <string name="sync_SPr_last_error">Status report</string>
-  
-  <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">"Clicca  per inviare un rapporto al team Astrid"</string>
-  <!-- Sync: send error report button -->
-  <string name="sync_SPr_send_report">Invia rapporto</string>
-  
-  <!-- Sync: Clear Data Title -->
-  <string name="sync_SPr_forget">Esci</string>
-  <!-- Sync: Clear Data Description -->
-  <string name="sync_SPr_forget_description">Cancella tutti i dati di sincronizzazione</string>
-
-  <!-- confirmation dialog for sync log out -->
-  <string name="sync_forget_confirm">Esci / cancella i file di sincronizzazione?</string>
-  
-  <!-- Sync error: network connectivity problems. %s-> name of sync service-->
-  <string name="sync_error_offline">Problema di connessione alla rete durante l\'ultima sincronizzazione con %s. Riprova dopo.</string>
-  
-  <string-array name="sync_SPr_interval_entries">
-      <!-- sync_SPr_interval_entries: Synchronization Intervals -->
-      <item>disabilita</item>
-      <item>ogni quindici minuti</item>
-      <item>ogni trenta minuti</item>
-      <item>ogni ora</item>
-      <item>ogni tre ore</item>
-      <item>ogni sei ore</item>
-      <item>ogni dodici ore</item>
-      <item>ogni giorno</item>
-      <item>ogni tre giorni</item>
-      <item>Ogni settimana</item>
-  </string-array>    
-    
+<resources>
+
+    <!-- ==================================================== Generic Units == -->
+
+    <plurals name="DUt_years">
+        <!-- plurals: years -->
+        <item quantity="one">1 Anno</item>
+        <!-- plurals: years -->
+        <item quantity="other">%d Anni</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <!-- plurals: months -->
+        <item quantity="one">1 Mese</item>
+        <!-- plurals: months -->
+        <item quantity="other">%d mesi</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <!-- plurals: days -->
+        <item quantity="one">1 Settimana</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d settimane</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <!-- plurals: days -->
+        <item quantity="one">1 Giorno</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d Giorni</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <!-- plurals: days -->
+        <item quantity="one">1 giorno della settimana</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d giorni della settimana</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <!-- plurals: hours -->
+        <item quantity="one">1 ora</item>
+        <!-- plurals: hours -->
+        <item quantity="other">%d ore</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <!-- plurals: minutes -->
+        <item quantity="one">1 minuto</item>
+        <!-- plurals: minutes -->
+        <item quantity="other">%d minuti</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <!-- plurals: seconds -->
+        <item quantity="one">1 secondo</item>
+        <!-- plurals: seconds -->
+        <item quantity="other">%d secondi</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="one">1 ora</item>
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="other">%d ore</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="one">1 min</item>
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="other">%d min</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="one">1 sec</item>
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="other">%d sec</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <!-- plurals: tasks -->
+        <item quantity="one">1 attività</item>
+        <!-- plurals: tasks -->
+        <item quantity="other">%d attività</item>
+    </plurals>
+    <plurals name="Npeople">
+        <!-- plurals: people -->
+        <item quantity="one">1 persona</item>
+        <!-- plurals: people -->
+        <item quantity="other">%d persone</item>
+    </plurals>
+
+    <!-- slide 10a, 12c: today -->
+    <string name="today">Oggi</string>
+
+    <!-- tomorrow -->
+    <string name="tomorrow">Domani</string>
+
+    <!-- yesterday -->
+    <string name="yesterday">Ieri</string>
+
+    <!-- slide 12c: tomorrow, abbreviated -->
+    <string name="tmrw">Domani</string>
+
+    <!-- slide 12c: yesterday, abbreviated -->
+    <string name="yest">Ieri</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- confirmation dialog title -->
+    <string name="DLG_confirm_title">Confermi?</string>
+
+    <!-- question dialog title -->
+    <string name="DLG_question_title">Domanda:</string>
+
+    <!-- information dialog title -->
+    <string name="DLG_information_title">Informazione</string>
+
+    <!-- error dialog title -->
+    <string name="DLG_error_title">Errore!</string>
+
+    <!-- general dialog save-->
+    <string name="DLG_save">Salva</string>
+
+    <!-- general dialog yes-->
+    <string name="DLG_yes">Sì</string>
+
+    <!-- general dialog no-->
+    <string name="DLG_no">No</string>
+
+    <!-- general dialog close-->
+    <string name="DLG_close">Chiudi</string>
+
+    <!-- general dialog done -->
+    <string name="DLG_done">Completata</string>
+
+    <!-- error dialog (%s => error message)-->
+    <string name="DLG_error">Oops, sembra che ci sia stato un errore! E\' successo questo:\n\n%s
+    </string>
+
+    <!-- error dialog (no message indicated)-->
+    <string name="DLG_error_generic">Oops, sembra che ci sia stato un errore!</string>
+
+    <!-- Progress dialog shown when doing something slow -->
+    <string name="DLG_wait">Attendi...</string>
+
+    <!-- ====================================================== SyncProvider == -->
+
+    <!-- Sync Notification: message when sync service active -->
+    <string name="SyP_progress">Sincronizzando le tue attività...</string>
+
+    <!-- Sync Notification: toast when sync activated from activity -->
+    <string name="SyP_progress_toast">Sincronizzando...</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="SyP_label">Sincronizza &amp; archivia</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="Sync_now_label">Sync now</string>
+
+    <!-- Sync label subtitle -->
+    <string name="SyP_summary">Astrid.com, Attività Google, dati salvati, backup locale</string>
+
+    <!-- Error msg when io exception  -->
+    <string name="SyP_ioerror">Errore di Connessione! Controlla la tua connessione Internet.
+    </string>
+
+    <!-- ================================================== SyncPreferences == -->
+
+    <!-- Status Group Label -->
+    <string name="sync_SPr_group_status">Stato</string>
+
+    <!-- Sync status subtitle, %s-> status message -->
+    <string name="sync_SPr_status_subtitle">Stato: %s</string>
+    <!-- Sync Status: log in -->
+    <string name="sync_status_loggedout">Non connesso</string>
+    <!-- Status: ongoing -->
+    <string name="sync_status_ongoing">Sincronizzazione in corso...</string>
+    <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
+    <string name="sync_status_success">Ultima Sincronizzazione:\n%s</string>
+    <!-- Sync Status: failure status (%s -> last attempted sync date) -->
+    <string name="sync_status_failed">Fallita Su: %s</string>
+    <!-- Sync Status: error status (%s -> last sync date) -->
+    <string name="sync_status_errors">Sincronizza con gli errori: %s</string>
+    <!-- Sync Status: error subtitle (%s -> last successful sync date) -->
+    <string name="sync_status_failed_subtitle">Ultima sincronizzazione eseguita con successo in
+        data: %s
+    </string>
+    <!-- Sync Status: never sync\'d -->
+    <string name="sync_status_never">Mai sincronizzato!</string>
+
+    <!-- Options Group Label -->
+    <string name="sync_SPr_group_options">Preferenze</string>
+
+    <!-- Preference: Synchronization Interval Title -->
+    <string name="sync_SPr_interval_title">Sincronizzazione eseguita in background</string>
+    <!-- Preference: Synchronization Interval Description (when disabled) -->
+    <string name="sync_SPr_interval_desc_disabled">La sincronizzazione in background è disattivata
+    </string>
+    <!-- Preference: Synchronization Interval Description (%s => setting) -->
+    <string name="sync_SPr_interval_desc">Attualmente impostata su: %s</string>
+
+    <!-- Preference: Background Wifi Title -->
+    <string name="sync_SPr_bgwifi_title">Unica Impostazione Wifi</string>
+    <!-- Preference: Background Wifi Description (enabled) -->
+    <string name="sync_SPr_bgwifi_desc_enabled">La sincronizzazione in background avviene solo con
+        rete Wifi attiva
+    </string>
+    <!-- Preference: Background Wifi Description (disabled) -->
+    <string name="sync_SPr_bgwifi_desc_disabled">La sincronizzazione in background avviene sempre
+    </string>
+
+    <!-- Actions Group Label  -->
+    <string name="sync_SPr_group_actions">Azioni</string>
+
+    <!-- Synchronize Now Button -->
+    <string name="sync_SPr_sync">Sincronizza ora</string>
+    <!-- Synchronize Now Button if not logged in-->
+    <string name="sync_SPr_sync_log_in">Esegui l\'accesso &amp; Sincronizza!</string>
+
+    <!-- Sync: Prefix string before logged in identifier -->
+    <string name="sync_SPr_logged_in_prefix">Accesso come:</string>
+
+    <!-- Sync: Last error -->
+    <string name="sync_SPr_last_error">Status report</string>
+
+    <!-- Sync: last error click for more -->
+    <string name="sync_SPr_last_error_subtitle">"Clicca per inviare un rapporto al team Astrid"
+    </string>
+    <!-- Sync: send error report button -->
+    <string name="sync_SPr_send_report">Invia rapporto</string>
+
+    <!-- Sync: Clear Data Title -->
+    <string name="sync_SPr_forget">Esci</string>
+    <!-- Sync: Clear Data Description -->
+    <string name="sync_SPr_forget_description">Cancella tutti i dati di sincronizzazione</string>
+
+    <!-- confirmation dialog for sync log out -->
+    <string name="sync_forget_confirm">Esci / cancella i file di sincronizzazione?</string>
+
+    <!-- Sync error: network connectivity problems. %s-> name of sync service-->
+    <string name="sync_error_offline">Problema di connessione alla rete durante l\'ultima
+        sincronizzazione con %s. Riprova dopo.
+    </string>
+
+    <string-array name="sync_SPr_interval_entries">
+        <!-- sync_SPr_interval_entries: Synchronization Intervals -->
+        <item>disabilita</item>
+        <item>ogni quindici minuti</item>
+        <item>ogni trenta minuti</item>
+        <item>ogni ora</item>
+        <item>ogni tre ore</item>
+        <item>ogni sei ore</item>
+        <item>ogni dodici ore</item>
+        <item>ogni giorno</item>
+        <item>ogni tre giorni</item>
+        <item>Ogni settimana</item>
+    </string-array>
+
 </resources>
diff --git a/api/res/values-iw/strings.xml b/api/res/values-iw/strings.xml
index 8cc08ef1c..f5d80f358 100755
--- a/api/res/values-iw/strings.xml
+++ b/api/res/values-iw/strings.xml
@@ -4,243 +4,245 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ==================================================== Generic Units == -->
-  
-  <plurals name="DUt_years">
-    <!-- plurals: years -->
-    <item quantity="one">שנה</item>
-    <!-- plurals: years -->
-    <item quantity="other">%d שנים</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <!-- plurals: months -->
-    <item quantity="one">חודש</item>
-    <!-- plurals: months -->
-    <item quantity="other">%d חודשים</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <!-- plurals: days -->
-    <item quantity="one">שבוע אחד</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d שבועות</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <!-- plurals: days -->
-    <item quantity="one">יום אחד</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d ימים</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <!-- plurals: days -->
-    <item quantity="one">יום עבודה אחד</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d ימי עבודה</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <!-- plurals: hours -->
-    <item quantity="one">שעה אחת</item>
-    <!-- plurals: hours -->
-    <item quantity="other">%d שעות</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <!-- plurals: minutes -->
-    <item quantity="one">דקה אחת</item>
-    <!-- plurals: minutes -->
-    <item quantity="other">%d דקות</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <!-- plurals: seconds -->
-    <item quantity="one">שנייה אחת</item>
-    <!-- plurals: seconds -->
-    <item quantity="other">%d שניות</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="one">שעה</item>
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="other">%d שע\'</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="one">דקה</item>
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="other">%d דק׳</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="one">שנייה</item>
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="other">%d שנ\'</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <!-- plurals: tasks -->
-    <item quantity="one">משימה אחת</item>
-    <!-- plurals: tasks -->
-    <item quantity="other">%d משימות</item>
-  </plurals>
-  <plurals name="Npeople">
-    <!-- plurals: people -->
-    <item quantity="one">שותף אחד</item>
-    <!-- plurals: people -->
-    <item quantity="other">%d שותפים</item>
-  </plurals>
-  
-  <!-- slide 10a, 12c: today -->
-  <string name="today">היום</string>
-  
-  <!-- tomorrow -->
-  <string name="tomorrow">מחר</string>
-  
-  <!-- yesterday -->
-  <string name="yesterday">אתמול</string>
-  
-  <!-- slide 12c: tomorrow, abbreviated -->
-  <string name="tmrw">מחר</string>
-  
-  <!-- slide 12c: yesterday, abbreviated -->
-  <string name="yest">אתמול</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-  
-  <!-- confirmation dialog title -->
-  <string name="DLG_confirm_title">האם לאשר?</string>
-  
-  <!-- question dialog title -->
-  <string name="DLG_question_title">שאלה:</string>
-  
-  <!-- information dialog title -->
-  <string name="DLG_information_title">פרטים</string>
-  
-  <!-- error dialog title -->
-  <string name="DLG_error_title">שגיאה!</string>
-  
-  <!-- general dialog save-->
-  <string name="DLG_save">שמור</string>
-  
-  <!-- general dialog yes-->
-  <string name="DLG_yes">כן</string>
-  
-  <!-- general dialog no-->
-  <string name="DLG_no">לא</string>
-  
-  <!-- general dialog close-->
-  <string name="DLG_close">סגור</string>
-  
-  <!-- general dialog done -->
-  <string name="DLG_done">בוצע</string>
-  
-  <!-- error dialog (%s => error message)-->
-  <string name="DLG_error">אוּפְּס, נראה שארעה שגיאה! הנה מה שקה:\n\n%s</string>
-  
-  <!-- error dialog (no message indicated)-->
-  <string name="DLG_error_generic">אוּפְּס, נראה שארעה שגיאה!</string>
-  
-  <!-- Progress dialog shown when doing something slow -->
-  <string name="DLG_wait">אנא המתן...</string>
-
- <!-- ====================================================== SyncProvider == -->
-          
-  <!-- Sync Notification: message when sync service active -->
-  <string name="SyP_progress">מסנכרן את המשימות שלך...</string>
-  
-  <!-- Sync Notification: toast when sync activated from activity -->
-  <string name="SyP_progress_toast">מסנכרנת...</string>
-  
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="SyP_label">סינכרון וגיבוי</string>  
-
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="Sync_now_label">סנכרני כעת</string>  
-
-  <!-- Sync label subtitle -->
-  <string name="SyP_summary">אתר אסטריד, ״משימות גוגל״, מידע שמור, גיבוי מקומי</string>  
-
-  <!-- Error msg when io exception  -->
-  <string name="SyP_ioerror">שגיאה בחיבור! בדוק את חיבור הַמִּרְשֶׁתֶת שלך</string>
-
-  <!-- ================================================== SyncPreferences == -->
-  
-  <!-- Status Group Label -->    
-  <string name="sync_SPr_group_status">מצב</string>
-  
-  <!-- Sync status subtitle, %s-> status message -->
-  <string name="sync_SPr_status_subtitle">מצב: %s</string>
-  <!-- Sync Status: log in -->    
-  <string name="sync_status_loggedout">לא מחובר</string>
-  <!-- Status: ongoing -->    
-  <string name="sync_status_ongoing">הסינכרון מתבצע</string>
-  <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">סנכרון אחרון:\n%s</string>
-  <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
-  <string name="sync_status_failed">נכשל ב: %s</string>
-  <!-- Sync Status: error status (%s -> last sync date) -->    
-  <string name="sync_status_errors">סנכרון עם שגיאות: %s</string>
-  <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
-  <string name="sync_status_failed_subtitle">סנכרון מוצלח אחרון: %s</string>
-  <!-- Sync Status: never sync\'d -->    
-  <string name="sync_status_never">לעולם לא סונכרן!</string>
-
-  <!-- Options Group Label -->    
-  <string name="sync_SPr_group_options">אפשרויות</string>
-
-  <!-- Preference: Synchronization Interval Title -->    
-  <string name="sync_SPr_interval_title">סנכרון ברקע</string>
-  <!-- Preference: Synchronization Interval Description (when disabled) -->
-  <string name="sync_SPr_interval_desc_disabled">סנכרון ברקע אינו מופעל</string>    
-  <!-- Preference: Synchronization Interval Description (%s => setting) -->
-  <string name="sync_SPr_interval_desc">כרגע מוגדר ל: %s</string>
-  
-  <!-- Preference: Background Wifi Title -->  
-  <string name="sync_SPr_bgwifi_title">הגדרת WiFi בלבד</string>    
-  <!-- Preference: Background Wifi Description (enabled) -->
-  <string name="sync_SPr_bgwifi_desc_enabled">סנכרון רקע מתרחש רק כאשר על WiFi</string>    
-  <!-- Preference: Background Wifi Description (disabled) -->
-  <string name="sync_SPr_bgwifi_desc_disabled">סנכרון רקע יתבצע תמיד</string>
-  
-  <!-- Actions Group Label  -->
-  <string name="sync_SPr_group_actions">פעולות</string>
-
-  <!-- Synchronize Now Button -->    
-  <string name="sync_SPr_sync">מסנכרן כעת</string>
-  <!-- Synchronize Now Button if not logged in-->    
-  <string name="sync_SPr_sync_log_in"> התחבר וסנכרן!</string>
-  
-  <!-- Sync: Prefix string before logged in identifier -->
-  <string name="sync_SPr_logged_in_prefix">מחובר לחשבון בתור:</string>
-  
-  <!-- Sync: Last error -->
-  <string name="sync_SPr_last_error">דו"ח מצב</string>
-  
-  <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">הקלק כדי לשלוח דוח לצוות של אסטריד</string>
-  <!-- Sync: send error report button -->
-  <string name="sync_SPr_send_report">שלח דו"ח</string>
-  
-  <!-- Sync: Clear Data Title -->
-  <string name="sync_SPr_forget">התנתק</string>
-  <!-- Sync: Clear Data Description -->
-  <string name="sync_SPr_forget_description">מסיר את כל נתוני הסנכרון</string>
-
-  <!-- confirmation dialog for sync log out -->
-  <string name="sync_forget_confirm">צא מהחשבון \\ הסר נתוני סנכרון?</string>
-  
-  <!-- Sync error: network connectivity problems. %s-> name of sync service-->
-  <string name="sync_error_offline">נתקלתי בבעית חיבור לרשת בזמן הסינכרון האחרון עם %s. אנא נסה מאוחר יותר.</string>
-  
-  <string-array name="sync_SPr_interval_entries">
-      <!-- sync_SPr_interval_entries: Synchronization Intervals -->
-      <item>מִנְעִי</item>
-      <item>כל רבע שעה</item>
-      <item>כל חצי שעה</item>
-      <item>כל שעה</item>
-      <item>כל שלוש שעות</item>
-      <item>כל שש שעות</item>
-      <item>כל שתים עשרה שעות</item>
-      <item>כל יום</item>
-      <item>כל שלושה ימים</item>
-      <item>כל שבוע</item>
-  </string-array>    
-    
+<resources>
+
+    <!-- ==================================================== Generic Units == -->
+
+    <plurals name="DUt_years">
+        <!-- plurals: years -->
+        <item quantity="one">שנה</item>
+        <!-- plurals: years -->
+        <item quantity="other">%d שנים</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <!-- plurals: months -->
+        <item quantity="one">חודש</item>
+        <!-- plurals: months -->
+        <item quantity="other">%d חודשים</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <!-- plurals: days -->
+        <item quantity="one">שבוע אחד</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d שבועות</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <!-- plurals: days -->
+        <item quantity="one">יום אחד</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d ימים</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <!-- plurals: days -->
+        <item quantity="one">יום עבודה אחד</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d ימי עבודה</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <!-- plurals: hours -->
+        <item quantity="one">שעה אחת</item>
+        <!-- plurals: hours -->
+        <item quantity="other">%d שעות</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <!-- plurals: minutes -->
+        <item quantity="one">דקה אחת</item>
+        <!-- plurals: minutes -->
+        <item quantity="other">%d דקות</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <!-- plurals: seconds -->
+        <item quantity="one">שנייה אחת</item>
+        <!-- plurals: seconds -->
+        <item quantity="other">%d שניות</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="one">שעה</item>
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="other">%d שע\'</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="one">דקה</item>
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="other">%d דק׳</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="one">שנייה</item>
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="other">%d שנ\'</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <!-- plurals: tasks -->
+        <item quantity="one">משימה אחת</item>
+        <!-- plurals: tasks -->
+        <item quantity="other">%d משימות</item>
+    </plurals>
+    <plurals name="Npeople">
+        <!-- plurals: people -->
+        <item quantity="one">שותף אחד</item>
+        <!-- plurals: people -->
+        <item quantity="other">%d שותפים</item>
+    </plurals>
+
+    <!-- slide 10a, 12c: today -->
+    <string name="today">היום</string>
+
+    <!-- tomorrow -->
+    <string name="tomorrow">מחר</string>
+
+    <!-- yesterday -->
+    <string name="yesterday">אתמול</string>
+
+    <!-- slide 12c: tomorrow, abbreviated -->
+    <string name="tmrw">מחר</string>
+
+    <!-- slide 12c: yesterday, abbreviated -->
+    <string name="yest">אתמול</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- confirmation dialog title -->
+    <string name="DLG_confirm_title">האם לאשר?</string>
+
+    <!-- question dialog title -->
+    <string name="DLG_question_title">שאלה:</string>
+
+    <!-- information dialog title -->
+    <string name="DLG_information_title">פרטים</string>
+
+    <!-- error dialog title -->
+    <string name="DLG_error_title">שגיאה!</string>
+
+    <!-- general dialog save-->
+    <string name="DLG_save">שמור</string>
+
+    <!-- general dialog yes-->
+    <string name="DLG_yes">כן</string>
+
+    <!-- general dialog no-->
+    <string name="DLG_no">לא</string>
+
+    <!-- general dialog close-->
+    <string name="DLG_close">סגור</string>
+
+    <!-- general dialog done -->
+    <string name="DLG_done">בוצע</string>
+
+    <!-- error dialog (%s => error message)-->
+    <string name="DLG_error">אוּפְּס, נראה שארעה שגיאה! הנה מה שקה:\n\n%s</string>
+
+    <!-- error dialog (no message indicated)-->
+    <string name="DLG_error_generic">אוּפְּס, נראה שארעה שגיאה!</string>
+
+    <!-- Progress dialog shown when doing something slow -->
+    <string name="DLG_wait">אנא המתן...</string>
+
+    <!-- ====================================================== SyncProvider == -->
+
+    <!-- Sync Notification: message when sync service active -->
+    <string name="SyP_progress">מסנכרן את המשימות שלך...</string>
+
+    <!-- Sync Notification: toast when sync activated from activity -->
+    <string name="SyP_progress_toast">מסנכרנת...</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="SyP_label">סינכרון וגיבוי</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="Sync_now_label">סנכרני כעת</string>
+
+    <!-- Sync label subtitle -->
+    <string name="SyP_summary">אתר אסטריד, ״משימות גוגל״, מידע שמור, גיבוי מקומי</string>
+
+    <!-- Error msg when io exception  -->
+    <string name="SyP_ioerror">שגיאה בחיבור! בדוק את חיבור הַמִּרְשֶׁתֶת שלך</string>
+
+    <!-- ================================================== SyncPreferences == -->
+
+    <!-- Status Group Label -->
+    <string name="sync_SPr_group_status">מצב</string>
+
+    <!-- Sync status subtitle, %s-> status message -->
+    <string name="sync_SPr_status_subtitle">מצב: %s</string>
+    <!-- Sync Status: log in -->
+    <string name="sync_status_loggedout">לא מחובר</string>
+    <!-- Status: ongoing -->
+    <string name="sync_status_ongoing">הסינכרון מתבצע</string>
+    <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
+    <string name="sync_status_success">סנכרון אחרון:\n%s</string>
+    <!-- Sync Status: failure status (%s -> last attempted sync date) -->
+    <string name="sync_status_failed">נכשל ב: %s</string>
+    <!-- Sync Status: error status (%s -> last sync date) -->
+    <string name="sync_status_errors">סנכרון עם שגיאות: %s</string>
+    <!-- Sync Status: error subtitle (%s -> last successful sync date) -->
+    <string name="sync_status_failed_subtitle">סנכרון מוצלח אחרון: %s</string>
+    <!-- Sync Status: never sync\'d -->
+    <string name="sync_status_never">לעולם לא סונכרן!</string>
+
+    <!-- Options Group Label -->
+    <string name="sync_SPr_group_options">אפשרויות</string>
+
+    <!-- Preference: Synchronization Interval Title -->
+    <string name="sync_SPr_interval_title">סנכרון ברקע</string>
+    <!-- Preference: Synchronization Interval Description (when disabled) -->
+    <string name="sync_SPr_interval_desc_disabled">סנכרון ברקע אינו מופעל</string>
+    <!-- Preference: Synchronization Interval Description (%s => setting) -->
+    <string name="sync_SPr_interval_desc">כרגע מוגדר ל: %s</string>
+
+    <!-- Preference: Background Wifi Title -->
+    <string name="sync_SPr_bgwifi_title">הגדרת WiFi בלבד</string>
+    <!-- Preference: Background Wifi Description (enabled) -->
+    <string name="sync_SPr_bgwifi_desc_enabled">סנכרון רקע מתרחש רק כאשר על WiFi</string>
+    <!-- Preference: Background Wifi Description (disabled) -->
+    <string name="sync_SPr_bgwifi_desc_disabled">סנכרון רקע יתבצע תמיד</string>
+
+    <!-- Actions Group Label  -->
+    <string name="sync_SPr_group_actions">פעולות</string>
+
+    <!-- Synchronize Now Button -->
+    <string name="sync_SPr_sync">מסנכרן כעת</string>
+    <!-- Synchronize Now Button if not logged in-->
+    <string name="sync_SPr_sync_log_in">התחבר וסנכרן!</string>
+
+    <!-- Sync: Prefix string before logged in identifier -->
+    <string name="sync_SPr_logged_in_prefix">מחובר לחשבון בתור:</string>
+
+    <!-- Sync: Last error -->
+    <string name="sync_SPr_last_error">דו"ח מצב</string>
+
+    <!-- Sync: last error click for more -->
+    <string name="sync_SPr_last_error_subtitle">הקלק כדי לשלוח דוח לצוות של אסטריד</string>
+    <!-- Sync: send error report button -->
+    <string name="sync_SPr_send_report">שלח דו"ח</string>
+
+    <!-- Sync: Clear Data Title -->
+    <string name="sync_SPr_forget">התנתק</string>
+    <!-- Sync: Clear Data Description -->
+    <string name="sync_SPr_forget_description">מסיר את כל נתוני הסנכרון</string>
+
+    <!-- confirmation dialog for sync log out -->
+    <string name="sync_forget_confirm">צא מהחשבון \\ הסר נתוני סנכרון?</string>
+
+    <!-- Sync error: network connectivity problems. %s-> name of sync service-->
+    <string name="sync_error_offline">נתקלתי בבעית חיבור לרשת בזמן הסינכרון האחרון עם %s. אנא נסה
+        מאוחר יותר.
+    </string>
+
+    <string-array name="sync_SPr_interval_entries">
+        <!-- sync_SPr_interval_entries: Synchronization Intervals -->
+        <item>מִנְעִי</item>
+        <item>כל רבע שעה</item>
+        <item>כל חצי שעה</item>
+        <item>כל שעה</item>
+        <item>כל שלוש שעות</item>
+        <item>כל שש שעות</item>
+        <item>כל שתים עשרה שעות</item>
+        <item>כל יום</item>
+        <item>כל שלושה ימים</item>
+        <item>כל שבוע</item>
+    </string-array>
+
 </resources>
diff --git a/api/res/values-ja/strings.xml b/api/res/values-ja/strings.xml
index 5c76a6b6c..77bf8f013 100755
--- a/api/res/values-ja/strings.xml
+++ b/api/res/values-ja/strings.xml
@@ -4,244 +4,247 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ==================================================== Generic Units == -->
-  
-  <plurals name="DUt_years">
-    <!-- plurals: years -->
-    <item quantity="one">1年</item>
-    <!-- plurals: years -->
-    <item quantity="other">%d 年</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <!-- plurals: months -->
-    <item quantity="one">1か月</item>
-    <!-- plurals: months -->
-    <item quantity="other">%d か月</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <!-- plurals: days -->
-    <item quantity="one">1週間</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d 週間</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <!-- plurals: days -->
-    <item quantity="one">1 日</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d 日</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <!-- plurals: days -->
-    <item quantity="one">1 Weekday</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d Weekdays</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <!-- plurals: hours -->
-    <item quantity="one">1 時間</item>
-    <!-- plurals: hours -->
-    <item quantity="other">%d 時間</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <!-- plurals: minutes -->
-    <item quantity="one">1 分</item>
-    <!-- plurals: minutes -->
-    <item quantity="other">%d 分</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <!-- plurals: seconds -->
-    <item quantity="one">1 秒</item>
-    <!-- plurals: seconds -->
-    <item quantity="other">%d 秒</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="one">1 時間</item>
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="other">%d 時間</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="one">1 分</item>
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="other">%d 分</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="one">1 秒</item>
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="other">%d 秒</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <!-- plurals: tasks -->
-    <item quantity="one">タスク 1 件</item>
-    <!-- plurals: tasks -->
-    <item quantity="other">タスク %d 件</item>
-  </plurals>
-  <plurals name="Npeople">
-    <!-- plurals: people -->
-    <item quantity="one">1人</item>
-    <!-- plurals: people -->
-    <item quantity="other">%d人</item>
-  </plurals>
-  
-  <!-- slide 10a, 12c: today -->
-  <string name="today">Today</string>
-  
-  <!-- tomorrow -->
-  <string name="tomorrow">Tomorrow</string>
-  
-  <!-- yesterday -->
-  <string name="yesterday">昨日</string>
-  
-  <!-- slide 12c: tomorrow, abbreviated -->
-  <string name="tmrw">明日</string>
-  
-  <!-- slide 12c: yesterday, abbreviated -->
-  <string name="yest">昨日</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-  
-  <!-- confirmation dialog title -->
-  <string name="DLG_confirm_title">確認</string>
-  
-  <!-- question dialog title -->
-  <string name="DLG_question_title">確認</string>
-  
-  <!-- information dialog title -->
-  <string name="DLG_information_title">インフォメーション</string>
-  
-  <!-- error dialog title -->
-  <string name="DLG_error_title">エラー</string>
-  
-  <!-- general dialog save-->
-  <string name="DLG_save">保存</string>
-  
-  <!-- general dialog yes-->
-  <string name="DLG_yes">はい</string>
-  
-  <!-- general dialog no-->
-  <string name="DLG_no">いいえ</string>
-  
-  <!-- general dialog close-->
-  <string name="DLG_close">閉じる</string>
-  
-  <!-- general dialog done -->
-  <string name="DLG_done">完了</string>
-  
-  <!-- error dialog (%s => error message)-->
-  <string name="DLG_error">Oops, looks like an error occurred! Here\'s what happened:\n\n%s</string>
-  
-  <!-- error dialog (no message indicated)-->
-  <string name="DLG_error_generic">Oops, looks like an error occurred!</string>
-  
-  <!-- Progress dialog shown when doing something slow -->
-  <string name="DLG_wait">お待ちください</string>
-
- <!-- ====================================================== SyncProvider == -->
-          
-  <!-- Sync Notification: message when sync service active -->
-  <string name="SyP_progress">タスクの同期中...</string>
-  
-  <!-- Sync Notification: toast when sync activated from activity -->
-  <string name="SyP_progress_toast">同期中...</string>
-  
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="SyP_label">同期</string>  
-
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="Sync_now_label">Sync now</string>  
-
-  <!-- Sync label subtitle -->
-  <string name="SyP_summary">Astrid.com, Google Tasks, saved data, local backup</string>  
-
-  <!-- Error msg when io exception  -->
-  <string name="SyP_ioerror">接続エラー！インターネットに接続できるか確認してください。</string>
-
-  <!-- ================================================== SyncPreferences == -->
-  
-  <!-- Status Group Label -->    
-  <string name="sync_SPr_group_status">状況</string>
-  
-  <!-- Sync status subtitle, %s-> status message -->
-  <string name="sync_SPr_status_subtitle">Status: %s</string>
-  <!-- Sync Status: log in -->    
-  <string name="sync_status_loggedout">Not logged in</string>
-  <!-- Status: ongoing -->    
-  <string name="sync_status_ongoing">同期中</string>
-  <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">前回の同期:\n%s</string>
-  <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
-  <string name="sync_status_failed">失敗: %s</string>
-  <!-- Sync Status: error status (%s -> last sync date) -->    
-  <string name="sync_status_errors">Sync w/ errors: %s</string>
-  <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
-  <string name="sync_status_failed_subtitle">最後の同期: %s</string>
-  <!-- Sync Status: never sync\'d -->    
-  <string name="sync_status_never">同期していません</string>
-
-  <!-- Options Group Label -->    
-  <string name="sync_SPr_group_options">オプション</string>
-
-  <!-- Preference: Synchronization Interval Title -->    
-  <string name="sync_SPr_interval_title">バックグラウンド同期</string>
-  <!-- Preference: Synchronization Interval Description (when disabled) -->
-  <string name="sync_SPr_interval_desc_disabled">バックグラウンド同期は無効になっています</string>    
-  <!-- Preference: Synchronization Interval Description (%s => setting) -->
-  <string name="sync_SPr_interval_desc">現在の設定: %s</string>
-  
-  <!-- Preference: Background Wifi Title -->  
-  <string name="sync_SPr_bgwifi_title">Wi-Fi のみ</string>    
-  <!-- Preference: Background Wifi Description (enabled) -->
-  <string name="sync_SPr_bgwifi_desc_enabled">Wi-Fi が有効なときだけバックグラウンドで同期する</string>    
-  <!-- Preference: Background Wifi Description (disabled) -->
-  <string name="sync_SPr_bgwifi_desc_disabled">Background synchronization will always occur</string>
-  
-  <!-- Actions Group Label  -->
-  <string name="sync_SPr_group_actions">アクション</string>
-
-  <!-- Synchronize Now Button -->    
-  <string name="sync_SPr_sync">Synchronize now</string>
-  <!-- Synchronize Now Button if not logged in-->    
-  <string name="sync_SPr_sync_log_in">ログインと同期</string>
-  
-  <!-- Sync: Prefix string before logged in identifier -->
-  <string name="sync_SPr_logged_in_prefix">ログインアカウント：</string>
-  
-  <!-- Sync: Last error -->
-  <string name="sync_SPr_last_error">Status report</string>
-  
-  <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Click to send a report to the Astrid team</string>
-  <!-- Sync: send error report button -->
-  <string name="sync_SPr_send_report">Send report</string>
-  
-  <!-- Sync: Clear Data Title -->
-  <string name="sync_SPr_forget">ログアウト</string>
-  <!-- Sync: Clear Data Description -->
-  <string name="sync_SPr_forget_description">すべての同期データを消去します</string>
-
-  <!-- confirmation dialog for sync log out -->
-  <string name="sync_forget_confirm">ログアウトと同期データを消去しますか?</string>
-  
-  <!-- Sync error: network connectivity problems. %s-> name of sync service-->
-  <string name="sync_error_offline">There was a problem connecting to the network
-      during the last sync with %s. Please try again later.</string>
-  
-  <string-array name="sync_SPr_interval_entries">
-      <!-- sync_SPr_interval_entries: Synchronization Intervals -->
-      <item>無効</item>
-      <item>15分毎</item>
-      <item>30分毎</item>
-      <item>1時間毎</item>
-      <item>3時間毎</item>
-      <item>6時間毎</item>
-      <item>12時間毎</item>
-      <item>毎日</item>
-      <item>3日に一度</item>
-      <item>毎週</item>
-  </string-array>    
-    
+<resources>
+
+    <!-- ==================================================== Generic Units == -->
+
+    <plurals name="DUt_years">
+        <!-- plurals: years -->
+        <item quantity="one">1年</item>
+        <!-- plurals: years -->
+        <item quantity="other">%d 年</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <!-- plurals: months -->
+        <item quantity="one">1か月</item>
+        <!-- plurals: months -->
+        <item quantity="other">%d か月</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <!-- plurals: days -->
+        <item quantity="one">1週間</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d 週間</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <!-- plurals: days -->
+        <item quantity="one">1 日</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d 日</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <!-- plurals: days -->
+        <item quantity="one">1 Weekday</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d Weekdays</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <!-- plurals: hours -->
+        <item quantity="one">1 時間</item>
+        <!-- plurals: hours -->
+        <item quantity="other">%d 時間</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <!-- plurals: minutes -->
+        <item quantity="one">1 分</item>
+        <!-- plurals: minutes -->
+        <item quantity="other">%d 分</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <!-- plurals: seconds -->
+        <item quantity="one">1 秒</item>
+        <!-- plurals: seconds -->
+        <item quantity="other">%d 秒</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="one">1 時間</item>
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="other">%d 時間</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="one">1 分</item>
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="other">%d 分</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="one">1 秒</item>
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="other">%d 秒</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <!-- plurals: tasks -->
+        <item quantity="one">タスク 1 件</item>
+        <!-- plurals: tasks -->
+        <item quantity="other">タスク %d 件</item>
+    </plurals>
+    <plurals name="Npeople">
+        <!-- plurals: people -->
+        <item quantity="one">1人</item>
+        <!-- plurals: people -->
+        <item quantity="other">%d人</item>
+    </plurals>
+
+    <!-- slide 10a, 12c: today -->
+    <string name="today">Today</string>
+
+    <!-- tomorrow -->
+    <string name="tomorrow">Tomorrow</string>
+
+    <!-- yesterday -->
+    <string name="yesterday">昨日</string>
+
+    <!-- slide 12c: tomorrow, abbreviated -->
+    <string name="tmrw">明日</string>
+
+    <!-- slide 12c: yesterday, abbreviated -->
+    <string name="yest">昨日</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- confirmation dialog title -->
+    <string name="DLG_confirm_title">確認</string>
+
+    <!-- question dialog title -->
+    <string name="DLG_question_title">確認</string>
+
+    <!-- information dialog title -->
+    <string name="DLG_information_title">インフォメーション</string>
+
+    <!-- error dialog title -->
+    <string name="DLG_error_title">エラー</string>
+
+    <!-- general dialog save-->
+    <string name="DLG_save">保存</string>
+
+    <!-- general dialog yes-->
+    <string name="DLG_yes">はい</string>
+
+    <!-- general dialog no-->
+    <string name="DLG_no">いいえ</string>
+
+    <!-- general dialog close-->
+    <string name="DLG_close">閉じる</string>
+
+    <!-- general dialog done -->
+    <string name="DLG_done">完了</string>
+
+    <!-- error dialog (%s => error message)-->
+    <string name="DLG_error">Oops, looks like an error occurred! Here\'s what happened:\n\n%s
+    </string>
+
+    <!-- error dialog (no message indicated)-->
+    <string name="DLG_error_generic">Oops, looks like an error occurred!</string>
+
+    <!-- Progress dialog shown when doing something slow -->
+    <string name="DLG_wait">お待ちください</string>
+
+    <!-- ====================================================== SyncProvider == -->
+
+    <!-- Sync Notification: message when sync service active -->
+    <string name="SyP_progress">タスクの同期中...</string>
+
+    <!-- Sync Notification: toast when sync activated from activity -->
+    <string name="SyP_progress_toast">同期中...</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="SyP_label">同期</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="Sync_now_label">Sync now</string>
+
+    <!-- Sync label subtitle -->
+    <string name="SyP_summary">Astrid.com, Google Tasks, saved data, local backup</string>
+
+    <!-- Error msg when io exception  -->
+    <string name="SyP_ioerror">接続エラー！インターネットに接続できるか確認してください。</string>
+
+    <!-- ================================================== SyncPreferences == -->
+
+    <!-- Status Group Label -->
+    <string name="sync_SPr_group_status">状況</string>
+
+    <!-- Sync status subtitle, %s-> status message -->
+    <string name="sync_SPr_status_subtitle">Status: %s</string>
+    <!-- Sync Status: log in -->
+    <string name="sync_status_loggedout">Not logged in</string>
+    <!-- Status: ongoing -->
+    <string name="sync_status_ongoing">同期中</string>
+    <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
+    <string name="sync_status_success">前回の同期:\n%s</string>
+    <!-- Sync Status: failure status (%s -> last attempted sync date) -->
+    <string name="sync_status_failed">失敗: %s</string>
+    <!-- Sync Status: error status (%s -> last sync date) -->
+    <string name="sync_status_errors">Sync w/ errors: %s</string>
+    <!-- Sync Status: error subtitle (%s -> last successful sync date) -->
+    <string name="sync_status_failed_subtitle">最後の同期: %s</string>
+    <!-- Sync Status: never sync\'d -->
+    <string name="sync_status_never">同期していません</string>
+
+    <!-- Options Group Label -->
+    <string name="sync_SPr_group_options">オプション</string>
+
+    <!-- Preference: Synchronization Interval Title -->
+    <string name="sync_SPr_interval_title">バックグラウンド同期</string>
+    <!-- Preference: Synchronization Interval Description (when disabled) -->
+    <string name="sync_SPr_interval_desc_disabled">バックグラウンド同期は無効になっています</string>
+    <!-- Preference: Synchronization Interval Description (%s => setting) -->
+    <string name="sync_SPr_interval_desc">現在の設定: %s</string>
+
+    <!-- Preference: Background Wifi Title -->
+    <string name="sync_SPr_bgwifi_title">Wi-Fi のみ</string>
+    <!-- Preference: Background Wifi Description (enabled) -->
+    <string name="sync_SPr_bgwifi_desc_enabled">Wi-Fi が有効なときだけバックグラウンドで同期する</string>
+    <!-- Preference: Background Wifi Description (disabled) -->
+    <string name="sync_SPr_bgwifi_desc_disabled">Background synchronization will always occur
+    </string>
+
+    <!-- Actions Group Label  -->
+    <string name="sync_SPr_group_actions">アクション</string>
+
+    <!-- Synchronize Now Button -->
+    <string name="sync_SPr_sync">Synchronize now</string>
+    <!-- Synchronize Now Button if not logged in-->
+    <string name="sync_SPr_sync_log_in">ログインと同期</string>
+
+    <!-- Sync: Prefix string before logged in identifier -->
+    <string name="sync_SPr_logged_in_prefix">ログインアカウント：</string>
+
+    <!-- Sync: Last error -->
+    <string name="sync_SPr_last_error">Status report</string>
+
+    <!-- Sync: last error click for more -->
+    <string name="sync_SPr_last_error_subtitle">Click to send a report to the Astrid team</string>
+    <!-- Sync: send error report button -->
+    <string name="sync_SPr_send_report">Send report</string>
+
+    <!-- Sync: Clear Data Title -->
+    <string name="sync_SPr_forget">ログアウト</string>
+    <!-- Sync: Clear Data Description -->
+    <string name="sync_SPr_forget_description">すべての同期データを消去します</string>
+
+    <!-- confirmation dialog for sync log out -->
+    <string name="sync_forget_confirm">ログアウトと同期データを消去しますか?</string>
+
+    <!-- Sync error: network connectivity problems. %s-> name of sync service-->
+    <string name="sync_error_offline">There was a problem connecting to the network
+        during the last sync with %s. Please try again later.
+    </string>
+
+    <string-array name="sync_SPr_interval_entries">
+        <!-- sync_SPr_interval_entries: Synchronization Intervals -->
+        <item>無効</item>
+        <item>15分毎</item>
+        <item>30分毎</item>
+        <item>1時間毎</item>
+        <item>3時間毎</item>
+        <item>6時間毎</item>
+        <item>12時間毎</item>
+        <item>毎日</item>
+        <item>3日に一度</item>
+        <item>毎週</item>
+    </string-array>
+
 </resources>
diff --git a/api/res/values-ko/strings.xml b/api/res/values-ko/strings.xml
index f1164f5ad..873e5888a 100755
--- a/api/res/values-ko/strings.xml
+++ b/api/res/values-ko/strings.xml
@@ -4,243 +4,243 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ==================================================== Generic Units == -->
-  
-  <plurals name="DUt_years">
-    <!-- plurals: years -->
-    <item quantity="one">1년</item>
-    <!-- plurals: years -->
-    <item quantity="other">%d년</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <!-- plurals: months -->
-    <item quantity="one">1개월</item>
-    <!-- plurals: months -->
-    <item quantity="other">%d개월</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <!-- plurals: days -->
-    <item quantity="one">1주</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d주</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <!-- plurals: days -->
-    <item quantity="one">1일</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d일</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <!-- plurals: days -->
-    <item quantity="one">주중 1일</item>
-    <!-- plurals: days -->
-    <item quantity="other">주중 %d일</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <!-- plurals: hours -->
-    <item quantity="one">1시간</item>
-    <!-- plurals: hours -->
-    <item quantity="other">%d시간</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <!-- plurals: minutes -->
-    <item quantity="one">1분</item>
-    <!-- plurals: minutes -->
-    <item quantity="other">%d분</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <!-- plurals: seconds -->
-    <item quantity="one">1초</item>
-    <!-- plurals: seconds -->
-    <item quantity="other">%d초</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="one">1시간</item>
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="other">%d시간</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="one">1분</item>
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="other">%d분</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="one">1초</item>
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="other">%d초</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <!-- plurals: tasks -->
-    <item quantity="one">1 일정</item>
-    <!-- plurals: tasks -->
-    <item quantity="other">%d 일정</item>
-  </plurals>
-  <plurals name="Npeople">
-    <!-- plurals: people -->
-    <item quantity="one">1 사람</item>
-    <!-- plurals: people -->
-    <item quantity="other">%d 사람</item>
-  </plurals>
-  
-  <!-- slide 10a, 12c: today -->
-  <string name="today">오늘</string>
-  
-  <!-- tomorrow -->
-  <string name="tomorrow">내일</string>
-  
-  <!-- yesterday -->
-  <string name="yesterday">어제</string>
-  
-  <!-- slide 12c: tomorrow, abbreviated -->
-  <string name="tmrw">내일</string>
-  
-  <!-- slide 12c: yesterday, abbreviated -->
-  <string name="yest">어제</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-  
-  <!-- confirmation dialog title -->
-  <string name="DLG_confirm_title">확인?</string>
-  
-  <!-- question dialog title -->
-  <string name="DLG_question_title">질문:</string>
-  
-  <!-- information dialog title -->
-  <string name="DLG_information_title">정보</string>
-  
-  <!-- error dialog title -->
-  <string name="DLG_error_title">에러!</string>
-  
-  <!-- general dialog save-->
-  <string name="DLG_save">저장</string>
-  
-  <!-- general dialog yes-->
-  <string name="DLG_yes">예</string>
-  
-  <!-- general dialog no-->
-  <string name="DLG_no">아니요</string>
-  
-  <!-- general dialog close-->
-  <string name="DLG_close">닫기</string>
-  
-  <!-- general dialog done -->
-  <string name="DLG_done">마침</string>
-  
-  <!-- error dialog (%s => error message)-->
-  <string name="DLG_error">에러가 발생한 것 같습니다! 발생한 에러는 다음과 같습니다:\n\n%s</string>
-  
-  <!-- error dialog (no message indicated)-->
-  <string name="DLG_error_generic">에러가 발생한 것 같습니다!</string>
-  
-  <!-- Progress dialog shown when doing something slow -->
-  <string name="DLG_wait">잠시 기다리세요...</string>
-
- <!-- ====================================================== SyncProvider == -->
-          
-  <!-- Sync Notification: message when sync service active -->
-  <string name="SyP_progress">일정을 동기화 중입니다...</string>
-  
-  <!-- Sync Notification: toast when sync activated from activity -->
-  <string name="SyP_progress_toast">동기화하는 중...</string>
-  
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="SyP_label">동기화 &amp; 백업</string>  
-
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="Sync_now_label">지금 동기화하기</string>  
-
-  <!-- Sync label subtitle -->
-  <string name="SyP_summary">Astrid.com, 구글 일정, 저장한 자료, 로컬 백업</string>  
-
-  <!-- Error msg when io exception  -->
-  <string name="SyP_ioerror">연결 오류! 인터넷 연결을 확인하세요.</string>
-
-  <!-- ================================================== SyncPreferences == -->
-  
-  <!-- Status Group Label -->    
-  <string name="sync_SPr_group_status">상태</string>
-  
-  <!-- Sync status subtitle, %s-> status message -->
-  <string name="sync_SPr_status_subtitle">상태: %s</string>
-  <!-- Sync Status: log in -->    
-  <string name="sync_status_loggedout">로그인 안 됨</string>
-  <!-- Status: ongoing -->    
-  <string name="sync_status_ongoing">동기화 진행 중...</string>
-  <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">마지막 동기화: \n%s</string>
-  <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
-  <string name="sync_status_failed">실패: %s</string>
-  <!-- Sync Status: error status (%s -> last sync date) -->    
-  <string name="sync_status_errors">동기화 중 에러: %s</string>
-  <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
-  <string name="sync_status_failed_subtitle">마지막 동기화 성공시간: %s</string>
-  <!-- Sync Status: never sync\'d -->    
-  <string name="sync_status_never">동기화 한 적이 없습니다!</string>
-
-  <!-- Options Group Label -->    
-  <string name="sync_SPr_group_options">설정</string>
-
-  <!-- Preference: Synchronization Interval Title -->    
-  <string name="sync_SPr_interval_title">백그라운드 동기화</string>
-  <!-- Preference: Synchronization Interval Description (when disabled) -->
-  <string name="sync_SPr_interval_desc_disabled">백그라운드 동기화를 사용하지 않습니다.</string>    
-  <!-- Preference: Synchronization Interval Description (%s => setting) -->
-  <string name="sync_SPr_interval_desc">현재 설정: %s</string>
-  
-  <!-- Preference: Background Wifi Title -->  
-  <string name="sync_SPr_bgwifi_title">WiFi 설정</string>    
-  <!-- Preference: Background Wifi Description (enabled) -->
-  <string name="sync_SPr_bgwifi_desc_enabled">백그라운드 동기화는 WiFi 지역에서만 작동합니다.</string>    
-  <!-- Preference: Background Wifi Description (disabled) -->
-  <string name="sync_SPr_bgwifi_desc_disabled">백그라운드 동기화는 항상 작동합니다.</string>
-  
-  <!-- Actions Group Label  -->
-  <string name="sync_SPr_group_actions">동작</string>
-
-  <!-- Synchronize Now Button -->    
-  <string name="sync_SPr_sync">지금 동기화하기</string>
-  <!-- Synchronize Now Button if not logged in-->    
-  <string name="sync_SPr_sync_log_in">로그인 &amp; 동기화!</string>
-  
-  <!-- Sync: Prefix string before logged in identifier -->
-  <string name="sync_SPr_logged_in_prefix">로그인하기:</string>
-  
-  <!-- Sync: Last error -->
-  <string name="sync_SPr_last_error">상태 보고</string>
-  
-  <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">아스트리드 팀에게 보고서를 보내려면 클릭하세요</string>
-  <!-- Sync: send error report button -->
-  <string name="sync_SPr_send_report">보고서 보내기</string>
-  
-  <!-- Sync: Clear Data Title -->
-  <string name="sync_SPr_forget">로그아웃</string>
-  <!-- Sync: Clear Data Description -->
-  <string name="sync_SPr_forget_description">모든 동기화 자료 삭제</string>
-
-  <!-- confirmation dialog for sync log out -->
-  <string name="sync_forget_confirm">로그아웃 / 모든 동기화 데이터 삭제?</string>
-  
-  <!-- Sync error: network connectivity problems. %s-> name of sync service-->
-  <string name="sync_error_offline">%s 과 마지막 동기화 중에 네트워크 연결 문제가 있었습니다.나중에 다시 시도해 주세요.</string>
-  
-  <string-array name="sync_SPr_interval_entries">
-      <!-- sync_SPr_interval_entries: Synchronization Intervals -->
-      <item>사용안함</item>
-      <item>15분마다</item>
-      <item>30분마다</item>
-      <item>매시간</item>
-      <item>3시간마다</item>
-      <item>6시간마다</item>
-      <item>12시간마다</item>
-      <item>매일</item>
-      <item>3일마다</item>
-      <item>일주일마다</item>
-  </string-array>    
-    
+<resources>
+
+    <!-- ==================================================== Generic Units == -->
+
+    <plurals name="DUt_years">
+        <!-- plurals: years -->
+        <item quantity="one">1년</item>
+        <!-- plurals: years -->
+        <item quantity="other">%d년</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <!-- plurals: months -->
+        <item quantity="one">1개월</item>
+        <!-- plurals: months -->
+        <item quantity="other">%d개월</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <!-- plurals: days -->
+        <item quantity="one">1주</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d주</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <!-- plurals: days -->
+        <item quantity="one">1일</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d일</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <!-- plurals: days -->
+        <item quantity="one">주중 1일</item>
+        <!-- plurals: days -->
+        <item quantity="other">주중 %d일</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <!-- plurals: hours -->
+        <item quantity="one">1시간</item>
+        <!-- plurals: hours -->
+        <item quantity="other">%d시간</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <!-- plurals: minutes -->
+        <item quantity="one">1분</item>
+        <!-- plurals: minutes -->
+        <item quantity="other">%d분</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <!-- plurals: seconds -->
+        <item quantity="one">1초</item>
+        <!-- plurals: seconds -->
+        <item quantity="other">%d초</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="one">1시간</item>
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="other">%d시간</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="one">1분</item>
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="other">%d분</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="one">1초</item>
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="other">%d초</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <!-- plurals: tasks -->
+        <item quantity="one">1 일정</item>
+        <!-- plurals: tasks -->
+        <item quantity="other">%d 일정</item>
+    </plurals>
+    <plurals name="Npeople">
+        <!-- plurals: people -->
+        <item quantity="one">1 사람</item>
+        <!-- plurals: people -->
+        <item quantity="other">%d 사람</item>
+    </plurals>
+
+    <!-- slide 10a, 12c: today -->
+    <string name="today">오늘</string>
+
+    <!-- tomorrow -->
+    <string name="tomorrow">내일</string>
+
+    <!-- yesterday -->
+    <string name="yesterday">어제</string>
+
+    <!-- slide 12c: tomorrow, abbreviated -->
+    <string name="tmrw">내일</string>
+
+    <!-- slide 12c: yesterday, abbreviated -->
+    <string name="yest">어제</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- confirmation dialog title -->
+    <string name="DLG_confirm_title">확인?</string>
+
+    <!-- question dialog title -->
+    <string name="DLG_question_title">질문:</string>
+
+    <!-- information dialog title -->
+    <string name="DLG_information_title">정보</string>
+
+    <!-- error dialog title -->
+    <string name="DLG_error_title">에러!</string>
+
+    <!-- general dialog save-->
+    <string name="DLG_save">저장</string>
+
+    <!-- general dialog yes-->
+    <string name="DLG_yes">예</string>
+
+    <!-- general dialog no-->
+    <string name="DLG_no">아니요</string>
+
+    <!-- general dialog close-->
+    <string name="DLG_close">닫기</string>
+
+    <!-- general dialog done -->
+    <string name="DLG_done">마침</string>
+
+    <!-- error dialog (%s => error message)-->
+    <string name="DLG_error">에러가 발생한 것 같습니다! 발생한 에러는 다음과 같습니다:\n\n%s</string>
+
+    <!-- error dialog (no message indicated)-->
+    <string name="DLG_error_generic">에러가 발생한 것 같습니다!</string>
+
+    <!-- Progress dialog shown when doing something slow -->
+    <string name="DLG_wait">잠시 기다리세요...</string>
+
+    <!-- ====================================================== SyncProvider == -->
+
+    <!-- Sync Notification: message when sync service active -->
+    <string name="SyP_progress">일정을 동기화 중입니다...</string>
+
+    <!-- Sync Notification: toast when sync activated from activity -->
+    <string name="SyP_progress_toast">동기화하는 중...</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="SyP_label">동기화 &amp; 백업</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="Sync_now_label">지금 동기화하기</string>
+
+    <!-- Sync label subtitle -->
+    <string name="SyP_summary">Astrid.com, 구글 일정, 저장한 자료, 로컬 백업</string>
+
+    <!-- Error msg when io exception  -->
+    <string name="SyP_ioerror">연결 오류! 인터넷 연결을 확인하세요.</string>
+
+    <!-- ================================================== SyncPreferences == -->
+
+    <!-- Status Group Label -->
+    <string name="sync_SPr_group_status">상태</string>
+
+    <!-- Sync status subtitle, %s-> status message -->
+    <string name="sync_SPr_status_subtitle">상태: %s</string>
+    <!-- Sync Status: log in -->
+    <string name="sync_status_loggedout">로그인 안 됨</string>
+    <!-- Status: ongoing -->
+    <string name="sync_status_ongoing">동기화 진행 중...</string>
+    <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
+    <string name="sync_status_success">마지막 동기화: \n%s</string>
+    <!-- Sync Status: failure status (%s -> last attempted sync date) -->
+    <string name="sync_status_failed">실패: %s</string>
+    <!-- Sync Status: error status (%s -> last sync date) -->
+    <string name="sync_status_errors">동기화 중 에러: %s</string>
+    <!-- Sync Status: error subtitle (%s -> last successful sync date) -->
+    <string name="sync_status_failed_subtitle">마지막 동기화 성공시간: %s</string>
+    <!-- Sync Status: never sync\'d -->
+    <string name="sync_status_never">동기화 한 적이 없습니다!</string>
+
+    <!-- Options Group Label -->
+    <string name="sync_SPr_group_options">설정</string>
+
+    <!-- Preference: Synchronization Interval Title -->
+    <string name="sync_SPr_interval_title">백그라운드 동기화</string>
+    <!-- Preference: Synchronization Interval Description (when disabled) -->
+    <string name="sync_SPr_interval_desc_disabled">백그라운드 동기화를 사용하지 않습니다.</string>
+    <!-- Preference: Synchronization Interval Description (%s => setting) -->
+    <string name="sync_SPr_interval_desc">현재 설정: %s</string>
+
+    <!-- Preference: Background Wifi Title -->
+    <string name="sync_SPr_bgwifi_title">WiFi 설정</string>
+    <!-- Preference: Background Wifi Description (enabled) -->
+    <string name="sync_SPr_bgwifi_desc_enabled">백그라운드 동기화는 WiFi 지역에서만 작동합니다.</string>
+    <!-- Preference: Background Wifi Description (disabled) -->
+    <string name="sync_SPr_bgwifi_desc_disabled">백그라운드 동기화는 항상 작동합니다.</string>
+
+    <!-- Actions Group Label  -->
+    <string name="sync_SPr_group_actions">동작</string>
+
+    <!-- Synchronize Now Button -->
+    <string name="sync_SPr_sync">지금 동기화하기</string>
+    <!-- Synchronize Now Button if not logged in-->
+    <string name="sync_SPr_sync_log_in">로그인 &amp; 동기화!</string>
+
+    <!-- Sync: Prefix string before logged in identifier -->
+    <string name="sync_SPr_logged_in_prefix">로그인하기:</string>
+
+    <!-- Sync: Last error -->
+    <string name="sync_SPr_last_error">상태 보고</string>
+
+    <!-- Sync: last error click for more -->
+    <string name="sync_SPr_last_error_subtitle">아스트리드 팀에게 보고서를 보내려면 클릭하세요</string>
+    <!-- Sync: send error report button -->
+    <string name="sync_SPr_send_report">보고서 보내기</string>
+
+    <!-- Sync: Clear Data Title -->
+    <string name="sync_SPr_forget">로그아웃</string>
+    <!-- Sync: Clear Data Description -->
+    <string name="sync_SPr_forget_description">모든 동기화 자료 삭제</string>
+
+    <!-- confirmation dialog for sync log out -->
+    <string name="sync_forget_confirm">로그아웃 / 모든 동기화 데이터 삭제?</string>
+
+    <!-- Sync error: network connectivity problems. %s-> name of sync service-->
+    <string name="sync_error_offline">%s 과 마지막 동기화 중에 네트워크 연결 문제가 있었습니다.나중에 다시 시도해 주세요.</string>
+
+    <string-array name="sync_SPr_interval_entries">
+        <!-- sync_SPr_interval_entries: Synchronization Intervals -->
+        <item>사용안함</item>
+        <item>15분마다</item>
+        <item>30분마다</item>
+        <item>매시간</item>
+        <item>3시간마다</item>
+        <item>6시간마다</item>
+        <item>12시간마다</item>
+        <item>매일</item>
+        <item>3일마다</item>
+        <item>일주일마다</item>
+    </string-array>
+
 </resources>
diff --git a/api/res/values-nb/strings.xml b/api/res/values-nb/strings.xml
index 57bb8a460..983f6b81a 100644
--- a/api/res/values-nb/strings.xml
+++ b/api/res/values-nb/strings.xml
@@ -1,102 +1,104 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <plurals name="DUt_years">
-    <item quantity="one">1 år</item>
-    <item quantity="other">%d år</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <item quantity="one">1 måned</item>
-    <item quantity="other">%d måneder</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <item quantity="one">1 uke</item>
-    <item quantity="other">%d uker</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <item quantity="one">1 dag</item>
-    <item quantity="other">%d dager</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <item quantity="one">1 ukesdag</item>
-    <item quantity="other">%d Weekdays</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <item quantity="one">1 time</item>
-    <item quantity="other">%d timer</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <item quantity="one">1 minutt</item>
-    <item quantity="other">%d minutter</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <item quantity="one">1 sekund</item>
-    <item quantity="other">%d sekunder</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <item quantity="one">1 t</item>
-    <item quantity="other">%d t</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <item quantity="one">1 min</item>
-    <item quantity="other">%d min</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <item quantity="one">1 s</item>
-    <item quantity="other">%d s</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <item quantity="one">1 oppgave</item>
-    <item quantity="other">%d oppgaver</item>
-  </plurals>
-  <plurals name="Npeople">
-    <item quantity="one">1 person</item>
-    <item quantity="other">%d people</item>
-  </plurals>
-  <string name="today">I dag</string>
-  <string name="tomorrow">I morgen</string>
-  <string name="yesterday">I går</string>
-  <string name="DLG_confirm_title">Bekreft?</string>
-  <string name="DLG_question_title">Spørsmål:</string>
-  <string name="DLG_information_title">Informasjon</string>
-  <string name="DLG_error_title">Feil!</string>
-  <string name="DLG_save">Lagre</string>
-  <string name="DLG_yes">Ja</string>
-  <string name="DLG_no">Nei</string>
-  <string name="DLG_close">Lukk</string>
-  <string name="DLG_done">Utført</string>
-  <string name="DLG_error">Oi, det oppstod en feil! Dette skjedde:\n\n%s</string>
-  <string name="DLG_error_generic">Oi, det oppstod en feil!</string>
-  <string name="DLG_wait">Vennligst vent...</string>
-  <string name="SyP_progress">Synkroniserer oppgavene dine...</string>
-  <string name="SyP_progress_toast">Synkroniserer...</string>
-  <string name="SyP_ioerror">Tilkoblingsfeil! Kontroller tilkoblingen til Internett</string>
-  <string name="sync_status_ongoing">Synkronisering pågår...</string>
-  <string name="sync_status_success">Siste synkronisering:\n%s</string>
-  <string name="sync_status_failed">Mislykket: %s</string>
-  <string name="sync_status_failed_subtitle">Siste vellykkede synkronisering: %s</string>
-  <string name="sync_status_never">Aldri synkronisert!</string>
-  <string name="sync_SPr_group_options">Alternativer</string>
-  <string name="sync_SPr_interval_title">Bakgrunnssynkronisering</string>
-  <string name="sync_SPr_interval_desc_disabled">Bakgrunnssynkronisering er deaktivert</string>
-  <string name="sync_SPr_interval_desc">Aktuell innstilling: %s</string>
-  <string name="sync_SPr_bgwifi_title">Bare Wifi Innstilling</string>
-  <string name="sync_SPr_bgwifi_desc_enabled">Bakgrunnssynkronisering skjer kun med Wifi-tilkobling</string>
-  <string name="sync_SPr_bgwifi_desc_disabled">Bakgrunnssynkronisering skjer alltid</string>
-  <string name="sync_SPr_group_actions">Handlinger</string>
-  <string name="sync_SPr_sync_log_in">Logg inn &amp; Synkroniser!</string>
-  <string name="sync_SPr_forget">Logg ut</string>
-  <string name="sync_SPr_forget_description">Sletter all synkroniseringsdata</string>
-  <string name="sync_forget_confirm">Logg ut / slett synkroniseringsdata?</string>
-  <string-array name="sync_SPr_interval_entries">
-    <item>deaktiver</item>
-    <item>hvert kvarter</item>
-    <item>hver halvtime</item>
-    <item>hver time</item>
-    <item>hver tredje time</item>
-    <item>hver sjette time</item>
-    <item>hver tolvte time</item>
-    <item>daglig</item>
-    <item>hver tredje dag</item>
-    <item>hver uke</item>
-  </string-array>
+    <plurals name="DUt_years">
+        <item quantity="one">1 år</item>
+        <item quantity="other">%d år</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <item quantity="one">1 måned</item>
+        <item quantity="other">%d måneder</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <item quantity="one">1 uke</item>
+        <item quantity="other">%d uker</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <item quantity="one">1 dag</item>
+        <item quantity="other">%d dager</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <item quantity="one">1 ukesdag</item>
+        <item quantity="other">%d Weekdays</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <item quantity="one">1 time</item>
+        <item quantity="other">%d timer</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <item quantity="one">1 minutt</item>
+        <item quantity="other">%d minutter</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <item quantity="one">1 sekund</item>
+        <item quantity="other">%d sekunder</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <item quantity="one">1 t</item>
+        <item quantity="other">%d t</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <item quantity="one">1 min</item>
+        <item quantity="other">%d min</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <item quantity="one">1 s</item>
+        <item quantity="other">%d s</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <item quantity="one">1 oppgave</item>
+        <item quantity="other">%d oppgaver</item>
+    </plurals>
+    <plurals name="Npeople">
+        <item quantity="one">1 person</item>
+        <item quantity="other">%d people</item>
+    </plurals>
+    <string name="today">I dag</string>
+    <string name="tomorrow">I morgen</string>
+    <string name="yesterday">I går</string>
+    <string name="DLG_confirm_title">Bekreft?</string>
+    <string name="DLG_question_title">Spørsmål:</string>
+    <string name="DLG_information_title">Informasjon</string>
+    <string name="DLG_error_title">Feil!</string>
+    <string name="DLG_save">Lagre</string>
+    <string name="DLG_yes">Ja</string>
+    <string name="DLG_no">Nei</string>
+    <string name="DLG_close">Lukk</string>
+    <string name="DLG_done">Utført</string>
+    <string name="DLG_error">Oi, det oppstod en feil! Dette skjedde:\n\n%s</string>
+    <string name="DLG_error_generic">Oi, det oppstod en feil!</string>
+    <string name="DLG_wait">Vennligst vent...</string>
+    <string name="SyP_progress">Synkroniserer oppgavene dine...</string>
+    <string name="SyP_progress_toast">Synkroniserer...</string>
+    <string name="SyP_ioerror">Tilkoblingsfeil! Kontroller tilkoblingen til Internett</string>
+    <string name="sync_status_ongoing">Synkronisering pågår...</string>
+    <string name="sync_status_success">Siste synkronisering:\n%s</string>
+    <string name="sync_status_failed">Mislykket: %s</string>
+    <string name="sync_status_failed_subtitle">Siste vellykkede synkronisering: %s</string>
+    <string name="sync_status_never">Aldri synkronisert!</string>
+    <string name="sync_SPr_group_options">Alternativer</string>
+    <string name="sync_SPr_interval_title">Bakgrunnssynkronisering</string>
+    <string name="sync_SPr_interval_desc_disabled">Bakgrunnssynkronisering er deaktivert</string>
+    <string name="sync_SPr_interval_desc">Aktuell innstilling: %s</string>
+    <string name="sync_SPr_bgwifi_title">Bare Wifi Innstilling</string>
+    <string name="sync_SPr_bgwifi_desc_enabled">Bakgrunnssynkronisering skjer kun med
+        Wifi-tilkobling
+    </string>
+    <string name="sync_SPr_bgwifi_desc_disabled">Bakgrunnssynkronisering skjer alltid</string>
+    <string name="sync_SPr_group_actions">Handlinger</string>
+    <string name="sync_SPr_sync_log_in">Logg inn &amp; Synkroniser!</string>
+    <string name="sync_SPr_forget">Logg ut</string>
+    <string name="sync_SPr_forget_description">Sletter all synkroniseringsdata</string>
+    <string name="sync_forget_confirm">Logg ut / slett synkroniseringsdata?</string>
+    <string-array name="sync_SPr_interval_entries">
+        <item>deaktiver</item>
+        <item>hvert kvarter</item>
+        <item>hver halvtime</item>
+        <item>hver time</item>
+        <item>hver tredje time</item>
+        <item>hver sjette time</item>
+        <item>hver tolvte time</item>
+        <item>daglig</item>
+        <item>hver tredje dag</item>
+        <item>hver uke</item>
+    </string-array>
 </resources>
diff --git a/api/res/values-nl/strings.xml b/api/res/values-nl/strings.xml
index 50f5c74f8..144096d17 100755
--- a/api/res/values-nl/strings.xml
+++ b/api/res/values-nl/strings.xml
@@ -4,243 +4,248 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ==================================================== Generic Units == -->
-  
-  <plurals name="DUt_years">
-    <!-- plurals: years -->
-    <item quantity="one">1 jaar</item>
-    <!-- plurals: years -->
-    <item quantity="other">%d jaren</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <!-- plurals: months -->
-    <item quantity="one">1 maand</item>
-    <!-- plurals: months -->
-    <item quantity="other">%d maanden</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <!-- plurals: days -->
-    <item quantity="one">1 week</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d weken</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <!-- plurals: days -->
-    <item quantity="one">1 dag</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d dagen</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <!-- plurals: days -->
-    <item quantity="one">1 weekdag</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d weekdagen</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <!-- plurals: hours -->
-    <item quantity="one">1 uur</item>
-    <!-- plurals: hours -->
-    <item quantity="other">%d uren</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <!-- plurals: minutes -->
-    <item quantity="one">1 minuut</item>
-    <!-- plurals: minutes -->
-    <item quantity="other">%d minuten</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <!-- plurals: seconds -->
-    <item quantity="one">1 seconde</item>
-    <!-- plurals: seconds -->
-    <item quantity="other">%d seconden</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="one">1 u.</item>
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="other">%d u.</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="one">1 m.</item>
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="other">%d m.</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="one">1 s.</item>
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="other">%d s.</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <!-- plurals: tasks -->
-    <item quantity="one">1 taak</item>
-    <!-- plurals: tasks -->
-    <item quantity="other">%d taken</item>
-  </plurals>
-  <plurals name="Npeople">
-    <!-- plurals: people -->
-    <item quantity="one">1 persoon</item>
-    <!-- plurals: people -->
-    <item quantity="other">%d personen</item>
-  </plurals>
-  
-  <!-- slide 10a, 12c: today -->
-  <string name="today">Vandaag</string>
-  
-  <!-- tomorrow -->
-  <string name="tomorrow">Morgen</string>
-  
-  <!-- yesterday -->
-  <string name="yesterday">Gisteren</string>
-  
-  <!-- slide 12c: tomorrow, abbreviated -->
-  <string name="tmrw">mrgn</string>
-  
-  <!-- slide 12c: yesterday, abbreviated -->
-  <string name="yest">gisteren</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-  
-  <!-- confirmation dialog title -->
-  <string name="DLG_confirm_title">OK?</string>
-  
-  <!-- question dialog title -->
-  <string name="DLG_question_title">Vraag:</string>
-  
-  <!-- information dialog title -->
-  <string name="DLG_information_title">Informatie</string>
-  
-  <!-- error dialog title -->
-  <string name="DLG_error_title">Fout!</string>
-  
-  <!-- general dialog save-->
-  <string name="DLG_save">Opslaan</string>
-  
-  <!-- general dialog yes-->
-  <string name="DLG_yes">Ja</string>
-  
-  <!-- general dialog no-->
-  <string name="DLG_no">Nee</string>
-  
-  <!-- general dialog close-->
-  <string name="DLG_close">Sluit</string>
-  
-  <!-- general dialog done -->
-  <string name="DLG_done">Gedaan</string>
-  
-  <!-- error dialog (%s => error message)-->
-  <string name="DLG_error">Er is een fout opgetreden:\n\n%s</string>
-  
-  <!-- error dialog (no message indicated)-->
-  <string name="DLG_error_generic">Er is een fout opgetreden!</string>
-  
-  <!-- Progress dialog shown when doing something slow -->
-  <string name="DLG_wait">Even geduld a.u.b.</string>
-
- <!-- ====================================================== SyncProvider == -->
-          
-  <!-- Sync Notification: message when sync service active -->
-  <string name="SyP_progress">Taken synchroniseren...</string>
-  
-  <!-- Sync Notification: toast when sync activated from activity -->
-  <string name="SyP_progress_toast">Synchroniseren…</string>
-  
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="SyP_label">Synchronisatie</string>  
-
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="Sync_now_label">Nu synchroniseren</string>  
-
-  <!-- Sync label subtitle -->
-  <string name="SyP_summary">Astrid.com, Google Taken, opgeslagen data, lokale back-up</string>  
-
-  <!-- Error msg when io exception  -->
-  <string name="SyP_ioerror">Verbindingsfout! Controleer de internetverbinding</string>
-
-  <!-- ================================================== SyncPreferences == -->
-  
-  <!-- Status Group Label -->    
-  <string name="sync_SPr_group_status">Status</string>
-  
-  <!-- Sync status subtitle, %s-> status message -->
-  <string name="sync_SPr_status_subtitle">Status: %s</string>
-  <!-- Sync Status: log in -->    
-  <string name="sync_status_loggedout">Niet aangemeld</string>
-  <!-- Status: ongoing -->    
-  <string name="sync_status_ongoing">Synchronisatie bezig...</string>
-  <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Vorige:\n%s</string>
-  <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
-  <string name="sync_status_failed">Mislukt op: %s</string>
-  <!-- Sync Status: error status (%s -> last sync date) -->    
-  <string name="sync_status_errors">Gesync. met fouten: %s</string>
-  <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
-  <string name="sync_status_failed_subtitle">Gelukt op: %s</string>
-  <!-- Sync Status: never sync\'d -->    
-  <string name="sync_status_never">Nooit gesynct!</string>
-
-  <!-- Options Group Label -->    
-  <string name="sync_SPr_group_options">Opties</string>
-
-  <!-- Preference: Synchronization Interval Title -->    
-  <string name="sync_SPr_interval_title">Achtergrond synchronisatie</string>
-  <!-- Preference: Synchronization Interval Description (when disabled) -->
-  <string name="sync_SPr_interval_desc_disabled">Achtergrond synchronisatie uitgeschakeld</string>    
-  <!-- Preference: Synchronization Interval Description (%s => setting) -->
-  <string name="sync_SPr_interval_desc">Huidige instelling: %s</string>
-  
-  <!-- Preference: Background Wifi Title -->  
-  <string name="sync_SPr_bgwifi_title">Alleen via WiFi</string>    
-  <!-- Preference: Background Wifi Description (enabled) -->
-  <string name="sync_SPr_bgwifi_desc_enabled">Achtergrond synchronisatie alleen met WiFi aan</string>    
-  <!-- Preference: Background Wifi Description (disabled) -->
-  <string name="sync_SPr_bgwifi_desc_disabled">Achtergrond synchronisatie altijd aan</string>
-  
-  <!-- Actions Group Label  -->
-  <string name="sync_SPr_group_actions">Acties</string>
-
-  <!-- Synchronize Now Button -->    
-  <string name="sync_SPr_sync">Nu synchroniseren</string>
-  <!-- Synchronize Now Button if not logged in-->    
-  <string name="sync_SPr_sync_log_in">Aanmelden &amp; Sync.</string>
-  
-  <!-- Sync: Prefix string before logged in identifier -->
-  <string name="sync_SPr_logged_in_prefix">Aangemeld als:</string>
-  
-  <!-- Sync: Last error -->
-  <string name="sync_SPr_last_error">Statusrapport</string>
-  
-  <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Klik om een rapport naar het Astrid team te versturen</string>
-  <!-- Sync: send error report button -->
-  <string name="sync_SPr_send_report">Rapport verzenden</string>
-  
-  <!-- Sync: Clear Data Title -->
-  <string name="sync_SPr_forget">Afmelden</string>
-  <!-- Sync: Clear Data Description -->
-  <string name="sync_SPr_forget_description">Alle synchronisatie gegevens verwijderen</string>
-
-  <!-- confirmation dialog for sync log out -->
-  <string name="sync_forget_confirm">Afmelden / synchronisatie gegevens verwijderen?</string>
-  
-  <!-- Sync error: network connectivity problems. %s-> name of sync service-->
-  <string name="sync_error_offline">Er was een probleem met de netwerkverbinding tijdens de laatste synchronisatie met %s. Probeer het a.u.b. later nog eens.</string>
-  
-  <string-array name="sync_SPr_interval_entries">
-      <!-- sync_SPr_interval_entries: Synchronization Intervals -->
-      <item>uitschakelen</item>
-      <item>elke 15 min.</item>
-      <item>elke 30 min.</item>
-      <item>elk uur</item>
-      <item>elke 3 uur</item>
-      <item>elke 6 uur</item>
-      <item>elke 12 uur</item>
-      <item>elke dag</item>
-      <item>elke 3 dagen</item>
-      <item>elke week</item>
-  </string-array>    
-    
+<resources>
+
+    <!-- ==================================================== Generic Units == -->
+
+    <plurals name="DUt_years">
+        <!-- plurals: years -->
+        <item quantity="one">1 jaar</item>
+        <!-- plurals: years -->
+        <item quantity="other">%d jaren</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <!-- plurals: months -->
+        <item quantity="one">1 maand</item>
+        <!-- plurals: months -->
+        <item quantity="other">%d maanden</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <!-- plurals: days -->
+        <item quantity="one">1 week</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d weken</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <!-- plurals: days -->
+        <item quantity="one">1 dag</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d dagen</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <!-- plurals: days -->
+        <item quantity="one">1 weekdag</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d weekdagen</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <!-- plurals: hours -->
+        <item quantity="one">1 uur</item>
+        <!-- plurals: hours -->
+        <item quantity="other">%d uren</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <!-- plurals: minutes -->
+        <item quantity="one">1 minuut</item>
+        <!-- plurals: minutes -->
+        <item quantity="other">%d minuten</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <!-- plurals: seconds -->
+        <item quantity="one">1 seconde</item>
+        <!-- plurals: seconds -->
+        <item quantity="other">%d seconden</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="one">1 u.</item>
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="other">%d u.</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="one">1 m.</item>
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="other">%d m.</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="one">1 s.</item>
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="other">%d s.</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <!-- plurals: tasks -->
+        <item quantity="one">1 taak</item>
+        <!-- plurals: tasks -->
+        <item quantity="other">%d taken</item>
+    </plurals>
+    <plurals name="Npeople">
+        <!-- plurals: people -->
+        <item quantity="one">1 persoon</item>
+        <!-- plurals: people -->
+        <item quantity="other">%d personen</item>
+    </plurals>
+
+    <!-- slide 10a, 12c: today -->
+    <string name="today">Vandaag</string>
+
+    <!-- tomorrow -->
+    <string name="tomorrow">Morgen</string>
+
+    <!-- yesterday -->
+    <string name="yesterday">Gisteren</string>
+
+    <!-- slide 12c: tomorrow, abbreviated -->
+    <string name="tmrw">mrgn</string>
+
+    <!-- slide 12c: yesterday, abbreviated -->
+    <string name="yest">gisteren</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- confirmation dialog title -->
+    <string name="DLG_confirm_title">OK?</string>
+
+    <!-- question dialog title -->
+    <string name="DLG_question_title">Vraag:</string>
+
+    <!-- information dialog title -->
+    <string name="DLG_information_title">Informatie</string>
+
+    <!-- error dialog title -->
+    <string name="DLG_error_title">Fout!</string>
+
+    <!-- general dialog save-->
+    <string name="DLG_save">Opslaan</string>
+
+    <!-- general dialog yes-->
+    <string name="DLG_yes">Ja</string>
+
+    <!-- general dialog no-->
+    <string name="DLG_no">Nee</string>
+
+    <!-- general dialog close-->
+    <string name="DLG_close">Sluit</string>
+
+    <!-- general dialog done -->
+    <string name="DLG_done">Gedaan</string>
+
+    <!-- error dialog (%s => error message)-->
+    <string name="DLG_error">Er is een fout opgetreden:\n\n%s</string>
+
+    <!-- error dialog (no message indicated)-->
+    <string name="DLG_error_generic">Er is een fout opgetreden!</string>
+
+    <!-- Progress dialog shown when doing something slow -->
+    <string name="DLG_wait">Even geduld a.u.b.</string>
+
+    <!-- ====================================================== SyncProvider == -->
+
+    <!-- Sync Notification: message when sync service active -->
+    <string name="SyP_progress">Taken synchroniseren...</string>
+
+    <!-- Sync Notification: toast when sync activated from activity -->
+    <string name="SyP_progress_toast">Synchroniseren…</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="SyP_label">Synchronisatie</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="Sync_now_label">Nu synchroniseren</string>
+
+    <!-- Sync label subtitle -->
+    <string name="SyP_summary">Astrid.com, Google Taken, opgeslagen data, lokale back-up</string>
+
+    <!-- Error msg when io exception  -->
+    <string name="SyP_ioerror">Verbindingsfout! Controleer de internetverbinding</string>
+
+    <!-- ================================================== SyncPreferences == -->
+
+    <!-- Status Group Label -->
+    <string name="sync_SPr_group_status">Status</string>
+
+    <!-- Sync status subtitle, %s-> status message -->
+    <string name="sync_SPr_status_subtitle">Status: %s</string>
+    <!-- Sync Status: log in -->
+    <string name="sync_status_loggedout">Niet aangemeld</string>
+    <!-- Status: ongoing -->
+    <string name="sync_status_ongoing">Synchronisatie bezig...</string>
+    <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
+    <string name="sync_status_success">Vorige:\n%s</string>
+    <!-- Sync Status: failure status (%s -> last attempted sync date) -->
+    <string name="sync_status_failed">Mislukt op: %s</string>
+    <!-- Sync Status: error status (%s -> last sync date) -->
+    <string name="sync_status_errors">Gesync. met fouten: %s</string>
+    <!-- Sync Status: error subtitle (%s -> last successful sync date) -->
+    <string name="sync_status_failed_subtitle">Gelukt op: %s</string>
+    <!-- Sync Status: never sync\'d -->
+    <string name="sync_status_never">Nooit gesynct!</string>
+
+    <!-- Options Group Label -->
+    <string name="sync_SPr_group_options">Opties</string>
+
+    <!-- Preference: Synchronization Interval Title -->
+    <string name="sync_SPr_interval_title">Achtergrond synchronisatie</string>
+    <!-- Preference: Synchronization Interval Description (when disabled) -->
+    <string name="sync_SPr_interval_desc_disabled">Achtergrond synchronisatie uitgeschakeld</string>
+    <!-- Preference: Synchronization Interval Description (%s => setting) -->
+    <string name="sync_SPr_interval_desc">Huidige instelling: %s</string>
+
+    <!-- Preference: Background Wifi Title -->
+    <string name="sync_SPr_bgwifi_title">Alleen via WiFi</string>
+    <!-- Preference: Background Wifi Description (enabled) -->
+    <string name="sync_SPr_bgwifi_desc_enabled">Achtergrond synchronisatie alleen met WiFi aan
+    </string>
+    <!-- Preference: Background Wifi Description (disabled) -->
+    <string name="sync_SPr_bgwifi_desc_disabled">Achtergrond synchronisatie altijd aan</string>
+
+    <!-- Actions Group Label  -->
+    <string name="sync_SPr_group_actions">Acties</string>
+
+    <!-- Synchronize Now Button -->
+    <string name="sync_SPr_sync">Nu synchroniseren</string>
+    <!-- Synchronize Now Button if not logged in-->
+    <string name="sync_SPr_sync_log_in">Aanmelden &amp; Sync.</string>
+
+    <!-- Sync: Prefix string before logged in identifier -->
+    <string name="sync_SPr_logged_in_prefix">Aangemeld als:</string>
+
+    <!-- Sync: Last error -->
+    <string name="sync_SPr_last_error">Statusrapport</string>
+
+    <!-- Sync: last error click for more -->
+    <string name="sync_SPr_last_error_subtitle">Klik om een rapport naar het Astrid team te
+        versturen
+    </string>
+    <!-- Sync: send error report button -->
+    <string name="sync_SPr_send_report">Rapport verzenden</string>
+
+    <!-- Sync: Clear Data Title -->
+    <string name="sync_SPr_forget">Afmelden</string>
+    <!-- Sync: Clear Data Description -->
+    <string name="sync_SPr_forget_description">Alle synchronisatie gegevens verwijderen</string>
+
+    <!-- confirmation dialog for sync log out -->
+    <string name="sync_forget_confirm">Afmelden / synchronisatie gegevens verwijderen?</string>
+
+    <!-- Sync error: network connectivity problems. %s-> name of sync service-->
+    <string name="sync_error_offline">Er was een probleem met de netwerkverbinding tijdens de
+        laatste synchronisatie met %s. Probeer het a.u.b. later nog eens.
+    </string>
+
+    <string-array name="sync_SPr_interval_entries">
+        <!-- sync_SPr_interval_entries: Synchronization Intervals -->
+        <item>uitschakelen</item>
+        <item>elke 15 min.</item>
+        <item>elke 30 min.</item>
+        <item>elk uur</item>
+        <item>elke 3 uur</item>
+        <item>elke 6 uur</item>
+        <item>elke 12 uur</item>
+        <item>elke dag</item>
+        <item>elke 3 dagen</item>
+        <item>elke week</item>
+    </string-array>
+
 </resources>
diff --git a/api/res/values-pl/strings.xml b/api/res/values-pl/strings.xml
index 93e29ee4d..5fce6eaba 100755
--- a/api/res/values-pl/strings.xml
+++ b/api/res/values-pl/strings.xml
@@ -4,243 +4,250 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ==================================================== Generic Units == -->
-  
-  <plurals name="DUt_years">
-    <!-- plurals: years -->
-    <item quantity="one">1 rok</item>
-    <!-- plurals: years -->
-    <item quantity="other">%d lat</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <!-- plurals: months -->
-    <item quantity="one">1 miesiąc</item>
-    <!-- plurals: months -->
-    <item quantity="other">%d miesięcy</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <!-- plurals: days -->
-    <item quantity="one">1 tydzień</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d tygodni</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <!-- plurals: days -->
-    <item quantity="one">1 dzień</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d dni</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <!-- plurals: days -->
-    <item quantity="one">1 dzień roboczy</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d dni roboczych</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <!-- plurals: hours -->
-    <item quantity="one">1 godzina</item>
-    <!-- plurals: hours -->
-    <item quantity="other">%d godzin</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <!-- plurals: minutes -->
-    <item quantity="one">1 minuta</item>
-    <!-- plurals: minutes -->
-    <item quantity="other">%d minut</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <!-- plurals: seconds -->
-    <item quantity="one">1 sekunda</item>
-    <!-- plurals: seconds -->
-    <item quantity="other">%d sekund</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="one">1 godz.</item>
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="other">%d godz.</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="one">1 min.</item>
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="other">%d min.</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="one">1 sek.</item>
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="other">%d sek.</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <!-- plurals: tasks -->
-    <item quantity="one">1 zadanie</item>
-    <!-- plurals: tasks -->
-    <item quantity="other">%d zadań</item>
-  </plurals>
-  <plurals name="Npeople">
-    <!-- plurals: people -->
-    <item quantity="one">1 osoba</item>
-    <!-- plurals: people -->
-    <item quantity="other">%d osób</item>
-  </plurals>
-  
-  <!-- slide 10a, 12c: today -->
-  <string name="today">Dzisiaj</string>
-  
-  <!-- tomorrow -->
-  <string name="tomorrow">Jutro</string>
-  
-  <!-- yesterday -->
-  <string name="yesterday">Wczoraj</string>
-  
-  <!-- slide 12c: tomorrow, abbreviated -->
-  <string name="tmrw">jtr</string>
-  
-  <!-- slide 12c: yesterday, abbreviated -->
-  <string name="yest">wcz</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-  
-  <!-- confirmation dialog title -->
-  <string name="DLG_confirm_title">Potwierdzić?</string>
-  
-  <!-- question dialog title -->
-  <string name="DLG_question_title">Pytanie:</string>
-  
-  <!-- information dialog title -->
-  <string name="DLG_information_title">Informacja</string>
-  
-  <!-- error dialog title -->
-  <string name="DLG_error_title">Błąd!</string>
-  
-  <!-- general dialog save-->
-  <string name="DLG_save">Zapisz</string>
-  
-  <!-- general dialog yes-->
-  <string name="DLG_yes">Tak</string>
-  
-  <!-- general dialog no-->
-  <string name="DLG_no">Nie</string>
-  
-  <!-- general dialog close-->
-  <string name="DLG_close">Zamknij</string>
-  
-  <!-- general dialog done -->
-  <string name="DLG_done">Ukończone</string>
-  
-  <!-- error dialog (%s => error message)-->
-  <string name="DLG_error">Ups! Wygląda na to, że wystąpił jakiś błąd! Oto, co się stało:\n\n%s</string>
-  
-  <!-- error dialog (no message indicated)-->
-  <string name="DLG_error_generic">Ups! Wygląda na to, że wystąpił jakiś błąd!</string>
-  
-  <!-- Progress dialog shown when doing something slow -->
-  <string name="DLG_wait">Proszę czekać...</string>
-
- <!-- ====================================================== SyncProvider == -->
-          
-  <!-- Sync Notification: message when sync service active -->
-  <string name="SyP_progress">Synchronizowanie Twoich zadań...</string>
-  
-  <!-- Sync Notification: toast when sync activated from activity -->
-  <string name="SyP_progress_toast">Synchronizacja...</string>
-  
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="SyP_label">Synchronizacja</string>  
-
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="Sync_now_label">Zsynchronizuj</string>  
-
-  <!-- Sync label subtitle -->
-  <string name="SyP_summary">Astrid.com, Zadania Google, zapisane dane, lokalna kopia zapasowa</string>  
-
-  <!-- Error msg when io exception  -->
-  <string name="SyP_ioerror">Błąd połączenia! Sprawdź swoje połączenie z Internetem!</string>
-
-  <!-- ================================================== SyncPreferences == -->
-  
-  <!-- Status Group Label -->    
-  <string name="sync_SPr_group_status">Stan</string>
-  
-  <!-- Sync status subtitle, %s-> status message -->
-  <string name="sync_SPr_status_subtitle">Status: %s</string>
-  <!-- Sync Status: log in -->    
-  <string name="sync_status_loggedout">Niezalogowany</string>
-  <!-- Status: ongoing -->    
-  <string name="sync_status_ongoing">Synchronizacja trwa...</string>
-  <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Ostatnia synchronizacja:\n%s</string>
-  <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
-  <string name="sync_status_failed">Nieudana: %s</string>
-  <!-- Sync Status: error status (%s -> last sync date) -->    
-  <string name="sync_status_errors">Synch w/ Błędy: %s</string>
-  <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
-  <string name="sync_status_failed_subtitle">Ostatnia udana synchronizacja: %s</string>
-  <!-- Sync Status: never sync\'d -->    
-  <string name="sync_status_never">Nigdy nie synchronizowano!</string>
-
-  <!-- Options Group Label -->    
-  <string name="sync_SPr_group_options">Opcje</string>
-
-  <!-- Preference: Synchronization Interval Title -->    
-  <string name="sync_SPr_interval_title">Synchronizacja w tle</string>
-  <!-- Preference: Synchronization Interval Description (when disabled) -->
-  <string name="sync_SPr_interval_desc_disabled">Synchronizacja w tle wyłączona</string>    
-  <!-- Preference: Synchronization Interval Description (%s => setting) -->
-  <string name="sync_SPr_interval_desc">Aktualnie ustawione na: %s</string>
-  
-  <!-- Preference: Background Wifi Title -->  
-  <string name="sync_SPr_bgwifi_title">Tylko połączenie Wi-Fi</string>    
-  <!-- Preference: Background Wifi Description (enabled) -->
-  <string name="sync_SPr_bgwifi_desc_enabled">Synchronizacja w tle przebiega tylko poprzez Wi-Fi</string>    
-  <!-- Preference: Background Wifi Description (disabled) -->
-  <string name="sync_SPr_bgwifi_desc_disabled">Synchronizowanie w tle zawsze, niezależnie od rodzaju połączenia</string>
-  
-  <!-- Actions Group Label  -->
-  <string name="sync_SPr_group_actions">Działania</string>
-
-  <!-- Synchronize Now Button -->    
-  <string name="sync_SPr_sync">Synchronizuj teraz</string>
-  <!-- Synchronize Now Button if not logged in-->    
-  <string name="sync_SPr_sync_log_in">Zaloguj &amp; Synchronizuj!</string>
-  
-  <!-- Sync: Prefix string before logged in identifier -->
-  <string name="sync_SPr_logged_in_prefix">Zalogowany jako:</string>
-  
-  <!-- Sync: Last error -->
-  <string name="sync_SPr_last_error">Raport statusu</string>
-  
-  <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Kliknij by wysłać raport do zespłu Astrid</string>
-  <!-- Sync: send error report button -->
-  <string name="sync_SPr_send_report">Wyślij raport</string>
-  
-  <!-- Sync: Clear Data Title -->
-  <string name="sync_SPr_forget">Wyloguj</string>
-  <!-- Sync: Clear Data Description -->
-  <string name="sync_SPr_forget_description">Czyści wszystkie dane synchronizacji</string>
-
-  <!-- confirmation dialog for sync log out -->
-  <string name="sync_forget_confirm">Wyloguj / wyczyść dane synchronizacji?</string>
-  
-  <!-- Sync error: network connectivity problems. %s-> name of sync service-->
-  <string name="sync_error_offline">Wystąpił problem łączenia się z siecią w trakcie ostatniej synchronizacji z %s. Spróbuj później.</string>
-  
-  <string-array name="sync_SPr_interval_entries">
-      <!-- sync_SPr_interval_entries: Synchronization Intervals -->
-      <item>Wyłączone</item>
-      <item>co 15 minut</item>
-      <item>co 30 minut</item>
-      <item>co godzinę</item>
-      <item>co 3 godziny</item>
-      <item>co 6 godzin</item>
-      <item>co 12 godzin</item>
-      <item>raz dziennie</item>
-      <item>co 3 dni</item>
-      <item>co tydzień</item>
-  </string-array>    
-    
+<resources>
+
+    <!-- ==================================================== Generic Units == -->
+
+    <plurals name="DUt_years">
+        <!-- plurals: years -->
+        <item quantity="one">1 rok</item>
+        <!-- plurals: years -->
+        <item quantity="other">%d lat</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <!-- plurals: months -->
+        <item quantity="one">1 miesiąc</item>
+        <!-- plurals: months -->
+        <item quantity="other">%d miesięcy</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <!-- plurals: days -->
+        <item quantity="one">1 tydzień</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d tygodni</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <!-- plurals: days -->
+        <item quantity="one">1 dzień</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d dni</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <!-- plurals: days -->
+        <item quantity="one">1 dzień roboczy</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d dni roboczych</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <!-- plurals: hours -->
+        <item quantity="one">1 godzina</item>
+        <!-- plurals: hours -->
+        <item quantity="other">%d godzin</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <!-- plurals: minutes -->
+        <item quantity="one">1 minuta</item>
+        <!-- plurals: minutes -->
+        <item quantity="other">%d minut</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <!-- plurals: seconds -->
+        <item quantity="one">1 sekunda</item>
+        <!-- plurals: seconds -->
+        <item quantity="other">%d sekund</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="one">1 godz.</item>
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="other">%d godz.</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="one">1 min.</item>
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="other">%d min.</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="one">1 sek.</item>
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="other">%d sek.</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <!-- plurals: tasks -->
+        <item quantity="one">1 zadanie</item>
+        <!-- plurals: tasks -->
+        <item quantity="other">%d zadań</item>
+    </plurals>
+    <plurals name="Npeople">
+        <!-- plurals: people -->
+        <item quantity="one">1 osoba</item>
+        <!-- plurals: people -->
+        <item quantity="other">%d osób</item>
+    </plurals>
+
+    <!-- slide 10a, 12c: today -->
+    <string name="today">Dzisiaj</string>
+
+    <!-- tomorrow -->
+    <string name="tomorrow">Jutro</string>
+
+    <!-- yesterday -->
+    <string name="yesterday">Wczoraj</string>
+
+    <!-- slide 12c: tomorrow, abbreviated -->
+    <string name="tmrw">jtr</string>
+
+    <!-- slide 12c: yesterday, abbreviated -->
+    <string name="yest">wcz</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- confirmation dialog title -->
+    <string name="DLG_confirm_title">Potwierdzić?</string>
+
+    <!-- question dialog title -->
+    <string name="DLG_question_title">Pytanie:</string>
+
+    <!-- information dialog title -->
+    <string name="DLG_information_title">Informacja</string>
+
+    <!-- error dialog title -->
+    <string name="DLG_error_title">Błąd!</string>
+
+    <!-- general dialog save-->
+    <string name="DLG_save">Zapisz</string>
+
+    <!-- general dialog yes-->
+    <string name="DLG_yes">Tak</string>
+
+    <!-- general dialog no-->
+    <string name="DLG_no">Nie</string>
+
+    <!-- general dialog close-->
+    <string name="DLG_close">Zamknij</string>
+
+    <!-- general dialog done -->
+    <string name="DLG_done">Ukończone</string>
+
+    <!-- error dialog (%s => error message)-->
+    <string name="DLG_error">Ups! Wygląda na to, że wystąpił jakiś błąd! Oto, co się stało:\n\n%s
+    </string>
+
+    <!-- error dialog (no message indicated)-->
+    <string name="DLG_error_generic">Ups! Wygląda na to, że wystąpił jakiś błąd!</string>
+
+    <!-- Progress dialog shown when doing something slow -->
+    <string name="DLG_wait">Proszę czekać...</string>
+
+    <!-- ====================================================== SyncProvider == -->
+
+    <!-- Sync Notification: message when sync service active -->
+    <string name="SyP_progress">Synchronizowanie Twoich zadań...</string>
+
+    <!-- Sync Notification: toast when sync activated from activity -->
+    <string name="SyP_progress_toast">Synchronizacja...</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="SyP_label">Synchronizacja</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="Sync_now_label">Zsynchronizuj</string>
+
+    <!-- Sync label subtitle -->
+    <string name="SyP_summary">Astrid.com, Zadania Google, zapisane dane, lokalna kopia zapasowa
+    </string>
+
+    <!-- Error msg when io exception  -->
+    <string name="SyP_ioerror">Błąd połączenia! Sprawdź swoje połączenie z Internetem!</string>
+
+    <!-- ================================================== SyncPreferences == -->
+
+    <!-- Status Group Label -->
+    <string name="sync_SPr_group_status">Stan</string>
+
+    <!-- Sync status subtitle, %s-> status message -->
+    <string name="sync_SPr_status_subtitle">Status: %s</string>
+    <!-- Sync Status: log in -->
+    <string name="sync_status_loggedout">Niezalogowany</string>
+    <!-- Status: ongoing -->
+    <string name="sync_status_ongoing">Synchronizacja trwa...</string>
+    <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
+    <string name="sync_status_success">Ostatnia synchronizacja:\n%s</string>
+    <!-- Sync Status: failure status (%s -> last attempted sync date) -->
+    <string name="sync_status_failed">Nieudana: %s</string>
+    <!-- Sync Status: error status (%s -> last sync date) -->
+    <string name="sync_status_errors">Synch w/ Błędy: %s</string>
+    <!-- Sync Status: error subtitle (%s -> last successful sync date) -->
+    <string name="sync_status_failed_subtitle">Ostatnia udana synchronizacja: %s</string>
+    <!-- Sync Status: never sync\'d -->
+    <string name="sync_status_never">Nigdy nie synchronizowano!</string>
+
+    <!-- Options Group Label -->
+    <string name="sync_SPr_group_options">Opcje</string>
+
+    <!-- Preference: Synchronization Interval Title -->
+    <string name="sync_SPr_interval_title">Synchronizacja w tle</string>
+    <!-- Preference: Synchronization Interval Description (when disabled) -->
+    <string name="sync_SPr_interval_desc_disabled">Synchronizacja w tle wyłączona</string>
+    <!-- Preference: Synchronization Interval Description (%s => setting) -->
+    <string name="sync_SPr_interval_desc">Aktualnie ustawione na: %s</string>
+
+    <!-- Preference: Background Wifi Title -->
+    <string name="sync_SPr_bgwifi_title">Tylko połączenie Wi-Fi</string>
+    <!-- Preference: Background Wifi Description (enabled) -->
+    <string name="sync_SPr_bgwifi_desc_enabled">Synchronizacja w tle przebiega tylko poprzez Wi-Fi
+    </string>
+    <!-- Preference: Background Wifi Description (disabled) -->
+    <string name="sync_SPr_bgwifi_desc_disabled">Synchronizowanie w tle zawsze, niezależnie od
+        rodzaju połączenia
+    </string>
+
+    <!-- Actions Group Label  -->
+    <string name="sync_SPr_group_actions">Działania</string>
+
+    <!-- Synchronize Now Button -->
+    <string name="sync_SPr_sync">Synchronizuj teraz</string>
+    <!-- Synchronize Now Button if not logged in-->
+    <string name="sync_SPr_sync_log_in">Zaloguj &amp; Synchronizuj!</string>
+
+    <!-- Sync: Prefix string before logged in identifier -->
+    <string name="sync_SPr_logged_in_prefix">Zalogowany jako:</string>
+
+    <!-- Sync: Last error -->
+    <string name="sync_SPr_last_error">Raport statusu</string>
+
+    <!-- Sync: last error click for more -->
+    <string name="sync_SPr_last_error_subtitle">Kliknij by wysłać raport do zespłu Astrid</string>
+    <!-- Sync: send error report button -->
+    <string name="sync_SPr_send_report">Wyślij raport</string>
+
+    <!-- Sync: Clear Data Title -->
+    <string name="sync_SPr_forget">Wyloguj</string>
+    <!-- Sync: Clear Data Description -->
+    <string name="sync_SPr_forget_description">Czyści wszystkie dane synchronizacji</string>
+
+    <!-- confirmation dialog for sync log out -->
+    <string name="sync_forget_confirm">Wyloguj / wyczyść dane synchronizacji?</string>
+
+    <!-- Sync error: network connectivity problems. %s-> name of sync service-->
+    <string name="sync_error_offline">Wystąpił problem łączenia się z siecią w trakcie ostatniej
+        synchronizacji z %s. Spróbuj później.
+    </string>
+
+    <string-array name="sync_SPr_interval_entries">
+        <!-- sync_SPr_interval_entries: Synchronization Intervals -->
+        <item>Wyłączone</item>
+        <item>co 15 minut</item>
+        <item>co 30 minut</item>
+        <item>co godzinę</item>
+        <item>co 3 godziny</item>
+        <item>co 6 godzin</item>
+        <item>co 12 godzin</item>
+        <item>raz dziennie</item>
+        <item>co 3 dni</item>
+        <item>co tydzień</item>
+    </string-array>
+
 </resources>
diff --git a/api/res/values-pt-rBR/strings.xml b/api/res/values-pt-rBR/strings.xml
index 93d77a5f4..147ac9bf1 100755
--- a/api/res/values-pt-rBR/strings.xml
+++ b/api/res/values-pt-rBR/strings.xml
@@ -4,243 +4,253 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ==================================================== Generic Units == -->
-  
-  <plurals name="DUt_years">
-    <!-- plurals: years -->
-    <item quantity="one">1 ano</item>
-    <!-- plurals: years -->
-    <item quantity="other">%d anos</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <!-- plurals: months -->
-    <item quantity="one">1 mês</item>
-    <!-- plurals: months -->
-    <item quantity="other">%d meses</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <!-- plurals: days -->
-    <item quantity="one">1 semana</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d semanas</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <!-- plurals: days -->
-    <item quantity="one">1 dia</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d dias</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <!-- plurals: days -->
-    <item quantity="one">1 dia útil</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d dias úteis</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <!-- plurals: hours -->
-    <item quantity="one">1 hora</item>
-    <!-- plurals: hours -->
-    <item quantity="other">%d horas</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <!-- plurals: minutes -->
-    <item quantity="one">1 minuto</item>
-    <!-- plurals: minutes -->
-    <item quantity="other">%d minutos</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <!-- plurals: seconds -->
-    <item quantity="one">1 segundo</item>
-    <!-- plurals: seconds -->
-    <item quantity="other">%d segundos</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="one">1 h</item>
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="other">%d h</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="one">1 min</item>
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="other">%d min</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="one">1 s</item>
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="other">%d s</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <!-- plurals: tasks -->
-    <item quantity="one">1 tarefa</item>
-    <!-- plurals: tasks -->
-    <item quantity="other">%d tarefas</item>
-  </plurals>
-  <plurals name="Npeople">
-    <!-- plurals: people -->
-    <item quantity="one">1 pessoa</item>
-    <!-- plurals: people -->
-    <item quantity="other">%d pessoas</item>
-  </plurals>
-  
-  <!-- slide 10a, 12c: today -->
-  <string name="today">Hoje</string>
-  
-  <!-- tomorrow -->
-  <string name="tomorrow">Amanhã</string>
-  
-  <!-- yesterday -->
-  <string name="yesterday">Ontem</string>
-  
-  <!-- slide 12c: tomorrow, abbreviated -->
-  <string name="tmrw">amanhã</string>
-  
-  <!-- slide 12c: yesterday, abbreviated -->
-  <string name="yest">ontem</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-  
-  <!-- confirmation dialog title -->
-  <string name="DLG_confirm_title">Confirmar?</string>
-  
-  <!-- question dialog title -->
-  <string name="DLG_question_title">Pergunta:</string>
-  
-  <!-- information dialog title -->
-  <string name="DLG_information_title">Informações</string>
-  
-  <!-- error dialog title -->
-  <string name="DLG_error_title">Erro!</string>
-  
-  <!-- general dialog save-->
-  <string name="DLG_save">Salvar</string>
-  
-  <!-- general dialog yes-->
-  <string name="DLG_yes">Sim</string>
-  
-  <!-- general dialog no-->
-  <string name="DLG_no">Não</string>
-  
-  <!-- general dialog close-->
-  <string name="DLG_close">Fechar</string>
-  
-  <!-- general dialog done -->
-  <string name="DLG_done">Feito</string>
-  
-  <!-- error dialog (%s => error message)-->
-  <string name="DLG_error">Opa, parece que ocorreu um erro! Aqui está o que aconteceu:\n\n%s</string>
-  
-  <!-- error dialog (no message indicated)-->
-  <string name="DLG_error_generic">Opa, parece que ocorreu um erro!</string>
-  
-  <!-- Progress dialog shown when doing something slow -->
-  <string name="DLG_wait">Por favor, aguarde...</string>
-
- <!-- ====================================================== SyncProvider == -->
-          
-  <!-- Sync Notification: message when sync service active -->
-  <string name="SyP_progress">Sincronizando suas tarefas...</string>
-  
-  <!-- Sync Notification: toast when sync activated from activity -->
-  <string name="SyP_progress_toast">Sincronizando...</string>
-  
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="SyP_label">Sincronização</string>  
-
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="Sync_now_label">Sync now</string>  
-
-  <!-- Sync label subtitle -->
-  <string name="SyP_summary">Astrid.com, Google Tasks, dados salvos, backup local</string>  
-
-  <!-- Error msg when io exception  -->
-  <string name="SyP_ioerror">Erro na Conexão! Verifique sua conexão com a internet.</string>
-
-  <!-- ================================================== SyncPreferences == -->
-  
-  <!-- Status Group Label -->    
-  <string name="sync_SPr_group_status">Estado</string>
-  
-  <!-- Sync status subtitle, %s-> status message -->
-  <string name="sync_SPr_status_subtitle">Status: %s</string>
-  <!-- Sync Status: log in -->    
-  <string name="sync_status_loggedout">Não Registrado</string>
-  <!-- Status: ongoing -->    
-  <string name="sync_status_ongoing">Sincronizando...</string>
-  <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Última sincronização:\n%s</string>
-  <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
-  <string name="sync_status_failed">Falhou em: %s</string>
-  <!-- Sync Status: error status (%s -> last sync date) -->    
-  <string name="sync_status_errors">Sicronizou com erros: %s</string>
-  <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
-  <string name="sync_status_failed_subtitle">Última sincronização com sucesso: %s</string>
-  <!-- Sync Status: never sync\'d -->    
-  <string name="sync_status_never">Nunca sincronizado!</string>
-
-  <!-- Options Group Label -->    
-  <string name="sync_SPr_group_options">Opções</string>
-
-  <!-- Preference: Synchronization Interval Title -->    
-  <string name="sync_SPr_interval_title">Sincronização em segundo plano</string>
-  <!-- Preference: Synchronization Interval Description (when disabled) -->
-  <string name="sync_SPr_interval_desc_disabled">O serviço de sincronização em segundo plano está desativado</string>    
-  <!-- Preference: Synchronization Interval Description (%s => setting) -->
-  <string name="sync_SPr_interval_desc">Atualmente definido para: %s</string>
-  
-  <!-- Preference: Background Wifi Title -->  
-  <string name="sync_SPr_bgwifi_title">Configuração Somente Wifi</string>    
-  <!-- Preference: Background Wifi Description (enabled) -->
-  <string name="sync_SPr_bgwifi_desc_enabled">Sincronização em segundo plano só ocorre se conectado ao Wifi</string>    
-  <!-- Preference: Background Wifi Description (disabled) -->
-  <string name="sync_SPr_bgwifi_desc_disabled">Sincronização em segundo plano sempre ocorre</string>
-  
-  <!-- Actions Group Label  -->
-  <string name="sync_SPr_group_actions">Ações</string>
-
-  <!-- Synchronize Now Button -->    
-  <string name="sync_SPr_sync">Sincronizar agora</string>
-  <!-- Synchronize Now Button if not logged in-->    
-  <string name="sync_SPr_sync_log_in">Conectar e sincronizar!</string>
-  
-  <!-- Sync: Prefix string before logged in identifier -->
-  <string name="sync_SPr_logged_in_prefix">Conectado como:</string>
-  
-  <!-- Sync: Last error -->
-  <string name="sync_SPr_last_error">Relatório de status</string>
-  
-  <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Clique para enviar um relatório para a equipe do Astrid</string>
-  <!-- Sync: send error report button -->
-  <string name="sync_SPr_send_report">Enviar relatório</string>
-  
-  <!-- Sync: Clear Data Title -->
-  <string name="sync_SPr_forget">Desconectar</string>
-  <!-- Sync: Clear Data Description -->
-  <string name="sync_SPr_forget_description">Limpar todos os dados de sincronização</string>
-
-  <!-- confirmation dialog for sync log out -->
-  <string name="sync_forget_confirm">Desconectar / limpar dados de sincronização?</string>
-  
-  <!-- Sync error: network connectivity problems. %s-> name of sync service-->
-  <string name="sync_error_offline">Houve um problema na conexão durante a última sincronia com %s. Por favor tente novamente mais tarde.</string>
-  
-  <string-array name="sync_SPr_interval_entries">
-      <!-- sync_SPr_interval_entries: Synchronization Intervals -->
-      <item>desabilitar</item>
-      <item>a cada quinze minutos</item>
-      <item>a cada trinta minutos</item>
-      <item>a cada hora</item>
-      <item>a cada três horas</item>
-      <item>a cada seis horas</item>
-      <item>a cada doze horas</item>
-      <item>diariamente</item>
-      <item>a cada três dias</item>
-      <item>semanalmente</item>
-  </string-array>    
-    
+<resources>
+
+    <!-- ==================================================== Generic Units == -->
+
+    <plurals name="DUt_years">
+        <!-- plurals: years -->
+        <item quantity="one">1 ano</item>
+        <!-- plurals: years -->
+        <item quantity="other">%d anos</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <!-- plurals: months -->
+        <item quantity="one">1 mês</item>
+        <!-- plurals: months -->
+        <item quantity="other">%d meses</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <!-- plurals: days -->
+        <item quantity="one">1 semana</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d semanas</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <!-- plurals: days -->
+        <item quantity="one">1 dia</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d dias</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <!-- plurals: days -->
+        <item quantity="one">1 dia útil</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d dias úteis</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <!-- plurals: hours -->
+        <item quantity="one">1 hora</item>
+        <!-- plurals: hours -->
+        <item quantity="other">%d horas</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <!-- plurals: minutes -->
+        <item quantity="one">1 minuto</item>
+        <!-- plurals: minutes -->
+        <item quantity="other">%d minutos</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <!-- plurals: seconds -->
+        <item quantity="one">1 segundo</item>
+        <!-- plurals: seconds -->
+        <item quantity="other">%d segundos</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="one">1 h</item>
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="other">%d h</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="one">1 min</item>
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="other">%d min</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="one">1 s</item>
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="other">%d s</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <!-- plurals: tasks -->
+        <item quantity="one">1 tarefa</item>
+        <!-- plurals: tasks -->
+        <item quantity="other">%d tarefas</item>
+    </plurals>
+    <plurals name="Npeople">
+        <!-- plurals: people -->
+        <item quantity="one">1 pessoa</item>
+        <!-- plurals: people -->
+        <item quantity="other">%d pessoas</item>
+    </plurals>
+
+    <!-- slide 10a, 12c: today -->
+    <string name="today">Hoje</string>
+
+    <!-- tomorrow -->
+    <string name="tomorrow">Amanhã</string>
+
+    <!-- yesterday -->
+    <string name="yesterday">Ontem</string>
+
+    <!-- slide 12c: tomorrow, abbreviated -->
+    <string name="tmrw">amanhã</string>
+
+    <!-- slide 12c: yesterday, abbreviated -->
+    <string name="yest">ontem</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- confirmation dialog title -->
+    <string name="DLG_confirm_title">Confirmar?</string>
+
+    <!-- question dialog title -->
+    <string name="DLG_question_title">Pergunta:</string>
+
+    <!-- information dialog title -->
+    <string name="DLG_information_title">Informações</string>
+
+    <!-- error dialog title -->
+    <string name="DLG_error_title">Erro!</string>
+
+    <!-- general dialog save-->
+    <string name="DLG_save">Salvar</string>
+
+    <!-- general dialog yes-->
+    <string name="DLG_yes">Sim</string>
+
+    <!-- general dialog no-->
+    <string name="DLG_no">Não</string>
+
+    <!-- general dialog close-->
+    <string name="DLG_close">Fechar</string>
+
+    <!-- general dialog done -->
+    <string name="DLG_done">Feito</string>
+
+    <!-- error dialog (%s => error message)-->
+    <string name="DLG_error">Opa, parece que ocorreu um erro! Aqui está o que aconteceu:\n\n%s
+    </string>
+
+    <!-- error dialog (no message indicated)-->
+    <string name="DLG_error_generic">Opa, parece que ocorreu um erro!</string>
+
+    <!-- Progress dialog shown when doing something slow -->
+    <string name="DLG_wait">Por favor, aguarde...</string>
+
+    <!-- ====================================================== SyncProvider == -->
+
+    <!-- Sync Notification: message when sync service active -->
+    <string name="SyP_progress">Sincronizando suas tarefas...</string>
+
+    <!-- Sync Notification: toast when sync activated from activity -->
+    <string name="SyP_progress_toast">Sincronizando...</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="SyP_label">Sincronização</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="Sync_now_label">Sync now</string>
+
+    <!-- Sync label subtitle -->
+    <string name="SyP_summary">Astrid.com, Google Tasks, dados salvos, backup local</string>
+
+    <!-- Error msg when io exception  -->
+    <string name="SyP_ioerror">Erro na Conexão! Verifique sua conexão com a internet.</string>
+
+    <!-- ================================================== SyncPreferences == -->
+
+    <!-- Status Group Label -->
+    <string name="sync_SPr_group_status">Estado</string>
+
+    <!-- Sync status subtitle, %s-> status message -->
+    <string name="sync_SPr_status_subtitle">Status: %s</string>
+    <!-- Sync Status: log in -->
+    <string name="sync_status_loggedout">Não Registrado</string>
+    <!-- Status: ongoing -->
+    <string name="sync_status_ongoing">Sincronizando...</string>
+    <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
+    <string name="sync_status_success">Última sincronização:\n%s</string>
+    <!-- Sync Status: failure status (%s -> last attempted sync date) -->
+    <string name="sync_status_failed">Falhou em: %s</string>
+    <!-- Sync Status: error status (%s -> last sync date) -->
+    <string name="sync_status_errors">Sicronizou com erros: %s</string>
+    <!-- Sync Status: error subtitle (%s -> last successful sync date) -->
+    <string name="sync_status_failed_subtitle">Última sincronização com sucesso: %s</string>
+    <!-- Sync Status: never sync\'d -->
+    <string name="sync_status_never">Nunca sincronizado!</string>
+
+    <!-- Options Group Label -->
+    <string name="sync_SPr_group_options">Opções</string>
+
+    <!-- Preference: Synchronization Interval Title -->
+    <string name="sync_SPr_interval_title">Sincronização em segundo plano</string>
+    <!-- Preference: Synchronization Interval Description (when disabled) -->
+    <string name="sync_SPr_interval_desc_disabled">O serviço de sincronização em segundo plano está
+        desativado
+    </string>
+    <!-- Preference: Synchronization Interval Description (%s => setting) -->
+    <string name="sync_SPr_interval_desc">Atualmente definido para: %s</string>
+
+    <!-- Preference: Background Wifi Title -->
+    <string name="sync_SPr_bgwifi_title">Configuração Somente Wifi</string>
+    <!-- Preference: Background Wifi Description (enabled) -->
+    <string name="sync_SPr_bgwifi_desc_enabled">Sincronização em segundo plano só ocorre se
+        conectado ao Wifi
+    </string>
+    <!-- Preference: Background Wifi Description (disabled) -->
+    <string name="sync_SPr_bgwifi_desc_disabled">Sincronização em segundo plano sempre ocorre
+    </string>
+
+    <!-- Actions Group Label  -->
+    <string name="sync_SPr_group_actions">Ações</string>
+
+    <!-- Synchronize Now Button -->
+    <string name="sync_SPr_sync">Sincronizar agora</string>
+    <!-- Synchronize Now Button if not logged in-->
+    <string name="sync_SPr_sync_log_in">Conectar e sincronizar!</string>
+
+    <!-- Sync: Prefix string before logged in identifier -->
+    <string name="sync_SPr_logged_in_prefix">Conectado como:</string>
+
+    <!-- Sync: Last error -->
+    <string name="sync_SPr_last_error">Relatório de status</string>
+
+    <!-- Sync: last error click for more -->
+    <string name="sync_SPr_last_error_subtitle">Clique para enviar um relatório para a equipe do
+        Astrid
+    </string>
+    <!-- Sync: send error report button -->
+    <string name="sync_SPr_send_report">Enviar relatório</string>
+
+    <!-- Sync: Clear Data Title -->
+    <string name="sync_SPr_forget">Desconectar</string>
+    <!-- Sync: Clear Data Description -->
+    <string name="sync_SPr_forget_description">Limpar todos os dados de sincronização</string>
+
+    <!-- confirmation dialog for sync log out -->
+    <string name="sync_forget_confirm">Desconectar / limpar dados de sincronização?</string>
+
+    <!-- Sync error: network connectivity problems. %s-> name of sync service-->
+    <string name="sync_error_offline">Houve um problema na conexão durante a última sincronia com
+        %s. Por favor tente novamente mais tarde.
+    </string>
+
+    <string-array name="sync_SPr_interval_entries">
+        <!-- sync_SPr_interval_entries: Synchronization Intervals -->
+        <item>desabilitar</item>
+        <item>a cada quinze minutos</item>
+        <item>a cada trinta minutos</item>
+        <item>a cada hora</item>
+        <item>a cada três horas</item>
+        <item>a cada seis horas</item>
+        <item>a cada doze horas</item>
+        <item>diariamente</item>
+        <item>a cada três dias</item>
+        <item>semanalmente</item>
+    </string-array>
+
 </resources>
diff --git a/api/res/values-pt/strings.xml b/api/res/values-pt/strings.xml
index 4a32bbc53..23f4ae240 100644
--- a/api/res/values-pt/strings.xml
+++ b/api/res/values-pt/strings.xml
@@ -1,85 +1,85 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <plurals name="DUt_years">
-    <item quantity="one">1 Ano</item>
-    <item quantity="other">%d Anos</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <item quantity="one">1 Mês</item>
-    <item quantity="other">%d Meses</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <item quantity="one">1 Semana</item>
-    <item quantity="other">%d Semanas</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <item quantity="one">1 Dia</item>
-    <item quantity="other">%d Dias</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <item quantity="one">1 Weekday</item>
-    <item quantity="other">%d Weekdays</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <item quantity="one">1 Hora</item>
-    <item quantity="other">%d Horas</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <item quantity="one">1 Minuto</item>
-    <item quantity="other">%d Minutos</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <item quantity="one">1 Segundo</item>
-    <item quantity="other">%d Segundos</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <item quantity="one">1 h</item>
-    <item quantity="other">%d h</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <item quantity="one">1 min</item>
-    <item quantity="other">%d min</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <item quantity="one">1 s</item>
-    <item quantity="other">%d s</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <item quantity="one">1 tarefa</item>
-    <item quantity="other">%d tarefas</item>
-  </plurals>
-  <plurals name="Npeople">
-    <item quantity="one">1 person</item>
-    <item quantity="other">%d people</item>
-  </plurals>
-  <string name="today">Hoje</string>
-  <string name="tomorrow">Amanhã</string>
-  <string name="yesterday">Ontem</string>
-  <string name="DLG_confirm_title">Confirma?</string>
-  <string name="DLG_question_title">Pergunta:</string>
-  <string name="DLG_information_title">Informação</string>
-  <string name="DLG_save">Guardar</string>
-  <string name="DLG_yes">Sim</string>
-  <string name="DLG_no">Não</string>
-  <string name="DLG_close">Fechar</string>
-  <string name="DLG_done">Concluído</string>
-  <string name="DLG_wait">Por favor aguarde...</string>
-  <string name="SyP_progress_toast">A Sincronizar...</string>
-  <string name="SyP_label">Sincronização</string>
-  <string name="sync_SPr_group_status">Estado</string>
-  <string name="sync_SPr_group_options">Opções</string>
-  <string name="sync_SPr_group_actions">Acções</string>
-  <string name="sync_SPr_forget">Terminar sessão</string>
-  <string-array name="sync_SPr_interval_entries">
-    <item>desactivar</item>
-    <item>every fifteen minutes</item>
-    <item>every thirty minutes</item>
-    <item>every hour</item>
-    <item>every three hours</item>
-    <item>every six hours</item>
-    <item>every twelve hours</item>
-    <item>every day</item>
-    <item>every three days</item>
-    <item>every week</item>
-  </string-array>
+    <plurals name="DUt_years">
+        <item quantity="one">1 Ano</item>
+        <item quantity="other">%d Anos</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <item quantity="one">1 Mês</item>
+        <item quantity="other">%d Meses</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <item quantity="one">1 Semana</item>
+        <item quantity="other">%d Semanas</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <item quantity="one">1 Dia</item>
+        <item quantity="other">%d Dias</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <item quantity="one">1 Weekday</item>
+        <item quantity="other">%d Weekdays</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <item quantity="one">1 Hora</item>
+        <item quantity="other">%d Horas</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <item quantity="one">1 Minuto</item>
+        <item quantity="other">%d Minutos</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <item quantity="one">1 Segundo</item>
+        <item quantity="other">%d Segundos</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <item quantity="one">1 h</item>
+        <item quantity="other">%d h</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <item quantity="one">1 min</item>
+        <item quantity="other">%d min</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <item quantity="one">1 s</item>
+        <item quantity="other">%d s</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <item quantity="one">1 tarefa</item>
+        <item quantity="other">%d tarefas</item>
+    </plurals>
+    <plurals name="Npeople">
+        <item quantity="one">1 person</item>
+        <item quantity="other">%d people</item>
+    </plurals>
+    <string name="today">Hoje</string>
+    <string name="tomorrow">Amanhã</string>
+    <string name="yesterday">Ontem</string>
+    <string name="DLG_confirm_title">Confirma?</string>
+    <string name="DLG_question_title">Pergunta:</string>
+    <string name="DLG_information_title">Informação</string>
+    <string name="DLG_save">Guardar</string>
+    <string name="DLG_yes">Sim</string>
+    <string name="DLG_no">Não</string>
+    <string name="DLG_close">Fechar</string>
+    <string name="DLG_done">Concluído</string>
+    <string name="DLG_wait">Por favor aguarde...</string>
+    <string name="SyP_progress_toast">A Sincronizar...</string>
+    <string name="SyP_label">Sincronização</string>
+    <string name="sync_SPr_group_status">Estado</string>
+    <string name="sync_SPr_group_options">Opções</string>
+    <string name="sync_SPr_group_actions">Acções</string>
+    <string name="sync_SPr_forget">Terminar sessão</string>
+    <string-array name="sync_SPr_interval_entries">
+        <item>desactivar</item>
+        <item>every fifteen minutes</item>
+        <item>every thirty minutes</item>
+        <item>every hour</item>
+        <item>every three hours</item>
+        <item>every six hours</item>
+        <item>every twelve hours</item>
+        <item>every day</item>
+        <item>every three days</item>
+        <item>every week</item>
+    </string-array>
 </resources>
diff --git a/api/res/values-ru/strings.xml b/api/res/values-ru/strings.xml
index d6b15977e..a76e6d36f 100755
--- a/api/res/values-ru/strings.xml
+++ b/api/res/values-ru/strings.xml
@@ -4,243 +4,249 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ==================================================== Generic Units == -->
-  
-  <plurals name="DUt_years">
-    <!-- plurals: years -->
-    <item quantity="one">1 год</item>
-    <!-- plurals: years -->
-    <item quantity="other">%d года/лет</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <!-- plurals: months -->
-    <item quantity="one">1 месяц</item>
-    <!-- plurals: months -->
-    <item quantity="other">%d месяца/месяцев</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <!-- plurals: days -->
-    <item quantity="one">1 неделя</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d недели/недель</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <!-- plurals: days -->
-    <item quantity="one">1 день</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d дня/дней</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <!-- plurals: days -->
-    <item quantity="one">1 рабочий день</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d рабочих дня</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <!-- plurals: hours -->
-    <item quantity="one">1 час</item>
-    <!-- plurals: hours -->
-    <item quantity="other">%d часа/часов</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <!-- plurals: minutes -->
-    <item quantity="one">1 минута</item>
-    <!-- plurals: minutes -->
-    <item quantity="other">%d минуты/минут</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <!-- plurals: seconds -->
-    <item quantity="one">1 секунда</item>
-    <!-- plurals: seconds -->
-    <item quantity="other">%d секунды/секунд</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="one">1 час</item>
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="other">%d ч</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="one">1 мин</item>
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="other">%d мин</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="one">1 с</item>
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="other">%d с</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <!-- plurals: tasks -->
-    <item quantity="one">1 задача</item>
-    <!-- plurals: tasks -->
-    <item quantity="other">%d задач(а/и)</item>
-  </plurals>
-  <plurals name="Npeople">
-    <!-- plurals: people -->
-    <item quantity="one">1 человек</item>
-    <!-- plurals: people -->
-    <item quantity="other">%d человек</item>
-  </plurals>
-  
-  <!-- slide 10a, 12c: today -->
-  <string name="today">Сегодня</string>
-  
-  <!-- tomorrow -->
-  <string name="tomorrow">Завтра</string>
-  
-  <!-- yesterday -->
-  <string name="yesterday">Вчера</string>
-  
-  <!-- slide 12c: tomorrow, abbreviated -->
-  <string name="tmrw">Завт</string>
-  
-  <!-- slide 12c: yesterday, abbreviated -->
-  <string name="yest">Сег</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-  
-  <!-- confirmation dialog title -->
-  <string name="DLG_confirm_title">Подтвердить?</string>
-  
-  <!-- question dialog title -->
-  <string name="DLG_question_title">Вопрос:</string>
-  
-  <!-- information dialog title -->
-  <string name="DLG_information_title">Информация</string>
-  
-  <!-- error dialog title -->
-  <string name="DLG_error_title">Ошибка!</string>
-  
-  <!-- general dialog save-->
-  <string name="DLG_save">Готово</string>
-  
-  <!-- general dialog yes-->
-  <string name="DLG_yes">Да</string>
-  
-  <!-- general dialog no-->
-  <string name="DLG_no">Нет</string>
-  
-  <!-- general dialog close-->
-  <string name="DLG_close">Закрыть</string>
-  
-  <!-- general dialog done -->
-  <string name="DLG_done">Готово</string>
-  
-  <!-- error dialog (%s => error message)-->
-  <string name="DLG_error">Ой, похоже произошла ошибка! Подробности ниже:\n\n%s</string>
-  
-  <!-- error dialog (no message indicated)-->
-  <string name="DLG_error_generic">Ой, похоже произошла ошибка!</string>
-  
-  <!-- Progress dialog shown when doing something slow -->
-  <string name="DLG_wait">Пожалуйста, подождите…</string>
-
- <!-- ====================================================== SyncProvider == -->
-          
-  <!-- Sync Notification: message when sync service active -->
-  <string name="SyP_progress">Синхронизация задач…</string>
-  
-  <!-- Sync Notification: toast when sync activated from activity -->
-  <string name="SyP_progress_toast">Синхронизация…</string>
-  
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="SyP_label">Синхронизация</string>  
-
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="Sync_now_label">Синхронизировать</string>  
-
-  <!-- Sync label subtitle -->
-  <string name="SyP_summary">Astrid.com, Задачи Google, сохраненные данные, локальная резервная копия</string>  
-
-  <!-- Error msg when io exception  -->
-  <string name="SyP_ioerror">Ошибка соединения! Проверьте подключение к интернету.</string>
-
-  <!-- ================================================== SyncPreferences == -->
-  
-  <!-- Status Group Label -->    
-  <string name="sync_SPr_group_status">Состояние</string>
-  
-  <!-- Sync status subtitle, %s-> status message -->
-  <string name="sync_SPr_status_subtitle">Состояние: %s</string>
-  <!-- Sync Status: log in -->    
-  <string name="sync_status_loggedout">Вход не выполнен</string>
-  <!-- Status: ongoing -->    
-  <string name="sync_status_ongoing">Процесс синхронизации…</string>
-  <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Последняя синхронизация\n%s</string>
-  <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
-  <string name="sync_status_failed">Ошибка: %s</string>
-  <!-- Sync Status: error status (%s -> last sync date) -->    
-  <string name="sync_status_errors">Синхронизировано с ошибками: %s</string>
-  <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
-  <string name="sync_status_failed_subtitle">Последняя успешная синхронизация: %s</string>
-  <!-- Sync Status: never sync\'d -->    
-  <string name="sync_status_never">Синхронизаций не выполнялось!</string>
-
-  <!-- Options Group Label -->    
-  <string name="sync_SPr_group_options">Параметры</string>
-
-  <!-- Preference: Synchronization Interval Title -->    
-  <string name="sync_SPr_interval_title">Фоновая синхронизация</string>
-  <!-- Preference: Synchronization Interval Description (when disabled) -->
-  <string name="sync_SPr_interval_desc_disabled">Фоновая синхронизация отключена</string>    
-  <!-- Preference: Synchronization Interval Description (%s => setting) -->
-  <string name="sync_SPr_interval_desc">Сейчас установлено: %s</string>
-  
-  <!-- Preference: Background Wifi Title -->  
-  <string name="sync_SPr_bgwifi_title">Только через Wifi</string>    
-  <!-- Preference: Background Wifi Description (enabled) -->
-  <string name="sync_SPr_bgwifi_desc_enabled">Фоновая синхронизация происходит только через Wifi</string>    
-  <!-- Preference: Background Wifi Description (disabled) -->
-  <string name="sync_SPr_bgwifi_desc_disabled">Фоновая синхронизация происходит всегда</string>
-  
-  <!-- Actions Group Label  -->
-  <string name="sync_SPr_group_actions">Действия</string>
-
-  <!-- Synchronize Now Button -->    
-  <string name="sync_SPr_sync">Синхронизировать</string>
-  <!-- Synchronize Now Button if not logged in-->    
-  <string name="sync_SPr_sync_log_in">Войти и синхронизировать!</string>
-  
-  <!-- Sync: Prefix string before logged in identifier -->
-  <string name="sync_SPr_logged_in_prefix">Вы вошли в систему как:</string>
-  
-  <!-- Sync: Last error -->
-  <string name="sync_SPr_last_error">Отчёт о состоянии</string>
-  
-  <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Нажмите, чтобы отправить отчет команде Astrid</string>
-  <!-- Sync: send error report button -->
-  <string name="sync_SPr_send_report">Отправить отчет</string>
-  
-  <!-- Sync: Clear Data Title -->
-  <string name="sync_SPr_forget">Выйти</string>
-  <!-- Sync: Clear Data Description -->
-  <string name="sync_SPr_forget_description">Очищает все данные синхронизации</string>
-
-  <!-- confirmation dialog for sync log out -->
-  <string name="sync_forget_confirm">Выйти / очистить данные синхронизации?</string>
-  
-  <!-- Sync error: network connectivity problems. %s-> name of sync service-->
-  <string name="sync_error_offline">В процессе последней синхронизации с %s возникли проблемы подключения к сети. Пожалуйста, повторите попытку позже.</string>
-  
-  <string-array name="sync_SPr_interval_entries">
-      <!-- sync_SPr_interval_entries: Synchronization Intervals -->
-      <item>отключить</item>
-      <item>каждые 15 минут</item>
-      <item>каждые 30 минут</item>
-      <item>каждый час</item>
-      <item>каждые 3 часа</item>
-      <item>каждые 6 часов</item>
-      <item>каждые 12 часов</item>
-      <item>каждый день</item>
-      <item>каждые 3 дня</item>
-      <item>каждую неделю</item>
-  </string-array>    
-    
+<resources>
+
+    <!-- ==================================================== Generic Units == -->
+
+    <plurals name="DUt_years">
+        <!-- plurals: years -->
+        <item quantity="one">1 год</item>
+        <!-- plurals: years -->
+        <item quantity="other">%d года/лет</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <!-- plurals: months -->
+        <item quantity="one">1 месяц</item>
+        <!-- plurals: months -->
+        <item quantity="other">%d месяца/месяцев</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <!-- plurals: days -->
+        <item quantity="one">1 неделя</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d недели/недель</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <!-- plurals: days -->
+        <item quantity="one">1 день</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d дня/дней</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <!-- plurals: days -->
+        <item quantity="one">1 рабочий день</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d рабочих дня</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <!-- plurals: hours -->
+        <item quantity="one">1 час</item>
+        <!-- plurals: hours -->
+        <item quantity="other">%d часа/часов</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <!-- plurals: minutes -->
+        <item quantity="one">1 минута</item>
+        <!-- plurals: minutes -->
+        <item quantity="other">%d минуты/минут</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <!-- plurals: seconds -->
+        <item quantity="one">1 секунда</item>
+        <!-- plurals: seconds -->
+        <item quantity="other">%d секунды/секунд</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="one">1 час</item>
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="other">%d ч</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="one">1 мин</item>
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="other">%d мин</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="one">1 с</item>
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="other">%d с</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <!-- plurals: tasks -->
+        <item quantity="one">1 задача</item>
+        <!-- plurals: tasks -->
+        <item quantity="other">%d задач(а/и)</item>
+    </plurals>
+    <plurals name="Npeople">
+        <!-- plurals: people -->
+        <item quantity="one">1 человек</item>
+        <!-- plurals: people -->
+        <item quantity="other">%d человек</item>
+    </plurals>
+
+    <!-- slide 10a, 12c: today -->
+    <string name="today">Сегодня</string>
+
+    <!-- tomorrow -->
+    <string name="tomorrow">Завтра</string>
+
+    <!-- yesterday -->
+    <string name="yesterday">Вчера</string>
+
+    <!-- slide 12c: tomorrow, abbreviated -->
+    <string name="tmrw">Завт</string>
+
+    <!-- slide 12c: yesterday, abbreviated -->
+    <string name="yest">Сег</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- confirmation dialog title -->
+    <string name="DLG_confirm_title">Подтвердить?</string>
+
+    <!-- question dialog title -->
+    <string name="DLG_question_title">Вопрос:</string>
+
+    <!-- information dialog title -->
+    <string name="DLG_information_title">Информация</string>
+
+    <!-- error dialog title -->
+    <string name="DLG_error_title">Ошибка!</string>
+
+    <!-- general dialog save-->
+    <string name="DLG_save">Готово</string>
+
+    <!-- general dialog yes-->
+    <string name="DLG_yes">Да</string>
+
+    <!-- general dialog no-->
+    <string name="DLG_no">Нет</string>
+
+    <!-- general dialog close-->
+    <string name="DLG_close">Закрыть</string>
+
+    <!-- general dialog done -->
+    <string name="DLG_done">Готово</string>
+
+    <!-- error dialog (%s => error message)-->
+    <string name="DLG_error">Ой, похоже произошла ошибка! Подробности ниже:\n\n%s</string>
+
+    <!-- error dialog (no message indicated)-->
+    <string name="DLG_error_generic">Ой, похоже произошла ошибка!</string>
+
+    <!-- Progress dialog shown when doing something slow -->
+    <string name="DLG_wait">Пожалуйста, подождите…</string>
+
+    <!-- ====================================================== SyncProvider == -->
+
+    <!-- Sync Notification: message when sync service active -->
+    <string name="SyP_progress">Синхронизация задач…</string>
+
+    <!-- Sync Notification: toast when sync activated from activity -->
+    <string name="SyP_progress_toast">Синхронизация…</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="SyP_label">Синхронизация</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="Sync_now_label">Синхронизировать</string>
+
+    <!-- Sync label subtitle -->
+    <string name="SyP_summary">Astrid.com, Задачи Google, сохраненные данные, локальная резервная
+        копия
+    </string>
+
+    <!-- Error msg when io exception  -->
+    <string name="SyP_ioerror">Ошибка соединения! Проверьте подключение к интернету.</string>
+
+    <!-- ================================================== SyncPreferences == -->
+
+    <!-- Status Group Label -->
+    <string name="sync_SPr_group_status">Состояние</string>
+
+    <!-- Sync status subtitle, %s-> status message -->
+    <string name="sync_SPr_status_subtitle">Состояние: %s</string>
+    <!-- Sync Status: log in -->
+    <string name="sync_status_loggedout">Вход не выполнен</string>
+    <!-- Status: ongoing -->
+    <string name="sync_status_ongoing">Процесс синхронизации…</string>
+    <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
+    <string name="sync_status_success">Последняя синхронизация\n%s</string>
+    <!-- Sync Status: failure status (%s -> last attempted sync date) -->
+    <string name="sync_status_failed">Ошибка: %s</string>
+    <!-- Sync Status: error status (%s -> last sync date) -->
+    <string name="sync_status_errors">Синхронизировано с ошибками: %s</string>
+    <!-- Sync Status: error subtitle (%s -> last successful sync date) -->
+    <string name="sync_status_failed_subtitle">Последняя успешная синхронизация: %s</string>
+    <!-- Sync Status: never sync\'d -->
+    <string name="sync_status_never">Синхронизаций не выполнялось!</string>
+
+    <!-- Options Group Label -->
+    <string name="sync_SPr_group_options">Параметры</string>
+
+    <!-- Preference: Synchronization Interval Title -->
+    <string name="sync_SPr_interval_title">Фоновая синхронизация</string>
+    <!-- Preference: Synchronization Interval Description (when disabled) -->
+    <string name="sync_SPr_interval_desc_disabled">Фоновая синхронизация отключена</string>
+    <!-- Preference: Synchronization Interval Description (%s => setting) -->
+    <string name="sync_SPr_interval_desc">Сейчас установлено: %s</string>
+
+    <!-- Preference: Background Wifi Title -->
+    <string name="sync_SPr_bgwifi_title">Только через Wifi</string>
+    <!-- Preference: Background Wifi Description (enabled) -->
+    <string name="sync_SPr_bgwifi_desc_enabled">Фоновая синхронизация происходит только через Wifi
+    </string>
+    <!-- Preference: Background Wifi Description (disabled) -->
+    <string name="sync_SPr_bgwifi_desc_disabled">Фоновая синхронизация происходит всегда</string>
+
+    <!-- Actions Group Label  -->
+    <string name="sync_SPr_group_actions">Действия</string>
+
+    <!-- Synchronize Now Button -->
+    <string name="sync_SPr_sync">Синхронизировать</string>
+    <!-- Synchronize Now Button if not logged in-->
+    <string name="sync_SPr_sync_log_in">Войти и синхронизировать!</string>
+
+    <!-- Sync: Prefix string before logged in identifier -->
+    <string name="sync_SPr_logged_in_prefix">Вы вошли в систему как:</string>
+
+    <!-- Sync: Last error -->
+    <string name="sync_SPr_last_error">Отчёт о состоянии</string>
+
+    <!-- Sync: last error click for more -->
+    <string name="sync_SPr_last_error_subtitle">Нажмите, чтобы отправить отчет команде Astrid
+    </string>
+    <!-- Sync: send error report button -->
+    <string name="sync_SPr_send_report">Отправить отчет</string>
+
+    <!-- Sync: Clear Data Title -->
+    <string name="sync_SPr_forget">Выйти</string>
+    <!-- Sync: Clear Data Description -->
+    <string name="sync_SPr_forget_description">Очищает все данные синхронизации</string>
+
+    <!-- confirmation dialog for sync log out -->
+    <string name="sync_forget_confirm">Выйти / очистить данные синхронизации?</string>
+
+    <!-- Sync error: network connectivity problems. %s-> name of sync service-->
+    <string name="sync_error_offline">В процессе последней синхронизации с %s возникли проблемы
+        подключения к сети. Пожалуйста, повторите попытку позже.
+    </string>
+
+    <string-array name="sync_SPr_interval_entries">
+        <!-- sync_SPr_interval_entries: Synchronization Intervals -->
+        <item>отключить</item>
+        <item>каждые 15 минут</item>
+        <item>каждые 30 минут</item>
+        <item>каждый час</item>
+        <item>каждые 3 часа</item>
+        <item>каждые 6 часов</item>
+        <item>каждые 12 часов</item>
+        <item>каждый день</item>
+        <item>каждые 3 дня</item>
+        <item>каждую неделю</item>
+    </string-array>
+
 </resources>
diff --git a/api/res/values-sv/strings.xml b/api/res/values-sv/strings.xml
index ab1a98f19..b96effc83 100755
--- a/api/res/values-sv/strings.xml
+++ b/api/res/values-sv/strings.xml
@@ -4,244 +4,250 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ==================================================== Generic Units == -->
-  
-  <plurals name="DUt_years">
-    <!-- plurals: years -->
-    <item quantity="one">1 år</item>
-    <!-- plurals: years -->
-    <item quantity="other">%d år</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <!-- plurals: months -->
-    <item quantity="one">1 månad</item>
-    <!-- plurals: months -->
-    <item quantity="other">%d månader</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <!-- plurals: days -->
-    <item quantity="one">1 vecka</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d veckor</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <!-- plurals: days -->
-    <item quantity="one">1 dag</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d dagar</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <!-- plurals: days -->
-    <item quantity="one">1 Veckodag</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d Veckodagar</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <!-- plurals: hours -->
-    <item quantity="one">1 timme</item>
-    <!-- plurals: hours -->
-    <item quantity="other">%d timmar</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <!-- plurals: minutes -->
-    <item quantity="one">1 minut</item>
-    <!-- plurals: minutes -->
-    <item quantity="other">%d minuter</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <!-- plurals: seconds -->
-    <item quantity="one">1 sekund</item>
-    <!-- plurals: seconds -->
-    <item quantity="other">%d sekunder</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="one">1 tim</item>
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="other">%d tim</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="one">1 min</item>
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="other">%d min</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="one">1 sek</item>
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="other">%d sek</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <!-- plurals: tasks -->
-    <item quantity="one">1 uppgift</item>
-    <!-- plurals: tasks -->
-    <item quantity="other">%d uppgifter</item>
-  </plurals>
-  <plurals name="Npeople">
-    <!-- plurals: people -->
-    <item quantity="one">1 person</item>
-    <!-- plurals: people -->
-    <item quantity="other">%d personer</item>
-  </plurals>
-  
-  <!-- slide 10a, 12c: today -->
-  <string name="today">Today</string>
-  
-  <!-- tomorrow -->
-  <string name="tomorrow">Tomorrow</string>
-  
-  <!-- yesterday -->
-  <string name="yesterday">Igår</string>
-  
-  <!-- slide 12c: tomorrow, abbreviated -->
-  <string name="tmrw">imorn</string>
-  
-  <!-- slide 12c: yesterday, abbreviated -->
-  <string name="yest">Igår</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-  
-  <!-- confirmation dialog title -->
-  <string name="DLG_confirm_title">Bekräfta?</string>
-  
-  <!-- question dialog title -->
-  <string name="DLG_question_title">Fråga:</string>
-  
-  <!-- information dialog title -->
-  <string name="DLG_information_title">Information</string>
-  
-  <!-- error dialog title -->
-  <string name="DLG_error_title">Fel!</string>
-  
-  <!-- general dialog save-->
-  <string name="DLG_save">Spara</string>
-  
-  <!-- general dialog yes-->
-  <string name="DLG_yes">Ja</string>
-  
-  <!-- general dialog no-->
-  <string name="DLG_no">Nej</string>
-  
-  <!-- general dialog close-->
-  <string name="DLG_close">Stäng</string>
-  
-  <!-- general dialog done -->
-  <string name="DLG_done">Klar</string>
-  
-  <!-- error dialog (%s => error message)-->
-  <string name="DLG_error">Oj, det uppstod ett fel! Detta hände:\n\n%s</string>
-  
-  <!-- error dialog (no message indicated)-->
-  <string name="DLG_error_generic">Oj, det uppstod ett fel!</string>
-  
-  <!-- Progress dialog shown when doing something slow -->
-  <string name="DLG_wait">Var god vänta...</string>
-
- <!-- ====================================================== SyncProvider == -->
-          
-  <!-- Sync Notification: message when sync service active -->
-  <string name="SyP_progress">Synkroniserar dina uppgifter...</string>
-  
-  <!-- Sync Notification: toast when sync activated from activity -->
-  <string name="SyP_progress_toast">Synkroniserar...</string>
-  
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="SyP_label">Synkronisering</string>  
-
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="Sync_now_label">Sync now</string>  
-
-  <!-- Sync label subtitle -->
-  <string name="SyP_summary">Astrid.com, Google Aktiviteter, sparad data, lokal backup</string>  
-
-  <!-- Error msg when io exception  -->
-  <string name="SyP_ioerror">Tillkopplingsfel! Kontrollera din tillkoppling till internet.</string>
-
-  <!-- ================================================== SyncPreferences == -->
-  
-  <!-- Status Group Label -->    
-  <string name="sync_SPr_group_status">Status</string>
-  
-  <!-- Sync status subtitle, %s-> status message -->
-  <string name="sync_SPr_status_subtitle">Status: %s</string>
-  <!-- Sync Status: log in -->    
-  <string name="sync_status_loggedout">Ej inloggad</string>
-  <!-- Status: ongoing -->    
-  <string name="sync_status_ongoing">Synkronisering pågår...</string>
-  <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Synkroniserades senast:\n%s</string>
-  <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
-  <string name="sync_status_failed">Misslyckades: %s</string>
-  <!-- Sync Status: error status (%s -> last sync date) -->    
-  <string name="sync_status_errors">Synkade med fel: %s</string>
-  <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
-  <string name="sync_status_failed_subtitle">Synkronisering lyckades senast: %s</string>
-  <!-- Sync Status: never sync\'d -->    
-  <string name="sync_status_never">Aldrig synkroniserad!</string>
-
-  <!-- Options Group Label -->    
-  <string name="sync_SPr_group_options">Alternativ</string>
-
-  <!-- Preference: Synchronization Interval Title -->    
-  <string name="sync_SPr_interval_title">Bakgrundssynkronisering</string>
-  <!-- Preference: Synchronization Interval Description (when disabled) -->
-  <string name="sync_SPr_interval_desc_disabled">Bakgrundssynkronisering är inaktiverad</string>    
-  <!-- Preference: Synchronization Interval Description (%s => setting) -->
-  <string name="sync_SPr_interval_desc">Aktuell inställning: %s</string>
-  
-  <!-- Preference: Background Wifi Title -->  
-  <string name="sync_SPr_bgwifi_title">Endast Wi-Fi Inställning</string>    
-  <!-- Preference: Background Wifi Description (enabled) -->
-  <string name="sync_SPr_bgwifi_desc_enabled">Bakgrundssynkronisering sker endast när du är ansluten till Wi-Fi</string>    
-  <!-- Preference: Background Wifi Description (disabled) -->
-  <string name="sync_SPr_bgwifi_desc_disabled">Bakgrundssynkronisering sker alltid</string>
-  
-  <!-- Actions Group Label  -->
-  <string name="sync_SPr_group_actions">Åtgärder</string>
-
-  <!-- Synchronize Now Button -->    
-  <string name="sync_SPr_sync">Synkronisera nu</string>
-  <!-- Synchronize Now Button if not logged in-->    
-  <string name="sync_SPr_sync_log_in">Logga in &amp; synkronisera!</string>
-  
-  <!-- Sync: Prefix string before logged in identifier -->
-  <string name="sync_SPr_logged_in_prefix">Inloggad som:</string>
-  
-  <!-- Sync: Last error -->
-  <string name="sync_SPr_last_error">Status rapport</string>
-  
-  <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Klicka för att skicka en rapport till Astrid-teamet</string>
-  <!-- Sync: send error report button -->
-  <string name="sync_SPr_send_report">Skicka rapport</string>
-  
-  <!-- Sync: Clear Data Title -->
-  <string name="sync_SPr_forget">Logga ut</string>
-  <!-- Sync: Clear Data Description -->
-  <string name="sync_SPr_forget_description">Rensar alla synkroniseringsdata</string>
-
-  <!-- confirmation dialog for sync log out -->
-  <string name="sync_forget_confirm">Logga ut / rensa synkroniseringsdata?</string>
-  
-  <!-- Sync error: network connectivity problems. %s-> name of sync service-->
-  <string name="sync_error_offline">Ett nätverksproblem uppstod 
-vid senaste synkroniseringen med %s. Vänligen försök igen.</string>
-  
-  <string-array name="sync_SPr_interval_entries">
-      <!-- sync_SPr_interval_entries: Synchronization Intervals -->
-      <item>inaktivera</item>
-      <item>varje kvartstimme</item>
-      <item>varje halvtimme</item>
-      <item>varje timme</item>
-      <item>var tredje timme</item>
-      <item>var sjätte timme</item>
-      <item>var tolfte timme</item>
-      <item>varje dag</item>
-      <item>var tredje dag</item>
-      <item>varje vecka</item>
-  </string-array>    
-    
+<resources>
+
+    <!-- ==================================================== Generic Units == -->
+
+    <plurals name="DUt_years">
+        <!-- plurals: years -->
+        <item quantity="one">1 år</item>
+        <!-- plurals: years -->
+        <item quantity="other">%d år</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <!-- plurals: months -->
+        <item quantity="one">1 månad</item>
+        <!-- plurals: months -->
+        <item quantity="other">%d månader</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <!-- plurals: days -->
+        <item quantity="one">1 vecka</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d veckor</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <!-- plurals: days -->
+        <item quantity="one">1 dag</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d dagar</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <!-- plurals: days -->
+        <item quantity="one">1 Veckodag</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d Veckodagar</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <!-- plurals: hours -->
+        <item quantity="one">1 timme</item>
+        <!-- plurals: hours -->
+        <item quantity="other">%d timmar</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <!-- plurals: minutes -->
+        <item quantity="one">1 minut</item>
+        <!-- plurals: minutes -->
+        <item quantity="other">%d minuter</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <!-- plurals: seconds -->
+        <item quantity="one">1 sekund</item>
+        <!-- plurals: seconds -->
+        <item quantity="other">%d sekunder</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="one">1 tim</item>
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="other">%d tim</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="one">1 min</item>
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="other">%d min</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="one">1 sek</item>
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="other">%d sek</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <!-- plurals: tasks -->
+        <item quantity="one">1 uppgift</item>
+        <!-- plurals: tasks -->
+        <item quantity="other">%d uppgifter</item>
+    </plurals>
+    <plurals name="Npeople">
+        <!-- plurals: people -->
+        <item quantity="one">1 person</item>
+        <!-- plurals: people -->
+        <item quantity="other">%d personer</item>
+    </plurals>
+
+    <!-- slide 10a, 12c: today -->
+    <string name="today">Today</string>
+
+    <!-- tomorrow -->
+    <string name="tomorrow">Tomorrow</string>
+
+    <!-- yesterday -->
+    <string name="yesterday">Igår</string>
+
+    <!-- slide 12c: tomorrow, abbreviated -->
+    <string name="tmrw">imorn</string>
+
+    <!-- slide 12c: yesterday, abbreviated -->
+    <string name="yest">Igår</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- confirmation dialog title -->
+    <string name="DLG_confirm_title">Bekräfta?</string>
+
+    <!-- question dialog title -->
+    <string name="DLG_question_title">Fråga:</string>
+
+    <!-- information dialog title -->
+    <string name="DLG_information_title">Information</string>
+
+    <!-- error dialog title -->
+    <string name="DLG_error_title">Fel!</string>
+
+    <!-- general dialog save-->
+    <string name="DLG_save">Spara</string>
+
+    <!-- general dialog yes-->
+    <string name="DLG_yes">Ja</string>
+
+    <!-- general dialog no-->
+    <string name="DLG_no">Nej</string>
+
+    <!-- general dialog close-->
+    <string name="DLG_close">Stäng</string>
+
+    <!-- general dialog done -->
+    <string name="DLG_done">Klar</string>
+
+    <!-- error dialog (%s => error message)-->
+    <string name="DLG_error">Oj, det uppstod ett fel! Detta hände:\n\n%s</string>
+
+    <!-- error dialog (no message indicated)-->
+    <string name="DLG_error_generic">Oj, det uppstod ett fel!</string>
+
+    <!-- Progress dialog shown when doing something slow -->
+    <string name="DLG_wait">Var god vänta...</string>
+
+    <!-- ====================================================== SyncProvider == -->
+
+    <!-- Sync Notification: message when sync service active -->
+    <string name="SyP_progress">Synkroniserar dina uppgifter...</string>
+
+    <!-- Sync Notification: toast when sync activated from activity -->
+    <string name="SyP_progress_toast">Synkroniserar...</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="SyP_label">Synkronisering</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="Sync_now_label">Sync now</string>
+
+    <!-- Sync label subtitle -->
+    <string name="SyP_summary">Astrid.com, Google Aktiviteter, sparad data, lokal backup</string>
+
+    <!-- Error msg when io exception  -->
+    <string name="SyP_ioerror">Tillkopplingsfel! Kontrollera din tillkoppling till internet.
+    </string>
+
+    <!-- ================================================== SyncPreferences == -->
+
+    <!-- Status Group Label -->
+    <string name="sync_SPr_group_status">Status</string>
+
+    <!-- Sync status subtitle, %s-> status message -->
+    <string name="sync_SPr_status_subtitle">Status: %s</string>
+    <!-- Sync Status: log in -->
+    <string name="sync_status_loggedout">Ej inloggad</string>
+    <!-- Status: ongoing -->
+    <string name="sync_status_ongoing">Synkronisering pågår...</string>
+    <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
+    <string name="sync_status_success">Synkroniserades senast:\n%s</string>
+    <!-- Sync Status: failure status (%s -> last attempted sync date) -->
+    <string name="sync_status_failed">Misslyckades: %s</string>
+    <!-- Sync Status: error status (%s -> last sync date) -->
+    <string name="sync_status_errors">Synkade med fel: %s</string>
+    <!-- Sync Status: error subtitle (%s -> last successful sync date) -->
+    <string name="sync_status_failed_subtitle">Synkronisering lyckades senast: %s</string>
+    <!-- Sync Status: never sync\'d -->
+    <string name="sync_status_never">Aldrig synkroniserad!</string>
+
+    <!-- Options Group Label -->
+    <string name="sync_SPr_group_options">Alternativ</string>
+
+    <!-- Preference: Synchronization Interval Title -->
+    <string name="sync_SPr_interval_title">Bakgrundssynkronisering</string>
+    <!-- Preference: Synchronization Interval Description (when disabled) -->
+    <string name="sync_SPr_interval_desc_disabled">Bakgrundssynkronisering är inaktiverad</string>
+    <!-- Preference: Synchronization Interval Description (%s => setting) -->
+    <string name="sync_SPr_interval_desc">Aktuell inställning: %s</string>
+
+    <!-- Preference: Background Wifi Title -->
+    <string name="sync_SPr_bgwifi_title">Endast Wi-Fi Inställning</string>
+    <!-- Preference: Background Wifi Description (enabled) -->
+    <string name="sync_SPr_bgwifi_desc_enabled">Bakgrundssynkronisering sker endast när du är
+        ansluten till Wi-Fi
+    </string>
+    <!-- Preference: Background Wifi Description (disabled) -->
+    <string name="sync_SPr_bgwifi_desc_disabled">Bakgrundssynkronisering sker alltid</string>
+
+    <!-- Actions Group Label  -->
+    <string name="sync_SPr_group_actions">Åtgärder</string>
+
+    <!-- Synchronize Now Button -->
+    <string name="sync_SPr_sync">Synkronisera nu</string>
+    <!-- Synchronize Now Button if not logged in-->
+    <string name="sync_SPr_sync_log_in">Logga in &amp; synkronisera!</string>
+
+    <!-- Sync: Prefix string before logged in identifier -->
+    <string name="sync_SPr_logged_in_prefix">Inloggad som:</string>
+
+    <!-- Sync: Last error -->
+    <string name="sync_SPr_last_error">Status rapport</string>
+
+    <!-- Sync: last error click for more -->
+    <string name="sync_SPr_last_error_subtitle">Klicka för att skicka en rapport till
+        Astrid-teamet
+    </string>
+    <!-- Sync: send error report button -->
+    <string name="sync_SPr_send_report">Skicka rapport</string>
+
+    <!-- Sync: Clear Data Title -->
+    <string name="sync_SPr_forget">Logga ut</string>
+    <!-- Sync: Clear Data Description -->
+    <string name="sync_SPr_forget_description">Rensar alla synkroniseringsdata</string>
+
+    <!-- confirmation dialog for sync log out -->
+    <string name="sync_forget_confirm">Logga ut / rensa synkroniseringsdata?</string>
+
+    <!-- Sync error: network connectivity problems. %s-> name of sync service-->
+    <string name="sync_error_offline">Ett nätverksproblem uppstod
+        vid senaste synkroniseringen med %s. Vänligen försök igen.
+    </string>
+
+    <string-array name="sync_SPr_interval_entries">
+        <!-- sync_SPr_interval_entries: Synchronization Intervals -->
+        <item>inaktivera</item>
+        <item>varje kvartstimme</item>
+        <item>varje halvtimme</item>
+        <item>varje timme</item>
+        <item>var tredje timme</item>
+        <item>var sjätte timme</item>
+        <item>var tolfte timme</item>
+        <item>varje dag</item>
+        <item>var tredje dag</item>
+        <item>varje vecka</item>
+    </string-array>
+
 </resources>
diff --git a/api/res/values-th/strings.xml b/api/res/values-th/strings.xml
index e11fcfee6..2cb6f36fe 100644
--- a/api/res/values-th/strings.xml
+++ b/api/res/values-th/strings.xml
@@ -1,77 +1,77 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <plurals name="DUt_years">
-    <item quantity="one">1 Year</item>
-    <item quantity="other">%d Years</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <item quantity="one">1 Month</item>
-    <item quantity="other">%d Months</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <item quantity="one">1 Week</item>
-    <item quantity="other">%d Weeks</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <item quantity="one">1 วัน</item>
-    <item quantity="other">%d วัน</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <item quantity="one">1 Weekday</item>
-    <item quantity="other">%d Weekdays</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <item quantity="one">1 ชั่วโมง</item>
-    <item quantity="other">%d ชั่วโมง</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <item quantity="one">1 นาที</item>
-    <item quantity="other">%d นาที</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <item quantity="one">1 วินาที</item>
-    <item quantity="other">%d วินาที</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <item quantity="one">1 ช.ม.</item>
-    <item quantity="other">%d ช.ม.</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <item quantity="one">1 นาที</item>
-    <item quantity="other">%d นาที</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <item quantity="one">1 วิ.</item>
-    <item quantity="other">%d วิ.</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <item quantity="one">1 task</item>
-    <item quantity="other">%d tasks</item>
-  </plurals>
-  <plurals name="Npeople">
-    <item quantity="one">1 person</item>
-    <item quantity="other">%d people</item>
-  </plurals>
-  <string name="today">วันนี้</string>
-  <string name="tomorrow">พรุ่งนี้</string>
-  <string name="yesterday">เมื่อวาน</string>
-  <string name="DLG_information_title">ข้อมูล</string>
-  <string name="DLG_save">บันทึก</string>
-  <string name="DLG_done">เสร็จแล้ว</string>
-  <string name="SyP_ioerror">ข้อผิดพลาดในการเชื่อมต่อ! ตรวจดูการเชื่อมต่ออินเตอร์เน็ท</string>
-  <string name="sync_SPr_group_status">สถานะ</string>
-  <string name="sync_SPr_group_options">ตัวเลือก</string>
-  <string name="sync_SPr_group_actions">การดำเนินการ</string>
-  <string-array name="sync_SPr_interval_entries">
-    <item>disable</item>
-    <item>every fifteen minutes</item>
-    <item>every thirty minutes</item>
-    <item>every hour</item>
-    <item>every three hours</item>
-    <item>every six hours</item>
-    <item>every twelve hours</item>
-    <item>every day</item>
-    <item>every three days</item>
-    <item>every week</item>
-  </string-array>
+    <plurals name="DUt_years">
+        <item quantity="one">1 Year</item>
+        <item quantity="other">%d Years</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <item quantity="one">1 Month</item>
+        <item quantity="other">%d Months</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <item quantity="one">1 Week</item>
+        <item quantity="other">%d Weeks</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <item quantity="one">1 วัน</item>
+        <item quantity="other">%d วัน</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <item quantity="one">1 Weekday</item>
+        <item quantity="other">%d Weekdays</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <item quantity="one">1 ชั่วโมง</item>
+        <item quantity="other">%d ชั่วโมง</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <item quantity="one">1 นาที</item>
+        <item quantity="other">%d นาที</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <item quantity="one">1 วินาที</item>
+        <item quantity="other">%d วินาที</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <item quantity="one">1 ช.ม.</item>
+        <item quantity="other">%d ช.ม.</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <item quantity="one">1 นาที</item>
+        <item quantity="other">%d นาที</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <item quantity="one">1 วิ.</item>
+        <item quantity="other">%d วิ.</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <item quantity="one">1 task</item>
+        <item quantity="other">%d tasks</item>
+    </plurals>
+    <plurals name="Npeople">
+        <item quantity="one">1 person</item>
+        <item quantity="other">%d people</item>
+    </plurals>
+    <string name="today">วันนี้</string>
+    <string name="tomorrow">พรุ่งนี้</string>
+    <string name="yesterday">เมื่อวาน</string>
+    <string name="DLG_information_title">ข้อมูล</string>
+    <string name="DLG_save">บันทึก</string>
+    <string name="DLG_done">เสร็จแล้ว</string>
+    <string name="SyP_ioerror">ข้อผิดพลาดในการเชื่อมต่อ! ตรวจดูการเชื่อมต่ออินเตอร์เน็ท</string>
+    <string name="sync_SPr_group_status">สถานะ</string>
+    <string name="sync_SPr_group_options">ตัวเลือก</string>
+    <string name="sync_SPr_group_actions">การดำเนินการ</string>
+    <string-array name="sync_SPr_interval_entries">
+        <item>disable</item>
+        <item>every fifteen minutes</item>
+        <item>every thirty minutes</item>
+        <item>every hour</item>
+        <item>every three hours</item>
+        <item>every six hours</item>
+        <item>every twelve hours</item>
+        <item>every day</item>
+        <item>every three days</item>
+        <item>every week</item>
+    </string-array>
 </resources>
diff --git a/api/res/values-tr/strings.xml b/api/res/values-tr/strings.xml
index 2eb388395..b32a64e3d 100755
--- a/api/res/values-tr/strings.xml
+++ b/api/res/values-tr/strings.xml
@@ -4,243 +4,245 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ==================================================== Generic Units == -->
-  
-  <plurals name="DUt_years">
-    <!-- plurals: years -->
-    <item quantity="one">1 Yıl</item>
-    <!-- plurals: years -->
-    <item quantity="other">%d Yıl</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <!-- plurals: months -->
-    <item quantity="one">1 Ay</item>
-    <!-- plurals: months -->
-    <item quantity="other">%d Ay</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <!-- plurals: days -->
-    <item quantity="one">1 Hafta</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d hafta</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <!-- plurals: days -->
-    <item quantity="one">1 Gün</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d gün</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <!-- plurals: days -->
-    <item quantity="one">1 haftaiçi gün</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d haftaiçi günü</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <!-- plurals: hours -->
-    <item quantity="one">1 Saat</item>
-    <!-- plurals: hours -->
-    <item quantity="other">%d saat</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <!-- plurals: minutes -->
-    <item quantity="one">1 Dakika</item>
-    <!-- plurals: minutes -->
-    <item quantity="other">%d dakika</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <!-- plurals: seconds -->
-    <item quantity="one">1 Saniye</item>
-    <!-- plurals: seconds -->
-    <item quantity="other">%d saniye</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="one">1 saat</item>
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="other">%d saat</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="one">1 dakika</item>
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="other">%d dakika</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="one">1 saniye</item>
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="other">%d saniye</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <!-- plurals: tasks -->
-    <item quantity="one">1 görev</item>
-    <!-- plurals: tasks -->
-    <item quantity="other">%d görev</item>
-  </plurals>
-  <plurals name="Npeople">
-    <!-- plurals: people -->
-    <item quantity="one">1 kişi</item>
-    <!-- plurals: people -->
-    <item quantity="other">%d kişi</item>
-  </plurals>
-  
-  <!-- slide 10a, 12c: today -->
-  <string name="today">Bugün</string>
-  
-  <!-- tomorrow -->
-  <string name="tomorrow">Yarın</string>
-  
-  <!-- yesterday -->
-  <string name="yesterday">Dün</string>
-  
-  <!-- slide 12c: tomorrow, abbreviated -->
-  <string name="tmrw">Yarın</string>
-  
-  <!-- slide 12c: yesterday, abbreviated -->
-  <string name="yest">Dün</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-  
-  <!-- confirmation dialog title -->
-  <string name="DLG_confirm_title">Onayla?</string>
-  
-  <!-- question dialog title -->
-  <string name="DLG_question_title">Soru:</string>
-  
-  <!-- information dialog title -->
-  <string name="DLG_information_title">Bilgi</string>
-  
-  <!-- error dialog title -->
-  <string name="DLG_error_title">Hata!</string>
-  
-  <!-- general dialog save-->
-  <string name="DLG_save">Kaydet</string>
-  
-  <!-- general dialog yes-->
-  <string name="DLG_yes">Evet</string>
-  
-  <!-- general dialog no-->
-  <string name="DLG_no">Hayır</string>
-  
-  <!-- general dialog close-->
-  <string name="DLG_close">Kapat</string>
-  
-  <!-- general dialog done -->
-  <string name="DLG_done">Yapıldı</string>
-  
-  <!-- error dialog (%s => error message)-->
-  <string name="DLG_error">Oops, bir sorun meydana geldi! Olan şu:\n\n%s</string>
-  
-  <!-- error dialog (no message indicated)-->
-  <string name="DLG_error_generic">Oops, bir sorun meydana geldi!</string>
-  
-  <!-- Progress dialog shown when doing something slow -->
-  <string name="DLG_wait">Lütfen bekleyin...</string>
-
- <!-- ====================================================== SyncProvider == -->
-          
-  <!-- Sync Notification: message when sync service active -->
-  <string name="SyP_progress">Görevleriniz eşleniyor...</string>
-  
-  <!-- Sync Notification: toast when sync activated from activity -->
-  <string name="SyP_progress_toast">Eşleniyor...</string>
-  
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="SyP_label">Sync &amp; backup</string>  
-
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="Sync_now_label">Sync now</string>  
-
-  <!-- Sync label subtitle -->
-  <string name="SyP_summary">Astrid.com, Google Tasks, saved data, local backup</string>  
-
-  <!-- Error msg when io exception  -->
-  <string name="SyP_ioerror">Bağlantı Hatası! Internet bağlantınızı denetleyin.</string>
-
-  <!-- ================================================== SyncPreferences == -->
-  
-  <!-- Status Group Label -->    
-  <string name="sync_SPr_group_status">Durum</string>
-  
-  <!-- Sync status subtitle, %s-> status message -->
-  <string name="sync_SPr_status_subtitle">Durum: %s</string>
-  <!-- Sync Status: log in -->    
-  <string name="sync_status_loggedout">Oturum açılmadı</string>
-  <!-- Status: ongoing -->    
-  <string name="sync_status_ongoing">Senkronizasyon devam ediyor...</string>
-  <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Son Senk.\n%s</string>
-  <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
-  <string name="sync_status_failed">Başarısız: %s</string>
-  <!-- Sync Status: error status (%s -> last sync date) -->    
-  <string name="sync_status_errors">Hatalı Senkron: %s</string>
-  <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
-  <string name="sync_status_failed_subtitle">Son Başarılı Eşleme: %s</string>
-  <!-- Sync Status: never sync\'d -->    
-  <string name="sync_status_never">Hiç Eşleme Yapılmamış!</string>
-
-  <!-- Options Group Label -->    
-  <string name="sync_SPr_group_options">Seçenekler</string>
-
-  <!-- Preference: Synchronization Interval Title -->    
-  <string name="sync_SPr_interval_title">Arkaplanda senkronizasyon</string>
-  <!-- Preference: Synchronization Interval Description (when disabled) -->
-  <string name="sync_SPr_interval_desc_disabled">Arkaplanda senkronizasyon devre dışı</string>    
-  <!-- Preference: Synchronization Interval Description (%s => setting) -->
-  <string name="sync_SPr_interval_desc">Mevcut ayar: %s</string>
-  
-  <!-- Preference: Background Wifi Title -->  
-  <string name="sync_SPr_bgwifi_title">Sadece Wifi Ayarı</string>    
-  <!-- Preference: Background Wifi Description (enabled) -->
-  <string name="sync_SPr_bgwifi_desc_enabled">Sadece Wifi ile arkaplan senkronu</string>    
-  <!-- Preference: Background Wifi Description (disabled) -->
-  <string name="sync_SPr_bgwifi_desc_disabled">Arkaplan senkronu her zaman etkin</string>
-  
-  <!-- Actions Group Label  -->
-  <string name="sync_SPr_group_actions">Eylemler</string>
-
-  <!-- Synchronize Now Button -->    
-  <string name="sync_SPr_sync">Şimdi Eşle</string>
-  <!-- Synchronize Now Button if not logged in-->    
-  <string name="sync_SPr_sync_log_in">Giriş Yapı &amp; Senktronize et!</string>
-  
-  <!-- Sync: Prefix string before logged in identifier -->
-  <string name="sync_SPr_logged_in_prefix">Giriş yapılan hesap:</string>
-  
-  <!-- Sync: Last error -->
-  <string name="sync_SPr_last_error">Durum Raporu</string>
-  
-  <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Astrid takımına bildirmek için tıklayın</string>
-  <!-- Sync: send error report button -->
-  <string name="sync_SPr_send_report">Rapor Gönder</string>
-  
-  <!-- Sync: Clear Data Title -->
-  <string name="sync_SPr_forget">Çıkış Yap</string>
-  <!-- Sync: Clear Data Description -->
-  <string name="sync_SPr_forget_description">Bütün eşleme verilerini temizle</string>
-
-  <!-- confirmation dialog for sync log out -->
-  <string name="sync_forget_confirm">Çıkış Yap / Senkron verisini sil?</string>
-  
-  <!-- Sync error: network connectivity problems. %s-> name of sync service-->
-  <string name="sync_error_offline">%s ile son eşleme yapılırken bir ağ bağlantı sorunu oluştu. Lütfen daha sonra yeniden deneyin.</string>
-  
-  <string-array name="sync_SPr_interval_entries">
-      <!-- sync_SPr_interval_entries: Synchronization Intervals -->
-      <item>devre dışı bırak</item>
-      <item>her 15 dakika</item>
-      <item>her 30 dakika</item>
-      <item>her saat</item>
-      <item>her 3 saat</item>
-      <item>her 6 saat</item>
-      <item>her 12 saat</item>
-      <item>hergün</item>
-      <item>her 3 gün</item>
-      <item>her hafta</item>
-  </string-array>    
-    
+<resources>
+
+    <!-- ==================================================== Generic Units == -->
+
+    <plurals name="DUt_years">
+        <!-- plurals: years -->
+        <item quantity="one">1 Yıl</item>
+        <!-- plurals: years -->
+        <item quantity="other">%d Yıl</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <!-- plurals: months -->
+        <item quantity="one">1 Ay</item>
+        <!-- plurals: months -->
+        <item quantity="other">%d Ay</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <!-- plurals: days -->
+        <item quantity="one">1 Hafta</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d hafta</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <!-- plurals: days -->
+        <item quantity="one">1 Gün</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d gün</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <!-- plurals: days -->
+        <item quantity="one">1 haftaiçi gün</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d haftaiçi günü</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <!-- plurals: hours -->
+        <item quantity="one">1 Saat</item>
+        <!-- plurals: hours -->
+        <item quantity="other">%d saat</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <!-- plurals: minutes -->
+        <item quantity="one">1 Dakika</item>
+        <!-- plurals: minutes -->
+        <item quantity="other">%d dakika</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <!-- plurals: seconds -->
+        <item quantity="one">1 Saniye</item>
+        <!-- plurals: seconds -->
+        <item quantity="other">%d saniye</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="one">1 saat</item>
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="other">%d saat</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="one">1 dakika</item>
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="other">%d dakika</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="one">1 saniye</item>
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="other">%d saniye</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <!-- plurals: tasks -->
+        <item quantity="one">1 görev</item>
+        <!-- plurals: tasks -->
+        <item quantity="other">%d görev</item>
+    </plurals>
+    <plurals name="Npeople">
+        <!-- plurals: people -->
+        <item quantity="one">1 kişi</item>
+        <!-- plurals: people -->
+        <item quantity="other">%d kişi</item>
+    </plurals>
+
+    <!-- slide 10a, 12c: today -->
+    <string name="today">Bugün</string>
+
+    <!-- tomorrow -->
+    <string name="tomorrow">Yarın</string>
+
+    <!-- yesterday -->
+    <string name="yesterday">Dün</string>
+
+    <!-- slide 12c: tomorrow, abbreviated -->
+    <string name="tmrw">Yarın</string>
+
+    <!-- slide 12c: yesterday, abbreviated -->
+    <string name="yest">Dün</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- confirmation dialog title -->
+    <string name="DLG_confirm_title">Onayla?</string>
+
+    <!-- question dialog title -->
+    <string name="DLG_question_title">Soru:</string>
+
+    <!-- information dialog title -->
+    <string name="DLG_information_title">Bilgi</string>
+
+    <!-- error dialog title -->
+    <string name="DLG_error_title">Hata!</string>
+
+    <!-- general dialog save-->
+    <string name="DLG_save">Kaydet</string>
+
+    <!-- general dialog yes-->
+    <string name="DLG_yes">Evet</string>
+
+    <!-- general dialog no-->
+    <string name="DLG_no">Hayır</string>
+
+    <!-- general dialog close-->
+    <string name="DLG_close">Kapat</string>
+
+    <!-- general dialog done -->
+    <string name="DLG_done">Yapıldı</string>
+
+    <!-- error dialog (%s => error message)-->
+    <string name="DLG_error">Oops, bir sorun meydana geldi! Olan şu:\n\n%s</string>
+
+    <!-- error dialog (no message indicated)-->
+    <string name="DLG_error_generic">Oops, bir sorun meydana geldi!</string>
+
+    <!-- Progress dialog shown when doing something slow -->
+    <string name="DLG_wait">Lütfen bekleyin...</string>
+
+    <!-- ====================================================== SyncProvider == -->
+
+    <!-- Sync Notification: message when sync service active -->
+    <string name="SyP_progress">Görevleriniz eşleniyor...</string>
+
+    <!-- Sync Notification: toast when sync activated from activity -->
+    <string name="SyP_progress_toast">Eşleniyor...</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="SyP_label">Sync &amp; backup</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="Sync_now_label">Sync now</string>
+
+    <!-- Sync label subtitle -->
+    <string name="SyP_summary">Astrid.com, Google Tasks, saved data, local backup</string>
+
+    <!-- Error msg when io exception  -->
+    <string name="SyP_ioerror">Bağlantı Hatası! Internet bağlantınızı denetleyin.</string>
+
+    <!-- ================================================== SyncPreferences == -->
+
+    <!-- Status Group Label -->
+    <string name="sync_SPr_group_status">Durum</string>
+
+    <!-- Sync status subtitle, %s-> status message -->
+    <string name="sync_SPr_status_subtitle">Durum: %s</string>
+    <!-- Sync Status: log in -->
+    <string name="sync_status_loggedout">Oturum açılmadı</string>
+    <!-- Status: ongoing -->
+    <string name="sync_status_ongoing">Senkronizasyon devam ediyor...</string>
+    <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
+    <string name="sync_status_success">Son Senk.\n%s</string>
+    <!-- Sync Status: failure status (%s -> last attempted sync date) -->
+    <string name="sync_status_failed">Başarısız: %s</string>
+    <!-- Sync Status: error status (%s -> last sync date) -->
+    <string name="sync_status_errors">Hatalı Senkron: %s</string>
+    <!-- Sync Status: error subtitle (%s -> last successful sync date) -->
+    <string name="sync_status_failed_subtitle">Son Başarılı Eşleme: %s</string>
+    <!-- Sync Status: never sync\'d -->
+    <string name="sync_status_never">Hiç Eşleme Yapılmamış!</string>
+
+    <!-- Options Group Label -->
+    <string name="sync_SPr_group_options">Seçenekler</string>
+
+    <!-- Preference: Synchronization Interval Title -->
+    <string name="sync_SPr_interval_title">Arkaplanda senkronizasyon</string>
+    <!-- Preference: Synchronization Interval Description (when disabled) -->
+    <string name="sync_SPr_interval_desc_disabled">Arkaplanda senkronizasyon devre dışı</string>
+    <!-- Preference: Synchronization Interval Description (%s => setting) -->
+    <string name="sync_SPr_interval_desc">Mevcut ayar: %s</string>
+
+    <!-- Preference: Background Wifi Title -->
+    <string name="sync_SPr_bgwifi_title">Sadece Wifi Ayarı</string>
+    <!-- Preference: Background Wifi Description (enabled) -->
+    <string name="sync_SPr_bgwifi_desc_enabled">Sadece Wifi ile arkaplan senkronu</string>
+    <!-- Preference: Background Wifi Description (disabled) -->
+    <string name="sync_SPr_bgwifi_desc_disabled">Arkaplan senkronu her zaman etkin</string>
+
+    <!-- Actions Group Label  -->
+    <string name="sync_SPr_group_actions">Eylemler</string>
+
+    <!-- Synchronize Now Button -->
+    <string name="sync_SPr_sync">Şimdi Eşle</string>
+    <!-- Synchronize Now Button if not logged in-->
+    <string name="sync_SPr_sync_log_in">Giriş Yapı &amp; Senktronize et!</string>
+
+    <!-- Sync: Prefix string before logged in identifier -->
+    <string name="sync_SPr_logged_in_prefix">Giriş yapılan hesap:</string>
+
+    <!-- Sync: Last error -->
+    <string name="sync_SPr_last_error">Durum Raporu</string>
+
+    <!-- Sync: last error click for more -->
+    <string name="sync_SPr_last_error_subtitle">Astrid takımına bildirmek için tıklayın</string>
+    <!-- Sync: send error report button -->
+    <string name="sync_SPr_send_report">Rapor Gönder</string>
+
+    <!-- Sync: Clear Data Title -->
+    <string name="sync_SPr_forget">Çıkış Yap</string>
+    <!-- Sync: Clear Data Description -->
+    <string name="sync_SPr_forget_description">Bütün eşleme verilerini temizle</string>
+
+    <!-- confirmation dialog for sync log out -->
+    <string name="sync_forget_confirm">Çıkış Yap / Senkron verisini sil?</string>
+
+    <!-- Sync error: network connectivity problems. %s-> name of sync service-->
+    <string name="sync_error_offline">%s ile son eşleme yapılırken bir ağ bağlantı sorunu oluştu.
+        Lütfen daha sonra yeniden deneyin.
+    </string>
+
+    <string-array name="sync_SPr_interval_entries">
+        <!-- sync_SPr_interval_entries: Synchronization Intervals -->
+        <item>devre dışı bırak</item>
+        <item>her 15 dakika</item>
+        <item>her 30 dakika</item>
+        <item>her saat</item>
+        <item>her 3 saat</item>
+        <item>her 6 saat</item>
+        <item>her 12 saat</item>
+        <item>hergün</item>
+        <item>her 3 gün</item>
+        <item>her hafta</item>
+    </string-array>
+
 </resources>
diff --git a/api/res/values-zh-rCN/strings.xml b/api/res/values-zh-rCN/strings.xml
index 4c081cda1..7cd58ce03 100755
--- a/api/res/values-zh-rCN/strings.xml
+++ b/api/res/values-zh-rCN/strings.xml
@@ -4,243 +4,243 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ==================================================== Generic Units == -->
-  
-  <plurals name="DUt_years">
-    <!-- plurals: years -->
-    <item quantity="one">1 年</item>
-    <!-- plurals: years -->
-    <item quantity="other">%d 年</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <!-- plurals: months -->
-    <item quantity="one">1 个月</item>
-    <!-- plurals: months -->
-    <item quantity="other">%d 个月</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <!-- plurals: days -->
-    <item quantity="one">1 周</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d 周</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <!-- plurals: days -->
-    <item quantity="one">1 天</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d 天</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <!-- plurals: days -->
-    <item quantity="one">1 个任务天</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d 个任务天</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <!-- plurals: hours -->
-    <item quantity="one">1 小时</item>
-    <!-- plurals: hours -->
-    <item quantity="other">%d 小时</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <!-- plurals: minutes -->
-    <item quantity="one">1 分钟</item>
-    <!-- plurals: minutes -->
-    <item quantity="other">%d 分钟</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <!-- plurals: seconds -->
-    <item quantity="one">1 秒</item>
-    <!-- plurals: seconds -->
-    <item quantity="other">%d 秒</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="one">1 小时</item>
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="other">%d 小时</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="one">1 分钟</item>
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="other">%d 分钟</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="one">1 秒</item>
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="other">%d 秒</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <!-- plurals: tasks -->
-    <item quantity="one">1 个任务</item>
-    <!-- plurals: tasks -->
-    <item quantity="other">%d 个任务</item>
-  </plurals>
-  <plurals name="Npeople">
-    <!-- plurals: people -->
-    <item quantity="one">一个人</item>
-    <!-- plurals: people -->
-    <item quantity="other">%d 个人</item>
-  </plurals>
-  
-  <!-- slide 10a, 12c: today -->
-  <string name="today">今天</string>
-  
-  <!-- tomorrow -->
-  <string name="tomorrow">明天</string>
-  
-  <!-- yesterday -->
-  <string name="yesterday">昨天</string>
-  
-  <!-- slide 12c: tomorrow, abbreviated -->
-  <string name="tmrw">明天</string>
-  
-  <!-- slide 12c: yesterday, abbreviated -->
-  <string name="yest">昨天</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-  
-  <!-- confirmation dialog title -->
-  <string name="DLG_confirm_title">确认?</string>
-  
-  <!-- question dialog title -->
-  <string name="DLG_question_title">问题：</string>
-  
-  <!-- information dialog title -->
-  <string name="DLG_information_title">信息</string>
-  
-  <!-- error dialog title -->
-  <string name="DLG_error_title">错误！</string>
-  
-  <!-- general dialog save-->
-  <string name="DLG_save">保存</string>
-  
-  <!-- general dialog yes-->
-  <string name="DLG_yes">确定</string>
-  
-  <!-- general dialog no-->
-  <string name="DLG_no">取消</string>
-  
-  <!-- general dialog close-->
-  <string name="DLG_close">关闭</string>
-  
-  <!-- general dialog done -->
-  <string name="DLG_done">完成</string>
-  
-  <!-- error dialog (%s => error message)-->
-  <string name="DLG_error">糟糕，发生错误！状况是:\n\n%s</string>
-  
-  <!-- error dialog (no message indicated)-->
-  <string name="DLG_error_generic">糟糕，发生错误！</string>
-  
-  <!-- Progress dialog shown when doing something slow -->
-  <string name="DLG_wait">请稍候...</string>
-
- <!-- ====================================================== SyncProvider == -->
-          
-  <!-- Sync Notification: message when sync service active -->
-  <string name="SyP_progress">任务同步中...</string>
-  
-  <!-- Sync Notification: toast when sync activated from activity -->
-  <string name="SyP_progress_toast">正在同步中...</string>
-  
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="SyP_label">同步和备份</string>  
-
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="Sync_now_label">Sync now</string>  
-
-  <!-- Sync label subtitle -->
-  <string name="SyP_summary">Astrid.com，谷歌任务，已存数据，本地备份</string>  
-
-  <!-- Error msg when io exception  -->
-  <string name="SyP_ioerror">连接错误！请检查您的因特网连接。</string>
-
-  <!-- ================================================== SyncPreferences == -->
-  
-  <!-- Status Group Label -->    
-  <string name="sync_SPr_group_status">状态</string>
-  
-  <!-- Sync status subtitle, %s-> status message -->
-  <string name="sync_SPr_status_subtitle">状态：%s</string>
-  <!-- Sync Status: log in -->    
-  <string name="sync_status_loggedout">未登陆</string>
-  <!-- Status: ongoing -->    
-  <string name="sync_status_ongoing">同步中...</string>
-  <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">上次同步：\n%s</string>
-  <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
-  <string name="sync_status_failed">失败：%s</string>
-  <!-- Sync Status: error status (%s -> last sync date) -->    
-  <string name="sync_status_errors">同步 w/ 错误： %s 上次同步日期</string>
-  <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
-  <string name="sync_status_failed_subtitle">上次成功同步：%s</string>
-  <!-- Sync Status: never sync\'d -->    
-  <string name="sync_status_never">未同步过！</string>
-
-  <!-- Options Group Label -->    
-  <string name="sync_SPr_group_options">选项</string>
-
-  <!-- Preference: Synchronization Interval Title -->    
-  <string name="sync_SPr_interval_title">后台同步</string>
-  <!-- Preference: Synchronization Interval Description (when disabled) -->
-  <string name="sync_SPr_interval_desc_disabled">后台同步已关闭</string>    
-  <!-- Preference: Synchronization Interval Description (%s => setting) -->
-  <string name="sync_SPr_interval_desc">目前同步间隔：%s</string>
-  
-  <!-- Preference: Background Wifi Title -->  
-  <string name="sync_SPr_bgwifi_title">Wifi 才可使用的设置</string>    
-  <!-- Preference: Background Wifi Description (enabled) -->
-  <string name="sync_SPr_bgwifi_desc_enabled">使用 Wifi 才启动后台同步</string>    
-  <!-- Preference: Background Wifi Description (disabled) -->
-  <string name="sync_SPr_bgwifi_desc_disabled">总是使用后台同步</string>
-  
-  <!-- Actions Group Label  -->
-  <string name="sync_SPr_group_actions">动作</string>
-
-  <!-- Synchronize Now Button -->    
-  <string name="sync_SPr_sync">现在同步</string>
-  <!-- Synchronize Now Button if not logged in-->    
-  <string name="sync_SPr_sync_log_in">登陆并同步！</string>
-  
-  <!-- Sync: Prefix string before logged in identifier -->
-  <string name="sync_SPr_logged_in_prefix">已经登录为：</string>
-  
-  <!-- Sync: Last error -->
-  <string name="sync_SPr_last_error">状态报告</string>
-  
-  <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">点击给 Astrid 团队发送报告</string>
-  <!-- Sync: send error report button -->
-  <string name="sync_SPr_send_report">发送报告</string>
-  
-  <!-- Sync: Clear Data Title -->
-  <string name="sync_SPr_forget">登出</string>
-  <!-- Sync: Clear Data Description -->
-  <string name="sync_SPr_forget_description">清除所有同步资料</string>
-
-  <!-- confirmation dialog for sync log out -->
-  <string name="sync_forget_confirm">登出/清除同步资料?</string>
-  
-  <!-- Sync error: network connectivity problems. %s-> name of sync service-->
-  <string name="sync_error_offline">在最近与 %s 同步时网络连接发生问题。请重试。</string>
-  
-  <string-array name="sync_SPr_interval_entries">
-      <!-- sync_SPr_interval_entries: Synchronization Intervals -->
-      <item>停用</item>
-      <item>每15分钟</item>
-      <item>每30分钟</item>
-      <item>每小时</item>
-      <item>每3小时</item>
-      <item>每6小时</item>
-      <item>每12小时</item>
-      <item>每天</item>
-      <item>每3天</item>
-      <item>每周</item>
-  </string-array>    
-    
+<resources>
+
+    <!-- ==================================================== Generic Units == -->
+
+    <plurals name="DUt_years">
+        <!-- plurals: years -->
+        <item quantity="one">1 年</item>
+        <!-- plurals: years -->
+        <item quantity="other">%d 年</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <!-- plurals: months -->
+        <item quantity="one">1 个月</item>
+        <!-- plurals: months -->
+        <item quantity="other">%d 个月</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <!-- plurals: days -->
+        <item quantity="one">1 周</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d 周</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <!-- plurals: days -->
+        <item quantity="one">1 天</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d 天</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <!-- plurals: days -->
+        <item quantity="one">1 个任务天</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d 个任务天</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <!-- plurals: hours -->
+        <item quantity="one">1 小时</item>
+        <!-- plurals: hours -->
+        <item quantity="other">%d 小时</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <!-- plurals: minutes -->
+        <item quantity="one">1 分钟</item>
+        <!-- plurals: minutes -->
+        <item quantity="other">%d 分钟</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <!-- plurals: seconds -->
+        <item quantity="one">1 秒</item>
+        <!-- plurals: seconds -->
+        <item quantity="other">%d 秒</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="one">1 小时</item>
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="other">%d 小时</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="one">1 分钟</item>
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="other">%d 分钟</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="one">1 秒</item>
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="other">%d 秒</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <!-- plurals: tasks -->
+        <item quantity="one">1 个任务</item>
+        <!-- plurals: tasks -->
+        <item quantity="other">%d 个任务</item>
+    </plurals>
+    <plurals name="Npeople">
+        <!-- plurals: people -->
+        <item quantity="one">一个人</item>
+        <!-- plurals: people -->
+        <item quantity="other">%d 个人</item>
+    </plurals>
+
+    <!-- slide 10a, 12c: today -->
+    <string name="today">今天</string>
+
+    <!-- tomorrow -->
+    <string name="tomorrow">明天</string>
+
+    <!-- yesterday -->
+    <string name="yesterday">昨天</string>
+
+    <!-- slide 12c: tomorrow, abbreviated -->
+    <string name="tmrw">明天</string>
+
+    <!-- slide 12c: yesterday, abbreviated -->
+    <string name="yest">昨天</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- confirmation dialog title -->
+    <string name="DLG_confirm_title">确认?</string>
+
+    <!-- question dialog title -->
+    <string name="DLG_question_title">问题：</string>
+
+    <!-- information dialog title -->
+    <string name="DLG_information_title">信息</string>
+
+    <!-- error dialog title -->
+    <string name="DLG_error_title">错误！</string>
+
+    <!-- general dialog save-->
+    <string name="DLG_save">保存</string>
+
+    <!-- general dialog yes-->
+    <string name="DLG_yes">确定</string>
+
+    <!-- general dialog no-->
+    <string name="DLG_no">取消</string>
+
+    <!-- general dialog close-->
+    <string name="DLG_close">关闭</string>
+
+    <!-- general dialog done -->
+    <string name="DLG_done">完成</string>
+
+    <!-- error dialog (%s => error message)-->
+    <string name="DLG_error">糟糕，发生错误！状况是:\n\n%s</string>
+
+    <!-- error dialog (no message indicated)-->
+    <string name="DLG_error_generic">糟糕，发生错误！</string>
+
+    <!-- Progress dialog shown when doing something slow -->
+    <string name="DLG_wait">请稍候...</string>
+
+    <!-- ====================================================== SyncProvider == -->
+
+    <!-- Sync Notification: message when sync service active -->
+    <string name="SyP_progress">任务同步中...</string>
+
+    <!-- Sync Notification: toast when sync activated from activity -->
+    <string name="SyP_progress_toast">正在同步中...</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="SyP_label">同步和备份</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="Sync_now_label">Sync now</string>
+
+    <!-- Sync label subtitle -->
+    <string name="SyP_summary">Astrid.com，谷歌任务，已存数据，本地备份</string>
+
+    <!-- Error msg when io exception  -->
+    <string name="SyP_ioerror">连接错误！请检查您的因特网连接。</string>
+
+    <!-- ================================================== SyncPreferences == -->
+
+    <!-- Status Group Label -->
+    <string name="sync_SPr_group_status">状态</string>
+
+    <!-- Sync status subtitle, %s-> status message -->
+    <string name="sync_SPr_status_subtitle">状态：%s</string>
+    <!-- Sync Status: log in -->
+    <string name="sync_status_loggedout">未登陆</string>
+    <!-- Status: ongoing -->
+    <string name="sync_status_ongoing">同步中...</string>
+    <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
+    <string name="sync_status_success">上次同步：\n%s</string>
+    <!-- Sync Status: failure status (%s -> last attempted sync date) -->
+    <string name="sync_status_failed">失败：%s</string>
+    <!-- Sync Status: error status (%s -> last sync date) -->
+    <string name="sync_status_errors">同步 w/ 错误： %s 上次同步日期</string>
+    <!-- Sync Status: error subtitle (%s -> last successful sync date) -->
+    <string name="sync_status_failed_subtitle">上次成功同步：%s</string>
+    <!-- Sync Status: never sync\'d -->
+    <string name="sync_status_never">未同步过！</string>
+
+    <!-- Options Group Label -->
+    <string name="sync_SPr_group_options">选项</string>
+
+    <!-- Preference: Synchronization Interval Title -->
+    <string name="sync_SPr_interval_title">后台同步</string>
+    <!-- Preference: Synchronization Interval Description (when disabled) -->
+    <string name="sync_SPr_interval_desc_disabled">后台同步已关闭</string>
+    <!-- Preference: Synchronization Interval Description (%s => setting) -->
+    <string name="sync_SPr_interval_desc">目前同步间隔：%s</string>
+
+    <!-- Preference: Background Wifi Title -->
+    <string name="sync_SPr_bgwifi_title">Wifi 才可使用的设置</string>
+    <!-- Preference: Background Wifi Description (enabled) -->
+    <string name="sync_SPr_bgwifi_desc_enabled">使用 Wifi 才启动后台同步</string>
+    <!-- Preference: Background Wifi Description (disabled) -->
+    <string name="sync_SPr_bgwifi_desc_disabled">总是使用后台同步</string>
+
+    <!-- Actions Group Label  -->
+    <string name="sync_SPr_group_actions">动作</string>
+
+    <!-- Synchronize Now Button -->
+    <string name="sync_SPr_sync">现在同步</string>
+    <!-- Synchronize Now Button if not logged in-->
+    <string name="sync_SPr_sync_log_in">登陆并同步！</string>
+
+    <!-- Sync: Prefix string before logged in identifier -->
+    <string name="sync_SPr_logged_in_prefix">已经登录为：</string>
+
+    <!-- Sync: Last error -->
+    <string name="sync_SPr_last_error">状态报告</string>
+
+    <!-- Sync: last error click for more -->
+    <string name="sync_SPr_last_error_subtitle">点击给 Astrid 团队发送报告</string>
+    <!-- Sync: send error report button -->
+    <string name="sync_SPr_send_report">发送报告</string>
+
+    <!-- Sync: Clear Data Title -->
+    <string name="sync_SPr_forget">登出</string>
+    <!-- Sync: Clear Data Description -->
+    <string name="sync_SPr_forget_description">清除所有同步资料</string>
+
+    <!-- confirmation dialog for sync log out -->
+    <string name="sync_forget_confirm">登出/清除同步资料?</string>
+
+    <!-- Sync error: network connectivity problems. %s-> name of sync service-->
+    <string name="sync_error_offline">在最近与 %s 同步时网络连接发生问题。请重试。</string>
+
+    <string-array name="sync_SPr_interval_entries">
+        <!-- sync_SPr_interval_entries: Synchronization Intervals -->
+        <item>停用</item>
+        <item>每15分钟</item>
+        <item>每30分钟</item>
+        <item>每小时</item>
+        <item>每3小时</item>
+        <item>每6小时</item>
+        <item>每12小时</item>
+        <item>每天</item>
+        <item>每3天</item>
+        <item>每周</item>
+    </string-array>
+
 </resources>
diff --git a/api/res/values-zh-rTW/strings.xml b/api/res/values-zh-rTW/strings.xml
index 3696287af..bbde844ce 100755
--- a/api/res/values-zh-rTW/strings.xml
+++ b/api/res/values-zh-rTW/strings.xml
@@ -4,243 +4,243 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ==================================================== Generic Units == -->
-  
-  <plurals name="DUt_years">
-    <!-- plurals: years -->
-    <item quantity="one">1 年</item>
-    <!-- plurals: years -->
-    <item quantity="other">%d 年</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <!-- plurals: months -->
-    <item quantity="one">1 個月</item>
-    <!-- plurals: months -->
-    <item quantity="other">%d 個月</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <!-- plurals: days -->
-    <item quantity="one">1 週</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d 週</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <!-- plurals: days -->
-    <item quantity="one">1 天</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d 天</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <!-- plurals: days -->
-    <item quantity="one">1 個工作天</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d 個工作天</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <!-- plurals: hours -->
-    <item quantity="one">1 小時</item>
-    <!-- plurals: hours -->
-    <item quantity="other">%d 小時</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <!-- plurals: minutes -->
-    <item quantity="one">1 分鐘</item>
-    <!-- plurals: minutes -->
-    <item quantity="other">%d 分鐘</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <!-- plurals: seconds -->
-    <item quantity="one">1 秒</item>
-    <!-- plurals: seconds -->
-    <item quantity="other">%d 秒</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="one">1 小時</item>
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="other">%d 小時</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="one">1 分鐘</item>
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="other">%d 分鐘</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="one">1 秒</item>
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="other">%d 秒</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <!-- plurals: tasks -->
-    <item quantity="one">1 個工作</item>
-    <!-- plurals: tasks -->
-    <item quantity="other">%d 個工作</item>
-  </plurals>
-  <plurals name="Npeople">
-    <!-- plurals: people -->
-    <item quantity="one">一個人</item>
-    <!-- plurals: people -->
-    <item quantity="other">%d個人</item>
-  </plurals>
-  
-  <!-- slide 10a, 12c: today -->
-  <string name="today">今天</string>
-  
-  <!-- tomorrow -->
-  <string name="tomorrow">明天</string>
-  
-  <!-- yesterday -->
-  <string name="yesterday">昨天</string>
-  
-  <!-- slide 12c: tomorrow, abbreviated -->
-  <string name="tmrw">明天</string>
-  
-  <!-- slide 12c: yesterday, abbreviated -->
-  <string name="yest">昨天</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-  
-  <!-- confirmation dialog title -->
-  <string name="DLG_confirm_title">確認?</string>
-  
-  <!-- question dialog title -->
-  <string name="DLG_question_title">問題：</string>
-  
-  <!-- information dialog title -->
-  <string name="DLG_information_title">資訊</string>
-  
-  <!-- error dialog title -->
-  <string name="DLG_error_title">錯誤！</string>
-  
-  <!-- general dialog save-->
-  <string name="DLG_save">儲存</string>
-  
-  <!-- general dialog yes-->
-  <string name="DLG_yes">確定</string>
-  
-  <!-- general dialog no-->
-  <string name="DLG_no">取消</string>
-  
-  <!-- general dialog close-->
-  <string name="DLG_close">關閉</string>
-  
-  <!-- general dialog done -->
-  <string name="DLG_done">完成</string>
-  
-  <!-- error dialog (%s => error message)-->
-  <string name="DLG_error">糟糕，發生錯誤！狀況是:\n\n%s</string>
-  
-  <!-- error dialog (no message indicated)-->
-  <string name="DLG_error_generic">糟糕，發生錯誤！</string>
-  
-  <!-- Progress dialog shown when doing something slow -->
-  <string name="DLG_wait">請稍候...</string>
-
- <!-- ====================================================== SyncProvider == -->
-          
-  <!-- Sync Notification: message when sync service active -->
-  <string name="SyP_progress">工作同步中...</string>
-  
-  <!-- Sync Notification: toast when sync activated from activity -->
-  <string name="SyP_progress_toast">正在同步中...</string>
-  
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="SyP_label">同步和備份</string>  
-
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="Sync_now_label">Sync now</string>  
-
-  <!-- Sync label subtitle -->
-  <string name="SyP_summary">Astrid.com，谷歌任務，已存數據，本地備份</string>  
-
-  <!-- Error msg when io exception  -->
-  <string name="SyP_ioerror">連結錯誤! 檢查您的網際網路連線.</string>
-
-  <!-- ================================================== SyncPreferences == -->
-  
-  <!-- Status Group Label -->    
-  <string name="sync_SPr_group_status">狀態</string>
-  
-  <!-- Sync status subtitle, %s-> status message -->
-  <string name="sync_SPr_status_subtitle">狀態：%s</string>
-  <!-- Sync Status: log in -->    
-  <string name="sync_status_loggedout">未登陸</string>
-  <!-- Status: ongoing -->    
-  <string name="sync_status_ongoing">同步中...</string>
-  <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">上次同步：\n%s</string>
-  <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
-  <string name="sync_status_failed">失敗：%s</string>
-  <!-- Sync Status: error status (%s -> last sync date) -->    
-  <string name="sync_status_errors">同步w/ 錯誤： %s 上次同步日期</string>
-  <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
-  <string name="sync_status_failed_subtitle">上次成功同步：%s</string>
-  <!-- Sync Status: never sync\'d -->    
-  <string name="sync_status_never">未同步過！</string>
-
-  <!-- Options Group Label -->    
-  <string name="sync_SPr_group_options">選項</string>
-
-  <!-- Preference: Synchronization Interval Title -->    
-  <string name="sync_SPr_interval_title">後台同步</string>
-  <!-- Preference: Synchronization Interval Description (when disabled) -->
-  <string name="sync_SPr_interval_desc_disabled">後台同步已關閉</string>    
-  <!-- Preference: Synchronization Interval Description (%s => setting) -->
-  <string name="sync_SPr_interval_desc">目前同步間隔：%s</string>
-  
-  <!-- Preference: Background Wifi Title -->  
-  <string name="sync_SPr_bgwifi_title">Wifi 才可使用的設置</string>    
-  <!-- Preference: Background Wifi Description (enabled) -->
-  <string name="sync_SPr_bgwifi_desc_enabled">使用 Wifi 才啟動後台同步</string>    
-  <!-- Preference: Background Wifi Description (disabled) -->
-  <string name="sync_SPr_bgwifi_desc_disabled">總是使用後台同步</string>
-  
-  <!-- Actions Group Label  -->
-  <string name="sync_SPr_group_actions">動作</string>
-
-  <!-- Synchronize Now Button -->    
-  <string name="sync_SPr_sync">現在同步</string>
-  <!-- Synchronize Now Button if not logged in-->    
-  <string name="sync_SPr_sync_log_in">登陸並同步！</string>
-  
-  <!-- Sync: Prefix string before logged in identifier -->
-  <string name="sync_SPr_logged_in_prefix">已經登錄為：</string>
-  
-  <!-- Sync: Last error -->
-  <string name="sync_SPr_last_error">狀態報告</string>
-  
-  <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">點擊給 Astrid 團隊發送報告</string>
-  <!-- Sync: send error report button -->
-  <string name="sync_SPr_send_report">發送報告</string>
-  
-  <!-- Sync: Clear Data Title -->
-  <string name="sync_SPr_forget">登出</string>
-  <!-- Sync: Clear Data Description -->
-  <string name="sync_SPr_forget_description">清除所有同步資料</string>
-
-  <!-- confirmation dialog for sync log out -->
-  <string name="sync_forget_confirm">登出/清除同步資料?</string>
-  
-  <!-- Sync error: network connectivity problems. %s-> name of sync service-->
-  <string name="sync_error_offline">在最近與%s 同步時網絡連接發生問題。請重試。</string>
-  
-  <string-array name="sync_SPr_interval_entries">
-      <!-- sync_SPr_interval_entries: Synchronization Intervals -->
-      <item>停用</item>
-      <item>每15分鐘</item>
-      <item>每30分鐘</item>
-      <item>每小時</item>
-      <item>每3小時</item>
-      <item>每6小時</item>
-      <item>每12小時</item>
-      <item>每天</item>
-      <item>每3天</item>
-      <item>每週</item>
-  </string-array>    
-    
+<resources>
+
+    <!-- ==================================================== Generic Units == -->
+
+    <plurals name="DUt_years">
+        <!-- plurals: years -->
+        <item quantity="one">1 年</item>
+        <!-- plurals: years -->
+        <item quantity="other">%d 年</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <!-- plurals: months -->
+        <item quantity="one">1 個月</item>
+        <!-- plurals: months -->
+        <item quantity="other">%d 個月</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <!-- plurals: days -->
+        <item quantity="one">1 週</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d 週</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <!-- plurals: days -->
+        <item quantity="one">1 天</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d 天</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <!-- plurals: days -->
+        <item quantity="one">1 個工作天</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d 個工作天</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <!-- plurals: hours -->
+        <item quantity="one">1 小時</item>
+        <!-- plurals: hours -->
+        <item quantity="other">%d 小時</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <!-- plurals: minutes -->
+        <item quantity="one">1 分鐘</item>
+        <!-- plurals: minutes -->
+        <item quantity="other">%d 分鐘</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <!-- plurals: seconds -->
+        <item quantity="one">1 秒</item>
+        <!-- plurals: seconds -->
+        <item quantity="other">%d 秒</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="one">1 小時</item>
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="other">%d 小時</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="one">1 分鐘</item>
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="other">%d 分鐘</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="one">1 秒</item>
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="other">%d 秒</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <!-- plurals: tasks -->
+        <item quantity="one">1 個工作</item>
+        <!-- plurals: tasks -->
+        <item quantity="other">%d 個工作</item>
+    </plurals>
+    <plurals name="Npeople">
+        <!-- plurals: people -->
+        <item quantity="one">一個人</item>
+        <!-- plurals: people -->
+        <item quantity="other">%d個人</item>
+    </plurals>
+
+    <!-- slide 10a, 12c: today -->
+    <string name="today">今天</string>
+
+    <!-- tomorrow -->
+    <string name="tomorrow">明天</string>
+
+    <!-- yesterday -->
+    <string name="yesterday">昨天</string>
+
+    <!-- slide 12c: tomorrow, abbreviated -->
+    <string name="tmrw">明天</string>
+
+    <!-- slide 12c: yesterday, abbreviated -->
+    <string name="yest">昨天</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- confirmation dialog title -->
+    <string name="DLG_confirm_title">確認?</string>
+
+    <!-- question dialog title -->
+    <string name="DLG_question_title">問題：</string>
+
+    <!-- information dialog title -->
+    <string name="DLG_information_title">資訊</string>
+
+    <!-- error dialog title -->
+    <string name="DLG_error_title">錯誤！</string>
+
+    <!-- general dialog save-->
+    <string name="DLG_save">儲存</string>
+
+    <!-- general dialog yes-->
+    <string name="DLG_yes">確定</string>
+
+    <!-- general dialog no-->
+    <string name="DLG_no">取消</string>
+
+    <!-- general dialog close-->
+    <string name="DLG_close">關閉</string>
+
+    <!-- general dialog done -->
+    <string name="DLG_done">完成</string>
+
+    <!-- error dialog (%s => error message)-->
+    <string name="DLG_error">糟糕，發生錯誤！狀況是:\n\n%s</string>
+
+    <!-- error dialog (no message indicated)-->
+    <string name="DLG_error_generic">糟糕，發生錯誤！</string>
+
+    <!-- Progress dialog shown when doing something slow -->
+    <string name="DLG_wait">請稍候...</string>
+
+    <!-- ====================================================== SyncProvider == -->
+
+    <!-- Sync Notification: message when sync service active -->
+    <string name="SyP_progress">工作同步中...</string>
+
+    <!-- Sync Notification: toast when sync activated from activity -->
+    <string name="SyP_progress_toast">正在同步中...</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="SyP_label">同步和備份</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="Sync_now_label">Sync now</string>
+
+    <!-- Sync label subtitle -->
+    <string name="SyP_summary">Astrid.com，谷歌任務，已存數據，本地備份</string>
+
+    <!-- Error msg when io exception  -->
+    <string name="SyP_ioerror">連結錯誤! 檢查您的網際網路連線.</string>
+
+    <!-- ================================================== SyncPreferences == -->
+
+    <!-- Status Group Label -->
+    <string name="sync_SPr_group_status">狀態</string>
+
+    <!-- Sync status subtitle, %s-> status message -->
+    <string name="sync_SPr_status_subtitle">狀態：%s</string>
+    <!-- Sync Status: log in -->
+    <string name="sync_status_loggedout">未登陸</string>
+    <!-- Status: ongoing -->
+    <string name="sync_status_ongoing">同步中...</string>
+    <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
+    <string name="sync_status_success">上次同步：\n%s</string>
+    <!-- Sync Status: failure status (%s -> last attempted sync date) -->
+    <string name="sync_status_failed">失敗：%s</string>
+    <!-- Sync Status: error status (%s -> last sync date) -->
+    <string name="sync_status_errors">同步w/ 錯誤： %s 上次同步日期</string>
+    <!-- Sync Status: error subtitle (%s -> last successful sync date) -->
+    <string name="sync_status_failed_subtitle">上次成功同步：%s</string>
+    <!-- Sync Status: never sync\'d -->
+    <string name="sync_status_never">未同步過！</string>
+
+    <!-- Options Group Label -->
+    <string name="sync_SPr_group_options">選項</string>
+
+    <!-- Preference: Synchronization Interval Title -->
+    <string name="sync_SPr_interval_title">後台同步</string>
+    <!-- Preference: Synchronization Interval Description (when disabled) -->
+    <string name="sync_SPr_interval_desc_disabled">後台同步已關閉</string>
+    <!-- Preference: Synchronization Interval Description (%s => setting) -->
+    <string name="sync_SPr_interval_desc">目前同步間隔：%s</string>
+
+    <!-- Preference: Background Wifi Title -->
+    <string name="sync_SPr_bgwifi_title">Wifi 才可使用的設置</string>
+    <!-- Preference: Background Wifi Description (enabled) -->
+    <string name="sync_SPr_bgwifi_desc_enabled">使用 Wifi 才啟動後台同步</string>
+    <!-- Preference: Background Wifi Description (disabled) -->
+    <string name="sync_SPr_bgwifi_desc_disabled">總是使用後台同步</string>
+
+    <!-- Actions Group Label  -->
+    <string name="sync_SPr_group_actions">動作</string>
+
+    <!-- Synchronize Now Button -->
+    <string name="sync_SPr_sync">現在同步</string>
+    <!-- Synchronize Now Button if not logged in-->
+    <string name="sync_SPr_sync_log_in">登陸並同步！</string>
+
+    <!-- Sync: Prefix string before logged in identifier -->
+    <string name="sync_SPr_logged_in_prefix">已經登錄為：</string>
+
+    <!-- Sync: Last error -->
+    <string name="sync_SPr_last_error">狀態報告</string>
+
+    <!-- Sync: last error click for more -->
+    <string name="sync_SPr_last_error_subtitle">點擊給 Astrid 團隊發送報告</string>
+    <!-- Sync: send error report button -->
+    <string name="sync_SPr_send_report">發送報告</string>
+
+    <!-- Sync: Clear Data Title -->
+    <string name="sync_SPr_forget">登出</string>
+    <!-- Sync: Clear Data Description -->
+    <string name="sync_SPr_forget_description">清除所有同步資料</string>
+
+    <!-- confirmation dialog for sync log out -->
+    <string name="sync_forget_confirm">登出/清除同步資料?</string>
+
+    <!-- Sync error: network connectivity problems. %s-> name of sync service-->
+    <string name="sync_error_offline">在最近與%s 同步時網絡連接發生問題。請重試。</string>
+
+    <string-array name="sync_SPr_interval_entries">
+        <!-- sync_SPr_interval_entries: Synchronization Intervals -->
+        <item>停用</item>
+        <item>每15分鐘</item>
+        <item>每30分鐘</item>
+        <item>每小時</item>
+        <item>每3小時</item>
+        <item>每6小時</item>
+        <item>每12小時</item>
+        <item>每天</item>
+        <item>每3天</item>
+        <item>每週</item>
+    </string-array>
+
 </resources>
diff --git a/api/res/values/colors.xml b/api/res/values/colors.xml
index 498c753f6..c1f3c8d3a 100644
--- a/api/res/values/colors.xml
+++ b/api/res/values/colors.xml
@@ -4,14 +4,14 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    
+<resources>
+
     <color name="importance_1">#ffff5555</color>
     <color name="importance_2">#fffea400</color>
     <color name="importance_3">#ff33a5e8</color>
-    <color name="importance_4">#ff808080</color>    
-    <color name="importance_5">#ff505050</color>    
+    <color name="importance_4">#ff808080</color>
+    <color name="importance_5">#ff505050</color>
     <color name="importance_6">#ff202020</color>
-        
+
 </resources>
 
diff --git a/api/res/values/keys.xml b/api/res/values/keys.xml
index 0106ccb5e..a4262c09a 100644
--- a/api/res/values/keys.xml
+++ b/api/res/values/keys.xml
@@ -3,10 +3,10 @@
   This file contains preference keys and preference list values.
   These should not be translated 
 -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- 
-  <!-- ============================================================ SYNC == -->
-  
+<resources>
+
+    <!-- ============================================================ SYNC == -->
+
     <string-array name="sync_SPr_interval_values">
         <!-- sync_SPr_interval_values: interval in seconds for sync entries (do not edit) -->
         <item>0</item>
@@ -20,8 +20,8 @@
         <item>259200</item>
         <item>604800</item>
     </string-array>
-  
-      <!-- Preference Key (do not translate) -->
+
+    <!-- Preference Key (do not translate) -->
     <string name="sync_SPr_status_key">sync_status</string>
     <!-- Preference Key (do not translate) -->
     <string name="sync_SPr_bgwifi_key">sync_bgwifi</string>
@@ -33,5 +33,5 @@
     <string name="sync_SPr_key_options">sync_options</string>
     <!-- Preference Key (do not translate) -->
     <string name="sync_SPr_key_last_error">sync_last_error</string>
-  
+
 </resources>
diff --git a/api/res/values/strings.xml b/api/res/values/strings.xml
index 25eb24f78..6fd875b71 100644
--- a/api/res/values/strings.xml
+++ b/api/res/values/strings.xml
@@ -4,244 +4,249 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ==================================================== Generic Units == -->
-  
-  <plurals name="DUt_years">
-    <!-- plurals: years -->
-    <item quantity="one">1 Year</item>
-    <!-- plurals: years -->
-    <item quantity="other">%d Years</item>
-  </plurals>
-  <plurals name="DUt_months">
-    <!-- plurals: months -->
-    <item quantity="one">1 Month</item>
-    <!-- plurals: months -->
-    <item quantity="other">%d Months</item>
-  </plurals>
-  <plurals name="DUt_weeks">
-    <!-- plurals: days -->
-    <item quantity="one">1 Week</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d Weeks</item>
-  </plurals>
-  <plurals name="DUt_days">
-    <!-- plurals: days -->
-    <item quantity="one">1 Day</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d Days</item>
-  </plurals>
-  <plurals name="DUt_weekdays">
-    <!-- plurals: days -->
-    <item quantity="one">1 Weekday</item>
-    <!-- plurals: days -->
-    <item quantity="other">%d Weekdays</item>
-  </plurals>
-  <plurals name="DUt_hours">
-    <!-- plurals: hours -->
-    <item quantity="one">1 Hour</item>
-    <!-- plurals: hours -->
-    <item quantity="other">%d Hours</item>
-  </plurals>
-  <plurals name="DUt_minutes">
-    <!-- plurals: minutes -->
-    <item quantity="one">1 Minute</item>
-    <!-- plurals: minutes -->
-    <item quantity="other">%d Minutes</item>
-  </plurals>
-  <plurals name="DUt_seconds">
-    <!-- plurals: seconds -->
-    <item quantity="one">1 Second</item>
-    <!-- plurals: seconds -->
-    <item quantity="other">%d Seconds</item>
-  </plurals>
-  <plurals name="DUt_hoursShort">
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="one">1 Hr</item>
-    <!-- plurals: hours (abbreviated) -->
-    <item quantity="other">%d Hrs</item>
-  </plurals>
-  <plurals name="DUt_minutesShort">
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="one">1 Min</item>
-    <!-- plurals: minutes (abbreviated) -->
-    <item quantity="other">%d Min</item>
-  </plurals>
-  <plurals name="DUt_secondsShort">
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="one">1 Sec</item>
-    <!-- plurals: seconds (abbreviated) -->
-    <item quantity="other">%d Sec</item>
-  </plurals>
-  <plurals name="Ntasks">
-    <!-- plurals: tasks -->
-    <item quantity="one">1 task</item>
-    <!-- plurals: tasks -->
-    <item quantity="other">%d tasks</item>
-  </plurals>
-  <plurals name="Npeople">
-    <!-- plurals: people -->
-    <item quantity="one">1 person</item>
-    <!-- plurals: people -->
-    <item quantity="other">%d people</item>
-  </plurals>
-  
-  <!-- slide 10a, 12c: today -->
-  <string name="today">Today</string>
-  
-  <!-- tomorrow -->
-  <string name="tomorrow">Tomorrow</string>
-  
-  <!-- yesterday -->
-  <string name="yesterday">Yesterday</string>
-  
-  <!-- slide 12c: tomorrow, abbreviated -->
-  <string name="tmrw">Tmrw</string>
-  
-  <!-- slide 12c: yesterday, abbreviated -->
-  <string name="yest">Yest</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-  
-  <!-- confirmation dialog title -->
-  <string name="DLG_confirm_title">Confirm?</string>
-  
-  <!-- question dialog title -->
-  <string name="DLG_question_title">Question:</string>
-  
-  <!-- information dialog title -->
-  <string name="DLG_information_title">Information</string>
-  
-  <!-- error dialog title -->
-  <string name="DLG_error_title">Error!</string>
-  
-  <!-- general dialog save-->
-  <string name="DLG_save">Save</string>
-  
-  <!-- general dialog yes-->
-  <string name="DLG_yes">Yes</string>
-  
-  <!-- general dialog no-->
-  <string name="DLG_no">No</string>
-  
-  <!-- general dialog close-->
-  <string name="DLG_close">Close</string>
-  
-  <!-- general dialog done -->
-  <string name="DLG_done">Done</string>
-  
-  <!-- error dialog (%s => error message)-->
-  <string name="DLG_error">Oops, looks like an error occurred! Here\'s what happened:\n\n%s</string>
-  
-  <!-- error dialog (no message indicated)-->
-  <string name="DLG_error_generic">Oops, looks like an error occurred!</string>
-  
-  <!-- Progress dialog shown when doing something slow -->
-  <string name="DLG_wait">Please wait...</string>
-
- <!-- ====================================================== SyncProvider == -->
-          
-  <!-- Sync Notification: message when sync service active -->
-  <string name="SyP_progress">Synchronizing your tasks...</string>
-  
-  <!-- Sync Notification: toast when sync activated from activity -->
-  <string name="SyP_progress_toast">Synchronizing...</string>
-  
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="SyP_label">Sync &amp; backup</string>  
-
-  <!-- Sync Label: used in menu to denote synchronization -->
-  <string name="Sync_now_label">Sync now</string>  
-
-  <!-- Sync label subtitle -->
-  <string name="SyP_summary">Astrid.com, Google Tasks, saved data, local backup</string>  
-
-  <!-- Error msg when io exception  -->
-  <string name="SyP_ioerror">Connection Error! Check your Internet connection.</string>
-
-  <!-- ================================================== SyncPreferences == -->
-  
-  <!-- Status Group Label -->    
-  <string name="sync_SPr_group_status">Status</string>
-  
-  <!-- Sync status subtitle, %s-> status message -->
-  <string name="sync_SPr_status_subtitle">Status: %s</string>
-  <!-- Sync Status: log in -->    
-  <string name="sync_status_loggedout">Not logged in</string>
-  <!-- Status: ongoing -->    
-  <string name="sync_status_ongoing">Sync ongoing...</string>
-  <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->    
-  <string name="sync_status_success">Last sync:\n%s</string>
-  <!-- Sync Status: failure status (%s -> last attempted sync date) -->    
-  <string name="sync_status_failed">Failed on: %s</string>
-  <!-- Sync Status: error status (%s -> last sync date) -->    
-  <string name="sync_status_errors">Sync w/ errors: %s</string>
-  <!-- Sync Status: error subtitle (%s -> last successful sync date) -->    
-  <string name="sync_status_failed_subtitle">Last successful sync: %s</string>
-  <!-- Sync Status: never sync'd -->    
-  <string name="sync_status_never">Never synchronized!</string>
-
-  <!-- Options Group Label -->    
-  <string name="sync_SPr_group_options">Options</string>
-
-  <!-- Preference: Synchronization Interval Title -->    
-  <string name="sync_SPr_interval_title">Background sync</string>
-  <!-- Preference: Synchronization Interval Description (when disabled) -->
-  <string name="sync_SPr_interval_desc_disabled">Background synchronization is disabled</string>    
-  <!-- Preference: Synchronization Interval Description (%s => setting) -->
-  <string name="sync_SPr_interval_desc">Currently set to: %s</string>
-  
-  <!-- Preference: Background Wifi Title -->  
-  <string name="sync_SPr_bgwifi_title">Wifi only setting</string>    
-  <!-- Preference: Background Wifi Description (enabled) -->
-  <string name="sync_SPr_bgwifi_desc_enabled">Background synchronization only happens when on Wifi</string>    
-  <!-- Preference: Background Wifi Description (disabled) -->
-  <string name="sync_SPr_bgwifi_desc_disabled">Background synchronization will always occur</string>
-  
-  <!-- Actions Group Label  -->
-  <string name="sync_SPr_group_actions">Actions</string>
-
-  <!-- Synchronize Now Button -->    
-  <string name="sync_SPr_sync">Synchronize now</string>
-  <!-- Synchronize Now Button if not logged in-->    
-  <string name="sync_SPr_sync_log_in">Log in &amp; synchronize!</string>
-  
-  <!-- Sync: Prefix string before logged in identifier -->
-  <string name="sync_SPr_logged_in_prefix">Logged in as:</string>
-  
-  <!-- Sync: Last error -->
-  <string name="sync_SPr_last_error">Status report</string>
-  
-  <!-- Sync: last error click for more -->
-  <string name="sync_SPr_last_error_subtitle">Click to send a report to the Astrid team</string>
-  <!-- Sync: send error report button -->
-  <string name="sync_SPr_send_report">Send report</string>
-  
-  <!-- Sync: Clear Data Title -->
-  <string name="sync_SPr_forget">Log out</string>
-  <!-- Sync: Clear Data Description -->
-  <string name="sync_SPr_forget_description">Clears all synchronization data</string>
-
-  <!-- confirmation dialog for sync log out -->
-  <string name="sync_forget_confirm">Log out/clear synchronization data?</string>
-  
-  <!-- Sync error: network connectivity problems. %s-> name of sync service-->
-  <string name="sync_error_offline">There was a problem connecting to the network
-      during the last sync with %s. Please try again later.</string>
-  
-  <string-array name="sync_SPr_interval_entries">
-      <!-- sync_SPr_interval_entries: Synchronization Intervals -->
-      <item>disable</item>
-      <item>every fifteen minutes</item>
-      <item>every thirty minutes</item>
-      <item>every hour</item>
-      <item>every three hours</item>
-      <item>every six hours</item>
-      <item>every twelve hours</item>
-      <item>every day</item>
-      <item>every three days</item>
-      <item>every week</item>
-  </string-array>    
-    
+<resources>
+
+    <!-- ==================================================== Generic Units == -->
+
+    <plurals name="DUt_years">
+        <!-- plurals: years -->
+        <item quantity="one">1 Year</item>
+        <!-- plurals: years -->
+        <item quantity="other">%d Years</item>
+    </plurals>
+    <plurals name="DUt_months">
+        <!-- plurals: months -->
+        <item quantity="one">1 Month</item>
+        <!-- plurals: months -->
+        <item quantity="other">%d Months</item>
+    </plurals>
+    <plurals name="DUt_weeks">
+        <!-- plurals: days -->
+        <item quantity="one">1 Week</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d Weeks</item>
+    </plurals>
+    <plurals name="DUt_days">
+        <!-- plurals: days -->
+        <item quantity="one">1 Day</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d Days</item>
+    </plurals>
+    <plurals name="DUt_weekdays">
+        <!-- plurals: days -->
+        <item quantity="one">1 Weekday</item>
+        <!-- plurals: days -->
+        <item quantity="other">%d Weekdays</item>
+    </plurals>
+    <plurals name="DUt_hours">
+        <!-- plurals: hours -->
+        <item quantity="one">1 Hour</item>
+        <!-- plurals: hours -->
+        <item quantity="other">%d Hours</item>
+    </plurals>
+    <plurals name="DUt_minutes">
+        <!-- plurals: minutes -->
+        <item quantity="one">1 Minute</item>
+        <!-- plurals: minutes -->
+        <item quantity="other">%d Minutes</item>
+    </plurals>
+    <plurals name="DUt_seconds">
+        <!-- plurals: seconds -->
+        <item quantity="one">1 Second</item>
+        <!-- plurals: seconds -->
+        <item quantity="other">%d Seconds</item>
+    </plurals>
+    <plurals name="DUt_hoursShort">
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="one">1 Hr</item>
+        <!-- plurals: hours (abbreviated) -->
+        <item quantity="other">%d Hrs</item>
+    </plurals>
+    <plurals name="DUt_minutesShort">
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="one">1 Min</item>
+        <!-- plurals: minutes (abbreviated) -->
+        <item quantity="other">%d Min</item>
+    </plurals>
+    <plurals name="DUt_secondsShort">
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="one">1 Sec</item>
+        <!-- plurals: seconds (abbreviated) -->
+        <item quantity="other">%d Sec</item>
+    </plurals>
+    <plurals name="Ntasks">
+        <!-- plurals: tasks -->
+        <item quantity="one">1 task</item>
+        <!-- plurals: tasks -->
+        <item quantity="other">%d tasks</item>
+    </plurals>
+    <plurals name="Npeople">
+        <!-- plurals: people -->
+        <item quantity="one">1 person</item>
+        <!-- plurals: people -->
+        <item quantity="other">%d people</item>
+    </plurals>
+
+    <!-- slide 10a, 12c: today -->
+    <string name="today">Today</string>
+
+    <!-- tomorrow -->
+    <string name="tomorrow">Tomorrow</string>
+
+    <!-- yesterday -->
+    <string name="yesterday">Yesterday</string>
+
+    <!-- slide 12c: tomorrow, abbreviated -->
+    <string name="tmrw">Tmrw</string>
+
+    <!-- slide 12c: yesterday, abbreviated -->
+    <string name="yest">Yest</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- confirmation dialog title -->
+    <string name="DLG_confirm_title">Confirm?</string>
+
+    <!-- question dialog title -->
+    <string name="DLG_question_title">Question:</string>
+
+    <!-- information dialog title -->
+    <string name="DLG_information_title">Information</string>
+
+    <!-- error dialog title -->
+    <string name="DLG_error_title">Error!</string>
+
+    <!-- general dialog save-->
+    <string name="DLG_save">Save</string>
+
+    <!-- general dialog yes-->
+    <string name="DLG_yes">Yes</string>
+
+    <!-- general dialog no-->
+    <string name="DLG_no">No</string>
+
+    <!-- general dialog close-->
+    <string name="DLG_close">Close</string>
+
+    <!-- general dialog done -->
+    <string name="DLG_done">Done</string>
+
+    <!-- error dialog (%s => error message)-->
+    <string name="DLG_error">Oops, looks like an error occurred! Here\'s what happened:\n\n%s
+    </string>
+
+    <!-- error dialog (no message indicated)-->
+    <string name="DLG_error_generic">Oops, looks like an error occurred!</string>
+
+    <!-- Progress dialog shown when doing something slow -->
+    <string name="DLG_wait">Please wait...</string>
+
+    <!-- ====================================================== SyncProvider == -->
+
+    <!-- Sync Notification: message when sync service active -->
+    <string name="SyP_progress">Synchronizing your tasks...</string>
+
+    <!-- Sync Notification: toast when sync activated from activity -->
+    <string name="SyP_progress_toast">Synchronizing...</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="SyP_label">Sync &amp; backup</string>
+
+    <!-- Sync Label: used in menu to denote synchronization -->
+    <string name="Sync_now_label">Sync now</string>
+
+    <!-- Sync label subtitle -->
+    <string name="SyP_summary">Astrid.com, Google Tasks, saved data, local backup</string>
+
+    <!-- Error msg when io exception  -->
+    <string name="SyP_ioerror">Connection Error! Check your Internet connection.</string>
+
+    <!-- ================================================== SyncPreferences == -->
+
+    <!-- Status Group Label -->
+    <string name="sync_SPr_group_status">Status</string>
+
+    <!-- Sync status subtitle, %s-> status message -->
+    <string name="sync_SPr_status_subtitle">Status: %s</string>
+    <!-- Sync Status: log in -->
+    <string name="sync_status_loggedout">Not logged in</string>
+    <!-- Status: ongoing -->
+    <string name="sync_status_ongoing">Sync ongoing...</string>
+    <!-- Sync Status: success status (%s -> last sync date). Keep it short!-->
+    <string name="sync_status_success">Last sync:\n%s</string>
+    <!-- Sync Status: failure status (%s -> last attempted sync date) -->
+    <string name="sync_status_failed">Failed on: %s</string>
+    <!-- Sync Status: error status (%s -> last sync date) -->
+    <string name="sync_status_errors">Sync w/ errors: %s</string>
+    <!-- Sync Status: error subtitle (%s -> last successful sync date) -->
+    <string name="sync_status_failed_subtitle">Last successful sync: %s</string>
+    <!-- Sync Status: never sync'd -->
+    <string name="sync_status_never">Never synchronized!</string>
+
+    <!-- Options Group Label -->
+    <string name="sync_SPr_group_options">Options</string>
+
+    <!-- Preference: Synchronization Interval Title -->
+    <string name="sync_SPr_interval_title">Background sync</string>
+    <!-- Preference: Synchronization Interval Description (when disabled) -->
+    <string name="sync_SPr_interval_desc_disabled">Background synchronization is disabled</string>
+    <!-- Preference: Synchronization Interval Description (%s => setting) -->
+    <string name="sync_SPr_interval_desc">Currently set to: %s</string>
+
+    <!-- Preference: Background Wifi Title -->
+    <string name="sync_SPr_bgwifi_title">Wifi only setting</string>
+    <!-- Preference: Background Wifi Description (enabled) -->
+    <string name="sync_SPr_bgwifi_desc_enabled">Background synchronization only happens when on
+        Wifi
+    </string>
+    <!-- Preference: Background Wifi Description (disabled) -->
+    <string name="sync_SPr_bgwifi_desc_disabled">Background synchronization will always occur
+    </string>
+
+    <!-- Actions Group Label  -->
+    <string name="sync_SPr_group_actions">Actions</string>
+
+    <!-- Synchronize Now Button -->
+    <string name="sync_SPr_sync">Synchronize now</string>
+    <!-- Synchronize Now Button if not logged in-->
+    <string name="sync_SPr_sync_log_in">Log in &amp; synchronize!</string>
+
+    <!-- Sync: Prefix string before logged in identifier -->
+    <string name="sync_SPr_logged_in_prefix">Logged in as:</string>
+
+    <!-- Sync: Last error -->
+    <string name="sync_SPr_last_error">Status report</string>
+
+    <!-- Sync: last error click for more -->
+    <string name="sync_SPr_last_error_subtitle">Click to send a report to the Astrid team</string>
+    <!-- Sync: send error report button -->
+    <string name="sync_SPr_send_report">Send report</string>
+
+    <!-- Sync: Clear Data Title -->
+    <string name="sync_SPr_forget">Log out</string>
+    <!-- Sync: Clear Data Description -->
+    <string name="sync_SPr_forget_description">Clears all synchronization data</string>
+
+    <!-- confirmation dialog for sync log out -->
+    <string name="sync_forget_confirm">Log out/clear synchronization data?</string>
+
+    <!-- Sync error: network connectivity problems. %s-> name of sync service-->
+    <string name="sync_error_offline">There was a problem connecting to the network
+        during the last sync with %s. Please try again later.
+    </string>
+
+    <string-array name="sync_SPr_interval_entries">
+        <!-- sync_SPr_interval_entries: Synchronization Intervals -->
+        <item>disable</item>
+        <item>every fifteen minutes</item>
+        <item>every thirty minutes</item>
+        <item>every hour</item>
+        <item>every three hours</item>
+        <item>every six hours</item>
+        <item>every twelve hours</item>
+        <item>every day</item>
+        <item>every three days</item>
+        <item>every week</item>
+    </string-array>
+
 </resources>
diff --git a/api/src/com/todoroo/andlib/data/AbstractDatabase.java b/api/src/com/todoroo/andlib/data/AbstractDatabase.java
index f24952551..2ff93f9d7 100644
--- a/api/src/com/todoroo/andlib/data/AbstractDatabase.java
+++ b/api/src/com/todoroo/andlib/data/AbstractDatabase.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.andlib.data;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -24,25 +21,27 @@ import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.andlib.utility.AndroidUtilities;
 
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+
 /**
  * AbstractDatabase is a database abstraction which wraps a SQLite database.
- * <p>
+ * <p/>
  * Users of this class are in charge of the database's lifecycle - ensuring that
  * the database is open when needed and closed when usage is finished. Within an
  * activity, this is typically accomplished through the onResume and onPause
  * methods, though if the database is not needed for the activity's entire
  * lifecycle, it can be closed earlier.
- * <p>
+ * <p/>
  * Direct querying is not recommended for type safety reasons. Instead, use one
  * of the service classes to issue the request and return a {@link TodorooCursor}.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 abstract public class AbstractDatabase {
 
-	// --- abstract methods
+    // --- abstract methods
 
     /**
      * @return database name
@@ -67,6 +66,7 @@ abstract public class AbstractDatabase {
 
     /**
      * Upgrades an open database from one version to the next
+     *
      * @param oldVersion
      * @param newVersion
      * @return true if upgrade was handled, false otherwise
@@ -105,12 +105,12 @@ abstract public class AbstractDatabase {
     }
 
     protected void onDatabaseUpdated() {
-        for(DatabaseUpdateListener listener : listeners) {
+        for (DatabaseUpdateListener listener : listeners) {
             listener.onDatabaseUpdated();
         }
     }
 
-	// --- internal implementation
+    // --- internal implementation
 
     @Autowired
     private ExceptionService exceptionService;
@@ -121,12 +121,13 @@ abstract public class AbstractDatabase {
 
     /**
      * Return the name of the table containing these models
+     *
      * @param modelType
      * @return
      */
     public final Table getTable(Class<? extends AbstractModel> modelType) {
-        for(Table table : getTables()) {
-            if(table.modelClass.equals(modelType))
+        for (Table table : getTables()) {
+            if (table.modelClass.equals(modelType))
                 return table;
         }
         throw new UnsupportedOperationException("Unknown model class " + modelType); //$NON-NLS-1$
@@ -149,8 +150,8 @@ abstract public class AbstractDatabase {
     }
 
     protected synchronized final void initializeHelper() {
-        if(helper == null) {
-            if(ContextManager.getContext() == null)
+        if (helper == null) {
+            if (ContextManager.getContext() == null)
                 throw new NullPointerException("Null context creating database helper");
             helper = new DatabaseHelper(ContextManager.getContext(),
                     getName(), null, getVersion());
@@ -164,7 +165,7 @@ abstract public class AbstractDatabase {
     public synchronized final void openForWriting() {
         initializeHelper();
 
-        if(database != null && !database.isReadOnly() && database.isOpen())
+        if (database != null && !database.isReadOnly() && database.isOpen())
             return;
 
         try {
@@ -192,7 +193,7 @@ abstract public class AbstractDatabase {
      */
     public synchronized final void openForReading() {
         initializeHelper();
-        if(database != null && database.isOpen())
+        if (database != null && database.isOpen())
             return;
         database = helper.getReadableDatabase();
     }
@@ -201,7 +202,7 @@ abstract public class AbstractDatabase {
      * Close the database if it has been opened previously
      */
     public synchronized final void close() {
-        if(database != null) {
+        if (database != null) {
             database.close();
         }
         database = null;
@@ -220,7 +221,7 @@ abstract public class AbstractDatabase {
      * @return sql database. opens database if not yet open
      */
     public synchronized final SQLiteDatabase getDatabase() {
-        if(database == null) {
+        if (database == null) {
             AndroidUtilities.sleepDeep(300L);
             openForWriting();
         }
@@ -273,7 +274,7 @@ abstract public class AbstractDatabase {
     /*
      * @see android.database.sqlite.SQLiteDatabase#update(String  table, ContentValues  values, String  whereClause, String[] whereArgs)
      */
-    public synchronized int update(String  table, ContentValues  values, String  whereClause, String[] whereArgs) {
+    public synchronized int update(String table, ContentValues values, String whereClause, String[] whereArgs) {
         int result = getDatabase().update(table, values, whereClause, whereArgs);
         onDatabaseUpdated();
         return result;
@@ -287,7 +288,7 @@ abstract public class AbstractDatabase {
     private class DatabaseHelper extends SQLiteOpenHelper {
 
         public DatabaseHelper(Context context, String name,
-                CursorFactory factory, int version) {
+                              CursorFactory factory, int version) {
             super(context, name, factory, version);
         }
 
@@ -300,11 +301,11 @@ abstract public class AbstractDatabase {
             SqlConstructorVisitor sqlVisitor = new SqlConstructorVisitor();
 
             // create tables
-            for(Table table : getTables()) {
+            for (Table table : getTables()) {
                 sql.append("CREATE TABLE IF NOT EXISTS ").append(table.name).append('(').
-                append(AbstractModel.ID_PROPERTY).append(" INTEGER PRIMARY KEY AUTOINCREMENT");
-                for(Property<?> property : table.getProperties()) {
-                    if(AbstractModel.ID_PROPERTY.name.equals(property.name))
+                        append(AbstractModel.ID_PROPERTY).append(" INTEGER PRIMARY KEY AUTOINCREMENT");
+                for (Property<?> property : table.getProperties()) {
+                    if (AbstractModel.ID_PROPERTY.name.equals(property.name))
                         continue;
                     sql.append(',').append(property.accept(sqlVisitor, null));
                 }
@@ -328,7 +329,7 @@ abstract public class AbstractDatabase {
 
             database = db;
             try {
-                if(!AbstractDatabase.this.onUpgrade(oldVersion, newVersion)) {
+                if (!AbstractDatabase.this.onUpgrade(oldVersion, newVersion)) {
                     // We don't know how to handle this case because someone forgot to
                     // implement the upgrade. We can't drop tables, we can only
                     // throw a nasty exception at this time
@@ -347,7 +348,6 @@ abstract public class AbstractDatabase {
      * Visitor that returns SQL constructor for this property
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     public static class SqlConstructorVisitor implements PropertyVisitor<String, Void> {
 
diff --git a/api/src/com/todoroo/andlib/data/AbstractModel.java b/api/src/com/todoroo/andlib/data/AbstractModel.java
index 4a572d750..1bfa6bccc 100644
--- a/api/src/com/todoroo/andlib/data/AbstractModel.java
+++ b/api/src/com/todoroo/andlib/data/AbstractModel.java
@@ -5,15 +5,6 @@
  */
 package com.todoroo.andlib.data;
 
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import android.content.ContentValues;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -24,15 +15,23 @@ import com.todoroo.andlib.data.Property.LongProperty;
 import com.todoroo.andlib.data.Property.PropertyVisitor;
 import com.todoroo.andlib.utility.AndroidUtilities;
 
+import java.lang.reflect.Array;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map.Entry;
+import java.util.Set;
+
 /**
  * <code>AbstractModel</code> represents a row in a database.
- * <p>
+ * <p/>
  * A single database can be represented by multiple <code>AbstractModel</code>s
  * corresponding to different queries that return a different set of columns.
  * Each model exposes a set of properties that it contains.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public abstract class AbstractModel implements Parcelable, Cloneable {
 
@@ -42,21 +41,31 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
 
     // --- constants
 
-    /** id property common to all models */
+    /**
+     * id property common to all models
+     */
     protected static final String ID_PROPERTY_NAME = "_id"; //$NON-NLS-1$
 
-    /** id field common to all models */
+    /**
+     * id field common to all models
+     */
     public static final LongProperty ID_PROPERTY = new LongProperty(null, ID_PROPERTY_NAME);
 
-    /** sentinel for objects without an id */
+    /**
+     * sentinel for objects without an id
+     */
     public static final long NO_ID = 0;
 
-    /** prefix for transitories retained in content values */
+    /**
+     * prefix for transitories retained in content values
+     */
     public static final String RETAIN_TRANSITORY_PREFIX = "retain-trans-"; //$NON-NLS-1$
 
     // --- abstract methods
 
-    /** Get the default values for this object */
+    /**
+     * Get the default values for this object
+     */
     abstract public ContentValues getDefaultValues();
 
     // --- data store variables and management
@@ -68,35 +77,47 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
      * the database (values), then defaults (getDefaultValues)
      */
 
-    /** User set values */
+    /**
+     * User set values
+     */
     protected ContentValues setValues = null;
 
-    /** Values from database */
+    /**
+     * Values from database
+     */
     protected ContentValues values = null;
 
-    /** Transitory Metadata (not saved in database) */
+    /**
+     * Transitory Metadata (not saved in database)
+     */
     protected HashMap<String, Object> transitoryData = null;
 
-    /** Get database-read values for this object */
+    /**
+     * Get database-read values for this object
+     */
     public ContentValues getDatabaseValues() {
         return values;
     }
 
-    /** Get the user-set values for this object */
+    /**
+     * Get the user-set values for this object
+     */
     public ContentValues getSetValues() {
         return setValues;
     }
 
-    /** Get a list of all field/value pairs merged across data sources */
+    /**
+     * Get a list of all field/value pairs merged across data sources
+     */
     public ContentValues getMergedValues() {
         ContentValues mergedValues = new ContentValues();
 
         ContentValues defaultValues = getDefaultValues();
-        if(defaultValues != null)
+        if (defaultValues != null)
             mergedValues.putAll(defaultValues);
-        if(values != null)
+        if (values != null)
             mergedValues.putAll(values);
-        if(setValues != null)
+        if (setValues != null)
             mergedValues.putAll(setValues);
 
         return mergedValues;
@@ -115,9 +136,9 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
      * saved - future saves will not need to write all the data as before.
      */
     public void markSaved() {
-        if(values == null)
+        if (values == null)
             values = setValues;
-        else if(setValues != null)
+        else if (setValues != null)
             values.putAll(setValues);
         setValues = null;
     }
@@ -128,10 +149,10 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
      */
     @Override
     public boolean equals(Object other) {
-        if(other == null || other.getClass() !=  getClass())
+        if (other == null || other.getClass() != getClass())
             return false;
 
-        return getMergedValues().equals(((AbstractModel)other).getMergedValues());
+        return getMergedValues().equals(((AbstractModel) other).getMergedValues());
     }
 
     @Override
@@ -144,10 +165,10 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
     public String toString() {
         StringBuilder builder = new StringBuilder();
         builder.append(getClass().getSimpleName()).append("\n")
-        .append("set values:\n")
-        .append(setValues).append("\n")
-        .append("values:\n")
-        .append(values).append("\n");
+                .append("set values:\n")
+                .append(setValues).append("\n")
+                .append("values:\n")
+                .append(values).append("\n");
         return builder.toString();
     }
 
@@ -159,14 +180,16 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
         } catch (CloneNotSupportedException e) {
             throw new RuntimeException(e);
         }
-        if(setValues != null)
+        if (setValues != null)
             clone.setValues = new ContentValues(setValues);
-        if(values != null)
+        if (values != null)
             clone.values = new ContentValues(values);
         return clone;
     }
 
-    /** Check if this model has values that have been changed */
+    /**
+     * Check if this model has values that have been changed
+     */
     public boolean isModified() {
         return setValues.size() > 0;
     }
@@ -198,29 +221,29 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
      */
     public synchronized <TYPE> TYPE getValue(Property<TYPE> property) {
         Object value;
-        if(setValues != null && setValues.containsKey(property.getColumnName()))
+        if (setValues != null && setValues.containsKey(property.getColumnName()))
             value = setValues.get(property.getColumnName());
 
-        else if(values != null && values.containsKey(property.getColumnName()))
+        else if (values != null && values.containsKey(property.getColumnName()))
             value = values.get(property.getColumnName());
 
-        else if(getDefaultValues().containsKey(property.getColumnName()))
+        else if (getDefaultValues().containsKey(property.getColumnName()))
             value = getDefaultValues().get(property.getColumnName());
 
         else
             throw new UnsupportedOperationException(
-                "Model Error: Did not read property " + property.name); //$NON-NLS-1$
+                    "Model Error: Did not read property " + property.name); //$NON-NLS-1$
 
         // resolve properties that were retrieved with a different type than accessed
         try {
-            if(value instanceof String && property instanceof LongProperty)
-                return (TYPE) Long.valueOf((String)value);
-            else if(value instanceof String && property instanceof IntegerProperty)
-                return (TYPE) Integer.valueOf((String)value);
-            else if(value instanceof String && property instanceof DoubleProperty)
-                return (TYPE) Double.valueOf((String)value);
-            else if(value instanceof Integer && property instanceof LongProperty)
-                return (TYPE) Long.valueOf(((Number)value).longValue());
+            if (value instanceof String && property instanceof LongProperty)
+                return (TYPE) Long.valueOf((String) value);
+            else if (value instanceof String && property instanceof IntegerProperty)
+                return (TYPE) Integer.valueOf((String) value);
+            else if (value instanceof String && property instanceof DoubleProperty)
+                return (TYPE) Double.valueOf((String) value);
+            else if (value instanceof Integer && property instanceof LongProperty)
+                return (TYPE) Long.valueOf(((Number) value).longValue());
             return (TYPE) value;
         } catch (NumberFormatException e) {
             return (TYPE) getDefaultValues().get(property.name);
@@ -235,9 +258,9 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
     abstract public long getId();
 
     protected long getIdHelper(LongProperty id) {
-        if(setValues != null && setValues.containsKey(id.name))
+        if (setValues != null && setValues.containsKey(id.name))
             return setValues.getAsLong(id.name);
-        else if(values != null && values.containsKey(id.name))
+        else if (values != null && values.containsKey(id.name))
             return values.getAsLong(id.name);
         else
             return NO_ID;
@@ -247,7 +270,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
         if (setValues == null)
             setValues = new ContentValues();
 
-        if(id == NO_ID)
+        if (id == NO_ID)
             clearValue(ID_PROPERTY);
         else
             setValues.put(ID_PROPERTY_NAME, id);
@@ -265,9 +288,9 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
      * @return true if setValues or values contains this property
      */
     public boolean containsValue(Property<?> property) {
-        if(setValues != null && setValues.containsKey(property.getColumnName()))
+        if (setValues != null && setValues.containsKey(property.getColumnName()))
             return true;
-        if(values != null && values.containsKey(property.getColumnName()))
+        if (values != null && values.containsKey(property.getColumnName()))
             return true;
         return false;
     }
@@ -275,12 +298,12 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
     /**
      * @param property
      * @return true if setValues or values contains this property, and the value
-     *         stored is not null
+     * stored is not null
      */
     public boolean containsNonNullValue(Property<?> property) {
-        if(setValues != null && setValues.containsKey(property.getColumnName()))
+        if (setValues != null && setValues.containsKey(property.getColumnName()))
             return setValues.get(property.getColumnName()) != null;
-        if(values != null && values.containsKey(property.getColumnName()))
+        if (values != null && values.containsKey(property.getColumnName()))
             return values.get(property.getColumnName()) != null;
         return false;
     }
@@ -294,12 +317,12 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
     protected synchronized <TYPE> boolean shouldSaveValue(
             Property<TYPE> property, TYPE newValue) {
 
-    	// we've already decided to save it, so overwrite old value
+        // we've already decided to save it, so overwrite old value
         if (setValues.containsKey(property.getColumnName()))
-        	return true;
+            return true;
 
         // values contains this key, we should check it out
-        if(values != null && values.containsKey(property.getColumnName())) {
+        if (values != null && values.containsKey(property.getColumnName())) {
             TYPE value = getValue(property);
             if (value == null) {
                 if (newValue == null)
@@ -316,7 +339,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
      * Sets the given property. Make sure this model has this property!
      */
     public synchronized <TYPE> void setValue(Property<TYPE> property,
-            TYPE value) {
+                                             TYPE value) {
         if (setValues == null)
             setValues = new ContentValues();
         if (!shouldSaveValue(property, value))
@@ -350,23 +373,25 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
 
     /**
      * Clear the key for the given property
+     *
      * @param property
      */
     public synchronized void clearValue(Property<?> property) {
-        if(setValues != null && setValues.containsKey(property.getColumnName()))
+        if (setValues != null && setValues.containsKey(property.getColumnName()))
             setValues.remove(property.getColumnName());
-        if(values != null && values.containsKey(property.getColumnName()))
+        if (values != null && values.containsKey(property.getColumnName()))
             values.remove(property.getColumnName());
     }
 
     /**
      * Sets the state of the given flag on the given property
+     *
      * @param property
      * @param flag
      * @param value
      */
     public void setFlag(IntegerProperty property, int flag, boolean value) {
-        if(value)
+        if (value)
             setValue(property, getValue(property) | flag);
         else
             setValue(property, getValue(property) & ~flag);
@@ -374,8 +399,9 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
 
     /**
      * Returns the set state of the given flag on the given property
+     *
      * @param property the property to get the set state of the flag
-     * @param flag the flag-descriptor (e.g. <code>Task.FLAG_REPEAT_AFTER_COMPLETION</code>)
+     * @param flag     the flag-descriptor (e.g. <code>Task.FLAG_REPEAT_AFTER_COMPLETION</code>)
      * @return true if the flag is set
      */
     public boolean getFlag(IntegerProperty property, int flag) {
@@ -386,13 +412,13 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
     // --- setting and retrieving flags
 
     public synchronized void putTransitory(String key, Object value) {
-        if(transitoryData == null)
+        if (transitoryData == null)
             transitoryData = new HashMap<String, Object>();
         transitoryData.put(key, value);
     }
 
     public Object getTransitory(String key) {
-        if(transitoryData == null)
+        if (transitoryData == null)
             return null;
         return transitoryData.get(key);
     }
@@ -427,18 +453,18 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
      */
     protected static Property<?>[] generateProperties(Class<? extends AbstractModel> cls) {
         ArrayList<Property<?>> properties = new ArrayList<Property<?>>();
-        if(cls.getSuperclass() != AbstractModel.class)
+        if (cls.getSuperclass() != AbstractModel.class)
             properties.addAll(Arrays.asList(generateProperties(
-                (Class<? extends AbstractModel>) cls.getSuperclass())));
+                    (Class<? extends AbstractModel>) cls.getSuperclass())));
 
         // a property is public, static & extends Property
-        for(Field field : cls.getFields()) {
-            if((field.getModifiers() & Modifier.STATIC) == 0)
+        for (Field field : cls.getFields()) {
+            if ((field.getModifiers() & Modifier.STATIC) == 0)
                 continue;
-            if(!Property.class.isAssignableFrom(field.getType()))
+            if (!Property.class.isAssignableFrom(field.getType()))
                 continue;
             try {
-                if(((Property<?>) field.get(null)).table == null)
+                if (((Property<?>) field.get(null)).table == null)
                     continue;
                 properties.add((Property<?>) field.get(null));
             } catch (IllegalArgumentException e) {
@@ -455,7 +481,6 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
      * Visitor that saves a value into a content values store
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     public static class ContentValuesSavingVisitor implements PropertyVisitor<Void, Object> {
 
@@ -467,7 +492,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
             // we don't allow null values, as they indicate unset properties
             // when the database was written
 
-            if(value != null)
+            if (value != null)
                 property.accept(this, value);
         }
 
@@ -516,9 +541,9 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
      */
     abstract protected Parcelable.Creator<? extends AbstractModel> getCreator();
 
-   /**
-    * Parcelable creator helper
-    */
+    /**
+     * Parcelable creator helper
+     */
     protected static final class ModelCreator<TYPE extends AbstractModel>
             implements Parcelable.Creator<TYPE> {
 
@@ -551,7 +576,11 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
          */
         public TYPE[] newArray(int size) {
             return (TYPE[]) Array.newInstance(cls, size);
-        };
-    };
+        }
+
+        ;
+    }
+
+    ;
 
 }
diff --git a/api/src/com/todoroo/andlib/data/ContentResolverDao.java b/api/src/com/todoroo/andlib/data/ContentResolverDao.java
index 472c7c6b7..df804bc2a 100644
--- a/api/src/com/todoroo/andlib/data/ContentResolverDao.java
+++ b/api/src/com/todoroo/andlib/data/ContentResolverDao.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.andlib.data;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Set;
-
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
@@ -22,23 +18,32 @@ import com.todoroo.andlib.sql.Criterion;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.AndroidUtilities;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Set;
+
 
 /**
  * DAO for reading and writing values from an Android ContentResolver
  *
- * @author Tim Su <tim@todoroo.com>
- *
  * @param <TYPE> model type
+ * @author Tim Su <tim@todoroo.com>
  */
 public class ContentResolverDao<TYPE extends AbstractModel> {
 
-    /** class of model */
+    /**
+     * class of model
+     */
     private final Class<TYPE> modelClass;
 
-    /** base content uri */
+    /**
+     * base content uri
+     */
     private final Uri baseUri;
 
-    /** content resolver */
+    /**
+     * content resolver
+     */
     private final ContentResolver cr;
 
     @Autowired
@@ -47,7 +52,7 @@ public class ContentResolverDao<TYPE extends AbstractModel> {
     public ContentResolverDao(Class<TYPE> modelClass, Context context, Uri baseUri) {
         DependencyInjectionService.getInstance().inject(this);
         this.modelClass = modelClass;
-        if(debug == null)
+        if (debug == null)
             debug = false;
         this.baseUri = baseUri;
 
@@ -56,6 +61,7 @@ public class ContentResolverDao<TYPE extends AbstractModel> {
 
     /**
      * Returns a URI for a single id
+     *
      * @param id
      * @return
      */
@@ -65,6 +71,7 @@ public class ContentResolverDao<TYPE extends AbstractModel> {
 
     /**
      * Delete specific item from the given table
+     *
      * @param id
      * @return number of rows affected
      */
@@ -74,6 +81,7 @@ public class ContentResolverDao<TYPE extends AbstractModel> {
 
     /**
      * Delete by criteria
+     *
      * @param where
      * @return number of rows affected
      */
@@ -83,11 +91,12 @@ public class ContentResolverDao<TYPE extends AbstractModel> {
 
     /**
      * Query content provider
+     *
      * @param query
      * @return
      */
     public TodorooCursor<TYPE> query(Query query) {
-        if(debug)
+        if (debug)
             Log.i("SQL-" + modelClass.getSimpleName(), query.toString()); //$NON-NLS-1$
         Cursor cursor = query.queryContentResolver(cr, baseUri);
         return new TodorooCursor<TYPE>(cursor, query.getFields());
@@ -95,15 +104,16 @@ public class ContentResolverDao<TYPE extends AbstractModel> {
 
     /**
      * Create new or save existing model
+     *
      * @param model
      * @return true if data was written to the db, false otherwise
      */
     public boolean save(TYPE model) {
         writeTransitoriesToModelContentValues(model);
-        if(model.isSaved()) {
-            if(model.getSetValues() == null)
+        if (model.isSaved()) {
+            if (model.getSetValues() == null)
                 return false;
-            if(cr.update(uriWithId(model.getId()), model.getSetValues(), null, null) != 0)
+            if (cr.update(uriWithId(model.getId()), model.getSetValues(), null, null) != 0)
                 return true;
         }
         Uri uri = cr.insert(baseUri, model.getMergedValues());
@@ -130,12 +140,9 @@ public class ContentResolverDao<TYPE extends AbstractModel> {
      * Returns object corresponding to the given identifier
      *
      * @param database
-     * @param table
-     *            name of table
-     * @param properties
-     *            properties to read
-     * @param id
-     *            id of item
+     * @param table      name of table
+     * @param properties properties to read
+     * @param id         id of item
      * @return null if no item found
      */
     public TYPE fetch(long id, Property<?>... properties) {
diff --git a/api/src/com/todoroo/andlib/data/DatabaseDao.java b/api/src/com/todoroo/andlib/data/DatabaseDao.java
index 2535c001f..49a6d93a5 100644
--- a/api/src/com/todoroo/andlib/data/DatabaseDao.java
+++ b/api/src/com/todoroo/andlib/data/DatabaseDao.java
@@ -5,14 +5,6 @@
  */
 package com.todoroo.andlib.data;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteTransactionListener;
@@ -26,6 +18,13 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.OutstandingEntry;
 import com.todoroo.astrid.data.SyncFlags;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 
 
 /**
@@ -34,7 +33,6 @@ import com.todoroo.astrid.data.SyncFlags;
  * of {@link ContentResolverDao} instead.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class DatabaseDao<TYPE extends AbstractModel> {
 
@@ -54,7 +52,7 @@ public class DatabaseDao<TYPE extends AbstractModel> {
     public DatabaseDao(Class<TYPE> modelClass) {
         DependencyInjectionService.getInstance().inject(this);
         this.modelClass = modelClass;
-        if(debug == null)
+        if (debug == null)
             debug = false;
     }
 
@@ -63,7 +61,9 @@ public class DatabaseDao<TYPE extends AbstractModel> {
         setDatabase(database);
     }
 
-    /** Gets table associated with this DAO */
+    /**
+     * Gets table associated with this DAO
+     */
     public Table getTable() {
         return table;
     }
@@ -79,7 +79,7 @@ public class DatabaseDao<TYPE extends AbstractModel> {
      * @param database
      */
     public void setDatabase(AbstractDatabase database) {
-        if(database == this.database)
+        if (database == this.database)
             return;
         this.database = database;
         table = database.getTable(modelClass);
@@ -93,7 +93,7 @@ public class DatabaseDao<TYPE extends AbstractModel> {
     }
 
     private final ArrayList<ModelUpdateListener<TYPE>> listeners =
-        new ArrayList<ModelUpdateListener<TYPE>>();
+            new ArrayList<ModelUpdateListener<TYPE>>();
 
     public void addListener(ModelUpdateListener<TYPE> listener) {
         listeners.add(listener);
@@ -101,7 +101,7 @@ public class DatabaseDao<TYPE extends AbstractModel> {
 
     protected void onModelUpdated(TYPE model, boolean outstandingEntries) {
         TYPE modelCopy = (TYPE) model.clone();
-        for(ModelUpdateListener<TYPE> listener : listeners) {
+        for (ModelUpdateListener<TYPE> listener : listeners) {
             listener.onModelUpdated(modelCopy, outstandingEntries);
         }
     }
@@ -116,7 +116,7 @@ public class DatabaseDao<TYPE extends AbstractModel> {
      */
     public TodorooCursor<TYPE> query(Query query) {
         query.from(table);
-        if(debug)
+        if (debug)
             Log.i("SQL-" + modelClass.getSimpleName(), query.toString()); //$NON-NLS-1$
         Cursor cursor = database.rawQuery(query.toString(), null);
         return new TodorooCursor<TYPE>(cursor, query.getFields());
@@ -132,7 +132,7 @@ public class DatabaseDao<TYPE extends AbstractModel> {
      */
     public TodorooCursor<TYPE> rawQuery(String selection, String[] selectionArgs, Property<?>... properties) {
         String[] fields = new String[properties.length];
-        for(int i = 0; i < properties.length; i++)
+        for (int i = 0; i < properties.length; i++)
             fields[i] = properties[i].name;
         return new TodorooCursor<TYPE>(database.getDatabase().query(table.name,
                 fields, selection, selectionArgs, null, null, null),
@@ -143,12 +143,9 @@ public class DatabaseDao<TYPE extends AbstractModel> {
      * Returns object corresponding to the given identifier
      *
      * @param database
-     * @param table
-     *            name of table
-     * @param properties
-     *            properties to read
-     * @param id
-     *            id of item
+     * @param table      name of table
+     * @param properties properties to read
+     * @param id         id of item
      * @return null if no item found
      */
     public TYPE fetch(long id, Property<?>... properties) {
@@ -193,6 +190,7 @@ public class DatabaseDao<TYPE extends AbstractModel> {
 
     /**
      * Delete all matching a clause
+     *
      * @param where predicate for deletion
      * @return # of deleted items
      */
@@ -203,14 +201,15 @@ public class DatabaseDao<TYPE extends AbstractModel> {
 
     /**
      * Update all matching a clause to have the values set on template object.
-     * <p>
+     * <p/>
      * Example (updates "joe" => "bob" in metadata value1):
      * {code}
      * Metadata item = new Metadata();
      * item.setValue(Metadata.VALUE1, "bob");
      * update(item, Metadata.VALUE1.eq("joe"));
      * {code}
-     * @param where sql criteria
+     *
+     * @param where    sql criteria
      * @param template set fields on this object in order to set them in the db.
      * @return # of updated items
      */
@@ -241,8 +240,10 @@ public class DatabaseDao<TYPE extends AbstractModel> {
                         Log.e(ERROR_TAG, "Error updating rows", new Throwable()); //$NON-NLS-1$
                         result.set(0);
                     }
+
                     @Override
                     public void onCommit() {/**/}
+
                     @Override
                     public void onBegin() {/**/}
                 });
@@ -299,7 +300,7 @@ public class DatabaseDao<TYPE extends AbstractModel> {
         boolean recordOutstanding = shouldRecordOutstanding(item);
         final AtomicBoolean result = new AtomicBoolean(false);
 
-        synchronized(database) {
+        synchronized (database) {
             if (recordOutstanding) { // begin transaction
                 database.getDatabase().beginTransactionWithListener(new SQLiteTransactionListener() {
                     @Override
@@ -307,8 +308,10 @@ public class DatabaseDao<TYPE extends AbstractModel> {
                         Log.e(ERROR_TAG, "Error inserting or updating rows", new Throwable()); //$NON-NLS-1$
                         result.set(false);
                     }
+
                     @Override
                     public void onCommit() {/**/}
+
                     @Override
                     public void onBegin() {/**/}
                 });
@@ -316,7 +319,7 @@ public class DatabaseDao<TYPE extends AbstractModel> {
             int numOutstanding = 0;
             try {
                 result.set(op.makeChange());
-                if(result.get()) {
+                if (result.get()) {
                     if (recordOutstanding && ((numOutstanding = createOutstandingEntries(item.getId(), values)) != -1)) // Create entries for setValues in outstanding table
                         database.getDatabase().setTransactionSuccessful();
                 }
@@ -336,10 +339,8 @@ public class DatabaseDao<TYPE extends AbstractModel> {
      * Creates the given item.
      *
      * @param database
-     * @param table
-     *            table name
-     * @param item
-     *            item model
+     * @param table    table name
+     * @param item     item model
      * @return returns true on success.
      */
     public boolean createNew(final TYPE item) {
@@ -363,15 +364,13 @@ public class DatabaseDao<TYPE extends AbstractModel> {
      * Saves the given item. Will not create a new item!
      *
      * @param database
-     * @param table
-     *            table name
-     * @param item
-     *            item model
+     * @param table    table name
+     * @param item     item model
      * @return returns true on success.
      */
     public boolean saveExisting(final TYPE item) {
         final ContentValues values = item.getSetValues();
-        if(values == null || values.size() == 0) // nothing changed
+        if (values == null || values.size() == 0) // nothing changed
             return true;
         DatabaseChangeOp update = new DatabaseChangeOp() {
             @Override
@@ -412,6 +411,7 @@ public class DatabaseDao<TYPE extends AbstractModel> {
      * Returns true if an entry in the outstanding table should be recorded for this
      * column. Subclasses can override to return false for insignificant columns
      * (e.g. Task.DETAILS, last modified, etc.)
+     *
      * @param columnName
      * @return
      */
@@ -426,12 +426,9 @@ public class DatabaseDao<TYPE extends AbstractModel> {
      * Returns cursor to object corresponding to the given identifier
      *
      * @param database
-     * @param table
-     *            name of table
-     * @param properties
-     *            properties to read
-     * @param id
-     *            id of item
+     * @param table      name of table
+     * @param properties properties to read
+     * @param id         id of item
      * @return
      */
     protected TodorooCursor<TYPE> fetchItem(long id, Property<?>... properties) {
diff --git a/api/src/com/todoroo/andlib/data/Property.java b/api/src/com/todoroo/andlib/data/Property.java
index e481eb662..b773b5893 100644
--- a/api/src/com/todoroo/andlib/data/Property.java
+++ b/api/src/com/todoroo/andlib/data/Property.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.andlib.data;
 
-import static com.todoroo.andlib.sql.SqlConstants.COMMA;
-import static com.todoroo.andlib.sql.SqlConstants.LEFT_PARENTHESIS;
-import static com.todoroo.andlib.sql.SqlConstants.RIGHT_PARENTHESIS;
-import static com.todoroo.andlib.sql.SqlConstants.SPACE;
 import android.text.TextUtils;
 
 import com.todoroo.andlib.sql.Criterion;
@@ -16,40 +12,59 @@ import com.todoroo.andlib.sql.Field;
 import com.todoroo.andlib.sql.Operator;
 import com.todoroo.andlib.sql.UnaryCriterion;
 
+import static com.todoroo.andlib.sql.SqlConstants.COMMA;
+import static com.todoroo.andlib.sql.SqlConstants.LEFT_PARENTHESIS;
+import static com.todoroo.andlib.sql.SqlConstants.RIGHT_PARENTHESIS;
+import static com.todoroo.andlib.sql.SqlConstants.SPACE;
+
 /**
  * Property represents a typed column in a database.
- *
+ * <p/>
  * Within a given database row, the parameter may not exist, in which case the
  * value is null, it may be of an incorrect type, in which case an exception is
  * thrown, or the correct type, in which case the value is returned.
  *
+ * @param <TYPE> a database supported type, such as String or Integer
  * @author Tim Su <tim@todoroo.com>
- *
- * @param <TYPE>
- *            a database supported type, such as String or Integer
  */
 @SuppressWarnings("nls")
 public abstract class Property<TYPE> extends Field implements Cloneable {
 
     // --- implementation
 
-    /** The database table name this property */
+    /**
+     * The database table name this property
+     */
     public final Table table;
 
-    /** The database column name for this property */
+    /**
+     * The database column name for this property
+     */
     public final String name;
 
-    /** Can this field be null? */
+    /**
+     * Can this field be null?
+     */
     public static final int PROP_FLAG_NULLABLE = 1 << 0;
-    /** Is this field a date? */
+    /**
+     * Is this field a date?
+     */
     public static final int PROP_FLAG_DATE = 1 << 1;
-    /** Is this field a user id? */
+    /**
+     * Is this field a user id?
+     */
     public static final int PROP_FLAG_USER_ID = 1 << 2;
-    /** Is this field a boolean? */
+    /**
+     * Is this field a boolean?
+     */
     public static final int PROP_FLAG_BOOLEAN = 1 << 3;
-    /** Is this field a serialized JSON object? */
+    /**
+     * Is this field a serialized JSON object?
+     */
     public static final int PROP_FLAG_JSON = 1 << 4;
-    /** Is this field for pictures? (usually as a json object containing "path" key or urls) */
+    /**
+     * Is this field for pictures? (usually as a json object containing "path" key or urls)
+     */
     public static final int PROP_FLAG_PICTURE = 1 << 5;
 
     public int flags = 0;
@@ -109,7 +124,7 @@ public abstract class Property<TYPE> extends Field implements Cloneable {
 
         try {
             Property<TYPE> newInstance = this.getClass().getConstructor(Table.class, String.class).newInstance(aliasedTable, this.name);
-            if(!TextUtils.isEmpty(columnAlias))
+            if (!TextUtils.isEmpty(columnAlias))
                 return (Property<TYPE>) newInstance.as(columnAlias);
             return newInstance;
         } catch (Exception e) {
@@ -123,7 +138,6 @@ public abstract class Property<TYPE> extends Field implements Cloneable {
      * Visitor interface for property classes
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     public interface PropertyVisitor<RETURN, PARAMETER> {
         public RETURN visitInteger(Property<Integer> property, PARAMETER data);
@@ -141,7 +155,6 @@ public abstract class Property<TYPE> extends Field implements Cloneable {
      * Integer property type. See {@link Property}
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     public static class IntegerProperty extends Property<Integer> {
 
@@ -178,7 +191,6 @@ public abstract class Property<TYPE> extends Field implements Cloneable {
      * String property type. See {@link Property}
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     public static class StringProperty extends Property<String> {
 
@@ -230,7 +242,6 @@ public abstract class Property<TYPE> extends Field implements Cloneable {
      * Double property type. See {@link Property}
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     public static class DoubleProperty extends Property<Double> {
 
@@ -263,7 +274,6 @@ public abstract class Property<TYPE> extends Field implements Cloneable {
      * Long property type. See {@link Property}
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     public static class LongProperty extends Property<Long> {
 
@@ -308,7 +318,9 @@ public abstract class Property<TYPE> extends Field implements Cloneable {
 
     // --- pseudo-properties
 
-    /** Runs a SQL function and returns the result as a string */
+    /**
+     * Runs a SQL function and returns the result as a string
+     */
     public static class StringFunctionProperty extends StringProperty {
         public StringFunctionProperty(String function, String columnName) {
             super(null, columnName, function);
@@ -316,7 +328,9 @@ public abstract class Property<TYPE> extends Field implements Cloneable {
         }
     }
 
-    /** Runs a SQL function and returns the result as a string */
+    /**
+     * Runs a SQL function and returns the result as a string
+     */
     public static class IntegerFunctionProperty extends IntegerProperty {
         public IntegerFunctionProperty(String function, String columnName) {
             super(null, columnName, function);
@@ -324,7 +338,9 @@ public abstract class Property<TYPE> extends Field implements Cloneable {
         }
     }
 
-    /** Counting in aggregated tables. Returns the result of COUNT(1) */
+    /**
+     * Counting in aggregated tables. Returns the result of COUNT(1)
+     */
     public static final class CountProperty extends IntegerFunctionProperty {
         public CountProperty() {
             super("COUNT(1)", "count");
diff --git a/api/src/com/todoroo/andlib/data/Table.java b/api/src/com/todoroo/andlib/data/Table.java
index 29da2cf77..26b9462f5 100644
--- a/api/src/com/todoroo/andlib/data/Table.java
+++ b/api/src/com/todoroo/andlib/data/Table.java
@@ -13,7 +13,6 @@ import com.todoroo.andlib.sql.SqlTable;
  * clone the table when it returns.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public final class Table extends SqlTable {
     public final String name;
@@ -32,12 +31,13 @@ public final class Table extends SqlTable {
 
     /**
      * Reads a list of properties from model class by reflection
+     *
      * @return property array
      */
     @SuppressWarnings("nls")
     public Property<?>[] getProperties() {
         try {
-            return (Property<?>[])modelClass.getField("PROPERTIES").get(null);
+            return (Property<?>[]) modelClass.getField("PROPERTIES").get(null);
         } catch (IllegalArgumentException e) {
             throw new RuntimeException(e);
         } catch (SecurityException e) {
@@ -61,25 +61,26 @@ public final class Table extends SqlTable {
 
     /**
      * Create a field object based on the given property
+     *
      * @param property
      * @return
      */
     @SuppressWarnings("nls")
     public Field field(Property<?> property) {
-        if(alias != null)
+        if (alias != null)
             return Field.field(alias + "." + property.name);
         return Field.field(name + "." + property.name);
     }
 
     @Override
     public String toString() {
-        if(hasAlias())
+        if (hasAlias())
             return expression + " AS " + alias; //$NON-NLS-1$
         return expression;
     }
 
     public String name() {
-        if(hasAlias())
+        if (hasAlias())
             return alias;
         return name;
     }
diff --git a/api/src/com/todoroo/andlib/data/TodorooCursor.java b/api/src/com/todoroo/andlib/data/TodorooCursor.java
index 0f512911b..fc720a82e 100644
--- a/api/src/com/todoroo/andlib/data/TodorooCursor.java
+++ b/api/src/com/todoroo/andlib/data/TodorooCursor.java
@@ -5,35 +5,42 @@
  */
 package com.todoroo.andlib.data;
 
-import java.util.WeakHashMap;
-
 import android.database.Cursor;
 import android.database.CursorWrapper;
 
 import com.todoroo.andlib.data.Property.PropertyVisitor;
 
+import java.util.WeakHashMap;
+
 /**
  * AstridCursor wraps a cursor and allows users to query for individual
  * {@link Property} types or read an entire {@link AbstractModel} from
  * a database row.
  *
- * @author Tim Su <tim@todoroo.com>
- *
  * @param <TYPE> a model type that is returned by this cursor
+ * @author Tim Su <tim@todoroo.com>
  */
 public class TodorooCursor<TYPE extends AbstractModel> extends CursorWrapper {
 
-    /** Properties read by this cursor */
+    /**
+     * Properties read by this cursor
+     */
     private final Property<?>[] properties;
 
-    /** Weakly cache field name to column id references for this cursor.
-     * Because it's a weak hash map, entire keys can be discarded by GC */
+    /**
+     * Weakly cache field name to column id references for this cursor.
+     * Because it's a weak hash map, entire keys can be discarded by GC
+     */
     private final WeakHashMap<String, Integer> columnIndexCache;
 
-    /** Property reading visitor */
+    /**
+     * Property reading visitor
+     */
     private static final CursorReadingVisitor reader = new CursorReadingVisitor();
 
-    /** Wrapped cursor */
+    /**
+     * Wrapped cursor
+     */
     private final Cursor cursor;
 
     /**
@@ -55,11 +62,11 @@ public class TodorooCursor<TYPE extends AbstractModel> extends CursorWrapper {
      * Get the value for the given property on the underlying {@link Cursor}
      *
      * @param <PROPERTY_TYPE> type to return
-     * @param property to retrieve
+     * @param property        to retrieve
      * @return
      */
     public <PROPERTY_TYPE> PROPERTY_TYPE get(Property<PROPERTY_TYPE> property) {
-        return (PROPERTY_TYPE)property.accept(reader, this);
+        return (PROPERTY_TYPE) property.accept(reader, this);
     }
 
     /**
@@ -71,6 +78,7 @@ public class TodorooCursor<TYPE extends AbstractModel> extends CursorWrapper {
 
     /**
      * Gets entire property list
+     *
      * @return
      */
     public Property<?>[] getProperties() {
@@ -82,7 +90,7 @@ public class TodorooCursor<TYPE extends AbstractModel> extends CursorWrapper {
      */
     public synchronized int getColumnIndexFromCache(String field) {
         Integer index = columnIndexCache.get(field);
-        if(index == null) {
+        if (index == null) {
             index = getColumnIndexOrThrow(field);
             columnIndexCache.put(field, index);
         }
@@ -94,37 +102,36 @@ public class TodorooCursor<TYPE extends AbstractModel> extends CursorWrapper {
      * Visitor that reads the given property from a cursor
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     public static class CursorReadingVisitor implements PropertyVisitor<Object, TodorooCursor<?>> {
 
         public Object visitDouble(Property<Double> property,
-                TodorooCursor<?> cursor) {
+                                  TodorooCursor<?> cursor) {
             int column = columnIndex(property, cursor);
-            if(property.checkFlag(Property.PROP_FLAG_NULLABLE) && cursor.isNull(column))
+            if (property.checkFlag(Property.PROP_FLAG_NULLABLE) && cursor.isNull(column))
                 return null;
             return cursor.getDouble(column);
         }
 
         public Object visitInteger(Property<Integer> property,
-                TodorooCursor<?> cursor) {
+                                   TodorooCursor<?> cursor) {
             int column = columnIndex(property, cursor);
-            if(property.checkFlag(Property.PROP_FLAG_NULLABLE) && cursor.isNull(column))
+            if (property.checkFlag(Property.PROP_FLAG_NULLABLE) && cursor.isNull(column))
                 return null;
             return cursor.getInt(column);
         }
 
         public Object visitLong(Property<Long> property, TodorooCursor<?> cursor) {
             int column = columnIndex(property, cursor);
-            if(property.checkFlag(Property.PROP_FLAG_NULLABLE) && cursor.isNull(column))
+            if (property.checkFlag(Property.PROP_FLAG_NULLABLE) && cursor.isNull(column))
                 return null;
             return cursor.getLong(column);
         }
 
         public Object visitString(Property<String> property,
-                TodorooCursor<?> cursor) {
+                                  TodorooCursor<?> cursor) {
             int column = columnIndex(property, cursor);
-            if(property.checkFlag(Property.PROP_FLAG_NULLABLE) && cursor.isNull(column))
+            if (property.checkFlag(Property.PROP_FLAG_NULLABLE) && cursor.isNull(column))
                 return null;
             return cursor.getString(column);
         }
diff --git a/api/src/com/todoroo/andlib/service/AbstractDependencyInjector.java b/api/src/com/todoroo/andlib/service/AbstractDependencyInjector.java
index b05fe770f..85ed10d26 100644
--- a/api/src/com/todoroo/andlib/service/AbstractDependencyInjector.java
+++ b/api/src/com/todoroo/andlib/service/AbstractDependencyInjector.java
@@ -5,19 +5,18 @@
  */
 package com.todoroo.andlib.service;
 
+import com.todoroo.andlib.service.ExceptionService.ErrorReporter;
+
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Field;
 import java.util.HashMap;
 
-import com.todoroo.andlib.service.ExceptionService.ErrorReporter;
-
 /**
  * A Dependency Injector knows how to inject certain dependencies based
  * on the field that is passed in. You will need to write your own initialization
  * code to insert this dependency injector into the DI chain.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 abstract public class AbstractDependencyInjector {
 
@@ -48,29 +47,27 @@ abstract public class AbstractDependencyInjector {
      * Cache of classes that were instantiated by the injector
      */
     protected final HashMap<Class<?>, WeakReference<Object>> createdObjects =
-        new HashMap<Class<?>, WeakReference<Object>>();
+            new HashMap<Class<?>, WeakReference<Object>>();
 
     /**
      * Gets the injected object for this field. If implementing class does not
      * know how to handle this dependency, it should return null
      *
-     * @param object
-     *            object to perform dependency injection on
-     * @param field
-     *            field tagged with {link Autowired} annotation
+     * @param object object to perform dependency injection on
+     * @param field  field tagged with {link Autowired} annotation
      * @return object to assign to this field, or null
      */
     public Object getInjection(Object object, Field field) {
-        if(injectables.containsKey(field.getName())) {
+        if (injectables.containsKey(field.getName())) {
             Object injection = injectables.get(field.getName());
 
             // if it's a class, instantiate the class
-            if(injection instanceof Class<?>) {
-                if(createdObjects.containsKey(injection) &&
+            if (injection instanceof Class<?>) {
+                if (createdObjects.containsKey(injection) &&
                         createdObjects.get(injection).get() != null) {
                     injection = createdObjects.get(injection).get();
                 } else {
-                    Class<?> cls = (Class<?>)injection;
+                    Class<?> cls = (Class<?>) injection;
                     try {
                         injection = cls.newInstance();
                     } catch (IllegalAccessException e) {
diff --git a/api/src/com/todoroo/andlib/service/Autowired.java b/api/src/com/todoroo/andlib/service/Autowired.java
index 17de1ab8b..5bf26293c 100644
--- a/api/src/com/todoroo/andlib/service/Autowired.java
+++ b/api/src/com/todoroo/andlib/service/Autowired.java
@@ -11,11 +11,10 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Autowired is an annotation that tells the dependency injector to 
+ * Autowired is an annotation that tells the dependency injector to
  * set up the class as appropriate.
- *  
- * @author Tim Su <tim@todoroo.com>
  *
+ * @author Tim Su <tim@todoroo.com>
  */
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/api/src/com/todoroo/andlib/service/ContextManager.java b/api/src/com/todoroo/andlib/service/ContextManager.java
index eeea1d5be..f3714157b 100644
--- a/api/src/com/todoroo/andlib/service/ContextManager.java
+++ b/api/src/com/todoroo/andlib/service/ContextManager.java
@@ -12,8 +12,8 @@ import android.content.res.Resources;
 /**
  * Singleton class to manage current application context
  * b
- * @author Tim Su <tim@todoroo.com>
  *
+ * @author Tim Su <tim@todoroo.com>
  */
 public final class ContextManager {
 
@@ -28,9 +28,9 @@ public final class ContextManager {
      * @param context
      */
     public static void setContext(Context context) {
-        if(context == null || context.getApplicationContext() == null)
+        if (context == null || context.getApplicationContext() == null)
             return;
-        if(ContextManager.context != null && !(context instanceof Activity))
+        if (ContextManager.context != null && !(context instanceof Activity))
             return;
         ContextManager.context = context;
     }
@@ -45,7 +45,7 @@ public final class ContextManager {
     /**
      * Convenience method to read a string from the resources
      *
-     * @param resId resource
+     * @param resId      resource
      * @param parameters % arguments
      * @return resource string
      */
diff --git a/api/src/com/todoroo/andlib/service/DependencyInjectionService.java b/api/src/com/todoroo/andlib/service/DependencyInjectionService.java
index e5ea6ca0f..2d726d1b6 100644
--- a/api/src/com/todoroo/andlib/service/DependencyInjectionService.java
+++ b/api/src/com/todoroo/andlib/service/DependencyInjectionService.java
@@ -5,25 +5,23 @@
  */
 package com.todoroo.andlib.service;
 
-import java.lang.reflect.Field;
-import java.util.LinkedList;
-
 import com.todoroo.andlib.service.ExceptionService.AndroidLogReporter;
 import com.todoroo.andlib.service.ExceptionService.ErrorReporter;
 
+import java.lang.reflect.Field;
+import java.util.LinkedList;
 
 
 /**
  * Simple Dependency Injection Service for Android.
- * <p>
+ * <p/>
  * Add dependency injectors to the injector chain, then invoke this method
  * against classes you wish to perform dependency injection for.
- * <p>
+ * <p/>
  * All errors encountered are handled as warnings, so if dependency injection
  * seems to be failing, check the logs for more information.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class DependencyInjectionService {
 
@@ -35,8 +33,7 @@ public class DependencyInjectionService {
     /**
      * Perform dependency injection in the caller object
      *
-     * @param caller
-     *            object to perform DI on
+     * @param caller object to perform DI on
      */
     @SuppressWarnings("nls")
     public void inject(Object caller) {
@@ -45,13 +42,13 @@ public class DependencyInjectionService {
         // dependency injection to set them as appropriate
 
         Class<?> cls = caller.getClass();
-        while(cls != null) {
+        while (cls != null) {
             String packageName = cls.getPackage().getName();
-            if(!isQualifiedPackage(packageName))
+            if (!isQualifiedPackage(packageName))
                 break;
 
-            for(Field field : cls.getDeclaredFields()) {
-                if(field.getAnnotation(Autowired.class) != null) {
+            for (Field field : cls.getDeclaredFields()) {
+                if (field.getAnnotation(Autowired.class) != null) {
                     field.setAccessible(true);
                     try {
                         handleField(caller, field);
@@ -60,7 +57,7 @@ public class DependencyInjectionService {
                                 field.getName(), field.getType()), e);
                     } catch (IllegalArgumentException e) {
                         throw new RuntimeException(String.format("Unable to set field '%s' of type '%s'",
-                                        field.getName(), field.getType()), e);
+                                field.getName(), field.getType()), e);
                     } catch (IllegalAccessException e) {
                         throw new RuntimeException(String.format("Unable to set field '%s' of type '%s'",
                                 field.getName(), field.getType()), e);
@@ -74,11 +71,11 @@ public class DependencyInjectionService {
 
     @SuppressWarnings("nls")
     private boolean isQualifiedPackage(String packageName) {
-        if(packageName.startsWith("com.todoroo"))
+        if (packageName.startsWith("com.todoroo"))
             return true;
-        if(packageName.startsWith("com.timsu"))
+        if (packageName.startsWith("com.timsu"))
             return true;
-        if(packageName.startsWith("org.weloveastrid"))
+        if (packageName.startsWith("org.weloveastrid"))
             return true;
         return false;
     }
@@ -87,17 +84,15 @@ public class DependencyInjectionService {
      * This method returns the appropriate dependency object based on the type
      * that this autowired field accepts
      *
-     * @param caller
-     *            calling object
-     * @param field
-     *            field to inject
+     * @param caller calling object
+     * @param field  field to inject
      */
     @SuppressWarnings("nls")
     private synchronized void handleField(Object caller, Field field)
             throws IllegalStateException, IllegalArgumentException,
             IllegalAccessException {
 
-        if(field.getType().isPrimitive())
+        if (field.getType().isPrimitive())
             throw new IllegalStateException(String.format(
                     "Tried to dependency-inject primative field '%s' of type '%s'",
                     field.getName(), field.getType()));
@@ -117,7 +112,7 @@ public class DependencyInjectionService {
 
         throw new IllegalStateException(
                 String.format("No dependency injector found for autowired " +
-                		"field '%s' in class '%s'. Injectors: %s",
+                        "field '%s' in class '%s'. Injectors: %s",
                         field.getName(), caller.getClass().getName(),
                         injectors));
     }
@@ -130,7 +125,7 @@ public class DependencyInjectionService {
         protected void addInjectables() {
             injectables.put("debug", false);
             injectables.put("exceptionService", ExceptionService.class);
-            injectables.put("errorReporters", new ErrorReporter[] {
+            injectables.put("errorReporters", new ErrorReporter[]{
                     new AndroidLogReporter(),
             });
         }
@@ -147,16 +142,18 @@ public class DependencyInjectionService {
 
     /**
      * Gets the singleton instance of the dependency injection service.
+     *
      * @return
      */
     public synchronized static DependencyInjectionService getInstance() {
-        if(instance == null)
+        if (instance == null)
             instance = new DependencyInjectionService();
         return instance;
     }
 
     /**
      * Removes the supplied injector
+     *
      * @return
      */
     public synchronized void removeInjector(AbstractDependencyInjector injector) {
@@ -165,6 +162,7 @@ public class DependencyInjectionService {
 
     /**
      * Adds a Dependency Injector to the front of the list
+     *
      * @param injectors
      */
     public synchronized void addInjector(AbstractDependencyInjector injector) {
diff --git a/api/src/com/todoroo/andlib/service/ExceptionService.java b/api/src/com/todoroo/andlib/service/ExceptionService.java
index cd481d29f..b022f2f23 100644
--- a/api/src/com/todoroo/andlib/service/ExceptionService.java
+++ b/api/src/com/todoroo/andlib/service/ExceptionService.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.andlib.service;
 
-import java.lang.Thread.UncaughtExceptionHandler;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
@@ -16,11 +14,12 @@ import android.util.Log;
 
 import com.todoroo.astrid.api.R;
 
+import java.lang.Thread.UncaughtExceptionHandler;
+
 /**
  * Exception handling utility class - reports and logs errors
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class ExceptionService {
 
@@ -29,8 +28,8 @@ public class ExceptionService {
 
     public ExceptionService() {
         DependencyInjectionService.getInstance().inject(this);
-        if(errorReporters == null) {
-            errorReporters = new ErrorReporter[] {
+        if (errorReporters == null) {
+            errorReporters = new ErrorReporter[]{
                     new AndroidLogReporter()
             };
         }
@@ -39,14 +38,14 @@ public class ExceptionService {
     /**
      * Report the error via registered error handlers
      *
-     * @param name Internal error name. Not displayed to user
+     * @param name  Internal error name. Not displayed to user
      * @param error Exception encountered. Message will be displayed to user
      */
     public void reportError(String name, Throwable error) {
-        if(errorReporters == null)
+        if (errorReporters == null)
             return;
 
-        for(ErrorReporter reporter : errorReporters) {
+        for (ErrorReporter reporter : errorReporters) {
             try {
                 reporter.handleError(name, error);
             } catch (Exception e) {
@@ -59,28 +58,28 @@ public class ExceptionService {
      * Display error dialog if context is activity and report error
      *
      * @param context Application Context
-     * @param name Internal error name. Not displayed to user
-     * @param error Exception encountered. Message will be displayed to user
+     * @param name    Internal error name. Not displayed to user
+     * @param error   Exception encountered. Message will be displayed to user
      */
     public void displayAndReportError(final Context context, String name, Throwable error) {
-        if(context instanceof Activity) {
+        if (context instanceof Activity) {
             final String messageToDisplay;
 
             // pretty up the message when displaying to user
-            if(error == null)
+            if (error == null)
                 messageToDisplay = context.getString(R.string.DLG_error_generic);
             else
                 messageToDisplay = context.getString(R.string.DLG_error, error);
 
-            ((Activity)context).runOnUiThread(new Runnable() {
+            ((Activity) context).runOnUiThread(new Runnable() {
                 public void run() {
                     try {
                         new AlertDialog.Builder(context)
-                        .setTitle(R.string.DLG_error_title)
-                        .setMessage(messageToDisplay)
-                        .setIcon(android.R.drawable.ic_dialog_alert)
-                        .setPositiveButton(android.R.string.ok, null)
-                        .show();
+                                .setTitle(R.string.DLG_error_title)
+                                .setMessage(messageToDisplay)
+                                .setIcon(android.R.drawable.ic_dialog_alert)
+                                .setPositiveButton(android.R.string.ok, null)
+                                .show();
                     } catch (Exception e) {
                         // suppress errors during dialog creation
                     }
@@ -95,7 +94,6 @@ public class ExceptionService {
      * Error reporter interface
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     public interface ErrorReporter {
         public void handleError(String name, Throwable error);
@@ -105,7 +103,6 @@ public class ExceptionService {
      * AndroidLogReporter reports errors to LogCat
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     public static class AndroidLogReporter implements ErrorReporter {
 
@@ -117,21 +114,21 @@ public class ExceptionService {
          */
         public void handleError(String name, Throwable error) {
             String tag = null;
-            if(ContextManager.getContext() != null) {
+            if (ContextManager.getContext() != null) {
                 PackageManager pm = ContextManager.getContext().getPackageManager();
                 try {
                     String appName = pm.getApplicationInfo(ContextManager.getContext().
                             getPackageName(), 0).loadLabel(pm).toString();
-                    tag = appName + "-" +  name; //$NON-NLS-1$
+                    tag = appName + "-" + name; //$NON-NLS-1$
                 } catch (NameNotFoundException e) {
                     // give up
                 }
             }
 
-            if(tag == null)
+            if (tag == null)
                 tag = "unknown-" + name; //$NON-NLS-1$
 
-            if(error == null)
+            if (error == null)
                 Log.e(tag, "Exception: " + name); //$NON-NLS-1$
             else
                 Log.e(tag, error.toString(), error);
@@ -143,7 +140,6 @@ public class ExceptionService {
      * report errors
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     public static class TodorooUncaughtExceptionHandler implements UncaughtExceptionHandler {
         private final UncaughtExceptionHandler defaultUEH;
@@ -157,7 +153,7 @@ public class ExceptionService {
         }
 
         public void uncaughtException(Thread thread, Throwable ex) {
-            if(exceptionService != null)
+            if (exceptionService != null)
                 exceptionService.reportError("uncaught", ex); //$NON-NLS-1$
             defaultUEH.uncaughtException(thread, ex);
         }
diff --git a/api/src/com/todoroo/andlib/service/HttpRestClient.java b/api/src/com/todoroo/andlib/service/HttpRestClient.java
index e2c514279..bcdf25584 100644
--- a/api/src/com/todoroo/andlib/service/HttpRestClient.java
+++ b/api/src/com/todoroo/andlib/service/HttpRestClient.java
@@ -5,10 +5,9 @@
  */
 package com.todoroo.andlib.service;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.ref.WeakReference;
-import java.util.zip.GZIPInputStream;
+import android.util.Log;
+
+import com.todoroo.andlib.utility.AndroidUtilities;
 
 import org.apache.http.Header;
 import org.apache.http.HeaderElement;
@@ -37,15 +36,15 @@ import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.HttpContext;
 
-import android.util.Log;
-
-import com.todoroo.andlib.utility.AndroidUtilities;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.ref.WeakReference;
+import java.util.zip.GZIPInputStream;
 
 /**
  * RestClient allows Android to consume web requests.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class HttpRestClient implements RestClient {
 
@@ -108,7 +107,7 @@ public class HttpRestClient implements RestClient {
                     final HttpRequest request,
                     final HttpContext context) throws HttpException, IOException {
                 if (!request.containsHeader("Accept-Encoding"))
-                        request.addHeader("Accept-Encoding", "gzip");
+                    request.addHeader("Accept-Encoding", "gzip");
             }
 
         });
@@ -141,7 +140,7 @@ public class HttpRestClient implements RestClient {
 
         @Override
         public InputStream getContent()
-            throws IOException, IllegalStateException {
+                throws IOException, IllegalStateException {
 
             // the wrapped entity's getContent() decides about repeatability
             InputStream wrappedin = wrappedEntity.getContent();
@@ -159,7 +158,7 @@ public class HttpRestClient implements RestClient {
 
     private String processHttpResponse(HttpResponse response) throws IOException {
         int statusCode = response.getStatusLine().getStatusCode();
-        if(statusCode >= HTTP_UNAVAILABLE_START && statusCode <= HTTP_UNAVAILABLE_END) {
+        if (statusCode >= HTTP_UNAVAILABLE_START && statusCode <= HTTP_UNAVAILABLE_END) {
             throw new HttpUnavailableException();
         }
 
@@ -175,7 +174,7 @@ public class HttpRestClient implements RestClient {
             }
         }
 
-        if(statusCode != HTTP_OK) {
+        if (statusCode != HTTP_OK) {
             System.out.println(body);
             throw new HttpErrorException(response.getStatusLine().getStatusCode(),
                     response.getStatusLine().getReasonPhrase());
@@ -192,7 +191,7 @@ public class HttpRestClient implements RestClient {
      * @throws IOException
      */
     public synchronized String get(String url) throws IOException {
-        if(debug)
+        if (debug)
             Log.d("http-rest-client-get", url); //$NON-NLS-1$
 
         try {
@@ -213,18 +212,17 @@ public class HttpRestClient implements RestClient {
      * Issue an HTTP POST for the given URL, return the response
      *
      * @param url
-     * @param data
-     *            url-encoded data
+     * @param data url-encoded data
      * @throws IOException
      */
     public synchronized String post(String url, HttpEntity data, Header... headers) throws IOException {
-        if(debug)
+        if (debug)
             Log.d("http-rest-client-post", url + " | " + data); //$NON-NLS-1$ //$NON-NLS-2$
 
         try {
             HttpPost httpPost = new HttpPost(url);
             httpPost.setEntity(data);
-            for(Header header : headers)
+            for (Header header : headers)
                 httpPost.addHeader(header);
             HttpResponse response = getClient().execute(httpPost);
 
diff --git a/api/src/com/todoroo/andlib/service/HttpUnavailableException.java b/api/src/com/todoroo/andlib/service/HttpUnavailableException.java
index 6aea1cb4c..857da6964 100644
--- a/api/src/com/todoroo/andlib/service/HttpUnavailableException.java
+++ b/api/src/com/todoroo/andlib/service/HttpUnavailableException.java
@@ -11,7 +11,6 @@ import java.io.IOException;
  * Exception displayed when a 500 error is received on an HTTP invocation
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class HttpUnavailableException extends IOException {
 
diff --git a/api/src/com/todoroo/andlib/service/NotificationManager.java b/api/src/com/todoroo/andlib/service/NotificationManager.java
index 95e4a1cac..666343bca 100644
--- a/api/src/com/todoroo/andlib/service/NotificationManager.java
+++ b/api/src/com/todoroo/andlib/service/NotificationManager.java
@@ -12,7 +12,6 @@ import android.content.Context;
  * Notification Manager stub
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public interface NotificationManager {
 
@@ -27,13 +26,13 @@ public interface NotificationManager {
      * Android's notification manager
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     public static class AndroidNotificationManager implements NotificationManager {
         private final android.app.NotificationManager nm;
+
         public AndroidNotificationManager(Context context) {
             nm = (android.app.NotificationManager)
-                context.getSystemService(Context.NOTIFICATION_SERVICE);
+                    context.getSystemService(Context.NOTIFICATION_SERVICE);
         }
 
         public void cancel(int id) {
diff --git a/api/src/com/todoroo/andlib/service/RestClient.java b/api/src/com/todoroo/andlib/service/RestClient.java
index 5c0851835..26d2cabc3 100644
--- a/api/src/com/todoroo/andlib/service/RestClient.java
+++ b/api/src/com/todoroo/andlib/service/RestClient.java
@@ -5,18 +5,18 @@
  */
 package com.todoroo.andlib.service;
 
-import java.io.IOException;
-
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 
+import java.io.IOException;
+
 /**
  * RestClient stub invokes the HTML requests as desired
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public interface RestClient {
     public String get(String url) throws IOException;
+
     public String post(String url, HttpEntity data, Header... headers) throws IOException;
 }
\ No newline at end of file
diff --git a/api/src/com/todoroo/andlib/sql/DBObject.java b/api/src/com/todoroo/andlib/sql/DBObject.java
index d10da034b..f95851003 100644
--- a/api/src/com/todoroo/andlib/sql/DBObject.java
+++ b/api/src/com/todoroo/andlib/sql/DBObject.java
@@ -12,7 +12,7 @@ public abstract class DBObject<T extends DBObject<?>> implements Cloneable {
     protected String alias;
     protected final String expression;
 
-    protected DBObject(String expression){
+    protected DBObject(String expression) {
         this.expression = expression;
     }
 
@@ -38,7 +38,8 @@ public abstract class DBObject<T extends DBObject<?>> implements Cloneable {
         DBObject<?> dbObject = (DBObject<?>) o;
 
         if (alias != null ? !alias.equals(dbObject.alias) : dbObject.alias != null) return false;
-        if (expression != null ? !expression.equals(dbObject.expression) : dbObject.expression != null) return false;
+        if (expression != null ? !expression.equals(dbObject.expression) : dbObject.expression != null)
+            return false;
 
         return true;
     }
@@ -64,7 +65,7 @@ public abstract class DBObject<T extends DBObject<?>> implements Cloneable {
             sb.append(SPACE).append(AS).append(SPACE).append(alias);
         } else {
             int pos = expression.indexOf('.');
-            if(pos > 0)
+            if (pos > 0)
                 sb.append(SPACE).append(AS).append(SPACE).append(expression.substring(pos + 1));
         }
         return sb.toString();
diff --git a/api/src/com/todoroo/andlib/sql/Field.java b/api/src/com/todoroo/andlib/sql/Field.java
index 56bd55416..6cfe2048e 100644
--- a/api/src/com/todoroo/andlib/sql/Field.java
+++ b/api/src/com/todoroo/andlib/sql/Field.java
@@ -23,14 +23,14 @@ public class Field extends DBObject<Field> {
     }
 
     public Criterion eq(Object value) {
-        if(value == null)
+        if (value == null)
             return UnaryCriterion.isNull(this);
         return UnaryCriterion.eq(this, value);
     }
 
     /**
      * Adds the criterion that the field must be equal to the given string, ignoring case.
-     *
+     * <p/>
      * Thanks to a sqlite bug, this will only work for ASCII values.
      *
      * @param value string which field must equal
@@ -38,14 +38,14 @@ public class Field extends DBObject<Field> {
      */
     @SuppressWarnings("nls")
     public Criterion eqCaseInsensitive(String value) {
-    	if(value == null)
+        if (value == null)
             return UnaryCriterion.isNull(this);
         String escaped = value.replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_");
         return UnaryCriterion.like(this, escaped, "\\");
     }
 
     public Criterion neq(Object value) {
-        if(value == null)
+        if (value == null)
             return UnaryCriterion.isNotNull(this);
         return UnaryCriterion.neq(this, value);
     }
diff --git a/api/src/com/todoroo/andlib/sql/Functions.java b/api/src/com/todoroo/andlib/sql/Functions.java
index 1436f1857..a818c71ac 100644
--- a/api/src/com/todoroo/andlib/sql/Functions.java
+++ b/api/src/com/todoroo/andlib/sql/Functions.java
@@ -10,15 +10,13 @@ import com.todoroo.andlib.data.Property.LongProperty;
 import com.todoroo.andlib.data.Property.StringProperty;
 
 
-
-
 @SuppressWarnings("nls")
 public final class Functions {
 
     public static String caseStatement(Criterion when, Object ifTrue, Object ifFalse) {
         return new StringBuilder("(CASE WHEN ").
-            append(when.toString()).append(" THEN ").append(value(ifTrue)).
-            append(" ELSE ").append(value(ifFalse)).append(" END)").toString();
+                append(when.toString()).append(" THEN ").append(value(ifTrue)).
+                append(" ELSE ").append(value(ifFalse)).append(" END)").toString();
     }
 
     private static String value(Object value) {
diff --git a/api/src/com/todoroo/andlib/sql/Operator.java b/api/src/com/todoroo/andlib/sql/Operator.java
index 5e28d8e79..b94a0259e 100644
--- a/api/src/com/todoroo/andlib/sql/Operator.java
+++ b/api/src/com/todoroo/andlib/sql/Operator.java
@@ -5,11 +5,11 @@
  */
 package com.todoroo.andlib.sql;
 
-import static com.todoroo.andlib.sql.SqlConstants.SPACE;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.todoroo.andlib.sql.SqlConstants.SPACE;
+
 @SuppressWarnings("nls")
 public final class Operator {
 
@@ -47,7 +47,7 @@ public final class Operator {
     }
 
     public Operator getContrary() {
-        if(!contraryRegistry.containsKey(this)){
+        if (!contraryRegistry.containsKey(this)) {
             Operator opposite = new Operator(not.toString() + SPACE + this.toString());
             contraryRegistry.put(this, opposite);
             contraryRegistry.put(opposite, this);
diff --git a/api/src/com/todoroo/andlib/sql/Order.java b/api/src/com/todoroo/andlib/sql/Order.java
index 70479da90..9630ac8a1 100644
--- a/api/src/com/todoroo/andlib/sql/Order.java
+++ b/api/src/com/todoroo/andlib/sql/Order.java
@@ -5,11 +5,11 @@
  */
 package com.todoroo.andlib.sql;
 
-import static com.todoroo.andlib.sql.SqlConstants.SPACE;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.todoroo.andlib.sql.SqlConstants.SPACE;
+
 public class Order {
     private final Object expression;
     private final List<Order> secondaryExpressions;
@@ -45,8 +45,8 @@ public class Order {
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append(expression.toString())
-          .append(SPACE)
-          .append(orderType.toString());
+                .append(SPACE)
+                .append(orderType.toString());
 
         for (Order secondary : secondaryExpressions) {
             sb.append(", ").append(secondary.toString()); //$NON-NLS-1$
@@ -56,7 +56,7 @@ public class Order {
     }
 
     public Order reverse() {
-        if(orderType == OrderType.ASC)
+        if (orderType == OrderType.ASC)
             return new Order(expression, OrderType.DESC);
         else
             return new Order(expression, OrderType.ASC);
diff --git a/api/src/com/todoroo/andlib/sql/Query.java b/api/src/com/todoroo/andlib/sql/Query.java
index cefbcd5ce..77694d297 100644
--- a/api/src/com/todoroo/andlib/sql/Query.java
+++ b/api/src/com/todoroo/andlib/sql/Query.java
@@ -5,6 +5,17 @@
  */
 package com.todoroo.andlib.sql;
 
+import android.content.ContentResolver;
+import android.database.Cursor;
+import android.net.Uri;
+
+import com.todoroo.andlib.data.Property;
+import com.todoroo.astrid.api.AstridApiConstants;
+
+import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import static com.todoroo.andlib.sql.SqlConstants.ALL;
 import static com.todoroo.andlib.sql.SqlConstants.COMMA;
 import static com.todoroo.andlib.sql.SqlConstants.DISTINCT;
@@ -21,17 +32,6 @@ import static com.todoroo.andlib.sql.SqlConstants.WHERE;
 import static com.todoroo.andlib.sql.SqlTable.table;
 import static java.util.Arrays.asList;
 
-import java.util.ArrayList;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import android.content.ContentResolver;
-import android.database.Cursor;
-import android.net.Uri;
-
-import com.todoroo.andlib.data.Property;
-import com.todoroo.astrid.api.AstridApiConstants;
-
 public final class Query {
 
     private SqlTable table;
@@ -117,14 +117,14 @@ public final class Query {
         visitFromClause(sql);
 
         visitJoinClause(sql);
-        if(queryTemplate == null) {
+        if (queryTemplate == null) {
             visitWhereClause(sql);
             visitGroupByClause(sql);
             visitUnionClause(sql);
             visitOrderByClause(sql);
             visitLimitClause(sql);
         } else {
-            if(groupBies.size() > 0 || orders.size() > 0 ||
+            if (groupBies.size() > 0 || orders.size() > 0 ||
                     havings.size() > 0)
                 throw new IllegalStateException("Can't have extras AND query template"); //$NON-NLS-1$
             sql.append(queryTemplate);
@@ -198,7 +198,7 @@ public final class Query {
 
     private void visitSelectClause(StringBuilder sql) {
         sql.append(SELECT).append(SPACE);
-        if(distinct)
+        if (distinct)
             sql.append(DISTINCT).append(SPACE);
         if (fields.isEmpty()) {
             sql.append(ALL).append(SPACE);
@@ -211,7 +211,7 @@ public final class Query {
     }
 
     private void visitLimitClause(StringBuilder sql) {
-        if(limits > -1)
+        if (limits > -1)
             sql.append(LIMIT).append(SPACE).append(limits).append(SPACE);
     }
 
@@ -226,6 +226,7 @@ public final class Query {
 
     /**
      * Gets a list of fields returned by this query
+     *
      * @return
      */
     public Property<?>[] getFields() {
@@ -234,6 +235,7 @@ public final class Query {
 
     /**
      * Add the SQL query template (comes after the "from")
+     *
      * @param template
      * @return query
      */
@@ -244,6 +246,7 @@ public final class Query {
 
     /**
      * Parse out properties and run query
+     *
      * @param cr
      * @param baseUri
      * @return
@@ -251,24 +254,24 @@ public final class Query {
     public Cursor queryContentResolver(ContentResolver cr, Uri baseUri) {
         Uri uri = baseUri;
 
-        if(joins.size() != 0)
+        if (joins.size() != 0)
             throw new UnsupportedOperationException("can't perform join in content resolver query"); //$NON-NLS-1$
 
         String[] projection = new String[fields.size()];
-        for(int i = 0; i < projection.length; i++)
+        for (int i = 0; i < projection.length; i++)
             projection[i] = fields.get(i).toString();
 
         StringBuilder groupByClause = new StringBuilder();
         StringBuilder selectionClause = new StringBuilder();
         StringBuilder orderClause = new StringBuilder();
-        if(queryTemplate != null) {
+        if (queryTemplate != null) {
             QueryTemplateHelper.queryForContentResolver(queryTemplate,
                     selectionClause, orderClause, groupByClause);
         } else {
-            if(groupBies.size() > 0) {
+            if (groupBies.size() > 0) {
                 for (Field groupBy : groupBies)
                     groupByClause.append(SPACE).append(groupBy).append(COMMA);
-                if(groupByClause.length() > 0)
+                if (groupByClause.length() > 0)
                     groupByClause.deleteCharAt(groupByClause.length() - 1);
             }
 
@@ -277,39 +280,43 @@ public final class Query {
 
             for (Order order : orders)
                 orderClause.append(SPACE).append(order).append(COMMA);
-            if(orderClause.length() > 0)
+            if (orderClause.length() > 0)
                 orderClause.deleteCharAt(orderClause.length() - 1);
         }
 
-        if(groupByClause.length() > 0)
+        if (groupByClause.length() > 0)
             uri = Uri.withAppendedPath(baseUri, AstridApiConstants.GROUP_BY_URI +
                     groupByClause.toString().trim());
         return cr.query(uri, projection, selectionClause.toString(), null,
                 orderClause.toString());
     }
 
-    /** query template helper */
+    /**
+     * query template helper
+     */
     public static class QueryTemplateHelper {
 
-        /** build a content resolver query */
+        /**
+         * build a content resolver query
+         */
         @SuppressWarnings("nls")
         public static void queryForContentResolver(String queryTemplate,
-                StringBuilder selectionClause, StringBuilder orderClause,
-                StringBuilder groupByClause) {
+                                                   StringBuilder selectionClause, StringBuilder orderClause,
+                                                   StringBuilder groupByClause) {
 
             Pattern where = Pattern.compile("WHERE (.*?)(LIMIT|HAVING|GROUP|ORDER|\\Z)");
             Matcher whereMatcher = where.matcher(queryTemplate);
-            if(whereMatcher.find())
+            if (whereMatcher.find())
                 selectionClause.append(whereMatcher.group(1).trim());
 
             Pattern group = Pattern.compile("GROUP BY (.*?)(LIMIT|HAVING|ORDER|\\Z)");
             Matcher groupMatcher = group.matcher(queryTemplate);
-            if(groupMatcher.find())
+            if (groupMatcher.find())
                 groupByClause.append(groupMatcher.group(1).trim());
 
             Pattern order = Pattern.compile("ORDER BY (.*?)(LIMIT|HAVING|\\Z)");
             Matcher orderMatcher = order.matcher(queryTemplate);
-            if(orderMatcher.find())
+            if (orderMatcher.find())
                 orderClause.append(orderMatcher.group(1).trim());
         }
 
diff --git a/api/src/com/todoroo/andlib/sql/QueryTemplate.java b/api/src/com/todoroo/andlib/sql/QueryTemplate.java
index ce46495bc..7abd50e42 100644
--- a/api/src/com/todoroo/andlib/sql/QueryTemplate.java
+++ b/api/src/com/todoroo/andlib/sql/QueryTemplate.java
@@ -5,6 +5,8 @@
  */
 package com.todoroo.andlib.sql;
 
+import java.util.ArrayList;
+
 import static com.todoroo.andlib.sql.SqlConstants.COMMA;
 import static com.todoroo.andlib.sql.SqlConstants.GROUP_BY;
 import static com.todoroo.andlib.sql.SqlConstants.LIMIT;
@@ -13,14 +15,11 @@ import static com.todoroo.andlib.sql.SqlConstants.SPACE;
 import static com.todoroo.andlib.sql.SqlConstants.WHERE;
 import static java.util.Arrays.asList;
 
-import java.util.ArrayList;
-
 /**
  * Query Template returns a bunch of criteria that allows a query to be
  * constructed
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public final class QueryTemplate {
 
@@ -58,7 +57,7 @@ public final class QueryTemplate {
         visitWhereClause(sql);
         visitGroupByClause(sql);
         visitOrderByClause(sql);
-        if(limit != null)
+        if (limit != null)
             sql.append(LIMIT).append(SPACE).append(limit);
         return sql.toString();
     }
diff --git a/api/src/com/todoroo/andlib/sql/SqlTable.java b/api/src/com/todoroo/andlib/sql/SqlTable.java
index a486df954..3baa5d4d0 100644
--- a/api/src/com/todoroo/andlib/sql/SqlTable.java
+++ b/api/src/com/todoroo/andlib/sql/SqlTable.java
@@ -20,6 +20,6 @@ public class SqlTable extends DBObject<SqlTable> {
         if (hasAlias()) {
             return alias + "." + fieldName;
         }
-        return expression+"."+fieldName;
+        return expression + "." + fieldName;
     }
 }
diff --git a/api/src/com/todoroo/andlib/sql/UnaryCriterion.java b/api/src/com/todoroo/andlib/sql/UnaryCriterion.java
index a23db5e2c..ff48d58c2 100644
--- a/api/src/com/todoroo/andlib/sql/UnaryCriterion.java
+++ b/api/src/com/todoroo/andlib/sql/UnaryCriterion.java
@@ -38,9 +38,9 @@ public class UnaryCriterion extends Criterion {
 
     @SuppressWarnings("nls")
     protected void afterPopulateOperator(StringBuilder sb) {
-        if(value == null)
+        if (value == null)
             return;
-        else if(value instanceof String)
+        else if (value instanceof String)
             sb.append("'").append(sanitize((String) value)).append("'");
         else
             sb.append(value);
@@ -48,6 +48,7 @@ public class UnaryCriterion extends Criterion {
 
     /**
      * Sanitize the given input for SQL
+     *
      * @param input
      * @return
      */
@@ -109,6 +110,7 @@ public class UnaryCriterion extends Criterion {
             protected void populateOperator(StringBuilder sb) {
                 sb.append(SPACE).append(operator).append(SPACE);
             }
+
             @SuppressWarnings("nls")
             @Override
             protected void afterPopulateOperator(StringBuilder sb) {
diff --git a/api/src/com/todoroo/andlib/utility/AndroidUtilities.java b/api/src/com/todoroo/andlib/utility/AndroidUtilities.java
index 4b0fc9c70..9274c0626 100644
--- a/api/src/com/todoroo/andlib/utility/AndroidUtilities.java
+++ b/api/src/com/todoroo/andlib/utility/AndroidUtilities.java
@@ -5,34 +5,6 @@
  */
 package com.todoroo.andlib.utility;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.lang.reflect.Array;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.math.BigInteger;
-import java.net.URL;
-import java.net.URLConnection;
-import java.security.MessageDigest;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.ContentValues;
@@ -60,11 +32,38 @@ import android.widget.TextView;
 
 import com.todoroo.andlib.service.ExceptionService;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.lang.reflect.Array;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.math.BigInteger;
+import java.net.URL;
+import java.net.URLConnection;
+import java.security.MessageDigest;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
 /**
  * Android Utility Classes
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class AndroidUtilities {
 
@@ -73,7 +72,9 @@ public class AndroidUtilities {
 
     // --- utility methods
 
-    /** Suppress virtual keyboard until user's first tap */
+    /**
+     * Suppress virtual keyboard until user's first tap
+     */
     public static void suppressVirtualKeyboard(final TextView editor) {
         final int inputType = editor.getInputType();
         editor.setInputType(InputType.TYPE_NULL);
@@ -91,7 +92,7 @@ public class AndroidUtilities {
      */
     public static boolean isConnected(Context context) {
         ConnectivityManager manager = (ConnectivityManager)
-            context.getSystemService(Context.CONNECTIVITY_SERVICE);
+                context.getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo info = manager.getActiveNetworkInfo();
         if (info == null)
             return false;
@@ -100,7 +101,9 @@ public class AndroidUtilities {
         return true;
     }
 
-    /** Fetch the image specified by the given url */
+    /**
+     * Fetch the image specified by the given url
+     */
     public static Bitmap fetchImage(URL url) throws IOException {
         InputStream is = null;
         try {
@@ -115,20 +118,23 @@ public class AndroidUtilities {
                 bis.close();
             }
         } finally {
-            if(is != null)
+            if (is != null)
                 is.close();
         }
     }
 
-    /** Read a bitmap from the specified file, scaling if necessary
-     *  Returns null if scaling failed after several tries */
-    private static final int[] SAMPLE_SIZES = { 1, 2, 4, 6, 8, 10 };
+    /**
+     * Read a bitmap from the specified file, scaling if necessary
+     * Returns null if scaling failed after several tries
+     */
+    private static final int[] SAMPLE_SIZES = {1, 2, 4, 6, 8, 10};
     private static final int MAX_DIM = 1024;
+
     public static Bitmap readScaledBitmap(String file) {
         Bitmap bitmap = null;
         int tries = 0;
         BitmapFactory.Options opts = new BitmapFactory.Options();
-        while((bitmap == null || (bitmap.getWidth() > MAX_DIM || bitmap.getHeight() > MAX_DIM)) && tries < SAMPLE_SIZES.length) {
+        while ((bitmap == null || (bitmap.getWidth() > MAX_DIM || bitmap.getHeight() > MAX_DIM)) && tries < SAMPLE_SIZES.length) {
             opts.inSampleSize = SAMPLE_SIZES[tries];
             try {
                 bitmap = BitmapFactory.decodeFile(file, opts);
@@ -151,8 +157,8 @@ public class AndroidUtilities {
      */
     public static void startExternalIntent(Context context, Intent intent, int request) {
         try {
-            if(request > -1 && context instanceof Activity)
-                ((Activity)context).startActivityForResult(intent, request);
+            if (request > -1 && context instanceof Activity)
+                ((Activity) context).startActivityForResult(intent, request);
             else
                 context.startActivity(intent);
         } catch (Exception e) {
@@ -182,6 +188,7 @@ public class AndroidUtilities {
 
     /**
      * Put an arbitrary object into a {@link ContentValues}
+     *
      * @param target
      * @param key
      * @param value
@@ -210,6 +217,7 @@ public class AndroidUtilities {
 
     /**
      * Put an arbitrary object into a {@link ContentValues}
+     *
      * @param target
      * @param key
      * @param value
@@ -244,7 +252,7 @@ public class AndroidUtilities {
     public static String[][] contentValuesToStringArrays(ContentValues source) {
         String[][] result = new String[2][source.size()];
         int i = 0;
-        for(Entry<String, Object> entry : source.valueSet()) {
+        for (Entry<String, Object> entry : source.valueSet()) {
             result[0][i] = entry.getKey();
             result[1][i++] = entry.getValue().toString();
         }
@@ -253,19 +261,21 @@ public class AndroidUtilities {
 
     /**
      * Return index of value in array
+     *
      * @param array array to search
      * @param value value to look for
      * @return
      */
     public static <TYPE> int indexOf(TYPE[] array, TYPE value) {
-        for(int i = 0; i < array.length; i++)
-            if(array[i].equals(value))
+        for (int i = 0; i < array.length; i++)
+            if (array[i].equals(value))
                 return i;
         return -1;
     }
 
     /**
      * Return index of value in integer array
+     *
      * @param array array to search
      * @param value value to look for
      * @return
@@ -282,24 +292,26 @@ public class AndroidUtilities {
      */
     public static String contentValuesToSerializedString(ContentValues source) {
         StringBuilder result = new StringBuilder();
-        for(Entry<String, Object> entry : source.valueSet()) {
+        for (Entry<String, Object> entry : source.valueSet()) {
             addSerialized(result, entry.getKey(), entry.getValue());
         }
         return result.toString();
     }
 
-    /** add serialized helper */
+    /**
+     * add serialized helper
+     */
     private static void addSerialized(StringBuilder result,
-            String key, Object value) {
+                                      String key, Object value) {
         result.append(key.replace(SERIALIZATION_SEPARATOR, SEPARATOR_ESCAPE)).append(
                 SERIALIZATION_SEPARATOR);
-        if(value instanceof Integer)
+        if (value instanceof Integer)
             result.append('i').append(value);
-        else if(value instanceof Double)
+        else if (value instanceof Double)
             result.append('d').append(value);
-        else if(value instanceof Long)
+        else if (value instanceof Long)
             result.append('l').append(value);
-        else if(value instanceof String)
+        else if (value instanceof String)
             result.append('s').append(value.toString().replace(SERIALIZATION_SEPARATOR, SEPARATOR_ESCAPE));
         else if (value instanceof Boolean)
             result.append('b').append(value);
@@ -316,7 +328,7 @@ public class AndroidUtilities {
         if (source == null)
             return null;
 
-        for(String key : source.keySet()) {
+        for (String key : source.keySet()) {
             addSerialized(result, key, source.get(key));
         }
         return result.toString();
@@ -324,32 +336,33 @@ public class AndroidUtilities {
 
     /**
      * Turn ContentValues into a string
+     *
      * @param string
      * @return
      */
     public static ContentValues contentValuesFromSerializedString(String string) {
-        if(string == null)
+        if (string == null)
             return new ContentValues();
 
         ContentValues result = new ContentValues();
         fromSerialized(string, result, new SerializedPut<ContentValues>() {
             public void put(ContentValues object, String key, char type, String value) throws NumberFormatException {
-                switch(type) {
-                case 'i':
-                    object.put(key, Integer.parseInt(value));
-                    break;
-                case 'd':
-                    object.put(key, Double.parseDouble(value));
-                    break;
-                case 'l':
-                    object.put(key, Long.parseLong(value));
-                    break;
-                case 's':
-                    object.put(key, value.replace(SEPARATOR_ESCAPE, SERIALIZATION_SEPARATOR));
-                    break;
-                case 'b':
-                    object.put(key, Boolean.parseBoolean(value));
-                    break;
+                switch (type) {
+                    case 'i':
+                        object.put(key, Integer.parseInt(value));
+                        break;
+                    case 'd':
+                        object.put(key, Double.parseDouble(value));
+                        break;
+                    case 'l':
+                        object.put(key, Long.parseLong(value));
+                        break;
+                    case 's':
+                        object.put(key, value.replace(SEPARATOR_ESCAPE, SERIALIZATION_SEPARATOR));
+                        break;
+                    case 'b':
+                        object.put(key, Boolean.parseBoolean(value));
+                        break;
                 }
             }
         });
@@ -358,32 +371,33 @@ public class AndroidUtilities {
 
     /**
      * Turn {@link android.os.Bundle} into a string
+     *
      * @param string
      * @return
      */
     public static Bundle bundleFromSerializedString(String string) {
-        if(string == null)
+        if (string == null)
             return new Bundle();
 
         Bundle result = new Bundle();
         fromSerialized(string, result, new SerializedPut<Bundle>() {
             public void put(Bundle object, String key, char type, String value) throws NumberFormatException {
-                switch(type) {
-                case 'i':
-                    object.putInt(key, Integer.parseInt(value));
-                    break;
-                case 'd':
-                    object.putDouble(key, Double.parseDouble(value));
-                    break;
-                case 'l':
-                    object.putLong(key, Long.parseLong(value));
-                    break;
-                case 's':
-                    object.putString(key, value.replace(SEPARATOR_ESCAPE, SERIALIZATION_SEPARATOR));
-                    break;
-                case 'b':
-                    object.putBoolean(key, Boolean.parseBoolean(value));
-                    break;
+                switch (type) {
+                    case 'i':
+                        object.putInt(key, Integer.parseInt(value));
+                        break;
+                    case 'd':
+                        object.putDouble(key, Double.parseDouble(value));
+                        break;
+                    case 'l':
+                        object.putLong(key, Long.parseLong(value));
+                        break;
+                    case 's':
+                        object.putString(key, value.replace(SEPARATOR_ESCAPE, SERIALIZATION_SEPARATOR));
+                        break;
+                    case 'b':
+                        object.putBoolean(key, Boolean.parseBoolean(value));
+                        break;
                 }
             }
         });
@@ -397,12 +411,12 @@ public class AndroidUtilities {
     @SuppressWarnings("nls")
     private static <T> void fromSerialized(String string, T object, SerializedPut<T> putter) {
         String[] pairs = string.split("\\" + SERIALIZATION_SEPARATOR); //$NON-NLS-1$
-        for(int i = 0; i < pairs.length; i += 2) {
+        for (int i = 0; i < pairs.length; i += 2) {
             try {
                 String key = pairs[i].replaceAll(SEPARATOR_ESCAPE, SERIALIZATION_SEPARATOR);
-                String value = pairs[i+1].substring(1);
+                String value = pairs[i + 1].substring(1);
                 try {
-                    putter.put(object, key, pairs[i+1].charAt(0), value);
+                    putter.put(object, key, pairs[i + 1].charAt(0), value);
                 } catch (NumberFormatException e) {
                     // failed parse to number
                     putter.put(object, key, 's', value);
@@ -414,31 +428,30 @@ public class AndroidUtilities {
     }
 
 
-
-
     /**
      * Turn ContentValues into a string
+     *
      * @param string
      * @return
      */
     @SuppressWarnings("nls")
     public static ContentValues contentValuesFromString(String string) {
-        if(string == null)
+        if (string == null)
             return null;
 
         String[] pairs = string.split("=");
         ContentValues result = new ContentValues();
         String key = null;
-        for(int i = 0; i < pairs.length; i++) {
+        for (int i = 0; i < pairs.length; i++) {
             String newKey = null;
             int lastSpace = pairs[i].lastIndexOf(' ');
-            if(lastSpace != -1) {
+            if (lastSpace != -1) {
                 newKey = pairs[i].substring(lastSpace + 1);
                 pairs[i] = pairs[i].substring(0, lastSpace);
             } else {
-                newKey =  pairs[i];
+                newKey = pairs[i];
             }
-            if(key != null)
+            if (key != null)
                 result.put(key.trim(), pairs[i].trim());
             key = newKey;
         }
@@ -447,14 +460,15 @@ public class AndroidUtilities {
 
     /**
      * Returns true if a and b or null or a.equals(b)
+     *
      * @param a
      * @param b
      * @return
      */
     public static boolean equals(Object a, Object b) {
-        if(a == null && b == null)
+        if (a == null && b == null)
             return true;
-        if(a == null)
+        if (a == null)
             return false;
         return a.equals(b);
     }
@@ -481,6 +495,7 @@ public class AndroidUtilities {
 
     /**
      * Copy stream from source to destination
+     *
      * @param source
      * @param dest
      * @throws IOException
@@ -507,20 +522,21 @@ public class AndroidUtilities {
 
     /**
      * Find a child view of a certain type
+     *
      * @param view
      * @param type
      * @return first view (by DFS) if found, or null if none
      */
     public static <TYPE> TYPE findViewByType(View view, Class<TYPE> type) {
-        if(view == null)
+        if (view == null)
             return null;
-        if(type.isInstance(view))
+        if (type.isInstance(view))
             return (TYPE) view;
-        if(view instanceof ViewGroup) {
+        if (view instanceof ViewGroup) {
             ViewGroup group = (ViewGroup) view;
-            for(int i = 0; i < group.getChildCount(); i++) {
+            for (int i = 0; i < group.getChildCount(); i++) {
                 TYPE v = findViewByType(group.getChildAt(i), type);
-                if(v != null)
+                if (v != null)
                     return v;
             }
         }
@@ -536,13 +552,14 @@ public class AndroidUtilities {
 
     /**
      * Copy databases to a given folder. Useful for debugging
+     *
      * @param folder
      */
     public static void copyDatabases(Context context, String folder) {
         File folderFile = new File(folder);
-        if(!folderFile.exists())
+        if (!folderFile.exists())
             folderFile.mkdir();
-        for(String db : context.databaseList()) {
+        for (String db : context.databaseList()) {
             File dbFile = context.getDatabasePath(db);
             try {
                 copyFile(dbFile, new File(folderFile.getAbsolutePath() +
@@ -555,6 +572,7 @@ public class AndroidUtilities {
 
     /**
      * Sort files by date so the newest file is on top
+     *
      * @param files
      */
     public static void sortFilesByDateDesc(File[] files) {
@@ -567,13 +585,14 @@ public class AndroidUtilities {
 
     /**
      * Search for the given value in the map, returning key if found
+     *
      * @param map
      * @param value
      * @return null if not found, otherwise key
      */
-    public static <KEY, VALUE> KEY findKeyInMap(Map<KEY, VALUE> map, VALUE value){
-        for (Entry<KEY, VALUE> entry: map.entrySet()) {
-            if(entry.getValue().equals(value))
+    public static <KEY, VALUE> KEY findKeyInMap(Map<KEY, VALUE> map, VALUE value) {
+        for (Entry<KEY, VALUE> entry : map.entrySet()) {
+            if (entry.getValue().equals(value))
                 return entry.getKey();
         }
         return null;
@@ -597,30 +616,31 @@ public class AndroidUtilities {
      * If you want to set a transition, please use this method rather than <code>callApiMethod</code> to ensure
      * you really pass an Activity-instance.
      *
-     * @param activity the activity-instance for which to set the finish-transition
+     * @param activity  the activity-instance for which to set the finish-transition
      * @param enterAnim the incoming-transition of the next activity
-     * @param exitAnim the outgoing-transition of this activity
+     * @param exitAnim  the outgoing-transition of this activity
      */
     public static void callOverridePendingTransition(Activity activity, int enterAnim, int exitAnim) {
         callApiMethod(5,
                 activity,
                 "overridePendingTransition", //$NON-NLS-1$
-                new Class<?>[] { Integer.TYPE, Integer.TYPE },
+                new Class<?>[]{Integer.TYPE, Integer.TYPE},
                 enterAnim, exitAnim);
     }
 
     /**
      * Call a method via reflection if API level is at least minSdk
-     * @param minSdk minimum sdk number (i.e. 8)
-     * @param receiver object to call method on
+     *
+     * @param minSdk     minimum sdk number (i.e. 8)
+     * @param receiver   object to call method on
      * @param methodName method name to call
-     * @param params method parameter types
-     * @param args arguments
+     * @param params     method parameter types
+     * @param args       arguments
      * @return method return value, or null if nothing was called or exception
      */
     public static Object callApiMethod(int minSdk, Object receiver,
-            String methodName, Class<?>[] params, Object... args) {
-        if(getSdkVersion() < minSdk)
+                                       String methodName, Class<?>[] params, Object... args) {
+        if (getSdkVersion() < minSdk)
             return null;
 
         return AndroidUtilities.callMethod(receiver.getClass(),
@@ -629,17 +649,18 @@ public class AndroidUtilities {
 
     /**
      * Call a static method via reflection if API level is at least minSdk
-     * @param minSdk minimum sdk number (i.e. 8)
-     * @param className fully qualified class to call method on
+     *
+     * @param minSdk     minimum sdk number (i.e. 8)
+     * @param className  fully qualified class to call method on
      * @param methodName method name to call
-     * @param params method parameter types
-     * @param args arguments
+     * @param params     method parameter types
+     * @param args       arguments
      * @return method return value, or null if nothing was called or exception
      */
     @SuppressWarnings("nls")
     public static Object callApiStaticMethod(int minSdk, String className,
-            String methodName, Class<?>[] params, Object... args) {
-        if(getSdkVersion() < minSdk)
+                                             String methodName, Class<?>[] params, Object... args) {
+        if (getSdkVersion() < minSdk)
             return null;
 
         try {
@@ -653,16 +674,17 @@ public class AndroidUtilities {
 
     /**
      * Call a method via reflection
-     * @param class class to call method on
-     * @param receiver object to call method on (can be null)
+     *
+     * @param class      class to call method on
+     * @param receiver   object to call method on (can be null)
      * @param methodName method name to call
-     * @param params method parameter types
-     * @param args arguments
+     * @param params     method parameter types
+     * @param args       arguments
      * @return method return value, or null if nothing was called or exception
      */
     @SuppressWarnings("nls")
     public static Object callMethod(Class<?> cls, Object receiver,
-            String methodName, Class<?>[] params, Object... args) {
+                                    String methodName, Class<?>[] params, Object... args) {
         try {
             Method method = cls.getMethod(methodName, params);
             Object result = method.invoke(receiver, args);
@@ -685,6 +707,7 @@ public class AndroidUtilities {
     /**
      * From Android MyTracks project (http://mytracks.googlecode.com/).
      * Licensed under the Apache Public License v2
+     *
      * @param activity
      * @param id
      * @return
@@ -738,6 +761,7 @@ public class AndroidUtilities {
 
     /**
      * Performs an md5 hash on the input string
+     *
      * @param input
      * @return
      */
@@ -747,9 +771,9 @@ public class AndroidUtilities {
             byte[] bytesOfMessage = input.getBytes("UTF-8");
             MessageDigest md = MessageDigest.getInstance("MD5");
             byte[] digest = md.digest(bytesOfMessage);
-            BigInteger bigInt = new BigInteger(1,digest);
+            BigInteger bigInt = new BigInteger(1, digest);
             String hashtext = bigInt.toString(16);
-            while(hashtext.length() < 32 ){
+            while (hashtext.length() < 32) {
                 hashtext = "0" + hashtext;
             }
             return hashtext;
@@ -760,6 +784,7 @@ public class AndroidUtilities {
 
     /**
      * Create an intent to a remote activity
+     *
      * @param appPackage
      * @param activityClass
      * @return
@@ -772,6 +797,7 @@ public class AndroidUtilities {
 
     /**
      * Gets application signature
+     *
      * @return application signature, or null if an error was encountered
      */
     public static String getSignature(Context context, String packageName) {
@@ -786,6 +812,7 @@ public class AndroidUtilities {
 
     /**
      * Join items to a list
+     *
      * @param <TYPE>
      * @param list
      * @param newList
@@ -804,11 +831,11 @@ public class AndroidUtilities {
 
         T[] newList = (T[]) Array.newInstance(type, length);
         if (list != null) {
-            for(int i = 0; i < list.length; i++)
+            for (int i = 0; i < list.length; i++)
                 newList[i] = list[i];
         }
         if (newItems != null) {
-            for(int i = 0; i < newItems.length; i++)
+            for (int i = 0; i < newItems.length; i++)
                 newList[originalListLength + i] = newItems[i];
         }
         return newList;
@@ -819,9 +846,9 @@ public class AndroidUtilities {
     private static ExceptionService exceptionService = null;
 
     private static ExceptionService getExceptionService() {
-        if(exceptionService == null)
-            synchronized(AndroidUtilities.class) {
-                if(exceptionService == null)
+        if (exceptionService == null)
+            synchronized (AndroidUtilities.class) {
+                if (exceptionService == null)
                     exceptionService = new ExceptionService();
             }
         return exceptionService;
@@ -829,16 +856,17 @@ public class AndroidUtilities {
 
     /**
      * Concatenate additional stuff to the end of the array
+     *
      * @param params
      * @param additional
      * @return
      */
     public static <TYPE> TYPE[] concat(TYPE[] dest, TYPE[] source, TYPE... additional) {
         int i = 0;
-        for(; i < Math.min(dest.length, source.length); i++)
+        for (; i < Math.min(dest.length, source.length); i++)
             dest[i] = source[i];
         int base = i;
-        for(; i < dest.length; i++)
+        for (; i < dest.length; i++)
             dest[i] = additional[i - base];
         return dest;
     }
@@ -847,6 +875,7 @@ public class AndroidUtilities {
      * Returns a map where the keys are the values of the map argument
      * and the values are the corresponding keys. Use at your own
      * risk if your map is not 1-to-1!
+     *
      * @param map
      * @return
      */
@@ -862,6 +891,7 @@ public class AndroidUtilities {
 
     /**
      * Capitalize the first character
+     *
      * @param string
      * @return
      */
@@ -871,11 +901,12 @@ public class AndroidUtilities {
 
     /**
      * Dismiss the keyboard if it is displayed by any of the listed views
+     *
      * @param context
-     * @param views - a list of views that might potentially be displaying the keyboard
+     * @param views   - a list of views that might potentially be displaying the keyboard
      */
-    public static void hideSoftInputForViews(Context context, View...views) {
-        InputMethodManager imm = (InputMethodManager)context.getSystemService(Context.INPUT_METHOD_SERVICE);
+    public static void hideSoftInputForViews(Context context, View... views) {
+        InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
         for (View v : views) {
             imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
         }
@@ -883,6 +914,7 @@ public class AndroidUtilities {
 
     /**
      * Returns true if the screen is large or xtra large
+     *
      * @param context
      * @return
      */
@@ -914,6 +946,7 @@ public class AndroidUtilities {
     /**
      * Wraps a call to Activity.unregisterReceiver in a try/catch block to prevent
      * exceptions being thrown if receiver was never registered with that activity
+     *
      * @param activity
      * @param receiver
      */
@@ -965,6 +998,7 @@ public class AndroidUtilities {
 
     /**
      * Returns the final word characters after the last '.'
+     *
      * @param file
      * @return
      */
diff --git a/api/src/com/todoroo/andlib/utility/DateUtilities.java b/api/src/com/todoroo/andlib/utility/DateUtilities.java
index 32ea38579..285bf5b2f 100644
--- a/api/src/com/todoroo/andlib/utility/DateUtilities.java
+++ b/api/src/com/todoroo/andlib/utility/DateUtilities.java
@@ -5,6 +5,12 @@
  */
 package com.todoroo.andlib.utility;
 
+import android.content.Context;
+import android.text.format.DateFormat;
+import android.text.format.DateUtils;
+
+import com.todoroo.astrid.api.R;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
@@ -12,12 +18,6 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 
-import android.content.Context;
-import android.text.format.DateFormat;
-import android.text.format.DateUtils;
-
-import com.todoroo.astrid.api.R;
-
 
 public class DateUtilities {
 
@@ -25,16 +25,20 @@ public class DateUtilities {
      * ============================================================ long time
      * ====================================================================== */
 
-    /** Convert unixtime into date */
+    /**
+     * Convert unixtime into date
+     */
     public static final Date unixtimeToDate(long millis) {
-        if(millis == 0)
+        if (millis == 0)
             return null;
         return new Date(millis);
     }
 
-    /** Convert date into unixtime */
+    /**
+     * Convert date into unixtime
+     */
     public static final long dateToUnixtime(Date date) {
-        if(date == null)
+        if (date == null)
             return 0;
         return date.getTime();
     }
@@ -43,7 +47,7 @@ public class DateUtilities {
      * Add the specified amount of months to the given time.<br/>
      * The day of month will stay the same.<br/>
      *
-     * @param time the base-time (in milliseconds) to which the amount of months is added
+     * @param time     the base-time (in milliseconds) to which the amount of months is added
      * @param interval the amount of months to be added
      * @return the calculated time in milliseconds
      */
@@ -54,28 +58,40 @@ public class DateUtilities {
         return c.getTimeInMillis();
     }
 
-    /** Returns unixtime for current time */
+    /**
+     * Returns unixtime for current time
+     */
     public static final long now() {
         return System.currentTimeMillis();
     }
 
-    /** Returns unixtime one month from now */
+    /**
+     * Returns unixtime one month from now
+     */
     public static final long oneMonthFromNow() {
         Date date = new Date();
         date.setMonth(date.getMonth() + 1);
         return date.getTime();
     }
 
-    /** Represents a single hour */
+    /**
+     * Represents a single hour
+     */
     public static final long ONE_HOUR = 3600000L;
 
-    /** Represents a single day */
+    /**
+     * Represents a single day
+     */
     public static final long ONE_DAY = 24 * ONE_HOUR;
 
-    /** Represents a single week */
+    /**
+     * Represents a single week
+     */
     public static final long ONE_WEEK = 7 * ONE_DAY;
 
-    /** Represents a single minute */
+    /**
+     * Represents a single minute
+     */
     public static final long ONE_MINUTE = 60000L;
 
     /* ======================================================================
@@ -85,7 +101,7 @@ public class DateUtilities {
     static Boolean is24HourOverride = null;
 
     public static boolean is24HourFormat(Context context) {
-        if(is24HourOverride != null)
+        if (is24HourOverride != null)
             return is24HourOverride;
 
         return DateFormat.is24HourFormat(context);
@@ -93,7 +109,7 @@ public class DateUtilities {
 
     /**
      * @param context android context
-     * @param date time to format
+     * @param date    time to format
      * @return time, with hours and minutes
      */
     @SuppressWarnings("nls")
@@ -101,10 +117,9 @@ public class DateUtilities {
         String value;
         if (is24HourFormat(context)) {
             value = "H:mm";
-        } else if (date.getMinutes() == 0 && excludeZeroMinutes){
+        } else if (date.getMinutes() == 0 && excludeZeroMinutes) {
             value = "h a";
-        }
-        else {
+        } else {
             value = "h:mm a";
         }
         return new SimpleDateFormat(value).format(date);
@@ -122,7 +137,7 @@ public class DateUtilities {
 
     /**
      * @param context android context
-     * @param date date to format
+     * @param date    date to format
      * @return date, with month, day, and year
      */
     @SuppressWarnings("nls")
@@ -134,20 +149,21 @@ public class DateUtilities {
         // united states, you are special
         Locale locale = Locale.getDefault();
         if (arrayBinaryContains(locale.getLanguage(), "ja", "ko", "zh")
-                || arrayBinaryContains(locale.getCountry(),  "BZ", "CA", "KE", "MN" ,"US"))
+                || arrayBinaryContains(locale.getCountry(), "BZ", "CA", "KE", "MN", "US"))
             value = "'#' d'$'";
         else
             value = "d'$' '#'";
         if (includeYear)
             value += ", yyyy";
-        if (arrayBinaryContains(locale.getLanguage(), "ja", "zh")){
+        if (arrayBinaryContains(locale.getLanguage(), "ja", "zh")) {
             standardDate = new SimpleDateFormat(value).format(date).replace("#", month).replace("$", "\u65E5"); //$NON-NLS-1$
-        }else if ("ko".equals(Locale.getDefault().getLanguage())){
+        } else if ("ko".equals(Locale.getDefault().getLanguage())) {
             standardDate = new SimpleDateFormat(value).format(date).replace("#", month).replace("$", "\uC77C"); //$NON-NLS-1$
-        }else{
+        } else {
             standardDate = new SimpleDateFormat(value).format(date).replace("#", month).replace("$", "");
         }
-        return standardDate;}
+        return standardDate;
+    }
 
     public static String getDateString(Context context, Date date) {
         return getDateString(context, date, true);
@@ -155,7 +171,7 @@ public class DateUtilities {
 
     /**
      * @param context android context
-     * @param date date to format
+     * @param date    date to format
      * @return date, with month, day, and year
      */
     @SuppressWarnings("nls")
@@ -166,12 +182,12 @@ public class DateUtilities {
         Locale locale = Locale.getDefault();
         // united states, you are special
         if (arrayBinaryContains(locale.getLanguage(), "ja", "ko", "zh")
-                || arrayBinaryContains(locale.getCountry(),  "BZ", "CA", "KE", "MN" ,"US"))
+                || arrayBinaryContains(locale.getCountry(), "BZ", "CA", "KE", "MN", "US"))
             value = "'#' d";
         else
             value = "d '#'";
 
-        if (date.getYear() !=  (new Date()).getYear()) {
+        if (date.getYear() != (new Date()).getYear()) {
             value = value + "\nyyyy";
         }
         if (arrayBinaryContains(locale.getLanguage(), "ja", "zh")) //$NON-NLS-1$
@@ -231,16 +247,16 @@ public class DateUtilities {
         long today = clearTime(new Date());
         long input = clearTime(new Date(date));
 
-        if(today == input)
+        if (today == input)
             return context.getString(R.string.today).toLowerCase();
 
-        if(today + ONE_DAY == input)
+        if (today + ONE_DAY == input)
             return context.getString(abbreviated ? R.string.tmrw : R.string.tomorrow).toLowerCase();
 
-        if(today == input + ONE_DAY)
+        if (today == input + ONE_DAY)
             return context.getString(abbreviated ? R.string.yest : R.string.yesterday).toLowerCase();
 
-        if(today + DateUtilities.ONE_WEEK >= input &&
+        if (today + DateUtilities.ONE_WEEK >= input &&
                 today - DateUtilities.ONE_WEEK <= input)
             return abbreviated ? DateUtilities.getWeekdayShort(new Date(date)) : DateUtilities.getWeekday(new Date(date));
 
@@ -270,6 +286,7 @@ public class DateUtilities {
     }
 
     private static final Calendar calendar = Calendar.getInstance();
+
     public static long getStartOfDay(long time) {
         calendar.setTimeInMillis(time);
         calendar.set(Calendar.HOUR, 0);
diff --git a/api/src/com/todoroo/andlib/utility/DialogUtilities.java b/api/src/com/todoroo/andlib/utility/DialogUtilities.java
index 1d9d30da4..328124eea 100644
--- a/api/src/com/todoroo/andlib/utility/DialogUtilities.java
+++ b/api/src/com/todoroo/andlib/utility/DialogUtilities.java
@@ -27,21 +27,21 @@ public class DialogUtilities {
      * @param okListener
      */
     public static void viewDialog(final Activity activity, final String text,
-            final View view, final DialogInterface.OnClickListener okListener,
-            final DialogInterface.OnClickListener cancelListener) {
-        if(activity.isFinishing())
+                                  final View view, final DialogInterface.OnClickListener okListener,
+                                  final DialogInterface.OnClickListener cancelListener) {
+        if (activity.isFinishing())
             return;
 
         tryOnUiThread(activity, new Runnable() {
             public void run() {
                 new AlertDialog.Builder(activity)
-                .setTitle(R.string.DLG_question_title)
-                .setMessage(text)
-                .setView(view)
-                .setIcon(android.R.drawable.ic_dialog_alert)
-                .setPositiveButton(android.R.string.ok, okListener)
-                .setNegativeButton(android.R.string.cancel, cancelListener)
-                .show().setOwnerActivity(activity);
+                        .setTitle(R.string.DLG_question_title)
+                        .setMessage(text)
+                        .setView(view)
+                        .setIcon(android.R.drawable.ic_dialog_alert)
+                        .setPositiveButton(android.R.string.ok, okListener)
+                        .setNegativeButton(android.R.string.cancel, cancelListener)
+                        .show().setOwnerActivity(activity);
             }
         });
     }
@@ -60,11 +60,11 @@ public class DialogUtilities {
         webView.setBackgroundColor(0);
 
         new AlertDialog.Builder(context)
-        .setTitle(title)
-        .setView(webView)
-        .setIcon(android.R.drawable.ic_dialog_info)
-        .setPositiveButton(android.R.string.ok, null)
-        .show();
+                .setTitle(title)
+                .setView(webView)
+                .setIcon(android.R.drawable.ic_dialog_info)
+                .setPositiveButton(android.R.string.ok, null)
+                .show();
     }
 
     /**
@@ -75,18 +75,18 @@ public class DialogUtilities {
      * @param okListener
      */
     public static void okDialog(final Activity activity, final String text,
-            final DialogInterface.OnClickListener okListener) {
-        if(activity.isFinishing())
+                                final DialogInterface.OnClickListener okListener) {
+        if (activity.isFinishing())
             return;
 
         tryOnUiThread(activity, new Runnable() {
             public void run() {
                 new AlertDialog.Builder(activity)
-                .setTitle(R.string.DLG_information_title)
-                .setMessage(text)
-                .setIcon(android.R.drawable.ic_dialog_alert)
-                .setPositiveButton(android.R.string.ok, okListener)
-                .show().setOwnerActivity(activity);
+                        .setTitle(R.string.DLG_information_title)
+                        .setMessage(text)
+                        .setIcon(android.R.drawable.ic_dialog_alert)
+                        .setPositiveButton(android.R.string.ok, okListener)
+                        .show().setOwnerActivity(activity);
             }
         });
     }
@@ -99,19 +99,19 @@ public class DialogUtilities {
      * @param okListener
      */
     public static void okDialog(final Activity activity, final String title,
-            final int icon, final CharSequence text,
-            final DialogInterface.OnClickListener okListener) {
-        if(activity.isFinishing())
+                                final int icon, final CharSequence text,
+                                final DialogInterface.OnClickListener okListener) {
+        if (activity.isFinishing())
             return;
 
         tryOnUiThread(activity, new Runnable() {
             public void run() {
                 new AlertDialog.Builder(activity)
-                .setTitle(title)
-                .setMessage(text)
-                .setIcon(icon)
-                .setPositiveButton(android.R.string.ok, okListener)
-                .show().setOwnerActivity(activity);
+                        .setTitle(title)
+                        .setMessage(text)
+                        .setIcon(icon)
+                        .setPositiveButton(android.R.string.ok, okListener)
+                        .show().setOwnerActivity(activity);
             }
         });
     }
@@ -126,8 +126,8 @@ public class DialogUtilities {
      * @param cancelListener
      */
     public static void okCancelDialog(final Activity activity, final String title,
-            final String text, final DialogInterface.OnClickListener okListener,
-            final DialogInterface.OnClickListener cancelListener) {
+                                      final String text, final DialogInterface.OnClickListener okListener,
+                                      final DialogInterface.OnClickListener cancelListener) {
 
         okCancelCustomDialog(activity, title, text, android.R.string.ok, android.R.string.cancel, android.R.drawable.ic_dialog_alert, okListener, cancelListener);
     }
@@ -141,40 +141,42 @@ public class DialogUtilities {
      * @param cancelListener
      */
     public static void okCancelDialog(final Activity activity, final String text,
-            final DialogInterface.OnClickListener okListener,
-            final DialogInterface.OnClickListener cancelListener) {
+                                      final DialogInterface.OnClickListener okListener,
+                                      final DialogInterface.OnClickListener cancelListener) {
 
         okCancelCustomDialog(activity, activity.getString(R.string.DLG_confirm_title), text, android.R.string.ok, android.R.string.cancel, android.R.drawable.ic_dialog_alert, okListener, cancelListener);
 
     }
 
     /**
-    * Displays a dialog box with custom titled OK and cancel button titles
-    */
+     * Displays a dialog box with custom titled OK and cancel button titles
+     */
 
     public static void okCancelCustomDialog(final Activity activity, final String title, final String text,
-            final int okTitleId, final int cancelTitleId,
-            final int icon,
-            final DialogInterface.OnClickListener okListener,
-            final DialogInterface.OnClickListener cancelListener) {
-        if(activity.isFinishing())
+                                            final int okTitleId, final int cancelTitleId,
+                                            final int icon,
+                                            final DialogInterface.OnClickListener okListener,
+                                            final DialogInterface.OnClickListener cancelListener) {
+        if (activity.isFinishing())
             return;
 
         tryOnUiThread(activity, new Runnable() {
             public void run() {
                 new AlertDialog.Builder(activity)
-                .setTitle(R.string.DLG_confirm_title)
-                .setMessage(text)
-                .setTitle(title)
-                .setIcon(icon)
-                .setPositiveButton(okTitleId, okListener)
-                .setNegativeButton(cancelTitleId, cancelListener)
-                .show().setOwnerActivity(activity);
+                        .setTitle(R.string.DLG_confirm_title)
+                        .setMessage(text)
+                        .setTitle(title)
+                        .setIcon(icon)
+                        .setPositiveButton(okTitleId, okListener)
+                        .setNegativeButton(cancelTitleId, cancelListener)
+                        .show().setOwnerActivity(activity);
             }
         });
     }
 
-    /** Run runnable with progress dialog */
+    /**
+     * Run runnable with progress dialog
+     */
     public static ProgressDialog runWithProgressDialog(final Activity activity, final Runnable runnable) {
         final ProgressDialog progressdiag = progressDialog(activity, activity.getString(R.string.DLG_wait));
         new Thread(new Runnable() {
@@ -196,6 +198,7 @@ public class DialogUtilities {
 
     /**
      * Displays a progress dialog. Must be run on the UI thread
+     *
      * @param context
      * @param text
      * @return
@@ -217,7 +220,7 @@ public class DialogUtilities {
      * @param dialog
      */
     public static void dismissDialog(Activity activity, final Dialog dialog) {
-        if(dialog == null)
+        if (dialog == null)
             return;
         tryOnUiThread(activity, new Runnable() {
             public void run() {
diff --git a/api/src/com/todoroo/andlib/utility/Pair.java b/api/src/com/todoroo/andlib/utility/Pair.java
index 822ce4ee2..a44618ec1 100644
--- a/api/src/com/todoroo/andlib/utility/Pair.java
+++ b/api/src/com/todoroo/andlib/utility/Pair.java
@@ -8,10 +8,9 @@ package com.todoroo.andlib.utility;
 /**
  * Pair utility class
  *
- * @author Tim Su <tim@todoroo.com>
- *
  * @param <L>
  * @param <R>
+ * @author Tim Su <tim@todoroo.com>
  */
 public class Pair<L, R> {
 
diff --git a/api/src/com/todoroo/andlib/utility/Preferences.java b/api/src/com/todoroo/andlib/utility/Preferences.java
index 95ab91812..e5fa865da 100644
--- a/api/src/com/todoroo/andlib/utility/Preferences.java
+++ b/api/src/com/todoroo/andlib/utility/Preferences.java
@@ -17,7 +17,6 @@ import com.todoroo.andlib.service.ContextManager;
  * Helper class for reading and writing SharedPreferences
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class Preferences {
 
@@ -33,12 +32,13 @@ public class Preferences {
      */
     public static void setIfUnset(SharedPreferences prefs, Editor editor, Resources r, int keyResource, int value) {
         String key = r.getString(keyResource);
-        if(!prefs.contains(key))
+        if (!prefs.contains(key))
             editor.putString(key, Integer.toString(value));
     }
 
     /**
      * Helper to write to editor if key specified is null
+     *
      * @param prefs
      * @param editor
      * @param r
@@ -47,12 +47,13 @@ public class Preferences {
      */
     public static void setIfUnset(SharedPreferences prefs, Editor editor, Resources r, int keyResource, boolean value) {
         String key = r.getString(keyResource);
-        if(!prefs.contains(key) || !(prefs.getAll().get(key) instanceof Boolean))
+        if (!prefs.contains(key) || !(prefs.getAll().get(key) instanceof Boolean))
             editor.putBoolean(key, value);
     }
 
     /**
      * Helper to write to editor if key specified is null
+     *
      * @param prefs
      * @param editor
      * @param r
@@ -61,7 +62,7 @@ public class Preferences {
      */
     public static void setIfUnset(SharedPreferences prefs, Editor editor, Resources r, int keyResource, String value) {
         String key = r.getString(keyResource);
-        if(!prefs.contains(key) || !(prefs.getAll().get(key) instanceof String))
+        if (!prefs.contains(key) || !(prefs.getAll().get(key) instanceof String))
             editor.putString(key, value);
     }
 
@@ -71,9 +72,11 @@ public class Preferences {
 
     private static SharedPreferences preferences = null;
 
-    /** Get preferences object from the context */
+    /**
+     * Get preferences object from the context
+     */
     public static SharedPreferences getPrefs(Context context) {
-        if(preferences != null)
+        if (preferences != null)
             return preferences;
 
         context = context.getApplicationContext();
@@ -91,7 +94,9 @@ public class Preferences {
         return preferences;
     }
 
-    /** @return true if given preference is set */
+    /**
+     * @return true if given preference is set
+     */
     public static boolean isSet(String key) {
         Context context = ContextManager.getContext();
         return getPrefs(context).contains(key);
@@ -99,7 +104,8 @@ public class Preferences {
 
     // --- preference fetching (string)
 
-    /** Gets an string value from a string preference. Returns null
+    /**
+     * Gets an string value from a string preference. Returns null
      * if the value is not set
      *
      * @param context
@@ -111,7 +117,8 @@ public class Preferences {
         return getPrefs(context).getString(key, null);
     }
 
-    /** Gets an string value from a string preference. Returns null
+    /**
+     * Gets an string value from a string preference. Returns null
      * if the value is not set
      *
      * @param context
@@ -123,7 +130,8 @@ public class Preferences {
         return getPrefs(context).getString(context.getResources().getString(keyResource), null);
     }
 
-    /** Gets an integer value from a string preference. Returns null
+    /**
+     * Gets an integer value from a string preference. Returns null
      * if the value is not set or not an integer.
      *
      * @param keyResource resource from string.xml
@@ -133,7 +141,7 @@ public class Preferences {
         Context context = ContextManager.getContext();
         Resources r = context.getResources();
         String value = getPrefs(context).getString(r.getString(keyResource), null);
-        if(value == null)
+        if (value == null)
             return defaultValue;
 
         try {
@@ -143,7 +151,8 @@ public class Preferences {
         }
     }
 
-    /** Gets an float value from a string preference. Returns null
+    /**
+     * Gets an float value from a string preference. Returns null
      * if the value is not set or not an flat.
      *
      * @param keyResource resource from string.xml
@@ -191,7 +200,8 @@ public class Preferences {
 
     // --- preference fetching (boolean)
 
-    /** Gets a boolean preference (e.g. a CheckBoxPreference setting)
+    /**
+     * Gets a boolean preference (e.g. a CheckBoxPreference setting)
      *
      * @param key
      * @param defValue
@@ -206,7 +216,8 @@ public class Preferences {
         }
     }
 
-    /** Gets a boolean preference (e.g. a CheckBoxPreference setting)
+    /**
+     * Gets a boolean preference (e.g. a CheckBoxPreference setting)
      *
      * @param keyResource
      * @param defValue
@@ -218,6 +229,7 @@ public class Preferences {
 
     /**
      * Sets boolean preference
+     *
      * @param key
      * @param value
      */
@@ -227,6 +239,7 @@ public class Preferences {
 
     /**
      * Sets boolean preference
+     *
      * @param key
      * @param value
      */
@@ -239,7 +252,8 @@ public class Preferences {
 
     // --- preference fetching (int)
 
-    /** Gets a int preference
+    /**
+     * Gets a int preference
      *
      * @param key
      * @param defValue
@@ -252,6 +266,7 @@ public class Preferences {
 
     /**
      * Sets int preference
+     *
      * @param key
      * @param value
      */
@@ -264,7 +279,8 @@ public class Preferences {
 
     // --- preference fetching (long)
 
-    /** Gets a long preference
+    /**
+     * Gets a long preference
      *
      * @param key
      * @param defValue
@@ -277,6 +293,7 @@ public class Preferences {
 
     /**
      * Sets long preference
+     *
      * @param key
      * @param value
      */
@@ -289,6 +306,7 @@ public class Preferences {
 
     /**
      * Clears a preference
+     *
      * @param key
      */
     public static void clear(String key) {
diff --git a/api/src/com/todoroo/andlib/utility/TodorooPreferenceActivity.java b/api/src/com/todoroo/andlib/utility/TodorooPreferenceActivity.java
index 5f9dd8921..2f95518f9 100644
--- a/api/src/com/todoroo/andlib/utility/TodorooPreferenceActivity.java
+++ b/api/src/com/todoroo/andlib/utility/TodorooPreferenceActivity.java
@@ -29,7 +29,6 @@ import com.todoroo.andlib.service.ContextManager;
  * updatePreferences to update the summary with preference values.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 abstract public class TodorooPreferenceActivity extends PreferenceActivity {
 
@@ -39,8 +38,9 @@ abstract public class TodorooPreferenceActivity extends PreferenceActivity {
 
     /**
      * Update preferences for the given preference
+     *
      * @param preference
-     * @param value setting. may be null.
+     * @param value      setting. may be null.
      */
     public abstract void updatePreferences(Preference preference, Object value);
 
@@ -60,21 +60,21 @@ abstract public class TodorooPreferenceActivity extends PreferenceActivity {
     }
 
     protected void initializePreference(Preference preference) {
-        if(preference instanceof PreferenceGroup) {
-            PreferenceGroup group = (PreferenceGroup)preference;
-            for(int i = 0; i < group.getPreferenceCount(); i++) {
+        if (preference instanceof PreferenceGroup) {
+            PreferenceGroup group = (PreferenceGroup) preference;
+            for (int i = 0; i < group.getPreferenceCount(); i++) {
                 initializePreference(group.getPreference(i));
             }
             updatePreferences(group, null);
         } else {
             Object value = null;
-            if(preference instanceof ListPreference)
-                value = ((ListPreference)preference).getValue();
-            else if(preference instanceof CheckBoxPreference)
-                value = ((CheckBoxPreference)preference).isChecked();
-            else if(preference instanceof EditTextPreference)
-                value = ((EditTextPreference)preference).getText();
-            else if(preference instanceof RingtonePreference)
+            if (preference instanceof ListPreference)
+                value = ((ListPreference) preference).getValue();
+            else if (preference instanceof CheckBoxPreference)
+                value = ((CheckBoxPreference) preference).isChecked();
+            else if (preference instanceof EditTextPreference)
+                value = ((EditTextPreference) preference).getText();
+            else if (preference instanceof RingtonePreference)
                 value = getPreferenceManager().getSharedPreferences().getString(preference.getKey(), null);
 
             updatePreferences(preference, value);
@@ -93,7 +93,7 @@ abstract public class TodorooPreferenceActivity extends PreferenceActivity {
     @Override
     public void onWindowFocusChanged(boolean hasFocus) {
         super.onWindowFocusChanged(hasFocus);
-        if(hasFocus) {
+        if (hasFocus) {
             initializePreference(getPreferenceScreen());
         }
     }
diff --git a/api/src/com/todoroo/astrid/api/Addon.java b/api/src/com/todoroo/astrid/api/Addon.java
index bf3e1ecaf..d97d92973 100644
--- a/api/src/com/todoroo/astrid/api/Addon.java
+++ b/api/src/com/todoroo/astrid/api/Addon.java
@@ -13,7 +13,6 @@ import android.os.Parcelable;
  * which affect all other extension points that share the same identifier.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class Addon implements Parcelable {
 
@@ -89,7 +88,9 @@ public class Addon implements Parcelable {
          */
         public Addon[] newArray(int size) {
             return new Addon[size];
-        };
+        }
+
+        ;
     };
 
 }
diff --git a/api/src/com/todoroo/astrid/api/AstridApiConstants.java b/api/src/com/todoroo/astrid/api/AstridApiConstants.java
index 5f7a499a9..f36206a15 100644
--- a/api/src/com/todoroo/astrid/api/AstridApiConstants.java
+++ b/api/src/com/todoroo/astrid/api/AstridApiConstants.java
@@ -70,7 +70,7 @@ public class AstridApiConstants {
     /**
      * Extras name for old task due date
      */
-    public static final String EXTRAS_OLD_DUE_DATE= "oldDueDate";
+    public static final String EXTRAS_OLD_DUE_DATE = "oldDueDate";
 
     /**
      * Extras name for new task due date
@@ -144,7 +144,7 @@ public class AstridApiConstants {
     /**
      * Action name for broadcast intent requesting details for a task.
      * Extended details are displayed when a user presses on a task.
-     *
+     * <p/>
      * <li> EXTRAS_TASK_ID id of the task
      * <li> EXTRAS_EXTENDED whether request is for standard or extended details
      */
diff --git a/api/src/com/todoroo/astrid/api/CustomFilterCriterion.java b/api/src/com/todoroo/astrid/api/CustomFilterCriterion.java
index 0e2b2bcef..bbf671057 100644
--- a/api/src/com/todoroo/astrid/api/CustomFilterCriterion.java
+++ b/api/src/com/todoroo/astrid/api/CustomFilterCriterion.java
@@ -15,13 +15,12 @@ import android.os.Parcelable;
  * together criteria
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 abstract public class CustomFilterCriterion implements Parcelable {
 
     /**
      * Criteria Identifier. This identifier allows saved filters to be reloaded.
-     * <p>
+     * <p/>
      * e.g "duedate"
      */
     public String identifier;
@@ -29,7 +28,7 @@ abstract public class CustomFilterCriterion implements Parcelable {
     /**
      * Criteria Title. If the title contains ?, this is replaced by the entry
      * label string selected.
-     * <p>
+     * <p/>
      * e.g "Due: ?"
      */
     public String text;
@@ -37,7 +36,7 @@ abstract public class CustomFilterCriterion implements Parcelable {
     /**
      * Criterion SQL. This query should return task id's. If this contains
      * ?, it will be replaced by the entry value
-     * <p>
+     * <p/>
      * Examples:
      * <ul>
      * <li><code>SELECT _id FROM tasks WHERE dueDate <= ?</code>
@@ -86,8 +85,8 @@ abstract public class CustomFilterCriterion implements Parcelable {
         identifier = source.readString();
         text = source.readString();
         sql = source.readString();
-        valuesForNewTasks = (ContentValues)source.readParcelable(ContentValues.class.getClassLoader());
-        icon = (Bitmap)source.readParcelable(Bitmap.class.getClassLoader());
+        valuesForNewTasks = (ContentValues) source.readParcelable(ContentValues.class.getClassLoader());
+        icon = (Bitmap) source.readParcelable(Bitmap.class.getClassLoader());
         name = source.readString();
     }
 }
diff --git a/api/src/com/todoroo/astrid/api/Filter.java b/api/src/com/todoroo/astrid/api/Filter.java
index 4c1f99a28..5a7637b3e 100644
--- a/api/src/com/todoroo/astrid/api/Filter.java
+++ b/api/src/com/todoroo/astrid/api/Filter.java
@@ -15,20 +15,21 @@ import com.todoroo.andlib.sql.QueryTemplate;
 /**
  * A <code>FilterListFilter</code> allows users to display tasks that have
  * something in common.
- * <p>
+ * <p/>
  * A plug-in can expose new <code>FilterListFilter</code>s to the system by
  * responding to the <code>com.todoroo.astrid.GET_FILTERS</code> broadcast
  * intent.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class Filter extends FilterListItem {
 
     // --- constants
 
-    /** Constant for valuesForNewTasks to indicate the value should be replaced
-     * with the current time as long */
+    /**
+     * Constant for valuesForNewTasks to indicate the value should be replaced
+     * with the current time as long
+     */
     public static final long VALUE_NOW = Long.MIN_VALUE + 1;
 
     // --- instance variables
@@ -36,7 +37,7 @@ public class Filter extends FilterListItem {
     /**
      * Expanded title of this filter. This is displayed at the top
      * of the screen when user is viewing this filter.
-     * <p>
+     * <p/>
      * e.g "Tasks With Notes"
      */
     public String title;
@@ -46,14 +47,14 @@ public class Filter extends FilterListItem {
      * statement after "<code>SELECT fields FROM table %s</code>". It is
      * recommended that you use a {@link QueryTemplate} to construct your
      * query.
-     * <p>
+     * <p/>
      * Examples:
      * <ul>
      * <li><code>"WHERE completionDate = 0"</code>
      * <li><code>"INNER JOIN " +
-     *      Constants.TABLE_METADATA + " ON metadata.task = tasks.id WHERE
-     *      metadata.namespace = " + NAMESPACE + " AND metadata.key = 'a' AND
-     *      metadata.value = 'b' GROUP BY tasks.id ORDER BY tasks.title"</code>
+     * Constants.TABLE_METADATA + " ON metadata.task = tasks.id WHERE
+     * metadata.namespace = " + NAMESPACE + " AND metadata.key = 'a' AND
+     * metadata.value = 'b' GROUP BY tasks.id ORDER BY tasks.title"</code>
      * </ul>
      */
     protected String sqlQuery;
@@ -74,36 +75,30 @@ public class Filter extends FilterListItem {
 
     /**
      * Utility constructor for creating a Filter object
-     * @param listingTitle
-     *            Title of this item as displayed on the lists page, e.g. Inbox
-     * @param title
-     *            Expanded title of this filter when user is viewing this
-     *            filter, e.g. Inbox (20 tasks)
-     * @param sqlQuery
-     *            SQL query for this list (see {@link #sqlQuery} for examples).
-     * @param valuesForNewTasks
-     *            see {@link #sqlForNewTasks}
+     *
+     * @param listingTitle      Title of this item as displayed on the lists page, e.g. Inbox
+     * @param title             Expanded title of this filter when user is viewing this
+     *                          filter, e.g. Inbox (20 tasks)
+     * @param sqlQuery          SQL query for this list (see {@link #sqlQuery} for examples).
+     * @param valuesForNewTasks see {@link #sqlForNewTasks}
      */
     public Filter(String listingTitle, String title,
-            QueryTemplate sqlQuery, ContentValues valuesForNewTasks) {
+                  QueryTemplate sqlQuery, ContentValues valuesForNewTasks) {
         this(listingTitle, title, sqlQuery == null ? null : sqlQuery.toString(),
                 valuesForNewTasks);
     }
 
     /**
      * Utility constructor for creating a Filter object
-     * @param listingTitle
-     *            Title of this item as displayed on the lists page, e.g. Inbox
-     * @param title
-     *            Expanded title of this filter when user is viewing this
-     *            filter, e.g. Inbox (20 tasks)
-     * @param sqlQuery
-     *            SQL query for this list (see {@link #sqlQuery} for examples).
-     * @param valuesForNewTasks
-     *            see {@link #sqlForNewTasks}
+     *
+     * @param listingTitle      Title of this item as displayed on the lists page, e.g. Inbox
+     * @param title             Expanded title of this filter when user is viewing this
+     *                          filter, e.g. Inbox (20 tasks)
+     * @param sqlQuery          SQL query for this list (see {@link #sqlQuery} for examples).
+     * @param valuesForNewTasks see {@link #sqlForNewTasks}
      */
     public Filter(String listingTitle, String title,
-            String sqlQuery, ContentValues valuesForNewTasks) {
+                  String sqlQuery, ContentValues valuesForNewTasks) {
         this.listingTitle = listingTitle;
         this.title = title;
         this.sqlQuery = sqlQuery;
@@ -128,8 +123,7 @@ public class Filter extends FilterListItem {
     /**
      * Utility constructor
      *
-     * @param plugin
-     *            {@link Addon} identifier that encompasses object
+     * @param plugin {@link Addon} identifier that encompasses object
      */
     protected Filter() {
         // do nothing
diff --git a/api/src/com/todoroo/astrid/api/FilterCategory.java b/api/src/com/todoroo/astrid/api/FilterCategory.java
index cdca14ff3..3de203890 100644
--- a/api/src/com/todoroo/astrid/api/FilterCategory.java
+++ b/api/src/com/todoroo/astrid/api/FilterCategory.java
@@ -13,7 +13,6 @@ import android.os.Parcelable;
  * a user to show/hide all of its children.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class FilterCategory extends FilterListItem {
 
@@ -24,10 +23,9 @@ public class FilterCategory extends FilterListItem {
 
     /**
      * Constructor for creating a new FilterCategory
-     * @param listingTitle
-     *            Title of this item as displayed on the lists page, e.g. Inbox
-     * @param children
-     *            filters belonging to this category
+     *
+     * @param listingTitle Title of this item as displayed on the lists page, e.g. Inbox
+     * @param children     filters belonging to this category
      */
     public FilterCategory(String listingTitle, Filter[] children) {
         this.listingTitle = listingTitle;
@@ -37,8 +35,7 @@ public class FilterCategory extends FilterListItem {
     /**
      * Constructor for creating a new FilterCategory
      *
-     * @param plugin
-     *            {@link Addon} identifier that encompasses object
+     * @param plugin {@link Addon} identifier that encompasses object
      */
     protected FilterCategory() {
         //
@@ -77,8 +74,8 @@ public class FilterCategory extends FilterListItem {
             Parcelable[] parcelableChildren = source.readParcelableArray(
                     FilterCategory.class.getClassLoader());
             item.children = new Filter[parcelableChildren.length];
-            for(int i = 0; i < item.children.length; i++) {
-                if(parcelableChildren[i] instanceof FilterListItem)
+            for (int i = 0; i < item.children.length; i++) {
+                if (parcelableChildren[i] instanceof FilterListItem)
                     item.children[i] = (Filter) parcelableChildren[i];
                 else
                     item.children[i] = null;
diff --git a/api/src/com/todoroo/astrid/api/FilterCategoryWithNewButton.java b/api/src/com/todoroo/astrid/api/FilterCategoryWithNewButton.java
index 9a7863aa5..31a4acf2b 100644
--- a/api/src/com/todoroo/astrid/api/FilterCategoryWithNewButton.java
+++ b/api/src/com/todoroo/astrid/api/FilterCategoryWithNewButton.java
@@ -13,7 +13,6 @@ import android.os.Parcelable;
  * A <code>FilterCategoryWithNewButton</code> has a button for new filter creation
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class FilterCategoryWithNewButton extends FilterCategory {
 
@@ -29,10 +28,9 @@ public class FilterCategoryWithNewButton extends FilterCategory {
 
     /**
      * Constructor for creating a new FilterCategory
-     * @param listingTitle
-     *            Title of this item as displayed on the lists page, e.g. Inbox
-     * @param children
-     *            filters belonging to this category
+     *
+     * @param listingTitle Title of this item as displayed on the lists page, e.g. Inbox
+     * @param children     filters belonging to this category
      */
     public FilterCategoryWithNewButton(String listingTitle, Filter[] children) {
         this.listingTitle = listingTitle;
@@ -42,8 +40,7 @@ public class FilterCategoryWithNewButton extends FilterCategory {
     /**
      * Constructor for creating a new FilterCategory
      *
-     * @param plugin
-     *            {@link Addon} identifier that encompasses object
+     * @param plugin {@link Addon} identifier that encompasses object
      */
     protected FilterCategoryWithNewButton() {
         //
@@ -85,8 +82,8 @@ public class FilterCategoryWithNewButton extends FilterCategory {
             Parcelable[] parcelableChildren = source.readParcelableArray(
                     FilterCategoryWithNewButton.class.getClassLoader());
             item.children = new Filter[parcelableChildren.length];
-            for(int i = 0; i < item.children.length; i++) {
-                if(parcelableChildren[i] instanceof FilterListItem)
+            for (int i = 0; i < item.children.length; i++) {
+                if (parcelableChildren[i] instanceof FilterListItem)
                     item.children[i] = (Filter) parcelableChildren[i];
                 else
                     item.children[i] = null;
diff --git a/api/src/com/todoroo/astrid/api/FilterListHeader.java b/api/src/com/todoroo/astrid/api/FilterListHeader.java
index 06e0b064c..f6865216a 100644
--- a/api/src/com/todoroo/astrid/api/FilterListHeader.java
+++ b/api/src/com/todoroo/astrid/api/FilterListHeader.java
@@ -12,12 +12,12 @@ import android.os.Parcelable;
  * Section Header for Filter List
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class FilterListHeader extends FilterListItem {
 
     /**
      * Constructor for creating a new FilterListHeader
+     *
      * @param listingTitle
      * @param listingIconResource
      * @param priority
@@ -29,8 +29,7 @@ public class FilterListHeader extends FilterListItem {
     /**
      * Constructor for creating a new FilterListHeader
      *
-     * @param plugin
-     *            {@link Addon} identifier that encompasses object
+     * @param plugin {@link Addon} identifier that encompasses object
      */
     protected FilterListHeader() {
         //
diff --git a/api/src/com/todoroo/astrid/api/FilterListItem.java b/api/src/com/todoroo/astrid/api/FilterListItem.java
index eb56e0b93..5ca9d04c2 100644
--- a/api/src/com/todoroo/astrid/api/FilterListItem.java
+++ b/api/src/com/todoroo/astrid/api/FilterListItem.java
@@ -14,7 +14,6 @@ import android.os.Parcelable;
  * Represents an item displayed by Astrid's FilterListActivity
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 abstract public class FilterListItem implements Parcelable {
 
diff --git a/api/src/com/todoroo/astrid/api/FilterWithCustomIntent.java b/api/src/com/todoroo/astrid/api/FilterWithCustomIntent.java
index 368d08634..b3dbd6b48 100644
--- a/api/src/com/todoroo/astrid/api/FilterWithCustomIntent.java
+++ b/api/src/com/todoroo/astrid/api/FilterWithCustomIntent.java
@@ -33,12 +33,12 @@ public class FilterWithCustomIntent extends Filter {
     }
 
     public FilterWithCustomIntent(String listingTitle, String title,
-            QueryTemplate sqlQuery, ContentValues valuesForNewTasks) {
+                                  QueryTemplate sqlQuery, ContentValues valuesForNewTasks) {
         super(listingTitle, title, sqlQuery, valuesForNewTasks);
     }
 
     public FilterWithCustomIntent(String listingTitle, String title,
-            String sqlQuery, ContentValues valuesForNewTasks) {
+                                  String sqlQuery, ContentValues valuesForNewTasks) {
         super(listingTitle, title, sqlQuery, valuesForNewTasks);
     }
 
@@ -46,7 +46,7 @@ public class FilterWithCustomIntent extends Filter {
         Intent intent = new Intent();
         intent.putExtra("filter", this); //$NON-NLS-1$
         intent.setComponent(new ComponentName(AstridApiConstants.ASTRID_PACKAGE, "com.todoroo.astrid.activity.TaskListActivity")); //$NON-NLS-1$
-        if(customExtras != null)
+        if (customExtras != null)
             intent.putExtras(customExtras);
 
         return intent;
diff --git a/api/src/com/todoroo/astrid/api/FilterWithUpdate.java b/api/src/com/todoroo/astrid/api/FilterWithUpdate.java
index f44461c64..399ef3902 100644
--- a/api/src/com/todoroo/astrid/api/FilterWithUpdate.java
+++ b/api/src/com/todoroo/astrid/api/FilterWithUpdate.java
@@ -29,12 +29,12 @@ public class FilterWithUpdate extends FilterWithCustomIntent {
     }
 
     public FilterWithUpdate(String listingTitle, String title,
-            QueryTemplate sqlQuery, ContentValues valuesForNewTasks) {
+                            QueryTemplate sqlQuery, ContentValues valuesForNewTasks) {
         super(listingTitle, title, sqlQuery, valuesForNewTasks);
     }
 
     public FilterWithUpdate(String listingTitle, String title,
-            String sqlQuery, ContentValues valuesForNewTasks) {
+                            String sqlQuery, ContentValues valuesForNewTasks) {
         super(listingTitle, title, sqlQuery, valuesForNewTasks);
     }
 
diff --git a/api/src/com/todoroo/astrid/api/IntentFilter.java b/api/src/com/todoroo/astrid/api/IntentFilter.java
index cc7d059a9..8f80a3bb2 100644
--- a/api/src/com/todoroo/astrid/api/IntentFilter.java
+++ b/api/src/com/todoroo/astrid/api/IntentFilter.java
@@ -14,7 +14,6 @@ import android.os.Parcelable;
  * Special filter that launches a PendingIntent when accessed.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public final class IntentFilter extends FilterListItem implements Parcelable {
 
@@ -26,10 +25,8 @@ public final class IntentFilter extends FilterListItem implements Parcelable {
     /**
      * Constructor for creating a new IntentFilter
      *
-     * @param listingTitle
-     *            Title of this item as displayed on the lists page, e.g. Inbox
-     * @param intent
-     *            intent to load
+     * @param listingTitle Title of this item as displayed on the lists page, e.g. Inbox
+     * @param intent       intent to load
      */
     public IntentFilter(String listingTitle, PendingIntent intent) {
         this.listingTitle = listingTitle;
diff --git a/api/src/com/todoroo/astrid/api/MultipleSelectCriterion.java b/api/src/com/todoroo/astrid/api/MultipleSelectCriterion.java
index 2748a9e7f..d9c2e8306 100644
--- a/api/src/com/todoroo/astrid/api/MultipleSelectCriterion.java
+++ b/api/src/com/todoroo/astrid/api/MultipleSelectCriterion.java
@@ -15,7 +15,6 @@ import android.os.Parcelable;
  * together criteria
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class MultipleSelectCriterion extends CustomFilterCriterion implements Parcelable {
 
@@ -42,8 +41,8 @@ public class MultipleSelectCriterion extends CustomFilterCriterion implements Pa
      * @param name
      */
     public MultipleSelectCriterion(String identifier, String title, String sql,
-            ContentValues valuesForNewTasks, String[] entryTitles,
-            String[] entryValues, Bitmap icon, String name) {
+                                   ContentValues valuesForNewTasks, String[] entryTitles,
+                                   String[] entryValues, Bitmap icon, String name) {
         this.identifier = identifier;
         this.text = title;
         this.sql = sql;
diff --git a/api/src/com/todoroo/astrid/api/PermaSql.java b/api/src/com/todoroo/astrid/api/PermaSql.java
index 7763c1b9c..8bf52c6aa 100644
--- a/api/src/com/todoroo/astrid/api/PermaSql.java
+++ b/api/src/com/todoroo/astrid/api/PermaSql.java
@@ -5,71 +5,98 @@
  */
 package com.todoroo.astrid.api;
 
-import java.util.Date;
-
 import com.todoroo.andlib.utility.DateUtilities;
 
+import java.util.Date;
+
 /**
  * PermaSql allows for creating SQL statements that can be saved and used
  * later without dates getting stale. It also allows these values to be
  * used in
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public final class PermaSql {
 
     // --- placeholder strings
 
-    /** value to be replaced with the current time as long */
+    /**
+     * value to be replaced with the current time as long
+     */
     public static final String VALUE_NOW = "NOW()"; //$NON-NLS-1$
 
-    /** value to be replaced by end of day as long */
+    /**
+     * value to be replaced by end of day as long
+     */
     public static final String VALUE_EOD = "EOD()"; //$NON-NLS-1$
 
-    /** value to be replaced by noon today as long */
+    /**
+     * value to be replaced by noon today as long
+     */
     public static final String VALUE_NOON = "NOON()"; //$NON-NLS-1$
 
-    /** value to be replaced by end of day yesterday as long */
+    /**
+     * value to be replaced by end of day yesterday as long
+     */
     public static final String VALUE_EOD_YESTERDAY = "EODY()"; //$NON-NLS-1$
 
-    /** value to be replaced by noon yesterday as long */
+    /**
+     * value to be replaced by noon yesterday as long
+     */
     public static final String VALUE_NOON_YESTERDAY = "NOONY()"; //$NON-NLS-1$
 
-    /** value to be replaced by end of day tomorrow as long */
+    /**
+     * value to be replaced by end of day tomorrow as long
+     */
     public static final String VALUE_EOD_TOMORROW = "EODT()"; //$NON-NLS-1$
 
-    /** value to be replaced by noon tomorrow as long */
+    /**
+     * value to be replaced by noon tomorrow as long
+     */
     public static final String VALUE_NOON_TOMORROW = "NOONT()"; //$NON-NLS-1$
 
-    /** value to be replaced by end of day day after tomorrow as long */
+    /**
+     * value to be replaced by end of day day after tomorrow as long
+     */
     public static final String VALUE_EOD_DAY_AFTER = "EODTT()"; //$NON-NLS-1$
 
-    /** value to be replaced by noon day after tomorrow as long */
+    /**
+     * value to be replaced by noon day after tomorrow as long
+     */
     public static final String VALUE_NOON_DAY_AFTER = "NOONTT()"; //$NON-NLS-1$
 
-    /** value to be replaced by end of day next week as long */
+    /**
+     * value to be replaced by end of day next week as long
+     */
     public static final String VALUE_EOD_NEXT_WEEK = "EODW()"; //$NON-NLS-1$
 
-    /** value to be replaced by noon next week as long */
+    /**
+     * value to be replaced by noon next week as long
+     */
     public static final String VALUE_NOON_NEXT_WEEK = "NOONW()"; //$NON-NLS-1$
 
-    /** value to be replaced by approximate end of day next month as long */
+    /**
+     * value to be replaced by approximate end of day next month as long
+     */
     public static final String VALUE_EOD_NEXT_MONTH = "EODM()"; //$NON-NLS-1$
 
-    /** value to be replaced by approximate noon next month as long */
+    /**
+     * value to be replaced by approximate noon next month as long
+     */
     public static final String VALUE_NOON_NEXT_MONTH = "NOONM()"; //$NON-NLS-1$
 
-    /** Replace placeholder strings with actual */
+    /**
+     * Replace placeholder strings with actual
+     */
     public static String replacePlaceholders(String value) {
-        if(value.contains(VALUE_NOW))
+        if (value.contains(VALUE_NOW))
             value = value.replace(VALUE_NOW, Long.toString(DateUtilities.now()));
-        if(value.contains(VALUE_EOD) || value.contains(VALUE_EOD_DAY_AFTER) ||
+        if (value.contains(VALUE_EOD) || value.contains(VALUE_EOD_DAY_AFTER) ||
                 value.contains(VALUE_EOD_NEXT_WEEK) || value.contains(VALUE_EOD_TOMORROW) ||
                 value.contains(VALUE_EOD_YESTERDAY) || value.contains(VALUE_EOD_NEXT_MONTH)) {
             value = replaceEodValues(value);
         }
-        if(value.contains(VALUE_NOON) || value.contains(VALUE_NOON_DAY_AFTER) ||
+        if (value.contains(VALUE_NOON) || value.contains(VALUE_NOON_DAY_AFTER) ||
                 value.contains(VALUE_NOON_NEXT_WEEK) || value.contains(VALUE_NOON_TOMORROW) ||
                 value.contains(VALUE_NOON_YESTERDAY) || value.contains(VALUE_NOON_NEXT_MONTH)) {
             value = replaceNoonValues(value);
diff --git a/api/src/com/todoroo/astrid/api/SyncAction.java b/api/src/com/todoroo/astrid/api/SyncAction.java
index aac6855ab..13ac0d382 100644
--- a/api/src/com/todoroo/astrid/api/SyncAction.java
+++ b/api/src/com/todoroo/astrid/api/SyncAction.java
@@ -13,7 +13,6 @@ import android.os.Parcelable;
  * Represents an intent that can be called to perform synchronization
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class SyncAction implements Parcelable {
 
@@ -30,10 +29,8 @@ public class SyncAction implements Parcelable {
     /**
      * Create an EditOperation object
      *
-     * @param label
-     *            label to display
-     * @param intent
-     *            intent to invoke
+     * @param label  label to display
+     * @param intent intent to invoke
      */
     public SyncAction(String label, PendingIntent intent) {
         super();
@@ -61,7 +58,7 @@ public class SyncAction implements Parcelable {
      */
     @Override
     public boolean equals(Object o) {
-        if(!(o instanceof SyncAction))
+        if (!(o instanceof SyncAction))
             return false;
         SyncAction other = (SyncAction) o;
         return label.equals(other.label) && intent.getTargetPackage().equals(other.intent.getTargetPackage());
@@ -92,7 +89,7 @@ public class SyncAction implements Parcelable {
          * {@inheritDoc}
          */
         public SyncAction createFromParcel(Parcel source) {
-            return new SyncAction(source.readString(), (PendingIntent)source.readParcelable(
+            return new SyncAction(source.readString(), (PendingIntent) source.readParcelable(
                     PendingIntent.class.getClassLoader()));
         }
 
@@ -101,7 +98,9 @@ public class SyncAction implements Parcelable {
          */
         public SyncAction[] newArray(int size) {
             return new SyncAction[size];
-        };
+        }
+
+        ;
     };
 
 }
diff --git a/api/src/com/todoroo/astrid/api/TaskAction.java b/api/src/com/todoroo/astrid/api/TaskAction.java
index a28774b16..db3c0d27c 100644
--- a/api/src/com/todoroo/astrid/api/TaskAction.java
+++ b/api/src/com/todoroo/astrid/api/TaskAction.java
@@ -12,7 +12,6 @@ import android.graphics.drawable.BitmapDrawable;
  * Represents an intent that can be called on a task
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TaskAction {
 
@@ -39,10 +38,8 @@ public class TaskAction {
     /**
      * Create an EditOperation object
      *
-     * @param text
-     *            label to display
-     * @param intent
-     *            intent to invoke. {@link #EXTRAS_TASK_ID} will be passed
+     * @param text   label to display
+     * @param intent intent to invoke. {@link #EXTRAS_TASK_ID} will be passed
      */
     public TaskAction(String text, PendingIntent intent, BitmapDrawable icon) {
         super();
diff --git a/api/src/com/todoroo/astrid/api/TaskDecoration.java b/api/src/com/todoroo/astrid/api/TaskDecoration.java
index 2d9d8a373..ddcc81b92 100644
--- a/api/src/com/todoroo/astrid/api/TaskDecoration.java
+++ b/api/src/com/todoroo/astrid/api/TaskDecoration.java
@@ -14,7 +14,6 @@ import android.widget.RemoteViews.RemoteView;
  * Represents a line of text displayed in the Task List
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public final class TaskDecoration implements Parcelable {
 
@@ -45,10 +44,9 @@ public final class TaskDecoration implements Parcelable {
 
     /**
      * Creates a TaskDetail object
-     * @param text
-     *            text to display
-     * @param color
-     *            color to use for text. Use <code>0</code> for default color
+     *
+     * @param text  text to display
+     * @param color color to use for text. Use <code>0</code> for default color
      */
     public TaskDecoration(RemoteViews decoration, int position, int color) {
         this.decoration = decoration;
@@ -82,7 +80,7 @@ public final class TaskDecoration implements Parcelable {
          * {@inheritDoc}
          */
         public TaskDecoration createFromParcel(Parcel source) {
-            return new TaskDecoration((RemoteViews)source.readParcelable(
+            return new TaskDecoration((RemoteViews) source.readParcelable(
                     RemoteViews.class.getClassLoader()),
                     source.readInt(), source.readInt());
         }
@@ -92,7 +90,9 @@ public final class TaskDecoration implements Parcelable {
          */
         public TaskDecoration[] newArray(int size) {
             return new TaskDecoration[size];
-        };
+        }
+
+        ;
     };
 
 }
diff --git a/api/src/com/todoroo/astrid/api/TextInputCriterion.java b/api/src/com/todoroo/astrid/api/TextInputCriterion.java
index 0a7ca5e45..6bb433f65 100644
--- a/api/src/com/todoroo/astrid/api/TextInputCriterion.java
+++ b/api/src/com/todoroo/astrid/api/TextInputCriterion.java
@@ -15,7 +15,6 @@ import android.os.Parcelable;
  * together criteria
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TextInputCriterion extends CustomFilterCriterion implements Parcelable {
 
@@ -43,8 +42,8 @@ public class TextInputCriterion extends CustomFilterCriterion implements Parcela
      * @param name
      */
     public TextInputCriterion(String identifier, String title, String sql,
-            ContentValues valuesForNewTasks, String prompt, String hint,
-            Bitmap icon, String name) {
+                              ContentValues valuesForNewTasks, String prompt, String hint,
+                              Bitmap icon, String name) {
         this.identifier = identifier;
         this.text = title;
         this.sql = sql;
diff --git a/api/src/com/todoroo/astrid/core/SearchFilter.java b/api/src/com/todoroo/astrid/core/SearchFilter.java
index 94b0aa044..d04c28473 100644
--- a/api/src/com/todoroo/astrid/core/SearchFilter.java
+++ b/api/src/com/todoroo/astrid/core/SearchFilter.java
@@ -14,15 +14,13 @@ import com.todoroo.astrid.api.FilterListItem;
  * Special filter that triggers the search functionality when accessed.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class SearchFilter extends FilterListItem {
 
     /**
      * Constructor for creating a new SearchFilter
      *
-     * @param listingTitle
-     *            Title of this item as displayed on the lists page, e.g. Inbox
+     * @param listingTitle Title of this item as displayed on the lists page, e.g. Inbox
      */
     public SearchFilter(String listingTitle) {
         this.listingTitle = listingTitle;
diff --git a/api/src/com/todoroo/astrid/core/SortHelper.java b/api/src/com/todoroo/astrid/core/SortHelper.java
index bba27bdf0..6bdf5b9f8 100644
--- a/api/src/com/todoroo/astrid/core/SortHelper.java
+++ b/api/src/com/todoroo/astrid/core/SortHelper.java
@@ -16,7 +16,6 @@ import com.todoroo.astrid.data.TaskApiDao.TaskCriteria;
  * Helpers for sorting a list of tasks
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class SortHelper {
 
@@ -32,14 +31,19 @@ public class SortHelper {
     public static final int SORT_IMPORTANCE = 3;
     public static final int SORT_MODIFIED = 4;
 
-    /** preference key for sort flags. stored in public prefs */
+    /**
+     * preference key for sort flags. stored in public prefs
+     */
     public static final String PREF_SORT_FLAGS = "sort_flags"; //$NON-NLS-1$
 
-    /** preference key for sort sort. stored in public prefs */
+    /**
+     * preference key for sort sort. stored in public prefs
+     */
     public static final String PREF_SORT_SORT = "sort_sort"; //$NON-NLS-1$
 
     /**
      * Takes a SQL query, and if there isn't already an order, creates an order.
+     *
      * @param originalSql
      * @param flags
      * @param sort
@@ -48,24 +52,24 @@ public class SortHelper {
     @SuppressWarnings("nls")
     public static String adjustQueryForFlagsAndSort(String originalSql, int flags, int sort) {
         // sort
-        if(originalSql == null)
+        if (originalSql == null)
             originalSql = "";
-        if(!originalSql.toUpperCase().contains("ORDER BY")) {
+        if (!originalSql.toUpperCase().contains("ORDER BY")) {
             Order order = orderForSortType(sort);
 
-            if((flags & FLAG_REVERSE_SORT) > 0)
+            if ((flags & FLAG_REVERSE_SORT) > 0)
                 order = order.reverse();
             originalSql += " ORDER BY " + order;
         }
 
         // flags
-        if((flags & FLAG_SHOW_COMPLETED) > 0)
+        if ((flags & FLAG_SHOW_COMPLETED) > 0)
             originalSql = originalSql.replace(Task.COMPLETION_DATE.eq(0).toString(),
                     Criterion.all.toString());
-        if((flags & FLAG_SHOW_HIDDEN) > 0)
+        if ((flags & FLAG_SHOW_HIDDEN) > 0)
             originalSql = originalSql.replace(TaskCriteria.isVisible().toString(),
                     Criterion.all.toString());
-        if((flags & FLAG_SHOW_DELETED) > 0)
+        if ((flags & FLAG_SHOW_DELETED) > 0)
             originalSql = originalSql.replace(Task.DELETION_DATE.eq(0).toString(),
                     Criterion.all.toString());
 
@@ -78,7 +82,7 @@ public class SortHelper {
 
     public static int setManualSort(int flags, boolean status) {
         flags = (flags & ~FLAG_DRAG_DROP);
-        if(status)
+        if (status)
             flags |= FLAG_DRAG_DROP;
         return flags;
     }
@@ -86,26 +90,26 @@ public class SortHelper {
     @SuppressWarnings("nls")
     public static Order orderForSortType(int sortType) {
         Order order;
-        switch(sortType) {
-        case SORT_ALPHA:
-            order = Order.asc(Functions.upper(Task.TITLE));
-            break;
-        case SORT_DUE:
-            order = Order.asc(Functions.caseStatement(Task.DUE_DATE.eq(0),
-                    Functions.now()  + "*2", adjustedDueDateFunction()) + "+" + Task.IMPORTANCE +
-                    "+3*" + Task.COMPLETION_DATE);
-            break;
-        case SORT_IMPORTANCE:
-            order = Order.asc(Task.IMPORTANCE + "*" + (2*DateUtilities.now()) + //$NON-NLS-1$
-                    "+" + Functions.caseStatement(Task.DUE_DATE.eq(0), //$NON-NLS-1$
-                            2 * DateUtilities.now(),
-                            Task.DUE_DATE) + "+8*" + Task.COMPLETION_DATE);
-            break;
-        case SORT_MODIFIED:
-            order = Order.desc(Task.MODIFICATION_DATE);
-            break;
-        default:
-            order = defaultTaskOrder();
+        switch (sortType) {
+            case SORT_ALPHA:
+                order = Order.asc(Functions.upper(Task.TITLE));
+                break;
+            case SORT_DUE:
+                order = Order.asc(Functions.caseStatement(Task.DUE_DATE.eq(0),
+                        Functions.now() + "*2", adjustedDueDateFunction()) + "+" + Task.IMPORTANCE +
+                        "+3*" + Task.COMPLETION_DATE);
+                break;
+            case SORT_IMPORTANCE:
+                order = Order.asc(Task.IMPORTANCE + "*" + (2 * DateUtilities.now()) + //$NON-NLS-1$
+                        "+" + Functions.caseStatement(Task.DUE_DATE.eq(0), //$NON-NLS-1$
+                        2 * DateUtilities.now(),
+                        Task.DUE_DATE) + "+8*" + Task.COMPLETION_DATE);
+                break;
+            case SORT_MODIFIED:
+                order = Order.desc(Task.MODIFICATION_DATE);
+                break;
+            default:
+                order = defaultTaskOrder();
         }
         if (sortType != SORT_ALPHA)
             order.addSecondaryExpression(Order.asc(Task.TITLE));
@@ -115,6 +119,7 @@ public class SortHelper {
 
     /**
      * Returns SQL task ordering that is astrid's default algorithm
+     *
      * @return
      */
     @SuppressWarnings("nls")
diff --git a/api/src/com/todoroo/astrid/data/History.java b/api/src/com/todoroo/astrid/data/History.java
index fb34d63c2..682113b47 100644
--- a/api/src/com/todoroo/astrid/data/History.java
+++ b/api/src/com/todoroo/astrid/data/History.java
@@ -14,61 +14,89 @@ import com.todoroo.astrid.api.AstridApiConstants;
 @SuppressWarnings("nls")
 public class History extends AbstractModel {
 
-    /** table for this model */
+    /**
+     * table for this model
+     */
     public static final Table TABLE = new Table("history", History.class);
 
-    /** content uri for this model */
+    /**
+     * content uri for this model
+     */
     public static final Uri CONTENT_URI = Uri.parse("content://" + AstridApiConstants.API_PACKAGE + "/" +
             TABLE.name);
 
     // --- properties
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
-    /** Remote ID */
+    /**
+     * Remote ID
+     */
     public static final StringProperty UUID = new StringProperty(
             TABLE, RemoteModel.UUID_PROPERTY_NAME);
 
-    /** Created at */
+    /**
+     * Created at
+     */
     public static final LongProperty CREATED_AT = new LongProperty(
             TABLE, "created_at", Property.PROP_FLAG_DATE);
 
-    /** User id */
+    /**
+     * User id
+     */
     public static final StringProperty USER_UUID = new StringProperty(
             TABLE, "user_id", Property.PROP_FLAG_USER_ID);
 
-    /** Column name */
+    /**
+     * Column name
+     */
     public static final StringProperty COLUMN = new StringProperty(
             TABLE, "columnString");
 
-    /** Old value */
+    /**
+     * Old value
+     */
     public static final StringProperty OLD_VALUE = new StringProperty(
             TABLE, "old_value", Property.PROP_FLAG_NULLABLE);
 
-    /** New value */
+    /**
+     * New value
+     */
     public static final StringProperty NEW_VALUE = new StringProperty(
             TABLE, "new_value", Property.PROP_FLAG_NULLABLE);
 
-    /** Table identifier */
+    /**
+     * Table identifier
+     */
     public static final StringProperty TABLE_ID = new StringProperty(
             TABLE, "table_id");
 
-    /** Target identifier */
+    /**
+     * Target identifier
+     */
     public static final StringProperty TARGET_ID = new StringProperty(
             TABLE, "target_id");
 
-    /** Task name and id (JSONArray) */
+    /**
+     * Task name and id (JSONArray)
+     */
     public static final StringProperty TASK = new StringProperty(
             TABLE, "task");
 
-    /** Associated tag id */
+    /**
+     * Associated tag id
+     */
     public static final StringProperty TAG_ID = new StringProperty(
             TABLE, "tag_id");
 
 
-    /** Default values container */
+    /**
+     * Default values container
+     */
     private static final ContentValues defaultValues = new ContentValues();
 
     @Override
@@ -104,7 +132,9 @@ public class History extends AbstractModel {
         super.readPropertiesFromCursor(cursor);
     }
 
-    /** List of all properties for this model */
+    /**
+     * List of all properties for this model
+     */
     public static final Property<?>[] PROPERTIES = generateProperties(History.class);
 
     private static final Creator<History> CREATOR = new ModelCreator<History>(History.class);
diff --git a/api/src/com/todoroo/astrid/data/Metadata.java b/api/src/com/todoroo/astrid/data/Metadata.java
index 0ef33eec8..b88371b97 100644
--- a/api/src/com/todoroo/astrid/data/Metadata.java
+++ b/api/src/com/todoroo/astrid/data/Metadata.java
@@ -21,54 +21,75 @@ import com.todoroo.astrid.api.AstridApiConstants;
  * Data Model which represents a piece of metadata associated with a task
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 public class Metadata extends AbstractModel {
 
     // --- table
 
-    /** table for this model */
+    /**
+     * table for this model
+     */
     public static final Table TABLE = new Table("metadata", Metadata.class);
 
-    /** changes to metadata (specifically tags) are recorded in the task outstanding table */
+    /**
+     * changes to metadata (specifically tags) are recorded in the task outstanding table
+     */
     public static final Class<? extends OutstandingEntry<Task>> OUTSTANDING_MODEL = TaskOutstanding.class;
 
-    /** content uri for this model */
+    /**
+     * content uri for this model
+     */
     public static final Uri CONTENT_URI = Uri.parse("content://" + AstridApiConstants.API_PACKAGE + "/" +
             TABLE.name);
 
     // --- properties
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
-    /** Associated Task */
+    /**
+     * Associated Task
+     */
     public static final LongProperty TASK = new LongProperty(
             TABLE, "task");
 
-    /** Metadata Key */
+    /**
+     * Metadata Key
+     */
     public static final StringProperty KEY = new StringProperty(
             TABLE, "key");
 
-    /** Metadata Text Value Column 1 */
+    /**
+     * Metadata Text Value Column 1
+     */
     public static final StringProperty VALUE1 = new StringProperty(
             TABLE, "value");
 
-    /** Metadata Text Value Column 2 */
+    /**
+     * Metadata Text Value Column 2
+     */
     public static final StringProperty VALUE2 = new StringProperty(
             TABLE, "value2");
 
-    /** Metadata Text Value Column 3 */
+    /**
+     * Metadata Text Value Column 3
+     */
     public static final StringProperty VALUE3 = new StringProperty(
             TABLE, "value3");
 
-    /** Metadata Text Value Column 4 */
+    /**
+     * Metadata Text Value Column 4
+     */
     public static final StringProperty VALUE4 = new StringProperty(
             TABLE, "value4");
 
-    /** Metadata Text Value Column 5 */
+    /**
+     * Metadata Text Value Column 5
+     */
     public static final StringProperty VALUE5 = new StringProperty(
             TABLE, "value5");
 
@@ -78,20 +99,28 @@ public class Metadata extends AbstractModel {
     public static final StringProperty VALUE7 = new StringProperty(
             TABLE, "value7");
 
-    /** Unixtime Metadata was created */
+    /**
+     * Unixtime Metadata was created
+     */
     public static final LongProperty CREATION_DATE = new LongProperty(
             TABLE, "created");
 
-    /** Unixtime metadata was deleted/tombstoned */
+    /**
+     * Unixtime metadata was deleted/tombstoned
+     */
     public static final LongProperty DELETION_DATE = new LongProperty(
             TABLE, "deleted");
 
-    /** List of all properties for this model */
+    /**
+     * List of all properties for this model
+     */
     public static final Property<?>[] PROPERTIES = generateProperties(Metadata.class);
 
     // --- defaults
 
-    /** Default values container */
+    /**
+     * Default values container
+     */
     private static final ContentValues defaultValues = new ContentValues();
 
     static {
@@ -121,7 +150,9 @@ public class Metadata extends AbstractModel {
     @Override
     public long getId() {
         return getIdHelper(ID);
-    };
+    }
+
+    ;
 
     // --- parcelable helpers
 
diff --git a/api/src/com/todoroo/astrid/data/MetadataApiDao.java b/api/src/com/todoroo/astrid/data/MetadataApiDao.java
index 1a92f0b6d..4fcbd1eea 100644
--- a/api/src/com/todoroo/astrid/data/MetadataApiDao.java
+++ b/api/src/com/todoroo/astrid/data/MetadataApiDao.java
@@ -16,7 +16,6 @@ import com.todoroo.andlib.sql.Criterion;
  * note. It operates in a one-to-many relation with tasks.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class MetadataApiDao extends ContentResolverDao<Metadata> {
 
@@ -29,17 +28,23 @@ public class MetadataApiDao extends ContentResolverDao<Metadata> {
      */
     public static class MetadataCriteria {
 
-        /** Returns all metadata associated with a given task */
+        /**
+         * Returns all metadata associated with a given task
+         */
         public static Criterion byTask(long taskId) {
             return Metadata.TASK.eq(taskId);
         }
 
-        /** Returns all metadata associated with a given key */
+        /**
+         * Returns all metadata associated with a given key
+         */
         public static Criterion withKey(String key) {
             return Metadata.KEY.eq(key);
         }
 
-        /** Returns all metadata associated with a given key */
+        /**
+         * Returns all metadata associated with a given key
+         */
         public static Criterion byTaskAndwithKey(long taskId, String key) {
             return Criterion.and(withKey(key), byTask(taskId));
         }
diff --git a/api/src/com/todoroo/astrid/data/RemoteModel.java b/api/src/com/todoroo/astrid/data/RemoteModel.java
index 4fbc309eb..c22de89cd 100644
--- a/api/src/com/todoroo/astrid/data/RemoteModel.java
+++ b/api/src/com/todoroo/astrid/data/RemoteModel.java
@@ -5,15 +5,6 @@
  */
 package com.todoroo.astrid.data;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Date;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.content.ContentValues;
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -26,39 +17,66 @@ import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.utility.DateUtilities;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Date;
+
 /**
  * A model that is synchronized to a remote server and has a remote id
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 abstract public class RemoteModel extends AbstractModel {
 
-    /** remote id property common to all remote models */
+    /**
+     * remote id property common to all remote models
+     */
     public static final String UUID_PROPERTY_NAME = "remoteId"; //$NON-NLS-1$
 
-    /** remote id property */
+    /**
+     * remote id property
+     */
     public static final StringProperty UUID_PROPERTY = new StringProperty(null, UUID_PROPERTY_NAME);
 
-    /** user id property common to all remote models */
+    /**
+     * user id property common to all remote models
+     */
     protected static final String USER_ID_PROPERTY_NAME = "userId"; //$NON-NLS-1$
 
-    /** user id property */
+    /**
+     * user id property
+     */
     public static final StringProperty USER_ID_PROPERTY = new StringProperty(null, USER_ID_PROPERTY_NAME);
 
-    /** user json property common to all remote models */
+    /**
+     * user json property common to all remote models
+     */
     protected static final String USER_JSON_PROPERTY_NAME = "user"; //$NON-NLS-1$
 
-    /** user json property */
-    @Deprecated public static final StringProperty USER_JSON_PROPERTY = new StringProperty(null, USER_JSON_PROPERTY_NAME);
+    /**
+     * user json property
+     */
+    @Deprecated
+    public static final StringProperty USER_JSON_PROPERTY = new StringProperty(null, USER_JSON_PROPERTY_NAME);
 
-    /** pushed at date property name */
+    /**
+     * pushed at date property name
+     */
     public static final String PUSHED_AT_PROPERTY_NAME = "pushedAt"; //$NON-NLS-1$
 
-    /** pushed at date property name */
+    /**
+     * pushed at date property name
+     */
     public static final LongProperty PUSHED_AT_PROPERTY = new LongProperty(null, PUSHED_AT_PROPERTY_NAME);
 
-    /** constant value for no uuid */
+    /**
+     * constant value for no uuid
+     */
     public static final String NO_UUID = "0"; //$NON-NLS-1$
 
     public static final boolean isValidUuid(String uuid) {
@@ -78,9 +96,9 @@ abstract public class RemoteModel extends AbstractModel {
     abstract public String getUuid();
 
     protected String getUuidHelper(StringProperty uuid) {
-        if(setValues != null && setValues.containsKey(uuid.name))
+        if (setValues != null && setValues.containsKey(uuid.name))
             return setValues.getAsString(uuid.name);
-        else if(values != null && values.containsKey(uuid.name))
+        else if (values != null && values.containsKey(uuid.name))
             return values.getAsString(uuid.name);
         else
             return NO_UUID;
@@ -90,7 +108,7 @@ abstract public class RemoteModel extends AbstractModel {
         if (setValues == null)
             setValues = new ContentValues();
 
-        if(NO_UUID.equals(uuid))
+        if (NO_UUID.equals(uuid))
             clearValue(UUID_PROPERTY);
         else
             setValues.put(UUID_PROPERTY_NAME, uuid);
diff --git a/api/src/com/todoroo/astrid/data/StoreObject.java b/api/src/com/todoroo/astrid/data/StoreObject.java
index 4131e713e..2e3cd6c54 100644
--- a/api/src/com/todoroo/astrid/data/StoreObject.java
+++ b/api/src/com/todoroo/astrid/data/StoreObject.java
@@ -21,60 +21,83 @@ import com.todoroo.astrid.api.AstridApiConstants;
  * Data Model which represents a piece of data unrelated to a task
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 public class StoreObject extends AbstractModel {
 
     // --- table
 
-    /** table for this model */
+    /**
+     * table for this model
+     */
     public static final Table TABLE = new Table("store", StoreObject.class);
 
-    /** content uri for this model */
+    /**
+     * content uri for this model
+     */
     public static final Uri CONTENT_URI = Uri.parse("content://" + AstridApiConstants.API_PACKAGE + "/" +
             TABLE.name);
 
     // --- properties
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
-    /** Store Type Key */
+    /**
+     * Store Type Key
+     */
     public static final StringProperty TYPE = new StringProperty(
             TABLE, "type");
 
-    /** Store Item Key */
-    public static final StringProperty ITEM= new StringProperty(
+    /**
+     * Store Item Key
+     */
+    public static final StringProperty ITEM = new StringProperty(
             TABLE, "item");
 
-    /** Store Value Column 1 */
+    /**
+     * Store Value Column 1
+     */
     public static final StringProperty VALUE1 = new StringProperty(
             TABLE, "value");
 
-    /** Store Value Column 2 */
+    /**
+     * Store Value Column 2
+     */
     public static final StringProperty VALUE2 = new StringProperty(
             TABLE, "value2");
 
-    /** Store Value Column 3 */
+    /**
+     * Store Value Column 3
+     */
     public static final StringProperty VALUE3 = new StringProperty(
             TABLE, "value3");
 
-    /** Store Value Column 4 */
+    /**
+     * Store Value Column 4
+     */
     public static final StringProperty VALUE4 = new StringProperty(
             TABLE, "value4");
 
-    /** Store Value Column 5 */
+    /**
+     * Store Value Column 5
+     */
     public static final StringProperty VALUE5 = new StringProperty(
             TABLE, "value5");
 
-    /** List of all properties for this model */
+    /**
+     * List of all properties for this model
+     */
     public static final Property<?>[] PROPERTIES = generateProperties(StoreObject.class);
 
     // --- defaults
 
-    /** Default values container */
+    /**
+     * Default values container
+     */
     private static final ContentValues defaultValues = new ContentValues();
 
     @Override
@@ -100,7 +123,9 @@ public class StoreObject extends AbstractModel {
     @Override
     public long getId() {
         return getIdHelper(ID);
-    };
+    }
+
+    ;
 
     // --- parcelable helpers
 
diff --git a/api/src/com/todoroo/astrid/data/StoreObjectApiDao.java b/api/src/com/todoroo/astrid/data/StoreObjectApiDao.java
index cc86f11c1..479549387 100644
--- a/api/src/com/todoroo/astrid/data/StoreObjectApiDao.java
+++ b/api/src/com/todoroo/astrid/data/StoreObjectApiDao.java
@@ -15,7 +15,6 @@ import com.todoroo.andlib.sql.Criterion;
  * StoreObject is an arbitrary piece of data stored inside of Astrid.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class StoreObjectApiDao extends ContentResolverDao<StoreObject> {
 
@@ -30,12 +29,16 @@ public class StoreObjectApiDao extends ContentResolverDao<StoreObject> {
      */
     public static class StoreObjectCriteria {
 
-        /** Returns all store objects with given type */
+        /**
+         * Returns all store objects with given type
+         */
         public static Criterion byType(String type) {
             return StoreObject.TYPE.eq(type);
         }
 
-        /** Returns store object with type and key */
+        /**
+         * Returns store object with type and key
+         */
         public static Criterion byTypeAndItem(String type, String item) {
             return Criterion.and(byType(type), StoreObject.ITEM.eq(item));
         }
diff --git a/api/src/com/todoroo/astrid/data/TagData.java b/api/src/com/todoroo/astrid/data/TagData.java
index 838a8d89e..3eea53ac6 100644
--- a/api/src/com/todoroo/astrid/data/TagData.java
+++ b/api/src/com/todoroo/astrid/data/TagData.java
@@ -22,156 +22,229 @@ import com.todoroo.astrid.api.AstridApiConstants;
  * Data Model which represents a collaboration space for users / tasks.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 public final class TagData extends RemoteModel {
 
     // --- table and uri
 
-    /** table for this model */
+    /**
+     * table for this model
+     */
     public static final Table TABLE = new Table("tagdata", TagData.class);
 
-    /** model class for entries in the outstanding table */
+    /**
+     * model class for entries in the outstanding table
+     */
     public static final Class<? extends OutstandingEntry<TagData>> OUTSTANDING_MODEL = TagOutstanding.class;
 
-    /** content uri for this model */
+    /**
+     * content uri for this model
+     */
     public static final Uri CONTENT_URI = Uri.parse("content://" + AstridApiConstants.API_PACKAGE + "/" +
             TABLE.name);
 
     // --- properties
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
-    /** User id */
+    /**
+     * User id
+     */
     public static final StringProperty USER_ID = new StringProperty(
             TABLE, USER_ID_PROPERTY_NAME, Property.PROP_FLAG_USER_ID);
 
-    /** User Object (JSON) */
-    @Deprecated public static final StringProperty USER = new StringProperty(
+    /**
+     * User Object (JSON)
+     */
+    @Deprecated
+    public static final StringProperty USER = new StringProperty(
             TABLE, USER_JSON_PROPERTY_NAME);
 
-    /** Remote goal id */
+    /**
+     * Remote goal id
+     */
     public static final StringProperty UUID = new StringProperty(
             TABLE, UUID_PROPERTY_NAME);
 
-    /** Name of Tag */
+    /**
+     * Name of Tag
+     */
     public static final StringProperty NAME = new StringProperty(
             TABLE, "name");
 
-    /** Project picture */
+    /**
+     * Project picture
+     */
     public static final StringProperty PICTURE = new StringProperty(
             TABLE, "picture", Property.PROP_FLAG_JSON | Property.PROP_FLAG_PICTURE);
 
-    /** Tag team array (JSON) */
-    @Deprecated public static final StringProperty MEMBERS = new StringProperty(
+    /**
+     * Tag team array (JSON)
+     */
+    @Deprecated
+    public static final StringProperty MEMBERS = new StringProperty(
             TABLE, "members");
 
-    /** Tag member count */
+    /**
+     * Tag member count
+     */
     public static final IntegerProperty MEMBER_COUNT = new IntegerProperty(
             TABLE, "memberCount");
 
-    /** Flags */
+    /**
+     * Flags
+     */
     public static final IntegerProperty FLAGS = new IntegerProperty(
             TABLE, "flags");
 
-    /** Unixtime Project was created */
+    /**
+     * Unixtime Project was created
+     */
     public static final LongProperty CREATION_DATE = new LongProperty(
             TABLE, "created", Property.PROP_FLAG_DATE);
 
-    /** Unixtime Project was last touched */
+    /**
+     * Unixtime Project was last touched
+     */
     public static final LongProperty MODIFICATION_DATE = new LongProperty(
             TABLE, "modified", Property.PROP_FLAG_DATE);
 
-    /** Unixtime Project was completed. 0 means active */
+    /**
+     * Unixtime Project was completed. 0 means active
+     */
     public static final LongProperty COMPLETION_DATE = new LongProperty(
             TABLE, "completed", Property.PROP_FLAG_DATE);
 
-    /** Unixtime Project was deleted. 0 means not deleted */
+    /**
+     * Unixtime Project was deleted. 0 means not deleted
+     */
     public static final LongProperty DELETION_DATE = new LongProperty(
             TABLE, "deleted", Property.PROP_FLAG_DATE);
 
-    /** Project picture thumbnail */
+    /**
+     * Project picture thumbnail
+     */
     public static final StringProperty THUMB = new StringProperty(
             TABLE, "thumb");
 
-    /** Project last activity date */
+    /**
+     * Project last activity date
+     */
     public static final LongProperty LAST_ACTIVITY_DATE = new LongProperty(
             TABLE, "lastActivityDate", Property.PROP_FLAG_DATE);
 
-    /** Whether user is part of Tag team */
+    /**
+     * Whether user is part of Tag team
+     */
     public static final IntegerProperty IS_TEAM = new IntegerProperty(
             TABLE, "isTeam");
 
-    /** Whether Tag has unread activity */
+    /**
+     * Whether Tag has unread activity
+     */
     public static final IntegerProperty IS_UNREAD = new IntegerProperty(
             TABLE, "isUnread");
 
-    /** Whether tag is a folder */
+    /**
+     * Whether tag is a folder
+     */
     public static final IntegerProperty IS_FOLDER = new IntegerProperty(
             TABLE, "isFolder", Property.PROP_FLAG_BOOLEAN);
 
-    /** Task count */
+    /**
+     * Task count
+     */
     public static final IntegerProperty TASK_COUNT = new IntegerProperty(
             TABLE, "taskCount");
 
-    /** Tag Desription */
+    /**
+     * Tag Desription
+     */
     public static final StringProperty TAG_DESCRIPTION = new StringProperty(
             TABLE, "tagDescription");
 
-    /** Pushed at date */
+    /**
+     * Pushed at date
+     */
     public static final LongProperty PUSHED_AT = new LongProperty(
             TABLE, PUSHED_AT_PROPERTY_NAME, Property.PROP_FLAG_DATE);
 
-    /** Tasks pushed at date */
+    /**
+     * Tasks pushed at date
+     */
     public static final LongProperty TASKS_PUSHED_AT = new LongProperty(
             TABLE, "tasks_pushed_at", Property.PROP_FLAG_DATE);
 
-    /** Metadata pushed at date */
+    /**
+     * Metadata pushed at date
+     */
     public static final LongProperty METADATA_PUSHED_AT = new LongProperty(
             TABLE, "metadata_pushed_at", Property.PROP_FLAG_DATE);
 
-    /** User activities pushed at date */
+    /**
+     * User activities pushed at date
+     */
     public static final LongProperty USER_ACTIVITIES_PUSHED_AT = new LongProperty(
             TABLE, "activities_pushed_at", Property.PROP_FLAG_DATE);
 
-    /** Tag ordering */
+    /**
+     * Tag ordering
+     */
     @Deprecated
     public static final StringProperty TAG_ORDERING = new StringProperty(
             TABLE, "tagOrdering");
 
-    /** History fetch date */
+    /**
+     * History fetch date
+     */
     public static final LongProperty HISTORY_FETCH_DATE = new LongProperty(
             TABLE, "historyFetch");
 
-    /** History has more*/
+    /**
+     * History has more
+     */
     public static final IntegerProperty HISTORY_HAS_MORE = new IntegerProperty(
             TABLE, "historyHasMore");
 
-    /** Last autosync */
+    /**
+     * Last autosync
+     */
     public static final LongProperty LAST_AUTOSYNC = new LongProperty(
             TABLE, "lastAutosync");
 
-    /** List of all properties for this model */
+    /**
+     * List of all properties for this model
+     */
     public static final Property<?>[] PROPERTIES = generateProperties(TagData.class);
 
     // --- flags
 
-    /** whether user should not be notified of tag activity */
+    /**
+     * whether user should not be notified of tag activity
+     */
     public static final int FLAG_SILENT = 1 << 1;
 
-    /** whether tag is emergent */
+    /**
+     * whether tag is emergent
+     */
     @Deprecated
     public static final int FLAG_EMERGENT = 1 << 2;
 
-    /** whether tag represents a featured list */
+    /**
+     * whether tag represents a featured list
+     */
     public static final int FLAG_FEATURED = 1 << 3;
 
     // --- defaults
 
-    /** Default values container */
+    /**
+     * Default values container
+     */
     private static final ContentValues defaultValues = new ContentValues();
 
     static {
@@ -244,15 +317,19 @@ public final class TagData extends RemoteModel {
 
     // --- data access methods
 
-    /** Checks whether task is done. Requires COMPLETION_DATE */
+    /**
+     * Checks whether task is done. Requires COMPLETION_DATE
+     */
     public boolean isCompleted() {
         return getValue(COMPLETION_DATE) > 0;
     }
 
-    /** Checks whether task is deleted. Will return false if DELETION_DATE not read */
+    /**
+     * Checks whether task is deleted. Will return false if DELETION_DATE not read
+     */
     public boolean isDeleted() {
         // assume false if we didn't load deletion date
-        if(!containsValue(DELETION_DATE))
+        if (!containsValue(DELETION_DATE))
             return false;
         else
             return getValue(DELETION_DATE) > 0;
diff --git a/api/src/com/todoroo/astrid/data/TagMetadata.java b/api/src/com/todoroo/astrid/data/TagMetadata.java
index 56dcef837..b88cdd9a2 100644
--- a/api/src/com/todoroo/astrid/data/TagMetadata.java
+++ b/api/src/com/todoroo/astrid/data/TagMetadata.java
@@ -16,56 +16,82 @@ public class TagMetadata extends AbstractModel {
 
     public static final Table TABLE = new Table("tag_metadata", TagMetadata.class);
 
-    /** changes to metadata (specifically members) are recorded in the tag outstanding table */
+    /**
+     * changes to metadata (specifically members) are recorded in the tag outstanding table
+     */
     public static final Class<? extends OutstandingEntry<TagData>> OUTSTANDING_MODEL = TagOutstanding.class;
 
-    /** content uri for this model */
+    /**
+     * content uri for this model
+     */
     public static final Uri CONTENT_URI = Uri.parse("content://" + AstridApiConstants.API_PACKAGE + "/" +
             TABLE.name);
 
     // --- properties
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
-    /** Tag local id */
+    /**
+     * Tag local id
+     */
     public static final LongProperty TAG_ID = new LongProperty(
             TABLE, "tag_id");
 
-    /** Tag uuid */
+    /**
+     * Tag uuid
+     */
     public static final StringProperty TAG_UUID = new StringProperty(
             TABLE, "tag_uuid");
 
-    /** Metadata Key */
+    /**
+     * Metadata Key
+     */
     public static final StringProperty KEY = new StringProperty(
             TABLE, "key");
 
-    /** Metadata Text Value Column 1 */
+    /**
+     * Metadata Text Value Column 1
+     */
     public static final StringProperty VALUE1 = new StringProperty(
             TABLE, "value");
 
-    /** Metadata Text Value Column 2 */
+    /**
+     * Metadata Text Value Column 2
+     */
     public static final StringProperty VALUE2 = new StringProperty(
             TABLE, "value2");
 
-    /** Metadata Text Value Column 3 */
+    /**
+     * Metadata Text Value Column 3
+     */
     public static final StringProperty VALUE3 = new StringProperty(
             TABLE, "value3");
 
-    /** Unixtime Metadata was created */
+    /**
+     * Unixtime Metadata was created
+     */
     public static final LongProperty CREATION_DATE = new LongProperty(
             TABLE, "created");
 
-    /** Unixtime metadata was deleted/tombstoned */
+    /**
+     * Unixtime metadata was deleted/tombstoned
+     */
     public static final LongProperty DELETION_DATE = new LongProperty(
             TABLE, "deleted");
 
-    /** List of all properties for this model */
+    /**
+     * List of all properties for this model
+     */
     public static final Property<?>[] PROPERTIES = generateProperties(TagMetadata.class);
 
 
-    /** Default values container */
+    /**
+     * Default values container
+     */
     private static final ContentValues defaultValues = new ContentValues();
 
     static {
diff --git a/api/src/com/todoroo/astrid/data/TagOutstanding.java b/api/src/com/todoroo/astrid/data/TagOutstanding.java
index a1198362a..b970c6d91 100644
--- a/api/src/com/todoroo/astrid/data/TagOutstanding.java
+++ b/api/src/com/todoroo/astrid/data/TagOutstanding.java
@@ -11,12 +11,16 @@ import com.todoroo.andlib.data.Table;
 @SuppressWarnings("nls")
 public class TagOutstanding extends OutstandingEntry<TagData> {
 
-    /** table for this model */
+    /**
+     * table for this model
+     */
     public static final Table TABLE = new Table("tags_outstanding", TagOutstanding.class);
 
     // --- properties
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
@@ -40,7 +44,9 @@ public class TagOutstanding extends OutstandingEntry<TagData> {
         defaultValues.put(VALUE_STRING.name, "");
     }
 
-    /** List of all properties for this model */
+    /**
+     * List of all properties for this model
+     */
     public static final Property<?>[] PROPERTIES = generateProperties(TagOutstanding.class);
 
     @Override
diff --git a/api/src/com/todoroo/astrid/data/Task.java b/api/src/com/todoroo/astrid/data/Task.java
index bdab30a7f..5ef683e85 100644
--- a/api/src/com/todoroo/astrid/data/Task.java
+++ b/api/src/com/todoroo/astrid/data/Task.java
@@ -6,8 +6,6 @@
 package com.todoroo.astrid.data;
 
 
-import java.util.Date;
-
 import android.content.ContentValues;
 import android.content.res.Resources;
 import android.net.Uri;
@@ -23,72 +21,101 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.R;
 
+import java.util.Date;
+
 /**
  * Data Model which represents a task users need to accomplish.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 public final class Task extends RemoteModel {
 
     // --- table and uri
 
-    /** table for this model */
+    /**
+     * table for this model
+     */
     public static final Table TABLE = new Table("tasks", Task.class);
 
-    /** model class for entries in the outstanding table */
+    /**
+     * model class for entries in the outstanding table
+     */
     public static final Class<? extends OutstandingEntry<Task>> OUTSTANDING_MODEL = TaskOutstanding.class;
 
-    /** content uri for this model */
+    /**
+     * content uri for this model
+     */
     public static final Uri CONTENT_URI = Uri.parse("content://" + AstridApiConstants.API_PACKAGE + "/" +
             TABLE.name);
 
     // --- properties
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
-    /** Name of Task */
+    /**
+     * Name of Task
+     */
     public static final StringProperty TITLE = new StringProperty(
             TABLE, "title");
 
-    /** Importance of Task (see importance flags) */
+    /**
+     * Importance of Task (see importance flags)
+     */
     public static final IntegerProperty IMPORTANCE = new IntegerProperty(
             TABLE, "importance");
 
-    /** Unixtime Task is due, 0 if not set */
+    /**
+     * Unixtime Task is due, 0 if not set
+     */
     public static final LongProperty DUE_DATE = new LongProperty(
             TABLE, "dueDate", Property.PROP_FLAG_DATE);
 
-    /** Unixtime Task should be hidden until, 0 if not set */
+    /**
+     * Unixtime Task should be hidden until, 0 if not set
+     */
     public static final LongProperty HIDE_UNTIL = new LongProperty(
             TABLE, "hideUntil", Property.PROP_FLAG_DATE);
 
-    /** Unixtime Task was created */
+    /**
+     * Unixtime Task was created
+     */
     public static final LongProperty CREATION_DATE = new LongProperty(
             TABLE, "created", Property.PROP_FLAG_DATE);
 
-    /** Unixtime Task was last touched */
+    /**
+     * Unixtime Task was last touched
+     */
     public static final LongProperty MODIFICATION_DATE = new LongProperty(
             TABLE, "modified", Property.PROP_FLAG_DATE);
 
-    /** Unixtime Task was completed. 0 means active */
+    /**
+     * Unixtime Task was completed. 0 means active
+     */
     public static final LongProperty COMPLETION_DATE = new LongProperty(
             TABLE, "completed", Property.PROP_FLAG_DATE);
 
-    /** Unixtime Task was deleted. 0 means not deleted */
+    /**
+     * Unixtime Task was deleted. 0 means not deleted
+     */
     public static final LongProperty DELETION_DATE = new LongProperty(
             TABLE, "deleted", Property.PROP_FLAG_DATE);
 
-    /** Cached Details Column - built from add-on detail exposers. A null
+    /**
+     * Cached Details Column - built from add-on detail exposers. A null
      * value means there is no value in the cache and it needs to be
-     * refreshed */
+     * refreshed
+     */
     public static final StringProperty DETAILS = new StringProperty(
             TABLE, "details");
 
-    /** Date details were last updated */
+    /**
+     * Date details were last updated
+     */
     public static final LongProperty DETAILS_DATE = new LongProperty(
             TABLE, "detailsDate", Property.PROP_FLAG_DATE);
 
@@ -119,24 +146,34 @@ public final class Task extends RemoteModel {
     public static final IntegerProperty POSTPONE_COUNT = new IntegerProperty(
             TABLE, "postponeCount");
 
-    /** Flags for when to send reminders */
+    /**
+     * Flags for when to send reminders
+     */
     public static final IntegerProperty REMINDER_FLAGS = new IntegerProperty(
             TABLE, "notificationFlags");
 
-    /** Reminder period, in milliseconds. 0 means disabled */
+    /**
+     * Reminder period, in milliseconds. 0 means disabled
+     */
     public static final LongProperty REMINDER_PERIOD = new LongProperty(
             TABLE, "notifications", Property.PROP_FLAG_DATE);
 
-    /** Unixtime the last reminder was triggered */
+    /**
+     * Unixtime the last reminder was triggered
+     */
     public static final LongProperty REMINDER_LAST = new LongProperty(
             TABLE, "lastNotified", Property.PROP_FLAG_DATE);
 
-    /** What kind of reminder the last reminder was: private task,
-     *  social with no faces, social with faces */
+    /**
+     * What kind of reminder the last reminder was: private task,
+     * social with no faces, social with faces
+     */
     public static final StringProperty SOCIAL_REMINDER = new StringProperty(
             TABLE, "socialReminder");
 
-    /** Unixtime snooze is set (0 -> no snooze) */
+    /**
+     * Unixtime snooze is set (0 -> no snooze)
+     */
     public static final LongProperty REMINDER_SNOOZE = new LongProperty(
             TABLE, "snoozeTime", Property.PROP_FLAG_DATE);
 
@@ -154,73 +191,113 @@ public final class Task extends RemoteModel {
 
     // --- for astrid.com
 
-    /** Remote id */
+    /**
+     * Remote id
+     */
     public static final StringProperty UUID = new StringProperty(
             TABLE, UUID_PROPERTY_NAME, Property.PROP_FLAG_NULLABLE);
 
-    /** Assigned user id */
+    /**
+     * Assigned user id
+     */
     public static final StringProperty USER_ID = new StringProperty(
             TABLE, USER_ID_PROPERTY_NAME, Property.PROP_FLAG_USER_ID);
 
-    /** User Object (JSON) */
-    @Deprecated public static final StringProperty USER = new StringProperty(
+    /**
+     * User Object (JSON)
+     */
+    @Deprecated
+    public static final StringProperty USER = new StringProperty(
             TABLE, USER_JSON_PROPERTY_NAME);
 
-    /** Creator user id */
+    /**
+     * Creator user id
+     */
     public static final StringProperty CREATOR_ID = new StringProperty(
             TABLE, "creatorId", Property.PROP_FLAG_USER_ID);
 
-    /** Last Sync date */
+    /**
+     * Last Sync date
+     */
     @Deprecated
     public static final LongProperty LAST_SYNC = new LongProperty(
             TABLE, "lastSync", Property.PROP_FLAG_DATE);
 
-    /** Pushed at date */
+    /**
+     * Pushed at date
+     */
     public static final LongProperty PUSHED_AT = new LongProperty(
             TABLE, PUSHED_AT_PROPERTY_NAME, Property.PROP_FLAG_DATE);
 
-    /** Attachments pushed at date */
+    /**
+     * Attachments pushed at date
+     */
     public static final LongProperty ATTACHMENTS_PUSHED_AT = new LongProperty(
             TABLE, "attachments_pushed_at", Property.PROP_FLAG_DATE);
 
-    /** User activities pushed at date */
+    /**
+     * User activities pushed at date
+     */
     public static final LongProperty USER_ACTIVITIES_PUSHED_AT = new LongProperty(
             TABLE, "activities_pushed_at", Property.PROP_FLAG_DATE);
 
-    /** History fetch time */
+    /**
+     * History fetch time
+     */
     public static final LongProperty HISTORY_FETCH_DATE = new LongProperty(
             TABLE, "historyFetch");
 
-    /** History has more*/
+    /**
+     * History has more
+     */
     public static final IntegerProperty HISTORY_HAS_MORE = new IntegerProperty(
             TABLE, "historyHasMore");
 
-    /** List of all properties for this model */
+    /**
+     * List of all properties for this model
+     */
     public static final Property<?>[] PROPERTIES = generateProperties(Task.class);
 
     // --- flags
 
-    /** whether repeat occurs relative to completion date instead of due date */
-    @Deprecated public static final int FLAG_REPEAT_AFTER_COMPLETION = 1 << 1;
+    /**
+     * whether repeat occurs relative to completion date instead of due date
+     */
+    @Deprecated
+    public static final int FLAG_REPEAT_AFTER_COMPLETION = 1 << 1;
 
-    /** whether task is read-only */
-    @Deprecated public static final int FLAG_IS_READONLY = 1 << 2;
+    /**
+     * whether task is read-only
+     */
+    @Deprecated
+    public static final int FLAG_IS_READONLY = 1 << 2;
 
-    /** whether a task is public */
-    @Deprecated public static final int FLAG_PUBLIC = 1 << 3;
+    /**
+     * whether a task is public
+     */
+    @Deprecated
+    public static final int FLAG_PUBLIC = 1 << 3;
 
     // --- user id special values
 
-    /** user id = doesn't exist/ignore it. For filtering in tags */
+    /**
+     * user id = doesn't exist/ignore it. For filtering in tags
+     */
     public static final String USER_ID_IGNORE = "-3";
 
-    /** user id = read user email value */
+    /**
+     * user id = read user email value
+     */
     public static final String USER_ID_EMAIL = "-2";
 
-    /** user id = unassigned */
+    /**
+     * user id = unassigned
+     */
     public static final String USER_ID_UNASSIGNED = "-1";
 
-    /** user id = myself */
+    /**
+     * user id = myself
+     */
     public static final String USER_ID_SELF = "0";
 
     public static boolean isRealUserId(String userId) {
@@ -240,16 +317,24 @@ public final class Task extends RemoteModel {
 
     // --- notification flags
 
-    /** whether to send a reminder at deadline */
+    /**
+     * whether to send a reminder at deadline
+     */
     public static final int NOTIFY_AT_DEADLINE = 1 << 1;
 
-    /** whether to send reminders while task is overdue */
+    /**
+     * whether to send reminders while task is overdue
+     */
     public static final int NOTIFY_AFTER_DEADLINE = 1 << 2;
 
-    /** reminder mode non-stop */
+    /**
+     * reminder mode non-stop
+     */
     public static final int NOTIFY_MODE_NONSTOP = 1 << 3;
 
-    /** reminder mode five times (exclusive with non-stop) */
+    /**
+     * reminder mode five times (exclusive with non-stop)
+     */
     public static final int NOTIFY_MODE_FIVE = 1 << 4;
 
     // --- importance settings (note: importance > 3 are supported via plugin)
@@ -270,7 +355,7 @@ public final class Task extends RemoteModel {
      * @return colors that correspond to importance values
      */
     public static int[] getImportanceColors(Resources r) {
-        return new int[] {
+        return new int[]{
                 r.getColor(R.color.importance_1),
                 r.getColor(R.color.importance_2),
                 r.getColor(R.color.importance_3),
@@ -285,7 +370,9 @@ public final class Task extends RemoteModel {
 
     // --- defaults
 
-    /** Default values container */
+    /**
+     * Default values container
+     */
     private static final ContentValues defaultValues = new ContentValues();
 
     static {
@@ -310,7 +397,7 @@ public final class Task extends RemoteModel {
         defaultValues.put(NOTES.name, "");
         defaultValues.put(FLAGS.name, 0);
         defaultValues.put(TIMER_START.name, 0);
-        defaultValues.put(DETAILS.name, (String)null);
+        defaultValues.put(DETAILS.name, (String) null);
         defaultValues.put(DETAILS_DATE.name, 0);
         defaultValues.put(IS_PUBLIC.name, 0);
         defaultValues.put(IS_READONLY.name, 0);
@@ -370,33 +457,43 @@ public final class Task extends RemoteModel {
 
     // --- data access methods
 
-    /** Checks whether task is done. Requires COMPLETION_DATE */
+    /**
+     * Checks whether task is done. Requires COMPLETION_DATE
+     */
     public boolean isCompleted() {
         return getValue(COMPLETION_DATE) > 0;
     }
 
-    /** Checks whether task is deleted. Will return false if DELETION_DATE not read */
+    /**
+     * Checks whether task is deleted. Will return false if DELETION_DATE not read
+     */
     public boolean isDeleted() {
         // assume false if we didn't load deletion date
-        if(!containsValue(DELETION_DATE))
+        if (!containsValue(DELETION_DATE))
             return false;
         else
             return getValue(DELETION_DATE) > 0;
     }
 
-    /** Checks whether task is hidden. Requires HIDDEN_UNTIL */
+    /**
+     * Checks whether task is hidden. Requires HIDDEN_UNTIL
+     */
     public boolean isHidden() {
         return getValue(HIDE_UNTIL) > DateUtilities.now();
     }
 
-    /** Checks whether task is done. Requires DUE_DATE */
+    /**
+     * Checks whether task is done. Requires DUE_DATE
+     */
     public boolean hasDueDate() {
         return getValue(DUE_DATE) > 0;
     }
 
     // --- due and hide until date management
 
-    /** urgency array index -> significance */
+    /**
+     * urgency array index -> significance
+     */
     public static final int URGENCY_NONE = 0;
     public static final int URGENCY_TODAY = 1;
     public static final int URGENCY_TOMORROW = 2;
@@ -407,7 +504,9 @@ public final class Task extends RemoteModel {
     public static final int URGENCY_SPECIFIC_DAY = 7;
     public static final int URGENCY_SPECIFIC_DAY_TIME = 8;
 
-    /** hide until array index -> significance */
+    /**
+     * hide until array index -> significance
+     */
     public static final int HIDE_UNTIL_NONE = 0;
     public static final int HIDE_UNTIL_DUE = 1;
     public static final int HIDE_UNTIL_DAY_BEFORE = 2;
@@ -420,49 +519,47 @@ public final class Task extends RemoteModel {
      * Creates due date for this task. If this due date has no time associated,
      * we move it to the last millisecond of the day.
      *
-     * @param setting
-     *            one of the URGENCY_* constants
-     * @param customDate
-     *            if specific day or day & time is set, this value
+     * @param setting    one of the URGENCY_* constants
+     * @param customDate if specific day or day & time is set, this value
      */
     public static long createDueDate(int setting, long customDate) {
         long date;
 
-        switch(setting) {
-        case URGENCY_NONE:
-            date = 0;
-            break;
-        case URGENCY_TODAY:
-            date = DateUtilities.now();
-            break;
-        case URGENCY_TOMORROW:
-            date = DateUtilities.now() + DateUtilities.ONE_DAY;
-            break;
-        case URGENCY_DAY_AFTER:
-            date = DateUtilities.now() + 2 * DateUtilities.ONE_DAY;
-            break;
-        case URGENCY_NEXT_WEEK:
-            date = DateUtilities.now() + DateUtilities.ONE_WEEK;
-            break;
-        case URGENCY_IN_TWO_WEEKS:
-            date = DateUtilities.now() + 2 * DateUtilities.ONE_WEEK;
-            break;
-        case URGENCY_NEXT_MONTH:
-            date = DateUtilities.oneMonthFromNow();
-            break;
-        case URGENCY_SPECIFIC_DAY:
-        case URGENCY_SPECIFIC_DAY_TIME:
-            date = customDate;
-            break;
-        default:
-            throw new IllegalArgumentException("Unknown setting " + setting);
+        switch (setting) {
+            case URGENCY_NONE:
+                date = 0;
+                break;
+            case URGENCY_TODAY:
+                date = DateUtilities.now();
+                break;
+            case URGENCY_TOMORROW:
+                date = DateUtilities.now() + DateUtilities.ONE_DAY;
+                break;
+            case URGENCY_DAY_AFTER:
+                date = DateUtilities.now() + 2 * DateUtilities.ONE_DAY;
+                break;
+            case URGENCY_NEXT_WEEK:
+                date = DateUtilities.now() + DateUtilities.ONE_WEEK;
+                break;
+            case URGENCY_IN_TWO_WEEKS:
+                date = DateUtilities.now() + 2 * DateUtilities.ONE_WEEK;
+                break;
+            case URGENCY_NEXT_MONTH:
+                date = DateUtilities.oneMonthFromNow();
+                break;
+            case URGENCY_SPECIFIC_DAY:
+            case URGENCY_SPECIFIC_DAY_TIME:
+                date = customDate;
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown setting " + setting);
         }
 
-        if(date <= 0)
+        if (date <= 0)
             return date;
 
         Date dueDate = new Date(date / 1000L * 1000L); // get rid of millis
-        if(setting != URGENCY_SPECIFIC_DAY_TIME) {
+        if (setting != URGENCY_SPECIFIC_DAY_TIME) {
             dueDate.setHours(12);
             dueDate.setMinutes(0);
             dueDate.setSeconds(0); // Seconds == 0 means no due time
@@ -475,41 +572,39 @@ public final class Task extends RemoteModel {
     /**
      * Create hide until for this task.
      *
-     * @param setting
-     *            one of the HIDE_UNTIL_* constants
-     * @param customDate
-     *            if specific day is set, this value
+     * @param setting    one of the HIDE_UNTIL_* constants
+     * @param customDate if specific day is set, this value
      * @return
      */
     public long createHideUntil(int setting, long customDate) {
         long date;
 
-        switch(setting) {
-        case HIDE_UNTIL_NONE:
-            return 0;
-        case HIDE_UNTIL_DUE:
-        case HIDE_UNTIL_DUE_TIME:
-            date = getValue(DUE_DATE);
-            break;
-        case HIDE_UNTIL_DAY_BEFORE:
-            date = getValue(DUE_DATE) - DateUtilities.ONE_DAY;
-            break;
-        case HIDE_UNTIL_WEEK_BEFORE:
-            date = getValue(DUE_DATE) - DateUtilities.ONE_WEEK;
-            break;
-        case HIDE_UNTIL_SPECIFIC_DAY:
-        case HIDE_UNTIL_SPECIFIC_DAY_TIME:
-            date = customDate;
-            break;
-        default:
-            throw new IllegalArgumentException("Unknown setting " + setting);
+        switch (setting) {
+            case HIDE_UNTIL_NONE:
+                return 0;
+            case HIDE_UNTIL_DUE:
+            case HIDE_UNTIL_DUE_TIME:
+                date = getValue(DUE_DATE);
+                break;
+            case HIDE_UNTIL_DAY_BEFORE:
+                date = getValue(DUE_DATE) - DateUtilities.ONE_DAY;
+                break;
+            case HIDE_UNTIL_WEEK_BEFORE:
+                date = getValue(DUE_DATE) - DateUtilities.ONE_WEEK;
+                break;
+            case HIDE_UNTIL_SPECIFIC_DAY:
+            case HIDE_UNTIL_SPECIFIC_DAY_TIME:
+                date = customDate;
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown setting " + setting);
         }
 
-        if(date <= 0)
+        if (date <= 0)
             return date;
 
         Date hideUntil = new Date(date / 1000L * 1000L); // get rid of millis
-        if(setting != HIDE_UNTIL_SPECIFIC_DAY_TIME && setting != HIDE_UNTIL_DUE_TIME) {
+        if (setting != HIDE_UNTIL_SPECIFIC_DAY_TIME && setting != HIDE_UNTIL_DUE_TIME) {
             hideUntil.setHours(0);
             hideUntil.setMinutes(0);
             hideUntil.setSeconds(0);
@@ -523,7 +618,7 @@ public final class Task extends RemoteModel {
      * Checks whether this due date has a due time or only a date
      */
     public boolean hasDueTime() {
-        if(!hasDueDate())
+        if (!hasDueDate())
             return false;
         return hasDueTime(getValue(Task.DUE_DATE));
     }
@@ -545,7 +640,7 @@ public final class Task extends RemoteModel {
     }
 
     public String sanitizedRecurrence() {
-        return getValue(Task.RECURRENCE).replaceAll("BYDAY=;","").replaceAll(";?FROM=[^;]*", "");  //$NON-NLS-1$//$NON-NLS-2$
+        return getValue(Task.RECURRENCE).replaceAll("BYDAY=;", "").replaceAll(";?FROM=[^;]*", "");  //$NON-NLS-1$//$NON-NLS-2$
     }
 
     /**
diff --git a/api/src/com/todoroo/astrid/data/TaskApiDao.java b/api/src/com/todoroo/astrid/data/TaskApiDao.java
index c781c5bf3..74f082ad8 100644
--- a/api/src/com/todoroo/astrid/data/TaskApiDao.java
+++ b/api/src/com/todoroo/astrid/data/TaskApiDao.java
@@ -22,7 +22,6 @@ import com.todoroo.astrid.api.PermaSql;
  * want to use the {@link MetadataApiDao} object.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TaskApiDao extends ContentResolverDao<Task> {
 
@@ -35,66 +34,90 @@ public class TaskApiDao extends ContentResolverDao<Task> {
      */
     public static class TaskCriteria {
 
-        /** @return tasks by id */
+        /**
+         * @return tasks by id
+         */
         public static Criterion byId(long id) {
             return Task.ID.eq(id);
         }
 
-        /** @return tasks that were deleted */
+        /**
+         * @return tasks that were deleted
+         */
         public static Criterion isDeleted() {
             return Task.DELETION_DATE.neq(0);
         }
 
-        /** @return tasks that were not deleted */
+        /**
+         * @return tasks that were not deleted
+         */
         public static Criterion notDeleted() {
             return Task.DELETION_DATE.eq(0);
         }
 
-        /** @return tasks that have not yet been completed or deleted */
+        /**
+         * @return tasks that have not yet been completed or deleted
+         */
         public static Criterion activeAndVisible() {
             return Criterion.and(Task.COMPLETION_DATE.eq(0),
                     Task.DELETION_DATE.eq(0),
                     Task.HIDE_UNTIL.lt(Functions.now()));
         }
 
-        /** @return tasks that have not yet been completed or deleted */
+        /**
+         * @return tasks that have not yet been completed or deleted
+         */
         public static Criterion isActive() {
             return Criterion.and(Task.COMPLETION_DATE.eq(0),
                     Task.DELETION_DATE.eq(0));
         }
 
-        /** @return tasks that are not hidden at current time */
+        /**
+         * @return tasks that are not hidden at current time
+         */
         public static Criterion isVisible() {
             return Task.HIDE_UNTIL.lt(Functions.now());
         }
 
-        /** @return tasks that have a due date */
+        /**
+         * @return tasks that have a due date
+         */
         public static Criterion hasDeadlines() {
             return Task.DUE_DATE.neq(0);
         }
 
-        /** @return tasks that are due before a certain unixtime */
+        /**
+         * @return tasks that are due before a certain unixtime
+         */
         public static Criterion dueBeforeNow() {
             return Criterion.and(Task.DUE_DATE.gt(0), Task.DUE_DATE.lt(Functions.now()));
         }
 
-        /** @return tasks that are due after a certain unixtime */
+        /**
+         * @return tasks that are due after a certain unixtime
+         */
         public static Criterion dueAfterNow() {
             return Task.DUE_DATE.gt(Functions.now());
         }
 
-        /** @return tasks completed before a given unixtime */
+        /**
+         * @return tasks completed before a given unixtime
+         */
         public static Criterion completed() {
             return Criterion.and(Task.COMPLETION_DATE.gt(0), Task.COMPLETION_DATE.lt(Functions.now()));
         }
 
-        /** @return tasks that have a blank or null title */
+        /**
+         * @return tasks that have a blank or null title
+         */
         @SuppressWarnings("nls")
         public static Criterion hasNoTitle() {
             return Criterion.or(Task.TITLE.isNull(), Task.TITLE.eq(""));
         }
 
-        /** @return tasks that have not yet been completed or deleted */
+        /**
+         * @return tasks that have not yet been completed or deleted
+         */
         public static Criterion activeVisibleMine() {
             return Criterion.and(Task.COMPLETION_DATE.eq(0),
                     Task.DELETION_DATE.eq(0),
@@ -103,16 +126,19 @@ public class TaskApiDao extends ContentResolverDao<Task> {
                     Task.USER_ID.eq(0));
         }
 
-        /** Check if a given task belongs to someone else & is read-only */
+        /**
+         * Check if a given task belongs to someone else & is read-only
+         */
         public static Criterion ownedByMe() {
-             return Criterion.and(Task.IS_READONLY.eq(0),
-                     Task.USER_ID.eq(0));
+            return Criterion.and(Task.IS_READONLY.eq(0),
+                    Task.USER_ID.eq(0));
         }
 
     }
 
     /**
      * Count tasks matching criterion
+     *
      * @param criterion
      * @return # of tasks matching
      */
@@ -127,6 +153,7 @@ public class TaskApiDao extends ContentResolverDao<Task> {
 
     /**
      * Count tasks matching query tepmlate
+     *
      * @param queryTemplate
      * @return # of tasks matching
      */
@@ -157,24 +184,26 @@ public class TaskApiDao extends ContentResolverDao<Task> {
         return false;
     }
 
-    /** @return true if task change shouldn't be broadcast */
+    /**
+     * @return true if task change shouldn't be broadcast
+     */
     public static boolean insignificantChange(ContentValues values) {
-        if(values == null || values.size() == 0)
+        if (values == null || values.size() == 0)
             return true;
 
-        if(values.containsKey(Task.DETAILS_DATE.name) &&
+        if (values.containsKey(Task.DETAILS_DATE.name) &&
                 values.size() <= 3)
             return true;
 
-        if(values.containsKey(Task.REMINDER_LAST.name) &&
+        if (values.containsKey(Task.REMINDER_LAST.name) &&
                 values.size() <= 2)
             return true;
 
-        if(values.containsKey(Task.REMINDER_SNOOZE.name) &&
+        if (values.containsKey(Task.REMINDER_SNOOZE.name) &&
                 values.size() <= 2)
             return true;
 
-        if(values.containsKey(Task.TIMER_START.name) &&
+        if (values.containsKey(Task.TIMER_START.name) &&
                 values.size() <= 2)
             return true;
 
diff --git a/api/src/com/todoroo/astrid/data/TaskAttachment.java b/api/src/com/todoroo/astrid/data/TaskAttachment.java
index 26f7b0bdb..faf120131 100644
--- a/api/src/com/todoroo/astrid/data/TaskAttachment.java
+++ b/api/src/com/todoroo/astrid/data/TaskAttachment.java
@@ -23,79 +23,112 @@ import com.todoroo.astrid.api.AstridApiConstants;
  * Data Model which represents a user.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 public final class TaskAttachment extends RemoteModel {
 
     // --- table and uri
 
-    /** table for this model */
+    /**
+     * table for this model
+     */
     public static final Table TABLE = new Table("task_attachments", TaskAttachment.class);
 
-    /** model class for entries in the outstanding table */
+    /**
+     * model class for entries in the outstanding table
+     */
     public static final Class<? extends OutstandingEntry<TaskAttachment>> OUTSTANDING_MODEL = TaskAttachmentOutstanding.class;
 
-    /** content uri for this model */
+    /**
+     * content uri for this model
+     */
     public static final Uri CONTENT_URI = Uri.parse("content://" + AstridApiConstants.API_PACKAGE + "/" +
             TABLE.name);
 
     // --- properties
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
-    /** Remote id */
+    /**
+     * Remote id
+     */
     public static final StringProperty UUID = new StringProperty(
             TABLE, UUID_PROPERTY_NAME);
 
-    /** Pushed at date */
+    /**
+     * Pushed at date
+     */
     public static final LongProperty PUSHED_AT = new LongProperty(
             TABLE, PUSHED_AT_PROPERTY_NAME);
 
-    /** Creator user id */
+    /**
+     * Creator user id
+     */
     public static final StringProperty USER_UUID = new StringProperty(
             TABLE, "user_id");
 
-    /** Task uuid */
+    /**
+     * Task uuid
+     */
     public static final StringProperty TASK_UUID = new StringProperty(
             TABLE, "task_id");
 
-    /** File name */
+    /**
+     * File name
+     */
     public static final StringProperty NAME = new StringProperty(
             TABLE, "name");
 
-    /** File url (for downloading) */
+    /**
+     * File url (for downloading)
+     */
     public static final StringProperty URL = new StringProperty(
             TABLE, "url");
 
-    /** File path (on local storage) */
+    /**
+     * File path (on local storage)
+     */
     public static final StringProperty FILE_PATH = new StringProperty(
             TABLE, "path");
 
-    /** File size (in bytes) */
+    /**
+     * File size (in bytes)
+     */
     public static final IntegerProperty SIZE = new IntegerProperty(
             TABLE, "size");
 
-    /** File mimetype */
+    /**
+     * File mimetype
+     */
     public static final StringProperty CONTENT_TYPE = new StringProperty(
             TABLE, "content_type");
 
-    /** Attachment creation date */
+    /**
+     * Attachment creation date
+     */
     public static final LongProperty CREATED_AT = new LongProperty(
             TABLE, "created_at", Property.PROP_FLAG_DATE);
 
-    /** Attachment deletion date */
+    /**
+     * Attachment deletion date
+     */
     public static final LongProperty DELETED_AT = new LongProperty(
             TABLE, "deleted_at", Property.PROP_FLAG_DATE);
 
-    /** List of all properties for this model */
+    /**
+     * List of all properties for this model
+     */
     public static final Property<?>[] PROPERTIES = generateProperties(TaskAttachment.class);
 
     // --- defaults
 
-    /** Default values container */
+    /**
+     * Default values container
+     */
     private static final ContentValues defaultValues = new ContentValues();
 
     static {
@@ -118,13 +151,19 @@ public final class TaskAttachment extends RemoteModel {
     }
 
     // -- Constants
-    /** default directory for files on external storage */
+    /**
+     * default directory for files on external storage
+     */
     public static final String FILES_DIRECTORY_DEFAULT = "attachments"; //$NON-NLS-1$
 
-    /** preference key for some other download directory */
+    /**
+     * preference key for some other download directory
+     */
     public static final String FILES_DIRECTORY_PREF = "custom_files_dir"; //$NON-NLS-1$
 
-    /** Constants for file types */
+    /**
+     * Constants for file types
+     */
     public static final String FILE_TYPE_AUDIO = "audio/"; //$NON-NLS-1$
     public static final String FILE_TYPE_IMAGE = "image/"; //$NON-NLS-1$
     public static final String FILE_TYPE_PDF = "application/pdf"; //$NON-NLS-1$
@@ -137,9 +176,9 @@ public final class TaskAttachment extends RemoteModel {
     public static final String FILE_TYPE_XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; //$NON-NLS-1$
 
     public static final String[] MS_FILETYPES = {
-        FILE_TYPE_DOC, FILE_TYPE_DOCX,
-        FILE_TYPE_XLS, FILE_TYPE_XLSX,
-        FILE_TYPE_PPT, FILE_TYPE_PPTX,
+            FILE_TYPE_DOC, FILE_TYPE_DOCX,
+            FILE_TYPE_XLS, FILE_TYPE_XLSX,
+            FILE_TYPE_PPT, FILE_TYPE_PPTX,
     };
 
     public static final String FILE_TYPE_OTHER = "application/octet-stream";  //$NON-NLS-1$
diff --git a/api/src/com/todoroo/astrid/data/TaskAttachmentOutstanding.java b/api/src/com/todoroo/astrid/data/TaskAttachmentOutstanding.java
index a51960dc6..e3f377748 100644
--- a/api/src/com/todoroo/astrid/data/TaskAttachmentOutstanding.java
+++ b/api/src/com/todoroo/astrid/data/TaskAttachmentOutstanding.java
@@ -11,12 +11,16 @@ import com.todoroo.andlib.data.Table;
 @SuppressWarnings("nls")
 public class TaskAttachmentOutstanding extends OutstandingEntry<TaskAttachment> {
 
-    /** table for this model */
+    /**
+     * table for this model
+     */
     public static final Table TABLE = new Table("task_attachment_outstanding", TaskAttachmentOutstanding.class);
 
     // --- properties
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
@@ -40,7 +44,9 @@ public class TaskAttachmentOutstanding extends OutstandingEntry<TaskAttachment>
         defaultValues.put(VALUE_STRING.name, "");
     }
 
-    /** List of all properties for this model */
+    /**
+     * List of all properties for this model
+     */
     public static final Property<?>[] PROPERTIES = generateProperties(TaskAttachmentOutstanding.class);
 
     @Override
diff --git a/api/src/com/todoroo/astrid/data/TaskListMetadata.java b/api/src/com/todoroo/astrid/data/TaskListMetadata.java
index d772b53f5..4ecc6a3d3 100644
--- a/api/src/com/todoroo/astrid/data/TaskListMetadata.java
+++ b/api/src/com/todoroo/astrid/data/TaskListMetadata.java
@@ -23,68 +23,94 @@ import com.todoroo.astrid.api.AstridApiConstants;
  * Data Model which represents a user.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 public final class TaskListMetadata extends RemoteModel {
 
     // --- table and uri
 
-    /** table for this model */
+    /**
+     * table for this model
+     */
     public static final Table TABLE = new Table("task_list_metadata", TaskListMetadata.class);
 
-    /** model class for entries in the outstanding table */
+    /**
+     * model class for entries in the outstanding table
+     */
     public static final Class<? extends OutstandingEntry<TaskListMetadata>> OUTSTANDING_MODEL = TaskListMetadataOutstanding.class;
 
-    /** content uri for this model */
+    /**
+     * content uri for this model
+     */
     public static final Uri CONTENT_URI = Uri.parse("content://" + AstridApiConstants.API_PACKAGE + "/" +
             TABLE.name);
 
     // --- properties
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
-    /** Remote id */
+    /**
+     * Remote id
+     */
     public static final StringProperty UUID = new StringProperty(
             TABLE, UUID_PROPERTY_NAME);
 
-    /** Pushed at date */
+    /**
+     * Pushed at date
+     */
     public static final LongProperty PUSHED_AT = new LongProperty(
             TABLE, PUSHED_AT_PROPERTY_NAME);
 
-    /** Tag UUID */
+    /**
+     * Tag UUID
+     */
     public static final StringProperty TAG_UUID = new StringProperty(
             TABLE, "tag_uuid");
 
-    /** Filter id (one of below) */
+    /**
+     * Filter id (one of below)
+     */
     public static final StringProperty FILTER = new StringProperty(
             TABLE, "filter");
 
-    /** Tree of task ids (serialized to json array) */
+    /**
+     * Tree of task ids (serialized to json array)
+     */
     public static final StringProperty TASK_IDS = new StringProperty(
             TABLE, "task_ids", Property.PROP_FLAG_JSON);
 
-    /** Sort setting (one of below) */
+    /**
+     * Sort setting (one of below)
+     */
     public static final StringProperty SORT = new StringProperty(
             TABLE, "sort");
 
-    /** Settings hash */
+    /**
+     * Settings hash
+     */
     public static final StringProperty SETTINGS = new StringProperty(
             TABLE, "settings", Property.PROP_FLAG_JSON);
 
-    /** Array of child tags (for folders) */
+    /**
+     * Array of child tags (for folders)
+     */
     public static final StringProperty CHILD_TAG_IDS = new StringProperty(
             TABLE, "child_tags", Property.PROP_FLAG_JSON);
 
-    /** If the folder is collapsed */
+    /**
+     * If the folder is collapsed
+     */
     public static final IntegerProperty IS_COLLAPSED = new IntegerProperty(
             TABLE, "is_collapsed");
 
 
-
-    /** List of all properties for this model */
+    /**
+     * List of all properties for this model
+     */
     public static final Property<?>[] PROPERTIES = generateProperties(TaskListMetadata.class);
 
     public static final String FILTER_ID_ALL = "all";
@@ -102,7 +128,9 @@ public final class TaskListMetadata extends RemoteModel {
 
     // --- defaults
 
-    /** Default values container */
+    /**
+     * Default values container
+     */
     private static final ContentValues defaultValues = new ContentValues();
 
     static {
diff --git a/api/src/com/todoroo/astrid/data/TaskListMetadataOutstanding.java b/api/src/com/todoroo/astrid/data/TaskListMetadataOutstanding.java
index 52e60e61c..eab6d0e66 100644
--- a/api/src/com/todoroo/astrid/data/TaskListMetadataOutstanding.java
+++ b/api/src/com/todoroo/astrid/data/TaskListMetadataOutstanding.java
@@ -11,12 +11,16 @@ import com.todoroo.andlib.data.Table;
 @SuppressWarnings("nls")
 public class TaskListMetadataOutstanding extends OutstandingEntry<TaskListMetadata> {
 
-    /** table for this model */
+    /**
+     * table for this model
+     */
     public static final Table TABLE = new Table("task_list_metadata_outstanding", TaskListMetadataOutstanding.class);
 
     // --- properties
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
@@ -40,7 +44,9 @@ public class TaskListMetadataOutstanding extends OutstandingEntry<TaskListMetada
         defaultValues.put(VALUE_STRING.name, "");
     }
 
-    /** List of all properties for this model */
+    /**
+     * List of all properties for this model
+     */
     public static final Property<?>[] PROPERTIES = generateProperties(TaskListMetadataOutstanding.class);
 
     @Override
diff --git a/api/src/com/todoroo/astrid/data/TaskOutstanding.java b/api/src/com/todoroo/astrid/data/TaskOutstanding.java
index 6a90ae5c1..7b5ecc8c4 100644
--- a/api/src/com/todoroo/astrid/data/TaskOutstanding.java
+++ b/api/src/com/todoroo/astrid/data/TaskOutstanding.java
@@ -11,12 +11,16 @@ import com.todoroo.andlib.data.Table;
 @SuppressWarnings("nls")
 public class TaskOutstanding extends OutstandingEntry<Task> {
 
-    /** table for this model */
+    /**
+     * table for this model
+     */
     public static final Table TABLE = new Table("tasks_outstanding", TaskOutstanding.class);
 
     // --- properties
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
@@ -40,7 +44,9 @@ public class TaskOutstanding extends OutstandingEntry<Task> {
         defaultValues.put(VALUE_STRING.name, "");
     }
 
-    /** List of all properties for this model */
+    /**
+     * List of all properties for this model
+     */
     public static final Property<?>[] PROPERTIES = generateProperties(TaskOutstanding.class);
 
     @Override
diff --git a/api/src/com/todoroo/astrid/data/Update.java b/api/src/com/todoroo/astrid/data/Update.java
index aa04bc25f..a4f84da60 100644
--- a/api/src/com/todoroo/astrid/data/Update.java
+++ b/api/src/com/todoroo/astrid/data/Update.java
@@ -17,12 +17,10 @@ import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.astrid.api.AstridApiConstants;
 
 
-
 /**
  * Data Model which represents an update (e.g. a comment or data update event)
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 @Deprecated
@@ -30,80 +28,118 @@ public class Update extends RemoteModel {
 
     // --- table
 
-    /** table for this model */
+    /**
+     * table for this model
+     */
     public static final Table TABLE = new Table("updates", Update.class);
 
-    /** content uri for this model */
+    /**
+     * content uri for this model
+     */
     public static final Uri CONTENT_URI = Uri.parse("content://" + AstridApiConstants.API_PACKAGE + "/" +
             TABLE.name);
 
     // --- properties
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
-    /** Remote ID */
+    /**
+     * Remote ID
+     */
     public static final LongProperty REMOTE_ID = new LongProperty(
             TABLE, UUID_PROPERTY_NAME);
 
-    /** Associated Task remote-id (if any) */
+    /**
+     * Associated Task remote-id (if any)
+     */
     public static final LongProperty TASK = new LongProperty(
             TABLE, "task");
 
-    /** Associated Task local-id (if any) */
+    /**
+     * Associated Task local-id (if any)
+     */
     public static final LongProperty TASK_LOCAL = new LongProperty(
             TABLE, "taskLocal");
 
-    /** Associated Tag remote-ids (comma separated list with leading and trailing commas) */
+    /**
+     * Associated Tag remote-ids (comma separated list with leading and trailing commas)
+     */
     public static final StringProperty TAGS = new StringProperty(
             TABLE, "tag");
 
-    /** Associated Tag local-ids (comma separated list with leading and trailing commas) */
+    /**
+     * Associated Tag local-ids (comma separated list with leading and trailing commas)
+     */
     public static final StringProperty TAGS_LOCAL = new StringProperty(
             TABLE, "tagsLocal");
 
-    /** From user id */
+    /**
+     * From user id
+     */
     public static final LongProperty USER_ID = new LongProperty(
             TABLE, USER_ID_PROPERTY_NAME);
 
-    /** From User Object (JSON) */
+    /**
+     * From User Object (JSON)
+     */
     public static final StringProperty USER = new StringProperty(
             TABLE, USER_JSON_PROPERTY_NAME);
 
-    /** Other user id */
+    /**
+     * Other user id
+     */
     public static final LongProperty OTHER_USER_ID = new LongProperty(
             TABLE, "other_user_id");
 
-    /** Other User Object (JSON) */
+    /**
+     * Other User Object (JSON)
+     */
     public static final StringProperty OTHER_USER = new StringProperty(
             TABLE, "other_user");
 
-    /** Action text */
+    /**
+     * Action text
+     */
     public static final StringProperty ACTION = new StringProperty(
             TABLE, "action");
 
-    /** Action code */
+    /**
+     * Action code
+     */
     public static final StringProperty ACTION_CODE = new StringProperty(
             TABLE, "actionCode");
 
-    /** Message */
+    /**
+     * Message
+     */
     public static final StringProperty MESSAGE = new StringProperty(
             TABLE, "message");
 
-    /** Target Object Name */
+    /**
+     * Target Object Name
+     */
     public static final StringProperty TARGET_NAME = new StringProperty(
             TABLE, "targetName");
 
-    /** From User Object (JSON) */
+    /**
+     * From User Object (JSON)
+     */
     public static final StringProperty PICTURE = new StringProperty(
             TABLE, "picture");
 
-    /** Unixtime Metadata was created */
+    /**
+     * Unixtime Metadata was created
+     */
     public static final LongProperty CREATION_DATE = new LongProperty(
             TABLE, "created");
 
-    /** List of all properties for this model */
+    /**
+     * List of all properties for this model
+     */
     public static final Property<?>[] PROPERTIES = generateProperties(Update.class);
 
     // --- constants
@@ -112,7 +148,9 @@ public class Update extends RemoteModel {
 
     // --- defaults
 
-    /** Default values container */
+    /**
+     * Default values container
+     */
     private static final ContentValues defaultValues = new ContentValues();
 
     @Override
@@ -155,7 +193,9 @@ public class Update extends RemoteModel {
     @Override
     public long getId() {
         return getIdHelper(ID);
-    };
+    }
+
+    ;
 
     @Override
     public String getUuid() {
diff --git a/api/src/com/todoroo/astrid/data/User.java b/api/src/com/todoroo/astrid/data/User.java
index ae3a56ff4..c910c5240 100644
--- a/api/src/com/todoroo/astrid/data/User.java
+++ b/api/src/com/todoroo/astrid/data/User.java
@@ -22,77 +22,110 @@ import com.todoroo.astrid.api.AstridApiConstants;
  * Data Model which represents a user.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 public final class User extends RemoteModel {
 
     // --- table and uri
 
-    /** table for this model */
+    /**
+     * table for this model
+     */
     public static final Table TABLE = new Table("users", User.class);
 
-    /** content uri for this model */
+    /**
+     * content uri for this model
+     */
     public static final Uri CONTENT_URI = Uri.parse("content://" + AstridApiConstants.API_PACKAGE + "/" +
             TABLE.name);
 
     // --- properties
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
-    /** User Name */
+    /**
+     * User Name
+     */
     public static final StringProperty NAME = new StringProperty(
             TABLE, "name");
 
-    /** User first name */
+    /**
+     * User first name
+     */
     public static final StringProperty FIRST_NAME = new StringProperty(
             TABLE, "first_name");
 
-    /** User last name */
+    /**
+     * User last name
+     */
     public static final StringProperty LAST_NAME = new StringProperty(
             TABLE, "last_name");
 
-    /** User Email */
-    @Deprecated public static final StringProperty EMAIL = new StringProperty(
+    /**
+     * User Email
+     */
+    @Deprecated
+    public static final StringProperty EMAIL = new StringProperty(
             TABLE, "email");
 
-    /** User picture */
+    /**
+     * User picture
+     */
     public static final StringProperty PICTURE = new StringProperty(
             TABLE, "picture", Property.PROP_FLAG_JSON);
 
-    /** Remote id */
+    /**
+     * Remote id
+     */
     public static final StringProperty UUID = new StringProperty(
             TABLE, UUID_PROPERTY_NAME);
 
-    /** Pushed at date */
+    /**
+     * Pushed at date
+     */
     public static final LongProperty PUSHED_AT = new LongProperty(
             TABLE, PUSHED_AT_PROPERTY_NAME);
 
-    /** Pushed at date */
+    /**
+     * Pushed at date
+     */
     public static final LongProperty TASKS_PUSHED_AT = new LongProperty(
             TABLE, "tasks_pushed_at");
 
-    /** Friendship status. One of the STATUS constants below */
+    /**
+     * Friendship status. One of the STATUS constants below
+     */
     public static final StringProperty STATUS = new StringProperty(
             TABLE, "status");
 
-    /** Last autosync */
+    /**
+     * Last autosync
+     */
     public static final LongProperty LAST_AUTOSYNC = new LongProperty(
             TABLE, "lastAutosync");
 
-    /** Friendship tatus that needs to be reported to the server.
-     * One of the PENDING constants below */
-    @Deprecated public static final StringProperty PENDING_STATUS = new StringProperty(
+    /**
+     * Friendship tatus that needs to be reported to the server.
+     * One of the PENDING constants below
+     */
+    @Deprecated
+    public static final StringProperty PENDING_STATUS = new StringProperty(
             TABLE, "pendingStatus");
 
-    /** List of all properties for this model */
+    /**
+     * List of all properties for this model
+     */
     public static final Property<?>[] PROPERTIES = generateProperties(User.class);
 
     // --- defaults
 
-    /** Default values container */
+    /**
+     * Default values container
+     */
     private static final ContentValues defaultValues = new ContentValues();
 
     static {
diff --git a/api/src/com/todoroo/astrid/data/UserActivity.java b/api/src/com/todoroo/astrid/data/UserActivity.java
index 590c13e39..d0a2a00c7 100644
--- a/api/src/com/todoroo/astrid/data/UserActivity.java
+++ b/api/src/com/todoroo/astrid/data/UserActivity.java
@@ -14,61 +14,89 @@ import com.todoroo.astrid.api.AstridApiConstants;
 @SuppressWarnings("nls")
 public class UserActivity extends RemoteModel {
 
- // --- table
+    // --- table
 
-    /** table for this model */
+    /**
+     * table for this model
+     */
     public static final Table TABLE = new Table("userActivity", UserActivity.class);
 
-    /** model class for entries in the outstanding table */
+    /**
+     * model class for entries in the outstanding table
+     */
     public static final Class<? extends OutstandingEntry<UserActivity>> OUTSTANDING_MODEL = UserActivityOutstanding.class;
 
-    /** content uri for this model */
+    /**
+     * content uri for this model
+     */
     public static final Uri CONTENT_URI = Uri.parse("content://" + AstridApiConstants.API_PACKAGE + "/" +
             TABLE.name);
 
     // --- properties
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
-    /** Remote ID */
+    /**
+     * Remote ID
+     */
     public static final StringProperty UUID = new StringProperty(
             TABLE, UUID_PROPERTY_NAME);
 
-    /** Pushed at */
+    /**
+     * Pushed at
+     */
     public static final LongProperty PUSHED_AT = new LongProperty(
             TABLE, PUSHED_AT_PROPERTY_NAME, Property.PROP_FLAG_DATE);
 
-    /** User ID (activity initiator) */
+    /**
+     * User ID (activity initiator)
+     */
     public static final StringProperty USER_UUID = new StringProperty(
             TABLE, "user_uuid", Property.PROP_FLAG_USER_ID);
 
-    /** Action */
+    /**
+     * Action
+     */
     public static final StringProperty ACTION = new StringProperty(
             TABLE, "action");
 
-    /** Message */
+    /**
+     * Message
+     */
     public static final StringProperty MESSAGE = new StringProperty(
             TABLE, "message");
 
-    /** Picture */
+    /**
+     * Picture
+     */
     public static final StringProperty PICTURE = new StringProperty(
             TABLE, "picture", Property.PROP_FLAG_JSON | Property.PROP_FLAG_PICTURE);
 
-    /** Target id */
+    /**
+     * Target id
+     */
     public static final StringProperty TARGET_ID = new StringProperty(
             TABLE, "target_id");
 
-    /** Target name */
+    /**
+     * Target name
+     */
     public static final StringProperty TARGET_NAME = new StringProperty(
             TABLE, "target_name");
 
-    /** Created at */
+    /**
+     * Created at
+     */
     public static final LongProperty CREATED_AT = new LongProperty(
             TABLE, "created_at", Property.PROP_FLAG_DATE);
 
-    /** Deleted at */
+    /**
+     * Deleted at
+     */
     public static final LongProperty DELETED_AT = new LongProperty(
             TABLE, "deleted_at", Property.PROP_FLAG_DATE);
 
@@ -99,7 +127,9 @@ public class UserActivity extends RemoteModel {
         return getUuidHelper(UUID);
     }
 
-    /** Default values container */
+    /**
+     * Default values container
+     */
     private static final ContentValues defaultValues = new ContentValues();
 
     @Override
@@ -119,7 +149,9 @@ public class UserActivity extends RemoteModel {
         defaultValues.put(DELETED_AT.name, 0L);
     }
 
-    /** List of all properties for this model */
+    /**
+     * List of all properties for this model
+     */
     public static final Property<?>[] PROPERTIES = generateProperties(UserActivity.class);
 
     @Override
diff --git a/api/src/com/todoroo/astrid/data/UserActivityOutstanding.java b/api/src/com/todoroo/astrid/data/UserActivityOutstanding.java
index 9291f37d1..df1045163 100644
--- a/api/src/com/todoroo/astrid/data/UserActivityOutstanding.java
+++ b/api/src/com/todoroo/astrid/data/UserActivityOutstanding.java
@@ -11,12 +11,16 @@ import com.todoroo.andlib.data.Table;
 @SuppressWarnings("nls")
 public class UserActivityOutstanding extends OutstandingEntry<UserActivity> {
 
-    /** table for this model */
+    /**
+     * table for this model
+     */
     public static final Table TABLE = new Table("user_activity_outstanding", UserActivityOutstanding.class);
 
     // --- properties
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
@@ -40,7 +44,9 @@ public class UserActivityOutstanding extends OutstandingEntry<UserActivity> {
         defaultValues.put(VALUE_STRING.name, "");
     }
 
-    /** List of all properties for this model */
+    /**
+     * List of all properties for this model
+     */
     public static final Property<?>[] PROPERTIES = generateProperties(UserActivityOutstanding.class);
 
     @Override
diff --git a/api/src/com/todoroo/astrid/data/WaitingOnMe.java b/api/src/com/todoroo/astrid/data/WaitingOnMe.java
index 81ca04ea0..9531132ee 100644
--- a/api/src/com/todoroo/astrid/data/WaitingOnMe.java
+++ b/api/src/com/todoroo/astrid/data/WaitingOnMe.java
@@ -15,21 +15,31 @@ import com.todoroo.astrid.api.AstridApiConstants;
 @SuppressWarnings("nls")
 public class WaitingOnMe extends RemoteModel {
 
-    /** table for this model */
+    /**
+     * table for this model
+     */
     public static final Table TABLE = new Table("waitingOnMe", WaitingOnMe.class);
 
-    /** model class for entries in the outstanding table */
+    /**
+     * model class for entries in the outstanding table
+     */
     public static final Class<? extends OutstandingEntry<WaitingOnMe>> OUTSTANDING_MODEL = WaitingOnMeOutstanding.class;
 
-    /** content uri for this model */
+    /**
+     * content uri for this model
+     */
     public static final Uri CONTENT_URI = Uri.parse("content://" + AstridApiConstants.API_PACKAGE + "/" +
             TABLE.name);
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
-    /** Remote ID */
+    /**
+     * Remote ID
+     */
     public static final StringProperty UUID = new StringProperty(
             TABLE, RemoteModel.UUID_PROPERTY_NAME);
 
diff --git a/api/src/com/todoroo/astrid/data/WaitingOnMeOutstanding.java b/api/src/com/todoroo/astrid/data/WaitingOnMeOutstanding.java
index 2e8479983..859dc5cc3 100644
--- a/api/src/com/todoroo/astrid/data/WaitingOnMeOutstanding.java
+++ b/api/src/com/todoroo/astrid/data/WaitingOnMeOutstanding.java
@@ -11,12 +11,16 @@ import com.todoroo.andlib.data.Table;
 @SuppressWarnings("nls")
 public class WaitingOnMeOutstanding extends OutstandingEntry<WaitingOnMe> {
 
-    /** table for this model */
+    /**
+     * table for this model
+     */
     public static final Table TABLE = new Table("waiting_on_me_outstanding", WaitingOnMeOutstanding.class);
 
     // --- properties
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
@@ -40,7 +44,9 @@ public class WaitingOnMeOutstanding extends OutstandingEntry<WaitingOnMe> {
         defaultValues.put(VALUE_STRING.name, "");
     }
 
-    /** List of all properties for this model */
+    /**
+     * List of all properties for this model
+     */
     public static final Property<?>[] PROPERTIES = generateProperties(WaitingOnMeOutstanding.class);
 
     @Override
diff --git a/api/src/com/todoroo/astrid/sync/SyncBackgroundService.java b/api/src/com/todoroo/astrid/sync/SyncBackgroundService.java
index 6607224b1..0319362d3 100644
--- a/api/src/com/todoroo/astrid/sync/SyncBackgroundService.java
+++ b/api/src/com/todoroo/astrid/sync/SyncBackgroundService.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.sync;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -22,23 +20,27 @@ import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 
+import java.util.concurrent.atomic.AtomicBoolean;
+
 /**
  * Performs synchronization service logic in background service to avoid
  * ANR (application not responding) messages.
- * <p>
+ * <p/>
  * Starting this service
- *  schedules a repeating alarm which handles
+ * schedules a repeating alarm which handles
  * synchronization with your serv
  *
  * @author Tim Su
- *
  */
 abstract public class SyncBackgroundService extends Service {
 
-	/** Minimum time before an auto-sync */
-	private static final long AUTO_SYNC_MIN_OFFSET = 5*60*1000L;
+    /**
+     * Minimum time before an auto-sync
+     */
+    private static final long AUTO_SYNC_MIN_OFFSET = 5 * 60 * 1000L;
 
-    @Autowired private ExceptionService exceptionService;
+    @Autowired
+    private ExceptionService exceptionService;
 
     // --- abstract methods
 
@@ -54,11 +56,13 @@ abstract public class SyncBackgroundService extends Service {
 
     private final AtomicBoolean started = new AtomicBoolean(false);
 
-    /** Receive the alarm - start the synchronize service! */
+    /**
+     * Receive the alarm - start the synchronize service!
+     */
     @Override
     public void onStart(Intent intent, int startId) {
         try {
-            if(intent != null && !started.getAndSet(true)) {
+            if (intent != null && !started.getAndSet(true)) {
                 startSynchronization(this);
             }
         } catch (Exception e) {
@@ -66,14 +70,16 @@ abstract public class SyncBackgroundService extends Service {
         }
     }
 
-    /** Start the actual synchronization */
+    /**
+     * Start the actual synchronization
+     */
     private void startSynchronization(Context context) {
-        if(context == null || context.getResources() == null)
+        if (context == null || context.getResources() == null)
             return;
 
         ContextManager.setContext(context);
 
-        if(!getSyncUtilities().isLoggedIn())
+        if (!getSyncUtilities().isLoggedIn())
             return;
 
         getSyncProvider().synchronize(context);
@@ -99,16 +105,16 @@ abstract public class SyncBackgroundService extends Service {
         try {
             syncFrequencySeconds = Preferences.getIntegerFromString(
                     getSyncUtilities().getSyncIntervalKey(), -1);
-        } catch(ClassCastException e) {
+        } catch (ClassCastException e) {
             Preferences.setStringFromInteger(getSyncUtilities().getSyncIntervalKey(), 0);
         }
         Context context = ContextManager.getContext();
-        if(syncFrequencySeconds <= 0) {
-    	    unscheduleService(context);
-    	    return;
-    	}
+        if (syncFrequencySeconds <= 0) {
+            unscheduleService(context);
+            return;
+        }
 
-    	// figure out synchronization frequency
+        // figure out synchronization frequency
         long interval = 1000L * syncFrequencySeconds;
         long offset = computeNextSyncOffset(interval);
 
@@ -120,7 +126,7 @@ abstract public class SyncBackgroundService extends Service {
                 createAlarmIntent(context), PendingIntent.FLAG_UPDATE_CURRENT);
 
         Log.i("Astrid", "Autosync set for " + offset / 1000 //$NON-NLS-1$ //$NON-NLS-2$
-            + " seconds repeating every " + syncFrequencySeconds); //$NON-NLS-1$
+                + " seconds repeating every " + syncFrequencySeconds); //$NON-NLS-1$
 
         // cancel all existing
         am.cancel(pendingIntent);
@@ -135,13 +141,15 @@ abstract public class SyncBackgroundService extends Service {
      * Removes repeating alarm for auto-synchronization
      */
     private void unscheduleService(Context context) {
-        AlarmManager am = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
+        AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
         PendingIntent pendingIntent = PendingIntent.getService(context, getSyncUtilities().getSyncIntervalKey(),
                 createAlarmIntent(context), PendingIntent.FLAG_UPDATE_CURRENT);
         am.cancel(pendingIntent);
     }
 
-    /** Create the alarm intent */
+    /**
+     * Create the alarm intent
+     */
     private Intent createAlarmIntent(Context context) {
         Intent intent = new Intent(context, getClass());
         return intent;
@@ -154,7 +162,7 @@ abstract public class SyncBackgroundService extends Service {
         long lastSyncDate = getSyncUtilities().getLastSyncDate();
 
         // if user never synchronized, give them a full offset period before bg sync
-        if(lastSyncDate != 0)
+        if (lastSyncDate != 0)
             return Math.max(0, lastSyncDate + interval - DateUtilities.now());
         else
             return interval;
diff --git a/api/src/com/todoroo/astrid/sync/SyncContainer.java b/api/src/com/todoroo/astrid/sync/SyncContainer.java
index 0ede39ce1..c742df94c 100644
--- a/api/src/com/todoroo/astrid/sync/SyncContainer.java
+++ b/api/src/com/todoroo/astrid/sync/SyncContainer.java
@@ -5,19 +5,18 @@
  */
 package com.todoroo.astrid.sync;
 
-import java.util.ArrayList;
-
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.Task;
 
+import java.util.ArrayList;
+
 /**
  * Container class for transmitting tasks and including local and remote
  * metadata. Synchronization Providers can subclass this class if desired.
  *
- * @see SyncProvider
  * @author Tim Su <tim@todoroo.com>
- *
+ * @see SyncProvider
  */
 public class SyncContainer {
     public Task task;
@@ -25,12 +24,13 @@ public class SyncContainer {
 
     /**
      * Check if the metadata contains anything with the given key
+     *
      * @param key
      * @return first match. or null
      */
     public Metadata findMetadata(String key) {
-        for(Metadata item : metadata) {
-            if(AndroidUtilities.equals(key, item.getValue(Metadata.KEY)))
+        for (Metadata item : metadata) {
+            if (AndroidUtilities.equals(key, item.getValue(Metadata.KEY)))
                 return item;
         }
         return null;
diff --git a/api/src/com/todoroo/astrid/sync/SyncProvider.java b/api/src/com/todoroo/astrid/sync/SyncProvider.java
index 2631981b0..a82933418 100644
--- a/api/src/com/todoroo/astrid/sync/SyncProvider.java
+++ b/api/src/com/todoroo/astrid/sync/SyncProvider.java
@@ -5,12 +5,6 @@
  */
 package com.todoroo.astrid.sync;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-
 import android.app.Activity;
 import android.app.Notification;
 import android.content.Context;
@@ -27,20 +21,25 @@ import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.astrid.api.R;
 import com.todoroo.astrid.data.Task;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+
 /**
  * A helper class for writing synchronization services for Astrid. This class
  * contains logic for merging incoming changes and writing outgoing changes.
- * <p>
+ * <p/>
  * Use {@link #initiateManual} as the entry point for your synchronization
  * service, which should check if a user is logged in. If not, you should
  * handle that in the UI, otherwise, you should launch your background
  * service to perform synchronization in the background.
- * <p>
+ * <p/>
  * Your background service should {@link #synchronize}, which in turn
  * invokes  {@link #initiateBackground} to initiate synchronization.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public abstract class SyncProvider<TYPE extends SyncContainer> {
 
@@ -55,8 +54,7 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
      * Perform log in (launching activity if necessary) and sync. This is
      * invoked when users manually request synchronization
      *
-     * @param activity
-     *            context
+     * @param activity context
      */
     abstract protected void initiateManual(Activity activity);
 
@@ -69,18 +67,18 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
 
     /**
      * Updates the text of a notification and the intent to open when tapped
+     *
      * @param context
      * @param notification
      * @return notification id (in Android, there is at most one notification
-     *         in the tray for a given id)
+     * in the tray for a given id)
      */
     abstract protected int updateNotification(Context context, Notification n);
 
     /**
      * Create a task on the remote server.
      *
-     * @param task
-     *            task to create
+     * @param task task to create
      */
     abstract protected TYPE create(TYPE task) throws IOException;
 
@@ -88,10 +86,8 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
      * Push variables from given task to the remote server, and read the newly
      * updated task.
      *
-     * @param task
-     *            task proxy to push
-     * @param remoteTask
-     *            remote task that we merged with. may be null
+     * @param task       task proxy to push
+     * @param remoteTask remote task that we merged with. may be null
      * @return task pulled on remote server
      */
     abstract protected TYPE push(TYPE task, TYPE remote) throws IOException;
@@ -99,8 +95,7 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
     /**
      * Fetch remote task. Used to re-read merged tasks
      *
-     * @param task
-     *            task with id's to re-read
+     * @param task task with id's to re-read
      * @return new Task
      */
     abstract protected TYPE pull(TYPE task) throws IOException;
@@ -132,13 +127,14 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
      * Transfer remote identifier(s) from one task to another
      */
     abstract protected void transferIdentifiers(TYPE source,
-            TYPE destination);
+                                                TYPE destination);
 
     // --- implementation
 
     private final Notification notification;
 
-    @Autowired protected ExceptionService exceptionService;
+    @Autowired
+    protected ExceptionService exceptionService;
 
     public SyncProvider() {
         DependencyInjectionService.getInstance().inject(this);
@@ -152,6 +148,7 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
 
     /**
      * Synchronize this provider with sync toast
+     *
      * @param context
      */
     public void synchronize(final Context context) {
@@ -160,23 +157,24 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
 
     /**
      * Synchronize this provider
+     *
      * @param context
      * @param showSyncToast should we toast to indicate synchronizing?
      */
     public void synchronize(final Context context, final boolean showSyncToast) {
         // display toast
-        if(context instanceof Activity) {
-            if(getUtilities().isLoggedIn() && getUtilities().shouldShowToast()) {
+        if (context instanceof Activity) {
+            if (getUtilities().isLoggedIn() && getUtilities().shouldShowToast()) {
                 ((Activity) context).runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
-                        if(showSyncToast)
+                        if (showSyncToast)
                             makeSyncToast(context);
                     }
                 });
             }
-            initiateManual((Activity)context);
-        } else if(context instanceof SyncBackgroundService) {
+            initiateManual((Activity) context);
+        } else if (context instanceof SyncBackgroundService) {
             // display notification
             final int notificationId = updateNotification(context, notification);
             final NotificationManager nm = new NotificationManager.AndroidNotificationManager(context);
@@ -189,7 +187,7 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
                         initiateBackground();
                     } finally {
                         nm.cancel(notificationId);
-                        ((SyncBackgroundService)context).stop();
+                        ((SyncBackgroundService) context).stop();
                     }
                 }
             }).start();
@@ -208,7 +206,7 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
 
     /**
      * Helper to synchronize remote tasks with our local database.
-     *
+     * <p/>
      * This initiates the following process: 1. local changes are read 2. remote
      * changes are read 3. local tasks are merged with remote changes and pushed
      * across 4. remote changes are then read in
@@ -221,9 +219,9 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
         // create internal data structures
         HashMap<String, Integer> remoteNewTaskNameMap = new HashMap<String, Integer>();
         length = data.remoteUpdated.size();
-        for(int i = 0; i < length; i++) {
+        for (int i = 0; i < length; i++) {
             TYPE remote = data.remoteUpdated.get(i);
-            if(remote.task.getId() != Task.NO_ID)
+            if (remote.task.getId() != Task.NO_ID)
                 continue;
             remoteNewTaskNameMap.put(remote.task.getValue(Task.TITLE), i);
         }
@@ -259,34 +257,36 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
 
         Collections.sort(data.remoteUpdated, new Comparator<TYPE>() {
             private static final int SENTINEL = -2;
+
             private final int check(TYPE o1, TYPE o2, LongProperty property) {
                 long o1Property = o1.task.getValue(property);
                 long o2Property = o2.task.getValue(property);
-                if(o1Property != 0 && o2Property != 0)
+                if (o1Property != 0 && o2Property != 0)
                     return 0;
-                else if(o1Property != 0)
+                else if (o1Property != 0)
                     return -1;
-                else if(o2Property != 0)
+                else if (o2Property != 0)
                     return 1;
                 return SENTINEL;
             }
+
             public int compare(TYPE o1, TYPE o2) {
                 int comparison = check(o1, o2, Task.DELETION_DATE);
-                if(comparison != SENTINEL)
+                if (comparison != SENTINEL)
                     return comparison;
                 comparison = check(o1, o2, Task.COMPLETION_DATE);
-                if(comparison != SENTINEL)
+                if (comparison != SENTINEL)
                     return comparison;
                 return 0;
             }
         });
 
         length = data.remoteUpdated.size();
-        for(int i = 0; i < length; i++) {
+        for (int i = 0; i < length; i++) {
             TYPE remote = data.remoteUpdated.get(i);
 
             // don't synchronize new & deleted tasks
-            if(!remote.task.isSaved() && (remote.task.isDeleted()))
+            if (!remote.task.isSaved() && (remote.task.isDeleted()))
                 continue;
 
             try {
@@ -300,16 +300,16 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
     protected void sendLocallyUpdated(SyncData<TYPE> data) throws IOException {
         int length;
         length = data.localUpdated.getCount();
-        for(int i = 0; i < length; i++) {
+        for (int i = 0; i < length; i++) {
             data.localUpdated.moveToNext();
             TYPE local = read(data.localUpdated);
             try {
-                if(local.task == null)
+                if (local.task == null)
                     continue;
 
                 // if there is a conflict, merge
-                int remoteIndex = matchTask((ArrayList<TYPE>)data.remoteUpdated, local);
-                if(remoteIndex != -1) {
+                int remoteIndex = matchTask((ArrayList<TYPE>) data.remoteUpdated, local);
+                if (remoteIndex != -1) {
                     TYPE remote = data.remoteUpdated.get(remoteIndex);
 
                     remote = push(local, remote);
@@ -328,10 +328,10 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
     }
 
     protected void sendLocallyCreated(SyncData<TYPE> data,
-            HashMap<String, Integer> remoteNewTaskNameMap) throws IOException {
+                                      HashMap<String, Integer> remoteNewTaskNameMap) throws IOException {
         int length;
         length = data.localCreated.getCount();
-        for(int i = 0; i < length; i++) {
+        for (int i = 0; i < length; i++) {
             data.localCreated.moveToNext();
             TYPE local = read(data.localCreated);
             try {
@@ -371,12 +371,9 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
      * to the user (unless synchronization is happening in background)
      *
      * @param context
-     * @param tag
-     *            error tag
-     * @param e
-     *            exception
-     * @param showError
-     *            whether to display a dialog
+     * @param tag       error tag
+     * @param e         exception
+     * @param showError whether to display a dialog
      */
     protected void handleException(String tag, Exception e, boolean displayError) {
         //TODO: When Crittercism supports it, report error to them
@@ -386,12 +383,12 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
         String message = null;
 
         // occurs when application was closed
-        if(e instanceof IllegalStateException) {
+        if (e instanceof IllegalStateException) {
             exceptionService.reportError(tag + "-caught", e); //$NON-NLS-1$
         }
 
         // occurs when network error
-        else if(e instanceof IOException) {
+        else if (e instanceof IOException) {
             exceptionService.reportError(tag + "-io", e); //$NON-NLS-1$
             message = context.getString(R.string.SyP_ioerror);
         }
@@ -402,15 +399,17 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
             exceptionService.reportError(tag + "-unhandled", e); //$NON-NLS-1$
         }
 
-        if(displayError && context instanceof Activity && message != null) {
-            DialogUtilities.okDialog((Activity)context,
+        if (displayError && context instanceof Activity && message != null) {
+            DialogUtilities.okDialog((Activity) context,
                     message, null);
         }
     }
 
     // --- helper classes
 
-    /** data structure builder */
+    /**
+     * data structure builder
+     */
     protected static class SyncData<TYPE extends SyncContainer> {
         public ArrayList<TYPE> remoteUpdated;
 
@@ -418,8 +417,8 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
         public TodorooCursor<Task> localUpdated;
 
         public SyncData(ArrayList<TYPE> remoteUpdated,
-                TodorooCursor<Task> localCreated,
-                TodorooCursor<Task> localUpdated) {
+                        TodorooCursor<Task> localCreated,
+                        TodorooCursor<Task> localUpdated) {
             super();
             this.remoteUpdated = remoteUpdated;
             this.localCreated = localCreated;
diff --git a/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java b/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java
index 65c772bca..700261524 100644
--- a/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java
+++ b/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.sync;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Set;
-
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
@@ -29,12 +25,15 @@ import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.TodorooPreferenceActivity;
 import com.todoroo.astrid.api.R;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Set;
+
 /**
  * Utility class for common synchronization action: displaying synchronization
  * preferences and an action panel so users can initiate actions from the menu.
  *
  * @author Tim Su <tim@todoroo.com
- *
  */
 abstract public class SyncProviderPreferences extends TodorooPreferenceActivity {
 
@@ -87,16 +86,14 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity
             @Override
             public void onChildViewAdded(View parent, View child) {
                 View view = findViewById(R.id.status);
-                if(view != null)
+                if (view != null)
                     view.setBackgroundColor(statusColor);
             }
         });
     }
 
     /**
-     *
-     * @param resource
-     *            if null, updates all resources
+     * @param resource if null, updates all resources
      */
     @Override
     public void updatePreferences(Preference preference, Object value) {
@@ -123,25 +120,25 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity
             //String subtitle = ""; //$NON-NLS-1$
 
             // ! logged in - display message, click -> sync
-            if(!loggedIn) {
+            if (!loggedIn) {
                 status = r.getString(R.string.sync_status_loggedout);
                 statusColor = Color.rgb(19, 132, 165);
             }
             // sync is occurring
-            else if(getUtilities().isOngoing()) {
+            else if (getUtilities().isOngoing()) {
                 status = r.getString(R.string.sync_status_ongoing);
                 statusColor = Color.rgb(0, 0, 100);
             }
             // last sync had errors
-            else if(getUtilities().getLastError() != null || getUtilities().getLastAttemptedSyncDate() != 0) {
+            else if (getUtilities().getLastError() != null || getUtilities().getLastAttemptedSyncDate() != 0) {
                 // last sync was failure
-                if(getUtilities().getLastAttemptedSyncDate() != 0) {
+                if (getUtilities().getLastAttemptedSyncDate() != 0) {
                     status = r.getString(R.string.sync_status_failed,
-                        DateUtilities.getDateStringWithTime(SyncProviderPreferences.this,
-                        new Date(getUtilities().getLastAttemptedSyncDate())));
+                            DateUtilities.getDateStringWithTime(SyncProviderPreferences.this,
+                                    new Date(getUtilities().getLastAttemptedSyncDate())));
                     statusColor = Color.rgb(100, 0, 0);
 
-                    if(getUtilities().getLastSyncDate() > 0) {
+                    if (getUtilities().getLastSyncDate() > 0) {
 //                        subtitle = r.getString(R.string.sync_status_failed_subtitle,
 //                                DateUtilities.getDateStringWithTime(SyncProviderPreferences.this,
 //                                        new Date(getUtilities().getLastSyncDate())));
@@ -154,11 +151,10 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity
                     status = r.getString(R.string.sync_status_errors, dateString);
                     statusColor = Color.rgb(100, 100, 0);
                 }
-            }
-            else if(getUtilities().getLastSyncDate() > 0) {
+            } else if (getUtilities().getLastSyncDate() > 0) {
                 status = r.getString(R.string.sync_status_success,
                         DateUtilities.getDateStringWithTime(SyncProviderPreferences.this,
-                        new Date(getUtilities().getLastSyncDate())));
+                                new Date(getUtilities().getLastSyncDate())));
                 statusColor = Color.rgb(0, 100, 0);
             } else {
                 status = r.getString(R.string.sync_status_never);
@@ -175,10 +171,9 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity
             });
 
             View view = findViewById(R.id.status);
-            if(view != null)
+            if (view != null)
                 view.setBackgroundColor(statusColor);
-        }
-        else if (r.getString(R.string.sync_SPr_key_last_error).equals(preference.getKey())) {
+        } else if (r.getString(R.string.sync_SPr_key_last_error).equals(preference.getKey())) {
             if (getUtilities().getLastError() != null) {
                 // Display error
                 final String service = getTitle().toString();
@@ -193,21 +188,21 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity
                     public boolean onPreferenceClick(Preference pref) {
                         // Show last error
                         new AlertDialog.Builder(SyncProviderPreferences.this)
-                            .setTitle(R.string.sync_SPr_last_error)
-                            .setMessage(lastErrorDisplay)
-                            .setPositiveButton(R.string.sync_SPr_send_report, new OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    Intent emailIntent = new Intent(Intent.ACTION_SEND);
-                                    emailIntent.setType("plain/text")
-                                               .putExtra(Intent.EXTRA_EMAIL, new String[] { "android-bugs@astrid.com"} )
-                                               .putExtra(Intent.EXTRA_SUBJECT, service + " Sync Error")
-                                               .putExtra(Intent.EXTRA_TEXT, lastErrorFull);
-                                    startActivity(Intent.createChooser(emailIntent, r.getString(R.string.sync_SPr_send_report)));
-                                }
-                            })
-                            .setNegativeButton(R.string.DLG_close, null)
-                            .create().show();
+                                .setTitle(R.string.sync_SPr_last_error)
+                                .setMessage(lastErrorDisplay)
+                                .setPositiveButton(R.string.sync_SPr_send_report, new OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        Intent emailIntent = new Intent(Intent.ACTION_SEND);
+                                        emailIntent.setType("plain/text")
+                                                .putExtra(Intent.EXTRA_EMAIL, new String[]{"android-bugs@astrid.com"})
+                                                .putExtra(Intent.EXTRA_SUBJECT, service + " Sync Error")
+                                                .putExtra(Intent.EXTRA_TEXT, lastErrorFull);
+                                        startActivity(Intent.createChooser(emailIntent, r.getString(R.string.sync_SPr_send_report)));
+                                    }
+                                })
+                                .setNegativeButton(R.string.DLG_close, null)
+                                .create().show();
                         return true;
                     }
                 });
@@ -226,7 +221,7 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity
                             r.getString(R.string.sync_forget_confirm), new OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog,
-                                int which) {
+                                            int which) {
                             logOut();
                             initializePreference(getPreferenceScreen());
                         }
@@ -234,7 +229,7 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity
                     return true;
                 }
             });
-            if(!loggedIn) {
+            if (!loggedIn) {
                 PreferenceCategory category = (PreferenceCategory) findPreference(r.getString(R.string.sync_SPr_key_options));
                 category.removePreference(preference);
             }
@@ -245,7 +240,7 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity
     /**
      * We can define exception strings in this map that we want to replace with more user-friendly
      * messages. As we discover new exception types, we can expand the map.
-     *
+     * <p/>
      * NOTE: All resources are currently required to have a single string format argument
      * for inserting the service name into the error message
      */
diff --git a/api/src/com/todoroo/astrid/sync/SyncProviderUtilities.java b/api/src/com/todoroo/astrid/sync/SyncProviderUtilities.java
index ae6d3e756..6c8332265 100644
--- a/api/src/com/todoroo/astrid/sync/SyncProviderUtilities.java
+++ b/api/src/com/todoroo/astrid/sync/SyncProviderUtilities.java
@@ -42,7 +42,9 @@ abstract public class SyncProviderUtilities {
 
     protected static final String PREF_ONGOING = "_ongoing"; //$NON-NLS-1$
 
-    /** Get preferences object from the context */
+    /**
+     * Get preferences object from the context
+     */
     protected static SharedPreferences getPrefs() {
         return PreferenceManager.getDefaultSharedPreferences(ContextManager.getContext());
     }
@@ -61,54 +63,74 @@ abstract public class SyncProviderUtilities {
         return getPrefs().getString(getIdentifier() + PREF_TOKEN, null) != null;
     }
 
-    /** authentication token, or null if doesn't exist */
+    /**
+     * authentication token, or null if doesn't exist
+     */
     public String getToken() {
         return getPrefs().getString(getIdentifier() + PREF_TOKEN, null);
     }
 
-    /** Returns something like "Logged in as: user@gmail.com" */
+    /**
+     * Returns something like "Logged in as: user@gmail.com"
+     */
     abstract public String getLoggedInUserName();
 
-    /** Sets the authentication token. Set to null to clear. */
+    /**
+     * Sets the authentication token. Set to null to clear.
+     */
     public void setToken(String setting) {
         Editor editor = getPrefs().edit();
         editor.putString(getIdentifier() + PREF_TOKEN, setting);
         editor.commit();
     }
 
-    /** @return Last Successful Sync Date, or 0 */
+    /**
+     * @return Last Successful Sync Date, or 0
+     */
     public long getLastSyncDate() {
         return getPrefs().getLong(getIdentifier() + PREF_LAST_SYNC, 0);
     }
 
-    /** @return Last Attempted Sync Date, or 0 if it was successful */
+    /**
+     * @return Last Attempted Sync Date, or 0 if it was successful
+     */
     public long getLastAttemptedSyncDate() {
         return getPrefs().getLong(getIdentifier() + PREF_LAST_ATTEMPTED_SYNC, 0);
     }
 
-    /** @return Last Error, or null if no last error */
+    /**
+     * @return Last Error, or null if no last error
+     */
     public String getLastError() {
         return getPrefs().getString(getIdentifier() + PREF_LAST_ERROR, null);
     }
 
-    /** @return Last Error type, or null if no last error */
+    /**
+     * @return Last Error type, or null if no last error
+     */
     public String getLastErrorType() {
         return getPrefs().getString(getIdentifier() + PREF_LAST_ERROR_TYPE, null);
     }
 
-    /** @return Last Error, or null if no last error */
+    /**
+     * @return Last Error, or null if no last error
+     */
     public boolean isOngoing() {
         return getPrefs().getBoolean(getIdentifier() + PREF_ONGOING, false);
     }
 
-    /** Deletes Last Successful Sync Date */
+    /**
+     * Deletes Last Successful Sync Date
+     */
     public void clearLastSyncDate() {
         Editor editor = getPrefs().edit();
         editor.remove(getIdentifier() + PREF_LAST_SYNC);
         editor.commit();
     }
 
-    /** Set Last Error */
+    /**
+     * Set Last Error
+     */
     public void setLastError(String error, String type) {
         Editor editor = getPrefs().edit();
         editor.putString(getIdentifier() + PREF_LAST_ERROR, error);
@@ -116,14 +138,18 @@ abstract public class SyncProviderUtilities {
         editor.commit();
     }
 
-    /** Set Ongoing */
+    /**
+     * Set Ongoing
+     */
     public void stopOngoing() {
         Editor editor = getPrefs().edit();
         editor.putBoolean(getIdentifier() + PREF_ONGOING, false);
         editor.commit();
     }
 
-    /** Set Last Successful Sync Date */
+    /**
+     * Set Last Successful Sync Date
+     */
     public void recordSuccessfulSync() {
         Editor editor = getPrefs().edit();
         editor.putLong(getIdentifier() + PREF_LAST_SYNC, DateUtilities.now() + 1000);
@@ -131,7 +157,9 @@ abstract public class SyncProviderUtilities {
         editor.commit();
     }
 
-    /** Report last error if one exists */
+    /**
+     * Report last error if one exists
+     */
     public void reportLastError() {
         String lastError = getLastError();
         if (!TextUtils.isEmpty(lastError)) {
@@ -144,7 +172,9 @@ abstract public class SyncProviderUtilities {
         // Subclasses can override if necessary
     }
 
-    /** Set Last Attempted Sync Date */
+    /**
+     * Set Last Attempted Sync Date
+     */
     public void recordSyncStart() {
         Editor editor = getPrefs().edit();
         editor.putLong(getIdentifier() + PREF_LAST_ATTEMPTED_SYNC,
diff --git a/api/src/com/todoroo/astrid/sync/SyncResultCallback.java b/api/src/com/todoroo/astrid/sync/SyncResultCallback.java
index 0bb844b91..8a860584b 100644
--- a/api/src/com/todoroo/astrid/sync/SyncResultCallback.java
+++ b/api/src/com/todoroo/astrid/sync/SyncResultCallback.java
@@ -8,12 +8,14 @@ package com.todoroo.astrid.sync;
 public interface SyncResultCallback {
     /**
      * Increment max sync progress
+     *
      * @param incrementBy
      */
     public void incrementMax(int incrementBy);
 
     /**
      * Increment current sync progress
+     *
      * @param incrementBy
      */
     public void incrementProgress(int incrementBy);
diff --git a/api/src/com/todoroo/astrid/sync/SyncResultCallbackAdapter.java b/api/src/com/todoroo/astrid/sync/SyncResultCallbackAdapter.java
index 007675649..c4bbbabdb 100644
--- a/api/src/com/todoroo/astrid/sync/SyncResultCallbackAdapter.java
+++ b/api/src/com/todoroo/astrid/sync/SyncResultCallbackAdapter.java
@@ -6,14 +6,12 @@
 package com.todoroo.astrid.sync;
 
 
-
-
 /**
  * Convenience class for implementing sync result callbacks--if we need a sync
  * result callback that only implements a subset of the callback methods, it
  * can extend this empty implementation
- * @author Sam
  *
+ * @author Sam
  */
 public abstract class SyncResultCallbackAdapter implements SyncResultCallback {
 
diff --git a/api/src/com/todoroo/astrid/sync/SyncV2BackgroundService.java b/api/src/com/todoroo/astrid/sync/SyncV2BackgroundService.java
index 9e6dded89..d46c9c1f6 100644
--- a/api/src/com/todoroo/astrid/sync/SyncV2BackgroundService.java
+++ b/api/src/com/todoroo/astrid/sync/SyncV2BackgroundService.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.sync;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -23,23 +21,27 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.api.AstridApiConstants;
 
+import java.util.concurrent.atomic.AtomicBoolean;
+
 /**
  * Performs synchronization service logic in background service to avoid
  * ANR (application not responding) messages.
- * <p>
+ * <p/>
  * Starting this service
- *  schedules a repeating alarm which handles
+ * schedules a repeating alarm which handles
  * synchronization with your serv
  *
  * @author Tim Su
- *
  */
 abstract public class SyncV2BackgroundService extends Service {
 
-	/** Minimum time before an auto-sync */
-	private static final long AUTO_SYNC_MIN_OFFSET = 5*60*1000L;
+    /**
+     * Minimum time before an auto-sync
+     */
+    private static final long AUTO_SYNC_MIN_OFFSET = 5 * 60 * 1000L;
 
-    @Autowired private ExceptionService exceptionService;
+    @Autowired
+    private ExceptionService exceptionService;
 
     // --- abstract methods
 
@@ -55,11 +57,13 @@ abstract public class SyncV2BackgroundService extends Service {
 
     private final AtomicBoolean started = new AtomicBoolean(false);
 
-    /** Receive the alarm - start the synchronize service! */
+    /**
+     * Receive the alarm - start the synchronize service!
+     */
     @Override
     public void onStart(Intent intent, int startId) {
         try {
-            if(intent != null && !started.getAndSet(true)) {
+            if (intent != null && !started.getAndSet(true)) {
                 startSynchronization(this);
             }
         } catch (Exception e) {
@@ -67,14 +71,16 @@ abstract public class SyncV2BackgroundService extends Service {
         }
     }
 
-    /** Start the actual synchronization */
+    /**
+     * Start the actual synchronization
+     */
     private void startSynchronization(final Context context) {
-        if(context == null || context.getResources() == null)
+        if (context == null || context.getResources() == null)
             return;
 
         ContextManager.setContext(context);
 
-        if(!getSyncUtilities().isLoggedIn())
+        if (!getSyncUtilities().isLoggedIn())
             return;
 
         SyncV2Provider provider = getSyncProvider();
@@ -108,16 +114,16 @@ abstract public class SyncV2BackgroundService extends Service {
         try {
             syncFrequencySeconds = Preferences.getIntegerFromString(
                     getSyncUtilities().getSyncIntervalKey(), -1);
-        } catch(ClassCastException e) {
+        } catch (ClassCastException e) {
             Preferences.setStringFromInteger(getSyncUtilities().getSyncIntervalKey(), 0);
         }
         Context context = ContextManager.getContext();
-        if(syncFrequencySeconds <= 0) {
-    	    unscheduleService(context);
-    	    return;
-    	}
+        if (syncFrequencySeconds <= 0) {
+            unscheduleService(context);
+            return;
+        }
 
-    	// figure out synchronization frequency
+        // figure out synchronization frequency
         long interval = 1000L * syncFrequencySeconds;
         long offset = computeNextSyncOffset(interval);
 
@@ -129,7 +135,7 @@ abstract public class SyncV2BackgroundService extends Service {
                 createAlarmIntent(context), PendingIntent.FLAG_UPDATE_CURRENT);
 
         Log.i("Astrid", "Autosync set for " + offset / 1000 //$NON-NLS-1$ //$NON-NLS-2$
-            + " seconds repeating every " + syncFrequencySeconds); //$NON-NLS-1$
+                + " seconds repeating every " + syncFrequencySeconds); //$NON-NLS-1$
 
         // cancel all existing
         am.cancel(pendingIntent);
@@ -144,13 +150,15 @@ abstract public class SyncV2BackgroundService extends Service {
      * Removes repeating alarm for auto-synchronization
      */
     private void unscheduleService(Context context) {
-        AlarmManager am = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
+        AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
         PendingIntent pendingIntent = PendingIntent.getService(context, getSyncUtilities().getSyncIntervalKey(),
                 createAlarmIntent(context), PendingIntent.FLAG_UPDATE_CURRENT);
         am.cancel(pendingIntent);
     }
 
-    /** Create the alarm intent */
+    /**
+     * Create the alarm intent
+     */
     private Intent createAlarmIntent(Context context) {
         Intent intent = new Intent(context, getClass());
         return intent;
@@ -163,7 +171,7 @@ abstract public class SyncV2BackgroundService extends Service {
         long lastSyncDate = getSyncUtilities().getLastSyncDate();
 
         // if user never synchronized, give them a full offset period before bg sync
-        if(lastSyncDate != 0)
+        if (lastSyncDate != 0)
             return Math.max(0, lastSyncDate + interval - DateUtilities.now());
         else
             return interval;
diff --git a/api/src/com/todoroo/astrid/sync/SyncV2Provider.java b/api/src/com/todoroo/astrid/sync/SyncV2Provider.java
index ed81eddc0..45f0632a2 100644
--- a/api/src/com/todoroo/astrid/sync/SyncV2Provider.java
+++ b/api/src/com/todoroo/astrid/sync/SyncV2Provider.java
@@ -5,14 +5,14 @@
  */
 package com.todoroo.astrid.sync;
 
-import java.io.IOException;
-
 import android.app.Activity;
 
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService;
 
+import java.io.IOException;
+
 
 abstract public class SyncV2Provider {
 
@@ -22,12 +22,12 @@ abstract public class SyncV2Provider {
             getUtilities().setLastError(e.toString(), type);
 
             // occurs when application was closed
-            if(e instanceof IllegalStateException) {
+            if (e instanceof IllegalStateException) {
                 exceptionService.reportError(tag + "-caught", e); //$NON-NLS-1$
             }
 
             // occurs when network error
-            else if(e instanceof IOException) {
+            else if (e instanceof IOException) {
                 exceptionService.reportError(tag + "-io", e); //$NON-NLS-1$
             }
 
@@ -60,15 +60,17 @@ abstract public class SyncV2Provider {
 
     /**
      * Synchronize all of user's active tasks
-     * @param manual whether manually triggered
+     *
+     * @param manual   whether manually triggered
      * @param callback callback object
      */
     abstract public void synchronizeActiveTasks(boolean manual, SyncResultCallback callback);
 
     /**
      * Synchronize a single list
-     * @param list object representing list (TaskListActivity-dependent)
-     * @param manual whether was manually triggered
+     *
+     * @param list     object representing list (TaskListActivity-dependent)
+     * @param manual   whether was manually triggered
      * @param callback callback object
      */
     abstract public void synchronizeList(Object list, boolean manual, SyncResultCallback callback);
diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 69d8e9d39..1dfc13c27 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -8,656 +8,746 @@
           package="com.timsu.astrid"
           android:versionName="4.6.5"
           android:versionCode="306">
-          
-  <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
-  <!--    android:installLocation="internalOnly"> -->
-       
-      
-  <!-- ================================================== Used Permissions = -->
-
-  <!-- for notifications -->
-  <uses-permission android:name="android.permission.VIBRATE"/>
-  <!-- for synchronization -->
-  <uses-permission android:name="android.permission.INTERNET"/>
-  <!-- for google calendar integration -->
-  <uses-permission android:name="android.permission.WRITE_CALENDAR" />
-  <uses-permission android:name="android.permission.READ_CALENDAR" />
-  <!-- for creating shortcuts -->
-  <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-  <!-- for backup -->
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />    
-  <!-- for analytics -->
-  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-  <!-- for google tasks -->
-  <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-  <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-  <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-  <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
-  <!-- for task sharing -->
-  <uses-permission android:name="android.permission.READ_CONTACTS" />  
-  <!-- for push notifications -->
-  <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
-  <!-- for missed call reminders -->
-  <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-  <!-- required for ics -->
-  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-  <uses-permission android:name="android.permission.RECORD_AUDIO" />
-  
-  <!-- required for in-app billing of premium subscriptions -->
-  <uses-permission android:name="com.android.vending.BILLING"/>
-  
-  <!-- Required for GCM - keeps the processor from sleeping when a message is received. -->
-  <uses-permission android:name="android.permission.WAKE_LOCK" />
-  
-  <!-- Used to initiate sync when device comes back online -->
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-
-  <!-- ============================================== Exported Permissions = -->
-
-  <!-- for v2 tasks provider -->
-  <permission android:name="com.timsu.astrid.permission.READ_TASKS"
-              android:permissionGroup="android.permission-group.MESSAGES"
-              android:protectionLevel="normal"
-              android:label="@string/read_permission_label"
-              android:description="@string/read_permission_desc"/>
-  <uses-permission android:name="com.timsu.astrid.permission.READ_TASKS"/>
-  
-  <!-- for reading data from add-ons or astrid via v3 content provider -->
-  <permission android:name="com.todoroo.astrid.READ"
-              android:description="@string/read_permission_desc"
-              android:protectionLevel="normal"
-              android:label="@string/read_permission_label" />
-  <uses-permission android:name="com.todoroo.astrid.READ" />
-  
-  <!-- for writing data to add-ons or astrid via v3 content provider -->
-  <permission android:name="com.todoroo.astrid.WRITE"
-              android:description="@string/write_permission_desc"
-              android:protectionLevel="normal"
-              android:label="@string/write_permission_label" />
-  <uses-permission android:name="com.todoroo.astrid.WRITE" />
-  <!-- for receiving C2D messages-->
-  <permission android:name="com.timsu.astrid.permission.C2D_MESSAGE" 
-              android:protectionLevel="signature" />
-  <uses-permission android:name="com.timsu.astrid.permission.C2D_MESSAGE" />
-  
-  <!-- ========================================================== Metadata = -->
-
-  <uses-sdk android:targetSdkVersion="10"
+
+    <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
+    <!--    android:installLocation="internalOnly"> -->
+
+
+    <!-- ================================================== Used Permissions = -->
+
+    <!-- for notifications -->
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <!-- for synchronization -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <!-- for google calendar integration -->
+    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
+    <uses-permission android:name="android.permission.READ_CALENDAR"/>
+    <!-- for creating shortcuts -->
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
+    <!-- for backup -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <!-- for analytics -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <!-- for google tasks -->
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
+    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS"/>
+    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH"/>
+    <!-- for task sharing -->
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <!-- for push notifications -->
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
+    <!-- for missed call reminders -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <!-- required for ics -->
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+
+    <!-- required for in-app billing of premium subscriptions -->
+    <uses-permission android:name="com.android.vending.BILLING"/>
+
+    <!-- Required for GCM - keeps the processor from sleeping when a message is received. -->
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+
+    <!-- Used to initiate sync when device comes back online -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
+    <!-- ============================================== Exported Permissions = -->
+
+    <!-- for v2 tasks provider -->
+    <permission
+            android:name="com.timsu.astrid.permission.READ_TASKS"
+            android:permissionGroup="android.permission-group.MESSAGES"
+            android:protectionLevel="normal"
+            android:label="@string/read_permission_label"
+            android:description="@string/read_permission_desc"/>
+    <uses-permission android:name="com.timsu.astrid.permission.READ_TASKS"/>
+
+    <!-- for reading data from add-ons or astrid via v3 content provider -->
+    <permission
+            android:name="com.todoroo.astrid.READ"
+            android:description="@string/read_permission_desc"
+            android:protectionLevel="normal"
+            android:label="@string/read_permission_label"/>
+    <uses-permission android:name="com.todoroo.astrid.READ"/>
+
+    <!-- for writing data to add-ons or astrid via v3 content provider -->
+    <permission
+            android:name="com.todoroo.astrid.WRITE"
+            android:description="@string/write_permission_desc"
+            android:protectionLevel="normal"
+            android:label="@string/write_permission_label"/>
+    <uses-permission android:name="com.todoroo.astrid.WRITE"/>
+    <!-- for receiving C2D messages-->
+    <permission
+            android:name="com.timsu.astrid.permission.C2D_MESSAGE"
+            android:protectionLevel="signature"/>
+    <uses-permission android:name="com.timsu.astrid.permission.C2D_MESSAGE"/>
+
+    <!-- ========================================================== Metadata = -->
+
+    <uses-sdk
+            android:targetSdkVersion="10"
             android:minSdkVersion="7"/>
-  <supports-screens android:xlargeScreens="true" android:largeScreens="true"/>
-  
-  <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
-  
-  <application android:icon="@drawable/icon" 
-               android:label="@string/app_name"
-               android:theme="@style/Theme"
-               android:name="greendroid.app.GDApplication" 
-               android:hardwareAccelerated="false" 
-               android:manageSpaceActivity="com.todoroo.astrid.core.OldTaskPreferences">
-  
-	<meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/fb_app_id"/>
-    <!-- ====================================================== Activities = -->
-        
-    <!-- Activity that displays task list -->
-    <activity android:name="com.todoroo.astrid.activity.TaskListActivity"
-              android:windowSoftInputMode="stateHidden|adjustResize">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.SEARCH" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-      <meta-data android:name="android.app.searchable" 
-                 android:resource="@xml/filter_list_searchable" />
-    </activity>
-    <!-- Activity launched from shortcut -->
-    <activity android:name="com.todoroo.astrid.activity.ShortcutActivity"
-              android:clearTaskOnLaunch="true">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </activity>
-    <!-- Activity for selecting Android shortcut -->
-    <activity android:name="com.todoroo.astrid.activity.FilterShortcutActivity"
-              android:label="@string/FSA_label">
-      <intent-filter>
-        <action android:name="android.intent.action.CREATE_SHORTCUT" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </activity>
-    <!-- Activity launched from ShareLink menu item -->
-    <activity android:name="com.todoroo.astrid.activity.ShareLinkActivity"
-    	android:clearTaskOnLaunch="true">
-        <intent-filter>
-            <action android:name="android.intent.action.SEND" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <data android:mimeType="text/plain" />
-        </intent-filter>
-    </activity>
-    <!-- Legacy Task List shortcut activity -->
-    <activity android:name=".activities.TaskList">
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
-        </intent-filter>
-    </activity>
-    <!-- Activity that creates or edits tasks -->
-    <activity android:name="com.todoroo.astrid.activity.TaskEditActivity"
-              android:windowSoftInputMode="stateHidden">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>      
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <data android:mimeType="vnd.android.cursor.item/task" />
-      </intent-filter>      
-    </activity>
-    <!-- Activity that selects and installs add-ons -->
-    <activity android:name="com.todoroo.astrid.activity.AddOnActivity"
-              android:windowSoftInputMode="stateHidden" />
-    <!-- Activity for preferences -->
-    <activity android:name="com.todoroo.astrid.activity.EditPreferences" 
-        android:theme="@android:style/Theme" />
-    <!-- Activity that configures widget -->
-    <activity android:name="com.todoroo.astrid.widget.TasksWidget$ConfigActivity">
-	    <intent-filter>
-	        <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
-	    </intent-filter>
-    </activity>
-
-    <activity android:name="com.todoroo.astrid.activity.ShareActivity"/>
-    
-    
-    <activity android:name="com.todoroo.astrid.service.UpdateScreenFlow"
-        android:screenOrientation="portrait"
-        android:theme="@android:style/Theme.Dialog"/>
-    
-    <activity android:name="com.todoroo.astrid.service.UpdateMessagePreference"
-        android:theme="@android:style/Theme" />
-
-    <activity android:name="com.todoroo.astrid.service.UpgradeService$UpgradeActivity"
-        android:screenOrientation="portrait"/>
-
-    
-    <activity android:name="com.todoroo.astrid.service.UpgradeService$UpgradeActivity"
-        android:screenOrientation="portrait"
-        android:theme="@android:style/Theme" />
-    
-    <!-- Start of Crittercism.com Code -->
-    <activity android:name="com.crittercism.NotificationActivity"/>
-    <!-- End of Crittercism.com Code -->
-    
-        
-    <!-- ======================================================= Receivers = -->
-
-    <receiver android:name="com.todoroo.astrid.reminders.Notifications" />
-    
-    <receiver android:name="com.todoroo.astrid.reminders.Notifications$ShowNotificationReceiver">
-      <intent-filter> 
-        <action android:name="com.timsu.astrid.IN_APP_NOTIFY"/>
-      </intent-filter>
-    </receiver>
-    
-    <!-- widgets -->
-    <receiver android:name="com.todoroo.astrid.widget.TasksWidget"
-        android:label="@string/widget_mini">
-      <intent-filter>
-        <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-      </intent-filter>
-      <meta-data android:name="android.appwidget.provider"
-                 android:resource="@xml/widget_provider_info" />
-    </receiver>
-
-    <receiver android:name="com.todoroo.astrid.service.GlobalEventReceiver">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.FLUSH_DETAILS" />
-      </intent-filter>
-    </receiver>
-    
-    <receiver android:name="com.todoroo.astrid.calls.PhoneStateChangedReceiver">
-        <intent-filter>
-            <action android:name="android.intent.action.PHONE_STATE"/>
-        </intent-filter>
-    </receiver>
-    
-    <receiver android:name="com.todoroo.astrid.reminders.ReengagementReceiver">
-        <intent-filter>
-            <action android:name="com.timsu.astrid.SHOW_REENGAGEMENT"/> 
-        </intent-filter>
-    </receiver>
-
-    <!-- ======================================================== Services = -->
-
-    <service android:name="com.todoroo.astrid.widget.TasksWidget$WidgetUpdateService" />
-
-    <!-- ======================================================= Providers = -->
-
-    <provider android:name="com.todoroo.astrid.provider.Astrid2TaskProvider"
-              android:authorities="com.timsu.astrid.tasksprovider"
-              android:multiprocess="true"
-              android:grantUriPermissions="true"
-              android:readPermission="com.timsu.astrid.permission.READ_TASKS"/>
-
-    <provider android:name="com.todoroo.astrid.provider.Astrid3ContentProvider"
-              android:authorities="com.todoroo.astrid"
-              android:multiprocess="true"
-              android:grantUriPermissions="true"
-              android:readPermission="com.todoroo.astrid.READ"
-              android:writePermission="com.todoroo.astrid.WRITE"/>
-
-    <provider android:name="com.todoroo.astrid.provider.SqlContentProvider"
-              android:authorities="com.todoroo.astrid.private"
-              android:multiprocess="true"
-              android:grantUriPermissions="true"
-              android:readPermission="com.todoroo.astrid.READ"
-              android:writePermission="com.todoroo.astrid.WRITE"/>
-
-    <!-- ========================================================= Plugins = -->
-        
-    <!-- core -->
-    <receiver android:name="com.todoroo.astrid.core.CorePlugin">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.REQUEST_ADDONS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>    
-    <receiver android:name="com.todoroo.astrid.core.CoreFilterExposer">
-      <intent-filter android:priority="9000">
-        <action android:name="com.todoroo.astrid.REQUEST_FILTERS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>
-    <activity android:name="com.todoroo.astrid.core.DefaultsPreferences"
-              android:theme="@android:style/Theme" 
-              android:label="@string/EPr_defaults_header">
-      <meta-data android:name="summary"
-                 android:resource="@string/EPr_defaults_summary" />
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.SETTINGS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </activity>
-    <activity android:name="com.todoroo.astrid.activity.BeastModePreferences"
-              android:theme="@android:style/Theme">
-    </activity>
-    
-    <activity android:name="com.todoroo.astrid.calls.MissedCallActivity"
-              android:theme="@android:style/Theme.Translucent.NoTitleBar">
-    </activity>
-    
-    <!-- tags -->
-    <receiver android:name="com.todoroo.astrid.tags.TagsPlugin">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.REQUEST_ADDONS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>    
-    <receiver android:name="com.todoroo.astrid.tags.TagFilterExposer">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.REQUEST_FILTERS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>
-    <receiver android:name="com.todoroo.astrid.tags.TagCustomFilterCriteriaExposer">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.REQUEST_CUSTOM_FILTER_CRITERIA" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>
-    <receiver android:name="com.todoroo.astrid.tags.TagDetailExposer">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.REQUEST_DETAILS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver> 
-    
-    <!-- custom filters -->
-    <receiver android:name="com.todoroo.astrid.core.CustomFilterExposer">
-      <intent-filter android:priority="9000">
-        <action android:name="com.todoroo.astrid.REQUEST_FILTERS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>
-    <activity android:name="com.todoroo.astrid.core.CustomFilterActivity" android:theme="@style/Theme.Dialog" />
-    <activity android:name="com.todoroo.astrid.core.CustomFilterExposer$DeleteActivity" android:theme="@style/Theme.FullTransparent" />
-    <activity android:name="com.todoroo.astrid.tags.TagFilterExposer$DeleteTagActivity" android:theme="@style/Theme.FullTransparent" />
-    <activity android:name="com.todoroo.astrid.tags.TagFilterExposer$RenameTagActivity" android:theme="@style/Theme.FullTransparent" />
-
-    <!-- People view -->
-    <receiver android:name="com.todoroo.astrid.people.PeopleFilterExposer">
-        <intent-filter>
-            <action android:name="com.timsu.astrid.REQUEST_PEOPLE_FILTERS"/>
-            <category android:name="android.intent.category.DEFAULT"/>
-        </intent-filter>
-    </receiver>
-    
-    
-    <!-- Featured lists -->
-    <receiver android:name="com.todoroo.astrid.tags.reusable.FeaturedListFilterExposer">
-        <intent-filter>
-            <action android:name="com.timsu.astrid.REQUEST_FEATURED_LISTS"/>
-            <category android:name="android.intent.category.DEFAULT"/>
-        </intent-filter>
-    </receiver>
-    <activity android:name="com.todoroo.astrid.tags.reusable.FeaturedListActivity"
-              android:windowSoftInputMode="stateHidden|adjustResize"/>
-    
-    <!-- alarms -->
-    <receiver android:name="com.todoroo.astrid.alarms.AlarmTaskRepeatListener">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.TASK_REPEATED" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>    
-    <receiver android:name="com.todoroo.astrid.alarms.AlarmDetailExposer">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.REQUEST_DETAILS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>    
-            
-    <!-- actfm -->
-    <activity android:name="com.todoroo.astrid.actfm.ActFmLoginActivity"
-              android:configChanges="keyboardHidden"/>
-    <activity android:name="com.facebook.LoginActivity" />
-    <activity android:name="com.todoroo.astrid.actfm.ActFmPreferences"
-              android:theme="@android:style/Theme"
-              android:label="@string/actfm_APr_header">
-      <meta-data android:name="category"
-                 android:resource="@string/SyP_label" />
-      <meta-data android:name="syncAction"
-                 android:value="true" />
-      <intent-filter>   
-        <action android:name="com.todoroo.astrid.SETTINGS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </activity>
-    <activity android:name="com.todoroo.astrid.actfm.ActFmGoogleAuthActivity" 
-              android:theme="@style/Theme" android:configChanges="orientation|keyboardHidden"/>
-    <service android:name="com.todoroo.astrid.actfm.ActFmBackgroundService">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.actfm.SYNC" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </service>
-    <activity android:name="com.todoroo.astrid.actfm.TagViewWrapperActivity"
-              android:windowSoftInputMode="stateHidden|adjustResize"
-              android:theme="@style/Theme">
-        <intent-filter>
-          <action android:name="android.intent.action.VIEW" />
-          <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </activity>
-    <activity android:name="com.todoroo.astrid.actfm.TagCreateActivity"
-              android:theme="@android:style/Theme.Dialog"/>
-    <activity android:name="com.todoroo.astrid.actfm.TagSettingsActivity"
-              android:windowSoftInputMode="stateHidden"/>
-    <activity android:name="com.todoroo.astrid.actfm.TagSettingsActivityTablet"
-              android:windowSoftInputMode="stateHidden"
-              android:theme="@style/Theme.Dialog"/>
-    <activity android:name="com.todoroo.astrid.actfm.CommentsActivity"
-              android:windowSoftInputMode="stateHidden"/>            
-
-    <receiver android:name="com.google.android.gcm.GCMBroadcastReceiver" android:permission="com.google.android.c2dm.permission.SEND" >
-	  <intent-filter>
-	    <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-	    <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
-	    <category android:name="com.timsu.astrid" />
-	  </intent-filter>
-	</receiver>
-	
-    <service android:name=".GCMIntentService" />
-    
-    <receiver android:name="com.todoroo.astrid.actfm.sync.ActFmSyncThread$NetworkStateChangedReceiver">
-        <intent-filter>
-            <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-       </intent-filter>
-    </receiver>
-    
-    <!-- gtasks -->
-    <activity android:name="com.todoroo.astrid.gtasks.GtasksListFragment"
-              android:windowSoftInputMode="stateHidden|adjustResize"
-              android:theme="@style/Theme">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </activity>
-    <activity android:name="com.todoroo.astrid.gtasks.auth.GtasksAuthTokenProvider"/>
-    <activity android:name="com.todoroo.astrid.gtasks.auth.GtasksLoginActivity" 
-              android:theme="@style/Theme" android:configChanges="orientation|keyboardHidden"/>
-    <receiver android:name="com.todoroo.astrid.gtasks.GtasksCustomFilterCriteriaExposer">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.REQUEST_CUSTOM_FILTER_CRITERIA" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>
-    <receiver android:name="com.todoroo.astrid.gtasks.GtasksFilterExposer">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.REQUEST_FILTERS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>
-    <activity android:name="com.todoroo.astrid.gtasks.GtasksListAdder"
-              android:theme="@android:style/Theme.Dialog"/>
-    <receiver android:name="com.todoroo.astrid.gtasks.GtasksDetailExposer">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.REQUEST_DETAILS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>
-    <activity android:name="com.todoroo.astrid.gtasks.GtasksPreferences"
-              android:theme="@android:style/Theme"
-              android:label="@string/gtasks_GPr_header"
-              android:screenOrientation="portrait">
-      <meta-data android:name="category"
-                 android:resource="@string/SyP_label" />
-      <meta-data android:name="syncAction"
-                 android:value="true" />
-      <intent-filter>   
-        <action android:name="com.todoroo.astrid.SETTINGS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </activity>
-    <service android:name="com.todoroo.astrid.gtasks.GtasksBackgroundService">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.gtasks.SYNC" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </service>        
-    <receiver android:name="com.todoroo.astrid.gtasks.GtasksStartupReceiver">
-      <intent-filter>
-        <action android:name="android.intent.action.BOOT_COMPLETED" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>
-    
-    <!-- repeats -->
-    <receiver android:name="com.todoroo.astrid.repeats.RepeatsPlugin">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.REQUEST_ADDONS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>    
-    <receiver android:name="com.todoroo.astrid.repeats.RepeatTaskCompleteListener">
-      <intent-filter android:priority="1">
-        <action android:name="com.todoroo.astrid.TASK_COMPLETED" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>
-    <receiver android:name="com.todoroo.astrid.repeats.RepeatDetailExposer">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.REQUEST_DETAILS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>    
-    
-    <!-- calendar -->
-    <receiver android:name="com.todoroo.astrid.gcal.GCalTaskCompleteListener">
-      <intent-filter android:priority="2">
-        <action android:name="com.todoroo.astrid.TASK_COMPLETED" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>
-    
-    <receiver android:name="com.todoroo.astrid.gcal.CalendarStartupReceiver">
-      <intent-filter>
-        <action android:name="android.intent.action.BOOT_COMPLETED" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-      <intent-filter>
-          <action android:name="com.todoroo.astrid.SCHEDULE_CAL_REMINDERS"/>
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>
-    
-    <activity android:name="com.todoroo.astrid.gcal.CalendarReminderActivity"
-              android:theme="@android:style/Theme.Translucent.NoTitleBar">
-    </activity>
-
-    <activity android:name="com.todoroo.astrid.gcal.CalendarAlarmListCreator"
-              android:theme="@android:style/Theme.Translucent.NoTitleBar">
-    </activity>
-    
-    <receiver android:name="com.todoroo.astrid.gcal.CalendarAlarmReceiver" />
-    
-    <!-- old tasks -->
-    <activity android:name="com.todoroo.astrid.core.OldTaskPreferences"
-              android:theme="@android:style/Theme" 
-              android:label="@string/EPr_manage_header">
-      <meta-data android:name="category"
-                 android:resource="@string/SyP_label" />
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.SETTINGS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </activity>
-    
-    <!-- backup -->
-    <service android:name="com.todoroo.astrid.backup.BackupService"/>
-    <activity android:name="com.todoroo.astrid.backup.BackupActivity"
-              android:theme="@style/Theme.Dialog" />
-    <activity android:name="com.todoroo.astrid.backup.BackupPreferences"
-              android:theme="@android:style/Theme" 
-              android:label="@string/backup_BPr_header">
-      <meta-data android:name="category"
-                 android:resource="@string/SyP_label" />
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.SETTINGS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </activity>
-    <receiver android:name="com.todoroo.astrid.backup.BackupStartupReceiver">
-      <intent-filter>
-        <action android:name="android.intent.action.BOOT_COMPLETED" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>
-    
-    <!-- premium -->
-    <service android:name="com.todoroo.astrid.billing.BillingService" />
-
-    <receiver android:name="com.todoroo.astrid.billing.BillingReceiver">
-      <intent-filter>
-        <action android:name="com.android.vending.billing.IN_APP_NOTIFY" />
-        <action android:name="com.android.vending.billing.RESPONSE_CODE" />
-        <action android:name="com.android.vending.billing.PURCHASE_STATE_CHANGED" />
-      </intent-filter>
-    </receiver>
-    
-    <activity android:name="com.todoroo.astrid.billing.BillingActivity"
-        android:screenOrientation="portrait"/>
-    
-    <activity android:name="com.todoroo.astrid.files.AACRecordingActivity"
-        android:configChanges="orientation|screenSize"
-        android:screenOrientation="portrait"
-        android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
-    
-    <activity android:name="com.todoroo.astrid.files.FileExplore"/>
-        
-    <!-- locale -->
-    <activity android:name="com.todoroo.astrid.locale.LocaleEditAlerts"
-              android:label="@string/locale_edit_alerts_title"
-              android:icon="@drawable/icon_32"
-              android:exported="true">
-      <intent-filter>
-        <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING" />
-      </intent-filter>
-    </activity>
-    <receiver android:name="com.todoroo.astrid.locale.LocaleReceiver">
-      <intent-filter>
-        <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING" />
-      </intent-filter>
-    </receiver>
-    
-    <!-- notes -->
-    <receiver android:name="com.todoroo.astrid.notes.NotesDetailExposer">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.REQUEST_DETAILS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>
-
-    <receiver android:name="com.todoroo.astrid.timers.TimerFilterExposer">
-      <intent-filter android:priority="10000">
-        <action android:name="com.todoroo.astrid.REQUEST_FILTERS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>    
-    <receiver android:name="com.todoroo.astrid.timers.TimerTaskCompleteListener">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.TASK_COMPLETED" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>
-              
-    <!-- reminders -->        
-    <activity android:name="com.todoroo.astrid.reminders.ReminderPreferences"
-              android:theme="@android:style/Theme" 
-              android:label="@string/rmd_EPr_alerts_header">
-      <meta-data android:name="summary"
-                 android:resource="@string/rmd_EPr_alerts_summary" />
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.SETTINGS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </activity>
-    <receiver android:name="com.todoroo.astrid.reminders.ReminderStartupReceiver">
-      <intent-filter>
-        <action android:name="android.intent.action.BOOT_COMPLETED" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>
-    <activity android:name="com.todoroo.astrid.reminders.NotificationWrapperActivity"
-              android:launchMode="singleTask"
-              android:finishOnTaskLaunch="true"
-              android:clearTaskOnLaunch="true">
-    </activity>
-    <service android:name="com.todoroo.astrid.reminders.ReminderSchedulingService"/>
-
-    <!-- other task actions -->
-    <receiver android:name="com.todoroo.astrid.core.LinkActionExposer">
-      <intent-filter>
-        <action android:name="com.todoroo.astrid.REQUEST_ACTIONS" />
-        <category android:name="android.intent.category.DEFAULT" />
-      </intent-filter>
-    </receiver>
-    
-    <activity android:name="com.todoroo.astrid.welcome.tutorial.WelcomeWalkthrough"
-              android:windowSoftInputMode="stateHidden"
-              android:screenOrientation="portrait"></activity>
-    
-    <!-- Uses Library -->      
-    <uses-library android:name="com.google.android.maps" android:required="false" />   
-  
-  </application>
+    <supports-screens
+            android:xlargeScreens="true"
+            android:largeScreens="true"/>
+
+    <uses-feature
+            android:name="android.hardware.touchscreen"
+            android:required="false"/>
+
+    <application
+            android:icon="@drawable/icon"
+            android:label="@string/app_name"
+            android:theme="@style/Theme"
+            android:name="greendroid.app.GDApplication"
+            android:hardwareAccelerated="false"
+            android:manageSpaceActivity="com.todoroo.astrid.core.OldTaskPreferences">
+
+        <meta-data
+                android:name="com.facebook.sdk.ApplicationId"
+                android:value="@string/fb_app_id"/>
+        <!-- ====================================================== Activities = -->
+
+        <!-- Activity that displays task list -->
+        <activity
+                android:name="com.todoroo.astrid.activity.TaskListActivity"
+                android:windowSoftInputMode="stateHidden|adjustResize">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+
+            <meta-data
+                    android:name="android.app.searchable"
+                    android:resource="@xml/filter_list_searchable"/>
+        </activity>
+        <!-- Activity launched from shortcut -->
+        <activity
+                android:name="com.todoroo.astrid.activity.ShortcutActivity"
+                android:clearTaskOnLaunch="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <!-- Activity for selecting Android shortcut -->
+        <activity
+                android:name="com.todoroo.astrid.activity.FilterShortcutActivity"
+                android:label="@string/FSA_label">
+            <intent-filter>
+                <action android:name="android.intent.action.CREATE_SHORTCUT"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <!-- Activity launched from ShareLink menu item -->
+        <activity
+                android:name="com.todoroo.astrid.activity.ShareLinkActivity"
+                android:clearTaskOnLaunch="true">
+            <intent-filter>
+                <action android:name="android.intent.action.SEND"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/plain"/>
+            </intent-filter>
+        </activity>
+        <!-- Legacy Task List shortcut activity -->
+        <activity android:name=".activities.TaskList">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+        </activity>
+        <!-- Activity that creates or edits tasks -->
+        <activity
+                android:name="com.todoroo.astrid.activity.TaskEditActivity"
+                android:windowSoftInputMode="stateHidden">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="vnd.android.cursor.item/task"/>
+            </intent-filter>
+        </activity>
+        <!-- Activity that selects and installs add-ons -->
+        <activity
+                android:name="com.todoroo.astrid.activity.AddOnActivity"
+                android:windowSoftInputMode="stateHidden"/>
+        <!-- Activity for preferences -->
+        <activity
+                android:name="com.todoroo.astrid.activity.EditPreferences"
+                android:theme="@android:style/Theme"/>
+        <!-- Activity that configures widget -->
+        <activity android:name="com.todoroo.astrid.widget.TasksWidget$ConfigActivity">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="com.todoroo.astrid.activity.ShareActivity"/>
+
+
+        <activity
+                android:name="com.todoroo.astrid.service.UpdateScreenFlow"
+                android:screenOrientation="portrait"
+                android:theme="@android:style/Theme.Dialog"/>
+
+        <activity
+                android:name="com.todoroo.astrid.service.UpdateMessagePreference"
+                android:theme="@android:style/Theme"/>
+
+        <activity
+                android:name="com.todoroo.astrid.service.UpgradeService$UpgradeActivity"
+                android:screenOrientation="portrait"/>
+
+
+        <activity
+                android:name="com.todoroo.astrid.service.UpgradeService$UpgradeActivity"
+                android:screenOrientation="portrait"
+                android:theme="@android:style/Theme"/>
+
+        <!-- Start of Crittercism.com Code -->
+        <activity android:name="com.crittercism.NotificationActivity"/>
+        <!-- End of Crittercism.com Code -->
+
+
+        <!-- ======================================================= Receivers = -->
+
+        <receiver android:name="com.todoroo.astrid.reminders.Notifications"/>
+
+        <receiver android:name="com.todoroo.astrid.reminders.Notifications$ShowNotificationReceiver">
+            <intent-filter>
+                <action android:name="com.timsu.astrid.IN_APP_NOTIFY"/>
+            </intent-filter>
+        </receiver>
+
+        <!-- widgets -->
+        <receiver
+                android:name="com.todoroo.astrid.widget.TasksWidget"
+                android:label="@string/widget_mini">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+            </intent-filter>
+            <meta-data
+                    android:name="android.appwidget.provider"
+                    android:resource="@xml/widget_provider_info"/>
+        </receiver>
+
+        <receiver android:name="com.todoroo.astrid.service.GlobalEventReceiver">
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.FLUSH_DETAILS"/>
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name="com.todoroo.astrid.calls.PhoneStateChangedReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.PHONE_STATE"/>
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name="com.todoroo.astrid.reminders.ReengagementReceiver">
+            <intent-filter>
+                <action android:name="com.timsu.astrid.SHOW_REENGAGEMENT"/>
+            </intent-filter>
+        </receiver>
+
+        <!-- ======================================================== Services = -->
+
+        <service android:name="com.todoroo.astrid.widget.TasksWidget$WidgetUpdateService"/>
+
+        <!-- ======================================================= Providers = -->
+
+        <provider
+                android:name="com.todoroo.astrid.provider.Astrid2TaskProvider"
+                android:authorities="com.timsu.astrid.tasksprovider"
+                android:multiprocess="true"
+                android:grantUriPermissions="true"
+                android:readPermission="com.timsu.astrid.permission.READ_TASKS"/>
+
+        <provider
+                android:name="com.todoroo.astrid.provider.Astrid3ContentProvider"
+                android:authorities="com.todoroo.astrid"
+                android:multiprocess="true"
+                android:grantUriPermissions="true"
+                android:readPermission="com.todoroo.astrid.READ"
+                android:writePermission="com.todoroo.astrid.WRITE"/>
+
+        <provider
+                android:name="com.todoroo.astrid.provider.SqlContentProvider"
+                android:authorities="com.todoroo.astrid.private"
+                android:multiprocess="true"
+                android:grantUriPermissions="true"
+                android:readPermission="com.todoroo.astrid.READ"
+                android:writePermission="com.todoroo.astrid.WRITE"/>
+
+        <!-- ========================================================= Plugins = -->
+
+        <!-- core -->
+        <receiver android:name="com.todoroo.astrid.core.CorePlugin">
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.REQUEST_ADDONS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:name="com.todoroo.astrid.core.CoreFilterExposer">
+            <intent-filter android:priority="9000">
+                <action android:name="com.todoroo.astrid.REQUEST_FILTERS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+
+        <activity
+                android:name="com.todoroo.astrid.core.DefaultsPreferences"
+                android:theme="@android:style/Theme"
+                android:label="@string/EPr_defaults_header">
+            <meta-data
+                    android:name="summary"
+                    android:resource="@string/EPr_defaults_summary"/>
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.SETTINGS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+                android:name="com.todoroo.astrid.activity.BeastModePreferences"
+                android:theme="@android:style/Theme">
+        </activity>
+
+        <activity
+                android:name="com.todoroo.astrid.calls.MissedCallActivity"
+                android:theme="@android:style/Theme.Translucent.NoTitleBar">
+        </activity>
+
+        <!-- tags -->
+        <receiver android:name="com.todoroo.astrid.tags.TagsPlugin">
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.REQUEST_ADDONS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:name="com.todoroo.astrid.tags.TagFilterExposer">
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.REQUEST_FILTERS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:name="com.todoroo.astrid.tags.TagCustomFilterCriteriaExposer">
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.REQUEST_CUSTOM_FILTER_CRITERIA"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:name="com.todoroo.astrid.tags.TagDetailExposer">
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.REQUEST_DETAILS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+
+        <!-- custom filters -->
+        <receiver android:name="com.todoroo.astrid.core.CustomFilterExposer">
+            <intent-filter android:priority="9000">
+                <action android:name="com.todoroo.astrid.REQUEST_FILTERS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+
+        <activity
+                android:name="com.todoroo.astrid.core.CustomFilterActivity"
+                android:theme="@style/Theme.Dialog"/>
+        <activity
+                android:name="com.todoroo.astrid.core.CustomFilterExposer$DeleteActivity"
+                android:theme="@style/Theme.FullTransparent"/>
+        <activity
+                android:name="com.todoroo.astrid.tags.TagFilterExposer$DeleteTagActivity"
+                android:theme="@style/Theme.FullTransparent"/>
+        <activity
+                android:name="com.todoroo.astrid.tags.TagFilterExposer$RenameTagActivity"
+                android:theme="@style/Theme.FullTransparent"/>
+
+        <!-- People view -->
+        <receiver android:name="com.todoroo.astrid.people.PeopleFilterExposer">
+            <intent-filter>
+                <action android:name="com.timsu.astrid.REQUEST_PEOPLE_FILTERS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+
+
+        <!-- Featured lists -->
+        <receiver android:name="com.todoroo.astrid.tags.reusable.FeaturedListFilterExposer">
+            <intent-filter>
+                <action android:name="com.timsu.astrid.REQUEST_FEATURED_LISTS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+        <activity
+                android:name="com.todoroo.astrid.tags.reusable.FeaturedListActivity"
+                android:windowSoftInputMode="stateHidden|adjustResize"/>
+
+        <!-- alarms -->
+        <receiver android:name="com.todoroo.astrid.alarms.AlarmTaskRepeatListener">
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.TASK_REPEATED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:name="com.todoroo.astrid.alarms.AlarmDetailExposer">
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.REQUEST_DETAILS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+
+        <!-- actfm -->
+        <activity
+                android:name="com.todoroo.astrid.actfm.ActFmLoginActivity"
+                android:configChanges="keyboardHidden"/>
+        <activity android:name="com.facebook.LoginActivity"/>
+        <activity
+                android:name="com.todoroo.astrid.actfm.ActFmPreferences"
+                android:theme="@android:style/Theme"
+                android:label="@string/actfm_APr_header">
+            <meta-data
+                    android:name="category"
+                    android:resource="@string/SyP_label"/>
+            <meta-data
+                    android:name="syncAction"
+                    android:value="true"/>
+
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.SETTINGS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+                android:name="com.todoroo.astrid.actfm.ActFmGoogleAuthActivity"
+                android:theme="@style/Theme"
+                android:configChanges="orientation|keyboardHidden"/>
+
+        <service android:name="com.todoroo.astrid.actfm.ActFmBackgroundService">
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.actfm.SYNC"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </service>
+
+        <activity
+                android:name="com.todoroo.astrid.actfm.TagViewWrapperActivity"
+                android:windowSoftInputMode="stateHidden|adjustResize"
+                android:theme="@style/Theme">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity
+                android:name="com.todoroo.astrid.actfm.TagCreateActivity"
+                android:theme="@android:style/Theme.Dialog"/>
+        <activity
+                android:name="com.todoroo.astrid.actfm.TagSettingsActivity"
+                android:windowSoftInputMode="stateHidden"/>
+        <activity
+                android:name="com.todoroo.astrid.actfm.TagSettingsActivityTablet"
+                android:windowSoftInputMode="stateHidden"
+                android:theme="@style/Theme.Dialog"/>
+        <activity
+                android:name="com.todoroo.astrid.actfm.CommentsActivity"
+                android:windowSoftInputMode="stateHidden"/>
+
+        <receiver
+                android:name="com.google.android.gcm.GCMBroadcastReceiver"
+                android:permission="com.google.android.c2dm.permission.SEND">
+            <intent-filter>
+                <action android:name="com.google.android.c2dm.intent.RECEIVE"/>
+                <action android:name="com.google.android.c2dm.intent.REGISTRATION"/>
+
+                <category android:name="com.timsu.astrid"/>
+            </intent-filter>
+        </receiver>
+
+        <service android:name=".GCMIntentService"/>
+
+        <receiver android:name="com.todoroo.astrid.actfm.sync.ActFmSyncThread$NetworkStateChangedReceiver">
+            <intent-filter>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+            </intent-filter>
+        </receiver>
+
+        <!-- gtasks -->
+        <activity
+                android:name="com.todoroo.astrid.gtasks.GtasksListFragment"
+                android:windowSoftInputMode="stateHidden|adjustResize"
+                android:theme="@style/Theme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity android:name="com.todoroo.astrid.gtasks.auth.GtasksAuthTokenProvider"/>
+        <activity
+                android:name="com.todoroo.astrid.gtasks.auth.GtasksLoginActivity"
+                android:theme="@style/Theme"
+                android:configChanges="orientation|keyboardHidden"/>
+
+        <receiver android:name="com.todoroo.astrid.gtasks.GtasksCustomFilterCriteriaExposer">
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.REQUEST_CUSTOM_FILTER_CRITERIA"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:name="com.todoroo.astrid.gtasks.GtasksFilterExposer">
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.REQUEST_FILTERS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+
+        <activity
+                android:name="com.todoroo.astrid.gtasks.GtasksListAdder"
+                android:theme="@android:style/Theme.Dialog"/>
+        <receiver android:name="com.todoroo.astrid.gtasks.GtasksDetailExposer">
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.REQUEST_DETAILS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+        <activity
+                android:name="com.todoroo.astrid.gtasks.GtasksPreferences"
+                android:theme="@android:style/Theme"
+                android:label="@string/gtasks_GPr_header"
+                android:screenOrientation="portrait">
+            <meta-data
+                    android:name="category"
+                    android:resource="@string/SyP_label"/>
+            <meta-data
+                    android:name="syncAction"
+                    android:value="true"/>
+
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.SETTINGS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <service android:name="com.todoroo.astrid.gtasks.GtasksBackgroundService">
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.gtasks.SYNC"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </service>
+        <receiver android:name="com.todoroo.astrid.gtasks.GtasksStartupReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+
+        <!-- repeats -->
+        <receiver android:name="com.todoroo.astrid.repeats.RepeatsPlugin">
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.REQUEST_ADDONS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:name="com.todoroo.astrid.repeats.RepeatTaskCompleteListener">
+            <intent-filter android:priority="1">
+                <action android:name="com.todoroo.astrid.TASK_COMPLETED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:name="com.todoroo.astrid.repeats.RepeatDetailExposer">
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.REQUEST_DETAILS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+
+        <!-- calendar -->
+        <receiver android:name="com.todoroo.astrid.gcal.GCalTaskCompleteListener">
+            <intent-filter android:priority="2">
+                <action android:name="com.todoroo.astrid.TASK_COMPLETED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name="com.todoroo.astrid.gcal.CalendarStartupReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.SCHEDULE_CAL_REMINDERS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+
+        <activity
+                android:name="com.todoroo.astrid.gcal.CalendarReminderActivity"
+                android:theme="@android:style/Theme.Translucent.NoTitleBar">
+        </activity>
+
+        <activity
+                android:name="com.todoroo.astrid.gcal.CalendarAlarmListCreator"
+                android:theme="@android:style/Theme.Translucent.NoTitleBar">
+        </activity>
+
+        <receiver android:name="com.todoroo.astrid.gcal.CalendarAlarmReceiver"/>
+
+        <!-- old tasks -->
+        <activity
+                android:name="com.todoroo.astrid.core.OldTaskPreferences"
+                android:theme="@android:style/Theme"
+                android:label="@string/EPr_manage_header">
+            <meta-data
+                    android:name="category"
+                    android:resource="@string/SyP_label"/>
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.SETTINGS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <!-- backup -->
+        <service android:name="com.todoroo.astrid.backup.BackupService"/>
+
+        <activity
+                android:name="com.todoroo.astrid.backup.BackupActivity"
+                android:theme="@style/Theme.Dialog"/>
+        <activity
+                android:name="com.todoroo.astrid.backup.BackupPreferences"
+                android:theme="@android:style/Theme"
+                android:label="@string/backup_BPr_header">
+            <meta-data
+                    android:name="category"
+                    android:resource="@string/SyP_label"/>
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.SETTINGS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <receiver android:name="com.todoroo.astrid.backup.BackupStartupReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+
+        <!-- premium -->
+        <service android:name="com.todoroo.astrid.billing.BillingService"/>
+
+        <receiver android:name="com.todoroo.astrid.billing.BillingReceiver">
+            <intent-filter>
+                <action android:name="com.android.vending.billing.IN_APP_NOTIFY"/>
+                <action android:name="com.android.vending.billing.RESPONSE_CODE"/>
+                <action android:name="com.android.vending.billing.PURCHASE_STATE_CHANGED"/>
+            </intent-filter>
+        </receiver>
+
+        <activity
+                android:name="com.todoroo.astrid.billing.BillingActivity"
+                android:screenOrientation="portrait"/>
+
+        <activity
+                android:name="com.todoroo.astrid.files.AACRecordingActivity"
+                android:configChanges="orientation|screenSize"
+                android:screenOrientation="portrait"
+                android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
+
+        <activity android:name="com.todoroo.astrid.files.FileExplore"/>
+
+        <!-- locale -->
+        <activity
+                android:name="com.todoroo.astrid.locale.LocaleEditAlerts"
+                android:label="@string/locale_edit_alerts_title"
+                android:icon="@drawable/icon_32"
+                android:exported="true">
+            <intent-filter>
+                <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING"/>
+            </intent-filter>
+        </activity>
+        <receiver android:name="com.todoroo.astrid.locale.LocaleReceiver">
+            <intent-filter>
+                <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING"/>
+            </intent-filter>
+        </receiver>
+
+        <!-- notes -->
+        <receiver android:name="com.todoroo.astrid.notes.NotesDetailExposer">
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.REQUEST_DETAILS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name="com.todoroo.astrid.timers.TimerFilterExposer">
+            <intent-filter android:priority="10000">
+                <action android:name="com.todoroo.astrid.REQUEST_FILTERS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:name="com.todoroo.astrid.timers.TimerTaskCompleteListener">
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.TASK_COMPLETED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+
+        <!-- reminders -->
+        <activity
+                android:name="com.todoroo.astrid.reminders.ReminderPreferences"
+                android:theme="@android:style/Theme"
+                android:label="@string/rmd_EPr_alerts_header">
+            <meta-data
+                    android:name="summary"
+                    android:resource="@string/rmd_EPr_alerts_summary"/>
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.SETTINGS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <receiver android:name="com.todoroo.astrid.reminders.ReminderStartupReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+        <activity
+                android:name="com.todoroo.astrid.reminders.NotificationWrapperActivity"
+                android:launchMode="singleTask"
+                android:finishOnTaskLaunch="true"
+                android:clearTaskOnLaunch="true">
+        </activity>
+        <service android:name="com.todoroo.astrid.reminders.ReminderSchedulingService"/>
+
+        <!-- other task actions -->
+        <receiver android:name="com.todoroo.astrid.core.LinkActionExposer">
+            <intent-filter>
+                <action android:name="com.todoroo.astrid.REQUEST_ACTIONS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </receiver>
+
+        <activity
+                android:name="com.todoroo.astrid.welcome.tutorial.WelcomeWalkthrough"
+                android:windowSoftInputMode="stateHidden"
+                android:screenOrientation="portrait"></activity>
+
+        <!-- Uses Library -->
+        <uses-library
+                android:name="com.google.android.maps"
+                android:required="false"/>
+
+    </application>
 
 </manifest>
diff --git a/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java b/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java
index 775fade05..8b30a41e5 100644
--- a/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java
+++ b/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java
@@ -39,40 +39,40 @@ import com.todoroo.astrid.ui.ErrorCatchingListView;
 
 @SuppressWarnings("nls")
 public class TouchListView extends ErrorCatchingListView {
-	private ImageView mDragView;
-	private View mOriginalView;
-	private WindowManager mWindowManager;
-	private WindowManager.LayoutParams mWindowParams;
-	private int mDragPos;      // which item is being dragged
-	private int mFirstDragPos; // where was the dragged item originally
-	private int mDragPoint;    // at what offset inside the item did the user grab it
-	private int mCoordOffset;  // the difference between screen coordinates and coordinates in this view
-	private float mDragStartX, mDragCurrentX;
-	private long mDragStartTime;
-	private DragListener mDragListener;
-	private DropListener mDropListener;
-	private SwipeListener mSwipeListener;
-	private GrabberClickListener mClickListener;
-	private int mUpperBound;
-	private int mLowerBound;
-	private int mHeight;
-	private GestureDetector mGestureDetector;
-	public static final int FLING = 0;
-	public static final int SLIDE_RIGHT = 1;
-	public static final int SLIDE_LEFT = 2;
-	private int mRemoveMode = -1;
-	private final Rect mTempRect = new Rect();
-	private Bitmap mDragBitmap;
-	private final int mTouchSlop;
-	private int mItemHeightNormal=-1;
-	private int mItemHeightExpanded=-1;
-	private int grabberId=-1;
-	private int dragndropBackgroundColor=0x00000000;
-	private Thread longPressThread;
-
-	public TouchListView(Context context, AttributeSet attrs) {
-		this(context, attrs, 0);
-	}
+    private ImageView mDragView;
+    private View mOriginalView;
+    private WindowManager mWindowManager;
+    private WindowManager.LayoutParams mWindowParams;
+    private int mDragPos;      // which item is being dragged
+    private int mFirstDragPos; // where was the dragged item originally
+    private int mDragPoint;    // at what offset inside the item did the user grab it
+    private int mCoordOffset;  // the difference between screen coordinates and coordinates in this view
+    private float mDragStartX, mDragCurrentX;
+    private long mDragStartTime;
+    private DragListener mDragListener;
+    private DropListener mDropListener;
+    private SwipeListener mSwipeListener;
+    private GrabberClickListener mClickListener;
+    private int mUpperBound;
+    private int mLowerBound;
+    private int mHeight;
+    private GestureDetector mGestureDetector;
+    public static final int FLING = 0;
+    public static final int SLIDE_RIGHT = 1;
+    public static final int SLIDE_LEFT = 2;
+    private int mRemoveMode = -1;
+    private final Rect mTempRect = new Rect();
+    private Bitmap mDragBitmap;
+    private final int mTouchSlop;
+    private int mItemHeightNormal = -1;
+    private int mItemHeightExpanded = -1;
+    private int grabberId = -1;
+    private int dragndropBackgroundColor = 0x00000000;
+    private Thread longPressThread;
+
+    public TouchListView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
 
     public TouchListView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
@@ -98,363 +98,362 @@ public class TouchListView extends ErrorCatchingListView {
     }
 
     @Override
-	final public void addHeaderView (View v, Object data, boolean isSelectable) {
-		throw new RuntimeException("Headers are not supported with TouchListView");
-	}
-
-	@Override
-	final public void addHeaderView (View v) {
-		throw new RuntimeException("Headers are not supported with TouchListView");
-	}
-
-  @Override
-  final public void addFooterView (View v, Object data, boolean isSelectable) {
-    if (mRemoveMode == SLIDE_LEFT || mRemoveMode == SLIDE_RIGHT) {
-      throw new RuntimeException("Footers are not supported with TouchListView in conjunction with remove_mode");
+    final public void addHeaderView(View v, Object data, boolean isSelectable) {
+        throw new RuntimeException("Headers are not supported with TouchListView");
+    }
+
+    @Override
+    final public void addHeaderView(View v) {
+        throw new RuntimeException("Headers are not supported with TouchListView");
     }
-  }
 
-  @Override
-  final public void addFooterView (View v) {
-    if (mRemoveMode == SLIDE_LEFT || mRemoveMode == SLIDE_RIGHT) {
-      throw new RuntimeException("Footers are not supported with TouchListView in conjunction with remove_mode");
+    @Override
+    final public void addFooterView(View v, Object data, boolean isSelectable) {
+        if (mRemoveMode == SLIDE_LEFT || mRemoveMode == SLIDE_RIGHT) {
+            throw new RuntimeException("Footers are not supported with TouchListView in conjunction with remove_mode");
+        }
     }
-  }
-
-	@Override
-	public boolean onInterceptTouchEvent(MotionEvent ev) {
-			if (mDragListener != null || mDropListener != null) {
-					switch (ev.getAction()) {
-							case MotionEvent.ACTION_DOWN:
-									int x = (int) ev.getX();
-									int y = (int) ev.getY();
-									int itemnum = pointToPosition(x, y);
-									if (itemnum == AdapterView.INVALID_POSITION) {
-											break;
-									}
-
-									View item = (View) getChildAt(itemnum - getFirstVisiblePosition());
-
-									if (isDraggableRow(item)) {
-										mDragPoint = y - item.getTop();
-										mCoordOffset = ((int)ev.getRawY()) - y;
-										View dragger = item.findViewById(grabberId);
-										Rect r = mTempRect;
+
+    @Override
+    final public void addFooterView(View v) {
+        if (mRemoveMode == SLIDE_LEFT || mRemoveMode == SLIDE_RIGHT) {
+            throw new RuntimeException("Footers are not supported with TouchListView in conjunction with remove_mode");
+        }
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        if (mDragListener != null || mDropListener != null) {
+            switch (ev.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    int x = (int) ev.getX();
+                    int y = (int) ev.getY();
+                    int itemnum = pointToPosition(x, y);
+                    if (itemnum == AdapterView.INVALID_POSITION) {
+                        break;
+                    }
+
+                    View item = (View) getChildAt(itemnum - getFirstVisiblePosition());
+
+                    if (isDraggableRow(item)) {
+                        mDragPoint = y - item.getTop();
+                        mCoordOffset = ((int) ev.getRawY()) - y;
+                        View dragger = item.findViewById(grabberId);
+                        Rect r = mTempRect;
 //										dragger.getDrawingRect(r);
 
-										r.left=dragger.getLeft();
-										r.right=dragger.getRight();
-										r.top=dragger.getTop();
-										r.bottom=dragger.getBottom();
-
-										if ((r.left<x) && (x<r.right)) {
-												item.setDrawingCacheEnabled(true);
-												// Create a copy of the drawing cache so that it does not get recycled
-												// by the framework when the list tries to clean up memory
-												Bitmap bitmap = Bitmap.createBitmap(item.getDrawingCache());
-												item.setDrawingCacheEnabled(false);
-
-												Rect listBounds=new Rect();
-
-												getGlobalVisibleRect(listBounds, null);
-
-												startDragging(bitmap, listBounds.left, y);
-												mDragPos = itemnum;
-												mFirstDragPos = mDragPos;
-												mHeight = getHeight();
-												mDragStartX = ev.getX();
-												mDragStartTime = System.currentTimeMillis();
-												mOriginalView = item;
-
-												int touchSlop = mTouchSlop;
-												mUpperBound = Math.min(y - touchSlop, mHeight / 3);
-												mLowerBound = Math.max(y + touchSlop, mHeight * 2 /3);
-												return false;
-										}
-
-										mDragView = null;
-									}
-
-									break;
-					}
-			}
-			return super.onInterceptTouchEvent(ev);
-	}
-
-	protected boolean isDraggableRow(View view) {
-    return(view.findViewById(grabberId)!=null);
-	}
-
-	/*
-	 * pointToPosition() doesn't consider invisible views, but we
-	 * need to, so implement a slightly different version.
-	 */
-	private int myPointToPosition(int x, int y) {
-			Rect frame = mTempRect;
-			final int count = getChildCount();
-			for (int i = count - 1; i >= 0; i--) {
-					final View child = getChildAt(i);
-					child.getHitRect(frame);
-					if (frame.contains(x, y)) {
-							return getFirstVisiblePosition() + i;
-					}
-			}
-			return INVALID_POSITION;
-	}
-
-	private int getItemForPosition(int y) {
-			int adjustedy = y - mDragPoint - (mItemHeightNormal/2);
-			int pos = myPointToPosition(0, adjustedy);
-			if (pos >= 0) {
-					if (pos <= mFirstDragPos) {
-							pos += 1;
-					}
-			} else if (adjustedy < 0) {
-					pos = 0;
-			}
-			return pos;
-	}
-
-	private void adjustScrollBounds(int y) {
-			if (y >= mHeight / 3) {
-					mUpperBound = mHeight / 3;
-			}
-			if (y <= mHeight * 2 / 3) {
-					mLowerBound = mHeight * 2 / 3;
-			}
-	}
-
-	/*
-	 * Restore size and visibility for all listitems
-	 */
-	private void unExpandViews(boolean deletion) {
-			for (int i = 0;; i++) {
-					View v = getChildAt(i);
-					if (v == null) {
-							if (deletion) {
-									// HACK force update of mItemCount
-									int position = getFirstVisiblePosition();
-									int y = getChildAt(0).getTop();
-									setAdapter(getAdapter());
-									setSelectionFromTop(position, y);
-									// end hack
-							}
-							layoutChildren(); // force children to be recreated where needed
-							v = getChildAt(i);
-							if (v == null) {
-									break;
-							}
-					}
-
-					if (isDraggableRow(v)) {
-						ViewGroup.LayoutParams params = v.getLayoutParams();
-						params.height = mItemHeightNormal;
-						v.setLayoutParams(params);
-						v.setVisibility(View.VISIBLE);
-					}
-			}
-	}
-
-	/* Adjust visibility and size to make it appear as though
-	 * an item is being dragged around and other items are making
-	 * room for it:
-	 * If dropping the item would result in it still being in the
-	 * same place, then make the dragged listitem's size normal,
-	 * but make the item invisible.
-	 * Otherwise, if the dragged listitem is still on screen, make
-	 * it as small as possible and expand the item below the insert
-	 * point.
-	 * If the dragged item is not on screen, only expand the item
-	 * below the current insertpoint.
-	 */
-	private void doExpansion() {
-			int childnum = mDragPos - getFirstVisiblePosition();
-			if (mDragPos > mFirstDragPos) {
-					childnum++;
-			}
-
-			View first = getChildAt(mFirstDragPos - getFirstVisiblePosition());
-
-			for (int i = 0;; i++) {
-					View vv = getChildAt(i);
-					if (vv == null) {
-							break;
-					}
-					int height = mItemHeightNormal;
-					int visibility = View.VISIBLE;
-					if (vv.equals(first)) {
-							// processing the item that is being dragged
-							if (mDragPos == mFirstDragPos) {
-									// hovering over the original location
-									visibility = View.INVISIBLE;
-							} else {
-									// not hovering over it
-									height = 1;
-							}
-					} else if (i == childnum) {
-							if (mDragPos < getCount() - 1) {
-									height = mItemHeightExpanded;
-							}
-					}
-
-					if (isDraggableRow(vv)) {
-						ViewGroup.LayoutParams params = vv.getLayoutParams();
-						params.height = height;
-						vv.setLayoutParams(params);
-						vv.setVisibility(visibility);
-					}
-			}
-			// Request re-layout since we changed the items layout
-			// and not doing this would cause bogus hitbox calculation
-			// in myPointToPosition
-			layoutChildren();
-	}
-
-	@Override
-	public boolean onTouchEvent(MotionEvent ev) {
-			if (mGestureDetector != null) {
-					mGestureDetector.onTouchEvent(ev);
-			}
-			if ((mDragListener != null || mDropListener != null) && mDragView != null) {
-					int action = ev.getAction();
-					switch (action) {
-							case MotionEvent.ACTION_UP:
-							case MotionEvent.ACTION_CANCEL:
-									Rect r = mTempRect;
-									mDragView.getDrawingRect(r);
-									stopDragging(ev);
-									if (mDragPos == mFirstDragPos && ev.getX() > mDragStartX + 20) {
-											if (mSwipeListener!= null) {
-													mSwipeListener.swipeRight(mFirstDragPos);
-											}
-											unExpandViews(true);
-									} else if (mDragPos == mFirstDragPos && ev.getX() < mDragStartX - 20) {
-    									    if (mSwipeListener!= null) {
-    									        mSwipeListener.swipeLeft(mFirstDragPos);
-    									    }
-											unExpandViews(true);
-									} else {
-											if (mDropListener != null && mDragPos >= 0 && mDragPos < getCount()) {
-													mDropListener.drop(mFirstDragPos, mDragPos);
-											}
-											unExpandViews(false);
-									}
-									break;
-
-							case MotionEvent.ACTION_DOWN:
-							case MotionEvent.ACTION_MOVE:
-									int x = (int) ev.getX();
-									int y = (int) ev.getY();
-									dragView(x, y);
-									int itemnum = getItemForPosition(y);
-									if (itemnum >= 0) {
-											if (action == MotionEvent.ACTION_DOWN || itemnum != mDragPos) {
-													if (mDragListener != null) {
-															mDragListener.drag(mDragPos, itemnum);
-													}
-													mDragPos = itemnum;
-													doExpansion();
-											}
-											int speed = 0;
-											adjustScrollBounds(y);
-											if (y > mLowerBound) {
-													// scroll the list up a bit
-													speed = y > (mHeight + mLowerBound) / 2 ? 16 : 4;
-											} else if (y < mUpperBound) {
-													// scroll the list down a bit
-													speed = y < mUpperBound / 2 ? -16 : -4;
-											}
-											if (speed != 0) {
-													int ref = pointToPosition(0, mHeight / 2);
-													if (ref == AdapterView.INVALID_POSITION) {
-															//we hit a divider or an invisible view, check somewhere else
-															ref = pointToPosition(0, mHeight / 2 + getDividerHeight() + 64);
-													}
-													View v = getChildAt(ref - getFirstVisiblePosition());
-													if (v!= null) {
-															int pos = v.getTop();
-															setSelectionFromTop(ref, pos - speed);
-													}
-											}
-									}
-									break;
-					}
-					return true;
-			}
-			return super.onTouchEvent(ev);
-	}
-
-	private void startDragging(Bitmap bm, int x, int y) {
-			stopDragging(null);
-
-			mWindowParams = new WindowManager.LayoutParams();
-			mWindowParams.gravity = Gravity.TOP|Gravity.LEFT;
-			mWindowParams.x = x;
-			mWindowParams.y = y - mDragPoint + mCoordOffset;
-
-			mWindowParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
-			mWindowParams.width = WindowManager.LayoutParams.WRAP_CONTENT;
-			mWindowParams.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
-							| WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
-							| WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
-							| WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
-			mWindowParams.format = PixelFormat.TRANSLUCENT;
-			mWindowParams.windowAnimations = 0;
-
-			ImageView v = new ImageView(getContext());
-			v.setBackgroundColor(dragndropBackgroundColor);
-			v.setImageBitmap(bm);
-			mDragBitmap = bm;
-
-			mWindowManager = (WindowManager)getContext().getSystemService(Context.WINDOW_SERVICE);
-			mWindowManager.addView(v, mWindowParams);
-			mDragView = v;
-
-			if(mClickListener != null) {
-			    longPressThread = new Thread(longPressRunnable);
-			    longPressThread.start();
-			}
-	}
-
-	private final Runnable longPressRunnable = new Runnable() {
-	    public void run() {
-	        AndroidUtilities.sleepDeep(1000L);
-	        if(Thread.currentThread().isInterrupted())
-	            return;
-
-	        if(mDragView != null && mDragPos == mFirstDragPos &&
+                        r.left = dragger.getLeft();
+                        r.right = dragger.getRight();
+                        r.top = dragger.getTop();
+                        r.bottom = dragger.getBottom();
+
+                        if ((r.left < x) && (x < r.right)) {
+                            item.setDrawingCacheEnabled(true);
+                            // Create a copy of the drawing cache so that it does not get recycled
+                            // by the framework when the list tries to clean up memory
+                            Bitmap bitmap = Bitmap.createBitmap(item.getDrawingCache());
+                            item.setDrawingCacheEnabled(false);
+
+                            Rect listBounds = new Rect();
+
+                            getGlobalVisibleRect(listBounds, null);
+
+                            startDragging(bitmap, listBounds.left, y);
+                            mDragPos = itemnum;
+                            mFirstDragPos = mDragPos;
+                            mHeight = getHeight();
+                            mDragStartX = ev.getX();
+                            mDragStartTime = System.currentTimeMillis();
+                            mOriginalView = item;
+
+                            int touchSlop = mTouchSlop;
+                            mUpperBound = Math.min(y - touchSlop, mHeight / 3);
+                            mLowerBound = Math.max(y + touchSlop, mHeight * 2 / 3);
+                            return false;
+                        }
+
+                        mDragView = null;
+                    }
+
+                    break;
+            }
+        }
+        return super.onInterceptTouchEvent(ev);
+    }
+
+    protected boolean isDraggableRow(View view) {
+        return (view.findViewById(grabberId) != null);
+    }
+
+    /*
+     * pointToPosition() doesn't consider invisible views, but we
+     * need to, so implement a slightly different version.
+     */
+    private int myPointToPosition(int x, int y) {
+        Rect frame = mTempRect;
+        final int count = getChildCount();
+        for (int i = count - 1; i >= 0; i--) {
+            final View child = getChildAt(i);
+            child.getHitRect(frame);
+            if (frame.contains(x, y)) {
+                return getFirstVisiblePosition() + i;
+            }
+        }
+        return INVALID_POSITION;
+    }
+
+    private int getItemForPosition(int y) {
+        int adjustedy = y - mDragPoint - (mItemHeightNormal / 2);
+        int pos = myPointToPosition(0, adjustedy);
+        if (pos >= 0) {
+            if (pos <= mFirstDragPos) {
+                pos += 1;
+            }
+        } else if (adjustedy < 0) {
+            pos = 0;
+        }
+        return pos;
+    }
+
+    private void adjustScrollBounds(int y) {
+        if (y >= mHeight / 3) {
+            mUpperBound = mHeight / 3;
+        }
+        if (y <= mHeight * 2 / 3) {
+            mLowerBound = mHeight * 2 / 3;
+        }
+    }
+
+    /*
+     * Restore size and visibility for all listitems
+     */
+    private void unExpandViews(boolean deletion) {
+        for (int i = 0; ; i++) {
+            View v = getChildAt(i);
+            if (v == null) {
+                if (deletion) {
+                    // HACK force update of mItemCount
+                    int position = getFirstVisiblePosition();
+                    int y = getChildAt(0).getTop();
+                    setAdapter(getAdapter());
+                    setSelectionFromTop(position, y);
+                    // end hack
+                }
+                layoutChildren(); // force children to be recreated where needed
+                v = getChildAt(i);
+                if (v == null) {
+                    break;
+                }
+            }
+
+            if (isDraggableRow(v)) {
+                ViewGroup.LayoutParams params = v.getLayoutParams();
+                params.height = mItemHeightNormal;
+                v.setLayoutParams(params);
+                v.setVisibility(View.VISIBLE);
+            }
+        }
+    }
+
+    /* Adjust visibility and size to make it appear as though
+     * an item is being dragged around and other items are making
+     * room for it:
+     * If dropping the item would result in it still being in the
+     * same place, then make the dragged listitem's size normal,
+     * but make the item invisible.
+     * Otherwise, if the dragged listitem is still on screen, make
+     * it as small as possible and expand the item below the insert
+     * point.
+     * If the dragged item is not on screen, only expand the item
+     * below the current insertpoint.
+     */
+    private void doExpansion() {
+        int childnum = mDragPos - getFirstVisiblePosition();
+        if (mDragPos > mFirstDragPos) {
+            childnum++;
+        }
+
+        View first = getChildAt(mFirstDragPos - getFirstVisiblePosition());
+
+        for (int i = 0; ; i++) {
+            View vv = getChildAt(i);
+            if (vv == null) {
+                break;
+            }
+            int height = mItemHeightNormal;
+            int visibility = View.VISIBLE;
+            if (vv.equals(first)) {
+                // processing the item that is being dragged
+                if (mDragPos == mFirstDragPos) {
+                    // hovering over the original location
+                    visibility = View.INVISIBLE;
+                } else {
+                    // not hovering over it
+                    height = 1;
+                }
+            } else if (i == childnum) {
+                if (mDragPos < getCount() - 1) {
+                    height = mItemHeightExpanded;
+                }
+            }
+
+            if (isDraggableRow(vv)) {
+                ViewGroup.LayoutParams params = vv.getLayoutParams();
+                params.height = height;
+                vv.setLayoutParams(params);
+                vv.setVisibility(visibility);
+            }
+        }
+        // Request re-layout since we changed the items layout
+        // and not doing this would cause bogus hitbox calculation
+        // in myPointToPosition
+        layoutChildren();
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        if (mGestureDetector != null) {
+            mGestureDetector.onTouchEvent(ev);
+        }
+        if ((mDragListener != null || mDropListener != null) && mDragView != null) {
+            int action = ev.getAction();
+            switch (action) {
+                case MotionEvent.ACTION_UP:
+                case MotionEvent.ACTION_CANCEL:
+                    Rect r = mTempRect;
+                    mDragView.getDrawingRect(r);
+                    stopDragging(ev);
+                    if (mDragPos == mFirstDragPos && ev.getX() > mDragStartX + 20) {
+                        if (mSwipeListener != null) {
+                            mSwipeListener.swipeRight(mFirstDragPos);
+                        }
+                        unExpandViews(true);
+                    } else if (mDragPos == mFirstDragPos && ev.getX() < mDragStartX - 20) {
+                        if (mSwipeListener != null) {
+                            mSwipeListener.swipeLeft(mFirstDragPos);
+                        }
+                        unExpandViews(true);
+                    } else {
+                        if (mDropListener != null && mDragPos >= 0 && mDragPos < getCount()) {
+                            mDropListener.drop(mFirstDragPos, mDragPos);
+                        }
+                        unExpandViews(false);
+                    }
+                    break;
+
+                case MotionEvent.ACTION_DOWN:
+                case MotionEvent.ACTION_MOVE:
+                    int x = (int) ev.getX();
+                    int y = (int) ev.getY();
+                    dragView(x, y);
+                    int itemnum = getItemForPosition(y);
+                    if (itemnum >= 0) {
+                        if (action == MotionEvent.ACTION_DOWN || itemnum != mDragPos) {
+                            if (mDragListener != null) {
+                                mDragListener.drag(mDragPos, itemnum);
+                            }
+                            mDragPos = itemnum;
+                            doExpansion();
+                        }
+                        int speed = 0;
+                        adjustScrollBounds(y);
+                        if (y > mLowerBound) {
+                            // scroll the list up a bit
+                            speed = y > (mHeight + mLowerBound) / 2 ? 16 : 4;
+                        } else if (y < mUpperBound) {
+                            // scroll the list down a bit
+                            speed = y < mUpperBound / 2 ? -16 : -4;
+                        }
+                        if (speed != 0) {
+                            int ref = pointToPosition(0, mHeight / 2);
+                            if (ref == AdapterView.INVALID_POSITION) {
+                                //we hit a divider or an invisible view, check somewhere else
+                                ref = pointToPosition(0, mHeight / 2 + getDividerHeight() + 64);
+                            }
+                            View v = getChildAt(ref - getFirstVisiblePosition());
+                            if (v != null) {
+                                int pos = v.getTop();
+                                setSelectionFromTop(ref, pos - speed);
+                            }
+                        }
+                    }
+                    break;
+            }
+            return true;
+        }
+        return super.onTouchEvent(ev);
+    }
+
+    private void startDragging(Bitmap bm, int x, int y) {
+        stopDragging(null);
+
+        mWindowParams = new WindowManager.LayoutParams();
+        mWindowParams.gravity = Gravity.TOP | Gravity.LEFT;
+        mWindowParams.x = x;
+        mWindowParams.y = y - mDragPoint + mCoordOffset;
+
+        mWindowParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        mWindowParams.width = WindowManager.LayoutParams.WRAP_CONTENT;
+        mWindowParams.flags = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+                | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
+                | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+                | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
+        mWindowParams.format = PixelFormat.TRANSLUCENT;
+        mWindowParams.windowAnimations = 0;
+
+        ImageView v = new ImageView(getContext());
+        v.setBackgroundColor(dragndropBackgroundColor);
+        v.setImageBitmap(bm);
+        mDragBitmap = bm;
+
+        mWindowManager = (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
+        mWindowManager.addView(v, mWindowParams);
+        mDragView = v;
+
+        if (mClickListener != null) {
+            longPressThread = new Thread(longPressRunnable);
+            longPressThread.start();
+        }
+    }
+
+    private final Runnable longPressRunnable = new Runnable() {
+        public void run() {
+            AndroidUtilities.sleepDeep(1000L);
+            if (Thread.currentThread().isInterrupted())
+                return;
+
+            if (mDragView != null && mDragPos == mFirstDragPos &&
                     Math.abs(mDragCurrentX - mDragStartX) < 10) {
-	            post(new Runnable() {
-	                public void run() {
-	                    stopDragging(null);
-	                    mClickListener.onLongClick(mOriginalView);
-	                    invalidate();
-	                }
-	            });
-	        }
-	    }
-	};
-
-	private void dragView(int x, int y) {
-		float alpha = 1.0f;
-		int width = mDragView.getWidth();
-
-		if (mRemoveMode == SLIDE_RIGHT) {
-				if (x > width / 2) {
-						alpha = ((float)(width - x)) / (width / 2);
-				}
-				mWindowParams.alpha = alpha;
-		}
-		else if (mRemoveMode == SLIDE_LEFT) {
-				if (x < width / 2) {
-						alpha = ((float)x) / (width / 2);
-				}
-				mWindowParams.alpha = alpha;
-		}
-		mWindowParams.y = y - mDragPoint + mCoordOffset;
-		mWindowManager.updateViewLayout(mDragView, mWindowParams);
-		mDragCurrentX = x;
-	}
+                post(new Runnable() {
+                    public void run() {
+                        stopDragging(null);
+                        mClickListener.onLongClick(mOriginalView);
+                        invalidate();
+                    }
+                });
+            }
+        }
+    };
+
+    private void dragView(int x, int y) {
+        float alpha = 1.0f;
+        int width = mDragView.getWidth();
+
+        if (mRemoveMode == SLIDE_RIGHT) {
+            if (x > width / 2) {
+                alpha = ((float) (width - x)) / (width / 2);
+            }
+            mWindowParams.alpha = alpha;
+        } else if (mRemoveMode == SLIDE_LEFT) {
+            if (x < width / 2) {
+                alpha = ((float) x) / (width / 2);
+            }
+            mWindowParams.alpha = alpha;
+        }
+        mWindowParams.y = y - mDragPoint + mCoordOffset;
+        mWindowManager.updateViewLayout(mDragView, mWindowParams);
+        mDragCurrentX = x;
+    }
 
     private void stopDragging(MotionEvent ev) {
         if (mDragBitmap != null) {
@@ -471,10 +470,10 @@ public class TouchListView extends ErrorCatchingListView {
 
             if (ev != null && mClickListener != null) {
                 // detect press & long press case
-                if(mDragPos == mFirstDragPos &&
+                if (mDragPos == mFirstDragPos &&
                         Math.abs(mDragCurrentX - mDragStartX) < 10) {
                     long pressTime = System.currentTimeMillis() - mDragStartTime;
-                    if(pressTime < 1000)
+                    if (pressTime < 1000)
                         mClickListener.onClick(mOriginalView);
                     else
                         mClickListener.onLongClick(mOriginalView);
@@ -482,45 +481,49 @@ public class TouchListView extends ErrorCatchingListView {
             }
         }
 
-        if(longPressThread != null) {
+        if (longPressThread != null) {
             longPressThread.interrupt();
             longPressThread = null;
         }
     }
 
-	public void setDragListener(DragListener l) {
-			mDragListener = l;
-	}
+    public void setDragListener(DragListener l) {
+        mDragListener = l;
+    }
 
-	public void setDropListener(DropListener l) {
-			mDropListener = l;
-	}
+    public void setDropListener(DropListener l) {
+        mDropListener = l;
+    }
 
-	public void setSwipeListener(SwipeListener l) {
-			mSwipeListener = l;
-	}
+    public void setSwipeListener(SwipeListener l) {
+        mSwipeListener = l;
+    }
 
-	public void setClickListener(GrabberClickListener listener) {
+    public void setClickListener(GrabberClickListener listener) {
         this.mClickListener = listener;
     }
 
-	public void setDragndropBackgroundColor(int color) {
+    public void setDragndropBackgroundColor(int color) {
         this.dragndropBackgroundColor = color;
     }
 
-	public interface GrabberClickListener {
-	    public void onClick(View v);
-	    public void onLongClick(View v);
-	}
-
-	public interface DragListener {
-			void drag(int from, int to);
-	}
-	public interface DropListener {
-			void drop(int from, int to);
-	}
-	public interface SwipeListener {
-			void swipeLeft(int which);
-			void swipeRight(int which);
-	}
+    public interface GrabberClickListener {
+        public void onClick(View v);
+
+        public void onLongClick(View v);
+    }
+
+    public interface DragListener {
+        void drag(int from, int to);
+    }
+
+    public interface DropListener {
+        void drop(int from, int to);
+    }
+
+    public interface SwipeListener {
+        void swipeLeft(int which);
+
+        void swipeRight(int which);
+    }
 }
diff --git a/astrid/common-src/com/localytics/android/Constants.java b/astrid/common-src/com/localytics/android/Constants.java
index 087cc19fa..57605ae3c 100644
--- a/astrid/common-src/com/localytics/android/Constants.java
+++ b/astrid/common-src/com/localytics/android/Constants.java
@@ -9,11 +9,10 @@ import android.text.format.DateUtils;
 
 /**
  * Build constants for the Localytics library.
- * <p>
+ * <p/>
  * This is not a public API.
  */
-/* package */final class Constants
-{
+/* package */final class Constants {
 
     /**
      * Version number of this library. This number is primarily important in terms of changes to the upload format.
@@ -53,7 +52,7 @@ import android.text.format.DateUtils;
 
     /**
      * Milliseconds after which a session is considered closed and cannot be reattached to.
-     * <p>
+     * <p/>
      * For example, if the user opens an app, presses home, and opens the app again in less than {@link #SESSION_EXPIRATION}
      * milliseconds, that will count as one session rather than two sessions.
      */
@@ -66,7 +65,7 @@ import android.text.format.DateUtils;
 
     /**
      * Boolean indicating whether logcat messages are enabled.
-     * <p>
+     * <p/>
      * Before releasing a production version of an app, this should be set to false for privacy and performance reasons. When
      * logging is enabled, sensitive information such as the device ID may be printed to the log.
      */
@@ -79,7 +78,7 @@ import android.text.format.DateUtils;
 
     /**
      * Cached copy of the current Android API level
-     * 
+     *
      * @see DatapointHelper#getApiLevel()
      */
     /*package*/ static final int CURRENT_API_LEVEL = DatapointHelper.getApiLevel();
@@ -89,8 +88,7 @@ import android.text.format.DateUtils;
      *
      * @throws UnsupportedOperationException because this class cannot be instantiated.
      */
-    private Constants()
-    {
+    private Constants() {
         throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
     }
 }
diff --git a/astrid/common-src/com/localytics/android/DatapointHelper.java b/astrid/common-src/com/localytics/android/DatapointHelper.java
index 95a7d143e..87348d810 100755
--- a/astrid/common-src/com/localytics/android/DatapointHelper.java
+++ b/astrid/common-src/com/localytics/android/DatapointHelper.java
@@ -8,6 +8,15 @@
 
 package com.localytics.android;
 
+import android.Manifest.permission;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.os.Build;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -18,22 +27,12 @@ import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-import android.Manifest.permission;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.os.Build;
-import android.telephony.TelephonyManager;
-import android.util.Log;
-
 /**
  * Provides a number of static functions to aid in the collection and formatting of datapoints.
- * <p>
+ * <p/>
  * Note: this is not a public API.
  */
-/* package */final class DatapointHelper
-{
+/* package */final class DatapointHelper {
     /**
      * AndroidID known to be duplicated across many devices due to manufacturer bugs.
      */
@@ -49,38 +48,30 @@ import android.util.Log;
      *
      * @throws UnsupportedOperationException because this class cannot be instantiated.
      */
-    private DatapointHelper()
-    {
+    private DatapointHelper() {
         throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
     }
 
     /**
      * @return current Android API level.
      */
-    /* package */static int getApiLevel()
-    {
-        try
-        {
+    /* package */
+    static int getApiLevel() {
+        try {
             // Although the Build.VERSION.SDK field has existed since API 1, it is deprecated and could be removed
             // in the future. Therefore use reflection to retrieve it for maximum forward compatibility.
             final Class<?> buildClass = Build.VERSION.class;
             final String sdkString = (String) buildClass.getField("SDK").get(null); //$NON-NLS-1$
             return Integer.parseInt(sdkString);
-        }
-        catch (final Exception e)
-        {
+        } catch (final Exception e) {
             Log.w(Constants.LOG_TAG, "Caught exception", e); //$NON-NLS-1$
 
             // Although probably not necessary, protects from the aforementioned deprecation
-            try
-            {
+            try {
                 final Class<?> buildClass = Build.VERSION.class;
                 return buildClass.getField("SDK_INT").getInt(null); //$NON-NLS-1$
-            }
-            catch (final Exception ignore)
-            {
-                if (Constants.IS_LOGGABLE)
-                {
+            } catch (final Exception ignore) {
+                if (Constants.IS_LOGGABLE) {
                     Log.w(Constants.LOG_TAG, "Caught exception", ignore); //$NON-NLS-1$
                 }
             }
@@ -96,20 +87,16 @@ import android.util.Log;
      *
      * @param context The context used to access the settings resolver
      * @return An 1-way hashed version of the {@link android.provider.Settings.Secure#ANDROID_ID}. May return null if an Android
-     *         ID or the hashing algorithm is not available.
+     * ID or the hashing algorithm is not available.
      */
-    public static String getAndroidIdHashOrNull(final Context context)
-    {
+    public static String getAndroidIdHashOrNull(final Context context) {
         // Make sure a legacy version of the SDK didn't leave behind a device ID.
         // If it did, this ID must be used to keep user counts accurate
         final File fp = new File(context.getFilesDir() + LEGACY_DEVICE_ID_FILE);
-        if (fp.exists() && fp.length() > 0)
-        {
-            try
-            {
+        if (fp.exists() && fp.length() > 0) {
+            try {
                 BufferedReader reader = null;
-                try
-                {
+                try {
                     final char[] buf = new char[100];
                     int numRead;
                     reader = new BufferedReader(new FileReader(fp), 128);
@@ -117,34 +104,24 @@ import android.util.Log;
                     final String deviceId = String.copyValueOf(buf, 0, numRead);
                     reader.close();
                     return deviceId;
-                }
-                catch (final FileNotFoundException e)
-                {
-                    if (Constants.IS_LOGGABLE)
-                    {
+                } catch (final FileNotFoundException e) {
+                    if (Constants.IS_LOGGABLE) {
                         Log.w(Constants.LOG_TAG, "Caught exception", e); //$NON-NLS-1$
                     }
-                }
-                finally
-                {
-                    if (null != reader)
-                    {
+                } finally {
+                    if (null != reader) {
                         reader.close();
                     }
                 }
-            }
-            catch (final IOException e)
-            {
-                if (Constants.IS_LOGGABLE)
-                {
+            } catch (final IOException e) {
+                if (Constants.IS_LOGGABLE) {
                     Log.w(Constants.LOG_TAG, "Caught exception", e); //$NON-NLS-1$
                 }
             }
         }
 
         final String androidId = android.provider.Settings.Secure.getString(context.getContentResolver(), android.provider.Settings.Secure.ANDROID_ID);
-        if (androidId == null || androidId.toLowerCase().equals(INVALID_ANDROID_ID))
-        {
+        if (androidId == null || androidId.toLowerCase().equals(INVALID_ANDROID_ID)) {
             return null;
         }
 
@@ -154,29 +131,24 @@ import android.util.Log;
     /**
      * Gets a 1-way hashed value of the device's unique serial number. This value is encoded using a SHA-256 one way hash and
      * therefore cannot be used to determine what device this data came from.
-     * <p>
+     * <p/>
      * Note: {@link android.os.Build#SERIAL} was introduced in SDK 9. For older SDKs, this method will return null.
      *
      * @return An 1-way hashed version of the {@link android.os.Build#SERIAL}. May return null if a serial or the hashing
-     *         algorithm is not available.
+     * algorithm is not available.
      */
     /*
      * Suppress JavaDoc warnings because the {@link android.os.Build#SERIAL} fails when built with SDK 4.
      */
-    public static String getSerialNumberHashOrNull()
-    {
+    public static String getSerialNumberHashOrNull() {
         /*
          * Obtain the device serial number using reflection, since serial number was added in SDK 9
          */
         String serialNumber = null;
-        if (Constants.CURRENT_API_LEVEL >= 9)
-        {
-            try
-            {
+        if (Constants.CURRENT_API_LEVEL >= 9) {
+            try {
                 serialNumber = (String) Build.class.getField("SERIAL").get(null); //$NON-NLS-1$
-            }
-            catch (final Exception e)
-            {
+            } catch (final Exception e) {
                 /*
                  * This should never happen, as SERIAL is a public field added in SDK 9.
                  */
@@ -184,8 +156,7 @@ import android.util.Log;
             }
         }
 
-        if (serialNumber == null)
-        {
+        if (serialNumber == null) {
             return null;
         }
 
@@ -194,24 +165,20 @@ import android.util.Log;
 
     /**
      * Gets the device's telephony ID (e.g. IMEI/MEID).
-     * <p>
+     * <p/>
      * Note: this method will return null if {@link permission#READ_PHONE_STATE} is not available. This method will also return
      * null on devices that do not have telephony.
      *
      * @param context The context used to access the phone state.
      * @return An the {@link TelephonyManager#getDeviceId()}. Null if an ID is not available, or if
-     *         {@link permission#READ_PHONE_STATE} is not available.
+     * {@link permission#READ_PHONE_STATE} is not available.
      */
-    public static String getTelephonyDeviceIdOrNull(final Context context)
-    {
-        if (Constants.CURRENT_API_LEVEL >= 8)
-        {
-            final Boolean hasTelephony = ReflectionUtils.tryInvokeInstance(context.getPackageManager(), "hasSystemFeature", new Class<?>[] { String.class }, new Object[] { "android.hardware.telephony" }); //$NON-NLS-1$//$NON-NLS-2$
-
-            if (!hasTelephony.booleanValue())
-            {
-                if (Constants.IS_LOGGABLE)
-                {
+    public static String getTelephonyDeviceIdOrNull(final Context context) {
+        if (Constants.CURRENT_API_LEVEL >= 8) {
+            final Boolean hasTelephony = ReflectionUtils.tryInvokeInstance(context.getPackageManager(), "hasSystemFeature", new Class<?>[]{String.class}, new Object[]{"android.hardware.telephony"}); //$NON-NLS-1$//$NON-NLS-2$
+
+            if (!hasTelephony.booleanValue()) {
+                if (Constants.IS_LOGGABLE) {
                     Log.i(Constants.LOG_TAG, "Device does not have telephony; cannot read telephony id"); //$NON-NLS-1$
                 }
 
@@ -224,15 +191,11 @@ import android.util.Log;
          * appears to be a race condition that occurs during installation.
          */
         String id = null;
-        if (context.getPackageManager().checkPermission(permission.READ_PHONE_STATE, context.getPackageName()) == PackageManager.PERMISSION_GRANTED)
-        {
+        if (context.getPackageManager().checkPermission(permission.READ_PHONE_STATE, context.getPackageName()) == PackageManager.PERMISSION_GRANTED) {
             final TelephonyManager manager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
             id = manager.getDeviceId();
-        }
-        else
-        {
-            if (Constants.IS_LOGGABLE)
-            {
+        } else {
+            if (Constants.IS_LOGGABLE) {
                 Log.w(Constants.LOG_TAG, "Application does not have permission READ_PHONE_STATE; determining device id is not possible.  Please consider requesting READ_PHONE_STATE in the AndroidManifest"); //$NON-NLS-1$
             }
         }
@@ -243,21 +206,19 @@ import android.util.Log;
     /**
      * Gets a 1-way hashed value of the device's IMEI/MEID ID. This value is encoded using a SHA-256 one way hash and cannot be
      * used to determine what device this data came from.
-     * <p>
+     * <p/>
      * Note: this method will return null if this is a non-telephony device.
-     * <p>
+     * <p/>
      * Note: this method will return null if {@link permission#READ_PHONE_STATE} is not available.
      *
      * @param context The context used to access the phone state.
      * @return An 1-way hashed version of the {@link TelephonyManager#getDeviceId()}. Null if an ID or the hashing algorithm is
-     *         not available, or if {@link permission#READ_PHONE_STATE} is not available.
+     * not available, or if {@link permission#READ_PHONE_STATE} is not available.
      */
-    public static String getTelephonyDeviceIdHashOrNull(final Context context)
-    {
+    public static String getTelephonyDeviceIdHashOrNull(final Context context) {
         final String id = getTelephonyDeviceIdOrNull(context);
 
-        if (null == id)
-        {
+        if (null == id) {
             return null;
         }
 
@@ -267,24 +228,18 @@ import android.util.Log;
     /**
      * Determines the type of network this device is connected to.
      *
-     * @param context the context used to access the device's WIFI
+     * @param context          the context used to access the device's WIFI
      * @param telephonyManager The manager used to access telephony info
      * @return The type of network, or unknown if the information is unavailable
      */
-    public static String getNetworkType(final Context context, final TelephonyManager telephonyManager)
-    {
-        if (context.getPackageManager().checkPermission(permission.ACCESS_WIFI_STATE, context.getPackageName()) == PackageManager.PERMISSION_GRANTED)
-        {
+    public static String getNetworkType(final Context context, final TelephonyManager telephonyManager) {
+        if (context.getPackageManager().checkPermission(permission.ACCESS_WIFI_STATE, context.getPackageName()) == PackageManager.PERMISSION_GRANTED) {
             final NetworkInfo wifiInfo = ((ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE)).getNetworkInfo(ConnectivityManager.TYPE_WIFI);
-            if (wifiInfo != null && wifiInfo.isConnectedOrConnecting())
-            {
+            if (wifiInfo != null && wifiInfo.isConnectedOrConnecting()) {
                 return "wifi"; //$NON-NLS-1$
             }
-        }
-        else
-        {
-            if (Constants.IS_LOGGABLE)
-            {
+        } else {
+            if (Constants.IS_LOGGABLE) {
                 Log.w(Constants.LOG_TAG, "Application does not have permission ACCESS_WIFI_STATE; determining Wi-Fi connectivity is unavailable"); //$NON-NLS-1$
             }
         }
@@ -298,20 +253,14 @@ import android.util.Log;
      *
      * @return A string naming the manufacturer
      */
-    public static String getManufacturer()
-    {
+    public static String getManufacturer() {
         String mfg = "unknown"; //$NON-NLS-1$
-        if (Constants.CURRENT_API_LEVEL > 3)
-        {
-            try
-            {
+        if (Constants.CURRENT_API_LEVEL > 3) {
+            try {
                 final Class<?> buildClass = Build.class;
                 mfg = (String) buildClass.getField("MANUFACTURER").get(null); //$NON-NLS-1$
-            }
-            catch (final Exception ignore)
-            {
-                if (Constants.IS_LOGGABLE)
-                {
+            } catch (final Exception ignore) {
+                if (Constants.IS_LOGGABLE) {
                     Log.w(Constants.LOG_TAG, "Caught exception", ignore); //$NON-NLS-1$
                 }
             }
@@ -325,21 +274,17 @@ import android.util.Log;
      * @param context {@link Context}. Cannot be null.
      * @return The application's version
      */
-    public static String getAppVersion(final Context context)
-    {
+    public static String getAppVersion(final Context context) {
         final PackageManager pm = context.getPackageManager();
 
-        try
-        {
+        try {
             final String versionName = pm.getPackageInfo(context.getPackageName(), 0).versionName;
 
             /*
              * If there is no versionName in the Android Manifest, the versionName will be null.
              */
-            if (versionName == null)
-            {
-                if (Constants.IS_LOGGABLE)
-                {
+            if (versionName == null) {
+                if (Constants.IS_LOGGABLE) {
                     Log.w(Constants.LOG_TAG, "versionName was null--is a versionName attribute set in the Android Manifest?"); //$NON-NLS-1$
                 }
 
@@ -347,9 +292,7 @@ import android.util.Log;
             }
 
             return versionName;
-        }
-        catch (final PackageManager.NameNotFoundException e)
-        {
+        } catch (final PackageManager.NameNotFoundException e) {
             /*
              * This should never occur--our own package must exist for this code to be running
              */
@@ -363,29 +306,22 @@ import android.util.Log;
      * @param string String to hash. Cannot be null.
      * @return hashed version of the string using SHA-256.
      */
-    /* package */static String getSha256(final String string)
-    {
-        if (Constants.ENABLE_PARAMETER_CHECKING)
-        {
-            if (null == string)
-            {
+    /* package */
+    static String getSha256(final String string) {
+        if (Constants.ENABLE_PARAMETER_CHECKING) {
+            if (null == string) {
                 throw new IllegalArgumentException("string cannot be null"); //$NON-NLS-1$
             }
         }
 
-        try
-        {
+        try {
             final MessageDigest md = MessageDigest.getInstance("SHA-256"); //$NON-NLS-1$
             final byte[] digest = md.digest(string.getBytes("UTF-8")); //$NON-NLS-1$
             final BigInteger hashedNumber = new BigInteger(1, digest);
             return hashedNumber.toString(16);
-        }
-        catch (final NoSuchAlgorithmException e)
-        {
+        } catch (final NoSuchAlgorithmException e) {
             throw new RuntimeException(e);
-        }
-        catch (final UnsupportedEncodingException e)
-        {
+        } catch (final UnsupportedEncodingException e) {
             throw new RuntimeException(e);
         }
     }
diff --git a/astrid/common-src/com/localytics/android/ExceptionHandler.java b/astrid/common-src/com/localytics/android/ExceptionHandler.java
index 2ed580281..b98a5416d 100644
--- a/astrid/common-src/com/localytics/android/ExceptionHandler.java
+++ b/astrid/common-src/com/localytics/android/ExceptionHandler.java
@@ -9,31 +9,24 @@ import android.util.Log;
 
 /**
  * Exception handler for background threads used by the Localytics library.
- * <p>
+ * <p/>
  * Analytics are secondary to any other functions performed by an app, which means that analytics should never cause an app to
  * crash. This handler therefore suppresses all uncaught exceptions from the Localytics library.
  */
-/* package */final class ExceptionHandler implements Thread.UncaughtExceptionHandler
-{
-    public void uncaughtException(final Thread thread, final Throwable throwable)
-    {
+/* package */final class ExceptionHandler implements Thread.UncaughtExceptionHandler {
+    public void uncaughtException(final Thread thread, final Throwable throwable) {
         /*
          * Wrap all the work done by the exception handler in a try-catch. It would be ironic if this exception handler itself
          * caused the parent process to crash.
          */
-        try
-        {
-            if (Constants.IS_LOGGABLE)
-            {
+        try {
+            if (Constants.IS_LOGGABLE) {
                 Log.e(Constants.LOG_TAG, "Localytics library threw an uncaught exception", throwable); //$NON-NLS-1$
             }
 
             // TODO: Upload uncaught exceptions so that we can fix them
-        }
-        catch (final Exception e)
-        {
-            if (Constants.IS_LOGGABLE)
-            {
+        } catch (final Exception e) {
+            if (Constants.IS_LOGGABLE) {
                 Log.e(Constants.LOG_TAG, "Exception handler threw an exception", e); //$NON-NLS-1$
             }
         }
diff --git a/astrid/common-src/com/localytics/android/JsonObjects.java b/astrid/common-src/com/localytics/android/JsonObjects.java
index f1f76e64b..81c818f0b 100644
--- a/astrid/common-src/com/localytics/android/JsonObjects.java
+++ b/astrid/common-src/com/localytics/android/JsonObjects.java
@@ -5,37 +5,33 @@
  */
 package com.localytics.android;
 
-import org.json.JSONArray;
-
 import android.Manifest.permission;
 
+import org.json.JSONArray;
+
 /**
  * Set of constants for building JSON objects that get sent to the Localytics web service.
  */
-/* package */final class JsonObjects
-{
+/* package */final class JsonObjects {
     /**
      * Private constructor prevents instantiation
      *
      * @throws UnsupportedOperationException because this class cannot be instantiated.
      */
-    private JsonObjects()
-    {
+    private JsonObjects() {
         throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
     }
 
     /**
      * Set of constants for the blob header JSON object.
      */
-    public static final class BlobHeader
-    {
+    public static final class BlobHeader {
         /**
          * Private constructor prevents instantiation
          *
          * @throws UnsupportedOperationException because this class cannot be instantiated.
          */
-        private BlobHeader()
-        {
+        private BlobHeader() {
             throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
         }
 
@@ -76,28 +72,26 @@ import android.Manifest.permission;
         /**
          * Attributes under {@link BlobHeader#KEY_ATTRIBUTES}
          */
-        public static final class Attributes
-        {
+        public static final class Attributes {
             /**
              * Private constructor prevents instantiation
              *
              * @throws UnsupportedOperationException because this class cannot be instantiated.
              */
-            private Attributes()
-            {
+            private Attributes() {
                 throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
             }
 
             /**
              * Type: {@code String}
-             * <p>
+             * <p/>
              * Data connection type.
              */
             public static final String KEY_DATA_CONNECTION = "dac"; //$NON-NLS-1$
 
             /**
              * Type: {@code String}
-             * <p>
+             * <p/>
              * Version name of the application, taken from the Android Manifest.
              */
             public static final String KEY_CLIENT_APP_VERSION = "av"; //$NON-NLS-1$
@@ -109,34 +103,34 @@ import android.Manifest.permission;
 
             /**
              * Type: {@code String}
-             * <p>
+             * <p/>
              */
             public static final String KEY_DEVICE_COUNTRY = "dc"; //$NON-NLS-1$
 
             /**
              * Type: {@code String}
-             * <p>
+             * <p/>
              * Manufacturer of the device (e.g. HTC, Samsung, Motorola, Kyocera, etc.)
              */
             public static final String KEY_DEVICE_MANUFACTURER = "dma"; //$NON-NLS-1$
 
             /**
              * Type: {@code String}
-             * <p>
+             * <p/>
              * Model of the device (e.g. dream,
              */
             public static final String KEY_DEVICE_MODEL = "dmo"; //$NON-NLS-1$
 
             /**
              * Type: {@code String}
-             * <p>
+             * <p/>
              * Android version (e.g. 1.6 or 2.3.4).
              */
             public static final String KEY_DEVICE_OS_VERSION = "dov"; //$NON-NLS-1$
 
             /**
              * Type: {@code String}
-             * <p>
+             * <p/>
              * Telephony ID of the device, if the device has telephony and the app has {@link permission#READ_PHONE_STATE}.
              * Otherwise null.
              */
@@ -144,21 +138,21 @@ import android.Manifest.permission;
 
             /**
              * Type: {@code String}
-             * <p>
+             * <p/>
              * Platform of the device. For Android devices, this is always "android"
              */
             public static final String KEY_DEVICE_PLATFORM = "dp"; //$NON-NLS-1$
 
             /**
              * Type: {@code String}
-             * <p>
+             * <p/>
              * SHA-256 hash of the device's serial number. Only reported for Android 2.3 or later. Otherwise null.
              */
             public static final String KEY_DEVICE_SERIAL_HASH = "dms"; //$NON-NLS-1$
 
             /**
              * Type: {@code int}
-             * <p>
+             * <p/>
              * SDK compatibility level of the device.
              *
              * @see android.os.Build.VERSION#SDK
@@ -167,7 +161,7 @@ import android.Manifest.permission;
 
             /**
              * Type: {@code String}
-             * <p>
+             * <p/>
              * SHA-256 hash of the device's Telephony ID, if the device has telephony and the app has
              * {@link permission#READ_PHONE_STATE}. Otherwise null.
              */
@@ -175,28 +169,28 @@ import android.Manifest.permission;
 
             /**
              * Type: {@code String}
-             * <p>
+             * <p/>
              * Country for the device's current locale settings
              */
             public static final String KEY_LOCALE_COUNTRY = "dlc"; //$NON-NLS-1$
 
             /**
              * Type: {@code String}
-             * <p>
+             * <p/>
              * Language for the device's current locale settings
              */
             public static final String KEY_LOCALE_LANGUAGE = "dll"; //$NON-NLS-1$
 
             /**
              * Type: {@code String}
-             * <p>
+             * <p/>
              * Api key
              */
             public static final String KEY_LOCALYTICS_API_KEY = "au"; //$NON-NLS-1$
 
             /**
              * Type: {@code String}
-             * <p>
+             * <p/>
              * Localytics library version
              *
              * @see Constants#LOCALYTICS_CLIENT_LIBRARY_VERSION
@@ -205,7 +199,7 @@ import android.Manifest.permission;
 
             /**
              * Type: {@code String}
-             * <p>
+             * <p/>
              * Data type for the JSON object.
              *
              * @see #VALUE_DATA_TYPE
@@ -214,14 +208,14 @@ import android.Manifest.permission;
 
             /**
              * Type: {@code String}
-             * <p>
+             * <p/>
              * Network carrier of the device
              */
             public static final String KEY_NETWORK_CARRIER = "nca"; //$NON-NLS-1$
 
             /**
              * Type: {@code String}
-             * <p>
+             * <p/>
              */
             public static final String KEY_NETWORK_COUNTRY = "nc"; //$NON-NLS-1$
 
@@ -243,21 +237,19 @@ import android.Manifest.permission;
     /**
      * Set of constants for the session open event.
      */
-    /* package */static final class SessionOpen
-    {
+    /* package */static final class SessionOpen {
         /**
          * Private constructor prevents instantiation
          *
          * @throws UnsupportedOperationException because this class cannot be instantiated.
          */
-        private SessionOpen()
-        {
+        private SessionOpen() {
             throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
         }
 
         /**
          * Type: {@code String}
-         * <p>
+         * <p/>
          * Data type for the JSON object.
          *
          * @see #VALUE_DATA_TYPE
@@ -271,21 +263,21 @@ import android.Manifest.permission;
 
         /**
          * Type: {@code long}
-         * <p>
+         * <p/>
          * Epoch timestamp when the session was started in seconds.
          */
         public static final String KEY_WALL_TIME_SECONDS = "ct"; //$NON-NLS-1$
 
         /**
          * Type: {@code long}
-         * <p>
+         * <p/>
          * UUID of the event, which is the same thing as the session UUID
          */
         public static final String KEY_EVENT_UUID = "u"; //$NON-NLS-1$
 
         /**
          * Type: {@code long}
-         * <p>
+         * <p/>
          * Count for the number of sessions
          */
         public static final String KEY_COUNT = "nth"; //$NON-NLS-1$
@@ -294,21 +286,19 @@ import android.Manifest.permission;
     /**
      * Set of constants for the session close event.
      */
-    /* package */static final class SessionClose
-    {
+    /* package */static final class SessionClose {
         /**
          * Private constructor prevents instantiation
          *
          * @throws UnsupportedOperationException because this class cannot be instantiated.
          */
-        private SessionClose()
-        {
+        private SessionClose() {
             throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
         }
 
         /**
          * Type: {@code String}
-         * <p>
+         * <p/>
          * Data type for the JSON object.
          *
          * @see #VALUE_DATA_TYPE
@@ -317,42 +307,42 @@ import android.Manifest.permission;
 
         /**
          * Type: {@code String}
-         * <p>
+         * <p/>
          * UUID of the event.
          */
         public static final String KEY_EVENT_UUID = "u"; //$NON-NLS-1$
 
         /**
          * Type: {@code String[]} (technically, a JSON array of strings)
-         * <p>
+         * <p/>
          * Ordered list of flow events that occurred
          */
         public static final String KEY_FLOW_ARRAY = "fl"; //$NON-NLS-1$
 
         /**
          * Type: {@code long}
-         * <p>
+         * <p/>
          * Epoch timestamp when the session was started
          */
         public static final String KEY_SESSION_LENGTH_SECONDS = "ctl"; //$NON-NLS-1$
 
         /**
          * Type: {@code long}
-         * <p>
+         * <p/>
          * Start time of the parent session
          */
         public static final String KEY_SESSION_START_TIME = "ss"; //$NON-NLS-1$
 
         /**
          * Type: {@code String}
-         * <p>
+         * <p/>
          * UUID of the session.
          */
         public static final String KEY_SESSION_UUID = "su"; //$NON-NLS-1$
 
         /**
          * Type: {@code long}
-         * <p>
+         * <p/>
          * Epoch timestamp when the session was started in seconds.
          */
         public static final String KEY_WALL_TIME_SECONDS = "ct"; //$NON-NLS-1$
@@ -368,21 +358,19 @@ import android.Manifest.permission;
     /**
      * Set of constants for the session event event.
      */
-    /* package */static final class SessionEvent
-    {
+    /* package */static final class SessionEvent {
         /**
          * Private constructor prevents instantiation
          *
          * @throws UnsupportedOperationException because this class cannot be instantiated.
          */
-        private SessionEvent()
-        {
+        private SessionEvent() {
             throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
         }
 
         /**
          * Type: {@code String}
-         * <p>
+         * <p/>
          * Data type for the JSON object.
          *
          * @see #VALUE_DATA_TYPE
@@ -398,37 +386,37 @@ import android.Manifest.permission;
 
         /**
          * Type: {@code long}
-         * <p>
+         * <p/>
          * Epoch timestamp when the session was started in seconds.
          */
         public static final String KEY_WALL_TIME_SECONDS = "ct"; //$NON-NLS-1$
 
         /**
          * Type: {@code String}
-         * <p>
+         * <p/>
          * UUID of the session.
          */
         public static final String KEY_SESSION_UUID = "su"; //$NON-NLS-1$
 
         /**
          * Type: {@code String}
-         * <p>
+         * <p/>
          * UUID of the event.
          */
         public static final String KEY_EVENT_UUID = "u"; //$NON-NLS-1$
 
         /**
          * Type: {@code String}
-         * <p>
+         * <p/>
          * Name of the event.
          */
         public static final String KEY_NAME = "n"; //$NON-NLS-1$
 
         /**
          * Type: {@code JSONObject}.
-         * <p>
+         * <p/>
          * Maps to the attributes of the event.
-         * <p>
+         * <p/>
          * Note that this key is optional. If it is present, it will point to a non-null value representing the attributes of the
          * event. Otherwise the key will not exist, indicating the event had no attributes.
          */
@@ -438,21 +426,19 @@ import android.Manifest.permission;
     /**
      * Set of constants for the session opt in/out event
      */
-    /* package */static final class OptEvent
-    {
+    /* package */static final class OptEvent {
         /**
          * Private constructor prevents instantiation
          *
          * @throws UnsupportedOperationException because this class cannot be instantiated.
          */
-        private OptEvent()
-        {
+        private OptEvent() {
             throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
         }
 
         /**
          * Type: {@code String}
-         * <p>
+         * <p/>
          * Data type for the JSON object.
          *
          * @see #VALUE_DATA_TYPE
@@ -468,21 +454,21 @@ import android.Manifest.permission;
 
         /**
          * Type: {@code long}
-         * <p>
+         * <p/>
          * Epoch timestamp when the session was started in seconds.
          */
         public static final String KEY_WALL_TIME_SECONDS = "ct"; //$NON-NLS-1$
 
         /**
          * Type: {@code String}
-         * <p>
+         * <p/>
          * API key
          */
         public static final String KEY_API_KEY = "u"; //$NON-NLS-1$
 
         /**
          * Type: {@code boolean}
-         * <p>
+         * <p/>
          * True to opt-out. False to opt-in
          */
         public static final String KEY_OPT = "out"; //$NON-NLS-1$
@@ -491,21 +477,19 @@ import android.Manifest.permission;
     /**
      * Set of constants for the session flow event.
      */
-    /* package */static final class EventFlow
-    {
+    /* package */static final class EventFlow {
         /**
          * Private constructor prevents instantiation
          *
          * @throws UnsupportedOperationException because this class cannot be instantiated.
          */
-        private EventFlow()
-        {
+        private EventFlow() {
             throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
         }
 
         /**
          * Type: {@code String}
-         * <p>
+         * <p/>
          * Data type for the JSON object.
          *
          * @see #VALUE_DATA_TYPE
@@ -514,28 +498,28 @@ import android.Manifest.permission;
 
         /**
          * Type: {@code long}
-         * <p>
+         * <p/>
          * UUID of the event, which is the same thing as the session UUID
          */
         public static final String KEY_EVENT_UUID = "u"; //$NON-NLS-1$
 
         /**
          * Type: {@code long}
-         * <p>
+         * <p/>
          * Start time of the parents session.
          */
         public static final String KEY_SESSION_START_TIME = "ss"; //$NON-NLS-1$
 
         /**
          * Type: {@code Element[]} (technically a {@link JSONArray} of {@link Element} objects)
-         * <p>
+         * <p/>
          * Ordered set of new flow elements that occurred since the last upload for this session.
          */
         public static final String KEY_FLOW_NEW = "nw"; //$NON-NLS-1$
 
         /**
          * Type: {@code Element[]} (technically a {@link JSONArray} of {@link Element} objects)
-         * <p>
+         * <p/>
          * Ordered set of old flow elements that occurred during all previous uploads for this session.
          */
         public static final String KEY_FLOW_OLD = "od"; //$NON-NLS-1$
@@ -548,15 +532,13 @@ import android.Manifest.permission;
         /**
          * Flow event element that indicates the type and name of the flow event.
          */
-        /* package */static final class Element
-        {
+        /* package */static final class Element {
             /**
              * Private constructor prevents instantiation
              *
              * @throws UnsupportedOperationException because this class cannot be instantiated.
              */
-            private Element()
-            {
+            private Element() {
                 throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
             }
 
diff --git a/astrid/common-src/com/localytics/android/LocalyticsProvider.java b/astrid/common-src/com/localytics/android/LocalyticsProvider.java
index 7ed58bdd1..82ca4967b 100644
--- a/astrid/common-src/com/localytics/android/LocalyticsProvider.java
+++ b/astrid/common-src/com/localytics/android/LocalyticsProvider.java
@@ -5,14 +5,6 @@
  */
 package com.localytics.android;
 
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -23,17 +15,24 @@ import android.database.sqlite.SQLiteQueryBuilder;
 import android.provider.BaseColumns;
 import android.util.Log;
 
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * Implements the storage mechanism for the Localytics library. The interface and implementation are similar to a ContentProvider
  * but modified to be better suited to a library. The interface is table-oriented, rather than Uri-oriented.
- * <p>
+ * <p/>
  * This is not a public API.
  */
-/* package */final class LocalyticsProvider
-{
+/* package */final class LocalyticsProvider {
     /**
      * Name of the Localytics database, stored in the host application's {@link Context#getDatabasePath(String)}.
-     * <p>
+     * <p/>
      * This is not a public API.
      */
     /*
@@ -44,7 +43,7 @@ import android.util.Log;
 
     /**
      * Version of the database.
-     * <p>
+     * <p/>
      * Version history:
      * <ol>
      * <li>1: Initial version</li>
@@ -79,26 +78,23 @@ import android.util.Log;
     /**
      * Obtains an instance of the Localytics Provider. Since the provider is a singleton object, only a single instance will be
      * returned.
-     * <p>
+     * <p/>
      * Note: if {@code context} is an instance of {@link android.test.RenamingDelegatingContext}, then a new object will be
      * returned every time. This is not a "public" API, but is documented here as it aids unit testing.
      *
      * @param context Application context. Cannot be null.
-     * @param apiKey TODO
+     * @param apiKey  TODO
      * @return An instance of {@link LocalyticsProvider}.
      * @throws IllegalArgumentException if {@code context} is null
      */
-    public static LocalyticsProvider getInstance(final Context context, final String apiKey)
-    {
+    public static LocalyticsProvider getInstance(final Context context, final String apiKey) {
         /*
          * Note: Don't call getApplicationContext() on the context, as that would return a different context and defeat useful
          * contexts such as RenamingDelegatingContext.
          */
 
-        if (Constants.ENABLE_PARAMETER_CHECKING)
-        {
-            if (null == context)
-            {
+        if (Constants.ENABLE_PARAMETER_CHECKING) {
+            if (null == context) {
                 throw new IllegalArgumentException("context cannot be null"); //$NON-NLS-1$
             }
         }
@@ -112,12 +108,10 @@ import android.util.Log;
             return new LocalyticsProvider(context, apiKey);
         }
 
-        synchronized (sLocalyticsProviderIntrinsicLock)
-        {
+        synchronized (sLocalyticsProviderIntrinsicLock) {
             LocalyticsProvider provider = sLocalyticsProviderMap.get(apiKey);
 
-            if (null == provider)
-            {
+            if (null == provider) {
                 provider = new LocalyticsProvider(context, apiKey);
                 sLocalyticsProviderMap.put(apiKey, provider);
             }
@@ -128,13 +122,12 @@ import android.util.Log;
 
     /**
      * Constructs a new Localytics Provider.
-     * <p>
+     * <p/>
      * Note: this method may perform disk operations.
      *
      * @param context application context. Cannot be null.
      */
-    private LocalyticsProvider(final Context context, final String apiKey)
-    {
+    private LocalyticsProvider(final Context context, final String apiKey) {
         /*
          * Rather than use the API key directly in the file name, it is put through SHA-256. The main reason for doing that is to
          * decouple the requirements of the Android file system from the possible values of the API key string. There is a very,
@@ -147,39 +140,33 @@ import android.util.Log;
 
     /**
      * Inserts a new record.
-     * <p>
+     * <p/>
      * Note: this method may perform disk operations.
      *
      * @param tableName name of the table operate on. Must be one of the recognized tables. Cannot be null.
-     * @param values ContentValues to insert. Cannot be null.
+     * @param values    ContentValues to insert. Cannot be null.
      * @return the {@link BaseColumns#_ID} of the inserted row or -1 if an error occurred.
      * @throws IllegalArgumentException if tableName is null or not a valid table name.
      * @throws IllegalArgumentException if values are null.
      */
-    public long insert(final String tableName, final ContentValues values)
-    {
-        if (Constants.ENABLE_PARAMETER_CHECKING)
-        {
-            if (!isValidTable(tableName))
-            {
+    public long insert(final String tableName, final ContentValues values) {
+        if (Constants.ENABLE_PARAMETER_CHECKING) {
+            if (!isValidTable(tableName)) {
                 throw new IllegalArgumentException(String.format("tableName %s is invalid", tableName)); //$NON-NLS-1$
             }
 
-            if (null == values)
-            {
+            if (null == values) {
                 throw new IllegalArgumentException("values cannot be null"); //$NON-NLS-1$
             }
         }
 
-        if (Constants.IS_LOGGABLE)
-        {
+        if (Constants.IS_LOGGABLE) {
             Log.v(Constants.LOG_TAG, String.format("Insert table: %s, values: %s", tableName, values.toString())); //$NON-NLS-1$
         }
 
         final long result = mDb.insertOrThrow(tableName, null, values);
 
-        if (Constants.IS_LOGGABLE)
-        {
+        if (Constants.IS_LOGGABLE) {
             Log.v(Constants.LOG_TAG, String.format("Inserted row with new id %d", Long.valueOf(result))); //$NON-NLS-1$
         }
 
@@ -188,30 +175,26 @@ import android.util.Log;
 
     /**
      * Performs a query.
-     * <p>
+     * <p/>
      * Note: this method may perform disk operations.
      *
-     * @param tableName name of the table operate on. Must be one of the recognized tables. Cannot be null.
-     * @param projection The list of columns to include. If null, then all columns are included by default.
-     * @param selection A filter to apply to all rows, like the SQLite WHERE clause. Passing null will query all rows. This param
-     *            may contain ? symbols, which will be replaced by values from the {@code selectionArgs} param.
+     * @param tableName     name of the table operate on. Must be one of the recognized tables. Cannot be null.
+     * @param projection    The list of columns to include. If null, then all columns are included by default.
+     * @param selection     A filter to apply to all rows, like the SQLite WHERE clause. Passing null will query all rows. This param
+     *                      may contain ? symbols, which will be replaced by values from the {@code selectionArgs} param.
      * @param selectionArgs An optional string array of replacements for ? symbols in {@code selection}. May be null.
-     * @param sortOrder How the rows in the cursor should be sorted. If null, then the sort order is undefined.
+     * @param sortOrder     How the rows in the cursor should be sorted. If null, then the sort order is undefined.
      * @return Cursor for the query. To the receiver: Don't forget to call .close() on the cursor when finished with it.
      * @throws IllegalArgumentException if tableName is null or not a valid table name.
      */
-    public Cursor query(final String tableName, final String[] projection, final String selection, final String[] selectionArgs, final String sortOrder)
-    {
-        if (Constants.ENABLE_PARAMETER_CHECKING)
-        {
-            if (!isValidTable(tableName))
-            {
+    public Cursor query(final String tableName, final String[] projection, final String selection, final String[] selectionArgs, final String sortOrder) {
+        if (Constants.ENABLE_PARAMETER_CHECKING) {
+            if (!isValidTable(tableName)) {
                 throw new IllegalArgumentException(String.format("tableName %s is invalid", tableName)); //$NON-NLS-1$
             }
         }
 
-        if (Constants.IS_LOGGABLE)
-        {
+        if (Constants.IS_LOGGABLE) {
             Log.v(Constants.LOG_TAG, String.format("Query table: %s, projection: %s, selection: %s, selectionArgs: %s", tableName, Arrays.toString(projection), selection, Arrays.toString(selectionArgs))); //$NON-NLS-1$
         }
 
@@ -220,8 +203,7 @@ import android.util.Log;
 
         final Cursor result = qb.query(mDb, projection, selection, selectionArgs, null, null, sortOrder);
 
-        if (Constants.IS_LOGGABLE)
-        {
+        if (Constants.IS_LOGGABLE) {
             Log.v(Constants.LOG_TAG, "Query result is: " + DatabaseUtils.dumpCursorToString(result)); //$NON-NLS-1$
         }
 
@@ -230,30 +212,26 @@ import android.util.Log;
 
     /**
      * Updates row(s).
-     * <p>
+     * <p/>
      * Note: this method may perform disk operations.
      *
-     * @param tableName name of the table operate on. Must be one of the recognized tables. Cannot be null.
-     * @param values A ContentValues mapping from column names (see the associated BaseColumns class for the table) to new column
-     *            values.
-     * @param selection A filter to limit which rows are updated, like the SQLite WHERE clause. Passing null implies all rows.
-     *            This param may contain ? symbols, which will be replaced by values from the {@code selectionArgs} param.
+     * @param tableName     name of the table operate on. Must be one of the recognized tables. Cannot be null.
+     * @param values        A ContentValues mapping from column names (see the associated BaseColumns class for the table) to new column
+     *                      values.
+     * @param selection     A filter to limit which rows are updated, like the SQLite WHERE clause. Passing null implies all rows.
+     *                      This param may contain ? symbols, which will be replaced by values from the {@code selectionArgs} param.
      * @param selectionArgs An optional string array of replacements for ? symbols in {@code selection}. May be null.
      * @return int representing the number of rows modified, which is in the range from 0 to the number of items in the table.
      * @throws IllegalArgumentException if tableName is null or not a valid table name.
      */
-    public int update(final String tableName, final ContentValues values, final String selection, final String[] selectionArgs)
-    {
-        if (Constants.ENABLE_PARAMETER_CHECKING)
-        {
-            if (!isValidTable(tableName))
-            {
+    public int update(final String tableName, final ContentValues values, final String selection, final String[] selectionArgs) {
+        if (Constants.ENABLE_PARAMETER_CHECKING) {
+            if (!isValidTable(tableName)) {
                 throw new IllegalArgumentException(String.format("tableName %s is invalid", tableName)); //$NON-NLS-1$
             }
         }
 
-        if (Constants.IS_LOGGABLE)
-        {
+        if (Constants.IS_LOGGABLE) {
             Log.v(Constants.LOG_TAG, String.format("Update table: %s, values: %s, selection: %s, selectionArgs: %s", tableName, values.toString(), selection, Arrays.toString(selectionArgs))); //$NON-NLS-1$
         }
 
@@ -262,43 +240,35 @@ import android.util.Log;
 
     /**
      * Deletes row(s).
-     * <p>
+     * <p/>
      * Note: this method may perform disk operations.
      *
-     * @param tableName name of the table operate on. Must be one of the recognized tables. Cannot be null.
-     * @param selection A filter to limit which rows are deleted, like the SQLite WHERE clause. Passing null implies all rows.
-     *            This param may contain ? symbols, which will be replaced by values from the {@code selectionArgs} param.
+     * @param tableName     name of the table operate on. Must be one of the recognized tables. Cannot be null.
+     * @param selection     A filter to limit which rows are deleted, like the SQLite WHERE clause. Passing null implies all rows.
+     *                      This param may contain ? symbols, which will be replaced by values from the {@code selectionArgs} param.
      * @param selectionArgs An optional string array of replacements for ? symbols in {@code selection}. May be null.
      * @return The number of rows affected, which is in the range from 0 to the number of items in the table.
      * @throws IllegalArgumentException if tableName is null or not a valid table name.
      */
-    public int delete(final String tableName, final String selection, final String[] selectionArgs)
-    {
-        if (Constants.ENABLE_PARAMETER_CHECKING)
-        {
-            if (!isValidTable(tableName))
-            {
+    public int delete(final String tableName, final String selection, final String[] selectionArgs) {
+        if (Constants.ENABLE_PARAMETER_CHECKING) {
+            if (!isValidTable(tableName)) {
                 throw new IllegalArgumentException(String.format("tableName %s is invalid", tableName)); //$NON-NLS-1$
             }
         }
 
-        if (Constants.IS_LOGGABLE)
-        {
+        if (Constants.IS_LOGGABLE) {
             Log.v(Constants.LOG_TAG, String.format("Delete table: %s, selection: %s, selectionArgs: %s", tableName, selection, Arrays.toString(selectionArgs))); //$NON-NLS-1$
         }
 
         final int count;
-        if (null == selection)
-        {
+        if (null == selection) {
             count = mDb.delete(tableName, "1", null); //$NON-NLS-1$
-        }
-        else
-        {
+        } else {
             count = mDb.delete(tableName, selection, selectionArgs);
         }
 
-        if (Constants.IS_LOGGABLE)
-        {
+        if (Constants.IS_LOGGABLE) {
             Log.v(Constants.LOG_TAG, String.format("Deleted %d rows", Integer.valueOf(count))); //$NON-NLS-1$
         }
 
@@ -318,25 +288,19 @@ import android.util.Log;
      * An alternative implementation would have been to expose the begin/end transaction methods on the Provider object. While
      * that would work, it makes it harder to transition to a ContentProviderOperation model in the future.
      */
-    public void runBatchTransaction(final Runnable runnable)
-    {
-        if (Constants.ENABLE_PARAMETER_CHECKING)
-        {
-            if (null == runnable)
-            {
+    public void runBatchTransaction(final Runnable runnable) {
+        if (Constants.ENABLE_PARAMETER_CHECKING) {
+            if (null == runnable) {
                 throw new IllegalArgumentException("runnable cannot be null"); //$NON-NLS-1$
             }
         }
 
         mDb.beginTransaction();
-        try
-        {
+        try {
             runnable.run();
 
             mDb.setTransactionSuccessful();
-        }
-        finally
-        {
+        } finally {
             mDb.endTransaction();
         }
     }
@@ -347,15 +311,12 @@ import android.util.Log;
      * @param table name of a table to check. This param may be null.
      * @return true if the table is valid, false if the table is invalid. If {@code table} is null, returns false.
      */
-    private static boolean isValidTable(final String table)
-    {
-        if (null == table)
-        {
+    private static boolean isValidTable(final String table) {
+        if (null == table) {
             return false;
         }
 
-        if (!sValidTables.contains(table))
-        {
+        if (!sValidTables.contains(table)) {
             return false;
         }
 
@@ -367,8 +328,7 @@ import android.util.Log;
      *
      * @return returns a set of the valid tables.
      */
-    private static Set<String> getValidTables()
-    {
+    private static Set<String> getValidTables() {
         final HashSet<String> tables = new HashSet<String>();
 
         tables.add(ApiKeysDbColumns.TABLE_NAME);
@@ -384,18 +344,16 @@ import android.util.Log;
 
     /**
      * Private helper that deletes files from older versions of the Localytics library.
-     * <p>
+     * <p/>
      * Note: This is a private method that is only made package-accessible for unit testing.
      *
      * @param context application context
      * @throws IllegalArgumentException if {@code context} is null
      */
-    /* package */static void deleteOldFiles(final Context context)
-    {
-        if (Constants.ENABLE_PARAMETER_CHECKING)
-        {
-            if (null == context)
-            {
+    /* package */
+    static void deleteOldFiles(final Context context) {
+        if (Constants.ENABLE_PARAMETER_CHECKING) {
+            if (null == context) {
                 throw new IllegalArgumentException("context cannot be null"); //$NON-NLS-1$
             }
         }
@@ -409,15 +367,11 @@ import android.util.Log;
      * @param directory Directory or file to delete. Cannot be null.
      * @return true if deletion was successful. False if deletion failed.
      */
-    private static boolean deleteDirectory(final File directory)
-    {
-        if (directory.exists() && directory.isDirectory())
-        {
-            for (final String child : directory.list())
-            {
+    private static boolean deleteDirectory(final File directory) {
+        if (directory.exists() && directory.isDirectory()) {
+            for (final String child : directory.list()) {
                 final boolean success = deleteDirectory(new File(directory, child));
-                if (!success)
-                {
+                if (!success) {
                     return false;
                 }
             }
@@ -430,8 +384,7 @@ import android.util.Log;
     /**
      * A private helper class to open and create the Localytics SQLite database.
      */
-    private static final class DatabaseHelper extends SQLiteOpenHelper
-    {
+    private static final class DatabaseHelper extends SQLiteOpenHelper {
         /**
          * Constant representing the SQLite value for true
          */
@@ -444,18 +397,17 @@ import android.util.Log;
 
         /**
          * @param context Application context. Cannot be null.
-         * @param name File name of the database. Cannot be null or empty. A database with this name will be opened in
-         *            {@link Context#getDatabasePath(String)}.
+         * @param name    File name of the database. Cannot be null or empty. A database with this name will be opened in
+         *                {@link Context#getDatabasePath(String)}.
          * @param version version of the database.
          */
-        public DatabaseHelper(final Context context, final String name, final int version)
-        {
+        public DatabaseHelper(final Context context, final String name, final int version) {
             super(context, name, null, version);
         }
 
         /**
          * Initializes the tables of the database.
-         * <p>
+         * <p/>
          * If an error occurs during initialization and an exception is thrown, {@link SQLiteDatabase#close()} will not be called
          * by this method. That responsibility is left to the caller.
          *
@@ -463,10 +415,8 @@ import android.util.Log;
          * @throws IllegalArgumentException if db is null
          */
         @Override
-        public void onCreate(final SQLiteDatabase db)
-        {
-            if (null == db)
-            {
+        public void onCreate(final SQLiteDatabase db) {
+            if (null == db) {
                 throw new IllegalArgumentException("db cannot be null"); //$NON-NLS-1$
             }
 
@@ -498,17 +448,14 @@ import android.util.Log;
         }
 
         @Override
-        public void onOpen(final SQLiteDatabase db)
-        {
+        public void onOpen(final SQLiteDatabase db) {
             super.onOpen(db);
 
-            if (Constants.IS_LOGGABLE)
-            {
+            if (Constants.IS_LOGGABLE) {
                 Log.v(Constants.LOG_TAG, String.format("SQLite library version is: %s", DatabaseUtils.stringForQuery(db, "select sqlite_version()", null))); //$NON-NLS-1$//$NON-NLS-2$
             }
 
-            if (!db.isReadOnly())
-            {
+            if (!db.isReadOnly()) {
                 /*
                  * Enable foreign key support
                  */
@@ -530,46 +477,34 @@ import android.util.Log;
         }
 
         @Override
-        public void onUpgrade(final SQLiteDatabase db, final int oldVersion, final int newVersion)
-        {
-            if (1 == oldVersion)
-            {
+        public void onUpgrade(final SQLiteDatabase db, final int oldVersion, final int newVersion) {
+            if (1 == oldVersion) {
                 // delete stranded sessions that don't have any events
                 Cursor sessionsCursor = null;
-                try
-                {
+                try {
                     sessionsCursor = db.query(SessionsDbColumns.TABLE_NAME, new String[]
-                        { SessionsDbColumns._ID }, null, null, null, null, null);
+                            {SessionsDbColumns._ID}, null, null, null, null, null);
 
-                    while (sessionsCursor.moveToNext())
-                    {
+                    while (sessionsCursor.moveToNext()) {
                         Cursor eventsCursor = null;
-                        try
-                        {
+                        try {
                             String sessionId = Long.toString(sessionsCursor.getLong(sessionsCursor.getColumnIndexOrThrow(SessionsDbColumns._ID)));
                             eventsCursor = db.query(EventsDbColumns.TABLE_NAME, new String[]
-                                { EventsDbColumns._ID }, String.format("%s = ?", EventsDbColumns.SESSION_KEY_REF), new String[] //$NON-NLS-1$
-                                { sessionId }, null, null, null);
+                                    {EventsDbColumns._ID}, String.format("%s = ?", EventsDbColumns.SESSION_KEY_REF), new String[] //$NON-NLS-1$
+                                    {sessionId}, null, null, null);
 
-                            if (eventsCursor.getCount() == 0)
-                            {
-                                db.delete(SessionsDbColumns.TABLE_NAME, String.format("%s = ?", SessionsDbColumns._ID), new String[] { sessionId }); //$NON-NLS-1$
+                            if (eventsCursor.getCount() == 0) {
+                                db.delete(SessionsDbColumns.TABLE_NAME, String.format("%s = ?", SessionsDbColumns._ID), new String[]{sessionId}); //$NON-NLS-1$
                             }
-                        }
-                        finally
-                        {
-                            if (null != eventsCursor)
-                            {
+                        } finally {
+                            if (null != eventsCursor) {
                                 eventsCursor.close();
                                 eventsCursor = null;
                             }
                         }
                     }
-                }
-                finally
-                {
-                    if (null != sessionsCursor)
-                    {
+                } finally {
+                    if (null != sessionsCursor) {
                         sessionsCursor.close();
                         sessionsCursor = null;
                     }
@@ -585,18 +520,16 @@ import android.util.Log;
 
     /**
      * Table for the API keys used and the opt-out preferences for each API key.
-     * <p>
+     * <p/>
      * This is not a public API.
      */
-    public static final class ApiKeysDbColumns implements BaseColumns
-    {
+    public static final class ApiKeysDbColumns implements BaseColumns {
         /**
          * Private constructor prevents instantiation
          *
          * @throws UnsupportedOperationException because this class cannot be instantiated.
          */
-        private ApiKeysDbColumns()
-        {
+        private ApiKeysDbColumns() {
             throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
         }
 
@@ -607,37 +540,37 @@ import android.util.Log;
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * The Localytics API key.
-         * <p>
+         * <p/>
          * Constraints: This column is unique and cannot be null.
          */
         public static final String API_KEY = "api_key"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * A UUID for the installation.
-         * <p>
+         * <p/>
          * Constraints: This column is unique and cannot be null.
          */
         public static final String UUID = "uuid"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code boolean}
-         * <p>
+         * <p/>
          * A flag indicating whether the user has opted out of data collection.
-         * <p>
+         * <p/>
          * Constraints: This column must be in the set {0, 1} and cannot be null.
          */
         public static final String OPT_OUT = "opt_out"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code long}
-         * <p>
+         * <p/>
          * A long representing the {@link System#currentTimeMillis()} when the row was created. Once created, this row will not be
          * modified.
-         * <p>
+         * <p/>
          * Constraints: This column must be >=0. This column cannot be null.
          */
         public static final String CREATED_TIME = "created_time"; //$NON-NLS-1$
@@ -646,18 +579,16 @@ import android.util.Log;
     /**
      * Database table for the session attributes. There is a one-to-many relationship between one event in the
      * {@link EventsDbColumns} table and the many attributes associated with that event.
-     * <p>
+     * <p/>
      * This is not a public API.
      */
-    public static final class AttributesDbColumns implements BaseColumns
-    {
+    public static final class AttributesDbColumns implements BaseColumns {
         /**
          * Private constructor prevents instantiation
          *
          * @throws UnsupportedOperationException because this class cannot be instantiated.
          */
-        private AttributesDbColumns()
-        {
+        private AttributesDbColumns() {
             throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
         }
 
@@ -668,27 +599,27 @@ import android.util.Log;
 
         /**
          * TYPE: {@code long}
-         * <p>
+         * <p/>
          * A one-to-many relationship with {@link EventsDbColumns#_ID}.
-         * <p>
+         * <p/>
          * Constraints: This is a foreign key with the {@link EventsDbColumns#_ID} column. This cannot be null.
          */
         public static final String EVENTS_KEY_REF = "events_key_ref"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * String representing the key name of the attribute.
-         * <p>
+         * <p/>
          * Constraints: This cannot be null.
          */
         public static final String ATTRIBUTE_KEY = "attribute_key"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * String representing the value of the attribute.
-         * <p>
+         * <p/>
          * Constraints: This cannot be null.
          */
         public static final String ATTRIBUTE_VALUE = "attribute_value"; //$NON-NLS-1$
@@ -698,18 +629,16 @@ import android.util.Log;
     /**
      * Database table for the session events. There is a one-to-many relationship between one session data entry in the
      * {@link SessionsDbColumns} table and the many events associated with that session.
-     * <p>
+     * <p/>
      * This is not a public API.
      */
-    public static final class EventsDbColumns implements BaseColumns
-    {
+    public static final class EventsDbColumns implements BaseColumns {
         /**
          * Private constructor prevents instantiation
          *
          * @throws UnsupportedOperationException because this class cannot be instantiated.
          */
-        private EventsDbColumns()
-        {
+        private EventsDbColumns() {
             throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
         }
 
@@ -720,45 +649,45 @@ import android.util.Log;
 
         /**
          * TYPE: {@code long}
-         * <p>
+         * <p/>
          * A one-to-many relationship with {@link SessionsDbColumns#_ID}.
-         * <p>
+         * <p/>
          * Constraints: This is a foreign key with the {@link SessionsDbColumns#_ID} column. This cannot be null.
          */
         public static final String SESSION_KEY_REF = "session_key_ref"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * Unique ID of the event, as generated from {@link java.util.UUID}.
-         * <p>
+         * <p/>
          * Constraints: This is unique and cannot be null.
          */
         public static final String UUID = "uuid"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * String representing the name of the event.
-         * <p>
+         * <p/>
          * Constraints: This cannot be null.
          */
         public static final String EVENT_NAME = "event_name"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code long}
-         * <p>
+         * <p/>
          * A long representing the {@link android.os.SystemClock#elapsedRealtime()} when the event occurred.
-         * <p>
+         * <p/>
          * Constraints: This column must be >=0. This column cannot be null.
          */
         public static final String REAL_TIME = "real_time"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code long}
-         * <p>
+         * <p/>
          * A long representing the {@link System#currentTimeMillis()} when the event occurred.
-         * <p>
+         * <p/>
          * Constraints: This column must be >=0. This column cannot be null.
          */
         public static final String WALL_TIME = "wall_time"; //$NON-NLS-1$
@@ -768,18 +697,16 @@ import android.util.Log;
     /**
      * Database table for tracking the history of events and screens. There is a one-to-many relationship between one session data
      * entry in the {@link SessionsDbColumns} table and the many historical events associated with that session.
-     * <p>
+     * <p/>
      * This is not a public API.
      */
-    public static final class EventHistoryDbColumns implements BaseColumns
-    {
+    public static final class EventHistoryDbColumns implements BaseColumns {
         /**
          * Private constructor prevents instantiation
          *
          * @throws UnsupportedOperationException because this class cannot be instantiated.
          */
-        private EventHistoryDbColumns()
-        {
+        private EventHistoryDbColumns() {
             throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
         }
 
@@ -790,34 +717,34 @@ import android.util.Log;
 
         /**
          * TYPE: {@code long}
-         * <p>
+         * <p/>
          * A one-to-many relationship with {@link SessionsDbColumns#_ID}.
-         * <p>
+         * <p/>
          * Constraints: This is a foreign key with the {@link SessionsDbColumns#_ID} column. This cannot be null.
          */
         public static final String SESSION_KEY_REF = "session_key_ref"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * Unique ID of the event, as generated from {@link java.util.UUID}.
-         * <p>
+         * <p/>
          * Constraints: This is unique and cannot be null.
          */
         public static final String TYPE = "type"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * String representing the name of the screen or event.
-         * <p>
+         * <p/>
          * Constraints: This cannot be null.
          */
         public static final String NAME = "name"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code boolean}
-         * <p>
+         * <p/>
          * Foreign key to the upload blob that this event was processed in. May be null indicating that this event wasn't
          * processed yet.
          */
@@ -837,18 +764,16 @@ import android.util.Log;
     /**
      * Database table for the session data. There is a one-to-many relationship between one API key entry in the
      * {@link ApiKeysDbColumns} table and many sessions for that API key.
-     * <p>
+     * <p/>
      * This is not a public API.
      */
-    public static final class SessionsDbColumns implements BaseColumns
-    {
+    public static final class SessionsDbColumns implements BaseColumns {
         /**
          * Private constructor prevents instantiation
          *
          * @throws UnsupportedOperationException because this class cannot be instantiated.
          */
-        private SessionsDbColumns()
-        {
+        private SessionsDbColumns() {
             throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
         }
 
@@ -859,27 +784,27 @@ import android.util.Log;
 
         /**
          * TYPE: {@code long}
-         * <p>
+         * <p/>
          * A one-to-one relationship with {@link ApiKeysDbColumns#_ID}.
-         * <p>
+         * <p/>
          * Constraints: This is a foreign key with the {@link ApiKeysDbColumns#_ID} column. This cannot be null.
          */
         public static final String API_KEY_REF = "api_key_ref"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * Unique ID of the event, as generated from {@link java.util.UUID}.
-         * <p>
+         * <p/>
          * Constraints: This is unique and cannot be null.
          */
         public static final String UUID = "uuid"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code long}
-         * <p>
+         * <p/>
          * The wall time when the session started.
-         * <p>
+         * <p/>
          * Constraints: This column must be >=0. This column cannot be null.
          */
         /*
@@ -890,7 +815,7 @@ import android.util.Log;
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * Version of the Localytics client library.
          *
          * @see Constants#LOCALYTICS_CLIENT_LIBRARY_VERSION
@@ -899,38 +824,38 @@ import android.util.Log;
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * String representing the app's versionName
-         * <p>
+         * <p/>
          * Constraints: This cannot be null.
          */
         public static final String APP_VERSION = "app_version"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * String representing the version of Android
-         * <p>
+         * <p/>
          * Constraints: This cannot be null.
          */
         public static final String ANDROID_VERSION = "android_version"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code int}
-         * <p>
+         * <p/>
          * Integer the Android SDK
-         * <p>
+         * <p/>
          * Constraints: Must be an integer and cannot be null.
-         * 
+         *
          * @see android.os.Build.VERSION#SDK
          */
         public static final String ANDROID_SDK = "android_sdk"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * String representing the device model
-         * <p>
+         * <p/>
          * Constraints: None
          *
          * @see android.os.Build#MODEL
@@ -939,9 +864,9 @@ import android.util.Log;
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * String representing the device manufacturer
-         * <p>
+         * <p/>
          * Constraints: None
          *
          * @see android.os.Build#MANUFACTURER
@@ -950,9 +875,9 @@ import android.util.Log;
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * String representing a hash of the device Android ID
-         * <p>
+         * <p/>
          * Constraints: None
          *
          * @see android.provider.Settings.Secure#ANDROID_ID
@@ -961,10 +886,10 @@ import android.util.Log;
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * String representing the telephony ID of the device. May be null for non-telephony devices. May also be null if the
          * parent application doesn't have {@link android.Manifest.permission#READ_PHONE_STATE}.
-         * <p>
+         * <p/>
          * Constraints: None
          *
          * @see android.telephony.TelephonyManager#getDeviceId()
@@ -973,10 +898,10 @@ import android.util.Log;
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * String representing a hash of the telephony ID of the device. May be null for non-telephony devices. May also be null
          * if the parent application doesn't have {@link android.Manifest.permission#READ_PHONE_STATE}.
-         * <p>
+         * <p/>
          * Constraints: None
          *
          * @see android.telephony.TelephonyManager#getDeviceId()
@@ -985,64 +910,64 @@ import android.util.Log;
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * String representing a hash of the the serial number of the device. May be null for some telephony devices.
-         * <p>
+         * <p/>
          * Constraints: None
          */
         public static final String DEVICE_SERIAL_NUMBER_HASH = "device_serial_number_hash"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * Represents the locale language of the device.
-         * <p>
+         * <p/>
          * Constraints: Cannot be null.
          */
         public static final String LOCALE_LANGUAGE = "locale_language"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * Represents the locale country of the device.
-         * <p>
+         * <p/>
          * Constraints: Cannot be null.
          */
         public static final String LOCALE_COUNTRY = "locale_country"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * Represents the locale country of the device, according to the SIM card.
-         * <p>
+         * <p/>
          * Constraints: Cannot be null.
          */
         public static final String DEVICE_COUNTRY = "device_country"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * Represents the network carrier of the device. May be null for non-telephony devices.
-         * <p>
+         * <p/>
          * Constraints: None
          */
         public static final String NETWORK_CARRIER = "network_carrier"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * Represents the network country of the device. May be null for non-telephony devices.
-         * <p>
+         * <p/>
          * Constraints: None
          */
         public static final String NETWORK_COUNTRY = "network_country"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * Represents the primary network connection type for the device. This could be any type, including Wi-Fi, various cell
          * networks, Ethernet, etc.
-         * <p>
+         * <p/>
          * Constraints: None
          *
          * @see android.telephony.TelephonyManager
@@ -1051,18 +976,18 @@ import android.util.Log;
 
         /**
          * TYPE: {@code double}
-         * <p>
+         * <p/>
          * Represents the latitude of the device. May be null if no longitude is known.
-         * <p>
+         * <p/>
          * Constraints: None
          */
         public static final String LATITUDE = "latitude"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code double}
-         * <p>
+         * <p/>
          * Represents the longitude of the device. May be null if no longitude is known.
-         * <p>
+         * <p/>
          * Constraints: None
          */
         public static final String LONGITUDE = "longitude"; //$NON-NLS-1$
@@ -1073,18 +998,16 @@ import android.util.Log;
      * Database table for the events associated with a given upload blob. There is a one-to-many relationship between one upload
      * blob in the {@link UploadBlobsDbColumns} table and the blob events. There is a one-to-one relationship between each blob
      * event entry and the actual events in the {@link EventsDbColumns} table. *
-     * <p>
+     * <p/>
      * This is not a public API.
      */
-    public static final class UploadBlobEventsDbColumns implements BaseColumns
-    {
+    public static final class UploadBlobEventsDbColumns implements BaseColumns {
         /**
          * Private constructor prevents instantiation
          *
          * @throws UnsupportedOperationException because this class cannot be instantiated.
          */
-        private UploadBlobEventsDbColumns()
-        {
+        private UploadBlobEventsDbColumns() {
             throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
         }
 
@@ -1095,18 +1018,18 @@ import android.util.Log;
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * A one-to-many relationship with {@link UploadBlobsDbColumns#_ID}.
-         * <p>
+         * <p/>
          * Constraints: This is a foreign key with the {@link UploadBlobsDbColumns#_ID} column. This cannot be null.
          */
         public static final String UPLOAD_BLOBS_KEY_REF = "upload_blobs_key_ref"; //$NON-NLS-1$
 
         /**
          * TYPE: {@code long}
-         * <p>
+         * <p/>
          * A one-to-one relationship with {@link EventsDbColumns#_ID}.
-         * <p>
+         * <p/>
          * Constraints: This is a foreign key with the {@link EventsDbColumns#_ID} column. This cannot be null.
          */
         public static final String EVENTS_KEY_REF = "events_key_ref"; //$NON-NLS-1$
@@ -1116,18 +1039,16 @@ import android.util.Log;
      * Database table for the upload blobs. Logically, a blob owns many events. In terms of the implementation, some indirection
      * is introduced by a blob having a one-to-many relationship with {@link UploadBlobsDbColumns} and
      * {@link UploadBlobsDbColumns} having a one-to-one relationship with {@link EventsDbColumns}
-     * <p>
+     * <p/>
      * This is not a public API.
      */
-    public static final class UploadBlobsDbColumns implements BaseColumns
-    {
+    public static final class UploadBlobsDbColumns implements BaseColumns {
         /**
          * Private constructor prevents instantiation
          *
          * @throws UnsupportedOperationException because this class cannot be instantiated.
          */
-        private UploadBlobsDbColumns()
-        {
+        private UploadBlobsDbColumns() {
             throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
         }
 
@@ -1138,9 +1059,9 @@ import android.util.Log;
 
         /**
          * TYPE: {@code String}
-         * <p>
+         * <p/>
          * Unique ID of the upload blob, as generated from {@link java.util.UUID}.
-         * <p>
+         * <p/>
          * Constraints: This is unique and cannot be null.
          */
         public static final String UUID = "uuid"; //$NON-NLS-1$
diff --git a/astrid/common-src/com/localytics/android/LocalyticsSession.java b/astrid/common-src/com/localytics/android/LocalyticsSession.java
index f0b568f7d..bcbb1d347 100755
--- a/astrid/common-src/com/localytics/android/LocalyticsSession.java
+++ b/astrid/common-src/com/localytics/android/LocalyticsSession.java
@@ -8,32 +8,6 @@
 
 package com.localytics.android;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.UUID;
-import java.util.zip.GZIPOutputStream;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.StatusLine;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.Manifest.permission;
 import android.content.ContentValues;
 import android.content.Context;
@@ -60,6 +34,32 @@ import com.localytics.android.LocalyticsProvider.SessionsDbColumns;
 import com.localytics.android.LocalyticsProvider.UploadBlobEventsDbColumns;
 import com.localytics.android.LocalyticsProvider.UploadBlobsDbColumns;
 
+import org.apache.http.HttpResponse;
+import org.apache.http.StatusLine;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.UUID;
+import java.util.zip.GZIPOutputStream;
+
 /**
  * This class manages creating, collecting, and uploading a Localytics session. Please see the following guides for information on
  * how to best use this library, sample code, and other useful information:
@@ -102,13 +102,12 @@ import com.localytics.android.LocalyticsProvider.UploadBlobsDbColumns;
  * <li>Do not call any {@link LocalyticsSession} methods inside a loop. Instead, calls such as {@link #tagEvent(String)} should
  * follow user actions. This limits the amount of data which is stored and uploaded.</li>
  * </ul>
- * <p>
+ * <p/>
  * This class is thread-safe.
  *
  * @version 2.0
  */
-public final class LocalyticsSession
-{
+public final class LocalyticsSession {
     /*
      * DESIGN NOTES
      *
@@ -197,8 +196,7 @@ public final class LocalyticsSession
      * @param name to give to the HandlerThread. Useful for debugging, as the thread name is shown in DDMS.
      * @return HandlerThread whose {@link HandlerThread#start()} method has already been called.
      */
-    private static HandlerThread getHandlerThread(final String name)
-    {
+    private static HandlerThread getHandlerThread(final String name) {
         final HandlerThread thread = new HandlerThread(name, android.os.Process.THREAD_PRIORITY_BACKGROUND);
 
         thread.start();
@@ -214,9 +212,9 @@ public final class LocalyticsSession
 
     /**
      * Handler object where all session requests of this instance of LocalyticsSession are handed off to.
-     * <p>
+     * <p/>
      * This Handler is the key thread synchronization point for all work inside the LocalyticsSession.
-     * <p>
+     * <p/>
      * This handler runs on {@link #sSessionHandlerThread}.
      */
     private final Handler mSessionHandler;
@@ -234,7 +232,7 @@ public final class LocalyticsSession
     /**
      * Keeps track of which Localytics clients are currently uploading, in order to allow only one upload for a given key at a
      * time.
-     * <p>
+     * <p/>
      * This field can only be read/written to from the {@link #sSessionHandlerThread}. This invariant is maintained by only
      * accessing this field from within the {@link #mSessionHandler}.
      */
@@ -244,20 +242,17 @@ public final class LocalyticsSession
      * Constructs a new {@link LocalyticsSession} object.
      *
      * @param context The context used to access resources on behalf of the app. It is recommended to use
-     *            {@link Context#getApplicationContext()} to avoid the potential memory leak incurred by maintaining references to
-     *            {@code Activity} instances. Cannot be null.
-     * @param key The key unique for each application generated at www.localytics.com. Cannot be null or empty.
+     *                {@link Context#getApplicationContext()} to avoid the potential memory leak incurred by maintaining references to
+     *                {@code Activity} instances. Cannot be null.
+     * @param key     The key unique for each application generated at www.localytics.com. Cannot be null or empty.
      * @throws IllegalArgumentException if {@code context} is null
      * @throws IllegalArgumentException if {@code key} is null or empty
      */
-    public LocalyticsSession(final Context context, final String key)
-    {
-        if (context == null)
-        {
+    public LocalyticsSession(final Context context, final String key) {
+        if (context == null) {
             throw new IllegalArgumentException("context cannot be null"); //$NON-NLS-1$
         }
-        if (TextUtils.isEmpty(key))
-        {
+        if (TextUtils.isEmpty(key)) {
             throw new IllegalArgumentException("key cannot be null or empty"); //$NON-NLS-1$
         }
 
@@ -299,8 +294,7 @@ public final class LocalyticsSession
      *
      * @param isOptedOut True if the user should be be opted out and have all his Localytics data deleted.
      */
-    public void setOptOut(final boolean isOptedOut)
-    {
+    public void setOptOut(final boolean isOptedOut) {
         mSessionHandler.sendMessage(mSessionHandler.obtainMessage(SessionHandler.MESSAGE_OPT_OUT, isOptedOut ? 1 : 0, 0));
     }
 
@@ -309,15 +303,14 @@ public final class LocalyticsSession
      * and the final <code>close</code> so it is recommended to open the session as early as possible, and close it at the last
      * moment. The session must be opened before {@link #tagEvent(String)} or {@link #tagEvent(String, Map)} can be called, so
      * this call should be placed in {@code Activity#onCreate(Bundle)}.
-     * <p>
+     * <p/>
      * If for any reason this is called more than once without an intervening call to {@link #close()}, subsequent calls to open
      * will be ignored.
-     * <p>
+     * <p/>
      * For applications with multiple Activities, every Activity should call <code>open</code> in <code>onCreate</code>. This will
      * cause each Activity to reconnect to the currently running session.
      */
-    public void open()
-    {
+    public void open() {
         mSessionHandler.sendEmptyMessage(SessionHandler.MESSAGE_OPEN);
     }
 
@@ -328,8 +321,7 @@ public final class LocalyticsSession
      * Closing does not cause the session to stop collecting data. This is a result of the application life cycle. It is possible
      * for onPause to be called long before the application is actually ready to close the session.
      */
-    public void close()
-    {
+    public void close() {
         mSessionHandler.sendEmptyMessage(SessionHandler.MESSAGE_CLOSE);
     }
 
@@ -352,8 +344,7 @@ public final class LocalyticsSession
      * @throws IllegalArgumentException if {@code event} is null.
      * @throws IllegalArgumentException if {@code event} is empty.
      */
-    public void tagEvent(final String event)
-    {
+    public void tagEvent(final String event) {
         tagEvent(event, null);
     }
 
@@ -372,61 +363,49 @@ public final class LocalyticsSession
      * </ul>
      * <br>
      *
-     * @param event The name of the event which occurred.
+     * @param event      The name of the event which occurred.
      * @param attributes The collection of attributes for this particular event. If this parameter is null or empty, then calling
-     *            this method has the same effect as calling {@link #tagEvent(String)}. This parameter may not contain null or
-     *            empty keys or values.
+     *                   this method has the same effect as calling {@link #tagEvent(String)}. This parameter may not contain null or
+     *                   empty keys or values.
      * @throws IllegalArgumentException if {@code event} is null.
      * @throws IllegalArgumentException if {@code event} is empty.
      * @throws IllegalArgumentException if {@code attributes} contains null keys, empty keys, null values, or empty values.
      */
-    public void tagEvent(final String event, final Map<String, String> attributes)
-    {
-        if (Constants.ENABLE_PARAMETER_CHECKING)
-        {
-            if (null == event)
-            {
+    public void tagEvent(final String event, final Map<String, String> attributes) {
+        if (Constants.ENABLE_PARAMETER_CHECKING) {
+            if (null == event) {
                 throw new IllegalArgumentException("event cannot be null"); //$NON-NLS-1$
             }
 
-            if (0 == event.length())
-            {
+            if (0 == event.length()) {
                 throw new IllegalArgumentException("event cannot be empty"); //$NON-NLS-1$
             }
 
-            if (null != attributes)
-            {
+            if (null != attributes) {
                 /*
                  * Calling this with empty attributes is a smell that indicates a possible programming error on the part of the
                  * caller
                  */
-                if (attributes.isEmpty())
-                {
-                    if (Constants.IS_LOGGABLE)
-                    {
+                if (attributes.isEmpty()) {
+                    if (Constants.IS_LOGGABLE) {
                         Log.i(Constants.LOG_TAG, "attributes is empty.  Did the caller make an error?"); //$NON-NLS-1$
                     }
                 }
 
-                for (final Entry<String, String> entry : attributes.entrySet())
-                {
+                for (final Entry<String, String> entry : attributes.entrySet()) {
                     final String key = entry.getKey();
                     final String value = entry.getValue();
 
-                    if (null == key)
-                    {
+                    if (null == key) {
                         throw new IllegalArgumentException("attributes cannot contain null keys"); //$NON-NLS-1$
                     }
-                    if (null == value)
-                    {
+                    if (null == value) {
                         throw new IllegalArgumentException("attributes cannot contain null values"); //$NON-NLS-1$
                     }
-                    if (0 == key.length())
-                    {
+                    if (0 == key.length()) {
                         throw new IllegalArgumentException("attributes cannot contain empty keys"); //$NON-NLS-1$
                     }
-                    if (0 == value.length())
-                    {
+                    if (0 == value.length()) {
                         throw new IllegalArgumentException("attributes cannot contain empty values"); //$NON-NLS-1$
                     }
                 }
@@ -435,12 +414,9 @@ public final class LocalyticsSession
 
         final String eventString = String.format(EVENT_FORMAT, mContext.getPackageName(), event);
 
-        if (null == attributes)
-        {
+        if (null == attributes) {
             mSessionHandler.sendMessage(mSessionHandler.obtainMessage(SessionHandler.MESSAGE_TAG_EVENT, new Pair<String, Map<String, String>>(eventString, null)));
-        }
-        else
-        {
+        } else {
             /*
              * Note: it is important to make a copy of the map, to ensure that a client can't modify the map after this method is
              * called. A TreeMap is used to ensure that the order that the attributes are written is deterministic. For example,
@@ -448,9 +424,9 @@ public final class LocalyticsSession
              * consistently.
              */
             mSessionHandler.sendMessage(mSessionHandler.obtainMessage(SessionHandler.MESSAGE_TAG_EVENT, new Pair<String, Map<String, String>>(
-                                                                                                                                              eventString,
-                                                                                                                                              new TreeMap<String, String>(
-                                                                                                                                                                          attributes))));
+                    eventString,
+                    new TreeMap<String, String>(
+                            attributes))));
         }
     }
 
@@ -463,15 +439,12 @@ public final class LocalyticsSession
      * @throws IllegalArgumentException if {@code event} is null.
      * @throws IllegalArgumentException if {@code event} is empty.
      */
-    public void tagScreen(final String screen)
-    {
-        if (null == screen)
-        {
+    public void tagScreen(final String screen) {
+        if (null == screen) {
             throw new IllegalArgumentException("event cannot be null"); //$NON-NLS-1$
         }
 
-        if (0 == screen.length())
-        {
+        if (0 == screen.length()) {
             throw new IllegalArgumentException("event cannot be empty"); //$NON-NLS-1$
         }
 
@@ -483,8 +456,7 @@ public final class LocalyticsSession
      * order to guarantee as much time as possible for slow connections to complete. It is necessary to do this even if the user
      * has opted out because this is how the opt out is transported to the webservice.
      */
-    public void upload()
-    {
+    public void upload() {
         mSessionHandler.sendMessage(mSessionHandler.obtainMessage(SessionHandler.MESSAGE_UPLOAD, null));
     }
 
@@ -514,27 +486,22 @@ public final class LocalyticsSession
      * step.
      *
      * @param actualValue The int value to be sorted.
-     * @param minValue The int value representing the inclusive minimum interval.
-     * @param maxValue The int value representing the inclusive maximum interval.
-     * @param step The int value representing the increment of each interval.
+     * @param minValue    The int value representing the inclusive minimum interval.
+     * @param maxValue    The int value representing the inclusive maximum interval.
+     * @param step        The int value representing the increment of each interval.
      * @return a ranged attribute suitable for passing as the argument to {@link #tagEvent(String)} or
-     *         {@link #tagEvent(String, Map)}.
+     * {@link #tagEvent(String, Map)}.
      */
-    public static String createRangedAttribute(final int actualValue, final int minValue, final int maxValue, final int step)
-    {
+    public static String createRangedAttribute(final int actualValue, final int minValue, final int maxValue, final int step) {
         // Confirm there is at least one bucket
-        if (step < 1)
-        {
-            if (Constants.IS_LOGGABLE)
-            {
+        if (step < 1) {
+            if (Constants.IS_LOGGABLE) {
                 Log.v(Constants.LOG_TAG, "Step must not be less than zero.  Returning null."); //$NON-NLS-1$
             }
             return null;
         }
-        if (minValue >= maxValue)
-        {
-            if (Constants.IS_LOGGABLE)
-            {
+        if (minValue >= maxValue) {
+            if (Constants.IS_LOGGABLE) {
                 Log.v(Constants.LOG_TAG, "maxValue must not be less than minValue.  Returning null."); //$NON-NLS-1$
             }
             return null;
@@ -543,8 +510,7 @@ public final class LocalyticsSession
         // Determine the number of steps, rounding up using int math
         final int stepQuantity = (maxValue - minValue + step) / step;
         final int[] steps = new int[stepQuantity + 1];
-        for (int currentStep = 0; currentStep <= stepQuantity; currentStep++)
-        {
+        for (int currentStep = 0; currentStep <= stepQuantity; currentStep++) {
             steps[currentStep] = minValue + (currentStep) * step;
         }
         return createRangedAttribute(actualValue, steps);
@@ -557,52 +523,41 @@ public final class LocalyticsSession
      * than 0, 0, 1-2, 3-9, 10 or greater.
      *
      * @param actualValue The int value to be bucketed.
-     * @param steps The sorted int array representing the bucketing intervals.
+     * @param steps       The sorted int array representing the bucketing intervals.
      * @return String representation of {@code actualValue} that has been bucketed into the range provided by {@code steps}.
      * @throws IllegalArgumentException if {@code steps} is null.
      * @throws IllegalArgumentException if {@code steps} has length 0.
      */
     @SuppressWarnings("nls")
-    public static String createRangedAttribute(final int actualValue, final int[] steps)
-    {
-        if (null == steps)
-        {
+    public static String createRangedAttribute(final int actualValue, final int[] steps) {
+        if (null == steps) {
             throw new IllegalArgumentException("steps cannot be null"); //$NON-NLS-1$
         }
 
-        if (steps.length == 0)
-        {
+        if (steps.length == 0) {
             throw new IllegalArgumentException("steps length must be greater than 0"); //$NON-NLS-1$
         }
 
         String bucket = null;
 
         // if less than smallest value
-        if (actualValue < steps[0])
-        {
+        if (actualValue < steps[0]) {
             bucket = "less than " + steps[0];
         }
         // if greater than largest value
-        else if (actualValue >= steps[steps.length - 1])
-        {
+        else if (actualValue >= steps[steps.length - 1]) {
             bucket = steps[steps.length - 1] + " and above";
-        }
-        else
-        {
+        } else {
             // binarySearch returns the index of the value, or (-(insertion point) - 1) if not found
             int bucketIndex = Arrays.binarySearch(steps, actualValue);
-            if (bucketIndex < 0)
-            {
+            if (bucketIndex < 0) {
                 // if the index wasn't found, then we want the value before the insertion point as the lower end
                 // the special case where the insertion point is 0 is covered above, so we don't have to worry about it here
                 bucketIndex = (-bucketIndex) - 2;
             }
-            if (steps[bucketIndex] == (steps[bucketIndex + 1] - 1))
-            {
+            if (steps[bucketIndex] == (steps[bucketIndex + 1] - 1)) {
                 bucket = Integer.toString(steps[bucketIndex]);
-            }
-            else
-            {
+            } else {
                 bucket = steps[bucketIndex] + "-" + (steps[bucketIndex + 1] - 1); //$NON-NLS-1$
             }
         }
@@ -612,11 +567,10 @@ public final class LocalyticsSession
     /**
      * Helper class to handle session-related work on the {@link LocalyticsSession#sSessionHandlerThread}.
      */
-    /* package */static final class SessionHandler extends Handler
-    {
+    /* package */static final class SessionHandler extends Handler {
         /**
          * Empty handler message to initialize the callback.
-         * <p>
+         * <p/>
          * This message must be sent before any other messages.
          */
         public static final int MESSAGE_INIT = 0;
@@ -633,14 +587,14 @@ public final class LocalyticsSession
 
         /**
          * Handler message to tag an event.
-         * <p>
+         * <p/>
          * {@link Message#obj} is a {@link Pair} instance. This object cannot be null.
          */
         public static final int MESSAGE_TAG_EVENT = 3;
 
         /**
          * Handler message to upload all data collected so far
-         * <p>
+         * <p/>
          * {@link Message#obj} is a {@code Runnable} to execute when upload is complete. The thread that this runnable will
          * executed on is undefined.
          */
@@ -653,28 +607,28 @@ public final class LocalyticsSession
 
         /**
          * Handler message indicating an opt-out choice.
-         * <p>
+         * <p/>
          * {@link Message#arg1} == 1 for true (opt out). 0 means opt-in.
          */
         public static final int MESSAGE_OPT_OUT = 6;
 
         /**
          * Handler message indicating a tag screen event
-         * <p>
+         * <p/>
          * {@link Message#obj} is a string representing the screen visited.
          */
         public static final int MESSAGE_TAG_SCREEN = 7;
 
         /**
          * Sort order for the upload blobs.
-         * <p>
+         * <p/>
          * This is a workaround for Android bug 3707 <http://code.google.com/p/android/issues/detail?id=3707>.
          */
         private static final String UPLOAD_BLOBS_EVENTS_SORT_ORDER = String.format("CAST(%s AS TEXT)", UploadBlobEventsDbColumns.EVENTS_KEY_REF); //$NON-NLS-1$
 
         /**
          * Sort order for the events.
-         * <p>
+         * <p/>
          * This is a workaround for Android bug 3707 <http://code.google.com/p/android/issues/detail?id=3707>.
          */
         private static final String EVENTS_SORT_ORDER = String.format("CAST(%s as TEXT)", EventsDbColumns._ID); //$NON-NLS-1$
@@ -716,7 +670,7 @@ public final class LocalyticsSession
 
         /**
          * Handler object where all upload of this instance of LocalyticsSession are handed off to.
-         * <p>
+         * <p/>
          * This handler runs on {@link #sUploadHandlerThread}.
          */
         private Handler mUploadHandler;
@@ -725,25 +679,21 @@ public final class LocalyticsSession
          * Constructs a new Handler that runs on the given looper.
          *
          * @param context The context used to access resources on behalf of the app. It is recommended to use
-         *            {@link Context#getApplicationContext()} to avoid the potential memory leak incurred by maintaining
-         *            references to {@code Activity} instances. Cannot be null.
-         * @param key The key unique for each application generated at www.localytics.com. Cannot be null or empty.
-         * @param looper to run the Handler on. Cannot be null.
+         *                {@link Context#getApplicationContext()} to avoid the potential memory leak incurred by maintaining
+         *                references to {@code Activity} instances. Cannot be null.
+         * @param key     The key unique for each application generated at www.localytics.com. Cannot be null or empty.
+         * @param looper  to run the Handler on. Cannot be null.
          * @throws IllegalArgumentException if {@code context} is null
          * @throws IllegalArgumentException if {@code key} is null or empty
          */
-        public SessionHandler(final Context context, final String key, final Looper looper)
-        {
+        public SessionHandler(final Context context, final String key, final Looper looper) {
             super(looper);
 
-            if (Constants.ENABLE_PARAMETER_CHECKING)
-            {
-                if (context == null)
-                {
+            if (Constants.ENABLE_PARAMETER_CHECKING) {
+                if (context == null) {
                     throw new IllegalArgumentException("context cannot be null"); //$NON-NLS-1$
                 }
-                if (TextUtils.isEmpty(key))
-                {
+                if (TextUtils.isEmpty(key)) {
                     throw new IllegalArgumentException("key cannot be null or empty"); //$NON-NLS-1$
                 }
             }
@@ -753,14 +703,10 @@ public final class LocalyticsSession
         }
 
         @Override
-        public void handleMessage(final Message msg)
-        {
-            switch (msg.what)
-            {
-                case MESSAGE_INIT:
-                {
-                    if (Constants.IS_LOGGABLE)
-                    {
+        public void handleMessage(final Message msg) {
+            switch (msg.what) {
+                case MESSAGE_INIT: {
+                    if (Constants.IS_LOGGABLE) {
                         Log.v(Constants.LOG_TAG, "Handler received MESSAGE_INIT"); //$NON-NLS-1$
                     }
 
@@ -768,10 +714,8 @@ public final class LocalyticsSession
 
                     break;
                 }
-                case MESSAGE_OPT_OUT:
-                {
-                    if (Constants.IS_LOGGABLE)
-                    {
+                case MESSAGE_OPT_OUT: {
+                    if (Constants.IS_LOGGABLE) {
                         Log.v(Constants.LOG_TAG, "Handler received MESSAGE_OPT_OUT"); //$NON-NLS-1$
                     }
 
@@ -781,10 +725,8 @@ public final class LocalyticsSession
 
                     break;
                 }
-                case MESSAGE_OPEN:
-                {
-                    if (Constants.IS_LOGGABLE)
-                    {
+                case MESSAGE_OPEN: {
+                    if (Constants.IS_LOGGABLE) {
                         Log.v(Constants.LOG_TAG, "Handler received MESSAGE_OPEN"); //$NON-NLS-1$
                     }
 
@@ -792,10 +734,8 @@ public final class LocalyticsSession
 
                     break;
                 }
-                case MESSAGE_CLOSE:
-                {
-                    if (Constants.IS_LOGGABLE)
-                    {
+                case MESSAGE_CLOSE: {
+                    if (Constants.IS_LOGGABLE) {
                         Log.d(Constants.LOG_TAG, "Handler received MESSAGE_CLOSE"); //$NON-NLS-1$
                     }
 
@@ -803,10 +743,8 @@ public final class LocalyticsSession
 
                     break;
                 }
-                case MESSAGE_TAG_EVENT:
-                {
-                    if (Constants.IS_LOGGABLE)
-                    {
+                case MESSAGE_TAG_EVENT: {
+                    if (Constants.IS_LOGGABLE) {
                         Log.d(Constants.LOG_TAG, "Handler received MESSAGE_TAG"); //$NON-NLS-1$
                     }
 
@@ -819,10 +757,8 @@ public final class LocalyticsSession
 
                     break;
                 }
-                case MESSAGE_TAG_SCREEN:
-                {
-                    if (Constants.IS_LOGGABLE)
-                    {
+                case MESSAGE_TAG_SCREEN: {
+                    if (Constants.IS_LOGGABLE) {
                         Log.d(Constants.LOG_TAG, "Handler received MESSAGE_SCREEN"); //$NON-NLS-1$
                     }
 
@@ -832,10 +768,8 @@ public final class LocalyticsSession
 
                     break;
                 }
-                case MESSAGE_UPLOAD:
-                {
-                    if (Constants.IS_LOGGABLE)
-                    {
+                case MESSAGE_UPLOAD: {
+                    if (Constants.IS_LOGGABLE) {
                         Log.d(Constants.LOG_TAG, "SessionHandler received MESSAGE_UPLOAD"); //$NON-NLS-1$
                     }
 
@@ -848,10 +782,8 @@ public final class LocalyticsSession
 
                     break;
                 }
-                case MESSAGE_UPLOAD_COMPLETE:
-                {
-                    if (Constants.IS_LOGGABLE)
-                    {
+                case MESSAGE_UPLOAD_COMPLETE: {
+                    if (Constants.IS_LOGGABLE) {
                         Log.d(Constants.LOG_TAG, "Handler received MESSAGE_UPLOAD_COMPLETE"); //$NON-NLS-1$
                     }
 
@@ -859,8 +791,7 @@ public final class LocalyticsSession
 
                     break;
                 }
-                default:
-                {
+                default: {
                     /*
                      * This should never happen
                      */
@@ -871,46 +802,39 @@ public final class LocalyticsSession
 
         /**
          * Initialize the handler post construction.
-         * <p>
+         * <p/>
          * This method must only be called once.
-         * <p>
+         * <p/>
          * Note: This method is a private implementation detail. It is only made public for unit testing purposes. The public
          * interface is to send {@link #MESSAGE_INIT} to the Handler.
          *
          * @see #MESSAGE_INIT
          */
-        public void init()
-        {
+        public void init() {
             mProvider = LocalyticsProvider.getInstance(mContext, mApiKey);
 
             /*
              * Check whether this session key is opted out
              */
             Cursor cursor = null;
-            try
-            {
+            try {
                 cursor = mProvider.query(ApiKeysDbColumns.TABLE_NAME, new String[]
-                    {
-                        ApiKeysDbColumns._ID,
-                        ApiKeysDbColumns.OPT_OUT }, String.format("%s = ?", ApiKeysDbColumns.API_KEY), new String[] //$NON-NLS-1$
-                    { mApiKey }, null);
+                        {
+                                ApiKeysDbColumns._ID,
+                                ApiKeysDbColumns.OPT_OUT}, String.format("%s = ?", ApiKeysDbColumns.API_KEY), new String[] //$NON-NLS-1$
+                        {mApiKey}, null);
 
-                if (cursor.moveToFirst())
-                {
+                if (cursor.moveToFirst()) {
                     // API key was previously created
-                    if (Constants.IS_LOGGABLE)
-                    {
+                    if (Constants.IS_LOGGABLE) {
                         Log.v(Constants.LOG_TAG, String.format("Loading details for API key %s", mApiKey)); //$NON-NLS-1$
                     }
 
                     mApiKeyId = cursor.getLong(cursor.getColumnIndexOrThrow(ApiKeysDbColumns._ID));
                     mIsOptedOut = cursor.getInt(cursor.getColumnIndexOrThrow(ApiKeysDbColumns.OPT_OUT)) != 0;
-                }
-                else
-                {
+                } else {
                     // perform first-time initialization of API key
-                    if (Constants.IS_LOGGABLE)
-                    {
+                    if (Constants.IS_LOGGABLE) {
                         Log.v(Constants.LOG_TAG, String.format("Performing first-time initialization for new API key %s", mApiKey)); //$NON-NLS-1$
                     }
 
@@ -922,18 +846,14 @@ public final class LocalyticsSession
 
                     mApiKeyId = mProvider.insert(ApiKeysDbColumns.TABLE_NAME, values);
                 }
-            }
-            finally
-            {
-                if (cursor != null)
-                {
+            } finally {
+                if (cursor != null) {
                     cursor.close();
                     cursor = null;
                 }
             }
 
-            if (!sIsUploadingMap.containsKey(mApiKey))
-            {
+            if (!sIsUploadingMap.containsKey(mApiKey)) {
                 sIsUploadingMap.put(mApiKey, Boolean.FALSE);
             }
 
@@ -945,48 +865,40 @@ public final class LocalyticsSession
 
         /**
          * Set the opt-in/out-out state for all sessions using the current API key.
-         * <p>
+         * <p/>
          * This method must only be called after {@link #init()} is called.
-         * <p>
+         * <p/>
          * Note: This method is a private implementation detail. It is only made package accessible for unit testing purposes. The
          * public interface is to send {@link #MESSAGE_OPT_OUT} to the Handler.
          *
          * @param isOptingOut true if the user is opting out. False if the user is opting back in.
          * @see #MESSAGE_OPT_OUT
          */
-        /* package */void optOut(final boolean isOptingOut)
-        {
-            if (Constants.IS_LOGGABLE)
-            {
+        /* package */void optOut(final boolean isOptingOut) {
+            if (Constants.IS_LOGGABLE) {
                 Log.v(Constants.LOG_TAG, String.format("Prior opt-out state is %b, requested opt-out state is %b", Boolean.valueOf(mIsOptedOut), Boolean.valueOf(isOptingOut))); //$NON-NLS-1$
             }
 
             // Do nothing if opt-out is unchanged
-            if (mIsOptedOut == isOptingOut)
-            {
+            if (mIsOptedOut == isOptingOut) {
                 return;
             }
 
-            mProvider.runBatchTransaction(new Runnable()
-            {
+            mProvider.runBatchTransaction(new Runnable() {
                 @Override
-                public void run()
-                {
+                public void run() {
                     final ContentValues values = new ContentValues();
                     values.put(ApiKeysDbColumns.OPT_OUT, Boolean.valueOf(isOptingOut));
-                    mProvider.update(ApiKeysDbColumns.TABLE_NAME, values, String.format("%s = ?", ApiKeysDbColumns._ID), new String[] { Long.toString(mApiKeyId) }); //$NON-NLS-1$
+                    mProvider.update(ApiKeysDbColumns.TABLE_NAME, values, String.format("%s = ?", ApiKeysDbColumns._ID), new String[]{Long.toString(mApiKeyId)}); //$NON-NLS-1$
 
-                    if (!mIsSessionOpen)
-                    {
+                    if (!mIsSessionOpen) {
                         /*
                          * Force a session to contain the opt event
                          */
                         open(true);
                         tagEvent(isOptingOut ? OPT_OUT_EVENT : OPT_IN_EVENT, null);
                         close();
-                    }
-                    else
-                    {
+                    } else {
                         tagEvent(isOptingOut ? OPT_OUT_EVENT : OPT_IN_EVENT, null);
                     }
                 }
@@ -1002,31 +914,26 @@ public final class LocalyticsSession
         /**
          * Open a session. While this method should only be called once without an intervening call to {@link #close()}, nothing
          * bad will happen if it is called multiple times.
-         * <p>
+         * <p/>
          * This method must only be called after {@link #init()} is called.
-         * <p>
+         * <p/>
          * Note: This method is a private implementation detail. It is only made package accessible for unit testing purposes. The
          * public interface is to send {@link #MESSAGE_OPEN} to the Handler.
          *
          * @param ignoreLimits true to ignore limits on the number of sessions. False to enforce limits.
          * @see #MESSAGE_OPEN
          */
-        /* package */void open(final boolean ignoreLimits)
-        {
-            if (mIsSessionOpen)
-            {
-                if (Constants.IS_LOGGABLE)
-                {
+        /* package */void open(final boolean ignoreLimits) {
+            if (mIsSessionOpen) {
+                if (Constants.IS_LOGGABLE) {
                     Log.w(Constants.LOG_TAG, "Session was already open"); //$NON-NLS-1$
                 }
 
                 return;
             }
 
-            if (mIsOptedOut)
-            {
-                if (Constants.IS_LOGGABLE)
-                {
+            if (mIsOptedOut) {
+                if (Constants.IS_LOGGABLE) {
                     Log.d(Constants.LOG_TAG, "Data collection is opted out"); //$NON-NLS-1$
                 }
                 return;
@@ -1042,44 +949,36 @@ public final class LocalyticsSession
             {
                 Cursor eventsCursor = null;
                 Cursor blob_eventsCursor = null;
-                try
-                {
+                try {
                     eventsCursor = mProvider.query(EventsDbColumns.TABLE_NAME, new String[]
-                        { EventsDbColumns._ID }, String.format("%s = ? AND %s >= ?", EventsDbColumns.EVENT_NAME, EventsDbColumns.WALL_TIME), new String[] { CLOSE_EVENT, Long.toString(System.currentTimeMillis() - Constants.SESSION_EXPIRATION) }, EVENTS_SORT_ORDER); //$NON-NLS-1$
+                            {EventsDbColumns._ID}, String.format("%s = ? AND %s >= ?", EventsDbColumns.EVENT_NAME, EventsDbColumns.WALL_TIME), new String[]{CLOSE_EVENT, Long.toString(System.currentTimeMillis() - Constants.SESSION_EXPIRATION)}, EVENTS_SORT_ORDER); //$NON-NLS-1$
                     blob_eventsCursor = mProvider.query(UploadBlobEventsDbColumns.TABLE_NAME, new String[]
-                        { UploadBlobEventsDbColumns.EVENTS_KEY_REF }, null, null, UPLOAD_BLOBS_EVENTS_SORT_ORDER);
+                            {UploadBlobEventsDbColumns.EVENTS_KEY_REF}, null, null, UPLOAD_BLOBS_EVENTS_SORT_ORDER);
 
                     final int idColumn = eventsCursor.getColumnIndexOrThrow(EventsDbColumns._ID);
                     final CursorJoiner joiner = new CursorJoiner(eventsCursor, new String[]
-                        { EventsDbColumns._ID }, blob_eventsCursor, new String[]
-                        { UploadBlobEventsDbColumns.EVENTS_KEY_REF });
+                            {EventsDbColumns._ID}, blob_eventsCursor, new String[]
+                            {UploadBlobEventsDbColumns.EVENTS_KEY_REF});
 
-                    for (final CursorJoiner.Result joinerResult : joiner)
-                    {
-                        switch (joinerResult)
-                        {
-                            case LEFT:
-                            {
+                    for (final CursorJoiner.Result joinerResult : joiner) {
+                        switch (joinerResult) {
+                            case LEFT: {
 
-                                if (-1 != closeEventId)
-                                {
+                                if (-1 != closeEventId) {
                                     /*
                                      * This should never happen
                                      */
-                                    if (Constants.IS_LOGGABLE)
-                                    {
+                                    if (Constants.IS_LOGGABLE) {
                                         Log.w(Constants.LOG_TAG, "There were multiple close events within SESSION_EXPIRATION"); //$NON-NLS-1$
                                     }
 
                                     long newClose = eventsCursor.getLong(eventsCursor.getColumnIndexOrThrow(EventsDbColumns._ID));
-                                    if (newClose > closeEventId)
-                                    {
+                                    if (newClose > closeEventId) {
                                         closeEventId = newClose;
                                     }
                                 }
 
-                                if (-1 == closeEventId)
-                                {
+                                if (-1 == closeEventId) {
                                     closeEventId = eventsCursor.getLong(idColumn);
                                 }
 
@@ -1094,42 +993,32 @@ public final class LocalyticsSession
                     /*
                      * Verify that the session hasn't already been flagged for upload. That could happen if
                      */
-                }
-                finally
-                {
-                    if (eventsCursor != null)
-                    {
+                } finally {
+                    if (eventsCursor != null) {
                         eventsCursor.close();
                     }
-                    if (blob_eventsCursor != null)
-                    {
+                    if (blob_eventsCursor != null) {
                         blob_eventsCursor.close();
                     }
                 }
             }
 
-            if (-1 != closeEventId)
-            {
+            if (-1 != closeEventId) {
                 Log.v(Constants.LOG_TAG, "Opening old closed session and reconnecting"); //$NON-NLS-1$
                 mIsSessionOpen = true;
 
                 openClosedSession(closeEventId);
-            }
-            else
-            {
+            } else {
                 Cursor sessionsCursor = null;
-                try
-                {
+                try {
                     sessionsCursor = mProvider.query(SessionsDbColumns.TABLE_NAME, new String[]
-                        {
-                            SessionsDbColumns._ID,
-                            SessionsDbColumns.SESSION_START_WALL_TIME }, null, null, SessionsDbColumns._ID);
+                            {
+                                    SessionsDbColumns._ID,
+                                    SessionsDbColumns.SESSION_START_WALL_TIME}, null, null, SessionsDbColumns._ID);
 
-                    if (sessionsCursor.moveToLast())
-                    {
+                    if (sessionsCursor.moveToLast()) {
                         if (sessionsCursor.getLong(sessionsCursor.getColumnIndexOrThrow(SessionsDbColumns.SESSION_START_WALL_TIME)) >= System.currentTimeMillis()
-                                - Constants.SESSION_EXPIRATION)
-                        {
+                                - Constants.SESSION_EXPIRATION) {
                             // reconnect
                             Log.v(Constants.LOG_TAG, "Opening old unclosed session and reconnecting"); //$NON-NLS-1$
                             mIsSessionOpen = true;
@@ -1139,32 +1028,24 @@ public final class LocalyticsSession
 
                         // delete empties
                         Cursor eventsCursor = null;
-                        try
-                        {
+                        try {
                             String sessionId = Long.toString(sessionsCursor.getLong(sessionsCursor.getColumnIndexOrThrow(SessionsDbColumns._ID)));
                             eventsCursor = mProvider.query(EventsDbColumns.TABLE_NAME, new String[]
-                                { EventsDbColumns._ID }, String.format("%s = ?", EventsDbColumns.SESSION_KEY_REF), new String[] //$NON-NLS-1$
-                                { sessionId }, null);
+                                    {EventsDbColumns._ID}, String.format("%s = ?", EventsDbColumns.SESSION_KEY_REF), new String[] //$NON-NLS-1$
+                                    {sessionId}, null);
 
-                            if (eventsCursor.getCount() == 0)
-                            {
-                                mProvider.delete(SessionsDbColumns.TABLE_NAME, String.format("%s = ?", SessionsDbColumns._ID), new String[] { sessionId }); //$NON-NLS-1$
+                            if (eventsCursor.getCount() == 0) {
+                                mProvider.delete(SessionsDbColumns.TABLE_NAME, String.format("%s = ?", SessionsDbColumns._ID), new String[]{sessionId}); //$NON-NLS-1$
                             }
-                        }
-                        finally
-                        {
-                            if (null != eventsCursor)
-                            {
+                        } finally {
+                            if (null != eventsCursor) {
                                 eventsCursor.close();
                                 eventsCursor = null;
                             }
                         }
                     }
-                }
-                finally
-                {
-                    if (null != sessionsCursor)
-                    {
+                } finally {
+                    if (null != sessionsCursor) {
                         sessionsCursor.close();
                         sessionsCursor = null;
                     }
@@ -1173,27 +1054,20 @@ public final class LocalyticsSession
                 /*
                  * Check that the maximum number of sessions hasn't been exceeded
                  */
-                if (!ignoreLimits)
-                {
+                if (!ignoreLimits) {
                     Cursor cursor = null;
-                    try
-                    {
+                    try {
                         cursor = mProvider.query(SessionsDbColumns.TABLE_NAME, new String[]
-                            { SessionsDbColumns._ID }, null, null, null);
+                                {SessionsDbColumns._ID}, null, null, null);
 
-                        if (cursor.getCount() >= Constants.MAX_NUM_SESSIONS)
-                        {
-                            if (Constants.IS_LOGGABLE)
-                            {
+                        if (cursor.getCount() >= Constants.MAX_NUM_SESSIONS) {
+                            if (Constants.IS_LOGGABLE) {
                                 Log.w(Constants.LOG_TAG, "Maximum number of sessions are already on disk--not writing any new sessions until old sessions are cleared out.  Try calling upload() to store more sessions."); //$NON-NLS-1$
                             }
                             return;
                         }
-                    }
-                    finally
-                    {
-                        if (cursor != null)
-                        {
+                    } finally {
+                        if (cursor != null) {
                             cursor.close();
                             cursor = null;
                         }
@@ -1212,8 +1086,7 @@ public final class LocalyticsSession
          *
          * @effects Updates the database by creating a new entry in the {@link SessionsDbColumns} table.
          */
-        private void openNewSession()
-        {
+        private void openNewSession() {
             final TelephonyManager telephonyManager = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
 
             final ContentValues values = new ContentValues();
@@ -1226,21 +1099,15 @@ public final class LocalyticsSession
 
             // Try and get the deviceId. If it is unavailable (or invalid) use the installation ID instead.
             String deviceId = DatapointHelper.getAndroidIdHashOrNull(mContext);
-            if (deviceId == null)
-            {
+            if (deviceId == null) {
                 Cursor cursor = null;
-                try
-                {
-                    cursor = mProvider.query(ApiKeysDbColumns.TABLE_NAME, null, String.format("%s = ?", ApiKeysDbColumns.API_KEY), new String[] { mApiKey }, null); //$NON-NLS-1$
-                    if (cursor.moveToFirst())
-                    {
+                try {
+                    cursor = mProvider.query(ApiKeysDbColumns.TABLE_NAME, null, String.format("%s = ?", ApiKeysDbColumns.API_KEY), new String[]{mApiKey}, null); //$NON-NLS-1$
+                    if (cursor.moveToFirst()) {
                         deviceId = cursor.getString(cursor.getColumnIndexOrThrow(ApiKeysDbColumns.UUID));
                     }
-                }
-                finally
-                {
-                    if (null != cursor)
-                    {
+                } finally {
+                    if (null != cursor) {
                         cursor.close();
                         cursor = null;
                     }
@@ -1264,14 +1131,11 @@ public final class LocalyticsSession
             values.put(SessionsDbColumns.NETWORK_COUNTRY, telephonyManager.getNetworkCountryIso());
             values.put(SessionsDbColumns.NETWORK_TYPE, DatapointHelper.getNetworkType(mContext, telephonyManager));
 
-            mProvider.runBatchTransaction(new Runnable()
-            {
+            mProvider.runBatchTransaction(new Runnable() {
                 @Override
-                public void run()
-                {
+                public void run() {
                     mSessionId = mProvider.insert(SessionsDbColumns.TABLE_NAME, values);
-                    if (mSessionId == -1)
-                    {
+                    if (mSessionId == -1) {
                         throw new RuntimeException("session insert failed"); //$NON-NLS-1$
                     }
 
@@ -1291,40 +1155,31 @@ public final class LocalyticsSession
          *
          * @param closeEventId The last close event which is to be deleted so that the old session can be reopened
          * @effects Updates the database by deleting the last close event and sets {@link #mSessionId} to the session id of the
-         *          last close event
+         * last close event
          */
-        private void openClosedSession(final long closeEventId)
-        {
+        private void openClosedSession(final long closeEventId) {
             Cursor eventCursor = null;
-            try
-            {
+            try {
                 eventCursor = mProvider.query(EventsDbColumns.TABLE_NAME, new String[]
-                    { EventsDbColumns.SESSION_KEY_REF }, String.format("%s = ?", EventsDbColumns._ID), new String[] { Long.toString(closeEventId) }, null); //$NON-NLS-1$
+                        {EventsDbColumns.SESSION_KEY_REF}, String.format("%s = ?", EventsDbColumns._ID), new String[]{Long.toString(closeEventId)}, null); //$NON-NLS-1$
 
-                if (eventCursor.moveToFirst())
-                {
+                if (eventCursor.moveToFirst()) {
                     mSessionId = eventCursor.getLong(eventCursor.getColumnIndexOrThrow(EventsDbColumns.SESSION_KEY_REF));
 
-                    mProvider.delete(EventsDbColumns.TABLE_NAME, String.format("%s = ?", EventsDbColumns._ID), new String[] { Long.toString(closeEventId) }); //$NON-NLS-1$
-                }
-                else
-                {
+                    mProvider.delete(EventsDbColumns.TABLE_NAME, String.format("%s = ?", EventsDbColumns._ID), new String[]{Long.toString(closeEventId)}); //$NON-NLS-1$
+                } else {
                     /*
                      * This should never happen
                      */
 
-                    if (Constants.IS_LOGGABLE)
-                    {
+                    if (Constants.IS_LOGGABLE) {
                         Log.e(Constants.LOG_TAG, "Event no longer exists"); //$NON-NLS-1$
                     }
 
                     openNewSession();
                 }
-            }
-            finally
-            {
-                if (eventCursor != null)
-                {
+            } finally {
+                if (eventCursor != null) {
                     eventCursor.close();
                 }
             }
@@ -1333,20 +1188,18 @@ public final class LocalyticsSession
         /**
          * Close a session. While this method should only be called after {@link #open(boolean)}, nothing bad will happen if it is
          * called and {@link #open(boolean)} wasn't called. Similarly, nothing bad will happen if close is called multiple times.
-         * <p>
+         * <p/>
          * This method must only be called after {@link #init()} is called.
-         * <p>
+         * <p/>
          * Note: This method is a private implementation detail. It is only made package accessible for unit testing purposes. The
          * public interface is to send {@link #MESSAGE_CLOSE} to the Handler.
          *
          * @see #MESSAGE_OPEN
          */
-        /* package */void close()
-        {
+        /* package */void close() {
             if (!mIsSessionOpen) // do nothing if session is not open
             {
-                if (Constants.IS_LOGGABLE)
-                {
+                if (Constants.IS_LOGGABLE) {
                     Log.w(Constants.LOG_TAG, "Session was not open, so close is not possible."); //$NON-NLS-1$
                 }
                 return;
@@ -1360,23 +1213,20 @@ public final class LocalyticsSession
         /**
          * Tag an event in a session. While this method shouldn't be called unless {@link #open(boolean)} is called first, this
          * method will simply do nothing if {@link #open(boolean)} hasn't been called.
-         * <p>
+         * <p/>
          * This method must only be called after {@link #init()} is called.
-         * <p>
+         * <p/>
          * Note: This method is a private implementation detail. It is only made package accessible for unit testing purposes. The
          * public interface is to send {@link #MESSAGE_TAG_EVENT} to the Handler.
          *
-         * @param event The name of the event which occurred.
+         * @param event      The name of the event which occurred.
          * @param attributes The collection of attributes for this particular event. If this parameter is null, then calling this
-         *            method has the same effect as calling {@link #tagEvent(String)}.
+         *                   method has the same effect as calling {@link #tagEvent(String)}.
          * @see #MESSAGE_TAG_EVENT
          */
-        /* package */void tagEvent(final String event, final Map<String, String> attributes)
-        {
-            if (!mIsSessionOpen)
-            {
-                if (Constants.IS_LOGGABLE)
-                {
+        /* package */void tagEvent(final String event, final Map<String, String> attributes) {
+            if (!mIsSessionOpen) {
+                if (Constants.IS_LOGGABLE) {
                     Log.w(Constants.LOG_TAG, "Tag not written because the session was not open"); //$NON-NLS-1$
                 }
                 return;
@@ -1397,28 +1247,20 @@ public final class LocalyticsSession
                 /*
                  * Special case for open event: keep the start time in sync with the start time put into the sessions table.
                  */
-                if (OPEN_EVENT.equals(event))
-                {
+                if (OPEN_EVENT.equals(event)) {
                     Cursor cursor = null;
-                    try
-                    {
+                    try {
                         cursor = mProvider.query(SessionsDbColumns.TABLE_NAME, new String[]
-                            { SessionsDbColumns.SESSION_START_WALL_TIME }, String.format("%s = ?", SessionsDbColumns._ID), new String[] { Long.toString(mSessionId) }, null); //$NON-NLS-1$
+                                {SessionsDbColumns.SESSION_START_WALL_TIME}, String.format("%s = ?", SessionsDbColumns._ID), new String[]{Long.toString(mSessionId)}, null); //$NON-NLS-1$
 
-                        if (cursor.moveToFirst())
-                        {
+                        if (cursor.moveToFirst()) {
                             values.put(EventsDbColumns.WALL_TIME, Long.valueOf(cursor.getLong(cursor.getColumnIndexOrThrow(SessionsDbColumns.SESSION_START_WALL_TIME))));
-                        }
-                        else
-                        {
+                        } else {
                             // this should never happen
                             throw new RuntimeException("Session didn't exist"); //$NON-NLS-1$
                         }
-                    }
-                    finally
-                    {
-                        if (null != cursor)
-                        {
+                    } finally {
+                        if (null != cursor) {
                             cursor.close();
                         }
                     }
@@ -1426,8 +1268,7 @@ public final class LocalyticsSession
 
                 eventId = mProvider.insert(EventsDbColumns.TABLE_NAME, values);
 
-                if (-1 == eventId)
-                {
+                if (-1 == eventId) {
                     throw new RuntimeException("Inserting event failed"); //$NON-NLS-1$
                 }
             }
@@ -1435,20 +1276,16 @@ public final class LocalyticsSession
             /*
              * If attributes exist, insert them as well
              */
-            if (null != attributes)
-            {
+            if (null != attributes) {
                 int count = 0;
-                for (final Entry<String, String> entry : attributes.entrySet())
-                {
+                for (final Entry<String, String> entry : attributes.entrySet()) {
                     /*
                      * Note: the attributes that are skipped are deterministic, because the map is actually an instance of
                      * TreeMap.
                      */
                     count++;
-                    if (count > Constants.MAX_NUM_ATTRIBUTES)
-                    {
-                        if (Constants.IS_LOGGABLE)
-                        {
+                    if (count > Constants.MAX_NUM_ATTRIBUTES) {
+                        if (Constants.IS_LOGGABLE) {
                             Log.w(Constants.LOG_TAG, String.format("Map contains %s keys while the maximum number of attributes is %s.  Some attributes were not written.  Consider reducing the number of attributes.", Integer.valueOf(attributes.size()), Integer.valueOf(Constants.MAX_NUM_ATTRIBUTES))); //$NON-NLS-1$
                         }
                         break;
@@ -1461,8 +1298,7 @@ public final class LocalyticsSession
 
                     final long id = mProvider.insert(AttributesDbColumns.TABLE_NAME, values);
 
-                    if (-1 == id)
-                    {
+                    if (-1 == id) {
                         throw new RuntimeException("Inserting attribute failed"); //$NON-NLS-1$
                     }
                 }
@@ -1471,8 +1307,7 @@ public final class LocalyticsSession
             /*
              * Insert the event into the history, only for application events
              */
-            if (!OPEN_EVENT.equals(event) && !CLOSE_EVENT.equals(event) && !OPT_IN_EVENT.equals(event) && !OPT_OUT_EVENT.equals(event) && !FLOW_EVENT.equals(event))
-            {
+            if (!OPEN_EVENT.equals(event) && !CLOSE_EVENT.equals(event) && !OPT_IN_EVENT.equals(event) && !OPT_OUT_EVENT.equals(event) && !FLOW_EVENT.equals(event)) {
                 final ContentValues values = new ContentValues();
                 values.put(EventHistoryDbColumns.NAME, event.substring(mContext.getPackageName().length() + 1, event.length()));
                 values.put(EventHistoryDbColumns.TYPE, Integer.valueOf(EventHistoryDbColumns.TYPE_EVENT));
@@ -1487,24 +1322,21 @@ public final class LocalyticsSession
         /**
          * Tag a screen in a session. While this method shouldn't be called unless {@link #open(boolean)} is called first, this
          * method will simply do nothing if {@link #open(boolean)} hasn't been called.
-         * <p>
+         * <p/>
          * This method performs duplicate suppression, preventing multiple screens with the same value in a row within a given
          * session.
-         * <p>
+         * <p/>
          * This method must only be called after {@link #init()} is called.
-         * <p>
+         * <p/>
          * Note: This method is a private implementation detail. It is only made public for unit testing purposes. The public
          * interface is to send {@link #MESSAGE_TAG_SCREEN} to the Handler.
          *
          * @param screen The name of the screen which occurred. Cannot be null or empty.
          * @see #MESSAGE_TAG_SCREEN
          */
-        /* package */void tagScreen(final String screen)
-        {
-            if (!mIsSessionOpen)
-            {
-                if (Constants.IS_LOGGABLE)
-                {
+        /* package */void tagScreen(final String screen) {
+            if (!mIsSessionOpen) {
+                if (Constants.IS_LOGGABLE) {
                     Log.w(Constants.LOG_TAG, "Tag not written because the session was not open"); //$NON-NLS-1$
                 }
                 return;
@@ -1514,27 +1346,20 @@ public final class LocalyticsSession
              * Do duplicate suppression
              */
             Cursor cursor = null;
-            try
-            {
+            try {
                 cursor = mProvider.query(EventHistoryDbColumns.TABLE_NAME, new String[]
-                    { EventHistoryDbColumns.NAME }, String.format("%s = ? AND %s = ?", EventHistoryDbColumns.TYPE, EventHistoryDbColumns.SESSION_KEY_REF), new String[] { Integer.toString(EventHistoryDbColumns.TYPE_SCREEN), Long.toString(mSessionId) }, String.format("%s DESC", EventHistoryDbColumns._ID)); //$NON-NLS-1$ //$NON-NLS-2$
+                        {EventHistoryDbColumns.NAME}, String.format("%s = ? AND %s = ?", EventHistoryDbColumns.TYPE, EventHistoryDbColumns.SESSION_KEY_REF), new String[]{Integer.toString(EventHistoryDbColumns.TYPE_SCREEN), Long.toString(mSessionId)}, String.format("%s DESC", EventHistoryDbColumns._ID)); //$NON-NLS-1$ //$NON-NLS-2$
 
-                if (cursor.moveToFirst())
-                {
-                    if (screen.equals(cursor.getString(cursor.getColumnIndexOrThrow(EventHistoryDbColumns.NAME))))
-                    {
-                        if (Constants.IS_LOGGABLE)
-                        {
+                if (cursor.moveToFirst()) {
+                    if (screen.equals(cursor.getString(cursor.getColumnIndexOrThrow(EventHistoryDbColumns.NAME)))) {
+                        if (Constants.IS_LOGGABLE) {
                             Log.v(Constants.LOG_TAG, String.format("Suppressed duplicate screen %s", screen)); //$NON-NLS-1$
                         }
                         return;
                     }
                 }
-            }
-            finally
-            {
-                if (null != cursor)
-                {
+            } finally {
+                if (null != cursor) {
                     cursor.close();
                     cursor = null;
                 }
@@ -1556,8 +1381,7 @@ public final class LocalyticsSession
         /**
          * Conditionally adds a flow event if no flow event exists in the current upload blob.
          */
-        private void conditionallyAddFlowEvent()
-        {
+        private void conditionallyAddFlowEvent() {
             /*
              * Creating a flow "event" is required to act as a placeholder so that the uploader will know that an upload needs to
              * occur. A flow event should only be created if there isn't already a flow event that hasn't been associated with an
@@ -1567,24 +1391,20 @@ public final class LocalyticsSession
 
             Cursor eventsCursor = null;
             Cursor blob_eventsCursor = null;
-            try
-            {
+            try {
                 eventsCursor = mProvider.query(EventsDbColumns.TABLE_NAME, new String[]
-                    { EventsDbColumns._ID }, String.format("%s = ?", EventsDbColumns.EVENT_NAME), new String[] //$NON-NLS-1$
-                    { FLOW_EVENT }, EVENTS_SORT_ORDER);
+                        {EventsDbColumns._ID}, String.format("%s = ?", EventsDbColumns.EVENT_NAME), new String[] //$NON-NLS-1$
+                        {FLOW_EVENT}, EVENTS_SORT_ORDER);
 
                 blob_eventsCursor = mProvider.query(UploadBlobEventsDbColumns.TABLE_NAME, new String[]
-                    { UploadBlobEventsDbColumns.EVENTS_KEY_REF }, null, null, UPLOAD_BLOBS_EVENTS_SORT_ORDER);
+                        {UploadBlobEventsDbColumns.EVENTS_KEY_REF}, null, null, UPLOAD_BLOBS_EVENTS_SORT_ORDER);
 
                 final CursorJoiner joiner = new CursorJoiner(eventsCursor, new String[]
-                    { EventsDbColumns._ID }, blob_eventsCursor, new String[]
-                    { UploadBlobEventsDbColumns.EVENTS_KEY_REF });
-                for (final CursorJoiner.Result joinerResult : joiner)
-                {
-                    switch (joinerResult)
-                    {
-                        case LEFT:
-                        {
+                        {EventsDbColumns._ID}, blob_eventsCursor, new String[]
+                        {UploadBlobEventsDbColumns.EVENTS_KEY_REF});
+                for (final CursorJoiner.Result joinerResult : joiner) {
+                    switch (joinerResult) {
+                        case LEFT: {
                             foundUnassociatedFlowEvent = true;
                             break;
                         }
@@ -1594,24 +1414,19 @@ public final class LocalyticsSession
                             break;
                     }
                 }
-            }
-            finally
-            {
-                if (eventsCursor != null)
-                {
+            } finally {
+                if (eventsCursor != null) {
                     eventsCursor.close();
                     eventsCursor = null;
                 }
 
-                if (blob_eventsCursor != null)
-                {
+                if (blob_eventsCursor != null) {
                     blob_eventsCursor.close();
                     blob_eventsCursor = null;
                 }
             }
 
-            if (!foundUnassociatedFlowEvent)
-            {
+            if (!foundUnassociatedFlowEvent) {
                 tagEvent(FLOW_EVENT, null);
             }
         }
@@ -1620,10 +1435,9 @@ public final class LocalyticsSession
          * Builds upload blobs for all events.
          *
          * @effects Mutates the database by creating a new upload blob for all events that are unassociated at the time this
-         *          method is called.
+         * method is called.
          */
-        /* package */void preUploadBuildBlobs()
-        {
+        /* package */void preUploadBuildBlobs() {
             /*
              * Group all events that aren't part of an upload blob into a new blob. While this process is a linear algorithm that
              * requires scanning two database tables, the performance won't be a problem for two reasons: 1. This process happens
@@ -1637,31 +1451,25 @@ public final class LocalyticsSession
 
             Cursor eventsCursor = null;
             Cursor blob_eventsCursor = null;
-            try
-            {
+            try {
                 eventsCursor = mProvider.query(EventsDbColumns.TABLE_NAME, new String[]
-                    {
-                        EventsDbColumns._ID,
-                        EventsDbColumns.EVENT_NAME,
-                        EventsDbColumns.WALL_TIME }, null, null, EVENTS_SORT_ORDER);
+                        {
+                                EventsDbColumns._ID,
+                                EventsDbColumns.EVENT_NAME,
+                                EventsDbColumns.WALL_TIME}, null, null, EVENTS_SORT_ORDER);
 
                 blob_eventsCursor = mProvider.query(UploadBlobEventsDbColumns.TABLE_NAME, new String[]
-                    { UploadBlobEventsDbColumns.EVENTS_KEY_REF }, null, null, UPLOAD_BLOBS_EVENTS_SORT_ORDER);
+                        {UploadBlobEventsDbColumns.EVENTS_KEY_REF}, null, null, UPLOAD_BLOBS_EVENTS_SORT_ORDER);
 
                 final int idColumn = eventsCursor.getColumnIndexOrThrow(EventsDbColumns._ID);
                 final CursorJoiner joiner = new CursorJoiner(eventsCursor, new String[]
-                    { EventsDbColumns._ID }, blob_eventsCursor, new String[]
-                    { UploadBlobEventsDbColumns.EVENTS_KEY_REF });
-                for (final CursorJoiner.Result joinerResult : joiner)
-                {
-                    switch (joinerResult)
-                    {
-                        case LEFT:
-                        {
-                            if (CLOSE_EVENT.equals(eventsCursor.getString(eventsCursor.getColumnIndexOrThrow(EventsDbColumns.EVENT_NAME))))
-                            {
-                                if (System.currentTimeMillis() - eventsCursor.getLong(eventsCursor.getColumnIndexOrThrow(EventsDbColumns.WALL_TIME)) < Constants.SESSION_EXPIRATION)
-                                {
+                        {EventsDbColumns._ID}, blob_eventsCursor, new String[]
+                        {UploadBlobEventsDbColumns.EVENTS_KEY_REF});
+                for (final CursorJoiner.Result joinerResult : joiner) {
+                    switch (joinerResult) {
+                        case LEFT: {
+                            if (CLOSE_EVENT.equals(eventsCursor.getString(eventsCursor.getColumnIndexOrThrow(EventsDbColumns.EVENT_NAME)))) {
+                                if (System.currentTimeMillis() - eventsCursor.getLong(eventsCursor.getColumnIndexOrThrow(EventsDbColumns.WALL_TIME)) < Constants.SESSION_EXPIRATION) {
                                     break;
                                 }
                             }
@@ -1674,22 +1482,17 @@ public final class LocalyticsSession
                             break;
                     }
                 }
-            }
-            finally
-            {
-                if (eventsCursor != null)
-                {
+            } finally {
+                if (eventsCursor != null) {
                     eventsCursor.close();
                 }
 
-                if (blob_eventsCursor != null)
-                {
+                if (blob_eventsCursor != null) {
                     blob_eventsCursor.close();
                 }
             }
 
-            if (eventIds.size() > 0)
-            {
+            if (eventIds.size() > 0) {
                 final long blobId;
                 {
                     final ContentValues values = new ContentValues();
@@ -1699,8 +1502,7 @@ public final class LocalyticsSession
 
                 {
                     final ContentValues values = new ContentValues();
-                    for (final Long x : eventIds)
-                    {
+                    for (final Long x : eventIds) {
                         values.clear();
 
                         values.put(UploadBlobEventsDbColumns.UPLOAD_BLOBS_KEY_REF, Long.valueOf(blobId));
@@ -1718,22 +1520,19 @@ public final class LocalyticsSession
 
         /**
          * Initiate upload of all session data currently stored on disk.
-         * <p>
+         * <p/>
          * This method must only be called after {@link #init()} is called. The session does not need to be open for an upload to
          * occur.
-         * <p>
+         * <p/>
          * Note: This method is a private implementation detail. It is only made package accessible for unit testing purposes. The
          * public interface is to send {@link #MESSAGE_UPLOAD} to the Handler.
          *
          * @param callback An optional callback to perform once the upload completes. May be null for no callback.
          * @see #MESSAGE_UPLOAD
          */
-        /* package */void upload(final Runnable callback)
-        {
-            if (sIsUploadingMap.get(mApiKey).booleanValue())
-            {
-                if (Constants.IS_LOGGABLE)
-                {
+        /* package */void upload(final Runnable callback) {
+            if (sIsUploadingMap.get(mApiKey).booleanValue()) {
+                if (Constants.IS_LOGGABLE) {
                     Log.d(Constants.LOG_TAG, "Already uploading"); //$NON-NLS-1$
                 }
 
@@ -1741,31 +1540,24 @@ public final class LocalyticsSession
                 return;
             }
 
-            try
-            {
-                mProvider.runBatchTransaction(new Runnable()
-                {
-                    public void run()
-                    {
+            try {
+                mProvider.runBatchTransaction(new Runnable() {
+                    public void run() {
                         preUploadBuildBlobs();
                     }
                 });
 
                 sIsUploadingMap.put(mApiKey, Boolean.TRUE);
                 mUploadHandler.sendMessage(mUploadHandler.obtainMessage(UploadHandler.MESSAGE_UPLOAD, callback));
-            }
-            catch (final Exception e)
-            {
-                if (Constants.IS_LOGGABLE)
-                {
+            } catch (final Exception e) {
+                if (Constants.IS_LOGGABLE) {
                     Log.w(Constants.LOG_TAG, "Error occurred during upload", e); //$NON-NLS-1$
                 }
 
                 sIsUploadingMap.put(mApiKey, Boolean.FALSE);
 
                 // Notify the caller the upload is "complete"
-                if (callback != null)
-                {
+                if (callback != null) {
                     /*
                      * Note that a new thread is created for the callback. This ensures that client code can't affect the
                      * performance of the SessionHandler's thread.
@@ -1779,8 +1571,7 @@ public final class LocalyticsSession
     /**
      * Helper object to the {@link SessionHandler} which helps process upload requests.
      */
-    /* package */static final class UploadHandler extends Handler
-    {
+    /* package */static final class UploadHandler extends Handler {
 
         /**
          * Thread name that the upload callback runnable is executed on.
@@ -1794,7 +1585,7 @@ public final class LocalyticsSession
 
         /**
          * Handler message to upload all data collected so far
-         * <p>
+         * <p/>
          * {@link Message#obj} is a {@code Runnable} to execute when upload is complete. The thread that this runnable will
          * executed on is undefined.
          */
@@ -1803,7 +1594,7 @@ public final class LocalyticsSession
         /**
          * Handler message indicating that there is a queued upload request. When this message is processed, this handler simply
          * forwards the request back to {@link LocalyticsSession#mSessionHandler} with {@link SessionHandler#MESSAGE_UPLOAD}.
-         * <p>
+         * <p/>
          * {@link Message#obj} is a {@code Runnable} to execute when upload is complete. The thread that this runnable will
          * executed on is undefined.
          */
@@ -1831,16 +1622,15 @@ public final class LocalyticsSession
 
         /**
          * Constructs a new Handler that runs on {@code looper}.
-         * <p>
+         * <p/>
          * Note: This constructor may perform disk access.
          *
-         * @param context Application context. Cannot be null.
+         * @param context        Application context. Cannot be null.
          * @param sessionHandler Parent {@link SessionHandler} object to notify when uploads are completed. Cannot be null.
-         * @param apiKey Localytics API key. Cannot be null.
-         * @param looper to run the Handler on. Cannot be null.
+         * @param apiKey         Localytics API key. Cannot be null.
+         * @param looper         to run the Handler on. Cannot be null.
          */
-        public UploadHandler(final Context context, final Handler sessionHandler, final String apiKey, final Looper looper)
-        {
+        public UploadHandler(final Context context, final Handler sessionHandler, final String apiKey, final Looper looper) {
             super(looper);
 
             mContext = context;
@@ -1850,16 +1640,12 @@ public final class LocalyticsSession
         }
 
         @Override
-        public void handleMessage(final Message msg)
-        {
+        public void handleMessage(final Message msg) {
             super.handleMessage(msg);
 
-            switch (msg.what)
-            {
-                case MESSAGE_UPLOAD:
-                {
-                    if (Constants.IS_LOGGABLE)
-                    {
+            switch (msg.what) {
+                case MESSAGE_UPLOAD: {
+                    if (Constants.IS_LOGGABLE) {
                         Log.d(Constants.LOG_TAG, "UploadHandler Received MESSAGE_UPLOAD"); //$NON-NLS-1$
                     }
 
@@ -1868,35 +1654,26 @@ public final class LocalyticsSession
                      */
                     final Runnable callback = (Runnable) msg.obj;
 
-                    try
-                    {
+                    try {
                         final List<JSONObject> toUpload = convertDatabaseToJson();
 
-                        if (!toUpload.isEmpty())
-                        {
+                        if (!toUpload.isEmpty()) {
                             final StringBuilder builder = new StringBuilder();
-                            for (final JSONObject json : toUpload)
-                            {
+                            for (final JSONObject json : toUpload) {
                                 builder.append(json.toString());
                                 builder.append('\n');
                             }
 
-                            if (uploadSessions(String.format(ANALYTICS_URL, mApiKey), builder.toString()))
-                            {
-                                mProvider.runBatchTransaction(new Runnable()
-                                {
-                                    public void run()
-                                    {
+                            if (uploadSessions(String.format(ANALYTICS_URL, mApiKey), builder.toString())) {
+                                mProvider.runBatchTransaction(new Runnable() {
+                                    public void run() {
                                         deleteBlobsAndSessions(mProvider);
                                     }
                                 });
                             }
                         }
-                    }
-                    finally
-                    {
-                        if (callback != null)
-                        {
+                    } finally {
+                        if (callback != null) {
                             /*
                              * Execute the callback on a separate thread, to avoid exposing this thread to the client of the
                              * library
@@ -1908,18 +1685,15 @@ public final class LocalyticsSession
                     }
                     break;
                 }
-                case MESSAGE_RETRY_UPLOAD_REQUEST:
-                {
-                    if (Constants.IS_LOGGABLE)
-                    {
+                case MESSAGE_RETRY_UPLOAD_REQUEST: {
+                    if (Constants.IS_LOGGABLE) {
                         Log.d(Constants.LOG_TAG, "Received MESSAGE_RETRY_UPLOAD_REQUEST"); //$NON-NLS-1$
                     }
 
                     mSessionHandler.sendMessage(mSessionHandler.obtainMessage(SessionHandler.MESSAGE_UPLOAD, msg.obj));
                     break;
                 }
-                default:
-                {
+                default: {
                     /*
                      * This should never happen
                      */
@@ -1931,27 +1705,23 @@ public final class LocalyticsSession
         /**
          * Uploads the post Body to the webservice
          *
-         * @param url where {@code body} will be posted to. Cannot be null.
+         * @param url  where {@code body} will be posted to. Cannot be null.
          * @param body upload body as a string. This should be a plain old string. Cannot be null.
          * @return True on success, false on failure.
          */
-        /* package */static boolean uploadSessions(final String url, final String body)
-        {
-            if (Constants.ENABLE_PARAMETER_CHECKING)
-            {
-                if (null == url)
-                {
+        /* package */
+        static boolean uploadSessions(final String url, final String body) {
+            if (Constants.ENABLE_PARAMETER_CHECKING) {
+                if (null == url) {
                     throw new IllegalArgumentException("url cannot be null"); //$NON-NLS-1$
                 }
 
-                if (null == body)
-                {
+                if (null == body) {
                     throw new IllegalArgumentException("body cannot be null"); //$NON-NLS-1$
                 }
             }
 
-            if (Constants.IS_LOGGABLE)
-            {
+            if (Constants.IS_LOGGABLE) {
                 Log.v(Constants.LOG_TAG, String.format("Upload body before compression is: %s", body.toString())); //$NON-NLS-1$
             }
 
@@ -1960,8 +1730,7 @@ public final class LocalyticsSession
             method.addHeader("Content-Type", "application/x-gzip"); //$NON-NLS-1$ //$NON-NLS-2$
 
             GZIPOutputStream gos = null;
-            try
-            {
+            try {
                 final byte[] originalBytes = body.getBytes("UTF-8"); //$NON-NLS-1$
                 final ByteArrayOutputStream baos = new ByteArrayOutputStream(originalBytes.length);
                 gos = new GZIPOutputStream(baos);
@@ -1976,57 +1745,39 @@ public final class LocalyticsSession
 
                 final StatusLine status = response.getStatusLine();
                 final int statusCode = status.getStatusCode();
-                if (Constants.IS_LOGGABLE)
-                {
+                if (Constants.IS_LOGGABLE) {
                     Log.v(Constants.LOG_TAG, String.format("Upload complete with status %d", Integer.valueOf(statusCode))); //$NON-NLS-1$
                 }
 
                 /*
                  * 5xx status codes indicate a server error, so upload should be reattempted
                  */
-                if (statusCode >= 500 && statusCode <= 599)
-                {
+                if (statusCode >= 500 && statusCode <= 599) {
                     return false;
                 }
 
                 return true;
-            }
-            catch (final UnsupportedEncodingException e)
-            {
-                if (Constants.IS_LOGGABLE)
-                {
+            } catch (final UnsupportedEncodingException e) {
+                if (Constants.IS_LOGGABLE) {
                     Log.w(Constants.LOG_TAG, "UnsupportedEncodingException", e); //$NON-NLS-1$
                 }
                 return false;
-            }
-            catch (final ClientProtocolException e)
-            {
-                if (Constants.IS_LOGGABLE)
-                {
+            } catch (final ClientProtocolException e) {
+                if (Constants.IS_LOGGABLE) {
                     Log.w(Constants.LOG_TAG, "ClientProtocolException", e); //$NON-NLS-1$
                 }
                 return false;
-            }
-            catch (final IOException e)
-            {
-                if (Constants.IS_LOGGABLE)
-                {
+            } catch (final IOException e) {
+                if (Constants.IS_LOGGABLE) {
                     Log.w(Constants.LOG_TAG, "IOException", e); //$NON-NLS-1$
                 }
                 return false;
-            }
-            finally
-            {
-                if (null != gos)
-                {
-                    try
-                    {
+            } finally {
+                if (null != gos) {
+                    try {
                         gos.close();
-                    }
-                    catch (final IOException e)
-                    {
-                        if (Constants.IS_LOGGABLE)
-                        {
+                    } catch (final IOException e) {
+                        if (Constants.IS_LOGGABLE) {
                             Log.w(Constants.LOG_TAG, "Caught exception", e); //$NON-NLS-1$
                         }
                     }
@@ -2039,22 +1790,18 @@ public final class LocalyticsSession
          *
          * @return A list of JSON objecs to upload to the server
          */
-        /* package */List<JSONObject> convertDatabaseToJson()
-        {
+        /* package */List<JSONObject> convertDatabaseToJson() {
             final List<JSONObject> result = new LinkedList<JSONObject>();
             Cursor cursor = null;
-            try
-            {
+            try {
                 cursor = mProvider.query(UploadBlobsDbColumns.TABLE_NAME, null, null, null, null);
 
                 final long creationTime = getApiKeyCreationTime(mProvider, mApiKey);
 
                 final int idColumn = cursor.getColumnIndexOrThrow(UploadBlobsDbColumns._ID);
                 final int uuidColumn = cursor.getColumnIndexOrThrow(UploadBlobsDbColumns.UUID);
-                while (cursor.moveToNext())
-                {
-                    try
-                    {
+                while (cursor.moveToNext()) {
+                    try {
                         final JSONObject blobHeader = new JSONObject();
 
                         blobHeader.put(JsonObjects.BlobHeader.KEY_DATA_TYPE, BlobHeader.VALUE_DATA_TYPE);
@@ -2065,45 +1812,33 @@ public final class LocalyticsSession
                         result.add(blobHeader);
 
                         Cursor blobEvents = null;
-                        try
-                        {
+                        try {
                             blobEvents = mProvider.query(UploadBlobEventsDbColumns.TABLE_NAME, new String[]
-                                { UploadBlobEventsDbColumns.EVENTS_KEY_REF }, String.format("%s = ?", UploadBlobEventsDbColumns.UPLOAD_BLOBS_KEY_REF), new String[] //$NON-NLS-1$
-                                { Long.toString(cursor.getLong(idColumn)) }, UploadBlobEventsDbColumns.EVENTS_KEY_REF);
+                                    {UploadBlobEventsDbColumns.EVENTS_KEY_REF}, String.format("%s = ?", UploadBlobEventsDbColumns.UPLOAD_BLOBS_KEY_REF), new String[] //$NON-NLS-1$
+                                    {Long.toString(cursor.getLong(idColumn))}, UploadBlobEventsDbColumns.EVENTS_KEY_REF);
 
                             final int eventIdColumn = blobEvents.getColumnIndexOrThrow(UploadBlobEventsDbColumns.EVENTS_KEY_REF);
-                            while (blobEvents.moveToNext())
-                            {
+                            while (blobEvents.moveToNext()) {
                                 result.add(convertEventToJson(mProvider, mContext, blobEvents.getLong(eventIdColumn), cursor.getLong(idColumn), mApiKey));
                             }
-                        }
-                        finally
-                        {
-                            if (null != blobEvents)
-                            {
+                        } finally {
+                            if (null != blobEvents) {
                                 blobEvents.close();
                             }
                         }
-                    }
-                    catch (final JSONException e)
-                    {
-                        if (Constants.IS_LOGGABLE)
-                        {
+                    } catch (final JSONException e) {
+                        if (Constants.IS_LOGGABLE) {
                             Log.w(Constants.LOG_TAG, "Caught exception", e); //$NON-NLS-1$
                         }
                     }
                 }
-            }
-            finally
-            {
-                if (cursor != null)
-                {
+            } finally {
+                if (cursor != null) {
                     cursor.close();
                 }
             }
 
-            if (Constants.IS_LOGGABLE)
-            {
+            if (Constants.IS_LOGGABLE) {
                 Log.v(Constants.LOG_TAG, String.format("JSON result is %s", result.toString())); //$NON-NLS-1$
             }
 
@@ -2112,13 +1847,13 @@ public final class LocalyticsSession
 
         /**
          * Deletes all blobs and sessions/events/attributes associated with those blobs.
-         * <p>
+         * <p/>
          * This should be called after a successful upload completes.
          *
          * @param provider Localytics database provider. Cannot be null.
          */
-        /* package */static void deleteBlobsAndSessions(final LocalyticsProvider provider)
-        {
+        /* package */
+        static void deleteBlobsAndSessions(final LocalyticsProvider provider) {
             /*
              * Deletion needs to occur in a specific order due to database constraints. Specifically, blobevents need to be
              * deleted first. Then blobs themselves can be deleted. Then attributes need to be deleted first. Then events. Then
@@ -2129,25 +1864,23 @@ public final class LocalyticsSession
             final HashSet<Long> blobsToDelete = new HashSet<Long>();
 
             Cursor blobEvents = null;
-            try
-            {
+            try {
                 blobEvents = provider.query(UploadBlobEventsDbColumns.TABLE_NAME, new String[]
-                    {
-                        UploadBlobEventsDbColumns._ID,
-                        UploadBlobEventsDbColumns.EVENTS_KEY_REF,
-                        UploadBlobEventsDbColumns.UPLOAD_BLOBS_KEY_REF }, null, null, null);
+                        {
+                                UploadBlobEventsDbColumns._ID,
+                                UploadBlobEventsDbColumns.EVENTS_KEY_REF,
+                                UploadBlobEventsDbColumns.UPLOAD_BLOBS_KEY_REF}, null, null, null);
 
                 final int uploadBlobIdColumn = blobEvents.getColumnIndexOrThrow(UploadBlobEventsDbColumns.UPLOAD_BLOBS_KEY_REF);
                 final int blobEventIdColumn = blobEvents.getColumnIndexOrThrow(UploadBlobEventsDbColumns._ID);
                 final int eventIdColumn = blobEvents.getColumnIndexOrThrow(UploadBlobEventsDbColumns.EVENTS_KEY_REF);
-                while (blobEvents.moveToNext())
-                {
+                while (blobEvents.moveToNext()) {
                     final long blobId = blobEvents.getLong(uploadBlobIdColumn);
                     final long blobEventId = blobEvents.getLong(blobEventIdColumn);
                     final long eventId = blobEvents.getLong(eventIdColumn);
 
                     // delete the blobevent
-                    provider.delete(UploadBlobEventsDbColumns.TABLE_NAME, String.format("%s = ?", UploadBlobEventsDbColumns._ID), new String[] { Long.toString(blobEventId) }); //$NON-NLS-1$
+                    provider.delete(UploadBlobEventsDbColumns.TABLE_NAME, String.format("%s = ?", UploadBlobEventsDbColumns._ID), new String[]{Long.toString(blobEventId)}); //$NON-NLS-1$
 
                     /*
                      * Add the blob to the list of blobs to be deleted
@@ -2155,60 +1888,50 @@ public final class LocalyticsSession
                     blobsToDelete.add(Long.valueOf(blobId));
 
                     // delete all attributes for the event
-                    provider.delete(AttributesDbColumns.TABLE_NAME, String.format("%s = ?", AttributesDbColumns.EVENTS_KEY_REF), new String[] { Long.toString(eventId) }); //$NON-NLS-1$
+                    provider.delete(AttributesDbColumns.TABLE_NAME, String.format("%s = ?", AttributesDbColumns.EVENTS_KEY_REF), new String[]{Long.toString(eventId)}); //$NON-NLS-1$
 
                     /*
                      * Check to see if the event is a close event, indicating that the session is complete and can also be deleted
                      */
                     Cursor eventCursor = null;
-                    try
-                    {
+                    try {
                         eventCursor = provider.query(EventsDbColumns.TABLE_NAME, new String[]
-                            { EventsDbColumns.SESSION_KEY_REF }, String.format("%s = ? AND %s = ?", EventsDbColumns._ID, EventsDbColumns.EVENT_NAME), new String[] //$NON-NLS-1$
-                            {
-                                Long.toString(eventId),
-                                CLOSE_EVENT }, null);
+                                {EventsDbColumns.SESSION_KEY_REF}, String.format("%s = ? AND %s = ?", EventsDbColumns._ID, EventsDbColumns.EVENT_NAME), new String[] //$NON-NLS-1$
+                                {
+                                        Long.toString(eventId),
+                                        CLOSE_EVENT}, null);
 
-                        if (eventCursor.moveToFirst())
-                        {
+                        if (eventCursor.moveToFirst()) {
                             final long sessionId = eventCursor.getLong(eventCursor.getColumnIndexOrThrow(EventsDbColumns.SESSION_KEY_REF));
 
                             provider.delete(EventHistoryDbColumns.TABLE_NAME, String.format("%s = ?", EventHistoryDbColumns.SESSION_KEY_REF), new String[] //$NON-NLS-1$
-                                { Long.toString(sessionId) });
+                                    {Long.toString(sessionId)});
 
                             sessionsToDelete.add(Long.valueOf(eventCursor.getLong(eventCursor.getColumnIndexOrThrow(EventsDbColumns.SESSION_KEY_REF))));
                         }
-                    }
-                    finally
-                    {
-                        if (null != eventCursor)
-                        {
+                    } finally {
+                        if (null != eventCursor) {
                             eventCursor.close();
                         }
                     }
 
                     // delete the event
-                    provider.delete(EventsDbColumns.TABLE_NAME, String.format("%s = ?", EventsDbColumns._ID), new String[] { Long.toString(eventId) }); //$NON-NLS-1$
+                    provider.delete(EventsDbColumns.TABLE_NAME, String.format("%s = ?", EventsDbColumns._ID), new String[]{Long.toString(eventId)}); //$NON-NLS-1$
                 }
-            }
-            finally
-            {
-                if (null != blobEvents)
-                {
+            } finally {
+                if (null != blobEvents) {
                     blobEvents.close();
                 }
             }
 
             // delete blobs
-            for (final long x : blobsToDelete)
-            {
-                provider.delete(UploadBlobsDbColumns.TABLE_NAME, String.format("%s = ?", UploadBlobsDbColumns._ID), new String[] { Long.toString(x) }); //$NON-NLS-1$
+            for (final long x : blobsToDelete) {
+                provider.delete(UploadBlobsDbColumns.TABLE_NAME, String.format("%s = ?", UploadBlobsDbColumns._ID), new String[]{Long.toString(x)}); //$NON-NLS-1$
             }
 
             // delete sessions
-            for (final long x : sessionsToDelete)
-            {
-                provider.delete(SessionsDbColumns.TABLE_NAME, String.format("%s = ?", SessionsDbColumns._ID), new String[] { Long.toString(x) }); //$NON-NLS-1$
+            for (final long x : sessionsToDelete) {
+                provider.delete(SessionsDbColumns.TABLE_NAME, String.format("%s = ?", SessionsDbColumns._ID), new String[]{Long.toString(x)}); //$NON-NLS-1$
             }
 
         }
@@ -2217,19 +1940,17 @@ public final class LocalyticsSession
          * Gets the creation time for an API key.
          *
          * @param provider Localytics database provider. Cannot be null.
-         * @param key Localytics API key. Cannot be null.
+         * @param key      Localytics API key. Cannot be null.
          * @return The time in seconds since the Unix Epoch when the API key entry was created in the database.
          * @throws RuntimeException if the API key entry doesn't exist in the database.
          */
-        /* package */static long getApiKeyCreationTime(final LocalyticsProvider provider, final String key)
-        {
+        /* package */
+        static long getApiKeyCreationTime(final LocalyticsProvider provider, final String key) {
             Cursor cursor = null;
-            try
-            {
-                cursor = provider.query(ApiKeysDbColumns.TABLE_NAME, null, String.format("%s = ?", ApiKeysDbColumns.API_KEY), new String[] { key }, null); //$NON-NLS-1$
+            try {
+                cursor = provider.query(ApiKeysDbColumns.TABLE_NAME, null, String.format("%s = ?", ApiKeysDbColumns.API_KEY), new String[]{key}, null); //$NON-NLS-1$
 
-                if (cursor.moveToFirst())
-                {
+                if (cursor.moveToFirst()) {
                     return Math.round((float) cursor.getLong(cursor.getColumnIndexOrThrow(ApiKeysDbColumns.CREATED_TIME)) / DateUtils.SECOND_IN_MILLIS);
                 }
 
@@ -2237,11 +1958,8 @@ public final class LocalyticsSession
                  * This should never happen
                  */
                 throw new RuntimeException("API key entry couldn't be found"); //$NON-NLS-1$
-            }
-            finally
-            {
-                if (null != cursor)
-                {
+            } finally {
+                if (null != cursor) {
                     cursor.close();
                 }
             }
@@ -2250,21 +1968,19 @@ public final class LocalyticsSession
         /**
          * Helper method to generate the attributes object for a session
          *
-         * @param provider Instance of the Localytics database provider. Cannot be null.
-         * @param apiKey Localytics API key. Cannot be null.
+         * @param provider  Instance of the Localytics database provider. Cannot be null.
+         * @param apiKey    Localytics API key. Cannot be null.
          * @param sessionId The {@link SessionsDbColumns#_ID} of the session.
          * @return a JSONObject representation of the session attributes
          * @throws JSONException if a problem occurred converting the element to JSON.
          */
-        /* package */static JSONObject getAttributesFromSession(final LocalyticsProvider provider, final String apiKey, final long sessionId) throws JSONException
-        {
+        /* package */
+        static JSONObject getAttributesFromSession(final LocalyticsProvider provider, final String apiKey, final long sessionId) throws JSONException {
             Cursor cursor = null;
-            try
-            {
-                cursor = provider.query(SessionsDbColumns.TABLE_NAME, null, String.format("%s = ?", SessionsDbColumns._ID), new String[] { Long.toString(sessionId) }, null); //$NON-NLS-1$
+            try {
+                cursor = provider.query(SessionsDbColumns.TABLE_NAME, null, String.format("%s = ?", SessionsDbColumns._ID), new String[]{Long.toString(sessionId)}, null); //$NON-NLS-1$
 
-                if (cursor.moveToFirst())
-                {
+                if (cursor.moveToFirst()) {
                     final JSONObject result = new JSONObject();
                     result.put(JsonObjects.BlobHeader.Attributes.KEY_CLIENT_APP_VERSION, cursor.getString(cursor.getColumnIndexOrThrow(SessionsDbColumns.APP_VERSION)));
                     result.put(JsonObjects.BlobHeader.Attributes.KEY_DATA_CONNECTION, cursor.getString(cursor.getColumnIndexOrThrow(SessionsDbColumns.NETWORK_TYPE)));
@@ -2291,11 +2007,8 @@ public final class LocalyticsSession
                 }
 
                 throw new RuntimeException("No session exists"); //$NON-NLS-1$
-            }
-            finally
-            {
-                if (null != cursor)
-                {
+            } finally {
+                if (null != cursor) {
                     cursor.close();
                 }
             }
@@ -2303,40 +2016,37 @@ public final class LocalyticsSession
 
         /**
          * Converts an event into a JSON object.
-         * <p>
+         * <p/>
          * There are three types of events: open, close, and application. Open and close events are Localytics events, while
          * application events are generated by the app. The return value of this method will vary based on the type of event that
          * is being converted.
          *
          * @param provider Localytics database instance. Cannot be null.
-         * @param context Application context. Cannot be null.
-         * @param eventId {@link EventsDbColumns#_ID} of the event to convert.
-         * @param blobId {@link UploadBlobEventsDbColumns#_ID} of the upload blob that contains this event.
-         * @param apiKey the Localytics API key. Cannot be null.
+         * @param context  Application context. Cannot be null.
+         * @param eventId  {@link EventsDbColumns#_ID} of the event to convert.
+         * @param blobId   {@link UploadBlobEventsDbColumns#_ID} of the upload blob that contains this event.
+         * @param apiKey   the Localytics API key. Cannot be null.
          * @return JSON representation of the event.
          * @throws JSONException if a problem occurred converting the element to JSON.
          */
-        /* package */static JSONObject convertEventToJson(final LocalyticsProvider provider, final Context context, final long eventId, final long blobId, final String apiKey)
-                                                                                                                                                                               throws JSONException
-        {
+        /* package */
+        static JSONObject convertEventToJson(final LocalyticsProvider provider, final Context context, final long eventId, final long blobId, final String apiKey)
+                throws JSONException {
             final JSONObject result = new JSONObject();
 
             Cursor cursor = null;
 
-            try
-            {
+            try {
                 cursor = provider.query(EventsDbColumns.TABLE_NAME, null, String.format("%s = ?", EventsDbColumns._ID), new String[] //$NON-NLS-1$
-                    { Long.toString(eventId) }, EventsDbColumns._ID);
+                        {Long.toString(eventId)}, EventsDbColumns._ID);
 
-                if (cursor.moveToFirst())
-                {
+                if (cursor.moveToFirst()) {
                     final String eventName = cursor.getString(cursor.getColumnIndexOrThrow(EventsDbColumns.EVENT_NAME));
                     final long sessionId = getSessionIdForEventId(provider, eventId);
                     final String sessionUuid = getSessionUuid(provider, sessionId);
                     final long sessionStartTime = getSessionStartTime(provider, sessionId);
 
-                    if (OPEN_EVENT.equals(eventName))
-                    {
+                    if (OPEN_EVENT.equals(eventName)) {
                         result.put(JsonObjects.SessionOpen.KEY_DATA_TYPE, JsonObjects.SessionOpen.VALUE_DATA_TYPE);
                         result.put(JsonObjects.SessionOpen.KEY_WALL_TIME_SECONDS, Math.round((double) cursor.getLong(cursor.getColumnIndex(EventsDbColumns.WALL_TIME))
                                 / DateUtils.SECOND_IN_MILLIS));
@@ -2346,9 +2056,7 @@ public final class LocalyticsSession
                          * Both the database and the web service use 1-based indexing.
                          */
                         result.put(JsonObjects.SessionOpen.KEY_COUNT, sessionId);
-                    }
-                    else if (CLOSE_EVENT.equals(eventName))
-                    {
+                    } else if (CLOSE_EVENT.equals(eventName)) {
                         result.put(JsonObjects.SessionClose.KEY_DATA_TYPE, JsonObjects.SessionClose.VALUE_DATA_TYPE);
                         result.put(JsonObjects.SessionClose.KEY_EVENT_UUID, cursor.getString(cursor.getColumnIndexOrThrow(EventsDbColumns.UUID)));
                         result.put(JsonObjects.SessionClose.KEY_SESSION_UUID, sessionUuid);
@@ -2360,28 +2068,21 @@ public final class LocalyticsSession
                          * length is a special case, as it depends on the start time embedded in the session table
                          */
                         Cursor sessionCursor = null;
-                        try
-                        {
+                        try {
                             sessionCursor = provider.query(SessionsDbColumns.TABLE_NAME, new String[]
-                                { SessionsDbColumns.SESSION_START_WALL_TIME }, String.format("%s = ?", SessionsDbColumns._ID), new String[] { Long.toString(cursor.getLong(cursor.getColumnIndexOrThrow(EventsDbColumns.SESSION_KEY_REF))) }, null); //$NON-NLS-1$
+                                    {SessionsDbColumns.SESSION_START_WALL_TIME}, String.format("%s = ?", SessionsDbColumns._ID), new String[]{Long.toString(cursor.getLong(cursor.getColumnIndexOrThrow(EventsDbColumns.SESSION_KEY_REF)))}, null); //$NON-NLS-1$
 
-                            if (sessionCursor.moveToFirst())
-                            {
+                            if (sessionCursor.moveToFirst()) {
                                 result.put(JsonObjects.SessionClose.KEY_SESSION_LENGTH_SECONDS, Math.round((double) cursor.getLong(cursor.getColumnIndex(EventsDbColumns.WALL_TIME))
                                         / DateUtils.SECOND_IN_MILLIS)
                                         - Math.round((double) sessionCursor.getLong(sessionCursor.getColumnIndexOrThrow(SessionsDbColumns.SESSION_START_WALL_TIME))
-                                                / DateUtils.SECOND_IN_MILLIS));
-                            }
-                            else
-                            {
+                                        / DateUtils.SECOND_IN_MILLIS));
+                            } else {
                                 // this should never happen
                                 throw new RuntimeException("Session didn't exist"); //$NON-NLS-1$
                             }
-                        }
-                        finally
-                        {
-                            if (null != sessionCursor)
-                            {
+                        } finally {
+                            if (null != sessionCursor) {
                                 sessionCursor.close();
                                 sessionCursor = null;
                             }
@@ -2391,41 +2092,31 @@ public final class LocalyticsSession
                          * The close also contains a special case element for the screens history
                          */
                         Cursor eventHistoryCursor = null;
-                        try
-                        {
+                        try {
                             eventHistoryCursor = provider.query(EventHistoryDbColumns.TABLE_NAME, new String[]
-                                { EventHistoryDbColumns.NAME }, String.format("%s = ? AND %s = ?", EventHistoryDbColumns.SESSION_KEY_REF, EventHistoryDbColumns.TYPE), new String[] { Long.toString(sessionId), Integer.toString(EventHistoryDbColumns.TYPE_SCREEN) }, EventHistoryDbColumns._ID); //$NON-NLS-1$
+                                    {EventHistoryDbColumns.NAME}, String.format("%s = ? AND %s = ?", EventHistoryDbColumns.SESSION_KEY_REF, EventHistoryDbColumns.TYPE), new String[]{Long.toString(sessionId), Integer.toString(EventHistoryDbColumns.TYPE_SCREEN)}, EventHistoryDbColumns._ID); //$NON-NLS-1$
 
                             final JSONArray screens = new JSONArray();
-                            while (eventHistoryCursor.moveToNext())
-                            {
+                            while (eventHistoryCursor.moveToNext()) {
                                 screens.put(eventHistoryCursor.getString(eventHistoryCursor.getColumnIndexOrThrow(EventHistoryDbColumns.NAME)));
                             }
 
-                            if (screens.length() > 0)
-                            {
+                            if (screens.length() > 0) {
                                 result.put(JsonObjects.SessionClose.KEY_FLOW_ARRAY, screens);
                             }
-                        }
-                        finally
-                        {
-                            if (null != eventHistoryCursor)
-                            {
+                        } finally {
+                            if (null != eventHistoryCursor) {
                                 eventHistoryCursor.close();
                                 eventHistoryCursor = null;
                             }
                         }
-                    }
-                    else if (OPT_IN_EVENT.equals(eventName) || OPT_OUT_EVENT.equals(eventName))
-                    {
+                    } else if (OPT_IN_EVENT.equals(eventName) || OPT_OUT_EVENT.equals(eventName)) {
                         result.put(JsonObjects.OptEvent.KEY_DATA_TYPE, JsonObjects.OptEvent.VALUE_DATA_TYPE);
                         result.put(JsonObjects.OptEvent.KEY_API_KEY, apiKey);
                         result.put(JsonObjects.OptEvent.KEY_OPT, OPT_OUT_EVENT.equals(eventName) ? Boolean.TRUE.toString() : Boolean.FALSE.toString());
                         result.put(JsonObjects.OptEvent.KEY_WALL_TIME_SECONDS, Math.round((double) cursor.getLong(cursor.getColumnIndex(EventsDbColumns.WALL_TIME))
                                 / DateUtils.SECOND_IN_MILLIS));
-                    }
-                    else if (FLOW_EVENT.equals(eventName))
-                    {
+                    } else if (FLOW_EVENT.equals(eventName)) {
                         result.put(JsonObjects.EventFlow.KEY_DATA_TYPE, JsonObjects.EventFlow.VALUE_DATA_TYPE);
                         result.put(JsonObjects.EventFlow.KEY_EVENT_UUID, cursor.getString(cursor.getColumnIndexOrThrow(EventsDbColumns.UUID)));
                         result.put(JsonObjects.EventFlow.KEY_SESSION_START_TIME, Math.round((double) sessionStartTime / DateUtils.SECOND_IN_MILLIS));
@@ -2438,53 +2129,40 @@ public final class LocalyticsSession
                          * Default sort order is ascending by _ID, so these will be sorted chronologically.
                          */
                         Cursor eventHistoryCursor = null;
-                        try
-                        {
+                        try {
                             eventHistoryCursor = provider.query(EventHistoryDbColumns.TABLE_NAME, new String[]
-                                {
-                                    EventHistoryDbColumns.TYPE,
-                                    EventHistoryDbColumns.PROCESSED_IN_BLOB,
-                                    EventHistoryDbColumns.NAME }, String.format("%s = ? AND %s <= ?", EventHistoryDbColumns.SESSION_KEY_REF, EventHistoryDbColumns.PROCESSED_IN_BLOB), new String[] { Long.toString(sessionId), Long.toString(blobId) }, EventHistoryDbColumns._ID); //$NON-NLS-1$
+                                    {
+                                            EventHistoryDbColumns.TYPE,
+                                            EventHistoryDbColumns.PROCESSED_IN_BLOB,
+                                            EventHistoryDbColumns.NAME}, String.format("%s = ? AND %s <= ?", EventHistoryDbColumns.SESSION_KEY_REF, EventHistoryDbColumns.PROCESSED_IN_BLOB), new String[]{Long.toString(sessionId), Long.toString(blobId)}, EventHistoryDbColumns._ID); //$NON-NLS-1$
 
                             final JSONArray newScreens = new JSONArray();
                             final JSONArray oldScreens = new JSONArray();
-                            while (eventHistoryCursor.moveToNext())
-                            {
+                            while (eventHistoryCursor.moveToNext()) {
                                 final String name = eventHistoryCursor.getString(eventHistoryCursor.getColumnIndexOrThrow(EventHistoryDbColumns.NAME));
                                 final String type;
-                                if (EventHistoryDbColumns.TYPE_EVENT == eventHistoryCursor.getInt(eventHistoryCursor.getColumnIndexOrThrow(EventHistoryDbColumns.TYPE)))
-                                {
+                                if (EventHistoryDbColumns.TYPE_EVENT == eventHistoryCursor.getInt(eventHistoryCursor.getColumnIndexOrThrow(EventHistoryDbColumns.TYPE))) {
                                     type = JsonObjects.EventFlow.Element.TYPE_EVENT;
-                                }
-                                else
-                                {
+                                } else {
                                     type = JsonObjects.EventFlow.Element.TYPE_SCREEN;
                                 }
 
-                                if (blobId == eventHistoryCursor.getLong(eventHistoryCursor.getColumnIndexOrThrow(EventHistoryDbColumns.PROCESSED_IN_BLOB)))
-                                {
+                                if (blobId == eventHistoryCursor.getLong(eventHistoryCursor.getColumnIndexOrThrow(EventHistoryDbColumns.PROCESSED_IN_BLOB))) {
                                     newScreens.put(new JSONObject().put(type, name));
-                                }
-                                else
-                                {
+                                } else {
                                     oldScreens.put(new JSONObject().put(type, name));
                                 }
                             }
 
                             result.put(JsonObjects.EventFlow.KEY_FLOW_NEW, newScreens);
                             result.put(JsonObjects.EventFlow.KEY_FLOW_OLD, oldScreens);
-                        }
-                        finally
-                        {
-                            if (null != eventHistoryCursor)
-                            {
+                        } finally {
+                            if (null != eventHistoryCursor) {
                                 eventHistoryCursor.close();
                                 eventHistoryCursor = null;
                             }
                         }
-                    }
-                    else
-                    {
+                    } else {
                         /*
                          * This is a normal application event
                          */
@@ -2498,24 +2176,18 @@ public final class LocalyticsSession
 
                         final JSONObject attributes = convertAttributesToJson(provider, eventId);
 
-                        if (null != attributes)
-                        {
+                        if (null != attributes) {
                             result.put(JsonObjects.SessionEvent.KEY_ATTRIBUTES, attributes);
                         }
                     }
-                }
-                else
-                {
+                } else {
                     /*
                      * This should never happen
                      */
                     throw new RuntimeException();
                 }
-            }
-            finally
-            {
-                if (null != cursor)
-                {
+            } finally {
+                if (null != cursor) {
                     cursor.close();
                 }
             }
@@ -2527,19 +2199,17 @@ public final class LocalyticsSession
          * Private helper to get the {@link SessionsDbColumns#_ID} for a given {@link EventsDbColumns#_ID}.
          *
          * @param provider Localytics database instance. Cannot be null.
-         * @param eventId {@link EventsDbColumns#_ID} of the event to look up
+         * @param eventId  {@link EventsDbColumns#_ID} of the event to look up
          * @return The {@link SessionsDbColumns#_ID} of the session that owns the event.
          */
-        /* package */static long getSessionIdForEventId(final LocalyticsProvider provider, final long eventId)
-        {
+        /* package */
+        static long getSessionIdForEventId(final LocalyticsProvider provider, final long eventId) {
             Cursor cursor = null;
-            try
-            {
+            try {
                 cursor = provider.query(EventsDbColumns.TABLE_NAME, new String[]
-                    { EventsDbColumns.SESSION_KEY_REF }, String.format("%s = ?", EventsDbColumns._ID), new String[] { Long.toString(eventId) }, null); //$NON-NLS-1$
+                        {EventsDbColumns.SESSION_KEY_REF}, String.format("%s = ?", EventsDbColumns._ID), new String[]{Long.toString(eventId)}, null); //$NON-NLS-1$
 
-                if (cursor.moveToFirst())
-                {
+                if (cursor.moveToFirst()) {
                     return cursor.getLong(cursor.getColumnIndexOrThrow(EventsDbColumns.SESSION_KEY_REF));
                 }
 
@@ -2547,11 +2217,8 @@ public final class LocalyticsSession
                  * This should never happen
                  */
                 throw new RuntimeException();
-            }
-            finally
-            {
-                if (null != cursor)
-                {
+            } finally {
+                if (null != cursor) {
                     cursor.close();
                 }
             }
@@ -2560,20 +2227,18 @@ public final class LocalyticsSession
         /**
          * Private helper to get the {@link SessionsDbColumns#UUID} for a given {@link SessionsDbColumns#_ID}.
          *
-         * @param provider Localytics database instance. Cannot be null.
+         * @param provider  Localytics database instance. Cannot be null.
          * @param sessionId {@link SessionsDbColumns#_ID} of the event to look up
          * @return The {@link SessionsDbColumns#UUID} of the session.
          */
-        /* package */static String getSessionUuid(final LocalyticsProvider provider, final long sessionId)
-        {
+        /* package */
+        static String getSessionUuid(final LocalyticsProvider provider, final long sessionId) {
             Cursor cursor = null;
-            try
-            {
+            try {
                 cursor = provider.query(SessionsDbColumns.TABLE_NAME, new String[]
-                    { SessionsDbColumns.UUID }, String.format("%s = ?", SessionsDbColumns._ID), new String[] { Long.toString(sessionId) }, null); //$NON-NLS-1$
+                        {SessionsDbColumns.UUID}, String.format("%s = ?", SessionsDbColumns._ID), new String[]{Long.toString(sessionId)}, null); //$NON-NLS-1$
 
-                if (cursor.moveToFirst())
-                {
+                if (cursor.moveToFirst()) {
                     return cursor.getString(cursor.getColumnIndexOrThrow(SessionsDbColumns.UUID));
                 }
 
@@ -2581,11 +2246,8 @@ public final class LocalyticsSession
                  * This should never happen
                  */
                 throw new RuntimeException();
-            }
-            finally
-            {
-                if (null != cursor)
-                {
+            } finally {
+                if (null != cursor) {
                     cursor.close();
                 }
             }
@@ -2594,20 +2256,18 @@ public final class LocalyticsSession
         /**
          * Private helper to get the {@link SessionsDbColumns#SESSION_START_WALL_TIME} for a given {@link SessionsDbColumns#_ID}.
          *
-         * @param provider Localytics database instance. Cannot be null.
+         * @param provider  Localytics database instance. Cannot be null.
          * @param sessionId {@link SessionsDbColumns#_ID} of the event to look up
          * @return The {@link SessionsDbColumns#SESSION_START_WALL_TIME} of the session.
          */
-        /* package */static long getSessionStartTime(final LocalyticsProvider provider, final long sessionId)
-        {
+        /* package */
+        static long getSessionStartTime(final LocalyticsProvider provider, final long sessionId) {
             Cursor cursor = null;
-            try
-            {
+            try {
                 cursor = provider.query(SessionsDbColumns.TABLE_NAME, new String[]
-                    { SessionsDbColumns.SESSION_START_WALL_TIME }, String.format("%s = ?", SessionsDbColumns._ID), new String[] { Long.toString(sessionId) }, null); //$NON-NLS-1$
+                        {SessionsDbColumns.SESSION_START_WALL_TIME}, String.format("%s = ?", SessionsDbColumns._ID), new String[]{Long.toString(sessionId)}, null); //$NON-NLS-1$
 
-                if (cursor.moveToFirst())
-                {
+                if (cursor.moveToFirst()) {
                     return cursor.getLong(cursor.getColumnIndexOrThrow(SessionsDbColumns.SESSION_START_WALL_TIME));
                 }
 
@@ -2615,11 +2275,8 @@ public final class LocalyticsSession
                  * This should never happen
                  */
                 throw new RuntimeException();
-            }
-            finally
-            {
-                if (null != cursor)
-                {
+            } finally {
+                if (null != cursor) {
                     cursor.close();
                 }
             }
@@ -2629,20 +2286,18 @@ public final class LocalyticsSession
          * Private helper to convert an event's attributes into a {@link JSONObject} representation.
          *
          * @param provider Localytics database instance. Cannot be null.
-         * @param eventId {@link EventsDbColumns#_ID} of the event whose attributes are to be loaded.
+         * @param eventId  {@link EventsDbColumns#_ID} of the event whose attributes are to be loaded.
          * @return {@link JSONObject} representing the attributes of the event. The order of attributes is undefined and may
-         *         change from call to call of this method. If the event has no attributes, returns null.
+         * change from call to call of this method. If the event has no attributes, returns null.
          * @throws JSONException if an error occurs converting the attributes to JSON
          */
-        /* package */static JSONObject convertAttributesToJson(final LocalyticsProvider provider, final long eventId) throws JSONException
-        {
+        /* package */
+        static JSONObject convertAttributesToJson(final LocalyticsProvider provider, final long eventId) throws JSONException {
             Cursor cursor = null;
-            try
-            {
-                cursor = provider.query(AttributesDbColumns.TABLE_NAME, null, String.format("%s = ?", AttributesDbColumns.EVENTS_KEY_REF), new String[] { Long.toString(eventId) }, null); //$NON-NLS-1$
+            try {
+                cursor = provider.query(AttributesDbColumns.TABLE_NAME, null, String.format("%s = ?", AttributesDbColumns.EVENTS_KEY_REF), new String[]{Long.toString(eventId)}, null); //$NON-NLS-1$
 
-                if (cursor.getCount() == 0)
-                {
+                if (cursor.getCount() == 0) {
                     return null;
                 }
 
@@ -2650,17 +2305,13 @@ public final class LocalyticsSession
 
                 final int keyColumn = cursor.getColumnIndexOrThrow(AttributesDbColumns.ATTRIBUTE_KEY);
                 final int valueColumn = cursor.getColumnIndexOrThrow(AttributesDbColumns.ATTRIBUTE_VALUE);
-                while (cursor.moveToNext())
-                {
+                while (cursor.moveToNext()) {
                     attributes.put(cursor.getString(keyColumn), cursor.getString(valueColumn));
                 }
 
                 return attributes;
-            }
-            finally
-            {
-                if (null != cursor)
-                {
+            } finally {
+                if (null != cursor) {
                     cursor.close();
                 }
             }
@@ -2672,8 +2323,7 @@ public final class LocalyticsSession
          * @param blobId {@link UploadBlobsDbColumns#_ID} of the upload blob.
          * @return id of the parent session.
          */
-        /* package */long getSessionIdForBlobId(final long blobId)
-        {
+        /* package */long getSessionIdForBlobId(final long blobId) {
             /*
              * This implementation needs to walk up the tree of database elements.
              */
@@ -2681,28 +2331,21 @@ public final class LocalyticsSession
             long eventId;
             {
                 Cursor cursor = null;
-                try
-                {
+                try {
                     cursor = mProvider.query(UploadBlobEventsDbColumns.TABLE_NAME, new String[]
-                        { UploadBlobEventsDbColumns.EVENTS_KEY_REF }, String.format("%s = ?", UploadBlobEventsDbColumns.UPLOAD_BLOBS_KEY_REF), new String[] //$NON-NLS-1$
-                        { Long.toString(blobId) }, null);
+                            {UploadBlobEventsDbColumns.EVENTS_KEY_REF}, String.format("%s = ?", UploadBlobEventsDbColumns.UPLOAD_BLOBS_KEY_REF), new String[] //$NON-NLS-1$
+                            {Long.toString(blobId)}, null);
 
-                    if (cursor.moveToFirst())
-                    {
+                    if (cursor.moveToFirst()) {
                         eventId = cursor.getLong(cursor.getColumnIndexOrThrow(UploadBlobEventsDbColumns.EVENTS_KEY_REF));
-                    }
-                    else
-                    {
+                    } else {
                         /*
                          * This should never happen
                          */
                         throw new RuntimeException("No events associated with blob"); //$NON-NLS-1$
                     }
-                }
-                finally
-                {
-                    if (null != cursor)
-                    {
+                } finally {
+                    if (null != cursor) {
                         cursor.close();
                     }
                 }
@@ -2711,28 +2354,21 @@ public final class LocalyticsSession
             long sessionId;
             {
                 Cursor cursor = null;
-                try
-                {
+                try {
                     cursor = mProvider.query(EventsDbColumns.TABLE_NAME, new String[]
-                        { EventsDbColumns.SESSION_KEY_REF }, String.format("%s = ?", EventsDbColumns._ID), new String[] //$NON-NLS-1$
-                        { Long.toString(eventId) }, null);
+                            {EventsDbColumns.SESSION_KEY_REF}, String.format("%s = ?", EventsDbColumns._ID), new String[] //$NON-NLS-1$
+                            {Long.toString(eventId)}, null);
 
-                    if (cursor.moveToFirst())
-                    {
+                    if (cursor.moveToFirst()) {
                         sessionId = cursor.getLong(cursor.getColumnIndexOrThrow(EventsDbColumns.SESSION_KEY_REF));
-                    }
-                    else
-                    {
+                    } else {
                         /*
                          * This should never happen
                          */
                         throw new RuntimeException("No session associated with event"); //$NON-NLS-1$
                     }
-                }
-                finally
-                {
-                    if (null != cursor)
-                    {
+                } finally {
+                    if (null != cursor) {
                         cursor.close();
                     }
                 }
@@ -2748,14 +2384,12 @@ public final class LocalyticsSession
     /*
      * Once support for Android 1.6 is dropped, using Android's built-in Pair class would be preferable
      */
-    private static final class Pair<F, S>
-    {
+    private static final class Pair<F, S> {
         public final F first;
 
         public final S second;
 
-        public Pair(final F first, final S second)
-        {
+        public Pair(final F first, final S second) {
             this.first = first;
             this.second = second;
         }
diff --git a/astrid/common-src/com/localytics/android/ReflectionUtils.java b/astrid/common-src/com/localytics/android/ReflectionUtils.java
index 202c700ac..ff1a6146a 100644
--- a/astrid/common-src/com/localytics/android/ReflectionUtils.java
+++ b/astrid/common-src/com/localytics/android/ReflectionUtils.java
@@ -9,105 +9,85 @@ import java.lang.reflect.InvocationTargetException;
 
 /**
  * Static utilities for performing reflection against newer Android SDKs.
- * <p>
+ * <p/>
  * This is not a general-purpose reflection class but is rather specifically designed for calling methods that must exist in newer
  * versions of Android.
  */
-public final class ReflectionUtils
-{
+public final class ReflectionUtils {
     /**
      * Private constructor prevents instantiation
      *
      * @throws UnsupportedOperationException because this class cannot be instantiated.
      */
-    private ReflectionUtils()
-    {
+    private ReflectionUtils() {
         throw new UnsupportedOperationException("This class is non-instantiable"); //$NON-NLS-1$
     }
 
     /**
      * Use reflection to invoke a static method for a class object and method name
      *
-     * @param <T> Type that the method should return
+     * @param <T>         Type that the method should return
      * @param classObject Class on which to invoke {@code methodName}. Cannot be null.
-     * @param methodName Name of the method to invoke. Cannot be null.
-     * @param types explicit types for the objects. This is useful if the types are primitives, rather than objects.
-     * @param args arguments for the method. May be null if the method takes no arguments.
+     * @param methodName  Name of the method to invoke. Cannot be null.
+     * @param types       explicit types for the objects. This is useful if the types are primitives, rather than objects.
+     * @param args        arguments for the method. May be null if the method takes no arguments.
      * @return The result of invoking the named method on the given class for the args
      * @throws RuntimeException if the class or method doesn't exist
      */
-    public static <T> T tryInvokeStatic(final Class<?> classObject, final String methodName, final Class<?>[] types, final Object[] args)
-    {
+    public static <T> T tryInvokeStatic(final Class<?> classObject, final String methodName, final Class<?>[] types, final Object[] args) {
         return (T) helper(null, classObject, null, methodName, types, args);
     }
 
     /**
      * Use reflection to invoke a static method for a class object and method name
      *
-     * @param <T> Type that the method should return
-     * @param className Name of the class on which to invoke {@code methodName}. Cannot be null.
+     * @param <T>        Type that the method should return
+     * @param className  Name of the class on which to invoke {@code methodName}. Cannot be null.
      * @param methodName Name of the method to invoke. Cannot be null.
-     * @param types explicit types for the objects. This is useful if the types are primitives, rather than objects.
-     * @param args arguments for the method. May be null if the method takes no arguments.
+     * @param types      explicit types for the objects. This is useful if the types are primitives, rather than objects.
+     * @param args       arguments for the method. May be null if the method takes no arguments.
      * @return The result of invoking the named method on the given class for the args
      * @throws RuntimeException if the class or method doesn't exist
      */
-    public static <T> T tryInvokeStatic(final String className, final String methodName, final Class<?>[] types, final Object[] args)
-    {
+    public static <T> T tryInvokeStatic(final String className, final String methodName, final Class<?>[] types, final Object[] args) {
         return (T) helper(className, null, null, methodName, types, args);
     }
 
     /**
      * Use reflection to invoke a static method for a class object and method name
      *
-     * @param <T> Type that the method should return
-     * @param target Object instance on which to invoke {@code methodName}. Cannot be null.
+     * @param <T>        Type that the method should return
+     * @param target     Object instance on which to invoke {@code methodName}. Cannot be null.
      * @param methodName Name of the method to invoke. Cannot be null.
-     * @param types explicit types for the objects. This is useful if the types are primitives, rather than objects.
-     * @param args arguments for the method. May be null if the method takes no arguments.
+     * @param types      explicit types for the objects. This is useful if the types are primitives, rather than objects.
+     * @param args       arguments for the method. May be null if the method takes no arguments.
      * @return The result of invoking the named method on the given class for the args
      * @throws RuntimeException if the class or method doesn't exist
      */
-    public static <T> T tryInvokeInstance(final Object target, final String methodName, final Class<?>[] types, final Object[] args)
-    {
+    public static <T> T tryInvokeInstance(final Object target, final String methodName, final Class<?>[] types, final Object[] args) {
         return (T) helper(target, null, null, methodName, types, args);
     }
 
     @SuppressWarnings("unchecked")
-    private static <T> T helper(final Object target, final Class<?> classObject, final String className, final String methodName, final Class<?>[] argTypes, final Object[] args)
-    {
-        try
-        {
+    private static <T> T helper(final Object target, final Class<?> classObject, final String className, final String methodName, final Class<?>[] argTypes, final Object[] args) {
+        try {
             Class<?> cls;
-            if (classObject != null)
-            {
+            if (classObject != null) {
                 cls = classObject;
-            }
-            else if (target != null)
-            {
+            } else if (target != null) {
                 cls = target.getClass();
-            }
-            else
-            {
+            } else {
                 cls = Class.forName(className);
             }
 
             return (T) cls.getMethod(methodName, argTypes).invoke(target, args);
-        }
-        catch (final NoSuchMethodException e)
-        {
+        } catch (final NoSuchMethodException e) {
             throw new RuntimeException(e);
-        }
-        catch (final IllegalAccessException e)
-        {
+        } catch (final IllegalAccessException e) {
             throw new RuntimeException(e);
-        }
-        catch (final InvocationTargetException e)
-        {
+        } catch (final InvocationTargetException e) {
             throw new RuntimeException(e);
-        }
-        catch (final ClassNotFoundException e)
-        {
+        } catch (final ClassNotFoundException e) {
             throw new RuntimeException(e);
         }
     }
diff --git a/astrid/common-src/com/mdimension/jchronic/AstridChronic.java b/astrid/common-src/com/mdimension/jchronic/AstridChronic.java
index 42948e5ea..3ef53b0b8 100644
--- a/astrid/common-src/com/mdimension/jchronic/AstridChronic.java
+++ b/astrid/common-src/com/mdimension/jchronic/AstridChronic.java
@@ -5,9 +5,6 @@
  */
 package com.mdimension.jchronic;
 
-import java.util.LinkedList;
-import java.util.List;
-
 import com.mdimension.jchronic.handlers.Handler;
 import com.mdimension.jchronic.numerizer.Numerizer;
 import com.mdimension.jchronic.repeaters.Repeater;
@@ -20,176 +17,178 @@ import com.mdimension.jchronic.tags.TimeZone;
 import com.mdimension.jchronic.utils.Span;
 import com.mdimension.jchronic.utils.Token;
 
+import java.util.LinkedList;
+import java.util.List;
+
 @SuppressWarnings("nls")
 public class AstridChronic {
-  public static final String VERSION = "0.2.3";
-
-  private AstridChronic() {
-    // DO NOTHING
-  }
-
-  public static Span parse(String text) {
-    return AstridChronic.parse(text, new Options());
-  }
-
-  /**
-   * Parses a string containing a natural language date or time. If the parser
-   * can find a date or time, either a Time or Chronic::Span will be returned
-   * (depending on the value of <tt>:guess</tt>). If no date or time can be found,
-   * +nil+ will be returned.
-   *
-   * Options are:
-   *
-   * [<tt>:context</tt>]
-   *     <tt>:past</tt> or <tt>:future</tt> (defaults to <tt>:future</tt>)
-   *
-   *     If your string represents a birthday, you can set <tt>:context</tt> to <tt>:past</tt>
-   *     and if an ambiguous string is given, it will assume it is in the
-   *     past. Specify <tt>:future</tt> or omit to set a future context.
-   *
-   * [<tt>:now</tt>]
-   *     Time (defaults to Time.now)
-   *
-   *     By setting <tt>:now</tt> to a Time, all computations will be based off
-   *     of that time instead of Time.now
-   *
-   * [<tt>:guess</tt>]
-   *     +true+ or +false+ (defaults to +true+)
-   *
-   *     By default, the parser will guess a single point in time for the
-   *     given date or time. If you'd rather have the entire time span returned,
-   *     set <tt>:guess</tt> to +false+ and a Chronic::Span will be returned.
-   *
-   * [<tt>:ambiguous_time_range</tt>]
-   *     Integer or <tt>:none</tt> (defaults to <tt>6</tt> (6am-6pm))
-   *
-   *     If an Integer is given, ambiguous times (like 5:00) will be
-   *     assumed to be within the range of that time in the AM to that time
-   *     in the PM. For example, if you set it to <tt>7</tt>, then the parser will
-   *     look for the time between 7am and 7pm. In the case of 5:00, it would
-   *     assume that means 5:00pm. If <tt>:none</tt> is given, no assumption
-   *     will be made, and the first matching instance of that time will
-   *     be used.
-   */
-  @SuppressWarnings("unchecked")
-  public static Span parse(String text, Options options) {
-    // store now for later =)
-    //_now = options.getNow();
-
-    // put the text into a normal format to ease scanning
-    String normalizedText = AstridChronic.preNormalize(text);
-
-    // get base tokens for each word
-    List<Token> tokens = AstridChronic.baseTokenize(normalizedText);
-
-    try {
-        tokens = Repeater.scan(tokens, options);
-    } catch (Throwable e) {
-        throw new RuntimeException("Failed to scan tokens.", e);
-    }
+    public static final String VERSION = "0.2.3";
 
-    tokens = Grabber.scan(tokens, options);
-    tokens = Pointer.scan(tokens, options);
-    tokens = Scalar.scan(tokens, options);
-    tokens = Ordinal.scan(tokens, options);
-    tokens = Separator.scan(tokens, options);
-    tokens = TimeZone.scan(tokens, options);
-
-    List<Token> taggedTokens = new LinkedList<Token>();
-    for (Token token : tokens) {
-      if (token.isTagged()) {
-        taggedTokens.add(token);
-      }
+    private AstridChronic() {
+        // DO NOTHING
     }
-    tokens = taggedTokens;
 
-    if (options.isDebug()) {
-      System.out.println("Chronic.parse: " + tokens);
+    public static Span parse(String text) {
+        return AstridChronic.parse(text, new Options());
     }
 
-    Span span = Handler.tokensToSpan(tokens, options);
+    /**
+     * Parses a string containing a natural language date or time. If the parser
+     * can find a date or time, either a Time or Chronic::Span will be returned
+     * (depending on the value of <tt>:guess</tt>). If no date or time can be found,
+     * +nil+ will be returned.
+     * <p/>
+     * Options are:
+     * <p/>
+     * [<tt>:context</tt>]
+     * <tt>:past</tt> or <tt>:future</tt> (defaults to <tt>:future</tt>)
+     * <p/>
+     * If your string represents a birthday, you can set <tt>:context</tt> to <tt>:past</tt>
+     * and if an ambiguous string is given, it will assume it is in the
+     * past. Specify <tt>:future</tt> or omit to set a future context.
+     * <p/>
+     * [<tt>:now</tt>]
+     * Time (defaults to Time.now)
+     * <p/>
+     * By setting <tt>:now</tt> to a Time, all computations will be based off
+     * of that time instead of Time.now
+     * <p/>
+     * [<tt>:guess</tt>]
+     * +true+ or +false+ (defaults to +true+)
+     * <p/>
+     * By default, the parser will guess a single point in time for the
+     * given date or time. If you'd rather have the entire time span returned,
+     * set <tt>:guess</tt> to +false+ and a Chronic::Span will be returned.
+     * <p/>
+     * [<tt>:ambiguous_time_range</tt>]
+     * Integer or <tt>:none</tt> (defaults to <tt>6</tt> (6am-6pm))
+     * <p/>
+     * If an Integer is given, ambiguous times (like 5:00) will be
+     * assumed to be within the range of that time in the AM to that time
+     * in the PM. For example, if you set it to <tt>7</tt>, then the parser will
+     * look for the time between 7am and 7pm. In the case of 5:00, it would
+     * assume that means 5:00pm. If <tt>:none</tt> is given, no assumption
+     * will be made, and the first matching instance of that time will
+     * be used.
+     */
+    @SuppressWarnings("unchecked")
+    public static Span parse(String text, Options options) {
+        // store now for later =)
+        //_now = options.getNow();
+
+        // put the text into a normal format to ease scanning
+        String normalizedText = AstridChronic.preNormalize(text);
+
+        // get base tokens for each word
+        List<Token> tokens = AstridChronic.baseTokenize(normalizedText);
+
+        try {
+            tokens = Repeater.scan(tokens, options);
+        } catch (Throwable e) {
+            throw new RuntimeException("Failed to scan tokens.", e);
+        }
+
+        tokens = Grabber.scan(tokens, options);
+        tokens = Pointer.scan(tokens, options);
+        tokens = Scalar.scan(tokens, options);
+        tokens = Ordinal.scan(tokens, options);
+        tokens = Separator.scan(tokens, options);
+        tokens = TimeZone.scan(tokens, options);
+
+        List<Token> taggedTokens = new LinkedList<Token>();
+        for (Token token : tokens) {
+            if (token.isTagged()) {
+                taggedTokens.add(token);
+            }
+        }
+        tokens = taggedTokens;
+
+        if (options.isDebug()) {
+            System.out.println("Chronic.parse: " + tokens);
+        }
+
+        Span span = Handler.tokensToSpan(tokens, options);
+
+        // guess a time within a span if required
+        if (options.isGuess()) {
+            span = guess(span);
+        }
+
+        return span;
+    }
 
-    // guess a time within a span if required
-    if (options.isGuess()) {
-      span = guess(span);
+    /**
+     * Clean up the specified input text by stripping unwanted characters,
+     * converting idioms to their canonical form, converting number words
+     * to numbers (three => 3), and converting ordinal words to numeric
+     * ordinals (third => 3rd)
+     */
+    protected static String preNormalize(String text) {
+        String normalizedText = text.toLowerCase();
+        normalizedText = Chronic.numericizeNumbers(normalizedText);
+        normalizedText = normalizedText.replaceAll("['\"\\.]", "");
+        normalizedText = normalizedText.replaceAll("([/\\-,@])", " $1 ");
+        normalizedText = normalizedText.replaceAll("\\btoday\\b", "this day");
+        normalizedText = normalizedText.replaceAll("\\btomm?orr?ow\\b", "next day");
+        normalizedText = normalizedText.replaceAll("\\byesterday\\b", "last day");
+        normalizedText = normalizedText.replaceAll("\\bnoon\\b", "12:00");
+        normalizedText = normalizedText.replaceAll("\\bmidnight\\b", "24:00");
+        normalizedText = normalizedText.replaceAll("\\bbefore now\\b", "past");
+        normalizedText = normalizedText.replaceAll("\\bnow\\b", "this second");
+        normalizedText = normalizedText.replaceAll("\\b(ago|before)\\b", "past");
+        normalizedText = normalizedText.replaceAll("\\bthis past\\b", "last");
+        normalizedText = normalizedText.replaceAll("\\bthis last\\b", "last");
+        normalizedText = normalizedText.replaceAll("\\b(?:in|during) the (morning)\\b", "$1");
+        normalizedText = normalizedText.replaceAll("\\b(?:in the|during the|at) (afternoon|evening|night)\\b", "$1");
+        normalizedText = normalizedText.replaceAll("\\btonight\\b", "this night");
+        normalizedText = normalizedText.replaceAll("(?=\\w)([ap]m|oclock)\\b", " $1");
+        normalizedText = normalizedText.replaceAll("\\b(hence|after|from)\\b", "future");
+        normalizedText = AstridChronic.numericizeOrdinals(normalizedText);
+        return normalizedText;
     }
 
-    return span;
-  }
-
-  /**
-   * Clean up the specified input text by stripping unwanted characters,
-   * converting idioms to their canonical form, converting number words
-   * to numbers (three => 3), and converting ordinal words to numeric
-   * ordinals (third => 3rd)
-   */
-  protected static String preNormalize(String text) {
-    String normalizedText = text.toLowerCase();
-    normalizedText = Chronic.numericizeNumbers(normalizedText);
-    normalizedText = normalizedText.replaceAll("['\"\\.]", "");
-    normalizedText = normalizedText.replaceAll("([/\\-,@])", " $1 ");
-    normalizedText = normalizedText.replaceAll("\\btoday\\b", "this day");
-    normalizedText = normalizedText.replaceAll("\\btomm?orr?ow\\b", "next day");
-    normalizedText = normalizedText.replaceAll("\\byesterday\\b", "last day");
-    normalizedText = normalizedText.replaceAll("\\bnoon\\b", "12:00");
-    normalizedText = normalizedText.replaceAll("\\bmidnight\\b", "24:00");
-    normalizedText = normalizedText.replaceAll("\\bbefore now\\b", "past");
-    normalizedText = normalizedText.replaceAll("\\bnow\\b", "this second");
-    normalizedText = normalizedText.replaceAll("\\b(ago|before)\\b", "past");
-    normalizedText = normalizedText.replaceAll("\\bthis past\\b", "last");
-    normalizedText = normalizedText.replaceAll("\\bthis last\\b", "last");
-    normalizedText = normalizedText.replaceAll("\\b(?:in|during) the (morning)\\b", "$1");
-    normalizedText = normalizedText.replaceAll("\\b(?:in the|during the|at) (afternoon|evening|night)\\b", "$1");
-    normalizedText = normalizedText.replaceAll("\\btonight\\b", "this night");
-    normalizedText = normalizedText.replaceAll("(?=\\w)([ap]m|oclock)\\b", " $1");
-    normalizedText = normalizedText.replaceAll("\\b(hence|after|from)\\b", "future");
-    normalizedText = AstridChronic.numericizeOrdinals(normalizedText);
-    return normalizedText;
-  }
-
-  /**
-   * Convert number words to numbers (three => 3)
-   */
-  protected static String numericizeNumbers(String text) {
-    return Numerizer.numerize(text);
-  }
-
-  /**
-   * Convert ordinal words to numeric ordinals (third => 3rd)
-   */
-  protected static String numericizeOrdinals(String text) {
-    return text;
-  }
-
-  /**
-   * Split the text on spaces and convert each word into
-   * a Token
-   */
-  protected static List<Token> baseTokenize(String text) {
-    String[] words = text.split(" ");
-    List<Token> tokens = new LinkedList<Token>();
-    for (String word : words) {
-      tokens.add(new Token(word));
+    /**
+     * Convert number words to numbers (three => 3)
+     */
+    protected static String numericizeNumbers(String text) {
+        return Numerizer.numerize(text);
     }
-    return tokens;
-  }
-
-  /**
-   * Guess a specific time within the given span
-   */
-  // DIFF: We return Span instead of Date
-  protected static Span guess(Span span) {
-    if (span == null) {
-      return null;
+
+    /**
+     * Convert ordinal words to numeric ordinals (third => 3rd)
+     */
+    protected static String numericizeOrdinals(String text) {
+        return text;
     }
-    long guessValue;
-    if (span.getWidth() > 1) {
-      guessValue = span.getBegin() + (span.getWidth() / 2);
+
+    /**
+     * Split the text on spaces and convert each word into
+     * a Token
+     */
+    protected static List<Token> baseTokenize(String text) {
+        String[] words = text.split(" ");
+        List<Token> tokens = new LinkedList<Token>();
+        for (String word : words) {
+            tokens.add(new Token(word));
+        }
+        return tokens;
     }
-    else {
-      guessValue = span.getBegin();
+
+    /**
+     * Guess a specific time within the given span
+     */
+    // DIFF: We return Span instead of Date
+    protected static Span guess(Span span) {
+        if (span == null) {
+            return null;
+        }
+        long guessValue;
+        if (span.getWidth() > 1) {
+            guessValue = span.getBegin() + (span.getWidth() / 2);
+        } else {
+            guessValue = span.getBegin();
+        }
+        Span guess = new Span(guessValue, guessValue);
+        return guess;
     }
-    Span guess = new Span(guessValue, guessValue);
-    return guess;
-  }
 }
diff --git a/astrid/common-src/edu/mit/mobile/android/imagecache/DiskCache.java b/astrid/common-src/edu/mit/mobile/android/imagecache/DiskCache.java
index ba53687c5..83e4bfdbe 100644
--- a/astrid/common-src/edu/mit/mobile/android/imagecache/DiskCache.java
+++ b/astrid/common-src/edu/mit/mobile/android/imagecache/DiskCache.java
@@ -17,6 +17,13 @@ package edu.mit.mobile.android.imagecache;
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
+
+import android.os.Build;
+import android.os.StatFs;
+import android.util.Log;
+
+import com.todoroo.astrid.utility.Constants;
+
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileInputStream;
@@ -37,35 +44,26 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import android.os.Build;
-import android.os.StatFs;
-import android.util.Log;
-
-import com.todoroo.astrid.utility.Constants;
-
 /**
  * <p>
  * A simple disk cache.
  * </p>
- *
+ * <p/>
  * <p>
  * By default, the maximum size of the cache is automatically set based on the amount of free space
  * available to the cache. Alternatively, a fixed size can be specified using
  * {@link #setCacheMaxSize(long)}.
  * </p>
- *
+ * <p/>
  * <p>
  * By default, the cache will automatically maintain its size by periodically checking to see if it
  * estimates that a trim is needed and if it is, proceeding to running {@link #trim()} on a worker
  * thread. This feature can be controlled by {@link #setAutoTrimFrequency(int)}.
  * </p>
  *
+ * @param <K> the key to store/retrieve the value
+ * @param <V> the value that will be stored to disk
  * @author <a href="mailto:spomeroy@mit.edu">Steve Pomeroy</a>
- *
- * @param <K>
- *            the key to store/retrieve the value
- * @param <V>
- *            the value that will be stored to disk
  */
 public abstract class DiskCache<K, V> {
     private static final String TAG = "DiskCache";
@@ -126,12 +124,9 @@ public abstract class DiskCache<K, V> {
     /**
      * Creates a new disk cache.
      *
-     * @param cacheBase
-     *            The base directory within which all the cache files will be stored.
-     * @param cachePrefix
-     *            If you want a prefix to the filenames, place one here. Otherwise, pass null.
-     * @param cacheSuffix
-     *            A suffix to the cache filename. Null is also ok here.
+     * @param cacheBase   The base directory within which all the cache files will be stored.
+     * @param cachePrefix If you want a prefix to the filenames, place one here. Otherwise, pass null.
+     * @param cacheSuffix A suffix to the cache filename. Null is also ok here.
      */
     public DiskCache(File cacheBase, String cachePrefix, String cacheSuffix) {
         mCacheBase = cacheBase;
@@ -159,8 +154,7 @@ public abstract class DiskCache<K, V> {
      * size based on the available disk space. This can be explicitly set by passing this
      * {@link #AUTO_MAX_CACHE_SIZE}.
      *
-     * @param maxSize
-     *            maximum size of the cache, in bytes.
+     * @param maxSize maximum size of the cache, in bytes.
      */
     public void setCacheMaxSize(long maxSize) {
         mMaxDiskUsage = maxSize;
@@ -170,9 +164,8 @@ public abstract class DiskCache<K, V> {
      * After this many puts, if it looks like there's a low space condition, {@link #trim()} will
      * automatically be called.
      *
-     * @param autoTrimFrequency
-     *            Set to {@link #AUTO_TRIM_DISABLED} to turn off auto trim. The default is
-     *            {@link #DEFAULT_AUTO_TRIM_FREQUENCY}.
+     * @param autoTrimFrequency Set to {@link #AUTO_TRIM_DISABLED} to turn off auto trim. The default is
+     *                          {@link #DEFAULT_AUTO_TRIM_FREQUENCY}.
      */
     public void setAutoTrimFrequency(int autoTrimFrequency) {
         mAutoTrimFrequency = autoTrimFrequency;
@@ -232,10 +225,8 @@ public abstract class DiskCache<K, V> {
      * Writes the value stored in the cache to disk by calling
      * {@link #toDisk(Object, Object, OutputStream)}.
      *
-     * @param key
-     *            The key to find the value.
-     * @param value
-     *            the data to be written to disk.
+     * @param key   The key to find the value.
+     * @param value the data to be written to disk.
      */
     public final synchronized void put(K key, V value) throws IOException, FileNotFoundException {
         final File saveHere = getFile(key);
@@ -401,7 +392,7 @@ public abstract class DiskCache<K, V> {
      *
      * @param key
      * @return true if the cached item has been removed or was already removed, false if it was not
-     *         able to be removed.
+     * able to be removed.
      */
     public synchronized boolean clear(K key) {
         final File readFrom = getFile(key);
@@ -425,7 +416,7 @@ public abstract class DiskCache<K, V> {
      *
      * @param cacheFile
      * @return true if the cached item has been removed or was already removed, false if it was not
-     *         able to be removed.
+     * able to be removed.
      */
     private synchronized boolean clear(File cacheFile) {
 
@@ -445,11 +436,11 @@ public abstract class DiskCache<K, V> {
 
     /**
      * Clears the cache files from disk.
-     *
+     * <p/>
      * Note: this only clears files that match the given prefix/suffix.
      *
      * @return true if the operation succeeded without error. It is possible that it will fail and
-     *         the cache ends up being partially cleared.
+     * the cache ends up being partially cleared.
      */
     public synchronized boolean clear() {
         boolean success = true;
@@ -499,7 +490,9 @@ public abstract class DiskCache<K, V> {
             return (mCachePrefix != null ? path.startsWith(mCachePrefix) : true)
                     && (mCacheSuffix != null ? path.endsWith(mCacheSuffix) : true);
         }
-    };
+    }
+
+    ;
 
     private final Comparator<File> mLastModifiedOldestFirstComparator = new Comparator<File>() {
 
diff --git a/astrid/common-src/edu/mit/mobile/android/imagecache/DrawableMemCache.java b/astrid/common-src/edu/mit/mobile/android/imagecache/DrawableMemCache.java
index 81e354bc1..695e23d56 100644
--- a/astrid/common-src/edu/mit/mobile/android/imagecache/DrawableMemCache.java
+++ b/astrid/common-src/edu/mit/mobile/android/imagecache/DrawableMemCache.java
@@ -17,6 +17,7 @@ package edu.mit.mobile.android.imagecache;
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
+
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
diff --git a/astrid/common-src/edu/mit/mobile/android/imagecache/ImageCache.java b/astrid/common-src/edu/mit/mobile/android/imagecache/ImageCache.java
index bdceb136a..5884eb0ba 100644
--- a/astrid/common-src/edu/mit/mobile/android/imagecache/ImageCache.java
+++ b/astrid/common-src/edu/mit/mobile/android/imagecache/ImageCache.java
@@ -17,22 +17,22 @@ package edu.mit.mobile.android.imagecache;
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.concurrent.PriorityBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.CompressFormat;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+import android.util.SparseArray;
+import android.widget.ImageView;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -51,28 +51,29 @@ import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
 import org.apache.http.params.CoreConnectionPNames;
 import org.apache.http.params.HttpParams;
 
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.CompressFormat;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-import android.util.SparseArray;
-import android.widget.ImageView;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.concurrent.PriorityBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 /**
  * <p>
  * An image download-and-cacher that also knows how to efficiently generate thumbnails of various
  * sizes.
  * </p>
- *
+ * <p/>
  * <p>
  * The cache is shared with the entire process, so make sure you
  * {@link #registerOnImageLoadListener(OnImageLoadListener)} and
@@ -81,7 +82,6 @@ import android.widget.ImageView;
  * </p>
  *
  * @author <a href="mailto:spomeroy@mit.edu">Steve Pomeroy</a>
- *
  */
 public class ImageCache extends DiskCache<String, Bitmap> {
     private static final String TAG = ImageCache.class.getSimpleName();
@@ -98,7 +98,7 @@ public class ImageCache extends DiskCache<String, Bitmap> {
 
     private final HashSet<OnImageLoadListener> mImageLoadListeners = new HashSet<ImageCache.OnImageLoadListener>();
 
-    public static final int DEFAULT_CACHE_SIZE = (24 /* MiB */* 1024 * 1024); // in bytes
+    public static final int DEFAULT_CACHE_SIZE = (24 /* MiB */ * 1024 * 1024); // in bytes
 
     private DrawableMemCache<String> mMemCache = new DrawableMemCache<String>(DEFAULT_CACHE_SIZE);
 
@@ -143,12 +143,15 @@ public class ImageCache extends DiskCache<String, Bitmap> {
                     mCache.notifyListeners((LoadResult) msg.obj);
                     break;
             }
-        };
+        }
+
+        ;
     }
 
     private final ImageLoadHandler mHandler = new ImageLoadHandler(this);
 
     // TODO make it so this is customizable on the instance level.
+
     /**
      * Gets an instance of the cache.
      *
@@ -207,8 +210,7 @@ public class ImageCache extends DiskCache<String, Bitmap> {
     /**
      * Sets the maximum size of the memory cache. Note, this will clear the memory cache.
      *
-     * @param maxSize
-     *            the maximum size of the memory cache in bytes.
+     * @param maxSize the maximum size of the memory cache in bytes.
      */
     public void setMemCacheMaxSize(int maxSize) {
         mMemCache = new DrawableMemCache<String>(maxSize);
@@ -328,7 +330,7 @@ public class ImageCache extends DiskCache<String, Bitmap> {
      * indirectly by {@link #loadImage(int, Uri, int, int)}, any registered listeners will get
      * called.
      * </p>
-     *
+     * <p/>
      * <p>
      * This should probably be called from {@link Activity#onResume()}.
      * </p>
@@ -343,7 +345,7 @@ public class ImageCache extends DiskCache<String, Bitmap> {
      * <p>
      * Unregisters the listener with the cache. This will not cancel any pending load requests.
      * </p>
-     *
+     * <p/>
      * <p>
      * This should probably be called from {@link Activity#onPause()}.
      * </p>
@@ -367,8 +369,7 @@ public class ImageCache extends DiskCache<String, Bitmap> {
     }
 
     /**
-     * @param uri
-     *            the image uri
+     * @param uri the image uri
      * @return a key unique to the given uri
      */
     public String getKey(Uri uri) {
@@ -378,8 +379,7 @@ public class ImageCache extends DiskCache<String, Bitmap> {
     /**
      * Gets the given key as a drawable, retrieving it from memory cache if it's present.
      *
-     * @param key
-     *            a key generated by {@link #getKey(Uri)} or {@link #getKey(Uri, int, int)}
+     * @param key a key generated by {@link #getKey(Uri)} or {@link #getKey(Uri, int, int)}
      * @return the drawable if it's in the memory cache or null.
      */
     public Drawable getDrawable(String key) {
@@ -398,8 +398,7 @@ public class ImageCache extends DiskCache<String, Bitmap> {
     /**
      * Puts a drawable into memory cache.
      *
-     * @param key
-     *            a key generated by {@link #getKey(Uri)} or {@link #getKey(Uri, int, int)}
+     * @param key      a key generated by {@link #getKey(Uri)} or {@link #getKey(Uri, int, int)}
      * @param drawable
      */
     public void putDrawable(String key, Drawable drawable) {
@@ -477,12 +476,9 @@ public class ImageCache extends DiskCache<String, Bitmap> {
     /**
      * Returns an opaque cache key representing the given uri, width and height.
      *
-     * @param uri
-     *            an image uri
-     * @param width
-     *            the desired image max width
-     * @param height
-     *            the desired image max height
+     * @param uri    an image uri
+     * @param width  the desired image max width
+     * @param height the desired image max height
      * @return a cache key unique to the given parameters
      */
     public String getKey(Uri uri, int width, int height) {
@@ -568,7 +564,9 @@ public class ImageCache extends DiskCache<String, Bitmap> {
         @Override
         public int compareTo(ImageLoadTask another) {
             return Long.valueOf(another.when).compareTo(when);
-        };
+        }
+
+        ;
     }
 
     private void oomClear() {
@@ -580,19 +578,14 @@ public class ImageCache extends DiskCache<String, Bitmap> {
      * Checks the cache for an image matching the given criteria and returns it. If it isn't
      * immediately available, calls {@link #scheduleLoadImage}.
      *
-     * @param id
-     *            An ID to keep track of image load requests. For one-off loads, this can just be
-     *            the ID of the {@link ImageView}. Otherwise, an unique ID can be acquired using
-     *            {@link #getNewID()}.
-     *
-     * @param image
-     *            the image to be loaded. Can be a local file or a network resource.
-     * @param width
-     *            the maximum width of the resulting image
-     * @param height
-     *            the maximum height of the resulting image
+     * @param id     An ID to keep track of image load requests. For one-off loads, this can just be
+     *               the ID of the {@link ImageView}. Otherwise, an unique ID can be acquired using
+     *               {@link #getNewID()}.
+     * @param image  the image to be loaded. Can be a local file or a network resource.
+     * @param width  the maximum width of the resulting image
+     * @param height the maximum height of the resulting image
      * @return the cached bitmap if it's available immediately or null if it needs to be loaded
-     *         asynchronously.
+     * asynchronously.
      */
     public Drawable loadImage(int id, Uri image, int width, int height) throws IOException {
         if (DEBUG) {
@@ -628,17 +621,12 @@ public class ImageCache extends DiskCache<String, Bitmap> {
      * Schedules a load of the given image. When the image has finished loading and scaling, all
      * registered {@link OnImageLoadListener}s will be called.
      *
-     * @param id
-     *            An ID to keep track of image load requests. For one-off loads, this can just be
-     *            the ID of the {@link ImageView}. Otherwise, an unique ID can be acquired using
-     *            {@link #getNewID()}.
-     *
-     * @param image
-     *            the image to be loaded. Can be a local file or a network resource.
-     * @param width
-     *            the maximum width of the resulting image
-     * @param height
-     *            the maximum height of the resulting image
+     * @param id     An ID to keep track of image load requests. For one-off loads, this can just be
+     *               the ID of the {@link ImageView}. Otherwise, an unique ID can be acquired using
+     *               {@link #getNewID()}.
+     * @param image  the image to be loaded. Can be a local file or a network resource.
+     * @param width  the maximum width of the resulting image
+     * @param height the maximum height of the resulting image
      */
     public void scheduleLoadImage(int id, Uri image, int width, int height) {
         if (DEBUG) {
@@ -665,7 +653,6 @@ public class ImageCache extends DiskCache<String, Bitmap> {
 
     /**
      * Cancels all the asynchronous image loads. Note: currently does not function properly.
-     *
      */
     public void cancelLoads() {
         jobs.clear();
@@ -698,12 +685,9 @@ public class ImageCache extends DiskCache<String, Bitmap> {
     /**
      * Blocking call to scale a local file. Scales using preserving aspect ratio
      *
-     * @param localFile
-     *            local image file to be scaled
-     * @param width
-     *            maximum width
-     * @param height
-     *            maximum height
+     * @param localFile local image file to be scaled
+     * @param width     maximum width
+     * @param height    maximum height
      * @return the scaled image
      * @throws ClientProtocolException
      * @throws IOException
@@ -764,11 +748,9 @@ public class ImageCache extends DiskCache<String, Bitmap> {
      * Blocking call to download an image. The image is placed directly into the disk cache at the
      * given key.
      *
-     * @param uri
-     *            the location of the image
+     * @param uri the location of the image
      * @return a decoded bitmap
-     * @throws ClientProtocolException
-     *             if the HTTP response code wasn't 200 or any other HTTP errors
+     * @throws ClientProtocolException if the HTTP response code wasn't 200 or any other HTTP errors
      * @throws IOException
      */
     protected void downloadImage(String key, Uri uri) throws ClientProtocolException, IOException {
@@ -823,19 +805,15 @@ public class ImageCache extends DiskCache<String, Bitmap> {
      * asynchronous image loads have completed.
      *
      * @author <a href="mailto:spomeroy@mit.edu">Steve Pomeroy</a>
-     *
      */
     public interface OnImageLoadListener {
         /**
          * Called when the image has been loaded and scaled.
          *
-         * @param id
-         *            the ID provided by {@link ImageCache#loadImage(int, Uri, int, int)} or
-         *            {@link ImageCache#scheduleLoadImage(int, Uri, int, int)}
-         * @param imageUri
-         *            the uri of the image that was originally requested
-         * @param image
-         *            the loaded and scaled image
+         * @param id       the ID provided by {@link ImageCache#loadImage(int, Uri, int, int)} or
+         *                 {@link ImageCache#scheduleLoadImage(int, Uri, int, int)}
+         * @param imageUri the uri of the image that was originally requested
+         * @param image    the loaded and scaled image
          */
         public void onImageLoaded(int id, Uri imageUri, Drawable image);
     }
diff --git a/astrid/common-src/edu/mit/mobile/android/imagecache/KeyedLock.java b/astrid/common-src/edu/mit/mobile/android/imagecache/KeyedLock.java
index 98a6d82b9..9bb075dd0 100644
--- a/astrid/common-src/edu/mit/mobile/android/imagecache/KeyedLock.java
+++ b/astrid/common-src/edu/mit/mobile/android/imagecache/KeyedLock.java
@@ -1,17 +1,16 @@
 package edu.mit.mobile.android.imagecache;
 
+import android.util.Log;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.locks.ReentrantLock;
 
-import android.util.Log;
-
 /**
  * A synchronization lock that creates a separate lock for each key.
  *
- * @author <a href="mailto:spomeroy@mit.edu">Steve Pomeroy</a>
- *
  * @param <K>
+ * @author <a href="mailto:spomeroy@mit.edu">Steve Pomeroy</a>
  */
 public class KeyedLock<K> {
     private static final String TAG = KeyedLock.class.getSimpleName();
diff --git a/astrid/plugin-src/com/timsu/astrid/GCMIntentService.java b/astrid/plugin-src/com/timsu/astrid/GCMIntentService.java
index f6abe0795..dd562e226 100644
--- a/astrid/plugin-src/com/timsu/astrid/GCMIntentService.java
+++ b/astrid/plugin-src/com/timsu/astrid/GCMIntentService.java
@@ -1,7 +1,5 @@
 package com.timsu.astrid;
 
-import java.io.IOException;
-
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -50,6 +48,8 @@ import com.todoroo.astrid.sync.SyncResultCallbackAdapter;
 import com.todoroo.astrid.tags.TagFilterExposer;
 import com.todoroo.astrid.utility.Constants;
 
+import java.io.IOException;
+
 @SuppressWarnings("nls")
 public class GCMIntentService extends GCMBaseIntentService {
 
@@ -62,13 +62,14 @@ public class GCMIntentService extends GCMBaseIntentService {
     public static final String PREF_C2DM_REGISTRATION = "c2dm_key";
 
     public static String getDeviceID() {
-        String id = Secure.getString(ContextManager.getContext().getContentResolver(), Secure.ANDROID_ID);;
-        if(AndroidUtilities.getSdkVersion() > 8) { //Gingerbread and above
+        String id = Secure.getString(ContextManager.getContext().getContentResolver(), Secure.ANDROID_ID);
+        ;
+        if (AndroidUtilities.getSdkVersion() > 8) { //Gingerbread and above
             //the following uses relection to get android.os.Build.SERIAL to avoid having to build with Gingerbread
             try {
-                if(!Build.UNKNOWN.equals(Build.SERIAL))
+                if (!Build.UNKNOWN.equals(Build.SERIAL))
                     id = Build.SERIAL;
-            } catch(Exception e) {
+            } catch (Exception e) {
                 // Ah well
             }
         }
@@ -119,7 +120,7 @@ public class GCMIntentService extends GCMBaseIntentService {
     @Override
     protected void onMessage(Context context, Intent intent) {
         if (actFmPreferenceService.isLoggedIn()) {
-            if(intent.hasExtra("web_update"))
+            if (intent.hasExtra("web_update"))
                 if (DateUtilities.now() - actFmPreferenceService.getLastSyncDate() > MIN_MILLIS_BETWEEN_FULL_SYNCS && !actFmPreferenceService.isOngoing())
                     new ActFmSyncV2Provider().synchronizeActiveTasks(false, refreshOnlyCallback);
                 else
@@ -129,9 +130,11 @@ public class GCMIntentService extends GCMBaseIntentService {
         }
     }
 
-    /** Handle web task or list changed */
+    /**
+     * Handle web task or list changed
+     */
     protected void handleWebUpdate(Intent intent) {
-        if(intent.hasExtra("tag_id")) {
+        if (intent.hasExtra("tag_id")) {
             String uuid = intent.getStringExtra("tag_id");
             TodorooCursor<TagData> cursor = tagDataService.query(
                     Query.select(TagData.PUSHED_AT).where(TagData.UUID.eq(
@@ -139,7 +142,7 @@ public class GCMIntentService extends GCMBaseIntentService {
             long pushedAt = 0;
             try {
                 TagData tagData = new TagData();
-                if(cursor.getCount() > 0) {
+                if (cursor.getCount() > 0) {
                     cursor.moveToNext();
                     tagData.readFromCursor(cursor);
                     pushedAt = tagData.getValue(TagData.PUSHED_AT);
@@ -148,7 +151,7 @@ public class GCMIntentService extends GCMBaseIntentService {
                 cursor.close();
             }
             ActFmSyncThread.getInstance().enqueueMessage(new BriefMe<TagData>(TagData.class, uuid, pushedAt), ActFmSyncThread.DEFAULT_REFRESH_RUNNABLE);
-        } else if(intent.hasExtra("task_id")) {
+        } else if (intent.hasExtra("task_id")) {
             String uuid = intent.getStringExtra("task_id");
             TodorooCursor<Task> cursor = taskService.query(
                     Query.select(Task.PROPERTIES).where(Task.UUID.eq(
@@ -156,7 +159,7 @@ public class GCMIntentService extends GCMBaseIntentService {
             long pushedAt = 0;
             try {
                 final Task task = new Task();
-                if(cursor.getCount() > 0) {
+                if (cursor.getCount() > 0) {
                     cursor.moveToNext();
                     task.readFromCursor(cursor);
                     pushedAt = task.getValue(Task.PUSHED_AT);
@@ -170,15 +173,17 @@ public class GCMIntentService extends GCMBaseIntentService {
 
     // --- message handling
 
-    /** Handle message. Run on separate thread. */
+    /**
+     * Handle message. Run on separate thread.
+     */
     private void handleMessage(Intent intent) {
         String message = intent.getStringExtra("alert");
         Context context = ContextManager.getContext();
-        if(TextUtils.isEmpty(message))
+        if (TextUtils.isEmpty(message))
             return;
 
         long lastNotification = Preferences.getLong(PREF_LAST_GCM, 0);
-        if(DateUtilities.now() - lastNotification < 5000L)
+        if (DateUtilities.now() - lastNotification < 5000L)
             return;
         Preferences.setLong(PREF_LAST_GCM, DateUtilities.now());
         Intent notifyIntent = null;
@@ -203,10 +208,10 @@ public class GCMIntentService extends GCMBaseIntentService {
 
 
         // fetch data
-        if(intent.hasExtra("tag_id")) {
+        if (intent.hasExtra("tag_id")) {
             notifyIntent = createTagIntent(context, intent);
             notifId = intent.getStringExtra("tag_id").hashCode();
-        } else if(intent.hasExtra("task_id")) {
+        } else if (intent.hasExtra("task_id")) {
             notifyIntent = createTaskIntent(intent);
             notifId = intent.getStringExtra("task_id").hashCode();
         } else {
@@ -228,7 +233,7 @@ public class GCMIntentService extends GCMBaseIntentService {
         Notification notification = new Notification(icon,
                 message, System.currentTimeMillis());
         String title;
-        if(intent.hasExtra("title"))
+        if (intent.hasExtra("title"))
             title = "Astrid: " + intent.getStringExtra("title");
         else
             title = ContextManager.getString(R.string.app_name);
@@ -238,13 +243,13 @@ public class GCMIntentService extends GCMBaseIntentService {
 
         boolean sounds = !"false".equals(intent.getStringExtra("sound"));
         notification.defaults = 0;
-        if(sounds && !Notifications.isQuietHours()) {
+        if (sounds && !Notifications.isQuietHours()) {
             notification.defaults |= Notification.DEFAULT_SOUND;
             notification.defaults |= Notification.DEFAULT_VIBRATE;
         }
         nm.notify(notifId, notification);
 
-        if(intent.hasExtra("tag_id")) {
+        if (intent.hasExtra("tag_id")) {
             Intent broadcastIntent = new Intent(TagViewFragment.BROADCAST_TAG_ACTIVITY);
             broadcastIntent.putExtras(intent);
             ContextManager.getContext().sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);
@@ -252,21 +257,21 @@ public class GCMIntentService extends GCMBaseIntentService {
     }
 
     private int calculateIcon(Intent intent) {
-        if(intent.hasExtra("type")) {
+        if (intent.hasExtra("type")) {
             String type = intent.getStringExtra("type");
-            if("f".equals(type))
+            if ("f".equals(type))
                 return R.drawable.notif_c2dm_done;
-            if("s".equals(type))
+            if ("s".equals(type))
                 return R.drawable.notif_c2dm_assign;
-            if("l".equals(type))
+            if ("l".equals(type))
                 return R.drawable.notif_c2dm_assign;
         } else {
             String message = intent.getStringExtra("alert");
-            if(message.contains(" finished "))
+            if (message.contains(" finished "))
                 return R.drawable.notif_c2dm_done;
-            if(message.contains(" invited you to "))
+            if (message.contains(" invited you to "))
                 return R.drawable.notif_c2dm_assign;
-            if(message.contains(" sent you "))
+            if (message.contains(" sent you "))
                 return R.drawable.notif_c2dm_assign;
         }
         return R.drawable.notif_c2dm_msg;
@@ -280,7 +285,7 @@ public class GCMIntentService extends GCMBaseIntentService {
         long pushedAt = 0;
         try {
             final Task task = new Task();
-            if(cursor.getCount() == 0) {
+            if (cursor.getCount() == 0) {
                 task.setValue(Task.TITLE, intent.getStringExtra("title"));
                 task.setValue(Task.UUID, intent.getStringExtra("task_id"));
                 task.setValue(Task.USER_ID, Task.USER_ID_UNASSIGNED);
@@ -312,7 +317,7 @@ public class GCMIntentService extends GCMBaseIntentService {
         long pushedAt = 0;
         try {
             final TagData tagData = new TagData();
-            if(cursor.getCount() == 0) {
+            if (cursor.getCount() == 0) {
                 tagData.setValue(TagData.NAME, intent.getStringExtra("title"));
                 tagData.setValue(TagData.UUID, intent.getStringExtra("tag_id"));
                 tagData.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
@@ -324,9 +329,9 @@ public class GCMIntentService extends GCMBaseIntentService {
             }
             ActFmSyncThread.getInstance().enqueueMessage(new BriefMe<TagData>(TagData.class, uuid, pushedAt), null);
 
-            FilterWithCustomIntent filter = (FilterWithCustomIntent)TagFilterExposer.filterFromTagData(context, tagData);
+            FilterWithCustomIntent filter = (FilterWithCustomIntent) TagFilterExposer.filterFromTagData(context, tagData);
 
-            if(intent.hasExtra("activity_id")) {
+            if (intent.hasExtra("activity_id")) {
                 UserActivity update = new UserActivity();
                 update.setValue(UserActivity.UUID, intent.getStringExtra("activity_id"));
                 update.setValue(UserActivity.USER_UUID, intent.getStringExtra("user_id"));
@@ -334,7 +339,7 @@ public class GCMIntentService extends GCMBaseIntentService {
                 update.setValue(UserActivity.ACTION, "tag_comment");
                 update.setValue(UserActivity.TARGET_NAME, intent.getStringExtra("title"));
                 String message = intent.getStringExtra("alert");
-                if(message.contains(":"))
+                if (message.contains(":"))
                     message = message.substring(message.indexOf(':') + 2);
                 update.setValue(UserActivity.MESSAGE, message);
                 update.setValue(UserActivity.CREATED_AT, DateUtilities.now());
@@ -359,16 +364,16 @@ public class GCMIntentService extends GCMBaseIntentService {
     }
 
     private boolean shouldLaunchActivity(Intent intent) {
-        if(intent.hasExtra("type")) {
+        if (intent.hasExtra("type")) {
             String type = intent.getStringExtra("type");
-            if("f".equals(type)) return true;
-            if("s".equals(type)) return false;
-            if("l".equals(type)) return false;
+            if ("f".equals(type)) return true;
+            if ("s".equals(type)) return false;
+            if ("l".equals(type)) return false;
         } else {
             String message = intent.getStringExtra("alert");
-            if(message.contains(" finished ")) return true;
-            if(message.contains(" invited you to ")) return false;
-            if(message.contains(" sent you ")) return false;
+            if (message.contains(" finished ")) return true;
+            if (message.contains(" invited you to ")) return false;
+            if (message.contains(" sent you ")) return false;
         }
         return true;
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmBackgroundService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmBackgroundService.java
index 71b36794a..7fdf3d97a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmBackgroundService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmBackgroundService.java
@@ -20,11 +20,11 @@ import com.todoroo.astrid.sync.SyncV2Provider;
  * schedules a repeating alarm which handles the synchronization
  *
  * @author Tim Su
- *
  */
 public class ActFmBackgroundService extends SyncV2BackgroundService {
 
-    @Autowired ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    ActFmPreferenceService actFmPreferenceService;
 
     public ActFmBackgroundService() {
         DependencyInjectionService.getInstance().inject(this);
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmCameraModule.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmCameraModule.java
index 37b7c87ce..cb4416b7b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmCameraModule.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmCameraModule.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.actfm;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -26,6 +22,10 @@ import com.timsu.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+
 public class ActFmCameraModule {
 
     protected static final int REQUEST_CODE_CAMERA = 1;
@@ -44,7 +44,7 @@ public class ActFmCameraModule {
         PackageManager pm = activity.getPackageManager();
 
         final boolean cameraAvailable = pm.queryIntentActivities(cameraIntent, 0).size() > 0;
-        if(cameraAvailable)
+        if (cameraAvailable)
             options.add(activity.getString(R.string.actfm_picture_camera));
         options.add(activity.getString(R.string.actfm_picture_gallery));
 
@@ -58,7 +58,7 @@ public class ActFmCameraModule {
             @SuppressWarnings("nls")
             @Override
             public void onClick(DialogInterface d, int which) {
-                if(which == 0 && cameraAvailable) {
+                if (which == 0 && cameraAvailable) {
                     lastTempFile = getTempFile(activity);
                     Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
                     if (lastTempFile != null) {
@@ -79,8 +79,8 @@ public class ActFmCameraModule {
 
         // show a menu of available options
         new AlertDialog.Builder(activity)
-        .setAdapter(adapter, listener)
-        .show().setOwnerActivity(activity);
+                .setAdapter(adapter, listener)
+                .show().setOwnerActivity(activity);
     }
 
 
@@ -90,7 +90,7 @@ public class ActFmCameraModule {
         final Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
         PackageManager pm = fragment.getActivity().getPackageManager();
         final boolean cameraAvailable = pm.queryIntentActivities(cameraIntent, 0).size() > 0;
-        if(cameraAvailable)
+        if (cameraAvailable)
             options.add(fragment.getString(R.string.actfm_picture_camera));
 
         options.add(fragment.getString(R.string.actfm_picture_gallery));
@@ -105,7 +105,7 @@ public class ActFmCameraModule {
             @SuppressWarnings("nls")
             @Override
             public void onClick(DialogInterface d, int which) {
-                if(which == 0 && cameraAvailable) {
+                if (which == 0 && cameraAvailable) {
                     lastTempFile = getTempFile(fragment.getActivity());
                     if (lastTempFile != null)
                         cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(lastTempFile));
@@ -124,15 +124,15 @@ public class ActFmCameraModule {
 
         // show a menu of available options
         new AlertDialog.Builder(fragment.getActivity())
-        .setAdapter(adapter, listener)
-        .show().setOwnerActivity(fragment.getActivity());
+                .setAdapter(adapter, listener)
+                .show().setOwnerActivity(fragment.getActivity());
     }
 
     @SuppressWarnings("nls")
     private static File getTempFile(Activity activity) {
         try {
             String storageState = Environment.getExternalStorageState();
-            if(storageState.equals(Environment.MEDIA_MOUNTED)) {
+            if (storageState.equals(Environment.MEDIA_MOUNTED)) {
                 String path = Environment.getExternalStorageDirectory().getName() + File.separatorChar + "Android/data/" + activity.getPackageName() + "/files/";
                 File photoFile = File.createTempFile("comment_pic_" + DateUtilities.now(), ".jpg", new File(path));
                 return photoFile;
@@ -148,11 +148,11 @@ public class ActFmCameraModule {
     }
 
     private static Bitmap bitmapFromUri(Activity activity, Uri uri) {
-        String[] projection = { MediaStore.Images.Media.DATA };
+        String[] projection = {MediaStore.Images.Media.DATA};
         Cursor cursor = activity.managedQuery(uri, projection, null, null, null);
         String path;
 
-        if(cursor != null) {
+        if (cursor != null) {
             int column_index = cursor
                     .getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
             cursor.moveToFirst();
@@ -165,28 +165,27 @@ public class ActFmCameraModule {
     }
 
     public static boolean activityResult(Activity activity, int requestCode, int resultCode, Intent data,
-            CameraResultCallback cameraResult) {
-        if(requestCode == ActFmCameraModule.REQUEST_CODE_CAMERA && resultCode == Activity.RESULT_OK) {
+                                         CameraResultCallback cameraResult) {
+        if (requestCode == ActFmCameraModule.REQUEST_CODE_CAMERA && resultCode == Activity.RESULT_OK) {
             Bitmap bitmap;
             if (data == null) { // large from camera
                 if (lastTempFile != null) {
                     bitmap = bitmapFromUri(activity, Uri.fromFile(lastTempFile));
                     lastTempFile.deleteOnExit();
                     lastTempFile = null;
-                }
-                else
+                } else
                     bitmap = null;
             } else
                 bitmap = data.getParcelableExtra("data"); //$NON-NLS-1$
-            if(bitmap != null) {
+            if (bitmap != null) {
                 activity.setResult(Activity.RESULT_OK);
                 cameraResult.handleCameraResult(bitmap);
             }
             return true;
-        } else if(requestCode == ActFmCameraModule.REQUEST_CODE_PICTURE && resultCode == Activity.RESULT_OK) {
+        } else if (requestCode == ActFmCameraModule.REQUEST_CODE_PICTURE && resultCode == Activity.RESULT_OK) {
             Uri uri = data.getData();
             Bitmap bitmap = bitmapFromUri(activity, uri);
-            if(bitmap != null) {
+            if (bitmap != null) {
                 activity.setResult(Activity.RESULT_OK);
                 cameraResult.handleCameraResult(bitmap);
             }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java
index e7a87e4a2..427f4f4f3 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.actfm;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;
@@ -32,12 +28,15 @@ import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.astrid.service.StatisticsService;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;
+
 /**
  * This activity allows users to sign in or log in to Google Tasks
  * through the Android account manager
  *
  * @author Sam Bosley
- *
  */
 public class ActFmGoogleAuthActivity extends ListActivity {
 
@@ -126,7 +125,7 @@ public class ActFmGoogleAuthActivity extends ListActivity {
                                 @Override
                                 public void run() {
                                     int error = e instanceof IOException ? R.string.gtasks_GLA_errorIOAuth :
-                                        R.string.gtasks_GLA_errorAuth;
+                                            R.string.gtasks_GLA_errorAuth;
                                     Toast.makeText(ActFmGoogleAuthActivity.this,
                                             error,
                                             Toast.LENGTH_LONG).show();
@@ -180,7 +179,7 @@ public class ActFmGoogleAuthActivity extends ListActivity {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if(requestCode == REQUEST_AUTHENTICATE && resultCode == RESULT_OK){
+        if (requestCode == REQUEST_AUTHENTICATE && resultCode == RESULT_OK) {
             final ProgressDialog pd = DialogUtilities.progressDialog(this, this.getString(R.string.gtasks_GLA_authenticating));
             pd.show();
             final Account a = accountManager.getAccountByName(accountName);
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
index 195fde17c..3ea766d00 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
@@ -5,15 +5,6 @@
  */
 package com.todoroo.astrid.actfm;
 
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map.Entry;
-import java.util.Random;
-import java.util.Set;
-
-import org.json.JSONObject;
-
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
@@ -115,11 +106,19 @@ import com.todoroo.astrid.subtasks.SubtasksHelper;
 import com.todoroo.astrid.subtasks.SubtasksHelper.TreeRemapHelper;
 import com.todoroo.astrid.tags.TaskToTagMetadata;
 
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map.Entry;
+import java.util.Random;
+import java.util.Set;
+
 /**
  * This activity allows users to sign in or log in to Astrid.com
  *
  * @author Tim Su <tim@astrid.com>
- *
  */
 public class ActFmLoginActivity extends SherlockFragmentActivity {
 
@@ -160,7 +159,8 @@ public class ActFmLoginActivity extends SherlockFragmentActivity {
     private TagMetadataDao tagMetadataDao;
 
 
-    @Autowired protected SyncV2Service syncService;
+    @Autowired
+    protected SyncV2Service syncService;
     private final ActFmInvoker actFmInvoker = new ActFmInvoker();
     private Random rand;
 
@@ -196,7 +196,7 @@ public class ActFmLoginActivity extends SherlockFragmentActivity {
         ContextManager.setContext(this);
 
         setContentView(getContentViewResource());
-        if(getTitleResource() != 0)
+        if (getTitleResource() != 0)
             setTitle(getTitleResource());
 
         if (getSupportActionBar() != null)
@@ -275,14 +275,15 @@ public class ActFmLoginActivity extends SherlockFragmentActivity {
 
 
     protected SpannableString getLinkStringWithCustomInterval(String base, String linkComponent,
-                                                            int start, int endOffset, final OnClickListener listener) {
-        SpannableString link = new SpannableString (String.format("%s %s", //$NON-NLS-1$
+                                                              int start, int endOffset, final OnClickListener listener) {
+        SpannableString link = new SpannableString(String.format("%s %s", //$NON-NLS-1$
                 base, linkComponent));
         ClickableSpan linkSpan = new ClickableSpan() {
             @Override
             public void onClick(View widget) {
                 listener.onClick(widget);
             }
+
             @Override
             public void updateDrawState(TextPaint ds) {
                 ds.setUnderlineText(true);
@@ -297,13 +298,13 @@ public class ActFmLoginActivity extends SherlockFragmentActivity {
     protected void initializeUI() {
         errors = (TextView) findViewById(R.id.error);
         LoginButton loginButton = (LoginButton) findViewById(R.id.fb_login);
-        if(loginButton == null)
+        if (loginButton == null)
             return;
 
         loginButton.setReadPermissions(Arrays.asList("email", "offline_access"));
 
         View googleLogin = findViewById(R.id.gg_login);
-        if(AmazonMarketStrategy.isKindleFire())
+        if (AmazonMarketStrategy.isKindleFire())
             googleLogin.setVisibility(View.GONE);
         googleLogin.setOnClickListener(googleListener);
 
@@ -382,22 +383,22 @@ public class ActFmLoginActivity extends SherlockFragmentActivity {
                     bodyScroll).setIcon(R.drawable.icon_32).setTitle(
                     R.string.actfm_ALA_signup_title).setPositiveButton(
                     android.R.string.ok, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dlg, int which) {
-                            String firstName = firstNameField.getText().toString();
-                            String lastName =lastNameField.getText().toString();
-
-                            AndroidUtilities.hideSoftInputForViews(ActFmLoginActivity.this, firstNameField, lastNameField, email);
-                            authenticate(email.getText().toString(),
-                                    firstName, lastName, ActFmInvoker.PROVIDER_PASSWORD, generateRandomPassword());
-                            StatisticsService.reportEvent(StatisticsConstants.ACTFM_SIGNUP_PW);
-                        }
-                    }).setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dlg, int which) {
-                            AndroidUtilities.hideSoftInputForViews(ActFmLoginActivity.this, firstNameField, lastNameField, email);
-                        }
-                    }).show();
+                @Override
+                public void onClick(DialogInterface dlg, int which) {
+                    String firstName = firstNameField.getText().toString();
+                    String lastName = lastNameField.getText().toString();
+
+                    AndroidUtilities.hideSoftInputForViews(ActFmLoginActivity.this, firstNameField, lastNameField, email);
+                    authenticate(email.getText().toString(),
+                            firstName, lastName, ActFmInvoker.PROVIDER_PASSWORD, generateRandomPassword());
+                    StatisticsService.reportEvent(StatisticsConstants.ACTFM_SIGNUP_PW);
+                }
+            }).setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dlg, int which) {
+                    AndroidUtilities.hideSoftInputForViews(ActFmLoginActivity.this, firstNameField, lastNameField, email);
+                }
+            }).show();
         }
     };
 
@@ -449,20 +450,20 @@ public class ActFmLoginActivity extends SherlockFragmentActivity {
                     bodyScroll).setIcon(R.drawable.icon_32).setTitle(
                     R.string.actfm_ALA_login_title).setPositiveButton(
                     android.R.string.ok, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dlg, int which) {
-                            AndroidUtilities.hideSoftInputForViews(ActFmLoginActivity.this, email, password);
-                            authenticate(email.getText().toString(),
-                                    "", "", ActFmInvoker.PROVIDER_PASSWORD,  //$NON-NLS-1$//$NON-NLS-2$
-                                    password.getText().toString());
-                            StatisticsService.reportEvent(StatisticsConstants.ACTFM_LOGIN_PW);
-                        }
-                    }).setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dlg, int which) {
-                            AndroidUtilities.hideSoftInputForViews(ActFmLoginActivity.this, email, password);
-                        }
-                    }).show();
+                @Override
+                public void onClick(DialogInterface dlg, int which) {
+                    AndroidUtilities.hideSoftInputForViews(ActFmLoginActivity.this, email, password);
+                    authenticate(email.getText().toString(),
+                            "", "", ActFmInvoker.PROVIDER_PASSWORD,  //$NON-NLS-1$//$NON-NLS-2$
+                            password.getText().toString());
+                    StatisticsService.reportEvent(StatisticsConstants.ACTFM_LOGIN_PW);
+                }
+            }).setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dlg, int which) {
+                    AndroidUtilities.hideSoftInputForViews(ActFmLoginActivity.this, email, password);
+                }
+            }).show();
         }
     };
 
@@ -507,9 +508,9 @@ public class ActFmLoginActivity extends SherlockFragmentActivity {
         String oSimilar = "oO0";
         String puncSimilar = ".,";
 
-        boolean match =  (iSimilar.indexOf(last) > 0 && iSimilar.indexOf(check) > 0)
-                        || (oSimilar.indexOf(last) > 0 && oSimilar.indexOf(check) > 0)
-                        || (puncSimilar.indexOf(last) > 0 && puncSimilar.indexOf(check) > 0);
+        boolean match = (iSimilar.indexOf(last) > 0 && iSimilar.indexOf(check) > 0)
+                || (oSimilar.indexOf(last) > 0 && oSimilar.indexOf(check) > 0)
+                || (puncSimilar.indexOf(last) > 0 && puncSimilar.indexOf(check) > 0);
 
         if (match)
             return false;
@@ -541,18 +542,18 @@ public class ActFmLoginActivity extends SherlockFragmentActivity {
     private void facebookSuccess(Session session) {
         progressDialog = DialogUtilities.progressDialog(this,
                 getString(R.string.DLG_please_wait));
-          Request request = Request.newMeRequest(session, new GraphUserCallback() {
-              @Override
-              public void onCompleted(GraphUser user, Response response) {
-                  try {
-                      String email = user.getInnerJSONObject().optString("email"); //$NON-NLS-1$
-                      authenticate(email, user.getFirstName(), user.getLastName(), ActFmInvoker.PROVIDER_FACEBOOK, Session.getActiveSession().getAccessToken());
-                  } catch (Exception e) {
-                      handleError(e);
-                  }
-              }
-          });
-          request.executeAsync();
+        Request request = Request.newMeRequest(session, new GraphUserCallback() {
+            @Override
+            public void onCompleted(GraphUser user, Response response) {
+                try {
+                    String email = user.getInnerJSONObject().optString("email"); //$NON-NLS-1$
+                    authenticate(email, user.getFirstName(), user.getLastName(), ActFmInvoker.PROVIDER_FACEBOOK, Session.getActiveSession().getAccessToken());
+                } catch (Exception e) {
+                    handleError(e);
+                }
+            }
+        });
+        request.executeAsync();
     }
 
     private UiLifecycleHelper uiHelper;
@@ -570,7 +571,7 @@ public class ActFmLoginActivity extends SherlockFragmentActivity {
 
     @SuppressWarnings("nls")
     public void authenticate(final String email, final String firstName, final String lastName, final String provider,
-            final String secret) {
+                             final String secret) {
         if (progressDialog == null)
             progressDialog = DialogUtilities.progressDialog(this,
                     getString(R.string.DLG_please_wait));
@@ -663,7 +664,8 @@ public class ActFmLoginActivity extends SherlockFragmentActivity {
                                     }
                                 }).start();
                             }
-                        });
+                        }
+                );
             } else {
                 finishSignIn(result, token, false);
             }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmPreferences.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmPreferences.java
index 54bf6da23..f9afeeb6b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmPreferences.java
@@ -39,12 +39,13 @@ import com.todoroo.astrid.utility.Constants;
  * initiate actions from the menu.
  *
  * @author timsu
- *
  */
 public class ActFmPreferences extends SyncProviderPreferences {
 
-    @Autowired ActFmPreferenceService actFmPreferenceService;
-    @Autowired GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    GtasksPreferenceService gtasksPreferenceService;
 
     @Override
     public int getPreferenceResource() {
@@ -145,12 +146,11 @@ public class ActFmPreferences extends SyncProviderPreferences {
                 title += email;
             }
             status.setTitle(getString(R.string.actfm_status_title_logged_in, title));
-        }
-        else
+        } else
             status.setTitle(R.string.sync_SPr_group_status);
 
         if (r.getString(R.string.actfm_https_key).equals(preference.getKey())) {
-            if ((Boolean)value)
+            if ((Boolean) value)
                 preference.setSummary(R.string.actfm_https_enabled);
             else
                 preference.setSummary(R.string.actfm_https_disabled);
@@ -174,7 +174,7 @@ public class ActFmPreferences extends SyncProviderPreferences {
                             r.getString(R.string.sync_forget_confirm), new OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog,
-                                int which) {
+                                            int which) {
                             logOut();
                             initializePreference(getPreferenceScreen());
                         }
@@ -182,7 +182,7 @@ public class ActFmPreferences extends SyncProviderPreferences {
                     return true;
                 }
             });
-            if(!loggedIn) {
+            if (!loggedIn) {
                 getPreferenceScreen().removePreference(preference);
             }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmSyncActionExposer.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmSyncActionExposer.java
index 229a42e62..bcbe524f8 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmSyncActionExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmSyncActionExposer.java
@@ -20,11 +20,11 @@ import com.todoroo.astrid.service.AstridDependencyInjector;
 
 /**
  * Exposes sync action
- *
  */
 public class ActFmSyncActionExposer extends BroadcastReceiver {
 
-    @Autowired ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    ActFmPreferenceService actFmPreferenceService;
 
     static {
         AstridDependencyInjector.initialize();
@@ -36,7 +36,7 @@ public class ActFmSyncActionExposer extends BroadcastReceiver {
         DependencyInjectionService.getInstance().inject(this);
 
         // if we aren't logged in, don't expose sync action
-        if(!actFmPreferenceService.isLoggedIn())
+        if (!actFmPreferenceService.isLoggedIn())
             return;
 
         SyncAction syncAction = new SyncAction(context.getString(R.string.actfm_APr_header),
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsActivity.java
index af812cd4d..bcae97ea2 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsActivity.java
@@ -49,10 +49,10 @@ public class CommentsActivity extends AstridActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch(item.getItemId()) {
-        case android.R.id.home:
-            finish();
-            break;
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+                break;
         }
         return super.onOptionsItemSelected(item);
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsFragment.java
index d84650ac1..939fc9200 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsFragment.java
@@ -5,11 +5,6 @@
  */
 package com.todoroo.astrid.actfm;
 
-import java.util.List;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -58,11 +53,16 @@ import com.todoroo.astrid.data.UserActivity;
 import com.todoroo.astrid.helper.AsyncImageView;
 import com.todoroo.astrid.service.StatisticsService;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.util.List;
+
 import edu.mit.mobile.android.imagecache.ImageCache;
 
 public abstract class CommentsFragment extends SherlockListFragment {
 
-//    private TagData tagData;
+    //    private TagData tagData;
     protected UpdateAdapter updateAdapter;
     protected EditText addCommentField;
     protected ViewGroup listHeader;
@@ -84,9 +84,12 @@ public abstract class CommentsFragment extends SherlockListFragment {
     protected Resources resources;
 
 
-    @Autowired ActFmSyncService actFmSyncService;
-    @Autowired ActFmPreferenceService actFmPreferenceService;
-    @Autowired UserActivityDao userActivityDao;
+    @Autowired
+    ActFmSyncService actFmSyncService;
+    @Autowired
+    ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    UserActivityDao userActivityDao;
 
     public CommentsFragment() {
         DependencyInjectionService.getInstance().inject(this);
@@ -95,7 +98,7 @@ public abstract class CommentsFragment extends SherlockListFragment {
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
+                             Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
 
         View v = inflater.inflate(getLayout(), container, false);
@@ -172,7 +175,7 @@ public abstract class CommentsFragment extends SherlockListFragment {
         addCommentField.setOnEditorActionListener(new OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView view, int actionId, KeyEvent event) {
-                if(actionId == EditorInfo.IME_NULL && addCommentField.getText().length() > 0) {
+                if (actionId == EditorInfo.IME_NULL && addCommentField.getText().length() > 0) {
                     addComment();
                     return true;
                 }
@@ -184,10 +187,12 @@ public abstract class CommentsFragment extends SherlockListFragment {
             public void afterTextChanged(Editable s) {
                 commentButton.setVisibility((s.length() > 0) ? View.VISIBLE : View.GONE);
             }
+
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
                 //
             }
+
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 //
@@ -235,7 +240,7 @@ public abstract class CommentsFragment extends SherlockListFragment {
 
         Cursor cursor = null;
         ListView listView = ((ListView) view.findViewById(android.R.id.list));
-        if(updateAdapter == null) {
+        if (updateAdapter == null) {
             cursor = getCursor();
             activity.startManagingCursor(cursor);
             String source = getSourceIdentifier();
@@ -262,11 +267,10 @@ public abstract class CommentsFragment extends SherlockListFragment {
         View activityContainer = view.findViewById(R.id.no_activity_container);
         if (cursor.getCount() == 0) {
             activityContainer.setVisibility(View.VISIBLE);
-            TextView textView = (TextView)activityContainer.findViewById(R.id.no_activity_message);
-            if(actFmPreferenceService.isLoggedIn()) {
+            TextView textView = (TextView) activityContainer.findViewById(R.id.no_activity_message);
+            if (actFmPreferenceService.isLoggedIn()) {
                 textView.setText(activity.getString(R.string.ENA_no_comments));
-            }
-            else {
+            } else {
                 textView.setText(activity.getString(R.string.UpS_no_activity_log_in));
                 activityContainer.setOnClickListener(new OnClickListener() {
 
@@ -278,8 +282,7 @@ public abstract class CommentsFragment extends SherlockListFragment {
                 });
             }
             listView.setVisibility(View.GONE);
-        }
-        else {
+        } else {
             activityContainer.setVisibility(View.GONE);
             listView.setVisibility(View.VISIBLE);
         }
@@ -351,19 +354,19 @@ public abstract class CommentsFragment extends SherlockListFragment {
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if(menu.size() > 0)
+        if (menu.size() > 0)
             return;
 
         MenuItem item;
         boolean showCommentsRefresh = actFmPreferenceService.isLoggedIn();
         if (showCommentsRefresh) {
-        Activity activity = getActivity();
+            Activity activity = getActivity();
             if (activity instanceof TaskListActivity) {
                 TaskListActivity tla = (TaskListActivity) activity;
                 showCommentsRefresh = tla.getTaskEditFragment() == null;
             }
         }
-        if(showCommentsRefresh) {
+        if (showCommentsRefresh) {
             item = menu.add(Menu.NONE, MENU_REFRESH_ID, Menu.NONE,
                     R.string.ENA_refresh_comments);
             item.setIcon(R.drawable.icn_menu_refresh_dark);
@@ -375,13 +378,14 @@ public abstract class CommentsFragment extends SherlockListFragment {
         // handle my own menus
         switch (item.getItemId()) {
 
-        case MENU_REFRESH_ID: {
+            case MENU_REFRESH_ID: {
 
-            refreshActivity(true);
-            return true;
-        }
+                refreshActivity(true);
+                return true;
+            }
 
-        default: return false;
+            default:
+                return false;
         }
     }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
index 1ca214b6a..d4bf272d7 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java
@@ -5,14 +5,6 @@
  */
 package com.todoroo.astrid.actfm;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -74,6 +66,14 @@ import com.todoroo.astrid.ui.PeopleContainer.ParseSharedException;
 import com.todoroo.astrid.ui.PopupControlSet;
 import com.todoroo.astrid.utility.ResourceDrawableCache;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+
 public class EditPeopleControlSet extends PopupControlSet {
 
     public static final String EXTRA_TASK_ID = "task"; //$NON-NLS-1$
@@ -82,21 +82,29 @@ public class EditPeopleControlSet extends PopupControlSet {
 
     private Task task;
 
-    @Autowired ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    ActFmPreferenceService actFmPreferenceService;
 
-    @Autowired ActFmSyncService actFmSyncService;
+    @Autowired
+    ActFmSyncService actFmSyncService;
 
-    @Autowired TaskService taskService;
+    @Autowired
+    TaskService taskService;
 
-    @Autowired UserDao userDao;
+    @Autowired
+    UserDao userDao;
 
-    @Autowired MetadataService metadataService;
+    @Autowired
+    MetadataService metadataService;
 
-    @Autowired ExceptionService exceptionService;
+    @Autowired
+    ExceptionService exceptionService;
 
-    @Autowired TagDataService tagDataService;
+    @Autowired
+    TagDataService tagDataService;
 
-    @Autowired ABChooser abChooser;
+    @Autowired
+    ABChooser abChooser;
 
     private final Fragment fragment;
 
@@ -174,7 +182,7 @@ public class EditPeopleControlSet extends PopupControlSet {
                 TodorooCursor<TagData> tags = TagService.getInstance().getTagDataForTask(task.getId(), TagData.NAME, TagData.MEMBER_COUNT, TagData.MEMBERS, TagData.USER);
                 try {
                     TagData tagData = new TagData();
-                    for(tags.moveToFirst(); !tags.isAfterLast(); tags.moveToNext()) {
+                    for (tags.moveToFirst(); !tags.isAfterLast(); tags.moveToNext()) {
                         tagData.readFromCursor(tags);
                         addMembersFromTagData(tagData, sharedPeople);
                     }
@@ -199,7 +207,7 @@ public class EditPeopleControlSet extends PopupControlSet {
                 JSONObject user = members.getJSONObject(i);
                 sharedPeople.add(user);
             }
-            if(!TextUtils.isEmpty(tagData.getValue(TagData.USER))) {
+            if (!TextUtils.isEmpty(tagData.getValue(TagData.USER))) {
                 JSONObject user = new JSONObject(tagData.getValue(TagData.USER));
                 sharedPeople.add(user);
             }
@@ -256,7 +264,7 @@ public class EditPeopleControlSet extends PopupControlSet {
             coreUsersJson.add(myself);
 
             boolean hasTags = t.getTransitory("tags") != null &&
-                    ((HashSet<String>)t.getTransitory("tags")).size() > 0;
+                    ((HashSet<String>) t.getTransitory("tags")).size() > 0;
             boolean addUnassigned = actFmPreferenceService.isLoggedIn() && hasTags;
             if (addUnassigned) {
                 JSONObject unassigned = new JSONObject();
@@ -265,7 +273,7 @@ public class EditPeopleControlSet extends PopupControlSet {
                 coreUsersJson.add(unassigned);
             }
 
-            if(Task.isRealUserId(t.getValue(Task.USER_ID))) {
+            if (Task.isRealUserId(t.getValue(Task.USER_ID))) {
                 try {
                     JSONObject user = new JSONObject(t.getValue(Task.USER));
                     coreUsersJson.add(0, user);
@@ -292,7 +300,7 @@ public class EditPeopleControlSet extends PopupControlSet {
 
             contactPickerUser = new AssignedToUser(activity.getString(R.string.actfm_EPA_choose_contact),
                     new JSONObject().put("default_picture", R.drawable.icn_friends)
-                    .put(CONTACT_CHOOSER_USER, true));
+                            .put(CONTACT_CHOOSER_USER, true));
             int contactsIndex = addUnassigned ? 2 : 1;
             boolean addContactPicker = Preferences.getBoolean(R.string.p_use_contact_picker, true) && contactPickerAvailable();
             if (addContactPicker)
@@ -354,19 +362,19 @@ public class EditPeopleControlSet extends PopupControlSet {
 
     @SuppressWarnings("nls")
     private ArrayList<AssignedToUser> convertJsonUsersToAssignedUsers(ArrayList<JSONObject> jsonUsers,
-            HashSet<String> userIds, HashSet<String> emails, HashMap<String, AssignedToUser> names) {
+                                                                      HashSet<String> userIds, HashSet<String> emails, HashMap<String, AssignedToUser> names) {
         ArrayList<AssignedToUser> users = new ArrayList<AssignedToUser>();
-        for(int i = 0; i < jsonUsers.size(); i++) {
+        for (int i = 0; i < jsonUsers.size(); i++) {
             JSONObject person = jsonUsers.get(i);
-            if(person == null)
+            if (person == null)
                 continue;
             String id = getLongOrStringId(person, Task.USER_ID_EMAIL);
-            if(ActFmPreferenceService.userId().equals(id) || ((Task.USER_ID_UNASSIGNED.equals(id) || Task.isRealUserId(id)) && userIds.contains(id)))
+            if (ActFmPreferenceService.userId().equals(id) || ((Task.USER_ID_UNASSIGNED.equals(id) || Task.isRealUserId(id)) && userIds.contains(id)))
                 continue;
             userIds.add(id);
 
             String email = person.optString("email");
-            if(!TextUtils.isEmpty(email) && emails.contains(email))
+            if (!TextUtils.isEmpty(email) && emails.contains(email))
                 continue;
             emails.add(email);
 
@@ -378,16 +386,16 @@ public class EditPeopleControlSet extends PopupControlSet {
 
             AssignedToUser atu = new AssignedToUser(name, person);
             users.add(atu);
-            if(names.containsKey(name)) {
+            if (names.containsKey(name)) {
                 AssignedToUser user = names.get(name);
-                if(user != null && user.user.has("email")) {
+                if (user != null && user.user.has("email")) {
                     user.label += " (" + user.user.optString("email") + ")";
                     names.put(name, null);
                 }
-                if(!TextUtils.isEmpty(email))
+                if (!TextUtils.isEmpty(email))
                     atu.label += " (" + email + ")";
-            } else if(TextUtils.isEmpty(name) || "null".equals(name)) {
-                if(!TextUtils.isEmpty(email))
+            } else if (TextUtils.isEmpty(name) || "null".equals(name)) {
+                if (!TextUtils.isEmpty(email))
                     atu.label = email;
                 else
                     users.remove(atu);
@@ -470,12 +478,11 @@ public class EditPeopleControlSet extends PopupControlSet {
     }
 
 
-
     private class AssignedUserAdapter extends ArrayAdapter<AssignedToUser> {
 
         private final int positionOffset;
 
-        public AssignedUserAdapter(Context context, ArrayList<AssignedToUser> people, int positionOffset)  {
+        public AssignedUserAdapter(Context context, ArrayList<AssignedToUser> people, int positionOffset) {
             super(context, R.layout.assigned_adapter_row, people);
             this.positionOffset = positionOffset;
         }
@@ -483,7 +490,7 @@ public class EditPeopleControlSet extends PopupControlSet {
         @SuppressWarnings("nls")
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
-            if(convertView == null)
+            if (convertView == null)
                 convertView = activity.getLayoutInflater().inflate(R.layout.assigned_adapter_row, parent, false);
             CheckedTextView ctv = (CheckedTextView) convertView.findViewById(android.R.id.text1);
             super.getView(position, ctv, parent);
@@ -514,7 +521,7 @@ public class EditPeopleControlSet extends PopupControlSet {
         assignedList.setOnItemClickListener(new OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> arg0, View arg1, int position,
-                    long id) {
+                                    long id) {
                 AssignedToUser user = (AssignedToUser) assignedList.getAdapter().getItem(position);
 
                 if (user.user.has(CONTACT_CHOOSER_USER)) {
@@ -597,19 +604,20 @@ public class EditPeopleControlSet extends PopupControlSet {
 
     /**
      * Save sharing settings
+     *
      * @param toast toast to show after saving is finished
      * @return false if login is required & save should be halted
      */
     @SuppressWarnings("nls")
     public boolean saveSharingSettings(String toast) {
-        if(task == null)
+        if (task == null)
             return false;
 
         boolean dirty = false;
         try {
             JSONObject userJson = null;
             TextView assignedView = null;
-            if(!TextUtils.isEmpty(assignedCustom.getText())) {
+            if (!TextUtils.isEmpty(assignedCustom.getText())) {
                 userJson = PeopleContainer.createUserJson(assignedCustom);
                 assignedView = assignedCustom;
             } else {
@@ -631,12 +639,12 @@ public class EditPeopleControlSet extends PopupControlSet {
                             activity.getString(R.string.actfm_EPA_invalid_email, userJson.optString("email")));
             }
 
-            if(userJson == null || Task.USER_ID_SELF.equals(getLongOrStringId(userJson, Task.USER_ID_EMAIL))) {
+            if (userJson == null || Task.USER_ID_SELF.equals(getLongOrStringId(userJson, Task.USER_ID_EMAIL))) {
                 dirty = Task.USER_ID_SELF.equals(task.getValue(Task.USER_ID)) ? dirty : true;
                 task.setValue(Task.USER_ID, Task.USER_ID_SELF);
                 task.setValue(Task.USER, "");
                 assignedToMe = true;
-            } else if(Task.USER_ID_UNASSIGNED.equals(getLongOrStringId(userJson, Task.USER_ID_SELF))) {
+            } else if (Task.USER_ID_UNASSIGNED.equals(getLongOrStringId(userJson, Task.USER_ID_SELF))) {
                 dirty = Task.USER_ID_UNASSIGNED.equals(task.getValue(Task.USER_ID)) ? dirty : true;
                 task.setValue(Task.USER_ID, Task.USER_ID_UNASSIGNED);
                 task.setValue(Task.USER, "");
@@ -645,7 +653,7 @@ public class EditPeopleControlSet extends PopupControlSet {
                 String taskUserEmail = "";
                 try {
                     @SuppressWarnings("deprecation") // For backwards compatibility
-                    JSONObject taskUser = new JSONObject(task.getValue(Task.USER));
+                            JSONObject taskUser = new JSONObject(task.getValue(Task.USER));
                     taskUserId = getLongOrStringId(taskUser, Task.USER_ID_EMAIL);
                     taskUserEmail = taskUser.optString("email");
                 } catch (JSONException e) {
@@ -668,7 +676,7 @@ public class EditPeopleControlSet extends PopupControlSet {
                 task.setValue(Task.USER, "");
             }
 
-            if(dirty && !actFmPreferenceService.isLoggedIn()) {
+            if (dirty && !actFmPreferenceService.isLoggedIn()) {
                 DialogInterface.OnClickListener okListener = new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface d, int which) {
@@ -701,7 +709,7 @@ public class EditPeopleControlSet extends PopupControlSet {
 
             return true;
         } catch (ParseSharedException e) {
-            if(e.view != null) {
+            if (e.view != null) {
                 e.view.setTextColor(Color.RED);
                 e.view.requestFocus();
             }
@@ -716,6 +724,7 @@ public class EditPeopleControlSet extends PopupControlSet {
 
     /**
      * Warning - only valid after a call to saveSharingSettings
+     *
      * @return
      */
     public boolean isAssignedToMe() {
@@ -727,7 +736,7 @@ public class EditPeopleControlSet extends PopupControlSet {
      */
     public boolean willBeAssignedToMe() {
         JSONObject userJson = null;
-        if(!TextUtils.isEmpty(assignedCustom.getText())) {
+        if (!TextUtils.isEmpty(assignedCustom.getText())) {
             userJson = PeopleContainer.createUserJson(assignedCustom);
         } else {
             if (!hasLoadedUI() || assignedList.getCheckedItemPosition() == ListView.INVALID_POSITION) {
@@ -741,7 +750,7 @@ public class EditPeopleControlSet extends PopupControlSet {
                 userJson = item.user;
         }
 
-        if(userJson == null || Task.USER_ID_SELF.equals(getLongOrStringId(userJson, Task.USER_ID_EMAIL))) {
+        if (userJson == null || Task.USER_ID_SELF.equals(getLongOrStringId(userJson, Task.USER_ID_EMAIL))) {
             return true;
         }
 
@@ -752,10 +761,13 @@ public class EditPeopleControlSet extends PopupControlSet {
         return assignedDisplay.getText().toString();
     }
 
-    /** Resume save
-     * @param data */
+    /**
+     * Resume save
+     *
+     * @param data
+     */
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if(requestCode == loginRequestCode && resultCode == Activity.RESULT_OK) {
+        if (requestCode == loginRequestCode && resultCode == Activity.RESULT_OK) {
             // clear user values & reset them to trigger a save
             task.clearValue(Task.USER_ID);
             task.clearValue(Task.USER);
@@ -764,8 +776,8 @@ public class EditPeopleControlSet extends PopupControlSet {
         } else if (requestCode == TaskEditFragment.REQUEST_CODE_CONTACT && resultCode == Activity.RESULT_OK) {
             Uri contactData = data.getData();
             String contactId = contactData.getLastPathSegment();
-            String[] args = { contactId };
-            String[] projection = { ContactsContract.CommonDataKinds.Email.DATA };
+            String[] args = {contactId};
+            String[] projection = {ContactsContract.CommonDataKinds.Email.DATA};
             String selection = ContactsContract.CommonDataKinds.Email.CONTACT_ID + " = ?"; //$NON-NLS-1$
             Cursor emailCursor = activity.managedQuery(ContactsContract.CommonDataKinds.Email.CONTENT_URI, projection, selection, args, null);
             if (emailCursor.getCount() > 0) {
@@ -773,7 +785,7 @@ public class EditPeopleControlSet extends PopupControlSet {
                 int emailIndex = emailCursor.getColumnIndex(ContactsContract.CommonDataKinds.Email.DATA);
                 String email = emailCursor.getString(emailIndex);
                 if (!TextUtils.isEmpty(email)) {
-                    String[] nameProjection = { ContactsContract.Contacts.DISPLAY_NAME };
+                    String[] nameProjection = {ContactsContract.Contacts.DISPLAY_NAME};
                     Cursor nameCursor = activity.managedQuery(contactData, nameProjection, null, null, null);
                     if (nameCursor.getCount() > 0) {
                         nameCursor.moveToFirst();
@@ -851,7 +863,7 @@ public class EditPeopleControlSet extends PopupControlSet {
     protected void additionalDialogSetup() {
         super.additionalDialogSetup();
         dialog.getWindow()
-            .setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN
-                    | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+                .setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN
+                        | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
     }
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagCommentsFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagCommentsFragment.java
index a6dd77a6c..5ed009453 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagCommentsFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagCommentsFragment.java
@@ -129,8 +129,7 @@ public class TagCommentsFragment extends CommentsFragment {
         if (!TextUtils.isEmpty(description)) {
             descriptionTitle.setText(description);
             descriptionTitle.setVisibility(View.VISIBLE);
-        }
-        else {
+        } else {
             descriptionTitle.setVisibility(View.GONE);
         }
 
@@ -175,7 +174,7 @@ public class TagCommentsFragment extends CommentsFragment {
 
     @Override
     protected void setLastViewed() {
-        if(tagData != null && RemoteModel.isValidUuid(tagData.getValue(TagData.UUID))) {
+        if (tagData != null && RemoteModel.isValidUuid(tagData.getValue(TagData.UUID))) {
             Preferences.setLong(UPDATES_LAST_VIEWED + tagData.getValue(TagData.UUID), DateUtilities.now());
             Activity activity = getActivity();
             if (activity instanceof TaskListActivity)
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
index bc76afd39..cc9ffe0e4 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.actfm;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -72,6 +68,10 @@ import com.todoroo.astrid.utility.AstridPreferences;
 import com.todoroo.astrid.utility.ResourceDrawableCache;
 import com.todoroo.astrid.welcome.HelpInfoPopover;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import edu.mit.mobile.android.imagecache.ImageCache;
 
 public class TagSettingsActivity extends SherlockFragmentActivity {
@@ -92,19 +92,26 @@ public class TagSettingsActivity extends SherlockFragmentActivity {
     private TagData tagData;
     private Filter filter; // Used for creating shortcuts, only initialized if necessary
 
-    @Autowired TagService tagService;
+    @Autowired
+    TagService tagService;
 
-    @Autowired TagDataService tagDataService;
+    @Autowired
+    TagDataService tagDataService;
 
-    @Autowired ActFmSyncService actFmSyncService;
+    @Autowired
+    ActFmSyncService actFmSyncService;
 
-    @Autowired ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    ActFmPreferenceService actFmPreferenceService;
 
-    @Autowired ExceptionService exceptionService;
+    @Autowired
+    ExceptionService exceptionService;
 
-    @Autowired UserDao userDao;
+    @Autowired
+    UserDao userDao;
 
-    @Autowired TagMetadataDao tagMetadataDao;
+    @Autowired
+    TagMetadataDao tagMetadataDao;
 
     private PeopleContainer tagMembers;
     private AsyncImageView picture;
@@ -158,7 +165,7 @@ public class TagSettingsActivity extends SherlockFragmentActivity {
 
         setUpSettingsPage();
 
-        if(savedInstanceState != null && savedInstanceState.containsKey(MEMBERS_IN_PROGRESS)) {
+        if (savedInstanceState != null && savedInstanceState.containsKey(MEMBERS_IN_PROGRESS)) {
             final String members = savedInstanceState.getString(MEMBERS_IN_PROGRESS);
             new Thread(new Runnable() {
                 @Override
@@ -239,11 +246,10 @@ public class TagSettingsActivity extends SherlockFragmentActivity {
         });
         if (isNewTag) {
             leaveListButton.setVisibility(View.GONE);
-        }
-        else if (tagData.getValue(TagData.MEMBER_COUNT) > 0) {
+        } else if (tagData.getValue(TagData.MEMBER_COUNT) > 0) {
             leaveListButton.setText(getString(R.string.tag_leave_button));
         }
-        if(actFmPreferenceService.isLoggedIn()) {
+        if (actFmPreferenceService.isLoggedIn()) {
             findViewById(R.id.tag_silenced_container).setVisibility(View.VISIBLE);
         }
 
@@ -329,7 +335,7 @@ public class TagSettingsActivity extends SherlockFragmentActivity {
             exceptionService.displayAndReportError(this, "save-people", e);
             return;
         } catch (ParseSharedException e) {
-            if(e.view != null) {
+            if (e.view != null) {
                 e.view.setTextColor(Color.RED);
                 e.view.requestFocus();
             }
@@ -339,8 +345,8 @@ public class TagSettingsActivity extends SherlockFragmentActivity {
         if (members == null)
             members = new JSONArray();
 
-        if(members.length() > 0 && !actFmPreferenceService.isLoggedIn()) {
-            if(newName.length() > 0 && oldName.length() == 0) {
+        if (members.length() > 0 && !actFmPreferenceService.isLoggedIn()) {
+            if (newName.length() > 0 && oldName.length() == 0) {
                 tagDataService.save(tagData);
             }
 
@@ -376,7 +382,7 @@ public class TagSettingsActivity extends SherlockFragmentActivity {
         tagData.setValue(TagData.MEMBER_COUNT, members.length());
         tagData.setFlag(TagData.FLAGS, TagData.FLAG_SILENT, isSilent.isChecked());
 
-        InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
         imm.hideSoftInputFromWindow(tagName.getWindowToken(), 0);
 
         tagDataService.save(tagData);
@@ -399,8 +405,7 @@ public class TagSettingsActivity extends SherlockFragmentActivity {
             String tagPicture = RemoteModel.PictureHelper.getPictureHash(tagData);
             imageCache.put(tagPicture, bitmap);
             tagData.setValue(TagData.PICTURE, tagPicture);
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -537,7 +542,7 @@ public class TagSettingsActivity extends SherlockFragmentActivity {
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        if(tagMembers.getChildCount() > 1) {
+        if (tagMembers.getChildCount() > 1) {
             JSONArray members = tagMembers.toJSONArray();
             outState.putString(MEMBERS_IN_PROGRESS, members.toString());
         }
@@ -555,7 +560,7 @@ public class TagSettingsActivity extends SherlockFragmentActivity {
         };
         if (ActFmCameraModule.activityResult(this, requestCode, resultCode, data, callback)) {
             // Handled
-        } else if(requestCode == REQUEST_ACTFM_LOGIN && resultCode == Activity.RESULT_OK) {
+        } else if (requestCode == REQUEST_ACTFM_LOGIN && resultCode == Activity.RESULT_OK) {
             saveSettings();
         } else {
             super.onActivityResult(requestCode, resultCode, data);
@@ -590,24 +595,24 @@ public class TagSettingsActivity extends SherlockFragmentActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch(item.getItemId()) {
-        case MENU_DISCARD_ID:
-            finish();
-            break;
-        case MENU_SAVE_ID:
-            saveSettings();
-            break;
-        case android.R.id.home:
-            saveSettings();
-            if (!isFinishing())
+        switch (item.getItemId()) {
+            case MENU_DISCARD_ID:
                 finish();
-            break;
+                break;
+            case MENU_SAVE_ID:
+                saveSettings();
+                break;
+            case android.R.id.home:
+                saveSettings();
+                if (!isFinishing())
+                    finish();
+                break;
         }
         return super.onOptionsItemSelected(item);
     }
 
     protected void showDeleteDialog(TagData td) {
-        if(td == null)
+        if (td == null)
             return;
 
         int string;
@@ -620,11 +625,11 @@ public class TagSettingsActivity extends SherlockFragmentActivity {
         DialogUtilities.okCancelDialog(this, getString(string, td.getValue(TagData.NAME)),
                 new DialogInterface.OnClickListener() {
 
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                deleteTag();
-            }
-        }, null );
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        deleteTag();
+                    }
+                }, null);
     }
 
     protected void deleteTag() {
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
index 254b2871c..25e3157d2 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
@@ -5,13 +5,6 @@
  */
 package com.todoroo.astrid.actfm;
 
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -90,6 +83,13 @@ import com.todoroo.astrid.utility.Flags;
 import com.todoroo.astrid.utility.ResourceDrawableCache;
 import com.todoroo.astrid.welcome.HelpInfoPopover;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 public class TagViewFragment extends TaskListFragment {
 
     public static final String BROADCAST_TAG_ACTIVITY = AstridApiConstants.API_PACKAGE + ".TAG_ACTIVITY"; //$NON-NLS-1$
@@ -112,25 +112,35 @@ public class TagViewFragment extends TaskListFragment {
 
     protected TagData tagData;
 
-    @Autowired TagDataService tagDataService;
+    @Autowired
+    TagDataService tagDataService;
 
-    @Autowired TagService tagService;
+    @Autowired
+    TagService tagService;
 
-    @Autowired TagDataDao tagDataDao;
+    @Autowired
+    TagDataDao tagDataDao;
 
-    @Autowired ActFmSyncService actFmSyncService;
+    @Autowired
+    ActFmSyncService actFmSyncService;
 
-    @Autowired ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    ActFmPreferenceService actFmPreferenceService;
 
-    @Autowired SyncV2Service syncService;
+    @Autowired
+    SyncV2Service syncService;
 
-    @Autowired UserDao userDao;
+    @Autowired
+    UserDao userDao;
 
-    @Autowired MetadataDao metadataDao;
+    @Autowired
+    MetadataDao metadataDao;
 
-    @Autowired TagMetadataDao tagMetadataDao;
+    @Autowired
+    TagMetadataDao tagMetadataDao;
 
-    @Autowired TaskListMetadataDao taskListMetadataDao;
+    @Autowired
+    TaskListMetadataDao taskListMetadataDao;
 
     protected View taskListView;
 
@@ -216,7 +226,7 @@ public class TagViewFragment extends TaskListFragment {
 
     @Override
     protected void addSyncRefreshMenuItem(Menu menu, int themeFlags) {
-        if(actFmPreferenceService.isLoggedIn()) {
+        if (actFmPreferenceService.isLoggedIn()) {
             addMenuItem(menu, R.string.actfm_TVA_menu_refresh,
                     ThemeService.getDrawable(R.drawable.icn_menu_refresh, themeFlags), MENU_REFRESH_ID, true);
         } else {
@@ -238,8 +248,8 @@ public class TagViewFragment extends TaskListFragment {
 
     @Override
     protected void initializeData() {
-        synchronized(this) {
-            if(dataLoaded)
+        synchronized (this) {
+            if (dataLoaded)
                 return;
             dataLoaded = true;
         }
@@ -253,7 +263,7 @@ public class TagViewFragment extends TaskListFragment {
             uuid = Long.toString(extras.getLong(EXTRA_TAG_REMOTE_ID));
 
 
-        if(tag == null && RemoteModel.NO_UUID.equals(uuid))
+        if (tag == null && RemoteModel.NO_UUID.equals(uuid))
             return;
 
         TodorooCursor<TagData> cursor;
@@ -265,7 +275,7 @@ public class TagViewFragment extends TaskListFragment {
 
         try {
             tagData = new TagData();
-            if(cursor.getCount() == 0) {
+            if (cursor.getCount() == 0) {
                 tagData.setValue(TagData.NAME, tag);
                 tagData.setValue(TagData.UUID, uuid);
                 tagDataService.save(tagData);
@@ -295,12 +305,12 @@ public class TagViewFragment extends TaskListFragment {
     @Override
     public void loadTaskListContent(boolean requery) {
         super.loadTaskListContent(requery);
-        if(taskAdapter == null || taskAdapter.getCursor() == null)
+        if (taskAdapter == null || taskAdapter.getCursor() == null)
             return;
 
         int count = taskAdapter.getCursor().getCount();
 
-        if(tagData != null && sortFlags <= SortHelper.FLAG_REVERSE_SORT &&
+        if (tagData != null && sortFlags <= SortHelper.FLAG_REVERSE_SORT &&
                 count != tagData.getValue(TagData.TASK_COUNT)) {
             tagData.setValue(TagData.TASK_COUNT, count);
             tagDataService.save(tagData);
@@ -340,7 +350,7 @@ public class TagViewFragment extends TaskListFragment {
             return;
         if (tagData != null) {
             long lastAutosync = tagData.getValue(TagData.LAST_AUTOSYNC);
-            if(DateUtilities.now() - lastAutosync > AUTOSYNC_INTERVAL) {
+            if (DateUtilities.now() - lastAutosync > AUTOSYNC_INTERVAL) {
                 tagData.setValue(TagData.LAST_AUTOSYNC, DateUtilities.now());
                 tagDataDao.saveExisting(tagData);
                 refreshData();
@@ -348,15 +358,17 @@ public class TagViewFragment extends TaskListFragment {
         }
     }
 
-    /** refresh the list with latest data from the web */
+    /**
+     * refresh the list with latest data from the web
+     */
     private void refreshData() {
         if (actFmPreferenceService.isLoggedIn() && tagData != null && !RemoteModel.isUuidEmpty(tagData.getUuid())) {
-            ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.DLG_loading);
+            ((TextView) taskListView.findViewById(android.R.id.empty)).setText(R.string.DLG_loading);
 
             SyncMessageCallback callback = new SyncMessageCallback() {
                 @Override
                 public void runOnSuccess() {
-                    synchronized(this) {
+                    synchronized (this) {
                         Activity activity = getActivity();
                         if (activity != null) {
                             activity.runOnUiThread(new Runnable() {
@@ -365,7 +377,7 @@ public class TagViewFragment extends TaskListFragment {
                                     try {
                                         reloadTagData(false);
                                         refresh();
-                                        ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.TLA_no_items);
+                                        ((TextView) taskListView.findViewById(android.R.id.empty)).setText(R.string.TLA_no_items);
                                     } catch (Exception e) {
                                         // Can happen when swipe between lists is on
                                     }
@@ -374,6 +386,7 @@ public class TagViewFragment extends TaskListFragment {
                         }
                     }
                 }
+
                 @Override
                 public void runOnErrors(List<JSONArray> errors) {
                     Activity activity = getActivity();
@@ -443,7 +456,8 @@ public class TagViewFragment extends TaskListFragment {
                                                     tagMetadataDao.deleteWhere(TagMetadata.TAG_UUID.eq(uuid));
                                                     tla.switchToActiveTasks();
                                                 }
-                                            });
+                                            }
+                                    );
                                 }
                             });
                         }
@@ -466,7 +480,7 @@ public class TagViewFragment extends TaskListFragment {
         }
         if (tagData == null)
             return;
-        LinearLayout membersView = (LinearLayout)getView().findViewById(R.id.shared_with);
+        LinearLayout membersView = (LinearLayout) getView().findViewById(R.id.shared_with);
         membersView.setOnClickListener(settingsListener);
         boolean addedMembers = false;
         try {
@@ -535,9 +549,9 @@ public class TagViewFragment extends TaskListFragment {
 
         if (addedMembers) {
             try {
-            // Handle creator
+                // Handle creator
                 JSONObject owner;
-                if(!Task.USER_ID_SELF.equals(tagData.getValue(TagData.USER_ID))) {
+                if (!Task.USER_ID_SELF.equals(tagData.getValue(TagData.USER_ID))) {
                     String userString = tagData.getValue(TagData.USER);
                     if (!TextUtils.isEmpty(userString)) {
                         owner = new JSONObject(tagData.getValue(TagData.USER));
@@ -585,8 +599,8 @@ public class TagViewFragment extends TaskListFragment {
         DisplayMetrics displayMetrics = new DisplayMetrics();
         getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
         AsyncImageView image = new AsyncImageView(getActivity());
-        image.setLayoutParams(new LinearLayout.LayoutParams((int)(43 * displayMetrics.density),
-                (int)(43 * displayMetrics.density)));
+        image.setLayoutParams(new LinearLayout.LayoutParams((int) (43 * displayMetrics.density),
+                (int) (43 * displayMetrics.density)));
 
 
         image.setDefaultImageDrawable(ResourceDrawableCache.getImageDrawableFromId(resources, R.drawable.icn_default_person_image));
@@ -616,6 +630,7 @@ public class TagViewFragment extends TaskListFragment {
     private OnClickListener listenerForImage(final JSONObject member, final String id, final String displayName) {
         return new OnClickListener() {
             final String email = member.optString("email"); //$NON-NLS-1$
+
             @SuppressWarnings("deprecation")
             @Override
             public void onClick(View v) {
@@ -688,9 +703,9 @@ public class TagViewFragment extends TaskListFragment {
         @SuppressWarnings("nls")
         @Override
         public void onReceive(Context context, Intent intent) {
-            if(!intent.hasExtra("tag_id"))
+            if (!intent.hasExtra("tag_id"))
                 return;
-            if(tagData == null || !tagData.getValue(TagData.UUID).toString().equals(intent.getStringExtra("tag_id")))
+            if (tagData == null || !tagData.getValue(TagData.UUID).toString().equals(intent.getStringExtra("tag_id")))
                 return;
 
             getActivity().runOnUiThread(new Runnable() {
@@ -783,12 +798,12 @@ public class TagViewFragment extends TaskListFragment {
     public boolean handleOptionsMenuItemSelected(int id, Intent intent) {
         // handle my own menus
         switch (id) {
-        case MENU_REFRESH_ID:
-            refreshData();
-            return true;
-        case MENU_LIST_SETTINGS_ID:
-            settingsListener.onClick(null);
-            return true;
+            case MENU_REFRESH_ID:
+                refreshData();
+                return true;
+            case MENU_LIST_SETTINGS_ID:
+                settingsListener.onClick(null);
+                return true;
         }
 
         return super.handleOptionsMenuItemSelected(id, intent);
@@ -803,7 +818,7 @@ public class TagViewFragment extends TaskListFragment {
     protected void toggleDragDrop(boolean newState) {
         Class<?> customComponent;
 
-        if(newState)
+        if (newState)
             customComponent = SubtasksTagListFragment.class;
         else {
             filter.setFilterQueryOverride(null);
@@ -813,7 +828,7 @@ public class TagViewFragment extends TaskListFragment {
         ((FilterWithCustomIntent) filter).customTaskList = new ComponentName(getActivity(), customComponent);
 
         extras.putParcelable(TOKEN_FILTER, filter);
-        ((AstridActivity)getActivity()).setupTasklistFragmentWithFilterAndCustomTaskList(filter,
+        ((AstridActivity) getActivity()).setupTasklistFragmentWithFilterAndCustomTaskList(filter,
                 extras, customComponent);
     }
 
@@ -821,7 +836,7 @@ public class TagViewFragment extends TaskListFragment {
     protected void refresh() {
         setUpMembersGallery();
         loadTaskListContent(true);
-        ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.TLA_no_items);
+        ((TextView) taskListView.findViewById(android.R.id.empty)).setText(R.string.TLA_no_items);
     }
 
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/WaitingOnMeFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/WaitingOnMeFragment.java
index 68e2f8b13..3ea74d394 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/WaitingOnMeFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/WaitingOnMeFragment.java
@@ -1,7 +1,5 @@
 package com.todoroo.astrid.actfm;
 
-import java.util.concurrent.atomic.AtomicReference;
-
 import android.database.Cursor;
 import android.graphics.Typeface;
 import android.text.TextUtils;
@@ -22,6 +20,8 @@ import com.todoroo.astrid.dao.WaitingOnMeDao;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.WaitingOnMe;
 
+import java.util.concurrent.atomic.AtomicReference;
+
 public class WaitingOnMeFragment extends TaskListFragment {
 
     @Autowired
@@ -51,8 +51,8 @@ public class WaitingOnMeFragment extends TaskListFragment {
     private static class WaitingOnMeTaskAdapter extends TaskAdapter {
 
         public WaitingOnMeTaskAdapter(TaskListFragment fragment, int resource,
-                Cursor c, AtomicReference<String> query, boolean autoRequery,
-                OnCompletedTaskListener onCompletedTaskListener) {
+                                      Cursor c, AtomicReference<String> query, boolean autoRequery,
+                                      OnCompletedTaskListener onCompletedTaskListener) {
             super(fragment, resource, c, query, autoRequery, onCompletedTaskListener);
         }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
index 2bb744451..95804a0e7 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java
@@ -5,23 +5,6 @@
  */
 package com.todoroo.astrid.actfm.sync;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.Charset;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.TimeZone;
-
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.entity.mime.MultipartEntity;
-import org.apache.http.entity.mime.content.StringBody;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -36,23 +19,43 @@ import com.todoroo.andlib.utility.Pair;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.utility.Constants;
 
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.entity.mime.MultipartEntity;
+import org.apache.http.entity.mime.content.StringBody;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.TimeZone;
+
 @SuppressWarnings("nls")
 public class ActFmInvoker {
 
-    /** NOTE: these values are development values & will not work on production */
+    /**
+     * NOTE: these values are development values & will not work on production
+     */
     private static final String URL = "//10.0.2.2:3000/api/";
     private static final String APP_ID = "a4732a32859dbcd3e684331acd36432c";
     private static final String APP_SECRET = "e389bfc82a0d932332f9a8bd8203735f";
 
     public static final String PROVIDER_FACEBOOK = "facebook";
-    public static final String PROVIDER_GOOGLE= "google";
+    public static final String PROVIDER_GOOGLE = "google";
     public static final String PROVIDER_PASSWORD = "password";
 
     private static final int API_VERSION = 7;
 
     public static final boolean SYNC_DEBUG = Constants.DEBUG || true;
 
-    @Autowired private RestClient restClient;
+    @Autowired
+    private RestClient restClient;
 
     private String token = null;
 
@@ -68,6 +71,7 @@ public class ActFmInvoker {
 
     /**
      * Create new api invoker service with a token
+     *
      * @token access token
      */
     public ActFmInvoker(String token) {
@@ -85,7 +89,7 @@ public class ActFmInvoker {
      * Authentication user with Act.fm server, returning a token
      */
     public JSONObject authenticate(String email, String firstName, String lastName, String provider,
-            String secret) throws ActFmServiceException, IOException {
+                                   String secret) throws ActFmServiceException, IOException {
         JSONObject result = invoke(
                 "user_signin",
                 "email", email,
@@ -107,10 +111,8 @@ public class ActFmInvoker {
     /**
      * Invokes API method using HTTP GET
      *
-     * @param method
-     *          API method to invoke
-     * @param getParameters
-     *          Name/Value pairs. Values will be URL encoded.
+     * @param method        API method to invoke
+     * @param getParameters Name/Value pairs. Values will be URL encoded.
      * @return response object
      */
     public JSONObject invoke(String method, Object... getParameters) throws IOException,
@@ -121,14 +123,12 @@ public class ActFmInvoker {
     /**
      * Invokes API method using HTTP GET
      *
-     * @param method
-     *          API method to invoke
-     * @param getParameters
-     *          Name/Value pairs. Values will be URL encoded.
+     * @param method        API method to invoke
+     * @param getParameters Name/Value pairs. Values will be URL encoded.
      * @return response object
      */
     public JSONObject invokeWithApi(String api, String method, Object... getParameters) throws IOException,
-    ActFmServiceException {
+            ActFmServiceException {
         try {
             String request = createFetchUrl(api, method, getParameters);
 
@@ -140,7 +140,7 @@ public class ActFmInvoker {
 
             if (SYNC_DEBUG)
                 AndroidUtilities.logJSONObject("act-fm-invoke-response", object);
-            if(object.getString("status").equals("error"))
+            if (object.getString("status").equals("error"))
                 throw new ActFmServiceException(object.getString("message"), object);
             return object;
         } catch (JSONException e) {
@@ -153,16 +153,13 @@ public class ActFmInvoker {
     /**
      * Invokes API method using HTTP POST
      *
-     * @param method
-     *          API method to invoke
-     * @param data
-     *          data to transmit
-     * @param getParameters
-     *          Name/Value pairs. Values will be URL encoded.
+     * @param method        API method to invoke
+     * @param data          data to transmit
+     * @param getParameters Name/Value pairs. Values will be URL encoded.
      * @return response object
      */
     public JSONObject post(String method, HttpEntity data, Object... getParameters) throws IOException,
-    ActFmServiceException {
+            ActFmServiceException {
         try {
             String request = createFetchUrl(null, method, getParameters);
 
@@ -175,7 +172,7 @@ public class ActFmInvoker {
             if (SYNC_DEBUG)
                 AndroidUtilities.logJSONObject("act-fm-post-response", object);
 
-            if(object.getString("status").equals("error"))
+            if (object.getString("status").equals("error"))
                 throw new ActFmServiceException(object.getString("message"), object);
             return object;
         } catch (JSONException e) {
@@ -186,11 +183,11 @@ public class ActFmInvoker {
     }
 
     public JSONObject postSync(String data, MultipartEntity entity, boolean changesHappened, String tok) throws IOException,
-    ActFmServiceException {
+            ActFmServiceException {
         try {
             String timeString = DateUtilities.timeToIso8601(DateUtilities.now(), true);
 
-            Object[] params = { "token", tok, "data", data, "time", timeString };
+            Object[] params = {"token", tok, "data", data, "time", timeString};
 
             if (changesHappened) {
                 String gcm = Preferences.getStringValue(GCMIntentService.PREF_REGISTRATION);
@@ -221,7 +218,7 @@ public class ActFmInvoker {
             if (SYNC_DEBUG)
                 AndroidUtilities.logJSONObject("act-fm-post-response", object);
 
-            if(object.getString("status").equals("error"))
+            if (object.getString("status").equals("error"))
                 throw new ActFmServiceException(object.getString("message"), object);
             return object;
         } catch (JSONException e) {
@@ -233,6 +230,7 @@ public class ActFmInvoker {
 
     /**
      * Creates a URL for invoking an HTTP GET/POST on the given method
+     *
      * @param method
      * @param getParameters
      * @return
@@ -241,21 +239,21 @@ public class ActFmInvoker {
      */
     private String createFetchUrl(String api, String method, Object... getParameters) throws UnsupportedEncodingException, NoSuchAlgorithmException {
         ArrayList<Pair<String, Object>> params = new ArrayList<Pair<String, Object>>();
-        for(int i = 0; i < getParameters.length; i += 2) {
-            if(getParameters[i+1] instanceof ArrayList) {
-                ArrayList<?> list = (ArrayList<?>) getParameters[i+1];
-                for(int j = 0; j < list.size(); j++)
+        for (int i = 0; i < getParameters.length; i += 2) {
+            if (getParameters[i + 1] instanceof ArrayList) {
+                ArrayList<?> list = (ArrayList<?>) getParameters[i + 1];
+                for (int j = 0; j < list.size(); j++)
                     params.add(new Pair<String, Object>(getParameters[i].toString() + "[]",
                             list.get(j)));
             } else
-                params.add(new Pair<String, Object>(getParameters[i].toString(), getParameters[i+1]));
+                params.add(new Pair<String, Object>(getParameters[i].toString(), getParameters[i + 1]));
         }
         params.add(new Pair<String, Object>("app_id", APP_ID));
         boolean syncMethod = "synchronize".equals(method);
 
         if (!syncMethod)
             params.add(new Pair<String, Object>("time", System.currentTimeMillis() / 1000L));
-        if(token != null) {
+        if (token != null) {
             boolean foundTokenKey = false;
             for (Pair<String, Object> curr : params) {
                 if (curr.getLeft().equals("token")) {
@@ -270,9 +268,9 @@ public class ActFmInvoker {
         Collections.sort(params, new Comparator<Pair<String, Object>>() {
             @Override
             public int compare(Pair<String, Object> object1,
-                    Pair<String, Object> object2) {
+                               Pair<String, Object> object2) {
                 int result = object1.getLeft().compareTo(object2.getLeft());
-                if(result == 0)
+                if (result == 0)
                     return object1.getRight().toString().compareTo(object2.getRight().toString());
                 return result;
             }
@@ -294,8 +292,8 @@ public class ActFmInvoker {
             requestBuilder.append(API_VERSION).append("/");
         requestBuilder.append(method).append('?');
         StringBuilder sigBuilder = new StringBuilder(method);
-        for(Pair<String, Object> entry : params) {
-            if(entry.getRight() == null)
+        for (Pair<String, Object> entry : params) {
+            if (entry.getRight() == null)
                 continue;
 
             String key = entry.getLeft();
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java
index 6772b08af..1b8c581ff 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.actfm.sync;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.text.TextUtils;
 
 import com.timsu.astrid.R;
@@ -21,15 +18,19 @@ import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.sync.SyncProviderUtilities;
 import com.todoroo.astrid.utility.AstridPreferences;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 /**
  * Methods for working with GTasks preferences
  *
  * @author timsu
- *
  */
 public class ActFmPreferenceService extends SyncProviderUtilities {
 
-    /** add-on identifier */
+    /**
+     * add-on identifier
+     */
     public static final String IDENTIFIER = "actfm"; //$NON-NLS-1$
 
     @Override
@@ -50,7 +51,7 @@ public class ActFmPreferenceService extends SyncProviderUtilities {
 
     @Override
     public boolean shouldShowToast() {
-        if(Preferences.getBoolean(AstridPreferences.P_FIRST_TASK, true))
+        if (Preferences.getBoolean(AstridPreferences.P_FIRST_TASK, true))
             return false;
         return super.shouldShowToast();
     }
@@ -87,31 +88,49 @@ public class ActFmPreferenceService extends SyncProviderUtilities {
         }
     }
 
-    /** Act.fm current user id */
+    /**
+     * Act.fm current user id
+     */
     public static final String PREF_USER_ID = IDENTIFIER + "_user"; //$NON-NLS-1$
 
-    /** Act.fm current user name */
+    /**
+     * Act.fm current user name
+     */
     public static final String PREF_NAME = IDENTIFIER + "_name"; //$NON-NLS-1$
 
-    /** Act.fm current user first name */
+    /**
+     * Act.fm current user first name
+     */
     public static final String PREF_FIRST_NAME = IDENTIFIER + "_first_name"; //$NON-NLS-1$
 
-    /** Act.fm current user last name */
+    /**
+     * Act.fm current user last name
+     */
     public static final String PREF_LAST_NAME = IDENTIFIER + "_last_name"; //$NON-NLS-1$
 
-    /** Act.fm current user premium status */
+    /**
+     * Act.fm current user premium status
+     */
     public static final String PREF_PREMIUM = IDENTIFIER + "_premium"; //$NON-NLS-1$
 
-    /** Local knowledge of current premium status */
+    /**
+     * Local knowledge of current premium status
+     */
     public static final String PREF_LOCAL_PREMIUM = IDENTIFIER + "_local_premium"; //$NON-NLS-1$
 
-    /** Act.fm current user picture */
+    /**
+     * Act.fm current user picture
+     */
     public static final String PREF_PICTURE = IDENTIFIER + "_picture"; //$NON-NLS-1$
 
-    /** Act.fm current user email */
+    /**
+     * Act.fm current user email
+     */
     public static final String PREF_EMAIL = IDENTIFIER + "_email"; //$NON-NLS-1$
 
-    /** Act.fm last sync server time */
+    /**
+     * Act.fm last sync server time
+     */
     public static final String PREF_SERVER_TIME = IDENTIFIER + "_time"; //$NON-NLS-1$
 
     private static JSONObject user = null;
@@ -122,7 +141,7 @@ public class ActFmPreferenceService extends SyncProviderUtilities {
     }
 
     public synchronized static JSONObject thisUser() {
-        if(user == null) {
+        if (user == null) {
             user = new JSONObject();
             populateUser();
         }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmServiceException.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmServiceException.java
index 034a23d9d..163e45fff 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmServiceException.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmServiceException.java
@@ -5,17 +5,16 @@
  */
 package com.todoroo.astrid.actfm.sync;
 
-import java.io.IOException;
-
 import org.json.JSONObject;
 
+import java.io.IOException;
+
 
 /**
  * Exception that wraps an exception encountered during API invocation or
  * processing.
  *
  * @author timsu
- *
  */
 public class ActFmServiceException extends IOException {
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncMonitor.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncMonitor.java
index 1d4c85716..77b6966e6 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncMonitor.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncMonitor.java
@@ -2,6 +2,7 @@ package com.todoroo.astrid.actfm.sync;
 
 public class ActFmSyncMonitor {
     private ActFmSyncMonitor() {/**/}
+
     private static final ActFmSyncMonitor INSTANCE = new ActFmSyncMonitor();
 
     public static ActFmSyncMonitor getInstance() {
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
index 8489898c4..8a77726d0 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
@@ -5,14 +5,6 @@
  */
 package com.todoroo.astrid.actfm.sync;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -28,11 +20,18 @@ import com.todoroo.astrid.service.TagDataService;
 import com.todoroo.astrid.service.abtesting.ABTestEventReportingService;
 import com.todoroo.astrid.tags.reusable.FeaturedListFilterExposer;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Service for synchronizing data on Astrid.com server with local.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 public final class ActFmSyncService {
@@ -58,7 +57,8 @@ public final class ActFmSyncService {
         JSONArray abTestInfo = abTestEventReportingService.getTestsWithVariantsArray();
         try {
             for (int i = 0; i < abTestInfo.length(); i++) {
-                params.add("ab_variants[]"); params.add(abTestInfo.getString(i));
+                params.add("ab_variants[]");
+                params.add(abTestInfo.getString(i));
             }
         } catch (JSONException e) {
             Log.e("Error parsing AB test info", abTestInfo.toString(), e);
@@ -91,10 +91,13 @@ public final class ActFmSyncService {
                 throw new ActFmServiceException("Not logged in", null);
 
             ArrayList<Object> params = new ArrayList<Object>();
-            params.add("purchase_token"); params.add(purchaseToken);
-            params.add("product_id"); params.add(productId);
+            params.add("purchase_token");
+            params.add(purchaseToken);
+            params.add("product_id");
+            params.add(productId);
             addAbTestEventInfo(params);
-            params.add("token"); params.add(token);
+            params.add("token");
+            params.add(token);
 
             actFmInvoker.invoke("premium_update_android", params.toArray(new Object[params.size()]));
             Preferences.setBoolean(BillingConstants.PREF_NEEDS_SERVER_UPDATE, false);
@@ -102,7 +105,7 @@ public final class ActFmSyncService {
                 onSuccess.run();
         } catch (Exception e) {
             if (e instanceof ActFmServiceException) {
-                ActFmServiceException ae = (ActFmServiceException)e;
+                ActFmServiceException ae = (ActFmServiceException) e;
                 if (ae.result != null && ae.result.optString("status").equals("error")) {
                     if (ae.result.optString("code").equals("invalid_purchase_token")) { // Not a valid purchase--expired or duolicate
                         Preferences.setBoolean(ActFmPreferenceService.PREF_LOCAL_PREMIUM, false);
@@ -125,12 +128,15 @@ public final class ActFmSyncService {
             String existingC2DM = Preferences.getStringValue(GCMIntentService.PREF_C2DM_REGISTRATION);
 
             ArrayList<Object> params = new ArrayList<Object>();
-            params.add("gcm"); params.add(regId);
+            params.add("gcm");
+            params.add(regId);
             if (!TextUtils.isEmpty(deviceId)) {
-                params.add("device_id"); params.add(deviceId);
+                params.add("device_id");
+                params.add(deviceId);
             }
             if (!TextUtils.isEmpty(existingC2DM)) { // Unregisters C2DM with the server for migration purposes
-                params.add("c2dm"); params.add(existingC2DM);
+                params.add("c2dm");
+                params.add(existingC2DM);
             }
 
             invoke("user_set_gcm", params.toArray(new Object[params.size()]));
@@ -147,16 +153,18 @@ public final class ActFmSyncService {
 
     // --- generic invokation
 
-    /** invoke authenticated method against the server */
+    /**
+     * invoke authenticated method against the server
+     */
     public JSONObject invoke(String method, Object... getParameters) throws IOException,
-    ActFmServiceException {
-        if(!checkForToken())
+            ActFmServiceException {
+        if (!checkForToken())
             throw new ActFmServiceException("not logged in", null);
         Object[] parameters = new Object[getParameters.length + 2];
         parameters[0] = "token";
         parameters[1] = token;
-        for(int i = 0; i < getParameters.length; i++)
-            parameters[i+2] = getParameters[i];
+        for (int i = 0; i < getParameters.length; i++)
+            parameters[i + 2] = getParameters[i];
         return actFmInvoker.invoke(method, parameters);
     }
 
@@ -165,7 +173,7 @@ public final class ActFmSyncService {
     }
 
     private boolean checkForToken() {
-        if(!actFmPreferenceService.isLoggedIn())
+        if (!actFmPreferenceService.isLoggedIn())
             return false;
         token = actFmPreferenceService.getToken();
         return true;
@@ -202,18 +210,18 @@ public final class ActFmSyncService {
             if (featuredList)
                 model.setFlag(TagData.FLAGS, TagData.FLAG_FEATURED, true);
 
-            if(json.has("picture"))
+            if (json.has("picture"))
                 model.setValue(TagData.PICTURE, json.optString("picture", ""));
-            if(json.has("thumb"))
+            if (json.has("thumb"))
                 model.setValue(TagData.THUMB, json.optString("thumb", ""));
 
-            if(json.has("is_silent"))
-                model.setFlag(TagData.FLAGS, TagData.FLAG_SILENT,json.getBoolean("is_silent"));
+            if (json.has("is_silent"))
+                model.setFlag(TagData.FLAGS, TagData.FLAG_SILENT, json.getBoolean("is_silent"));
 
-            if(!json.isNull("description"))
+            if (!json.isNull("description"))
                 model.setValue(TagData.TAG_DESCRIPTION, json.getString("description"));
 
-            if(json.has("members")) {
+            if (json.has("members")) {
                 JSONArray members = json.getJSONArray("members");
                 model.setValue(TagData.MEMBERS, members.toString());
                 model.setValue(TagData.MEMBER_COUNT, members.length());
@@ -222,7 +230,7 @@ public final class ActFmSyncService {
             if (json.has("deleted_at"))
                 model.setValue(TagData.DELETION_DATE, readDate(json, "deleted_at"));
 
-            if(json.has("tasks"))
+            if (json.has("tasks"))
                 model.setValue(TagData.TASK_COUNT, json.getInt("tasks"));
         }
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java
index 9e5799f2c..64f739d55 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java
@@ -1,19 +1,5 @@
 package com.todoroo.astrid.actfm.sync;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.http.entity.mime.MultipartEntity;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -76,6 +62,20 @@ import com.todoroo.astrid.data.WaitingOnMe;
 import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.widget.TasksWidget;
 
+import org.apache.http.entity.mime.MultipartEntity;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 public class ActFmSyncThread {
 
     private static final String ERROR_TAG = "actfm-sync-thread"; //$NON-NLS-1$
@@ -133,6 +133,7 @@ public class ActFmSyncThread {
 
     public static interface SyncMessageCallback {
         public void runOnSuccess();
+
         public void runOnErrors(List<JSONArray> errors);
     }
 
@@ -149,7 +150,7 @@ public class ActFmSyncThread {
 
     public static ActFmSyncThread getInstance() {
         if (instance == null) {
-            synchronized(ActFmSyncThread.class) {
+            synchronized (ActFmSyncThread.class) {
                 if (instance == null) {
                     initializeSyncComponents(PluginServices.getTaskDao(), PluginServices.getTagDataDao(), PluginServices.getUserActivityDao(),
                             PluginServices.getTaskAttachmentDao(), PluginServices.getTaskListMetadataDao(), PluginServices.getWaitingOnMeDao());
@@ -160,9 +161,9 @@ public class ActFmSyncThread {
     }
 
     public static ActFmSyncThread initializeSyncComponents(TaskDao taskDao, TagDataDao tagDataDao, UserActivityDao userActivityDao,
-            TaskAttachmentDao taskAttachmentDao, TaskListMetadataDao taskListMetadataDao, WaitingOnMeDao waitingOnMeDao) {
+                                                           TaskAttachmentDao taskAttachmentDao, TaskListMetadataDao taskListMetadataDao, WaitingOnMeDao waitingOnMeDao) {
         if (instance == null) {
-            synchronized(ActFmSyncThread.class) {
+            synchronized (ActFmSyncThread.class) {
                 if (instance == null) {
                     List<ClientToServerMessage<?>> syncQueue = Collections.synchronizedList(new LinkedList<ClientToServerMessage<?>>());
                     ActFmSyncMonitor monitor = ActFmSyncMonitor.getInstance();
@@ -206,8 +207,8 @@ public class ActFmSyncThread {
     }
 
     public static void clearTablePushedAtValues() {
-        String[] pushedAtPrefs = new String[] { NameMaps.PUSHED_AT_TASKS, NameMaps.PUSHED_AT_TAGS, NameMaps.PUSHED_AT_ACTIVITY,
-                NameMaps.PUSHED_AT_USERS, NameMaps.PUSHED_AT_TASK_LIST_METADATA, NameMaps.PUSHED_AT_WAITING_ON_ME };
+        String[] pushedAtPrefs = new String[]{NameMaps.PUSHED_AT_TASKS, NameMaps.PUSHED_AT_TAGS, NameMaps.PUSHED_AT_ACTIVITY,
+                NameMaps.PUSHED_AT_USERS, NameMaps.PUSHED_AT_TASK_LIST_METADATA, NameMaps.PUSHED_AT_WAITING_ON_ME};
         for (String key : pushedAtPrefs)
             Preferences.clear(key);
     }
@@ -219,7 +220,7 @@ public class ActFmSyncThread {
             pendingMessages.add(message);
             if (callback != null)
                 pendingCallbacks.put(message, callback);
-            synchronized(monitor) {
+            synchronized (monitor) {
                 monitor.notifyAll();
             }
         }
@@ -249,8 +250,8 @@ public class ActFmSyncThread {
         try {
             int batchSize = 4;
             List<ClientToServerMessage<?>> messageBatch = new ArrayList<ClientToServerMessage<?>>();
-            while(true) {
-                synchronized(monitor) {
+            while (true) {
+                synchronized (monitor) {
                     while ((pendingMessages.isEmpty() && !timeForBackgroundSync()) || !actFmPreferenceService.isLoggedIn() || !syncMigration) {
                         try {
                             if ((pendingMessages.isEmpty() || !actFmPreferenceService.isLoggedIn()) && notificationId >= 0) {
@@ -482,10 +483,10 @@ public class ActFmSyncThread {
         try {
             NotificationCompat.Builder builder = new NotificationCompat.Builder(ContextManager.getContext());
             builder.setContentText(ContextManager.getString(R.string.actfm_sync_ongoing))
-            .setContentTitle(ContextManager.getString(R.string.app_name))
-            .setOngoing(true)
-            .setSmallIcon(android.R.drawable.stat_notify_sync)
-            .setContentIntent(PendingIntent.getActivity(ContextManager.getContext().getApplicationContext(), 0, new Intent(), 0));
+                    .setContentTitle(ContextManager.getString(R.string.app_name))
+                    .setOngoing(true)
+                    .setSmallIcon(android.R.drawable.stat_notify_sync)
+                    .setContentIntent(PendingIntent.getActivity(ContextManager.getContext().getApplicationContext(), 0, new Intent(), 0));
 
 
             notificationManager.notify(0, builder.getNotification());
@@ -498,7 +499,7 @@ public class ActFmSyncThread {
     }
 
     private boolean checkForToken() {
-        if(!actFmPreferenceService.isLoggedIn())
+        if (!actFmPreferenceService.isLoggedIn())
             return false;
         token = actFmPreferenceService.getToken();
         return true;
@@ -512,6 +513,7 @@ public class ActFmSyncThread {
     public static class NetworkStateChangedReceiver extends BroadcastReceiver {
         private static long lastSyncFromNetworkChange = 0;
         private static final String PREF_LAST_SYNC_FROM_NETWORK_CHANGE = "p_last_sync_from_net_change"; //$NON-NLS-1$
+
         @Override
         public void onReceive(Context context, Intent intent) {
             lastSyncFromNetworkChange = Preferences.getLong(PREF_LAST_SYNC_FROM_NETWORK_CHANGE, 0L);
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
index 8bbf4a91e..5d2229006 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.actfm.sync;
 
-import java.io.IOException;
-
-import org.json.JSONObject;
-
 import android.app.Activity;
 import android.content.DialogInterface;
 
@@ -26,9 +22,12 @@ import com.todoroo.astrid.service.AstridDependencyInjector;
 import com.todoroo.astrid.sync.SyncResultCallback;
 import com.todoroo.astrid.sync.SyncV2Provider;
 
+import org.json.JSONObject;
+
+import java.io.IOException;
+
 /**
  * Exposes sync action
- *
  */
 public class ActFmSyncV2Provider extends SyncV2Provider {
 
@@ -94,7 +93,7 @@ public class ActFmSyncV2Provider extends SyncV2Provider {
 
     @Override
     public void synchronizeActiveTasks(final boolean manual,
-            final SyncResultCallback callback) {
+                                       final SyncResultCallback callback) {
 
         new Thread(new Runnable() {
             public void run() {
@@ -106,7 +105,9 @@ public class ActFmSyncV2Provider extends SyncV2Provider {
         }).start();
     }
 
-    /** fetch user status hash*/
+    /**
+     * fetch user status hash
+     */
     @SuppressWarnings("nls")
     public void updateUserStatus() {
         if (Preferences.getStringValue(GCMIntentService.PREF_NEEDS_REGISTRATION) != null) {
@@ -145,7 +146,7 @@ public class ActFmSyncV2Provider extends SyncV2Provider {
     // --- synchronize list
     @Override
     public void synchronizeList(Object list, final boolean manual,
-            final SyncResultCallback callback) {
+                                final SyncResultCallback callback) {
         // Nothing to do
     }
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncWaitingPool.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncWaitingPool.java
index 37e93b1ec..c0f2505ba 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncWaitingPool.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncWaitingPool.java
@@ -1,21 +1,21 @@
 package com.todoroo.astrid.actfm.sync;
 
+import com.todoroo.andlib.utility.AndroidUtilities;
+import com.todoroo.astrid.actfm.sync.messages.ClientToServerMessage;
+
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import com.todoroo.andlib.utility.AndroidUtilities;
-import com.todoroo.astrid.actfm.sync.messages.ClientToServerMessage;
-
 public class ActFmSyncWaitingPool {
 
     private static volatile ActFmSyncWaitingPool instance;
 
     public static ActFmSyncWaitingPool getInstance() {
         if (instance == null) {
-            synchronized(ActFmSyncWaitingPool.class) {
+            synchronized (ActFmSyncWaitingPool.class) {
                 if (instance == null) {
                     instance = new ActFmSyncWaitingPool();
                 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java
index e59d1c70d..c16ee806f 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java
@@ -1,8 +1,5 @@
 package com.todoroo.astrid.actfm.sync;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -52,21 +49,35 @@ import com.todoroo.astrid.subtasks.SubtasksHelper;
 import com.todoroo.astrid.subtasks.SubtasksUpdater;
 import com.todoroo.astrid.tags.TaskToTagMetadata;
 
+import java.util.HashSet;
+import java.util.Set;
+
 @SuppressWarnings("nls")
 public class AstridNewSyncMigrator {
 
-    @Autowired private MetadataService metadataService;
-    @Autowired private TagDataService tagDataService;
-    @Autowired private TagDataDao tagDataDao;
-    @Autowired private TaskDao taskDao;
-    @Autowired private UpdateDao updateDao;
-    @Autowired private UserActivityDao userActivityDao;
-    @Autowired private UserDao userDao;
-    @Autowired private TaskAttachmentDao taskAttachmentDao;
-    @Autowired private TaskListMetadataDao taskListMetadataDao;
-
-    @Autowired private TaskOutstandingDao taskOutstandingDao;
-    @Autowired private TagOutstandingDao tagOutstandingDao;
+    @Autowired
+    private MetadataService metadataService;
+    @Autowired
+    private TagDataService tagDataService;
+    @Autowired
+    private TagDataDao tagDataDao;
+    @Autowired
+    private TaskDao taskDao;
+    @Autowired
+    private UpdateDao updateDao;
+    @Autowired
+    private UserActivityDao userActivityDao;
+    @Autowired
+    private UserDao userDao;
+    @Autowired
+    private TaskAttachmentDao taskAttachmentDao;
+    @Autowired
+    private TaskListMetadataDao taskListMetadataDao;
+
+    @Autowired
+    private TaskOutstandingDao taskOutstandingDao;
+    @Autowired
+    private TagOutstandingDao tagOutstandingDao;
 
     private static final String LOG_TAG = "sync-migrate";
 
@@ -138,7 +149,7 @@ public class AstridNewSyncMigrator {
                     Crittercism.logHandledException(e);
                 }
             }
-        } catch (Exception e){
+        } catch (Exception e) {
             Crittercism.logHandledException(e);
         } finally {
             if (emergentTags != null)
@@ -294,7 +305,6 @@ public class AstridNewSyncMigrator {
         }
 
 
-
         // --------------
         // Drop any entries from the Users table that don't have a UUID
         // --------------
@@ -440,7 +450,8 @@ public class AstridNewSyncMigrator {
                     MetadataCriteria.withKey(TaskToTagMetadata.KEY),
                     Criterion.or(TaskToTagMetadata.TASK_UUID.eq(0), TaskToTagMetadata.TASK_UUID.isNull(),
                             TaskToTagMetadata.TAG_UUID.eq(0), TaskToTagMetadata.TAG_UUID.isNull())));
-            incompleteMetadata = metadataService.query(incompleteQuery);;
+            incompleteMetadata = metadataService.query(incompleteQuery);
+            ;
             Metadata m = new Metadata();
             for (incompleteMetadata.moveToFirst(); !incompleteMetadata.isAfterLast(); incompleteMetadata.moveToNext()) {
                 try {
@@ -540,6 +551,7 @@ public class AstridNewSyncMigrator {
 
     private interface UUIDAssertionExtras<TYPE extends RemoteModel> {
         boolean shouldCreateOutstandingEntries(TYPE instance);
+
         void afterSave(TYPE instance, boolean createdOutstanding);
     }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/EmptyTitleOutstandingEntryMigration.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/EmptyTitleOutstandingEntryMigration.java
index fa4f5d4fa..1c360d8bb 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/EmptyTitleOutstandingEntryMigration.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/EmptyTitleOutstandingEntryMigration.java
@@ -1,8 +1,5 @@
 package com.todoroo.astrid.actfm.sync;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import android.util.Log;
 
 import com.todoroo.andlib.data.TodorooCursor;
@@ -21,6 +18,9 @@ import com.todoroo.astrid.data.TaskAttachment;
 import com.todoroo.astrid.data.TaskAttachmentOutstanding;
 import com.todoroo.astrid.data.TaskOutstanding;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class EmptyTitleOutstandingEntryMigration {
 
     private static final String ERROR_TAG = "empty-title-migrate"; //$NON-NLS-1$
@@ -46,24 +46,24 @@ public class EmptyTitleOutstandingEntryMigration {
                             .join(Join.left(Task.TABLE, Task.ID.eq(TaskOutstanding.TASK_ID)))
                             .where(Criterion.and(TaskOutstanding.COLUMN_STRING.eq(Task.TITLE.name),
                                     Criterion.and(TaskOutstanding.VALUE_STRING.isNotNull(), TaskOutstanding.VALUE_STRING.neq("")))) //$NON-NLS-1$
-                                    .groupBy(TaskOutstanding.TASK_ID));
-                List<Long> ids = new ArrayList<Long>();
-                List<String> uuids = new ArrayList<String>();
-                for (outstandingWithTitle.moveToFirst(); !outstandingWithTitle.isAfterLast(); outstandingWithTitle.moveToNext()) {
-                    try {
-                        ids.add(outstandingWithTitle.get(TaskOutstanding.TASK_ID));
-                        uuids.add(outstandingWithTitle.get(Task.UUID));
-                    } catch (Exception e) {
-                        Log.e(ERROR_TAG, "Error reading from cursor", e); //$NON-NLS-1$
-                    }
+                            .groupBy(TaskOutstanding.TASK_ID));
+            List<Long> ids = new ArrayList<Long>();
+            List<String> uuids = new ArrayList<String>();
+            for (outstandingWithTitle.moveToFirst(); !outstandingWithTitle.isAfterLast(); outstandingWithTitle.moveToNext()) {
+                try {
+                    ids.add(outstandingWithTitle.get(TaskOutstanding.TASK_ID));
+                    uuids.add(outstandingWithTitle.get(Task.UUID));
+                } catch (Exception e) {
+                    Log.e(ERROR_TAG, "Error reading from cursor", e); //$NON-NLS-1$
                 }
+            }
 
-                taskOutstandingDao.deleteWhere(Criterion.and(TaskOutstanding.TASK_ID.in(ids.toArray(new Long[ids.size()])),
-                        TaskOutstanding.COLUMN_STRING.eq(Task.TITLE.name),
-                        Criterion.or(TaskOutstanding.VALUE_STRING.isNull(), TaskOutstanding.VALUE_STRING.eq("")))); //$NON-NLS-1$
+            taskOutstandingDao.deleteWhere(Criterion.and(TaskOutstanding.TASK_ID.in(ids.toArray(new Long[ids.size()])),
+                    TaskOutstanding.COLUMN_STRING.eq(Task.TITLE.name),
+                    Criterion.or(TaskOutstanding.VALUE_STRING.isNull(), TaskOutstanding.VALUE_STRING.eq("")))); //$NON-NLS-1$
 
-                new ConstructOutstandingTableFromMasterTable<TaskAttachment, TaskAttachmentOutstanding>(NameMaps.TABLE_ID_ATTACHMENTS,
-                        taskAttachmentDao, taskAttachmentOutstandingDao, TaskAttachment.CREATED_AT).execute(TaskAttachment.TASK_UUID.in(uuids.toArray(new String[uuids.size()])));
+            new ConstructOutstandingTableFromMasterTable<TaskAttachment, TaskAttachmentOutstanding>(NameMaps.TABLE_ID_ATTACHMENTS,
+                    taskAttachmentDao, taskAttachmentOutstandingDao, TaskAttachment.CREATED_AT).execute(TaskAttachment.TASK_UUID.in(uuids.toArray(new String[uuids.size()])));
         } catch (Exception e) {
             Log.e(ERROR_TAG, "Unhandled exception", e); //$NON-NLS-1$
         } finally {
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/SyncDatabaseListener.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/SyncDatabaseListener.java
index e238b920a..d3f6a1ca7 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/SyncDatabaseListener.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/SyncDatabaseListener.java
@@ -11,6 +11,7 @@ public class SyncDatabaseListener<MTYPE extends AbstractModel> implements ModelU
 
     private final ModelType modelType;
     protected final ActFmSyncThread actFmSyncThread;
+
     public SyncDatabaseListener(ActFmSyncThread actFmSyncThread, ModelType modelType) {
         this.actFmSyncThread = actFmSyncThread;
         this.modelType = modelType;
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/SyncUpgradePrompt.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/SyncUpgradePrompt.java
index 6bc95a2c9..c8ab87543 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/SyncUpgradePrompt.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/SyncUpgradePrompt.java
@@ -32,22 +32,22 @@ public class SyncUpgradePrompt {
                     // Logged into google but not astrid
                     d = getDialog(activity, R.string.sync_upgr_gtasks_only_title, R.string.sync_upgr_gtasks_only_body,
                             R.string.sync_upgr_gtasks_only_btn1, new Runnable() {
-                                @Override
-                                public void run() {
-                                    activity.startActivity(new Intent(activity, ActFmLoginActivity.class));
-                                }
-                            },
+                        @Override
+                        public void run() {
+                            activity.startActivity(new Intent(activity, ActFmLoginActivity.class));
+                        }
+                    },
                             R.string.sync_upgr_gtasks_only_btn2,
                             null);
                 } else {
                     // Logged into neither
                     d = getDialog(activity, R.string.sync_upgr_neither_title, R.string.sync_upgr_neither_body,
                             R.string.sync_upgr_neither_btn1, new Runnable() {
-                                @Override
-                                public void run() {
-                                    activity.startActivity(new Intent(activity, ActFmLoginActivity.class));
-                                }
-                            });
+                        @Override
+                        public void run() {
+                            activity.startActivity(new Intent(activity, ActFmLoginActivity.class));
+                        }
+                    });
                 }
                 setLastPromptDate(DateUtilities.now());
             } else if (PluginServices.getGtasksPreferenceService().isLoggedIn()) {
@@ -56,12 +56,12 @@ public class SyncUpgradePrompt {
                         R.string.sync_upgr_both_btn1,
                         null,
                         R.string.sync_upgr_both_btn2, new Runnable() {
-                            @Override
-                            public void run() {
-                                new ActFmSyncV2Provider().signOut(activity);
-                                Toast.makeText(activity, R.string.sync_upgr_logged_out, Toast.LENGTH_LONG).show();
-                            }
-                        });
+                    @Override
+                    public void run() {
+                        new ActFmSyncV2Provider().signOut(activity);
+                        Toast.makeText(activity, R.string.sync_upgr_logged_out, Toast.LENGTH_LONG).show();
+                    }
+                });
                 setLastPromptDate(Long.MAX_VALUE);
             } else {
                 // Logged into just astrid--don't need to show prompts anymore
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/AcknowledgeChange.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/AcknowledgeChange.java
index dab4c17db..2f85ab47e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/AcknowledgeChange.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/AcknowledgeChange.java
@@ -1,17 +1,17 @@
 package com.todoroo.astrid.actfm.sync.messages;
 
-import java.util.ArrayList;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.util.Log;
 
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.dao.OutstandingEntryDao;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
 public class AcknowledgeChange extends ServerToClientMessage {
 
     private static final String ERROR_TAG = "actfm-acknowledge-change"; //$NON-NLS-1$
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/BriefMe.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/BriefMe.java
index 5574c7830..a3dd29190 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/BriefMe.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/BriefMe.java
@@ -1,15 +1,15 @@
 package com.todoroo.astrid.actfm.sync.messages;
 
-import org.apache.http.entity.mime.MultipartEntity;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.util.Log;
 
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.dao.RemoteModelDao;
 import com.todoroo.astrid.data.RemoteModel;
 
+import org.apache.http.entity.mime.MultipartEntity;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 public class BriefMe<TYPE extends RemoteModel> extends ClientToServerMessage<TYPE> {
 
     private static final String ERROR_TAG = "actfm-brief-me"; //$NON-NLS-1$
@@ -30,7 +30,7 @@ public class BriefMe<TYPE extends RemoteModel> extends ClientToServerMessage<TYP
 
     private final Object[] extraParameters;
 
-    public BriefMe(Class<TYPE> modelClass, String uuid, long pushedAt, Object...extraParameters) {
+    public BriefMe(Class<TYPE> modelClass, String uuid, long pushedAt, Object... extraParameters) {
         super(modelClass, uuid, pushedAt);
         this.extraParameters = extraParameters;
     }
@@ -38,7 +38,7 @@ public class BriefMe<TYPE extends RemoteModel> extends ClientToServerMessage<TYP
     @Override
     protected boolean serializeExtrasToJSON(JSONObject serializeTo, MultipartEntity entity) throws JSONException {
         if (extraParameters != null && extraParameters.length > 0) {
-            for (int i = 0; i < extraParameters.length - 1; i+=2) {
+            for (int i = 0; i < extraParameters.length - 1; i += 2) {
                 try {
                     String key = (String) extraParameters[i];
                     Object value = extraParameters[i + 1];
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java
index 8b46796f3..092cfc711 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java
@@ -1,16 +1,5 @@
 package com.todoroo.astrid.actfm.sync.messages;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.http.entity.mime.MultipartEntity;
-import org.apache.http.entity.mime.content.FileBody;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -41,6 +30,17 @@ import com.todoroo.astrid.data.UserActivityOutstanding;
 import com.todoroo.astrid.data.WaitingOnMe;
 import com.todoroo.astrid.data.WaitingOnMeOutstanding;
 
+import org.apache.http.entity.mime.MultipartEntity;
+import org.apache.http.entity.mime.content.FileBody;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
 @SuppressWarnings("nls")
 public class ChangesHappened<TYPE extends RemoteModel, OE extends OutstandingEntry<TYPE>> extends ClientToServerMessage<TYPE> {
 
@@ -53,32 +53,32 @@ public class ChangesHappened<TYPE extends RemoteModel, OE extends OutstandingEnt
     public static final String CHANGES_KEY = "changes";
 
     public static ChangesHappened<?, ?> instantiateChangesHappened(long id, ModelType modelType) {
-        switch(modelType) {
-        case TYPE_TASK:
-            return new ChangesHappened<Task, TaskOutstanding>(id, Task.class,
-                    PluginServices.getTaskDao(), PluginServices.getTaskOutstandingDao());
-        case TYPE_TAG:
-            return new ChangesHappened<TagData, TagOutstanding>(id, TagData.class,
-                    PluginServices.getTagDataDao(), PluginServices.getTagOutstandingDao());
-        case TYPE_ACTIVITY:
-            return new ChangesHappened<UserActivity, UserActivityOutstanding>(id, UserActivity.class,
-                    PluginServices.getUserActivityDao(), PluginServices.getUserActivityOutstandingDao());
-        case TYPE_ATTACHMENT:
-            return new ChangesHappened<TaskAttachment, TaskAttachmentOutstanding>(id, TaskAttachment.class,
-                    PluginServices.getTaskAttachmentDao(), PluginServices.getTaskAttachmentOutstandingDao());
-        case TYPE_TASK_LIST_METADATA:
-            return new TaskListMetadataChangesHappened(id, TaskListMetadata.class,
-                    PluginServices.getTaskListMetadataDao(), PluginServices.getTaskListMetadataOutstandingDao());
-        case TYPE_WAITING_ON_ME:
-            return new ChangesHappened<WaitingOnMe, WaitingOnMeOutstanding>(id, WaitingOnMe.class,
-                    PluginServices.getWaitingOnMeDao(), PluginServices.getWaitingOnMeOutstandingDao());
-        default:
-            return null;
+        switch (modelType) {
+            case TYPE_TASK:
+                return new ChangesHappened<Task, TaskOutstanding>(id, Task.class,
+                        PluginServices.getTaskDao(), PluginServices.getTaskOutstandingDao());
+            case TYPE_TAG:
+                return new ChangesHappened<TagData, TagOutstanding>(id, TagData.class,
+                        PluginServices.getTagDataDao(), PluginServices.getTagOutstandingDao());
+            case TYPE_ACTIVITY:
+                return new ChangesHappened<UserActivity, UserActivityOutstanding>(id, UserActivity.class,
+                        PluginServices.getUserActivityDao(), PluginServices.getUserActivityOutstandingDao());
+            case TYPE_ATTACHMENT:
+                return new ChangesHappened<TaskAttachment, TaskAttachmentOutstanding>(id, TaskAttachment.class,
+                        PluginServices.getTaskAttachmentDao(), PluginServices.getTaskAttachmentOutstandingDao());
+            case TYPE_TASK_LIST_METADATA:
+                return new TaskListMetadataChangesHappened(id, TaskListMetadata.class,
+                        PluginServices.getTaskListMetadataDao(), PluginServices.getTaskListMetadataOutstandingDao());
+            case TYPE_WAITING_ON_ME:
+                return new ChangesHappened<WaitingOnMe, WaitingOnMeOutstanding>(id, WaitingOnMe.class,
+                        PluginServices.getWaitingOnMeDao(), PluginServices.getWaitingOnMeOutstandingDao());
+            default:
+                return null;
         }
     }
 
     public ChangesHappened(long id, Class<TYPE> modelClass, RemoteModelDao<TYPE> modelDao,
-            OutstandingEntryDao<OE> outstandingDao) {
+                           OutstandingEntryDao<OE> outstandingDao) {
         super(id, modelClass, modelDao);
 
         this.outstandingClass = DaoReflectionHelpers.getOutstandingClass(modelClass);
@@ -201,7 +201,7 @@ public class ChangesHappened<TYPE extends RemoteModel, OE extends OutstandingEnt
 
     protected void populateChanges() {
         TodorooCursor<OE> cursor = outstandingDao.query(Query.select(DaoReflectionHelpers.getModelProperties(outstandingClass))
-               .where(OutstandingEntry.ENTITY_ID_PROPERTY.eq(id)).orderBy(Order.asc(OutstandingEntry.CREATED_AT_PROPERTY)));
+                .where(OutstandingEntry.ENTITY_ID_PROPERTY.eq(id)).orderBy(Order.asc(OutstandingEntry.CREATED_AT_PROPERTY)));
         try {
             for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 try {
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ClientToServerMessage.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ClientToServerMessage.java
index fff800665..5b39f0051 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ClientToServerMessage.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ClientToServerMessage.java
@@ -1,9 +1,5 @@
 package com.todoroo.astrid.actfm.sync.messages;
 
-import org.apache.http.entity.mime.MultipartEntity;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import com.crittercism.app.Crittercism;
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.data.Table;
@@ -12,6 +8,10 @@ import com.todoroo.astrid.dao.DaoReflectionHelpers;
 import com.todoroo.astrid.dao.RemoteModelDao;
 import com.todoroo.astrid.data.RemoteModel;
 
+import org.apache.http.entity.mime.MultipartEntity;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 @SuppressWarnings("nls")
 public abstract class ClientToServerMessage<TYPE extends RemoteModel> {
 
@@ -116,5 +116,6 @@ public abstract class ClientToServerMessage<TYPE extends RemoteModel> {
     }
 
     protected abstract boolean serializeExtrasToJSON(JSONObject serializeTo, MultipartEntity entity) throws JSONException;
+
     protected abstract String getTypeString();
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ConstructOutstandingTableFromMasterTable.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ConstructOutstandingTableFromMasterTable.java
index 8926d8a11..35f7c1e56 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ConstructOutstandingTableFromMasterTable.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ConstructOutstandingTableFromMasterTable.java
@@ -24,7 +24,7 @@ public class ConstructOutstandingTableFromMasterTable<TYPE extends RemoteModel,
     protected final LongProperty createdAtProperty;
 
     public ConstructOutstandingTableFromMasterTable(String table, RemoteModelDao<TYPE> dao,
-            OutstandingEntryDao<OE> outstandingDao, LongProperty createdAtProperty) {
+                                                    OutstandingEntryDao<OE> outstandingDao, LongProperty createdAtProperty) {
         this.table = table;
         this.dao = dao;
         this.outstandingDao = outstandingDao;
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/Debug.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/Debug.java
index f8bbc667f..843840628 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/Debug.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/Debug.java
@@ -1,10 +1,10 @@
 package com.todoroo.astrid.actfm.sync.messages;
 
-import org.json.JSONObject;
-
 import android.text.TextUtils;
 import android.util.Log;
 
+import org.json.JSONObject;
+
 public class Debug extends ServerToClientMessage {
 
     public Debug(JSONObject json) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/FetchHistory.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/FetchHistory.java
index ae8c58833..dcffa4459 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/FetchHistory.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/FetchHistory.java
@@ -1,12 +1,5 @@
 package com.todoroo.astrid.actfm.sync.messages;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -25,6 +18,13 @@ import com.todoroo.astrid.data.RemoteModel;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.User;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+
 public class FetchHistory<TYPE extends RemoteModel> {
 
     private static final String ERROR_TAG = "actfm-fetch-history"; //$NON-NLS-1$
@@ -52,7 +52,7 @@ public class FetchHistory<TYPE extends RemoteModel> {
     private ActFmPreferenceService actFmPreferenceService;
 
     public FetchHistory(RemoteModelDao<TYPE> dao, LongProperty historyTimeProperty, IntegerProperty historyHasMoreProperty,
-            String table, String uuid, String taskTitle, long modifiedAfter, int offset, SyncMessageCallback done) {
+                        String table, String uuid, String taskTitle, long modifiedAfter, int offset, SyncMessageCallback done) {
         DependencyInjectionService.getInstance().inject(this);
         this.dao = dao;
         this.historyTimeProperty = historyTimeProperty;
@@ -85,14 +85,17 @@ public class FetchHistory<TYPE extends RemoteModel> {
                 params.add(uuid);
 
                 if (modifiedAfter > 0) {
-                    params.add("modified_after"); params.add(modifiedAfter / 1000L);
+                    params.add("modified_after");
+                    params.add(modifiedAfter / 1000L);
                 }
 
                 if (offset > 0) {
-                    params.add("offset"); params.add(offset);
+                    params.add("offset");
+                    params.add(offset);
                 }
 
-                params.add("token"); params.add(token);
+                params.add("token");
+                params.add(token);
                 try {
                     JSONObject result = actFmInvoker.invoke("model_history_list", params.toArray(new Object[params.size()]));
                     JSONArray list = result.optJSONArray("list");
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/JSONChangeToPropertyVisitor.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/JSONChangeToPropertyVisitor.java
index f1b52f310..bea292df8 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/JSONChangeToPropertyVisitor.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/JSONChangeToPropertyVisitor.java
@@ -1,8 +1,5 @@
 package com.todoroo.astrid.actfm.sync.messages;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.util.Log;
 
 import com.todoroo.andlib.data.AbstractModel;
@@ -16,6 +13,9 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.data.Task;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 
 @SuppressWarnings("nls")
 public class JSONChangeToPropertyVisitor implements PropertyVisitor<Void, String> {
@@ -61,7 +61,7 @@ public class JSONChangeToPropertyVisitor implements PropertyVisitor<Void, String
                     if (Task.DUE_DATE.equals(property)) {
                         value = Task.createDueDate(DateUtilities.isoStringHasTime(valueString) ? Task.URGENCY_SPECIFIC_DAY_TIME : Task.URGENCY_SPECIFIC_DAY, value);
                     }
-                } catch (Exception e){
+                } catch (Exception e) {
                     value = 0;
                 }
             }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/JSONPayloadBuilder.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/JSONPayloadBuilder.java
index 91efc8fd7..c6fe81f94 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/JSONPayloadBuilder.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/JSONPayloadBuilder.java
@@ -1,10 +1,10 @@
 package com.todoroo.astrid.actfm.sync.messages;
 
+import com.todoroo.astrid.actfm.sync.ActFmSyncThread;
+
 import org.apache.http.entity.mime.MultipartEntity;
 import org.json.JSONObject;
 
-import com.todoroo.astrid.actfm.sync.ActFmSyncThread;
-
 public class JSONPayloadBuilder {
 
     private final StringBuilder sb = new StringBuilder("["); //$NON-NLS-1$
@@ -26,7 +26,7 @@ public class JSONPayloadBuilder {
             temp.delete(0, temp.length());
             if (obj != null) {
                 temp.append(obj)
-                .append(","); //$NON-NLS-1$
+                        .append(","); //$NON-NLS-1$
                 ActFmSyncThread.syncLog(temp.toString());
 
                 sb.append(temp);
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java
index dd4b410ff..73263e2be 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java
@@ -1,13 +1,5 @@
 package com.todoroo.astrid.actfm.sync.messages;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -41,6 +33,14 @@ import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.tags.TagService;
 import com.todoroo.astrid.tags.TaskToTagMetadata;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Iterator;
+
 @SuppressWarnings("nls")
 public class MakeChanges<TYPE extends RemoteModel> extends ServerToClientMessage {
 
@@ -340,7 +340,7 @@ public class MakeChanges<TYPE extends RemoteModel> extends ServerToClientMessage
                 if (!TextUtils.isEmpty(valueString)) {
                     try {
                         deletedValue = DateUtilities.parseIso8601(valueString);
-                    } catch (Exception e){
+                    } catch (Exception e) {
                         //
                     }
                 }
@@ -437,5 +437,4 @@ public class MakeChanges<TYPE extends RemoteModel> extends ServerToClientMessage
     }
 
 
-
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java
index 91e675734..590e3048c 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java
@@ -1,10 +1,5 @@
 package com.todoroo.astrid.actfm.sync.messages;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.Table;
 import com.todoroo.andlib.utility.AndroidUtilities;
@@ -17,6 +12,11 @@ import com.todoroo.astrid.data.User;
 import com.todoroo.astrid.data.UserActivity;
 import com.todoroo.astrid.data.WaitingOnMe;
 
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
 @SuppressWarnings("nls")
 public class NameMaps {
 
@@ -73,8 +73,8 @@ public class NameMaps {
     // ---- Column name mappings -------
     // --------------------------------
     private static void putPropertyToServerName(Property<?> property, String serverName,
-            Map<Property<?>, String> propertyMap, Map<String, Property<?>> localNameMap, Map<String, String> serverNameMap,
-            Set<String> excludedFromOutstandingSet, boolean writeable) {
+                                                Map<Property<?>, String> propertyMap, Map<String, Property<?>> localNameMap, Map<String, String> serverNameMap,
+                                                Set<String> excludedFromOutstandingSet, boolean writeable) {
         propertyMap.put(property, serverName);
         localNameMap.put(property.name, property);
         serverNameMap.put(property.name, serverName);
@@ -130,22 +130,22 @@ public class NameMaps {
         TASK_COLUMN_NAMES_TO_PROPERTIES = new HashMap<String, Property<?>>();
         TASK_PROPERTIES_EXCLUDED = new HashSet<String>();
 
-        putTaskPropertyToServerName(Task.TITLE,           "title",          true);
-        putTaskPropertyToServerName(Task.IMPORTANCE,      "importance",     true);
-        putTaskPropertyToServerName(Task.DUE_DATE,        "due",            true);
-        putTaskPropertyToServerName(Task.HIDE_UNTIL,      "hide_until",     true);
-        putTaskPropertyToServerName(Task.CREATION_DATE,   "created_at",     true);
-        putTaskPropertyToServerName(Task.COMPLETION_DATE, "completed_at",   true);
-        putTaskPropertyToServerName(Task.RECURRENCE,      "repeat",         true);
-        putTaskPropertyToServerName(Task.DELETION_DATE,   "deleted_at",     true);
-        putTaskPropertyToServerName(Task.NOTES,           "notes",          true);
-        putTaskPropertyToServerName(Task.RECURRENCE,      "repeat",         true);
-        putTaskPropertyToServerName(Task.USER_ID,         "user_id",        true);
-        putTaskPropertyToServerName(Task.CREATOR_ID,      "creator_id",     false);
-        putTaskPropertyToServerName(Task.UUID,            "uuid",           false);
-        putTaskPropertyToServerName(Task.IS_PUBLIC,       "public",         true);
-        putTaskPropertyToServerName(Task.IS_READONLY,     "read_only",      false);
-        putTaskPropertyToServerName(Task.CLASSIFICATION,  "classification", false);
+        putTaskPropertyToServerName(Task.TITLE, "title", true);
+        putTaskPropertyToServerName(Task.IMPORTANCE, "importance", true);
+        putTaskPropertyToServerName(Task.DUE_DATE, "due", true);
+        putTaskPropertyToServerName(Task.HIDE_UNTIL, "hide_until", true);
+        putTaskPropertyToServerName(Task.CREATION_DATE, "created_at", true);
+        putTaskPropertyToServerName(Task.COMPLETION_DATE, "completed_at", true);
+        putTaskPropertyToServerName(Task.RECURRENCE, "repeat", true);
+        putTaskPropertyToServerName(Task.DELETION_DATE, "deleted_at", true);
+        putTaskPropertyToServerName(Task.NOTES, "notes", true);
+        putTaskPropertyToServerName(Task.RECURRENCE, "repeat", true);
+        putTaskPropertyToServerName(Task.USER_ID, "user_id", true);
+        putTaskPropertyToServerName(Task.CREATOR_ID, "creator_id", false);
+        putTaskPropertyToServerName(Task.UUID, "uuid", false);
+        putTaskPropertyToServerName(Task.IS_PUBLIC, "public", true);
+        putTaskPropertyToServerName(Task.IS_READONLY, "read_only", false);
+        putTaskPropertyToServerName(Task.CLASSIFICATION, "classification", false);
 
         TASK_PROPERTIES_SERVER_TO_LOCAL = AndroidUtilities.reverseMap(TASK_PROPERTIES_LOCAL_TO_SERVER);
     }
@@ -168,6 +168,7 @@ public class NameMaps {
         putPropertyToServerName(property, serverName, TAG_DATA_PROPERTIES_LOCAL_TO_SERVER, TAG_DATA_COLUMN_NAMES_TO_PROPERTIES,
                 TAG_DATA_COLUMNS_LOCAL_TO_SERVER, TAG_PROPERTIES_EXCLUDED, writeable);
     }
+
     static {
         // Hardcoded local columns mapped to corresponding server names
         TAG_DATA_PROPERTIES_LOCAL_TO_SERVER = new HashMap<Property<?>, String>();
@@ -175,15 +176,15 @@ public class NameMaps {
         TAG_DATA_COLUMN_NAMES_TO_PROPERTIES = new HashMap<String, Property<?>>();
         TAG_PROPERTIES_EXCLUDED = new HashSet<String>();
 
-        putTagPropertyToServerName(TagData.USER_ID,         "user_id",      true);
-        putTagPropertyToServerName(TagData.NAME,            "name",         true);
-        putTagPropertyToServerName(TagData.CREATION_DATE,   "created_at",   true);
-        putTagPropertyToServerName(TagData.DELETION_DATE,   "deleted_at",   true);
-        putTagPropertyToServerName(TagData.UUID,            "uuid",         false);
-        putTagPropertyToServerName(TagData.TASK_COUNT,      "task_count",   false);
-        putTagPropertyToServerName(TagData.TAG_DESCRIPTION, "description",  true);
-        putTagPropertyToServerName(TagData.PICTURE,         "picture",      true);
-        putTagPropertyToServerName(TagData.IS_FOLDER,       "is_folder",    false);
+        putTagPropertyToServerName(TagData.USER_ID, "user_id", true);
+        putTagPropertyToServerName(TagData.NAME, "name", true);
+        putTagPropertyToServerName(TagData.CREATION_DATE, "created_at", true);
+        putTagPropertyToServerName(TagData.DELETION_DATE, "deleted_at", true);
+        putTagPropertyToServerName(TagData.UUID, "uuid", false);
+        putTagPropertyToServerName(TagData.TASK_COUNT, "task_count", false);
+        putTagPropertyToServerName(TagData.TAG_DESCRIPTION, "description", true);
+        putTagPropertyToServerName(TagData.PICTURE, "picture", true);
+        putTagPropertyToServerName(TagData.IS_FOLDER, "is_folder", false);
 
         // Reverse the mapping to construct the server to local map
         TAG_DATA_PROPERTIES_SERVER_TO_LOCAL = AndroidUtilities.reverseMap(TAG_DATA_PROPERTIES_LOCAL_TO_SERVER);
@@ -193,7 +194,6 @@ public class NameMaps {
     public static final String MEMBER_REMOVED_COLUMN = "member_removed";
 
 
-
     // ----------
     // Users
     // ----------
@@ -214,11 +214,11 @@ public class NameMaps {
         USER_COLUMNS_LOCAL_TO_SERVER = new HashMap<String, String>();
         USER_PROPERTIES_EXCLUDED = new HashSet<String>();
 
-        putUserPropertyToServerName(User.UUID,       "uuid",       false);
-        putUserPropertyToServerName(User.PICTURE,    "picture",    false);
+        putUserPropertyToServerName(User.UUID, "uuid", false);
+        putUserPropertyToServerName(User.PICTURE, "picture", false);
         putUserPropertyToServerName(User.FIRST_NAME, "first_name", false);
-        putUserPropertyToServerName(User.LAST_NAME,  "last_name",  false);
-        putUserPropertyToServerName(User.STATUS,     "connection", true);
+        putUserPropertyToServerName(User.LAST_NAME, "last_name", false);
+        putUserPropertyToServerName(User.STATUS, "connection", true);
 
 
         // Reverse the mapping to construct the server to local map
@@ -245,15 +245,15 @@ public class NameMaps {
         USER_ACTIVITY_COLUMNS_LOCAL_TO_SERVER = new HashMap<String, String>();
         USER_ACTIVITY_PROPERTIES_EXCLUDED = new HashSet<String>();
 
-        putUserActivityPropertyToServerName(UserActivity.UUID,        "uuid",        false);
-        putUserActivityPropertyToServerName(UserActivity.USER_UUID,   "user_id",     false);
-        putUserActivityPropertyToServerName(UserActivity.ACTION,      "action",      true);
-        putUserActivityPropertyToServerName(UserActivity.MESSAGE,     "message",     true);
-        putUserActivityPropertyToServerName(UserActivity.PICTURE,     "picture",     true);
-        putUserActivityPropertyToServerName(UserActivity.TARGET_ID,   "target_id",   true);
+        putUserActivityPropertyToServerName(UserActivity.UUID, "uuid", false);
+        putUserActivityPropertyToServerName(UserActivity.USER_UUID, "user_id", false);
+        putUserActivityPropertyToServerName(UserActivity.ACTION, "action", true);
+        putUserActivityPropertyToServerName(UserActivity.MESSAGE, "message", true);
+        putUserActivityPropertyToServerName(UserActivity.PICTURE, "picture", true);
+        putUserActivityPropertyToServerName(UserActivity.TARGET_ID, "target_id", true);
         putUserActivityPropertyToServerName(UserActivity.TARGET_NAME, "target_name", false);
-        putUserActivityPropertyToServerName(UserActivity.CREATED_AT,  "created_at",  true);
-        putUserActivityPropertyToServerName(UserActivity.DELETED_AT,  "deleted_at",  true);
+        putUserActivityPropertyToServerName(UserActivity.CREATED_AT, "created_at", true);
+        putUserActivityPropertyToServerName(UserActivity.DELETED_AT, "deleted_at", true);
 
 
         // Reverse the mapping to construct the server to local map
@@ -282,15 +282,15 @@ public class NameMaps {
         TASK_ATTACHMENT_COLUMNS_LOCAL_TO_SERVER = new HashMap<String, String>();
         TASK_ATTACHMENT_PROPERTIES_EXCLUDED = new HashSet<String>();
 
-        putTaskAttachmentPropertyToServerName(TaskAttachment.UUID,         "uuid",         false);
-        putTaskAttachmentPropertyToServerName(TaskAttachment.USER_UUID,    "user_id",      false);
-        putTaskAttachmentPropertyToServerName(TaskAttachment.TASK_UUID,    "task_id",      true);
-        putTaskAttachmentPropertyToServerName(TaskAttachment.NAME,         "name",         false);
-        putTaskAttachmentPropertyToServerName(TaskAttachment.URL,          "url",          false);
-        putTaskAttachmentPropertyToServerName(TaskAttachment.SIZE,         "size",         false);
+        putTaskAttachmentPropertyToServerName(TaskAttachment.UUID, "uuid", false);
+        putTaskAttachmentPropertyToServerName(TaskAttachment.USER_UUID, "user_id", false);
+        putTaskAttachmentPropertyToServerName(TaskAttachment.TASK_UUID, "task_id", true);
+        putTaskAttachmentPropertyToServerName(TaskAttachment.NAME, "name", false);
+        putTaskAttachmentPropertyToServerName(TaskAttachment.URL, "url", false);
+        putTaskAttachmentPropertyToServerName(TaskAttachment.SIZE, "size", false);
         putTaskAttachmentPropertyToServerName(TaskAttachment.CONTENT_TYPE, "content_type", false);
-        putTaskAttachmentPropertyToServerName(TaskAttachment.CREATED_AT,   "created_at",   true);
-        putTaskAttachmentPropertyToServerName(TaskAttachment.DELETED_AT,   "deleted_at",   true);
+        putTaskAttachmentPropertyToServerName(TaskAttachment.CREATED_AT, "created_at", true);
+        putTaskAttachmentPropertyToServerName(TaskAttachment.DELETED_AT, "deleted_at", true);
 
 
         // Reverse the mapping to construct the server to local map
@@ -317,14 +317,14 @@ public class NameMaps {
         TASK_LIST_METADATA_COLUMNS_LOCAL_TO_SERVER = new HashMap<String, String>();
         TASK_LIST_METADATA_PROPERTIES_EXCLUDED = new HashSet<String>();
 
-        putTaskListMetadataPropertyToServerName(TaskListMetadata.UUID,          "uuid",          false);
-        putTaskListMetadataPropertyToServerName(TaskListMetadata.TAG_UUID,      "tag_id",        true);
-        putTaskListMetadataPropertyToServerName(TaskListMetadata.FILTER,        "filter",        true);
-        putTaskListMetadataPropertyToServerName(TaskListMetadata.TASK_IDS,      "task_ids",      true);
-        putTaskListMetadataPropertyToServerName(TaskListMetadata.SORT,          "sort",          false);
-        putTaskListMetadataPropertyToServerName(TaskListMetadata.SETTINGS,      "settings",      false);
+        putTaskListMetadataPropertyToServerName(TaskListMetadata.UUID, "uuid", false);
+        putTaskListMetadataPropertyToServerName(TaskListMetadata.TAG_UUID, "tag_id", true);
+        putTaskListMetadataPropertyToServerName(TaskListMetadata.FILTER, "filter", true);
+        putTaskListMetadataPropertyToServerName(TaskListMetadata.TASK_IDS, "task_ids", true);
+        putTaskListMetadataPropertyToServerName(TaskListMetadata.SORT, "sort", false);
+        putTaskListMetadataPropertyToServerName(TaskListMetadata.SETTINGS, "settings", false);
         putTaskListMetadataPropertyToServerName(TaskListMetadata.CHILD_TAG_IDS, "child_tag_ids", false);
-        putTaskListMetadataPropertyToServerName(TaskListMetadata.IS_COLLAPSED,  "is_collapsed",  false);
+        putTaskListMetadataPropertyToServerName(TaskListMetadata.IS_COLLAPSED, "is_collapsed", false);
 
         // Reverse the mapping to construct the server to local map
         TASK_LIST_METADATA_PROPERTIES_SERVER_TO_LOCAL = AndroidUtilities.reverseMap(TASK_LIST_METADATA_PROPERTIES_LOCAL_TO_SERVER);
@@ -350,14 +350,14 @@ public class NameMaps {
         WAITING_ON_ME_COLUMNS_LOCAL_TO_SERVER = new HashMap<String, String>();
         WAITING_ON_ME_PROPERTIES_EXCLUDED = new HashSet<String>();
 
-        putWaitingOnMePropertyToServerName(WaitingOnMe.UUID,            "uuid",            false);
+        putWaitingOnMePropertyToServerName(WaitingOnMe.UUID, "uuid", false);
         putWaitingOnMePropertyToServerName(WaitingOnMe.WAITING_USER_ID, "waiting_user_id", false);
-        putWaitingOnMePropertyToServerName(WaitingOnMe.TASK_UUID,       "task_id",         false);
-        putWaitingOnMePropertyToServerName(WaitingOnMe.WAIT_TYPE,       "wait_type",       false);
-        putWaitingOnMePropertyToServerName(WaitingOnMe.CREATED_AT,      "created_at",      false);
-        putWaitingOnMePropertyToServerName(WaitingOnMe.DELETED_AT,      "deleted_at",      true);
-        putWaitingOnMePropertyToServerName(WaitingOnMe.READ_AT,         "read_at",         true);
-        putWaitingOnMePropertyToServerName(WaitingOnMe.ACKNOWLEDGED,    "acknowledged",    true);
+        putWaitingOnMePropertyToServerName(WaitingOnMe.TASK_UUID, "task_id", false);
+        putWaitingOnMePropertyToServerName(WaitingOnMe.WAIT_TYPE, "wait_type", false);
+        putWaitingOnMePropertyToServerName(WaitingOnMe.CREATED_AT, "created_at", false);
+        putWaitingOnMePropertyToServerName(WaitingOnMe.DELETED_AT, "deleted_at", true);
+        putWaitingOnMePropertyToServerName(WaitingOnMe.READ_AT, "read_at", true);
+        putWaitingOnMePropertyToServerName(WaitingOnMe.ACKNOWLEDGED, "acknowledged", true);
 
         // Reverse the mapping to construct the server to local map
         WAITING_ON_ME_PROPERTIES_SERVER_TO_LOCAL = AndroidUtilities.reverseMap(WAITING_ON_ME_PROPERTIES_LOCAL_TO_SERVER);
@@ -369,7 +369,7 @@ public class NameMaps {
     // ----------
 
     private static <A, B> B mapColumnName(String table, A col, Map<A, B> taskMap, Map<A, B> tagMap, Map<A, B> userMap,
-            Map<A, B> userActivityMap, Map<A, B> taskAttachmentMap, Map<A, B> taskListMetadataMap, Map<A, B> waitingOnMeMap) {
+                                          Map<A, B> userActivityMap, Map<A, B> taskAttachmentMap, Map<A, B> taskListMetadataMap, Map<A, B> waitingOnMeMap) {
         Map<A, B> map = null;
         if (TABLE_ID_TASKS.equals(table))
             map = taskMap;
@@ -394,8 +394,8 @@ public class NameMaps {
 
     public static boolean shouldRecordOutstandingColumnForTable(String table, String column) {
         if (TABLE_ID_TASKS.equals(table)) {
-           if (TASK_COLUMN_NAMES_TO_PROPERTIES.containsKey(column))
-               return !TASK_PROPERTIES_EXCLUDED.contains(column);
+            if (TASK_COLUMN_NAMES_TO_PROPERTIES.containsKey(column))
+                return !TASK_PROPERTIES_EXCLUDED.contains(column);
         } else if (TABLE_ID_TAGS.equals(table)) {
             if (TAG_DATA_COLUMN_NAMES_TO_PROPERTIES.containsKey(column))
                 return !TAG_PROPERTIES_EXCLUDED.contains(column);
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java
index 78c89799a..378a683bc 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java
@@ -1,9 +1,5 @@
 package com.todoroo.astrid.actfm.sync.messages;
 
-import java.text.ParseException;
-
-import org.json.JSONObject;
-
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -16,6 +12,10 @@ import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.User;
 
+import org.json.JSONObject;
+
+import java.text.ParseException;
+
 @SuppressWarnings("nls")
 public class NowBriefed<TYPE extends RemoteModel> extends ServerToClientMessage {
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ReplayOutstandingEntries.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ReplayOutstandingEntries.java
index 260f624ac..c5e215e79 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ReplayOutstandingEntries.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ReplayOutstandingEntries.java
@@ -74,7 +74,7 @@ public class ReplayOutstandingEntries<T extends RemoteModel, OE extends Outstand
                 instance.readPropertiesFromCursor(outstanding);
                 if (instance.getValue(OutstandingEntry.ENTITY_ID_PROPERTY) != id)
                     break;
-                count ++;
+                count++;
                 String column = instance.getValue(OutstandingEntry.COLUMN_STRING_PROPERTY);
                 Property<?> property = NameMaps.localColumnNameToProperty(table, column);
                 // set values to model
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/RequestDoubleCheck.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/RequestDoubleCheck.java
index 5f405f783..c0c9a697e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/RequestDoubleCheck.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/RequestDoubleCheck.java
@@ -1,12 +1,12 @@
 package com.todoroo.astrid.actfm.sync.messages;
 
+import com.todoroo.astrid.dao.RemoteModelDao;
+import com.todoroo.astrid.data.RemoteModel;
+
 import org.apache.http.entity.mime.MultipartEntity;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.todoroo.astrid.dao.RemoteModelDao;
-import com.todoroo.astrid.data.RemoteModel;
-
 public class RequestDoubleCheck<TYPE extends RemoteModel> extends ClientToServerMessage<TYPE> {
 
     public RequestDoubleCheck(long id, Class<TYPE> modelClass, RemoteModelDao<TYPE> modelDao) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java
index f31fe6eee..fa6444089 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java
@@ -1,7 +1,5 @@
 package com.todoroo.astrid.actfm.sync.messages;
 
-import org.json.JSONObject;
-
 import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.Task;
@@ -11,6 +9,8 @@ import com.todoroo.astrid.data.User;
 import com.todoroo.astrid.data.UserActivity;
 import com.todoroo.astrid.data.WaitingOnMe;
 
+import org.json.JSONObject;
+
 @SuppressWarnings("nls")
 public abstract class ServerToClientMessage {
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/TaskListMetadataChangesHappened.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/TaskListMetadataChangesHappened.java
index ba73feb7f..280998014 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/TaskListMetadataChangesHappened.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/TaskListMetadataChangesHappened.java
@@ -1,8 +1,5 @@
 package com.todoroo.astrid.actfm.sync.messages;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import android.text.TextUtils;
 
 import com.todoroo.astrid.dao.TaskListMetadataDao;
@@ -11,6 +8,9 @@ import com.todoroo.astrid.data.RemoteModel;
 import com.todoroo.astrid.data.TaskListMetadata;
 import com.todoroo.astrid.data.TaskListMetadataOutstanding;
 
+import java.util.HashSet;
+import java.util.Set;
+
 public class TaskListMetadataChangesHappened extends ChangesHappened<TaskListMetadata, TaskListMetadataOutstanding> {
 
     private final TaskListMetadataDao dao;
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/UserData.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/UserData.java
index 2f6387830..3653b67f4 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/UserData.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/UserData.java
@@ -1,7 +1,5 @@
 package com.todoroo.astrid.actfm.sync.messages;
 
-import org.json.JSONObject;
-
 import android.text.TextUtils;
 
 import com.todoroo.andlib.sql.Criterion;
@@ -12,6 +10,8 @@ import com.todoroo.astrid.data.TagMetadata;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.tags.TagMemberMetadata;
 
+import org.json.JSONObject;
+
 public class UserData extends ServerToClientMessage {
 
     public UserData(JSONObject json) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/UserMigrated.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/UserMigrated.java
index 15c94394e..d740bc2c1 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/UserMigrated.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/UserMigrated.java
@@ -1,11 +1,11 @@
 package com.todoroo.astrid.actfm.sync.messages;
 
-import org.json.JSONObject;
-
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.data.RemoteModel;
 
+import org.json.JSONObject;
+
 public class UserMigrated extends ServerToClientMessage {
 
     public UserMigrated(JSONObject json) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java
index 780f6dc04..859d719ff 100644
--- a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.alarms;
 
-import java.util.Date;
-import java.util.LinkedHashSet;
-
 import android.app.Activity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -26,11 +23,13 @@ import com.todoroo.astrid.ui.DateAndTimeDialog;
 import com.todoroo.astrid.ui.DateAndTimeDialog.DateAndTimeDialogListener;
 import com.todoroo.astrid.ui.DateAndTimePicker;
 
+import java.util.Date;
+import java.util.LinkedHashSet;
+
 /**
  * Control set to manage adding and removing tags
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public final class AlarmControlSet extends TaskEditControlSet {
 
@@ -48,7 +47,7 @@ public final class AlarmControlSet extends TaskEditControlSet {
         alertsContainer.removeAllViews();
         TodorooCursor<Metadata> cursor = AlarmService.getInstance().getAlarms(model.getId());
         try {
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext())
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext())
                 addAlarm(new Date(cursor.get(AlarmFields.TIME)));
         } finally {
             cursor.close();
@@ -79,14 +78,14 @@ public final class AlarmControlSet extends TaskEditControlSet {
     @Override
     protected String writeToModelAfterInitialized(Task task) {
         LinkedHashSet<Long> alarms = new LinkedHashSet<Long>();
-        for(int i = 0; i < alertsContainer.getChildCount(); i++) {
+        for (int i = 0; i < alertsContainer.getChildCount(); i++) {
             Long dateValue = (Long) alertsContainer.getChildAt(i).getTag();
-            if(dateValue == null)
+            if (dateValue == null)
                 continue;
             alarms.add(dateValue);
         }
 
-        if(AlarmService.getInstance().synchronizeAlarms(task.getId(), alarms))
+        if (AlarmService.getInstance().synchronizeAlarms(task.getId(), alarms))
             task.setValue(Task.MODIFICATION_DATE, DateUtilities.now());
 
         return null;
@@ -131,7 +130,7 @@ public final class AlarmControlSet extends TaskEditControlSet {
         display.setText(DateAndTimePicker.getDisplayString(activity, alert.getTime()));
 
         ImageButton reminderRemoveButton;
-        reminderRemoveButton = (ImageButton)alertItem.findViewById(R.id.button1);
+        reminderRemoveButton = (ImageButton) alertItem.findViewById(R.id.button1);
         reminderRemoveButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 alertsContainer.removeView(alertItem);
diff --git a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmDetailExposer.java
index cb6b7d3b3..72ad0e65a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmDetailExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmDetailExposer.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.alarms;
 
-import java.util.Date;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -18,11 +16,12 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.data.Metadata;
 
+import java.util.Date;
+
 /**
  * Exposes Task Detail for tags, i.e. "Tags: frogs, animals"
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class AlarmDetailExposer extends BroadcastReceiver {
 
@@ -31,11 +30,11 @@ public class AlarmDetailExposer extends BroadcastReceiver {
         ContextManager.setContext(context);
         // get tags associated with this task
         long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1);
-        if(taskId == -1)
+        if (taskId == -1)
             return;
 
         String taskDetail = getTaskDetails(context, taskId);
-        if(taskDetail == null)
+        if (taskDetail == null)
             return;
 
         // transmit
@@ -50,25 +49,25 @@ public class AlarmDetailExposer extends BroadcastReceiver {
         TodorooCursor<Metadata> cursor = AlarmService.getInstance().getAlarms(id);
         long nextTime = -1;
         try {
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 long time = cursor.get(AlarmFields.TIME);
-                if(time > DateUtilities.now()) {
+                if (time > DateUtilities.now()) {
                     nextTime = time;
                     break;
                 }
             }
 
-            if(nextTime == -1)
+            if (nextTime == -1)
                 return null;
             int flags = DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME;
             Date today = new Date();
             Date alarm = new Date(nextTime);
-            if(today.getYear() == alarm.getYear())
+            if (today.getYear() == alarm.getYear())
                 flags |= DateUtils.FORMAT_NO_YEAR;
-            if(alarm.getTime() - today.getTime() > DateUtilities.ONE_DAY)
+            if (alarm.getTime() - today.getTime() > DateUtilities.ONE_DAY)
                 flags |= DateUtils.FORMAT_SHOW_DATE;
             CharSequence durationString = DateUtils.formatDateTime(context, nextTime,
-                     flags);
+                    flags);
             return "<img src='silk_clock'/> " + durationString; //$NON-NLS-1$
         } finally {
             cursor.close();
diff --git a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmFields.java b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmFields.java
index 98d093a72..409ec45f8 100644
--- a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmFields.java
+++ b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmFields.java
@@ -13,27 +13,36 @@ import com.todoroo.astrid.data.Metadata;
  * Metadata entry for a task alarm
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class AlarmFields {
 
-    /** metadata key */
+    /**
+     * metadata key
+     */
     public static final String METADATA_KEY = "alarm"; //$NON-NLS-1$
 
-    /** time of alarm */
+    /**
+     * time of alarm
+     */
     public static final LongProperty TIME = new LongProperty(Metadata.TABLE,
             Metadata.VALUE1.name);
 
-    /** alarm type */
+    /**
+     * alarm type
+     */
     public static final IntegerProperty TYPE = new IntegerProperty(Metadata.TABLE,
             Metadata.VALUE2.name);
 
     // --- constants
 
-    /** this alarm is single-shot */
+    /**
+     * this alarm is single-shot
+     */
     public static final int TYPE_SINGLE = 1;
 
-    /** this alarm repeats itself until turned off */
+    /**
+     * this alarm repeats itself until turned off
+     */
     public static final int TYPE_REPEATING = 2;
 
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmService.java b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmService.java
index 141e0adde..4dd5a4ec1 100644
--- a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmService.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.alarms;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedHashSet;
-
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -33,11 +29,14 @@ import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.MetadataService.SynchronizeMetadataCallback;
 import com.todoroo.astrid.utility.Constants;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedHashSet;
+
 /**
  * Provides operations for working with alerts
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class AlarmService {
 
@@ -46,7 +45,7 @@ public class AlarmService {
     private static AlarmService instance = null;
 
     public static synchronized AlarmService getInstance() {
-        if(instance == null)
+        if (instance == null)
             instance = new AlarmService();
         return instance;
     }
@@ -63,11 +62,12 @@ public class AlarmService {
     public TodorooCursor<Metadata> getAlarms(long taskId) {
         return PluginServices.getMetadataService().query(Query.select(
                 Metadata.PROPERTIES).where(MetadataCriteria.byTaskAndwithKey(
-                        taskId, AlarmFields.METADATA_KEY)).orderBy(Order.asc(AlarmFields.TIME)));
+                taskId, AlarmFields.METADATA_KEY)).orderBy(Order.asc(AlarmFields.TIME)));
     }
 
     /**
      * Save the given array of alarms into the database
+     *
      * @param taskId
      * @param tags
      * @return true if data was changed
@@ -76,7 +76,7 @@ public class AlarmService {
         MetadataService service = PluginServices.getMetadataService();
 
         ArrayList<Metadata> metadata = new ArrayList<Metadata>();
-        for(Long alarm : alarms) {
+        for (Long alarm : alarms) {
             Metadata item = new Metadata();
             item.setValue(Metadata.KEY, AlarmFields.METADATA_KEY);
             item.setValue(AlarmFields.TIME, alarm);
@@ -85,7 +85,7 @@ public class AlarmService {
         }
 
         final Context context = ContextManager.getContext();
-        final AlarmManager am = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
+        final AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
 
         boolean changed = service.synchronizeMetadata(taskId, metadata, Metadata.KEY.eq(AlarmFields.METADATA_KEY), new SynchronizeMetadataCallback() {
             @Override
@@ -96,7 +96,7 @@ public class AlarmService {
             }
         }, true);
 
-        if(changed)
+        if (changed)
             scheduleAlarms(taskId);
         return changed;
     }
@@ -105,6 +105,7 @@ public class AlarmService {
 
     /**
      * Gets a listing of all alarms that are active
+     *
      * @param properties
      * @return todoroo cursor. PLEASE CLOSE THIS CURSOR!
      */
@@ -116,6 +117,7 @@ public class AlarmService {
 
     /**
      * Gets a listing of alarms by task
+     *
      * @param properties
      * @return todoroo cursor. PLEASE CLOSE THIS CURSOR!
      */
@@ -133,7 +135,7 @@ public class AlarmService {
         TodorooCursor<Metadata> cursor = getActiveAlarms();
         try {
             Metadata alarm = new Metadata();
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 alarm.readFromCursor(cursor);
                 scheduleAlarm(alarm);
             }
@@ -148,13 +150,14 @@ public class AlarmService {
 
     /**
      * Schedules alarms for a single task
+     *
      * @param task
      */
     public void scheduleAlarms(long taskId) {
         TodorooCursor<Metadata> cursor = getActiveAlarmsForTask(taskId);
         try {
             Metadata alarm = new Metadata();
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 alarm.readFromCursor(cursor);
                 scheduleAlarm(alarm);
             }
@@ -172,34 +175,33 @@ public class AlarmService {
         intent.putExtra(Notifications.ID_KEY, taskId);
         intent.putExtra(Notifications.EXTRAS_TYPE, ReminderService.TYPE_ALARM);
 
-        return PendingIntent.getBroadcast(context, (int)alarm.getId(),
+        return PendingIntent.getBroadcast(context, (int) alarm.getId(),
                 intent, PendingIntent.FLAG_UPDATE_CURRENT);
     }
 
     /**
      * Schedules alarms for a single task
      *
-     * @param shouldPerformPropertyCheck
-     *            whether to check if task has requisite properties
+     * @param shouldPerformPropertyCheck whether to check if task has requisite properties
      */
     @SuppressWarnings("nls")
     private void scheduleAlarm(Metadata alarm) {
-        if(alarm == null)
+        if (alarm == null)
             return;
 
         long taskId = alarm.getValue(Metadata.TASK);
 
         Context context = ContextManager.getContext();
-        AlarmManager am = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
+        AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
         PendingIntent pendingIntent = pendingIntentForAlarm(alarm, taskId);
 
         long time = alarm.getValue(AlarmFields.TIME);
-        if(time == 0 || time == NO_ALARM)
+        if (time == 0 || time == NO_ALARM)
             am.cancel(pendingIntent);
-        else if(time > DateUtilities.now()) {
-            if(Constants.DEBUG)
+        else if (time > DateUtilities.now()) {
+            if (Constants.DEBUG)
                 Log.e("Astrid", "Alarm (" + taskId + ", " + ReminderService.TYPE_ALARM +
-                    ", " + alarm.getId() + ") set for " + new Date(time));
+                        ", " + alarm.getId() + ") set for " + new Date(time));
             am.set(AlarmManager.RTC_WAKEUP, time, pendingIntent);
         }
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java
index 30f44feb0..e0ecb8cf9 100644
--- a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java
+++ b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.alarms;
 
-import java.util.LinkedHashSet;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -17,30 +15,32 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.data.Metadata;
 
+import java.util.LinkedHashSet;
+
 public class AlarmTaskRepeatListener extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
         ContextManager.setContext(context);
         long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1);
-        if(taskId == -1)
+        if (taskId == -1)
             return;
 
         long oldDueDate = intent.getLongExtra(AstridApiConstants.EXTRAS_OLD_DUE_DATE, 0);
-        if(oldDueDate == 0)
+        if (oldDueDate == 0)
             oldDueDate = DateUtilities.now();
         long newDueDate = intent.getLongExtra(AstridApiConstants.EXTRAS_NEW_DUE_DATE, -1);
-        if(newDueDate <= 0 || newDueDate <= oldDueDate)
+        if (newDueDate <= 0 || newDueDate <= oldDueDate)
             return;
 
         TodorooCursor<Metadata> cursor = AlarmService.getInstance().getAlarms(taskId);
         try {
-            if(cursor.getCount() == 0)
+            if (cursor.getCount() == 0)
                 return;
 
             Metadata metadata = new Metadata();
             LinkedHashSet<Long> alarms = new LinkedHashSet<Long>(cursor.getCount());
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 metadata.readFromCursor(cursor);
                 alarms.add(metadata.getValue(AlarmFields.TIME) + (newDueDate - oldDueDate));
             }
diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/BackupActivity.java b/astrid/plugin-src/com/todoroo/astrid/backup/BackupActivity.java
index 3a3a35c4c..96f28e40d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupActivity.java
@@ -24,14 +24,14 @@ public class BackupActivity extends Activity {
         setContentView(R.layout.backup_activity);
         setTitle(R.string.backup_BAc_title);
 
-        ((Button)findViewById(R.id.importButton)).setOnClickListener(new OnClickListener() {
+        ((Button) findViewById(R.id.importButton)).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View view) {
                 importTasks();
             }
         });
 
-        ((Button)findViewById(R.id.exportButton)).setOnClickListener(new OnClickListener() {
+        ((Button) findViewById(R.id.exportButton)).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View view) {
                 exportTasks();
@@ -45,13 +45,13 @@ public class BackupActivity extends Activity {
             public void onFilePicked(String filePath) {
                 TasksXmlImporter.importTasks(BackupActivity.this, filePath,
                         new Runnable() {
-                    @Override
-                    public void run() {
-                        setResult(RESULT_OK);
-                        finish();
-                        Flags.set(Flags.REFRESH);
-                    }
-                });
+                            @Override
+                            public void run() {
+                                setResult(RESULT_OK);
+                                finish();
+                                Flags.set(Flags.REFRESH);
+                            }
+                        });
             }
         };
         new FilePickerBuilder(this,
diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/BackupConstants.java b/astrid/plugin-src/com/todoroo/astrid/backup/BackupConstants.java
index bb2e517fd..327683d46 100644
--- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupConstants.java
+++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupConstants.java
@@ -5,9 +5,10 @@
  */
 package com.todoroo.astrid.backup;
 
+import android.os.Environment;
+
 import java.io.File;
 
-import android.os.Environment;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 
 
@@ -15,7 +16,6 @@ import edu.umd.cs.findbugs.annotations.CheckForNull;
  * Constants for backup XML attributes and nodes.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 public class BackupConstants {
@@ -24,21 +24,31 @@ public class BackupConstants {
 
     // --- general xml
 
-    /** Tag containing Astrid backup data */
+    /**
+     * Tag containing Astrid backup data
+     */
     public static final String ASTRID_TAG = "astrid";
 
-    /** Attribute indicating application version */
+    /**
+     * Attribute indicating application version
+     */
     public static final String ASTRID_ATTR_VERSION = "version";
 
-    /** Attribute indicating backup file format */
+    /**
+     * Attribute indicating backup file format
+     */
     public static final String ASTRID_ATTR_FORMAT = "format";
 
     // --- format 2
 
-    /** Tag containing a task */
+    /**
+     * Tag containing a task
+     */
     public static final String TASK_TAG = "task";
 
-    /** Tag containing a metadata item */
+    /**
+     * Tag containing a metadata item
+     */
     public static final String METADATA_TAG = "metadata";
 
     // --- format 1
diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/BackupDateUtilities.java b/astrid/plugin-src/com/todoroo/astrid/backup/BackupDateUtilities.java
index 147ea8e1e..804dc1fcb 100644
--- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupDateUtilities.java
+++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupDateUtilities.java
@@ -5,18 +5,17 @@
  */
 package com.todoroo.astrid.backup;
 
+import android.util.Log;
+
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import android.util.Log;
-
 /**
  * Date Utility functions for backups
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 public class BackupDateUtilities {
@@ -25,6 +24,7 @@ public class BackupDateUtilities {
 
     /**
      * Format a Date into ISO 8601 Complaint format.
+     *
      * @return date string, or empty string if input was null
      */
     public static String getIso8601String(Date d) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java b/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java
index 966ada565..f55319021 100644
--- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.backup;
 
-import java.util.Date;
-
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.Color;
@@ -26,12 +24,13 @@ import com.todoroo.andlib.utility.TodorooPreferenceActivity;
 import com.todoroo.astrid.actfm.ActFmLoginActivity;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 
+import java.util.Date;
+
 /**
  * Displays synchronization preferences and an action panel so users can
  * initiate actions from the menu.
  *
  * @author timsu
- *
  */
 public class BackupPreferences extends TodorooPreferenceActivity {
 
@@ -63,7 +62,7 @@ public class BackupPreferences extends TodorooPreferenceActivity {
             @Override
             public void onChildViewAdded(View parent, View child) {
                 View view = findViewById(R.id.status);
-                if(view != null)
+                if (view != null)
                     view.setBackgroundColor(statusColor);
             }
         });
@@ -93,9 +92,7 @@ public class BackupPreferences extends TodorooPreferenceActivity {
     }
 
     /**
-     *
-     * @param resource
-     *            if null, updates all resources
+     * @param resource if null, updates all resources
      */
     @Override
     public void updatePreferences(Preference preference, Object value) {
@@ -104,7 +101,7 @@ public class BackupPreferences extends TodorooPreferenceActivity {
         // auto
         if (r.getString(R.string.backup_BPr_auto_key).equals(
                 preference.getKey())) {
-            if (value != null && !(Boolean)value)
+            if (value != null && !(Boolean) value)
                 preference.setSummary(R.string.backup_BPr_auto_disabled);
             else
                 preference.setSummary(R.string.backup_BPr_auto_enabled);
@@ -118,7 +115,7 @@ public class BackupPreferences extends TodorooPreferenceActivity {
             // last backup was error
             final long last = Preferences.getLong(PREF_BACKUP_LAST_DATE, 0);
             final String error = Preferences.getStringValue(PREF_BACKUP_LAST_ERROR);
-            if(error != null) {
+            if (error != null) {
                 status = r.getString(R.string.backup_status_failed);
                 subtitle = r.getString(R.string.backup_status_failed_subtitle);
                 statusColor = Color.rgb(100, 0, 0);
@@ -128,10 +125,10 @@ public class BackupPreferences extends TodorooPreferenceActivity {
                         return true;
                     }
                 });
-            } else if(last > 0) {
+            } else if (last > 0) {
                 status = r.getString(R.string.backup_status_success,
                         DateUtilities.getDateStringWithTime(BackupPreferences.this,
-                        new Date(last)));
+                                new Date(last)));
                 statusColor = Color.rgb(0, 100, 0);
                 preference.setOnPreferenceClickListener(null);
             } else {
@@ -143,7 +140,7 @@ public class BackupPreferences extends TodorooPreferenceActivity {
             preference.setSummary(subtitle);
 
             View view = findViewById(R.id.status);
-            if(view != null)
+            if (view != null)
                 view.setBackgroundColor(statusColor);
         }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java b/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java
index b8e394ee7..113ed9b2c 100644
--- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java
@@ -5,11 +5,6 @@
  */
 package com.todoroo.astrid.backup;
 
-import java.io.File;
-import java.io.FileFilter;
-import java.util.Arrays;
-import java.util.Comparator;
-
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -24,6 +19,11 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.core.PluginServices;
 
+import java.io.File;
+import java.io.FileFilter;
+import java.util.Arrays;
+import java.util.Comparator;
+
 /**
  * Inspired heavily by SynchronizationService
  */
@@ -61,6 +61,7 @@ public class BackupService extends Service {
 
     /**
      * Test hook for backup
+     *
      * @param context
      */
     public void testBackup(Context context) {
@@ -127,12 +128,12 @@ public class BackupService extends Service {
             }
         };
         File astridDir = backupDirectorySetting.getBackupDirectory();
-        if(astridDir == null)
+        if (astridDir == null)
             return;
 
         // grab all backup files, sort by modified date, delete old ones
         File[] files = astridDir.listFiles(backupFileFilter);
-        if(files == null)
+        if (files == null)
             return;
 
         Arrays.sort(files, new Comparator<File>() {
@@ -141,16 +142,16 @@ public class BackupService extends Service {
                 return -Long.valueOf(file1.lastModified()).compareTo(Long.valueOf(file2.lastModified()));
             }
         });
-        for(int i = DAYS_TO_KEEP_BACKUP; i < files.length; i++) {
-            if(!files[i].delete())
+        for (int i = DAYS_TO_KEEP_BACKUP; i < files.length; i++) {
+            if (!files[i].delete())
                 Log.i("astrid-backups", "Unable to delete: " + files[i]); //$NON-NLS-1$ //$NON-NLS-2$
         }
     }
 
     /**
      * Interface for setting where backups go
-     * @author Tim Su <tim@todoroo.com>
      *
+     * @author Tim Su <tim@todoroo.com>
      */
     public interface BackupDirectorySetting {
         public File getBackupDirectory();
diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/FilePickerBuilder.java b/astrid/plugin-src/com/todoroo/astrid/backup/FilePickerBuilder.java
index a3012aaf1..7a0b8ae48 100644
--- a/astrid/plugin-src/com/todoroo/astrid/backup/FilePickerBuilder.java
+++ b/astrid/plugin-src/com/todoroo/astrid/backup/FilePickerBuilder.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.backup;
 
-import java.io.File;
-import java.io.FilenameFilter;
-
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -16,6 +13,9 @@ import android.util.Log;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 
+import java.io.File;
+import java.io.FilenameFilter;
+
 @SuppressWarnings("nls")
 public class FilePickerBuilder extends AlertDialog.Builder implements DialogInterface.OnClickListener {
 
@@ -54,7 +54,7 @@ public class FilePickerBuilder extends AlertDialog.Builder implements DialogInte
             AndroidUtilities.sortFilesByDateDesc(filesAsFile);
 
             files = new String[filesAsFile.length];
-            for(int i = 0; i < files.length; i++)
+            for (int i = 0; i < files.length; i++)
                 files[i] = filesAsFile[i].getName();
 
             setItems(files, this);
diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java
index 86085d8ce..493c960ce 100644
--- a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java
+++ b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java
@@ -5,12 +5,6 @@
  */
 package com.todoroo.astrid.backup;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.xmlpull.v1.XmlSerializer;
-
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -39,6 +33,12 @@ import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.utility.AstridPreferences;
 
+import org.xmlpull.v1.XmlSerializer;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
 public class TasksXmlExporter {
 
     // --- public interface
@@ -46,13 +46,13 @@ public class TasksXmlExporter {
     /**
      * Import tasks from the given file
      *
-     * @param context context
-     * @param exportType from service, manual, or on upgrade
-     * @param runAfterExport runnable to run after exporting
+     * @param context                 context
+     * @param exportType              from service, manual, or on upgrade
+     * @param runAfterExport          runnable to run after exporting
      * @param backupDirectoryOverride new backupdirectory, or null to use default
      */
     public static void exportTasks(Context context, ExportType exportType,
-            Runnable runAfterExport, File backupDirectoryOverride, String versionName) {
+                                   Runnable runAfterExport, File backupDirectoryOverride, String versionName) {
         new TasksXmlExporter(context, exportType, runAfterExport,
                 backupDirectoryOverride, versionName);
     }
@@ -90,7 +90,7 @@ public class TasksXmlExporter {
     }
 
     private TasksXmlExporter(final Context context, final ExportType exportType,
-            final Runnable runAfterExport, File backupDirectoryOverride, String versionName) {
+                             final Runnable runAfterExport, File backupDirectoryOverride, String versionName) {
         this.context = context;
         this.exportCount = 0;
         this.backupDirectory = backupDirectoryOverride == null ?
@@ -99,7 +99,7 @@ public class TasksXmlExporter {
 
         handler = new Handler();
         progressDialog = new ProgressDialog(context);
-        if(exportType == ExportType.EXPORT_TYPE_MANUAL) {
+        if (exportType == ExportType.EXPORT_TYPE_MANUAL) {
             progressDialog.setIcon(android.R.drawable.ic_dialog_info);
             progressDialog.setTitle(R.string.export_progress_title);
             progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
@@ -107,8 +107,8 @@ public class TasksXmlExporter {
             progressDialog.setCancelable(false);
             progressDialog.setIndeterminate(false);
             progressDialog.show();
-            if(context instanceof Activity)
-                progressDialog.setOwnerActivity((Activity)context);
+            if (context instanceof Activity)
+                progressDialog.setOwnerActivity((Activity) context);
         }
 
         new Thread(new Runnable() {
@@ -119,7 +119,7 @@ public class TasksXmlExporter {
                             exportType);
                     int tasks = taskService.countTasks();
 
-                    if(tasks > 0)
+                    if (tasks > 0)
                         doTasksExport(output);
 
                     Preferences.setLong(BackupPreferences.PREF_BACKUP_LAST_DATE,
@@ -129,22 +129,22 @@ public class TasksXmlExporter {
                     if (exportType == ExportType.EXPORT_TYPE_MANUAL)
                         onFinishExport(output);
                 } catch (IOException e) {
-                    switch(exportType) {
-                    case EXPORT_TYPE_MANUAL:
-                        exceptionService.displayAndReportError(context,
-                            context.getString(R.string.backup_TXI_error), e);
-                        break;
-                    case EXPORT_TYPE_SERVICE:
-                        exceptionService.reportError("background-backup", e); //$NON-NLS-1$
-                        Preferences.setString(BackupPreferences.PREF_BACKUP_LAST_ERROR, e.toString());
-                        break;
-                    case EXPORT_TYPE_ON_UPGRADE:
-                        exceptionService.reportError("background-backup", e); //$NON-NLS-1$
-                        Preferences.setString(BackupPreferences.PREF_BACKUP_LAST_ERROR, e.toString());
-                        break;
+                    switch (exportType) {
+                        case EXPORT_TYPE_MANUAL:
+                            exceptionService.displayAndReportError(context,
+                                    context.getString(R.string.backup_TXI_error), e);
+                            break;
+                        case EXPORT_TYPE_SERVICE:
+                            exceptionService.reportError("background-backup", e); //$NON-NLS-1$
+                            Preferences.setString(BackupPreferences.PREF_BACKUP_LAST_ERROR, e.toString());
+                            break;
+                        case EXPORT_TYPE_ON_UPGRADE:
+                            exceptionService.reportError("background-backup", e); //$NON-NLS-1$
+                            Preferences.setString(BackupPreferences.PREF_BACKUP_LAST_ERROR, e.toString());
+                            break;
                     }
                 } finally {
-                    if(runAfterExport != null)
+                    if (runAfterExport != null)
                         runAfterExport.run();
                 }
             }
@@ -184,7 +184,7 @@ public class TasksXmlExporter {
         try {
             Task task = new Task();
             int length = cursor.getCount();
-            for(int i = 0; i < length; i++) {
+            for (int i = 0; i < length; i++) {
                 cursor.moveToNext();
                 task.readFromCursor(cursor);
 
@@ -206,7 +206,7 @@ public class TasksXmlExporter {
                 Metadata.PROPERTIES).where(MetadataCriteria.byTask(task.getId())));
         try {
             Metadata metadata = new Metadata();
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 metadata.readFromCursor(cursor);
 
                 xml.startTag(null, BackupConstants.METADATA_TAG);
@@ -220,12 +220,14 @@ public class TasksXmlExporter {
 
     /**
      * Turn a model into xml attributes
+     *
      * @param model
      */
     private void serializeModel(AbstractModel model, Property<?>[] properties, Property<?>... excludes) {
-        outer: for(Property<?> property : properties) {
-            for(Property<?> exclude : excludes)
-                if(property.name.equals(exclude.name))
+        outer:
+        for (Property<?> property : properties) {
+            for (Property<?> exclude : excludes)
+                if (property.name.equals(exclude.name))
                     continue outer;
 
             try {
@@ -233,7 +235,7 @@ public class TasksXmlExporter {
             } catch (Exception e) {
                 Log.e("astrid-exporter", //$NON-NLS-1$
                         "Caught exception while reading " + property.name + //$NON-NLS-1$
-                        " from " + model.getDatabaseValues(), e); //$NON-NLS-1$
+                                " from " + model.getDatabaseValues(), e); //$NON-NLS-1$
             }
         }
     }
@@ -301,7 +303,7 @@ public class TasksXmlExporter {
         public Void visitString(Property<String> property, AbstractModel data) {
             try {
                 String value = data.getValue(property);
-                if(value == null)
+                if (value == null)
                     return null;
                 xml.attribute(null, property.name, value);
             } catch (UnsupportedOperationException e) {
@@ -322,14 +324,14 @@ public class TasksXmlExporter {
             @Override
             public void run() {
 
-                if(exportCount == 0)
+                if (exportCount == 0)
                     Toast.makeText(context, context.getString(R.string.export_toast_no_tasks), Toast.LENGTH_LONG).show();
                 else {
                     CharSequence text = String.format(context.getString(R.string.export_toast),
                             context.getResources().getQuantityString(R.plurals.Ntasks, exportCount,
                                     exportCount), outputFile);
                     Toast.makeText(context, text, Toast.LENGTH_LONG).show();
-                    if(progressDialog.isShowing() && context instanceof Activity)
+                    if (progressDialog.isShowing() && context instanceof Activity)
                         DialogUtilities.dismissDialog((Activity) context, progressDialog);
                 }
             }
@@ -338,6 +340,7 @@ public class TasksXmlExporter {
 
     /**
      * Creates directories if necessary and returns fully qualified file
+     *
      * @param directory
      * @return output file name
      * @throws IOException
@@ -348,18 +351,18 @@ public class TasksXmlExporter {
             // Check for /sdcard/astrid directory. If it doesn't exist, make it.
             if (astridDir.exists() || astridDir.mkdir()) {
                 String fileName = ""; //$NON-NLS-1$
-                switch(exportType) {
-                case EXPORT_TYPE_SERVICE:
-                    fileName = String.format(BackupConstants.BACKUP_FILE_NAME, BackupDateUtilities.getDateForExport());
-                    break;
-                case EXPORT_TYPE_MANUAL:
-                    fileName = String.format(BackupConstants.EXPORT_FILE_NAME, BackupDateUtilities.getDateForExport());
-                    break;
-                case EXPORT_TYPE_ON_UPGRADE:
-                    fileName = String.format(BackupConstants.UPGRADE_FILE_NAME, latestSetVersionName);
-                    break;
-                default:
-                     throw new IllegalArgumentException("Invalid export type"); //$NON-NLS-1$
+                switch (exportType) {
+                    case EXPORT_TYPE_SERVICE:
+                        fileName = String.format(BackupConstants.BACKUP_FILE_NAME, BackupDateUtilities.getDateForExport());
+                        break;
+                    case EXPORT_TYPE_MANUAL:
+                        fileName = String.format(BackupConstants.EXPORT_FILE_NAME, BackupDateUtilities.getDateForExport());
+                        break;
+                    case EXPORT_TYPE_ON_UPGRADE:
+                        fileName = String.format(BackupConstants.UPGRADE_FILE_NAME, latestSetVersionName);
+                        break;
+                    default:
+                        throw new IllegalArgumentException("Invalid export type"); //$NON-NLS-1$
                 }
                 return astridDir.getAbsolutePath() + File.separator + fileName;
             } else {
diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java
index 98ee4851f..a46b0c5cb 100644
--- a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java
+++ b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java
@@ -5,16 +5,6 @@
  */
 package com.todoroo.astrid.backup;
 
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Date;
-import java.util.LinkedHashSet;
-import java.util.StringTokenizer;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-import org.xmlpull.v1.XmlPullParserFactory;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -52,6 +42,16 @@ import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.service.UpgradeService;
 import com.todoroo.astrid.tags.TagService;
 
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlPullParserFactory;
+
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Date;
+import java.util.LinkedHashSet;
+import java.util.StringTokenizer;
+
 public class TasksXmlImporter {
 
     // --- public interface
@@ -92,6 +92,7 @@ public class TasksXmlImporter {
 
     /**
      * Import tasks.
+     *
      * @param runAfterImport optional runnable after import
      */
     private TasksXmlImporter(final Context context, String input, Runnable runAfterImport) {
@@ -108,8 +109,8 @@ public class TasksXmlImporter {
         progressDialog.setIndeterminate(true);
         try {
             progressDialog.show();
-            if(context instanceof Activity)
-                progressDialog.setOwnerActivity((Activity)context);
+            if (context instanceof Activity)
+                progressDialog.setOwnerActivity((Activity) context);
         } catch (BadTokenException e) {
             // Running from a unit test or some such thing
         }
@@ -147,14 +148,14 @@ public class TasksXmlImporter {
                     // Process <astrid ... >
                     if (tag.equals(BackupConstants.ASTRID_TAG)) {
                         String format = xpp.getAttributeValue(null, BackupConstants.ASTRID_ATTR_FORMAT);
-                        if(TextUtils.equals(format, FORMAT1))
+                        if (TextUtils.equals(format, FORMAT1))
                             new Format1TaskImporter(xpp);
-                        else if(TextUtils.equals(format, FORMAT2))
+                        else if (TextUtils.equals(format, FORMAT2))
                             new Format2TaskImporter(xpp);
                         else
                             throw new UnsupportedOperationException(
                                     "Did not know how to import tasks with xml format '" +
-                                    format + "'");
+                                            format + "'");
                     }
                 }
             }
@@ -164,8 +165,8 @@ public class TasksXmlImporter {
             handler.post(new Runnable() {
                 @Override
                 public void run() {
-                    if(progressDialog.isShowing() && context instanceof Activity)
-                       DialogUtilities.dismissDialog((Activity) context, progressDialog);
+                    if (progressDialog.isShowing() && context instanceof Activity)
+                        DialogUtilities.dismissDialog((Activity) context, progressDialog);
                     showSummary();
                 }
             });
@@ -191,7 +192,7 @@ public class TasksXmlImporter {
                             handler.post(runAfterImport);
                         }
                     }
-        });
+                });
 
         builder.show();
     }
@@ -201,6 +202,7 @@ public class TasksXmlImporter {
     // =============================================================== FORMAT2
 
     private static final String FORMAT2 = "2"; //$NON-NLS-1$
+
     private class Format2TaskImporter {
 
         private int version;
@@ -235,7 +237,7 @@ public class TasksXmlImporter {
                     errorCount++;
                     Log.e("astrid-importer", //$NON-NLS-1$
                             "Caught exception while reading from " + //$NON-NLS-1$
-                            xpp.getText(), e);
+                                    xpp.getText(), e);
                 }
             }
         }
@@ -261,24 +263,24 @@ public class TasksXmlImporter {
             // if the task's name and creation date match an existing task, skip
             long existingTask = 0;
             TodorooCursor<Task> cursor = taskService.query(Query.select(Task.ID,
-                        Task.COMPLETION_DATE, Task.DELETION_DATE).
+                    Task.COMPLETION_DATE, Task.DELETION_DATE).
                     where(Criterion.and(Task.TITLE.eq(title), Task.CREATION_DATE.eq(created))));
             try {
-                if(cursor.getCount() > 0) {
+                if (cursor.getCount() > 0) {
                     cursor.moveToNext();
 
                     // fix for failed migration in 4.0.6
-                    if(version < UpgradeService.V4_0_6) {
-                        if(!completionDate.equals("0") &&
+                    if (version < UpgradeService.V4_0_6) {
+                        if (!completionDate.equals("0") &&
                                 !completionDate.equals(Long.toString(cursor.get(Task.COMPLETION_DATE))))
                             existingTask = cursor.get(Task.ID);
 
-                        if(!deletionDate.equals("0") &&
+                        if (!deletionDate.equals("0") &&
                                 !deletionDate.equals(Long.toString(cursor.get(Task.DELETION_DATE))))
                             existingTask = cursor.get(Task.ID);
                     }
 
-                    if(existingTask == 0) {
+                    if (existingTask == 0) {
                         skipCount++;
                         return;
                     }
@@ -289,10 +291,10 @@ public class TasksXmlImporter {
 
             // else, make a new task model and add away.
             deserializeModel(currentTask, Task.PROPERTIES);
-            if(version < UpgradeService.V4_0_6)
+            if (version < UpgradeService.V4_0_6)
                 adjustDueDateScheme(currentTask);
 
-            if(existingTask > 0)
+            if (existingTask > 0)
                 currentTask.setId(existingTask);
             else
                 currentTask.setId(Task.NO_ID);
@@ -319,7 +321,7 @@ public class TasksXmlImporter {
         }
 
         private void parseMetadata() {
-            if(!currentTask.isSaved())
+            if (!currentTask.isSaved())
                 return;
             metadata.clear();
             deserializeModel(metadata, Metadata.PROPERTIES);
@@ -330,16 +332,17 @@ public class TasksXmlImporter {
 
         /**
          * Turn a model into xml attributes
+         *
          * @param model
          */
         private void deserializeModel(AbstractModel model, Property<?>[] properties) {
-            for(Property<?> property : properties) {
+            for (Property<?> property : properties) {
                 try {
                     property.accept(xmlReadingVisitor, model);
                 } catch (Exception e) {
                     Log.e("astrid-importer", //$NON-NLS-1$
                             "Caught exception while writing " + property.name + //$NON-NLS-1$
-                            " from " + xpp.getText(), e); //$NON-NLS-1$
+                                    " from " + xpp.getText(), e); //$NON-NLS-1$
                 }
             }
         }
@@ -350,9 +353,9 @@ public class TasksXmlImporter {
 
             @Override
             public Void visitInteger(Property<Integer> property,
-                    AbstractModel data) {
+                                     AbstractModel data) {
                 String value = xpp.getAttributeValue(null, property.name);
-                if(value != null)
+                if (value != null)
                     data.setValue(property, TasksXmlExporter.XML_NULL.equals(value) ?
                             null : Integer.parseInt(value));
                 return null;
@@ -361,7 +364,7 @@ public class TasksXmlImporter {
             @Override
             public Void visitLong(Property<Long> property, AbstractModel data) {
                 String value = xpp.getAttributeValue(null, property.name);
-                if(value != null)
+                if (value != null)
                     data.setValue(property, TasksXmlExporter.XML_NULL.equals(value) ?
                             null : Long.parseLong(value));
                 return null;
@@ -369,9 +372,9 @@ public class TasksXmlImporter {
 
             @Override
             public Void visitDouble(Property<Double> property,
-                    AbstractModel data) {
+                                    AbstractModel data) {
                 String value = xpp.getAttributeValue(null, property.name);
-                if(value != null)
+                if (value != null)
                     data.setValue(property, TasksXmlExporter.XML_NULL.equals(value) ?
                             null : Double.parseDouble(value));
                 return null;
@@ -379,9 +382,9 @@ public class TasksXmlImporter {
 
             @Override
             public Void visitString(Property<String> property,
-                    AbstractModel data) {
+                                    AbstractModel data) {
                 String value = xpp.getAttributeValue(null, property.name);
-                if(value != null)
+                if (value != null)
                     data.setValue(property, value);
                 return null;
             }
@@ -392,6 +395,7 @@ public class TasksXmlImporter {
     // =============================================================== FORMAT1
 
     private static final String FORMAT1 = null;
+
     private class Format1TaskImporter {
 
         private final XmlPullParser xpp;
@@ -408,7 +412,7 @@ public class TasksXmlImporter {
                 String tag = xpp.getName();
 
                 try {
-                    if(BackupConstants.TASK_TAG.equals(tag) && xpp.getEventType() == XmlPullParser.END_TAG)
+                    if (BackupConstants.TASK_TAG.equals(tag) && xpp.getEventType() == XmlPullParser.END_TAG)
                         saveTags();
                     else if (tag == null || xpp.getEventType() == XmlPullParser.END_TAG)
                         continue;
@@ -433,7 +437,7 @@ public class TasksXmlImporter {
                     errorCount++;
                     Log.e("astrid-importer", //$NON-NLS-1$
                             "Caught exception while reading from " + //$NON-NLS-1$
-                            xpp.getText(), e);
+                                    xpp.getText(), e);
                 }
             }
         }
@@ -471,7 +475,7 @@ public class TasksXmlImporter {
         }
 
         private void saveTags() {
-            if(currentTask != null && tags.size() > 0) {
+            if (currentTask != null && tags.size() > 0) {
                 TagService.getInstance().synchronizeTags(currentTask.getId(), currentTask.getValue(Task.UUID), tags);
             }
             tags.clear();
@@ -500,9 +504,9 @@ public class TasksXmlImporter {
             // if the task's name and creation date match an existing task, skip
             TodorooCursor<Task> cursor = taskService.query(Query.select(Task.ID).
                     where(Criterion.and(Task.TITLE.eq(taskName),
-                            Task.CREATION_DATE.like(creationDate.getTime()/1000L + "%"))));
+                            Task.CREATION_DATE.like(creationDate.getTime() / 1000L + "%"))));
             try {
-                if(cursor.getCount() > 0) {
+                if (cursor.getCount() > 0) {
                     skipCount++;
                     return null;
                 }
@@ -516,14 +520,14 @@ public class TasksXmlImporter {
             for (int i = 0; i < numAttributes; i++) {
                 String fieldName = xpp.getAttributeName(i);
                 String fieldValue = xpp.getAttributeValue(i);
-                if(!setTaskField(task, fieldName, fieldValue)) {
+                if (!setTaskField(task, fieldName, fieldValue)) {
                     Log.i("astrid-xml-import", "Task: " + taskName + ": Unknown field '" +
                             fieldName + "' with value '" + fieldValue + "' disregarded.");
                 }
             }
 
-            if(upgradeNotes != null) {
-                if(task.containsValue(Task.NOTES) && task.getValue(Task.NOTES).length() > 0)
+            if (upgradeNotes != null) {
+                if (task.containsValue(Task.NOTES) && task.getValue(Task.NOTES).length() > 0)
                     task.setValue(Task.NOTES, task.getValue(Task.NOTES) + "\n" + upgradeNotes);
                 else
                     task.setValue(Task.NOTES, upgradeNotes);
@@ -536,37 +540,31 @@ public class TasksXmlImporter {
             return task;
         }
 
-        /** helper method to set field on a task */
+        /**
+         * helper method to set field on a task
+         */
         @SuppressWarnings("nls")
         private final boolean setTaskField(Task task, String field, String value) {
-            if(field.equals(LegacyTaskModel.ID)) {
+            if (field.equals(LegacyTaskModel.ID)) {
                 // ignore
-            }
-            else if(field.equals(LegacyTaskModel.NAME)) {
+            } else if (field.equals(LegacyTaskModel.NAME)) {
                 task.setValue(Task.TITLE, value);
-            }
-            else if(field.equals(LegacyTaskModel.NOTES)) {
+            } else if (field.equals(LegacyTaskModel.NOTES)) {
                 task.setValue(Task.NOTES, value);
-            }
-            else if(field.equals(LegacyTaskModel.PROGRESS_PERCENTAGE)) {
+            } else if (field.equals(LegacyTaskModel.PROGRESS_PERCENTAGE)) {
                 // ignore
-            }
-            else if(field.equals(LegacyTaskModel.IMPORTANCE)) {
+            } else if (field.equals(LegacyTaskModel.IMPORTANCE)) {
                 task.setValue(Task.IMPORTANCE, LegacyImportance.valueOf(value).ordinal());
-            }
-            else if(field.equals(LegacyTaskModel.ESTIMATED_SECONDS)) {
+            } else if (field.equals(LegacyTaskModel.ESTIMATED_SECONDS)) {
                 task.setValue(Task.ESTIMATED_SECONDS, Integer.parseInt(value));
-            }
-            else if(field.equals(LegacyTaskModel.ELAPSED_SECONDS)) {
+            } else if (field.equals(LegacyTaskModel.ELAPSED_SECONDS)) {
                 task.setValue(Task.ELAPSED_SECONDS, Integer.parseInt(value));
-            }
-            else if(field.equals(LegacyTaskModel.TIMER_START)) {
+            } else if (field.equals(LegacyTaskModel.TIMER_START)) {
                 task.setValue(Task.TIMER_START,
                         BackupDateUtilities.getDateFromIso8601String(value).getTime());
-            }
-            else if(field.equals(LegacyTaskModel.DEFINITE_DUE_DATE)) {
+            } else if (field.equals(LegacyTaskModel.DEFINITE_DUE_DATE)) {
                 String preferred = xpp.getAttributeValue(null, LegacyTaskModel.PREFERRED_DUE_DATE);
-                if(preferred != null) {
+                if (preferred != null) {
                     Date preferredDate = BackupDateUtilities.getDateFromIso8601String(value);
                     upgradeNotes = "Project Deadline: " +
                             DateUtilities.getDateString(ContextManager.getContext(),
@@ -574,64 +572,51 @@ public class TasksXmlImporter {
                 }
                 task.setValue(Task.DUE_DATE,
                         BackupDateUtilities.getTaskDueDateFromIso8601String(value).getTime());
-            }
-            else if(field.equals(LegacyTaskModel.PREFERRED_DUE_DATE)) {
+            } else if (field.equals(LegacyTaskModel.PREFERRED_DUE_DATE)) {
                 String definite = xpp.getAttributeValue(null, LegacyTaskModel.DEFINITE_DUE_DATE);
-                if(definite != null)
+                if (definite != null)
                     ; // handled above
                 else
                     task.setValue(Task.DUE_DATE,
                             BackupDateUtilities.getTaskDueDateFromIso8601String(value).getTime());
-            }
-            else if(field.equals(LegacyTaskModel.HIDDEN_UNTIL)) {
+            } else if (field.equals(LegacyTaskModel.HIDDEN_UNTIL)) {
                 task.setValue(Task.HIDE_UNTIL,
                         BackupDateUtilities.getDateFromIso8601String(value).getTime());
-            }
-            else if(field.equals(LegacyTaskModel.BLOCKING_ON)) {
+            } else if (field.equals(LegacyTaskModel.BLOCKING_ON)) {
                 // ignore
-            }
-            else if(field.equals(LegacyTaskModel.POSTPONE_COUNT)) {
+            } else if (field.equals(LegacyTaskModel.POSTPONE_COUNT)) {
                 task.setValue(Task.POSTPONE_COUNT, Integer.parseInt(value));
-            }
-            else if(field.equals(LegacyTaskModel.NOTIFICATIONS)) {
+            } else if (field.equals(LegacyTaskModel.NOTIFICATIONS)) {
                 task.setValue(Task.REMINDER_PERIOD, Integer.parseInt(value) * 1000L);
-            }
-            else if(field.equals(LegacyTaskModel.CREATION_DATE)) {
+            } else if (field.equals(LegacyTaskModel.CREATION_DATE)) {
                 task.setValue(Task.CREATION_DATE,
                         BackupDateUtilities.getDateFromIso8601String(value).getTime());
-            }
-            else if(field.equals(LegacyTaskModel.COMPLETION_DATE)) {
+            } else if (field.equals(LegacyTaskModel.COMPLETION_DATE)) {
                 String completion = xpp.getAttributeValue(null, LegacyTaskModel.PROGRESS_PERCENTAGE);
-                if("100".equals(completion)) {
+                if ("100".equals(completion)) {
                     task.setValue(Task.COMPLETION_DATE,
-                        BackupDateUtilities.getDateFromIso8601String(value).getTime());
+                            BackupDateUtilities.getDateFromIso8601String(value).getTime());
                 }
-            }
-            else if(field.equals(LegacyTaskModel.NOTIFICATION_FLAGS)) {
+            } else if (field.equals(LegacyTaskModel.NOTIFICATION_FLAGS)) {
                 task.setValue(Task.REMINDER_FLAGS, Integer.parseInt(value));
-            }
-            else if(field.equals(LegacyTaskModel.LAST_NOTIFIED)) {
+            } else if (field.equals(LegacyTaskModel.LAST_NOTIFIED)) {
                 task.setValue(Task.REMINDER_LAST,
                         BackupDateUtilities.getDateFromIso8601String(value).getTime());
-            }
-            else if(field.equals("repeat_interval")) {
+            } else if (field.equals("repeat_interval")) {
                 // handled below
-            }
-            else if(field.equals("repeat_value")) {
+            } else if (field.equals("repeat_value")) {
                 int repeatValue = Integer.parseInt(value);
                 String repeatInterval = xpp.getAttributeValue(null, "repeat_interval");
-                if(repeatValue > 0 && repeatInterval != null) {
+                if (repeatValue > 0 && repeatInterval != null) {
                     LegacyRepeatInterval interval = LegacyRepeatInterval.valueOf(repeatInterval);
                     LegacyRepeatInfo repeatInfo = new LegacyRepeatInfo(interval, repeatValue);
                     RRule rrule = repeatInfo.toRRule();
                     task.setValue(Task.RECURRENCE, rrule.toIcal());
                 }
-            }
-            else if(field.equals(LegacyTaskModel.FLAGS)) {
-                if(Integer.parseInt(value) == LegacyTaskModel.FLAG_SYNC_ON_COMPLETE)
+            } else if (field.equals(LegacyTaskModel.FLAGS)) {
+                if (Integer.parseInt(value) == LegacyTaskModel.FLAG_SYNC_ON_COMPLETE)
                     syncOnComplete = true;
-            }
-            else {
+            } else {
                 return false;
             }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/calls/MissedCallActivity.java b/astrid/plugin-src/com/todoroo/astrid/calls/MissedCallActivity.java
index 632354709..d082eb264 100644
--- a/astrid/plugin-src/com/todoroo/astrid/calls/MissedCallActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/calls/MissedCallActivity.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.calls;
 
-import java.io.InputStream;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.ContentUris;
@@ -39,6 +37,8 @@ import com.todoroo.astrid.service.StartupService;
 import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.service.ThemeService;
 
+import java.io.InputStream;
+
 public class MissedCallActivity extends Activity {
 
     public static final String EXTRA_NUMBER = "number"; //$NON-NLS-1$
@@ -51,7 +51,8 @@ public class MissedCallActivity extends Activity {
     // Prompt user to ignore all missed calls after this many ignore presses
     private static final int IGNORE_PROMPT_COUNT = 3;
 
-    @Autowired private TaskService taskService;
+    @Autowired
+    private TaskService taskService;
 
     private final OnClickListener dismissListener = new OnClickListener() {
         @Override
@@ -86,7 +87,8 @@ public class MissedCallActivity extends Activity {
                             public void onClick(DialogInterface dialog, int which) {
                                 dismissListener.onClick(v);
                             }
-                        });
+                        }
+                );
             } else {
                 dismissListener.onClick(v);
             }
@@ -127,24 +129,24 @@ public class MissedCallActivity extends Activity {
         ignoreSettingsButton = findViewById(R.id.ignore_settings);
         dismissButton = findViewById(R.id.dismiss);
         ((TextView) findViewById(R.id.reminder_title))
-            .setText(getString(R.string.MCA_title,
-                    TextUtils.isEmpty(name) ? number : name, timeString));
-
-       ImageView pictureView = ((ImageView) findViewById(R.id.contact_picture));
-       if (contactId >= 0) {
-           Uri uri = ContentUris.withAppendedId(ContactsContract.Contacts.CONTENT_URI, contactId);
-           InputStream input = ContactsContract.Contacts.openContactPhotoInputStream(getContentResolver(), uri);
-           Bitmap b = null;
-           try {
-               b = BitmapFactory.decodeStream(input);
-           } catch (OutOfMemoryError e) {
-               //
-           }
-           if (b != null) {
-               pictureView.setImageBitmap(b);
-               pictureView.setVisibility(View.VISIBLE);
-           }
-       }
+                .setText(getString(R.string.MCA_title,
+                        TextUtils.isEmpty(name) ? number : name, timeString));
+
+        ImageView pictureView = ((ImageView) findViewById(R.id.contact_picture));
+        if (contactId >= 0) {
+            Uri uri = ContentUris.withAppendedId(ContactsContract.Contacts.CONTENT_URI, contactId);
+            InputStream input = ContactsContract.Contacts.openContactPhotoInputStream(getContentResolver(), uri);
+            Bitmap b = null;
+            try {
+                b = BitmapFactory.decodeStream(input);
+            } catch (OutOfMemoryError e) {
+                //
+            }
+            if (b != null) {
+                pictureView.setImageBitmap(b);
+                pictureView.setVisibility(View.VISIBLE);
+            }
+        }
 
         Resources r = getResources();
         returnCallButton.setBackgroundColor(r.getColor(color));
@@ -210,11 +212,11 @@ public class MissedCallActivity extends Activity {
                     }
                 });
                 new AlertDialog.Builder(MissedCallActivity.this)
-                    .setTitle(dialogTitle)
-                    .setView(sd)
-                    .setPositiveButton(android.R.string.ok, sd)
-                    .setNegativeButton(android.R.string.cancel, null)
-                    .show().setOwnerActivity(MissedCallActivity.this);
+                        .setTitle(dialogTitle)
+                        .setView(sd)
+                        .setPositiveButton(android.R.string.ok, sd)
+                        .setNegativeButton(android.R.string.cancel, null)
+                        .show().setOwnerActivity(MissedCallActivity.this);
             }
         });
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java b/astrid/plugin-src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java
index fc1e18171..8ddc03788 100644
--- a/astrid/plugin-src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java
+++ b/astrid/plugin-src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.calls;
 
-import java.util.Date;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -23,6 +21,8 @@ import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 
+import java.util.Date;
+
 @SuppressWarnings("nls")
 public class PhoneStateChangedReceiver extends BroadcastReceiver {
 
@@ -60,22 +60,22 @@ public class PhoneStateChangedReceiver extends BroadcastReceiver {
                     Cursor calls;
                     try {
                         calls = context.getContentResolver().query(
-                            Calls.CONTENT_URI,
-                            new String[] { Calls.NUMBER, Calls.DATE, Calls.CACHED_NAME },
-                            Calls.TYPE + " = ? AND " + Calls.NEW + " = ?",
-                            new String[] { Integer.toString(Calls.MISSED_TYPE), "1" },
-                            Calls.DATE + " DESC"
-                            );
+                                Calls.CONTENT_URI,
+                                new String[]{Calls.NUMBER, Calls.DATE, Calls.CACHED_NAME},
+                                Calls.TYPE + " = ? AND " + Calls.NEW + " = ?",
+                                new String[]{Integer.toString(Calls.MISSED_TYPE), "1"},
+                                Calls.DATE + " DESC"
+                        );
                     } catch (Exception e) { // Sometimes database is locked, retry once
                         AndroidUtilities.sleepDeep(300L);
                         try {
                             calls = context.getContentResolver().query(
                                     Calls.CONTENT_URI,
-                                    new String[] { Calls.NUMBER, Calls.DATE, Calls.CACHED_NAME },
+                                    new String[]{Calls.NUMBER, Calls.DATE, Calls.CACHED_NAME},
                                     Calls.TYPE + " = ? AND " + Calls.NEW + " = ?",
-                                    new String[] { Integer.toString(Calls.MISSED_TYPE), "1" },
+                                    new String[]{Integer.toString(Calls.MISSED_TYPE), "1"},
                                     Calls.DATE + " DESC"
-                                    );
+                            );
                         } catch (Exception e2) {
                             calls = null;
                         }
@@ -143,7 +143,7 @@ public class PhoneStateChangedReceiver extends BroadcastReceiver {
 
     private long getContactIdFromNumber(Context context, String number) {
         Uri contactUri = Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(number));
-        Cursor c = context.getContentResolver().query(contactUri, new String[] { ContactsContract.PhoneLookup._ID }, null, null, null);
+        Cursor c = context.getContentResolver().query(contactUri, new String[]{ContactsContract.PhoneLookup._ID}, null, null, null);
 
         try {
             if (c.moveToFirst()) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java
index 3b547cb75..ed406f9f5 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.core;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.ContentValues;
@@ -40,11 +37,13 @@ import com.todoroo.astrid.data.WaitingOnMe;
 import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.tags.TaskToTagMetadata;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Exposes Astrid's built in filters to the {@link FilterListFragment}
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public final class CoreFilterExposer extends BroadcastReceiver implements AstridFilterExposer {
 
@@ -78,6 +77,7 @@ public final class CoreFilterExposer extends BroadcastReceiver implements Astrid
 
     /**
      * Build inbox filter
+     *
      * @return
      */
     public static Filter buildInboxFilter(Resources r) {
@@ -87,9 +87,9 @@ public final class CoreFilterExposer extends BroadcastReceiver implements Astrid
                                 Criterion.not(Task.ID.in(Query.select(Metadata.TASK).from(Metadata.TABLE).where(
                                         Criterion.and(MetadataCriteria.withKey(TaskToTagMetadata.KEY),
                                                 TaskToTagMetadata.TAG_NAME.like("x_%", "x"))))))), //$NON-NLS-1$ //$NON-NLS-2$
-                                                null);
+                null);
         int themeFlags = ThemeService.getFilterThemeFlags();
-        inbox.listingIcon = ((BitmapDrawable)r.getDrawable(
+        inbox.listingIcon = ((BitmapDrawable) r.getDrawable(
                 ThemeService.getDrawable(R.drawable.filter_inbox, themeFlags))).getBitmap();
         return inbox;
     }
@@ -105,28 +105,29 @@ public final class CoreFilterExposer extends BroadcastReceiver implements Astrid
                         Criterion.and(TaskCriteria.activeVisibleMine(),
                                 Task.DUE_DATE.gt(0),
                                 Task.DUE_DATE.lte(PermaSql.VALUE_EOD))),
-                                todayValues);
-        todayFilter.listingIcon = ((BitmapDrawable)r.getDrawable(
+                todayValues);
+        todayFilter.listingIcon = ((BitmapDrawable) r.getDrawable(
                 ThemeService.getDrawable(R.drawable.filter_calendar, themeFlags))).getBitmap();
         return todayFilter;
     }
 
     public static Filter getWaitingOnMeFilter(Resources r) {
-         FilterWithCustomIntent waitingOnMe = new FilterWithCustomIntent(r.getString(R.string.BFE_waiting_on_me), r.getString(R.string.BFE_waiting_on_me),
-                 new QueryTemplate().join(Join.inner(WaitingOnMe.TABLE, Task.UUID.eq(WaitingOnMe.TASK_UUID))).where(
-                         Criterion.and(WaitingOnMe.DELETED_AT.eq(0),
-                                 Criterion.or(WaitingOnMe.ACKNOWLEDGED.isNull(), WaitingOnMe.ACKNOWLEDGED.neq(1))))
-                                 .groupBy(Task.UUID), null);
-         waitingOnMe.customTaskList = new ComponentName(ContextManager.getContext(), WaitingOnMeFragment.class);
-         int themeFlags = ThemeService.getFilterThemeFlags();
-         waitingOnMe.listingIcon = ((BitmapDrawable) r.getDrawable(
-                 ThemeService.getDrawable(R.drawable.waiting_on_me, themeFlags))).getBitmap();
-         return waitingOnMe;
+        FilterWithCustomIntent waitingOnMe = new FilterWithCustomIntent(r.getString(R.string.BFE_waiting_on_me), r.getString(R.string.BFE_waiting_on_me),
+                new QueryTemplate().join(Join.inner(WaitingOnMe.TABLE, Task.UUID.eq(WaitingOnMe.TASK_UUID))).where(
+                        Criterion.and(WaitingOnMe.DELETED_AT.eq(0),
+                                Criterion.or(WaitingOnMe.ACKNOWLEDGED.isNull(), WaitingOnMe.ACKNOWLEDGED.neq(1))))
+                        .groupBy(Task.UUID), null);
+        waitingOnMe.customTaskList = new ComponentName(ContextManager.getContext(), WaitingOnMeFragment.class);
+        int themeFlags = ThemeService.getFilterThemeFlags();
+        waitingOnMe.listingIcon = ((BitmapDrawable) r.getDrawable(
+                ThemeService.getDrawable(R.drawable.waiting_on_me, themeFlags))).getBitmap();
+        return waitingOnMe;
 
     }
 
     /**
      * Is this the inbox?
+     *
      * @param filter
      * @return
      */
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java
index 42bbecc17..93f1c39bc 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java
@@ -5,13 +5,6 @@
  */
 package com.todoroo.astrid.core;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
 import android.content.BroadcastReceiver;
 import android.content.ContentValues;
 import android.content.Context;
@@ -60,11 +53,17 @@ import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.utility.AstridPreferences;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
 /**
  * Activity that allows users to build custom filters
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class CustomFilterActivity extends SherlockFragmentActivity {
 
@@ -85,32 +84,42 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
         public static final int TYPE_INTERSECT = 2;
         public static final int TYPE_UNIVERSE = 3;
 
-        /** criteria for this instance */
+        /**
+         * criteria for this instance
+         */
         public CustomFilterCriterion criterion;
 
-        /** which of the entries is selected (MultipleSelect) */
+        /**
+         * which of the entries is selected (MultipleSelect)
+         */
         public int selectedIndex = -1;
 
-        /** text of selection (TextInput) */
+        /**
+         * text of selection (TextInput)
+         */
         public String selectedText = null;
 
-        /** type of join */
+        /**
+         * type of join
+         */
         public int type = TYPE_INTERSECT;
 
-        /** statistics for {@link FilterView} */
+        /**
+         * statistics for {@link FilterView}
+         */
         public int start, end, max;
 
         @SuppressWarnings("nls")
         public String getTitleFromCriterion() {
-            if(criterion instanceof MultipleSelectCriterion) {
-                if(selectedIndex >= 0 && ((MultipleSelectCriterion)criterion).entryTitles != null &&
-                        selectedIndex < ((MultipleSelectCriterion)criterion).entryTitles.length) {
-                    String title = ((MultipleSelectCriterion)criterion).entryTitles[selectedIndex];
+            if (criterion instanceof MultipleSelectCriterion) {
+                if (selectedIndex >= 0 && ((MultipleSelectCriterion) criterion).entryTitles != null &&
+                        selectedIndex < ((MultipleSelectCriterion) criterion).entryTitles.length) {
+                    String title = ((MultipleSelectCriterion) criterion).entryTitles[selectedIndex];
                     return criterion.text.replace("?", title);
                 }
                 return criterion.text;
-            } else if(criterion instanceof TextInputCriterion) {
-                if(selectedText == null)
+            } else if (criterion instanceof TextInputCriterion) {
+                if (selectedText == null)
                     return criterion.text;
                 return criterion.text.replace("?", selectedText);
             }
@@ -118,15 +127,15 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
         }
 
         public String getValueFromCriterion() {
-            if(type == TYPE_UNIVERSE)
+            if (type == TYPE_UNIVERSE)
                 return null;
-            if(criterion instanceof MultipleSelectCriterion) {
-                if(selectedIndex >= 0 && ((MultipleSelectCriterion)criterion).entryValues != null &&
-                        selectedIndex < ((MultipleSelectCriterion)criterion).entryValues.length) {
-                    return ((MultipleSelectCriterion)criterion).entryValues[selectedIndex];
+            if (criterion instanceof MultipleSelectCriterion) {
+                if (selectedIndex >= 0 && ((MultipleSelectCriterion) criterion).entryValues != null &&
+                        selectedIndex < ((MultipleSelectCriterion) criterion).entryValues.length) {
+                    return ((MultipleSelectCriterion) criterion).entryValues[selectedIndex];
                 }
                 return criterion.text;
-            } else if(criterion instanceof TextInputCriterion) {
+            } else if (criterion instanceof TextInputCriterion) {
                 return selectedText;
             }
             throw new UnsupportedOperationException("Unknown criterion type"); //$NON-NLS-1$
@@ -138,7 +147,7 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
     private boolean isDialog;
 
     private CustomFilterAdapter adapter;
-    private final Map<String,CustomFilterCriterion> criteria = Collections.synchronizedMap(new LinkedHashMap<String,CustomFilterCriterion>());
+    private final Map<String, CustomFilterCriterion> criteria = Collections.synchronizedMap(new LinkedHashMap<String, CustomFilterCriterion>());
 
     private final FilterCriteriaReceiver filterCriteriaReceiver = new FilterCriteriaReceiver();
 
@@ -166,7 +175,7 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
         database.openForReading();
         populateCriteria();
 
-        filterName = (TextView)findViewById(R.id.filterName);
+        filterName = (TextView) findViewById(R.id.filterName);
         List<CriterionInstance> startingCriteria = new ArrayList<CriterionInstance>();
         startingCriteria.add(getStartingUniverse());
         adapter = new CustomFilterAdapter(this, startingCriteria);
@@ -197,7 +206,7 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
 
         // built in criteria: due date
         {
-            String[] entryValues = new String[] {
+            String[] entryValues = new String[]{
                     "0",
                     PermaSql.VALUE_EOD_YESTERDAY,
                     PermaSql.VALUE_EOD,
@@ -219,20 +228,20 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
                                             Task.DUE_DATE.gt(0)),
                                     Task.DUE_DATE.lte("?"))).toString(),
                     values, r.getStringArray(R.array.CFC_dueBefore_entries),
-                    entryValues, ((BitmapDrawable)r.getDrawable(R.drawable.tango_calendar)).getBitmap(),
+                    entryValues, ((BitmapDrawable) r.getDrawable(R.drawable.tango_calendar)).getBitmap(),
                     getString(R.string.CFC_dueBefore_name));
             criteria.put(IDENTIFIER_DUEDATE, criterion);
         }
 
         // built in criteria: importance
         {
-            String[] entryValues = new String[] {
-                            Integer.toString(Task.IMPORTANCE_DO_OR_DIE),
-                            Integer.toString(Task.IMPORTANCE_MUST_DO),
-                            Integer.toString(Task.IMPORTANCE_SHOULD_DO),
-                            Integer.toString(Task.IMPORTANCE_NONE),
-                    };
-            String[] entries = new String[] {
+            String[] entryValues = new String[]{
+                    Integer.toString(Task.IMPORTANCE_DO_OR_DIE),
+                    Integer.toString(Task.IMPORTANCE_MUST_DO),
+                    Integer.toString(Task.IMPORTANCE_SHOULD_DO),
+                    Integer.toString(Task.IMPORTANCE_NONE),
+            };
+            String[] entries = new String[]{
                     "!!!", "!!", "!", "o"
             };
             ContentValues values = new ContentValues();
@@ -244,7 +253,7 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
                             Criterion.and(TaskCriteria.activeVisibleMine(),
                                     Task.IMPORTANCE.lte("?"))).toString(),
                     values, entries,
-                    entryValues, ((BitmapDrawable)r.getDrawable(R.drawable.tango_warning)).getBitmap(),
+                    entryValues, ((BitmapDrawable) r.getDrawable(R.drawable.tango_warning)).getBitmap(),
                     getString(R.string.CFC_importance_name));
             criteria.put(IDENTIFIER_IMPORTANCE, criterion);
         }
@@ -259,9 +268,9 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
                     Query.select(Task.ID).from(Task.TABLE).where(
                             Criterion.and(TaskCriteria.activeVisibleMine(),
                                     Task.TITLE.like("%?%"))).toString(),
-                        null, getString(R.string.CFC_title_contains_name), "",
-                        ((BitmapDrawable)r.getDrawable(R.drawable.tango_alpha)).getBitmap(),
-                        getString(R.string.CFC_title_contains_name));
+                    null, getString(R.string.CFC_title_contains_name), "",
+                    ((BitmapDrawable) r.getDrawable(R.drawable.tango_alpha)).getBitmap(),
+                    getString(R.string.CFC_title_contains_name));
             criteria.put(IDENTIFIER_TITLE, criterion);
         }
     }
@@ -302,14 +311,14 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
     }
 
     private void setUpListeners() {
-        ((Button)findViewById(R.id.add)).setOnClickListener(new View.OnClickListener() {
+        ((Button) findViewById(R.id.add)).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 listView.showContextMenu();
             }
         });
 
-        final Button saveAndView = ((Button)findViewById(R.id.saveAndView));
+        final Button saveAndView = ((Button) findViewById(R.id.saveAndView));
         saveAndView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -320,20 +329,22 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
         filterName.addTextChangedListener(new TextWatcher() {
             @Override
             public void afterTextChanged(Editable s) {
-                if(s.length() == 0) {
+                if (s.length() == 0) {
                     saveAndView.setText(R.string.CFA_button_view);
                 } else {
                     saveAndView.setText(R.string.CFA_button_save);
                 }
             }
+
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count,
-                    int after) {
+                                          int after) {
                 //
             }
+
             @Override
             public void onTextChanged(CharSequence s, int start, int before,
-                    int count) {
+                                      int count) {
                 //
             }
         });
@@ -341,8 +352,8 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
         listView.setOnCreateContextMenuListener(new OnCreateContextMenuListener() {
             @Override
             public void onCreateContextMenu(ContextMenu menu, View v,
-                    ContextMenuInfo menuInfo) {
-                if(menu.hasVisibleItems()) {
+                                            ContextMenuInfo menuInfo) {
+                if (menu.hasVisibleItems()) {
                     /* If it has items already, then the user did not click on the "Add Criteria" button, but instead
                        long held on a row in the list view, which caused CustomFilterAdapter.onCreateContextMenu
                        to be invoked before this onCreateContextMenu method was invoked.
@@ -376,11 +387,11 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
 
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-        if(menu.size() > 0)
+        if (menu.size() > 0)
             menu.clear();
 
         // view holder
-        if(v.getTag() != null) {
+        if (v.getTag() != null) {
             adapter.onCreateContextMenu(menu, v);
         }
     }
@@ -390,44 +401,44 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
         StringBuilder sql = new StringBuilder(" WHERE ");
         StringBuilder suggestedTitle = new StringBuilder();
         ContentValues values = new ContentValues();
-        for(int i = 0; i < adapter.getCount(); i++) {
+        for (int i = 0; i < adapter.getCount(); i++) {
             CriterionInstance instance = adapter.getItem(i);
             String value = instance.getValueFromCriterion();
-            if(value == null && instance.criterion.sql != null && instance.criterion.sql.contains("?"))
+            if (value == null && instance.criterion.sql != null && instance.criterion.sql.contains("?"))
                 value = "";
 
             String title = instance.getTitleFromCriterion();
 
-            switch(instance.type) {
-            case CriterionInstance.TYPE_ADD:
-                sql.append("OR ");
-                suggestedTitle.append(getString(R.string.CFA_type_add)).append(' ').
-                    append(title).append(' ');
-                break;
-            case CriterionInstance.TYPE_SUBTRACT:
-                sql.append("AND NOT ");
-                suggestedTitle.append(getString(R.string.CFA_type_subtract)).append(' ').
-                    append(title).append(' ');
-                break;
-            case CriterionInstance.TYPE_INTERSECT:
-                sql.append("AND ");
-                suggestedTitle.append(title).append(' ');
-                break;
-            case CriterionInstance.TYPE_UNIVERSE:
+            switch (instance.type) {
+                case CriterionInstance.TYPE_ADD:
+                    sql.append("OR ");
+                    suggestedTitle.append(getString(R.string.CFA_type_add)).append(' ').
+                            append(title).append(' ');
+                    break;
+                case CriterionInstance.TYPE_SUBTRACT:
+                    sql.append("AND NOT ");
+                    suggestedTitle.append(getString(R.string.CFA_type_subtract)).append(' ').
+                            append(title).append(' ');
+                    break;
+                case CriterionInstance.TYPE_INTERSECT:
+                    sql.append("AND ");
+                    suggestedTitle.append(title).append(' ');
+                    break;
+                case CriterionInstance.TYPE_UNIVERSE:
             }
 
 
             // special code for all tasks universe
-            if(instance.criterion.sql == null)
+            if (instance.criterion.sql == null)
                 sql.append(TaskCriteria.activeVisibleMine()).append(' ');
             else {
                 String subSql = instance.criterion.sql.replace("?", UnaryCriterion.sanitize(value));
                 sql.append(Task.ID).append(" IN (").append(subSql).append(") ");
             }
 
-            if(instance.criterion.valuesForNewTasks != null &&
+            if (instance.criterion.valuesForNewTasks != null &&
                     instance.type == CriterionInstance.TYPE_INTERSECT) {
-                for(Entry<String, Object> entry : instance.criterion.valuesForNewTasks.valueSet()) {
+                for (Entry<String, Object> entry : instance.criterion.valuesForNewTasks.valueSet()) {
                     values.put(entry.getKey().replace("?", value),
                             entry.getValue().toString().replace("?", value));
                 }
@@ -435,7 +446,7 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
         }
 
         String title;
-        if(filterName.getText().length() > 0) {
+        if (filterName.getText().length() > 0) {
             // persist saved filter
             title = filterName.getText().toString().trim();
             SavedFilter.persist(adapter, title, sql.toString(), values);
@@ -458,29 +469,29 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
         int max = 0, last = -1;
 
         StringBuilder sql = new StringBuilder(Query.select(new CountProperty()).from(Task.TABLE).toString()).
-            append(" WHERE ");
+                append(" WHERE ");
 
-        for(int i = 0; i < adapter.getCount(); i++) {
+        for (int i = 0; i < adapter.getCount(); i++) {
             CriterionInstance instance = adapter.getItem(i);
             String value = instance.getValueFromCriterion();
-            if(value == null && instance.criterion.sql != null && instance.criterion.sql.contains("?"))
+            if (value == null && instance.criterion.sql != null && instance.criterion.sql.contains("?"))
                 value = "";
 
-            switch(instance.type) {
-            case CriterionInstance.TYPE_ADD:
-                sql.append("OR ");
-                break;
-            case CriterionInstance.TYPE_SUBTRACT:
-                sql.append("AND NOT ");
-                break;
-            case CriterionInstance.TYPE_INTERSECT:
-                sql.append("AND ");
-                break;
-            case CriterionInstance.TYPE_UNIVERSE:
+            switch (instance.type) {
+                case CriterionInstance.TYPE_ADD:
+                    sql.append("OR ");
+                    break;
+                case CriterionInstance.TYPE_SUBTRACT:
+                    sql.append("AND NOT ");
+                    break;
+                case CriterionInstance.TYPE_INTERSECT:
+                    sql.append("AND ");
+                    break;
+                case CriterionInstance.TYPE_UNIVERSE:
             }
 
             // special code for all tasks universe
-            if(instance.criterion.sql == null)
+            if (instance.criterion.sql == null)
                 sql.append(TaskCriteria.activeVisibleMine()).append(' ');
             else {
                 String subSql = instance.criterion.sql.replace("?", UnaryCriterion.sanitize(value));
@@ -500,7 +511,7 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
             }
         }
 
-        for(int i = 0; i < adapter.getCount(); i++) {
+        for (int i = 0; i < adapter.getCount(); i++) {
             CriterionInstance instance = adapter.getItem(i);
             instance.max = max;
         }
@@ -509,7 +520,7 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
     }
 
     @SuppressWarnings("nls")
-    private <V> V getNth(int index, Map<?,V> map) {
+    private <V> V getNth(int index, Map<?, V> map) {
         int i = 0;
         for (V v : map.values()) {
             if (i == index) return v;
@@ -529,7 +540,7 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
 
     @Override
     public boolean onContextItemSelected(android.view.MenuItem item) {
-        if(item.getGroupId() == MENU_GROUP_FILTER) {
+        if (item.getGroupId() == MENU_GROUP_FILTER) {
             // give an initial value for the row before adding it
             CustomFilterCriterion criterion = getNth(item.getItemId(), criteria);
             final CriterionInstance instance = new CriterionInstance();
@@ -544,14 +555,14 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
         }
 
         // item type context item
-        else if(item.getGroupId() == MENU_GROUP_CONTEXT_TYPE) {
+        else if (item.getGroupId() == MENU_GROUP_CONTEXT_TYPE) {
             CriterionInstance instance = adapter.getItem(item.getOrder());
             instance.type = item.getItemId();
             updateList();
         }
 
         // delete context item
-        else if(item.getGroupId() == MENU_GROUP_CONTEXT_DELETE) {
+        else if (item.getGroupId() == MENU_GROUP_CONTEXT_DELETE) {
             CriterionInstance instance = adapter.getItem(item.getOrder());
             adapter.remove(instance);
             updateList();
@@ -565,7 +576,7 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
         public void onReceive(Context context, Intent intent) {
             try {
                 final Parcelable[] filters = intent.getExtras().
-                    getParcelableArray(AstridApiConstants.EXTRAS_RESPONSE);
+                        getParcelableArray(AstridApiConstants.EXTRAS_RESPONSE);
                 for (Parcelable filter : filters) {
                     CustomFilterCriterion filterCriterion = (CustomFilterCriterion) filter;
                     criteria.put(filterCriterion.identifier, filterCriterion);
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterAdapter.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterAdapter.java
index b349a54d7..9cc800db7 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterAdapter.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterAdapter.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.core;
 
-import java.util.List;
-
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -28,11 +26,12 @@ import com.todoroo.astrid.api.TextInputCriterion;
 import com.todoroo.astrid.core.CustomFilterActivity.CriterionInstance;
 import com.todoroo.astrid.data.AddOn;
 
+import java.util.List;
+
 /**
  * Adapter for {@link AddOn}s
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class CustomFilterAdapter extends ArrayAdapter<CriterionInstance> {
 
@@ -52,9 +51,9 @@ public class CustomFilterAdapter extends ArrayAdapter<CriterionInstance> {
         @Override
         public void onClick(View v) {
             ViewHolder viewHolder = (ViewHolder) v.getTag();
-            if(viewHolder == null)
+            if (viewHolder == null)
                 return;
-            if(viewHolder.item.type == CriterionInstance.TYPE_UNIVERSE)
+            if (viewHolder.item.type == CriterionInstance.TYPE_UNIVERSE)
                 return;
 
             showOptionsFor(viewHolder.item, new Runnable() {
@@ -70,13 +69,13 @@ public class CustomFilterAdapter extends ArrayAdapter<CriterionInstance> {
     public void onCreateContextMenu(ContextMenu menu, View v) {
         // view holder
         ViewHolder viewHolder = (ViewHolder) v.getTag();
-        if(viewHolder == null || viewHolder.item.type == CriterionInstance.TYPE_UNIVERSE)
+        if (viewHolder == null || viewHolder.item.type == CriterionInstance.TYPE_UNIVERSE)
             return;
 
         int index = getPosition(viewHolder.item);
 
         menu.setHeaderTitle(viewHolder.name.getText());
-        if(viewHolder.icon.getVisibility() == View.VISIBLE)
+        if (viewHolder.icon.getVisibility() == View.VISIBLE)
             menu.setHeaderIcon(viewHolder.icon.getDrawable());
 
 
@@ -101,13 +100,14 @@ public class CustomFilterAdapter extends ArrayAdapter<CriterionInstance> {
 
     /**
      * Show options menu for the given criterioninstance
+     *
      * @param item
      */
     public void showOptionsFor(final CriterionInstance item, final Runnable onComplete) {
         AlertDialog.Builder dialog = new AlertDialog.Builder(activity).
-            setTitle(item.criterion.name);
+                setTitle(item.criterion.name);
 
-        if(item.criterion instanceof MultipleSelectCriterion) {
+        if (item.criterion instanceof MultipleSelectCriterion) {
             MultipleSelectCriterion multiSelectCriterion = (MultipleSelectCriterion) item.criterion;
             final String[] titles = multiSelectCriterion.entryTitles;
             ArrayAdapter<String> adapter = new ArrayAdapter<String>(activity,
@@ -116,12 +116,12 @@ public class CustomFilterAdapter extends ArrayAdapter<CriterionInstance> {
                 @Override
                 public void onClick(DialogInterface click, int which) {
                     item.selectedIndex = which;
-                    if(onComplete != null)
+                    if (onComplete != null)
                         onComplete.run();
                 }
             };
             dialog.setAdapter(adapter, listener);
-        } else if(item.criterion instanceof TextInputCriterion) {
+        } else if (item.criterion instanceof TextInputCriterion) {
             TextInputCriterion textInCriterion = (TextInputCriterion) item.criterion;
             FrameLayout frameLayout = new FrameLayout(activity);
             frameLayout.setPadding(10, 0, 10, 0);
@@ -132,14 +132,14 @@ public class CustomFilterAdapter extends ArrayAdapter<CriterionInstance> {
                     FrameLayout.LayoutParams.FILL_PARENT,
                     FrameLayout.LayoutParams.WRAP_CONTENT));
             dialog.setMessage(textInCriterion.prompt).setView(frameLayout).
-                setPositiveButton(android.R.string.ok, new OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialogInterface, int which) {
-                        item.selectedText = editText.getText().toString();
-                        if(onComplete != null)
-                            onComplete.run();
-                    }
-                });
+                    setPositiveButton(android.R.string.ok, new OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int which) {
+                            item.selectedText = editText.getText().toString();
+                            if (onComplete != null)
+                                onComplete.run();
+                        }
+                    });
         }
 
         dialog.show().setOwnerActivity(activity);
@@ -149,17 +149,17 @@ public class CustomFilterAdapter extends ArrayAdapter<CriterionInstance> {
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        if(convertView == null) {
+        if (convertView == null) {
             convertView = inflater.inflate(R.layout.custom_filter_row, parent, false);
             ViewHolder viewHolder = new ViewHolder();
             viewHolder.type = (ImageView) convertView.findViewById(R.id.type);
             viewHolder.icon = (ImageView) convertView.findViewById(R.id.icon);
-            viewHolder.name= (TextView) convertView.findViewById(R.id.name);
+            viewHolder.name = (TextView) convertView.findViewById(R.id.name);
             viewHolder.filterView = (FilterView) convertView.findViewById(R.id.filter);
             convertView.setTag(viewHolder);
         }
 
-        ViewHolder viewHolder = (ViewHolder)convertView.getTag();
+        ViewHolder viewHolder = (ViewHolder) convertView.getTag();
         viewHolder.item = getItem(position);
         initializeView(convertView);
 
@@ -187,23 +187,23 @@ public class CustomFilterAdapter extends ArrayAdapter<CriterionInstance> {
 
         viewHolder.type.setVisibility(item.type == CriterionInstance.TYPE_UNIVERSE ?
                 View.GONE : View.VISIBLE);
-        switch(item.type) {
-        case CriterionInstance.TYPE_ADD:
-            viewHolder.type.setImageResource(R.drawable.arrow_join);
-            title = activity.getString(R.string.CFA_type_add) + " " + title;
-            break;
-        case CriterionInstance.TYPE_SUBTRACT:
-            viewHolder.type.setImageResource(R.drawable.arrow_branch);
-            title = activity.getString(R.string.CFA_type_subtract) + " " + title;
-            break;
-        case CriterionInstance.TYPE_INTERSECT:
-            viewHolder.type.setImageResource(R.drawable.arrow_down);
-            break;
+        switch (item.type) {
+            case CriterionInstance.TYPE_ADD:
+                viewHolder.type.setImageResource(R.drawable.arrow_join);
+                title = activity.getString(R.string.CFA_type_add) + " " + title;
+                break;
+            case CriterionInstance.TYPE_SUBTRACT:
+                viewHolder.type.setImageResource(R.drawable.arrow_branch);
+                title = activity.getString(R.string.CFA_type_subtract) + " " + title;
+                break;
+            case CriterionInstance.TYPE_INTERSECT:
+                viewHolder.type.setImageResource(R.drawable.arrow_down);
+                break;
         }
 
         viewHolder.icon.setVisibility(item.criterion.icon == null ? View.GONE :
-            View.VISIBLE);
-        if(item.criterion.icon != null)
+                View.VISIBLE);
+        if (item.criterion.icon != null)
             viewHolder.icon.setImageBitmap(item.criterion.icon);
 
         viewHolder.name.setText(title);
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java
index f3ada3bef..690dcdc2a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.core;
 
-import java.util.ArrayList;
-
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -41,19 +39,22 @@ import com.todoroo.astrid.gtasks.GtasksPreferenceService;
 import com.todoroo.astrid.service.TagDataService;
 import com.todoroo.astrid.service.ThemeService;
 
+import java.util.ArrayList;
+
 /**
  * Exposes Astrid's built in filters to the {@link FilterListFragment}
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public final class CustomFilterExposer extends BroadcastReceiver implements AstridFilterExposer {
 
     private static final String TOKEN_FILTER_ID = "id"; //$NON-NLS-1$
     private static final String TOKEN_FILTER_NAME = "name"; //$NON-NLS-1$
 
-    @Autowired TagDataService tagDataService;
-    @Autowired GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    TagDataService tagDataService;
+    @Autowired
+    GtasksPreferenceService gtasksPreferenceService;
 
     @Override
     public void onReceive(Context context, Intent intent) {
@@ -81,7 +82,7 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr
         TodorooCursor<StoreObject> cursor = null;
         if (useCustomFilters)
             cursor = dao.query(Query.select(StoreObject.PROPERTIES).where(
-                StoreObject.TYPE.eq(SavedFilter.TYPE)).orderBy(Order.asc(SavedFilter.NAME)));
+                    StoreObject.TYPE.eq(SavedFilter.TYPE)).orderBy(Order.asc(SavedFilter.NAME)));
         try {
             ArrayList<Filter> list = new ArrayList<Filter>();
 
@@ -91,9 +92,9 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr
                         r.getString(R.string.BFE_Recent),
                         new QueryTemplate().where(
                                 TaskCriteria.ownedByMe()).orderBy(
-                                        Order.desc(Task.MODIFICATION_DATE)).limit(15),
-                                        null);
-                recent.listingIcon = ((BitmapDrawable)r.getDrawable(
+                                Order.desc(Task.MODIFICATION_DATE)).limit(15),
+                        null);
+                recent.listingIcon = ((BitmapDrawable) r.getDrawable(
                         ThemeService.getDrawable(R.drawable.filter_pencil, themeFlags))).getBitmap();
 
                 list.add(recent);
@@ -104,16 +105,16 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr
 
             if (useCustomFilters && cursor != null) {
                 StoreObject savedFilter = new StoreObject();
-                for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+                for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                     savedFilter.readFromCursor(cursor);
                     Filter f = SavedFilter.load(savedFilter);
 
                     Intent deleteIntent = new Intent(context, DeleteActivity.class);
                     deleteIntent.putExtra(TOKEN_FILTER_ID, savedFilter.getId());
                     deleteIntent.putExtra(TOKEN_FILTER_NAME, f.title);
-                    f.contextMenuLabels = new String[] { context.getString(R.string.BFE_Saved_delete) };
-                    f.contextMenuIntents = new Intent[] { deleteIntent };
-                    f.listingIcon = ((BitmapDrawable)r.getDrawable(
+                    f.contextMenuLabels = new String[]{context.getString(R.string.BFE_Saved_delete)};
+                    f.contextMenuIntents = new Intent[]{deleteIntent};
+                    f.listingIcon = ((BitmapDrawable) r.getDrawable(
                             ThemeService.getDrawable(R.drawable.filter_sliders, themeFlags))).getBitmap();
                     list.add(f);
                 }
@@ -133,8 +134,8 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr
                 new QueryTemplate().where(Criterion.and(TaskCriteria.isActive(),
                         Criterion.or(Task.CREATOR_ID.eq(0), Task.CREATOR_ID.eq(ActFmPreferenceService.userId())),
                         Task.USER_ID.neq(0))),
-                        null);
-        f.listingIcon = ((BitmapDrawable)r.getDrawable(
+                null);
+        f.listingIcon = ((BitmapDrawable) r.getDrawable(
                 ThemeService.getDrawable(R.drawable.filter_assigned, themeFlags))).getBitmap();
         return f;
     }
@@ -143,7 +144,6 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr
      * Simple activity for deleting stuff
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     public static class DeleteActivity extends Activity {
 
@@ -153,7 +153,7 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr
             setTheme(android.R.style.Theme_Dialog);
 
             final long id = getIntent().getLongExtra(TOKEN_FILTER_ID, -1);
-            if(id == -1) {
+            if (id == -1) {
                 finish();
                 return;
             }
@@ -177,7 +177,8 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr
                             setResult(RESULT_CANCELED);
                             finish();
                         }
-                    });
+                    }
+            );
         }
     }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java b/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java
index 9748ef508..b64101fc5 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java
@@ -21,7 +21,6 @@ import com.todoroo.astrid.gcal.Calendars;
  * Displays the preference screen for users to edit their preferences
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class DefaultsPreferences extends TodorooPreferenceActivity {
 
@@ -39,7 +38,6 @@ public class DefaultsPreferences extends TodorooPreferenceActivity {
     }
 
     /**
-     *
      * @param resource if null, updates all resources
      */
     @Override
@@ -47,33 +45,33 @@ public class DefaultsPreferences extends TodorooPreferenceActivity {
         Resources r = getResources();
 
         // defaults options
-        if(r.getString(R.string.p_default_urgency_key).equals(preference.getKey())) {
+        if (r.getString(R.string.p_default_urgency_key).equals(preference.getKey())) {
             updateTaskListPreference(preference, value, r, R.array.EPr_default_urgency,
                     R.array.EPr_default_urgency_values, R.string.EPr_default_urgency_desc);
-        } else if(r.getString(R.string.p_default_importance_key).equals(preference.getKey())) {
+        } else if (r.getString(R.string.p_default_importance_key).equals(preference.getKey())) {
             updateTaskListPreference(preference, value, r, R.array.EPr_default_importance,
                     R.array.EPr_default_importance_values, R.string.EPr_default_importance_desc);
-        } else if(r.getString(R.string.p_default_hideUntil_key).equals(preference.getKey())) {
+        } else if (r.getString(R.string.p_default_hideUntil_key).equals(preference.getKey())) {
             updateTaskListPreference(preference, value, r, R.array.EPr_default_hideUntil,
                     R.array.EPr_default_hideUntil_values, R.string.EPr_default_hideUntil_desc);
-        } else if(r.getString(R.string.p_default_reminders_key).equals(preference.getKey())) {
+        } else if (r.getString(R.string.p_default_reminders_key).equals(preference.getKey())) {
             updateTaskListPreference(preference, value, r, R.array.EPr_default_reminders,
                     R.array.EPr_default_reminders_values, R.string.EPr_default_reminders_desc);
-        } else if(r.getString(R.string.p_default_reminders_mode_key).equals(preference.getKey())) {
+        } else if (r.getString(R.string.p_default_reminders_mode_key).equals(preference.getKey())) {
             updateTaskListPreference(preference, value, r, R.array.EPr_default_reminders_mode,
                     R.array.EPr_default_reminders_mode_values, R.string.EPr_default_reminders_mode_desc);
-        } else if(r.getString(R.string.p_rmd_default_random_hours).equals(preference.getKey())) {
-            int index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_reminder_random_hours), (String)value);
-            if(index <= 0)
+        } else if (r.getString(R.string.p_rmd_default_random_hours).equals(preference.getKey())) {
+            int index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_reminder_random_hours), (String) value);
+            if (index <= 0)
                 preference.setSummary(r.getString(R.string.rmd_EPr_defaultRemind_desc_disabled));
             else {
                 String setting = r.getStringArray(R.array.EPr_reminder_random)[index];
                 preference.setSummary(r.getString(R.string.rmd_EPr_defaultRemind_desc, setting));
             }
-        } else if(r.getString(R.string.gcal_p_default).equals(preference.getKey())) {
+        } else if (r.getString(R.string.gcal_p_default).equals(preference.getKey())) {
             ListPreference listPreference = (ListPreference) preference;
-            int index = AndroidUtilities.indexOf(listPreference.getEntryValues(), (String)value);
-            if(index <= 0)
+            int index = AndroidUtilities.indexOf(listPreference.getEntryValues(), (String) value);
+            if (index <= 0)
                 preference.setSummary(r.getString(R.string.EPr_default_addtocalendar_desc_disabled));
             else {
                 String setting = listPreference.getEntries()[index].toString();
@@ -81,7 +79,7 @@ public class DefaultsPreferences extends TodorooPreferenceActivity {
             }
         } else if (r.getString(R.string.p_voiceInputCreatesTask).equals(preference.getKey())) {
             preference.setEnabled(Preferences.getBoolean(R.string.p_voiceInputEnabled, false));
-            if (value != null && !(Boolean)value)
+            if (value != null && !(Boolean) value)
                 preference.setSummary(R.string.EPr_voiceInputCreatesTask_desc_disabled);
             else
                 preference.setSummary(R.string.EPr_voiceInputCreatesTask_desc_enabled);
@@ -89,9 +87,9 @@ public class DefaultsPreferences extends TodorooPreferenceActivity {
     }
 
     private void updateTaskListPreference(Preference preference, Object value,
-            Resources r, int keyArray, int valueArray, int summaryResource) {
-        int index = AndroidUtilities.indexOf(r.getStringArray(valueArray), (String)value);
-        if(index == -1) {
+                                          Resources r, int keyArray, int valueArray, int summaryResource) {
+        int index = AndroidUtilities.indexOf(r.getStringArray(valueArray), (String) value);
+        if (index == -1) {
             // force the zeroth index
             index = 0;
             Editor editor = preference.getEditor();
@@ -104,9 +102,9 @@ public class DefaultsPreferences extends TodorooPreferenceActivity {
                 setting));
 
         // if user changed the value, refresh task defaults
-        if(!AndroidUtilities.equals(value, Preferences.getStringValue(preference.getKey()))) {
+        if (!AndroidUtilities.equals(value, Preferences.getStringValue(preference.getKey()))) {
             Editor editor = Preferences.getPrefs(this).edit();
-            editor.putString(preference.getKey(), (String)value);
+            editor.putString(preference.getKey(), (String) value);
             editor.commit();
         }
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/FilterView.java b/astrid/plugin-src/com/todoroo/astrid/core/FilterView.java
index 4c5323ec5..21f60d3eb 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/FilterView.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/FilterView.java
@@ -17,7 +17,6 @@ import android.view.View;
  * Draws filters
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class FilterView extends View {
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/LinkActionExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/LinkActionExposer.java
index b95e38245..6f5aa76b9 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/LinkActionExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/LinkActionExposer.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.core;
 
-import java.util.HashMap;
-import java.util.List;
-
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -29,11 +26,13 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.files.FilesAction;
 import com.todoroo.astrid.notes.NotesAction;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * Exposes {@link TaskDecoration} for phone numbers, emails, urls, etc
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class LinkActionExposer {
 
@@ -44,13 +43,13 @@ public class LinkActionExposer {
         Linkify.addLinks(titleSpan, Linkify.ALL);
 
         URLSpan[] urlSpans = titleSpan.getSpans(0, titleSpan.length(), URLSpan.class);
-        if(urlSpans.length == 0 && !hasNotes &&
+        if (urlSpans.length == 0 && !hasNotes &&
                 !hasAttachments)
             return null;
 
         PackageManager pm = context.getPackageManager();
 
-        for(URLSpan urlSpan : urlSpans) {
+        for (URLSpan urlSpan : urlSpans) {
             String url = urlSpan.getURL();
             int start = titleSpan.getSpanStart(urlSpan);
             int end = titleSpan.getSpanEnd(urlSpan);
@@ -85,12 +84,12 @@ public class LinkActionExposer {
         Intent actionIntent;
 
         // if options > 1, display open with...
-        if(resolveInfoList.size() > 1) {
+        if (resolveInfoList.size() > 1) {
             actionIntent = Intent.createChooser(itemIntent, text);
         }
 
         // else show app that gets opened
-        else if(resolveInfoList.size() == 1) {
+        else if (resolveInfoList.size() == 1) {
             actionIntent = itemIntent;
         }
 
@@ -108,11 +107,11 @@ public class LinkActionExposer {
             icon = getBitmapDrawable(R.drawable.action_web, r);
         }
 
-        if(text.length() > 15)
+        if (text.length() > 15)
             text = text.substring(0, 12) + "..."; //$NON-NLS-1$
 
         TaskAction action = new TaskAction(text,
-                PendingIntent.getActivity(context, (int)id, actionIntent, 0), (BitmapDrawable)icon);
+                PendingIntent.getActivity(context, (int) id, actionIntent, 0), (BitmapDrawable) icon);
         return action;
     }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java b/astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java
index 32f1d18e2..dc1dadb4a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java
@@ -39,15 +39,18 @@ import com.todoroo.astrid.utility.AstridPreferences;
  * Displays the preference screen for users to manage their old tasks and events
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class OldTaskPreferences extends TodorooPreferenceActivity {
 
-    @Autowired TaskService taskService;
-    @Autowired MetadataService metadataService;
-    @Autowired Database database;
+    @Autowired
+    TaskService taskService;
+    @Autowired
+    MetadataService metadataService;
+    @Autowired
+    Database database;
 
-    @Autowired ActFmSyncService actFmSyncService;
+    @Autowired
+    ActFmSyncService actFmSyncService;
 
     ProgressDialog pd;
 
@@ -104,7 +107,7 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
             }
         });
 
-        preference= screen.findPreference(getString(R.string.EPr_manage_clear_all));
+        preference = screen.findPreference(getString(R.string.EPr_manage_clear_all));
         preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
             public boolean onPreferenceClick(Preference p) {
                 showClearDataDialog();
@@ -118,7 +121,7 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
                 this,
                 getResources().getString(
                         R.string.EPr_manage_clear_all_message),
-                        new OnClickListener() {
+                new OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         Editor editor = Preferences.getPrefs(OldTaskPreferences.this).edit();
@@ -150,7 +153,9 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
         super.onPause();
     }
 
-    /** Show the dialog to delete completed tasks */
+    /**
+     * Show the dialog to delete completed tasks
+     */
     private void showDeleteCompletedDialog() {
         DialogUtilities.okCancelDialog(
                 this,
@@ -167,7 +172,7 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
                                 try {
                                     Task task = new Task();
                                     int length = cursor.getCount();
-                                    for(int i = 0; i < length; i++) {
+                                    for (int i = 0; i < length; i++) {
                                         cursor.moveToNext();
                                         task.readFromCursor(cursor);
                                         GCalHelper.deleteTaskEvent(task);
@@ -189,7 +194,9 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
                 }, null);
     }
 
-    /** Show the dialog to purge deleted tasks */
+    /**
+     * Show the dialog to purge deleted tasks
+     */
     private void showPurgeDeletedDialog() {
         DialogUtilities.okCancelDialog(
                 this,
@@ -206,7 +213,7 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
                                 try {
                                     Task task = new Task();
                                     int length = cursor.getCount();
-                                    for(int i = 0; i < length; i++) {
+                                    for (int i = 0; i < length; i++) {
                                         cursor.moveToNext();
                                         task.readFromCursor(cursor);
                                         GCalHelper.deleteTaskEvent(task);
@@ -225,7 +232,9 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
                 }, null);
     }
 
-    /** Show the dialog to delete completed events */
+    /**
+     * Show the dialog to delete completed events
+     */
     private void showDeleteCompletedEventsDialog() {
         DialogUtilities.okCancelDialog(
                 this,
@@ -243,7 +252,7 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
                                 try {
                                     Task task = new Task();
                                     int length = cursor.getCount();
-                                    for(int i = 0; i < length; i++) {
+                                    for (int i = 0; i < length; i++) {
                                         cursor.moveToNext();
                                         task.readFromCursor(cursor);
                                         if (GCalHelper.deleteTaskEvent(task))
@@ -266,7 +275,9 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
                 }, null);
     }
 
-    /** Show the dialog to delete all events */
+    /**
+     * Show the dialog to delete all events
+     */
     private void showDeleteAllEventsDialog() {
         DialogUtilities.okCancelDialog(
                 this,
@@ -284,7 +295,7 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
                                 try {
                                     Task task = new Task();
                                     int length = cursor.getCount();
-                                    for(int i = 0; i < length; i++) {
+                                    for (int i = 0; i < length; i++) {
                                         cursor.moveToNext();
                                         task.readFromCursor(cursor);
                                         if (GCalHelper.deleteTaskEvent(task))
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/PluginServices.java b/astrid/plugin-src/com/todoroo/astrid/core/PluginServices.java
index 59f612b49..531b60bcb 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/PluginServices.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/PluginServices.java
@@ -41,7 +41,6 @@ import com.todoroo.astrid.service.TaskService;
  * Utility class for getting dependency-injected services from plugins
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public final class PluginServices {
 
@@ -128,7 +127,7 @@ public final class PluginServices {
     }
 
     private static PluginServices getInstance() {
-        if(instance == null) {
+        if (instance == null) {
             synchronized (PluginServices.class) {
                 if (instance == null)
                     instance = new PluginServices();
@@ -244,8 +243,8 @@ public final class PluginServices {
     public static Metadata getMetadataByTaskAndWithKey(long taskId, String metadataKey) {
         TodorooCursor<Metadata> cursor = PluginServices.getMetadataService().query(Query.select(
                 Metadata.PROPERTIES).where(MetadataCriteria.byTaskAndwithKey(taskId, metadataKey)));
-                try {
-            if(cursor.getCount() > 0) {
+        try {
+            if (cursor.getCount() > 0) {
                 cursor.moveToNext();
                 return new Metadata(cursor);
             } else
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/SavedFilter.java b/astrid/plugin-src/com/todoroo/astrid/core/SavedFilter.java
index 057461a23..52edea76e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/SavedFilter.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/SavedFilter.java
@@ -21,26 +21,35 @@ import com.todoroo.astrid.data.StoreObject;
  * {@link StoreObject} entries for a saved custom filter
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class SavedFilter {
 
-    /** type */
+    /**
+     * type
+     */
     public static final String TYPE = "filter"; //$NON-NLS-1$
 
-    /** saved filter name */
+    /**
+     * saved filter name
+     */
     public static final StringProperty NAME = new StringProperty(StoreObject.TABLE,
             StoreObject.ITEM.name);
 
-    /** perma-sql */
+    /**
+     * perma-sql
+     */
     public static final StringProperty SQL = new StringProperty(StoreObject.TABLE,
             StoreObject.VALUE1.name);
 
-    /** serialized new task content values */
+    /**
+     * serialized new task content values
+     */
     public static final StringProperty VALUES = new StringProperty(StoreObject.TABLE,
             StoreObject.VALUE2.name);
 
-    /** serialized list of filters applied */
+    /**
+     * serialized list of filters applied
+     */
     public static final StringProperty FILTERS = new StringProperty(StoreObject.TABLE,
             StoreObject.VALUE3.name);
 
@@ -55,9 +64,9 @@ public class SavedFilter {
      * @param values2
      */
     public static void persist(CustomFilterAdapter adapter, String title,
-            String sql, ContentValues values) {
+                               String sql, ContentValues values) {
 
-        if(title == null || title.length() == 0)
+        if (title == null || title.length() == 0)
             return;
 
         // if filter of this name exists, edit it
@@ -65,7 +74,7 @@ public class SavedFilter {
         StoreObject storeObject = new StoreObject();
         TodorooCursor<StoreObject> cursor = dao.query(Query.select(StoreObject.ID).where(NAME.eq(title)));
         try {
-            if(!cursor.isAfterLast()) {
+            if (!cursor.isAfterLast()) {
                 cursor.moveToNext();
                 storeObject.readFromCursor(cursor);
             }
@@ -78,7 +87,7 @@ public class SavedFilter {
         storeObject.setValue(NAME, title);
         storeObject.setValue(SQL, sql);
 
-        if(values == null)
+        if (values == null)
             storeObject.setValue(VALUES, ""); //$NON-NLS-1$
         else
             storeObject.setValue(VALUES, AndroidUtilities.contentValuesToSerializedString(values));
@@ -91,12 +100,13 @@ public class SavedFilter {
 
     /**
      * Turn a series of CriterionInstance objects into a string
+     *
      * @param adapter
      * @return
      */
     private static String serializeFilters(CustomFilterAdapter adapter) {
         StringBuilder values = new StringBuilder();
-        for(int i = 0; i < adapter.getCount(); i++) {
+        for (int i = 0; i < adapter.getCount(); i++) {
             CriterionInstance item = adapter.getItem(i);
 
             // criterion|entry|text|type|sql
@@ -104,7 +114,7 @@ public class SavedFilter {
             values.append(escape(item.getValueFromCriterion())).append(AndroidUtilities.SERIALIZATION_SEPARATOR);
             values.append(escape(item.criterion.text)).append(AndroidUtilities.SERIALIZATION_SEPARATOR);
             values.append(item.type).append(AndroidUtilities.SERIALIZATION_SEPARATOR);
-            if(item.criterion.sql != null)
+            if (item.criterion.sql != null)
                 values.append(item.criterion.sql);
             values.append('\n');
         }
@@ -113,7 +123,7 @@ public class SavedFilter {
     }
 
     private static String escape(String item) {
-        if(item == null)
+        if (item == null)
             return ""; //$NON-NLS-1$
         return item.replace(AndroidUtilities.SERIALIZATION_SEPARATOR,
                 AndroidUtilities.SEPARATOR_ESCAPE);
@@ -121,6 +131,7 @@ public class SavedFilter {
 
     /**
      * Read filter from store
+     *
      * @param savedFilter
      * @return
      */
@@ -130,7 +141,7 @@ public class SavedFilter {
         String values = savedFilter.getValue(VALUES);
 
         ContentValues contentValues = null;
-        if(!TextUtils.isEmpty(values))
+        if (!TextUtils.isEmpty(values))
             contentValues = AndroidUtilities.contentValuesFromSerializedString(values);
 
         return new Filter(title, title, sql, contentValues);
diff --git a/astrid/plugin-src/com/todoroo/astrid/files/AACRecordingActivity.java b/astrid/plugin-src/com/todoroo/astrid/files/AACRecordingActivity.java
index c4852466e..071d557f4 100644
--- a/astrid/plugin-src/com/todoroo/astrid/files/AACRecordingActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/files/AACRecordingActivity.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.files;
 
-import java.io.IOException;
-import java.util.concurrent.atomic.AtomicReference;
-
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
@@ -23,6 +20,9 @@ import com.todoroo.aacenc.AACRecorder.AACRecorderCallbacks;
 import com.todoroo.aacenc.AACToM4A;
 import com.todoroo.andlib.utility.DialogUtilities;
 
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicReference;
+
 public class AACRecordingActivity extends Activity implements AACRecorderCallbacks {
 
     public static final String EXTRA_TEMP_FILE = "tempFile"; //$NON-NLS-1$
diff --git a/astrid/plugin-src/com/todoroo/astrid/files/FileExplore.java b/astrid/plugin-src/com/todoroo/astrid/files/FileExplore.java
index 293dd4b9a..9d493344d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/files/FileExplore.java
+++ b/astrid/plugin-src/com/todoroo/astrid/files/FileExplore.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.files;
 
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.ArrayList;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
@@ -28,214 +24,217 @@ import android.widget.TextView;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.utility.DialogUtilities;
 
+import java.io.File;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+
 /**
  * Based on the Android-File-Explore project by Manish Burman
  * https://github.com/mburman/Android-File-Explore
- *
  */
 public class FileExplore extends Activity {
 
-	// Stores names of traversed directories
-	ArrayList<String> str = new ArrayList<String>();
+    // Stores names of traversed directories
+    ArrayList<String> str = new ArrayList<String>();
 
-	// Check if the first level of the directory structure is the one showing
-	private Boolean firstLvl = true;
+    // Check if the first level of the directory structure is the one showing
+    private Boolean firstLvl = true;
 
-	private static final String TAG = "F_PATH"; //$NON-NLS-1$
+    private static final String TAG = "F_PATH"; //$NON-NLS-1$
 
-	public static final String RESULT_FILE_SELECTED = "fileSelected"; //$NON-NLS-1$
+    public static final String RESULT_FILE_SELECTED = "fileSelected"; //$NON-NLS-1$
 
-	public static final String RESULT_DIR_SELECTED = "dirSelected"; //$NON-NLS-1$
+    public static final String RESULT_DIR_SELECTED = "dirSelected"; //$NON-NLS-1$
 
-	public static final String EXTRA_DIRECTORIES_SELECTABLE = "directoriesSelectable"; //$NON-NLS-1$
+    public static final String EXTRA_DIRECTORIES_SELECTABLE = "directoriesSelectable"; //$NON-NLS-1$
 
-	private Item[] fileList;
-	private File path;
-	private String chosenFile;
-	private static final int DIALOG_LOAD_FILE = 1000;
-	private String upString;
+    private Item[] fileList;
+    private File path;
+    private String chosenFile;
+    private static final int DIALOG_LOAD_FILE = 1000;
+    private String upString;
 
-	private boolean directoryMode;
+    private boolean directoryMode;
 
-	private ListAdapter adapter;
+    private ListAdapter adapter;
 
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
-		super.onCreate(savedInstanceState);
+        super.onCreate(savedInstanceState);
 
-		if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState()))
-		    path = new File(Environment.getExternalStorageDirectory().toString());
-		else
-		    path = Environment.getRootDirectory();
+        if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState()))
+            path = new File(Environment.getExternalStorageDirectory().toString());
+        else
+            path = Environment.getRootDirectory();
 
-		loadFileList();
+        loadFileList();
 
-		directoryMode = getIntent().getBooleanExtra(EXTRA_DIRECTORIES_SELECTABLE, false);
+        directoryMode = getIntent().getBooleanExtra(EXTRA_DIRECTORIES_SELECTABLE, false);
 
-		showDialog(DIALOG_LOAD_FILE);
-		upString = getString(R.string.file_browser_up);
-		Log.d(TAG, path.getAbsolutePath());
+        showDialog(DIALOG_LOAD_FILE);
+        upString = getString(R.string.file_browser_up);
+        Log.d(TAG, path.getAbsolutePath());
 
-	}
+    }
 
-	private void loadFileList() {
-		try {
-			path.mkdirs();
-		} catch (SecurityException e) {
-		    DialogUtilities.okDialog(this, getString(R.string.file_browser_err_permissions), new DialogInterface.OnClickListener() {
+    private void loadFileList() {
+        try {
+            path.mkdirs();
+        } catch (SecurityException e) {
+            DialogUtilities.okDialog(this, getString(R.string.file_browser_err_permissions), new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
                     finish();
                 }
             });
-		}
-
-		// Checks whether path exists
-		if (path.exists()) {
-			FilenameFilter filter = new FilenameFilter() {
-				@Override
-				public boolean accept(File dir, String filename) {
-					File sel = new File(dir, filename);
-					// Filters based on whether the file is hidden or not
-					return (sel.isFile() || sel.isDirectory())
-							&& !sel.isHidden();
-
-				}
-			};
-
-			String[] fList = path.list(filter);
-			fileList = new Item[fList.length];
-			for (int i = 0; i < fList.length; i++) {
-				fileList[i] = new Item(fList[i], R.drawable.file_icon);
-
-				// Convert into file path
-				File sel = new File(path, fList[i]);
-
-				// Set drawables
-				if (sel.isDirectory()) {
-					fileList[i].icon = R.drawable.directory_icon;
-				}
-			}
-
-			if (!firstLvl) {
-				Item temp[] = new Item[fileList.length + 1];
-				for (int i = 0; i < fileList.length; i++) {
-					temp[i + 1] = fileList[i];
-				}
-				temp[0] = new Item(upString, R.drawable.directory_up);
-				fileList = temp;
-			}
-		} else {
-			Log.e(TAG, "path does not exist"); //$NON-NLS-1$
-		}
-
-		adapter = new ArrayAdapter<Item>(this,
-				android.R.layout.select_dialog_item, android.R.id.text1,
-				fileList) {
-			@Override
-			public View getView(int position, View convertView, ViewGroup parent) {
-				// creates view
-				View view = super.getView(position, convertView, parent);
-				TextView textView = (TextView) view
-						.findViewById(android.R.id.text1);
-
-				// put the image on the text view
-				textView.setCompoundDrawablesWithIntrinsicBounds(
-						fileList[position].icon, 0, 0, 0);
-
-				// add margin between image and text (support various screen
-				// densities)
-				int dp5 = (int) (5 * getResources().getDisplayMetrics().density + 0.5f);
-				textView.setCompoundDrawablePadding(dp5);
-
-				return view;
-			}
-		};
-
-	}
-
-	private class Item {
-		public String file;
-		public int icon;
-
-		public Item(String file, Integer icon) {
-			this.file = file;
-			this.icon = icon;
-		}
-
-		@Override
-		public String toString() {
-			return file;
-		}
-	}
-
-	@Override
-	protected Dialog onCreateDialog(int id) {
-		Dialog dialog = null;
-		AlertDialog.Builder builder = new Builder(this);
-
-		if (fileList == null) {
-			dialog = builder.create();
-			return dialog;
-		}
-
-		switch (id) {
-		case DIALOG_LOAD_FILE:
-			builder.setTitle(getString(directoryMode ? R.string.dir_browser_title : R.string.file_browser_title));
-			builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface d, int which) {
-					chosenFile = fileList[which].file;
-					File sel = new File(path + File.separator + chosenFile);
-					if (sel.isDirectory()) {
-						firstLvl = false;
-
-						// Adds chosen directory to list
-						str.add(chosenFile);
-						fileList = null;
-						path = new File(sel.toString());
-
-						loadFileList();
-
-						removeDialog(DIALOG_LOAD_FILE);
-						showDialog(DIALOG_LOAD_FILE);
-					} else if (chosenFile.equals(upString) && !sel.exists()) { // Checks if 'up' was clicked
-						// present directory removed from list
-						String s = str.remove(str.size() - 1);
-
-						// path modified to exclude present directory
-						path = new File(path.toString().substring(0,
-								path.toString().lastIndexOf(s)));
-						fileList = null;
-
-						// if there are no more directories in the list, then
-						// its the first level
-						if (str.isEmpty()) {
-							firstLvl = true;
-						}
-						loadFileList();
-
-						removeDialog(DIALOG_LOAD_FILE);
-						showDialog(DIALOG_LOAD_FILE);
-					} else {
-					    Intent result = new Intent();
-					    if (directoryMode) {
-					        result.putExtra(RESULT_DIR_SELECTED, path.getAbsolutePath());
-					    } else {
-					        result.putExtra(RESULT_FILE_SELECTED, sel.getAbsolutePath());
-					    }
-					    setResult(RESULT_OK, result);
-					    removeDialog(DIALOG_LOAD_FILE);
-					    finish();
-					}
-
-				}
-			});
-			break;
-		}
-		if (directoryMode) {
-		    builder.setPositiveButton(R.string.file_dir_dialog_ok, new DialogInterface.OnClickListener() {
+        }
+
+        // Checks whether path exists
+        if (path.exists()) {
+            FilenameFilter filter = new FilenameFilter() {
+                @Override
+                public boolean accept(File dir, String filename) {
+                    File sel = new File(dir, filename);
+                    // Filters based on whether the file is hidden or not
+                    return (sel.isFile() || sel.isDirectory())
+                            && !sel.isHidden();
+
+                }
+            };
+
+            String[] fList = path.list(filter);
+            fileList = new Item[fList.length];
+            for (int i = 0; i < fList.length; i++) {
+                fileList[i] = new Item(fList[i], R.drawable.file_icon);
+
+                // Convert into file path
+                File sel = new File(path, fList[i]);
+
+                // Set drawables
+                if (sel.isDirectory()) {
+                    fileList[i].icon = R.drawable.directory_icon;
+                }
+            }
+
+            if (!firstLvl) {
+                Item temp[] = new Item[fileList.length + 1];
+                for (int i = 0; i < fileList.length; i++) {
+                    temp[i + 1] = fileList[i];
+                }
+                temp[0] = new Item(upString, R.drawable.directory_up);
+                fileList = temp;
+            }
+        } else {
+            Log.e(TAG, "path does not exist"); //$NON-NLS-1$
+        }
+
+        adapter = new ArrayAdapter<Item>(this,
+                android.R.layout.select_dialog_item, android.R.id.text1,
+                fileList) {
+            @Override
+            public View getView(int position, View convertView, ViewGroup parent) {
+                // creates view
+                View view = super.getView(position, convertView, parent);
+                TextView textView = (TextView) view
+                        .findViewById(android.R.id.text1);
+
+                // put the image on the text view
+                textView.setCompoundDrawablesWithIntrinsicBounds(
+                        fileList[position].icon, 0, 0, 0);
+
+                // add margin between image and text (support various screen
+                // densities)
+                int dp5 = (int) (5 * getResources().getDisplayMetrics().density + 0.5f);
+                textView.setCompoundDrawablePadding(dp5);
+
+                return view;
+            }
+        };
+
+    }
+
+    private class Item {
+        public String file;
+        public int icon;
+
+        public Item(String file, Integer icon) {
+            this.file = file;
+            this.icon = icon;
+        }
+
+        @Override
+        public String toString() {
+            return file;
+        }
+    }
+
+    @Override
+    protected Dialog onCreateDialog(int id) {
+        Dialog dialog = null;
+        AlertDialog.Builder builder = new Builder(this);
+
+        if (fileList == null) {
+            dialog = builder.create();
+            return dialog;
+        }
+
+        switch (id) {
+            case DIALOG_LOAD_FILE:
+                builder.setTitle(getString(directoryMode ? R.string.dir_browser_title : R.string.file_browser_title));
+                builder.setAdapter(adapter, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface d, int which) {
+                        chosenFile = fileList[which].file;
+                        File sel = new File(path + File.separator + chosenFile);
+                        if (sel.isDirectory()) {
+                            firstLvl = false;
+
+                            // Adds chosen directory to list
+                            str.add(chosenFile);
+                            fileList = null;
+                            path = new File(sel.toString());
+
+                            loadFileList();
+
+                            removeDialog(DIALOG_LOAD_FILE);
+                            showDialog(DIALOG_LOAD_FILE);
+                        } else if (chosenFile.equals(upString) && !sel.exists()) { // Checks if 'up' was clicked
+                            // present directory removed from list
+                            String s = str.remove(str.size() - 1);
+
+                            // path modified to exclude present directory
+                            path = new File(path.toString().substring(0,
+                                    path.toString().lastIndexOf(s)));
+                            fileList = null;
+
+                            // if there are no more directories in the list, then
+                            // its the first level
+                            if (str.isEmpty()) {
+                                firstLvl = true;
+                            }
+                            loadFileList();
+
+                            removeDialog(DIALOG_LOAD_FILE);
+                            showDialog(DIALOG_LOAD_FILE);
+                        } else {
+                            Intent result = new Intent();
+                            if (directoryMode) {
+                                result.putExtra(RESULT_DIR_SELECTED, path.getAbsolutePath());
+                            } else {
+                                result.putExtra(RESULT_FILE_SELECTED, sel.getAbsolutePath());
+                            }
+                            setResult(RESULT_OK, result);
+                            removeDialog(DIALOG_LOAD_FILE);
+                            finish();
+                        }
+
+                    }
+                });
+                break;
+        }
+        if (directoryMode) {
+            builder.setPositiveButton(R.string.file_dir_dialog_ok, new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface d, int which) {
                     Intent result = new Intent();
@@ -245,7 +244,7 @@ public class FileExplore extends Activity {
                     finish();
                 }
             });
-		    builder.setNegativeButton(R.string.file_dir_dialog_default, new DialogInterface.OnClickListener() {
+            builder.setNegativeButton(R.string.file_dir_dialog_default, new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface d, int which) {
                     Intent result = new Intent();
@@ -255,17 +254,17 @@ public class FileExplore extends Activity {
                     finish();
                 }
             });
-		}
+        }
 
-		dialog = builder.show();
-		dialog.setCancelable(true);
-		dialog.setOnCancelListener(new OnCancelListener() {
+        dialog = builder.show();
+        dialog.setCancelable(true);
+        dialog.setOnCancelListener(new OnCancelListener() {
             @Override
             public void onCancel(DialogInterface d) {
                 finish();
             }
         });
-		return dialog;
-	}
+        return dialog;
+    }
 
 }
\ No newline at end of file
diff --git a/astrid/plugin-src/com/todoroo/astrid/files/FileMetadata.java b/astrid/plugin-src/com/todoroo/astrid/files/FileMetadata.java
index b51bc6c1c..586ea92bb 100644
--- a/astrid/plugin-src/com/todoroo/astrid/files/FileMetadata.java
+++ b/astrid/plugin-src/com/todoroo/astrid/files/FileMetadata.java
@@ -11,13 +11,15 @@ import com.todoroo.astrid.data.Metadata;
 
 /**
  * This class was deprecated with SyncV2. Use TaskAttachment instead.
- * @author Sam
  *
+ * @author Sam
  */
 @Deprecated
 public class FileMetadata {
 
-    /** metadata key */
+    /**
+     * metadata key
+     */
     public static final String METADATA_KEY = "file"; //$NON-NLS-1$
 
     public static final StringProperty FILE_PATH = new StringProperty(Metadata.TABLE,
diff --git a/astrid/plugin-src/com/todoroo/astrid/files/FileUtilities.java b/astrid/plugin-src/com/todoroo/astrid/files/FileUtilities.java
index 7743608b8..58f1a7e16 100644
--- a/astrid/plugin-src/com/todoroo/astrid/files/FileUtilities.java
+++ b/astrid/plugin-src/com/todoroo/astrid/files/FileUtilities.java
@@ -5,11 +5,6 @@
  */
 package com.todoroo.astrid.files;
 
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.concurrent.atomic.AtomicReference;
-
 import android.content.Context;
 import android.text.TextUtils;
 
@@ -18,6 +13,11 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.data.TaskAttachment;
 
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.concurrent.atomic.AtomicReference;
+
 public class FileUtilities {
 
     /**
@@ -32,8 +32,7 @@ public class FileUtilities {
         String value;
         if (DateUtilities.is24HourFormat(context)) {
             value = "HH.mm";
-        }
-        else {
+        } else {
             value = "hh.mma";
         }
         return new SimpleDateFormat(value).format(date);
diff --git a/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java b/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
index f8c2c4ee6..0d947322f 100644
--- a/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java
@@ -5,13 +5,6 @@
  */
 package com.todoroo.astrid.files;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -52,6 +45,13 @@ import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.ui.PopupControlSet;
 import com.todoroo.astrid.utility.Constants;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+
 public class FilesControlSet extends PopupControlSet {
 
     @Autowired
@@ -99,8 +99,8 @@ public class FilesControlSet extends PopupControlSet {
         if (model != null) {
             TodorooCursor<TaskAttachment> cursor = taskAttachmentDao.query(
                     Query.select(TaskAttachment.PROPERTIES)
-                    .where(Criterion.and(TaskAttachment.TASK_UUID.eq(model.getUuid()),
-                            TaskAttachment.DELETED_AT.eq(0))));
+                            .where(Criterion.and(TaskAttachment.TASK_UUID.eq(model.getUuid()),
+                                    TaskAttachment.DELETED_AT.eq(0))));
             try {
                 files.clear();
                 for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
@@ -170,24 +170,24 @@ public class FilesControlSet extends PopupControlSet {
                     public void onClick(View v) {
                         DialogUtilities.okCancelDialog(activity, activity.getString(R.string.premium_remove_file_confirm),
                                 new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface d, int which) {
-                                if (RemoteModel.isValidUuid(m.getValue(TaskAttachment.UUID))) {
-                                    m.setValue(TaskAttachment.DELETED_AT, DateUtilities.now());
-                                    taskAttachmentDao.saveExisting(m);
-                                } else {
-                                    taskAttachmentDao.delete(m.getId());
-                                }
-
-                                if (m.containsNonNullValue(TaskAttachment.FILE_PATH)) {
-                                    File f = new File(m.getValue(TaskAttachment.FILE_PATH));
-                                    f.delete();
-                                }
-                                files.remove(m);
-                                refreshDisplayView();
-                                finalList.removeView(fileRow);
-                            }
-                        }, null);
+                                    @Override
+                                    public void onClick(DialogInterface d, int which) {
+                                        if (RemoteModel.isValidUuid(m.getValue(TaskAttachment.UUID))) {
+                                            m.setValue(TaskAttachment.DELETED_AT, DateUtilities.now());
+                                            taskAttachmentDao.saveExisting(m);
+                                        } else {
+                                            taskAttachmentDao.delete(m.getId());
+                                        }
+
+                                        if (m.containsNonNullValue(TaskAttachment.FILE_PATH)) {
+                                            File f = new File(m.getValue(TaskAttachment.FILE_PATH));
+                                            f.delete();
+                                        }
+                                        files.remove(m);
+                                        refreshDisplayView();
+                                        finalList.removeView(fileRow);
+                                    }
+                                }, null);
                     }
                 });
             }
@@ -335,8 +335,8 @@ public class FilesControlSet extends PopupControlSet {
                 }
 
                 filePathBuilder.append(directory.toString())
-                    .append(File.separator)
-                    .append(name);
+                        .append(File.separator)
+                        .append(name);
 
                 File file = new File(filePathBuilder.toString());
                 if (file.exists()) {
@@ -373,7 +373,7 @@ public class FilesControlSet extends PopupControlSet {
                         fileOutput.write(buffer, 0, bufferLength);
                         downloadedSize += bufferLength;
 
-                        int progress = (int) (downloadedSize*100/totalSize);
+                        int progress = (int) (downloadedSize * 100 / totalSize);
                         pd.setProgress(progress);
                     }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java
index b6d9cbe69..60dbf3925 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java
@@ -1,12 +1,5 @@
 package com.todoroo.astrid.gcal;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -32,6 +25,13 @@ import com.todoroo.astrid.data.User;
 import com.todoroo.astrid.service.TagDataService;
 import com.todoroo.astrid.service.ThemeService;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
 public class CalendarAlarmListCreator extends Activity {
 
     public static final String TOKEN_LIST_NAME = "listName"; //$NON-NLS-1$
@@ -120,9 +120,9 @@ public class CalendarAlarmListCreator extends Activity {
         String title;
         if (!TextUtils.isEmpty(attendeesString)) {
             builder.append(" ") //$NON-NLS-1$
-            .append(attendeesString)
-            .append(" ") //$NON-NLS-1$
-            .append(getString(R.string.CRA_invitation_prompt));
+                    .append(attendeesString)
+                    .append(" ") //$NON-NLS-1$
+                    .append(getString(R.string.CRA_invitation_prompt));
             inviteAll.setBackgroundColor(getResources().getColor(color));
             title = getString(R.string.CRA_share_list_title);
         } else {
@@ -134,7 +134,7 @@ public class CalendarAlarmListCreator extends Activity {
         }
 
         ((TextView) findViewById(R.id.reminder_title))
-            .setText(title);
+                .setText(title);
 
         dialogView.setText(builder.toString());
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java
index 51498cd30..371ea4403 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java
@@ -1,9 +1,5 @@
 package com.todoroo.astrid.gcal;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.content.BroadcastReceiver;
@@ -22,6 +18,10 @@ import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.utility.Constants;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
 @SuppressWarnings("nls")
 public class CalendarAlarmReceiver extends BroadcastReceiver {
 
@@ -29,14 +29,14 @@ public class CalendarAlarmReceiver extends BroadcastReceiver {
     public static final String BROADCAST_CALENDAR_REMINDER = Constants.PACKAGE + ".CALENDAR_EVENT";
 
     private static final String[] EVENTS_PROJECTION = {
-        Calendars.EVENTS_DTSTART_COL,
-        Calendars.EVENTS_DTEND_COL,
-        Calendars.EVENTS_NAME_COL,
+            Calendars.EVENTS_DTSTART_COL,
+            Calendars.EVENTS_DTEND_COL,
+            Calendars.EVENTS_NAME_COL,
     };
 
     private static final String[] ATTENDEES_PROJECTION = {
-        Calendars.ATTENDEES_NAME_COL,
-        Calendars.ATTENDEES_EMAIL_COL,
+            Calendars.ATTENDEES_NAME_COL,
+            Calendars.ATTENDEES_EMAIL_COL,
     };
 
     @Override
@@ -64,14 +64,14 @@ public class CalendarAlarmReceiver extends BroadcastReceiver {
     }
 
     private void showCalReminder(Context context,
-            long eventId, boolean fromPostpone) {
+                                 long eventId, boolean fromPostpone) {
         ContentResolver cr = context.getContentResolver();
         Uri eventUri = Calendars.getCalendarContentUri(Calendars.CALENDAR_CONTENT_EVENTS);
 
         if (AndroidUtilities.getSdkVersion() <= 7)
             return;
 
-        String[] eventArg = new String[] { Long.toString(eventId) };
+        String[] eventArg = new String[]{Long.toString(eventId)};
         Cursor event = cr.query(eventUri,
                 EVENTS_PROJECTION,
                 Calendars.ID_COLUMN_NAME + " = ?",
diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java
index 86eb3fe3e..4ff675d6d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java
@@ -1,7 +1,5 @@
 package com.todoroo.astrid.gcal;
 
-import java.util.Date;
-
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.ContentResolver;
@@ -16,6 +14,8 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.utility.Constants;
 
+import java.util.Date;
+
 @SuppressWarnings("nls")
 public class CalendarAlarmScheduler {
 
@@ -32,11 +32,11 @@ public class CalendarAlarmScheduler {
 
         long now = DateUtilities.now();
 
-        AlarmManager am = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
+        AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
         Cursor events = cr.query(Calendars.getCalendarContentUri(Calendars.CALENDAR_CONTENT_EVENTS),
-                new String[] { Calendars.ID_COLUMN_NAME, Calendars.EVENTS_DTSTART_COL },
+                new String[]{Calendars.ID_COLUMN_NAME, Calendars.EVENTS_DTSTART_COL},
                 Calendars.EVENTS_DTSTART_COL + " > ? AND " + Calendars.EVENTS_DTSTART_COL + " < ?",
-                new String[] { Long.toString(now + DateUtilities.ONE_MINUTE * 15), Long.toString(now + DateUtilities.ONE_DAY) },
+                new String[]{Long.toString(now + DateUtilities.ONE_MINUTE * 15), Long.toString(now + DateUtilities.ONE_DAY)},
                 null);
         try {
             if (events != null && events.getCount() > 0) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java
index a3c23391e..78c993917 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java
@@ -1,7 +1,5 @@
 package com.todoroo.astrid.gcal;
 
-import java.util.Date;
-
 import android.app.Activity;
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -33,6 +31,8 @@ import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.tags.TagFilterExposer;
 import com.todoroo.astrid.utility.Constants;
 
+import java.util.Date;
+
 @SuppressWarnings("nls")
 public class CalendarReminderActivity extends Activity {
 
@@ -99,7 +99,8 @@ public class CalendarReminderActivity extends Activity {
                             public void onClick(DialogInterface dialog, int which) {
                                 dismissListener.onClick(v);
                             }
-                        });
+                        }
+                );
             } else {
                 dismissListener.onClick(v);
             }
@@ -136,7 +137,7 @@ public class CalendarReminderActivity extends Activity {
 
     private void setupUi() {
         ((TextView) findViewById(R.id.reminder_title))
-            .setText(getString(R.string.CRA_title));
+                .setText(getString(R.string.CRA_title));
 
         TextView dialogView = (TextView) findViewById(R.id.reminder_message);
         String speechText;
@@ -190,31 +191,32 @@ public class CalendarReminderActivity extends Activity {
 
     private void listExists(final TagData tag) {
         DialogUtilities.okCancelCustomDialog(this,
-            getString(R.string.CRA_list_exists_title),
-            getString(R.string.CRA_list_exists_body, tag.getValue(TagData.NAME)),
-            R.string.CRA_create_new,
-            R.string.CRA_use_existing,
-            0,
-            new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    createNewList(tag.getValue(TagData.NAME) + " "
-                            + DateUtilities.getDateStringHideYear(CalendarReminderActivity.this, new Date(startTime)));
+                getString(R.string.CRA_list_exists_title),
+                getString(R.string.CRA_list_exists_body, tag.getValue(TagData.NAME)),
+                R.string.CRA_create_new,
+                R.string.CRA_use_existing,
+                0,
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        createNewList(tag.getValue(TagData.NAME) + " "
+                                + DateUtilities.getDateStringHideYear(CalendarReminderActivity.this, new Date(startTime)));
+                    }
+                },
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        FilterWithCustomIntent filter = TagFilterExposer.filterFromTagData(CalendarReminderActivity.this, tag);
+
+                        Intent listIntent = new Intent(CalendarReminderActivity.this, TaskListActivity.class);
+                        listIntent.putExtra(TaskListFragment.TOKEN_FILTER, filter);
+                        listIntent.putExtras(filter.customExtras);
+
+                        startActivity(listIntent);
+                        dismissButton.performClick();
+                    }
                 }
-            },
-            new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    FilterWithCustomIntent filter = TagFilterExposer.filterFromTagData(CalendarReminderActivity.this, tag);
-
-                    Intent listIntent = new Intent(CalendarReminderActivity.this, TaskListActivity.class);
-                    listIntent.putExtra(TaskListFragment.TOKEN_FILTER, filter);
-                    listIntent.putExtras(filter.customExtras);
-
-                    startActivity(listIntent);
-                    dismissButton.performClick();
-                }
-            });
+        );
     }
 
     private void createNewList(String name) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java b/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java
index 57fb28eca..9357fecd0 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.gcal;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.res.Resources;
@@ -22,6 +19,9 @@ import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.Preferences;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+
 @SuppressWarnings("nls")
 public class Calendars {
 
@@ -29,156 +29,162 @@ public class Calendars {
     public static final String CALENDAR_CONTENT_EVENTS = "events";
     public static final String CALENDAR_CONTENT_ATTENDEES = "attendees";
 
-	private static final boolean USE_ICS_NAMES = AndroidUtilities.getSdkVersion() >= 14;
+    private static final boolean USE_ICS_NAMES = AndroidUtilities.getSdkVersion() >= 14;
 
-	public static final String ID_COLUMN_NAME = "_id";
-	public static final String CALENDARS_DISPLAY_COL = (USE_ICS_NAMES ? CalendarContract.Calendars.CALENDAR_DISPLAY_NAME : "displayName");
-	public static final String CALENDARS_ACCESS_LEVEL_COL = (USE_ICS_NAMES ? CalendarContract.Calendars.CALENDAR_ACCESS_LEVEL : "access_level");
-	public static final String EVENTS_DTSTART_COL = (USE_ICS_NAMES ? CalendarContract.Events.DTSTART : "dtstart");
-	public static final String EVENTS_DTEND_COL = (USE_ICS_NAMES ? CalendarContract.Events.DTEND : "dtend");
-	public static final String EVENTS_NAME_COL = (USE_ICS_NAMES ? CalendarContract.Events.TITLE : "title");
-	public static final String ATTENDEES_EVENT_ID_COL = (USE_ICS_NAMES ? CalendarContract.Attendees.EVENT_ID : "event_id");
+    public static final String ID_COLUMN_NAME = "_id";
+    public static final String CALENDARS_DISPLAY_COL = (USE_ICS_NAMES ? CalendarContract.Calendars.CALENDAR_DISPLAY_NAME : "displayName");
+    public static final String CALENDARS_ACCESS_LEVEL_COL = (USE_ICS_NAMES ? CalendarContract.Calendars.CALENDAR_ACCESS_LEVEL : "access_level");
+    public static final String EVENTS_DTSTART_COL = (USE_ICS_NAMES ? CalendarContract.Events.DTSTART : "dtstart");
+    public static final String EVENTS_DTEND_COL = (USE_ICS_NAMES ? CalendarContract.Events.DTEND : "dtend");
+    public static final String EVENTS_NAME_COL = (USE_ICS_NAMES ? CalendarContract.Events.TITLE : "title");
+    public static final String ATTENDEES_EVENT_ID_COL = (USE_ICS_NAMES ? CalendarContract.Attendees.EVENT_ID : "event_id");
     public static final String ATTENDEES_NAME_COL = (USE_ICS_NAMES ? CalendarContract.Attendees.ATTENDEE_NAME : "attendeeName");
-    public static final String ATTENDEES_EMAIL_COL = (USE_ICS_NAMES ? CalendarContract.Attendees.ATTENDEE_EMAIL: "attendeeEmail");
-
-
-	private static final String[] CALENDARS_PROJECTION = new String[] {
-			ID_COLUMN_NAME,
-			CALENDARS_DISPLAY_COL,
-	};
-
-	// Only show calendars that the user can modify. Access level 500
-	// corresponds to Calendars.CONTRIBUTOR_ACCESS
-	private static final String CALENDARS_WHERE = CALENDARS_ACCESS_LEVEL_COL + ">= 500";
-
-	private static final String CALENDARS_SORT = CALENDARS_DISPLAY_COL + " ASC";
-
-	// --- api access
-
-	/** Return content uri for calendars
-	 * @param table provider table, something like calendars, events
-	 */
-	public static Uri getCalendarContentUri(String table) {
-	    if (AndroidUtilities.getSdkVersion() >= 14) {
-	        return getIcsUri(table);
-	    }
-
-	    if(AndroidUtilities.getSdkVersion() >= 8)
-	        return Uri.parse("content://com.android.calendar/" + table);
-	    else
-	        return Uri.parse("content://calendar/" + table);
-	}
-
-	private static Uri getIcsUri(String table) {
-	    if (CALENDAR_CONTENT_CALENDARS.equals(table))
-	        return CalendarContract.Calendars.CONTENT_URI;
-	    else if (CALENDAR_CONTENT_EVENTS.equals(table))
-	        return CalendarContract.Events.CONTENT_URI;
-	    else if (CALENDAR_CONTENT_ATTENDEES.equals(table))
-	        return CalendarContract.Attendees.CONTENT_URI;
-	    return null;
-	}
-
-	/** Return calendar package name */
-	public static String getCalendarPackage() {
-	    if(AndroidUtilities.getSdkVersion() >= 8)
-	        return "com.google.android.calendar";
-	    else
-	        return "com.android.calendar";
-	}
-
-	// --- helper data structure
-
-	/**
-	 * Helper class for working with the results of getCalendars
-	 */
-	public static class CalendarResult {
-	    /** calendar names */
-	    public String[] calendars;
-
-	    /** calendar ids. null entry -> use default */
-	    public String[] calendarIds;
-
-	    /** default selection index */
-	    public int defaultIndex = -1;
-	}
-
-	/**
-	 * Appends all user-modifiable calendars to listPreference.
-	 *
-	 * @param context
-	 *            context
-	 * @param listPreference
-	 *            preference to init
-	 */
-	public static CalendarResult getCalendars() {
-	    Context context = ContextManager.getContext();
-		ContentResolver cr = context.getContentResolver();
-		Resources r = context.getResources();
-
-		Cursor c = cr.query(getCalendarContentUri(CALENDAR_CONTENT_CALENDARS), CALENDARS_PROJECTION,
-				CALENDARS_WHERE, null, CALENDARS_SORT);
-		try {
-    		// Fetch the current setting. Invalid calendar id will
-    		// be changed to default value.
-    		String defaultSetting = Preferences.getStringValue(R.string.gcal_p_default);
-
-    		CalendarResult result = new CalendarResult();
-
-    		if (c == null || c.getCount() == 0) {
-    			// Something went wrong when querying calendars. Only offer them
-    		    // the system default choice
-    		    result.calendars = new String[] {
-    			        r.getString(R.string.gcal_GCP_default) };
-    			result.calendarIds = new String[] { null };
-    			result.defaultIndex = 0;
-    			return result;
-    		}
-
-    		int calendarCount = c.getCount();
-
-    		result.calendars = new String[calendarCount];
-    		result.calendarIds = new String[calendarCount];
-
-    		// Iterate calendars one by one, and fill up the list preference
-			int row = 0;
-			int idColumn = c.getColumnIndex(ID_COLUMN_NAME);
-			int nameColumn = c.getColumnIndex(CALENDARS_DISPLAY_COL);
-			while (c.moveToNext()) {
-				String id = c.getString(idColumn);
-				String name = c.getString(nameColumn);
-				result.calendars[row] = name;
-				result.calendarIds[row] = id;
-
-				// We found currently selected calendar
-				if (defaultSetting != null && defaultSetting.equals(id)) {
-					result.defaultIndex = row;
-				}
-
-				row++;
-			}
-
-			if (result.defaultIndex >= calendarCount) {
-			    result.defaultIndex = 0;
-			}
-
-			return result;
-		} finally {
-		    if(c != null)
-		        c.close();
-		}
-	}
+    public static final String ATTENDEES_EMAIL_COL = (USE_ICS_NAMES ? CalendarContract.Attendees.ATTENDEE_EMAIL : "attendeeEmail");
+
+
+    private static final String[] CALENDARS_PROJECTION = new String[]{
+            ID_COLUMN_NAME,
+            CALENDARS_DISPLAY_COL,
+    };
+
+    // Only show calendars that the user can modify. Access level 500
+    // corresponds to Calendars.CONTRIBUTOR_ACCESS
+    private static final String CALENDARS_WHERE = CALENDARS_ACCESS_LEVEL_COL + ">= 500";
+
+    private static final String CALENDARS_SORT = CALENDARS_DISPLAY_COL + " ASC";
+
+    // --- api access
+
+    /**
+     * Return content uri for calendars
+     *
+     * @param table provider table, something like calendars, events
+     */
+    public static Uri getCalendarContentUri(String table) {
+        if (AndroidUtilities.getSdkVersion() >= 14) {
+            return getIcsUri(table);
+        }
+
+        if (AndroidUtilities.getSdkVersion() >= 8)
+            return Uri.parse("content://com.android.calendar/" + table);
+        else
+            return Uri.parse("content://calendar/" + table);
+    }
+
+    private static Uri getIcsUri(String table) {
+        if (CALENDAR_CONTENT_CALENDARS.equals(table))
+            return CalendarContract.Calendars.CONTENT_URI;
+        else if (CALENDAR_CONTENT_EVENTS.equals(table))
+            return CalendarContract.Events.CONTENT_URI;
+        else if (CALENDAR_CONTENT_ATTENDEES.equals(table))
+            return CalendarContract.Attendees.CONTENT_URI;
+        return null;
+    }
+
+    /**
+     * Return calendar package name
+     */
+    public static String getCalendarPackage() {
+        if (AndroidUtilities.getSdkVersion() >= 8)
+            return "com.google.android.calendar";
+        else
+            return "com.android.calendar";
+    }
+
+    // --- helper data structure
+
+    /**
+     * Helper class for working with the results of getCalendars
+     */
+    public static class CalendarResult {
+        /**
+         * calendar names
+         */
+        public String[] calendars;
+
+        /**
+         * calendar ids. null entry -> use default
+         */
+        public String[] calendarIds;
+
+        /**
+         * default selection index
+         */
+        public int defaultIndex = -1;
+    }
 
     /**
      * Appends all user-modifiable calendars to listPreference.
      *
-     * @param context
-     *            context
-     * @param listPreference
-     *            preference to init
+     * @param context        context
+     * @param listPreference preference to init
+     */
+    public static CalendarResult getCalendars() {
+        Context context = ContextManager.getContext();
+        ContentResolver cr = context.getContentResolver();
+        Resources r = context.getResources();
+
+        Cursor c = cr.query(getCalendarContentUri(CALENDAR_CONTENT_CALENDARS), CALENDARS_PROJECTION,
+                CALENDARS_WHERE, null, CALENDARS_SORT);
+        try {
+            // Fetch the current setting. Invalid calendar id will
+            // be changed to default value.
+            String defaultSetting = Preferences.getStringValue(R.string.gcal_p_default);
+
+            CalendarResult result = new CalendarResult();
+
+            if (c == null || c.getCount() == 0) {
+                // Something went wrong when querying calendars. Only offer them
+                // the system default choice
+                result.calendars = new String[]{
+                        r.getString(R.string.gcal_GCP_default)};
+                result.calendarIds = new String[]{null};
+                result.defaultIndex = 0;
+                return result;
+            }
+
+            int calendarCount = c.getCount();
+
+            result.calendars = new String[calendarCount];
+            result.calendarIds = new String[calendarCount];
+
+            // Iterate calendars one by one, and fill up the list preference
+            int row = 0;
+            int idColumn = c.getColumnIndex(ID_COLUMN_NAME);
+            int nameColumn = c.getColumnIndex(CALENDARS_DISPLAY_COL);
+            while (c.moveToNext()) {
+                String id = c.getString(idColumn);
+                String name = c.getString(nameColumn);
+                result.calendars[row] = name;
+                result.calendarIds[row] = id;
+
+                // We found currently selected calendar
+                if (defaultSetting != null && defaultSetting.equals(id)) {
+                    result.defaultIndex = row;
+                }
+
+                row++;
+            }
+
+            if (result.defaultIndex >= calendarCount) {
+                result.defaultIndex = 0;
+            }
+
+            return result;
+        } finally {
+            if (c != null)
+                c.close();
+        }
+    }
+
+    /**
+     * Appends all user-modifiable calendars to listPreference.
+     *
+     * @param context        context
+     * @param listPreference preference to init
      */
     public static void initCalendarsPreference(Context context,
-            ListPreference listPreference) {
+                                               ListPreference listPreference) {
 
         Resources r = context.getResources();
         CalendarResult calendars = getCalendars();
@@ -211,16 +217,16 @@ public class Calendars {
 
         // Iterate calendars one by one, and fill up the list preference
         if (currentSetting != null) {
-            for (int i=0; i<calendars.calendarIds.length; i++) {
+            for (int i = 0; i < calendars.calendarIds.length; i++) {
                 // We found currently selected calendar
                 if (currentSetting.equals(calendars.calendarIds[i])) {
-                    currentSettingIndex = i+1; // +1 correction for disabled-entry
+                    currentSettingIndex = i + 1; // +1 correction for disabled-entry
                     break;
                 }
             }
         }
 
-        if(currentSettingIndex == -1 || currentSettingIndex > calendars.calendarIds.length+1) {
+        if (currentSettingIndex == -1 || currentSettingIndex > calendars.calendarIds.length + 1) {
             // Should not happen!
             // Leave the preference at disabled.
             Log.d("astrid", "initCalendarsPreference: Unknown calendar.");
@@ -231,20 +237,22 @@ public class Calendars {
         listPreference.setEnabled(true);
     }
 
-	/**
-	 * sets the default calendar for future use
-	 * @param defaultCalendar default calendar id
-	 */
-	public static void setDefaultCalendar(String defaultCalendar) {
+    /**
+     * sets the default calendar for future use
+     *
+     * @param defaultCalendar default calendar id
+     */
+    public static void setDefaultCalendar(String defaultCalendar) {
         Preferences.setString(R.string.gcal_p_default, defaultCalendar);
-	}
-
-	/**
-	 * gets the default calendar for future use
-	 * @return the calendar id for use with the contentresolver
-	 */
-	public static String getDefaultCalendar() {
-	    return Preferences.getStringValue(R.string.gcal_p_default);
-	}
+    }
+
+    /**
+     * gets the default calendar for future use
+     *
+     * @return the calendar id for use with the contentresolver
+     */
+    public static String getDefaultCalendar() {
+        return Preferences.getStringValue(R.string.gcal_p_default);
+    }
 
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java
index a1d1d704d..bdd21f51a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.gcal;
 
-import java.util.ArrayList;
-import java.util.Collections;
-
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -39,11 +36,13 @@ import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.ui.PopupControlSet;
 
+import java.util.ArrayList;
+import java.util.Collections;
+
 /**
  * Control Set for managing repeats
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class GCalControlSet extends PopupControlSet {
 
@@ -88,7 +87,7 @@ public class GCalControlSet extends PopupControlSet {
         calendarSelector.setOnItemSelectedListener(new OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> arg0, View arg1,
-                    int arg2, long arg3) {
+                                       int arg2, long arg3) {
                 refreshDisplayView();
             }
 
@@ -102,17 +101,17 @@ public class GCalControlSet extends PopupControlSet {
     @Override
     protected void readFromTaskOnInitialize() {
         String uri = GCalHelper.getTaskEventUri(model);
-        if(!TextUtils.isEmpty(uri)) {
+        if (!TextUtils.isEmpty(uri)) {
             try {
                 calendarUri = Uri.parse(uri);
 
                 // try to load calendar
                 ContentResolver cr = activity.getContentResolver();
-                Cursor cursor = cr.query(calendarUri, new String[] { "dtstart" }, null, null, null); //$NON-NLS-1$
+                Cursor cursor = cr.query(calendarUri, new String[]{"dtstart"}, null, null, null); //$NON-NLS-1$
                 try {
                     boolean deleted = cursor.getCount() == 0;
 
-                    if(deleted) {
+                    if (deleted) {
                         calendarUri = null;
                         return;
                     }
@@ -144,12 +143,12 @@ public class GCalControlSet extends PopupControlSet {
             return null;
 
         boolean gcalCreateEventEnabled = Preferences.getStringValue(R.string.gcal_p_default) != null &&
-                                        !Preferences.getStringValue(R.string.gcal_p_default).equals("-1");
+                !Preferences.getStringValue(R.string.gcal_p_default).equals("-1");
         if ((gcalCreateEventEnabled || calendarSelector.getSelectedItemPosition() != 0) &&
                 calendarUri == null) {
             StatisticsService.reportEvent(StatisticsConstants.CREATE_CALENDAR_EVENT);
 
-            try{
+            try {
                 ContentResolver cr = activity.getContentResolver();
 
                 ContentValues values = new ContentValues();
@@ -157,7 +156,7 @@ public class GCalControlSet extends PopupControlSet {
                 values.put("calendar_id", calendarId);
 
                 calendarUri = GCalHelper.createTaskEvent(task, cr, values);
-                if(calendarUri != null) {
+                if (calendarUri != null) {
                     task.setValue(Task.CALENDAR_URI, calendarUri.toString());
 
                     if (calendarSelector.getSelectedItemPosition() != 0 && !hasEvent) {
@@ -173,21 +172,21 @@ public class GCalControlSet extends PopupControlSet {
                 exceptionService.displayAndReportError(activity,
                         activity.getString(R.string.gcal_TEA_error), e);
             }
-        } else if(calendarUri != null) {
+        } else if (calendarUri != null) {
             try {
                 ContentValues updateValues = new ContentValues();
 
                 // check if we need to update the item
                 ContentValues setValues = task.getSetValues();
-                if(setValues.containsKey(Task.TITLE.name))
+                if (setValues.containsKey(Task.TITLE.name))
                     updateValues.put("title", task.getValue(Task.TITLE));
-                if(setValues.containsKey(Task.NOTES.name))
+                if (setValues.containsKey(Task.NOTES.name))
                     updateValues.put("description", task.getValue(Task.NOTES));
-                if(setValues.containsKey(Task.DUE_DATE.name) || setValues.containsKey(Task.ESTIMATED_SECONDS.name))
+                if (setValues.containsKey(Task.DUE_DATE.name) || setValues.containsKey(Task.ESTIMATED_SECONDS.name))
                     GCalHelper.createStartAndEndDate(task, updateValues);
 
                 ContentResolver cr = activity.getContentResolver();
-                if(cr.update(calendarUri, updateValues, null, null) > 0)
+                if (cr.update(calendarUri, updateValues, null, null) > 0)
                     return activity.getString(R.string.gcal_TEA_calendar_updated);
             } catch (Exception e) {
                 exceptionService.reportError("unable-to-update-calendar: " +  //$NON-NLS-1$
@@ -200,15 +199,15 @@ public class GCalControlSet extends PopupControlSet {
 
     @SuppressWarnings("nls")
     private void viewCalendarEvent() {
-        if(calendarUri == null)
+        if (calendarUri == null)
             return;
 
         ContentResolver cr = activity.getContentResolver();
         Intent intent = new Intent(Intent.ACTION_EDIT, calendarUri);
-        Cursor cursor = cr.query(calendarUri, new String[] { "dtstart", "dtend" },
+        Cursor cursor = cr.query(calendarUri, new String[]{"dtstart", "dtend"},
                 null, null, null);
         try {
-            if(cursor.getCount() == 0) {
+            if (cursor.getCount() == 0) {
                 // event no longer exists, recreate it
                 calendarUri = null;
                 writeToModel(model);
@@ -237,7 +236,7 @@ public class GCalControlSet extends PopupControlSet {
             if (hasEvent) {
                 calendar.setText(R.string.gcal_TEA_has_event);
             } else if (calendarSelector.getSelectedItemPosition() != 0) {
-                calendar.setText((String)calendarSelector.getSelectedItem());
+                calendar.setText((String) calendarSelector.getSelectedItem());
             } else {
                 calendar.setTextColor(unsetColor);
                 image.setImageResource(R.drawable.tea_icn_addcal_gray);
diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalHelper.java b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalHelper.java
index 4912e44c7..19627caa2 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalHelper.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalHelper.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.gcal;
 
-import java.util.TimeZone;
-
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.database.Cursor;
@@ -24,8 +22,12 @@ import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.data.Task;
 
+import java.util.TimeZone;
+
 public class GCalHelper {
-    /** If task has no estimated time, how early to set a task in calendar (seconds)*/
+    /**
+     * If task has no estimated time, how early to set a task in calendar (seconds)
+     */
     private static final long DEFAULT_CAL_TIME = DateUtilities.ONE_HOUR;
 
     public static final String CALENDAR_ID_COLUMN = "calendar_id"; //$NON-NLS-1$
@@ -36,7 +38,7 @@ public class GCalHelper {
             uri = task.getValue(Task.CALENDAR_URI);
         else {
             task = PluginServices.getTaskService().fetchById(task.getId(), Task.CALENDAR_URI);
-            if(task == null)
+            if (task == null)
                 return null;
             uri = task.getValue(Task.CALENDAR_URI);
         }
@@ -52,7 +54,7 @@ public class GCalHelper {
 
     private static void createTaskEventIfEnabled(Task t, boolean deleteEventIfExists) {
         boolean gcalCreateEventEnabled = Preferences.getStringValue(R.string.gcal_p_default) != null
-            && !Preferences.getStringValue(R.string.gcal_p_default).equals("-1"); //$NON-NLS-1$
+                && !Preferences.getStringValue(R.string.gcal_p_default).equals("-1"); //$NON-NLS-1$
         if (gcalCreateEventEnabled) {
             ContentResolver cr = ContextManager.getContext().getContentResolver();
             Uri calendarUri = GCalHelper.createTaskEvent(t, cr, new ContentValues(), deleteEventIfExists);
@@ -69,11 +71,11 @@ public class GCalHelper {
     public static Uri createTaskEvent(Task task, ContentResolver cr, ContentValues values, boolean deleteEventIfExists) {
         String eventuri = getTaskEventUri(task);
 
-        if(!TextUtils.isEmpty(eventuri) && deleteEventIfExists) {
+        if (!TextUtils.isEmpty(eventuri) && deleteEventIfExists) {
             deleteTaskEvent(task);
         }
 
-        try{
+        try {
             Uri uri = Calendars.getCalendarContentUri(Calendars.CALENDAR_CONTENT_EVENTS);
             values.put("title", task.getValue(Task.TITLE));
             values.put("description", task.getValue(Task.NOTES));
@@ -126,13 +128,13 @@ public class GCalHelper {
     }
 
     private static String getCalendarId(Uri uri, ContentResolver cr) {
-        Cursor calendar = cr.query(uri, new String[] { CALENDAR_ID_COLUMN }, null, null, null);
+        Cursor calendar = cr.query(uri, new String[]{CALENDAR_ID_COLUMN}, null, null, null);
         try {
             calendar.moveToFirst();
             return calendar.getString(0);
         } catch (CursorIndexOutOfBoundsException e) {
             return null;
-        } finally  {
+        } finally {
             calendar.close();
         }
     }
@@ -141,22 +143,22 @@ public class GCalHelper {
     public static boolean deleteTaskEvent(Task task) {
         boolean eventDeleted = false;
         String uri;
-        if(task.containsNonNullValue(Task.CALENDAR_URI))
+        if (task.containsNonNullValue(Task.CALENDAR_URI))
             uri = task.getValue(Task.CALENDAR_URI);
         else {
             task = PluginServices.getTaskService().fetchById(task.getId(), Task.CALENDAR_URI);
-            if(task == null)
+            if (task == null)
                 return false;
             uri = task.getValue(Task.CALENDAR_URI);
         }
 
-        if(!TextUtils.isEmpty(uri)) {
+        if (!TextUtils.isEmpty(uri)) {
             try {
                 Uri calendarUri = Uri.parse(uri);
 
                 // try to load calendar
                 ContentResolver cr = ContextManager.getContext().getContentResolver();
-                Cursor cursor = cr.query(calendarUri, new String[] { "dtstart" }, null, null, null); //$NON-NLS-1$
+                Cursor cursor = cr.query(calendarUri, new String[]{"dtstart"}, null, null, null); //$NON-NLS-1$
                 try {
                     boolean alreadydeleted = cursor.getCount() == 0;
 
@@ -168,7 +170,7 @@ public class GCalHelper {
                     cursor.close();
                 }
 
-                task.setValue(Task.CALENDAR_URI,"");
+                task.setValue(Task.CALENDAR_URI, "");
             } catch (Exception e) {
                 Log.e("astrid-gcal", "error-deleting-calendar-event", e); //$NON-NLS-1$ //$NON-NLS-2$
             }
@@ -183,15 +185,15 @@ public class GCalHelper {
         long tzCorrectedDueDate = dueDate + TimeZone.getDefault().getOffset(dueDate);
         long tzCorrectedDueDateNow = DateUtilities.now() + TimeZone.getDefault().getOffset(DateUtilities.now());
         // FIXME: doesnt respect timezones, see story 17443653
-        if(task.hasDueDate()) {
-            if(task.hasDueTime()) {
-                long estimatedTime = task.getValue(Task.ESTIMATED_SECONDS)  * 1000;
-                if(estimatedTime <= 0)
+        if (task.hasDueDate()) {
+            if (task.hasDueTime()) {
+                long estimatedTime = task.getValue(Task.ESTIMATED_SECONDS) * 1000;
+                if (estimatedTime <= 0)
                     estimatedTime = DEFAULT_CAL_TIME;
                 if (Preferences.getBoolean(R.string.p_end_at_deadline, true)) {
                     values.put("dtstart", dueDate);
                     values.put("dtend", dueDate + estimatedTime);
-                }else{
+                } else {
                     values.put("dtstart", dueDate - estimatedTime);
                     values.put("dtend", dueDate);
                 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java
index b3337bdf1..2989fe322 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java
@@ -27,15 +27,15 @@ public class GCalTaskCompleteListener extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         ContextManager.setContext(context);
         long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1);
-        if(taskId == -1)
+        if (taskId == -1)
             return;
 
         Task task = PluginServices.getTaskService().fetchById(taskId, Task.ID, Task.TITLE, Task.CALENDAR_URI);
-        if(task == null)
+        if (task == null)
             return;
 
         String calendarUri = task.getValue(Task.CALENDAR_URI);
-        if(!TextUtils.isEmpty(calendarUri)) {
+        if (!TextUtils.isEmpty(calendarUri)) {
             try {
                 // change title of calendar event
                 ContentResolver cr = context.getContentResolver();
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksBackgroundService.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksBackgroundService.java
index 9823ef892..2e8cfcaed 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksBackgroundService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksBackgroundService.java
@@ -15,7 +15,8 @@ import com.todoroo.astrid.sync.SyncV2Provider;
 
 public class GtasksBackgroundService extends SyncV2BackgroundService {
 
-    @Autowired private GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    private GtasksPreferenceService gtasksPreferenceService;
 
     @Override
     protected SyncV2Provider getSyncProvider() {
@@ -24,7 +25,7 @@ public class GtasksBackgroundService extends SyncV2BackgroundService {
 
     @Override
     protected SyncProviderUtilities getSyncUtilities() {
-        if(gtasksPreferenceService == null)
+        if (gtasksPreferenceService == null)
             DependencyInjectionService.getInstance().inject(this);
         return gtasksPreferenceService;
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java
index 5247e49cf..06e381dea 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java
@@ -31,8 +31,10 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.AstridDependencyInjector;
 
 public class GtasksCustomFilterCriteriaExposer extends BroadcastReceiver {
-    @Autowired private GtasksPreferenceService gtasksPreferenceService;
-    @Autowired private GtasksListService gtasksListService;
+    @Autowired
+    private GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    private GtasksListService gtasksListService;
 
     private static final String IDENTIFIER = "gtaskslist"; //$NON-NLS-1$
 
@@ -47,7 +49,7 @@ public class GtasksCustomFilterCriteriaExposer extends BroadcastReceiver {
         DependencyInjectionService.getInstance().inject(this);
 
         // if we aren't logged in, don't expose sync action
-        if(!gtasksPreferenceService.isLoggedIn())
+        if (!gtasksPreferenceService.isLoggedIn())
             return;
 
         Resources r = context.getResources();
@@ -81,7 +83,7 @@ public class GtasksCustomFilterCriteriaExposer extends BroadcastReceiver {
                 values,
                 listNames,
                 listIds,
-                ((BitmapDrawable)r.getDrawable(R.drawable.gtasks_icon)).getBitmap(),
+                ((BitmapDrawable) r.getDrawable(R.drawable.gtasks_icon)).getBitmap(),
                 context.getString(R.string.CFC_gtasks_list_name));
         result[0] = criterion;
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksDetailExposer.java
index 22a52d246..60ff0310a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksDetailExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksDetailExposer.java
@@ -22,15 +22,17 @@ import com.todoroo.astrid.service.AstridDependencyInjector;
  * - list
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class GtasksDetailExposer extends BroadcastReceiver {
 
     public static final String DETAIL_SEPARATOR = " | "; //$NON-NLS-1$
 
-    @Autowired private GtasksMetadataService gtasksMetadataService;
-    @Autowired private GtasksListService gtasksListService;
-    @Autowired private GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    private GtasksMetadataService gtasksMetadataService;
+    @Autowired
+    private GtasksListService gtasksListService;
+    @Autowired
+    private GtasksPreferenceService gtasksPreferenceService;
 
     static {
         AstridDependencyInjector.initialize();
@@ -45,15 +47,15 @@ public class GtasksDetailExposer extends BroadcastReceiver {
         ContextManager.setContext(context);
 
         // if we aren't logged in, don't expose features
-        if(!gtasksPreferenceService.isLoggedIn())
+        if (!gtasksPreferenceService.isLoggedIn())
             return;
 
         long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1);
-        if(taskId == -1)
+        if (taskId == -1)
             return;
 
         String taskDetail = getTaskDetails(taskId);
-        if(taskDetail == null)
+        if (taskDetail == null)
             return;
 
         Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_DETAILS);
@@ -65,16 +67,16 @@ public class GtasksDetailExposer extends BroadcastReceiver {
 
     public String getTaskDetails(long id) {
         Metadata metadata = gtasksMetadataService.getTaskMetadata(id);
-        if(metadata == null)
+        if (metadata == null)
             return null;
 
         StringBuilder builder = new StringBuilder();
 
         String listId = metadata.getValue(GtasksMetadata.LIST_ID);
-        if(listId == null || listId.equals(Preferences.getStringValue(GtasksPreferenceService.PREF_DEFAULT_LIST)))
+        if (listId == null || listId.equals(Preferences.getStringValue(GtasksPreferenceService.PREF_DEFAULT_LIST)))
             return null;
         String listName = gtasksListService.getListName(listId);
-        if(listName == GtasksListService.LIST_NOT_FOUND)
+        if (listName == GtasksListService.LIST_NOT_FOUND)
             return null;
 
         builder.append("<img src='gtasks_detail'/> ").append(listName); //$NON-NLS-1$
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
index 6b58105c2..568c4a2c4 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
@@ -43,13 +43,15 @@ import com.todoroo.astrid.service.AstridDependencyInjector;
  * Exposes filters based on lists
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class GtasksFilterExposer extends BroadcastReceiver implements AstridFilterExposer {
 
-    @Autowired private GtasksListService gtasksListService;
-    @Autowired private GtasksPreferenceService gtasksPreferenceService;
-    @Autowired private ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    private GtasksListService gtasksListService;
+    @Autowired
+    private GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    private ActFmPreferenceService actFmPreferenceService;
 
     static {
         AstridDependencyInjector.initialize();
@@ -67,12 +69,12 @@ public class GtasksFilterExposer extends BroadcastReceiver implements AstridFilt
         FilterWithCustomIntent filter = new FilterWithCustomIntent(listName,
                 ContextManager.getString(R.string.gtasks_FEx_title, listName), new QueryTemplate().join(
                 Join.left(Metadata.TABLE, Task.ID.eq(Metadata.TASK))).where(Criterion.and(
-                        MetadataCriteria.withKey(GtasksMetadata.METADATA_KEY),
-                        TaskCriteria.notDeleted(),
-                        GtasksMetadata.LIST_ID.eq(list.getValue(GtasksList.REMOTE_ID)))).orderBy(
-                                Order.asc(Functions.cast(GtasksMetadata.ORDER, "LONG"))), //$NON-NLS-1$
+                MetadataCriteria.withKey(GtasksMetadata.METADATA_KEY),
+                TaskCriteria.notDeleted(),
+                GtasksMetadata.LIST_ID.eq(list.getValue(GtasksList.REMOTE_ID)))).orderBy(
+                Order.asc(Functions.cast(GtasksMetadata.ORDER, "LONG"))), //$NON-NLS-1$
                 values);
-        filter.listingIcon = ((BitmapDrawable)context.getResources().getDrawable(R.drawable.gtasks_icon)).getBitmap();
+        filter.listingIcon = ((BitmapDrawable) context.getResources().getDrawable(R.drawable.gtasks_icon)).getBitmap();
         filter.customTaskList = new ComponentName(ContextManager.getContext(), GtasksListFragment.class);
         Bundle extras = new Bundle();
         extras.putLong(GtasksListFragment.TOKEN_STORE_ID, list.getId());
@@ -95,17 +97,17 @@ public class GtasksFilterExposer extends BroadcastReceiver implements AstridFilt
         DependencyInjectionService.getInstance().inject(this);
 
         // if we aren't logged in (or we are logged in to astrid.com), don't expose features
-        if(!gtasksPreferenceService.isLoggedIn() || actFmPreferenceService.isLoggedIn())
+        if (!gtasksPreferenceService.isLoggedIn() || actFmPreferenceService.isLoggedIn())
             return null;
 
         lists = gtasksListService.getLists();
 
         // If user does not have any lists, don't show this section at all
-        if(noListsToShow())
+        if (noListsToShow())
             return null;
 
         Filter[] listFilters = new Filter[lists.length];
-        for(int i = 0; i < lists.length; i++)
+        for (int i = 0; i < lists.length; i++)
             listFilters[i] = filterFromList(context, lists[i]);
 
         FilterCategoryWithNewButton listsCategory = new FilterCategoryWithNewButton(context.getString(R.string.gtasks_FEx_header),
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksList.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksList.java
index 56992e71f..6e0d86a56 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksList.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksList.java
@@ -14,22 +14,29 @@ import com.todoroo.astrid.data.StoreObject;
  * {@link StoreObject} entries for a GTasks List
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class GtasksList {
 
-    /** type*/
+    /**
+     * type
+     */
     public static final String TYPE = "gtasks-list"; //$NON-NLS-1$
 
-    /** list id in g-tasks */
+    /**
+     * list id in g-tasks
+     */
     public static final StringProperty REMOTE_ID = new StringProperty(StoreObject.TABLE,
             StoreObject.ITEM.name);
 
-    /** list name */
+    /**
+     * list name
+     */
     public static final StringProperty NAME = new StringProperty(StoreObject.TABLE,
             StoreObject.VALUE1.name);
 
-    /** list order */
+    /**
+     * list order
+     */
     public static final IntegerProperty ORDER = new IntegerProperty(StoreObject.TABLE,
             StoreObject.VALUE2.name);
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListAdder.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListAdder.java
index 12a9e27c8..2b87821cc 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListAdder.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListAdder.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.gtasks;
 
-import java.io.IOException;
-
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
@@ -24,10 +22,14 @@ import com.todoroo.astrid.data.StoreObject;
 import com.todoroo.astrid.gtasks.api.GtasksInvoker;
 import com.todoroo.astrid.gtasks.auth.GtasksTokenValidator;
 
+import java.io.IOException;
+
 public class GtasksListAdder extends Activity {
 
-    @Autowired GtasksPreferenceService gtasksPreferenceService;
-    @Autowired GtasksListService gtasksListService;
+    @Autowired
+    GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    GtasksListService gtasksListService;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -46,7 +48,7 @@ public class GtasksListAdder extends Activity {
         DialogInterface.OnClickListener onClick = new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                if (gtasksPreferenceService.isLoggedIn() && ! gtasksPreferenceService.isOngoing()) {
+                if (gtasksPreferenceService.isLoggedIn() && !gtasksPreferenceService.isOngoing()) {
                     final ProgressDialog pd = DialogUtilities.progressDialog(GtasksListAdder.this,
                             GtasksListAdder.this.getString(R.string.gtasks_FEx_creating_list));
                     pd.show();
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java
index 62bf9b182..d3e4a085f 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java
@@ -38,25 +38,30 @@ public class GtasksListFragment extends SubtasksListFragment {
 
     protected static final int MENU_REFRESH_ID = MENU_SUPPORT_ID + 1;
 
-    @Autowired private StoreObjectDao storeObjectDao;
+    @Autowired
+    private StoreObjectDao storeObjectDao;
 
-    @Autowired private GtasksTaskListUpdater gtasksTaskListUpdater;
+    @Autowired
+    private GtasksTaskListUpdater gtasksTaskListUpdater;
 
-    @Autowired private GtasksMetadataService gtasksMetadataService;
+    @Autowired
+    private GtasksMetadataService gtasksMetadataService;
 
-    @Autowired private GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    private GtasksPreferenceService gtasksPreferenceService;
 
-    @Autowired private SyncV2Service syncService;
+    @Autowired
+    private SyncV2Service syncService;
 
     private StoreObject list;
 
-    private static final Property<?>[] LIST_PROPERTIES = new Property<?>[] {
-        StoreObject.ID,
-        StoreObject.TYPE,
-        GtasksList.REMOTE_ID,
-        GtasksList.ORDER,
-        GtasksList.NAME,
-        GtasksList.LAST_SYNC
+    private static final Property<?>[] LIST_PROPERTIES = new Property<?>[]{
+            StoreObject.ID,
+            StoreObject.TYPE,
+            GtasksList.REMOTE_ID,
+            GtasksList.ORDER,
+            GtasksList.NAME,
+            GtasksList.LAST_SYNC
     };
 
     @Override
@@ -75,7 +80,7 @@ public class GtasksListFragment extends SubtasksListFragment {
 
         long storeObjectId = extras.getLong(TOKEN_STORE_ID, 0);
         list = storeObjectDao.fetch(storeObjectId, LIST_PROPERTIES);
-        ((OrderedMetadataListFragmentHelper<StoreObject>)helper).setList(list);
+        ((OrderedMetadataListFragmentHelper<StoreObject>) helper).setList(list);
     }
 
     @Override
@@ -88,7 +93,7 @@ public class GtasksListFragment extends SubtasksListFragment {
     }
 
     private void refreshData(final boolean manual) {
-        ((TextView)getView().findViewById(android.R.id.empty)).setText(R.string.DLG_loading);
+        ((TextView) getView().findViewById(android.R.id.empty)).setText(R.string.DLG_loading);
 
         syncService.synchronizeList(list, manual, new ProgressBarSyncResultCallback(getActivity(), this,
                 R.id.progressBar, new Runnable() {
@@ -98,7 +103,7 @@ public class GtasksListFragment extends SubtasksListFragment {
                     ContextManager.getContext().sendBroadcast(new Intent(AstridApiConstants.BROADCAST_EVENT_REFRESH));
                 else
                     refresh();
-                ((TextView)getView().findViewById(android.R.id.empty)).setText(R.string.TLA_no_items);
+                ((TextView) getView().findViewById(android.R.id.empty)).setText(R.string.TLA_no_items);
             }
         }));
     }
@@ -116,14 +121,14 @@ public class GtasksListFragment extends SubtasksListFragment {
 
     @Override
     public boolean handleOptionsMenuItemSelected(int id, Intent intent) {
-     // handle my own menus
+        // handle my own menus
         switch (id) {
-        case MENU_REFRESH_ID:
-            refreshData(true);
-            return true;
-        case MENU_CLEAR_COMPLETED_ID:
-            clearCompletedTasks();
-            return true;
+            case MENU_REFRESH_ID:
+                refreshData(true);
+                return true;
+            case MENU_CLEAR_COMPLETED_ID:
+                clearCompletedTasks();
+                return true;
         }
 
         return super.handleOptionsMenuItemSelected(id, intent);
@@ -178,7 +183,7 @@ public class GtasksListFragment extends SubtasksListFragment {
 
     @Override
     protected void addSyncRefreshMenuItem(Menu menu, int themeFlags) {
-        if(gtasksPreferenceService.isLoggedIn()) {
+        if (gtasksPreferenceService.isLoggedIn()) {
             addMenuItem(menu, R.string.actfm_TVA_menu_refresh,
                     ThemeService.getDrawable(R.drawable.icn_menu_refresh, themeFlags), MENU_REFRESH_ID, true);
         } else {
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListService.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListService.java
index 81fb44834..e4cbe3113 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListService.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.gtasks;
 
-import java.util.HashSet;
-import java.util.List;
-
 import com.google.api.services.tasks.model.TaskList;
 import com.google.api.services.tasks.model.TaskLists;
 import com.todoroo.andlib.data.TodorooCursor;
@@ -18,6 +15,9 @@ import com.todoroo.astrid.dao.StoreObjectDao;
 import com.todoroo.astrid.dao.StoreObjectDao.StoreObjectCriteria;
 import com.todoroo.astrid.data.StoreObject;
 
+import java.util.HashSet;
+import java.util.List;
+
 public class GtasksListService {
 
     public static final String LIST_NOT_FOUND = null;
@@ -33,7 +33,7 @@ public class GtasksListService {
     }
 
     private void readLists() {
-        if(lists != null) {
+        if (lists != null) {
             return;
         }
 
@@ -41,7 +41,7 @@ public class GtasksListService {
                 where(StoreObjectCriteria.byType(GtasksList.TYPE)));
         try {
             lists = new StoreObject[cursor.getCount()];
-            for(int i = 0; i < lists.length; i++) {
+            for (int i = 0; i < lists.length; i++) {
                 cursor.moveToNext();
                 StoreObject dashboard = new StoreObject(cursor);
                 lists[i] = dashboard;
@@ -58,17 +58,18 @@ public class GtasksListService {
 
     /**
      * Get list name
+     *
      * @param listId
      * @return NOT_FOUND if no list by this id exists, otherwise list name
      */
     public String getListName(String listId) {
         StoreObject list = getList(listId);
-        if(list != LIST_NOT_FOUND_OBJECT)
+        if (list != LIST_NOT_FOUND_OBJECT)
             return list.getValue(GtasksList.NAME);
         return LIST_NOT_FOUND;
     }
 
-    public void migrateListIds (TaskLists remoteLists) {
+    public void migrateListIds(TaskLists remoteLists) {
         readLists();
 
         List<TaskList> items = remoteLists.getItems();
@@ -93,24 +94,24 @@ public class GtasksListService {
         readLists();
 
         HashSet<Long> previousLists = new HashSet<Long>(lists.length);
-        for(StoreObject list : lists)
+        for (StoreObject list : lists)
             previousLists.add(list.getId());
 
         List<TaskList> items = remoteLists.getItems();
         StoreObject[] newLists = new StoreObject[items.size()];
-        for(int i = 0; i < items.size(); i++) {
+        for (int i = 0; i < items.size(); i++) {
             com.google.api.services.tasks.model.TaskList remote = items.get(i);
 
             String id = remote.getId();
             StoreObject local = null;
-            for(StoreObject list : lists) {
-                if(list.getValue(GtasksList.REMOTE_ID).equals(id)) {
+            for (StoreObject list : lists) {
+                if (list.getValue(GtasksList.REMOTE_ID).equals(id)) {
                     local = list;
                     break;
                 }
             }
 
-            if(local == null)
+            if (local == null)
                 local = new StoreObject();
 
             local.setValue(StoreObject.TYPE, GtasksList.TYPE);
@@ -124,7 +125,7 @@ public class GtasksListService {
         lists = newLists;
 
         // check for lists that aren't on remote server
-        for(Long listId : previousLists) {
+        for (Long listId : previousLists) {
             storeObjectDao.delete(listId);
         }
     }
@@ -159,8 +160,8 @@ public class GtasksListService {
 
     public StoreObject getList(String listId) {
         readLists();
-        for(StoreObject list : lists)
-            if(list != null && list.getValue(GtasksList.REMOTE_ID).equals(listId))
+        for (StoreObject list : lists)
+            if (list != null && list.getValue(GtasksList.REMOTE_ID).equals(listId))
                 return list;
         return LIST_NOT_FOUND_OBJECT;
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadata.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadata.java
index 5c8578597..ffc5cab2d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadata.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadata.java
@@ -15,24 +15,30 @@ import com.todoroo.astrid.data.Metadata;
 
 /**
  * Metadata entries for a GTasks Task
- * @author Tim Su <tim@todoroo.com>
  *
+ * @author Tim Su <tim@todoroo.com>
  */
 public class GtasksMetadata {
 
     static final int VALUE_UNSET = -1;
 
-    /** metadata key */
+    /**
+     * metadata key
+     */
     public static final String METADATA_KEY = "gtasks"; //$NON-NLS-1$
 
-    /** task id in google */
+    /**
+     * task id in google
+     */
     public static final StringProperty ID = new StringProperty(Metadata.TABLE,
             Metadata.VALUE1.name);
 
     public static final StringProperty LIST_ID = new StringProperty(Metadata.TABLE,
             Metadata.VALUE2.name);
 
-    /** parent task id, or 0 if top level task */
+    /**
+     * parent task id, or 0 if top level task
+     */
     public static final LongProperty PARENT_TASK = new LongProperty(Metadata.TABLE,
             Metadata.VALUE3.name);
 
@@ -50,6 +56,7 @@ public class GtasksMetadata {
 
     /**
      * Creates default GTasks metadata item
+     *
      * @param taskId if > 0, will set metadata task field
      * @return
      */
@@ -59,14 +66,14 @@ public class GtasksMetadata {
         metadata.setValue(ID, ""); //$NON-NLS-1$
 
         String defaultList = Preferences.getStringValue(GtasksPreferenceService.PREF_DEFAULT_LIST);
-        if(defaultList == null)
+        if (defaultList == null)
             defaultList = "@default"; //$NON-NLS-1$
 
         metadata.setValue(LIST_ID, defaultList);
         metadata.setValue(PARENT_TASK, AbstractModel.NO_ID);
         metadata.setValue(INDENT, 0);
         metadata.setValue(ORDER, DateUtilities.now());
-        if(taskId > AbstractModel.NO_ID)
+        if (taskId > AbstractModel.NO_ID)
             metadata.setValue(Metadata.TASK, taskId);
         return metadata;
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java
index 9e9d0ca5d..0d308d60e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java
@@ -5,12 +5,6 @@
  */
 package com.todoroo.astrid.gtasks;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-
 import android.text.TextUtils;
 
 import com.todoroo.andlib.data.AbstractModel;
@@ -33,15 +27,21 @@ import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater.OrderedListIterato
 import com.todoroo.astrid.sync.SyncProviderUtilities;
 import com.todoroo.astrid.utility.SyncMetadataService;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+
 /**
  * Service for working with GTasks metadata
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public final class GtasksMetadataService extends SyncMetadataService<GtasksTaskContainer> {
 
-    @Autowired private GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    private GtasksPreferenceService gtasksPreferenceService;
 
     public GtasksMetadataService() {
         super(ContextManager.getContext());
@@ -50,7 +50,7 @@ public final class GtasksMetadataService extends SyncMetadataService<GtasksTaskC
 
     @Override
     public GtasksTaskContainer createContainerFromLocalTask(Task task,
-            ArrayList<Metadata> metadata) {
+                                                            ArrayList<Metadata> metadata) {
         return new GtasksTaskContainer(task, metadata);
     }
 
@@ -81,13 +81,13 @@ public final class GtasksMetadataService extends SyncMetadataService<GtasksTaskC
 
     @Override
     public synchronized void findLocalMatch(GtasksTaskContainer remoteTask) {
-        if(remoteTask.task.getId() != Task.NO_ID)
+        if (remoteTask.task.getId() != Task.NO_ID)
             return;
         TodorooCursor<Metadata> cursor = metadataDao.query(Query.select(Metadata.PROPERTIES).
                 where(Criterion.and(MetadataCriteria.withKey(getMetadataKey()),
                         getLocalMatchCriteria(remoteTask))));
         try {
-            if(cursor.getCount() == 0)
+            if (cursor.getCount() == 0)
                 return;
             cursor.moveToFirst();
             remoteTask.task.setId(cursor.get(Metadata.TASK));
@@ -116,13 +116,13 @@ public final class GtasksMetadataService extends SyncMetadataService<GtasksTaskC
     @Override
     protected TodorooCursor<Task> filterLocallyUpdated(TodorooCursor<Task> tasks, long lastSyncDate) {
         HashSet<Long> taskIds = new HashSet<Long>();
-        for(tasks.moveToFirst(); !tasks.isAfterLast(); tasks.moveToNext())
+        for (tasks.moveToFirst(); !tasks.isAfterLast(); tasks.moveToNext())
             taskIds.add(tasks.get(Task.ID));
 
         TodorooCursor<Metadata> metadata = metadataDao.query(Query.select(Metadata.TASK).where(
                 Criterion.and(MetadataCriteria.withKey(GtasksMetadata.METADATA_KEY),
-                GtasksMetadata.LAST_SYNC.gt(lastSyncDate))));
-        for(metadata.moveToFirst(); !metadata.isAfterLast(); metadata.moveToNext())
+                        GtasksMetadata.LAST_SYNC.gt(lastSyncDate))));
+        for (metadata.moveToFirst(); !metadata.isAfterLast(); metadata.moveToNext())
             taskIds.remove(metadata.get(Metadata.TASK));
 
         return taskDao.query(Query.select(Task.ID).where(
@@ -141,20 +141,20 @@ public final class GtasksMetadataService extends SyncMetadataService<GtasksTaskC
     public void iterateThroughList(String listId, OrderedListIterator iterator, long startAtOrder, boolean reverse) {
         Field orderField = Functions.cast(GtasksMetadata.ORDER, "LONG");
         Order order = reverse ? Order.desc(orderField) : Order.asc(orderField);
-        Criterion startAtCriterion = reverse ?  Functions.cast(GtasksMetadata.ORDER, "LONG").lt(startAtOrder) :
-            Functions.cast(GtasksMetadata.ORDER, "LONG").gt(startAtOrder - 1);
+        Criterion startAtCriterion = reverse ? Functions.cast(GtasksMetadata.ORDER, "LONG").lt(startAtOrder) :
+                Functions.cast(GtasksMetadata.ORDER, "LONG").gt(startAtOrder - 1);
 
         Query query = Query.select(Metadata.PROPERTIES).where(Criterion.and(
-                        MetadataCriteria.withKey(GtasksMetadata.METADATA_KEY),
-                        GtasksMetadata.LIST_ID.eq(listId),
-                        startAtCriterion)).
-                        orderBy(order);
+                MetadataCriteria.withKey(GtasksMetadata.METADATA_KEY),
+                GtasksMetadata.LIST_ID.eq(listId),
+                startAtCriterion)).
+                orderBy(order);
         TodorooCursor<Metadata> cursor = PluginServices.getMetadataService().query(query);
         try {
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 long taskId = cursor.get(Metadata.TASK);
                 Metadata metadata = getTaskMetadata(taskId);
-                if(metadata == null)
+                if (metadata == null)
                     continue;
                 iterator.processTask(taskId, metadata);
             }
@@ -166,6 +166,7 @@ public final class GtasksMetadataService extends SyncMetadataService<GtasksTaskC
 
     /**
      * Gets the remote id string of the parent task
+     *
      * @param gtasksMetadata
      * @return
      */
@@ -186,6 +187,7 @@ public final class GtasksMetadataService extends SyncMetadataService<GtasksTaskC
 
     /**
      * Gets the remote id string of the previous sibling task
+     *
      * @param listId
      * @param gtasksMetadata
      * @return
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java
index 4387c387f..d697040c4 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java
@@ -15,11 +15,12 @@ import com.todoroo.astrid.sync.SyncProviderUtilities;
  * Methods for working with GTasks preferences
  *
  * @author timsu
- *
  */
 public class GtasksPreferenceService extends SyncProviderUtilities {
 
-    /** add-on identifier */
+    /**
+     * add-on identifier
+     */
     public static final String IDENTIFIER = "gtasks"; //$NON-NLS-1$
 
     @Override
@@ -36,19 +37,29 @@ public class GtasksPreferenceService extends SyncProviderUtilities {
         return Preferences.getBoolean(PREF_MIGRATION_HAS_OCCURRED, false);
     }
 
-    /** GTasks user's default list id */
+    /**
+     * GTasks user's default list id
+     */
     public static final String PREF_DEFAULT_LIST = IDENTIFIER + "_defaultlist"; //$NON-NLS-1$
 
-    /** GTasks user name */
+    /**
+     * GTasks user name
+     */
     public static final String PREF_USER_NAME = IDENTIFIER + "_user"; //$NON-NLS-1$
 
-    /** GTasks is apps for domain boolean */
+    /**
+     * GTasks is apps for domain boolean
+     */
     public static final String PREF_IS_DOMAIN = IDENTIFIER + "_domain"; //$NON-NLS-1$
 
-    /** GTasks whether we have shown list help boolean */
+    /**
+     * GTasks whether we have shown list help boolean
+     */
     public static final String PREF_SHOWN_LIST_HELP = IDENTIFIER + "_list_help"; //$NON-NLS-1$
 
-    /** Pref that is set once migration to new GTasks API has occurred */
+    /**
+     * Pref that is set once migration to new GTasks API has occurred
+     */
     public static final String PREF_MIGRATION_HAS_OCCURRED = IDENTIFIER + "_migrated"; //$NON-NLS-1$
 
     @Override
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java
index 144bc2353..7bdb43e49 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java
@@ -30,13 +30,15 @@ import com.todoroo.astrid.tags.TagService;
  * initiate actions from the menu.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class GtasksPreferences extends SyncProviderPreferences {
 
-    @Autowired private GtasksPreferenceService gtasksPreferenceService;
-    @Autowired private ActFmPreferenceService actFmPreferenceService;
-    @Autowired private TagService tagService;
+    @Autowired
+    private GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    private ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    private TagService tagService;
 
     public GtasksPreferences() {
         super();
@@ -88,7 +90,8 @@ public class GtasksPreferences extends SyncProviderPreferences {
         final ProgressDialog pd = DialogUtilities.progressDialog(this, getString(R.string.gtasks_import_progress));
         pd.setCancelable(false);
 
-        GtasksImportCallback callback = new GtasksImportCallback(new SyncResultCallbackAdapter() {/**/}) {
+        GtasksImportCallback callback = new GtasksImportCallback(new SyncResultCallbackAdapter() {/**/
+        }) {
             @Override
             public void finished() {
                 super.finished();
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java
index 5635196be..ea343acf4 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java
@@ -20,11 +20,11 @@ import com.todoroo.astrid.service.AstridDependencyInjector;
 
 /**
  * Exposes sync action
- *
  */
 public class GtasksSyncActionExposer extends BroadcastReceiver {
 
-    @Autowired private GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    private GtasksPreferenceService gtasksPreferenceService;
 
     static {
         AstridDependencyInjector.initialize();
@@ -36,7 +36,7 @@ public class GtasksSyncActionExposer extends BroadcastReceiver {
         DependencyInjectionService.getInstance().inject(this);
 
         // if we aren't logged in, don't expose sync action
-        if(!gtasksPreferenceService.isLoggedIn())
+        if (!gtasksPreferenceService.isLoggedIn())
             return;
 
         Intent syncIntent = new Intent(null, null,
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
index 255e3d51d..6b1d616e6 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
@@ -5,11 +5,6 @@
  */
 package com.todoroo.astrid.gtasks;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -29,23 +24,35 @@ import com.todoroo.astrid.data.StoreObject;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.gtasks.sync.GtasksSyncService;
 import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater;
-import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater.OrderedListIterator;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 
 public class GtasksTaskListUpdater extends OrderedMetadataListUpdater<StoreObject> {
 
-    /** map of task -> parent task */
+    /**
+     * map of task -> parent task
+     */
     final HashMap<Long, Long> parents = new HashMap<Long, Long>();
 
-    /** map of task -> prior sibling */
+    /**
+     * map of task -> prior sibling
+     */
     final HashMap<Long, Long> siblings = new HashMap<Long, Long>();
 
     final HashMap<Long, String> localToRemoteIdMap =
-        new HashMap<Long, String>();
+            new HashMap<Long, String>();
 
-    @Autowired private GtasksListService gtasksListService;
-    @Autowired private GtasksMetadataService gtasksMetadataService;
-    @Autowired private GtasksSyncService gtasksSyncService;
-    @Autowired private MetadataDao metadataDao;
+    @Autowired
+    private GtasksListService gtasksListService;
+    @Autowired
+    private GtasksMetadataService gtasksMetadataService;
+    @Autowired
+    private GtasksSyncService gtasksSyncService;
+    @Autowired
+    private MetadataDao metadataDao;
 
     public GtasksTaskListUpdater() {
         super();
@@ -72,6 +79,7 @@ public class GtasksTaskListUpdater extends OrderedMetadataListUpdater<StoreObjec
     protected Metadata getTaskMetadata(StoreObject list, long taskId) {
         return gtasksMetadataService.getTaskMetadata(taskId);
     }
+
     @Override
     protected Metadata createEmptyMetadata(StoreObject list, long taskId) {
         Metadata metadata = GtasksMetadata.createEmptyMetadata(taskId);
@@ -100,18 +108,19 @@ public class GtasksTaskListUpdater extends OrderedMetadataListUpdater<StoreObjec
      * Create a local tree of tasks to expedite sibling and parent lookups
      */
     public void createParentSiblingMaps() {
-        for(StoreObject list : gtasksListService.getLists()) {
+        for (StoreObject list : gtasksListService.getLists()) {
             updateParentSiblingMapsFor(list);
         }
     }
 
     /**
      * Update order, parent, and indentation fields for all tasks in the given list
+     *
      * @param listId
      */
     public void correctMetadataForList(String listId) {
         StoreObject list = gtasksListService.getList(listId);
-        if(list == GtasksListService.LIST_NOT_FOUND_OBJECT)
+        if (list == GtasksListService.LIST_NOT_FOUND_OBJECT)
             return;
 
         updateParentSiblingMapsFor(list);
@@ -124,12 +133,12 @@ public class GtasksTaskListUpdater extends OrderedMetadataListUpdater<StoreObjec
             public void processTask(long taskId, Metadata metadata) {
                 metadata.setValue(GtasksMetadata.ORDER, order.getAndAdd(1));
                 int indent = metadata.getValue(GtasksMetadata.INDENT);
-                if(indent > previousIndent.get() + 1)
+                if (indent > previousIndent.get() + 1)
                     indent = previousIndent.get() + 1;
                 metadata.setValue(GtasksMetadata.INDENT, indent);
 
                 Long parent = parents.get(taskId);
-                if(parent == null || parent < 0)
+                if (parent == null || parent < 0)
                     parent = Task.NO_ID;
                 metadata.setValue(GtasksMetadata.PARENT_TASK, parent);
 
@@ -145,7 +154,7 @@ public class GtasksTaskListUpdater extends OrderedMetadataListUpdater<StoreObjec
     }
 
     private void orderAndIndentHelper(String listId, AtomicLong order, long parent, int indentLevel,
-            HashSet<Long> alreadyChecked) {
+                                      HashSet<Long> alreadyChecked) {
         TodorooCursor<Metadata> metadata = metadataDao.query(Query.select(Metadata.PROPERTIES)
                 .where(Criterion.and(Metadata.KEY.eq(GtasksMetadata.METADATA_KEY),
                         GtasksMetadata.LIST_ID.eq(listId), GtasksMetadata.PARENT_TASK.eq(parent)))
@@ -155,7 +164,7 @@ public class GtasksTaskListUpdater extends OrderedMetadataListUpdater<StoreObjec
                 Metadata curr = new Metadata();
                 for (metadata.moveToFirst(); !metadata.isAfterLast(); metadata.moveToNext()) {
                     curr.readFromCursor(metadata);
-                    if(alreadyChecked.contains(curr.getValue(Metadata.TASK)))
+                    if (alreadyChecked.contains(curr.getValue(Metadata.TASK)))
                         continue;
 
                     curr.setValue(GtasksMetadata.INDENT, indentLevel);
@@ -182,18 +191,18 @@ public class GtasksTaskListUpdater extends OrderedMetadataListUpdater<StoreObjec
 
                 try {
                     long parent, sibling;
-                    if(indent > previousIndent.get()) {
+                    if (indent > previousIndent.get()) {
                         parent = previousTask.get();
                         sibling = Task.NO_ID;
-                    } else if(indent == previousIndent.get()) {
+                    } else if (indent == previousIndent.get()) {
                         sibling = previousTask.get();
                         parent = parents.get(sibling);
                     } else {
                         // move up once for each indent
                         sibling = previousTask.get();
-                        for(int i = indent; i < previousIndent.get(); i++)
+                        for (int i = indent; i < previousIndent.get(); i++)
                             sibling = parents.get(sibling);
-                        if(parents.containsKey(sibling))
+                        if (parents.containsKey(sibling))
                             parent = parents.get(sibling);
                         else
                             parent = Task.NO_ID;
@@ -206,7 +215,7 @@ public class GtasksTaskListUpdater extends OrderedMetadataListUpdater<StoreObjec
 
                 previousTask.set(taskId);
                 previousIndent.set(indent);
-                if(!TextUtils.isEmpty(metadata.getValue(GtasksMetadata.ID)))
+                if (!TextUtils.isEmpty(metadata.getValue(GtasksMetadata.ID)))
                     localToRemoteIdMap.put(taskId, metadata.getValue(GtasksMetadata.ID));
             }
         });
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/CreateRequest.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/CreateRequest.java
index 2b0a44208..46932eeef 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/CreateRequest.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/CreateRequest.java
@@ -5,13 +5,14 @@
  */
 package com.todoroo.astrid.gtasks.api;
 
+import com.google.api.services.tasks.model.Task;
+
 import java.io.IOException;
 
-import com.google.api.services.tasks.model.Task;
 /**
  * Encapsulates a request to the api to create a task on the remote server
- * @author Sam Bosley
  *
+ * @author Sam Bosley
  */
 public class CreateRequest extends PushRequest {
 
@@ -21,7 +22,7 @@ public class CreateRequest extends PushRequest {
     public CreateRequest(GtasksInvoker service, String listId, Task toUpdate, String parent, String priorSiblingId) {
         super(service, listId, toUpdate);
         this.parent = parent;
-        this.priorSiblingId  = priorSiblingId;
+        this.priorSiblingId = priorSiblingId;
     }
 
     @Override
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GoogleTasksException.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GoogleTasksException.java
index 6b1a90422..c57cbaa6e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GoogleTasksException.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GoogleTasksException.java
@@ -5,10 +5,10 @@
  */
 package com.todoroo.astrid.gtasks.api;
 
-import java.io.IOException;
-
 import android.text.TextUtils;
 
+import java.io.IOException;
+
 public class GoogleTasksException extends IOException {
     private static final long serialVersionUID = -5585448790574862510L;
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java
index fa0d55999..dc30dd070 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java
@@ -5,11 +5,11 @@
  */
 package com.todoroo.astrid.gtasks.api;
 
+import com.google.api.client.util.DateTime;
+
 import java.util.Date;
 import java.util.TimeZone;
 
-import com.google.api.client.util.DateTime;
-
 @SuppressWarnings("nls")
 public class GtasksApiUtilities {
 
@@ -45,6 +45,7 @@ public class GtasksApiUtilities {
      * and then truncate h:m:s to 0. This can lead to a loss of date information for
      * us, so we adjust here by doing the normalizing/truncating ourselves and
      * then correcting the date we get back in a similar way.
+     *
      * @param time
      * @return
      */
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksInvoker.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksInvoker.java
index 1e6497e43..87fb58f4b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksInvoker.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/GtasksInvoker.java
@@ -1,7 +1,5 @@
 package com.todoroo.astrid.gtasks.api;
 
-import java.io.IOException;
-
 import android.content.Context;
 
 import com.google.api.client.extensions.android2.AndroidHttp;
@@ -24,11 +22,13 @@ import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.astrid.gtasks.auth.GtasksTokenValidator;
 
+import java.io.IOException;
+
 /**
  * Wrapper around the official Google Tasks API to simplify common operations. In the case
  * of an exception, each request is tried twice in case of a timeout.
- * @author Sam Bosley
  *
+ * @author Sam Bosley
  */
 @SuppressWarnings("nls")
 public class GtasksInvoker {
@@ -37,7 +37,8 @@ public class GtasksInvoker {
     private String token;
     private JsonFactory jsonFactory;
 
-    @Autowired ExceptionService exceptionService;
+    @Autowired
+    ExceptionService exceptionService;
 
     private static final String API_KEY = "AIzaSyCIYZTBo6haRHxmiplZsfYdagFEpaiFnAk"; // non-production API key
 
@@ -61,7 +62,7 @@ public class GtasksInvoker {
     //If we get a 401 or 403, try revalidating the auth token before bailing
     private synchronized void handleException(IOException e) throws IOException {
         if (e instanceof HttpResponseException) {
-            HttpResponseException h = (HttpResponseException)e;
+            HttpResponseException h = (HttpResponseException) e;
             int statusCode = h.getResponse().getStatusCode();
             if (statusCode == 401 || statusCode == 403) {
                 System.err.println("Encountered " + statusCode + " error");
@@ -91,6 +92,7 @@ public class GtasksInvoker {
      * A simple service query that will throw an exception if anything goes wrong.
      * Useful for checking if token needs revalidating or if there are network problems--
      * no exception means all is well
+     *
      * @throws IOException
      */
     public void ping() throws IOException {
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/MoveListRequest.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/MoveListRequest.java
index c9be3896e..c162643e0 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/MoveListRequest.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/MoveListRequest.java
@@ -5,13 +5,14 @@
  */
 package com.todoroo.astrid.gtasks.api;
 
+import com.google.api.services.tasks.model.Task;
+
 import java.io.IOException;
 
-import com.google.api.services.tasks.model.Task;
 /**
  * Encapsulates a request to the api to move a task from one list to another
- * @author Sam Bosley
  *
+ * @author Sam Bosley
  */
 public class MoveListRequest extends PushRequest {
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/MoveRequest.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/MoveRequest.java
index b835911a9..b1bc4c820 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/MoveRequest.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/MoveRequest.java
@@ -5,13 +5,14 @@
  */
 package com.todoroo.astrid.gtasks.api;
 
+import com.google.api.services.tasks.model.Task;
+
 import java.io.IOException;
 
-import com.google.api.services.tasks.model.Task;
 /**
  * Encapsulates a request to the api to change the ordering on the given task
- * @author Sam Bosley
  *
+ * @author Sam Bosley
  */
 public class MoveRequest extends PushRequest {
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/PushRequest.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/PushRequest.java
index d15f9cbaf..9237e533d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/PushRequest.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/PushRequest.java
@@ -5,14 +5,14 @@
  */
 package com.todoroo.astrid.gtasks.api;
 
-import java.io.IOException;
-
 import com.google.api.services.tasks.model.Task;
 
+import java.io.IOException;
+
 /**
  * Abstract class that encapsulates some push request to the server
- * @author Sam Bosley
  *
+ * @author Sam Bosley
  */
 public abstract class PushRequest {
     protected String listId;
@@ -28,6 +28,7 @@ public abstract class PushRequest {
     public String getListId() {
         return listId;
     }
+
     public void setListId(String listId) {
         this.listId = listId;
     }
@@ -35,6 +36,7 @@ public abstract class PushRequest {
     public Task getToPush() {
         return toPush;
     }
+
     public void setToPush(Task toPush) {
         this.toPush = toPush;
     }
@@ -42,6 +44,7 @@ public abstract class PushRequest {
     public GtasksInvoker getService() {
         return service;
     }
+
     public void setService(GtasksInvoker service) {
         this.service = service;
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/UpdateRequest.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/UpdateRequest.java
index a4f5057ba..9a8bd0968 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/api/UpdateRequest.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/api/UpdateRequest.java
@@ -5,14 +5,14 @@
  */
 package com.todoroo.astrid.gtasks.api;
 
-import java.io.IOException;
-
 import com.google.api.services.tasks.model.Task;
 
+import java.io.IOException;
+
 /**
  * Encapsulates a request to the api to update a task on the remote server
- * @author Sam Bosley
  *
+ * @author Sam Bosley
  */
 public class UpdateRequest extends PushRequest {
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/AccountChooser.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/AccountChooser.java
index 2f69e0e43..39103d75a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/AccountChooser.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/AccountChooser.java
@@ -23,99 +23,101 @@ import android.content.DialogInterface;
 
 /**
  * Choose which account to upload track information to.
+ *
  * @author Sandor Dornbush
  */
 public class AccountChooser {
 
-  /**
-   * The last selected account.
-   */
-  private int selectedAccountIndex = -1;
-  private Account selectedAccount = null;
-
-  /**
-   * An interface for receiving updates once the user has selected the account.
-   */
-  public interface AccountHandler {
     /**
-     * Handle the account being selected.
-     * @param account The selected account or null if none could be found
+     * The last selected account.
      */
-    public void handleAccountSelected(Account account);
-  }
+    private int selectedAccountIndex = -1;
+    private Account selectedAccount = null;
 
-  /**
-   * Chooses the best account to upload to.
-   * If no account is found the user will be alerted.
-   * If only one account is found that will be used.
-   * If multiple accounts are found the user will be allowed to choose.
-   *
-   * @param activity The parent activity
-   * @param handler The handler to be notified when an account has been selected
-   */
-  public void chooseAccount(final Activity activity,
-      final AccountHandler handler) {
-    final Account[] accounts = AccountManager.get(activity)
-        .getAccountsByType("com.google"); //$NON-NLS-1$
-    if (accounts.length < 1) {
-      alertNoAccounts(activity, handler);
-      return;
-    }
-    if (accounts.length == 1) {
-      handler.handleAccountSelected(accounts[0]);
-      return;
+    /**
+     * An interface for receiving updates once the user has selected the account.
+     */
+    public interface AccountHandler {
+        /**
+         * Handle the account being selected.
+         *
+         * @param account The selected account or null if none could be found
+         */
+        public void handleAccountSelected(Account account);
     }
 
-    // TODO This should be read out of a preference.
-    if (selectedAccount != null) {
-      handler.handleAccountSelected(selectedAccount);
-      return;
-    }
+    /**
+     * Chooses the best account to upload to.
+     * If no account is found the user will be alerted.
+     * If only one account is found that will be used.
+     * If multiple accounts are found the user will be allowed to choose.
+     *
+     * @param activity The parent activity
+     * @param handler  The handler to be notified when an account has been selected
+     */
+    public void chooseAccount(final Activity activity,
+                              final AccountHandler handler) {
+        final Account[] accounts = AccountManager.get(activity)
+                .getAccountsByType("com.google"); //$NON-NLS-1$
+        if (accounts.length < 1) {
+            alertNoAccounts(activity, handler);
+            return;
+        }
+        if (accounts.length == 1) {
+            handler.handleAccountSelected(accounts[0]);
+            return;
+        }
+
+        // TODO This should be read out of a preference.
+        if (selectedAccount != null) {
+            handler.handleAccountSelected(selectedAccount);
+            return;
+        }
 
-    // Let the user choose.
-    final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-    builder.setCancelable(false);
-    builder.setPositiveButton(android.R.string.ok,
-        new DialogInterface.OnClickListener() {
-      public void onClick(DialogInterface dialog, int which) {
-        selectedAccount = accounts[selectedAccountIndex];
-        handler.handleAccountSelected(selectedAccount);
-      }
-    });
-    builder.setNegativeButton(android.R.string.cancel,
-        new DialogInterface.OnClickListener() {
-      public void onClick(DialogInterface dialog, int which) {
-        handler.handleAccountSelected(null);
-      }
-    });
-    String[] choices = new String[accounts.length];
-    for (int i = 0; i < accounts.length; i++) {
-      choices[i] = accounts[i].name;
+        // Let the user choose.
+        final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        builder.setCancelable(false);
+        builder.setPositiveButton(android.R.string.ok,
+                new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                        selectedAccount = accounts[selectedAccountIndex];
+                        handler.handleAccountSelected(selectedAccount);
+                    }
+                });
+        builder.setNegativeButton(android.R.string.cancel,
+                new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                        handler.handleAccountSelected(null);
+                    }
+                });
+        String[] choices = new String[accounts.length];
+        for (int i = 0; i < accounts.length; i++) {
+            choices[i] = accounts[i].name;
+        }
+        builder.setSingleChoiceItems(choices, selectedAccountIndex,
+                new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        selectedAccountIndex = which;
+                    }
+                });
+        builder.show();
     }
-    builder.setSingleChoiceItems(choices, selectedAccountIndex,
-        new DialogInterface.OnClickListener() {
-      @Override
-      public void onClick(DialogInterface dialog, int which) {
-        selectedAccountIndex = which;
-      }
-    });
-    builder.show();
-  }
 
-  /**
-   * Puts up a dialog alerting the user that no suitable account was found.
-   */
-  private void alertNoAccounts(final Activity activity,
-      final AccountHandler handler) {
-    final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-    builder.setMessage("No Accounts Found."); //$NON-NLS-1$
-    builder.setCancelable(true);
-    builder.setNegativeButton(android.R.string.ok,
-        new DialogInterface.OnClickListener() {
-          public void onClick(DialogInterface dialog, int which) {
-            handler.handleAccountSelected(null);
-          }
-        });
-    builder.show();
-  }
+    /**
+     * Puts up a dialog alerting the user that no suitable account was found.
+     */
+    private void alertNoAccounts(final Activity activity,
+                                 final AccountHandler handler) {
+        final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        builder.setMessage("No Accounts Found."); //$NON-NLS-1$
+        builder.setCancelable(true);
+        builder.setNegativeButton(android.R.string.ok,
+                new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                        handler.handleAccountSelected(null);
+                    }
+                });
+        builder.show();
+    }
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/AuthManager.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/AuthManager.java
index f410aca31..fa5ea61fe 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/AuthManager.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/AuthManager.java
@@ -25,53 +25,53 @@ import android.content.Intent;
  */
 public interface AuthManager {
 
-  /**
-   * Initializes the login process. The user should be asked to login if they
-   * haven't already. The {@link Runnable} provided will be executed when the
-   * auth token is successfully fetched.
-   *
-   * @param whenFinished A {@link Runnable} to execute when the auth token
-   *        has been successfully fetched and is available via
-   *        {@link #getAuthToken()}
-   */
-  public abstract void doLogin(Runnable whenFinished, Object o);
+    /**
+     * Initializes the login process. The user should be asked to login if they
+     * haven't already. The {@link Runnable} provided will be executed when the
+     * auth token is successfully fetched.
+     *
+     * @param whenFinished A {@link Runnable} to execute when the auth token
+     *                     has been successfully fetched and is available via
+     *                     {@link #getAuthToken()}
+     */
+    public abstract void doLogin(Runnable whenFinished, Object o);
 
-  /**
-   * The {@link android.app.Activity} owner of this class should call this
-   * function when it gets {@link android.app.Activity#onActivityResult} with
-   * the request code passed into the constructor. The resultCode and results
-   * should come directly from the {@link android.app.Activity#onActivityResult}
-   * function. This function will return true if an auth token was successfully
-   *  fetched or the process is not finished.
-   *
-   * @param resultCode The result code passed in to the
-   *        {@link android.app.Activity}'s
-   *        {@link android.app.Activity#onActivityResult} function
-   * @param results The data passed in to the {@link android.app.Activity}'s
-   *        {@link android.app.Activity#onActivityResult} function
-   * @return True if the auth token was fetched or we aren't done fetching
-   *         the auth token, or False if there was an error or the request was
-   *         canceled
-   */
-  public abstract boolean authResult(int resultCode, Intent results);
+    /**
+     * The {@link android.app.Activity} owner of this class should call this
+     * function when it gets {@link android.app.Activity#onActivityResult} with
+     * the request code passed into the constructor. The resultCode and results
+     * should come directly from the {@link android.app.Activity#onActivityResult}
+     * function. This function will return true if an auth token was successfully
+     * fetched or the process is not finished.
+     *
+     * @param resultCode The result code passed in to the
+     *                   {@link android.app.Activity}'s
+     *                   {@link android.app.Activity#onActivityResult} function
+     * @param results    The data passed in to the {@link android.app.Activity}'s
+     *                   {@link android.app.Activity#onActivityResult} function
+     * @return True if the auth token was fetched or we aren't done fetching
+     * the auth token, or False if there was an error or the request was
+     * canceled
+     */
+    public abstract boolean authResult(int resultCode, Intent results);
 
-  /**
-   * Returns the current auth token. Response may be null if no valid auth
-   * token has been fetched.
-   *
-   * @return The current auth token or null if no auth token has been
-   *         fetched
-   */
-  public abstract String getAuthToken();
+    /**
+     * Returns the current auth token. Response may be null if no valid auth
+     * token has been fetched.
+     *
+     * @return The current auth token or null if no auth token has been
+     * fetched
+     */
+    public abstract String getAuthToken();
 
-  /**
-   * Invalidates the existing auth token and request a new one. The
-   * {@link Runnable} provided will be executed when the new auth token is
-   * successfully fetched.
-   *
-   * @param whenFinished A {@link Runnable} to execute when a new auth token
-   *        is successfully fetched
-   */
-  public abstract void invalidateAndRefresh(Runnable whenFinished);
+    /**
+     * Invalidates the existing auth token and request a new one. The
+     * {@link Runnable} provided will be executed when the new auth token is
+     * successfully fetched.
+     *
+     * @param whenFinished A {@link Runnable} to execute when a new auth token
+     *                     is successfully fetched
+     */
+    public abstract void invalidateAndRefresh(Runnable whenFinished);
 
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
index f973e0a65..227712060 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.gtasks.auth;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;
@@ -39,18 +35,23 @@ import com.todoroo.astrid.service.AstridDependencyInjector;
 import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.service.SyncV2Service;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;
+
 /**
  * This activity allows users to sign in or log in to Google Tasks
  * through the Android account manager
  *
  * @author Sam Bosley
- *
  */
 public class GtasksLoginActivity extends ListActivity {
 
-    @Autowired private GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    private GtasksPreferenceService gtasksPreferenceService;
 
-    @Autowired private SyncV2Service syncService;
+    @Autowired
+    private SyncV2Service syncService;
 
     // --- ui initialization
 
@@ -132,7 +133,7 @@ public class GtasksLoginActivity extends ListActivity {
                                 @Override
                                 public void run() {
                                     int error = e instanceof IOException ? R.string.gtasks_GLA_errorIOAuth :
-                                        R.string.gtasks_GLA_errorAuth;
+                                            R.string.gtasks_GLA_errorAuth;
                                     Toast.makeText(GtasksLoginActivity.this,
                                             error,
                                             Toast.LENGTH_LONG).show();
@@ -188,7 +189,7 @@ public class GtasksLoginActivity extends ListActivity {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if(requestCode == REQUEST_AUTHENTICATE && resultCode == RESULT_OK){
+        if (requestCode == REQUEST_AUTHENTICATE && resultCode == RESULT_OK) {
             final ProgressDialog pd = DialogUtilities.progressDialog(this, this.getString(R.string.gtasks_GLA_authenticating));
             pd.show();
             final Account a = accountManager.getAccountByName(accountName);
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java
index 746ee0681..5d967b72b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.gtasks.auth;
 
-import java.io.IOException;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerFuture;
@@ -23,22 +21,26 @@ import com.todoroo.astrid.gtasks.GtasksPreferenceService;
 import com.todoroo.astrid.gtasks.api.GoogleTasksException;
 import com.todoroo.astrid.gtasks.api.GtasksInvoker;
 
+import java.io.IOException;
+
 @SuppressWarnings("nls")
 public class GtasksTokenValidator {
 
     private static final String TOKEN_INTENT_RECEIVED = "intent!"; //$NON-NLS-1$
 
     private static final int REVALIDATION_TRIES = 4;
+
     /**
      * Invalidates and then revalidates the auth token for the currently logged in user
      * Shouldn't be called from the main thread--will block on network calls
+     *
      * @param token
      * @return valid token on success, null on failure
      */
     public static synchronized String validateAuthToken(Context c, String token) throws GoogleTasksException {
         GoogleAccountManager accountManager = new GoogleAccountManager(ContextManager.getContext());
 
-        if(testToken(token))
+        if (testToken(token))
             return token;
 
         // If fail, token may have expired -- get a new one and return that
@@ -55,9 +57,9 @@ public class GtasksTokenValidator {
             AccountManagerFuture<Bundle> future = accountManager.manager.getAuthToken(a, GtasksInvoker.AUTH_TOKEN_TYPE, false, null, null);
             token = getTokenFromFuture(c, future);
 
-            if(TOKEN_INTENT_RECEIVED.equals(token))
+            if (TOKEN_INTENT_RECEIVED.equals(token))
                 return null;
-            else if(token != null && testToken(token))
+            else if (token != null && testToken(token))
                 return token;
         }
 
@@ -80,7 +82,7 @@ public class GtasksTokenValidator {
         Bundle result;
         try {
             result = future.getResult();
-            if(result == null)
+            if (result == null)
                 throw new NullPointerException("Future result was null."); //$NON-NLS-1$
         } catch (Exception e) {
             throw new GoogleTasksException(e.getLocalizedMessage(), "future-error");
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/ModernAuthManager.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/ModernAuthManager.java
index 34567788b..108cbb1d5 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/ModernAuthManager.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/ModernAuthManager.java
@@ -15,9 +15,6 @@
  */
 package com.todoroo.astrid.gtasks.auth;
 
-import java.io.IOException;
-import java.util.ArrayList;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;
@@ -31,6 +28,9 @@ import android.util.Log;
 
 import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager;
 
+import java.io.IOException;
+import java.util.ArrayList;
+
 /**
  * AuthManager keeps track of the current auth token for a user. The advantage
  * over just passing around a String is that this class can renew the auth
@@ -38,178 +38,184 @@ import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountMa
  * AuthManager.
  */
 public class ModernAuthManager implements AuthManager {
-  protected static final int GET_LOGIN_REQUEST = 1;
-
-/** The activity that will handle auth result callbacks. */
-  private final Activity activity;
-
-  /** The name of the service to authorize for. */
-  private final String service;
-
-  /** The most recently fetched auth token or null if none is available. */
-  private String authToken;
-
-  private final AccountManager accountManager;
-
-  private Runnable whenFinished;
-
-  /**
-   * AuthManager requires many of the same parameters as
-   * {@link com.google.android.googlelogindist.GoogleLoginServiceHelper
-   * #getCredentials(Activity, int, Bundle, boolean, String, boolean)}.
-   * The activity must have a handler in {@link Activity#onActivityResult} that
-   * calls {@link #authResult(int, Intent)} if the request code is the code
-   * given here.
-   *
-   * @param activity An activity with a handler in
-   *        {@link Activity#onActivityResult} that calls
-   *        {@link #authResult(int, Intent)} when {@literal code} is the request
-   *        code
-   * @param code The request code to pass to
-   *        {@link Activity#onActivityResult} when
-   *        {@link #authResult(int, Intent)} should be called
-   * @param extras A {@link Bundle} of extras for
-   *        {@link com.google.android.googlelogindist.GoogleLoginServiceHelper}
-   * @param requireGoogle True if the account must be a Google account
-   * @param service The name of the service to authenticate as
-   */
-  public ModernAuthManager(Activity activity, int code, Bundle extras,
-      boolean requireGoogle, String service) {
-    this.activity = activity;
-    this.service = service;
-    this.accountManager = AccountManager.get(activity);
-  }
-
-  /**
-   * Call this to do the initial login. The user will be asked to login if
-   * they haven't already. The {@link Runnable} provided will be executed
-   * when the auth token is successfully fetched.
-   *
-   * @param runnable A {@link Runnable} to execute when the auth token
-   *        has been successfully fetched and is available via
-   *        {@link #getAuthToken()}
-   */
-  @SuppressWarnings("nls")
-  public void doLogin(final Runnable runnable, Object o) {
-    this.whenFinished = runnable;
-    if (!(o instanceof Account)) {
-      throw new IllegalArgumentException("FroyoAuthManager requires an account.");
+    protected static final int GET_LOGIN_REQUEST = 1;
+
+    /**
+     * The activity that will handle auth result callbacks.
+     */
+    private final Activity activity;
+
+    /**
+     * The name of the service to authorize for.
+     */
+    private final String service;
+
+    /**
+     * The most recently fetched auth token or null if none is available.
+     */
+    private String authToken;
+
+    private final AccountManager accountManager;
+
+    private Runnable whenFinished;
+
+    /**
+     * AuthManager requires many of the same parameters as
+     * {@link com.google.android.googlelogindist.GoogleLoginServiceHelper
+     * #getCredentials(Activity, int, Bundle, boolean, String, boolean)}.
+     * The activity must have a handler in {@link Activity#onActivityResult} that
+     * calls {@link #authResult(int, Intent)} if the request code is the code
+     * given here.
+     *
+     * @param activity      An activity with a handler in
+     *                      {@link Activity#onActivityResult} that calls
+     *                      {@link #authResult(int, Intent)} when {@literal code} is the request
+     *                      code
+     * @param code          The request code to pass to
+     *                      {@link Activity#onActivityResult} when
+     *                      {@link #authResult(int, Intent)} should be called
+     * @param extras        A {@link Bundle} of extras for
+     *                      {@link com.google.android.googlelogindist.GoogleLoginServiceHelper}
+     * @param requireGoogle True if the account must be a Google account
+     * @param service       The name of the service to authenticate as
+     */
+    public ModernAuthManager(Activity activity, int code, Bundle extras,
+                             boolean requireGoogle, String service) {
+        this.activity = activity;
+        this.service = service;
+        this.accountManager = AccountManager.get(activity);
+    }
+
+    /**
+     * Call this to do the initial login. The user will be asked to login if
+     * they haven't already. The {@link Runnable} provided will be executed
+     * when the auth token is successfully fetched.
+     *
+     * @param runnable A {@link Runnable} to execute when the auth token
+     *                 has been successfully fetched and is available via
+     *                 {@link #getAuthToken()}
+     */
+    @SuppressWarnings("nls")
+    public void doLogin(final Runnable runnable, Object o) {
+        this.whenFinished = runnable;
+        if (!(o instanceof Account)) {
+            throw new IllegalArgumentException("FroyoAuthManager requires an account.");
+        }
+        Account account = (Account) o;
+        accountManager.getAuthToken(account, service, true,
+                new AccountManagerCallback<Bundle>() {
+                    public void run(AccountManagerFuture<Bundle> future) {
+                        try {
+                            Bundle result = future.getResult();
+
+                            // AccountManager needs user to grant permission
+                            if (result.containsKey(AccountManager.KEY_INTENT)) {
+                                Intent intent = (Intent) result.get(AccountManager.KEY_INTENT);
+                                clearNewTaskFlag(intent);
+                                activity.startActivityForResult(intent, GET_LOGIN_REQUEST);
+                                return;
+                            }
+
+                            authToken = result.getString(
+                                    AccountManager.KEY_AUTHTOKEN);
+                            Log.e("gtasks-auth", "Got auth token.");
+                            runWhenFinished();
+                        } catch (OperationCanceledException e) {
+                            Log.e("gtasks-auth", "Operation Canceled", e);
+                        } catch (IOException e) {
+                            Log.e("gtasks-auth", "IOException", e);
+                        } catch (AuthenticatorException e) {
+                            Log.e("gtasks-auth", "Authentication Failed", e);
+                        }
+                    }
+                }, null /* handler */);
+    }
+
+    private static void clearNewTaskFlag(Intent intent) {
+        int flags = intent.getFlags();
+        flags &= ~Intent.FLAG_ACTIVITY_NEW_TASK;
+        intent.setFlags(flags);
     }
-    Account account = (Account) o;
-    accountManager.getAuthToken(account, service, true,
-            new AccountManagerCallback<Bundle>() {
-        public void run(AccountManagerFuture<Bundle> future) {
-          try {
-            Bundle result = future.getResult();
-
-            // AccountManager needs user to grant permission
-            if (result.containsKey(AccountManager.KEY_INTENT)) {
-              Intent intent = (Intent) result.get(AccountManager.KEY_INTENT);
-              clearNewTaskFlag(intent);
-              activity.startActivityForResult(intent, GET_LOGIN_REQUEST);
-              return;
-            }
 
-            authToken = result.getString(
-                AccountManager.KEY_AUTHTOKEN);
-            Log.e("gtasks-auth", "Got auth token.");
-            runWhenFinished();
-          } catch (OperationCanceledException e) {
-            Log.e("gtasks-auth", "Operation Canceled", e);
-          } catch (IOException e) {
-            Log.e("gtasks-auth", "IOException", e);
-          } catch (AuthenticatorException e) {
-            Log.e("gtasks-auth", "Authentication Failed", e);
-          }
+    /**
+     * The {@link Activity} passed into the constructor should call this
+     * function when it gets {@link Activity#onActivityResult} with the request
+     * code passed into the constructor. The resultCode and results should
+     * come directly from the {@link Activity#onActivityResult} function. This
+     * function will return true if an auth token was successfully fetched or
+     * the process is not finished.
+     *
+     * @param resultCode The result code passed in to the {@link Activity}'s
+     *                   {@link Activity#onActivityResult} function
+     * @param results    The data passed in to the {@link Activity}'s
+     *                   {@link Activity#onActivityResult} function
+     * @return True if the auth token was fetched or we aren't done fetching
+     * the auth token, or False if there was an error or the request was
+     * canceled
+     */
+    @SuppressWarnings("nls")
+    public boolean authResult(int resultCode, Intent results) {
+        if (results != null) {
+            authToken = results.getStringExtra(
+                    AccountManager.KEY_AUTHTOKEN);
+            Log.w("google-auth", "authResult: " + authToken);
+        } else {
+            Log.e("google-auth", "No auth result results!!");
         }
-    }, null /* handler */);
-  }
-
-  private static void clearNewTaskFlag(Intent intent) {
-    int flags = intent.getFlags();
-    flags &= ~Intent.FLAG_ACTIVITY_NEW_TASK;
-    intent.setFlags(flags);
-  }
-
-  /**
-   * The {@link Activity} passed into the constructor should call this
-   * function when it gets {@link Activity#onActivityResult} with the request
-   * code passed into the constructor. The resultCode and results should
-   * come directly from the {@link Activity#onActivityResult} function. This
-   * function will return true if an auth token was successfully fetched or
-   * the process is not finished.
-   *
-   * @param resultCode The result code passed in to the {@link Activity}'s
-   *        {@link Activity#onActivityResult} function
-   * @param results The data passed in to the {@link Activity}'s
-   *        {@link Activity#onActivityResult} function
-   * @return True if the auth token was fetched or we aren't done fetching
-   *         the auth token, or False if there was an error or the request was
-   *         canceled
-   */
-  @SuppressWarnings("nls")
-  public boolean authResult(int resultCode, Intent results) {
-    if (results != null) {
-      authToken = results.getStringExtra(
-          AccountManager.KEY_AUTHTOKEN);
-      Log.w("google-auth", "authResult: " + authToken);
-    } else {
-      Log.e("google-auth", "No auth result results!!");
+        runWhenFinished();
+        return authToken != null;
+    }
+
+    /**
+     * Returns the current auth token. Response may be null if no valid auth
+     * token has been fetched.
+     *
+     * @return The current auth token or null if no auth token has been
+     * fetched
+     */
+    public String getAuthToken() {
+        return authToken;
     }
-    runWhenFinished();
-    return authToken != null;
-  }
-
-  /**
-   * Returns the current auth token. Response may be null if no valid auth
-   * token has been fetched.
-   *
-   * @return The current auth token or null if no auth token has been
-   *         fetched
-   */
-  public String getAuthToken() {
-    return authToken;
-  }
-
-  /**
-   * Invalidates the existing auth token and request a new one. The
-   * {@link Runnable} provided will be executed when the new auth token is
-   * successfully fetched.
-   *
-   * @param runnable A {@link Runnable} to execute when a new auth token
-   *        is successfully fetched
-   */
-  public void invalidateAndRefresh(final Runnable runnable) {
-    this.whenFinished = runnable;
-
-    activity.runOnUiThread(new Runnable() {
-      public void run() {
-        accountManager.invalidateAuthToken("com.google", authToken); //$NON-NLS-1$
-        new AccountChooser().chooseAccount(activity,
-            new AccountChooser.AccountHandler() {
-              @Override
-              public void handleAccountSelected(Account account) {
-                if (account != null) {
-                  doLogin(whenFinished, account);
-                } else {
-                  runWhenFinished();
+
+    /**
+     * Invalidates the existing auth token and request a new one. The
+     * {@link Runnable} provided will be executed when the new auth token is
+     * successfully fetched.
+     *
+     * @param runnable A {@link Runnable} to execute when a new auth token
+     *                 is successfully fetched
+     */
+    public void invalidateAndRefresh(final Runnable runnable) {
+        this.whenFinished = runnable;
+
+        activity.runOnUiThread(new Runnable() {
+            public void run() {
+                accountManager.invalidateAuthToken("com.google", authToken); //$NON-NLS-1$
+                new AccountChooser().chooseAccount(activity,
+                        new AccountChooser.AccountHandler() {
+                            @Override
+                            public void handleAccountSelected(Account account) {
+                                if (account != null) {
+                                    doLogin(whenFinished, account);
+                                } else {
+                                    runWhenFinished();
+                                }
+                            }
+                        });
+            }
+        });
+    }
+
+    private void runWhenFinished() {
+        if (whenFinished != null) {
+            (new Thread() {
+                @Override
+                public void run() {
+                    whenFinished.run();
                 }
-              }
-            });
-      }
-    });
-  }
-
-  private void runWhenFinished() {
-    if (whenFinished != null) {
-      (new Thread() {
-        @Override
-        public void run() {
-          whenFinished.run();
+            }).start();
         }
-      }).start();
     }
-  }
 
     public static String[] getAccounts(Activity activity) {
         try {
@@ -221,7 +227,7 @@ public class ModernAuthManager implements AuthManager {
             }
             return accountNames.toArray(new String[accountNames.size()]);
         } catch (Exception e) {
-            return new String[] {}; // Empty array on failure
+            return new String[]{}; // Empty array on failure
         }
     }
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksLegacyMigrator.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksLegacyMigrator.java
index 9df1ee477..9d24c0df5 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksLegacyMigrator.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksLegacyMigrator.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.gtasks.sync;
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-
 import com.google.api.services.tasks.model.TaskList;
 import com.google.api.services.tasks.model.TaskLists;
 import com.google.api.services.tasks.model.Tasks;
@@ -28,19 +24,28 @@ import com.todoroo.astrid.service.AstridDependencyInjector;
 import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.TaskService;
 
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * Class to handle migration of legacy metadata (old remote ids) to new
  * metadata based on the official remote ids returned by the api.
- * @author Sam Bosley
  *
+ * @author Sam Bosley
  */
 public class GtasksLegacyMigrator {
 
-    @Autowired GtasksMetadataService gtasksMetadataService;
-    @Autowired TaskService taskService;
-    @Autowired MetadataService metadataService;
-    @Autowired GtasksListService gtasksListService;
-    @Autowired GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    GtasksMetadataService gtasksMetadataService;
+    @Autowired
+    TaskService taskService;
+    @Autowired
+    MetadataService metadataService;
+    @Autowired
+    GtasksListService gtasksListService;
+    @Autowired
+    GtasksPreferenceService gtasksPreferenceService;
 
     private final GtasksInvoker gtasksService;
     private final GtasksListService listService;
@@ -50,7 +55,7 @@ public class GtasksLegacyMigrator {
         AstridDependencyInjector.initialize();
     }
 
-    public GtasksLegacyMigrator(GtasksInvoker service,GtasksListService listService, TaskLists allLists) {
+    public GtasksLegacyMigrator(GtasksInvoker service, GtasksListService listService, TaskLists allLists) {
         DependencyInjectionService.getInstance().inject(this);
         this.gtasksService = service;
         this.listService = listService;
@@ -67,7 +72,7 @@ public class GtasksLegacyMigrator {
             TodorooCursor<Task> allTasksWithGtaskData = taskService.query(Query.select(Task.PROPERTIES).
                     where(Task.ID.in(
                             Query.select(Metadata.TASK).from(Metadata.TABLE).
-                            where(Metadata.KEY.eq(GtasksMetadata.METADATA_KEY)))));
+                                    where(Metadata.KEY.eq(GtasksMetadata.METADATA_KEY)))));
 
             try {
                 if (allTasksWithGtaskData.getCount() > 0) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java
index 09ec72718..4c337f1a8 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.gtasks.sync;
 
-import java.io.IOException;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.Semaphore;
-
 import android.content.ContentValues;
 import android.text.TextUtils;
 import android.util.Log;
@@ -36,15 +32,25 @@ import com.todoroo.astrid.gtasks.api.MoveRequest;
 import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.TaskService;
 
+import java.io.IOException;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.Semaphore;
+
 public final class GtasksSyncService {
 
     private static final String DEFAULT_LIST = "@default"; //$NON-NLS-1$
-    @Autowired MetadataService metadataService;
-    @Autowired MetadataDao metadataDao;
-    @Autowired GtasksMetadataService gtasksMetadataService;
-    @Autowired TaskDao taskDao;
-    @Autowired GtasksPreferenceService gtasksPreferenceService;
-    @Autowired ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    MetadataService metadataService;
+    @Autowired
+    MetadataDao metadataDao;
+    @Autowired
+    GtasksMetadataService gtasksMetadataService;
+    @Autowired
+    TaskDao taskDao;
+    @Autowired
+    GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    ActFmPreferenceService actFmPreferenceService;
 
     public GtasksSyncService() {
         DependencyInjectionService.getInstance().inject(this);
@@ -66,7 +72,7 @@ public final class GtasksSyncService {
 
         @Override
         public void op(GtasksInvoker invoker) throws IOException {
-            if(DateUtilities.now() - creationDate < 1000)
+            if (DateUtilities.now() - creationDate < 1000)
                 AndroidUtilities.sleepDeep(1000 - (DateUtilities.now() - creationDate));
             pushTaskOnSave(model, model.getMergedValues(), invoker, false);
         }
@@ -104,14 +110,14 @@ public final class GtasksSyncService {
 
         taskDao.addListener(new ModelUpdateListener<Task>() {
             public void onModelUpdated(final Task model, boolean outstandingEntries) {
-                if(model.checkAndClearTransitory(SyncFlags.GTASKS_SUPPRESS_SYNC))
+                if (model.checkAndClearTransitory(SyncFlags.GTASKS_SUPPRESS_SYNC))
                     return;
                 if (actFmPreferenceService.isLoggedIn())
                     return;
                 if (gtasksPreferenceService.isOngoing() && !model.checkTransitory(TaskService.TRANS_REPEAT_COMPLETE)) //Don't try and sync changes that occur during a normal sync
                     return;
                 final ContentValues setValues = model.getSetValues();
-                if(setValues == null || !checkForToken())
+                if (setValues == null || !checkForToken())
                     return;
                 if (!checkValuesForProperties(setValues, TASK_PROPERTIES)) //None of the properties we sync were updated
                     return;
@@ -159,11 +165,12 @@ public final class GtasksSyncService {
         }
     }
 
-    private static final Property<?>[] TASK_PROPERTIES = { Task.ID, Task.TITLE,
-            Task.NOTES, Task.DUE_DATE, Task.COMPLETION_DATE, Task.DELETION_DATE, Task.USER_ID };
+    private static final Property<?>[] TASK_PROPERTIES = {Task.ID, Task.TITLE,
+            Task.NOTES, Task.DUE_DATE, Task.COMPLETION_DATE, Task.DELETION_DATE, Task.USER_ID};
 
     /**
      * Checks to see if any of the values changed are among the properties we sync
+     *
      * @param values
      * @param properties
      * @return false if none of the properties we sync were changed, true otherwise
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
index 9cd74558b..b55924e97 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
@@ -5,15 +5,6 @@
  */
 package com.todoroo.astrid.gtasks.sync;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.json.JSONException;
-
 import android.app.Activity;
 import android.text.TextUtils;
 
@@ -62,21 +53,43 @@ import com.todoroo.astrid.sync.SyncResultCallback;
 import com.todoroo.astrid.sync.SyncV2Provider;
 import com.todoroo.astrid.tags.TagService;
 
+import org.json.JSONException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
 public class GtasksSyncV2Provider extends SyncV2Provider {
 
-    @Autowired TaskService taskService;
-    @Autowired MetadataService metadataService;
-    @Autowired MetadataDao metadataDao;
-    @Autowired StoreObjectDao storeObjectDao;
-    @Autowired ActFmPreferenceService actFmPreferenceService;
-    @Autowired GtasksPreferenceService gtasksPreferenceService;
-    @Autowired GtasksSyncService gtasksSyncService;
-    @Autowired GtasksListService gtasksListService;
-    @Autowired GtasksMetadataService gtasksMetadataService;
-    @Autowired GtasksTaskListUpdater gtasksTaskListUpdater;
-    @Autowired TagService tagService;
-    @Autowired TagDataDao tagDataDao;
-    @Autowired TagMetadataDao tagMetadataDao;
+    @Autowired
+    TaskService taskService;
+    @Autowired
+    MetadataService metadataService;
+    @Autowired
+    MetadataDao metadataDao;
+    @Autowired
+    StoreObjectDao storeObjectDao;
+    @Autowired
+    ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    GtasksSyncService gtasksSyncService;
+    @Autowired
+    GtasksListService gtasksListService;
+    @Autowired
+    GtasksMetadataService gtasksMetadataService;
+    @Autowired
+    GtasksTaskListUpdater gtasksTaskListUpdater;
+    @Autowired
+    TagService tagService;
+    @Autowired
+    TagDataDao tagDataDao;
+    @Autowired
+    TagMetadataDao tagMetadataDao;
 
     static {
         AstridDependencyInjector.initialize();
@@ -89,7 +102,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
     }
 
     public synchronized static GtasksSyncV2Provider getInstance() {
-        if(instance == null)
+        if (instance == null)
             instance = new GtasksSyncV2Provider();
         return instance;
     }
@@ -197,9 +210,9 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
     private synchronized void pushUpdated(GtasksInvoker invoker, SyncResultCallback callback) {
         TodorooCursor<Task> queued = taskService.query(Query.select(Task.PROPERTIES).
                 join(Join.left(Metadata.TABLE, Criterion.and(MetadataCriteria.withKey(GtasksMetadata.METADATA_KEY), Task.ID.eq(Metadata.TASK)))).where(
-                        Criterion.or(Task.MODIFICATION_DATE.gt(GtasksMetadata.LAST_SYNC),
-                                    Criterion.and(Task.USER_ID.neq(Task.USER_ID_SELF), GtasksMetadata.ID.isNotNull()),
-                                      Metadata.KEY.isNull())));
+                Criterion.or(Task.MODIFICATION_DATE.gt(GtasksMetadata.LAST_SYNC),
+                        Criterion.and(Task.USER_ID.neq(Task.USER_ID_SELF), GtasksMetadata.ID.isNotNull()),
+                        Metadata.KEY.isNull())));
         callback.incrementMax(queued.getCount() * 10);
         try {
             Task task = new Task();
@@ -266,7 +279,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
 
 
     private synchronized void synchronizeListHelper(StoreObject list, GtasksInvoker invoker,
-            boolean manual, SyncExceptionHandler errorHandler, SyncResultCallback callback, boolean isImport) {
+                                                    boolean manual, SyncExceptionHandler errorHandler, SyncResultCallback callback, boolean isImport) {
         String listId = list.getValue(GtasksList.REMOTE_ID);
         long lastSyncDate;
         if (!manual && list.containsNonNullValue(GtasksList.LAST_SYNC)) {
@@ -298,7 +311,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
                 list.setValue(GtasksList.LAST_SYNC, DateUtilities.now());
                 storeObjectDao.persist(list);
 
-                if(lastSyncDate == 0 && !isImport) {
+                if (lastSyncDate == 0 && !isImport) {
                     Long[] localIdArray = localIds.toArray(new Long[localIds.size()]);
                     Criterion delete = Criterion.and(Metadata.KEY.eq(GtasksMetadata.METADATA_KEY),
                             GtasksMetadata.LIST_ID.eq(listId),
@@ -320,8 +333,11 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
         }
     }
 
-    /** Create a task container for the given remote task
-     * @throws JSONException */
+    /**
+     * Create a task container for the given remote task
+     *
+     * @throws JSONException
+     */
     private GtasksTaskContainer parseRemoteTask(com.google.api.services.tasks.model.Task remoteTask, String listId) {
         Task task = new Task();
 
@@ -356,14 +372,14 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
         if (!task.task.isSaved() && actFmPreferenceService.isLoggedIn())
             titleMatchWithActFm(task.task);
 
-        if(task.task.isSaved()) {
+        if (task.task.isSaved()) {
             Task local = PluginServices.getTaskService().fetchById(task.task.getId(), Task.DUE_DATE, Task.COMPLETION_DATE);
             if (local == null) {
                 task.task.clearValue(Task.ID);
                 task.task.clearValue(Task.UUID);
             } else {
                 mergeDates(task.task, local);
-                if(task.task.isCompleted() && !local.isCompleted())
+                if (task.task.isCompleted() && !local.isCompleted())
                     StatisticsService.reportEvent(StatisticsConstants.GTASKS_TASK_COMPLETED);
             }
         } else { // Set default importance and reminders for remotely created tasks
@@ -394,7 +410,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
     }
 
     private void mergeDates(Task remote, Task local) {
-        if(remote.hasDueDate() && local.hasDueTime()) {
+        if (remote.hasDueDate() && local.hasDueTime()) {
             Date newDate = new Date(remote.getValue(Task.DUE_DATE));
             Date oldDate = new Date(local.getValue(Task.DUE_DATE));
             newDate.setHours(oldDate.getHours());
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java
index 8e6731aae..8a1bfcfd0 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java
@@ -5,19 +5,18 @@
  */
 package com.todoroo.astrid.gtasks.sync;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-
 import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.gtasks.GtasksMetadata;
 import com.todoroo.astrid.sync.SyncContainer;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+
 /**
  * RTM Task Container
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class GtasksTaskContainer extends SyncContainer {
 
@@ -31,7 +30,7 @@ public class GtasksTaskContainer extends SyncContainer {
         this.task = task;
         this.metadata = metadata;
         this.gtaskMetadata = gtaskMetadata;
-        if(this.gtaskMetadata == null) {
+        if (this.gtaskMetadata == null) {
             this.gtaskMetadata = GtasksMetadata.createEmptyMetadata(task.getId());
         }
     }
@@ -40,15 +39,15 @@ public class GtasksTaskContainer extends SyncContainer {
         this.task = task;
         this.metadata = metadata;
 
-        for(Iterator<Metadata> iterator = metadata.iterator(); iterator.hasNext(); ) {
+        for (Iterator<Metadata> iterator = metadata.iterator(); iterator.hasNext(); ) {
             Metadata item = iterator.next();
-            if(GtasksMetadata.METADATA_KEY.equals(item.getValue(Metadata.KEY))) {
+            if (GtasksMetadata.METADATA_KEY.equals(item.getValue(Metadata.KEY))) {
                 gtaskMetadata = item;
                 iterator.remove();
                 // don't break, could be multiple
             }
         }
-        if(this.gtaskMetadata == null) {
+        if (this.gtaskMetadata == null) {
             this.gtaskMetadata = GtasksMetadata.createEmptyMetadata(task.getId());
         }
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
index 29b2129b6..d1fd26b6e 100644
--- a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
+++ b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
@@ -35,25 +35,32 @@ import com.twofortyfouram.SharedResources;
  * Activity to edit alerts from Locale
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public final class LocaleEditAlerts extends ListActivity {
 
     // --- locale constants
 
-    /** key name for filter title in bundle */
+    /**
+     * key name for filter title in bundle
+     */
     @SuppressWarnings("nls")
     public static final String KEY_FILTER_TITLE = "title";
 
-    /** key name for filter SQL in bundle */
+    /**
+     * key name for filter SQL in bundle
+     */
     @SuppressWarnings("nls")
     public static final String KEY_SQL = "sql";
 
-    /** key name for filter content-values in bundle */
+    /**
+     * key name for filter content-values in bundle
+     */
     @SuppressWarnings("nls")
     public static final String KEY_VALUES = "val";
 
-    /** key name for interval (integer, # of seconds) */
+    /**
+     * key name for interval (integer, # of seconds)
+     */
     @SuppressWarnings("nls")
     public static final String KEY_INTERVAL = "interval";
 
@@ -72,8 +79,8 @@ public final class LocaleEditAlerts extends ListActivity {
     /**
      * Intervals in seconds
      */
-    public static final int[] INTERVALS = new int[] {
-        3600, 6 * 3600, 12 * 3600, 24 * 3600, 3 * 24 * 3600, 7 * 24 * 3600
+    public static final int[] INTERVALS = new int[]{
+            3600, 6 * 3600, 12 * 3600, 24 * 3600, 3 * 24 * 3600, 7 * 24 * 3600
     };
 
     /**
@@ -94,13 +101,15 @@ public final class LocaleEditAlerts extends ListActivity {
     /**
      * Flag boolean that can only be set to true via the "Don't Save" menu item in {@link #onMenuItemSelected(int, MenuItem)}. If
      * true, then this {@code Activity} should return {@link Activity#RESULT_CANCELED} in {@link #finish()}.
-     * <p>
+     * <p/>
      * There is no need to save/restore this field's state when the {@code Activity} is paused.
      */
     private boolean isCancelled = false;
     private boolean isRemoved = false;
 
-    /** Called when the activity is first created. */
+    /**
+     * Called when the activity is first created.
+     */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         setTheme(R.style.Theme);
@@ -135,18 +144,16 @@ public final class LocaleEditAlerts extends ListActivity {
              * if savedInstanceState == null, then we are entering the Activity directly from Locale and we need to check whether the
              * Intent has forwarded a Bundle extra (e.g. whether we editing an old setting or creating a new one)
              */
-            if (savedInstanceState == null)
-            {
+            if (savedInstanceState == null) {
                 final Bundle forwardedBundle = getIntent().getBundleExtra(com.twofortyfouram.Intent.EXTRA_BUNDLE);
 
                 /*
                  * the forwardedBundle would be null if this was a new setting
                  */
-                if (forwardedBundle != null)
-                {
+                if (forwardedBundle != null) {
                     final int intervalValue = forwardedBundle.getInt(KEY_INTERVAL, INTERVALS[interval.getSelectedItemPosition()]);
-                    for(int i = 0; i < INTERVALS.length; i++) {
-                        if(intervalValue == INTERVALS[i]) {
+                    for (int i = 0; i < INTERVALS.length; i++) {
+                        if (intervalValue == INTERVALS[i]) {
                             interval.setSelection(i);
                             break;
                         }
@@ -164,17 +171,17 @@ public final class LocaleEditAlerts extends ListActivity {
         adapter = new FilterAdapter(this, getListView(), R.layout.filter_adapter_row, true) {
             @Override
             public void onReceiveFilter(FilterListItem item) {
-                if(adapter.getSelection() != null || finalSelection == null)
+                if (adapter.getSelection() != null || finalSelection == null)
                     return;
-                if(item instanceof Filter) {
-                    if(finalSelection.equals(((Filter)item).getSqlQuery()))
+                if (item instanceof Filter) {
+                    if (finalSelection.equals(((Filter) item).getSqlQuery()))
                         adapter.setSelection(item);
-                } else if(item instanceof FilterCategory) {
-                    Filter[] filters = ((FilterCategory)item).children;
-                    if(filters == null)
+                } else if (item instanceof FilterCategory) {
+                    Filter[] filters = ((FilterCategory) item).children;
+                    if (filters == null)
                         return;
-                    for(Filter filter : filters)
-                        if(finalSelection.equals(filter.getSqlQuery())) {
+                    for (Filter filter : filters)
+                        if (finalSelection.equals(filter.getSqlQuery())) {
                             adapter.setSelection(filter);
                             break;
                         }
@@ -186,15 +193,15 @@ public final class LocaleEditAlerts extends ListActivity {
         setListAdapter(adapter);
 
         // check for plugin
-        if(!PluginServices.getAddOnService().hasLocalePlugin()) {
+        if (!PluginServices.getAddOnService().hasLocalePlugin()) {
             isRemoved = true;
             new AlertDialog.Builder(this)
-            .setTitle(R.string.DLG_information_title)
-            .setMessage(R.string.locale_plugin_required)
-            .setCancelable(false)
-            .setPositiveButton(android.R.string.ok,
-                    AddOnActivity.createAddOnClicker(LocaleEditAlerts.this, true))
-            .show();
+                    .setTitle(R.string.DLG_information_title)
+                    .setMessage(R.string.locale_plugin_required)
+                    .setCancelable(false)
+                    .setPositiveButton(android.R.string.ok,
+                            AddOnActivity.createAddOnClicker(LocaleEditAlerts.this, true))
+                    .show();
             StatisticsService.reportEvent(StatisticsConstants.LOCALE_EDIT_ALERTS_NO_PLUGIN);
         } else {
             StatisticsService.reportEvent(StatisticsConstants.LOCALE_EDIT_ALERTS);
@@ -212,26 +219,21 @@ public final class LocaleEditAlerts extends ListActivity {
      * sort of result should be returned to <i>Locale</i>.
      */
     @Override
-    public void finish()
-    {
-        if(isRemoved)
+    public void finish() {
+        if (isRemoved)
             setResult(com.twofortyfouram.Intent.RESULT_REMOVE);
         else if (isCancelled)
             setResult(RESULT_CANCELED);
-        else
-        {
+        else {
             final FilterListItem selected = adapter.getSelection();
             final int intervalIndex = interval.getSelectedItemPosition();
 
-            if (selected == null)
-            {
+            if (selected == null) {
                 /*
                  * If nothing is selected, return as if user had canceled
                  */
                 setResult(RESULT_CANCELED);
-            }
-            else
-            {
+            } else {
                 /*
                  * This is the return Intent, into which we'll put all the required extras
                  */
@@ -248,7 +250,7 @@ public final class LocaleEditAlerts extends ListActivity {
                 Filter filterItem = (Filter) selected;
                 storeAndForwardExtras.putString(KEY_FILTER_TITLE, filterItem.title);
                 storeAndForwardExtras.putString(KEY_SQL, filterItem.getSqlQuery());
-                if(filterItem.valuesForNewTasks != null)
+                if (filterItem.valuesForNewTasks != null)
                     storeAndForwardExtras.putString(KEY_VALUES, AndroidUtilities.contentValuesToSerializedString(filterItem.valuesForNewTasks));
                 storeAndForwardExtras.putInt(KEY_INTERVAL, INTERVALS[intervalIndex]);
 
@@ -300,8 +302,7 @@ public final class LocaleEditAlerts extends ListActivity {
      * {@inheritDoc}
      */
     @Override
-    public boolean onCreateOptionsMenu(final Menu menu)
-    {
+    public boolean onCreateOptionsMenu(final Menu menu) {
         super.onCreateOptionsMenu(menu);
 
         final PackageManager manager = getPackageManager();
@@ -310,10 +311,10 @@ public final class LocaleEditAlerts extends ListActivity {
          * We are dynamically loading resources from Locale's APK. This will only work if Locale is actually installed
          */
         menu.add(0, MENU_DONT_SAVE, 0, SharedResources.getTextResource(manager, SharedResources.STRING_MENU_DONTSAVE))
-            .setIcon(SharedResources.getDrawableResource(manager, SharedResources.DRAWABLE_MENU_DONTSAVE)).getItemId();
+                .setIcon(SharedResources.getDrawableResource(manager, SharedResources.DRAWABLE_MENU_DONTSAVE)).getItemId();
 
         menu.add(0, MENU_SAVE, 0, SharedResources.getTextResource(manager, SharedResources.STRING_MENU_SAVE))
-            .setIcon(SharedResources.getDrawableResource(manager, SharedResources.DRAWABLE_MENU_SAVE)).getItemId();
+                .setIcon(SharedResources.getDrawableResource(manager, SharedResources.DRAWABLE_MENU_SAVE)).getItemId();
 
         return true;
     }
@@ -322,17 +323,13 @@ public final class LocaleEditAlerts extends ListActivity {
      * {@inheritDoc}
      */
     @Override
-    public boolean onMenuItemSelected(final int featureId, final MenuItem item)
-    {
-        switch (item.getItemId())
-        {
-            case MENU_SAVE:
-            {
+    public boolean onMenuItemSelected(final int featureId, final MenuItem item) {
+        switch (item.getItemId()) {
+            case MENU_SAVE: {
                 finish();
                 return true;
             }
-            case MENU_DONT_SAVE:
-            {
+            case MENU_DONT_SAVE: {
                 isCancelled = true;
                 finish();
                 return true;
diff --git a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java
index 8a2367a56..95be919df 100644
--- a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java
+++ b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java
@@ -31,12 +31,12 @@ import com.todoroo.astrid.utility.Constants;
  * Receiver is activated when Locale conditions are triggered
  *
  * @author timsu
- *
  */
 public class LocaleReceiver extends BroadcastReceiver {
 
     /**
      * Create a preference key for storing / retrieving last interval time
+     *
      * @param filterTitle
      * @param interval
      * @return
@@ -53,7 +53,7 @@ public class LocaleReceiver extends BroadcastReceiver {
 
         try {
             if (com.twofortyfouram.Intent.ACTION_FIRE_SETTING.equals(intent.getAction())) {
-                if(!PluginServices.getAddOnService().hasLocalePlugin())
+                if (!PluginServices.getAddOnService().hasLocalePlugin())
                     return;
 
                 final Bundle forwardedBundle = intent.getBundleExtra(com.twofortyfouram.Intent.EXTRA_BUNDLE);
@@ -61,18 +61,18 @@ public class LocaleReceiver extends BroadcastReceiver {
                 final String title = forwardedBundle.getString(LocaleEditAlerts.KEY_FILTER_TITLE);
                 final String sql = forwardedBundle.getString(LocaleEditAlerts.KEY_SQL);
                 final String values = forwardedBundle.getString(LocaleEditAlerts.KEY_VALUES);
-                final int interval = forwardedBundle.getInt(LocaleEditAlerts.KEY_INTERVAL, 24*3600);
+                final int interval = forwardedBundle.getInt(LocaleEditAlerts.KEY_INTERVAL, 24 * 3600);
 
-                if(TextUtils.isEmpty(title) || TextUtils.isEmpty(sql) ||
+                if (TextUtils.isEmpty(title) || TextUtils.isEmpty(sql) ||
                         sql.contains("--") || sql.contains(";") || interval == 0)
                     return;
 
                 // check if we've already made a notification recently
                 String preferenceKey = makePreferenceKey(title, interval);
                 long lastNotifyTime = Preferences.getLong(preferenceKey, 0);
-                if(DateUtilities.now() - lastNotifyTime < interval * 1000L) {
+                if (DateUtilities.now() - lastNotifyTime < interval * 1000L) {
                     Log.i("astrid-locale-rx", title + ": Too soon, need " + (interval
-                            - (DateUtilities.now() - lastNotifyTime)/1000) + " more seconds");
+                            - (DateUtilities.now() - lastNotifyTime) / 1000) + " more seconds");
                     return;
                 }
 
@@ -82,10 +82,10 @@ public class LocaleReceiver extends BroadcastReceiver {
                 TodorooCursor<Task> cursor = PluginServices.getTaskService().fetchFiltered(
                         sql, null, Task.ID);
                 try {
-                    if(cursor.getCount() == 0)
+                    if (cursor.getCount() == 0)
                         return;
 
-                    if(values != null)
+                    if (values != null)
                         filter.valuesForNewTasks = AndroidUtilities.contentValuesFromSerializedString(values);
 
                     Resources r = context.getResources();
diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
index d7723a474..dcbcb2507 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
@@ -5,16 +5,6 @@
  */
 package com.todoroo.astrid.notes;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -84,6 +74,16 @@ import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.timers.TimerActionControlSet.TimerActionListener;
 import com.todoroo.astrid.utility.ResourceDrawableCache;
 
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
 import edu.mit.mobile.android.imagecache.ImageCache;
 
 public class EditNoteActivity extends LinearLayout implements TimerActionListener {
@@ -92,12 +92,18 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
 
     private Task task;
 
-    @Autowired ActFmSyncService actFmSyncService;
-    @Autowired ActFmPreferenceService actFmPreferenceService;
-    @Autowired MetadataService metadataService;
-    @Autowired UserActivityDao userActivityDao;
-    @Autowired TaskService taskService;
-    @Autowired TaskDao taskDao;
+    @Autowired
+    ActFmSyncService actFmSyncService;
+    @Autowired
+    ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    MetadataService metadataService;
+    @Autowired
+    UserActivityDao userActivityDao;
+    @Autowired
+    TaskService taskService;
+    @Autowired
+    TaskDao taskDao;
 
     private final ArrayList<NoteOrUpdate> items = new ArrayList<NoteOrUpdate>();
     private EditText commentField;
@@ -125,7 +131,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
     private final SyncMessageCallback callback = new SyncMessageCallback() {
         @Override
         public void runOnSuccess() {
-            synchronized(this) {
+            synchronized (this) {
                 if (activity != null) {
                     activity.runOnUiThread(new Runnable() {
                         @Override
@@ -143,6 +149,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
                 }
             }
         }
+
         @Override
         public void runOnErrors(List<JSONArray> errors) {/**/}
     };
@@ -153,6 +160,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
 
     public interface UpdatesChangedListener {
         public void updatesChanged();
+
         public void commentAdded();
     }
 
@@ -193,32 +201,31 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
         task = PluginServices.getTaskService().fetchById(id, Task.NOTES, Task.ID, Task.UUID, Task.TITLE, Task.HISTORY_FETCH_DATE, Task.HISTORY_HAS_MORE, Task.USER_ACTIVITIES_PUSHED_AT, Task.ATTACHMENTS_PUSHED_AT);
     }
 
-    public void loadViewForTaskID(long t){
+    public void loadViewForTaskID(long t) {
         try {
             fetchTask(t);
         } catch (SQLiteException e) {
             StartupService.handleSQLiteError(ContextManager.getContext(), e);
         }
-        if(task == null) {
+        if (task == null) {
             return;
         }
         setUpInterface();
         setUpListAdapter();
 
-        if(actFmPreferenceService.isLoggedIn()) {
+        if (actFmPreferenceService.isLoggedIn()) {
             long pushedAt = task.getValue(Task.USER_ACTIVITIES_PUSHED_AT);
-            if(DateUtilities.now() - pushedAt > DateUtilities.ONE_HOUR / 2) {
+            if (DateUtilities.now() - pushedAt > DateUtilities.ONE_HOUR / 2) {
                 refreshData();
             } else {
                 loadingText.setText(R.string.ENA_no_comments);
-                if(items.size() == 0)
+                if (items.size() == 0)
                     loadingText.setVisibility(View.VISIBLE);
             }
         }
     }
 
 
-
     // --- UI preparation
 
     private void setUpInterface() {
@@ -235,8 +242,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
                     if (hasFocus) {
                         timerView.setVisibility(View.GONE);
                         commentButton.setVisibility(View.VISIBLE);
-                    }
-                    else {
+                    } else {
                         timerView.setVisibility(View.VISIBLE);
                         commentButton.setVisibility(View.GONE);
                     }
@@ -260,6 +266,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
                 //
             }
+
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 //
@@ -269,7 +276,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
         commentField.setOnEditorActionListener(new OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView view, int actionId, KeyEvent event) {
-                if(actionId == EditorInfo.IME_NULL && commentField.getText().length() > 0) {
+                if (actionId == EditorInfo.IME_NULL && commentField.getText().length() > 0) {
                     addComment();
                     return true;
                 }
@@ -301,7 +308,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
                 respondToPicture = true;
             }
         });
-        if(!TextUtils.isEmpty(task.getValue(Task.NOTES))) {
+        if (!TextUtils.isEmpty(task.getValue(Task.NOTES))) {
             TextView notes = new TextView(getContext());
             notes.setLinkTextColor(Color.rgb(100, 160, 255));
             notes.setTextSize(18);
@@ -333,7 +340,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
                                 NoteMetadata.METADATA_KEY)));
         try {
             Metadata metadata = new Metadata();
-            for(notes.moveToFirst(); !notes.isAfterLast(); notes.moveToNext()) {
+            for (notes.moveToFirst(); !notes.isAfterLast(); notes.moveToNext()) {
                 metadata.readFromCursor(notes);
                 items.add(NoteOrUpdate.fromMetadata(metadata));
             }
@@ -348,7 +355,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
             UserActivity update = new UserActivity();
             History history = new History();
             User user = new User();
-            for(updates.moveToFirst(); !updates.isAfterLast(); updates.moveToNext()) {
+            for (updates.moveToFirst(); !updates.isAfterLast(); updates.moveToNext()) {
                 update.clear();
                 user.clear();
 
@@ -367,7 +374,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
                     noa = NoteOrUpdate.fromUpdateOrHistory(activity, null, history, user, linkColor);
                     historyCount++;
                 }
-                if(noa != null)
+                if (noa != null)
                     items.add(noa);
             }
         } finally {
@@ -377,7 +384,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
         Collections.sort(items, new Comparator<NoteOrUpdate>() {
             @Override
             public int compare(NoteOrUpdate a, NoteOrUpdate b) {
-                if(a.createdAt < b.createdAt)
+                if (a.createdAt < b.createdAt)
                     return 1;
                 else if (a.createdAt == b.createdAt)
                     return 0;
@@ -407,8 +414,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
                 }
             });
             this.addView(loadMore);
-        }
-        else if (items.size() == 0) {
+        } else if (items.size() == 0) {
             TextView noUpdates = new TextView(getContext());
             noUpdates.setText(R.string.TEA_no_activity);
             noUpdates.setTextColor(activity.getResources().getColor(R.color.task_edit_deadline_gray));
@@ -426,26 +432,29 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
     }
 
 
-
     public View getUpdateNotes(NoteOrUpdate note, ViewGroup parent) {
-        View convertView = ((Activity)getContext()).getLayoutInflater().inflate(
+        View convertView = ((Activity) getContext()).getLayoutInflater().inflate(
                 R.layout.update_adapter_row, parent, false);
 
         bindView(convertView, note);
         return convertView;
     }
 
-    /** Helper method to set the contents and visibility of each field */
+    /**
+     * Helper method to set the contents and visibility of each field
+     */
     public synchronized void bindView(View view, NoteOrUpdate item) {
         // picture
-        final AsyncImageView pictureView = (AsyncImageView)view.findViewById(R.id.picture); {
+        final AsyncImageView pictureView = (AsyncImageView) view.findViewById(R.id.picture);
+        {
             pictureView.setDefaultImageDrawable(ResourceDrawableCache.getImageDrawableFromId(resources, R.drawable.icn_default_person_image));
             pictureView.setUrl(item.picture);
 
         }
 
         // name
-        final TextView nameView = (TextView)view.findViewById(R.id.title); {
+        final TextView nameView = (TextView) view.findViewById(R.id.title);
+        {
             nameView.setText(item.title);
             if (NameMaps.TABLE_ID_HISTORY.equals(item.type))
                 nameView.setTextColor(grayColor);
@@ -455,7 +464,8 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
         }
 
         // date
-        final TextView date = (TextView)view.findViewById(R.id.date); {
+        final TextView date = (TextView) view.findViewById(R.id.date);
+        {
             CharSequence dateString = DateUtils.getRelativeTimeSpanString(item.createdAt,
                     DateUtilities.now(), DateUtils.MINUTE_IN_MILLIS,
                     DateUtils.FORMAT_ABBREV_RELATIVE);
@@ -463,13 +473,14 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
         }
 
         // picture
-        final AsyncImageView commentPictureView = (AsyncImageView)view.findViewById(R.id.comment_picture); {
+        final AsyncImageView commentPictureView = (AsyncImageView) view.findViewById(R.id.comment_picture);
+        {
             UpdateAdapter.setupImagePopupForCommentView(view, commentPictureView, item.pictureThumb, item.pictureFull, item.commentBitmap, item.title.toString(), fragment, imageCache);
         }
     }
 
     public void refreshData() {
-        if(!task.containsNonNullValue(Task.UUID)) {
+        if (!task.containsNonNullValue(Task.UUID)) {
             return;
         }
 
@@ -565,9 +576,9 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
         }
 
         public static NoteOrUpdate fromMetadata(Metadata m) {
-            if(!m.containsNonNullValue(NoteMetadata.THUMBNAIL))
+            if (!m.containsNonNullValue(NoteMetadata.THUMBNAIL))
                 m.setValue(NoteMetadata.THUMBNAIL, ""); //$NON-NLS-1$
-            if(!m.containsNonNullValue(NoteMetadata.COMMENT_PICTURE))
+            if (!m.containsNonNullValue(NoteMetadata.COMMENT_PICTURE))
                 m.setValue(NoteMetadata.COMMENT_PICTURE, ""); //$NON-NLS-1$
             Spanned title = Html.fromHtml(String.format("%s\n%s", m.getValue(NoteMetadata.TITLE), m.getValue(NoteMetadata.BODY))); //$NON-NLS-1$
             return new NoteOrUpdate(m.getValue(NoteMetadata.THUMBNAIL),
@@ -669,7 +680,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
                 }
             };
 
-            return (ActFmCameraModule.activityResult((Activity)getContext(),
+            return (ActFmCameraModule.activityResult((Activity) getContext(),
                     requestCode, resultCode, data, callback));
         } else {
             return false;
diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NoteMetadata.java b/astrid/plugin-src/com/todoroo/astrid/notes/NoteMetadata.java
index 154121d66..66f262761 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/NoteMetadata.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/NoteMetadata.java
@@ -12,29 +12,42 @@ import com.todoroo.astrid.data.Metadata;
  * Metadata entry for a note displayed by the Notes plugin.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class NoteMetadata {
 
-    /** metadata key */
+    /**
+     * metadata key
+     */
     public static final String METADATA_KEY = "note"; //$NON-NLS-1$
 
-    /** note body */
+    /**
+     * note body
+     */
     public static final StringProperty BODY = Metadata.VALUE1;
 
-    /** note description (title, date, from, etc) */
+    /**
+     * note description (title, date, from, etc)
+     */
     public static final StringProperty TITLE = Metadata.VALUE2;
 
-    /** note thumbnail URL */
+    /**
+     * note thumbnail URL
+     */
     public static final StringProperty THUMBNAIL = Metadata.VALUE3;
 
-    /** note external id (use for your own purposes) */
+    /**
+     * note external id (use for your own purposes)
+     */
     public static final StringProperty COMMENT_PICTURE = Metadata.VALUE6;
 
-    /** note external provider (use for your own purposes) */
+    /**
+     * note external provider (use for your own purposes)
+     */
     public static final StringProperty EXT_PROVIDER = Metadata.VALUE4;
 
-    /** note external id (use for your own purposes) */
+    /**
+     * note external id (use for your own purposes)
+     */
     public static final StringProperty EXT_ID = Metadata.VALUE5;
 
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDecorationExposer.java b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDecorationExposer.java
index 50df6d27b..c7ff000b1 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDecorationExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDecorationExposer.java
@@ -20,22 +20,21 @@ import com.todoroo.astrid.data.Task;
  * Exposes {@link TaskDecoration} for timers
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class NotesDecorationExposer implements TaskDecorationExposer {
 
     @Override
     public TaskDecoration expose(Task task) {
-        if(Preferences.getBoolean(R.string.p_showNotes, false))
+        if (Preferences.getBoolean(R.string.p_showNotes, false))
             return null;
-        if(task == null || !NotesPlugin.hasNotes(task))
+        if (task == null || !NotesPlugin.hasNotes(task))
             return null;
 
         Intent intent = new Intent(ContextManager.getContext(), EditNoteActivity.class);
         intent.setAction(EditNoteActivity.class.getName());
         intent.putExtra(EditNoteActivity.EXTRA_TASK_ID, task.getId());
-        PendingIntent pi  = PendingIntent.getActivity(ContextManager.getContext(),
-                (int)task.getId(), intent, PendingIntent.FLAG_UPDATE_CURRENT);
+        PendingIntent pi = PendingIntent.getActivity(ContextManager.getContext(),
+                (int) task.getId(), intent, PendingIntent.FLAG_UPDATE_CURRENT);
 
         TaskDecoration decoration;
         RemoteViews remoteViews = new RemoteViews(ContextManager.getContext().getPackageName(),
diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java
index 80a1dc559..38eecae57 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java
@@ -26,7 +26,6 @@ import com.todoroo.astrid.data.Task;
  * Exposes Task Detail for notes
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class NotesDetailExposer extends BroadcastReceiver {
 
@@ -36,11 +35,11 @@ public class NotesDetailExposer extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         // get tags associated with this task
         long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1);
-        if(taskId == -1)
+        if (taskId == -1)
             return;
 
         String taskDetail = getTaskDetails(taskId);
-        if(taskDetail == null)
+        if (taskDetail == null)
             return;
 
         // transmit
@@ -53,18 +52,18 @@ public class NotesDetailExposer extends BroadcastReceiver {
 
     @SuppressWarnings("nls")
     public String getTaskDetails(long id) {
-        if(!Preferences.getBoolean(R.string.p_showNotes, false))
+        if (!Preferences.getBoolean(R.string.p_showNotes, false))
             return null;
 
         Task task = PluginServices.getTaskService().fetchById(id, Task.ID, Task.NOTES);
-        if(task == null)
+        if (task == null)
             return null;
 
         StringBuilder notesBuilder = new StringBuilder();
 
         String notes = task.getValue(Task.NOTES);
-        if(!TextUtils.isEmpty(notes)) {
-            if(notes.length() > NOTE_MAX) {
+        if (!TextUtils.isEmpty(notes)) {
+            if (notes.length() > NOTE_MAX) {
                 int lastSpace = notes.lastIndexOf(' ', NOTE_MAX);
                 notes = notes.substring(0, Math.max(lastSpace, NOTE_MAX - 20)) + "...";
             }
@@ -77,10 +76,10 @@ public class NotesDetailExposer extends BroadcastReceiver {
                                 NoteMetadata.METADATA_KEY)).orderBy(Order.asc(Metadata.CREATION_DATE)));
         Metadata metadata = new Metadata();
         try {
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 metadata.readFromCursor(cursor);
 
-                if(notesBuilder.length() > 0)
+                if (notesBuilder.length() > 0)
                     notesBuilder.append("\n");
                 notesBuilder.append("<b>").append(metadata.getValue(NoteMetadata.TITLE)).append("</b>\n");
                 notesBuilder.append(metadata.getValue(NoteMetadata.BODY));
@@ -89,7 +88,7 @@ public class NotesDetailExposer extends BroadcastReceiver {
             cursor.close();
         }
 
-        if(notesBuilder.length() == 0)
+        if (notesBuilder.length() == 0)
             return null;
 
         return "<img src='silk_note'/> " + notesBuilder; //$NON-NLS-1$
diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NotesPlugin.java b/astrid/plugin-src/com/todoroo/astrid/notes/NotesPlugin.java
index 313ef996f..52d668d1d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/NotesPlugin.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/NotesPlugin.java
@@ -37,10 +37,10 @@ public class NotesPlugin extends BroadcastReceiver {
      * @return
      */
     public static boolean hasNotes(Task task) {
-        if(task.containsNonNullValue(Task.NOTES) && !TextUtils.isEmpty(task.getValue(Task.NOTES)))
+        if (task.containsNonNullValue(Task.NOTES) && !TextUtils.isEmpty(task.getValue(Task.NOTES)))
             return true;
 
-        if(PluginServices.getMetadataService().hasMetadata(task.getId(), NoteMetadata.METADATA_KEY))
+        if (PluginServices.getMetadataService().hasMetadata(task.getId(), NoteMetadata.METADATA_KEY))
             return true;
 
         return false;
diff --git a/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxControlSet.java b/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxControlSet.java
index 975ee6f9a..48a80a3f9 100644
--- a/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxControlSet.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.opencrx;
 
-import java.util.ArrayList;
-
 import android.app.Activity;
 import android.util.Log;
 import android.view.View;
@@ -34,28 +32,34 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.ui.PopupControlSet;
 
+import java.util.ArrayList;
+
 /**
  * Control Set for managing contact/creator assignments in OpenCRX
  *
  * @author Andrey Marchenko <igendou@gmail.com>
- *
  */
 public class OpencrxControlSet extends PopupControlSet {
 
     /**
      * Class that represents OpenCRX ActivityCreator. Duplicates some functionality of OpenCRX plugin.
-     *
      */
     @SuppressWarnings("unused")
     private static class OpencrxActivityCreator {
-        /** type*/
+        /**
+         * type
+         */
         public static final String TYPE = "opencrx-creator"; //$NON-NLS-1$
 
-        /** hashed creator id in opencrx */
+        /**
+         * hashed creator id in opencrx
+         */
         public static final LongProperty REMOTE_ID = new LongProperty(StoreObject.TABLE,
                 StoreObject.ITEM.name);
 
-        /** creator name */
+        /**
+         * creator name
+         */
         public static final StringProperty NAME = new StringProperty(StoreObject.TABLE,
                 StoreObject.VALUE1.name);
 
@@ -71,9 +75,9 @@ public class OpencrxControlSet extends PopupControlSet {
 
         private final String crxId;
 
-        public OpencrxActivityCreator (StoreObject creatorData) {
-            this(creatorData.getValue(REMOTE_ID),creatorData.getValue(NAME),
-                   creatorData.containsValue(CRX_ID) ? creatorData.getValue(CRX_ID) : ""); //$NON-NLS-1$
+        public OpencrxActivityCreator(StoreObject creatorData) {
+            this(creatorData.getValue(REMOTE_ID), creatorData.getValue(NAME),
+                    creatorData.containsValue(CRX_ID) ? creatorData.getValue(CRX_ID) : ""); //$NON-NLS-1$
         }
 
         public OpencrxActivityCreator(long id, String name, String crxId) {
@@ -81,6 +85,7 @@ public class OpencrxControlSet extends PopupControlSet {
             this.name = name;
             this.crxId = crxId;
         }
+
         public long getId() {
             return id;
         }
@@ -101,25 +106,32 @@ public class OpencrxControlSet extends PopupControlSet {
 
     /**
      * Class that represents OpenCRX Contact. Duplicates some functionality of OpenCRX plugin.
-     *
      */
     @SuppressWarnings("unused")
     private static class OpencrxContact {
         public static final String TYPE = "opencrx-contacts"; //$NON-NLS-1$
 
-        /** hash contact id in opencrx */
+        /**
+         * hash contact id in opencrx
+         */
         public static final LongProperty REMOTE_ID = new LongProperty(StoreObject.TABLE,
                 StoreObject.ITEM.name);
 
-        /** contact first name */
+        /**
+         * contact first name
+         */
         public static final StringProperty FIRST_NAME = new StringProperty(StoreObject.TABLE,
                 StoreObject.VALUE1.name);
 
-        /** contact last name */
+        /**
+         * contact last name
+         */
         public static final StringProperty LAST_NAME = new StringProperty(StoreObject.TABLE,
                 StoreObject.VALUE2.name);
 
-        /** id in OpenCRX as string */
+        /**
+         * id in OpenCRX as string
+         */
         public static final StringProperty CRX_ID = new StringProperty(StoreObject.TABLE,
                 StoreObject.VALUE3.name);
 
@@ -134,7 +146,7 @@ public class OpencrxControlSet extends PopupControlSet {
         private final String crxId;
 
         public OpencrxContact(long id, String email, String firstname,
-                String lastname, String crxId) {
+                              String lastname, String crxId) {
             this.id = id;
             this.email = email;
             this.firstname = firstname;
@@ -142,22 +154,26 @@ public class OpencrxControlSet extends PopupControlSet {
             this.crxId = crxId;
         }
 
-        public OpencrxContact(StoreObject userData){
-            this(userData.getValue(REMOTE_ID), "", userData.getValue(FIRST_NAME), userData.getValue(LAST_NAME), userData.getValue(CRX_ID) ); //$NON-NLS-1$
+        public OpencrxContact(StoreObject userData) {
+            this(userData.getValue(REMOTE_ID), "", userData.getValue(FIRST_NAME), userData.getValue(LAST_NAME), userData.getValue(CRX_ID)); //$NON-NLS-1$
         }
 
         public String getEmail() {
             return email;
         }
+
         public String getFirstname() {
             return firstname;
         }
+
         public String getLastname() {
             return lastname;
         }
+
         public String getCrxId() {
             return crxId;
         }
+
         public long getId() {
             return id;
         }
@@ -210,7 +226,7 @@ public class OpencrxControlSet extends PopupControlSet {
 
     @Override
     protected void afterInflate() {
-      //View view = LayoutInflater.from(activity).inflate(R.layout.opencrx_control, parent, true);
+        //View view = LayoutInflater.from(activity).inflate(R.layout.opencrx_control, parent, true);
 
         this.assignedToSelector = (Spinner) getView().findViewById(R.id.opencrx_TEA_task_assign);
         TextView emptyView = new TextView(activity);
@@ -228,22 +244,22 @@ public class OpencrxControlSet extends PopupControlSet {
 
 
         Metadata metadata = getTaskMetadata(model.getId());
-        if(metadata == null)
+        if (metadata == null)
             metadata = OpencrxCoreUtils.INSTANCE.newMetadata(model.getId());
 
         // Fill the dashboard-spinner and set the current dashboard
         long dashboardId = OpencrxCoreUtils.INSTANCE.getDefaultCreator();
-        if(metadata.containsNonNullValue(OpencrxCoreUtils.ACTIVITY_CREATOR_ID))
+        if (metadata.containsNonNullValue(OpencrxCoreUtils.ACTIVITY_CREATOR_ID))
             dashboardId = metadata.getValue(OpencrxCoreUtils.ACTIVITY_CREATOR_ID);
 
         StoreObject[] dashboardsData = readStoreObjects(OpencrxActivityCreator.TYPE);
         dashboards = new ArrayList<OpencrxActivityCreator>(dashboardsData.length);
         int dashboardSpinnerIndex = -1;
 
-        for (int i=0;i<dashboardsData.length;i++) {
+        for (int i = 0; i < dashboardsData.length; i++) {
             OpencrxActivityCreator dashboard = new OpencrxActivityCreator(dashboardsData[i]);
             dashboards.add(dashboard);
-            if(dashboard.getId() == dashboardId) {
+            if (dashboard.getId() == dashboardId) {
                 dashboardSpinnerIndex = i;
             }
         }
@@ -255,7 +271,7 @@ public class OpencrxControlSet extends PopupControlSet {
                 android.R.layout.simple_spinner_item, dashboards);
         dashAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         creatorSelector.setAdapter(dashAdapter);
-        creatorSelector.setSelection(dashboardSpinnerIndex+1);
+        creatorSelector.setSelection(dashboardSpinnerIndex + 1);
 
         ArrayAdapter<OpencrxActivityCreator> creatorAdapterTextInput = new ArrayAdapter<OpencrxActivityCreator>(activity,
                 android.R.layout.simple_spinner_item, dashboards);
@@ -264,16 +280,16 @@ public class OpencrxControlSet extends PopupControlSet {
 
             @Override
             public void onItemClick(AdapterView<?> adapter, View view, int position,
-                    long id) {
+                                    long id) {
                 OpencrxActivityCreator creatorInput = (OpencrxActivityCreator) adapter.getItemAtPosition(position);
 
                 if (creatorInput == null) return;
 
                 int selectedIndex = creatorSelector.getSelectedItemPosition();
 
-                for (int i = 0; i < creatorSelector.getAdapter().getCount(); ++i){
+                for (int i = 0; i < creatorSelector.getAdapter().getCount(); ++i) {
                     OpencrxActivityCreator current = (OpencrxActivityCreator) creatorSelector.getAdapter().getItem(i);
-                    if (current != null && current.getId() == creatorInput.getId()){
+                    if (current != null && current.getId() == creatorInput.getId()) {
                         selectedIndex = i;
                         break;
                     }
@@ -285,13 +301,13 @@ public class OpencrxControlSet extends PopupControlSet {
 
         // Assigned user
         long responsibleId = OpencrxCoreUtils.INSTANCE.getDefaultAssignedUser();
-        if (metadata.containsNonNullValue(OpencrxCoreUtils.ACTIVITY_ASSIGNED_TO_ID)){
+        if (metadata.containsNonNullValue(OpencrxCoreUtils.ACTIVITY_ASSIGNED_TO_ID)) {
             responsibleId = metadata.getValue(OpencrxCoreUtils.ACTIVITY_ASSIGNED_TO_ID);
         }
 
         StoreObject[] usersData = readStoreObjects(OpencrxContact.TYPE);
         this.users = new ArrayList<OpencrxContact>();
-        for (StoreObject user : usersData){
+        for (StoreObject user : usersData) {
             this.users.add(new OpencrxContact(user));
         }
 
@@ -302,8 +318,8 @@ public class OpencrxControlSet extends PopupControlSet {
 
         int responsibleSpinnerIndex = 0;
 
-        for (int i = 0; i < this.users.size() ; i++) {
-            if (this.users.get(i).getId() == responsibleId ) {
+        for (int i = 0; i < this.users.size(); i++) {
+            if (this.users.get(i).getId() == responsibleId) {
                 responsibleSpinnerIndex = i;
                 break;
             }
@@ -318,7 +334,7 @@ public class OpencrxControlSet extends PopupControlSet {
 
             @Override
             public void onItemClick(AdapterView<?> adapter, View view, int position,
-                    long id) {
+                                    long id) {
 
                 OpencrxContact userInput = (OpencrxContact) adapter.getItemAtPosition(position);
 
@@ -326,9 +342,9 @@ public class OpencrxControlSet extends PopupControlSet {
 
                 int selectedIndex = assignedToSelector.getSelectedItemPosition();
 
-                for (int i = 0; i < assignedToSelector.getAdapter().getCount(); ++i){
+                for (int i = 0; i < assignedToSelector.getAdapter().getCount(); ++i) {
                     OpencrxContact current = (OpencrxContact) assignedToSelector.getAdapter().getItem(i);
-                    if (current != null && current.getId() == userInput.getId()){
+                    if (current != null && current.getId() == userInput.getId()) {
                         selectedIndex = i;
                         break;
                     }
@@ -353,12 +369,12 @@ public class OpencrxControlSet extends PopupControlSet {
 
             OpencrxContact responsibleUser = (OpencrxContact) assignedToSelector.getSelectedItem();
 
-            if(responsibleUser == null)
+            if (responsibleUser == null)
                 metadata.setValue(OpencrxCoreUtils.ACTIVITY_ASSIGNED_TO_ID, 0L);
             else
                 metadata.setValue(OpencrxCoreUtils.ACTIVITY_ASSIGNED_TO_ID, responsibleUser.getId());
 
-            if(metadata.getSetValues().size() > 0) {
+            if (metadata.getSetValues().size() > 0) {
                 metadataService.save(metadata);
                 task.setValue(Task.MODIFICATION_DATE, DateUtilities.now());
             }
@@ -370,14 +386,15 @@ public class OpencrxControlSet extends PopupControlSet {
 
     /**
      * Reads metadata out of a task
+     *
      * @return null if no metadata found
      */
     private Metadata getTaskMetadata(long taskId) {
         TodorooCursor<Metadata> cursor = metadataService.query(Query.select(Metadata.PROPERTIES).where(
-                                                                MetadataCriteria.byTaskAndwithKey(taskId, OpencrxCoreUtils.OPENCRX_ACTIVITY_METADATA_KEY))
-                                                         );
+                MetadataCriteria.byTaskAndwithKey(taskId, OpencrxCoreUtils.OPENCRX_ACTIVITY_METADATA_KEY))
+        );
         try {
-            if(cursor.getCount() == 0)
+            if (cursor.getCount() == 0)
                 return null;
             cursor.moveToFirst();
             return new Metadata(cursor);
@@ -392,7 +409,7 @@ public class OpencrxControlSet extends PopupControlSet {
                 where(StoreObjectCriteria.byType(type)));
         try {
             ret = new StoreObject[cursor.getCount()];
-            for(int i = 0; i < ret.length; i++) {
+            for (int i = 0; i < ret.length; i++) {
                 cursor.moveToNext();
                 StoreObject dashboard = new StoreObject(cursor);
                 ret[i] = dashboard;
diff --git a/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxCoreUtils.java b/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxCoreUtils.java
index e674c53fe..caa13d3db 100644
--- a/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxCoreUtils.java
+++ b/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxCoreUtils.java
@@ -16,7 +16,7 @@ import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.sync.SyncProviderUtilities;
 
-public class OpencrxCoreUtils extends SyncProviderUtilities{
+public class OpencrxCoreUtils extends SyncProviderUtilities {
 
     public static final String OPENCRX_ACTIVITY_METADATA_KEY = "opencrx"; //$NON-NLS-1$
 
@@ -38,7 +38,7 @@ public class OpencrxCoreUtils extends SyncProviderUtilities{
 
     public static final OpencrxCoreUtils INSTANCE = new OpencrxCoreUtils();
 
-    private OpencrxCoreUtils(){
+    private OpencrxCoreUtils() {
         // prevent instantiation
     }
 
@@ -58,7 +58,7 @@ public class OpencrxCoreUtils extends SyncProviderUtilities{
     public void stopOngoing() {
         SharedPreferences sharedPreferences = OpencrxCoreUtils.getPrefs();
 
-        if (sharedPreferences != null){
+        if (sharedPreferences != null) {
             Editor editor = sharedPreferences.edit();
             editor.putBoolean(getIdentifier() + PREF_ONGOING, false);
             editor.commit();
@@ -67,18 +67,19 @@ public class OpencrxCoreUtils extends SyncProviderUtilities{
 
     /**
      * Gets default creator from setting
+     *
      * @return CREATOR_NO_SYNC if should not sync, otherwise remote id
      */
     public long getDefaultCreator() {
-        long defaultCreatorId = CREATOR_NO_SYNC ;
+        long defaultCreatorId = CREATOR_NO_SYNC;
         SharedPreferences sharedPreferences = OpencrxCoreUtils.getPrefs();
 
-        if (sharedPreferences != null){
+        if (sharedPreferences != null) {
             String defCreatorString = sharedPreferences.getString(PREF_DEFAULT_CREATOR, String.valueOf(CREATOR_NO_SYNC));
 
-            try{
+            try {
                 defaultCreatorId = Long.parseLong(defCreatorString);
-            }catch(Exception ex){
+            } catch (Exception ex) {
                 defaultCreatorId = CREATOR_NO_SYNC;
             }
         }
@@ -86,12 +87,12 @@ public class OpencrxCoreUtils extends SyncProviderUtilities{
         return defaultCreatorId;
     }
 
-    public long getDefaultAssignedUser(){
+    public long getDefaultAssignedUser() {
         SharedPreferences sharedPreferences = OpencrxCoreUtils.getPrefs();
 
-        if (sharedPreferences != null){
+        if (sharedPreferences != null) {
             return sharedPreferences.getLong(PREF_USER_ID, -1);
-        }else{
+        } else {
             return -1;
         }
     }
@@ -100,7 +101,7 @@ public class OpencrxCoreUtils extends SyncProviderUtilities{
         try {
             Context crxContext = ContextManager.getContext().createPackageContext(OPENCRX_PACKAGE, 0);
             SharedPreferences sharedPreferences = crxContext.getSharedPreferences(PREFS_FILE,
-                                            Context.MODE_WORLD_READABLE + Context.MODE_WORLD_WRITEABLE);
+                    Context.MODE_WORLD_READABLE + Context.MODE_WORLD_WRITEABLE);
             return sharedPreferences;
         } catch (NameNotFoundException e) {
             return null;
@@ -121,6 +122,7 @@ public class OpencrxCoreUtils extends SyncProviderUtilities{
     public String getIdentifier() {
         return IDENTIFIER;
     }
+
     @Override
     public int getSyncIntervalKey() {
         return 0;
diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterAdapter.java b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterAdapter.java
index 46bacbd19..6c9dc4958 100644
--- a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterAdapter.java
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterAdapter.java
@@ -19,7 +19,7 @@ public class PeopleFilterAdapter extends FilterAdapter {
     public static final String BROADCAST_SEND_PEOPLE_FILTERS = Constants.PACKAGE + ".SEND_PEOPLE_FILTERS"; //$NON-NLS-1$
 
     public PeopleFilterAdapter(Activity activity, ListView listView,
-            int rowLayout, boolean skipIntentFilters) {
+                               int rowLayout, boolean skipIntentFilters) {
         super(activity, listView, rowLayout, skipIntentFilters);
     }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java
index 2e2fc5cda..1050183be 100644
--- a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.people;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.ContentValues;
@@ -43,6 +40,9 @@ import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.tags.TaskToTagMetadata;
 import com.todoroo.astrid.utility.AstridPreferences;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class PeopleFilterExposer extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
@@ -57,7 +57,7 @@ public class PeopleFilterExposer extends BroadcastReceiver {
     private FilterListItem[] prepareFilters(Context context) {
         TodorooCursor<User> users = PluginServices.getUserDao().query(Query.select(User.PROPERTIES)
                 .where(Criterion.not(Criterion.or(User.STATUS.eq(User.STATUS_BLOCKED),
-                                User.STATUS.eq(User.STATUS_IGNORED), User.STATUS.eq(User.STATUS_RENOUNCE), User.STATUS.eq(User.STATUS_IGNORE))))
+                        User.STATUS.eq(User.STATUS_IGNORED), User.STATUS.eq(User.STATUS_RENOUNCE), User.STATUS.eq(User.STATUS_IGNORE))))
                 .orderBy(Order.asc(User.FIRST_NAME), Order.asc(User.LAST_NAME), Order.asc(User.NAME)));
         try {
             List<FilterListItem> items = new ArrayList<FilterListItem>();
@@ -77,7 +77,7 @@ public class PeopleFilterExposer extends BroadcastReceiver {
         }
     }
 
-    @SuppressWarnings({ "nls", "deprecation" })
+    @SuppressWarnings({"nls", "deprecation"})
     private static FilterWithCustomIntent filterFromUserData(User user) {
         String title = user.getDisplayName();
         if (TextUtils.isEmpty(title) || "null".equals(title))
@@ -154,7 +154,7 @@ public class PeopleFilterExposer extends BroadcastReceiver {
         extras.putBoolean(PersonViewFragment.EXTRA_HIDE_QUICK_ADD, true);
         filter.customExtras = extras;
 
-        filter.listingIcon = ((BitmapDrawable)context.getResources().getDrawable(
+        filter.listingIcon = ((BitmapDrawable) context.getResources().getDrawable(
                 ThemeService.getDrawable(R.drawable.icn_menu_friends, themeFlags))).getBitmap();
 
         return filter;
diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterMode.java b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterMode.java
index 1e3977ab0..92a86ec1f 100644
--- a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterMode.java
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterMode.java
@@ -37,8 +37,8 @@ public class PeopleFilterMode implements FilterModeSpec {
     }
 
     private static final int[] FORBIDDEN_MENU_ITEMS = {
-        TaskListFragment.MENU_NEW_FILTER_ID,
-        MainMenuPopover.MAIN_MENU_ITEM_FRIENDS
+            TaskListFragment.MENU_NEW_FILTER_ID,
+            MainMenuPopover.MAIN_MENU_ITEM_FRIENDS
     };
 
     @Override
diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
index b0d90c4ab..23b61b240 100644
--- a/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.people;
 
-import java.util.List;
-
-import org.json.JSONArray;
-
 import android.app.Activity;
 import android.content.ContentValues;
 import android.content.Intent;
@@ -37,6 +33,10 @@ import com.todoroo.astrid.service.SyncV2Service;
 import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.utility.ResourceDrawableCache;
 
+import org.json.JSONArray;
+
+import java.util.List;
+
 public class PersonViewFragment extends TaskListFragment {
 
     public static final String EXTRA_USER_ID_LOCAL = "user_local_id"; //$NON-NLS-1$
@@ -45,13 +45,17 @@ public class PersonViewFragment extends TaskListFragment {
 
     protected static final int MENU_REFRESH_ID = MENU_SUPPORT_ID + 1;
 
-    @Autowired UserDao userDao;
+    @Autowired
+    UserDao userDao;
 
-    @Autowired SyncV2Service syncService;
+    @Autowired
+    SyncV2Service syncService;
 
-    @Autowired ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    ActFmPreferenceService actFmPreferenceService;
 
-    @Autowired ActFmSyncService actFmSyncService;
+    @Autowired
+    ActFmSyncService actFmSyncService;
 
     private AsyncImageView userImage;
     private TextView userSubtitle;
@@ -167,7 +171,7 @@ public class PersonViewFragment extends TaskListFragment {
 
     @Override
     protected void addSyncRefreshMenuItem(Menu menu, int themeFlags) {
-        if(actFmPreferenceService.isLoggedIn()) {
+        if (actFmPreferenceService.isLoggedIn()) {
             addMenuItem(menu, R.string.actfm_TVA_menu_refresh,
                     ThemeService.getDrawable(R.drawable.icn_menu_refresh, themeFlags), MENU_REFRESH_ID, true);
         } else {
@@ -178,9 +182,9 @@ public class PersonViewFragment extends TaskListFragment {
     @Override
     public boolean handleOptionsMenuItemSelected(int id, Intent intent) {
         switch (id) {
-        case MENU_REFRESH_ID:
-            refreshData();
-            return true;
+            case MENU_REFRESH_ID:
+                refreshData();
+                return true;
         }
         return super.handleOptionsMenuItemSelected(id, intent);
     }
@@ -192,7 +196,7 @@ public class PersonViewFragment extends TaskListFragment {
         if (user != null) {
             long lastAutosync = user.getValue(User.LAST_AUTOSYNC);
 
-            if(DateUtilities.now() - lastAutosync > AUTOSYNC_INTERVAL) {
+            if (DateUtilities.now() - lastAutosync > AUTOSYNC_INTERVAL) {
                 refreshData();
                 user.setValue(User.LAST_AUTOSYNC, DateUtilities.now());
                 userDao.saveExisting(user);
@@ -227,6 +231,7 @@ public class PersonViewFragment extends TaskListFragment {
                         });
                     }
                 }
+
                 @Override
                 public void runOnErrors(List<JSONArray> errors) {/**/}
             };
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationFragment.java b/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationFragment.java
index b58c2b8a1..aeccb16bd 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationFragment.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.reminders;
 
-import java.util.Date;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.TimePickerDialog;
@@ -33,18 +31,21 @@ import com.todoroo.astrid.service.StatisticsConstants;
 import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.ui.NumberPicker;
 
+import java.util.Date;
+
 /**
  * This activity is launched when a user opens up a notification from the
  * tray. It launches the appropriate activity based on the passed in parameters.
  *
  * @author timsu
- *
  */
 public class NotificationFragment extends TaskListFragment {
 
     // --- constants
 
-    /** task id from notification */
+    /**
+     * task id from notification
+     */
     public static final String TOKEN_ID = "id"; //$NON-NLS-1$
 
     // --- implementation
@@ -117,25 +118,25 @@ public class NotificationFragment extends TaskListFragment {
         public void onClick(DialogInterface dialog, int which) {
             long time = DateUtilities.now();
             int value = snoozeValue.getCurrent();
-            switch(snoozeUnits.getSelectedItemPosition()) {
-            case RepeatControlSet.INTERVAL_DAYS:
-                time += value * DateUtilities.ONE_DAY;
-                break;
-            case RepeatControlSet.INTERVAL_HOURS:
-                time += value * DateUtilities.ONE_HOUR;
-                break;
-            case RepeatControlSet.INTERVAL_MINUTES:
-                time += value * DateUtilities.ONE_MINUTE;
-                break;
-            case RepeatControlSet.INTERVAL_WEEKS:
-                time += value * 7 * DateUtilities.ONE_DAY;
-                break;
-            case RepeatControlSet.INTERVAL_MONTHS:
-                time = DateUtilities.addCalendarMonthsToUnixtime(time, 1);
-                break;
-            case RepeatControlSet.INTERVAL_YEARS:
-                time = DateUtilities.addCalendarMonthsToUnixtime(time, 12);
-                break;
+            switch (snoozeUnits.getSelectedItemPosition()) {
+                case RepeatControlSet.INTERVAL_DAYS:
+                    time += value * DateUtilities.ONE_DAY;
+                    break;
+                case RepeatControlSet.INTERVAL_HOURS:
+                    time += value * DateUtilities.ONE_HOUR;
+                    break;
+                case RepeatControlSet.INTERVAL_MINUTES:
+                    time += value * DateUtilities.ONE_MINUTE;
+                    break;
+                case RepeatControlSet.INTERVAL_WEEKS:
+                    time += value * 7 * DateUtilities.ONE_DAY;
+                    break;
+                case RepeatControlSet.INTERVAL_MONTHS:
+                    time = DateUtilities.addCalendarMonthsToUnixtime(time, 1);
+                    break;
+                case RepeatControlSet.INTERVAL_YEARS:
+                    time = DateUtilities.addCalendarMonthsToUnixtime(time, 12);
+                    break;
             }
 
             snoozeCallback.snoozeForTime(time);
@@ -147,7 +148,7 @@ public class NotificationFragment extends TaskListFragment {
      * Snooze and re-trigger this alarm
      */
     public static void snooze(Activity activity, OnTimeSetListener onTimeSet, SnoozeCallback snoozeCallback) {
-        if(Preferences.getBoolean(R.string.p_rmd_snooze_dialog, false)) {
+        if (Preferences.getBoolean(R.string.p_rmd_snooze_dialog, false)) {
             Date now = new Date();
             now.setHours(now.getHours() + 1);
             int hour = now.getHours();
@@ -159,11 +160,11 @@ public class NotificationFragment extends TaskListFragment {
         } else {
             SnoozeDialog sd = new SnoozeDialog(activity, snoozeCallback);
             new AlertDialog.Builder(activity)
-                .setTitle(R.string.rmd_NoA_snooze)
-                .setView(sd)
-                .setPositiveButton(android.R.string.ok, sd)
-                .setNegativeButton(android.R.string.cancel, null)
-                .show().setOwnerActivity(activity);
+                    .setTitle(R.string.rmd_NoA_snooze)
+                    .setView(sd)
+                    .setPositiveButton(android.R.string.ok, sd)
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .show().setOwnerActivity(activity);
         }
     }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java b/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java
index 4c7298824..40cac4b50 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java
@@ -5,11 +5,6 @@
  */
 package com.todoroo.astrid.reminders;
 
-import java.util.Date;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
@@ -48,15 +43,24 @@ import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.utility.Flags;
 import com.todoroo.astrid.voice.VoiceOutputService;
 
+import java.util.Date;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
 public class Notifications extends BroadcastReceiver {
 
     // --- constants
 
-    /** task id extra */
+    /**
+     * task id extra
+     */
     public static final String ID_KEY = "id"; //$NON-NLS-1$
 
 
-    /** preference values */
+    /**
+     * preference values
+     */
     public static final int ICON_SET_PINK = 0;
     public static final int ICON_SET_BORING = 1;
     public static final int ICON_SET_ASTRID = 2;
@@ -68,7 +72,9 @@ public class Notifications extends BroadcastReceiver {
     public static final String EXTRAS_CUSTOM_INTENT = "intent"; //$NON-NLS-1$
     public static final String EXTRAS_NOTIF_ID = "notifId"; //$NON-NLS-1$
 
-    /** notification type extra */
+    /**
+     * notification type extra
+     */
     public static final String EXTRAS_TYPE = "type"; //$NON-NLS-1$
     public static final String EXTRAS_TITLE = "title"; //$NON-NLS-1$
     public static final String EXTRAS_TEXT = "text"; //$NON-NLS-1$
@@ -106,25 +112,25 @@ public class Notifications extends BroadcastReceiver {
         Resources r = context.getResources();
         String reminder;
 
-        if(type == ReminderService.TYPE_ALARM)
+        if (type == ReminderService.TYPE_ALARM)
             reminder = getRandomReminder(r.getStringArray(R.array.reminders_alarm));
-        else if(Preferences.getBoolean(R.string.p_rmd_nagging, true)) {
-            if(type == ReminderService.TYPE_DUE || type == ReminderService.TYPE_OVERDUE)
+        else if (Preferences.getBoolean(R.string.p_rmd_nagging, true)) {
+            if (type == ReminderService.TYPE_DUE || type == ReminderService.TYPE_OVERDUE)
                 reminder = getRandomReminder(r.getStringArray(R.array.reminders_due));
-            else if(type == ReminderService.TYPE_SNOOZE)
+            else if (type == ReminderService.TYPE_SNOOZE)
                 reminder = getRandomReminder(r.getStringArray(R.array.reminders_snooze));
             else
                 reminder = getRandomReminder(r.getStringArray(R.array.reminders));
         } else
             reminder = ""; //$NON-NLS-1$
 
-        synchronized(Notifications.class) {
-            if(notificationManager == null)
+        synchronized (Notifications.class) {
+            if (notificationManager == null)
                 notificationManager = new AndroidNotificationManager(context);
         }
 
-        if(!showTaskNotification(id, type, reminder)) {
-            notificationManager.cancel((int)id);
+        if (!showTaskNotification(id, type, reminder)) {
+            notificationManager.cancel((int) id);
         }
 
         try {
@@ -136,7 +142,9 @@ public class Notifications extends BroadcastReceiver {
 
     // --- notification creation
 
-    /** @return a random reminder string */
+    /**
+     * @return a random reminder string
+     */
     public static String getRandomReminder(String[] reminders) {
         int next = ReminderService.random.nextInt(reminders.length);
         String reminder = reminders[next];
@@ -151,8 +159,8 @@ public class Notifications extends BroadcastReceiver {
         Task task;
         try {
             task = taskDao.fetch(id, Task.ID, Task.TITLE, Task.HIDE_UNTIL, Task.COMPLETION_DATE,
-                        Task.DUE_DATE, Task.DELETION_DATE, Task.REMINDER_FLAGS, Task.USER_ID);
-            if(task == null)
+                    Task.DUE_DATE, Task.DELETION_DATE, Task.REMINDER_FLAGS, Task.USER_ID);
+            if (task == null)
                 throw new IllegalArgumentException("cound not find item with id"); //$NON-NLS-1$
 
         } catch (Exception e) {
@@ -163,21 +171,21 @@ public class Notifications extends BroadcastReceiver {
         if (!Preferences.getBoolean(R.string.p_rmd_enabled, true))
             return false;
         // you're done, or not yours - don't sound, do delete
-        if(task.isCompleted() || task.isDeleted() || !Task.USER_ID_SELF.equals(task.getValue(Task.USER_ID)))
+        if (task.isCompleted() || task.isDeleted() || !Task.USER_ID_SELF.equals(task.getValue(Task.USER_ID)))
             return false;
 
         // new task edit in progress
-        if(TextUtils.isEmpty(task.getValue(Task.TITLE)))
+        if (TextUtils.isEmpty(task.getValue(Task.TITLE)))
             return false;
 
         // it's hidden - don't sound, don't delete
-        if(task.isHidden() && type == ReminderService.TYPE_RANDOM)
+        if (task.isHidden() && type == ReminderService.TYPE_RANDOM)
             return true;
 
         // task due date was changed, but alarm wasn't rescheduled
         boolean dueInFuture = task.hasDueTime() && task.getValue(Task.DUE_DATE) > DateUtilities.now() ||
-            !task.hasDueTime() && task.getValue(Task.DUE_DATE) - DateUtilities.now() > DateUtilities.ONE_DAY;
-        if((type == ReminderService.TYPE_DUE || type == ReminderService.TYPE_OVERDUE) &&
+                !task.hasDueTime() && task.getValue(Task.DUE_DATE) - DateUtilities.now() > DateUtilities.ONE_DAY;
+        if ((type == ReminderService.TYPE_DUE || type == ReminderService.TYPE_OVERDUE) &&
                 (!task.hasDueDate() || dueInFuture))
             return true;
 
@@ -214,14 +222,14 @@ public class Notifications extends BroadcastReceiver {
         notifyIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
         notifyIntent.putExtra(TaskListActivity.TOKEN_SOURCE, Constants.SOURCE_NOTIFICATION);
 
-        requestNotification((int)id, notifyIntent, type, title, text, ringTimes);
+        requestNotification((int) id, notifyIntent, type, title, text, ringTimes);
         return true;
     }
 
     private static void requestNotification(long taskId, Intent intent, int type, String title, String text, int ringTimes) {
         Context context = ContextManager.getContext();
         Intent inAppNotify = new Intent(BROADCAST_IN_APP_NOTIFY);
-        inAppNotify.putExtra(EXTRAS_NOTIF_ID, (int)taskId);
+        inAppNotify.putExtra(EXTRAS_NOTIF_ID, (int) taskId);
         inAppNotify.putExtra(NotificationFragment.TOKEN_ID, taskId);
         inAppNotify.putExtra(EXTRAS_CUSTOM_INTENT, intent);
         inAppNotify.putExtra(EXTRAS_TYPE, type);
@@ -229,7 +237,7 @@ public class Notifications extends BroadcastReceiver {
         inAppNotify.putExtra(EXTRAS_TEXT, text);
         inAppNotify.putExtra(EXTRAS_RING_TIMES, ringTimes);
 
-        if(forceNotificationManager)
+        if (forceNotificationManager)
             new ShowNotificationReceiver().onReceive(ContextManager.getContext(), inAppNotify);
         else
             context.sendOrderedBroadcast(inAppNotify, AstridApiConstants.PERMISSION_READ);
@@ -238,8 +246,8 @@ public class Notifications extends BroadcastReceiver {
     /**
      * Receives requests to show an Astrid notification if they were not intercepted and handled
      * by the in-app reminders in AstridActivity.
-     * @author Sam
      *
+     * @author Sam
      */
     public static class ShowNotificationReceiver extends BroadcastReceiver {
         @Override
@@ -271,17 +279,18 @@ public class Notifications extends BroadcastReceiver {
     /**
      * Shows an Astrid notification. Pulls in ring tone and quiet hour settings
      * from preferences. You can make it say anything you like.
+     *
      * @param ringTimes number of times to ring (-1 = nonstop)
      */
     public static void showNotification(int notificationId, Intent intent, int type, String title,
-            String text, int ringTimes) {
+                                        String text, int ringTimes) {
         Context context = ContextManager.getContext();
 
-        if(notificationManager == null)
+        if (notificationManager == null)
             notificationManager = new AndroidNotificationManager(context);
 
         // don't ring multiple times if random reminder
-        if(type == ReminderService.TYPE_RANDOM)
+        if (type == ReminderService.TYPE_RANDOM)
             ringTimes = 1;
 
         // quiet hours? unless alarm clock
@@ -292,16 +301,16 @@ public class Notifications extends BroadcastReceiver {
 
         // set up properties (name and icon) for the notification
         int icon;
-        switch(Preferences.getIntegerFromString(R.string.p_rmd_icon,
+        switch (Preferences.getIntegerFromString(R.string.p_rmd_icon,
                 ICON_SET_ASTRID)) {
-        case ICON_SET_PINK:
-            icon = R.drawable.notif_pink_alarm;
-            break;
-        case ICON_SET_BORING:
-            icon = R.drawable.notif_boring_alarm;
-            break;
-        default:
-            icon = R.drawable.notif_astrid;
+            case ICON_SET_PINK:
+                icon = R.drawable.notif_pink_alarm;
+                break;
+            case ICON_SET_BORING:
+                icon = R.drawable.notif_boring_alarm;
+                break;
+            default:
+                icon = R.drawable.notif_astrid;
         }
 
         // create notification object
@@ -312,17 +321,16 @@ public class Notifications extends BroadcastReceiver {
                 text,
                 pendingIntent);
         notification.flags |= Notification.FLAG_AUTO_CANCEL;
-        if(Preferences.getBoolean(R.string.p_rmd_persistent, true)) {
+        if (Preferences.getBoolean(R.string.p_rmd_persistent, true)) {
             notification.flags |= Notification.FLAG_NO_CLEAR |
-                Notification.FLAG_SHOW_LIGHTS;
+                    Notification.FLAG_SHOW_LIGHTS;
             notification.ledOffMS = 5000;
             notification.ledOnMS = 700;
             notification.ledARGB = Color.YELLOW;
-        }
-        else
+        } else
             notification.defaults = Notification.DEFAULT_LIGHTS;
 
-        AudioManager audioManager = (AudioManager)context.getSystemService(
+        AudioManager audioManager = (AudioManager) context.getSystemService(
                 Context.AUDIO_SERVICE);
 
         // detect call state
@@ -345,7 +353,7 @@ public class Notifications extends BroadcastReceiver {
             }
 
             // insistent rings until notification is disabled
-            if(ringTimes < 0) {
+            if (ringTimes < 0) {
                 notification.flags |= Notification.FLAG_INSISTENT;
                 voiceReminder = false;
             }
@@ -357,16 +365,16 @@ public class Notifications extends BroadcastReceiver {
         boolean soundIntervalOk = checkLastNotificationSound();
 
         // quiet hours = no sound
-        if(quietHours || callState != TelephonyManager.CALL_STATE_IDLE) {
+        if (quietHours || callState != TelephonyManager.CALL_STATE_IDLE) {
             notification.sound = null;
             voiceReminder = false;
         } else {
             String notificationPreference = Preferences.getStringValue(R.string.p_rmd_ringtone);
-            if(audioManager.getStreamVolume(AudioManager.STREAM_NOTIFICATION) == 0) {
+            if (audioManager.getStreamVolume(AudioManager.STREAM_NOTIFICATION) == 0) {
                 notification.sound = null;
                 voiceReminder = false;
-            } else if(notificationPreference != null) {
-                if(notificationPreference.length() > 0 && soundIntervalOk) {
+            } else if (notificationPreference != null) {
+                if (notificationPreference.length() > 0 && soundIntervalOk) {
                     Uri notificationSound = Uri.parse(notificationPreference);
                     notification.sound = notificationSound;
                 } else {
@@ -378,20 +386,20 @@ public class Notifications extends BroadcastReceiver {
         }
 
         // quiet hours && ! due date or snooze = no vibrate
-        if(quietHours && !(type == ReminderService.TYPE_DUE || type == ReminderService.TYPE_SNOOZE)) {
+        if (quietHours && !(type == ReminderService.TYPE_DUE || type == ReminderService.TYPE_SNOOZE)) {
             notification.vibrate = null;
-        } else if(callState != TelephonyManager.CALL_STATE_IDLE) {
+        } else if (callState != TelephonyManager.CALL_STATE_IDLE) {
             notification.vibrate = null;
         } else {
             if (Preferences.getBoolean(R.string.p_rmd_vibrate, true)
                     && audioManager.shouldVibrate(AudioManager.VIBRATE_TYPE_NOTIFICATION) && soundIntervalOk) {
-                notification.vibrate = new long[] {0, 1000, 500, 1000, 500, 1000};
+                notification.vibrate = new long[]{0, 1000, 500, 1000, 500, 1000};
             } else {
                 notification.vibrate = null;
             }
         }
 
-        if(Constants.DEBUG)
+        if (Constants.DEBUG)
             Log.w("Astrid", "Logging notification: " + text); //$NON-NLS-1$ //$NON-NLS-2$
 
         singleThreadVoicePool.submit(new NotificationRunnable(ringTimes, notificationId, notification, voiceReminder,
@@ -415,7 +423,7 @@ public class Notifications extends BroadcastReceiver {
         private final String text;
 
         public NotificationRunnable(int ringTimes, int notificationId, Notification notification, boolean voiceReminder,
-                boolean maxOutVolume, AudioManager audioManager, int previousAlarmVolume, String text) {
+                                    boolean maxOutVolume, AudioManager audioManager, int previousAlarmVolume, String text) {
             this.ringTimes = ringTimes;
             this.notificationId = notificationId;
             this.notification = notification;
@@ -428,16 +436,16 @@ public class Notifications extends BroadcastReceiver {
 
         @Override
         public void run() {
-            for(int i = 0; i < Math.max(ringTimes, 1); i++) {
+            for (int i = 0; i < Math.max(ringTimes, 1); i++) {
                 notificationManager.notify(notificationId, notification);
                 AndroidUtilities.sleepDeep(500);
             }
             Flags.set(Flags.REFRESH); // Forces a reload when app launches
             if ((voiceReminder || maxOutVolumeForMultipleRingReminders)) {
                 AndroidUtilities.sleepDeep(2000);
-                for(int i = 0; i < 50; i++) {
+                for (int i = 0; i < 50; i++) {
                     AndroidUtilities.sleepDeep(500);
-                    if(audioManager.getMode() != AudioManager.MODE_RINGTONE)
+                    if (audioManager.getMode() != AudioManager.MODE_RINGTONE)
                         break;
                 }
                 try {
@@ -461,13 +469,13 @@ public class Notifications extends BroadcastReceiver {
     public static boolean isQuietHours() {
         int quietHoursStart = Preferences.getIntegerFromString(R.string.p_rmd_quietStart, -1);
         int quietHoursEnd = Preferences.getIntegerFromString(R.string.p_rmd_quietEnd, -1);
-        if(quietHoursStart != -1 && quietHoursEnd != -1) {
+        if (quietHoursStart != -1 && quietHoursEnd != -1) {
             int hour = new Date().getHours();
-            if(quietHoursStart <= quietHoursEnd) {
-                if(hour >= quietHoursStart && hour < quietHoursEnd)
+            if (quietHoursStart <= quietHoursEnd) {
+                if (hour >= quietHoursStart && hour < quietHoursEnd)
                     return true;
             } else { // wrap across 24/hour boundary
-                if(hour >= quietHoursStart || hour < quietHoursEnd)
+                if (hour >= quietHoursStart || hour < quietHoursEnd)
                     return true;
             }
         }
@@ -477,18 +485,17 @@ public class Notifications extends BroadcastReceiver {
     /**
      * Schedules alarms for a single task
      *
-     * @param shouldPerformPropertyCheck
-     *            whether to check if task has requisite properties
+     * @param shouldPerformPropertyCheck whether to check if task has requisite properties
      */
     public static void cancelNotifications(long taskId) {
-        if(notificationManager == null)
-            synchronized(Notifications.class) {
-                if(notificationManager == null)
+        if (notificationManager == null)
+            synchronized (Notifications.class) {
+                if (notificationManager == null)
                     notificationManager = new AndroidNotificationManager(
                             ContextManager.getContext());
             }
 
-        notificationManager.cancel((int)taskId);
+        notificationManager.cancel((int) taskId);
     }
 
     // --- notification manager
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementReceiver.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementReceiver.java
index 306df88bf..6b8af477f 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementReceiver.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementReceiver.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.reminders;
 
-import org.json.JSONObject;
-
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
@@ -37,11 +35,15 @@ import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.utility.Flags;
 
+import org.json.JSONObject;
+
 public class ReengagementReceiver extends BroadcastReceiver {
 
-    @Autowired ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    ActFmPreferenceService actFmPreferenceService;
 
-    @Autowired TaskService taskService;
+    @Autowired
+    TaskService taskService;
 
     private static final int TASK_LIMIT = 3;
 
@@ -112,9 +114,9 @@ public class ReengagementReceiver extends BroadcastReceiver {
                 pendingIntent);
 
         notification.flags |= Notification.FLAG_AUTO_CANCEL;
-        if(Preferences.getBoolean(R.string.p_rmd_persistent, true)) {
+        if (Preferences.getBoolean(R.string.p_rmd_persistent, true)) {
             notification.flags |= Notification.FLAG_NO_CLEAR |
-                Notification.FLAG_SHOW_LIGHTS;
+                    Notification.FLAG_SHOW_LIGHTS;
             notification.ledOffMS = 5000;
             notification.ledOnMS = 700;
             notification.ledARGB = Color.YELLOW;
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementService.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementService.java
index aa4c324fc..09aa86db9 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReengagementService.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.reminders;
 
-import java.util.Date;
-
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -17,6 +15,8 @@ import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.utility.AstridPreferences;
 import com.todoroo.astrid.utility.Constants;
 
+import java.util.Date;
+
 public final class ReengagementService {
 
     private static final int REQUEST_CODE = 10;
@@ -27,7 +27,7 @@ public final class ReengagementService {
     public static final String BROADCAST_SHOW_REENGAGEMENT = Constants.PACKAGE + ".SHOW_REENGAGEMENT"; //$NON-NLS-1$
 
     public static void scheduleReengagementAlarm(Context context) {
-        AlarmManager am = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
+        AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
         Intent intent = new Intent(BROADCAST_SHOW_REENGAGEMENT);
         PendingIntent pendingIntent = PendingIntent.getBroadcast(context, REQUEST_CODE, intent, 0);
         am.cancel(pendingIntent);
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDebugContextActions.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDebugContextActions.java
index 63fdce162..3fc4dc933 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDebugContextActions.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDebugContextActions.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.reminders;
 
-import java.util.Date;
-
 import android.widget.Toast;
 
 import com.todoroo.andlib.service.ContextManager;
@@ -15,6 +13,8 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.reminders.ReminderService.AlarmScheduler;
 import com.todoroo.astrid.utility.Constants;
 
+import java.util.Date;
+
 @SuppressWarnings("nls")
 public class ReminderDebugContextActions {
 
@@ -32,7 +32,7 @@ public class ReminderDebugContextActions {
             ReminderService.getInstance().setScheduler(new AlarmScheduler() {
                 @Override
                 public void createAlarm(Task theTask, long time, int type) {
-                    if(time == 0 || time == Long.MAX_VALUE)
+                    if (time == 0 || time == Long.MAX_VALUE)
                         return;
 
                     Toast.makeText(ContextManager.getContext(), "Scheduled Alarm: " +
@@ -41,7 +41,7 @@ public class ReminderDebugContextActions {
                 }
             });
             ReminderService.getInstance().scheduleAlarm(task);
-            if(ReminderService.getInstance().getScheduler() != null)
+            if (ReminderService.getInstance().getScheduler() != null)
                 Toast.makeText(ContextManager.getContext(), "No alarms", Toast.LENGTH_LONG).show();
             ReminderService.getInstance().setScheduler(original);
         }
@@ -57,7 +57,7 @@ public class ReminderDebugContextActions {
 
         public void invoke(Task task) {
             new Notifications().showTaskNotification(task.getId(),
-                        ReminderService.TYPE_SNOOZE, "test reminder");
+                    ReminderService.TYPE_SNOOZE, "test reminder");
         }
     }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java
index b4163b4eb..38b51bbf0 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java
@@ -5,16 +5,6 @@
  */
 package com.todoroo.astrid.reminders;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.TimePickerDialog.OnTimeSetListener;
@@ -55,11 +45,20 @@ import com.todoroo.astrid.tags.TagMemberMetadata;
 import com.todoroo.astrid.tags.TagService;
 import com.todoroo.astrid.utility.ResourceDrawableCache;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 /**
  * A dialog that shows your task reminder
  *
  * @author sbosley
- *
  */
 public class ReminderDialog extends Dialog {
 
@@ -75,7 +74,7 @@ public class ReminderDialog extends Dialog {
     private UserDao userDao;
 
     public ReminderDialog(final AstridActivity activity, final long taskId,
-            String title) {
+                          String title) {
         super(activity, R.style.ReminderDialog);
         DependencyInjectionService.getInstance().inject(this);
         final SnoozeCallback dialogSnooze = new SnoozeCallback() {
@@ -95,7 +94,7 @@ public class ReminderDialog extends Dialog {
                 Date alarmTime = new Date();
                 alarmTime.setHours(hours);
                 alarmTime.setMinutes(minutes);
-                if(alarmTime.getTime() < DateUtilities.now())
+                if (alarmTime.getTime() < DateUtilities.now())
                     alarmTime.setDate(alarmTime.getDate() + 1);
                 dialogSnooze.snoozeForTime(alarmTime.getTime());
             }
@@ -268,8 +267,8 @@ public class ReminderDialog extends Dialog {
                     TodorooCursor<User> users = userDao.query(Query.select(User.PROPERTIES)
                             .where(User.UUID.in(
                                     Query.select(TagMemberMetadata.USER_UUID)
-                                    .from(TagMetadata.TABLE)
-                                    .where(TagMetadata.TAG_UUID.eq(td.getUuid())))));
+                                            .from(TagMetadata.TABLE)
+                                            .where(TagMetadata.TAG_UUID.eq(td.getUuid())))));
                     try {
                         User user = new User();
                         for (users.moveToFirst(); !users.isAfterLast(); users.moveToNext()) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java
index 38e0ca01b..d58dd5835 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java
@@ -17,7 +17,6 @@ import com.todoroo.andlib.utility.TodorooPreferenceActivity;
  * Displays the preference screen for users to edit their preferences
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class ReminderPreferences extends TodorooPreferenceActivity {
 
@@ -27,17 +26,16 @@ public class ReminderPreferences extends TodorooPreferenceActivity {
     }
 
     /**
-     *
      * @param resource if null, updates all resources
      */
     @Override
     public void updatePreferences(Preference preference, Object value) {
         Resources r = getResources();
 
-        if(r.getString(R.string.p_rmd_quietStart).equals(preference.getKey())) {
-            int index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_quiet_hours_start_values), (String)value);
+        if (r.getString(R.string.p_rmd_quietStart).equals(preference.getKey())) {
+            int index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_quiet_hours_start_values), (String) value);
             Preference endPreference = findPreference(getString(R.string.p_rmd_quietEnd));
-            if(index <= 0) {
+            if (index <= 0) {
                 preference.setSummary(r.getString(R.string.rmd_EPr_quiet_hours_desc_none));
                 endPreference.setEnabled(false);
             } else {
@@ -45,62 +43,62 @@ public class ReminderPreferences extends TodorooPreferenceActivity {
                 preference.setSummary(r.getString(R.string.rmd_EPr_quiet_hours_start_desc, setting));
                 endPreference.setEnabled(true);
             }
-        } else if(r.getString(R.string.p_rmd_quietEnd).equals(preference.getKey())) {
-            int index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_quiet_hours_end_values), (String)value);
+        } else if (r.getString(R.string.p_rmd_quietEnd).equals(preference.getKey())) {
+            int index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_quiet_hours_end_values), (String) value);
             int quietHoursStart = Preferences.getIntegerFromString(R.string.p_rmd_quietStart, -1);
-            if(index == -1 || quietHoursStart == -1)
+            if (index == -1 || quietHoursStart == -1)
                 preference.setSummary(r.getString(R.string.rmd_EPr_quiet_hours_desc_none));
             else {
                 String setting = r.getStringArray(R.array.EPr_quiet_hours_end)[index];
                 preference.setSummary(r.getString(R.string.rmd_EPr_quiet_hours_end_desc, setting));
             }
-        } else if(r.getString(R.string.p_rmd_time).equals(preference.getKey())) {
-            int index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_rmd_time_values), (String)value);
+        } else if (r.getString(R.string.p_rmd_time).equals(preference.getKey())) {
+            int index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_rmd_time_values), (String) value);
             if (index != -1 && index < r.getStringArray(R.array.EPr_rmd_time).length) {
                 // FIXME this does not fix the underlying cause of the ArrayIndexOutofBoundsException
                 // https://www.crittercism.com/developers/crash-details/e0886dbfcf9e78a21d9f2e2a385c4c13e2f6ad2132ac24a3fa811144
                 String setting = r.getStringArray(R.array.EPr_rmd_time)[index];
                 preference.setSummary(r.getString(R.string.rmd_EPr_rmd_time_desc, setting));
             }
-        } else if(r.getString(R.string.p_rmd_ringtone).equals(preference.getKey())) {
-            if(value == null || "content://settings/system/notification_sound".equals(value)) //$NON-NLS-1$
+        } else if (r.getString(R.string.p_rmd_ringtone).equals(preference.getKey())) {
+            if (value == null || "content://settings/system/notification_sound".equals(value)) //$NON-NLS-1$
                 preference.setSummary(r.getString(R.string.rmd_EPr_ringtone_desc_default));
-            else if("".equals(value)) //$NON-NLS-1$
+            else if ("".equals(value)) //$NON-NLS-1$
                 preference.setSummary(r.getString(R.string.rmd_EPr_ringtone_desc_silent));
             else
                 preference.setSummary(r.getString(R.string.rmd_EPr_ringtone_desc_custom));
-        } else if(r.getString(R.string.p_rmd_persistent).equals(preference.getKey())) {
-            if((Boolean)value)
+        } else if (r.getString(R.string.p_rmd_persistent).equals(preference.getKey())) {
+            if ((Boolean) value)
                 preference.setSummary(r.getString(R.string.rmd_EPr_persistent_desc_true));
             else
                 preference.setSummary(r.getString(R.string.rmd_EPr_persistent_desc_false));
-        } else if(r.getString(R.string.p_rmd_maxvolume).equals(preference.getKey())) {
-            if((Boolean)value)
+        } else if (r.getString(R.string.p_rmd_maxvolume).equals(preference.getKey())) {
+            if ((Boolean) value)
                 preference.setSummary(r.getString(R.string.rmd_EPr_multiple_maxvolume_desc_true));
             else
                 preference.setSummary(r.getString(R.string.rmd_EPr_multiple_maxvolume_desc_false));
-        } else if(r.getString(R.string.p_rmd_vibrate).equals(preference.getKey())) {
-            if((Boolean)value)
+        } else if (r.getString(R.string.p_rmd_vibrate).equals(preference.getKey())) {
+            if ((Boolean) value)
                 preference.setSummary(r.getString(R.string.rmd_EPr_vibrate_desc_true));
             else
                 preference.setSummary(r.getString(R.string.rmd_EPr_vibrate_desc_false));
-        } else if(r.getString(R.string.p_rmd_nagging).equals(preference.getKey())) {
-            if((Boolean)value)
+        } else if (r.getString(R.string.p_rmd_nagging).equals(preference.getKey())) {
+            if ((Boolean) value)
                 preference.setSummary(r.getString(R.string.rmd_EPr_nagging_desc_true));
             else
                 preference.setSummary(r.getString(R.string.rmd_EPr_nagging_desc_false));
-        } else if(r.getString(R.string.p_rmd_snooze_dialog).equals(preference.getKey())) {
-            if(value == null || ((Boolean)value) == true)
+        } else if (r.getString(R.string.p_rmd_snooze_dialog).equals(preference.getKey())) {
+            if (value == null || ((Boolean) value) == true)
                 preference.setSummary(r.getString(R.string.rmd_EPr_snooze_dialog_desc_true));
             else
                 preference.setSummary(r.getString(R.string.rmd_EPr_snooze_dialog_desc_false));
         } else if (r.getString(R.string.p_rmd_enabled).equals(preference.getKey())) {
-            if((Boolean)value)
+            if ((Boolean) value)
                 preference.setSummary(R.string.rmd_EPr_enabled_desc_true);
             else
                 preference.setSummary(R.string.rmd_EPr_enabled_desc_false);
         } else if (r.getString(R.string.p_rmd_social).equals(preference.getKey())) {
-            if ((Boolean)value)
+            if ((Boolean) value)
                 preference.setSummary(R.string.rmd_EPr_social_summary_enabled);
             else
                 preference.setSummary(R.string.rmd_EPr_social_summary_disabled);
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderSchedulingService.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderSchedulingService.java
index ee2f4549c..b8a6c717a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderSchedulingService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderSchedulingService.java
@@ -18,11 +18,12 @@ import com.todoroo.astrid.alarms.AlarmService;
  * Schedules reminders in the background to prevent ANR's
  *
  * @author Tim Su
- *
  */
 public class ReminderSchedulingService extends Service {
 
-    /** Receive the alarm - start the synchronize service! */
+    /**
+     * Receive the alarm - start the synchronize service!
+     */
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         ContextManager.setContext(ReminderSchedulingService.this);
@@ -49,6 +50,7 @@ public class ReminderSchedulingService extends Service {
             Log.e("reminder-scheduling", "reminder-startup", e);
         }
     }
+
     private void delaySchedulingToPreventANRs() {
         AndroidUtilities.sleepDeep(5000L);
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java
index a778372c2..561cc384f 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.reminders;
 
-import java.util.Date;
-import java.util.Random;
-
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -32,39 +29,51 @@ import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.utility.Constants;
 
+import java.util.Date;
+import java.util.Random;
+
 
 /**
  * Data service for reminders
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
-public final class ReminderService  {
+public final class ReminderService {
 
     // --- constants
 
-    public static final Property<?>[] NOTIFICATION_PROPERTIES = new Property<?>[] {
-        Task.ID,
-        Task.CREATION_DATE,
-        Task.COMPLETION_DATE,
-        Task.DELETION_DATE,
-        Task.DUE_DATE,
-        Task.REMINDER_FLAGS,
-        Task.REMINDER_PERIOD,
-        Task.REMINDER_LAST,
-        Task.REMINDER_SNOOZE,
-        Task.IMPORTANCE
+    public static final Property<?>[] NOTIFICATION_PROPERTIES = new Property<?>[]{
+            Task.ID,
+            Task.CREATION_DATE,
+            Task.COMPLETION_DATE,
+            Task.DELETION_DATE,
+            Task.DUE_DATE,
+            Task.REMINDER_FLAGS,
+            Task.REMINDER_PERIOD,
+            Task.REMINDER_LAST,
+            Task.REMINDER_SNOOZE,
+            Task.IMPORTANCE
     };
 
-    /** flag for due date reminder */
+    /**
+     * flag for due date reminder
+     */
     public static final int TYPE_DUE = 0;
-    /** flag for overdue reminder */
+    /**
+     * flag for overdue reminder
+     */
     public static final int TYPE_OVERDUE = 1;
-    /** flag for random reminder */
+    /**
+     * flag for random reminder
+     */
     public static final int TYPE_RANDOM = 2;
-    /** flag for a snoozed reminder */
+    /**
+     * flag for a snoozed reminder
+     */
     public static final int TYPE_SNOOZE = 3;
-    /** flag for an alarm reminder */
+    /**
+     * flag for an alarm reminder
+     */
     public static final int TYPE_ALARM = 4;
 
     static final Random random = new Random();
@@ -88,7 +97,7 @@ public final class ReminderService  {
     private static ReminderService instance = null;
 
     public static synchronized ReminderService getInstance() {
-        if(instance == null)
+        if (instance == null)
             instance = new ReminderService();
         return instance;
     }
@@ -97,9 +106,11 @@ public final class ReminderService  {
 
     private static boolean preferencesInitialized = false;
 
-    /** Set preference defaults, if unset. called at startup */
+    /**
+     * Set preference defaults, if unset. called at startup
+     */
     public void setPreferenceDefaults() {
-        if(preferencesInitialized)
+        if (preferencesInitialized)
             return;
 
         Context context = ContextManager.getContext();
@@ -128,7 +139,7 @@ public final class ReminderService  {
         try {
             Task task = new Task();
             now = DateUtilities.now(); // Before mass scheduling, initialize now variable
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 task.readFromCursor(cursor);
                 scheduleAlarm(task, false);
             }
@@ -149,6 +160,7 @@ public final class ReminderService  {
 
     /**
      * Schedules alarms for a single task
+     *
      * @param task
      */
     public void scheduleAlarm(Task task) {
@@ -169,19 +181,18 @@ public final class ReminderService  {
     /**
      * Schedules alarms for a single task
      *
-     * @param shouldPerformPropertyCheck
-     *            whether to check if task has requisite properties
+     * @param shouldPerformPropertyCheck whether to check if task has requisite properties
      */
     private void scheduleAlarm(Task task, boolean shouldPerformPropertyCheck) {
-        if(task == null || !task.isSaved())
+        if (task == null || !task.isSaved())
             return;
 
         // read data if necessary
-        if(shouldPerformPropertyCheck) {
-            for(Property<?> property : NOTIFICATION_PROPERTIES) {
-                if(!task.containsValue(property)) {
+        if (shouldPerformPropertyCheck) {
+            for (Property<?> property : NOTIFICATION_PROPERTIES) {
+                if (!task.containsValue(property)) {
                     task = taskDao.fetch(task.getId(), NOTIFICATION_PROPERTIES);
-                    if(task == null)
+                    if (task == null)
                         return;
                     break;
                 }
@@ -191,7 +202,7 @@ public final class ReminderService  {
         // Make sure no alarms are scheduled other than the next one. When that one is shown, it
         // will schedule the next one after it, and so on and so forth.
         clearAllAlarms(task);
-        if(task.isCompleted() || task.isDeleted() || !Task.USER_ID_SELF.equals(task.getValue(Task.USER_ID))) {
+        if (task.isCompleted() || task.isDeleted() || !Task.USER_ID_SELF.equals(task.getValue(Task.USER_ID))) {
             return;
         }
 
@@ -216,30 +227,26 @@ public final class ReminderService  {
         }
 
         // if random reminders are too close to due date, favor due date
-        if(whenRandom != NO_ALARM && whenDueDate - whenRandom < DateUtilities.ONE_DAY)
+        if (whenRandom != NO_ALARM && whenDueDate - whenRandom < DateUtilities.ONE_DAY)
             whenRandom = NO_ALARM;
 
         // snooze trumps all
-        if(whenSnooze != NO_ALARM) {
+        if (whenSnooze != NO_ALARM) {
             scheduler.createAlarm(task, whenSnooze, TYPE_SNOOZE);
-        }
-        else if(whenRandom < whenDueDate && whenRandom < whenOverdue) {
+        } else if (whenRandom < whenDueDate && whenRandom < whenOverdue) {
             scheduler.createAlarm(task, whenRandom, TYPE_RANDOM);
-        }
-        else if(whenDueDate < whenOverdue) {
+        } else if (whenDueDate < whenOverdue) {
             scheduler.createAlarm(task, whenDueDate, TYPE_DUE);
-        }
-        else if(whenOverdue != NO_ALARM) {
+        } else if (whenOverdue != NO_ALARM) {
             scheduler.createAlarm(task, whenOverdue, TYPE_OVERDUE);
-        }
-        else {
+        } else {
             scheduler.createAlarm(task, 0, 0);
         }
     }
 
     /**
      * Calculate the next alarm time for snooze.
-     * <p>
+     * <p/>
      * Pretty simple - if a snooze time is in the future, we use that. If it
      * has already passed, we do nothing.
      *
@@ -247,14 +254,14 @@ public final class ReminderService  {
      * @return
      */
     private long calculateNextSnoozeReminder(Task task) {
-        if(task.getValue(Task.REMINDER_SNOOZE) > DateUtilities.now())
+        if (task.getValue(Task.REMINDER_SNOOZE) > DateUtilities.now())
             return task.getValue(Task.REMINDER_SNOOZE);
         return NO_ALARM;
     }
 
     /**
      * Calculate the next alarm time for overdue reminders.
-     * <p>
+     * <p/>
      * We schedule an alarm for after the due date (which could be in the past),
      * with the exception that if a reminder was recently issued, we move
      * the alarm time to the near future.
@@ -263,8 +270,8 @@ public final class ReminderService  {
      * @return
      */
     private long calculateNextOverdueReminder(Task task) {
-     // Uses getNowValue() instead of DateUtilities.now()
-        if(task.hasDueDate() && task.getFlag(Task.REMINDER_FLAGS, Task.NOTIFY_AFTER_DEADLINE)) {
+        // Uses getNowValue() instead of DateUtilities.now()
+        if (task.hasDueDate() && task.getFlag(Task.REMINDER_FLAGS, Task.NOTIFY_AFTER_DEADLINE)) {
             Date due = new Date(task.getValue(Task.DUE_DATE));
             if (!task.hasDueTime()) {
                 due.setHours(23);
@@ -274,14 +281,14 @@ public final class ReminderService  {
             long dueDateForOverdue = due.getTime();
             long lastReminder = task.getValue(Task.REMINDER_LAST);
 
-            if(dueDateForOverdue > getNowValue())
-                return dueDateForOverdue + (long)((0.5f + 2f * random.nextFloat()) * DateUtilities.ONE_HOUR);
+            if (dueDateForOverdue > getNowValue())
+                return dueDateForOverdue + (long) ((0.5f + 2f * random.nextFloat()) * DateUtilities.ONE_HOUR);
 
-            if(lastReminder < dueDateForOverdue)
+            if (lastReminder < dueDateForOverdue)
                 return getNowValue();
 
-            if(getNowValue() - lastReminder < 6 * DateUtilities.ONE_HOUR)
-                return getNowValue() + (long)((2.0f +
+            if (getNowValue() - lastReminder < 6 * DateUtilities.ONE_HOUR)
+                return getNowValue() + (long) ((2.0f +
                         task.getValue(Task.IMPORTANCE) +
                         6f * random.nextFloat()) * DateUtilities.ONE_HOUR);
 
@@ -292,11 +299,11 @@ public final class ReminderService  {
 
     /**
      * Calculate the next alarm time for due date reminders.
-     * <p>
+     * <p/>
      * This alarm always returns the due date, and is triggered if
      * the last reminder time occurred before the due date. This means it is
      * possible to return due dates in the past.
-     * <p>
+     * <p/>
      * If the date was indicated to not have a due time, we read from
      * preferences and assign a time.
      *
@@ -305,13 +312,13 @@ public final class ReminderService  {
      */
     private long calculateNextDueDateReminder(Task task) {
         // Uses getNowValue() instead of DateUtilities.now()
-        if(task.hasDueDate() && task.getFlag(Task.REMINDER_FLAGS, Task.NOTIFY_AT_DEADLINE)) {
+        if (task.hasDueDate() && task.getFlag(Task.REMINDER_FLAGS, Task.NOTIFY_AT_DEADLINE)) {
             long dueDate = task.getValue(Task.DUE_DATE);
             long lastReminder = task.getValue(Task.REMINDER_LAST);
 
             long dueDateAlarm = NO_ALARM;
 
-            if(task.hasDueTime())
+            if (task.hasDueTime())
                 // return due date straight up
                 dueDateAlarm = dueDate;
             else if (DateUtilities.now() > lastReminder + DateUtilities.ONE_DAY) {
@@ -344,10 +351,10 @@ public final class ReminderService  {
                     //
                     int periodDivFactor = 4;
 
-                    if(quietHoursStart != -1 && quietHoursEnd != -1) {
+                    if (quietHoursStart != -1 && quietHoursEnd != -1) {
                         int hour = new Date().getHours();
-                        if(quietHoursStart <= quietHoursEnd) {
-                            if(hour >= quietHoursStart && hour < quietHoursEnd) {
+                        if (quietHoursStart <= quietHoursEnd) {
+                            if (hour >= quietHoursStart && hour < quietHoursEnd) {
                                 // its quiet now, quietHoursEnd is 23 max,
                                 // so put the default reminder to the end of the quiethours
                                 date.setHours(quietHoursEnd);
@@ -358,16 +365,16 @@ public final class ReminderService  {
                                 long millisAfterQuiet = dueDate - quietHoursEndDate.getTime();
 
                                 // if there is more time after quiethours today, select quiethours-end for reminder
-                                if (millisAfterQuiet > (millisToQuiet / ((float)(1-(1/periodDivFactor))) ))
+                                if (millisAfterQuiet > (millisToQuiet / ((float) (1 - (1 / periodDivFactor)))))
                                     dueDateAlarm = quietHoursEndDate.getTime();
                                 else
-                                    dueDateAlarm = getNowValue() + (long)(millisToQuiet / periodDivFactor);
+                                    dueDateAlarm = getNowValue() + (long) (millisToQuiet / periodDivFactor);
                             } else {
                                 // after quietHours, reuse dueDate for end of day
-                                dueDateAlarm = getNowValue() + (long)(millisToEndOfDay / periodDivFactor);
+                                dueDateAlarm = getNowValue() + (long) (millisToEndOfDay / periodDivFactor);
                             }
                         } else { // wrap across 24/hour boundary
-                            if(hour >= quietHoursStart) {
+                            if (hour >= quietHoursStart) {
                                 // do nothing for the end of day, dont let it even vibrate
                                 dueDateAlarm = NO_ALARM;
                             } else if (hour < quietHoursEnd) {
@@ -376,20 +383,20 @@ public final class ReminderService  {
                             } else {
                                 // quietHours didnt start yet
                                 millisToQuiet = quietHoursStartDate.getTime() - getNowValue();
-                                dueDateAlarm = getNowValue() + (long)(millisToQuiet / periodDivFactor);
+                                dueDateAlarm = getNowValue() + (long) (millisToQuiet / periodDivFactor);
                             }
                         }
                     } else {
                         // Quiet hours not activated, simply schedule the reminder on 1/periodDivFactor towards the end of day
-                        dueDateAlarm = getNowValue() + (long)(millisToEndOfDay / periodDivFactor);
+                        dueDateAlarm = getNowValue() + (long) (millisToEndOfDay / periodDivFactor);
                     }
 
-                    if(dueDate > getNowValue() && dueDateAlarm < getNowValue())
+                    if (dueDate > getNowValue() && dueDateAlarm < getNowValue())
                         dueDateAlarm = dueDate;
                 }
             }
 
-            if(lastReminder > dueDateAlarm)
+            if (lastReminder > dueDateAlarm)
                 return NO_ALARM;
 
             return dueDateAlarm;
@@ -399,7 +406,7 @@ public final class ReminderService  {
 
     /**
      * Calculate the next alarm time for random reminders.
-     * <p>
+     * <p/>
      * We take the last reminder time and add approximately the reminder
      * period. If it's still in the past, we set it to some time in the near
      * future.
@@ -409,16 +416,16 @@ public final class ReminderService  {
      */
     private long calculateNextRandomReminder(Task task) {
         long reminderPeriod = task.getValue(Task.REMINDER_PERIOD);
-        if((reminderPeriod) > 0) {
+        if ((reminderPeriod) > 0) {
             long when = task.getValue(Task.REMINDER_LAST);
 
-            if(when == 0)
+            if (when == 0)
                 when = task.getValue(Task.CREATION_DATE);
 
-            when += (long)(reminderPeriod * (0.85f + 0.3f * random.nextFloat()));
+            when += (long) (reminderPeriod * (0.85f + 0.3f * random.nextFloat()));
 
-            if(when < DateUtilities.now()) {
-                when = DateUtilities.now() + (long)((0.5f +
+            if (when < DateUtilities.now()) {
+                when = DateUtilities.now() + (long) ((0.5f +
                         6 * random.nextFloat()) * DateUtilities.ONE_HOUR);
             }
 
@@ -455,7 +462,7 @@ public final class ReminderService  {
          */
         @SuppressWarnings("nls")
         public void createAlarm(Task task, long time, int type) {
-            if(task.getId() == Task.NO_ID)
+            if (task.getId() == Task.NO_ID)
                 return;
             Context context = ContextManager.getContext();
             Intent intent = new Intent(context, Notifications.class);
@@ -473,18 +480,18 @@ public final class ReminderService  {
             } catch (Exception e) {
                 requestCode = type;
             }
-            AlarmManager am = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
+            AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
             PendingIntent pendingIntent = PendingIntent.getBroadcast(context, requestCode,
                     intent, 0);
 
             if (time == 0 || time == NO_ALARM)
                 am.cancel(pendingIntent);
             else {
-                if(time < DateUtilities.now())
+                if (time < DateUtilities.now())
                     time = DateUtilities.now() + 5000L;
 
-               if(Constants.DEBUG)
-                    Log.e("Astrid", "Reminder set for " + new Date(time)+" for (\""+task.getValue(Task.TITLE)+"\" (" + task.getId() + "), " + type +")");
+                if (Constants.DEBUG)
+                    Log.e("Astrid", "Reminder set for " + new Date(time) + " for (\"" + task.getValue(Task.TITLE) + "\" (" + task.getId() + "), " + type + ")");
                 am.set(AlarmManager.RTC_WAKEUP, time, pendingIntent);
             }
         }
@@ -494,6 +501,7 @@ public final class ReminderService  {
 
     /**
      * Gets a listing of all tasks that are active &
+     *
      * @param properties
      * @return todoroo cursor. PLEASE CLOSE THIS CURSOR!
      */
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderStartupReceiver.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderStartupReceiver.java
index 9d8976686..ce8507833 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderStartupReceiver.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderStartupReceiver.java
@@ -16,7 +16,6 @@ import com.todoroo.astrid.service.AstridDependencyInjector;
  * Service which handles jobs that need to be run when phone boots
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class ReminderStartupReceiver extends BroadcastReceiver {
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
index a6625b9a5..b7ff551dc 100644
--- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
@@ -5,13 +5,6 @@
  */
 package com.todoroo.astrid.repeats;
 
-import java.text.DateFormatSymbols;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -50,11 +43,17 @@ import com.todoroo.astrid.ui.NumberPickerDialog;
 import com.todoroo.astrid.ui.NumberPickerDialog.OnNumberPickedListener;
 import com.todoroo.astrid.ui.PopupControlSet;
 
+import java.text.DateFormatSymbols;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
 /**
  * Control Set for managing repeats
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class RepeatControlSet extends PopupControlSet {
 
@@ -103,7 +102,9 @@ public class RepeatControlSet extends PopupControlSet {
         DependencyInjectionService.getInstance().inject(this);
     }
 
-    /** Set up the repeat value button */
+    /**
+     * Set up the repeat value button
+     */
     private void setRepeatValue(int newValue) {
         repeatValue = newValue;
         value.setText(activity.getString(R.string.repeat_every, newValue));
@@ -120,17 +121,17 @@ public class RepeatControlSet extends PopupControlSet {
 
     protected void repeatValueClick() {
         int dialogValue = repeatValue;
-        if(dialogValue == 0)
+        if (dialogValue == 0)
             dialogValue = 1;
 
         new NumberPickerDialog(activity, new OnNumberPickedListener() {
             @Override
             public void onNumberPicked(NumberPicker view,
-                    int number) {
+                                       int number) {
                 setRepeatValue(number);
             }
         }, activity.getResources().getString(R.string.repeat_interval_prompt),
-        dialogValue, 1, 1, 365).show();
+                dialogValue, 1, 1, 365).show();
     }
 
     private void repeatUntilClick() {
@@ -165,39 +166,39 @@ public class RepeatControlSet extends PopupControlSet {
     public void readFromTask(Task task) {
         super.readFromTask(task);
         recurrence = model.sanitizedRecurrence();
-        if(recurrence == null)
+        if (recurrence == null)
             recurrence = "";
 
         repeatUntilValue = model.getValue(Task.REPEAT_UNTIL);
 
-        if(recurrence.length() > 0) {
+        if (recurrence.length() > 0) {
             try {
                 RRule rrule = new RRule(recurrence);
                 repeatValue = rrule.getInterval();
-                switch(rrule.getFreq()) {
-                case DAILY:
-                    intervalValue = INTERVAL_DAYS;
-                    break;
-                case WEEKLY: {
-                    intervalValue = INTERVAL_WEEKS;
-                    break;
-                }
-                case MONTHLY:
-                    intervalValue = INTERVAL_MONTHS;
-                    break;
-                case HOURLY:
-                    intervalValue = INTERVAL_HOURS;
-                    break;
-                case MINUTELY:
-                    intervalValue = INTERVAL_MINUTES;
-                    break;
-                case YEARLY:
-                    intervalValue = INTERVAL_YEARS;
-                    break;
-                default:
-                    // an unhandled recurrence
-                    exceptionService.reportError("repeat-unhandled-rule",  //$NON-NLS-1$
-                            new Exception("Unhandled rrule frequency: " + recurrence));
+                switch (rrule.getFreq()) {
+                    case DAILY:
+                        intervalValue = INTERVAL_DAYS;
+                        break;
+                    case WEEKLY: {
+                        intervalValue = INTERVAL_WEEKS;
+                        break;
+                    }
+                    case MONTHLY:
+                        intervalValue = INTERVAL_MONTHS;
+                        break;
+                    case HOURLY:
+                        intervalValue = INTERVAL_HOURS;
+                        break;
+                    case MINUTELY:
+                        intervalValue = INTERVAL_MINUTES;
+                        break;
+                    case YEARLY:
+                        intervalValue = INTERVAL_YEARS;
+                        break;
+                    default:
+                        // an unhandled recurrence
+                        exceptionService.reportError("repeat-unhandled-rule",  //$NON-NLS-1$
+                                new Exception("Unhandled rrule frequency: " + recurrence));
                 }
             } catch (Exception e) {
                 // invalid RRULE
@@ -213,16 +214,16 @@ public class RepeatControlSet extends PopupControlSet {
     @Override
     protected void readFromTaskOnInitialize() {
         Date date;
-        if(model.getValue(Task.DUE_DATE) != 0) {
+        if (model.getValue(Task.DUE_DATE) != 0) {
             date = new Date(model.getValue(Task.DUE_DATE));
 
             int dayOfWeek = date.getDay();
-            for(int i = 0; i < 7; i++)
+            for (int i = 0; i < 7; i++)
                 daysOfWeek[i].setChecked(i == dayOfWeek);
         }
 
         // read recurrence rule
-        if(recurrence.length() > 0) {
+        if (recurrence.length() > 0) {
             try {
                 RRule rrule = new RRule(recurrence);
 
@@ -231,12 +232,12 @@ public class RepeatControlSet extends PopupControlSet {
                 interval.setSelection(intervalValue);
 
                 // clear all day of week checks, then update them
-                for(int i = 0; i < 7; i++)
+                for (int i = 0; i < 7; i++)
                     daysOfWeek[i].setChecked(false);
 
-                for(WeekdayNum day : rrule.getByDay()) {
-                    for(int i = 0; i < 7; i++)
-                        if(daysOfWeek[i].getTag().equals(day.wday))
+                for (WeekdayNum day : rrule.getByDay()) {
+                    for (int i = 0; i < 7; i++)
+                        if (daysOfWeek[i].getTag().equals(day.wday))
                             daysOfWeek[i].setChecked(true);
                 }
 
@@ -251,7 +252,7 @@ public class RepeatControlSet extends PopupControlSet {
         doRepeat = recurrence.length() > 0;
 
         // read flag
-        if(model.repeatAfterCompletion())
+        if (model.repeatAfterCompletion())
             type.setSelection(TYPE_COMPLETION_DATE);
         else
             type.setSelection(TYPE_DUE_DATE);
@@ -273,9 +274,9 @@ public class RepeatControlSet extends PopupControlSet {
         DateFormatSymbols dfs = new DateFormatSymbols();
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.DAY_OF_WEEK, calendar.getFirstDayOfWeek());
-        LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT, 1.0f/14);
-        LinearLayout.LayoutParams textLp = new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT, 1.0f/14);
-        for(int i = 0; i < 7; i++) {
+        LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT, 1.0f / 14);
+        LinearLayout.LayoutParams textLp = new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT, 1.0f / 14);
+        for (int i = 0; i < 7; i++) {
             CheckBox checkBox = new CheckBox(activity);
             int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
             checkBox.setPadding(0, 0, 0, 0);
@@ -327,41 +328,41 @@ public class RepeatControlSet extends PopupControlSet {
     @Override
     protected String writeToModelAfterInitialized(Task task) {
         String result;
-        if(!doRepeat)
+        if (!doRepeat)
             result = ""; //$NON-NLS-1$
         else {
-            if(TextUtils.isEmpty(task.getValue(Task.RECURRENCE))) {
+            if (TextUtils.isEmpty(task.getValue(Task.RECURRENCE))) {
                 StatisticsService.reportEvent(StatisticsConstants.REPEAT_TASK_CREATE);
             }
 
             RRule rrule = new RRule();
             rrule.setInterval(repeatValue);
-            switch(interval.getSelectedItemPosition()) {
-            case INTERVAL_DAYS:
-                rrule.setFreq(Frequency.DAILY);
-                break;
-            case INTERVAL_WEEKS: {
-                rrule.setFreq(Frequency.WEEKLY);
-
-                ArrayList<WeekdayNum> days = new ArrayList<WeekdayNum>();
-                for(int i = 0; i < daysOfWeek.length; i++)
-                    if(daysOfWeek[i].isChecked())
-                        days.add(new WeekdayNum(0, (Weekday)daysOfWeek[i].getTag()));
-                rrule.setByDay(days);
-                break;
-            }
-            case INTERVAL_MONTHS:
-                rrule.setFreq(Frequency.MONTHLY);
-                break;
-            case INTERVAL_HOURS:
-                rrule.setFreq(Frequency.HOURLY);
-                break;
-            case INTERVAL_MINUTES:
-                rrule.setFreq(Frequency.MINUTELY);
-                break;
-            case INTERVAL_YEARS:
-                rrule.setFreq(Frequency.YEARLY);
-                break;
+            switch (interval.getSelectedItemPosition()) {
+                case INTERVAL_DAYS:
+                    rrule.setFreq(Frequency.DAILY);
+                    break;
+                case INTERVAL_WEEKS: {
+                    rrule.setFreq(Frequency.WEEKLY);
+
+                    ArrayList<WeekdayNum> days = new ArrayList<WeekdayNum>();
+                    for (int i = 0; i < daysOfWeek.length; i++)
+                        if (daysOfWeek[i].isChecked())
+                            days.add(new WeekdayNum(0, (Weekday) daysOfWeek[i].getTag()));
+                    rrule.setByDay(days);
+                    break;
+                }
+                case INTERVAL_MONTHS:
+                    rrule.setFreq(Frequency.MONTHLY);
+                    break;
+                case INTERVAL_HOURS:
+                    rrule.setFreq(Frequency.HOURLY);
+                    break;
+                case INTERVAL_MINUTES:
+                    rrule.setFreq(Frequency.MINUTELY);
+                    break;
+                case INTERVAL_YEARS:
+                    rrule.setFreq(Frequency.YEARLY);
+                    break;
             }
 
             result = rrule.toIcal();
@@ -376,7 +377,7 @@ public class RepeatControlSet extends PopupControlSet {
         task.setValue(Task.RECURRENCE, result);
         task.setValue(Task.REPEAT_UNTIL, repeatUntilValue);
 
-        if(task.repeatAfterCompletion())
+        if (task.repeatAfterCompletion())
             type.setSelection(1);
 
         return null;
@@ -421,7 +422,7 @@ public class RepeatControlSet extends PopupControlSet {
             arrayResource = R.array.repeat_interval;
 
         String[] dates = activity.getResources().getStringArray(
-                    arrayResource);
+                arrayResource);
         String date = String.format("%s %s", repeatValue, dates[intervalValue]); //$NON-NLS-1$
         if (repeatUntilValue > 0)
             return activity.getString(R.string.repeat_detail_duedate_until, date, DateAndTimePicker.getDisplayString(activity, repeatUntilValue, false, useAbbrev, useAbbrev));
diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatDetailExposer.java
index e60771365..21bf31b53 100644
--- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatDetailExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatDetailExposer.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.repeats;
 
-import java.text.DateFormatSymbols;
-import java.text.ParseException;
-import java.util.List;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -22,11 +18,14 @@ import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.data.Task;
 
+import java.text.DateFormatSymbols;
+import java.text.ParseException;
+import java.util.List;
+
 /**
  * Exposes Task Detail for repeats, i.e. "Repeats every 2 days"
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class RepeatDetailExposer extends BroadcastReceiver {
 
@@ -34,11 +33,11 @@ public class RepeatDetailExposer extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         // get tags associated with this task
         long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1);
-        if(taskId == -1)
+        if (taskId == -1)
             return;
 
         String taskDetail = getTaskDetails(context, taskId);
-        if(taskDetail == null)
+        if (taskDetail == null)
             return;
 
         // transmit
@@ -51,13 +50,13 @@ public class RepeatDetailExposer extends BroadcastReceiver {
 
     public String getTaskDetails(Context context, long id) {
         Task task = PluginServices.getTaskService().fetchById(id, Task.RECURRENCE);
-        if(task == null)
+        if (task == null)
             return null;
 
         Resources r = context.getResources();
 
         String recurrence = task.sanitizedRecurrence();
-        if(recurrence != null && recurrence.length() > 0) {
+        if (recurrence != null && recurrence.length() > 0) {
             RRule rrule;
             try {
                 rrule = new RRule(recurrence);
@@ -70,15 +69,15 @@ public class RepeatDetailExposer extends BroadcastReceiver {
 
             interval = "<b>" + interval + "</b>";  //$NON-NLS-1$//$NON-NLS-2$
             List<WeekdayNum> byDay = rrule.getByDay();
-            if(rrule.getFreq() == Frequency.WEEKLY || byDay.size() != 7) {
-                if(byDay.size() > 0) {
+            if (rrule.getFreq() == Frequency.WEEKLY || byDay.size() != 7) {
+                if (byDay.size() > 0) {
                     StringBuilder byDayString = new StringBuilder();
                     DateFormatSymbols dfs = new DateFormatSymbols();
                     String[] weekdays = dfs.getShortWeekdays();
-                    for(int i = 0; i < byDay.size(); i++) {
+                    for (int i = 0; i < byDay.size(); i++) {
                         byDayString.append(weekdays[byDay.get(i).wday.javaDayNum]);
-                        if(i < byDay.size() - 1)
-                        byDayString.append(", "); //$NON-NLS-1$
+                        if (i < byDay.size() - 1)
+                            byDayString.append(", "); //$NON-NLS-1$
                     }
                     interval = r.getString(R.string.repeat_detail_byday).replace("$I",  //$NON-NLS-1$
                             interval).replace("$D", byDayString); //$NON-NLS-1$
@@ -86,7 +85,7 @@ public class RepeatDetailExposer extends BroadcastReceiver {
             }
 
             String detail;
-            if(task.repeatAfterCompletion())
+            if (task.repeatAfterCompletion())
                 detail = context.getString(R.string.repeat_detail_completion, interval);
             else
                 detail = context.getString(R.string.repeat_detail_duedate, interval);
@@ -98,22 +97,28 @@ public class RepeatDetailExposer extends BroadcastReceiver {
 
     private String getIntervalFor(Resources r, RRule rrule) {
         int plural;
-        switch(rrule.getFreq()) {
-        case MINUTELY:
-            plural = R.plurals.DUt_minutes; break;
-        case HOURLY:
-            plural = R.plurals.DUt_hours; break;
-        case DAILY:
-            plural = R.plurals.DUt_days; break;
-        case WEEKLY:
-            plural = R.plurals.DUt_weeks; break;
-        case MONTHLY:
-            plural = R.plurals.DUt_months; break;
-        case YEARLY:
-            plural = R.plurals.DUt_years; break;
-        default:
-            // not designed to be used, only a fail-safe
-            return rrule.getInterval() + "-" + rrule.getFreq().name(); //$NON-NLS-1$
+        switch (rrule.getFreq()) {
+            case MINUTELY:
+                plural = R.plurals.DUt_minutes;
+                break;
+            case HOURLY:
+                plural = R.plurals.DUt_hours;
+                break;
+            case DAILY:
+                plural = R.plurals.DUt_days;
+                break;
+            case WEEKLY:
+                plural = R.plurals.DUt_weeks;
+                break;
+            case MONTHLY:
+                plural = R.plurals.DUt_months;
+                break;
+            case YEARLY:
+                plural = R.plurals.DUt_years;
+                break;
+            default:
+                // not designed to be used, only a fail-safe
+                return rrule.getInterval() + "-" + rrule.getFreq().name(); //$NON-NLS-1$
         }
 
         return r.getQuantityString(plural, rrule.getInterval(), rrule.getInterval());
diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java
index 500e2c981..a7b6b91dd 100644
--- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java
+++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java
@@ -5,14 +5,6 @@
  */
 package com.todoroo.astrid.repeats;
 
-import java.text.ParseException;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.TimeZone;
-
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -40,30 +32,39 @@ import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.utility.Flags;
 
+import java.text.ParseException;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.TimeZone;
+
 public class RepeatTaskCompleteListener extends BroadcastReceiver {
 
-    @Autowired ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    ActFmPreferenceService actFmPreferenceService;
 
     @Override
     public void onReceive(Context context, Intent intent) {
         ContextManager.setContext(context);
         DependencyInjectionService.getInstance().inject(this);
         long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1);
-        if(taskId == -1)
+        if (taskId == -1)
             return;
 
         Task task = PluginServices.getTaskService().fetchById(taskId, Task.PROPERTIES);
-        if(task == null || !task.isCompleted())
+        if (task == null || !task.isCompleted())
             return;
 
         String recurrence = task.sanitizedRecurrence();
         boolean repeatAfterCompletion = task.repeatAfterCompletion();
 
-        if(recurrence != null && recurrence.length() > 0) {
+        if (recurrence != null && recurrence.length() > 0) {
             long newDueDate;
             try {
                 newDueDate = computeNextDueDate(task, recurrence, repeatAfterCompletion);
-                if(newDueDate == -1)
+                if (newDueDate == -1)
                     return;
             } catch (ParseException e) {
                 PluginServices.getExceptionService().reportError("repeat-parse", e); //$NON-NLS-1$
@@ -101,7 +102,7 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
 
     public static void rescheduleTask(Task task, long newDueDate) {
         long hideUntil = task.getValue(Task.HIDE_UNTIL);
-        if(hideUntil > 0 && task.getValue(Task.DUE_DATE) > 0) {
+        if (hideUntil > 0 && task.getValue(Task.DUE_DATE) > 0) {
             hideUntil += newDueDate - task.getValue(Task.DUE_DATE);
         }
 
@@ -115,7 +116,9 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
         PluginServices.getTaskService().save(task);
     }
 
-    /** Compute next due date */
+    /**
+     * Compute next due date
+     */
     public static long computeNextDueDate(Task task, String recurrence, boolean repeatAfterCompletion) throws ParseException {
         RRule rrule = initRRule(recurrence);
 
@@ -123,9 +126,9 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
         Date original = setUpStartDate(task, repeatAfterCompletion, rrule.getFreq());
         DateValue startDateAsDV = setUpStartDateAsDV(task, original);
 
-        if(rrule.getFreq() == Frequency.HOURLY || rrule.getFreq() == Frequency.MINUTELY)
+        if (rrule.getFreq() == Frequency.HOURLY || rrule.getFreq() == Frequency.MINUTELY)
             return handleSubdayRepeat(original, rrule);
-        else if(rrule.getFreq() == Frequency.WEEKLY && rrule.getByDay().size() > 0 && repeatAfterCompletion)
+        else if (rrule.getFreq() == Frequency.WEEKLY && rrule.getByDay().size() > 0 && repeatAfterCompletion)
             return handleWeeklyRepeatAfterComplete(rrule, original, task.hasDueTime());
         else if (rrule.getFreq() == Frequency.MONTHLY)
             return handleMonthlyRepeat(original, startDateAsDV, task.hasDueTime(), rrule);
@@ -134,7 +137,7 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
     }
 
     private static long handleWeeklyRepeatAfterComplete(RRule rrule, Date original,
-            boolean hasDueTime) {
+                                                        boolean hasDueTime) {
         List<WeekdayNum> byDay = rrule.getByDay();
         long newDate = original.getTime();
         newDate += DateUtilities.ONE_WEEK * (rrule.getInterval() - 1);
@@ -149,7 +152,7 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
         } while (date.get(Calendar.DAY_OF_WEEK) != next.wday.javaDayNum);
 
         long time = date.getTimeInMillis();
-        if(hasDueTime)
+        if (hasDueTime)
             return Task.createDueDate(Task.URGENCY_SPECIFIC_DAY_TIME, time);
         else
             return Task.createDueDate(Task.URGENCY_SPECIFIC_DAY, time);
@@ -183,7 +186,7 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
     };
 
     private static WeekdayNum findNextWeekday(List<WeekdayNum> byDay,
-            Calendar date) {
+                                              Calendar date) {
         WeekdayNum next = byDay.get(0);
         for (int i = 0; i < byDay.size(); i++) {
             WeekdayNum weekday = byDay.get(i);
@@ -195,34 +198,36 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
     }
 
     private static long invokeRecurrence(RRule rrule, Date original,
-            DateValue startDateAsDV) {
+                                         DateValue startDateAsDV) {
         long newDueDate = -1;
         RecurrenceIterator iterator = RecurrenceIteratorFactory.createRecurrenceIterator(rrule,
                 startDateAsDV, TimeZone.getDefault());
         DateValue nextDate = startDateAsDV;
 
-        for(int i = 0; i < 10; i++) { // ten tries then we give up
-            if(!iterator.hasNext())
+        for (int i = 0; i < 10; i++) { // ten tries then we give up
+            if (!iterator.hasNext())
                 return -1;
             nextDate = iterator.next();
 
-            if(nextDate.compareTo(startDateAsDV) == 0)
+            if (nextDate.compareTo(startDateAsDV) == 0)
                 continue;
 
             newDueDate = buildNewDueDate(original, nextDate);
 
             // detect if we finished
-            if(newDueDate > original.getTime())
+            if (newDueDate > original.getTime())
                 break;
         }
         return newDueDate;
     }
 
-    /** Compute long due date from DateValue */
+    /**
+     * Compute long due date from DateValue
+     */
     private static long buildNewDueDate(Date original, DateValue nextDate) {
         long newDueDate;
-        if(nextDate instanceof DateTimeValueImpl) {
-            DateTimeValueImpl newDateTime = (DateTimeValueImpl)nextDate;
+        if (nextDate instanceof DateTimeValueImpl) {
+            DateTimeValueImpl newDateTime = (DateTimeValueImpl) nextDate;
             Date date = new Date(Date.UTC(newDateTime.year() - 1900, newDateTime.month() - 1,
                     newDateTime.day(), newDateTime.hour(),
                     newDateTime.minute(), newDateTime.second()));
@@ -239,30 +244,35 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
         return newDueDate;
     }
 
-    /** Initialize RRule instance */
+    /**
+     * Initialize RRule instance
+     */
     private static RRule initRRule(String recurrence) throws ParseException {
         RRule rrule = new RRule(recurrence);
 
         // handle the iCalendar "byDay" field differently depending on if
         // we are weekly or otherwise
-        if(rrule.getFreq() != Frequency.WEEKLY)
+        if (rrule.getFreq() != Frequency.WEEKLY)
             rrule.setByDay(Collections.EMPTY_LIST);
 
         return rrule;
     }
 
-    /** Set up repeat start date
-     * @param frequency */
+    /**
+     * Set up repeat start date
+     *
+     * @param frequency
+     */
     private static Date setUpStartDate(Task task, boolean repeatAfterCompletion, Frequency frequency) {
         Date startDate = new Date();
-        if(task.hasDueDate()) {
+        if (task.hasDueDate()) {
             Date dueDate = new Date(task.getValue(Task.DUE_DATE));
-            if(repeatAfterCompletion)
+            if (repeatAfterCompletion)
                 startDate = new Date(task.getValue(Task.COMPLETION_DATE));
             else
                 startDate = dueDate;
 
-            if(task.hasDueTime() && frequency != Frequency.HOURLY && frequency != Frequency.MINUTELY) {
+            if (task.hasDueTime() && frequency != Frequency.HOURLY && frequency != Frequency.MINUTELY) {
                 startDate.setHours(dueDate.getHours());
                 startDate.setMinutes(dueDate.getMinutes());
                 startDate.setSeconds(dueDate.getSeconds());
@@ -272,7 +282,7 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
     }
 
     private static DateValue setUpStartDateAsDV(Task task, Date startDate) {
-        if(task.hasDueTime())
+        if (task.hasDueTime())
             return new DateTimeValueImpl(startDate.getYear() + 1900,
                     startDate.getMonth() + 1, startDate.getDate(),
                     startDate.getHours(), startDate.getMinutes(), startDate.getSeconds());
@@ -283,15 +293,15 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
 
     private static long handleSubdayRepeat(Date startDate, RRule rrule) {
         long millis;
-        switch(rrule.getFreq()) {
-        case HOURLY:
-            millis = DateUtilities.ONE_HOUR;
-            break;
-        case MINUTELY:
-            millis = DateUtilities.ONE_MINUTE;
-            break;
-        default:
-            throw new RuntimeException("Error handing subday repeat: " + rrule.getFreq()); //$NON-NLS-1$
+        switch (rrule.getFreq()) {
+            case HOURLY:
+                millis = DateUtilities.ONE_HOUR;
+                break;
+            case MINUTELY:
+                millis = DateUtilities.ONE_MINUTE;
+                break;
+            default:
+                throw new RuntimeException("Error handing subday repeat: " + rrule.getFreq()); //$NON-NLS-1$
         }
         long newDueDate = startDate.getTime() + millis * rrule.getInterval();
         return Task.createDueDate(Task.URGENCY_SPECIFIC_DAY_TIME,
diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
index b4f8846f7..caf9948d2 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
@@ -1,11 +1,5 @@
 package com.todoroo.astrid.subtasks;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
-
 import android.app.Activity;
 import android.database.Cursor;
 import android.text.TextUtils;
@@ -41,6 +35,12 @@ import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.ui.DraggableListView;
 import com.todoroo.astrid.utility.AstridPreferences;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+
 public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmentHelperInterface<LIST> {
 
 
@@ -48,8 +48,10 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
     private final AstridOrderedListUpdater<LIST> updater;
     private final TaskListFragment fragment;
 
-    @Autowired TaskService taskService;
-    @Autowired MetadataService metadataService;
+    @Autowired
+    TaskService taskService;
+    @Autowired
+    MetadataService metadataService;
 
     private DraggableTaskAdapter taskAdapter;
 
@@ -89,7 +91,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
         getTouchListView().setSwipeListener(swipeListener);
         getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
 
-        if(Preferences.getInt(AstridPreferences.P_SUBTASKS_HELP, 0) == 0)
+        if (Preferences.getInt(AstridPreferences.P_SUBTASKS_HELP, 0) == 0)
             showSubtasksHelp();
     }
 
@@ -119,11 +121,12 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
         @Override
         public void drop(int from, int to) {
             String targetTaskId = taskAdapter.getItemUuid(from);
-            if (!RemoteModel.isValidUuid(targetTaskId)) return; // This can happen with gestures on empty parts of the list (e.g. extra space below tasks)
+            if (!RemoteModel.isValidUuid(targetTaskId))
+                return; // This can happen with gestures on empty parts of the list (e.g. extra space below tasks)
             String destinationTaskId = taskAdapter.getItemUuid(to);
 
             try {
-                if(to >= getListView().getCount())
+                if (to >= getListView().getCount())
                     updater.moveTo(list, getFilter(), targetTaskId, "-1"); //$NON-NLS-1$
                 else
                     updater.moveTo(list, getFilter(), targetTaskId, destinationTaskId);
@@ -149,7 +152,8 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
 
         protected void indent(int which, int delta) {
             String targetTaskId = taskAdapter.getItemUuid(which);
-            if (!RemoteModel.isValidUuid(targetTaskId)) return; // This can happen with gestures on empty parts of the list (e.g. extra space below tasks)
+            if (!RemoteModel.isValidUuid(targetTaskId))
+                return; // This can happen with gestures on empty parts of the list (e.g. extra space below tasks)
             try {
                 updater.indent(list, getFilter(), targetTaskId, delta);
             } catch (Exception e) {
@@ -164,7 +168,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
     private final GrabberClickListener rowClickListener = new GrabberClickListener() {
         @Override
         public void onLongClick(final View v) {
-            if(v == null)
+            if (v == null)
                 return;
 
             fragment.registerForContextMenu(getListView());
@@ -174,14 +178,14 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
 
         @Override
         public void onClick(View v) {
-            if(v == null)
+            if (v == null)
                 return;
             ((DraggableTaskAdapter) taskAdapter).getListener().onClick(v);
         }
     };
 
     public TaskAdapter createTaskAdapter(TodorooCursor<Task> cursor,
-            AtomicReference<String> sqlQueryTemplate) {
+                                         AtomicReference<String> sqlQueryTemplate) {
 
         taskAdapter = new DraggableTaskAdapter(fragment, TaskListFragment.getTaskRowResource(),
                 cursor, sqlQueryTemplate, false, null);
@@ -201,8 +205,8 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
     private final class DraggableTaskAdapter extends TaskAdapter {
 
         private DraggableTaskAdapter(TaskListFragment activity, int resource,
-                Cursor c, AtomicReference<String> query, boolean autoRequery,
-                OnCompletedTaskListener onCompletedTaskListener) {
+                                     Cursor c, AtomicReference<String> query, boolean autoRequery,
+                                     OnCompletedTaskListener onCompletedTaskListener) {
             super(activity, resource, c, query, autoRequery,
                     onCompletedTaskListener);
 
@@ -211,7 +215,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
 
         @Override
         protected ViewHolder getTagFromCheckBox(View v) {
-            return (ViewHolder)((View)v.getParent()).getTag();
+            return (ViewHolder) ((View) v.getParent()).getTag();
         }
 
         @Override
@@ -234,7 +238,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
     }
 
     private final Map<String, ArrayList<String>> chainedCompletions =
-        Collections.synchronizedMap(new HashMap<String, ArrayList<String>>());
+            Collections.synchronizedMap(new HashMap<String, ArrayList<String>>());
 
     private void setCompletedForItemAndSubtasks(final Task item, final boolean completedState) {
         final String itemId = item.getUuid();
@@ -242,10 +246,10 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
         final Task model = new Task();
         final long completionDate = completedState ? DateUtilities.now() : 0;
 
-        if(completedState == false) {
+        if (completedState == false) {
             ArrayList<String> chained = chainedCompletions.get(itemId);
-            if(chained != null) {
-                for(String taskId : chained) {
+            if (chained != null) {
+                for (String taskId : chained) {
                     model.setValue(Task.COMPLETION_DATE, completionDate);
                     taskService.update(Task.UUID.eq(taskId), model);
                     model.clear();
@@ -271,11 +275,11 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
             }
         });
 
-        if(chained.size() > 0) {
+        if (chained.size() > 0) {
             // move recurring items to item parent
             TodorooCursor<Task> recurring = taskService.query(Query.select(Task.UUID, Task.RECURRENCE).where(
                     Criterion.and(Task.UUID.in(chained.toArray(new String[chained.size()])),
-                                   Task.RECURRENCE.isNotNull(), Functions.length(Task.RECURRENCE).gt(0))));
+                            Task.RECURRENCE.isNotNull(), Functions.length(Task.RECURRENCE).gt(0))));
             try {
                 Task t = new Task();
                 boolean madeChanges = false;
diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java
index d407b60c0..582911f37 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java
@@ -1,14 +1,5 @@
 package com.todoroo.astrid.subtasks;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-
 import android.util.Log;
 
 import com.todoroo.andlib.data.TodorooCursor;
@@ -19,6 +10,15 @@ import com.todoroo.astrid.data.RemoteModel;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.TaskService;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 public abstract class AstridOrderedListUpdater<LIST> {
 
     @Autowired
@@ -51,7 +51,9 @@ public abstract class AstridOrderedListUpdater<LIST> {
     private final HashMap<String, Node> idToNode;
 
     protected abstract String getSerializedTree(LIST list, Filter filter);
+
     protected abstract void writeSerialization(LIST list, String serialized, boolean shouldQueueSync);
+
     protected abstract void applyToFilter(Filter filter);
 
     public int getIndentForTask(String targetTaskId) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedListFragmentHelperInterface.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedListFragmentHelperInterface.java
index 076b117d6..7f68c361a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedListFragmentHelperInterface.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedListFragmentHelperInterface.java
@@ -1,20 +1,25 @@
 package com.todoroo.astrid.subtasks;
 
-import java.util.concurrent.atomic.AtomicReference;
-
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.astrid.adapter.TaskAdapter;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.data.Task;
 
+import java.util.concurrent.atomic.AtomicReference;
+
 public interface OrderedListFragmentHelperInterface<T> {
 
     void setUpUiComponents();
+
     void beforeSetUpTaskList(Filter filter);
+
     void onCreateTask(Task task);
+
     void onDeleteTask(Task task);
+
     TaskAdapter createTaskAdapter(TodorooCursor<Task> cursor, AtomicReference<String> queryTemplate);
+
     Property<?>[] taskProperties();
 
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java
index 54048d2ed..763f2d2be 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java
@@ -5,13 +5,6 @@
  */
 package com.todoroo.astrid.subtasks;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
-
 import android.app.Activity;
 import android.database.Cursor;
 import android.text.TextUtils;
@@ -46,14 +39,23 @@ import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater.OrderedListNodeVis
 import com.todoroo.astrid.ui.DraggableListView;
 import com.todoroo.astrid.utility.AstridPreferences;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+
 public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragmentHelperInterface<LIST> {
 
     private final DisplayMetrics metrics = new DisplayMetrics();
     private final OrderedMetadataListUpdater<LIST> updater;
     private final TaskListFragment fragment;
 
-    @Autowired TaskService taskService;
-    @Autowired MetadataService metadataService;
+    @Autowired
+    TaskService taskService;
+    @Autowired
+    MetadataService metadataService;
 
     private DraggableTaskAdapter taskAdapter;
 
@@ -93,7 +95,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
         getTouchListView().setSwipeListener(swipeListener);
         getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
 
-        if(Preferences.getInt(AstridPreferences.P_SUBTASKS_HELP, 0) == 0)
+        if (Preferences.getInt(AstridPreferences.P_SUBTASKS_HELP, 0) == 0)
             showSubtasksHelp();
     }
 
@@ -135,11 +137,12 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
         @Override
         public void drop(int from, int to) {
             long targetTaskId = taskAdapter.getItemId(from);
-            if (targetTaskId <= 0) return; // This can happen with gestures on empty parts of the list (e.g. extra space below tasks)
+            if (targetTaskId <= 0)
+                return; // This can happen with gestures on empty parts of the list (e.g. extra space below tasks)
             long destinationTaskId = taskAdapter.getItemId(to);
 
             try {
-                if(to >= getListView().getCount())
+                if (to >= getListView().getCount())
                     updater.moveTo(getFilter(), list, targetTaskId, -1);
                 else
                     updater.moveTo(getFilter(), list, targetTaskId, destinationTaskId);
@@ -164,7 +167,8 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
 
         protected void indent(int which, int delta) {
             long targetTaskId = taskAdapter.getItemId(which);
-            if (targetTaskId <= 0) return; // This can happen with gestures on empty parts of the list (e.g. extra space below tasks)
+            if (targetTaskId <= 0)
+                return; // This can happen with gestures on empty parts of the list (e.g. extra space below tasks)
             try {
                 updater.indent(getFilter(), list, targetTaskId, delta);
             } catch (Exception e) {
@@ -177,7 +181,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
     private final GrabberClickListener rowClickListener = new GrabberClickListener() {
         @Override
         public void onLongClick(final View v) {
-            if(v == null)
+            if (v == null)
                 return;
 
             fragment.registerForContextMenu(getListView());
@@ -187,14 +191,14 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
 
         @Override
         public void onClick(View v) {
-            if(v == null)
+            if (v == null)
                 return;
             ((DraggableTaskAdapter) taskAdapter).getListener().onClick(v);
         }
     };
 
     public TaskAdapter createTaskAdapter(TodorooCursor<Task> cursor,
-            AtomicReference<String> sqlQueryTemplate) {
+                                         AtomicReference<String> sqlQueryTemplate) {
 
         taskAdapter = new DraggableTaskAdapter(fragment, TaskListFragment.getTaskRowResource(),
                 cursor, sqlQueryTemplate, false, null);
@@ -212,8 +216,8 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
     private final class DraggableTaskAdapter extends TaskAdapter {
 
         private DraggableTaskAdapter(TaskListFragment activity, int resource,
-                Cursor c, AtomicReference<String> query, boolean autoRequery,
-                OnCompletedTaskListener onCompletedTaskListener) {
+                                     Cursor c, AtomicReference<String> query, boolean autoRequery,
+                                     OnCompletedTaskListener onCompletedTaskListener) {
             super(activity, resource, c, query, autoRequery,
                     onCompletedTaskListener);
 
@@ -222,7 +226,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
 
         @Override
         protected ViewHolder getTagFromCheckBox(View v) {
-            return (ViewHolder)((View)v.getParent()).getTag();
+            return (ViewHolder) ((View) v.getParent()).getTag();
         }
 
         @Override
@@ -245,7 +249,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
     }
 
     private final Map<Long, ArrayList<Long>> chainedCompletions =
-        Collections.synchronizedMap(new HashMap<Long, ArrayList<Long>>());
+            Collections.synchronizedMap(new HashMap<Long, ArrayList<Long>>());
 
     private void setCompletedForItemAndSubtasks(final Task item, final boolean completedState) {
         final long itemId = item.getId();
@@ -253,10 +257,10 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
         final Task model = new Task();
         final long completionDate = completedState ? DateUtilities.now() : 0;
 
-        if(completedState == false) {
+        if (completedState == false) {
             ArrayList<Long> chained = chainedCompletions.get(itemId);
-            if(chained != null) {
-                for(Long taskId : chained) {
+            if (chained != null) {
+                for (Long taskId : chained) {
                     model.setId(taskId);
                     model.setValue(Task.COMPLETION_DATE, completionDate);
                     taskService.save(model);
@@ -275,7 +279,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
             @Override
             public void visitNode(Node node) {
                 Task childTask = taskService.fetchById(node.taskId, Task.RECURRENCE);
-                if(!TextUtils.isEmpty(childTask.getValue(Task.RECURRENCE))) {
+                if (!TextUtils.isEmpty(childTask.getValue(Task.RECURRENCE))) {
                     Metadata metadata = updater.getTaskMetadata(list, node.taskId);
                     metadata.setValue(updater.indentProperty(), parentIndent);
                     metadataService.save(metadata);
@@ -291,7 +295,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
             }
         });
 
-        if(chained.size() > 0) {
+        if (chained.size() > 0) {
             chainedCompletions.put(itemId, chained);
             taskAdapter.notifyDataSetInvalidated();
         }
diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java
index 60acb9f9b..7e64e152a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java
@@ -5,12 +5,6 @@
  */
 package com.todoroo.astrid.subtasks;
 
-import java.util.ArrayList;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-
 import com.todoroo.andlib.data.Property.IntegerProperty;
 import com.todoroo.andlib.data.Property.LongProperty;
 import com.todoroo.andlib.service.DependencyInjectionService;
@@ -18,7 +12,12 @@ import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.Task;
-import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater.OrderedListIterator;
+
+import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
 
 abstract public class OrderedMetadataListUpdater<LIST> {
 
@@ -83,7 +82,7 @@ abstract public class OrderedMetadataListUpdater<LIST> {
      * Indent a task and all its children
      */
     public void indent(final Filter filter, final LIST list, final long targetTaskId, final int delta) {
-        if(list == null)
+        if (list == null)
             return;
 
         beforeIndent(list);
@@ -96,7 +95,7 @@ abstract public class OrderedMetadataListUpdater<LIST> {
         iterateThroughList(filter, list, new OrderedListIterator() {
             @Override
             public void processTask(long taskId, Metadata metadata) {
-                if(!metadata.isSaved())
+                if (!metadata.isSaved())
                     metadata = createEmptyMetadata(list, taskId);
                 int indent = metadata.containsNonNullValue(indentProperty()) ?
                         metadata.getValue(indentProperty()) : 0;
@@ -104,13 +103,13 @@ abstract public class OrderedMetadataListUpdater<LIST> {
                 long order = globalOrder.incrementAndGet();
                 metadata.setValue(orderProperty(), order);
 
-                if(targetTaskId == taskId) {
+                if (targetTaskId == taskId) {
                     // if indenting is warranted, indent me and my children
-                    if(indent + delta <= previousIndent.get() + 1 && indent + delta >= 0) {
+                    if (indent + delta <= previousIndent.get() + 1 && indent + delta >= 0) {
                         targetTaskIndent.set(indent);
                         metadata.setValue(indentProperty(), indent + delta);
 
-                        if(parentProperty() != null) {
+                        if (parentProperty() != null) {
                             long newParent = computeNewParent(filter, list,
                                     taskId, indent + delta - 1);
                             if (newParent == taskId)
@@ -120,9 +119,9 @@ abstract public class OrderedMetadataListUpdater<LIST> {
                         }
                         saveAndUpdateModifiedDate(metadata);
                     }
-                } else if(targetTaskIndent.get() > -1) {
+                } else if (targetTaskIndent.get() > -1) {
                     // found first task that is not beneath target
-                    if(indent <= targetTaskIndent.get())
+                    if (indent <= targetTaskIndent.get())
                         targetTaskIndent.set(-1);
                     else {
                         metadata.setValue(indentProperty(), indent + delta);
@@ -133,7 +132,7 @@ abstract public class OrderedMetadataListUpdater<LIST> {
                     previousTask.set(taskId);
                 }
 
-                if(!metadata.isSaved())
+                if (!metadata.isSaved())
                     saveAndUpdateModifiedDate(metadata);
             }
 
@@ -144,6 +143,7 @@ abstract public class OrderedMetadataListUpdater<LIST> {
     /**
      * Helper function to iterate through a list and compute a new parent for the target task
      * based on the target parent's indent
+     *
      * @param list
      * @param targetTaskId
      * @param newIndent
@@ -182,24 +182,24 @@ abstract public class OrderedMetadataListUpdater<LIST> {
      * @param newTaskId task we will move above. if -1, moves to end of list
      */
     public void moveTo(Filter filter, LIST list, final long targetTaskId,
-            final long moveBeforeTaskId) {
-        if(list == null)
+                       final long moveBeforeTaskId) {
+        if (list == null)
             return;
 
         Node root = buildTreeModel(filter, list);
         Node target = findNode(root, targetTaskId);
 
-        if(target != null && target.parent != null) {
-            if(moveBeforeTaskId == -1) {
+        if (target != null && target.parent != null) {
+            if (moveBeforeTaskId == -1) {
                 target.parent.children.remove(target);
                 root.children.add(target);
                 target.parent = root;
             } else {
                 Node sibling = findNode(root, moveBeforeTaskId);
-                if(sibling != null && !ancestorOf(target, sibling)) {
+                if (sibling != null && !ancestorOf(target, sibling)) {
                     int index = sibling.parent.children.indexOf(sibling);
 
-                    if(target.parent == sibling.parent &&
+                    if (target.parent == sibling.parent &&
                             target.parent.children.indexOf(target) < index)
                         index--;
 
@@ -215,9 +215,9 @@ abstract public class OrderedMetadataListUpdater<LIST> {
     }
 
     private boolean ancestorOf(Node ancestor, Node descendant) {
-        if(descendant.parent == ancestor)
+        if (descendant.parent == ancestor)
             return true;
-        if(descendant.parent == null)
+        if (descendant.parent == null)
             return false;
         return ancestorOf(ancestor, descendant.parent);
     }
@@ -234,34 +234,34 @@ abstract public class OrderedMetadataListUpdater<LIST> {
     }
 
     protected void traverseTreeAndWriteValues(LIST list, Node node, AtomicLong order, int indent) {
-        if(node.taskId != Task.NO_ID) {
+        if (node.taskId != Task.NO_ID) {
             Metadata metadata = getTaskMetadata(list, node.taskId);
-            if(metadata == null)
+            if (metadata == null)
                 metadata = createEmptyMetadata(list, node.taskId);
             metadata.setValue(orderProperty(), order.getAndIncrement());
             metadata.setValue(indentProperty(), indent);
             boolean parentChanged = false;
-            if(parentProperty() != null && metadata.getValue(parentProperty()) !=
+            if (parentProperty() != null && metadata.getValue(parentProperty()) !=
                     node.parent.taskId) {
                 parentChanged = true;
                 metadata.setValue(parentProperty(), node.parent.taskId);
             }
             saveAndUpdateModifiedDate(metadata);
-            if(parentChanged)
+            if (parentChanged)
                 onMovedOrIndented(metadata);
         }
 
-        for(Node child : node.children) {
+        for (Node child : node.children) {
             traverseTreeAndWriteValues(list, child, order, indent + 1);
         }
     }
 
     protected Node findNode(Node node, long taskId) {
-        if(node.taskId == taskId)
+        if (node.taskId == taskId)
             return node;
-        for(Node child : node.children) {
+        for (Node child : node.children) {
             Node found = findNode(child, taskId);
-            if(found != null)
+            if (found != null)
                 return found;
         }
         return null;
@@ -278,19 +278,19 @@ abstract public class OrderedMetadataListUpdater<LIST> {
                 int indent = metadata.getValue(indentProperty());
 
                 int previousIndentValue = previoustIndent.get();
-                if(indent == previousIndentValue) { // sibling
+                if (indent == previousIndentValue) { // sibling
                     Node parent = currentNode.get().parent;
                     currentNode.set(new Node(taskId, parent));
                     parent.children.add(currentNode.get());
-                } else if(indent > previousIndentValue) { // child
+                } else if (indent > previousIndentValue) { // child
                     Node parent = currentNode.get();
                     currentNode.set(new Node(taskId, parent));
                     parent.children.add(currentNode.get());
                 } else { // in a different tree
                     Node node = currentNode.get().parent;
-                    for(int i = indent; i < previousIndentValue; i++) {
+                    for (int i = indent; i < previousIndentValue; i++) {
                         node = node.parent;
-                        if(node == null) {
+                        if (node == null) {
                             node = root;
                             break;
                         }
@@ -306,7 +306,7 @@ abstract public class OrderedMetadataListUpdater<LIST> {
     }
 
     protected void saveAndUpdateModifiedDate(Metadata metadata) {
-        if(metadata.getSetValues().size() == 0)
+        if (metadata.getSetValues().size() == 0)
             return;
         PluginServices.getMetadataService().save(metadata);
     }
@@ -321,39 +321,40 @@ abstract public class OrderedMetadataListUpdater<LIST> {
      * Apply an operation only to the children of the task
      */
     public void applyToChildren(Filter filter, LIST list, long targetTaskId,
-            OrderedListNodeVisitor visitor) {
+                                OrderedListNodeVisitor visitor) {
 
         Node root = buildTreeModel(filter, list);
         Node target = findNode(root, targetTaskId);
 
-        if(target != null)
-            for(Node child : target.children)
+        if (target != null)
+            for (Node child : target.children)
                 applyVisitor(child, visitor);
     }
 
     private void applyVisitor(Node node, OrderedListNodeVisitor visitor) {
         visitor.visitNode(node);
-        for(Node child : node.children)
+        for (Node child : node.children)
             applyVisitor(child, visitor);
     }
 
     /**
      * Removes a task from the order hierarchy and un-indent children
+     *
      * @param filter
      * @param list
      * @param targetTaskId
      */
     public void onDeleteTask(Filter filter, LIST list, final long targetTaskId) {
-        if(list == null)
+        if (list == null)
             return;
 
         Node root = buildTreeModel(filter, list);
         Node target = findNode(root, targetTaskId);
 
-        if(target != null && target.parent != null) {
+        if (target != null && target.parent != null) {
             int targetIndex = target.parent.children.indexOf(target);
             target.parent.children.remove(targetIndex);
-            for(Node node : target.children) {
+            for (Node node : target.children) {
                 node.parent = target.parent;
                 target.parent.children.add(targetIndex++, node);
             }
@@ -378,11 +379,11 @@ abstract public class OrderedMetadataListUpdater<LIST> {
 
     @SuppressWarnings("nls")
     public void debugPrint(Node root, int depth) {
-        for(int i = 0; i < depth; i++) System.err.print(" + ");
+        for (int i = 0; i < depth; i++) System.err.print(" + ");
         System.err.format("%03d", root.taskId);
         System.err.print("\n");
 
-        for(int i = 0; i < root.children.size(); i++)
+        for (int i = 0; i < root.children.size(); i++)
             debugPrint(root.children.get(i), depth + 1);
     }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksHelper.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksHelper.java
index 38e1779a1..750754fd8 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksHelper.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksHelper.java
@@ -1,8 +1,5 @@
 package com.todoroo.astrid.subtasks;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-
 import android.content.SharedPreferences;
 import android.text.TextUtils;
 import android.util.Log;
@@ -27,13 +24,16 @@ import com.todoroo.astrid.data.TaskListMetadata;
 import com.todoroo.astrid.subtasks.AstridOrderedListUpdater.Node;
 import com.todoroo.astrid.utility.AstridPreferences;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+
 public class SubtasksHelper {
 
     public static boolean shouldUseSubtasksFragmentForFilter(Filter filter) {
-        if(filter == null || CoreFilterExposer.isInbox(filter) || CoreFilterExposer.isTodayFilter(filter) || SubtasksHelper.isTagFilter(filter)) {
+        if (filter == null || CoreFilterExposer.isInbox(filter) || CoreFilterExposer.isTodayFilter(filter) || SubtasksHelper.isTagFilter(filter)) {
             SharedPreferences publicPrefs = AstridPreferences.getPublicPrefs(ContextManager.getContext());
             int sortFlags = publicPrefs.getInt(SortHelper.PREF_SORT_FLAGS, 0);
-            if(SortHelper.isManualSort(sortFlags))
+            if (SortHelper.isManualSort(sortFlags))
                 return true;
         }
         return false;
@@ -125,6 +125,7 @@ public class SubtasksHelper {
 
     /**
      * Takes a subtasks string containing local ids and remaps it to one containing UUIDs
+     *
      * @param localTree
      * @return
      */
diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksListFragment.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksListFragment.java
index a3b1601c0..e8775a9f9 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksListFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksListFragment.java
@@ -20,7 +20,6 @@ import com.todoroo.astrid.data.TaskListMetadata;
  * Fragment for subtasks
  *
  * @author Tim Su <tim@astrid.com>
- *
  */
 public class SubtasksListFragment extends TaskListFragment {
 
@@ -36,7 +35,7 @@ public class SubtasksListFragment extends TaskListFragment {
 
     protected OrderedListFragmentHelperInterface<?> createFragmentHelper() {
         AstridOrderedListFragmentHelper<TaskListMetadata> olfh =
-            new AstridOrderedListFragmentHelper<TaskListMetadata>(this, new SubtasksFilterUpdater());
+                new AstridOrderedListFragmentHelper<TaskListMetadata>(this, new SubtasksFilterUpdater());
         return olfh;
     }
 
@@ -73,7 +72,7 @@ public class SubtasksListFragment extends TaskListFragment {
     @Override
     public void onResume() {
         super.onResume();
-        if (lastVisibleIndex >=0) {
+        if (lastVisibleIndex >= 0) {
             getListView().setSelection(lastVisibleIndex);
         }
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadata.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadata.java
index 1eb8dfdc9..4cbb021d1 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadata.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadata.java
@@ -14,17 +14,20 @@ import com.todoroo.astrid.data.Metadata;
  * Metadata entries for a Subtask list
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @Deprecated
 public class SubtasksMetadata {
 
     public static final String LIST_ACTIVE_TASKS = "[AT]"; //$NON-NLS-1$
 
-    /** metadata key */
+    /**
+     * metadata key
+     */
     public static final String METADATA_KEY = "subtasks"; //$NON-NLS-1$
 
-    /** tag name */
+    /**
+     * tag name
+     */
     public static final StringProperty TAG = new StringProperty(Metadata.TABLE,
             Metadata.VALUE1.name);
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java
index f1e9ab91d..203521e0b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java
@@ -1,7 +1,5 @@
 package com.todoroo.astrid.subtasks;
 
-import java.util.ArrayList;
-
 import android.util.Log;
 
 import com.todoroo.andlib.data.TodorooCursor;
@@ -20,6 +18,8 @@ import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.TagDataService;
 import com.todoroo.astrid.subtasks.AstridOrderedListUpdater.Node;
 
+import java.util.ArrayList;
+
 @SuppressWarnings("deprecation") // Subtasks metadata is deprecated
 public class SubtasksMetadataMigration {
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java
index 142c1bcd8..8e5273536 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java
@@ -37,7 +37,7 @@ public class SubtasksTagListFragment extends TagViewFragment {
                 R.layout.task_list_body_tag, root, false);
 
         taskListView =
-            getActivity().getLayoutInflater().inflate(R.layout.task_list_body_subtasks, root, false);
+                getActivity().getLayoutInflater().inflate(R.layout.task_list_body_subtasks, root, false);
         parent.addView(taskListView);
 
         return parent;
diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksTagUpdater.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksTagUpdater.java
index 4de2adcf2..de825accc 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksTagUpdater.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksTagUpdater.java
@@ -1,10 +1,10 @@
 package com.todoroo.astrid.subtasks;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.data.TaskListMetadata;
 
+import java.util.concurrent.atomic.AtomicBoolean;
+
 public class SubtasksTagUpdater extends SubtasksFilterUpdater {
 
     private final AtomicBoolean isBeingFiltered;
diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java
index 049271960..6437dbea8 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java
@@ -16,9 +16,12 @@ import com.todoroo.astrid.service.TaskService;
 
 public abstract class SubtasksUpdater<T> extends AstridOrderedListUpdater<T> {
 
-    @Autowired TaskListMetadataDao taskListMetadataDao;
-    @Autowired TaskService taskService;
-    @Autowired ActFmSyncService actFmSyncService;
+    @Autowired
+    TaskListMetadataDao taskListMetadataDao;
+    @Autowired
+    TaskService taskService;
+    @Autowired
+    ActFmSyncService actFmSyncService;
 
     public static final String ACTIVE_TASKS_ORDER = "active_tasks_order"; //$NON-NLS-1$
     public static final String TODAY_TASKS_ORDER = "today_tasks_order"; //$NON-NLS-1$
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java
index 7e852cd8c..fe28ef8ba 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.tags;
 
-import java.util.HashMap;
-
 import android.content.Context;
 
 import com.todoroo.andlib.data.TodorooCursor;
@@ -26,11 +24,16 @@ import com.todoroo.astrid.service.TagDataService;
 import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.utility.Flags;
 
+import java.util.HashMap;
+
 public class TagCaseMigrator {
 
-    @Autowired TaskService taskService;
-    @Autowired TagDataService tagDataService;
-    @Autowired MetadataService metadataService;
+    @Autowired
+    TaskService taskService;
+    @Autowired
+    TagDataService tagDataService;
+    @Autowired
+    MetadataService metadataService;
 
     public static final String PREF_SHOW_MIGRATION_ALERT = "tag_case_migration_alert"; //$NON-NLS-1$
     private static final String PREF_CASE_MIGRATION_PERFORMED = "tag_case_migration"; //$NON-NLS-1$
@@ -51,7 +54,7 @@ public class TagCaseMigrator {
             boolean shouldShowDialog = false;
             for (int i = 0; i < allTagData.length - 1; i++) {
                 TagService.Tag first = allTagData[i];
-                TagService.Tag second = allTagData[i+1];
+                TagService.Tag second = allTagData[i + 1];
 
                 if (first.tag.equalsIgnoreCase(second.tag)) {
                     shouldShowDialog = true;
@@ -95,8 +98,8 @@ public class TagCaseMigrator {
     private void updateTagData(String tag) {
         long remoteId = nameToRemoteId.get(tag);
         TodorooCursor<TagData> tagData = tagDataService.query(Query.select(TagData.NAME, TagData.UUID)
-                                                                   .where(Criterion.and(
-                                                                           TagData.NAME.eq(tag), TagData.UUID.eq(remoteId))));
+                .where(Criterion.and(
+                        TagData.NAME.eq(tag), TagData.UUID.eq(remoteId))));
         try {
             for (tagData.moveToFirst(); !tagData.isAfterLast(); tagData.moveToNext()) {
                 TagData curr = new TagData(tagData);
@@ -119,12 +122,12 @@ public class TagCaseMigrator {
 
     private void addTasksToTargetTag(String tag, String target) {
         TodorooCursor<Task> tasks = taskService.query(Query.select(Task.ID).join(Join.inner(Metadata.TABLE,
-                    Task.ID.eq(Metadata.TASK))).where(tagEq(tag, Criterion.all)));
+                Task.ID.eq(Metadata.TASK))).where(tagEq(tag, Criterion.all)));
         try {
             for (tasks.moveToFirst(); !tasks.isAfterLast(); tasks.moveToNext()) {
                 Task curr = new Task(tasks);
                 TodorooCursor<Metadata> tagMetadata = metadataService.query(Query.select(TaskToTagMetadata.TAG_NAME)
-                                                                 .where(Criterion.and(TaskToTagMetadata.TAG_NAME.eq(target), Metadata.KEY.eq(TaskToTagMetadata.KEY), Metadata.TASK.eq(curr.getId()))));
+                        .where(Criterion.and(TaskToTagMetadata.TAG_NAME.eq(target), Metadata.KEY.eq(TaskToTagMetadata.KEY), Metadata.TASK.eq(curr.getId()))));
                 try {
                     if (tagMetadata.getCount() == 0) {
                         Metadata newTag = new Metadata();
@@ -149,7 +152,7 @@ public class TagCaseMigrator {
 
     @Deprecated
     private int renameHelper(String oldTag, String newTag, boolean caseSensitive) {
-     // First remove newTag from all tasks that have both oldTag and newTag.
+        // First remove newTag from all tasks that have both oldTag and newTag.
         metadataService.deleteWhere(
                 Criterion.and(
                         Metadata.VALUE1.eq(newTag),
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java
index c9e182e50..a62a5c45b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java
@@ -41,9 +41,9 @@ public class TagCustomFilterCriteriaExposer extends BroadcastReceiver {
         // built in criteria: tags
         {
             TagService.Tag[] tags = TagService.getInstance().getGroupedTags(TagService.GROUPED_TAGS_BY_SIZE,
-                            TaskDao.TaskCriteria.activeAndVisible());
+                    TaskDao.TaskCriteria.activeAndVisible());
             String[] tagNames = new String[tags.length];
-            for(int i = 0; i < tags.length; i++)
+            for (int i = 0; i < tags.length; i++)
                 tagNames[i] = tags[i].tag;
             ContentValues values = new ContentValues();
             values.put(Metadata.KEY.name, TaskToTagMetadata.KEY);
@@ -52,12 +52,12 @@ public class TagCustomFilterCriteriaExposer extends BroadcastReceiver {
                     IDENTIFIER_TAG_IS,
                     context.getString(R.string.CFC_tag_text),
                     Query.select(Metadata.TASK).from(Metadata.TABLE).join(Join.inner(
-                                Task.TABLE, Metadata.TASK.eq(Task.ID))).where(Criterion.and(
+                            Task.TABLE, Metadata.TASK.eq(Task.ID))).where(Criterion.and(
                             TaskDao.TaskCriteria.activeAndVisible(),
                             MetadataDao.MetadataCriteria.withKey(TaskToTagMetadata.KEY),
                             TaskToTagMetadata.TAG_NAME.eq("?"), Metadata.DELETION_DATE.eq(0))).toString(),
                     values, tagNames, tagNames,
-                    ((BitmapDrawable)r.getDrawable(TagService.getDefaultImageIDForTag(RemoteModel.NO_UUID))).getBitmap(),
+                    ((BitmapDrawable) r.getDrawable(TagService.getDefaultImageIDForTag(RemoteModel.NO_UUID))).getBitmap(),
                     context.getString(R.string.CFC_tag_name));
             ret[j++] = criterion;
         }
@@ -65,16 +65,16 @@ public class TagCustomFilterCriteriaExposer extends BroadcastReceiver {
         // built in criteria: tags containing X
         {
             CustomFilterCriterion criterion = new TextInputCriterion(
-                            IDENTIFIER_TAG_CONTAINS,
-                            context.getString(R.string.CFC_tag_contains_text),
-                            Query.select(Metadata.TASK).from(Metadata.TABLE).join(Join.inner(
-                                    Task.TABLE, Metadata.TASK.eq(Task.ID))).where(Criterion.and(
-                                            TaskDao.TaskCriteria.activeAndVisible(),
-                                            MetadataDao.MetadataCriteria.withKey(TaskToTagMetadata.KEY),
-                                            TaskToTagMetadata.TAG_NAME.like("%?%"), Metadata.DELETION_DATE.eq(0))).toString(),
-                                            null, context.getString(R.string.CFC_tag_contains_name), "",
-                                            ((BitmapDrawable)r.getDrawable(TagService.getDefaultImageIDForTag(RemoteModel.NO_UUID))).getBitmap(),
-                                            context.getString(R.string.CFC_tag_contains_name));
+                    IDENTIFIER_TAG_CONTAINS,
+                    context.getString(R.string.CFC_tag_contains_text),
+                    Query.select(Metadata.TASK).from(Metadata.TABLE).join(Join.inner(
+                            Task.TABLE, Metadata.TASK.eq(Task.ID))).where(Criterion.and(
+                            TaskDao.TaskCriteria.activeAndVisible(),
+                            MetadataDao.MetadataCriteria.withKey(TaskToTagMetadata.KEY),
+                            TaskToTagMetadata.TAG_NAME.like("%?%"), Metadata.DELETION_DATE.eq(0))).toString(),
+                    null, context.getString(R.string.CFC_tag_contains_name), "",
+                    ((BitmapDrawable) r.getDrawable(TagService.getDefaultImageIDForTag(RemoteModel.NO_UUID))).getBitmap(),
+                    context.getString(R.string.CFC_tag_contains_name));
             ret[j++] = criterion;
         }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagDetailExposer.java
index e0265bc47..c00ca113b 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagDetailExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagDetailExposer.java
@@ -15,7 +15,6 @@ import com.todoroo.astrid.api.AstridApiConstants;
  * Exposes Task Detail for tags, i.e. "Tags: frogs, animals"
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TagDetailExposer extends BroadcastReceiver {
 
@@ -23,11 +22,11 @@ public class TagDetailExposer extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         // get tags associated with this task
         long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1);
-        if(taskId == -1)
+        if (taskId == -1)
             return;
 
         String taskDetail = getTaskDetails(taskId);
-        if(taskDetail == null)
+        if (taskDetail == null)
             return;
 
         // transmit
@@ -40,7 +39,7 @@ public class TagDetailExposer extends BroadcastReceiver {
 
     public String getTaskDetails(long id) {
         String tagList = TagService.getInstance().getTagsAsString(id);
-        if(tagList.length() == 0)
+        if (tagList.length() == 0)
             return null;
 
         return /*"<img src='silk_tag_pink'/> " +*/ tagList;
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
index fd1fec40b..48798776c 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.tags;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -51,22 +48,28 @@ import com.todoroo.astrid.service.TagDataService;
 import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.tags.TagService.Tag;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Exposes filters based on tags
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TagFilterExposer extends BroadcastReceiver implements AstridFilterExposer {
 
     private static final String TAG = "tag"; //$NON-NLS-1$
 
-    @Autowired protected TagDataService tagDataService;
-    @Autowired GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    protected TagDataService tagDataService;
+    @Autowired
+    GtasksPreferenceService gtasksPreferenceService;
 
     protected boolean addUntaggedFilter = true;
 
-    /** Create filter from new tag object */
+    /**
+     * Create filter from new tag object
+     */
     @SuppressWarnings("nls")
     public static FilterWithCustomIntent filterFromTag(Context context, Tag tag, Criterion criterion) {
         String title = tag.tag;
@@ -81,7 +84,7 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE
         FilterWithUpdate filter = new FilterWithUpdate(tag.tag,
                 title, tagTemplate,
                 contentValues);
-        if(!RemoteModel.NO_UUID.equals(tag.uuid)) {
+        if (!RemoteModel.NO_UUID.equals(tag.uuid)) {
             filter.listingTitle += " (" + tag.count + ")";
         }
 
@@ -91,17 +94,17 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE
         else
             deleteIntentLabel = R.string.tag_cm_delete;
 
-        filter.contextMenuLabels = new String[] {
-            context.getString(R.string.tag_cm_rename),
-            context.getString(deleteIntentLabel)
+        filter.contextMenuLabels = new String[]{
+                context.getString(R.string.tag_cm_rename),
+                context.getString(deleteIntentLabel)
         };
-        filter.contextMenuIntents = new Intent[] {
+        filter.contextMenuIntents = new Intent[]{
                 newTagIntent(context, RenameTagActivity.class, tag, tag.uuid),
                 newTagIntent(context, DeleteTagActivity.class, tag, tag.uuid)
         };
 
         filter.customTaskList = new ComponentName(ContextManager.getContext(), TagViewFragment.class);
-        if(tag.image != null)
+        if (tag.image != null)
             filter.imageUrl = tag.image;
         Bundle extras = new Bundle();
         extras.putString(TagViewFragment.EXTRA_TAG_NAME, tag.tag);
@@ -111,7 +114,9 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE
         return filter;
     }
 
-    /** Create a filter from tag data object */
+    /**
+     * Create a filter from tag data object
+     */
     public static FilterWithCustomIntent filterFromTagData(Context context, TagData tagData) {
         Tag tag = new Tag(tagData);
         return filterFromTag(context, tag, TaskCriteria.activeAndVisible());
@@ -174,12 +179,12 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE
                     r.getString(R.string.tag_FEx_untagged),
                     TagService.getInstance().untaggedTemplate(),
                     null);
-            untagged.listingIcon = ((BitmapDrawable)r.getDrawable(
+            untagged.listingIcon = ((BitmapDrawable) r.getDrawable(
                     ThemeService.getDrawable(R.drawable.gl_lists, themeFlags))).getBitmap();
             filters.add(untagged);
         }
 
-        for(int i = 0; i < tags.length; i++) {
+        for (int i = 0; i < tags.length; i++) {
             Filter f = constructFilter(context, tags[i]);
             if (f != null)
                 filters.add(f);
@@ -199,9 +204,12 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE
         protected String tag;
         protected String uuid;
 
-        @Autowired public TagService tagService;
-        @Autowired public TagDataDao tagDataDao;
-        @Autowired public TagMetadataDao tagMetadataDao;
+        @Autowired
+        public TagService tagService;
+        @Autowired
+        public TagDataDao tagDataDao;
+        @Autowired
+        public TagMetadataDao tagMetadataDao;
 
         static {
             AstridDependencyInjector.initialize();
@@ -214,7 +222,7 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE
             tag = getIntent().getStringExtra(TAG);
             uuid = getIntent().getStringExtra(TagViewFragment.EXTRA_TAG_UUID);
 
-            if(tag == null || RemoteModel.isUuidEmpty(uuid)) {
+            if (tag == null || RemoteModel.isUuidEmpty(uuid)) {
                 finish();
                 return;
             }
@@ -261,7 +269,7 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE
 
         private void toastNoChanges() {
             Toast.makeText(this, R.string.TEA_no_tags_modified,
-                        Toast.LENGTH_SHORT).show();
+                    Toast.LENGTH_SHORT).show();
         }
 
         protected abstract void showDialog(TagData tagData);
@@ -279,8 +287,7 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE
                     string = R.string.actfm_tag_operation_owner_delete;
                 else
                     string = R.string.DLG_leave_this_shared_tag_question;
-            }
-            else
+            } else
                 string = R.string.DLG_delete_this_tag_question;
             DialogUtilities.okCancelDialog(this, getString(string, tag), getOkListener(), getCancelListener());
         }
@@ -304,7 +311,7 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE
 
         @Override
         protected Intent ok() {
-            if(editor == null)
+            if (editor == null)
                 return null;
 
             String text = editor.getText().toString();
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
index 5aca64063..d23f267d9 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
@@ -5,13 +5,6 @@
  */
 package com.todoroo.astrid.tags;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-
 import android.content.Context;
 import android.content.Intent;
 import android.text.TextUtils;
@@ -47,11 +40,17 @@ import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.TagDataService;
 import com.todoroo.astrid.service.TaskService;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Provides operations for working with tags
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 public final class TagService {
@@ -63,28 +62,32 @@ public final class TagService {
 
     private static TagService instance = null;
 
-    private static int[] default_tag_images = new int[] {
-        R.drawable.default_list_0,
-        R.drawable.default_list_1,
-        R.drawable.default_list_2,
-        R.drawable.default_list_3
+    private static int[] default_tag_images = new int[]{
+            R.drawable.default_list_0,
+            R.drawable.default_list_1,
+            R.drawable.default_list_2,
+            R.drawable.default_list_3
     };
 
     public static synchronized TagService getInstance() {
-        if(instance == null)
+        if (instance == null)
             instance = new TagService();
         return instance;
     }
 
     // --- implementation details
 
-    @Autowired MetadataDao metadataDao;
+    @Autowired
+    MetadataDao metadataDao;
 
-    @Autowired TaskService taskService;
+    @Autowired
+    TaskService taskService;
 
-    @Autowired TagDataService tagDataService;
+    @Autowired
+    TagDataService tagDataService;
 
-    @Autowired TagDataDao tagDataDao;
+    @Autowired
+    TagDataDao tagDataDao;
 
     public TagService() {
         DependencyInjectionService.getInstance().inject(this);
@@ -101,7 +104,6 @@ public final class TagService {
      * Helper class for returning a tag/task count pair
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     public static final class Tag {
         public String tag;
@@ -185,16 +187,16 @@ public final class TagService {
     /**
      * Return all tags ordered by given clause
      *
-     * @param order ordering
+     * @param order        ordering
      * @param activeStatus criterion for specifying completed or uncompleted
      * @return empty array if no tags, otherwise array
      */
     public Tag[] getGroupedTags(Order order, Criterion activeStatus) {
         Criterion criterion = Criterion.and(activeStatus, MetadataCriteria.withKey(TaskToTagMetadata.KEY));
         Query query = Query.select(TaskToTagMetadata.TAG_NAME, TaskToTagMetadata.TAG_UUID, COUNT).
-            join(Join.inner(Task.TABLE, Metadata.TASK.eq(Task.ID))).
-            where(criterion).
-            orderBy(order).groupBy(TaskToTagMetadata.TAG_NAME);
+                join(Join.inner(Task.TABLE, Metadata.TASK.eq(Task.ID))).
+                where(criterion).
+                orderBy(order).groupBy(TaskToTagMetadata.TAG_NAME);
         TodorooCursor<Metadata> cursor = metadataDao.query(query);
         try {
             ArrayList<Tag> array = new ArrayList<Tag>();
@@ -232,13 +234,14 @@ public final class TagService {
     public void createLink(Task task, String tagName, String tagUuid) {
         Metadata link = TaskToTagMetadata.newTagMetadata(task.getId(), task.getUuid(), tagName, tagUuid);
         if (metadataDao.update(Criterion.and(MetadataCriteria.byTaskAndwithKey(task.getId(), TaskToTagMetadata.KEY),
-                    TaskToTagMetadata.TASK_UUID.eq(task.getValue(Task.UUID)), TaskToTagMetadata.TAG_UUID.eq(tagUuid)), link) <= 0) {
+                TaskToTagMetadata.TASK_UUID.eq(task.getValue(Task.UUID)), TaskToTagMetadata.TAG_UUID.eq(tagUuid)), link) <= 0) {
             metadataDao.createNew(link);
         }
     }
 
     /**
      * Creates a link for a nameless tag. We expect the server to fill in the tag name with a MakeChanges message later
+     *
      * @param taskId
      * @param taskUuid
      * @param tagUuid
@@ -271,6 +274,7 @@ public final class TagService {
 
     /**
      * Delete a single task to tag link
+     *
      * @param taskUuid
      * @param tagUuid
      */
@@ -287,6 +291,7 @@ public final class TagService {
 
     /**
      * Delete all links between the specified task and the list of tags
+     *
      * @param taskUuid
      * @param tagUuids
      */
@@ -315,8 +320,8 @@ public final class TagService {
      */
     public TodorooCursor<Metadata> getTags(long taskId) {
         Criterion criterion = Criterion.and(MetadataCriteria.withKey(TaskToTagMetadata.KEY),
-                    Metadata.DELETION_DATE.eq(0),
-                    MetadataCriteria.byTask(taskId));
+                Metadata.DELETION_DATE.eq(0),
+                MetadataCriteria.byTask(taskId));
         Query query = Query.select(TaskToTagMetadata.TAG_NAME, TaskToTagMetadata.TAG_UUID).where(criterion).orderBy(Order.asc(Functions.upper(TaskToTagMetadata.TAG_NAME)));
         return metadataDao.query(query);
     }
@@ -378,7 +383,7 @@ public final class TagService {
         TagData tagData = tagDataDao.fetch(uuid, TagData.ID, TagData.UUID, TagData.DELETION_DATE, TagData.MEMBER_COUNT, TagData.USER_ID);
         boolean shared = false;
         Intent tagDeleted = new Intent(AstridApiConstants.BROADCAST_EVENT_TAG_DELETED);
-        if(tagData != null) {
+        if (tagData != null) {
             tagData.setValue(TagData.DELETION_DATE, DateUtilities.now());
             PluginServices.getTagDataService().save(tagData);
             tagDeleted.putExtra(TagViewFragment.EXTRA_TAG_UUID, tagData.getUuid());
@@ -393,6 +398,7 @@ public final class TagService {
 
     /**
      * Return all tags (including metadata tags and TagData tags) in an array list
+     *
      * @return
      */
     public ArrayList<Tag> getTagList() {
@@ -401,13 +407,13 @@ public final class TagService {
                 TagData.IS_FOLDER.neq(1)), TagData.NAME.isNotNull())).orderBy(Order.asc(Functions.upper(TagData.NAME))));
         try {
             TagData tagData = new TagData();
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 tagData.readFromCursor(cursor);
-                if(tagData.getFlag(TagData.FLAGS, TagData.FLAG_FEATURED)) {
+                if (tagData.getFlag(TagData.FLAGS, TagData.FLAG_FEATURED)) {
                     continue;
                 }
                 Tag tag = new Tag(tagData);
-                if(TextUtils.isEmpty(tag.tag))
+                if (TextUtils.isEmpty(tag.tag))
                     continue;
                 tagList.add(tag);
             }
@@ -424,13 +430,13 @@ public final class TagService {
                 .where(Functions.bitwiseAnd(TagData.FLAGS, TagData.FLAG_FEATURED).gt(0)));
         try {
             TagData tagData = new TagData();
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 tagData.readFromCursor(cursor);
                 if (tagData.getValue(TagData.DELETION_DATE) > 0)
                     continue;
                 String tagName = tagData.getValue(TagData.NAME).trim();
                 Tag tag = new Tag(tagData);
-                if(TextUtils.isEmpty(tag.tag))
+                if (TextUtils.isEmpty(tag.tag))
                     continue;
                 tags.put(tagName, tag);
             }
@@ -440,16 +446,17 @@ public final class TagService {
         ArrayList<Tag> tagList = new ArrayList<Tag>(tags.values());
         Collections.sort(tagList,
                 new Comparator<Tag>() {
-            @Override
-            public int compare(Tag object1, Tag object2) {
-                return object1.tag.compareToIgnoreCase(object2.tag);
-            }
-        });
+                    @Override
+                    public int compare(Tag object1, Tag object2) {
+                        return object1.tag.compareToIgnoreCase(object2.tag);
+                    }
+                });
         return tagList;
     }
 
     /**
      * Save the given array of tags into the database
+     *
      * @param taskId
      * @param tags
      */
@@ -490,6 +497,7 @@ public final class TagService {
     /**
      * If a tag already exists in the database that case insensitively matches the
      * given tag, return that. Otherwise, return the argument
+     *
      * @param tag
      * @return
      */
@@ -562,9 +570,9 @@ public final class TagService {
 
     public static int getDefaultImageIDForTag(String nameOrUUID) {
         if (RemoteModel.NO_UUID.equals(nameOrUUID)) {
-            int random = (int)(Math.random()*4);
+            int random = (int) (Math.random() * 4);
             return default_tag_images[random];
         }
-        return default_tag_images[((int)Math.abs(nameOrUUID.hashCode()))%4];
+        return default_tag_images[((int) Math.abs(nameOrUUID.hashCode())) % 4];
     }
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
index e842c7c70..540fd3631 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.tags;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-
 import android.app.Activity;
 import android.text.Editable;
 import android.text.TextUtils;
@@ -39,11 +35,14 @@ import com.todoroo.astrid.tags.TagService.Tag;
 import com.todoroo.astrid.ui.PopupControlSet;
 import com.todoroo.astrid.utility.Flags;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+
 /**
  * Control set to manage adding and removing tags
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public final class TagsControlSet extends PopupControlSet {
 
@@ -112,21 +111,21 @@ public final class TagsControlSet extends PopupControlSet {
         } else {
             allTagNames.add(tag);
             tagIndices.put(tag, allTagNames.size() - 1);
-            ((ArrayAdapter<String>)selectedTags.getAdapter()).notifyDataSetChanged();
+            ((ArrayAdapter<String>) selectedTags.getAdapter()).notifyDataSetChanged();
         }
     }
 
     private LinkedHashSet<String> getTagSet() {
         LinkedHashSet<String> tags = new LinkedHashSet<String>();
         if (initialized) {
-            for(int i = 0; i < selectedTags.getAdapter().getCount(); i++) {
+            for (int i = 0; i < selectedTags.getAdapter().getCount(); i++) {
                 if (selectedTags.isItemChecked(i))
                     tags.add(allTagNames.get(i));
             }
 
-            for(int i = 0; i < newTags.getChildCount(); i++) {
+            for (int i = 0; i < newTags.getChildCount(); i++) {
                 TextView tagName = (TextView) newTags.getChildAt(i).findViewById(R.id.text1);
-                if(tagName.getText().length() == 0)
+                if (tagName.getText().length() == 0)
                     continue;
 
                 tags.add(tagName.getText().toString());
@@ -139,31 +138,33 @@ public final class TagsControlSet extends PopupControlSet {
         return tags;
     }
 
-    /** Adds a tag to the tag field */
+    /**
+     * Adds a tag to the tag field
+     */
     boolean addTag(String tagName, boolean reuse) {
         LayoutInflater inflater = activity.getLayoutInflater();
 
         // check if already exists
         TextView lastText = null;
-        for(int i = 0; i < newTags.getChildCount(); i++) {
+        for (int i = 0; i < newTags.getChildCount(); i++) {
             View view = newTags.getChildAt(i);
             lastText = (TextView) view.findViewById(R.id.text1);
-            if(lastText.getText().equals(tagName))
+            if (lastText.getText().equals(tagName))
                 return false;
         }
 
         final View tagItem;
-        if(reuse && lastText != null && lastText.getText().length() == 0) {
+        if (reuse && lastText != null && lastText.getText().length() == 0) {
             tagItem = (View) lastText.getParent();
         } else {
             tagItem = inflater.inflate(R.layout.tag_edit_row, null);
             newTags.addView(tagItem);
         }
-        if(tagName == null)
+        if (tagName == null)
             tagName = ""; //$NON-NLS-1$
 
-        final AutoCompleteTextView textView = (AutoCompleteTextView)tagItem.
-            findViewById(R.id.text1);
+        final AutoCompleteTextView textView = (AutoCompleteTextView) tagItem.
+                findViewById(R.id.text1);
         textView.setText(tagName);
 
         textView.addTextChangedListener(new TextWatcher() {
@@ -171,15 +172,17 @@ public final class TagsControlSet extends PopupControlSet {
             public void afterTextChanged(Editable s) {
                 //
             }
+
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count,
-                    int after) {
+                                          int after) {
                 //
             }
+
             @Override
             public void onTextChanged(CharSequence s, int start, int before,
-                    int count) {
-                if(count > 0 && newTags.getChildAt(newTags.getChildCount()-1) ==
+                                      int count) {
+                if (count > 0 && newTags.getChildAt(newTags.getChildCount() - 1) ==
                         tagItem)
                     addTag("", false); //$NON-NLS-1$
             }
@@ -188,9 +191,9 @@ public final class TagsControlSet extends PopupControlSet {
         textView.setOnEditorActionListener(new OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView arg0, int actionId, KeyEvent arg2) {
-                if(actionId != EditorInfo.IME_NULL)
+                if (actionId != EditorInfo.IME_NULL)
                     return false;
-                if(getLastTextView().getText().length() != 0) {
+                if (getLastTextView().getText().length() != 0) {
                     addTag("", false); //$NON-NLS-1$
                 }
                 return true;
@@ -198,14 +201,14 @@ public final class TagsControlSet extends PopupControlSet {
         });
 
         ImageButton reminderRemoveButton;
-        reminderRemoveButton = (ImageButton)tagItem.findViewById(R.id.button1);
+        reminderRemoveButton = (ImageButton) tagItem.findViewById(R.id.button1);
         reminderRemoveButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 TextView lastView = getLastTextView();
-                if(lastView == textView && textView.getText().length() == 0)
+                if (lastView == textView && textView.getText().length() == 0)
                     return;
 
-                if(newTags.getChildCount() > 1)
+                if (newTags.getChildCount() > 1)
                     newTags.removeView(tagItem);
                 else
                     textView.setText(""); //$NON-NLS-1$
@@ -217,12 +220,13 @@ public final class TagsControlSet extends PopupControlSet {
 
     /**
      * Get tags container last text view. might be null
+     *
      * @return
      */
     private TextView getLastTextView() {
-        if(newTags.getChildCount() == 0)
+        if (newTags.getChildCount() == 0)
             return null;
-        View lastItem = newTags.getChildAt(newTags.getChildCount()-1);
+        View lastItem = newTags.getChildAt(newTags.getChildCount() - 1);
         TextView lastText = (TextView) lastItem.findViewById(R.id.text1);
         return lastText;
     }
@@ -230,11 +234,11 @@ public final class TagsControlSet extends PopupControlSet {
     @Override
     public void readFromTask(Task task) {
         super.readFromTask(task);
-        if(model.getId() != AbstractModel.NO_ID) {
+        if (model.getId() != AbstractModel.NO_ID) {
             TodorooCursor<Metadata> cursor = tagService.getTags(model.getId());
             LinkedHashSet<String> tags = new LinkedHashSet<String>(cursor.getCount());
             try {
-                for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+                for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                     String tag = cursor.get(TaskToTagMetadata.TAG_NAME);
                     tags.add(tag);
                 }
@@ -253,7 +257,7 @@ public final class TagsControlSet extends PopupControlSet {
         for (int i = 0; i < selectedTags.getCount(); i++) { // clear all selected items
             selectedTags.setItemChecked(i, false);
         }
-        if(model.getId() != AbstractModel.NO_ID) {
+        if (model.getId() != AbstractModel.NO_ID) {
             selectTagsFromModel();
         }
         addTag("", false); //$NON-NLS-1$
@@ -293,12 +297,12 @@ public final class TagsControlSet extends PopupControlSet {
     @Override
     protected String writeToModelAfterInitialized(Task task) {
         // this is a case where we're asked to save but the UI was not yet populated
-        if(!populated)
+        if (!populated)
             return null;
 
         LinkedHashSet<String> tags = getTagSet();
 
-        if(TagService.getInstance().synchronizeTags(task.getId(), task.getValue(Task.UUID), tags)) {
+        if (TagService.getInstance().synchronizeTags(task.getId(), task.getValue(Task.UUID), tags)) {
             Flags.set(Flags.TAGS_CHANGED);
             task.setValue(Task.MODIFICATION_DATE, DateUtilities.now());
         }
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagsPlugin.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagsPlugin.java
index 38d8d2115..d88bdae4a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagsPlugin.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagsPlugin.java
@@ -33,6 +33,7 @@ public class TagsPlugin extends BroadcastReceiver {
 
     /**
      * Create new tag data
+     *
      * @param activity
      */
     public static Intent newTagDialog(Context context) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TaskToTagMetadata.java b/astrid/plugin-src/com/todoroo/astrid/tags/TaskToTagMetadata.java
index 1002e42e8..f013c65fe 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TaskToTagMetadata.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TaskToTagMetadata.java
@@ -5,17 +5,25 @@ import com.todoroo.astrid.data.Metadata;
 
 public class TaskToTagMetadata {
 
-    /** Metadata key for tag data */
+    /**
+     * Metadata key for tag data
+     */
     public static final String KEY = "tags-tag"; //$NON-NLS-1$
 
-    /** Property for reading tag values */
+    /**
+     * Property for reading tag values
+     */
     public static final StringProperty TAG_NAME = Metadata.VALUE1;
 
-    /** Tag uuid */
+    /**
+     * Tag uuid
+     */
     public static final StringProperty TAG_UUID = new StringProperty(
             Metadata.TABLE, Metadata.VALUE2.name);
 
-    /** Task uuid */
+    /**
+     * Task uuid
+     */
     public static final StringProperty TASK_UUID = new StringProperty(
             Metadata.TABLE, Metadata.VALUE3.name);
 
@@ -26,6 +34,7 @@ public class TaskToTagMetadata {
      * New metadata object for linking a task to the specified tag. The task
      * object should be saved and have the uuid property. All parameters
      * are manditory
+     *
      * @param taskId
      * @param tagName
      * @param taskUuid
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterAdapter.java b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterAdapter.java
index 14f22ce75..9e96040c4 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterAdapter.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterAdapter.java
@@ -15,7 +15,7 @@ public class FeaturedListFilterAdapter extends FilterAdapter {
     public static final String BROADCAST_SEND_FEATURED_LISTS = Constants.PACKAGE + ".SEND_FEATURED_LISTS"; //$NON-NLS-1$
 
     public FeaturedListFilterAdapter(Activity activity, ListView listView,
-            int rowLayout, boolean skipIntentFilters) {
+                                     int rowLayout, boolean skipIntentFilters) {
         super(activity, listView, rowLayout, skipIntentFilters);
     }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterExposer.java
index c745ef4fb..21b198a8d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterExposer.java
@@ -1,7 +1,5 @@
 package com.todoroo.astrid.tags.reusable;
 
-import java.util.List;
-
 import android.content.ComponentName;
 import android.content.ContentValues;
 import android.content.Context;
@@ -30,6 +28,8 @@ import com.todoroo.astrid.tags.TagService;
 import com.todoroo.astrid.tags.TagService.Tag;
 import com.todoroo.astrid.tags.TaskToTagMetadata;
 
+import java.util.List;
+
 public class FeaturedListFilterExposer extends TagFilterExposer {
 
     public static final String PREF_SHOULD_SHOW_FEATURED_LISTS = "show_featured_lists"; //$NON-NLS-1$
@@ -58,7 +58,7 @@ public class FeaturedListFilterExposer extends TagFilterExposer {
 
         Class<?> fragmentClass = FeaturedTaskListFragment.class;
         filter.customTaskList = new ComponentName(ContextManager.getContext(), fragmentClass);
-        if(tag.image != null)
+        if (tag.image != null)
             filter.imageUrl = tag.image;
 
         Bundle extras = new Bundle();
@@ -71,12 +71,12 @@ public class FeaturedListFilterExposer extends TagFilterExposer {
 
     public static Filter getDefaultFilter() {
         TodorooCursor<TagData> firstFilter = PluginServices.getTagDataService()
-        .query(Query.select(TagData.PROPERTIES)
-                .where(Criterion.and(
-                        Functions.bitwiseAnd(TagData.FLAGS, TagData.FLAG_FEATURED).gt(0),
-                        TagData.DELETION_DATE.eq(0),
-                        TagData.NAME.isNotNull(),
-                        TagData.NAME.neq(""))) //$NON-NLS-1$
+                .query(Query.select(TagData.PROPERTIES)
+                        .where(Criterion.and(
+                                Functions.bitwiseAnd(TagData.FLAGS, TagData.FLAG_FEATURED).gt(0),
+                                TagData.DELETION_DATE.eq(0),
+                                TagData.NAME.isNotNull(),
+                                TagData.NAME.neq(""))) //$NON-NLS-1$
                         .orderBy(Order.asc(TagData.NAME))
                         .limit(1));
         try {
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java
index ef6bc2264..b3e794364 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java
@@ -19,8 +19,8 @@ public class FeaturedListFilterMode implements FilterModeSpec {
     }
 
     private static final int[] FORBIDDEN_MENU_ITEMS = {
-        TaskListFragment.MENU_NEW_FILTER_ID,
-        MainMenuPopover.MAIN_MENU_ITEM_FEATURED_LISTS
+            TaskListFragment.MENU_NEW_FILTER_ID,
+            MainMenuPopover.MAIN_MENU_ITEM_FEATURED_LISTS
     };
 
     @Override
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java
index e03cc95e0..d167b6806 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java
@@ -38,7 +38,8 @@ import com.todoroo.astrid.utility.ResourceDrawableCache;
 
 public class FeaturedTaskListFragment extends TagViewFragment {
 
-    @Autowired private TagDataService tagDataService;
+    @Autowired
+    private TagDataService tagDataService;
 
     private static final int MENU_CLONE_LIST = R.string.actfm_feat_list_clone;
 
@@ -84,7 +85,7 @@ public class FeaturedTaskListFragment extends TagViewFragment {
 
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v,
-            ContextMenuInfo menuInfo) {
+                                    ContextMenuInfo menuInfo) {
         // Do nothing
     }
 
@@ -192,7 +193,7 @@ public class FeaturedTaskListFragment extends TagViewFragment {
     @Override
     protected void refresh() {
         loadTaskListContent(true);
-        ((TextView)taskListView.findViewById(android.R.id.empty)).setText(R.string.TLA_no_items);
+        ((TextView) taskListView.findViewById(android.R.id.empty)).setText(R.string.TLA_no_items);
         setUpMembersGallery();
     }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/ReusableTaskAdapter.java b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/ReusableTaskAdapter.java
index acfc74efc..2ebb79d45 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/ReusableTaskAdapter.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/ReusableTaskAdapter.java
@@ -1,7 +1,5 @@
 package com.todoroo.astrid.tags.reusable;
 
-import java.util.concurrent.atomic.AtomicReference;
-
 import android.content.Context;
 import android.database.Cursor;
 import android.view.View;
@@ -20,17 +18,19 @@ import com.todoroo.astrid.data.RemoteModel;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.utility.Flags;
 
+import java.util.concurrent.atomic.AtomicReference;
+
 public class ReusableTaskAdapter extends TaskAdapter {
 
     public ReusableTaskAdapter(TaskListFragment fragment, int resource,
-            Cursor c, AtomicReference<String> query, boolean autoRequery,
-            OnCompletedTaskListener onCompletedTaskListener) {
+                               Cursor c, AtomicReference<String> query, boolean autoRequery,
+                               OnCompletedTaskListener onCompletedTaskListener) {
         super(fragment, resource, c, query, autoRequery, onCompletedTaskListener);
     }
 
     @Override
     public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        ViewGroup view = (ViewGroup)inflater.inflate(resource, parent, false);
+        ViewGroup view = (ViewGroup) inflater.inflate(resource, parent, false);
 
         ReusableTaskViewHolder viewHolder = new ReusableTaskViewHolder();
         viewHolder.task = new Task();
@@ -43,7 +43,7 @@ public class ReusableTaskAdapter extends TaskAdapter {
         }
 
         view.setTag(viewHolder);
-        for(int i = 0; i < view.getChildCount(); i++)
+        for (int i = 0; i < view.getChildCount(); i++)
             view.getChildAt(i).setTag(viewHolder);
 
         viewHolder.clone.setOnClickListener(new OnClickListener() {
@@ -61,7 +61,7 @@ public class ReusableTaskAdapter extends TaskAdapter {
 
     @Override
     public void bindView(View view, Context context, Cursor c) {
-        TodorooCursor<Task> cursor = (TodorooCursor<Task>)c;
+        TodorooCursor<Task> cursor = (TodorooCursor<Task>) c;
         ReusableTaskViewHolder viewHolder = (ReusableTaskViewHolder) view.getTag();
 
         Task task = viewHolder.task;
diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionControlSet.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionControlSet.java
index 9a856a6c4..e9a08cc5d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionControlSet.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.timers;
 
-import java.util.LinkedList;
-import java.util.List;
-
 import android.app.Activity;
 import android.os.SystemClock;
 import android.text.format.DateFormat;
@@ -23,6 +20,9 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.helper.TaskEditControlSet;
 
+import java.util.LinkedList;
+import java.util.List;
+
 public class TimerActionControlSet extends TaskEditControlSet {
 
     private final ImageView timerButton;
@@ -66,12 +66,12 @@ public class TimerActionControlSet extends TaskEditControlSet {
             if (timerActive) {
                 TimerPlugin.updateTimer(activity, model, false);
 
-                for(TimerActionListener listener : listeners)
+                for (TimerActionListener listener : listeners)
                     listener.timerStopped(model);
                 chronometer.stop();
             } else {
                 TimerPlugin.updateTimer(activity, model, true);
-                for(TimerActionListener listener : listeners)
+                for (TimerActionListener listener : listeners)
                     listener.timerStarted(model);
                 chronometer.start();
             }
@@ -82,7 +82,7 @@ public class TimerActionControlSet extends TaskEditControlSet {
 
     private void updateDisplay() {
         final int drawable;
-        if(timerActive) {
+        if (timerActive) {
             drawable = R.drawable.icn_timer_stop;
         } else {
             drawable = R.drawable.icn_edit_timer;
@@ -113,6 +113,7 @@ public class TimerActionControlSet extends TaskEditControlSet {
 
     public interface TimerActionListener {
         public void timerStopped(Task task);
+
         public void timerStarted(Task task);
     }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java
index e8832cf87..17bb8290d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerControlSet.java
@@ -25,7 +25,6 @@ import com.todoroo.astrid.ui.TimeDurationControlSet;
  * Control Set for managing repeats
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TimerControlSet extends PopupControlSet implements TimerActionListener {
 
@@ -44,10 +43,10 @@ public class TimerControlSet extends PopupControlSet implements TimerActionListe
 
         estimated = new TimeDurationTaskEditControlSet(activity, getView(), Task.ESTIMATED_SECONDS,
                 R.id.estimatedDuration, 0, R.string.DLG_hour_minutes
-                );
+        );
         elapsed = new TimeDurationTaskEditControlSet(activity, getView(), Task.ELAPSED_SECONDS, R.id.elapsedDuration,
                 0, R.string.DLG_hour_minutes
-                );
+        );
     }
 
     @Override
@@ -74,15 +73,15 @@ public class TimerControlSet extends PopupControlSet implements TimerActionListe
 
     /**
      * Control set for mapping a Property to a TimeDurationControlSet
-     * @author Tim Su <tim@todoroo.com>
      *
+     * @author Tim Su <tim@todoroo.com>
      */
     public class TimeDurationTaskEditControlSet extends TaskEditControlSet {
         private final TimeDurationControlSet controlSet;
         private final IntegerProperty property;
 
         public TimeDurationTaskEditControlSet(Activity activity, View v, IntegerProperty property, int timeButtonId,
-                int prefixResource, int titleResource) {
+                                              int prefixResource, int titleResource) {
             super(activity, -1);
             this.property = property;
             this.controlSet = new TimeDurationControlSet(activity, v, property,
diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerDecorationExposer.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerDecorationExposer.java
index a89bdb2b6..50a6676fb 100644
--- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerDecorationExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerDecorationExposer.java
@@ -25,7 +25,6 @@ import com.todoroo.astrid.data.Task;
  * Exposes {@link TaskDecoration} for timers
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TimerDecorationExposer implements TaskDecorationExposer {
 
@@ -33,7 +32,7 @@ public class TimerDecorationExposer implements TaskDecorationExposer {
 
     @Override
     public TaskDecoration expose(Task task) {
-        if(task == null || (task.getValue(Task.ELAPSED_SECONDS) == 0 &&
+        if (task == null || (task.getValue(Task.ELAPSED_SECONDS) == 0 &&
                 task.getValue(Task.TIMER_START) == 0))
             return null;
 
@@ -44,7 +43,7 @@ public class TimerDecorationExposer implements TaskDecorationExposer {
                 TaskDecoration.POSITION_LEFT, 0);
 
         long elapsed = task.getValue(Task.ELAPSED_SECONDS) * 1000L;
-        if(task.getValue(Task.TIMER_START) != 0) {
+        if (task.getValue(Task.TIMER_START) != 0) {
             decoration.color = TIMING_BG_COLOR;
             elapsed += DateUtilities.now() - task.getValue(Task.TIMER_START);
             decoration.decoration.setChronometer(R.id.timer, SystemClock.elapsedRealtime() -
@@ -66,7 +65,7 @@ public class TimerDecorationExposer implements TaskDecorationExposer {
 
     public void updateDecoration(Context context, Task task) {
         TaskDecoration decoration = expose(task);
-        if(decoration == null)
+        if (decoration == null)
             return;
 
         Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_SEND_DECORATIONS);
diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerFilterExposer.java
index 0b538730e..423a770b6 100644
--- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerFilterExposer.java
@@ -28,7 +28,6 @@ import com.todoroo.astrid.data.Task;
  * Exposes "working on" filter to the {@link FilterListFragment}
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public final class TimerFilterExposer extends BroadcastReceiver implements AstridFilterExposer {
 
@@ -43,7 +42,7 @@ public final class TimerFilterExposer extends BroadcastReceiver implements Astri
     }
 
     private FilterListItem[] prepareFilters(Context context) {
-        if(PluginServices.getTaskService().count(Query.select(Task.ID).
+        if (PluginServices.getTaskService().count(Query.select(Task.ID).
                 where(Task.TIMER_START.gt(0))) == 0)
             return null;
 
@@ -63,7 +62,7 @@ public final class TimerFilterExposer extends BroadcastReceiver implements Astri
                 r.getString(R.string.TFE_workingOn),
                 new QueryTemplate().where(Task.TIMER_START.gt(0)),
                 values);
-        workingOn.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.tango_clock)).getBitmap();
+        workingOn.listingIcon = ((BitmapDrawable) r.getDrawable(R.drawable.tango_clock)).getBitmap();
         return workingOn;
     }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java
index 7d1185e30..9af185622 100644
--- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java
+++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java
@@ -46,6 +46,7 @@ public class TimerPlugin extends BroadcastReceiver {
 
     /**
      * toggles timer and updates elapsed time.
+     *
      * @param task
      * @param start if true, start timer. else, stop it
      */
@@ -57,14 +58,14 @@ public class TimerPlugin extends BroadcastReceiver {
         if (task == null)
             return;
 
-        if(start) {
-            if(task.getValue(Task.TIMER_START) == 0) {
+        if (start) {
+            if (task.getValue(Task.TIMER_START) == 0) {
                 task.setValue(Task.TIMER_START, DateUtilities.now());
                 StatisticsService.reportEvent(StatisticsConstants.TIMER_START);
             }
         } else {
-            if(task.getValue(Task.TIMER_START) > 0) {
-                int newElapsed = (int)((DateUtilities.now() - task.getValue(Task.TIMER_START)) / 1000L);
+            if (task.getValue(Task.TIMER_START) > 0) {
+                int newElapsed = (int) ((DateUtilities.now() - task.getValue(Task.TIMER_START)) / 1000L);
                 task.setValue(Task.TIMER_START, 0L);
                 task.setValue(Task.ELAPSED_SECONDS,
                         task.getValue(Task.ELAPSED_SECONDS) + newElapsed);
@@ -83,7 +84,7 @@ public class TimerPlugin extends BroadcastReceiver {
 
         int count = PluginServices.getTaskService().count(Query.select(Task.ID).
                 where(Task.TIMER_START.gt(0)));
-        if(count == 0) {
+        if (count == 0) {
             nm.cancel(Constants.NOTIFICATION_TIMER);
         } else {
             Filter filter = TimerFilterExposer.createFilter(context);
diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerTaskCompleteListener.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerTaskCompleteListener.java
index 7182c351f..4ff249755 100644
--- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerTaskCompleteListener.java
+++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerTaskCompleteListener.java
@@ -20,12 +20,12 @@ public class TimerTaskCompleteListener extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         ContextManager.setContext(context);
         long taskId = intent.getLongExtra(AstridApiConstants.EXTRAS_TASK_ID, -1);
-        if(taskId == -1)
+        if (taskId == -1)
             return;
 
         Task task = PluginServices.getTaskService().fetchById(taskId, Task.ID, Task.ELAPSED_SECONDS,
                 Task.TIMER_START);
-        if(task == null || task.getValue(Task.TIMER_START) == 0)
+        if (task == null || task.getValue(Task.TIMER_START) == 0)
             return;
 
         TimerPlugin.updateTimer(context, task, false);
diff --git a/astrid/res/anim/slide_bottom_in.xml b/astrid/res/anim/slide_bottom_in.xml
index 01e1245b7..2a71f136a 100644
--- a/astrid/res/anim/slide_bottom_in.xml
+++ b/astrid/res/anim/slide_bottom_in.xml
@@ -15,5 +15,8 @@
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromYDelta="100%p" android:toYDelta="0" android:duration="150"/>
+    <translate
+            android:fromYDelta="100%p"
+            android:toYDelta="0"
+            android:duration="150"/>
 </set>
diff --git a/astrid/res/anim/slide_bottom_out.xml b/astrid/res/anim/slide_bottom_out.xml
index c297e8768..9b740a528 100644
--- a/astrid/res/anim/slide_bottom_out.xml
+++ b/astrid/res/anim/slide_bottom_out.xml
@@ -15,5 +15,8 @@
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromYDelta="0" android:toYDelta="100%p" android:duration="150"/>
+    <translate
+            android:fromYDelta="0"
+            android:toYDelta="100%p"
+            android:duration="150"/>
 </set>
diff --git a/astrid/res/anim/slide_left_in.xml b/astrid/res/anim/slide_left_in.xml
index 291a0f127..6bf096f84 100644
--- a/astrid/res/anim/slide_left_in.xml
+++ b/astrid/res/anim/slide_left_in.xml
@@ -15,5 +15,8 @@
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromXDelta="100%p" android:toXDelta="0" android:duration="150"/>
+    <translate
+            android:fromXDelta="100%p"
+            android:toXDelta="0"
+            android:duration="150"/>
 </set>
diff --git a/astrid/res/anim/slide_left_out.xml b/astrid/res/anim/slide_left_out.xml
index 2f3a5dfb1..fb8dfd4a7 100644
--- a/astrid/res/anim/slide_left_out.xml
+++ b/astrid/res/anim/slide_left_out.xml
@@ -15,5 +15,8 @@
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromXDelta="0" android:toXDelta="-100%p" android:duration="150"/>
+    <translate
+            android:fromXDelta="0"
+            android:toXDelta="-100%p"
+            android:duration="150"/>
 </set>
diff --git a/astrid/res/anim/slide_none.xml b/astrid/res/anim/slide_none.xml
index 2b818a771..e1544a3a6 100644
--- a/astrid/res/anim/slide_none.xml
+++ b/astrid/res/anim/slide_none.xml
@@ -15,5 +15,8 @@
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromYDelta="0" android:toYDelta="0" android:duration="150"/>
+    <translate
+            android:fromYDelta="0"
+            android:toYDelta="0"
+            android:duration="150"/>
 </set>
diff --git a/astrid/res/anim/slide_right_in.xml b/astrid/res/anim/slide_right_in.xml
index 749fb14cb..2e8cfc369 100644
--- a/astrid/res/anim/slide_right_in.xml
+++ b/astrid/res/anim/slide_right_in.xml
@@ -15,5 +15,8 @@
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromXDelta="-100%p" android:toXDelta="0" android:duration="150"/>
+    <translate
+            android:fromXDelta="-100%p"
+            android:toXDelta="0"
+            android:duration="150"/>
 </set>
diff --git a/astrid/res/anim/slide_right_out.xml b/astrid/res/anim/slide_right_out.xml
index 84dacfca6..bbfb8d8d9 100644
--- a/astrid/res/anim/slide_right_out.xml
+++ b/astrid/res/anim/slide_right_out.xml
@@ -15,5 +15,8 @@
 -->
 
 <set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate android:fromXDelta="0" android:toXDelta="100%p" android:duration="150"/>
+    <translate
+            android:fromXDelta="0"
+            android:toXDelta="100%p"
+            android:duration="150"/>
 </set>
diff --git a/astrid/res/color/new_list_button_text.xml b/astrid/res/color/new_list_button_text.xml
index 28fe5af2e..f267fb5cb 100644
--- a/astrid/res/color/new_list_button_text.xml
+++ b/astrid/res/color/new_list_button_text.xml
@@ -4,9 +4,9 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-        <item android:state_pressed="true"
-              android:color="#888"/>
-        <item android:state_pressed="false"
-              android:color="#fff"/>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+          android:color="#888"/>
+    <item android:state_pressed="false"
+          android:color="#fff"/>
 </selector>
\ No newline at end of file
diff --git a/astrid/res/color/task_edit_toggle_button_text.xml b/astrid/res/color/task_edit_toggle_button_text.xml
index 6be054e27..10a851dcc 100644
--- a/astrid/res/color/task_edit_toggle_button_text.xml
+++ b/astrid/res/color/task_edit_toggle_button_text.xml
@@ -4,9 +4,9 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-        <item android:state_checked="true"
-              android:color="@android:color/white"/>
-        <item android:state_checked="false"
-              android:color="@color/task_edit_deadline_gray"/>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true"
+          android:color="@android:color/white"/>
+    <item android:state_checked="false"
+          android:color="@color/task_edit_deadline_gray"/>
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable-v11/importance_title_1.xml b/astrid/res/drawable-v11/importance_title_1.xml
index e92f735c8..d43bbdefa 100644
--- a/astrid/res/drawable-v11/importance_title_1.xml
+++ b/astrid/res/drawable-v11/importance_title_1.xml
@@ -5,9 +5,9 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid android:color="@color/importance_1" />
-  <corners
-    android:bottomLeftRadius="4dp"
-    android:topLeftRadius="4dp" />
+       android:shape="rectangle">
+    <solid android:color="@color/importance_1"/>
+    <corners
+            android:bottomLeftRadius="4dp"
+            android:topLeftRadius="4dp"/>
 </shape>
diff --git a/astrid/res/drawable-v11/importance_title_2.xml b/astrid/res/drawable-v11/importance_title_2.xml
index d72d40c67..0bbba6e24 100644
--- a/astrid/res/drawable-v11/importance_title_2.xml
+++ b/astrid/res/drawable-v11/importance_title_2.xml
@@ -5,9 +5,9 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid android:color="@color/importance_2" />
-  <corners
-    android:bottomLeftRadius="4dp"
-    android:topLeftRadius="4dp" />
+       android:shape="rectangle">
+    <solid android:color="@color/importance_2"/>
+    <corners
+            android:bottomLeftRadius="4dp"
+            android:topLeftRadius="4dp"/>
 </shape>
diff --git a/astrid/res/drawable-v11/importance_title_3.xml b/astrid/res/drawable-v11/importance_title_3.xml
index 2e2a1b118..cf530ce56 100644
--- a/astrid/res/drawable-v11/importance_title_3.xml
+++ b/astrid/res/drawable-v11/importance_title_3.xml
@@ -5,9 +5,9 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid android:color="@color/importance_3" />
-  <corners
-    android:bottomLeftRadius="4dp"
-    android:topLeftRadius="4dp" />
+       android:shape="rectangle">
+    <solid android:color="@color/importance_3"/>
+    <corners
+            android:bottomLeftRadius="4dp"
+            android:topLeftRadius="4dp"/>
 </shape>
diff --git a/astrid/res/drawable-v11/importance_title_4.xml b/astrid/res/drawable-v11/importance_title_4.xml
index 15bb40096..acd6bf833 100644
--- a/astrid/res/drawable-v11/importance_title_4.xml
+++ b/astrid/res/drawable-v11/importance_title_4.xml
@@ -5,9 +5,9 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid android:color="@color/importance_4" />
-  <corners
-    android:bottomLeftRadius="4dp"
-    android:topLeftRadius="4dp" />
+       android:shape="rectangle">
+    <solid android:color="@color/importance_4"/>
+    <corners
+            android:bottomLeftRadius="4dp"
+            android:topLeftRadius="4dp"/>
 </shape>
diff --git a/astrid/res/drawable-v11/importance_title_5.xml b/astrid/res/drawable-v11/importance_title_5.xml
index cd9a211b1..8acc68ab1 100644
--- a/astrid/res/drawable-v11/importance_title_5.xml
+++ b/astrid/res/drawable-v11/importance_title_5.xml
@@ -5,9 +5,9 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid android:color="@color/importance_5" />
-  <corners
-    android:bottomLeftRadius="4dp"
-    android:topLeftRadius="4dp" />
+       android:shape="rectangle">
+    <solid android:color="@color/importance_5"/>
+    <corners
+            android:bottomLeftRadius="4dp"
+            android:topLeftRadius="4dp"/>
 </shape>
diff --git a/astrid/res/drawable-v11/importance_title_6.xml b/astrid/res/drawable-v11/importance_title_6.xml
index 78d787149..462571c49 100644
--- a/astrid/res/drawable-v11/importance_title_6.xml
+++ b/astrid/res/drawable-v11/importance_title_6.xml
@@ -5,9 +5,9 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid android:color="@color/importance_6" />
-  <corners
-    android:bottomLeftRadius="4dp"
-    android:topLeftRadius="4dp" />
+       android:shape="rectangle">
+    <solid android:color="@color/importance_6"/>
+    <corners
+            android:bottomLeftRadius="4dp"
+            android:topLeftRadius="4dp"/>
 </shape>
diff --git a/astrid/res/drawable/astrid_com_gradient.xml b/astrid/res/drawable/astrid_com_gradient.xml
index 1ec360c5c..d848d3198 100644
--- a/astrid/res/drawable/astrid_com_gradient.xml
+++ b/astrid/res/drawable/astrid_com_gradient.xml
@@ -5,12 +5,12 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <gradient
-      android:type="radial"
-      android:startColor="#70cef1"
-      android:endColor="#2d8db6"
-      android:gradientRadius="300"
-      android:centerX="0.5"
-      android:centerY="0.5" />
+       android:shape="rectangle">
+    <gradient
+            android:type="radial"
+            android:startColor="#70cef1"
+            android:endColor="#2d8db6"
+            android:gradientRadius="300"
+            android:centerX="0.5"
+            android:centerY="0.5"/>
 </shape>
diff --git a/astrid/res/drawable/btn_add.xml b/astrid/res/drawable/btn_add.xml
index eb597adab..10fd568b3 100644
--- a/astrid/res/drawable/btn_add.xml
+++ b/astrid/res/drawable/btn_add.xml
@@ -17,7 +17,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_pressed="true"
-          android:drawable="@drawable/btn_add_pressed" />
-    <item android:drawable="@drawable/btn_add_normal" />
+          android:drawable="@drawable/btn_add_pressed"/>
+    <item android:drawable="@drawable/btn_add_normal"/>
 
 </selector>
diff --git a/astrid/res/drawable/btn_check.xml b/astrid/res/drawable/btn_check.xml
index 80906df34..fdc7445d0 100644
--- a/astrid/res/drawable/btn_check.xml
+++ b/astrid/res/drawable/btn_check.xml
@@ -18,9 +18,9 @@
 
     <item android:state_checked="false"
           android:state_enabled="true"
-          android:drawable="@drawable/icn_check_off" />
+          android:drawable="@drawable/icn_check_off"/>
     <item android:state_checked="true"
           android:state_enabled="true"
-          android:drawable="@drawable/icn_check_on" />
+          android:drawable="@drawable/icn_check_on"/>
 
 </selector>
diff --git a/astrid/res/drawable/btn_check_small.xml b/astrid/res/drawable/btn_check_small.xml
index 3ff6790be..c2b01d344 100644
--- a/astrid/res/drawable/btn_check_small.xml
+++ b/astrid/res/drawable/btn_check_small.xml
@@ -17,19 +17,19 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Enabled states -->
-        
+
     <item android:state_checked="true" android:state_pressed="true"
           android:state_enabled="true"
-          android:drawable="@android:drawable/checkbox_off_background" />
+          android:drawable="@android:drawable/checkbox_off_background"/>
     <item android:state_checked="false" android:state_pressed="true"
           android:state_enabled="true"
-          android:drawable="@android:drawable/checkbox_on_background" />
+          android:drawable="@android:drawable/checkbox_on_background"/>
 
     <item android:state_checked="false"
           android:state_enabled="true"
-          android:drawable="@android:drawable/checkbox_off_background" />
+          android:drawable="@android:drawable/checkbox_off_background"/>
     <item android:state_checked="true"
           android:state_enabled="true"
-          android:drawable="@android:drawable/checkbox_on_background" />
+          android:drawable="@android:drawable/checkbox_on_background"/>
 
 </selector>
diff --git a/astrid/res/drawable/btn_clone.xml b/astrid/res/drawable/btn_clone.xml
index ed1a20a15..b8cafcaa2 100644
--- a/astrid/res/drawable/btn_clone.xml
+++ b/astrid/res/drawable/btn_clone.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"
-          android:drawable="@drawable/icn_clone_down" />
-    <item android:drawable="@drawable/icn_clone_up" />
+          android:drawable="@drawable/icn_clone_down"/>
+    <item android:drawable="@drawable/icn_clone_up"/>
 
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/btn_dismiss.xml b/astrid/res/drawable/btn_dismiss.xml
index 78deabd1c..85f793cae 100644
--- a/astrid/res/drawable/btn_dismiss.xml
+++ b/astrid/res/drawable/btn_dismiss.xml
@@ -17,7 +17,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_pressed="true"
-          android:drawable="@drawable/btn_dismiss_pressed" />
-    <item android:drawable="@drawable/btn_dismiss_normal" />
+          android:drawable="@drawable/btn_dismiss_pressed"/>
+    <item android:drawable="@drawable/btn_dismiss_normal"/>
 
 </selector>
diff --git a/astrid/res/drawable/camera_button.xml b/astrid/res/drawable/camera_button.xml
index ff317e87d..321c00cff 100644
--- a/astrid/res/drawable/camera_button.xml
+++ b/astrid/res/drawable/camera_button.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/camera_button_pressed"/>
     <item android:state_focused="true" android:drawable="@drawable/camera_button_pressed"/>
     <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/camera_button_normal"/>
diff --git a/astrid/res/drawable/comment_blue.xml b/astrid/res/drawable/comment_blue.xml
index eb8874e7c..4194cf646 100644
--- a/astrid/res/drawable/comment_blue.xml
+++ b/astrid/res/drawable/comment_blue.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/comment_blue_pressed"/>
     <item android:state_focused="true" android:drawable="@drawable/comment_blue_pressed"/>
     <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/comment_blue_normal"/>
diff --git a/astrid/res/drawable/comment_blue_alt.xml b/astrid/res/drawable/comment_blue_alt.xml
index e58cf8227..c99077df5 100644
--- a/astrid/res/drawable/comment_blue_alt.xml
+++ b/astrid/res/drawable/comment_blue_alt.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/comment_blue_alt_pressed"/>
     <item android:state_focused="true" android:drawable="@drawable/comment_blue_alt_pressed"/>
     <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/comment_blue_alt_normal"/>
diff --git a/astrid/res/drawable/comment_blue_filled.xml b/astrid/res/drawable/comment_blue_filled.xml
index 0999d1f70..c7d6de853 100644
--- a/astrid/res/drawable/comment_blue_filled.xml
+++ b/astrid/res/drawable/comment_blue_filled.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/comment_blue_filled_pressed"/>
     <item android:state_focused="true" android:drawable="@drawable/comment_blue_filled_pressed"/>
     <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/comment_blue_filled_normal"/>
diff --git a/astrid/res/drawable/comment_blue_filled_alt.xml b/astrid/res/drawable/comment_blue_filled_alt.xml
index 0a04982a6..6132d0004 100644
--- a/astrid/res/drawable/comment_blue_filled_alt.xml
+++ b/astrid/res/drawable/comment_blue_filled_alt.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/comment_blue_alt_filled_pressed"/>
     <item android:state_focused="true" android:drawable="@drawable/comment_blue_alt_filled_pressed"/>
     <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/comment_blue_alt_filled_normal"/>
diff --git a/astrid/res/drawable/comment_dark_blue.xml b/astrid/res/drawable/comment_dark_blue.xml
index 5ec798a31..75f66a557 100644
--- a/astrid/res/drawable/comment_dark_blue.xml
+++ b/astrid/res/drawable/comment_dark_blue.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/comment_dark_blue_pressed"/>
     <item android:state_focused="true" android:drawable="@drawable/comment_dark_blue_pressed"/>
     <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/comment_dark_blue_normal"/>
diff --git a/astrid/res/drawable/comment_dark_blue_filled.xml b/astrid/res/drawable/comment_dark_blue_filled.xml
index f8e030937..a10839600 100644
--- a/astrid/res/drawable/comment_dark_blue_filled.xml
+++ b/astrid/res/drawable/comment_dark_blue_filled.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/comment_dark_blue_filled_pressed"/>
     <item android:state_focused="true" android:drawable="@drawable/comment_dark_blue_filled_pressed"/>
     <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/comment_dark_blue_filled_normal"/>
diff --git a/astrid/res/drawable/comment_red.xml b/astrid/res/drawable/comment_red.xml
index 82a4c4268..4e8c432ba 100644
--- a/astrid/res/drawable/comment_red.xml
+++ b/astrid/res/drawable/comment_red.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/comment_red_pressed"/>
     <item android:state_focused="true" android:drawable="@drawable/comment_red_pressed"/>
     <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/comment_red_normal"/>
diff --git a/astrid/res/drawable/comment_red_filled.xml b/astrid/res/drawable/comment_red_filled.xml
index 19cc37333..e0b5a9738 100644
--- a/astrid/res/drawable/comment_red_filled.xml
+++ b/astrid/res/drawable/comment_red_filled.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/comment_red_filled_pressed"/>
     <item android:state_focused="true" android:drawable="@drawable/comment_red_filled_pressed"/>
     <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/comment_red_filled_normal"/>
diff --git a/astrid/res/drawable/custom_tab_indicator.xml b/astrid/res/drawable/custom_tab_indicator.xml
index 58903a5a1..b4d0432de 100644
--- a/astrid/res/drawable/custom_tab_indicator.xml
+++ b/astrid/res/drawable/custom_tab_indicator.xml
@@ -16,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_unselected" />
-    <item android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_selected_layer" />
+    <item android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_unselected"/>
+    <item android:state_selected="true" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_selected_layer"/>
 
 </selector>
diff --git a/astrid/res/drawable/custom_tab_indicator_alt.xml b/astrid/res/drawable/custom_tab_indicator_alt.xml
index c190d8b34..8c71b9eb3 100644
--- a/astrid/res/drawable/custom_tab_indicator_alt.xml
+++ b/astrid/res/drawable/custom_tab_indicator_alt.xml
@@ -16,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_unselected_alt" />
-    <item android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_selected_alt_layer" />
-    
+    <item android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_unselected_alt"/>
+    <item android:state_selected="true" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_selected_alt_layer"/>
+
 </selector>
diff --git a/astrid/res/drawable/custom_tab_indicator_dark.xml b/astrid/res/drawable/custom_tab_indicator_dark.xml
index 68e6f4433..9fa48be36 100644
--- a/astrid/res/drawable/custom_tab_indicator_dark.xml
+++ b/astrid/res/drawable/custom_tab_indicator_dark.xml
@@ -16,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_unselected" />
-    <item android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_selected_layer" />
+    <item android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_unselected"/>
+    <item android:state_selected="true" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_selected_layer"/>
 
 </selector>
diff --git a/astrid/res/drawable/custom_tab_indicator_dark_blue.xml b/astrid/res/drawable/custom_tab_indicator_dark_blue.xml
index 2d7df74aa..70a014547 100644
--- a/astrid/res/drawable/custom_tab_indicator_dark_blue.xml
+++ b/astrid/res/drawable/custom_tab_indicator_dark_blue.xml
@@ -16,7 +16,7 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_blue_unselected" />
-    <item android:state_selected="true"  android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_blue_selected_layer" />
+    <item android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_blue_unselected"/>
+    <item android:state_selected="true" android:state_pressed="false" android:drawable="@drawable/custom_tab_indicator_dark_blue_selected_layer"/>
 
 </selector>
diff --git a/astrid/res/drawable/custom_tab_indicator_dark_blue_selected_layer.xml b/astrid/res/drawable/custom_tab_indicator_dark_blue_selected_layer.xml
index ad423f8f3..697536117 100644
--- a/astrid/res/drawable/custom_tab_indicator_dark_blue_selected_layer.xml
+++ b/astrid/res/drawable/custom_tab_indicator_dark_blue_selected_layer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/task_edit_background_white"/>
     <item android:drawable="@drawable/custom_tab_indicator_dark_blue_selected"/>
 </layer-list>
\ No newline at end of file
diff --git a/astrid/res/drawable/custom_tab_indicator_dark_selected_layer.xml b/astrid/res/drawable/custom_tab_indicator_dark_selected_layer.xml
index ef06b958d..48fab6038 100644
--- a/astrid/res/drawable/custom_tab_indicator_dark_selected_layer.xml
+++ b/astrid/res/drawable/custom_tab_indicator_dark_selected_layer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/task_edit_background"/>
-    <item android:drawable="@drawable/custom_tab_indicator_dark_selected"/>    
+    <item android:drawable="@drawable/custom_tab_indicator_dark_selected"/>
 
 </layer-list>
\ No newline at end of file
diff --git a/astrid/res/drawable/custom_tab_indicator_selected_alt_layer.xml b/astrid/res/drawable/custom_tab_indicator_selected_alt_layer.xml
index b09be76d7..c50508067 100644
--- a/astrid/res/drawable/custom_tab_indicator_selected_alt_layer.xml
+++ b/astrid/res/drawable/custom_tab_indicator_selected_alt_layer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/task_edit_background_white"/>
     <item android:drawable="@drawable/custom_tab_indicator_selected_alt"/>
 </layer-list>
\ No newline at end of file
diff --git a/astrid/res/drawable/custom_tab_indicator_selected_layer.xml b/astrid/res/drawable/custom_tab_indicator_selected_layer.xml
index ee32de8f4..094a317a4 100644
--- a/astrid/res/drawable/custom_tab_indicator_selected_layer.xml
+++ b/astrid/res/drawable/custom_tab_indicator_selected_layer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/task_edit_background_white"/>
     <item android:drawable="@drawable/custom_tab_indicator_selected"/>
 </layer-list>
\ No newline at end of file
diff --git a/astrid/res/drawable/edit_title_background.xml b/astrid/res/drawable/edit_title_background.xml
index 9c2e3427f..c42341c78 100644
--- a/astrid/res/drawable/edit_title_background.xml
+++ b/astrid/res/drawable/edit_title_background.xml
@@ -5,15 +5,16 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
+       android:shape="rectangle">
     <gradient
-      android:startColor="#eeeeee"
-      android:endColor="#ffffff"
-      android:angle="270"
-      android:height="20dp" />
-  <stroke 
-      android:color="#bbbbbf"
-      android:width="1dip" />
-  <size android:width="45dip"
-        android:height="45dip"/>
+            android:startColor="#eeeeee"
+            android:endColor="#ffffff"
+            android:angle="270"
+            android:height="20dp"/>
+    <stroke
+            android:color="#bbbbbf"
+            android:width="1dip"/>
+    <size
+            android:width="45dip"
+            android:height="45dip"/>
 </shape>
diff --git a/astrid/res/drawable/edit_title_background_dark.xml b/astrid/res/drawable/edit_title_background_dark.xml
index 53d249ee3..8b0a1e818 100644
--- a/astrid/res/drawable/edit_title_background_dark.xml
+++ b/astrid/res/drawable/edit_title_background_dark.xml
@@ -5,15 +5,16 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
+       android:shape="rectangle">
     <gradient
-      android:startColor="#111111"
-      android:endColor="#181818"
-      android:angle="270"
-      android:height="20dp" />
-  <stroke 
-      android:color="#707070"
-      android:width="1dip" />
-  <size android:width="45dip"
-        android:height="45dip"/>
+            android:startColor="#111111"
+            android:endColor="#181818"
+            android:angle="270"
+            android:height="20dp"/>
+    <stroke
+            android:color="#707070"
+            android:width="1dip"/>
+    <size
+            android:width="45dip"
+            android:height="45dip"/>
 </shape>
diff --git a/astrid/res/drawable/file_type_background.xml b/astrid/res/drawable/file_type_background.xml
index 85a49c924..2ee7fe8f1 100644
--- a/astrid/res/drawable/file_type_background.xml
+++ b/astrid/res/drawable/file_type_background.xml
@@ -4,8 +4,8 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:shape="rectangle">
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
     <corners android:radius="5dip"/>
     <solid android:color="#b7b7b7"/>
 </shape>
\ No newline at end of file
diff --git a/astrid/res/drawable/filter_count.xml b/astrid/res/drawable/filter_count.xml
index 67557be45..405e2d9ac 100644
--- a/astrid/res/drawable/filter_count.xml
+++ b/astrid/res/drawable/filter_count.xml
@@ -5,13 +5,13 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <shape
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:shape="rectangle">
-  <solid
-    android:color="#66282828" />
-  <corners
-    android:bottomRightRadius="4dp"
-    android:bottomLeftRadius="4dp"
-    android:topLeftRadius="4dp"
-    android:topRightRadius="4dp" />
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:shape="rectangle">
+    <solid
+            android:color="#66282828"/>
+    <corners
+            android:bottomRightRadius="4dp"
+            android:bottomLeftRadius="4dp"
+            android:topLeftRadius="4dp"
+            android:topRightRadius="4dp"/>
 </shape>
\ No newline at end of file
diff --git a/astrid/res/drawable/footer_editbutton.xml b/astrid/res/drawable/footer_editbutton.xml
index 0449aa4d1..1cb273028 100644
--- a/astrid/res/drawable/footer_editbutton.xml
+++ b/astrid/res/drawable/footer_editbutton.xml
@@ -17,7 +17,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_pressed="true"
-          android:drawable="@drawable/footer_editbutton_pressed" />
-    <item android:drawable="@drawable/footer_editbutton_normal" />
+          android:drawable="@drawable/footer_editbutton_pressed"/>
+    <item android:drawable="@drawable/footer_editbutton_normal"/>
 
 </selector>
diff --git a/astrid/res/drawable/header_button.xml b/astrid/res/drawable/header_button.xml
index 4e05b00bb..c5da31b01 100644
--- a/astrid/res/drawable/header_button.xml
+++ b/astrid/res/drawable/header_button.xml
@@ -17,11 +17,11 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_pressed="false" android:state_enabled="true"
-          android:state_focused="false" 
+          android:state_focused="false"
           android:drawable="@drawable/header_background"/>
     <item android:state_pressed="true" android:state_enabled="true"
           android:drawable="@drawable/header_background_pressed"/>
     <item android:state_pressed="false" android:state_enabled="true"
-          android:state_focused="true"  android:drawable="@drawable/header_background_pressed"/>
+          android:state_focused="true" android:drawable="@drawable/header_background_pressed"/>
 
 </selector>
diff --git a/astrid/res/drawable/header_button_white.xml b/astrid/res/drawable/header_button_white.xml
index 59f7bf0d3..bcc2ebedb 100644
--- a/astrid/res/drawable/header_button_white.xml
+++ b/astrid/res/drawable/header_button_white.xml
@@ -17,11 +17,11 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_pressed="false" android:state_enabled="true"
-          android:state_focused="false" 
+          android:state_focused="false"
           android:drawable="@drawable/header_background_white"/>
     <item android:state_pressed="true" android:state_enabled="true"
           android:drawable="@drawable/header_background_pressed"/>
     <item android:state_pressed="false" android:state_enabled="true"
-          android:state_focused="true"  android:drawable="@drawable/header_background_pressed"/>
+          android:state_focused="true" android:drawable="@drawable/header_background_pressed"/>
 
 </selector>
diff --git a/astrid/res/drawable/importance_1.xml b/astrid/res/drawable/importance_1.xml
index 1f4a9bc20..9f87b03e9 100644
--- a/astrid/res/drawable/importance_1.xml
+++ b/astrid/res/drawable/importance_1.xml
@@ -5,6 +5,6 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid android:color="@color/importance_1" />
+       android:shape="rectangle">
+    <solid android:color="@color/importance_1"/>
 </shape>
diff --git a/astrid/res/drawable/importance_2.xml b/astrid/res/drawable/importance_2.xml
index 51b0d8722..98b990bda 100644
--- a/astrid/res/drawable/importance_2.xml
+++ b/astrid/res/drawable/importance_2.xml
@@ -5,6 +5,6 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid android:color="@color/importance_2" />
+       android:shape="rectangle">
+    <solid android:color="@color/importance_2"/>
 </shape>
diff --git a/astrid/res/drawable/importance_3.xml b/astrid/res/drawable/importance_3.xml
index c16a4619c..093a7dc23 100644
--- a/astrid/res/drawable/importance_3.xml
+++ b/astrid/res/drawable/importance_3.xml
@@ -5,6 +5,6 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid android:color="@color/importance_3" />
+       android:shape="rectangle">
+    <solid android:color="@color/importance_3"/>
 </shape>
diff --git a/astrid/res/drawable/importance_4.xml b/astrid/res/drawable/importance_4.xml
index 648a9faa9..89809d50b 100644
--- a/astrid/res/drawable/importance_4.xml
+++ b/astrid/res/drawable/importance_4.xml
@@ -5,6 +5,6 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid android:color="@color/importance_4" />
+       android:shape="rectangle">
+    <solid android:color="@color/importance_4"/>
 </shape>
diff --git a/astrid/res/drawable/importance_background_selected.xml b/astrid/res/drawable/importance_background_selected.xml
index dabd34feb..8f9ea3f31 100644
--- a/astrid/res/drawable/importance_background_selected.xml
+++ b/astrid/res/drawable/importance_background_selected.xml
@@ -5,11 +5,12 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid
-      android:color="#eee"/>
-  <corners
-    android:radius="4dp" />
-  <size android:width="40dip"
-        android:height="40dip"/>
+       android:shape="rectangle">
+    <solid
+            android:color="#eee"/>
+    <corners
+            android:radius="4dp"/>
+    <size
+            android:width="40dip"
+            android:height="40dip"/>
 </shape>
diff --git a/astrid/res/drawable/importance_background_selected_dark.xml b/astrid/res/drawable/importance_background_selected_dark.xml
index 3ec8b9bd2..579b71672 100644
--- a/astrid/res/drawable/importance_background_selected_dark.xml
+++ b/astrid/res/drawable/importance_background_selected_dark.xml
@@ -5,11 +5,12 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-  <solid
-      android:color="#111"/>
-  <corners
-    android:radius="4dp" />
-  <size android:width="40dip"
-        android:height="40dip"/>
+       android:shape="rectangle">
+    <solid
+            android:color="#111"/>
+    <corners
+            android:radius="4dp"/>
+    <size
+            android:width="40dip"
+            android:height="40dip"/>
 </shape>
diff --git a/astrid/res/drawable/importance_check_1.xml b/astrid/res/drawable/importance_check_1.xml
index 5681ffe80..fd39518c7 100644
--- a/astrid/res/drawable/importance_check_1.xml
+++ b/astrid/res/drawable/importance_check_1.xml
@@ -8,9 +8,9 @@
 
     <item android:state_checked="false"
           android:state_enabled="true"
-          android:drawable="@drawable/check_box_1" />
+          android:drawable="@drawable/check_box_1"/>
     <item android:state_checked="true"
           android:state_enabled="true"
-          android:drawable="@drawable/check_box_checked_1" />
+          android:drawable="@drawable/check_box_checked_1"/>
 
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/importance_check_2.xml b/astrid/res/drawable/importance_check_2.xml
index 9029f73a7..820d86df8 100644
--- a/astrid/res/drawable/importance_check_2.xml
+++ b/astrid/res/drawable/importance_check_2.xml
@@ -8,9 +8,9 @@
 
     <item android:state_checked="false"
           android:state_enabled="true"
-          android:drawable="@drawable/check_box_2" />
+          android:drawable="@drawable/check_box_2"/>
     <item android:state_checked="true"
           android:state_enabled="true"
-          android:drawable="@drawable/check_box_checked_2" />
+          android:drawable="@drawable/check_box_checked_2"/>
 
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/importance_check_3.xml b/astrid/res/drawable/importance_check_3.xml
index d845b2e43..ba5abb979 100644
--- a/astrid/res/drawable/importance_check_3.xml
+++ b/astrid/res/drawable/importance_check_3.xml
@@ -8,9 +8,9 @@
 
     <item android:state_checked="false"
           android:state_enabled="true"
-          android:drawable="@drawable/check_box_3" />
+          android:drawable="@drawable/check_box_3"/>
     <item android:state_checked="true"
           android:state_enabled="true"
-          android:drawable="@drawable/check_box_checked_3" />
+          android:drawable="@drawable/check_box_checked_3"/>
 
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/importance_check_4.xml b/astrid/res/drawable/importance_check_4.xml
index 32a513d4d..89da804a6 100644
--- a/astrid/res/drawable/importance_check_4.xml
+++ b/astrid/res/drawable/importance_check_4.xml
@@ -8,9 +8,9 @@
 
     <item android:state_checked="false"
           android:state_enabled="true"
-          android:drawable="@drawable/check_box_4" />
+          android:drawable="@drawable/check_box_4"/>
     <item android:state_checked="true"
           android:state_enabled="true"
-          android:drawable="@drawable/check_box_checked_4" />
+          android:drawable="@drawable/check_box_checked_4"/>
 
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/importance_check_repeat_1.xml b/astrid/res/drawable/importance_check_repeat_1.xml
index 5c64a294d..568ff19da 100644
--- a/astrid/res/drawable/importance_check_repeat_1.xml
+++ b/astrid/res/drawable/importance_check_repeat_1.xml
@@ -8,9 +8,9 @@
 
     <item android:state_checked="false"
           android:state_enabled="true"
-          android:drawable="@drawable/check_box_repeat_1" />
+          android:drawable="@drawable/check_box_repeat_1"/>
     <item android:state_checked="true"
           android:state_enabled="true"
-          android:drawable="@drawable/check_box_repeat_checked_1" />
+          android:drawable="@drawable/check_box_repeat_checked_1"/>
 
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/importance_check_repeat_2.xml b/astrid/res/drawable/importance_check_repeat_2.xml
index 645bec70b..d2cc5a0a3 100644
--- a/astrid/res/drawable/importance_check_repeat_2.xml
+++ b/astrid/res/drawable/importance_check_repeat_2.xml
@@ -8,9 +8,9 @@
 
     <item android:state_checked="false"
           android:state_enabled="true"
-          android:drawable="@drawable/check_box_repeat_2" />
+          android:drawable="@drawable/check_box_repeat_2"/>
     <item android:state_checked="true"
           android:state_enabled="true"
-          android:drawable="@drawable/check_box_repeat_checked_2" />
+          android:drawable="@drawable/check_box_repeat_checked_2"/>
 
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/importance_check_repeat_3.xml b/astrid/res/drawable/importance_check_repeat_3.xml
index bdce11fc5..339f720a7 100644
--- a/astrid/res/drawable/importance_check_repeat_3.xml
+++ b/astrid/res/drawable/importance_check_repeat_3.xml
@@ -8,9 +8,9 @@
 
     <item android:state_checked="false"
           android:state_enabled="true"
-          android:drawable="@drawable/check_box_repeat_3" />
+          android:drawable="@drawable/check_box_repeat_3"/>
     <item android:state_checked="true"
           android:state_enabled="true"
-          android:drawable="@drawable/check_box_repeat_checked_3" />
+          android:drawable="@drawable/check_box_repeat_checked_3"/>
 
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/importance_check_repeat_4.xml b/astrid/res/drawable/importance_check_repeat_4.xml
index 06e813ffa..c395ff6bc 100644
--- a/astrid/res/drawable/importance_check_repeat_4.xml
+++ b/astrid/res/drawable/importance_check_repeat_4.xml
@@ -8,9 +8,9 @@
 
     <item android:state_checked="false"
           android:state_enabled="true"
-          android:drawable="@drawable/check_box_repeat_4" />
+          android:drawable="@drawable/check_box_repeat_4"/>
     <item android:state_checked="true"
           android:state_enabled="true"
-          android:drawable="@drawable/check_box_repeat_checked_4" />
+          android:drawable="@drawable/check_box_repeat_checked_4"/>
 
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/lists_disclosure_blue.xml b/astrid/res/drawable/lists_disclosure_blue.xml
index 8bf99a0e2..d9bb5d362 100644
--- a/astrid/res/drawable/lists_disclosure_blue.xml
+++ b/astrid/res/drawable/lists_disclosure_blue.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="false" android:drawable="@drawable/lists_disclosure_blue_off"/>
     <item android:state_selected="true" android:drawable="@drawable/lists_disclosure_blue_on"/>
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/lists_disclosure_blue_alt.xml b/astrid/res/drawable/lists_disclosure_blue_alt.xml
index 77c7beb70..6d7bc8a60 100644
--- a/astrid/res/drawable/lists_disclosure_blue_alt.xml
+++ b/astrid/res/drawable/lists_disclosure_blue_alt.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true" android:drawable="@drawable/lists_disclosure_blue_off"/>
     <item android:state_selected="false" android:drawable="@drawable/lists_disclosure_red_on"/>
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/lists_disclosure_dark_blue.xml b/astrid/res/drawable/lists_disclosure_dark_blue.xml
index e3e45f5ca..a68c50277 100644
--- a/astrid/res/drawable/lists_disclosure_dark_blue.xml
+++ b/astrid/res/drawable/lists_disclosure_dark_blue.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="false" android:drawable="@drawable/lists_disclosure_dark_blue_off"/>
     <item android:state_selected="true" android:drawable="@drawable/lists_disclosure_dark_blue_on"/>
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/lists_disclosure_red.xml b/astrid/res/drawable/lists_disclosure_red.xml
index 6de8eac42..4e1d49edc 100644
--- a/astrid/res/drawable/lists_disclosure_red.xml
+++ b/astrid/res/drawable/lists_disclosure_red.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="false" android:drawable="@drawable/lists_disclosure_red_off"/>
     <item android:state_selected="true" android:drawable="@drawable/lists_disclosure_red_on"/>
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/menu_button_blue.xml b/astrid/res/drawable/menu_button_blue.xml
index df7fce73b..d42526754 100644
--- a/astrid/res/drawable/menu_button_blue.xml
+++ b/astrid/res/drawable/menu_button_blue.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="false" android:drawable="@drawable/menu_button_blue_off"/>
     <item android:state_selected="true" android:drawable="@drawable/menu_button_blue_on"/>
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/menu_button_blue_alt.xml b/astrid/res/drawable/menu_button_blue_alt.xml
index d5f035274..827e9c16e 100644
--- a/astrid/res/drawable/menu_button_blue_alt.xml
+++ b/astrid/res/drawable/menu_button_blue_alt.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="false" android:drawable="@drawable/menu_button_blue_alt_off"/>
     <item android:state_selected="true" android:drawable="@drawable/menu_button_blue_alt_on"/>
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/menu_button_dark_blue.xml b/astrid/res/drawable/menu_button_dark_blue.xml
index 3ff8d7a21..6e9e7254c 100644
--- a/astrid/res/drawable/menu_button_dark_blue.xml
+++ b/astrid/res/drawable/menu_button_dark_blue.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="false" android:drawable="@drawable/menu_button_dark_blue_off"/>
     <item android:state_selected="true" android:drawable="@drawable/menu_button_dark_blue_on"/>
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/menu_button_red.xml b/astrid/res/drawable/menu_button_red.xml
index 9cb1709cc..d320df0c1 100644
--- a/astrid/res/drawable/menu_button_red.xml
+++ b/astrid/res/drawable/menu_button_red.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="false" android:drawable="@drawable/menu_button_red_off"/>
     <item android:state_selected="true" android:drawable="@drawable/menu_button_red_on"/>
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/mic_button_blue.xml b/astrid/res/drawable/mic_button_blue.xml
index eb5a244f2..2f529cec1 100644
--- a/astrid/res/drawable/mic_button_blue.xml
+++ b/astrid/res/drawable/mic_button_blue.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/mic_button_blue_pressed"/>
     <item android:state_focused="true" android:drawable="@drawable/mic_button_blue_pressed"/>
     <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/mic_button_blue_normal"/>
diff --git a/astrid/res/drawable/mic_button_dark_blue.xml b/astrid/res/drawable/mic_button_dark_blue.xml
index 04badd710..c5f55fa14 100644
--- a/astrid/res/drawable/mic_button_dark_blue.xml
+++ b/astrid/res/drawable/mic_button_dark_blue.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/mic_button_dark_blue_pressed"/>
     <item android:state_focused="true" android:drawable="@drawable/mic_button_dark_blue_pressed"/>
     <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/mic_button_dark_blue_normal"/>
diff --git a/astrid/res/drawable/mic_button_red.xml b/astrid/res/drawable/mic_button_red.xml
index 34fd49602..3a2365ec7 100644
--- a/astrid/res/drawable/mic_button_red.xml
+++ b/astrid/res/drawable/mic_button_red.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/mic_button_red_pressed"/>
     <item android:state_focused="true" android:drawable="@drawable/mic_button_red_pressed"/>
     <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/mic_button_red_normal"/>
diff --git a/astrid/res/drawable/people_menu_button_blue.xml b/astrid/res/drawable/people_menu_button_blue.xml
index 0d8cabd0b..865485ca3 100644
--- a/astrid/res/drawable/people_menu_button_blue.xml
+++ b/astrid/res/drawable/people_menu_button_blue.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="false" android:drawable="@drawable/people_menu_button_blue_off"/>
     <item android:state_selected="true" android:drawable="@drawable/people_menu_button_blue_on"/>
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/people_menu_button_dark_blue.xml b/astrid/res/drawable/people_menu_button_dark_blue.xml
index 8ccd97464..0f6eaefd2 100644
--- a/astrid/res/drawable/people_menu_button_dark_blue.xml
+++ b/astrid/res/drawable/people_menu_button_dark_blue.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="false" android:drawable="@drawable/people_menu_button_dark_blue_off"/>
     <item android:state_selected="true" android:drawable="@drawable/people_menu_button_dark_blue_on"/>
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/people_menu_button_red.xml b/astrid/res/drawable/people_menu_button_red.xml
index ecd369170..0255c9d1d 100644
--- a/astrid/res/drawable/people_menu_button_red.xml
+++ b/astrid/res/drawable/people_menu_button_red.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="false" android:drawable="@drawable/people_menu_button_red_off"/>
     <item android:state_selected="true" android:drawable="@drawable/people_menu_button_red_on"/>
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/plus_button_blue.xml b/astrid/res/drawable/plus_button_blue.xml
index bfa6b3052..b40486cb6 100644
--- a/astrid/res/drawable/plus_button_blue.xml
+++ b/astrid/res/drawable/plus_button_blue.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/plus_button_blue_pressed"/>
     <item android:state_focused="true" android:drawable="@drawable/plus_button_blue_pressed"/>
     <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/plus_button_blue_normal"/>
diff --git a/astrid/res/drawable/plus_button_dark_blue.xml b/astrid/res/drawable/plus_button_dark_blue.xml
index 9ec53bcbc..f0611067a 100644
--- a/astrid/res/drawable/plus_button_dark_blue.xml
+++ b/astrid/res/drawable/plus_button_dark_blue.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/plus_button_dark_blue_pressed"/>
     <item android:state_focused="true" android:drawable="@drawable/plus_button_dark_blue_pressed"/>
     <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/plus_button_dark_blue_normal"/>
diff --git a/astrid/res/drawable/plus_button_red.xml b/astrid/res/drawable/plus_button_red.xml
index c748ab93b..7632a53a9 100644
--- a/astrid/res/drawable/plus_button_red.xml
+++ b/astrid/res/drawable/plus_button_red.xml
@@ -4,7 +4,7 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true" android:drawable="@drawable/plus_button_red_pressed"/>
     <item android:state_focused="true" android:drawable="@drawable/plus_button_red_pressed"/>
     <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/plus_button_red_normal"/>
diff --git a/astrid/res/drawable/reminder_dialog_background.xml b/astrid/res/drawable/reminder_dialog_background.xml
index a4a09ee07..5169a17a3 100644
--- a/astrid/res/drawable/reminder_dialog_background.xml
+++ b/astrid/res/drawable/reminder_dialog_background.xml
@@ -4,10 +4,10 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:shape="rectangle">
-    <corners 
-        android:radius="5dip"/>
-    <solid 
-        android:color="@color/reminder_background"/>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners
+            android:radius="5dip"/>
+    <solid
+            android:color="@color/reminder_background"/>
 </shape>
\ No newline at end of file
diff --git a/astrid/res/drawable/reminder_dialog_inset_background.xml b/astrid/res/drawable/reminder_dialog_inset_background.xml
index f683ed047..9ab588654 100644
--- a/astrid/res/drawable/reminder_dialog_inset_background.xml
+++ b/astrid/res/drawable/reminder_dialog_inset_background.xml
@@ -5,8 +5,8 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <inset
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/reminder_dialog_background" 
-    android:insetRight="10dp"
-    android:insetLeft="10dp">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:drawable="@drawable/reminder_dialog_background"
+        android:insetRight="10dp"
+        android:insetLeft="10dp">
 </inset>
\ No newline at end of file
diff --git a/astrid/res/drawable/task_edit_background.xml b/astrid/res/drawable/task_edit_background.xml
index 0bc4b6007..aba80828f 100644
--- a/astrid/res/drawable/task_edit_background.xml
+++ b/astrid/res/drawable/task_edit_background.xml
@@ -4,20 +4,24 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Bottom 2dp Shadow -->
     <item>
-        <shape android:shape="rectangle" >
+        <shape android:shape="rectangle">
             <solid
-                android:color="#222"/>
-            <corners android:radius="2dp" />
+                    android:color="#222"/>
+            <corners android:radius="2dp"/>
         </shape>
     </item>
-    <item android:bottom="2px" android:right="1px" android:top="1px" android:left="1px">
-        <shape android:shape="rectangle" >
-            <solid android:color="#000000" />
-            <corners android:radius="2dp" />
+    <item
+            android:bottom="2px"
+            android:right="1px"
+            android:top="1px"
+            android:left="1px">
+        <shape android:shape="rectangle">
+            <solid android:color="#000000"/>
+            <corners android:radius="2dp"/>
         </shape>
     </item>
 
diff --git a/astrid/res/drawable/task_edit_background_transparent_black.xml b/astrid/res/drawable/task_edit_background_transparent_black.xml
index 4f42359e1..06eb51e24 100644
--- a/astrid/res/drawable/task_edit_background_transparent_black.xml
+++ b/astrid/res/drawable/task_edit_background_transparent_black.xml
@@ -4,22 +4,24 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Bottom 2dp Shadow -->
     <item>
-        <shape android:shape="rectangle" >
+        <shape android:shape="rectangle">
             <gradient
-                android:endColor="#33111111"
-                android:startColor="#33222222" />
+                    android:endColor="#33111111"
+                    android:startColor="#33222222"/>
 
-            <corners android:radius="4dp" />
+            <corners android:radius="4dp"/>
         </shape>
     </item>
-    <item android:bottom="2dp" android:right="1dp">
-        <shape android:shape="rectangle" >
-            <solid android:color="#33000000" />
-            <corners android:radius="4dp" />
+    <item
+            android:bottom="2dp"
+            android:right="1dp">
+        <shape android:shape="rectangle">
+            <solid android:color="#33000000"/>
+            <corners android:radius="4dp"/>
         </shape>
     </item>
 
diff --git a/astrid/res/drawable/task_edit_background_transparent_white.xml b/astrid/res/drawable/task_edit_background_transparent_white.xml
index 90210e05e..34cc8324c 100644
--- a/astrid/res/drawable/task_edit_background_transparent_white.xml
+++ b/astrid/res/drawable/task_edit_background_transparent_white.xml
@@ -4,22 +4,24 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Bottom 2dp Shadow -->
     <item>
-        <shape android:shape="rectangle" >
+        <shape android:shape="rectangle">
             <gradient
-                android:endColor="#33eeeeee"
-                android:startColor="#33d8d8d8" />
+                    android:endColor="#33eeeeee"
+                    android:startColor="#33d8d8d8"/>
 
-            <corners android:radius="4dp" />
+            <corners android:radius="4dp"/>
         </shape>
     </item>
-    <item android:bottom="2dp" android:right="1dp">
-        <shape android:shape="rectangle" >
-            <solid android:color="#33ffffff" />
-            <corners android:radius="4dp" />
+    <item
+            android:bottom="2dp"
+            android:right="1dp">
+        <shape android:shape="rectangle">
+            <solid android:color="#33ffffff"/>
+            <corners android:radius="4dp"/>
         </shape>
     </item>
 
diff --git a/astrid/res/drawable/task_edit_background_white.xml b/astrid/res/drawable/task_edit_background_white.xml
index 3bfbaef2f..67167de5f 100644
--- a/astrid/res/drawable/task_edit_background_white.xml
+++ b/astrid/res/drawable/task_edit_background_white.xml
@@ -4,20 +4,24 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Bottom 2dp Shadow -->
     <item>
-        <shape android:shape="rectangle" >
+        <shape android:shape="rectangle">
             <solid
-                android:color="#aaa"/>
-            <corners android:radius="2dp" />
+                    android:color="#aaa"/>
+            <corners android:radius="2dp"/>
         </shape>
     </item>
-    <item android:bottom="2px" android:right="1px" android:top="1px" android:left="1px">
-        <shape android:shape="rectangle" >
-            <solid android:color="#ffffff" />
-            <corners android:radius="2dp" />
+    <item
+            android:bottom="2px"
+            android:right="1px"
+            android:top="1px"
+            android:left="1px">
+        <shape android:shape="rectangle">
+            <solid android:color="#ffffff"/>
+            <corners android:radius="2dp"/>
         </shape>
     </item>
 
diff --git a/astrid/res/drawable/task_row_bg_dark.xml b/astrid/res/drawable/task_row_bg_dark.xml
index 1e629e27e..5f1dec51a 100644
--- a/astrid/res/drawable/task_row_bg_dark.xml
+++ b/astrid/res/drawable/task_row_bg_dark.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+          android:exitFadeDuration="@android:integer/config_mediumAnimTime">
 
-    <item android:state_window_focused="false" android:drawable="@android:color/transparent" />
+    <item android:state_window_focused="false" android:drawable="@android:color/transparent"/>
 
     <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
-    <item android:state_focused="true" 
-        android:drawable="@color/task_row_bg_dark_pressed" />
+    <item android:state_focused="true"
+          android:drawable="@color/task_row_bg_dark_pressed"/>
     <item android:state_pressed="true"
-        android:drawable="@color/task_row_bg_dark_pressed" />
+          android:drawable="@color/task_row_bg_dark_pressed"/>
     <item android:state_focused="false"
-        android:state_pressed="false"
-        android:drawable="@android:color/transparent" />
-    
+          android:state_pressed="false"
+          android:drawable="@android:color/transparent"/>
+
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/task_row_bg_white.xml b/astrid/res/drawable/task_row_bg_white.xml
index 58ae75e9b..8e5d021c0 100644
--- a/astrid/res/drawable/task_row_bg_white.xml
+++ b/astrid/res/drawable/task_row_bg_white.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+          android:exitFadeDuration="@android:integer/config_mediumAnimTime">
 
-    <item android:state_window_focused="false" android:drawable="@android:color/transparent" />
+    <item android:state_window_focused="false" android:drawable="@android:color/transparent"/>
 
     <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
-    <item android:state_focused="true" 
-        android:drawable="@color/task_row_bg_white_pressed" />
+    <item android:state_focused="true"
+          android:drawable="@color/task_row_bg_white_pressed"/>
     <item android:state_pressed="true"
-        android:drawable="@color/task_row_bg_white_pressed" />
+          android:drawable="@color/task_row_bg_white_pressed"/>
     <item android:state_focused="false"
-        android:state_pressed="false"
-        android:drawable="@android:color/transparent" />
-    
+          android:state_pressed="false"
+          android:drawable="@android:color/transparent"/>
+
 </selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/timepicker_down_btn.xml b/astrid/res/drawable/timepicker_down_btn.xml
index 17719b065..47e78942b 100644
--- a/astrid/res/drawable/timepicker_down_btn.xml
+++ b/astrid/res/drawable/timepicker_down_btn.xml
@@ -17,14 +17,14 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_pressed="false" android:state_enabled="true"
-          android:state_focused="false" android:drawable="@drawable/timepicker_down_normal" />
+          android:state_focused="false" android:drawable="@drawable/timepicker_down_normal"/>
     <item android:state_pressed="true" android:state_enabled="true"
-          android:drawable="@drawable/timepicker_down_pressed" />
+          android:drawable="@drawable/timepicker_down_pressed"/>
     <item android:state_pressed="false" android:state_enabled="true"
-          android:state_focused="true" android:drawable="@drawable/timepicker_down_selected" />
+          android:state_focused="true" android:drawable="@drawable/timepicker_down_selected"/>
     <item android:state_pressed="false" android:state_enabled="false"
-          android:state_focused="false" android:drawable="@drawable/timepicker_down_disabled" />
+          android:state_focused="false" android:drawable="@drawable/timepicker_down_disabled"/>
     <item android:state_pressed="false" android:state_enabled="false"
-          android:state_focused="true" android:drawable="@drawable/timepicker_down_normal" />
+          android:state_focused="true" android:drawable="@drawable/timepicker_down_normal"/>
 
 </selector>
diff --git a/astrid/res/drawable/timepicker_input.xml b/astrid/res/drawable/timepicker_input.xml
index b811d4e3a..894cab50a 100644
--- a/astrid/res/drawable/timepicker_input.xml
+++ b/astrid/res/drawable/timepicker_input.xml
@@ -17,14 +17,14 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_pressed="false" android:state_enabled="true"
-          android:state_focused="false" android:drawable="@drawable/timepicker_input_normal" />
+          android:state_focused="false" android:drawable="@drawable/timepicker_input_normal"/>
     <item android:state_pressed="true" android:state_enabled="true"
-          android:drawable="@drawable/timepicker_input_pressed" />
+          android:drawable="@drawable/timepicker_input_pressed"/>
     <item android:state_pressed="false" android:state_enabled="true"
-          android:state_focused="true" android:drawable="@drawable/timepicker_input_selected" />
+          android:state_focused="true" android:drawable="@drawable/timepicker_input_selected"/>
     <item android:state_pressed="false" android:state_enabled="false"
-          android:state_focused="false" android:drawable="@drawable/timepicker_input_disabled" />
+          android:state_focused="false" android:drawable="@drawable/timepicker_input_disabled"/>
     <item android:state_pressed="false" android:state_enabled="false"
-          android:state_focused="true" android:drawable="@drawable/timepicker_input_normal" />
+          android:state_focused="true" android:drawable="@drawable/timepicker_input_normal"/>
 
 </selector>
diff --git a/astrid/res/drawable/timepicker_up_btn.xml b/astrid/res/drawable/timepicker_up_btn.xml
index d684c37d0..f4ed5891e 100644
--- a/astrid/res/drawable/timepicker_up_btn.xml
+++ b/astrid/res/drawable/timepicker_up_btn.xml
@@ -17,14 +17,14 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_pressed="false" android:state_enabled="true"
-          android:state_focused="false" android:drawable="@drawable/timepicker_up_normal" />
+          android:state_focused="false" android:drawable="@drawable/timepicker_up_normal"/>
     <item android:state_pressed="true" android:state_enabled="true"
-          android:drawable="@drawable/timepicker_up_pressed" />
+          android:drawable="@drawable/timepicker_up_pressed"/>
     <item android:state_pressed="false" android:state_enabled="true"
-          android:state_focused="true" android:drawable="@drawable/timepicker_up_selected" />
+          android:state_focused="true" android:drawable="@drawable/timepicker_up_selected"/>
     <item android:state_pressed="false" android:state_enabled="false"
-          android:state_focused="false" android:drawable="@drawable/timepicker_up_disabled" />
+          android:state_focused="false" android:drawable="@drawable/timepicker_up_disabled"/>
     <item android:state_pressed="false" android:state_enabled="false"
-          android:state_focused="true" android:drawable="@drawable/timepicker_up_normal" />
+          android:state_focused="true" android:drawable="@drawable/timepicker_up_normal"/>
 
 </selector>
diff --git a/astrid/res/drawable/vertical_separator.xml b/astrid/res/drawable/vertical_separator.xml
index 3ba573afe..97de5ac45 100644
--- a/astrid/res/drawable/vertical_separator.xml
+++ b/astrid/res/drawable/vertical_separator.xml
@@ -4,8 +4,8 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:shape="rectangle">
-    <solid 
-        android:color="#888888"/>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <solid
+            android:color="#888888"/>
 </shape>
\ No newline at end of file
diff --git a/astrid/res/drawable/widget_body_legacy.xml b/astrid/res/drawable/widget_body_legacy.xml
index c2f0c334a..d3e0fad49 100644
--- a/astrid/res/drawable/widget_body_legacy.xml
+++ b/astrid/res/drawable/widget_body_legacy.xml
@@ -4,11 +4,11 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:shape="rectangle">
-    <corners 
-        android:bottomLeftRadius="8dip"
-        android:bottomRightRadius="8dip"/>
-    <solid 
-        android:color="@color/widget_body_legacy"/>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners
+            android:bottomLeftRadius="8dip"
+            android:bottomRightRadius="8dip"/>
+    <solid
+            android:color="@color/widget_body_legacy"/>
 </shape>
\ No newline at end of file
diff --git a/astrid/res/drawable/widget_header_legacy.xml b/astrid/res/drawable/widget_header_legacy.xml
index bf5d830b7..f03b9665e 100644
--- a/astrid/res/drawable/widget_header_legacy.xml
+++ b/astrid/res/drawable/widget_header_legacy.xml
@@ -4,14 +4,14 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:shape="rectangle">
-    <corners 
-        android:topLeftRadius="8dip"
-        android:topRightRadius="8dip"/>
-    <gradient 
-        android:centerX="0.5"
-        android:centerY="0.5"
-        android:startColor="@color/widget_header_legacy_start"
-        android:endColor="@color/widget_header_legacy_end"/>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners
+            android:topLeftRadius="8dip"
+            android:topRightRadius="8dip"/>
+    <gradient
+            android:centerX="0.5"
+            android:centerY="0.5"
+            android:startColor="@color/widget_header_legacy_start"
+            android:endColor="@color/widget_header_legacy_end"/>
 </shape>
\ No newline at end of file
diff --git a/astrid/res/drawable/wom_edit_background_white.xml b/astrid/res/drawable/wom_edit_background_white.xml
index 5c953e9a2..58ee3e814 100644
--- a/astrid/res/drawable/wom_edit_background_white.xml
+++ b/astrid/res/drawable/wom_edit_background_white.xml
@@ -4,20 +4,24 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Bottom 2dp Shadow -->
     <item>
-        <shape android:shape="rectangle" >
+        <shape android:shape="rectangle">
             <solid
-                android:color="#aaa"/>
-            <corners android:radius="2dp" />
+                    android:color="#aaa"/>
+            <corners android:radius="2dp"/>
         </shape>
     </item>
-    <item android:bottom="2px" android:right="1px" android:top="1px" android:left="1px">
-        <shape android:shape="rectangle" >
-            <solid android:color="#ddd" />
-            <corners android:radius="2dp" />
+    <item
+            android:bottom="2px"
+            android:right="1px"
+            android:top="1px"
+            android:left="1px">
+        <shape android:shape="rectangle">
+            <solid android:color="#ddd"/>
+            <corners android:radius="2dp"/>
         </shape>
     </item>
 
diff --git a/astrid/res/layout-land/actfm_login_activity.xml b/astrid/res/layout-land/actfm_login_activity.xml
index 3be7cf17e..7c680c8e5 100644
--- a/astrid/res/layout-land/actfm_login_activity.xml
+++ b/astrid/res/layout-land/actfm_login_activity.xml
@@ -1,143 +1,150 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+<!-- 
+** Copyright (c) 2012 Todoroo Inc
+**
+** See the file "LICENSE" for the full license governing this code. 
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:paddingLeft="4dip"
-    android:paddingRight="4dip"
-    android:background="@drawable/astrid_com_gradient"
-    android:orientation="vertical" >
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:paddingLeft="4dip"
+              android:paddingRight="4dip"
+              android:background="@drawable/astrid_com_gradient"
+              android:orientation="vertical">
 
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_weight="1"
-        android:orientation="horizontal">

-        <ImageView
-            android:id="@+id/logo"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:scaleType="center"
-            android:paddingLeft="20dip"
-            android:paddingRight="20dip"
-            android:paddingBottom="10dip"
-            android:src="@drawable/astrid_com_logo_new"
-            android:layout_weight="1" />


-        <LinearLayout
-            android:id="@+id/LinearLayout1"
-            android:orientation="vertical"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:layout_weight="1"
-            android:gravity="center_vertical"
-            android:paddingTop="5dip" >
+            android:orientation="horizontal">
+
+        <ImageView
+                android:id="@+id/logo"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:scaleType="center"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip"
+                android:paddingBottom="10dip"
+                android:src="@drawable/astrid_com_logo_new"
+                android:layout_weight="1"/>
+
+
+        <LinearLayout
+                android:id="@+id/LinearLayout1"
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:paddingTop="5dip">
 
             <com.facebook.widget.LoginButton
-	          android:id="@+id/fb_login"
-	          android:layout_width="fill_parent"
-	          android:layout_height="45dip"
-	          android:layout_marginLeft="15dip"
-	          android:layout_marginRight="15dip"
-	          android:layout_marginBottom="15dip"
-	          android:layout_marginTop="15dip"
-	          android:paddingLeft="70dip"
-	          android:textSize="14sp"
-	          android:gravity="left|center_vertical"
-	          android:background="@drawable/fb_login_background"
-	          android:textColor="@android:color/white"
-	          android:text="@string/actfm_ALA_fb_login" 
-	          android:visibility="gone"/>
-            
+                    android:id="@+id/fb_login"
+                    android:layout_width="fill_parent"
+                    android:layout_height="45dip"
+                    android:layout_marginLeft="15dip"
+                    android:layout_marginRight="15dip"
+                    android:layout_marginBottom="15dip"
+                    android:layout_marginTop="15dip"
+                    android:paddingLeft="70dip"
+                    android:textSize="14sp"
+                    android:gravity="left|center_vertical"
+                    android:background="@drawable/fb_login_background"
+                    android:textColor="@android:color/white"
+                    android:text="@string/actfm_ALA_fb_login"
+                    android:visibility="gone"/>
+
             <Button
-	          android:id="@+id/fb_login_dummy"
-	          android:layout_width="fill_parent"
-	          android:layout_height="45dip"
-	          android:layout_marginLeft="15dip"
-              android:layout_marginRight="15dip"
-              android:layout_marginBottom="15dip"
-              android:layout_marginTop="15dip"
-	          android:paddingLeft="70dip"
-	          android:textSize="14sp"
-	          android:gravity="left|center_vertical"
-	          android:background="@drawable/fb_login_background"
-	          android:textColor="@android:color/white"
-	          android:text="@string/actfm_ALA_fb_login" />
-            
+                    android:id="@+id/fb_login_dummy"
+                    android:layout_width="fill_parent"
+                    android:layout_height="45dip"
+                    android:layout_marginLeft="15dip"
+                    android:layout_marginRight="15dip"
+                    android:layout_marginBottom="15dip"
+                    android:layout_marginTop="15dip"
+                    android:paddingLeft="70dip"
+                    android:textSize="14sp"
+                    android:gravity="left|center_vertical"
+                    android:background="@drawable/fb_login_background"
+                    android:textColor="@android:color/white"
+                    android:text="@string/actfm_ALA_fb_login"/>
+
             <Button
-	          android:id="@+id/gg_login"
-	          android:layout_width="fill_parent"
-	          android:layout_height="45dip"
-	          android:layout_marginLeft="15dip"
-	          android:layout_marginRight="15dip"
-	          android:paddingLeft="70dip"
-	          android:textSize="14sp"
-	          android:gravity="left|center_vertical"
-	          android:background="@drawable/google_login_background"
-	          android:textColor="@android:color/white"
-	          android:text="@string/actfm_ALA_gg_login" />
+                    android:id="@+id/gg_login"
+                    android:layout_width="fill_parent"
+                    android:layout_height="45dip"
+                    android:layout_marginLeft="15dip"
+                    android:layout_marginRight="15dip"
+                    android:paddingLeft="70dip"
+                    android:textSize="14sp"
+                    android:gravity="left|center_vertical"
+                    android:background="@drawable/google_login_background"
+                    android:textColor="@android:color/white"
+                    android:text="@string/actfm_ALA_gg_login"/>
 
 
             <TextView
-	          android:id="@+id/tos"
-	          android:layout_width="fill_parent"
-	          android:layout_height="35dip"
-	          android:layout_above="@id/gg_login"
-	          android:gravity="center"
-	          android:paddingLeft="20dip"
-	          android:paddingRight="20dip"
-	          android:textSize="12.5sp"
-	          android:visibility="invisible"
-	          android:textColor="#ffffff" /> 
+                    android:id="@+id/tos"
+                    android:layout_width="fill_parent"
+                    android:layout_height="35dip"
+                    android:layout_above="@id/gg_login"
+                    android:gravity="center"
+                    android:paddingLeft="20dip"
+                    android:paddingRight="20dip"
+                    android:textSize="12.5sp"
+                    android:visibility="invisible"
+                    android:textColor="#ffffff"/>
         </LinearLayout>
 
     </LinearLayout>
-    
-    <LinearLayout 
-        android:layout_width="fill_parent"
-        android:layout_height="45dip"
-        android:orientation="horizontal">
+
+    <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="45dip"
+            android:orientation="horizontal">
+
         <TextView
-          android:id="@+id/login_later"
-          android:text="@string/welcome_login_later"
-          android:layout_width="fill_parent"
-          android:layout_height="45dip"
-          android:gravity="center"
-          android:layout_weight="1"
-          android:textSize="16sp"
-          android:textColor="@android:color/white" 
-          android:visibility="gone"/>
+                android:id="@+id/login_later"
+                android:text="@string/welcome_login_later"
+                android:layout_width="fill_parent"
+                android:layout_height="45dip"
+                android:gravity="center"
+                android:layout_weight="1"
+                android:textSize="16sp"
+                android:textColor="@android:color/white"
+                android:visibility="gone"/>
+
         <TextView
-          android:id="@+id/pw_login"
-          android:layout_width="fill_parent"
-          android:layout_height="45dip"
-          android:layout_weight="1"
-          android:gravity="center"
-          android:textColor="@android:color/white"
-          android:textSize="16sp"
-          android:text="@string/welcome_sign_in"/>
+                android:id="@+id/pw_login"
+                android:layout_width="fill_parent"
+                android:layout_height="45dip"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:textColor="@android:color/white"
+                android:textSize="16sp"
+                android:text="@string/welcome_sign_in"/>
+
         <TextView
-          android:id="@+id/pw_signup"
-          android:layout_width="fill_parent"
-          android:layout_height="45dip"
-          android:layout_weight="1"
-          android:gravity="center"
-          android:textColor="@android:color/white"
-          android:textSize="16sp" 
-          android:text="@string/welcome_login_pw"/>    
-        
+                android:id="@+id/pw_signup"
+                android:layout_width="fill_parent"
+                android:layout_height="45dip"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:textColor="@android:color/white"
+                android:textSize="16sp"
+                android:text="@string/welcome_login_pw"/>
+
     </LinearLayout>
+
     <TextView
-        android:id="@+id/error"
-        android:layout_width="fill_parent"
-        android:layout_height="45dip"
-        android:gravity="center"
-        android:textColor="#ff0000"
-        android:textSize="16sp"
-        android:textStyle="bold" 
-        android:visibility="gone"/>
+            android:id="@+id/error"
+            android:layout_width="fill_parent"
+            android:layout_height="45dip"
+            android:gravity="center"
+            android:textColor="#ff0000"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            android:visibility="gone"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout-land/astrid_dialog_view.xml b/astrid/res/layout-land/astrid_dialog_view.xml
index 3deaf7f79..ee1c3ec90 100644
--- a/astrid/res/layout-land/astrid_dialog_view.xml
+++ b/astrid/res/layout-land/astrid_dialog_view.xml
@@ -5,87 +5,92 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dialog_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="15dip"
-    android:layout_marginRight="15dip"
-    android:orientation="horizontal">
-    
+              android:id="@+id/dialog_root"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_marginLeft="15dip"
+              android:layout_marginRight="15dip"
+              android:orientation="horizontal">
+
     <LinearLayout
-        android:layout_width="260dip"
-        android:layout_height="fill_parent"
-        android:orientation="vertical">
-	    <LinearLayout
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        android:layout_marginTop="5dip"
-	        android:layout_marginRight="5dip"
-	        android:layout_marginBottom="20dip"
-	        android:layout_marginLeft="10dip">
-	        
-	        <TextView 
-	            android:id="@+id/dialog_title"
-	            android:layout_width="fill_parent"
-	            android:layout_height="wrap_content"
-	            android:textSize="20sp"
-	            android:textColor="@android:color/white"
-	            android:layout_weight="1"/>
-	    
-	    </LinearLayout>
-	    
-	    <include layout="@layout/astrid_speech_bubble"/>
+            android:layout_width="260dip"
+            android:layout_height="fill_parent"
+            android:orientation="vertical">
+
+        <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginTop="5dip"
+                android:layout_marginRight="5dip"
+                android:layout_marginBottom="20dip"
+                android:layout_marginLeft="10dip">
+
+            <TextView
+                    android:id="@+id/dialog_title"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="20sp"
+                    android:textColor="@android:color/white"
+                    android:layout_weight="1"/>
+
+        </LinearLayout>
+
+        <include layout="@layout/astrid_speech_bubble"/>
 
     </LinearLayout>
-    
+
     <LinearLayout
-        android:layout_width="170dip"
-        android:layout_height="fill_parent"
-        android:layout_weight="1"
-        android:orientation="vertical">
-	    <ImageView
-            android:id="@+id/dismiss"
-            android:layout_width="25dip"
-            android:layout_height="25dip"
-            android:scaleType="fitCenter"
-            android:layout_gravity="right"
-            android:layout_marginBottom="10dip"
-            android:src="@drawable/ic_menu_close"/>
-	    <Button
-	        android:id="@+id/button0"
-	        android:layout_width="fill_parent"
-	        android:layout_height="35dip"
-	        android:layout_marginLeft="10dip"
-	        android:layout_marginRight="10dip"
-	        android:layout_marginBottom="10dip"
-	        android:textColor="@android:color/white"
-	        android:textSize="20sp"
-	        android:visibility="gone"
-	        android:background="?attr/asThemeTextColor"/>
-	    <Button
-	        android:id="@+id/button1"
-	        android:layout_width="fill_parent"
-	        android:layout_height="35dip"
-	        android:layout_marginLeft="10dip"
-	        android:layout_marginRight="10dip"
-	        android:layout_marginBottom="10dip"
-	        android:textColor="@android:color/white"
-	        android:textSize="20sp"
-	        android:visibility="gone"
-	        android:background="?attr/asThemeTextColor"/>
-	    <Button
-	        android:id="@+id/button2"
-	        android:layout_width="fill_parent"
-	        android:layout_height="35dip"
-	        android:layout_marginLeft="10dip"
-	        android:layout_marginRight="10dip"
-	        android:layout_marginBottom="10dip"
-	        android:textColor="@android:color/white"
-	        android:textSize="20sp"
-	        android:visibility="gone"
-	        android:background="?attr/asThemeTextColor"/>
-	    
+            android:layout_width="170dip"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+        <ImageView
+                android:id="@+id/dismiss"
+                android:layout_width="25dip"
+                android:layout_height="25dip"
+                android:scaleType="fitCenter"
+                android:layout_gravity="right"
+                android:layout_marginBottom="10dip"
+                android:src="@drawable/ic_menu_close"/>
+
+        <Button
+                android:id="@+id/button0"
+                android:layout_width="fill_parent"
+                android:layout_height="35dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:layout_marginBottom="10dip"
+                android:textColor="@android:color/white"
+                android:textSize="20sp"
+                android:visibility="gone"
+                android:background="?attr/asThemeTextColor"/>
+
+        <Button
+                android:id="@+id/button1"
+                android:layout_width="fill_parent"
+                android:layout_height="35dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:layout_marginBottom="10dip"
+                android:textColor="@android:color/white"
+                android:textSize="20sp"
+                android:visibility="gone"
+                android:background="?attr/asThemeTextColor"/>
+
+        <Button
+                android:id="@+id/button2"
+                android:layout_width="fill_parent"
+                android:layout_height="35dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:layout_marginBottom="10dip"
+                android:textColor="@android:color/white"
+                android:textSize="20sp"
+                android:visibility="gone"
+                android:background="?attr/asThemeTextColor"/>
+
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout-land/astrid_reminder_view.xml b/astrid/res/layout-land/astrid_reminder_view.xml
index 1ec7141d7..cc6005d15 100644
--- a/astrid/res/layout-land/astrid_reminder_view.xml
+++ b/astrid/res/layout-land/astrid_reminder_view.xml
@@ -5,95 +5,100 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/reminder_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="15dip"
-    android:layout_marginRight="15dip"
-    android:orientation="horizontal">
-    
+              android:id="@+id/reminder_root"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_marginLeft="15dip"
+              android:layout_marginRight="15dip"
+              android:orientation="horizontal">
+
     <LinearLayout
-        android:layout_width="260dip"
-        android:layout_height="fill_parent"
-        android:orientation="vertical">
-	    <LinearLayout
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        android:layout_marginTop="5dip"
-	        android:layout_marginRight="5dip"
-	        android:layout_marginBottom="20dip"
-	        android:layout_marginLeft="10dip">
-	        
-	        <TextView 
-	            android:id="@+id/reminder_title"
-	            android:layout_width="fill_parent"
-	            android:layout_height="wrap_content"
-	            android:textSize="20sp"
-	            android:textColor="@android:color/white"
-	            android:layout_weight="1"/>
-	    
-	    </LinearLayout>
-	    
-	    <include layout="@layout/astrid_speech_bubble"/>
-	    
-	    <CheckBox 
-	        android:id="@+id/reminders_should_show"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_marginLeft="10dip"
-	        android:layout_marginBottom="10dip"
-	        android:text="@string/TLA_quickadd_confirm_hide_helpers" 
-	        android:visibility="gone"/>
+            android:layout_width="260dip"
+            android:layout_height="fill_parent"
+            android:orientation="vertical">
+
+        <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginTop="5dip"
+                android:layout_marginRight="5dip"
+                android:layout_marginBottom="20dip"
+                android:layout_marginLeft="10dip">
+
+            <TextView
+                    android:id="@+id/reminder_title"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="20sp"
+                    android:textColor="@android:color/white"
+                    android:layout_weight="1"/>
+
+        </LinearLayout>
+
+        <include layout="@layout/astrid_speech_bubble"/>
+
+        <CheckBox
+                android:id="@+id/reminders_should_show"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dip"
+                android:layout_marginBottom="10dip"
+                android:text="@string/TLA_quickadd_confirm_hide_helpers"
+                android:visibility="gone"/>
     </LinearLayout>
-    
+
     <LinearLayout
-        android:layout_width="170dip"
-        android:layout_height="fill_parent"
-        android:layout_weight="1"
-        android:orientation="vertical">
-	    <ImageView
-            android:id="@+id/dismiss"
-            android:layout_width="25dip"
-            android:layout_height="25dip"
-            android:scaleType="fitCenter"
-            android:layout_gravity="right"
-            android:layout_marginBottom="10dip"
-            android:src="@drawable/ic_menu_close"/>
-	    <Button
-	        android:id="@+id/reminder_edit"
-	        android:layout_width="fill_parent"
-	        android:layout_height="35dip"
-	        android:layout_marginLeft="10dip"
-	        android:layout_marginRight="10dip"
-	        android:layout_marginBottom="10dip"
-	        android:textColor="@android:color/white"
-	        android:textSize="20sp"
-	        android:text="@string/TAd_actionEditTask"
-	        android:background="#707070"/>
-	    <Button
-	        android:id="@+id/reminder_snooze"
-	        android:layout_width="fill_parent"
-	        android:layout_height="35dip"
-	        android:layout_marginLeft="10dip"
-	        android:layout_marginRight="10dip"
-	        android:layout_marginBottom="10dip"
-	        android:textColor="@android:color/white"
-	        android:textSize="20sp"
-	        android:text="@string/rmd_NoA_snooze"
-	        android:background="#707070"/>
-	    <Button
-	        android:id="@+id/reminder_complete"
-	        android:layout_width="fill_parent"
-	        android:layout_height="35dip"
-	        android:layout_marginLeft="10dip"
-	        android:layout_marginRight="10dip"
-	        android:layout_marginBottom="10dip"
-	        android:textColor="@android:color/white"
-	        android:textSize="20sp"
-	        android:text="@string/rmd_NoA_done"
-	        android:background="?attr/asThemeTextColor"/>
-	    
+            android:layout_width="170dip"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+        <ImageView
+                android:id="@+id/dismiss"
+                android:layout_width="25dip"
+                android:layout_height="25dip"
+                android:scaleType="fitCenter"
+                android:layout_gravity="right"
+                android:layout_marginBottom="10dip"
+                android:src="@drawable/ic_menu_close"/>
+
+        <Button
+                android:id="@+id/reminder_edit"
+                android:layout_width="fill_parent"
+                android:layout_height="35dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:layout_marginBottom="10dip"
+                android:textColor="@android:color/white"
+                android:textSize="20sp"
+                android:text="@string/TAd_actionEditTask"
+                android:background="#707070"/>
+
+        <Button
+                android:id="@+id/reminder_snooze"
+                android:layout_width="fill_parent"
+                android:layout_height="35dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:layout_marginBottom="10dip"
+                android:textColor="@android:color/white"
+                android:textSize="20sp"
+                android:text="@string/rmd_NoA_snooze"
+                android:background="#707070"/>
+
+        <Button
+                android:id="@+id/reminder_complete"
+                android:layout_width="fill_parent"
+                android:layout_height="35dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:layout_marginBottom="10dip"
+                android:textColor="@android:color/white"
+                android:textSize="20sp"
+                android:text="@string/rmd_NoA_done"
+                android:background="?attr/asThemeTextColor"/>
+
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout-land/date_time_picker.xml b/astrid/res/layout-land/date_time_picker.xml
index 0afe4bd93..c92fcc974 100644
--- a/astrid/res/layout-land/date_time_picker.xml
+++ b/astrid/res/layout-land/date_time_picker.xml
@@ -5,54 +5,61 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-	<ScrollView
-	  android:layout_width="fill_parent"
-	  android:layout_height="fill_parent"
-	  android:minWidth="320dip"
-	  android:paddingLeft="10dip"
-	  android:paddingRight="10dip"
-	  android:paddingTop="5dip"
-	  android:paddingBottom="5dip">
-		<LinearLayout
-		  android:id="@+id/datetime_body"
-		  android:orientation="vertical"
-		  android:layout_width="fill_parent"
-		  android:layout_height="fill_parent">
-		<LinearLayout
-		    android:id="@+id/datetime_extras"
-		    android:layout_width="fill_parent"
-		    android:layout_height="wrap_content"
-		    android:orientation="horizontal"/>
-		  <LinearLayout
-		      android:layout_width="fill_parent"
-		      android:layout_height="wrap_content"
-		      android:orientation="horizontal"
-		      android:layout_weight="1"
-		      android:layout_marginLeft="5dip"
-		      android:layout_gravity="center_vertical">
-              <com.todoroo.astrid.ui.CalendarView
-	              android:id="@+id/calendar"
-	              android:layout_width="0dip"
-	              android:layout_height="280dip"
-	              android:layout_weight="50" 
-	              android:layout_marginRight="5dip"/>
-	          <LinearLayout
-	              android:id="@+id/date_shortcuts"
-	              android:layout_width="0dip"
-	          	  android:layout_height="fill_parent"
-	          	  android:layout_marginTop="5dip"
-	          	  android:layout_marginRight="5dip"
-	          	  android:layout_weight="25"
-	          	  android:orientation="vertical"/>		          
-		      <com.todoroo.astrid.ui.AstridTimePicker
-		          android:id="@+id/time_picker"
-		          android:layout_width="0dip"
-		          android:layout_height="fill_parent"
-	          	  android:layout_marginTop="5dip"
-			      android:layout_marginLeft="5dip"
-	          	  android:layout_weight="25"
-	          	  android:orientation="vertical"/>
-		  </LinearLayout>
-		</LinearLayout>
-	</ScrollView>
+
+    <ScrollView
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:minWidth="320dip"
+            android:paddingLeft="10dip"
+            android:paddingRight="10dip"
+            android:paddingTop="5dip"
+            android:paddingBottom="5dip">
+
+        <LinearLayout
+                android:id="@+id/datetime_body"
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent">
+
+            <LinearLayout
+                    android:id="@+id/datetime_extras"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"/>
+
+            <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_weight="1"
+                    android:layout_marginLeft="5dip"
+                    android:layout_gravity="center_vertical">
+
+                <com.todoroo.astrid.ui.CalendarView
+                        android:id="@+id/calendar"
+                        android:layout_width="0dip"
+                        android:layout_height="280dip"
+                        android:layout_weight="50"
+                        android:layout_marginRight="5dip"/>
+
+                <LinearLayout
+                        android:id="@+id/date_shortcuts"
+                        android:layout_width="0dip"
+                        android:layout_height="fill_parent"
+                        android:layout_marginTop="5dip"
+                        android:layout_marginRight="5dip"
+                        android:layout_weight="25"
+                        android:orientation="vertical"/>
+
+                <com.todoroo.astrid.ui.AstridTimePicker
+                        android:id="@+id/time_picker"
+                        android:layout_width="0dip"
+                        android:layout_height="fill_parent"
+                        android:layout_marginTop="5dip"
+                        android:layout_marginLeft="5dip"
+                        android:layout_weight="25"
+                        android:orientation="vertical"/>
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
 </merge>
\ No newline at end of file
diff --git a/astrid/res/layout-land/date_time_picker_no_shortcuts.xml b/astrid/res/layout-land/date_time_picker_no_shortcuts.xml
index eb452deb2..21011aa42 100644
--- a/astrid/res/layout-land/date_time_picker_no_shortcuts.xml
+++ b/astrid/res/layout-land/date_time_picker_no_shortcuts.xml
@@ -5,55 +5,62 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-	<ScrollView
-	  android:layout_width="fill_parent"
-	  android:layout_height="fill_parent"
-	  android:minWidth="320dip"
-	  android:paddingLeft="10dip"
-	  android:paddingRight="10dip"
-	  android:paddingTop="5dip"
-	  android:paddingBottom="5dip">
-		<LinearLayout
-		  android:id="@+id/datetime_body"
-		  android:orientation="vertical"
-		  android:layout_width="fill_parent"
-		  android:layout_height="fill_parent">
-		<LinearLayout
-		    android:id="@+id/datetime_extras"
-		    android:layout_width="fill_parent"
-		    android:layout_height="wrap_content"
-		    android:orientation="horizontal"/>
-		  <LinearLayout
-		      android:layout_width="fill_parent"
-		      android:layout_height="wrap_content"
-		      android:orientation="horizontal"
-		      android:layout_weight="1"
-		      android:layout_marginLeft="5dip"
-		      android:layout_gravity="center_vertical">
-              <com.todoroo.astrid.ui.CalendarView
-	              android:id="@+id/calendar"
-	              android:layout_width="0dip"
-	              android:layout_height="280dip"
-	              android:layout_weight="50" 
-	              android:layout_marginRight="5dip"/>
-	          <LinearLayout
-	              android:id="@+id/date_shortcuts"
-	              android:layout_width="0dip"
-	          	  android:layout_height="fill_parent"
-	          	  android:layout_marginTop="5dip"
-	          	  android:layout_marginRight="5dip"
-	          	  android:layout_weight="25"
-	          	  android:visibility="gone"
-	          	  android:orientation="vertical"/>		          
-		      <com.todoroo.astrid.ui.AstridTimePicker
-		          android:id="@+id/time_picker"
-		          android:layout_width="0dip"
-		          android:layout_height="fill_parent"
-	          	  android:layout_marginTop="5dip"
-			      android:layout_marginLeft="5dip"
-	          	  android:layout_weight="50"
-	          	  android:orientation="vertical"/>
-		  </LinearLayout>
-		</LinearLayout>
-	</ScrollView>
+
+    <ScrollView
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:minWidth="320dip"
+            android:paddingLeft="10dip"
+            android:paddingRight="10dip"
+            android:paddingTop="5dip"
+            android:paddingBottom="5dip">
+
+        <LinearLayout
+                android:id="@+id/datetime_body"
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent">
+
+            <LinearLayout
+                    android:id="@+id/datetime_extras"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"/>
+
+            <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_weight="1"
+                    android:layout_marginLeft="5dip"
+                    android:layout_gravity="center_vertical">
+
+                <com.todoroo.astrid.ui.CalendarView
+                        android:id="@+id/calendar"
+                        android:layout_width="0dip"
+                        android:layout_height="280dip"
+                        android:layout_weight="50"
+                        android:layout_marginRight="5dip"/>
+
+                <LinearLayout
+                        android:id="@+id/date_shortcuts"
+                        android:layout_width="0dip"
+                        android:layout_height="fill_parent"
+                        android:layout_marginTop="5dip"
+                        android:layout_marginRight="5dip"
+                        android:layout_weight="25"
+                        android:visibility="gone"
+                        android:orientation="vertical"/>
+
+                <com.todoroo.astrid.ui.AstridTimePicker
+                        android:id="@+id/time_picker"
+                        android:layout_width="0dip"
+                        android:layout_height="fill_parent"
+                        android:layout_marginTop="5dip"
+                        android:layout_marginLeft="5dip"
+                        android:layout_weight="50"
+                        android:orientation="vertical"/>
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
 </merge>
\ No newline at end of file
diff --git a/astrid/res/layout-land/filter_list_activity.xml b/astrid/res/layout-land/filter_list_activity.xml
index 86ceb9f48..50cd4ea1a 100644
--- a/astrid/res/layout-land/filter_list_activity.xml
+++ b/astrid/res/layout-land/filter_list_activity.xml
@@ -5,48 +5,49 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content"
-    android:background="?attr/asListPopoverBg"
-    android:orientation="vertical">
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:background="?attr/asListPopoverBg"
+              android:orientation="vertical">
 
 
     <!-- List -->
-    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="180dip"
-        android:layout_alignParentTop="true"
-        android:scrollbars="vertical"
-        android:divider="@android:color/transparent"
-        android:dividerHeight="1px"
-        android:background="@android:color/transparent"
-        android:cacheColorHint="#00000000"/>
-    
+    <com.todoroo.astrid.ui.ErrorCatchingListView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="180dip"
+            android:layout_alignParentTop="true"
+            android:scrollbars="vertical"
+            android:divider="@android:color/transparent"
+            android:dividerHeight="1px"
+            android:background="@android:color/transparent"
+            android:cacheColorHint="#00000000"/>
+
     <include layout="@layout/fla_separator"/>
 
     <!-- Footer -->
     <LinearLayout
-        android:id="@+id/lists_footer"
-        android:layout_width="fill_parent" 
-        android:layout_height="50dip"
-        android:padding="5dip"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:layout_alignParentBottom="true">
-        
-        <TextView
-            android:id="@+id/new_list_button"
+            android:id="@+id/lists_footer"
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:gravity="left|center_vertical"
-            android:background="?attr/asThemeTextColor"
-            android:paddingLeft="9dip"
-            android:drawableLeft="@drawable/filter_plus_button"
-            android:drawablePadding="13dip"
-            android:text="@string/FLA_new_list"
-            style="@style/TextAppearance.FLA_Button"/>
-        
+            android:layout_height="50dip"
+            android:padding="5dip"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:layout_alignParentBottom="true">
+
+        <TextView
+                android:id="@+id/new_list_button"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:gravity="left|center_vertical"
+                android:background="?attr/asThemeTextColor"
+                android:paddingLeft="9dip"
+                android:drawableLeft="@drawable/filter_plus_button"
+                android:drawablePadding="13dip"
+                android:text="@string/FLA_new_list"
+                style="@style/TextAppearance.FLA_Button"/>
+
     </LinearLayout>
-        
+
 </LinearLayout>
     
diff --git a/astrid/res/layout-land/filter_list_fragment_alternative.xml b/astrid/res/layout-land/filter_list_fragment_alternative.xml
index 48484d219..b0d7d774c 100644
--- a/astrid/res/layout-land/filter_list_fragment_alternative.xml
+++ b/astrid/res/layout-land/filter_list_fragment_alternative.xml
@@ -5,22 +5,23 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content"
-    android:background="?attr/asListPopoverBg"
-    android:orientation="vertical">
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:background="?attr/asListPopoverBg"
+              android:orientation="vertical">
 
 
     <!-- List -->
-    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="230dip"
-        android:layout_alignParentTop="true"
-        android:scrollbars="vertical"
-        android:divider="@android:color/transparent"
-        android:dividerHeight="1px"
-        android:background="@android:color/transparent"
-        android:cacheColorHint="#00000000"/>
-        
+    <com.todoroo.astrid.ui.ErrorCatchingListView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="230dip"
+            android:layout_alignParentTop="true"
+            android:scrollbars="vertical"
+            android:divider="@android:color/transparent"
+            android:dividerHeight="1px"
+            android:background="@android:color/transparent"
+            android:cacheColorHint="#00000000"/>
+
 </LinearLayout>
     
diff --git a/astrid/res/layout-land/main_menu_popover_body.xml b/astrid/res/layout-land/main_menu_popover_body.xml
index 24321c2c0..5d2285dd4 100644
--- a/astrid/res/layout-land/main_menu_popover_body.xml
+++ b/astrid/res/layout-land/main_menu_popover_body.xml
@@ -5,35 +5,42 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
+
     <ScrollView
-        android:layout_width="280dip"
-        android:layout_height="220dip"
-        android:layout_below="@+id/gdi_arrow_up"
-        android:background="?attr/asListPopoverBg">
+            android:layout_width="280dip"
+            android:layout_height="220dip"
+            android:layout_below="@+id/gdi_arrow_up"
+            android:background="?attr/asListPopoverBg">
+
         <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-	        <LinearLayout
-	            android:id="@+id/topFixedItems"
-	            android:layout_width="280dip"
-	            android:layout_height="wrap_content"
-	            android:background="@android:color/transparent"
-	            android:orientation="vertical"/>
-	        <include layout="@layout/fla_separator"/>
-		    <LinearLayout
-		        android:id="@+id/content"
-		        android:layout_width="280dip"
-		        android:layout_height="wrap_content"
-		        android:background="@android:color/transparent"
-		        android:orientation="vertical"/>
-	        <include layout="@layout/fla_separator"/>
-	        <LinearLayout
-	            android:id="@+id/bottomFixedItems"
-	            android:layout_width="280dip"
-	            android:layout_height="wrap_content"
-	            android:background="@android:color/transparent"
-	            android:orientation="vertical"/>
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+            <LinearLayout
+                    android:id="@+id/topFixedItems"
+                    android:layout_width="280dip"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
+                    android:orientation="vertical"/>
+
+            <include layout="@layout/fla_separator"/>
+
+            <LinearLayout
+                    android:id="@+id/content"
+                    android:layout_width="280dip"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
+                    android:orientation="vertical"/>
+
+            <include layout="@layout/fla_separator"/>
+
+            <LinearLayout
+                    android:id="@+id/bottomFixedItems"
+                    android:layout_width="280dip"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
+                    android:orientation="vertical"/>
         </LinearLayout>
     </ScrollView>
 </merge>
diff --git a/astrid/res/layout-land/share_activity.xml b/astrid/res/layout-land/share_activity.xml
index c5d8628b2..b46c12a2a 100644
--- a/astrid/res/layout-land/share_activity.xml
+++ b/astrid/res/layout-land/share_activity.xml
@@ -1,87 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" 
-    android:background="#eee" >
-    
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:background="#eee">
+
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:layout_marginTop="20dip"
-        android:orientation="horizontal">
-        
+            android:layout_width="fill_parent"
+            android:layout_height="50dip"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:layout_marginTop="20dip"
+            android:orientation="horizontal">
+
         <ImageView
-            android:layout_width="30dip"
-            android:layout_height="30dip"
-            android:layout_marginRight="20dip"
-            android:scaleType="fitCenter"
-            android:src="@drawable/share_facebook"/>
-        
+                android:layout_width="30dip"
+                android:layout_height="30dip"
+                android:layout_marginRight="20dip"
+                android:scaleType="fitCenter"
+                android:src="@drawable/share_facebook"/>
+
         <TextView
-	        android:id="@+id/share_facebook"
-	        android:gravity="center_vertical"
-	        android:layout_width="150dip"
-	        android:layout_height="fill_parent"
-	        android:textSize="16sp"
-	        android:textStyle="bold"
-	        android:textColor="?attr/asThemeTextColor"/>
-        
+                android:id="@+id/share_facebook"
+                android:gravity="center_vertical"
+                android:layout_width="150dip"
+                android:layout_height="fill_parent"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:textColor="?attr/asThemeTextColor"/>
+
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:orientation="horizontal">
-        
+            android:layout_width="fill_parent"
+            android:layout_height="50dip"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="horizontal">
+
         <ImageView
-            android:layout_width="30dip"
-            android:layout_height="30dip"
-            android:layout_marginRight="20dip"
-            android:scaleType="fitCenter"
-            android:src="@drawable/share_twitter"/>
-        
+                android:layout_width="30dip"
+                android:layout_height="30dip"
+                android:layout_marginRight="20dip"
+                android:scaleType="fitCenter"
+                android:src="@drawable/share_twitter"/>
+
         <TextView
-	        android:id="@+id/share_twitter"
-	        android:gravity="center_vertical"
-	        android:layout_width="150dip"
-	        android:layout_height="fill_parent"
-	        android:textSize="16sp"
-	        android:textStyle="bold"
-	        android:textColor="?attr/asThemeTextColor"/>
-        
+                android:id="@+id/share_twitter"
+                android:gravity="center_vertical"
+                android:layout_width="150dip"
+                android:layout_height="fill_parent"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:textColor="?attr/asThemeTextColor"/>
+
     </LinearLayout>
-    
+
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:layout_marginBottom="20dip">
-        
+            android:layout_width="fill_parent"
+            android:layout_height="50dip"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:layout_marginBottom="20dip">
+
         <ImageView
-            android:layout_width="30dip"
-            android:layout_height="30dip"
-            android:layout_marginRight="20dip"
-            android:scaleType="fitCenter"
-            android:src="@drawable/share_google"/>
-        
+                android:layout_width="30dip"
+                android:layout_height="30dip"
+                android:layout_marginRight="20dip"
+                android:scaleType="fitCenter"
+                android:src="@drawable/share_google"/>
+
         <TextView
-	        android:id="@+id/share_google"
-	        android:gravity="center_vertical"
-	        android:layout_width="150dip"
-	        android:layout_height="fill_parent"
-	        android:textSize="16sp"
-	        android:textStyle="bold"
-	        android:textColor="?attr/asThemeTextColor"/>
-        
+                android:id="@+id/share_google"
+                android:gravity="center_vertical"
+                android:layout_width="150dip"
+                android:layout_height="fill_parent"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:textColor="?attr/asThemeTextColor"/>
+
     </LinearLayout>
-    
+
     <include layout="@layout/astrid_speech_bubble"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout-land/task_list_wrapper_activity_3pane.xml b/astrid/res/layout-land/task_list_wrapper_activity_3pane.xml
index 2dd21852f..77a8217ec 100644
--- a/astrid/res/layout-land/task_list_wrapper_activity_3pane.xml
+++ b/astrid/res/layout-land/task_list_wrapper_activity_3pane.xml
@@ -5,43 +5,43 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    style="@style/Content"
-    android:orientation="horizontal">
-  
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        style="@style/Content"
+        android:orientation="horizontal">
+
     <!-- Filter List -->
     <FrameLayout
-	    android:layout_width="match_parent"
-	    android:layout_height="match_parent"
-	    android:layout_weight="40"
-	    android:background="@android:color/white"
-	    android:id="@+id/filterlist_fragment_container" />
-  
-	<View 
-        android:layout_width="1px"
-        android:layout_height="match_parent"
-        android:background="?attr/asSeparatorBackground"/>
-  
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="40"
+            android:background="@android:color/white"
+            android:id="@+id/filterlist_fragment_container"/>
+
+    <View
+            android:layout_width="1px"
+            android:layout_height="match_parent"
+            android:background="?attr/asSeparatorBackground"/>
+
     <!-- Task List -->
-	<FrameLayout
-	    android:layout_width="match_parent"
-	    android:layout_height="match_parent"
-        android:layout_weight="30"
-        android:id="@+id/tasklist_fragment_container" />
-  
-	<View 
-        android:layout_width="1px"
-        android:layout_height="match_parent"
-        android:background="?attr/asSeparatorBackground"/>
-  
+    <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="30"
+            android:id="@+id/tasklist_fragment_container"/>
+
+    <View
+            android:layout_width="1px"
+            android:layout_height="match_parent"
+            android:background="?attr/asSeparatorBackground"/>
+
     <!-- Task Edit -->
-	<FrameLayout
-	    android:layout_width="match_parent"
-	    android:layout_height="match_parent"
-        android:layout_weight="35"
-        android:id="@+id/taskedit_fragment_container"
-        android:visibility="invisible" />
-  
+    <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="35"
+            android:id="@+id/taskedit_fragment_container"
+            android:visibility="invisible"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout-land/widget_initialized.xml b/astrid/res/layout-land/widget_initialized.xml
index acd739bf3..32d51d50f 100644
--- a/astrid/res/layout-land/widget_initialized.xml
+++ b/astrid/res/layout-land/widget_initialized.xml
@@ -6,56 +6,57 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/widget"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@android:color/transparent">
-
-    <LinearLayout 
-        android:id="@+id/widget_header"
-        android:layout_width="200dip"
-        android:layout_height="39dip"
-        android:orientation="horizontal"
-        android:padding="3dp"
-        android:background="@color/widget_header_light">
-        
-        <TextView
-            android:id="@+id/widget_title"
-            android:layout_width="fill_parent" 
+              android:id="@+id/widget"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:background="@android:color/transparent">
+
+    <LinearLayout
+            android:id="@+id/widget_header"
+            android:layout_width="200dip"
             android:layout_height="39dip"
-            android:layout_gravity="left|center_vertical" 
-            android:paddingLeft="2dip"
-            android:textColor="@color/widget_text_color_light"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:maxLines="2"
-            android:layout_weight="1"
-            android:gravity="left|center_vertical" 
-            android:ellipsize="end" />
-    
+            android:orientation="horizontal"
+            android:padding="3dp"
+            android:background="@color/widget_header_light">
+
+        <TextView
+                android:id="@+id/widget_title"
+                android:layout_width="fill_parent"
+                android:layout_height="39dip"
+                android:layout_gravity="left|center_vertical"
+                android:paddingLeft="2dip"
+                android:textColor="@color/widget_text_color_light"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:maxLines="2"
+                android:layout_weight="1"
+                android:gravity="left|center_vertical"
+                android:ellipsize="end"/>
+
         <ImageButton
-            android:id="@+id/widget_button"
-            android:layout_width="33dip"
-            android:layout_height="39dip"
-            android:layout_gravity="right|center_vertical"
-            android:background="@android:color/transparent"
-            android:src="@drawable/plus_button_dark_blue"
-            android:scaleType="fitCenter"/>
-      
+                android:id="@+id/widget_button"
+                android:layout_width="33dip"
+                android:layout_height="39dip"
+                android:layout_gravity="right|center_vertical"
+                android:background="@android:color/transparent"
+                android:src="@drawable/plus_button_dark_blue"
+                android:scaleType="fitCenter"/>
+
     </LinearLayout>
-    
+
     <ImageView
-        android:id="@+id/widget_header_separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:background="@color/dark_blue_theme_color"/>
-
-    <LinearLayout android:id="@+id/taskbody"
-    	android:layout_width="fill_parent"
-    	android:layout_height="fill_parent"
-    	android:background="@color/widget_body_light"
-	    android:orientation="vertical">
+            android:id="@+id/widget_header_separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@color/dark_blue_theme_color"/>
+
+    <LinearLayout
+            android:id="@+id/taskbody"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:background="@color/widget_body_light"
+            android:orientation="vertical">
 
     </LinearLayout>
 </LinearLayout>
diff --git a/astrid/res/layout-xlarge-land/widget_initialized.xml b/astrid/res/layout-xlarge-land/widget_initialized.xml
index d206623e9..b1c884ab7 100644
--- a/astrid/res/layout-xlarge-land/widget_initialized.xml
+++ b/astrid/res/layout-xlarge-land/widget_initialized.xml
@@ -6,55 +6,56 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/widget"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@android:color/transparent">
+              android:id="@+id/widget"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:background="@android:color/transparent">
 
     <LinearLayout
-        android:id="@+id/widget_header"
-        android:layout_width="150dip"
-        android:layout_height="39dip"
-        android:orientation="horizontal"
-        android:padding="3dp"
-        android:background="@color/widget_header_light">
-        
-        <TextView
-            android:id="@+id/widget_title"
-            android:layout_width="fill_parent" 
+            android:id="@+id/widget_header"
+            android:layout_width="150dip"
             android:layout_height="39dip"
-            android:layout_gravity="left|center_vertical" 
-            android:paddingLeft="2dip"
-            android:textColor="@color/widget_text_color_light"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:maxLines="2"
-            android:layout_weight="1"
-            android:gravity="left|center_vertical" 
-            android:ellipsize="end" />
-    
+            android:orientation="horizontal"
+            android:padding="3dp"
+            android:background="@color/widget_header_light">
+
+        <TextView
+                android:id="@+id/widget_title"
+                android:layout_width="fill_parent"
+                android:layout_height="39dip"
+                android:layout_gravity="left|center_vertical"
+                android:paddingLeft="2dip"
+                android:textColor="@color/widget_text_color_light"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:maxLines="2"
+                android:layout_weight="1"
+                android:gravity="left|center_vertical"
+                android:ellipsize="end"/>
+
         <ImageButton
-            android:id="@+id/widget_button"
-            android:layout_width="33dip"
-            android:layout_height="39dip"
-            android:layout_gravity="right|center_vertical"
-            android:background="@android:color/transparent"
-            android:src="@drawable/plus_button_dark_blue"
-            android:scaleType="fitCenter"/>
-      
+                android:id="@+id/widget_button"
+                android:layout_width="33dip"
+                android:layout_height="39dip"
+                android:layout_gravity="right|center_vertical"
+                android:background="@android:color/transparent"
+                android:src="@drawable/plus_button_dark_blue"
+                android:scaleType="fitCenter"/>
+
     </LinearLayout>
-    
+
     <ImageView
-        android:id="@+id/widget_header_separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:background="@color/dark_blue_theme_color"/>
+            android:id="@+id/widget_header_separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@color/dark_blue_theme_color"/>
 
-    <LinearLayout android:id="@+id/taskbody"
-    	android:layout_width="fill_parent"
-    	android:layout_height="fill_parent"
-    	android:background="@color/widget_body_light"
-	    android:orientation="vertical">
+    <LinearLayout
+            android:id="@+id/taskbody"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:background="@color/widget_body_light"
+            android:orientation="vertical">
     </LinearLayout>
 </LinearLayout>
diff --git a/astrid/res/layout-xlarge/help_popover.xml b/astrid/res/layout-xlarge/help_popover.xml
index 9a1048c91..2d28c31e5 100644
--- a/astrid/res/layout-xlarge/help_popover.xml
+++ b/astrid/res/layout-xlarge/help_popover.xml
@@ -5,37 +5,37 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
 
     <TextView
-        android:id="@+id/gdi_message"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/gdi_arrow_up"
-        android:gravity="center"
-        android:textColor="@android:color/white"
-        android:textSize="18sp"
-        android:textStyle="bold"
-        android:background="@drawable/popover_bg"
-        android:fadingEdgeLength="0dp"/>
+            android:id="@+id/gdi_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/gdi_arrow_up"
+            android:gravity="center"
+            android:textColor="@android:color/white"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            android:background="@drawable/popover_bg"
+            android:fadingEdgeLength="0dp"/>
 
     <ImageView
-        android:id="@+id/gdi_arrow_up"
-        android:layout_marginBottom="-18dip"
-        android:layout_width="27dip"
-        android:layout_height="27dip"
-        android:scaleType="fitCenter"
-        android:src="@drawable/popover_arrow_up" />
+            android:id="@+id/gdi_arrow_up"
+            android:layout_marginBottom="-18dip"
+            android:layout_width="27dip"
+            android:layout_height="27dip"
+            android:scaleType="fitCenter"
+            android:src="@drawable/popover_arrow_up"/>
 
     <ImageView
-        android:id="@+id/gdi_arrow_down"
-        android:layout_width="27dip"
-        android:layout_height="27dip"
-        android:scaleType="fitCenter"
-        android:layout_below="@id/gdi_message"
-        android:layout_marginTop="-19dip"
-        android:src="@drawable/popover_arrow_down" />
+            android:id="@+id/gdi_arrow_down"
+            android:layout_width="27dip"
+            android:layout_height="27dip"
+            android:scaleType="fitCenter"
+            android:layout_below="@id/gdi_message"
+            android:layout_marginTop="-19dip"
+            android:src="@drawable/popover_arrow_down"/>
 
 </RelativeLayout>
diff --git a/astrid/res/layout/aac_record_activity.xml b/astrid/res/layout/aac_record_activity.xml
index 2fa6bb439..151dac9ee 100644
--- a/astrid/res/layout/aac_record_activity.xml
+++ b/astrid/res/layout/aac_record_activity.xml
@@ -5,10 +5,10 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" 
-    android:gravity="center">
-    
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:gravity="center">
+
     <include layout="@layout/astrid_record_audio_view"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/actfm_login_activity.xml b/astrid/res/layout/actfm_login_activity.xml
index 645886a52..6b916283f 100644
--- a/astrid/res/layout/actfm_login_activity.xml
+++ b/astrid/res/layout/actfm_login_activity.xml
@@ -4,126 +4,130 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-  <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:paddingLeft="4dip"
-    android:paddingRight="4dip"
-    android:background="@drawable/astrid_com_gradient"
-    android:orientation="vertical">
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:paddingLeft="4dip"
+        android:paddingRight="4dip"
+        android:background="@drawable/astrid_com_gradient"
+        android:orientation="vertical">
 
     <ImageView
-      android:id="@+id/logo"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent"
-      android:layout_weight="1"
-      android:paddingTop="95dip"
-      android:scaleType="center"
-      android:src="@drawable/astrid_com_logo_new" />
-      
+            android:id="@+id/logo"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:paddingTop="95dip"
+            android:scaleType="center"
+            android:src="@drawable/astrid_com_logo_new"/>
+
     <TextView
-      android:id="@+id/error"
-      android:layout_width="fill_parent"
-      android:layout_height="45dip"
-      android:gravity="center"
-      android:textColor="#ff0000"
-      android:textSize="16sp"
-      android:textStyle="bold" />
-    
+            android:id="@+id/error"
+            android:layout_width="fill_parent"
+            android:layout_height="45dip"
+            android:gravity="center"
+            android:textColor="#ff0000"
+            android:textSize="16sp"
+            android:textStyle="bold"/>
+
     <LinearLayout
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:orientation="vertical"
-      android:gravity="center_horizontal">
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:gravity="center_horizontal">
+
         <com.facebook.widget.LoginButton
-          android:id="@+id/fb_login"
-          android:layout_width="300dip"
-          android:layout_height="45dip"
-          android:layout_marginLeft="15dip"
-          android:layout_marginRight="15dip"
-          android:layout_marginBottom="15dip"
-          android:paddingLeft="70dip"
-          android:textSize="16sp"
-          android:gravity="left|center_vertical"
-          android:background="@drawable/fb_login_background"
-          android:textColor="@android:color/white"
-          android:text="@string/actfm_ALA_fb_login"
-          android:visibility="gone" />
-                            
+                android:id="@+id/fb_login"
+                android:layout_width="300dip"
+                android:layout_height="45dip"
+                android:layout_marginLeft="15dip"
+                android:layout_marginRight="15dip"
+                android:layout_marginBottom="15dip"
+                android:paddingLeft="70dip"
+                android:textSize="16sp"
+                android:gravity="left|center_vertical"
+                android:background="@drawable/fb_login_background"
+                android:textColor="@android:color/white"
+                android:text="@string/actfm_ALA_fb_login"
+                android:visibility="gone"/>
+
         <Button
-          android:id="@+id/fb_login_dummy"
-          android:layout_width="300dip"
-          android:layout_height="45dip"
-          android:layout_marginLeft="15dip"
-          android:layout_marginRight="15dip"
-          android:layout_marginBottom="15dip"
-          android:paddingLeft="70dip"
-          android:textSize="16sp"
-          android:gravity="left|center_vertical"
-          android:background="@drawable/fb_login_background"
-          android:textColor="@android:color/white"
-          android:text="@string/actfm_ALA_fb_login" />
-          
+                android:id="@+id/fb_login_dummy"
+                android:layout_width="300dip"
+                android:layout_height="45dip"
+                android:layout_marginLeft="15dip"
+                android:layout_marginRight="15dip"
+                android:layout_marginBottom="15dip"
+                android:paddingLeft="70dip"
+                android:textSize="16sp"
+                android:gravity="left|center_vertical"
+                android:background="@drawable/fb_login_background"
+                android:textColor="@android:color/white"
+                android:text="@string/actfm_ALA_fb_login"/>
+
         <Button
-          android:id="@+id/gg_login"
-          android:layout_width="300dip"
-          android:layout_height="45dip"
-          android:layout_marginLeft="15dip"
-          android:layout_marginRight="15dip"
-          android:paddingLeft="70dip"
-          android:textSize="16sp"
-          android:gravity="left|center_vertical"
-          android:background="@drawable/google_login_background"
-          android:textColor="@android:color/white"
-          android:text="@string/actfm_ALA_gg_login" />
-          
+                android:id="@+id/gg_login"
+                android:layout_width="300dip"
+                android:layout_height="45dip"
+                android:layout_marginLeft="15dip"
+                android:layout_marginRight="15dip"
+                android:paddingLeft="70dip"
+                android:textSize="16sp"
+                android:gravity="left|center_vertical"
+                android:background="@drawable/google_login_background"
+                android:textColor="@android:color/white"
+                android:text="@string/actfm_ALA_gg_login"/>
+
         <TextView
-          android:id="@+id/tos"
-          android:layout_width="fill_parent"
-          android:layout_height="35dip"
-          android:gravity="center"
-          android:paddingLeft="20dip"
-          android:paddingRight="20dip"
-          android:textSize="12.5sp"
-          android:visibility="invisible"
-          android:textColor="#ffffff" />  
+                android:id="@+id/tos"
+                android:layout_width="fill_parent"
+                android:layout_height="35dip"
+                android:gravity="center"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip"
+                android:textSize="12.5sp"
+                android:visibility="invisible"
+                android:textColor="#ffffff"/>
     </LinearLayout>
-    
-    <LinearLayout 
-        android:layout_width="fill_parent"
-        android:layout_height="45dip"
-        android:orientation="horizontal"
-        android:paddingLeft="40dip"
-        android:paddingRight="40dip">
+
+    <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="45dip"
+            android:orientation="horizontal"
+            android:paddingLeft="40dip"
+            android:paddingRight="40dip">
+
         <TextView
-          android:id="@+id/login_later"
-          android:text="@string/welcome_login_later"
-          android:layout_width="fill_parent"
-          android:layout_height="45dip"
-          android:gravity="center"
-          android:layout_weight="1"
-          android:textSize="16sp"
-          android:textColor="#a0ffffff" 
-          android:visibility="gone"/>
+                android:id="@+id/login_later"
+                android:text="@string/welcome_login_later"
+                android:layout_width="fill_parent"
+                android:layout_height="45dip"
+                android:gravity="center"
+                android:layout_weight="1"
+                android:textSize="16sp"
+                android:textColor="#a0ffffff"
+                android:visibility="gone"/>
+
         <TextView
-          android:id="@+id/pw_login"
-          android:layout_width="fill_parent"
-          android:layout_height="45dip"
-          android:layout_weight="1"
-          android:gravity="center"
-          android:textColor="@android:color/white"
-          android:textSize="16sp"
-          android:text="@string/welcome_sign_in"/>
+                android:id="@+id/pw_login"
+                android:layout_width="fill_parent"
+                android:layout_height="45dip"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:textColor="@android:color/white"
+                android:textSize="16sp"
+                android:text="@string/welcome_sign_in"/>
+
         <TextView
-          android:id="@+id/pw_signup"
-          android:layout_width="fill_parent"
-          android:layout_height="45dip"
-          android:layout_weight="1"
-          android:gravity="center"
-          android:textColor="@android:color/white"
-          android:textSize="16sp" 
-          android:text="@string/welcome_login_pw"/>    
-        
+                android:id="@+id/pw_signup"
+                android:layout_width="fill_parent"
+                android:layout_height="45dip"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:textColor="@android:color/white"
+                android:textSize="16sp"
+                android:text="@string/welcome_login_pw"/>
+
     </LinearLayout>
 </LinearLayout>
diff --git a/astrid/res/layout/addon_adapter_row.xml b/astrid/res/layout/addon_adapter_row.xml
index 14e6158dd..cb09e7b8b 100644
--- a/astrid/res/layout/addon_adapter_row.xml
+++ b/astrid/res/layout/addon_adapter_row.xml
@@ -5,82 +5,88 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:background="@android:drawable/list_selector_background"
-    android:paddingTop="4dip"
-    android:paddingBottom="4dip"
-    android:paddingLeft="4dip"
-    android:paddingRight="4dip">
-        
-            
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:orientation="horizontal"
+              android:background="@android:drawable/list_selector_background"
+              android:paddingTop="4dip"
+              android:paddingBottom="4dip"
+              android:paddingLeft="4dip"
+              android:paddingRight="4dip">
+
+
     <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingLeft="5dip" 
-        android:orientation="vertical">
-        
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dip"
+            android:orientation="vertical">
+
         <!-- icon -->
-        <ImageView android:id="@+id/icon"
-            android:layout_width="48dip"
-            android:layout_height="48dip"
-            android:gravity="center"
-            android:scaleType="fitCenter"/>
-        
+        <ImageView
+                android:id="@+id/icon"
+                android:layout_width="48dip"
+                android:layout_height="48dip"
+                android:gravity="center"
+                android:scaleType="fitCenter"/>
+
         <!-- free -->
-        <TextView android:id="@+id/free"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textSize="10sp"
-            android:textColor="#00ff00"
-            android:text="@string/AOA_free" />
-            
+        <TextView
+                android:id="@+id/free"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:textSize="10sp"
+                android:textColor="#00ff00"
+                android:text="@string/AOA_free"/>
+
     </LinearLayout>
-            
+
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="100"
-        android:paddingLeft="8dip" 
-        android:paddingRight="3dip" 
-        android:orientation="vertical">
-            
-        <!-- add-on name -->
-        <TextView android:id="@+id/title"
-            android:layout_width="wrap_content"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_toRightOf="@id/icon"
-            android:singleLine="true"
-            style="@style/TextAppearance.TAd_ItemTitle"/>
-    
+            android:layout_weight="100"
+            android:paddingLeft="8dip"
+            android:paddingRight="3dip"
+            android:orientation="vertical">
+
+        <!-- add-on name -->
+        <TextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_toRightOf="@id/icon"
+                android:singleLine="true"
+                style="@style/TextAppearance.TAd_ItemTitle"/>
+
         <!-- description -->
-        <TextView android:id="@+id/description"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/title"
-            android:layout_toRightOf="@id/icon"
-            android:singleLine="false"
-            android:textSize="11sp"
-            style="@style/TextAppearance.TAd_ItemDetails"/>
-            
+        <TextView
+                android:id="@+id/description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/title"
+                android:layout_toRightOf="@id/icon"
+                android:singleLine="false"
+                android:textSize="11sp"
+                style="@style/TextAppearance.TAd_ItemDetails"/>
+
     </LinearLayout>
-          
+
     <!-- buttons -->
-        
-    <ImageButton android:id="@+id/button_market"
-        android:layout_width="48dip"
-        android:layout_height="48dip"
-        android:scaleType="fitCenter"
-        android:layout_gravity="center" />
-        
-    <ImageView android:id="@+id/check"
-        android:layout_width="48dip"
-        android:layout_height="48dip"
-        android:scaleType="center"
-        android:layout_gravity="center"
-        android:src="@android:drawable/checkbox_on_background"/>
-            
+
+    <ImageButton
+            android:id="@+id/button_market"
+            android:layout_width="48dip"
+            android:layout_height="48dip"
+            android:scaleType="fitCenter"
+            android:layout_gravity="center"/>
+
+    <ImageView
+            android:id="@+id/check"
+            android:layout_width="48dip"
+            android:layout_height="48dip"
+            android:scaleType="center"
+            android:layout_gravity="center"
+            android:src="@android:drawable/checkbox_on_background"/>
+
 </LinearLayout>
diff --git a/astrid/res/layout/addon_list_container.xml b/astrid/res/layout/addon_list_container.xml
index 2f12254bc..7a8ff95b4 100644
--- a/astrid/res/layout/addon_list_container.xml
+++ b/astrid/res/layout/addon_list_container.xml
@@ -4,26 +4,28 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<FrameLayout 
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/tab_installed"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    style="@style/Content">
-    
-    <TextView android:id="@+id/empty"
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/tab_installed"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:gravity="center"
-        android:text="@string/AOA_no_addons"
-        style="@style/TextAppearance.TLA_NoItems" />
-  
-    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@+id/list"
-        android:paddingRight="8dip"
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:background="@android:color/transparent" 
-        android:cacheColorHint="#00000000"/>
-        
+        style="@style/Content">
+
+    <TextView
+            android:id="@+id/empty"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:gravity="center"
+            android:text="@string/AOA_no_addons"
+            style="@style/TextAppearance.TLA_NoItems"/>
+
+    <com.todoroo.astrid.ui.ErrorCatchingListView
+            android:id="@+id/list"
+            android:paddingRight="8dip"
+            android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:background="@android:color/transparent"
+            android:cacheColorHint="#00000000"/>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/alarm_edit_row.xml b/astrid/res/layout/alarm_edit_row.xml
index 58217e13e..57c1e6e4c 100644
--- a/astrid/res/layout/alarm_edit_row.xml
+++ b/astrid/res/layout/alarm_edit_row.xml
@@ -15,38 +15,41 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="5dip"
-    android:paddingRight="5dip">
-	<LinearLayout 
-	    android:orientation="horizontal"
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content"
-	    android:gravity="center_vertical">
-	    
-	    <TextView
-	        android:id="@+id/alarm_string"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_weight="100"
-	        android:paddingTop="15dip"
-	        android:paddingBottom="15dip"
-	        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"/>
-	        
-	    <ImageButton android:id="@+id/button1"
-	        android:background="@drawable/btn_dismiss"
-	        android:layout_width="32dip"
-	        android:layout_height="32dip"
-	        android:layout_gravity="center"
-	        android:layout_margin="4dip"
-	        android:layout_weight="1"
-	    />
-	</LinearLayout>
-	<View
-	      	  android:id="@+id/TEA_Separator"
-		      android:layout_width="fill_parent"
-		      android:layout_height="1px"
-		      style="@style/TEA_Separator" />
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:paddingLeft="5dip"
+              android:paddingRight="5dip">
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical">
+
+        <TextView
+                android:id="@+id/alarm_string"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="100"
+                android:paddingTop="15dip"
+                android:paddingBottom="15dip"
+                style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"/>
+
+        <ImageButton
+                android:id="@+id/button1"
+                android:background="@drawable/btn_dismiss"
+                android:layout_width="32dip"
+                android:layout_height="32dip"
+                android:layout_gravity="center"
+                android:layout_margin="4dip"
+                android:layout_weight="1"
+                />
+    </LinearLayout>
+
+    <View
+            android:id="@+id/TEA_Separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            style="@style/TEA_Separator"/>
 </LinearLayout>
diff --git a/astrid/res/layout/assigned_adapter_row.xml b/astrid/res/layout/assigned_adapter_row.xml
index 61c8dcddf..95155f6ec 100644
--- a/astrid/res/layout/assigned_adapter_row.xml
+++ b/astrid/res/layout/assigned_adapter_row.xml
@@ -5,29 +5,31 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="8dip"
-    android:gravity="center_vertical">
+              xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:paddingLeft="8dip"
+              android:gravity="center_vertical">
 
-    <com.todoroo.astrid.helper.AsyncImageView android:id="@+id/person_image"
-        android:layout_width="44dip"
-        android:layout_height="44dip"
-        android:gravity="center"
-        android:layout_gravity="center_vertical"
-        android:scaleType="fitCenter"
-        astrid:defaultSrc="@drawable/icn_default_person_image" />
-	<CheckedTextView
-		android:id="@android:id/text1"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		style="@style/TextAppearance.TEA_assigned"
-		android:textColor="?attr/asTextColor"
-		android:gravity="center_vertical"
-		android:checkMark="?android:attr/listChoiceIndicatorSingle"
-		android:paddingLeft="6dip"
-		android:paddingRight="6dip"
-	    android:layout_toRightOf="@id/person_image"/>
+    <com.todoroo.astrid.helper.AsyncImageView
+            android:id="@+id/person_image"
+            android:layout_width="44dip"
+            android:layout_height="44dip"
+            android:gravity="center"
+            android:layout_gravity="center_vertical"
+            android:scaleType="fitCenter"
+            astrid:defaultSrc="@drawable/icn_default_person_image"/>
+
+    <CheckedTextView
+            android:id="@android:id/text1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/TextAppearance.TEA_assigned"
+            android:textColor="?attr/asTextColor"
+            android:gravity="center_vertical"
+            android:checkMark="?android:attr/listChoiceIndicatorSingle"
+            android:paddingLeft="6dip"
+            android:paddingRight="6dip"
+            android:layout_toRightOf="@id/person_image"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/astrid_calendar_list_creator_view.xml b/astrid/res/layout/astrid_calendar_list_creator_view.xml
index be831dc48..08ac7338e 100644
--- a/astrid/res/layout/astrid_calendar_list_creator_view.xml
+++ b/astrid/res/layout/astrid_calendar_list_creator_view.xml
@@ -5,99 +5,101 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/reminder_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="10dip"
-    android:layout_marginRight="10dip"
-    android:orientation="vertical"
-    android:background="@drawable/reminder_dialog_background">
-    
+              android:id="@+id/reminder_root"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_marginLeft="10dip"
+              android:layout_marginRight="10dip"
+              android:orientation="vertical"
+              android:background="@drawable/reminder_dialog_background">
+
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="15dip"
-        android:layout_marginLeft="10dip">
-        
-        <TextView 
-            android:id="@+id/reminder_title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="1dip"
-            android:textSize="24sp"
-            android:textColor="@android:color/white"
-            android:layout_weight="1"
-            android:text="@string/CRA_share_list_title"/>
+            android:orientation="horizontal"
+            android:layout_marginTop="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="15dip"
+            android:layout_marginLeft="10dip">
+
+        <TextView
+                android:id="@+id/reminder_title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="1dip"
+                android:textSize="24sp"
+                android:textColor="@android:color/white"
+                android:layout_weight="1"
+                android:text="@string/CRA_share_list_title"/>
+
         <ImageView
-            android:id="@+id/dismiss"
-            android:layout_width="25dip"
-            android:layout_height="25dip"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_menu_close"/>
-    
+                android:id="@+id/dismiss"
+                android:layout_width="25dip"
+                android:layout_height="25dip"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_menu_close"/>
+
     </LinearLayout>
 
     <FrameLayout
-        android:id="@+id/calendar_reminder_speech_bubble"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <include layout="@layout/astrid_speech_bubble" />
+            android:id="@+id/calendar_reminder_speech_bubble"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+
+        <include layout="@layout/astrid_speech_bubble"/>
     </FrameLayout>
-    
+
     <TextView
-        android:id="@+id/invite_all"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="24sp"
-        android:gravity="center"
-        android:text="@string/CRA_invite_attendees"/>
+            android:id="@+id/invite_all"
+            android:layout_width="fill_parent"
+            android:layout_height="35dip"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:textSize="24sp"
+            android:gravity="center"
+            android:text="@string/CRA_invite_attendees"/>
 
     <TextView
-        android:id="@+id/list_settings"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="24sp"
-        android:gravity="center"
-        android:background="#707070"
-        android:text="@string/CRA_more_options"/>
-    
+            android:id="@+id/list_settings"
+            android:layout_width="fill_parent"
+            android:layout_height="35dip"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:textSize="24sp"
+            android:gravity="center"
+            android:background="#707070"
+            android:text="@string/CRA_more_options"/>
+
     <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:layout_marginBottom="10dip">
-	    
-	    <TextView
-	        android:id="@+id/ignore"
-	        android:layout_width="fill_parent"
-	        android:layout_height="35dip"
-	        android:textColor="@android:color/white"
-	        android:textSize="24sp"
-	        android:gravity="center"
-	        android:text="@string/CRA_dont_invite"
-	        android:background="#707070"/>
-	    
-	    <ImageView 
-	        android:id="@+id/ignore_settings"
-	        android:layout_alignParentRight="true"
-	        android:layout_width="35dip"
-	        android:layout_height="35dip"
-	        android:padding="4dip"
-	        android:background="@android:color/transparent"
-	        android:scaleType="fitCenter"
-	        android:src="@drawable/single_gear"/>
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:layout_marginBottom="10dip">
+
+        <TextView
+                android:id="@+id/ignore"
+                android:layout_width="fill_parent"
+                android:layout_height="35dip"
+                android:textColor="@android:color/white"
+                android:textSize="24sp"
+                android:gravity="center"
+                android:text="@string/CRA_dont_invite"
+                android:background="#707070"/>
+
+        <ImageView
+                android:id="@+id/ignore_settings"
+                android:layout_alignParentRight="true"
+                android:layout_width="35dip"
+                android:layout_height="35dip"
+                android:padding="4dip"
+                android:background="@android:color/transparent"
+                android:scaleType="fitCenter"
+                android:src="@drawable/single_gear"/>
     </RelativeLayout>
 
 
diff --git a/astrid/res/layout/astrid_calendar_reminder_view.xml b/astrid/res/layout/astrid_calendar_reminder_view.xml
index f7e90d3f1..6c92d0d1c 100644
--- a/astrid/res/layout/astrid_calendar_reminder_view.xml
+++ b/astrid/res/layout/astrid_calendar_reminder_view.xml
@@ -5,99 +5,101 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/reminder_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="10dip"
-    android:layout_marginRight="10dip"
-    android:orientation="vertical"
-    android:background="@drawable/reminder_dialog_background">
-    
+              android:id="@+id/reminder_root"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_marginLeft="10dip"
+              android:layout_marginRight="10dip"
+              android:orientation="vertical"
+              android:background="@drawable/reminder_dialog_background">
+
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="15dip"
-        android:layout_marginLeft="10dip">
-        
-        <TextView 
-            android:id="@+id/reminder_title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="1dip"
-            android:textSize="24sp"
-            android:textColor="@android:color/white"
-            android:layout_weight="1"
-            android:text="@string/CRA_title"/>
+            android:orientation="horizontal"
+            android:layout_marginTop="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="15dip"
+            android:layout_marginLeft="10dip">
+
+        <TextView
+                android:id="@+id/reminder_title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="1dip"
+                android:textSize="24sp"
+                android:textColor="@android:color/white"
+                android:layout_weight="1"
+                android:text="@string/CRA_title"/>
+
         <ImageView
-            android:id="@+id/dismiss"
-            android:layout_width="25dip"
-            android:layout_height="25dip"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_menu_close"/>
-    
+                android:id="@+id/dismiss"
+                android:layout_width="25dip"
+                android:layout_height="25dip"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_menu_close"/>
+
     </LinearLayout>
 
     <FrameLayout
-        android:id="@+id/calendar_reminder_speech_bubble"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <include layout="@layout/astrid_speech_bubble" />
+            android:id="@+id/calendar_reminder_speech_bubble"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+
+        <include layout="@layout/astrid_speech_bubble"/>
     </FrameLayout>
-    
+
     <TextView
-        android:id="@+id/create_list"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="24sp"
-        android:gravity="center"
-        android:text="@string/CRA_create_list"/>
+            android:id="@+id/create_list"
+            android:layout_width="fill_parent"
+            android:layout_height="35dip"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:textSize="24sp"
+            android:gravity="center"
+            android:text="@string/CRA_create_list"/>
 
     <TextView
-        android:id="@+id/postpone"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="24sp"
-        android:gravity="center"
-        android:background="#707070"
-        android:text="@string/CRA_postpone"/>
-    
+            android:id="@+id/postpone"
+            android:layout_width="fill_parent"
+            android:layout_height="35dip"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:textSize="24sp"
+            android:gravity="center"
+            android:background="#707070"
+            android:text="@string/CRA_postpone"/>
+
     <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:layout_marginBottom="10dip">
-	    
-	    <TextView
-	        android:id="@+id/ignore"
-	        android:layout_width="fill_parent"
-	        android:layout_height="35dip"
-	        android:textColor="@android:color/white"
-	        android:textSize="24sp"
-	        android:gravity="center"
-	        android:text="@string/CRA_ignore"
-	        android:background="#707070"/>
-	    
-	    <ImageView 
-	        android:id="@+id/ignore_settings"
-	        android:layout_alignParentRight="true"
-	        android:layout_width="35dip"
-	        android:layout_height="35dip"
-	        android:padding="4dip"
-	        android:background="@android:color/transparent"
-	        android:scaleType="fitCenter"
-	        android:src="@drawable/single_gear"/>
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:layout_marginBottom="10dip">
+
+        <TextView
+                android:id="@+id/ignore"
+                android:layout_width="fill_parent"
+                android:layout_height="35dip"
+                android:textColor="@android:color/white"
+                android:textSize="24sp"
+                android:gravity="center"
+                android:text="@string/CRA_ignore"
+                android:background="#707070"/>
+
+        <ImageView
+                android:id="@+id/ignore_settings"
+                android:layout_alignParentRight="true"
+                android:layout_width="35dip"
+                android:layout_height="35dip"
+                android:padding="4dip"
+                android:background="@android:color/transparent"
+                android:scaleType="fitCenter"
+                android:src="@drawable/single_gear"/>
     </RelativeLayout>
 
 
diff --git a/astrid/res/layout/astrid_dialog_view.xml b/astrid/res/layout/astrid_dialog_view.xml
index 30ffdf70a..38ee8ad96 100644
--- a/astrid/res/layout/astrid_dialog_view.xml
+++ b/astrid/res/layout/astrid_dialog_view.xml
@@ -5,72 +5,75 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dialog_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="10dip"
-    android:paddingRight="10dip"
-    android:orientation="vertical">
-    
+              android:id="@+id/dialog_root"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:paddingLeft="10dip"
+              android:paddingRight="10dip"
+              android:orientation="vertical">
+
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="20dip"
-        android:layout_marginLeft="5dip">
-        
-        <TextView 
-            android:id="@+id/dialog_title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:textColor="@android:color/white"
-            android:layout_weight="1"/>
+            android:orientation="horizontal"
+            android:layout_marginTop="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="20dip"
+            android:layout_marginLeft="5dip">
+
+        <TextView
+                android:id="@+id/dialog_title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:textSize="20sp"
+                android:textColor="@android:color/white"
+                android:layout_weight="1"/>
+
         <ImageView
-            android:id="@+id/dismiss"
-            android:layout_width="25dip"
-            android:layout_height="25dip"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_menu_close"/>
-    
+                android:id="@+id/dismiss"
+                android:layout_width="25dip"
+                android:layout_height="25dip"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_menu_close"/>
+
     </LinearLayout>
-    
+
     <include layout="@layout/astrid_speech_bubble"/>
-    
+
     <Button
-        android:id="@+id/button0"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:visibility="gone"
-        android:textSize="20sp"
-        android:background="?attr/asThemeTextColor"/>
+            android:id="@+id/button0"
+            android:layout_width="fill_parent"
+            android:layout_height="35dip"
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:visibility="gone"
+            android:textSize="20sp"
+            android:background="?attr/asThemeTextColor"/>
+
     <Button
-        android:id="@+id/button1"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="20sp"
-        android:visibility="gone"
-        android:background="?attr/asThemeTextColor"/>
+            android:id="@+id/button1"
+            android:layout_width="fill_parent"
+            android:layout_height="35dip"
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:textSize="20sp"
+            android:visibility="gone"
+            android:background="?attr/asThemeTextColor"/>
+
     <Button
-        android:id="@+id/button2"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="20sp"
-        android:visibility="gone"
-        android:background="?attr/asThemeTextColor"/>
+            android:id="@+id/button2"
+            android:layout_width="fill_parent"
+            android:layout_height="35dip"
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:textSize="20sp"
+            android:visibility="gone"
+            android:background="?attr/asThemeTextColor"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/astrid_dialog_view_portrait.xml b/astrid/res/layout/astrid_dialog_view_portrait.xml
index dc837e8c5..b582efb4c 100644
--- a/astrid/res/layout/astrid_dialog_view_portrait.xml
+++ b/astrid/res/layout/astrid_dialog_view_portrait.xml
@@ -5,72 +5,75 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dialog_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="10dip"
-    android:paddingRight="10dip"
-    android:orientation="vertical">
-    
+              android:id="@+id/dialog_root"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:paddingLeft="10dip"
+              android:paddingRight="10dip"
+              android:orientation="vertical">
+
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="20dip"
-        android:layout_marginLeft="5dip">
-        
-        <TextView 
-            android:id="@+id/dialog_title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:textColor="@android:color/white"
-            android:layout_weight="1"/>
+            android:orientation="horizontal"
+            android:layout_marginTop="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="20dip"
+            android:layout_marginLeft="5dip">
+
+        <TextView
+                android:id="@+id/dialog_title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:textSize="20sp"
+                android:textColor="@android:color/white"
+                android:layout_weight="1"/>
+
         <ImageView
-            android:id="@+id/dismiss"
-            android:layout_width="25dip"
-            android:layout_height="25dip"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_menu_close"/>
-    
+                android:id="@+id/dismiss"
+                android:layout_width="25dip"
+                android:layout_height="25dip"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_menu_close"/>
+
     </LinearLayout>
-    
+
     <include layout="@layout/astrid_speech_bubble"/>
-    
+
     <Button
-        android:id="@+id/button0"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="20sp"
-        android:visibility="gone"
-        android:background="?attr/asThemeTextColor"/>
+            android:id="@+id/button0"
+            android:layout_width="fill_parent"
+            android:layout_height="35dip"
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:textSize="20sp"
+            android:visibility="gone"
+            android:background="?attr/asThemeTextColor"/>
+
     <Button
-        android:id="@+id/button1"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="20sp"
-        android:visibility="gone"
-        android:background="?attr/asThemeTextColor"/>
+            android:id="@+id/button1"
+            android:layout_width="fill_parent"
+            android:layout_height="35dip"
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:textSize="20sp"
+            android:visibility="gone"
+            android:background="?attr/asThemeTextColor"/>
+
     <Button
-        android:id="@+id/button2"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="20sp"
-        android:visibility="gone"
-        android:background="?attr/asThemeTextColor"/>
+            android:id="@+id/button2"
+            android:layout_width="fill_parent"
+            android:layout_height="35dip"
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:textSize="20sp"
+            android:visibility="gone"
+            android:background="?attr/asThemeTextColor"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/astrid_missed_call_view.xml b/astrid/res/layout/astrid_missed_call_view.xml
index 3c5f3910e..a156d14bb 100644
--- a/astrid/res/layout/astrid_missed_call_view.xml
+++ b/astrid/res/layout/astrid_missed_call_view.xml
@@ -5,107 +5,110 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/reminder_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="10dip"
-    android:layout_marginRight="10dip"
-    android:orientation="vertical"
-    android:background="@drawable/reminder_dialog_background">
-    
+              android:id="@+id/reminder_root"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_marginLeft="10dip"
+              android:layout_marginRight="10dip"
+              android:orientation="vertical"
+              android:background="@drawable/reminder_dialog_background">
+
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="15dip"
-        android:layout_marginLeft="10dip">
-        
-        <ImageView
-            android:id="@+id/contact_picture"
-            android:layout_marginTop="5dip"
-            android:layout_marginRight="10dip"
-            android:visibility="gone"
-            android:layout_width="51dip"
-            android:layout_height="51dip"
-            android:scaleType="fitCenter" />
-        
-        <TextView 
-            android:id="@+id/reminder_title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="1dip"
-            android:textSize="24sp"
-            android:textColor="@android:color/white"
-            android:layout_weight="1"
-            android:text="@string/MCA_title"/>
+            android:orientation="horizontal"
+            android:layout_marginTop="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="15dip"
+            android:layout_marginLeft="10dip">
+
         <ImageView
-            android:id="@+id/dismiss"
-            android:layout_width="25dip"
-            android:layout_height="25dip"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_menu_close"/>
-    
+                android:id="@+id/contact_picture"
+                android:layout_marginTop="5dip"
+                android:layout_marginRight="10dip"
+                android:visibility="gone"
+                android:layout_width="51dip"
+                android:layout_height="51dip"
+                android:scaleType="fitCenter"/>
+
+        <TextView
+                android:id="@+id/reminder_title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="1dip"
+                android:textSize="24sp"
+                android:textColor="@android:color/white"
+                android:layout_weight="1"
+                android:text="@string/MCA_title"/>
+
+        <ImageView
+                android:id="@+id/dismiss"
+                android:layout_width="25dip"
+                android:layout_height="25dip"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_menu_close"/>
+
     </LinearLayout>
-    
-    
+
+
     <TextView
-        android:id="@+id/call_now"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="24sp"
-        android:gravity="center"
-        android:text="@string/MCA_return_call"/>
+            android:id="@+id/call_now"
+            android:layout_width="fill_parent"
+            android:layout_height="35dip"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:textSize="24sp"
+            android:gravity="center"
+            android:text="@string/MCA_return_call"/>
+
     <TextView
-        android:id="@+id/call_later"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="24sp"
-        android:gravity="center"
-        android:text="@string/MCA_add_task"/>
-    
+            android:id="@+id/call_later"
+            android:layout_width="fill_parent"
+            android:layout_height="35dip"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:textSize="24sp"
+            android:gravity="center"
+            android:text="@string/MCA_add_task"/>
+
     <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:layout_marginBottom="10dip">
-	    
-	    <TextView
-	        android:id="@+id/call_ignore"
-	        android:layout_width="fill_parent"
-	        android:layout_height="35dip"
-	        android:textColor="@android:color/white"
-	        android:textSize="24sp"
-	        android:gravity="center"
-	        android:text="@string/MCA_ignore"
-	        android:background="#707070"/>
-	    
-	    <ImageView 
-	        android:id="@+id/ignore_settings"
-	        android:layout_alignParentRight="true"
-	        android:layout_width="35dip"
-	        android:layout_height="35dip"
-	        android:padding="4dip"
-	        android:background="@android:color/transparent"
-	        android:scaleType="fitCenter"
-	        android:src="@drawable/single_gear"/>
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:layout_marginBottom="10dip">
+
+        <TextView
+                android:id="@+id/call_ignore"
+                android:layout_width="fill_parent"
+                android:layout_height="35dip"
+                android:textColor="@android:color/white"
+                android:textSize="24sp"
+                android:gravity="center"
+                android:text="@string/MCA_ignore"
+                android:background="#707070"/>
+
+        <ImageView
+                android:id="@+id/ignore_settings"
+                android:layout_alignParentRight="true"
+                android:layout_width="35dip"
+                android:layout_height="35dip"
+                android:padding="4dip"
+                android:background="@android:color/transparent"
+                android:scaleType="fitCenter"
+                android:src="@drawable/single_gear"/>
     </RelativeLayout>
 
     <FrameLayout
-        android:id="@+id/missed_calls_speech_bubble"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        <include layout="@layout/astrid_speech_bubble" />
+            android:id="@+id/missed_calls_speech_bubble"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+
+        <include layout="@layout/astrid_speech_bubble"/>
     </FrameLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/astrid_record_audio_view.xml b/astrid/res/layout/astrid_record_audio_view.xml
index 395e4b301..5fc0228b6 100644
--- a/astrid/res/layout/astrid_record_audio_view.xml
+++ b/astrid/res/layout/astrid_record_audio_view.xml
@@ -5,61 +5,62 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/reminder_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="10dip"
-    android:layout_marginRight="10dip"
-    android:orientation="vertical"
-    android:background="@drawable/reminder_dialog_background">
-    
+              android:id="@+id/reminder_root"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_marginLeft="10dip"
+              android:layout_marginRight="10dip"
+              android:orientation="vertical"
+              android:background="@drawable/reminder_dialog_background">
+
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="10dip"
-        android:layout_marginLeft="10dip">
-        
-        <TextView 
-            android:id="@+id/reminder_title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="1dip"
-            android:textSize="24sp"
-            android:textColor="@android:color/white"
-            android:layout_weight="1"
-            android:text="@string/audio_recording_title"/>
+            android:orientation="horizontal"
+            android:layout_marginTop="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="10dip"
+            android:layout_marginLeft="10dip">
+
+        <TextView
+                android:id="@+id/reminder_title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="1dip"
+                android:textSize="24sp"
+                android:textColor="@android:color/white"
+                android:layout_weight="1"
+                android:text="@string/audio_recording_title"/>
+
         <ImageView
-            android:id="@+id/dismiss"
-            android:layout_width="25dip"
-            android:layout_height="25dip"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_menu_close"/>
-    
+                android:id="@+id/dismiss"
+                android:layout_width="25dip"
+                android:layout_height="25dip"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_menu_close"/>
+
     </LinearLayout>
-    
-    <Chronometer 
-        android:id="@+id/timer"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="24sp"
-        android:gravity="center"/>
-    
+
+    <Chronometer
+            android:id="@+id/timer"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:textSize="24sp"
+            android:gravity="center"/>
+
     <TextView
-        android:id="@+id/stop_recording"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:background="@color/red_theme_color"
-        android:textSize="24sp"
-        android:gravity="center"
-        android:text="@string/audio_stop_recording"/>
+            android:id="@+id/stop_recording"
+            android:layout_width="fill_parent"
+            android:layout_height="35dip"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:background="@color/red_theme_color"
+            android:textSize="24sp"
+            android:gravity="center"
+            android:text="@string/audio_stop_recording"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/astrid_reminder_view.xml b/astrid/res/layout/astrid_reminder_view.xml
index 716d60749..df5175048 100644
--- a/astrid/res/layout/astrid_reminder_view.xml
+++ b/astrid/res/layout/astrid_reminder_view.xml
@@ -5,81 +5,84 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/reminder_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="10dip"
-    android:paddingRight="10dip"
-    android:orientation="vertical">
-    
+              android:id="@+id/reminder_root"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:paddingLeft="10dip"
+              android:paddingRight="10dip"
+              android:orientation="vertical">
+
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="20dip"
-        android:layout_marginLeft="5dip">
-        
-        <TextView 
-            android:id="@+id/reminder_title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:textColor="@android:color/white"
-            android:layout_weight="1"/>
+            android:orientation="horizontal"
+            android:layout_marginTop="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="20dip"
+            android:layout_marginLeft="5dip">
+
+        <TextView
+                android:id="@+id/reminder_title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:textSize="20sp"
+                android:textColor="@android:color/white"
+                android:layout_weight="1"/>
+
         <ImageView
-            android:id="@+id/dismiss"
-            android:layout_width="25dip"
-            android:layout_height="25dip"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_menu_close"/>
-    
+                android:id="@+id/dismiss"
+                android:layout_width="25dip"
+                android:layout_height="25dip"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_menu_close"/>
+
     </LinearLayout>
-    
+
     <include layout="@layout/astrid_speech_bubble"/>
-    
-    <CheckBox 
-        android:id="@+id/reminders_should_show"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:layout_marginBottom="10dip"
-        android:text="@string/TLA_quickadd_confirm_hide_helpers" 
-        android:visibility="gone"/>
-    
+
+    <CheckBox
+            android:id="@+id/reminders_should_show"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dip"
+            android:layout_marginBottom="10dip"
+            android:text="@string/TLA_quickadd_confirm_hide_helpers"
+            android:visibility="gone"/>
+
     <Button
-        android:id="@+id/reminder_edit"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="20sp"
-        android:text="@string/TAd_actionEditTask"
-        android:background="#707070"/>
+            android:id="@+id/reminder_edit"
+            android:layout_width="fill_parent"
+            android:layout_height="35dip"
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:textSize="20sp"
+            android:text="@string/TAd_actionEditTask"
+            android:background="#707070"/>
+
     <Button
-        android:id="@+id/reminder_snooze"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="20sp"
-        android:text="@string/rmd_NoA_snooze"
-        android:background="#707070"/>
+            android:id="@+id/reminder_snooze"
+            android:layout_width="fill_parent"
+            android:layout_height="35dip"
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:textSize="20sp"
+            android:text="@string/rmd_NoA_snooze"
+            android:background="#707070"/>
+
     <Button
-        android:id="@+id/reminder_complete"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="20sp"
-        android:text="@string/rmd_NoA_done"
-        android:background="?attr/asThemeTextColor"/>
+            android:id="@+id/reminder_complete"
+            android:layout_width="fill_parent"
+            android:layout_height="35dip"
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:textSize="20sp"
+            android:text="@string/rmd_NoA_done"
+            android:background="?attr/asThemeTextColor"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/astrid_reminder_view_portrait.xml b/astrid/res/layout/astrid_reminder_view_portrait.xml
index 716d60749..df5175048 100644
--- a/astrid/res/layout/astrid_reminder_view_portrait.xml
+++ b/astrid/res/layout/astrid_reminder_view_portrait.xml
@@ -5,81 +5,84 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/reminder_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="10dip"
-    android:paddingRight="10dip"
-    android:orientation="vertical">
-    
+              android:id="@+id/reminder_root"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:paddingLeft="10dip"
+              android:paddingRight="10dip"
+              android:orientation="vertical">
+
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="20dip"
-        android:layout_marginLeft="5dip">
-        
-        <TextView 
-            android:id="@+id/reminder_title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:textColor="@android:color/white"
-            android:layout_weight="1"/>
+            android:orientation="horizontal"
+            android:layout_marginTop="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="20dip"
+            android:layout_marginLeft="5dip">
+
+        <TextView
+                android:id="@+id/reminder_title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:textSize="20sp"
+                android:textColor="@android:color/white"
+                android:layout_weight="1"/>
+
         <ImageView
-            android:id="@+id/dismiss"
-            android:layout_width="25dip"
-            android:layout_height="25dip"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_menu_close"/>
-    
+                android:id="@+id/dismiss"
+                android:layout_width="25dip"
+                android:layout_height="25dip"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_menu_close"/>
+
     </LinearLayout>
-    
+
     <include layout="@layout/astrid_speech_bubble"/>
-    
-    <CheckBox 
-        android:id="@+id/reminders_should_show"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:layout_marginBottom="10dip"
-        android:text="@string/TLA_quickadd_confirm_hide_helpers" 
-        android:visibility="gone"/>
-    
+
+    <CheckBox
+            android:id="@+id/reminders_should_show"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dip"
+            android:layout_marginBottom="10dip"
+            android:text="@string/TLA_quickadd_confirm_hide_helpers"
+            android:visibility="gone"/>
+
     <Button
-        android:id="@+id/reminder_edit"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="20sp"
-        android:text="@string/TAd_actionEditTask"
-        android:background="#707070"/>
+            android:id="@+id/reminder_edit"
+            android:layout_width="fill_parent"
+            android:layout_height="35dip"
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:textSize="20sp"
+            android:text="@string/TAd_actionEditTask"
+            android:background="#707070"/>
+
     <Button
-        android:id="@+id/reminder_snooze"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="20sp"
-        android:text="@string/rmd_NoA_snooze"
-        android:background="#707070"/>
+            android:id="@+id/reminder_snooze"
+            android:layout_width="fill_parent"
+            android:layout_height="35dip"
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:textSize="20sp"
+            android:text="@string/rmd_NoA_snooze"
+            android:background="#707070"/>
+
     <Button
-        android:id="@+id/reminder_complete"
-        android:layout_width="fill_parent"
-        android:layout_height="35dip"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="20sp"
-        android:text="@string/rmd_NoA_done"
-        android:background="?attr/asThemeTextColor"/>
+            android:id="@+id/reminder_complete"
+            android:layout_width="fill_parent"
+            android:layout_height="35dip"
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="@android:color/white"
+            android:textSize="20sp"
+            android:text="@string/rmd_NoA_done"
+            android:background="?attr/asThemeTextColor"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/astrid_speech_bubble.xml b/astrid/res/layout/astrid_speech_bubble.xml
index 4ed2b5027..a1390b5b5 100644
--- a/astrid/res/layout/astrid_speech_bubble.xml
+++ b/astrid/res/layout/astrid_speech_bubble.xml
@@ -5,42 +5,45 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <merge>
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	    android:id="@+id/speech_bubble_container"
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content"
-	    android:orientation="horizontal"
-	    android:layout_marginLeft="2dip"
-	    android:layout_marginRight="5dip"
-	    android:layout_marginBottom="10dip"
-	    android:gravity="bottom">
-	    <ImageView 
-	        android:id="@+id/astridIcon"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_marginBottom="5dip"
-	        android:src="@drawable/icon"
-	        android:scaleType="fitCenter"
-	        android:layout_alignParentLeft="true"/>
-	    
-	    
-	    <LinearLayout
-	        android:id="@+id/speech_bubble_content"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_marginRight="5dip"
-	        android:layout_marginBottom="5dip"
-	        android:minHeight="60dip"
-	        android:layout_alignParentBottom="true"
-	        android:gravity="center_vertical"
-	        android:background="@drawable/speech_bubble_reminder"
-	        android:layout_toRightOf="@id/astridIcon">
-	        <TextView 
-	            android:id="@+id/reminder_message"
-	            android:layout_width="fill_parent"
-	            android:layout_height="wrap_content"
-	            style="@style/TextAppearance.TLA_Reminder"
-	            android:gravity="center_vertical"/>
-	    </LinearLayout>
-	</LinearLayout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:id="@+id/speech_bubble_container"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal"
+                  android:layout_marginLeft="2dip"
+                  android:layout_marginRight="5dip"
+                  android:layout_marginBottom="10dip"
+                  android:gravity="bottom">
+
+        <ImageView
+                android:id="@+id/astridIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dip"
+                android:src="@drawable/icon"
+                android:scaleType="fitCenter"
+                android:layout_alignParentLeft="true"/>
+
+
+        <LinearLayout
+                android:id="@+id/speech_bubble_content"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="5dip"
+                android:layout_marginBottom="5dip"
+                android:minHeight="60dip"
+                android:layout_alignParentBottom="true"
+                android:gravity="center_vertical"
+                android:background="@drawable/speech_bubble_reminder"
+                android:layout_toRightOf="@id/astridIcon">
+
+            <TextView
+                    android:id="@+id/reminder_message"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/TextAppearance.TLA_Reminder"
+                    android:gravity="center_vertical"/>
+        </LinearLayout>
+    </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/astrid/res/layout/astrid_time_picker.xml b/astrid/res/layout/astrid_time_picker.xml
index 87dbb9063..8e3dd2ecf 100644
--- a/astrid/res/layout/astrid_time_picker.xml
+++ b/astrid/res/layout/astrid_time_picker.xml
@@ -5,75 +5,81 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    
-    <LinearLayout 
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical">
-	    <LinearLayout
-	        android:id="@+id/timeComponents"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_marginBottom="8dip"
-	        android:orientation="horizontal">
-		    <com.todoroo.astrid.ui.DeadlineNumberPicker
-		        android:id="@+id/hours"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
-		        android:layout_weight="1"/>
-		   	<TextView 
-		   	    android:layout_width="wrap_content"
-		   	    android:layout_height="fill_parent"
-		   	    android:background="@android:color/transparent"
-		   	    android:text=":"
-		   	    android:textColor="?attr/asTextColor"
-		   	    android:gravity="center"
-		   	    />
-		    <com.todoroo.astrid.ui.DeadlineNumberPicker
-		        android:id="@+id/minutes"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
-		        android:layout_weight="1"/>
-	    </LinearLayout>
-	    
-	    <LinearLayout
-	        android:id="@+id/am_pm_container"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_marginBottom="4dip">
-		    <ToggleButton
-		        android:id="@+id/am_button"
-		        android:layout_width="fill_parent"
-		        android:layout_height="42dip"
-		        android:paddingTop="8dip"
-		        android:paddingBottom="8dip"
-		        android:textSize="18sp"
-		        android:gravity="center"
-		        android:textColor="@color/task_edit_toggle_button_text"
-		        android:layout_weight="1"
-		        android:layout_marginRight="-1dip"/>
-	        <ToggleButton
-		        android:id="@+id/pm_button"
-		        android:layout_width="fill_parent"
-		        android:layout_height="42dip"
-		        android:paddingTop="8dip"
-		        android:paddingBottom="8dip"
-		        android:textSize="18sp"
-		        android:gravity="center"
-		        android:textColor="@color/task_edit_toggle_button_text"
-		        android:layout_weight="1"
-		        android:layout_marginLeft="-1dip"/>
-	    </LinearLayout>
-	    
-	    <ToggleButton
-	        android:id="@+id/hasTime"
-	        android:layout_width="fill_parent"
-	        android:layout_height="42dip"
-	        android:paddingTop="8dip"
-	        android:paddingBottom="8dip"
-	        android:textSize="18sp"
-	        android:gravity="center"
-	        android:textColor="@color/task_edit_toggle_button_text"/>
+
+    <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="vertical">
+
+        <LinearLayout
+                android:id="@+id/timeComponents"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dip"
+                android:orientation="horizontal">
+
+            <com.todoroo.astrid.ui.DeadlineNumberPicker
+                    android:id="@+id/hours"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"/>
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="fill_parent"
+                    android:background="@android:color/transparent"
+                    android:text=":"
+                    android:textColor="?attr/asTextColor"
+                    android:gravity="center"
+                    />
+
+            <com.todoroo.astrid.ui.DeadlineNumberPicker
+                    android:id="@+id/minutes"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"/>
+        </LinearLayout>
+
+        <LinearLayout
+                android:id="@+id/am_pm_container"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dip">
+
+            <ToggleButton
+                    android:id="@+id/am_button"
+                    android:layout_width="fill_parent"
+                    android:layout_height="42dip"
+                    android:paddingTop="8dip"
+                    android:paddingBottom="8dip"
+                    android:textSize="18sp"
+                    android:gravity="center"
+                    android:textColor="@color/task_edit_toggle_button_text"
+                    android:layout_weight="1"
+                    android:layout_marginRight="-1dip"/>
+
+            <ToggleButton
+                    android:id="@+id/pm_button"
+                    android:layout_width="fill_parent"
+                    android:layout_height="42dip"
+                    android:paddingTop="8dip"
+                    android:paddingBottom="8dip"
+                    android:textSize="18sp"
+                    android:gravity="center"
+                    android:textColor="@color/task_edit_toggle_button_text"
+                    android:layout_weight="1"
+                    android:layout_marginLeft="-1dip"/>
+        </LinearLayout>
+
+        <ToggleButton
+                android:id="@+id/hasTime"
+                android:layout_width="fill_parent"
+                android:layout_height="42dip"
+                android:paddingTop="8dip"
+                android:paddingBottom="8dip"
+                android:textSize="18sp"
+                android:gravity="center"
+                android:textColor="@color/task_edit_toggle_button_text"/>
     </LinearLayout>
-    
+
 </merge>
\ No newline at end of file
diff --git a/astrid/res/layout/astrid_time_picker_horizontal.xml b/astrid/res/layout/astrid_time_picker_horizontal.xml
index 070c6686a..df6e7ceb0 100644
--- a/astrid/res/layout/astrid_time_picker_horizontal.xml
+++ b/astrid/res/layout/astrid_time_picker_horizontal.xml
@@ -5,86 +5,93 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    
-    <LinearLayout 
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="horizontal">
-	    <LinearLayout
-	        android:id="@+id/timeComponents"
-	        android:layout_width="fill_parent"
-	        android:layout_height="122dip"
-	        android:layout_weight="1"
-	        android:layout_marginBottom="5dip"
-	        android:layout_marginRight="4dip"
-	        android:orientation="horizontal">
-		    <com.todoroo.astrid.ui.DeadlineNumberPicker
-		        android:id="@+id/hours"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
-		        android:layout_weight="1"/>
-		   	<TextView 
-		   	    android:layout_width="wrap_content"
-		   	    android:layout_height="fill_parent"
-		   	    android:background="@android:color/transparent"
-		   	    android:text=":"
-		   	    android:textColor="?attr/asTextColor"
-		   	    android:gravity="center"
-		   	    />
-		    <com.todoroo.astrid.ui.DeadlineNumberPicker
-		        android:id="@+id/minutes"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
-		        android:layout_weight="1"/>
-	    </LinearLayout>
-	    
-	    <LinearLayout
-	        android:id="@+id/date_shortcuts"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_weight="1"
-	        android:layout_marginLeft="4dip"
-	        android:orientation="vertical">
-		    <LinearLayout
-		        android:id="@+id/am_pm_container"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
-		        android:layout_marginBottom="4dip">
-			    <ToggleButton
-			        android:id="@+id/am_button"
-			        android:layout_width="fill_parent"
-			        android:layout_height="38dip"
-			        android:paddingTop="8dip"
-			        android:paddingBottom="8dip"
-			        android:textSize="18sp"
-			        android:gravity="center"
-			        android:textColor="@color/task_edit_toggle_button_text"
-			        android:layout_weight="1"
-			        android:layout_marginRight="-1dip"/>
-		        <ToggleButton
-			        android:id="@+id/pm_button"
-			        android:layout_width="fill_parent"
-			        android:layout_height="38dip"
-			        android:paddingTop="8dip"
-			        android:paddingBottom="8dip"
-			        android:textSize="18sp"
-			        android:gravity="center"
-			        android:textColor="@color/task_edit_toggle_button_text"
-			        android:layout_weight="1"
-			        android:layout_marginLeft="-1dip"/>
-		    </LinearLayout>
-		    
-		    <ToggleButton
-		        android:id="@+id/hasTime"
-		        android:layout_width="fill_parent"
-		        android:layout_marginBottom="4dip"
-		        android:layout_height="38dip"
-		        android:paddingTop="8dip"
-		        android:paddingBottom="8dip"
-		        android:textSize="18sp"
-		        android:gravity="center"
-		        android:textColor="@color/task_edit_toggle_button_text"/>
-	    </LinearLayout>
+
+    <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="horizontal">
+
+        <LinearLayout
+                android:id="@+id/timeComponents"
+                android:layout_width="fill_parent"
+                android:layout_height="122dip"
+                android:layout_weight="1"
+                android:layout_marginBottom="5dip"
+                android:layout_marginRight="4dip"
+                android:orientation="horizontal">
+
+            <com.todoroo.astrid.ui.DeadlineNumberPicker
+                    android:id="@+id/hours"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"/>
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="fill_parent"
+                    android:background="@android:color/transparent"
+                    android:text=":"
+                    android:textColor="?attr/asTextColor"
+                    android:gravity="center"
+                    />
+
+            <com.todoroo.astrid.ui.DeadlineNumberPicker
+                    android:id="@+id/minutes"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"/>
+        </LinearLayout>
+
+        <LinearLayout
+                android:id="@+id/date_shortcuts"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginLeft="4dip"
+                android:orientation="vertical">
+
+            <LinearLayout
+                    android:id="@+id/am_pm_container"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="4dip">
+
+                <ToggleButton
+                        android:id="@+id/am_button"
+                        android:layout_width="fill_parent"
+                        android:layout_height="38dip"
+                        android:paddingTop="8dip"
+                        android:paddingBottom="8dip"
+                        android:textSize="18sp"
+                        android:gravity="center"
+                        android:textColor="@color/task_edit_toggle_button_text"
+                        android:layout_weight="1"
+                        android:layout_marginRight="-1dip"/>
+
+                <ToggleButton
+                        android:id="@+id/pm_button"
+                        android:layout_width="fill_parent"
+                        android:layout_height="38dip"
+                        android:paddingTop="8dip"
+                        android:paddingBottom="8dip"
+                        android:textSize="18sp"
+                        android:gravity="center"
+                        android:textColor="@color/task_edit_toggle_button_text"
+                        android:layout_weight="1"
+                        android:layout_marginLeft="-1dip"/>
+            </LinearLayout>
+
+            <ToggleButton
+                    android:id="@+id/hasTime"
+                    android:layout_width="fill_parent"
+                    android:layout_marginBottom="4dip"
+                    android:layout_height="38dip"
+                    android:paddingTop="8dip"
+                    android:paddingBottom="8dip"
+                    android:textSize="18sp"
+                    android:gravity="center"
+                    android:textColor="@color/task_edit_toggle_button_text"/>
+        </LinearLayout>
     </LinearLayout>
-    
+
 </merge>
\ No newline at end of file
diff --git a/astrid/res/layout/backup_activity.xml b/astrid/res/layout/backup_activity.xml
index 380a2630c..a41ee832e 100644
--- a/astrid/res/layout/backup_activity.xml
+++ b/astrid/res/layout/backup_activity.xml
@@ -17,25 +17,27 @@
 */
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:minWidth="300dip"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
+              android:orientation="vertical"
+              android:minWidth="300dip"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content">
 
     <View
-      android:layout_width="fill_parent"
-      android:layout_height="1dip"
-      android:padding="5dip"
-      android:background="@android:drawable/divider_horizontal_dark" />
+            android:layout_width="fill_parent"
+            android:layout_height="1dip"
+            android:padding="5dip"
+            android:background="@android:drawable/divider_horizontal_dark"/>
 
-    <Button android:id="@+id/importButton"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" 
-        android:text="@string/backup_BAc_import" />
+    <Button
+            android:id="@+id/importButton"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/backup_BAc_import"/>
+
+    <Button
+            android:id="@+id/exportButton"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/backup_BAc_export"/>
 
-    <Button android:id="@+id/exportButton"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" 
-        android:text="@string/backup_BAc_export" />
-        
 </LinearLayout>
diff --git a/astrid/res/layout/beast_mode_pref_activity.xml b/astrid/res/layout/beast_mode_pref_activity.xml
index 27d02e3b5..5f56f5d09 100644
--- a/astrid/res/layout/beast_mode_pref_activity.xml
+++ b/astrid/res/layout/beast_mode_pref_activity.xml
@@ -5,36 +5,36 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-    
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
     <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:padding="8dip"
-        android:textSize="16sp"
-        android:text="@string/EPr_beastMode_hint"/>
-    
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:padding="8dip"
+            android:textSize="16sp"
+            android:text="@string/EPr_beastMode_hint"/>
+
     <com.commonsware.cwac.tlv.TouchListView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tlv="http://schemas.android.com/apk/res/com.timsu.astrid"
-    
-        android:id="@android:id/list"
-        android:scrollbars="vertical"
-        android:cacheColorHint="#00000000"            
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_weight="1"
-        android:drawSelectorOnTop="false"
-        
-        tlv:normal_height="52dip"
-        tlv:grabber="@+id/row_body" />
-    
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:tlv="http://schemas.android.com/apk/res/com.timsu.astrid"
+
+            android:id="@android:id/list"
+            android:scrollbars="vertical"
+            android:cacheColorHint="#00000000"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:drawSelectorOnTop="false"
+
+            tlv:normal_height="52dip"
+            tlv:grabber="@+id/row_body"/>
+
     <Button
-        android:id="@+id/reset"
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:text="@string/EPr_beastMode_reset"/>
-    
+            android:id="@+id/reset"
+            android:layout_width="fill_parent"
+            android:layout_height="50dip"
+            android:text="@string/EPr_beastMode_reset"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/billing_activity.xml b/astrid/res/layout/billing_activity.xml
index a7837a29e..319588745 100644
--- a/astrid/res/layout/billing_activity.xml
+++ b/astrid/res/layout/billing_activity.xml
@@ -1,95 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#aaa"
-    android:orientation="vertical" >
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:background="#aaa"
+              android:orientation="vertical">
 
     <LinearLayout
-        android:id="@+id/premium_description_holder"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingRight="5dip"
-        android:paddingTop="10dip" >
- 
+            android:id="@+id/premium_description_holder"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingRight="5dip"
+            android:paddingTop="10dip">
+
         <TextView
-            android:id="@+id/premium_description_title"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dip"
-            android:gravity="left"
-            android:text="@string/premium_description_header"
-            android:textColor="#404040"
-            android:paddingLeft="20dip"
-            android:textSize="20dip"
-            android:textStyle="bold" />
+                android:id="@+id/premium_description_title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="16dip"
+                android:gravity="left"
+                android:text="@string/premium_description_header"
+                android:textColor="#404040"
+                android:paddingLeft="20dip"
+                android:textSize="20dip"
+                android:textStyle="bold"/>
+
         <WebView
-            android:id="@+id/premium_bullets"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:textSize="20dip" />
+                android:id="@+id/premium_bullets"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:textSize="20dip"/>
     </LinearLayout>
-        
-    
+
+
     <include layout="@layout/astrid_speech_bubble"/>
-            
+
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:gravity="center_vertical"
-        android:background="@android:color/white">
-	    <LinearLayout
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="horizontal"
-	        android:gravity="center_vertical"
-	        android:background="@android:color/white">
-	
-	        <Button
-	            android:id="@+id/premium_buy_month"
-	            android:layout_width="fill_parent"
-	            android:layout_height="50dip"
-	            android:layout_marginLeft="8dip"
-	            android:layout_marginRight="8dip"
-	            android:layout_marginBottom="8dip"
-	            android:layout_marginTop="8dip"
-	            android:layout_weight="1"
-	            android:background="#707070"
-	            android:textColor="@android:color/white"
-	            android:textStyle="bold"
-	            android:textSize="24sp"
-	            android:text="@string/premium_buy_month"
-	            android:gravity="center"/>
-	
-	        <Button
-	            android:id="@+id/premium_buy_year"
-	            android:layout_width="fill_parent"
-	            android:layout_height="50dip"
-	            android:layout_marginLeft="8dip"
-	            android:layout_marginRight="8dip"
-	            android:layout_marginBottom="8dip"
-	            android:layout_marginTop="8dip"
-	            android:layout_weight="1"
-	            android:background="?attr/asThemeTextColor"
-	            android:textColor="@android:color/white"
-	            android:textSize="24sp"
-	            android:textStyle="bold"
-	            android:text="@string/premium_buy_year"
-	            android:gravity="center" />
-	
-	    </LinearLayout>
-	    
-	    <TextView 
-	        android:id="@+id/check_for_purchases"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_marginBottom="5dip"
-	        android:textColor="#404040"
-	        android:gravity="center"
-	        android:text="@string/premium_check_for_purchases"/>
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:gravity="center_vertical"
+            android:background="@android:color/white">
+
+        <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:background="@android:color/white">
+
+            <Button
+                    android:id="@+id/premium_buy_month"
+                    android:layout_width="fill_parent"
+                    android:layout_height="50dip"
+                    android:layout_marginLeft="8dip"
+                    android:layout_marginRight="8dip"
+                    android:layout_marginBottom="8dip"
+                    android:layout_marginTop="8dip"
+                    android:layout_weight="1"
+                    android:background="#707070"
+                    android:textColor="@android:color/white"
+                    android:textStyle="bold"
+                    android:textSize="24sp"
+                    android:text="@string/premium_buy_month"
+                    android:gravity="center"/>
+
+            <Button
+                    android:id="@+id/premium_buy_year"
+                    android:layout_width="fill_parent"
+                    android:layout_height="50dip"
+                    android:layout_marginLeft="8dip"
+                    android:layout_marginRight="8dip"
+                    android:layout_marginBottom="8dip"
+                    android:layout_marginTop="8dip"
+                    android:layout_weight="1"
+                    android:background="?attr/asThemeTextColor"
+                    android:textColor="@android:color/white"
+                    android:textSize="24sp"
+                    android:textStyle="bold"
+                    android:text="@string/premium_buy_year"
+                    android:gravity="center"/>
+
+        </LinearLayout>
+
+        <TextView
+                android:id="@+id/check_for_purchases"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dip"
+                android:textColor="#404040"
+                android:gravity="center"
+                android:text="@string/premium_check_for_purchases"/>
     </LinearLayout>
-    
+
 </LinearLayout>
diff --git a/astrid/res/layout/calendar.xml b/astrid/res/layout/calendar.xml
index b3d3a6d6a..f453e67a2 100644
--- a/astrid/res/layout/calendar.xml
+++ b/astrid/res/layout/calendar.xml
@@ -5,30 +5,35 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent">
 
-  <LinearLayout
-      android:orientation="horizontal"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent"
-      android:layout_weight="1">
-      <com.todoroo.astrid.ui.CalendarView
-            android:id="@+id/CalendarView"
+    <LinearLayout
+            android:orientation="horizontal"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            android:layout_weight="1" />
-  </LinearLayout>
-        
-  <LinearLayout
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_weight="7">
-    <Button android:layout_width="wrap_content"
-		android:layout_height="fill_parent" android:text="Cancel" android:id="@+id/CancelButton"
-		android:layout_weight="1" />
-  </LinearLayout>
+            android:layout_weight="1">
+
+        <com.todoroo.astrid.ui.CalendarView
+                android:id="@+id/CalendarView"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="7">
+
+        <Button
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:text="Cancel"
+                android:id="@+id/CancelButton"
+                android:layout_weight="1"/>
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/calendar_alarm_list_creator.xml b/astrid/res/layout/calendar_alarm_list_creator.xml
index fe5f33b6c..b0f966d53 100644
--- a/astrid/res/layout/calendar_alarm_list_creator.xml
+++ b/astrid/res/layout/calendar_alarm_list_creator.xml
@@ -5,10 +5,10 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" 
-    android:gravity="center">
-    
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:gravity="center">
+
     <include layout="@layout/astrid_calendar_list_creator_view"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/calendar_reminder_activity.xml b/astrid/res/layout/calendar_reminder_activity.xml
index 7c868f1a1..088b8f27e 100644
--- a/astrid/res/layout/calendar_reminder_activity.xml
+++ b/astrid/res/layout/calendar_reminder_activity.xml
@@ -5,10 +5,10 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" 
-    android:gravity="center">
-    
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:gravity="center">
+
     <include layout="@layout/astrid_calendar_reminder_view"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/contact_adapter_row.xml b/astrid/res/layout/contact_adapter_row.xml
index dfea78177..0f5800ac3 100644
--- a/astrid/res/layout/contact_adapter_row.xml
+++ b/astrid/res/layout/contact_adapter_row.xml
@@ -5,42 +5,45 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/asContentBackground"
-    android:padding="4dip"
-    android:paddingRight="6dip"
-    android:orientation="horizontal">
-        
+                xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:background="?attr/asContentBackground"
+                android:padding="4dip"
+                android:paddingRight="6dip"
+                android:orientation="horizontal">
+
     <!-- picture thumbnail -->
-    <com.todoroo.astrid.helper.AsyncImageView android:id="@+id/icon"
-        android:layout_width="40dip"
-        android:layout_height="44dip"
-        android:gravity="center"
-        android:scaleType="fitCenter"
-        astrid:defaultSrc="@drawable/icn_default_person_image" />
-        
+    <com.todoroo.astrid.helper.AsyncImageView
+            android:id="@+id/icon"
+            android:layout_width="40dip"
+            android:layout_height="44dip"
+            android:gravity="center"
+            android:scaleType="fitCenter"
+            astrid:defaultSrc="@drawable/icn_default_person_image"/>
+
     <!-- person name -->
-    <TextView android:id="@android:id/text1"
-        android:layout_width="fill_parent" 
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="55dip"
-        style="@android:attr/dropDownItemStyle"
-        android:textColor="?attr/asTextColor"
-        android:singleLine="true"
-        android:textSize="18sp"/>
-        
+    <TextView
+            android:id="@android:id/text1"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="55dip"
+            style="@android:attr/dropDownItemStyle"
+            android:textColor="?attr/asTextColor"
+            android:singleLine="true"
+            android:textSize="18sp"/>
+
     <!-- person email -->
-    <TextView android:id="@android:id/text2"
-        android:layout_width="fill_parent" 
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="55dip"
-        android:layout_below="@android:id/text1"
-        style="@android:attr/dropDownItemStyle"
-        android:textAppearance="@android:attr/textAppearance"
-        android:textColor="?attr/asTextColor"
-        android:singleLine="true"
-        android:textSize="14sp"/>
-        
+    <TextView
+            android:id="@android:id/text2"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="55dip"
+            android:layout_below="@android:id/text1"
+            style="@android:attr/dropDownItemStyle"
+            android:textAppearance="@android:attr/textAppearance"
+            android:textColor="?attr/asTextColor"
+            android:singleLine="true"
+            android:textSize="14sp"/>
+
 </RelativeLayout>
diff --git a/astrid/res/layout/contact_edit_row.xml b/astrid/res/layout/contact_edit_row.xml
index 24a33eae3..45c3737d7 100644
--- a/astrid/res/layout/contact_edit_row.xml
+++ b/astrid/res/layout/contact_edit_row.xml
@@ -15,51 +15,51 @@
      limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
+              xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
 
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
 
         <com.todoroo.astrid.helper.AsyncImageView
-            android:id="@+id/icon"
-            android:layout_width="31dip"
-            android:layout_height="35dip"
-            android:layout_margin="5dip"
-            astrid:defaultSrc="@drawable/icn_default_person_image"
-            android:gravity="center"
-            android:scaleType="fitCenter" />
+                android:id="@+id/icon"
+                android:layout_width="31dip"
+                android:layout_height="35dip"
+                android:layout_margin="5dip"
+                astrid:defaultSrc="@drawable/icn_default_person_image"
+                android:gravity="center"
+                android:scaleType="fitCenter"/>
 
         <com.todoroo.astrid.ui.ContactsAutoComplete
-            android:id="@+id/text1"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginLeft="5dip"
-            android:layout_weight="1"
-            android:background="#00000000"
-            android:hint="@string/actfm_person_hint"
-                    style="@style/TextAppearance"
-            android:textCursorDrawable="@null"
-            android:textSize="15sp" />
+                android:id="@+id/text1"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="5dip"
+                android:layout_weight="1"
+                android:background="#00000000"
+                android:hint="@string/actfm_person_hint"
+                style="@style/TextAppearance"
+                android:textCursorDrawable="@null"
+                android:textSize="15sp"/>
 
         <ImageButton
-            android:id="@+id/button1"
-            android:layout_width="32dip"
-            android:layout_height="32dip"
-            android:layout_gravity="center"
-            android:layout_margin="4dip"
-            android:background="@drawable/btn_dismiss" />
+                android:id="@+id/button1"
+                android:layout_width="32dip"
+                android:layout_height="32dip"
+                android:layout_gravity="center"
+                android:layout_margin="4dip"
+                android:background="@drawable/btn_dismiss"/>
     </LinearLayout>
 
     <View
-        android:id="@+id/divider"
-        style="@style/TEA_Separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1dip" />
+            android:id="@+id/divider"
+            style="@style/TEA_Separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1dip"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/control_dialog_ok.xml b/astrid/res/layout/control_dialog_ok.xml
index 9ce0a0e44..9ca4d5f6c 100644
--- a/astrid/res/layout/control_dialog_ok.xml
+++ b/astrid/res/layout/control_dialog_ok.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?> 
+<?xml version="1.0" encoding="utf-8"?>
 <!-- 
 ** Copyright (c) 2012 Todoroo Inc
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <Button xmlns:android="http://schemas.android.com/apk/res/android"
-	    android:id="@+id/edit_dlg_ok"
-	    android:layout_width="fill_parent"
-	    android:layout_height="45dip"
-	    android:layout_marginTop="5dip"
-	    android:layout_marginBottom="5dip"
-	    android:layout_gravity="center_horizontal"
-	    android:background="@null"
-	    android:textStyle="bold"
-	    android:textColor="@android:color/black"
-	    android:layout_alignParentBottom="true"
-	    android:text="@string/DLG_ok"/>
\ No newline at end of file
+        android:id="@+id/edit_dlg_ok"
+        android:layout_width="fill_parent"
+        android:layout_height="45dip"
+        android:layout_marginTop="5dip"
+        android:layout_marginBottom="5dip"
+        android:layout_gravity="center_horizontal"
+        android:background="@null"
+        android:textStyle="bold"
+        android:textColor="@android:color/black"
+        android:layout_alignParentBottom="true"
+        android:text="@string/DLG_ok"/>
\ No newline at end of file
diff --git a/astrid/res/layout/control_set_alarms.xml b/astrid/res/layout/control_set_alarms.xml
index 0ece52938..7f10240e9 100644
--- a/astrid/res/layout/control_set_alarms.xml
+++ b/astrid/res/layout/control_set_alarms.xml
@@ -5,43 +5,48 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-  
-    
-    <TextView android:id="@+id/alarms_label"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+
+
+    <TextView
+            android:id="@+id/alarms_label"
             android:layout_marginLeft="10dip"
             android:layout_marginTop="10dip"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/alarm_ACS_label"
-            style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
-  <LinearLayout android:id="@+id/alert_container"
-      android:paddingLeft="5dip"
-                android:orientation="vertical"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content">
-  </LinearLayout>
-  
-  <LinearLayout
-      android:id="@+id/alarms_add"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:gravity="center_vertical">
-	  <TextView
-	          android:text="+"
-	          android:gravity="center"
-	          android:textSize="26sp"
-	          android:textColor="?attr/asThemeTextColor"
-	          android:layout_width="40dip"
-	          android:layout_height="40dip"/>
-  	  <TextView
+            style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"/>
+
+    <LinearLayout
+            android:id="@+id/alert_container"
+            android:paddingLeft="5dip"
+            android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+    </LinearLayout>
+
+    <LinearLayout
+            android:id="@+id/alarms_add"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="@string/alarm_ACS_button"
-            style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
-  </LinearLayout>
+            android:gravity="center_vertical">
+
+        <TextView
+                android:text="+"
+                android:gravity="center"
+                android:textSize="26sp"
+                android:textColor="?attr/asThemeTextColor"
+                android:layout_width="40dip"
+                android:layout_height="40dip"/>
+
+        <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/alarm_ACS_button"
+                style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"/>
+    </LinearLayout>
 </LinearLayout>
 
diff --git a/astrid/res/layout/control_set_assigned.xml b/astrid/res/layout/control_set_assigned.xml
index 130c8dc50..ab7f8595d 100644
--- a/astrid/res/layout/control_set_assigned.xml
+++ b/astrid/res/layout/control_set_assigned.xml
@@ -5,54 +5,57 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-  
-    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:padding="5dip"
-        android:layout_marginBottom="5dip">
-  		<com.todoroo.astrid.ui.ContactsAutoComplete
-          android:id="@+id/assigned_custom"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="2dip"
-          android:layout_marginLeft="5dip"
-          android:paddingLeft="5dip"
-          android:layout_weight="1"
-          android:background="?attr/asEditTextBackground"
-          android:textColor="?attr/asTextColor"
-          android:inputType="textEmailAddress"
-          android:hint="@string/actfm_person_hint" />
+        android:layout_height="fill_parent">
+
+    <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:padding="5dip"
+            android:layout_marginBottom="5dip">
+
+        <com.todoroo.astrid.ui.ContactsAutoComplete
+                android:id="@+id/assigned_custom"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="2dip"
+                android:layout_marginLeft="5dip"
+                android:paddingLeft="5dip"
+                android:layout_weight="1"
+                android:background="?attr/asEditTextBackground"
+                android:textColor="?attr/asTextColor"
+                android:inputType="textEmailAddress"
+                android:hint="@string/actfm_person_hint"/>
+
         <ImageButton
-          android:id="@+id/assigned_clear"
-		  android:background="@drawable/btn_dismiss"
-          android:layout_width="32dip"
-          android:layout_height="32dip"
-          android:layout_gravity="center"
-          android:layout_marginLeft="2dip"
-          android:gravity="center_vertical" />
+                android:id="@+id/assigned_clear"
+                android:background="@drawable/btn_dismiss"
+                android:layout_width="32dip"
+                android:layout_height="32dip"
+                android:layout_gravity="center"
+                android:layout_marginLeft="2dip"
+                android:gravity="center_vertical"/>
+
         <Button
-          android:id="@+id/edit_dlg_ok"
-		  android:background="@drawable/btn_add"
-          android:layout_width="32dip"
-          android:layout_height="32dip"
-          android:layout_gravity="center"
-          android:layout_marginLeft="2dip"
-          android:layout_marginRight="3dip"
-          android:gravity="center_vertical" />
+                android:id="@+id/edit_dlg_ok"
+                android:background="@drawable/btn_add"
+                android:layout_width="32dip"
+                android:layout_height="32dip"
+                android:layout_gravity="center"
+                android:layout_marginLeft="2dip"
+                android:layout_marginRight="3dip"
+                android:gravity="center_vertical"/>
     </LinearLayout>
-    
-	<com.todoroo.astrid.ui.ErrorCatchingListView
-	    android:id="@+id/assigned_list"
-	    android:layout_width="fill_parent"
-	    android:layout_height="fill_parent"
-	    android:layout_marginLeft="3dip"
-	    android:layout_marginRight="3dip"
-	    android:layout_marginBottom="3dip"
-	    android:layout_weight="100"/>
-    
+
+    <com.todoroo.astrid.ui.ErrorCatchingListView
+            android:id="@+id/assigned_list"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginLeft="3dip"
+            android:layout_marginRight="3dip"
+            android:layout_marginBottom="3dip"
+            android:layout_weight="100"/>
+
 </LinearLayout>
diff --git a/astrid/res/layout/control_set_collaborators.xml b/astrid/res/layout/control_set_collaborators.xml
index 6c57ee762..37990a60e 100644
--- a/astrid/res/layout/control_set_collaborators.xml
+++ b/astrid/res/layout/control_set_collaborators.xml
@@ -5,117 +5,130 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent"
-  android:orientation="vertical"
-  android:paddingLeft="5dip"
-  android:paddingRight="5dip">
-	<ScrollView
-	  android:layout_width="fill_parent"
-	  android:layout_height="fill_parent"
-	  android:layout_weight="100">
-		<LinearLayout
-		  android:orientation="vertical"
-		  android:layout_width="fill_parent"
-		  android:layout_height="fill_parent"
-		  android:layout_marginLeft="10dip">
-		      
-		      <!-- Shared with -->    
-		      <TextView
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
-		        android:paddingTop="5dip"
-		        android:paddingBottom="5dip"
-		        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
-		        android:text="@string/actfm_EPA_share_with" />
-		      <com.todoroo.astrid.ui.PeopleContainer
-		        android:id="@+id/share_container"
-		        android:orientation="vertical"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content" />
-		      <LinearLayout
-		        android:id="@+id/share_additional"
-		        android:orientation="vertical"
-		        android:padding="5dip"
-		        android:visibility="gone"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content">
-		        <View
-		          android:layout_width="fill_parent"
-		          android:layout_height="1px"
-		          android:background="@android:drawable/divider_horizontal_dark" />
-		        <TextView
-		          android:layout_width="fill_parent"
-		          android:layout_height="wrap_content"
-		          android:paddingTop="5dip"
-		          android:paddingBottom="5dip"
-		          android:text="@string/actfm_EPA_message_text" />
-		        <EditText
-		          android:id="@+id/message"
-		          android:layout_width="fill_parent"
-		          android:layout_height="wrap_content"
-		          android:scrollbars="vertical"
-		          android:text="@string/actfm_EPA_message_body"
-		          android:autoText="true"
-		          android:capitalize="sentences"
-		          android:singleLine="false" />
-		        <!-- <TextView
-		          android:id="@+id/tag_label"
-		          android:layout_width="fill_parent"
-		          android:layout_height="wrap_content"
-		          android:paddingBottom="5dip"
-		          android:visibility="gone"
-		          android:text="@string/actfm_EPA_tag_label" />
-		        <EditText
-		          android:id="@+id/tag_name"
-		          android:layout_width="fill_parent"
-		          android:layout_height="wrap_content"
-		          android:visibility="gone"
-		          android:hint="@string/actfm_EPA_tag_hint" /> -->
-		        <View
-		          android:layout_width="fill_parent"
-		          android:layout_height="1px"
-		          android:background="@android:drawable/divider_horizontal_dark" />
-		      </LinearLayout>
-		      <LinearLayout
-		        android:id="@+id/collaborators"
-		        android:orientation="vertical"
-		        android:padding="5dip"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content" />
-		      <CheckBox
-		        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" 
-		        android:id="@+id/checkbox_facebook"
-		        android:text="@string/actfm_EPA_facebook"
-		        android:paddingLeft="45dip"
-		        android:visibility="gone"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content" />
-		      <CheckBox
-		        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" 
-		        android:id="@+id/checkbox_twitter"
-		        android:text="@string/actfm_EPA_twitter"
-		        android:paddingLeft="45dip"
-		        android:visibility="gone"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content" />
-		      <View
-		        android:layout_width="fill_parent"
-		        android:layout_height="1px"
-		        android:layout_margin="15dip"
-		        android:visibility="gone"
-		        android:background="@android:drawable/divider_horizontal_dark" />
-		      <TextView
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
-		        android:paddingTop="15dip"
-		        android:text="@string/actfm_EPA_intro"
-		        android:gravity="center"
-		        android:visibility="gone"
-		        android:textColor="#ee9900" />
-		    
-		</LinearLayout>
-	</ScrollView>
-	<include layout="@layout/control_dialog_ok"/>
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        android:paddingLeft="5dip"
+        android:paddingRight="5dip">
+
+    <ScrollView
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="100">
+
+        <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_marginLeft="10dip">
+
+            <!-- Shared with -->
+            <TextView
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="5dip"
+                    android:paddingBottom="5dip"
+                    style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
+                    android:text="@string/actfm_EPA_share_with"/>
+
+            <com.todoroo.astrid.ui.PeopleContainer
+                    android:id="@+id/share_container"
+                    android:orientation="vertical"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"/>
+
+            <LinearLayout
+                    android:id="@+id/share_additional"
+                    android:orientation="vertical"
+                    android:padding="5dip"
+                    android:visibility="gone"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content">
+
+                <View
+                        android:layout_width="fill_parent"
+                        android:layout_height="1px"
+                        android:background="@android:drawable/divider_horizontal_dark"/>
+
+                <TextView
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="5dip"
+                        android:paddingBottom="5dip"
+                        android:text="@string/actfm_EPA_message_text"/>
+
+                <EditText
+                        android:id="@+id/message"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:scrollbars="vertical"
+                        android:text="@string/actfm_EPA_message_body"
+                        android:autoText="true"
+                        android:capitalize="sentences"
+                        android:singleLine="false"/>
+                <!-- <TextView
+                  android:id="@+id/tag_label"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:paddingBottom="5dip"
+                  android:visibility="gone"
+                  android:text="@string/actfm_EPA_tag_label" />
+                <EditText
+                  android:id="@+id/tag_name"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:visibility="gone"
+                  android:hint="@string/actfm_EPA_tag_hint" /> -->
+                <View
+                        android:layout_width="fill_parent"
+                        android:layout_height="1px"
+                        android:background="@android:drawable/divider_horizontal_dark"/>
+            </LinearLayout>
+
+            <LinearLayout
+                    android:id="@+id/collaborators"
+                    android:orientation="vertical"
+                    android:padding="5dip"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"/>
+
+            <CheckBox
+                    style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
+                    android:id="@+id/checkbox_facebook"
+                    android:text="@string/actfm_EPA_facebook"
+                    android:paddingLeft="45dip"
+                    android:visibility="gone"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"/>
+
+            <CheckBox
+                    style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
+                    android:id="@+id/checkbox_twitter"
+                    android:text="@string/actfm_EPA_twitter"
+                    android:paddingLeft="45dip"
+                    android:visibility="gone"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"/>
+
+            <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="1px"
+                    android:layout_margin="15dip"
+                    android:visibility="gone"
+                    android:background="@android:drawable/divider_horizontal_dark"/>
+
+            <TextView
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="15dip"
+                    android:text="@string/actfm_EPA_intro"
+                    android:gravity="center"
+                    android:visibility="gone"
+                    android:textColor="#ee9900"/>
+
+        </LinearLayout>
+    </ScrollView>
+
+    <include layout="@layout/control_dialog_ok"/>
 </LinearLayout>
diff --git a/astrid/res/layout/control_set_deadline.xml b/astrid/res/layout/control_set_deadline.xml
index 7c52e2ad4..b45245bed 100644
--- a/astrid/res/layout/control_set_deadline.xml
+++ b/astrid/res/layout/control_set_deadline.xml
@@ -5,9 +5,8 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <com.todoroo.astrid.ui.DateAndTimePicker
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-  android:id="@+id/date_and_time"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent"
-  android:orientation="vertical"/>
\ No newline at end of file
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/date_and_time"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"/>
\ No newline at end of file
diff --git a/astrid/res/layout/control_set_deadline_display.xml b/astrid/res/layout/control_set_deadline_display.xml
index 3bf857cde..b84bebad5 100644
--- a/astrid/res/layout/control_set_deadline_display.xml
+++ b/astrid/res/layout/control_set_deadline_display.xml
@@ -5,36 +5,41 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="wrap_content">
-      <LinearLayout
-        android:id="@+id/display_row_body"
-        android:orientation="horizontal"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="50dip"
-        android:paddingLeft="10dip"
-        android:paddingRight="10dip"
-        android:gravity="center_vertical">
-        <ImageView android:id="@+id/display_row_icon"
-             android:layout_marginRight="10dip"
-             android:layout_width="20dip"
-             android:layout_height="20dip"/>
-	     <TextView
-	         android:id="@+id/display_row_edit"
-		     android:layout_width="fill_parent"
-	         android:layout_height="wrap_content"
-		     android:layout_weight="1"
-	         android:gravity="left"
-		     style="@style/TextAppearance.EditRowDisplay" />
-      </LinearLayout>
-      <View
-	      android:id="@+id/TEA_Separator"
-	      android:layout_width="fill_parent"
-	      android:layout_height="1px"
-	      style="@style/TEA_Separator" />
+        android:layout_height="wrap_content">
+
+    <LinearLayout
+            android:id="@+id/display_row_body"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="50dip"
+            android:paddingLeft="10dip"
+            android:paddingRight="10dip"
+            android:gravity="center_vertical">
+
+        <ImageView
+                android:id="@+id/display_row_icon"
+                android:layout_marginRight="10dip"
+                android:layout_width="20dip"
+                android:layout_height="20dip"/>
+
+        <TextView
+                android:id="@+id/display_row_edit"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="left"
+                style="@style/TextAppearance.EditRowDisplay"/>
+    </LinearLayout>
+
+    <View
+            android:id="@+id/TEA_Separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            style="@style/TEA_Separator"/>
+
 
-    
 </LinearLayout>
diff --git a/astrid/res/layout/control_set_default_display.xml b/astrid/res/layout/control_set_default_display.xml
index 8cd855ed9..c6f1928bf 100644
--- a/astrid/res/layout/control_set_default_display.xml
+++ b/astrid/res/layout/control_set_default_display.xml
@@ -5,37 +5,41 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="wrap_content">
-      <LinearLayout
-        android:id="@+id/display_row_body"
-        android:orientation="horizontal"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
         android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:paddingLeft="10dip"
-        android:paddingRight="10dip"
-        android:gravity="center_vertical">
-        
-         <ImageView android:id="@+id/display_row_icon"
-             android:layout_marginRight="10dip"
-             android:layout_width="20dip"
-             android:layout_height="20dip"
-             android:scaleType="fitCenter"/>
-	     <TextView
-	         android:id="@+id/display_row_edit"
-		     android:layout_width="fill_parent"
-	         android:layout_height="wrap_content"
-		     android:layout_weight="1"
-	         android:gravity="left"
-		     style="@style/TextAppearance.EditRowDisplay" />
-      </LinearLayout>
-      <View
-	      android:id="@+id/TEA_Separator"
-	      android:layout_width="fill_parent"
-	      android:layout_height="1px"
-	      style="@style/TEA_Separator" />
+        android:layout_height="wrap_content">
+
+    <LinearLayout
+            android:id="@+id/display_row_body"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="50dip"
+            android:paddingLeft="10dip"
+            android:paddingRight="10dip"
+            android:gravity="center_vertical">
+
+        <ImageView
+                android:id="@+id/display_row_icon"
+                android:layout_marginRight="10dip"
+                android:layout_width="20dip"
+                android:layout_height="20dip"
+                android:scaleType="fitCenter"/>
+
+        <TextView
+                android:id="@+id/display_row_edit"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="left"
+                style="@style/TextAppearance.EditRowDisplay"/>
+    </LinearLayout>
+
+    <View
+            android:id="@+id/TEA_Separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            style="@style/TEA_Separator"/>
+
 
-    
 </LinearLayout>
diff --git a/astrid/res/layout/control_set_files.xml b/astrid/res/layout/control_set_files.xml
index 02566f6b3..950c1afb6 100644
--- a/astrid/res/layout/control_set_files.xml
+++ b/astrid/res/layout/control_set_files.xml
@@ -5,22 +5,24 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-  
-  <!-- notes -->
-  <ScrollView
-      android:layout_width="fill_parent"
-   	  android:layout_height="wrap_content"
-      android:layout_weight="100">
-	  <LinearLayout
-	    android:id="@+id/files_list"
-	    android:orientation="vertical"
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content">
-	  </LinearLayout>
-  </ScrollView>
-  <include layout="@layout/control_dialog_ok"/>
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+
+    <!-- notes -->
+    <ScrollView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="100">
+
+        <LinearLayout
+                android:id="@+id/files_list"
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+        </LinearLayout>
+    </ScrollView>
+
+    <include layout="@layout/control_dialog_ok"/>
 </LinearLayout>
diff --git a/astrid/res/layout/control_set_files_display.xml b/astrid/res/layout/control_set_files_display.xml
index 8b1509771..6606d1247 100644
--- a/astrid/res/layout/control_set_files_display.xml
+++ b/astrid/res/layout/control_set_files_display.xml
@@ -5,37 +5,42 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="wrap_content">
-      <LinearLayout
-        android:id="@+id/display_row_body"
-        android:orientation="horizontal"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="50dip"
-        android:paddingLeft="10dip"
-        android:paddingRight="10dip"
-        android:gravity="center_vertical">
-         <ImageView android:id="@+id/display_row_icon"
-            android:layout_marginRight="10dip"
-            android:layout_width="20dip"
-            android:layout_height="20dip"
-            android:scaleType="fitCenter"/>
-	     <LinearLayout
-	         android:id="@+id/files_list"
-		     android:layout_width="fill_parent"
-	         android:layout_height="wrap_content"
-		     android:layout_weight="1"
-	         android:gravity="left"
-	         android:orientation="vertical"/>
-      </LinearLayout>
-      <View
-	      android:id="@+id/TEA_Separator"
-	      android:layout_width="fill_parent"
-	      android:layout_height="1px"
-	      style="@style/TEA_Separator" />
+        android:layout_height="wrap_content">
+
+    <LinearLayout
+            android:id="@+id/display_row_body"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="50dip"
+            android:paddingLeft="10dip"
+            android:paddingRight="10dip"
+            android:gravity="center_vertical">
+
+        <ImageView
+                android:id="@+id/display_row_icon"
+                android:layout_marginRight="10dip"
+                android:layout_width="20dip"
+                android:layout_height="20dip"
+                android:scaleType="fitCenter"/>
+
+        <LinearLayout
+                android:id="@+id/files_list"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="left"
+                android:orientation="vertical"/>
+    </LinearLayout>
+
+    <View
+            android:id="@+id/TEA_Separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            style="@style/TEA_Separator"/>
+
 
-    
 </LinearLayout>
diff --git a/astrid/res/layout/control_set_gcal.xml b/astrid/res/layout/control_set_gcal.xml
index cc8268a80..b8b1a31a1 100644
--- a/astrid/res/layout/control_set_gcal.xml
+++ b/astrid/res/layout/control_set_gcal.xml
@@ -5,29 +5,29 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="0dip"
-  android:layout_height="0dip">
-    
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="0dip"
+        android:layout_height="0dip">
+
     <!-- calendar integration -->
     <LinearLayout
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content">
-        
-      <com.todoroo.astrid.ui.ErrorCatchingSpinner
-        android:id="@+id/calendars"
-        android:layout_width="0dip"
-        android:layout_height="0dip"/>
-        
-      <Button
-        android:id="@+id/view_calendar_event"
-        android:layout_width="0dip"
-        android:layout_height="0dip"
-        android:text="@string/gcal_TEA_showCalendar_label"/>
+            android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content">
+
+        <com.todoroo.astrid.ui.ErrorCatchingSpinner
+                android:id="@+id/calendars"
+                android:layout_width="0dip"
+                android:layout_height="0dip"/>
+
+        <Button
+                android:id="@+id/view_calendar_event"
+                android:layout_width="0dip"
+                android:layout_height="0dip"
+                android:text="@string/gcal_TEA_showCalendar_label"/>
 
     </LinearLayout>
-  
+
 </LinearLayout>
 
diff --git a/astrid/res/layout/control_set_gcal_display.xml b/astrid/res/layout/control_set_gcal_display.xml
index 49607c4d7..4152ee28d 100644
--- a/astrid/res/layout/control_set_gcal_display.xml
+++ b/astrid/res/layout/control_set_gcal_display.xml
@@ -5,37 +5,41 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-  
-  <LinearLayout
-      android:id="@+id/gcal_body"
-      android:layout_width="fill_parent"
-      android:layout_height="50dip"
-      android:paddingLeft="5dip"
-      android:gravity="center_vertical">
-      <ImageView android:id="@+id/display_row_icon"
-             android:layout_marginRight="10dip"
-             android:layout_width="20dip"
-             android:layout_height="20dip"
-             android:scaleType="fitCenter"/>
-	  <TextView
-	      android:id="@+id/calendar_display_which"
-	      android:layout_width="fill_parent"
-	      android:layout_height="wrap_content"
-	      android:layout_weight="1"
-	      android:gravity="left"
-	      android:maxLines="1"
-	      android:ellipsize="end"
-	      style="@style/TextAppearance.EditRowDisplay" />
-  </LinearLayout>
-  <View
-      android:layout_width="fill_parent"
-      android:layout_height="1px"
-      android:padding="5dip"
-      style="@style/TEA_Separator" />
-    
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+
+    <LinearLayout
+            android:id="@+id/gcal_body"
+            android:layout_width="fill_parent"
+            android:layout_height="50dip"
+            android:paddingLeft="5dip"
+            android:gravity="center_vertical">
+
+        <ImageView
+                android:id="@+id/display_row_icon"
+                android:layout_marginRight="10dip"
+                android:layout_width="20dip"
+                android:layout_height="20dip"
+                android:scaleType="fitCenter"/>
+
+        <TextView
+                android:id="@+id/calendar_display_which"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="left"
+                android:maxLines="1"
+                android:ellipsize="end"
+                style="@style/TextAppearance.EditRowDisplay"/>
+    </LinearLayout>
+
+    <View
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:padding="5dip"
+            style="@style/TEA_Separator"/>
+
 </LinearLayout>
 
diff --git a/astrid/res/layout/control_set_hide.xml b/astrid/res/layout/control_set_hide.xml
index 8e04d08f7..db8cc8a57 100644
--- a/astrid/res/layout/control_set_hide.xml
+++ b/astrid/res/layout/control_set_hide.xml
@@ -5,12 +5,13 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="0dip"
-  android:layout_height="0dip">
-  <com.todoroo.astrid.ui.ErrorCatchingSpinner
-    android:id="@+id/hideUntil"
-    android:layout_width="0dip"
-    android:layout_height="0dip" />
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="0dip"
+        android:layout_height="0dip">
+
+    <com.todoroo.astrid.ui.ErrorCatchingSpinner
+            android:id="@+id/hideUntil"
+            android:layout_width="0dip"
+            android:layout_height="0dip"/>
 </LinearLayout>
diff --git a/astrid/res/layout/control_set_importance.xml b/astrid/res/layout/control_set_importance.xml
index 58e6881d7..e09fd89aa 100644
--- a/astrid/res/layout/control_set_importance.xml
+++ b/astrid/res/layout/control_set_importance.xml
@@ -5,41 +5,44 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-  
-      <LinearLayout
-        android:id="@+id/importance_container"
-        android:orientation="horizontal"
-        android:paddingTop="5dip"
-        android:paddingBottom="5dip"
-        android:gravity="center_vertical"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
         android:layout_width="fill_parent"
-        android:paddingLeft="10dip"
-        android:paddingRight="10dip"
-        android:layout_height="50dip">
-	      <ImageView android:id="@+id/display_row_icon"
-	         android:layout_marginRight="10dip"
-             android:layout_width="20dip"
-             android:layout_height="20dip"
-             android:scaleType="fitCenter"
-             android:src="@drawable/tea_icn_priority_gray"/>
-	      <TextView
-	         android:id="@+id/display_row_edit"
-		     android:layout_width="wrap_content"
-	         android:layout_height="wrap_content"
-	         android:gravity="left"
-	         android:text="@string/TEA_importance_label"
-		     style="@style/TextAppearance.EditRowDisplay" 
-		     android:textColor="@color/task_edit_deadline_gray"/>
-      </LinearLayout>
-      
-      <View
-	      android:id="@+id/TEA_Separator"
-	      android:layout_width="fill_parent"
-	      android:layout_height="1px"
-	      style="@style/TEA_Separator" />
-    
+        android:layout_height="fill_parent">
+
+    <LinearLayout
+            android:id="@+id/importance_container"
+            android:orientation="horizontal"
+            android:paddingTop="5dip"
+            android:paddingBottom="5dip"
+            android:gravity="center_vertical"
+            android:layout_width="fill_parent"
+            android:paddingLeft="10dip"
+            android:paddingRight="10dip"
+            android:layout_height="50dip">
+
+        <ImageView
+                android:id="@+id/display_row_icon"
+                android:layout_marginRight="10dip"
+                android:layout_width="20dip"
+                android:layout_height="20dip"
+                android:scaleType="fitCenter"
+                android:src="@drawable/tea_icn_priority_gray"/>
+
+        <TextView
+                android:id="@+id/display_row_edit"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="left"
+                android:text="@string/TEA_importance_label"
+                style="@style/TextAppearance.EditRowDisplay"
+                android:textColor="@color/task_edit_deadline_gray"/>
+    </LinearLayout>
+
+    <View
+            android:id="@+id/TEA_Separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            style="@style/TEA_Separator"/>
+
 </LinearLayout>
diff --git a/astrid/res/layout/control_set_notes.xml b/astrid/res/layout/control_set_notes.xml
index 17312d9d9..9a3972389 100644
--- a/astrid/res/layout/control_set_notes.xml
+++ b/astrid/res/layout/control_set_notes.xml
@@ -5,55 +5,58 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent"
-  android:paddingLeft="5dip"
-  android:paddingRight="5dip">
-  
-  <!-- notes -->
-  <ScrollView
-      android:layout_width="fill_parent"
-   	  android:layout_height="wrap_content"
-      android:layout_weight="100">
-	  <LinearLayout
-	    android:orientation="horizontal"
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content"
-	    android:gravity="center_vertical">
-	    <!-- Voice Add Note Button -->
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:paddingLeft="5dip"
+        android:paddingRight="5dip">
 
-	    <ImageButton
-	        android:id="@+id/voiceAddNoteButton"
-	        android:layout_width="39dip"
-	        android:layout_height="39dip"
-	        android:paddingLeft="10dip"
-            android:paddingRight="10dip"
-	        android:background="@android:color/transparent"
-	        android:scaleType="center"
-	        android:src="?attr/asMicButtonImg"
-	        android:layout_gravity="top"
-	        android:visibility="gone" />
-        <EditText
-	      android:id="@+id/notes"
-	      android:layout_width="wrap_content"
-	      android:layout_height="wrap_content"
-	      android:minHeight="100dip"
-	      android:layout_marginLeft="9dip"
-	      android:layout_marginRight="9dip"
-	      android:layout_marginTop="5dip"
-	      android:layout_weight="100"
-	      android:scrollbars="vertical"
-	      android:gravity="top"
-	      android:background="@null"
-	      android:hint="@string/TEA_notes_hint"
-	      android:autoText="true"
-	      android:capitalize="sentences"
-	      android:singleLine="false"
-	      android:textColor="?attr/asTextColor"
-	      android:freezesText="true" />
-	  </LinearLayout>
-  </ScrollView>
-  <include layout="@layout/control_dialog_ok"/>
+    <!-- notes -->
+    <ScrollView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="100">
+
+        <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical">
+            <!-- Voice Add Note Button -->
+
+            <ImageButton
+                    android:id="@+id/voiceAddNoteButton"
+                    android:layout_width="39dip"
+                    android:layout_height="39dip"
+                    android:paddingLeft="10dip"
+                    android:paddingRight="10dip"
+                    android:background="@android:color/transparent"
+                    android:scaleType="center"
+                    android:src="?attr/asMicButtonImg"
+                    android:layout_gravity="top"
+                    android:visibility="gone"/>
+
+            <EditText
+                    android:id="@+id/notes"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:minHeight="100dip"
+                    android:layout_marginLeft="9dip"
+                    android:layout_marginRight="9dip"
+                    android:layout_marginTop="5dip"
+                    android:layout_weight="100"
+                    android:scrollbars="vertical"
+                    android:gravity="top"
+                    android:background="@null"
+                    android:hint="@string/TEA_notes_hint"
+                    android:autoText="true"
+                    android:capitalize="sentences"
+                    android:singleLine="false"
+                    android:textColor="?attr/asTextColor"
+                    android:freezesText="true"/>
+        </LinearLayout>
+    </ScrollView>
+
+    <include layout="@layout/control_dialog_ok"/>
 </LinearLayout>
diff --git a/astrid/res/layout/control_set_notes_display.xml b/astrid/res/layout/control_set_notes_display.xml
index dad69b664..dbc4cd65c 100644
--- a/astrid/res/layout/control_set_notes_display.xml
+++ b/astrid/res/layout/control_set_notes_display.xml
@@ -5,40 +5,43 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical">
 
     <!-- tags -->
 
     <LinearLayout
-        android:id="@+id/notes_body"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:gravity="center_vertical"
-        android:minHeight="50dip"
-        android:orientation="horizontal"
-        android:paddingLeft="10dip"
-        android:paddingRight="10dip" >
-        <ImageView android:id="@+id/display_row_icon"
-            android:layout_marginRight="10dip"
-            android:layout_width="20dip"
-            android:layout_height="20dip"
-            android:scaleType="fitCenter"/>
-        <TextView
-            android:id="@+id/display_row_edit"
-            style="@style/TextAppearance.EditRowDisplay"
+            android:id="@+id/notes_body"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="10dip"
-            android:paddingBottom="10dip"
-            android:gravity="left" />
+            android:layout_height="fill_parent"
+            android:gravity="center_vertical"
+            android:minHeight="50dip"
+            android:orientation="horizontal"
+            android:paddingLeft="10dip"
+            android:paddingRight="10dip">
+
+        <ImageView
+                android:id="@+id/display_row_icon"
+                android:layout_marginRight="10dip"
+                android:layout_width="20dip"
+                android:layout_height="20dip"
+                android:scaleType="fitCenter"/>
+
+        <TextView
+                android:id="@+id/display_row_edit"
+                style="@style/TextAppearance.EditRowDisplay"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="10dip"
+                android:paddingBottom="10dip"
+                android:gravity="left"/>
     </LinearLayout>
 
     <View
-        android:id="@+id/TEA_Separator"
-        style="@style/TEA_Separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1px" />
+            android:id="@+id/TEA_Separator"
+            style="@style/TEA_Separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1px"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/control_set_opencrx.xml b/astrid/res/layout/control_set_opencrx.xml
index 021d65545..c3e1b6f9b 100644
--- a/astrid/res/layout/control_set_opencrx.xml
+++ b/astrid/res/layout/control_set_opencrx.xml
@@ -4,65 +4,66 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<LinearLayout 
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
-    
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical">
+
     <!-- opencrx task assignment controlset -->
     <LinearLayout
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:layout_weight="100">
-        
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/opencrx_TEA_creator_assign_label"
-        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
-      
-      <AutoCompleteTextView
-        android:id="@+id/opencrx_TEA_creator_textinput"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/opencrx_creator_input_hint" 
-      />
-        
-      <Spinner
-        android:id="@+id/opencrx_TEA_dashboard_assign"
-        android:prompt="@string/opencrx_TEA_creator_assign_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />      
-          
-      <TextView
-        android:id="@+id/opencrx_TEA_task_assign_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/opencrx_TEA_task_assign_label"
-        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
-        
-      <AutoCompleteTextView
-        android:id="@+id/opencrx_TEA_contact_textinput"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/opencrx_contact_input_hint" 
-      />
-      
-      <Spinner
-        android:id="@+id/opencrx_TEA_task_assign"
-        android:prompt="@string/opencrx_TEA_task_assign_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />      
+            android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="100">
+
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/opencrx_TEA_creator_assign_label"
+                style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"/>
+
+        <AutoCompleteTextView
+                android:id="@+id/opencrx_TEA_creator_textinput"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/opencrx_creator_input_hint"
+                />
+
+        <Spinner
+                android:id="@+id/opencrx_TEA_dashboard_assign"
+                android:prompt="@string/opencrx_TEA_creator_assign_label"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"/>
+
+        <TextView
+                android:id="@+id/opencrx_TEA_task_assign_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/opencrx_TEA_task_assign_label"
+                style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"/>
+
+        <AutoCompleteTextView
+                android:id="@+id/opencrx_TEA_contact_textinput"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/opencrx_contact_input_hint"
+                />
+
+        <Spinner
+                android:id="@+id/opencrx_TEA_task_assign"
+                android:prompt="@string/opencrx_TEA_task_assign_label"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"/>
     </LinearLayout>
 
     <View
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:padding="5dip"
-        android:background="@android:drawable/divider_horizontal_dark" />
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:padding="5dip"
+            android:background="@android:drawable/divider_horizontal_dark"/>
+
     <include layout="@layout/control_dialog_ok"/>
-  
+
 </LinearLayout>
 
diff --git a/astrid/res/layout/control_set_opencrx_display.xml b/astrid/res/layout/control_set_opencrx_display.xml
index 01167ccdc..edee4fde5 100644
--- a/astrid/res/layout/control_set_opencrx_display.xml
+++ b/astrid/res/layout/control_set_opencrx_display.xml
@@ -5,30 +5,32 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-  
-  <!-- tags -->
-  <LinearLayout
-      android:id="@+id/opencrx_body"
-      android:layout_width="fill_parent"
-      android:layout_height="50dip"
-        android:paddingLeft="10dip"
-        android:paddingRight="10dip"
-      android:gravity="center_vertical">
-	  <TextView
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-	    android:layout_marginRight="15dip"
-	    android:text="@string/opencrx_TEA_opencrx_title"
-	    style="@style/TextAppearance.GEN_EditLabel" />
-  </LinearLayout>
-  <View
-	  android:id="@+id/TEA_Separator"
-      android:layout_width="fill_parent"
-      android:layout_height="1px"
-      style="@style/TEA_Separator" />
-    
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+
+    <!-- tags -->
+    <LinearLayout
+            android:id="@+id/opencrx_body"
+            android:layout_width="fill_parent"
+            android:layout_height="50dip"
+            android:paddingLeft="10dip"
+            android:paddingRight="10dip"
+            android:gravity="center_vertical">
+
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="15dip"
+                android:text="@string/opencrx_TEA_opencrx_title"
+                style="@style/TextAppearance.GEN_EditLabel"/>
+    </LinearLayout>
+
+    <View
+            android:id="@+id/TEA_Separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            style="@style/TEA_Separator"/>
+
 </LinearLayout>
diff --git a/astrid/res/layout/control_set_reminders.xml b/astrid/res/layout/control_set_reminders.xml
index 364bd8550..90e71f4a9 100644
--- a/astrid/res/layout/control_set_reminders.xml
+++ b/astrid/res/layout/control_set_reminders.xml
@@ -5,99 +5,113 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent"
-  android:orientation="vertical"
-  android:paddingLeft="5dip"
-  android:paddingRight="5dip">
-	<ScrollView
-	  android:layout_width="fill_parent"
-	  android:layout_height="fill_parent"
-	  android:layout_weight="100"
-	  android:minWidth="320dip">
-		<LinearLayout
-		  android:id="@+id/reminders_body"
-		  android:orientation="vertical"
-		  android:layout_width="fill_parent"
-		  android:layout_height="fill_parent">
-		  
-		  <!-- reminders -->
-		      <TextView
-		        android:layout_width="wrap_content"
-		        android:layout_height="wrap_content"
-		        android:paddingLeft="10dip"
-		        android:text="@string/TEA_reminder_label"
-		        android:paddingTop="10dip"
-		        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
-		      <CheckBox
-		        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" 
-		        android:id="@+id/reminder_due"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
-		        android:layout_marginLeft="10dip"   
-		        android:text="@string/TEA_reminder_due" />
-		      <CheckBox
-		        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" 
-		        android:id="@+id/reminder_overdue"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
-		        android:layout_marginLeft="10dip"   
-		        android:text="@string/TEA_reminder_overdue" />
-		      <LinearLayout
-		        android:orientation="horizontal"
-		        android:layout_width="fill_parent"
-		        android:layout_height="fill_parent">
-		        <CheckBox
-		          style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"   
-		          android:id="@+id/reminder_random"
-		          android:layout_width="wrap_content"
-		          android:layout_height="wrap_content"
-		          android:layout_marginLeft="10dip"   
-		          android:text="@string/TEA_reminder_randomly" />
-		        <com.todoroo.astrid.ui.ErrorCatchingSpinner
-		          android:id="@+id/reminder_random_interval"
-		          android:layout_width="fill_parent"
-		          android:layout_height="wrap_content" />
-		      </LinearLayout>
-		      <View
-		          android:id="@+id/TEA_Separator"
-		          android:layout_width="fill_parent"
-		          android:layout_height="1px"
-		          style="@style/TEA_Separator" />
-		      <LinearLayout
-		          android:id="@+id/reminder_alarm_container"
-		          android:layout_width="fill_parent"
-		          android:layout_height="50dip"
-		          android:layout_marginLeft="10dip"
-		          android:layout_marginRight="10dip"
-		          android:gravity="center_vertical"
-		          android:orientation="horizontal">
-			      <TextView
-			        android:layout_width="wrap_content"
-			        android:layout_height="wrap_content"
-			        android:text="@string/TEA_reminder_alarm_label"
-			        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
-			      <TextView
-		             android:id="@+id/reminder_alarm_display"
-		             android:layout_width="fill_parent"
-		             android:layout_height="wrap_content"
-		             android:layout_weight="1"
-		             android:gravity="right"
-		             android:paddingLeft="10dip"
-		             style="@style/TextAppearance.EditRowDisplay" />
-			      <com.todoroo.astrid.ui.ErrorCatchingSpinner
-			        android:id="@+id/reminder_alarm"
-			        android:layout_width="0dip"
-			        android:layout_height="wrap_content" />
-		      </LinearLayout>
-		      <View
-		          android:id="@+id/TEA_Separator"
-		          android:layout_width="fill_parent"
-		          android:layout_height="1px"
-		          style="@style/TEA_Separator" />
-		    
-		</LinearLayout>
-	</ScrollView>
-	<include layout="@layout/control_dialog_ok"/>
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        android:paddingLeft="5dip"
+        android:paddingRight="5dip">
+
+    <ScrollView
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="100"
+            android:minWidth="320dip">
+
+        <LinearLayout
+                android:id="@+id/reminders_body"
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent">
+
+            <!-- reminders -->
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="10dip"
+                    android:text="@string/TEA_reminder_label"
+                    android:paddingTop="10dip"
+                    style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"/>
+
+            <CheckBox
+                    style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
+                    android:id="@+id/reminder_due"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dip"
+                    android:text="@string/TEA_reminder_due"/>
+
+            <CheckBox
+                    style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
+                    android:id="@+id/reminder_overdue"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dip"
+                    android:text="@string/TEA_reminder_overdue"/>
+
+            <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent">
+
+                <CheckBox
+                        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
+                        android:id="@+id/reminder_random"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dip"
+                        android:text="@string/TEA_reminder_randomly"/>
+
+                <com.todoroo.astrid.ui.ErrorCatchingSpinner
+                        android:id="@+id/reminder_random_interval"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"/>
+            </LinearLayout>
+
+            <View
+                    android:id="@+id/TEA_Separator"
+                    android:layout_width="fill_parent"
+                    android:layout_height="1px"
+                    style="@style/TEA_Separator"/>
+
+            <LinearLayout
+                    android:id="@+id/reminder_alarm_container"
+                    android:layout_width="fill_parent"
+                    android:layout_height="50dip"
+                    android:layout_marginLeft="10dip"
+                    android:layout_marginRight="10dip"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/TEA_reminder_alarm_label"
+                        style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"/>
+
+                <TextView
+                        android:id="@+id/reminder_alarm_display"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="right"
+                        android:paddingLeft="10dip"
+                        style="@style/TextAppearance.EditRowDisplay"/>
+
+                <com.todoroo.astrid.ui.ErrorCatchingSpinner
+                        android:id="@+id/reminder_alarm"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"/>
+            </LinearLayout>
+
+            <View
+                    android:id="@+id/TEA_Separator"
+                    android:layout_width="fill_parent"
+                    android:layout_height="1px"
+                    style="@style/TEA_Separator"/>
+
+        </LinearLayout>
+    </ScrollView>
+
+    <include layout="@layout/control_dialog_ok"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/control_set_repeat.xml b/astrid/res/layout/control_set_repeat.xml
index ac955b776..6d97ce30b 100644
--- a/astrid/res/layout/control_set_repeat.xml
+++ b/astrid/res/layout/control_set_repeat.xml
@@ -4,68 +4,76 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<LinearLayout 
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:paddingLeft="5dip"
-    android:paddingRight="5dip"
-    android:orientation="vertical">
-      
-  <LinearLayout android:id="@+id/repeatContainer"
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:layout_weight="100">
-      
-    <LinearLayout
-        android:orientation="horizontal"
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
-        
-      <Button android:id="@+id/repeatValue"
-          android:layout_weight="1"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content" />
-          
-      <Spinner android:id="@+id/repeatInterval"
-          android:layout_weight="1"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content" 
-          android:prompt="@string/repeat_interval_prompt"
-          android:entries="@array/repeat_interval"/>
-          
+        android:layout_height="fill_parent"
+        android:paddingLeft="5dip"
+        android:paddingRight="5dip"
+        android:orientation="vertical">
+
+    <LinearLayout
+            android:id="@+id/repeatContainer"
+            android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="100">
+
+        <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+
+            <Button
+                    android:id="@+id/repeatValue"
+                    android:layout_weight="1"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"/>
+
+            <Spinner
+                    android:id="@+id/repeatInterval"
+                    android:layout_weight="1"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:prompt="@string/repeat_interval_prompt"
+                    android:entries="@array/repeat_interval"/>
+
+        </LinearLayout>
+
+        <com.todoroo.astrid.ui.ErrorCatchingSpinner
+                android:id="@+id/repeatType"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:entries="@array/repeat_type"/>
+
+        <LinearLayout
+                android:id="@+id/repeatDayOfWeekContainer"
+                android:orientation="horizontal"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"/>
     </LinearLayout>
-    
-    <com.todoroo.astrid.ui.ErrorCatchingSpinner android:id="@+id/repeatType"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" 
-        android:entries="@array/repeat_type"/>
-    
-    <LinearLayout android:id="@+id/repeatDayOfWeekContainer"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" 
-        android:gravity="center"/>
-  </LinearLayout>  
-  
-  <LinearLayout
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:orientation="horizontal">
-      <Button android:id="@+id/repeatUntil"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content" 
-          android:layout_weight="1"/>
+
+    <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+        <Button
+                android:id="@+id/repeatUntil"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"/>
+
         <Button xmlns:android="http://schemas.android.com/apk/res/android"
-          android:id="@+id/edit_dont_repeat"
-          android:text="@string/repeat_dont"        
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"/>
-      
-  </LinearLayout>
-  
-  <include layout="@layout/control_dialog_ok" />
+                android:id="@+id/edit_dont_repeat"
+                android:text="@string/repeat_dont"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"/>
+
+    </LinearLayout>
+
+    <include layout="@layout/control_dialog_ok"/>
 </LinearLayout>
 
diff --git a/astrid/res/layout/control_set_repeat_display.xml b/astrid/res/layout/control_set_repeat_display.xml
index 41895ef33..e354bb3fd 100644
--- a/astrid/res/layout/control_set_repeat_display.xml
+++ b/astrid/res/layout/control_set_repeat_display.xml
@@ -5,39 +5,44 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-  
-  <!-- tags -->
-  <LinearLayout
-      android:id="@+id/repeat_body"
-      android:layout_width="fill_parent"
-      android:layout_height="50dip"
-      android:gravity="center_vertical">
-      <ImageView android:id="@+id/display_row_icon"
-             android:layout_marginRight="10dip"
-             android:layout_width="20dip"
-             android:layout_height="20dip"
-             android:scaleType="fitCenter"/>
-	  <TextView
-	      android:id="@+id/display_row_edit"
-	      android:layout_width="fill_parent"
-	      android:layout_height="wrap_content"
-	      android:layout_weight="1"
-	      android:gravity="left"
-	      android:paddingLeft="5dip"
-	      style="@style/TextAppearance.EditRowDisplay" />
-	  <View
-	      android:layout_width="1px"
-	      android:layout_height="fill_parent"
-	      style="@style/TEA_Separator" />
-  </LinearLayout>
-  <View
-      android:layout_width="fill_parent"
-      android:layout_height="1px"
-      android:padding="5dip"
-      style="@style/TEA_Separator" />
-    
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+
+    <!-- tags -->
+    <LinearLayout
+            android:id="@+id/repeat_body"
+            android:layout_width="fill_parent"
+            android:layout_height="50dip"
+            android:gravity="center_vertical">
+
+        <ImageView
+                android:id="@+id/display_row_icon"
+                android:layout_marginRight="10dip"
+                android:layout_width="20dip"
+                android:layout_height="20dip"
+                android:scaleType="fitCenter"/>
+
+        <TextView
+                android:id="@+id/display_row_edit"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="left"
+                android:paddingLeft="5dip"
+                style="@style/TextAppearance.EditRowDisplay"/>
+
+        <View
+                android:layout_width="1px"
+                android:layout_height="fill_parent"
+                style="@style/TEA_Separator"/>
+    </LinearLayout>
+
+    <View
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:padding="5dip"
+            style="@style/TEA_Separator"/>
+
 </LinearLayout>
diff --git a/astrid/res/layout/control_set_tags.xml b/astrid/res/layout/control_set_tags.xml
index 58765af3b..c85bd2552 100644
--- a/astrid/res/layout/control_set_tags.xml
+++ b/astrid/res/layout/control_set_tags.xml
@@ -5,34 +5,36 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent"
-  android:paddingLeft="5dip"
-  android:paddingRight="5dip">
-  
-  <LinearLayout
-      android:id="@+id/newTags"
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="2dip"
-      android:layout_marginBottom="5dip"
-      />
-  
-  <View
-      android:layout_width="fill_parent"
-      android:layout_height="1px"
-      android:padding="5dip"
-      android:background="@android:drawable/divider_horizontal_dark"/>  
-  <com.todoroo.astrid.ui.ErrorCatchingListView
-      android:id="@+id/existingTags"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent"
-      android:layout_marginLeft="3dip"
-      android:layout_marginRight="3dip"
-      android:layout_weight="100"/>
-  <include layout="@layout/control_dialog_ok"/>
-    
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:paddingLeft="5dip"
+        android:paddingRight="5dip">
+
+    <LinearLayout
+            android:id="@+id/newTags"
+            android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dip"
+            android:layout_marginBottom="5dip"
+            />
+
+    <View
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:padding="5dip"
+            android:background="@android:drawable/divider_horizontal_dark"/>
+
+    <com.todoroo.astrid.ui.ErrorCatchingListView
+            android:id="@+id/existingTags"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginLeft="3dip"
+            android:layout_marginRight="3dip"
+            android:layout_weight="100"/>
+
+    <include layout="@layout/control_dialog_ok"/>
+
 </LinearLayout>
diff --git a/astrid/res/layout/control_set_timers.xml b/astrid/res/layout/control_set_timers.xml
index e62b283f4..aa58110ee 100644
--- a/astrid/res/layout/control_set_timers.xml
+++ b/astrid/res/layout/control_set_timers.xml
@@ -5,63 +5,69 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent"
-  android:paddingLeft="5dip"
-  android:paddingRight="5dip">
-        
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:paddingLeft="5dip"
+        android:paddingRight="5dip">
+
     <!-- estimated time -->
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-	    <TextView
-	      android:layout_width="wrap_content"
-	      android:layout_height="wrap_content"
-	      android:text="@string/TEA_estimatedDuration_label"
-	      style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
-	    <TextView
-             android:id="@+id/estimatedDuration"
-             android:layout_width="fill_parent"
-             android:layout_height="wrap_content"
-             android:layout_weight="1"
-             android:gravity="right"
-             android:paddingLeft="10dip"
-             style="@style/TextAppearance.EditRowDisplay" />
+            android:layout_width="fill_parent"
+            android:layout_height="50dip"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/TEA_estimatedDuration_label"
+                style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"/>
+
+        <TextView
+                android:id="@+id/estimatedDuration"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:paddingLeft="10dip"
+                style="@style/TextAppearance.EditRowDisplay"/>
     </LinearLayout>
+
     <View
-          android:id="@+id/TEA_Separator"
-          android:layout_width="fill_parent"
-          android:layout_height="1px"
-          style="@style/TEA_Separator" />
+            android:id="@+id/TEA_Separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            style="@style/TEA_Separator"/>
     <!-- elapsed time -->
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-	    <TextView
-	      android:layout_width="wrap_content"
-	      android:layout_height="wrap_content"
-	      android:text="@string/TEA_elapsedDuration_label"
-	      style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel" />
-	    <TextView
-             android:id="@+id/elapsedDuration"
-             android:layout_width="fill_parent"
-             android:layout_height="wrap_content"
-             android:layout_weight="1"
-             android:gravity="right"
-             android:paddingLeft="10dip"
-             style="@style/TextAppearance.EditRowDisplay" />
+            android:layout_width="fill_parent"
+            android:layout_height="50dip"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/TEA_elapsedDuration_label"
+                style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"/>
+
+        <TextView
+                android:id="@+id/elapsedDuration"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:paddingLeft="10dip"
+                style="@style/TextAppearance.EditRowDisplay"/>
     </LinearLayout>
+
     <include layout="@layout/control_dialog_ok"/>
-  
+
 </LinearLayout>
 
diff --git a/astrid/res/layout/control_set_title.xml b/astrid/res/layout/control_set_title.xml
index 8ba806406..f41433ba6 100644
--- a/astrid/res/layout/control_set_title.xml
+++ b/astrid/res/layout/control_set_title.xml
@@ -5,39 +5,39 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="10dip"
-    android:paddingBottom="10dip"
-    android:paddingLeft="0dip"
-    android:paddingRight="0dip"
-    android:gravity="center_vertical"
-    android:orientation="horizontal" >
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:paddingTop="10dip"
+              android:paddingBottom="10dip"
+              android:paddingLeft="0dip"
+              android:paddingRight="0dip"
+              android:gravity="center_vertical"
+              android:orientation="horizontal">
 
     <com.todoroo.astrid.ui.CheckableImageView
-        android:id="@+id/completeBox"
-        android:layout_width="35dip"
-        android:layout_height="wrap_content"
-        android:minHeight="30dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginLeft="4dip"
-        android:scaleType="center"
-        android:src="@drawable/btn_check" />
+            android:id="@+id/completeBox"
+            android:layout_width="35dip"
+            android:layout_height="wrap_content"
+            android:minHeight="30dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginLeft="4dip"
+            android:scaleType="center"
+            android:src="@drawable/btn_check"/>
 
     <com.todoroo.astrid.ui.ErrorCatchingEditText
-        android:id="@+id/title"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="100"
-        android:autoText="true"
-        android:background="?attr/asEditTextBackground"
-        android:capitalize="sentences"
-        android:freezesText="true"
-        android:hint="@string/TEA_title_hint"
-        android:inputType="textMultiLine"
-        android:scrollbars="vertical"
-        android:imeOptions="flagNoExtractUi"
-        android:text=""
-        android:textColor="?attr/asTextColor" />
+            android:id="@+id/title"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="100"
+            android:autoText="true"
+            android:background="?attr/asEditTextBackground"
+            android:capitalize="sentences"
+            android:freezesText="true"
+            android:hint="@string/TEA_title_hint"
+            android:inputType="textMultiLine"
+            android:scrollbars="vertical"
+            android:imeOptions="flagNoExtractUi"
+            android:text=""
+            android:textColor="?attr/asTextColor"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/custom_filter_activity.xml b/astrid/res/layout/custom_filter_activity.xml
index f8639e3d4..b27d0e05d 100644
--- a/astrid/res/layout/custom_filter_activity.xml
+++ b/astrid/res/layout/custom_filter_activity.xml
@@ -5,80 +5,84 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent" 
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    style="@style/Content">
-    
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical"
+              style="@style/Content">
+
     <!-- Filter Name -->
-    <EditText android:id="@+id/filterName"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="15dip"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:layout_marginBottom="15dip"
-        android:layout_weight="1"
-        android:background="@null"
-        android:hint="@string/CFA_filterName_hint"
-        android:capitalize="sentences" />
-    
-    <View 
-        android:layout_height="1px"
-        android:layout_width="fill_parent"
-        android:background="#e9e9e9"/>
-    
+    <EditText
+            android:id="@+id/filterName"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dip"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:layout_marginBottom="15dip"
+            android:layout_weight="1"
+            android:background="@null"
+            android:hint="@string/CFA_filterName_hint"
+            android:capitalize="sentences"/>
+
+    <View
+            android:layout_height="1px"
+            android:layout_width="fill_parent"
+            android:background="#e9e9e9"/>
+
     <!-- List -->
-    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_weight="100"
-        android:scrollbars="vertical"
-        android:cacheColorHint="#00000000"/>
-    
+    <com.todoroo.astrid.ui.ErrorCatchingListView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="100"
+            android:scrollbars="vertical"
+            android:cacheColorHint="#00000000"/>
+
     <!-- help text -->
-    <TextView android:id="@+id/help"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:paddingLeft="5dip"
-        android:text="@string/CFA_help"
-        style="@style/TextAppearance"/>
-    
+    <TextView
+            android:id="@+id/help"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:paddingLeft="5dip"
+            android:text="@string/CFA_help"
+            style="@style/TextAppearance"/>
+
     <!-- buttons -->
     <LinearLayout
-      android:orientation="horizontal"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="10dip"
-      android:padding="5dip"
-      android:baselineAligned="false">
-      
-      <Button android:id="@+id/add"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="10dip"
-        android:paddingBottom="10dip"
-        android:layout_marginRight="3dip"
-        android:layout_weight="1"
-        android:text="@string/CFA_button_add"
-        android:background="?attr/asThemeTextColor"
-        android:textColor="?attr/asContentBackground" />
-        
-      <Button
-        android:id="@+id/saveAndView"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingTop="10dip"
-        android:paddingBottom="10dip"
-        android:layout_marginLeft="3dip"
-        android:text="@string/CFA_button_view"
-        android:background="?attr/asThemeTextColor"
-        android:textColor="?attr/asContentBackground" />
-        
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dip"
+            android:padding="5dip"
+            android:baselineAligned="false">
+
+        <Button
+                android:id="@+id/add"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="10dip"
+                android:paddingBottom="10dip"
+                android:layout_marginRight="3dip"
+                android:layout_weight="1"
+                android:text="@string/CFA_button_add"
+                android:background="?attr/asThemeTextColor"
+                android:textColor="?attr/asContentBackground"/>
+
+        <Button
+                android:id="@+id/saveAndView"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingTop="10dip"
+                android:paddingBottom="10dip"
+                android:layout_marginLeft="3dip"
+                android:text="@string/CFA_button_view"
+                android:background="?attr/asThemeTextColor"
+                android:textColor="?attr/asContentBackground"/>
+
     </LinearLayout>
-    
+
 </LinearLayout>
     
diff --git a/astrid/res/layout/custom_filter_row.xml b/astrid/res/layout/custom_filter_row.xml
index 8eb603ff2..8c45211e7 100644
--- a/astrid/res/layout/custom_filter_row.xml
+++ b/astrid/res/layout/custom_filter_row.xml
@@ -5,47 +5,51 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="55dip"
-    android:background="@android:drawable/list_selector_background"
-    android:paddingLeft="4dip"
-    android:paddingRight="6dip"
-    android:orientation="horizontal">
-        
+              android:layout_width="fill_parent"
+              android:layout_height="55dip"
+              android:background="@android:drawable/list_selector_background"
+              android:paddingLeft="4dip"
+              android:paddingRight="6dip"
+              android:orientation="horizontal">
+
     <!-- filter intersection type icon -->
-    <ImageView android:id="@+id/type"
-        android:layout_width="32dip"
-        android:layout_height="fill_parent"
-        android:layout_weight="1"
-        android:paddingLeft="5dip" 
-        android:paddingRight="5dip" 
-        android:scaleType="center"/>
-        
+    <ImageView
+            android:id="@+id/type"
+            android:layout_width="32dip"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:paddingLeft="5dip"
+            android:paddingRight="5dip"
+            android:scaleType="center"/>
+
     <!-- filter icon -->
-    <ImageView android:id="@+id/icon"
-        android:layout_width="32dip"
-        android:layout_height="fill_parent"
-        android:layout_weight="1"
-        android:paddingLeft="5dip" 
-        android:paddingRight="5dip"
-        android:visibility="gone"/>
-            
+    <ImageView
+            android:id="@+id/icon"
+            android:layout_width="32dip"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:paddingLeft="5dip"
+            android:paddingRight="5dip"
+            android:visibility="gone"/>
+
     <!-- filter text -->
-    <TextView android:id="@+id/name"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_weight="100"
-        android:paddingLeft="5dip"
-        android:textSize="18sp" 
-        android:gravity="center_vertical"
-        style="@style/TextAppearance"/>
-        
+    <TextView
+            android:id="@+id/name"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="100"
+            android:paddingLeft="5dip"
+            android:textSize="18sp"
+            android:gravity="center_vertical"
+            style="@style/TextAppearance"/>
+
     <!-- filter graphic -->
-    <com.todoroo.astrid.core.FilterView android:id="@+id/filter"
-        android:layout_width="64px"
-        android:layout_height="fill_parent"
-        android:layout_weight="1"
-        android:paddingLeft="5dip" 
-        android:paddingRight="5dip"/>
-                    
+    <com.todoroo.astrid.core.FilterView
+            android:id="@+id/filter"
+            android:layout_width="64px"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:paddingLeft="5dip"
+            android:paddingRight="5dip"/>
+
 </LinearLayout>
diff --git a/astrid/res/layout/date_time_dialog.xml b/astrid/res/layout/date_time_dialog.xml
index 1c1919e8f..b61843626 100644
--- a/astrid/res/layout/date_time_dialog.xml
+++ b/astrid/res/layout/date_time_dialog.xml
@@ -5,37 +5,41 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <ScrollView
-	 xmlns:android="http://schemas.android.com/apk/res/android"
-	 xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-     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>
+        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>
\ No newline at end of file
diff --git a/astrid/res/layout/date_time_picker.xml b/astrid/res/layout/date_time_picker.xml
index 80f1149bc..8188a6b96 100644
--- a/astrid/res/layout/date_time_picker.xml
+++ b/astrid/res/layout/date_time_picker.xml
@@ -5,53 +5,60 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
+
     <ScrollView
-	  android:layout_width="fill_parent"
-	  android:layout_height="fill_parent"
-	  android:layout_weight="100"
-	  android:paddingLeft="10dip"
-	  android:paddingRight="10dip"
-	  android:paddingTop="5dip"
-	  android:paddingBottom="5dip">
-		<LinearLayout
-		  android:id="@+id/datetime_body"
-		  android:orientation="vertical"
-		  android:layout_width="fill_parent"
-		  android:layout_height="fill_parent">
-		  <LinearLayout
-		      android:id="@+id/datetime_extras"
-		      android:layout_width="fill_parent"
-		      android:layout_height="wrap_content"
-		      android:orientation="horizontal"/>
-		  <LinearLayout
-		      android:layout_width="fill_parent"
-		      android:layout_height="wrap_content"
-		      android:layout_marginBottom="3dip"
-		      android:orientation="horizontal"
-		      android:layout_weight="1">
-	          <LinearLayout
-	              android:id="@+id/date_shortcuts"
-	              android:layout_width="fill_parent"
-	          	  android:layout_height="fill_parent"
-	          	  android:layout_marginTop="5dip"
-	          	  android:layout_marginRight="5dip"
-	          	  android:layout_weight="1"
-	          	  android:orientation="vertical"/>		          
-		      <com.todoroo.astrid.ui.AstridTimePicker
-		          android:id="@+id/time_picker"
-		          android:layout_width="fill_parent"
-		          android:layout_height="fill_parent"
-	          	  android:layout_marginTop="5dip"
-			      android:layout_marginLeft="5dip"
-	          	  android:layout_weight="1"
-	          	  android:orientation="vertical"/>
-
-		  </LinearLayout>
-		  <com.todoroo.astrid.ui.CalendarView
-            android:id="@+id/calendar"
             android:layout_width="fill_parent"
-            android:layout_height="250dip"
-            android:layout_weight="1" />
-		</LinearLayout>
-	</ScrollView>
+            android:layout_height="fill_parent"
+            android:layout_weight="100"
+            android:paddingLeft="10dip"
+            android:paddingRight="10dip"
+            android:paddingTop="5dip"
+            android:paddingBottom="5dip">
+
+        <LinearLayout
+                android:id="@+id/datetime_body"
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent">
+
+            <LinearLayout
+                    android:id="@+id/datetime_extras"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"/>
+
+            <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="3dip"
+                    android:orientation="horizontal"
+                    android:layout_weight="1">
+
+                <LinearLayout
+                        android:id="@+id/date_shortcuts"
+                        android:layout_width="fill_parent"
+                        android:layout_height="fill_parent"
+                        android:layout_marginTop="5dip"
+                        android:layout_marginRight="5dip"
+                        android:layout_weight="1"
+                        android:orientation="vertical"/>
+
+                <com.todoroo.astrid.ui.AstridTimePicker
+                        android:id="@+id/time_picker"
+                        android:layout_width="fill_parent"
+                        android:layout_height="fill_parent"
+                        android:layout_marginTop="5dip"
+                        android:layout_marginLeft="5dip"
+                        android:layout_weight="1"
+                        android:orientation="vertical"/>
+
+            </LinearLayout>
+
+            <com.todoroo.astrid.ui.CalendarView
+                    android:id="@+id/calendar"
+                    android:layout_width="fill_parent"
+                    android:layout_height="250dip"
+                    android:layout_weight="1"/>
+        </LinearLayout>
+    </ScrollView>
 </merge>
\ No newline at end of file
diff --git a/astrid/res/layout/date_time_picker_no_shortcuts.xml b/astrid/res/layout/date_time_picker_no_shortcuts.xml
index 90cd76d76..7642e30ed 100644
--- a/astrid/res/layout/date_time_picker_no_shortcuts.xml
+++ b/astrid/res/layout/date_time_picker_no_shortcuts.xml
@@ -5,64 +5,73 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
+
     <ScrollView
-	  android:layout_width="fill_parent"
-	  android:layout_height="fill_parent"
-	  android:layout_weight="100"
-	  android:paddingLeft="10dip"
-	  android:paddingRight="10dip"
-	  android:paddingTop="4dip"
-	  android:paddingBottom="5dip">
-		<LinearLayout
-		  android:id="@+id/datetime_body"
-		  android:orientation="vertical"
-		  android:layout_width="fill_parent"
-		  android:layout_height="fill_parent">
-		  <com.todoroo.astrid.ui.CalendarView
-            android:id="@+id/calendar"
             android:layout_width="fill_parent"
-            android:layout_height="250dip"
-            android:layout_weight="1" />
-		  <View
-	          android:id="@+id/TEA_Separator"
-	          android:layout_width="fill_parent"
-	          android:layout_height="1px"
-	          android:layout_marginBottom="1dip"
-	          style="@style/TEA_Separator" />
-		  <LinearLayout
-		      android:layout_width="fill_parent"
-		      android:layout_height="wrap_content"
-		      android:orientation="horizontal"
-		      android:layout_weight="1">
-	          <LinearLayout
-	              android:id="@+id/date_shortcuts"
-	              android:layout_width="fill_parent"
-	          	  android:layout_height="fill_parent"
-	          	  android:layout_marginTop="5dip"
-	          	  android:layout_marginRight="5dip"
-	          	  android:layout_weight="1"
-	          	  android:orientation="vertical"/>		          
-		      <com.todoroo.astrid.ui.AstridTimePicker
-		          android:id="@+id/time_picker"
-		          android:layout_width="fill_parent"
-		          android:layout_height="fill_parent"
-	          	  android:layout_marginTop="5dip"
-			      android:layout_marginLeft="5dip"
-	          	  android:layout_weight="1"
-	          	  android:orientation="vertical"/>
+            android:layout_height="fill_parent"
+            android:layout_weight="100"
+            android:paddingLeft="10dip"
+            android:paddingRight="10dip"
+            android:paddingTop="4dip"
+            android:paddingBottom="5dip">
+
+        <LinearLayout
+                android:id="@+id/datetime_body"
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent">
+
+            <com.todoroo.astrid.ui.CalendarView
+                    android:id="@+id/calendar"
+                    android:layout_width="fill_parent"
+                    android:layout_height="250dip"
+                    android:layout_weight="1"/>
+
+            <View
+                    android:id="@+id/TEA_Separator"
+                    android:layout_width="fill_parent"
+                    android:layout_height="1px"
+                    android:layout_marginBottom="1dip"
+                    style="@style/TEA_Separator"/>
+
+            <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_weight="1">
+
+                <LinearLayout
+                        android:id="@+id/date_shortcuts"
+                        android:layout_width="fill_parent"
+                        android:layout_height="fill_parent"
+                        android:layout_marginTop="5dip"
+                        android:layout_marginRight="5dip"
+                        android:layout_weight="1"
+                        android:orientation="vertical"/>
+
+                <com.todoroo.astrid.ui.AstridTimePicker
+                        android:id="@+id/time_picker"
+                        android:layout_width="fill_parent"
+                        android:layout_height="fill_parent"
+                        android:layout_marginTop="5dip"
+                        android:layout_marginLeft="5dip"
+                        android:layout_weight="1"
+                        android:orientation="vertical"/>
+
+            </LinearLayout>
+
+            <View
+                    android:id="@+id/TEA_Separator"
+                    android:layout_width="fill_parent"
+                    android:layout_height="1px"
+                    android:layout_marginTop="1dip"
+                    style="@style/TEA_Separator"/>
 
-		  </LinearLayout>
-		  <View
-	          android:id="@+id/TEA_Separator"
-	          android:layout_width="fill_parent"
-	          android:layout_height="1px"
-	          android:layout_marginTop="1dip"
-	          style="@style/TEA_Separator" />
-		  <LinearLayout
-              android:id="@+id/datetime_extras"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:orientation="horizontal"/>
-		</LinearLayout>
-	</ScrollView>
+            <LinearLayout
+                    android:id="@+id/datetime_extras"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"/>
+        </LinearLayout>
+    </ScrollView>
 </merge>
\ No newline at end of file
diff --git a/astrid/res/layout/deadline_number_picker.xml b/astrid/res/layout/deadline_number_picker.xml
index a3cc73920..4faec58a7 100644
--- a/astrid/res/layout/deadline_number_picker.xml
+++ b/astrid/res/layout/deadline_number_picker.xml
@@ -18,35 +18,38 @@
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <com.todoroo.astrid.ui.NumberPickerButton android:id="@+id/increment"
-        android:layout_width="fill_parent"
-        android:layout_height="38dip"
-        android:src="@drawable/icn_arrow_up"
-        />
-    
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-        
-        <EditText android:id="@+id/timepicker_input"
-            android:layout_width="wrap_content"
-            android:layout_height="40dip"
-            android:layout_weight="1"
-            style="?android:attr/textAppearanceLarge"
-            android:gravity="center"
-            android:inputType="phone"
-            android:textSize="30sp"
-            android:textColor="?attr/asThemeTextColor"
-            android:background="@android:color/transparent"
+    <com.todoroo.astrid.ui.NumberPickerButton
+            android:id="@+id/increment"
+            android:layout_width="fill_parent"
+            android:layout_height="38dip"
+            android:src="@drawable/icn_arrow_up"
             />
+
+    <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+        <EditText
+                android:id="@+id/timepicker_input"
+                android:layout_width="wrap_content"
+                android:layout_height="40dip"
+                android:layout_weight="1"
+                style="?android:attr/textAppearanceLarge"
+                android:gravity="center"
+                android:inputType="phone"
+                android:textSize="30sp"
+                android:textColor="?attr/asThemeTextColor"
+                android:background="@android:color/transparent"
+                />
     </LinearLayout>
-        
-    <com.todoroo.astrid.ui.NumberPickerButton android:id="@+id/decrement"
-        android:layout_width="fill_parent"
-        android:layout_height="38dip"
-        android:src="@drawable/icn_arrow_down"
-        android:paddingTop="15dip"
-        />
-        
+
+    <com.todoroo.astrid.ui.NumberPickerButton
+            android:id="@+id/decrement"
+            android:layout_width="fill_parent"
+            android:layout_height="38dip"
+            android:src="@drawable/icn_arrow_down"
+            android:paddingTop="15dip"
+            />
+
 </merge>
diff --git a/astrid/res/layout/feedback_prompt.xml b/astrid/res/layout/feedback_prompt.xml
index 956a3d407..06e6d2607 100644
--- a/astrid/res/layout/feedback_prompt.xml
+++ b/astrid/res/layout/feedback_prompt.xml
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/feedback_banner"
-    android:layout_width="match_parent"
-    android:layout_height="43dip"
-    android:gravity="center_vertical"
-    android:background="?attr/asThemeTextColor"
-    android:orientation="horizontal" >
-    
+              android:id="@+id/feedback_banner"
+              android:layout_width="match_parent"
+              android:layout_height="43dip"
+              android:gravity="center_vertical"
+              android:background="?attr/asThemeTextColor"
+              android:orientation="horizontal">
+
     <TextView
-	    android:layout_width="fill_parent"
-	    android:layout_height="fill_parent"
-	    android:layout_marginLeft="10dip"
-	    android:gravity="center_vertical"
-	    style="@style/TextAppearance"
-	    android:textSize="14sp"
-	    android:textStyle="bold"
-	    android:textColor="?attr/asTextColorInverse"
-	    android:layout_weight="1"
-	    android:text="@string/feedback_banner_text"/>
-    
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginLeft="10dip"
+            android:gravity="center_vertical"
+            style="@style/TextAppearance"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            android:textColor="?attr/asTextColorInverse"
+            android:layout_weight="1"
+            android:text="@string/feedback_banner_text"/>
+
     <ImageView
-        android:id="@+id/positiveFeedback"
-        android:layout_width="24dip"
-        android:layout_height="26dip"
-        android:gravity="center"
-        android:scaleType="fitCenter"
-        android:layout_marginRight="10dip"
-        android:src="@drawable/icn_thumbsup"/>
+            android:id="@+id/positiveFeedback"
+            android:layout_width="24dip"
+            android:layout_height="26dip"
+            android:gravity="center"
+            android:scaleType="fitCenter"
+            android:layout_marginRight="10dip"
+            android:src="@drawable/icn_thumbsup"/>
 
     <ImageView
-        android:id="@+id/negativeFeedback"
-        android:layout_width="24dip"
-        android:layout_height="26dip"
-        android:gravity="center"
-        android:scaleType="fitCenter"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:src="@drawable/icn_thumbsdown"/>
+            android:id="@+id/negativeFeedback"
+            android:layout_width="24dip"
+            android:layout_height="26dip"
+            android:gravity="center"
+            android:scaleType="fitCenter"
+            android:layout_marginLeft="10dip"
+            android:layout_marginRight="10dip"
+            android:src="@drawable/icn_thumbsdown"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/file_display_row.xml b/astrid/res/layout/file_display_row.xml
index 94babc02c..c3d6081b9 100644
--- a/astrid/res/layout/file_display_row.xml
+++ b/astrid/res/layout/file_display_row.xml
@@ -5,29 +5,30 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal" >
-    
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:gravity="center_vertical"
+              android:orientation="horizontal">
+
     <TextView
-        android:id="@+id/file_text"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:maxLines="1"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:textAppearance="@style/TextAppearance.EditRowDisplay"/>
+            android:id="@+id/file_text"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:maxLines="1"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:textAppearance="@style/TextAppearance.EditRowDisplay"/>
+
     <TextView
-        android:id="@+id/file_type"
-        android:minWidth="37dip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/file_type_background"
-        android:layout_marginLeft="5dip"
-        android:paddingLeft="4dip"
-        android:paddingRight="4dip"
-        android:gravity="center"
-        android:textColor="?attr/asTextColorInverse"/>
+            android:id="@+id/file_type"
+            android:minWidth="37dip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/file_type_background"
+            android:layout_marginLeft="5dip"
+            android:paddingLeft="4dip"
+            android:paddingRight="4dip"
+            android:gravity="center"
+            android:textColor="?attr/asTextColorInverse"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/file_row.xml b/astrid/res/layout/file_row.xml
index c43db96da..38e1c0215 100644
--- a/astrid/res/layout/file_row.xml
+++ b/astrid/res/layout/file_row.xml
@@ -5,41 +5,43 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal" >
-    
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:gravity="center_vertical"
+              android:orientation="horizontal">
+
     <TextView
-        android:id="@+id/file_text"
-        android:layout_width="fill_parent"
-        android:layout_height="40dip"
-        android:layout_marginTop="5dip"
-        android:layout_marginBottom="5dip"
-        android:layout_marginLeft="10dip"
-        android:paddingRight="5dip"
-        android:paddingLeft="3dip"
-        android:layout_weight="1"
-        android:textAppearance="@style/TextAppearance.EditRowDisplay"
-        android:gravity="left|center_vertical"/>
+            android:id="@+id/file_text"
+            android:layout_width="fill_parent"
+            android:layout_height="40dip"
+            android:layout_marginTop="5dip"
+            android:layout_marginBottom="5dip"
+            android:layout_marginLeft="10dip"
+            android:paddingRight="5dip"
+            android:paddingLeft="3dip"
+            android:layout_weight="1"
+            android:textAppearance="@style/TextAppearance.EditRowDisplay"
+            android:gravity="left|center_vertical"/>
+
     <TextView
-        android:id="@+id/file_type"
-        android:minWidth="37dip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/file_type_background"
-        android:layout_marginLeft="5dip"
-        android:layout_marginRight="5dip"
-        android:paddingLeft="4dip"
-        android:paddingRight="4dip"
-        android:gravity="center"
-        android:textColor="?attr/asTextColorInverse"/>
+            android:id="@+id/file_type"
+            android:minWidth="37dip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/file_type_background"
+            android:layout_marginLeft="5dip"
+            android:layout_marginRight="5dip"
+            android:paddingLeft="4dip"
+            android:paddingRight="4dip"
+            android:gravity="center"
+            android:textColor="?attr/asTextColorInverse"/>
+
     <ImageView
-        android:id="@+id/remove_file"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_menu_close"
-        android:layout_marginLeft="-5dip"
-        android:layout_marginRight="5dip"
-        android:visibility="gone"/>
+            android:id="@+id/remove_file"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_menu_close"
+            android:layout_marginLeft="-5dip"
+            android:layout_marginRight="5dip"
+            android:visibility="gone"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/filter_adapter_row.xml b/astrid/res/layout/filter_adapter_row.xml
index 27c992728..557716920 100644
--- a/astrid/res/layout/filter_adapter_row.xml
+++ b/astrid/res/layout/filter_adapter_row.xml
@@ -7,66 +7,71 @@
 <!-- Note that properties like height, background color, and filter name size
      are defined in FilterAdapter.java -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="55dip"
-    android:paddingLeft="7dip"
-    android:orientation="horizontal">
-        
+                android:layout_width="fill_parent"
+                android:layout_height="55dip"
+                android:paddingLeft="7dip"
+                android:orientation="horizontal">
+
     <!-- filter icon -->
-    <ImageView android:id="@+id/icon"
-        android:layout_width="25dip"
-        android:layout_height="48dip"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="8dip"
-        android:scaleType="fitCenter"
-        android:visibility="gone"/>
-        
+    <ImageView
+            android:id="@+id/icon"
+            android:layout_width="25dip"
+            android:layout_height="48dip"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="8dip"
+            android:scaleType="fitCenter"
+            android:visibility="gone"/>
+
     <!-- filter url image icon -->
-    <com.todoroo.astrid.helper.AsyncImageView android:id="@+id/url_image"
-        android:layout_width="30dip"
-        android:layout_height="48dip"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="6dip"
-        android:scaleType="fitCenter"
-        android:visibility="gone"/>
-            
+    <com.todoroo.astrid.helper.AsyncImageView
+            android:id="@+id/url_image"
+            android:layout_width="30dip"
+            android:layout_height="48dip"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="6dip"
+            android:scaleType="fitCenter"
+            android:visibility="gone"/>
+
     <!-- filter name -->
-    <TextView android:id="@+id/name"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_marginLeft="55dp"
-        android:paddingRight="30dp"
-        android:checked="false"
-        android:checkMark="?android:attr/listChoiceIndicatorMultiple"
-        android:lines="1"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:gravity="center_vertical" />
-        
+    <TextView
+            android:id="@+id/name"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginLeft="55dp"
+            android:paddingRight="30dp"
+            android:checked="false"
+            android:checkMark="?android:attr/listChoiceIndicatorMultiple"
+            android:lines="1"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:gravity="center_vertical"/>
+
     <!-- size -->
-    <TextView android:id="@+id/size"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/filter_count"
-        android:layout_marginRight="5dip"
-        android:layout_centerVertical="true"
-        android:paddingLeft="7dip" 
-        android:paddingRight="7dip"
-        android:textColor="#ffffff"
-        android:gravity="center" />
-        
+    <TextView
+            android:id="@+id/size"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:background="@drawable/filter_count"
+            android:layout_marginRight="5dip"
+            android:layout_centerVertical="true"
+            android:paddingLeft="7dip"
+            android:paddingRight="7dip"
+            android:textColor="#ffffff"
+            android:gravity="center"/>
+
     <!-- selected -->
-    <ImageView android:id="@+id/selected"
-        android:layout_width="24dip"
-        android:layout_height="fill_parent"
-        android:layout_toLeftOf="@id/size"
-        android:paddingLeft="5dip" 
-        android:paddingRight="5dip" 
-        android:src="?attr/asFilterSelectedIcon"
-        android:scaleType="fitCenter"
-        android:visibility="gone"/>
-                    
+    <ImageView
+            android:id="@+id/selected"
+            android:layout_width="24dip"
+            android:layout_height="fill_parent"
+            android:layout_toLeftOf="@id/size"
+            android:paddingLeft="5dip"
+            android:paddingRight="5dip"
+            android:src="?attr/asFilterSelectedIcon"
+            android:scaleType="fitCenter"
+            android:visibility="gone"/>
+
 </RelativeLayout>
diff --git a/astrid/res/layout/filter_list_activity.xml b/astrid/res/layout/filter_list_activity.xml
index 5a2502c63..8b1fee3f9 100644
--- a/astrid/res/layout/filter_list_activity.xml
+++ b/astrid/res/layout/filter_list_activity.xml
@@ -5,48 +5,49 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content"
-    android:background="?attr/asListPopoverBg"
-    android:orientation="vertical">
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:background="?attr/asListPopoverBg"
+              android:orientation="vertical">
 
 
     <!-- List -->
-    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="320dip"
-        android:layout_alignParentTop="true"
-        android:scrollbars="vertical"
-        android:divider="@android:color/transparent"
-        android:dividerHeight="1px"
-        android:background="@android:color/transparent"
-        android:cacheColorHint="#00000000"/>
-    
+    <com.todoroo.astrid.ui.ErrorCatchingListView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="320dip"
+            android:layout_alignParentTop="true"
+            android:scrollbars="vertical"
+            android:divider="@android:color/transparent"
+            android:dividerHeight="1px"
+            android:background="@android:color/transparent"
+            android:cacheColorHint="#00000000"/>
+
     <include layout="@layout/fla_separator"/>
 
     <!-- Footer -->
     <LinearLayout
-        android:id="@+id/lists_footer"
-        android:layout_width="fill_parent" 
-        android:layout_height="50dip"
-        android:padding="5dip"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:layout_alignParentBottom="true">
-        
+            android:id="@+id/lists_footer"
+            android:layout_width="fill_parent"
+            android:layout_height="50dip"
+            android:padding="5dip"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:layout_alignParentBottom="true">
+
         <TextView
-		    android:id="@+id/new_list_button"
-		    android:layout_width="fill_parent"
-		    android:layout_height="fill_parent"
-		    android:gravity="left|center_vertical"
-	        android:background="?attr/asThemeTextColor"
-	        android:paddingLeft="9dip"
-		    android:drawableLeft="@drawable/filter_plus_button"
-            android:drawablePadding="13dip"
-		    android:text="@string/FLA_new_list"
-		    style="@style/TextAppearance.FLA_Button"/>
-        
+                android:id="@+id/new_list_button"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:gravity="left|center_vertical"
+                android:background="?attr/asThemeTextColor"
+                android:paddingLeft="9dip"
+                android:drawableLeft="@drawable/filter_plus_button"
+                android:drawablePadding="13dip"
+                android:text="@string/FLA_new_list"
+                style="@style/TextAppearance.FLA_Button"/>
+
     </LinearLayout>
-        
+
 </LinearLayout>
     
diff --git a/astrid/res/layout/filter_list_activity_3pane.xml b/astrid/res/layout/filter_list_activity_3pane.xml
index b74191658..8d85d4570 100644
--- a/astrid/res/layout/filter_list_activity_3pane.xml
+++ b/astrid/res/layout/filter_list_activity_3pane.xml
@@ -5,47 +5,48 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent" 
-    android:layout_height="fill_parent"
-    android:background="@color/tablet_list_bg">
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:background="@color/tablet_list_bg">
 
     <!-- Footer -->
     <LinearLayout
-        android:id="@+id/lists_footer"
-        android:layout_width="fill_parent" 
-        android:layout_height="50dip"
-        android:orientation="vertical"
-        android:layout_alignParentBottom="true">
-        
+            android:id="@+id/lists_footer"
+            android:layout_width="fill_parent"
+            android:layout_height="50dip"
+            android:orientation="vertical"
+            android:layout_alignParentBottom="true">
+
         <include layout="@layout/fla_separator"/>
-        
+
         <TextView
-            android:id="@+id/new_list_button"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_margin="6dip"
-            android:gravity="left|center_vertical"
-            android:background="?attr/asThemeTextColor"
-            android:paddingLeft="2dip"
-            android:drawableLeft="@drawable/filter_plus_button"
-            android:drawablePadding="13dip"
-            android:text="@string/FLA_new_list"
-            style="@style/TextAppearance.FLA_Button"/>
-        
+                android:id="@+id/new_list_button"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:layout_margin="6dip"
+                android:gravity="left|center_vertical"
+                android:background="?attr/asThemeTextColor"
+                android:paddingLeft="2dip"
+                android:drawableLeft="@drawable/filter_plus_button"
+                android:drawablePadding="13dip"
+                android:text="@string/FLA_new_list"
+                style="@style/TextAppearance.FLA_Button"/>
+
     </LinearLayout>
 
     <!-- List -->
-    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_weight="100"
-        android:layout_alignParentTop="true"
-        android:layout_above="@id/lists_footer"
-        android:scrollbars="vertical"
-        android:divider="@android:color/transparent"
-        android:dividerHeight="1px"
-        android:background="@android:color/transparent"
-        android:cacheColorHint="#00000000"/>
-    
+    <com.todoroo.astrid.ui.ErrorCatchingListView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="100"
+            android:layout_alignParentTop="true"
+            android:layout_above="@id/lists_footer"
+            android:scrollbars="vertical"
+            android:divider="@android:color/transparent"
+            android:dividerHeight="1px"
+            android:background="@android:color/transparent"
+            android:cacheColorHint="#00000000"/>
+
 </RelativeLayout>
     
diff --git a/astrid/res/layout/filter_list_fragment_alternative.xml b/astrid/res/layout/filter_list_fragment_alternative.xml
index f39462f2b..73c0b99a2 100644
--- a/astrid/res/layout/filter_list_fragment_alternative.xml
+++ b/astrid/res/layout/filter_list_fragment_alternative.xml
@@ -5,22 +5,23 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content"
-    android:background="?attr/asListPopoverBg"
-    android:orientation="vertical">
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:background="?attr/asListPopoverBg"
+              android:orientation="vertical">
 
 
     <!-- List -->
-    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="370dip"
-        android:layout_alignParentTop="true"
-        android:scrollbars="vertical"
-        android:divider="@android:color/transparent"
-        android:dividerHeight="1px"
-        android:background="@android:color/transparent"
-        android:cacheColorHint="#00000000"/>
-        
+    <com.todoroo.astrid.ui.ErrorCatchingListView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="370dip"
+            android:layout_alignParentTop="true"
+            android:scrollbars="vertical"
+            android:divider="@android:color/transparent"
+            android:dividerHeight="1px"
+            android:background="@android:color/transparent"
+            android:cacheColorHint="#00000000"/>
+
 </LinearLayout>
     
diff --git a/astrid/res/layout/filter_list_fragment_alternative_3pane.xml b/astrid/res/layout/filter_list_fragment_alternative_3pane.xml
index 7b64e7178..5a628a0f0 100644
--- a/astrid/res/layout/filter_list_fragment_alternative_3pane.xml
+++ b/astrid/res/layout/filter_list_fragment_alternative_3pane.xml
@@ -5,22 +5,23 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent" 
-    android:layout_height="fill_parent"
-    android:background="@color/tablet_list_bg"
-    android:orientation="vertical">
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:background="@color/tablet_list_bg"
+              android:orientation="vertical">
 
 
     <!-- List -->
-    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_alignParentTop="true"
-        android:scrollbars="vertical"
-        android:divider="@android:color/transparent"
-        android:dividerHeight="1px"
-        android:background="@android:color/transparent"        
-        android:cacheColorHint="#00000000"/>
-        
+    <com.todoroo.astrid.ui.ErrorCatchingListView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_alignParentTop="true"
+            android:scrollbars="vertical"
+            android:divider="@android:color/transparent"
+            android:dividerHeight="1px"
+            android:background="@android:color/transparent"
+            android:cacheColorHint="#00000000"/>
+
 </LinearLayout>
     
diff --git a/astrid/res/layout/fla_separator.xml b/astrid/res/layout/fla_separator.xml
index 276a72234..21a3ef053 100644
--- a/astrid/res/layout/fla_separator.xml
+++ b/astrid/res/layout/fla_separator.xml
@@ -5,6 +5,6 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <View xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="1px"
-    style="@style/FLA_Separator"/>
\ No newline at end of file
+      android:layout_width="fill_parent"
+      android:layout_height="1px"
+      style="@style/FLA_Separator"/>
\ No newline at end of file
diff --git a/astrid/res/layout/gtasks_login_activity.xml b/astrid/res/layout/gtasks_login_activity.xml
index 18ce3d51c..ec0822a4f 100644
--- a/astrid/res/layout/gtasks_login_activity.xml
+++ b/astrid/res/layout/gtasks_login_activity.xml
@@ -5,35 +5,38 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    style="@style/Content">
+             android:layout_width="fill_parent"
+             android:layout_height="fill_parent"
+             style="@style/Content">
 
-  <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"/>
-        
-  <LinearLayout android:id="@android:id/empty"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="20dip"
-        android:paddingRight="20dip"
-        android:gravity="center"
-        android:orientation="vertical">
-        
-      <TextView
+    <com.todoroo.astrid.ui.ErrorCatchingListView
+            android:id="@android:id/list"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/gtasks_GLA_noaccounts"
-            android:gravity="center"
-            style="@style/TextAppearance.TLA_NoItems" />
-        
-      <Button android:id="@+id/empty_button"
+            android:layout_height="fill_parent"/>
+
+    <LinearLayout
+            android:id="@android:id/empty"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="50dip"
-            android:text="@string/DLG_ok" />
-        
-  </LinearLayout>
+            android:paddingLeft="20dip"
+            android:paddingRight="20dip"
+            android:gravity="center"
+            android:orientation="vertical">
+
+        <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/gtasks_GLA_noaccounts"
+                android:gravity="center"
+                style="@style/TextAppearance.TLA_NoItems"/>
+
+        <Button
+                android:id="@+id/empty_button"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="50dip"
+                android:text="@string/DLG_ok"/>
+
+    </LinearLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/header_nav_views.xml b/astrid/res/layout/header_nav_views.xml
index 2e6481f8d..fab5f62a4 100644
--- a/astrid/res/layout/header_nav_views.xml
+++ b/astrid/res/layout/header_nav_views.xml
@@ -5,75 +5,76 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal">
-    
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="horizontal">
+
     <ImageView
-        android:id="@+id/main_menu"
-        android:layout_width="51dip"
-        android:layout_height="fill_parent"
-        android:src="?attr/asMainMenu"
-        android:scaleType="fitCenter"/>
-        
-    <LinearLayout 
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-		android:layout_weight="1"
-		android:gravity="center_vertical">
-		<RelativeLayout 
-		    android:id="@+id/lists_nav"
-		    android:layout_width="wrap_content"
-		    android:layout_height="match_parent"
-		    android:layout_marginRight="5dip"
-		    android:layout_marginTop="5dip"
-		    android:layout_marginBottom="5dip"
-		    android:layout_marginLeft="0dip"
-		    android:paddingRight="5dip"
-		    android:paddingLeft="4dip"
-		    android:gravity="center_vertical">
-		    
-		    <TextView
-		        android:id="@+id/list_title"
-		        android:layout_width="wrap_content"
-		        android:layout_height="wrap_content"
-		        android:gravity="center_vertical"
-		        android:text="@string/BFE_Active"
-		        android:singleLine="true"
-		        android:layout_weight="1"
-		        android:ellipsize="end"
-		        style="@style/TextAppearance.ActionBar_ListsHeader"/>
-		    
-		    <ImageView
-		        android:id="@+id/list_disclosure_arrow"
-		        android:layout_width="12dip"
-		        android:layout_height="12dip"
-		        android:layout_marginLeft="10dip" 
-		        android:layout_toRightOf="@id/list_title"
-		        android:layout_alignBottom="@id/list_title"
-		        android:src="?attr/asListsDisclosure"
-		        android:scaleType="fitCenter"/>
-		
-		</RelativeLayout>
+            android:id="@+id/main_menu"
+            android:layout_width="51dip"
+            android:layout_height="fill_parent"
+            android:src="?attr/asMainMenu"
+            android:scaleType="fitCenter"/>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:gravity="center_vertical">
+
+        <RelativeLayout
+                android:id="@+id/lists_nav"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginRight="5dip"
+                android:layout_marginTop="5dip"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="0dip"
+                android:paddingRight="5dip"
+                android:paddingLeft="4dip"
+                android:gravity="center_vertical">
+
+            <TextView
+                    android:id="@+id/list_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:text="@string/BFE_Active"
+                    android:singleLine="true"
+                    android:layout_weight="1"
+                    android:ellipsize="end"
+                    style="@style/TextAppearance.ActionBar_ListsHeader"/>
+
+            <ImageView
+                    android:id="@+id/list_disclosure_arrow"
+                    android:layout_width="12dip"
+                    android:layout_height="12dip"
+                    android:layout_marginLeft="10dip"
+                    android:layout_toRightOf="@id/list_title"
+                    android:layout_alignBottom="@id/list_title"
+                    android:src="?attr/asListsDisclosure"
+                    android:scaleType="fitCenter"/>
+
+        </RelativeLayout>
     </LinearLayout>
-	
-    <TextView 
-        android:id="@+id/person_image"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:gravity="center_vertical"
-        android:singleLine="true"
-        android:paddingRight="5dip"
-        style="@style/TextAppearance.ActionBar_ListsHeader"
-        android:textSize="16sp"
-        android:visibility="gone"/>
-    
-	<Button 
-	    android:id="@+id/comments"
-	    android:layout_width="51dip"
-	    android:layout_height="fill_parent"
-	    android:background="?attr/asCommentButtonImg"
-	    android:textColor="?attr/asTextColorInverse"
-	    android:paddingBottom="6dip"/>
+
+    <TextView
+            android:id="@+id/person_image"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:paddingRight="5dip"
+            style="@style/TextAppearance.ActionBar_ListsHeader"
+            android:textSize="16sp"
+            android:visibility="gone"/>
+
+    <Button
+            android:id="@+id/comments"
+            android:layout_width="51dip"
+            android:layout_height="fill_parent"
+            android:background="?attr/asCommentButtonImg"
+            android:textColor="?attr/asTextColorInverse"
+            android:paddingBottom="6dip"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/header_title_view.xml b/astrid/res/layout/header_title_view.xml
index d81363d3d..65ef3af04 100644
--- a/astrid/res/layout/header_title_view.xml
+++ b/astrid/res/layout/header_title_view.xml
@@ -5,11 +5,11 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/title"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:paddingLeft="10dip"
-    android:paddingRight="10dip"
-    android:gravity="center_vertical"
-    style="@style/TextAppearance.ActionBar_ListsHeader"/>
\ No newline at end of file
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingLeft="10dip"
+        android:paddingRight="10dip"
+        android:gravity="center_vertical"
+        style="@style/TextAppearance.ActionBar_ListsHeader"/>
\ No newline at end of file
diff --git a/astrid/res/layout/help_popover.xml b/astrid/res/layout/help_popover.xml
index 3ac5fa708..d12cc27d2 100644
--- a/astrid/res/layout/help_popover.xml
+++ b/astrid/res/layout/help_popover.xml
@@ -5,37 +5,37 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
 
     <TextView
-        android:id="@+id/gdi_message"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/gdi_arrow_up"
-        android:gravity="center"
-        android:textColor="@android:color/white"
-        android:textSize="18sp"
-        android:textStyle="bold"
-        android:background="@drawable/popover_bg"
-        android:fadingEdgeLength="0dp"/>
+            android:id="@+id/gdi_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/gdi_arrow_up"
+            android:gravity="center"
+            android:textColor="@android:color/white"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            android:background="@drawable/popover_bg"
+            android:fadingEdgeLength="0dp"/>
 
     <ImageView
-        android:id="@+id/gdi_arrow_up"
-        android:layout_marginBottom="-15dip"
-        android:layout_width="27dip"
-        android:layout_height="27dip"
-        android:scaleType="fitCenter"
-        android:src="@drawable/popover_arrow_up" />
+            android:id="@+id/gdi_arrow_up"
+            android:layout_marginBottom="-15dip"
+            android:layout_width="27dip"
+            android:layout_height="27dip"
+            android:scaleType="fitCenter"
+            android:src="@drawable/popover_arrow_up"/>
 
     <ImageView
-        android:id="@+id/gdi_arrow_down"
-        android:layout_width="27dip"
-        android:layout_height="27dip"
-        android:scaleType="fitCenter"
-        android:layout_below="@id/gdi_message"
-        android:layout_marginTop="-16dip"
-        android:src="@drawable/popover_arrow_down" />
+            android:id="@+id/gdi_arrow_down"
+            android:layout_width="27dip"
+            android:layout_height="27dip"
+            android:scaleType="fitCenter"
+            android:layout_below="@id/gdi_message"
+            android:layout_marginTop="-16dip"
+            android:src="@drawable/popover_arrow_down"/>
 
 </RelativeLayout>
diff --git a/astrid/res/layout/list_dropdown_popover.xml b/astrid/res/layout/list_dropdown_popover.xml
index d735b043c..137281964 100644
--- a/astrid/res/layout/list_dropdown_popover.xml
+++ b/astrid/res/layout/list_dropdown_popover.xml
@@ -5,31 +5,31 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:paddingLeft="10dip">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="10dip">
 
     <FrameLayout
-        android:id="@+id/content"
-        android:layout_width="280dip"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/gdi_arrow_up"/>
+            android:id="@+id/content"
+            android:layout_width="280dip"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/gdi_arrow_up"/>
 
     <ImageView
-        android:id="@+id/gdi_arrow_up"
-        android:layout_width="27dip"
-        android:layout_height="27dip"
-        android:scaleType="fitCenter"
-        android:layout_marginBottom="-8dip"
-        android:src="?attr/asListArrowUp" />
+            android:id="@+id/gdi_arrow_up"
+            android:layout_width="27dip"
+            android:layout_height="27dip"
+            android:scaleType="fitCenter"
+            android:layout_marginBottom="-8dip"
+            android:src="?attr/asListArrowUp"/>
 
     <ImageView
-        android:id="@+id/gdi_arrow_down"
-        android:layout_width="27dip"
-        android:layout_height="27dip"
-        android:scaleType="fitCenter"
-        android:layout_marginBottom="-8dip"
-        android:layout_below="@android:id/list" />
+            android:id="@+id/gdi_arrow_down"
+            android:layout_width="27dip"
+            android:layout_height="27dip"
+            android:scaleType="fitCenter"
+            android:layout_marginBottom="-8dip"
+            android:layout_below="@android:id/list"/>
 
 </RelativeLayout>
diff --git a/astrid/res/layout/list_header.xml b/astrid/res/layout/list_header.xml
index a7526874a..0b69d55e9 100644
--- a/astrid/res/layout/list_header.xml
+++ b/astrid/res/layout/list_header.xml
@@ -5,11 +5,11 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/list_header_title"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="2dip"
-    android:paddingBottom="2dip"
-    android:paddingLeft="7dip"
-    style="@style/TEA_list_header" />
\ No newline at end of file
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/list_header_title"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="2dip"
+        android:paddingBottom="2dip"
+        android:paddingLeft="7dip"
+        style="@style/TEA_list_header"/>
\ No newline at end of file
diff --git a/astrid/res/layout/locale_edit_alerts.xml b/astrid/res/layout/locale_edit_alerts.xml
index a7a328c2e..2f409ff3c 100644
--- a/astrid/res/layout/locale_edit_alerts.xml
+++ b/astrid/res/layout/locale_edit_alerts.xml
@@ -5,59 +5,61 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    style="@style/Content">
-    
-    <!-- At runtime, we'll load the Locale background frame -->
-    <LinearLayout
-        android:id="@+id/frame"
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:orientation="vertical"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1">
+        android:layout_height="fill_parent"
+        style="@style/Content">
 
-        <TextView
+    <!-- At runtime, we'll load the Locale background frame -->
+    <LinearLayout
+            android:id="@+id/frame"
+            android:orientation="vertical"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:paddingBottom="10px"
-            android:gravity="center"
-            android:text="@string/locale_edit_intro"
-            style="@style/TextAppearance" />
-            
-            <FrameLayout
+            android:layout_weight="1">
+
+        <TextView
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:paddingBottom="10px"
+                android:gravity="center"
+                android:text="@string/locale_edit_intro"
+                style="@style/TextAppearance"/>
+
+        <FrameLayout
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
                 android:layout_weight="100"
                 android:layout_margin="10px"
                 android:background="@drawable/locale_border">
-    
-                <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
+
+            <com.todoroo.astrid.ui.ErrorCatchingListView
+                    android:id="@android:id/list"
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
                     android:scrollbars="vertical"
                     android:background="@android:color/black"
                     android:cacheColorHint="@android:color/black"/>
-                
-            </FrameLayout>
-                
-            <TextView
+
+        </FrameLayout>
+
+        <TextView
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="@string/locale_interval_label"
-                style="@style/TextAppearance" />
-        
-            <Spinner android:id="@+id/intervalSpinner"
+                style="@style/TextAppearance"/>
+
+        <Spinner
+                android:id="@+id/intervalSpinner"
                 android:layout_width="fill_parent"
-                android:layout_height="wrap_content" 
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:paddingBottom="10dip"
-                android:entries="@array/locale_interval" />
-            
+                android:entries="@array/locale_interval"/>
+
     </LinearLayout>
-    
+
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/main_menu_popover.xml b/astrid/res/layout/main_menu_popover.xml
index fc813ec27..0c225e09c 100644
--- a/astrid/res/layout/main_menu_popover.xml
+++ b/astrid/res/layout/main_menu_popover.xml
@@ -5,32 +5,33 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <com.todoroo.astrid.ui.TouchInterceptingFrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-	<RelativeLayout
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-	    android:paddingLeft="10dip">
-	
-	    <include layout="@layout/main_menu_popover_body"/>
-	
-	    <ImageView
-	        android:id="@+id/gdi_arrow_up"
-	        android:layout_width="27dip"
-	        android:layout_height="27dip"
-	        android:layout_marginLeft="-10dip"
-	        android:scaleType="fitCenter"
-	        android:layout_marginBottom="-8dip"
-	        android:src="?attr/asListArrowUp" />
-	
-	    <ImageView
-	        android:id="@+id/gdi_arrow_down"
-	        android:layout_width="27dip"
-	        android:layout_height="27dip"
-	        android:scaleType="fitCenter"
-	        android:layout_marginBottom="-8dip"
-	        android:layout_below="@android:id/list"/>
-	
-	</RelativeLayout>
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+    <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="10dip">
+
+        <include layout="@layout/main_menu_popover_body"/>
+
+        <ImageView
+                android:id="@+id/gdi_arrow_up"
+                android:layout_width="27dip"
+                android:layout_height="27dip"
+                android:layout_marginLeft="-10dip"
+                android:scaleType="fitCenter"
+                android:layout_marginBottom="-8dip"
+                android:src="?attr/asListArrowUp"/>
+
+        <ImageView
+                android:id="@+id/gdi_arrow_down"
+                android:layout_width="27dip"
+                android:layout_height="27dip"
+                android:scaleType="fitCenter"
+                android:layout_marginBottom="-8dip"
+                android:layout_below="@android:id/list"/>
+
+    </RelativeLayout>
 </com.todoroo.astrid.ui.TouchInterceptingFrameLayout>
diff --git a/astrid/res/layout/main_menu_popover_body.xml b/astrid/res/layout/main_menu_popover_body.xml
index 02cf1529f..eb6ca5e54 100644
--- a/astrid/res/layout/main_menu_popover_body.xml
+++ b/astrid/res/layout/main_menu_popover_body.xml
@@ -5,36 +5,43 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
+
     <ScrollView
-        android:layout_width="280dip"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/gdi_arrow_up"
-        android:paddingBottom="3dip"
-        android:background="?attr/asListPopoverBg">
-        <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="280dip"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-            <LinearLayout
-                android:id="@+id/topFixedItems"
-                android:layout_width="280dip"
+            android:layout_below="@+id/gdi_arrow_up"
+            android:paddingBottom="3dip"
+            android:background="?attr/asListPopoverBg">
+
+        <LinearLayout
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@android:color/transparent"
-                android:orientation="vertical"/>
+                android:orientation="vertical">
+
+            <LinearLayout
+                    android:id="@+id/topFixedItems"
+                    android:layout_width="280dip"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
+                    android:orientation="vertical"/>
+
             <include layout="@layout/fla_separator"/>
+
             <LinearLayout
-                android:id="@+id/content"
-                android:layout_width="280dip"
-                android:layout_height="wrap_content"
-                android:background="@android:color/transparent"
-                android:orientation="vertical"/>
+                    android:id="@+id/content"
+                    android:layout_width="280dip"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
+                    android:orientation="vertical"/>
+
             <include layout="@layout/fla_separator"/>
+
             <LinearLayout
-                android:id="@+id/bottomFixedItems"
-                android:layout_width="280dip"
-                android:layout_height="wrap_content"
-                android:background="@android:color/transparent"
-                android:orientation="vertical"/>
+                    android:id="@+id/bottomFixedItems"
+                    android:layout_width="280dip"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
+                    android:orientation="vertical"/>
         </LinearLayout>
     </ScrollView>
 </merge>
\ No newline at end of file
diff --git a/astrid/res/layout/main_menu_popover_body_tablet.xml b/astrid/res/layout/main_menu_popover_body_tablet.xml
index 25ebfc632..6ca94da6c 100644
--- a/astrid/res/layout/main_menu_popover_body_tablet.xml
+++ b/astrid/res/layout/main_menu_popover_body_tablet.xml
@@ -5,35 +5,42 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
+
     <ScrollView
-        android:layout_width="280dip"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/gdi_arrow_up"
-        android:background="@drawable/list_popover_bg_white">
-        <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="280dip"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-	        <LinearLayout
-	            android:id="@+id/topFixedItems"
-	            android:layout_width="280dip"
-	            android:layout_height="wrap_content"
-	            android:background="@android:color/transparent"
-	            android:orientation="vertical"/>
-	        <include layout="@layout/fla_separator"/>
-		    <LinearLayout
-		        android:id="@+id/content"
-		        android:layout_width="280dip"
-		        android:layout_height="wrap_content"
-		        android:background="@android:color/transparent"
-		        android:orientation="vertical"/>
-	        <include layout="@layout/fla_separator"/>
-	        <LinearLayout
-	            android:id="@+id/bottomFixedItems"
-	            android:layout_width="280dip"
-	            android:layout_height="wrap_content"
-	            android:background="@android:color/transparent"
-	            android:orientation="vertical"/>
+            android:layout_below="@+id/gdi_arrow_up"
+            android:background="@drawable/list_popover_bg_white">
+
+        <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+            <LinearLayout
+                    android:id="@+id/topFixedItems"
+                    android:layout_width="280dip"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
+                    android:orientation="vertical"/>
+
+            <include layout="@layout/fla_separator"/>
+
+            <LinearLayout
+                    android:id="@+id/content"
+                    android:layout_width="280dip"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
+                    android:orientation="vertical"/>
+
+            <include layout="@layout/fla_separator"/>
+
+            <LinearLayout
+                    android:id="@+id/bottomFixedItems"
+                    android:layout_width="280dip"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
+                    android:orientation="vertical"/>
         </LinearLayout>
     </ScrollView>
 </merge>
diff --git a/astrid/res/layout/main_menu_popover_body_tablet_phone_layout.xml b/astrid/res/layout/main_menu_popover_body_tablet_phone_layout.xml
index 482b2fb29..ab7b6b2a0 100644
--- a/astrid/res/layout/main_menu_popover_body_tablet_phone_layout.xml
+++ b/astrid/res/layout/main_menu_popover_body_tablet_phone_layout.xml
@@ -5,35 +5,42 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
+
     <ScrollView
-        android:layout_width="280dip"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/gdi_arrow_up"
-        android:background="?attr/asListPopoverBg">
-        <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="280dip"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-	        <LinearLayout
-	            android:id="@+id/topFixedItems"
-	            android:layout_width="280dip"
-	            android:layout_height="wrap_content"
-	            android:background="@android:color/transparent"
-	            android:orientation="vertical"/>
-	        <include layout="@layout/fla_separator"/>
-		    <LinearLayout
-		        android:id="@+id/content"
-		        android:layout_width="280dip"
-		        android:layout_height="wrap_content"
-		        android:background="@android:color/transparent"
-		        android:orientation="vertical"/>
-	        <include layout="@layout/fla_separator"/>
-	        <LinearLayout
-	            android:id="@+id/bottomFixedItems"
-	            android:layout_width="280dip"
-	            android:layout_height="wrap_content"
-	            android:background="@android:color/transparent"
-	            android:orientation="vertical"/>
+            android:layout_below="@+id/gdi_arrow_up"
+            android:background="?attr/asListPopoverBg">
+
+        <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+            <LinearLayout
+                    android:id="@+id/topFixedItems"
+                    android:layout_width="280dip"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
+                    android:orientation="vertical"/>
+
+            <include layout="@layout/fla_separator"/>
+
+            <LinearLayout
+                    android:id="@+id/content"
+                    android:layout_width="280dip"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
+                    android:orientation="vertical"/>
+
+            <include layout="@layout/fla_separator"/>
+
+            <LinearLayout
+                    android:id="@+id/bottomFixedItems"
+                    android:layout_width="280dip"
+                    android:layout_height="wrap_content"
+                    android:background="@android:color/transparent"
+                    android:orientation="vertical"/>
         </LinearLayout>
     </ScrollView>
 </merge>
diff --git a/astrid/res/layout/main_menu_popover_tablet.xml b/astrid/res/layout/main_menu_popover_tablet.xml
index 3bfe45dbe..f682a0ff7 100644
--- a/astrid/res/layout/main_menu_popover_tablet.xml
+++ b/astrid/res/layout/main_menu_popover_tablet.xml
@@ -5,31 +5,32 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <com.todoroo.astrid.ui.TouchInterceptingFrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-	<RelativeLayout
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-	    android:paddingLeft="10dip">
-	
-	    <include layout="@layout/main_menu_popover_body_tablet"/>
-	
-	    <ImageView
-	        android:id="@+id/gdi_arrow_up"
-	        android:layout_width="27dip"
-	        android:layout_height="27dip"
-	        android:layout_marginLeft="-10dip"
-	        android:scaleType="fitCenter"
-	        android:layout_marginBottom="-8dip"
-	        android:src="@drawable/list_arrow_up_white" />
-	
-	    <ImageView
-	        android:id="@+id/gdi_arrow_down"
-	        android:layout_width="27dip"
-	        android:layout_height="27dip"
-	        android:scaleType="fitCenter"
-	        android:layout_marginBottom="-8dip"
-	        android:layout_below="@android:id/list"/>
-	</RelativeLayout>
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+    <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="10dip">
+
+        <include layout="@layout/main_menu_popover_body_tablet"/>
+
+        <ImageView
+                android:id="@+id/gdi_arrow_up"
+                android:layout_width="27dip"
+                android:layout_height="27dip"
+                android:layout_marginLeft="-10dip"
+                android:scaleType="fitCenter"
+                android:layout_marginBottom="-8dip"
+                android:src="@drawable/list_arrow_up_white"/>
+
+        <ImageView
+                android:id="@+id/gdi_arrow_down"
+                android:layout_width="27dip"
+                android:layout_height="27dip"
+                android:scaleType="fitCenter"
+                android:layout_marginBottom="-8dip"
+                android:layout_below="@android:id/list"/>
+    </RelativeLayout>
 </com.todoroo.astrid.ui.TouchInterceptingFrameLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/main_menu_popover_tablet_phone_layout.xml b/astrid/res/layout/main_menu_popover_tablet_phone_layout.xml
index dc10d8c38..2eaeb74ff 100644
--- a/astrid/res/layout/main_menu_popover_tablet_phone_layout.xml
+++ b/astrid/res/layout/main_menu_popover_tablet_phone_layout.xml
@@ -5,31 +5,32 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <com.todoroo.astrid.ui.TouchInterceptingFrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-	<RelativeLayout
-	    android:layout_width="wrap_content"
-	    android:layout_height="wrap_content"
-	    android:paddingLeft="10dip">
-	
-	    <include layout="@layout/main_menu_popover_body_tablet_phone_layout"/>
-	
-	    <ImageView
-	        android:id="@+id/gdi_arrow_up"
-	        android:layout_width="27dip"
-	        android:layout_height="27dip"
-	        android:layout_marginLeft="-10dip"
-	        android:scaleType="fitCenter"
-	        android:layout_marginBottom="-8dip"
-	        android:src="?attr/asListArrowUp" />
-	
-	    <ImageView
-	        android:id="@+id/gdi_arrow_down"
-	        android:layout_width="27dip"
-	        android:layout_height="27dip"
-	        android:scaleType="fitCenter"
-	        android:layout_marginBottom="-8dip"
-	        android:layout_below="@android:id/list"/>
-	</RelativeLayout>
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+    <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="10dip">
+
+        <include layout="@layout/main_menu_popover_body_tablet_phone_layout"/>
+
+        <ImageView
+                android:id="@+id/gdi_arrow_up"
+                android:layout_width="27dip"
+                android:layout_height="27dip"
+                android:layout_marginLeft="-10dip"
+                android:scaleType="fitCenter"
+                android:layout_marginBottom="-8dip"
+                android:src="?attr/asListArrowUp"/>
+
+        <ImageView
+                android:id="@+id/gdi_arrow_down"
+                android:layout_width="27dip"
+                android:layout_height="27dip"
+                android:scaleType="fitCenter"
+                android:layout_marginBottom="-8dip"
+                android:layout_below="@android:id/list"/>
+    </RelativeLayout>
 </com.todoroo.astrid.ui.TouchInterceptingFrameLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/main_menu_row.xml b/astrid/res/layout/main_menu_row.xml
index 10be810f6..0f627154c 100644
--- a/astrid/res/layout/main_menu_row.xml
+++ b/astrid/res/layout/main_menu_row.xml
@@ -5,32 +5,34 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="44dip"
-    android:minHeight="44dip"
-    android:background="@android:drawable/list_selector_background"
-    android:paddingTop="5dip"
-    android:paddingBottom="5dip"
-    android:paddingRight="6dip"
-    android:gravity="center_vertical"
-    android:orientation="horizontal">
-        
+              android:layout_width="fill_parent"
+              android:layout_height="44dip"
+              android:minHeight="44dip"
+              android:background="@android:drawable/list_selector_background"
+              android:paddingTop="5dip"
+              android:paddingBottom="5dip"
+              android:paddingRight="6dip"
+              android:gravity="center_vertical"
+              android:orientation="horizontal">
+
     <!-- filter icon -->
-    <ImageView android:id="@+id/icon"
-        android:layout_width="36dip"
-        android:layout_height="36dip"
-        android:layout_alignParentLeft="true"
-        android:layout_marginLeft="12dip"
-        android:scaleType="fitCenter"/>
-            
+    <ImageView
+            android:id="@+id/icon"
+            android:layout_width="36dip"
+            android:layout_height="36dip"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="12dip"
+            android:scaleType="fitCenter"/>
+
     <!-- filter name -->
-    <TextView android:id="@+id/name"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_marginLeft="12dp"
-        android:paddingRight="30dp"
-        android:checked="false"
-        android:gravity="center_vertical" 
-        style="@style/TextAppearance.FLA_Filter"/>
-                    
+    <TextView
+            android:id="@+id/name"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginLeft="12dp"
+            android:paddingRight="30dp"
+            android:checked="false"
+            android:gravity="center_vertical"
+            style="@style/TextAppearance.FLA_Filter"/>
+
 </LinearLayout>
diff --git a/astrid/res/layout/main_menu_row_tablet.xml b/astrid/res/layout/main_menu_row_tablet.xml
index c1db7ffff..066a73062 100644
--- a/astrid/res/layout/main_menu_row_tablet.xml
+++ b/astrid/res/layout/main_menu_row_tablet.xml
@@ -5,34 +5,36 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="44dip"
-    android:minHeight="44dip"
-    android:background="@android:drawable/list_selector_background"
-    android:paddingTop="5dip"
-    android:paddingBottom="5dip"
-    android:paddingRight="6dip"
-    android:gravity="center_vertical"
-    android:orientation="horizontal">
-        
+              android:layout_width="fill_parent"
+              android:layout_height="44dip"
+              android:minHeight="44dip"
+              android:background="@android:drawable/list_selector_background"
+              android:paddingTop="5dip"
+              android:paddingBottom="5dip"
+              android:paddingRight="6dip"
+              android:gravity="center_vertical"
+              android:orientation="horizontal">
+
     <!-- filter icon -->
-    <ImageView android:id="@+id/icon"
-        android:layout_width="36dip"
-        android:layout_height="36dip"
-        android:layout_alignParentLeft="true"
-        android:layout_marginLeft="12dip"
-        android:scaleType="fitCenter"/>
-            
+    <ImageView
+            android:id="@+id/icon"
+            android:layout_width="36dip"
+            android:layout_height="36dip"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="12dip"
+            android:scaleType="fitCenter"/>
+
     <!-- filter name -->
-    <TextView android:id="@+id/name"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_marginLeft="12dp"
-        android:paddingRight="30dp"
-        android:checked="false"
-        android:gravity="center_vertical" 
-        android:textSize="18sp"
-        android:textStyle="bold"
-        android:textColor="#000000"/>
-                    
+    <TextView
+            android:id="@+id/name"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_marginLeft="12dp"
+            android:paddingRight="30dp"
+            android:checked="false"
+            android:gravity="center_vertical"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            android:textColor="#000000"/>
+
 </LinearLayout>
diff --git a/astrid/res/layout/missed_call_activity.xml b/astrid/res/layout/missed_call_activity.xml
index ca9f38c85..4d94c8d47 100644
--- a/astrid/res/layout/missed_call_activity.xml
+++ b/astrid/res/layout/missed_call_activity.xml
@@ -5,10 +5,10 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" 
-    android:gravity="center">
-    
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:gravity="center">
+
     <include layout="@layout/astrid_missed_call_view"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/n_number_picker_dialog.xml b/astrid/res/layout/n_number_picker_dialog.xml
index a6a0d5474..6ae488f80 100644
--- a/astrid/res/layout/n_number_picker_dialog.xml
+++ b/astrid/res/layout/n_number_picker_dialog.xml
@@ -17,11 +17,11 @@
 */
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/container"
-        android:gravity="center"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:padding="5dip">
+              android:id="@+id/container"
+              android:gravity="center"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:orientation="horizontal"
+              android:padding="5dip">
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/no_members_text_view.xml b/astrid/res/layout/no_members_text_view.xml
index 35571a8b0..c9a3a3527 100644
--- a/astrid/res/layout/no_members_text_view.xml
+++ b/astrid/res/layout/no_members_text_view.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/no_members"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	android:gravity="center_vertical"
-	style="@style/TextAppearance"
-	android:textStyle="bold"
-	android:textColor="#333333"
-	android:text="@string/actfm_TVA_no_members_alert"/>
\ No newline at end of file
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/no_members"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center_vertical"
+        style="@style/TextAppearance"
+        android:textStyle="bold"
+        android:textColor="#333333"
+        android:text="@string/actfm_TVA_no_members_alert"/>
\ No newline at end of file
diff --git a/astrid/res/layout/note_decoration.xml b/astrid/res/layout/note_decoration.xml
index 9c7d09678..8e3729459 100644
--- a/astrid/res/layout/note_decoration.xml
+++ b/astrid/res/layout/note_decoration.xml
@@ -5,21 +5,21 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="top">
-    
-    <ImageButton 
-        android:id="@+id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingTop="8dip"
-        android:paddingLeft="8dip"
-        android:paddingRight="8dip"
-        android:scaleType="center"
-        android:background="#00000000"
-        android:src="@drawable/task_notes" />
-        
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_gravity="top">
+
+    <ImageButton
+            android:id="@+id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingTop="8dip"
+            android:paddingLeft="8dip"
+            android:paddingRight="8dip"
+            android:scaleType="center"
+            android:background="#00000000"
+            android:src="@drawable/task_notes"/>
+
 </FrameLayout>              
 
 
diff --git a/astrid/res/layout/notes_view_dialog.xml b/astrid/res/layout/notes_view_dialog.xml
index 4e33a06ee..f8972e3d7 100644
--- a/astrid/res/layout/notes_view_dialog.xml
+++ b/astrid/res/layout/notes_view_dialog.xml
@@ -5,33 +5,36 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-  
-  <!-- notes -->
-  <ScrollView
-      android:layout_width="fill_parent"
-   	  android:layout_height="wrap_content"
-      android:layout_weight="100">
-	  <LinearLayout
-	    android:orientation="horizontal"
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content">
-	    <TextView
-	      android:id="@+id/notes"
-	      android:layout_width="wrap_content"
-	      android:layout_height="wrap_content"
-	      android:layout_marginLeft="9dip"
-	      android:layout_marginRight="9dip"
-	      android:layout_weight="100"
-	      android:scrollbars="vertical"
-	      android:gravity="top"
-	      android:capitalize="sentences"
-	      android:textSize="18sp"
-	      android:singleLine="false" />
-	  </LinearLayout>
-  </ScrollView>
-  <include layout="@layout/control_dialog_ok"/>
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+
+    <!-- notes -->
+    <ScrollView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="100">
+
+        <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+
+            <TextView
+                    android:id="@+id/notes"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="9dip"
+                    android:layout_marginRight="9dip"
+                    android:layout_weight="100"
+                    android:scrollbars="vertical"
+                    android:gravity="top"
+                    android:capitalize="sentences"
+                    android:textSize="18sp"
+                    android:singleLine="false"/>
+        </LinearLayout>
+    </ScrollView>
+
+    <include layout="@layout/control_dialog_ok"/>
 </LinearLayout>
diff --git a/astrid/res/layout/number_picker.xml b/astrid/res/layout/number_picker.xml
index 4dfe7813f..4d3c1e315 100644
--- a/astrid/res/layout/number_picker.xml
+++ b/astrid/res/layout/number_picker.xml
@@ -18,13 +18,15 @@
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <com.todoroo.astrid.ui.NumberPickerButton android:id="@+id/increment"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/timepicker_up_btn"
-        />
-        
-        <EditText android:id="@+id/timepicker_input"
+    <com.todoroo.astrid.ui.NumberPickerButton
+            android:id="@+id/increment"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/timepicker_up_btn"
+            />
+
+    <EditText
+            android:id="@+id/timepicker_input"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             style="?android:attr/textAppearanceLargeInverse"
@@ -34,11 +36,12 @@
             android:textSize="30sp"
             android:background="@drawable/timepicker_input"
             />
-        
-    <com.todoroo.astrid.ui.NumberPickerButton android:id="@+id/decrement"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/timepicker_down_btn"
-        />
-        
+
+    <com.todoroo.astrid.ui.NumberPickerButton
+            android:id="@+id/decrement"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/timepicker_down_btn"
+            />
+
 </merge>
diff --git a/astrid/res/layout/number_picker_dialog.xml b/astrid/res/layout/number_picker_dialog.xml
index 7e66b3e75..171514dfe 100644
--- a/astrid/res/layout/number_picker_dialog.xml
+++ b/astrid/res/layout/number_picker_dialog.xml
@@ -17,10 +17,12 @@
 */
 -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="5dip">
-    <com.todoroo.astrid.ui.NumberPicker android:id="@+id/numberPicker"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:padding="5dip">
+
+    <com.todoroo.astrid.ui.NumberPicker
+            android:id="@+id/numberPicker"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"/>
 </FrameLayout>
diff --git a/astrid/res/layout/oauth_login_activity.xml b/astrid/res/layout/oauth_login_activity.xml
index 1a334a3cb..8c1b77991 100644
--- a/astrid/res/layout/oauth_login_activity.xml
+++ b/astrid/res/layout/oauth_login_activity.xml
@@ -5,12 +5,13 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    
-    <WebView android:id="@+id/browser"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"/>
-        
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent">
+
+    <WebView
+            android:id="@+id/browser"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"/>
+
 </LinearLayout>
diff --git a/astrid/res/layout/preference_draggable_row.xml b/astrid/res/layout/preference_draggable_row.xml
index f0a9db6bc..6820936dd 100644
--- a/astrid/res/layout/preference_draggable_row.xml
+++ b/astrid/res/layout/preference_draggable_row.xml
@@ -5,33 +5,34 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-    android:layout_width="fill_parent"
-    android:layout_height="52dip"
-    android:paddingTop="2dip"
-    android:paddingBottom="2dip"
-    android:paddingLeft="4dip"
-    android:paddingRight="4dip"
-    android:orientation="horizontal">
-    
+              android:layout_width="fill_parent"
+              android:layout_height="52dip"
+              android:paddingTop="2dip"
+              android:paddingBottom="2dip"
+              android:paddingLeft="4dip"
+              android:paddingRight="4dip"
+              android:orientation="horizontal">
+
     <!-- grabber -->
     <LinearLayout
-        android:id="@+id/row_body"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:orientation="horizontal"
-        android:gravity="center_vertical">
-	    <ImageView android:id="@+id/grabber"
-	        android:layout_width="wrap_content"
-	        android:layout_height="fill_parent"
-	        android:scaleType="center"
-	        android:src="@drawable/grabber"/>
-	    
-	    <TextView
-	        android:id="@+id/text"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:paddingLeft="10dip"
-	        android:textAppearance="?android:attr/textAppearanceLarge"/>
+            android:id="@+id/row_body"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:orientation="horizontal"
+            android:gravity="center_vertical">
+
+        <ImageView
+                android:id="@+id/grabber"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:scaleType="center"
+                android:src="@drawable/grabber"/>
+
+        <TextView
+                android:id="@+id/text"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="10dip"
+                android:textAppearance="?android:attr/textAppearanceLarge"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/astrid/res/layout/quick_add_bar.xml b/astrid/res/layout/quick_add_bar.xml
index d028f1f7e..f5407d19b 100644
--- a/astrid/res/layout/quick_add_bar.xml
+++ b/astrid/res/layout/quick_add_bar.xml
@@ -5,99 +5,104 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
+
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/asQuickaddBackgroundColor"
-        android:orientation="vertical">
-        <View
             android:layout_width="fill_parent"
-            android:layout_height="1px"
-            android:background="?attr/asThemeTextColor"/>
-	    <LinearLayout
-	        android:layout_width="fill_parent" 
-	        android:layout_height="wrap_content"
-	        android:minHeight="49dip"
-	        android:padding="3dip"
-	        android:paddingBottom="0dip"
-	        android:gravity="center_vertical"
-	        android:orientation="horizontal">
-	        
-	        <!-- Voice Add Button -->
-	        <ImageButton android:id="@+id/voiceAddButton"
-	            android:layout_width="39dip"
-	            android:layout_height="39dip"
-	            android:layout_gravity="top"
-	            android:layout_marginTop="-2dip"
-	            android:layout_marginLeft="4dip"
-	            android:layout_marginRight="2dip"
-	            android:paddingLeft="10dip"
-	            android:paddingRight="10dip"
-	            android:layout_weight="1"
-	            android:visibility="gone"
-	            android:background="@android:color/transparent"
-	            android:src="?attr/asMicButtonImg"
-	            android:scaleType="center"/> 
-	    
-	        <!-- Quick Add Task -->
-	        <EditText android:id="@+id/quickAddText"
-	            android:layout_width="wrap_content"
-	            android:layout_height="39dip"
-	            android:layout_marginRight="8dip"
-	            android:layout_marginLeft="5dip"
-	            android:layout_marginBottom="2dip"
-	            android:layout_marginTop="2dip"
-	            android:layout_weight="100"
-	            android:paddingLeft="5dip"
-	            android:background="?attr/asEditTextBackground"
-	            android:textColor="?attr/asTextColor"
-	            android:hint="@string/TLA_quick_add_hint"
-	            android:textSize="16sp"
-	            android:autoText="true"
-	            android:capitalize="sentences"/>
-	        
-	        <!-- Extended Add Button -->
-	        <ImageButton android:id="@+id/quickAddButton"
-	            android:layout_width="39dip"
-	            android:layout_height="39dip"
-	            android:layout_marginRight="5dip"
-	            android:layout_weight="1"
-	            android:background="@android:color/transparent"
-	            android:src="?attr/asAddButtonImg"
-	            android:scaleType="center"/> 
-	
-	    </LinearLayout>
-	  
-	    
-	    
-	    <LinearLayout
-	        android:id="@+id/taskListQuickaddControlsContainer"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:orientation="vertical"
-	        android:paddingBottom="5dip"
-	        android:background="#22000000"
-	        android:visibility="gone">
-	        
-            <View 
+            android:layout_height="wrap_content"
+            android:background="?attr/asQuickaddBackgroundColor"
+            android:orientation="vertical">
+
+        <View
                 android:layout_width="fill_parent"
                 android:layout_height="1px"
-                android:background="?attr/asSeparatorBackground"/> 
-                           
-	        <LinearLayout 
-	            android:id="@+id/taskListQuickaddControls"
-	            android:layout_width="fill_parent"
-	            android:layout_height="50dip"
-	            android:orientation="horizontal">
-	            
-	            <View 
-	                android:layout_height="fill_parent"
-	                android:layout_width="1px"
-	                android:background="?attr/asSeparatorBackground"/>            
-	            
-	        </LinearLayout>
-	    
-	    </LinearLayout>
+                android:background="?attr/asThemeTextColor"/>
+
+        <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="49dip"
+                android:padding="3dip"
+                android:paddingBottom="0dip"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+            <!-- Voice Add Button -->
+            <ImageButton
+                    android:id="@+id/voiceAddButton"
+                    android:layout_width="39dip"
+                    android:layout_height="39dip"
+                    android:layout_gravity="top"
+                    android:layout_marginTop="-2dip"
+                    android:layout_marginLeft="4dip"
+                    android:layout_marginRight="2dip"
+                    android:paddingLeft="10dip"
+                    android:paddingRight="10dip"
+                    android:layout_weight="1"
+                    android:visibility="gone"
+                    android:background="@android:color/transparent"
+                    android:src="?attr/asMicButtonImg"
+                    android:scaleType="center"/>
+
+            <!-- Quick Add Task -->
+            <EditText
+                    android:id="@+id/quickAddText"
+                    android:layout_width="wrap_content"
+                    android:layout_height="39dip"
+                    android:layout_marginRight="8dip"
+                    android:layout_marginLeft="5dip"
+                    android:layout_marginBottom="2dip"
+                    android:layout_marginTop="2dip"
+                    android:layout_weight="100"
+                    android:paddingLeft="5dip"
+                    android:background="?attr/asEditTextBackground"
+                    android:textColor="?attr/asTextColor"
+                    android:hint="@string/TLA_quick_add_hint"
+                    android:textSize="16sp"
+                    android:autoText="true"
+                    android:capitalize="sentences"/>
+
+            <!-- Extended Add Button -->
+            <ImageButton
+                    android:id="@+id/quickAddButton"
+                    android:layout_width="39dip"
+                    android:layout_height="39dip"
+                    android:layout_marginRight="5dip"
+                    android:layout_weight="1"
+                    android:background="@android:color/transparent"
+                    android:src="?attr/asAddButtonImg"
+                    android:scaleType="center"/>
+
+        </LinearLayout>
+
+
+        <LinearLayout
+                android:id="@+id/taskListQuickaddControlsContainer"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingBottom="5dip"
+                android:background="#22000000"
+                android:visibility="gone">
+
+            <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="1px"
+                    android:background="?attr/asSeparatorBackground"/>
+
+            <LinearLayout
+                    android:id="@+id/taskListQuickaddControls"
+                    android:layout_width="fill_parent"
+                    android:layout_height="50dip"
+                    android:orientation="horizontal">
+
+                <View
+                        android:layout_height="fill_parent"
+                        android:layout_width="1px"
+                        android:background="?attr/asSeparatorBackground"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
     </LinearLayout>
-  
+
 </merge>
\ No newline at end of file
diff --git a/astrid/res/layout/repeat_until_dialog.xml b/astrid/res/layout/repeat_until_dialog.xml
index b95f7248f..8a1332628 100644
--- a/astrid/res/layout/repeat_until_dialog.xml
+++ b/astrid/res/layout/repeat_until_dialog.xml
@@ -5,38 +5,43 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <ScrollView
-	 xmlns:android="http://schemas.android.com/apk/res/android"
-	 xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-     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"
-			astrid:shortcutLabels="@array/repeat_until_shortcuts"/>
-		<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>
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+        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"
+                astrid:shortcutLabels="@array/repeat_until_shortcuts"/>
+
+        <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>
\ No newline at end of file
diff --git a/astrid/res/layout/reusable_task_adapter_row.xml b/astrid/res/layout/reusable_task_adapter_row.xml
index 05141022e..8814106ca 100644
--- a/astrid/res/layout/reusable_task_adapter_row.xml
+++ b/astrid/res/layout/reusable_task_adapter_row.xml
@@ -1,32 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- See the file "LICENSE" for the full license governing this code. -->
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/asTaskRowSelector"
-    android:orientation="horizontal"
-    android:gravity="center_vertical">
-	    
-    <ImageView 
-        android:id="@+id/clone_task"
-        android:layout_width="45dip"
-        android:layout_height="45dip"
-        android:layout_centerVertical="true"
-        android:src="@drawable/btn_clone"
-        android:scaleType="fitCenter"
-        android:padding="6dip"/>
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/asTaskRowSelector"
+        android:orientation="horizontal"
+        android:gravity="center_vertical">
+
+    <ImageView
+            android:id="@+id/clone_task"
+            android:layout_width="45dip"
+            android:layout_height="45dip"
+            android:layout_centerVertical="true"
+            android:src="@drawable/btn_clone"
+            android:scaleType="fitCenter"
+            android:padding="6dip"/>
 
     <!-- task name -->
     <TextView
-        android:id="@+id/title"
-        style="@style/TextAppearance.TAd_ItemTitle"
-        android:layout_marginLeft="3dip"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="100"
-        android:gravity="center_vertical"
-        android:maxLines="2" />
+            android:id="@+id/title"
+            style="@style/TextAppearance.TAd_ItemTitle"
+            android:layout_marginLeft="3dip"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="100"
+            android:gravity="center_vertical"
+            android:maxLines="2"/>
 
 </LinearLayout>
diff --git a/astrid/res/layout/share_activity.xml b/astrid/res/layout/share_activity.xml
index 6e88af5ac..23fcb40da 100644
--- a/astrid/res/layout/share_activity.xml
+++ b/astrid/res/layout/share_activity.xml
@@ -1,87 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" 
-    android:background="#eee" >
-    
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:background="#eee">
+
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:layout_marginTop="50dip"
-        android:orientation="horizontal">
-        
+            android:layout_width="fill_parent"
+            android:layout_height="50dip"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:layout_marginTop="50dip"
+            android:orientation="horizontal">
+
         <ImageView
-            android:layout_width="30dip"
-            android:layout_height="30dip"
-            android:layout_marginRight="20dip"
-            android:scaleType="fitCenter"
-            android:src="@drawable/share_facebook"/>
-        
+                android:layout_width="30dip"
+                android:layout_height="30dip"
+                android:layout_marginRight="20dip"
+                android:scaleType="fitCenter"
+                android:src="@drawable/share_facebook"/>
+
         <TextView
-	        android:id="@+id/share_facebook"
-	        android:gravity="center_vertical"
-	        android:layout_width="150dip"
-	        android:layout_height="fill_parent"
-	        android:textSize="16sp"
-	        android:textStyle="bold"
-	        android:textColor="?attr/asThemeTextColor"/>
-        
+                android:id="@+id/share_facebook"
+                android:gravity="center_vertical"
+                android:layout_width="150dip"
+                android:layout_height="fill_parent"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:textColor="?attr/asThemeTextColor"/>
+
     </LinearLayout>
 
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:orientation="horizontal">
-        
+            android:layout_width="fill_parent"
+            android:layout_height="50dip"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="horizontal">
+
         <ImageView
-            android:layout_width="30dip"
-            android:layout_height="30dip"
-            android:layout_marginRight="20dip"
-            android:scaleType="fitCenter"
-            android:src="@drawable/share_twitter"/>
-        
+                android:layout_width="30dip"
+                android:layout_height="30dip"
+                android:layout_marginRight="20dip"
+                android:scaleType="fitCenter"
+                android:src="@drawable/share_twitter"/>
+
         <TextView
-	        android:id="@+id/share_twitter"
-	        android:gravity="center_vertical"
-	        android:layout_width="150dip"
-	        android:layout_height="fill_parent"
-	        android:textSize="16sp"
-	        android:textStyle="bold"
-	        android:textColor="?attr/asThemeTextColor"/>
-        
+                android:id="@+id/share_twitter"
+                android:gravity="center_vertical"
+                android:layout_width="150dip"
+                android:layout_height="fill_parent"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:textColor="?attr/asThemeTextColor"/>
+
     </LinearLayout>
-    
+
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:layout_marginBottom="50dip">
-        
+            android:layout_width="fill_parent"
+            android:layout_height="50dip"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:layout_marginBottom="50dip">
+
         <ImageView
-            android:layout_width="30dip"
-            android:layout_height="30dip"
-            android:layout_marginRight="20dip"
-            android:scaleType="fitCenter"
-            android:src="@drawable/share_google"/>
-        
+                android:layout_width="30dip"
+                android:layout_height="30dip"
+                android:layout_marginRight="20dip"
+                android:scaleType="fitCenter"
+                android:src="@drawable/share_google"/>
+
         <TextView
-	        android:id="@+id/share_google"
-	        android:gravity="center_vertical"
-	        android:layout_width="150dip"
-	        android:layout_height="fill_parent"
-	        android:textSize="16sp"
-	        android:textStyle="bold"
-	        android:textColor="?attr/asThemeTextColor"/>
-        
+                android:id="@+id/share_google"
+                android:gravity="center_vertical"
+                android:layout_width="150dip"
+                android:layout_height="fill_parent"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:textColor="?attr/asThemeTextColor"/>
+
     </LinearLayout>
-    
+
     <include layout="@layout/astrid_speech_bubble"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/simple_list_item_multiple_choice_themed.xml b/astrid/res/layout/simple_list_item_multiple_choice_themed.xml
index d207980ed..4257bfac9 100644
--- a/astrid/res/layout/simple_list_item_multiple_choice_themed.xml
+++ b/astrid/res/layout/simple_list_item_multiple_choice_themed.xml
@@ -5,13 +5,13 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:textAppearance="?android:attr/textAppearanceLarge"
-    android:gravity="center_vertical"
-    android:checkMark="?android:attr/listChoiceIndicatorMultiple"
-    android:paddingLeft="8dip"
-    android:paddingRight="8dip"
-    android:textColor="?attr/asTextColor"
-/>
\ No newline at end of file
+                 android:id="@android:id/text1"
+                 android:layout_width="match_parent"
+                 android:layout_height="?android:attr/listPreferredItemHeight"
+                 android:textAppearance="?android:attr/textAppearanceLarge"
+                 android:gravity="center_vertical"
+                 android:checkMark="?android:attr/listChoiceIndicatorMultiple"
+                 android:paddingLeft="8dip"
+                 android:paddingRight="8dip"
+                 android:textColor="?attr/asTextColor"
+        />
\ No newline at end of file
diff --git a/astrid/res/layout/snooze_dialog.xml b/astrid/res/layout/snooze_dialog.xml
index 8c1296b41..81feaf3e1 100644
--- a/astrid/res/layout/snooze_dialog.xml
+++ b/astrid/res/layout/snooze_dialog.xml
@@ -18,32 +18,36 @@
 -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:padding="5dip">
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:padding="5dip">
 
-    <TimePicker android:id="@+id/timePicker"
-        android:visibility="gone"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"/>
-
-    <LinearLayout android:id="@+id/snoozePicker"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-            
-        <com.todoroo.astrid.ui.NumberPicker android:id="@+id/numberPicker"
-            android:layout_weight="1"
+    <TimePicker
+            android:id="@+id/timePicker"
+            android:visibility="gone"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"/>
-        
-        <Spinner android:id="@+id/numberUnits"
-            android:layout_weight="1"
-            android:layout_gravity="center_vertical"
-            android:layout_width="fill_parent"
+
+    <LinearLayout
+            android:id="@+id/snoozePicker"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:entries="@array/repeat_interval"/>
-            
+            android:orientation="horizontal">
+
+        <com.todoroo.astrid.ui.NumberPicker
+                android:id="@+id/numberPicker"
+                android:layout_weight="1"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"/>
+
+        <Spinner
+                android:id="@+id/numberUnits"
+                android:layout_weight="1"
+                android:layout_gravity="center_vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:entries="@array/repeat_interval"/>
+
     </LinearLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/sort_selection_dialog.xml b/astrid/res/layout/sort_selection_dialog.xml
index 91d1eb221..85fd7d961 100644
--- a/astrid/res/layout/sort_selection_dialog.xml
+++ b/astrid/res/layout/sort_selection_dialog.xml
@@ -5,92 +5,102 @@
 ** 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="wrap_content"
-  android:paddingLeft="10dip"
-  android:paddingRight="10dip"
-  style="@style/Content">
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="10dip"
+            android:paddingRight="10dip"
+            style="@style/Content">
 
     <LinearLayout
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:orientation="vertical">
-           
-      <!-- Sorting -->
-    
-      <RadioGroup
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-        
-        <RadioButton android:id="@+id/sort_drag"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/SSD_sort_drag" />
-        
-        <RadioButton android:id="@+id/sort_smart"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/SSD_sort_auto" />
-        
-        <RadioButton android:id="@+id/sort_due"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/SSD_sort_due" />
-        
-        <RadioButton android:id="@+id/sort_importance"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/SSD_sort_importance" />
-        
-        <RadioButton android:id="@+id/sort_alpha"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/SSD_sort_alpha" />
-        
-        <RadioButton android:id="@+id/sort_modified"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:text="@string/SSD_sort_modified" />
-          
-      </RadioGroup>
-      
-      <CheckBox android:id="@+id/reverse"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/SSD_sort_reverse" />
-            
-      <!-- hidden task status -->
-      
-      <View
-          android:id="@+id/TEA_Separator"
-          style="@style/TEA_Separator"
-          android:layout_width="fill_parent"
-          android:layout_height="1px" />
-
-      <TextView
-          style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:paddingTop="10dip"
-          android:paddingLeft="10dip"
-          android:text="@string/SSD_hidden_title" />
-        
-      <CheckBox android:id="@+id/hidden"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/SSD_hidden" />
-      
-      <CheckBox android:id="@+id/completed"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/SSD_completed" />
-        
-      <CheckBox android:id="@+id/deleted"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/SSD_deleted" />
-          
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+        <!-- Sorting -->
+
+        <RadioGroup
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+            <RadioButton
+                    android:id="@+id/sort_drag"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/SSD_sort_drag"/>
+
+            <RadioButton
+                    android:id="@+id/sort_smart"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/SSD_sort_auto"/>
+
+            <RadioButton
+                    android:id="@+id/sort_due"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/SSD_sort_due"/>
+
+            <RadioButton
+                    android:id="@+id/sort_importance"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/SSD_sort_importance"/>
+
+            <RadioButton
+                    android:id="@+id/sort_alpha"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/SSD_sort_alpha"/>
+
+            <RadioButton
+                    android:id="@+id/sort_modified"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/SSD_sort_modified"/>
+
+        </RadioGroup>
+
+        <CheckBox
+                android:id="@+id/reverse"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/SSD_sort_reverse"/>
+
+        <!-- hidden task status -->
+
+        <View
+                android:id="@+id/TEA_Separator"
+                style="@style/TEA_Separator"
+                android:layout_width="fill_parent"
+                android:layout_height="1px"/>
+
+        <TextView
+                style="@style/TextAppearance.GEN_EditLabel.DLG_EditLabel"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="10dip"
+                android:paddingLeft="10dip"
+                android:text="@string/SSD_hidden_title"/>
+
+        <CheckBox
+                android:id="@+id/hidden"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/SSD_hidden"/>
+
+        <CheckBox
+                android:id="@+id/completed"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/SSD_completed"/>
+
+        <CheckBox
+                android:id="@+id/deleted"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/SSD_deleted"/>
+
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/astrid/res/layout/tag_edit_row.xml b/astrid/res/layout/tag_edit_row.xml
index 837a45c4e..a5f46f7d0 100644
--- a/astrid/res/layout/tag_edit_row.xml
+++ b/astrid/res/layout/tag_edit_row.xml
@@ -14,21 +14,23 @@
      limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
-    
-    <AutoCompleteTextView android:id="@+id/text1"
-        android:hint="@string/TEA_tag_hint"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_gravity="center_vertical"/>
-        
-    <ImageButton android:id="@+id/button1"
-        android:layout_width="32dip"
-        android:layout_height="32dip"
-        android:background="@drawable/btn_dismiss"
-        android:layout_gravity="center_vertical"
-        android:layout_margin="4dip"/>
+              android:orientation="horizontal"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content">
+
+    <AutoCompleteTextView
+            android:id="@+id/text1"
+            android:hint="@string/TEA_tag_hint"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_gravity="center_vertical"/>
+
+    <ImageButton
+            android:id="@+id/button1"
+            android:layout_width="32dip"
+            android:layout_height="32dip"
+            android:background="@drawable/btn_dismiss"
+            android:layout_gravity="center_vertical"
+            android:layout_margin="4dip"/>
 </LinearLayout>
diff --git a/astrid/res/layout/tag_settings_activity.xml b/astrid/res/layout/tag_settings_activity.xml
index 15f3cfb8c..449496b0b 100644
--- a/astrid/res/layout/tag_settings_activity.xml
+++ b/astrid/res/layout/tag_settings_activity.xml
@@ -5,241 +5,241 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_weight="100" >
+              xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:layout_weight="100">
 
     <ScrollView
-        android:id="@+id/settings"
-        style="@style/Content_EditScroll"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_weight="100"
-        android:padding="10dip"
-        android:paddingTop="0dip" >
-
-        <LinearLayout
+            android:id="@+id/settings"
+            style="@style/Content_EditScroll"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" >
+            android:layout_height="fill_parent"
+            android:layout_weight="100"
+            android:padding="10dip"
+            android:paddingTop="0dip">
 
-            <LinearLayout
-                android:id="@+id/save_and_cancel"
+        <LinearLayout
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:gravity="right"
-                android:orientation="horizontal"
-                android:visibility="gone" >
+                android:orientation="vertical">
 
-                <ImageButton
-                    android:id="@+id/cancel"
-                    android:layout_width="wrap_content"
+            <LinearLayout
+                    android:id="@+id/save_and_cancel"
+                    android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="10dip"
-                    android:background="@android:color/transparent"
-                    android:src="@drawable/ic_menu_close" />
+                    android:gravity="right"
+                    android:orientation="horizontal"
+                    android:visibility="gone">
 
                 <ImageButton
-                    android:id="@+id/save"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="10dip"
-                    android:background="@android:color/transparent"
-                    android:src="@drawable/ic_menu_save" />
+                        android:id="@+id/cancel"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="10dip"
+                        android:background="@android:color/transparent"
+                        android:src="@drawable/ic_menu_close"/>
+
+                <ImageButton
+                        android:id="@+id/save"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="10dip"
+                        android:background="@android:color/transparent"
+                        android:src="@drawable/ic_menu_save"/>
             </LinearLayout>
 
             <RelativeLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:paddingBottom="5dip"
-                android:paddingTop="5dip" >
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="5dip"
+                    android:paddingTop="5dip">
 
                 <!-- picture -->
 
                 <com.todoroo.astrid.helper.AsyncImageView
-                    android:id="@+id/picture"
-                    android:layout_width="80dip"
-                    android:layout_height="80dip"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentTop="true"
-                    astrid:defaultSrc="@android:drawable/ic_menu_gallery"
-                    android:scaleType="centerCrop" />
+                        android:id="@+id/picture"
+                        android:layout_width="80dip"
+                        android:layout_height="80dip"
+                        android:layout_alignParentLeft="true"
+                        android:layout_alignParentTop="true"
+                        astrid:defaultSrc="@android:drawable/ic_menu_gallery"
+                        android:scaleType="centerCrop"/>
 
                 <TextView
-                    android:id="@+id/tag_label"
-                    style="@style/TextAppearance"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:layout_marginLeft="10dip"
-                    android:layout_toRightOf="@id/picture"
-                    android:text="@string/actfm_TVA_tag_label" />
+                        android:id="@+id/tag_label"
+                        style="@style/TextAppearance"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentTop="true"
+                        android:layout_marginLeft="10dip"
+                        android:layout_toRightOf="@id/picture"
+                        android:text="@string/actfm_TVA_tag_label"/>
 
                 <LinearLayout
-                    style="@style/EditRow"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/tag_label"
-                    android:layout_marginLeft="10dip"
-                    android:layout_marginTop="14dip"
-                    android:layout_toRightOf="@id/picture"
-                    android:padding="10dip"
-                    android:paddingBottom="14dip" >
-
-                    <EditText
-                        android:id="@+id/tag_name"
-                        style="@style/TextAppearance"
+                        style="@style/EditRow"
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
-                        android:background="#00000000"
-                        android:hint="@string/actfm_TVA_tag_name_hint"
-                        android:singleLine="true"
-	                    android:capitalize="sentences"
-	                    android:imeOptions="flagNoExtractUi"
-                        android:textCursorDrawable="@null"
-                        android:textSize="15sp" />
+                        android:layout_below="@id/tag_label"
+                        android:layout_marginLeft="10dip"
+                        android:layout_marginTop="14dip"
+                        android:layout_toRightOf="@id/picture"
+                        android:padding="10dip"
+                        android:paddingBottom="14dip">
+
+                    <EditText
+                            android:id="@+id/tag_name"
+                            style="@style/TextAppearance"
+                            android:layout_width="fill_parent"
+                            android:layout_height="wrap_content"
+                            android:background="#00000000"
+                            android:hint="@string/actfm_TVA_tag_name_hint"
+                            android:singleLine="true"
+                            android:capitalize="sentences"
+                            android:imeOptions="flagNoExtractUi"
+                            android:textCursorDrawable="@null"
+                            android:textSize="15sp"/>
                 </LinearLayout>
             </RelativeLayout>
 
             <TextView
-                style="@style/TextAppearance"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="1dip"
-                android:layout_marginTop="10dip"
-                android:paddingBottom="5dip"
-                android:text="@string/actfm_TVA_members_label" />
+                    style="@style/TextAppearance"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="1dip"
+                    android:layout_marginTop="10dip"
+                    android:paddingBottom="5dip"
+                    android:text="@string/actfm_TVA_members_label"/>
 
             <com.todoroo.astrid.ui.PeopleContainer
-                android:id="@+id/members_container"
-                style="@style/EditRow"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical" />
+                    android:id="@+id/members_container"
+                    style="@style/EditRow"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"/>
 
             <TextView
-                style="@style/TextAppearance"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="1dip"
-                android:paddingBottom="5dip"
-                android:textSize="14sp"
-                android:text="@string/actfm_TVA_members_hint" />
+                    style="@style/TextAppearance"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="1dip"
+                    android:paddingBottom="5dip"
+                    android:textSize="14sp"
+                    android:text="@string/actfm_TVA_members_hint"/>
 
             <TextView
-                android:id="@+id/description_label"
-                style="@style/TextAppearance"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="1dip"
-                android:layout_marginTop="10dip"
-                android:text="@string/actfm_TVA_tag_description_label" />
+                    android:id="@+id/description_label"
+                    style="@style/TextAppearance"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="1dip"
+                    android:layout_marginTop="10dip"
+                    android:text="@string/actfm_TVA_tag_description_label"/>
 
             <LinearLayout
-                style="@style/EditRow"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/tag_label"
-                android:layout_marginTop="5dip"
-                android:padding="10dip"
-                android:paddingBottom="14dip" >
-
-                <EditText
-                    android:id="@+id/tag_description"
-                    style="@style/TextAppearance"
+                    style="@style/EditRow"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
-                    android:imeOptions="flagNoExtractUi"
-                    android:background="#00000000"
-                    android:hint="@string/actfm_TVA_tag_description_hint"
-                    android:textCursorDrawable="@null"
-                    android:textSize="15sp" />
+                    android:layout_below="@id/tag_label"
+                    android:layout_marginTop="5dip"
+                    android:padding="10dip"
+                    android:paddingBottom="14dip">
+
+                <EditText
+                        android:id="@+id/tag_description"
+                        style="@style/TextAppearance"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:imeOptions="flagNoExtractUi"
+                        android:background="#00000000"
+                        android:hint="@string/actfm_TVA_tag_description_hint"
+                        android:textCursorDrawable="@null"
+                        android:textSize="15sp"/>
             </LinearLayout>
 
             <!-- Footer -->
 
             <TextView
-                android:id="@+id/settings_label"
-                style="@style/TextAppearance"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="1dip"
-                android:layout_marginTop="10dip"
-                android:text="@string/actfm_TVA_tag_settings_label" />
+                    android:id="@+id/settings_label"
+                    style="@style/TextAppearance"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="1dip"
+                    android:layout_marginTop="10dip"
+                    android:text="@string/actfm_TVA_tag_settings_label"/>
 
             <LinearLayout
-                style="@style/EditRow"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dip"
-                android:orientation="vertical" >
+                    style="@style/EditRow"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dip"
+                    android:orientation="vertical">
 
                 <RelativeLayout
-                    android:id="@+id/tag_silenced_container"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:padding="5dip" >
+                        android:id="@+id/tag_silenced_container"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:padding="5dip">
 
                     <TextView
-                        style="@style/TextAppearance"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
-                        android:layout_marginTop="10dip"
-                        android:paddingLeft="5dip"
-                        android:text="@string/actfm_TVA_silence_label" />
+                            style="@style/TextAppearance"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentLeft="true"
+                            android:layout_marginTop="10dip"
+                            android:paddingLeft="5dip"
+                            android:text="@string/actfm_TVA_silence_label"/>
 
                     <CheckBox
-                        android:id="@+id/tag_silenced"
-                        style="@style/TextAppearance"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentRight="true"
-                        android:paddingRight="5dip" />
+                            android:id="@+id/tag_silenced"
+                            style="@style/TextAppearance"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:paddingRight="5dip"/>
                 </RelativeLayout>
 
                 <View
-                    android:id="@+id/divider"
-                    style="@style/TEA_Separator"
-                    android:layout_width="fill_parent"
-                    android:layout_height="1dip" />
+                        android:id="@+id/divider"
+                        style="@style/TEA_Separator"
+                        android:layout_width="fill_parent"
+                        android:layout_height="1dip"/>
 
                 <RelativeLayout
-                    android:id="@+id/create_shortcut_container"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:padding="5dip" >
+                        android:id="@+id/create_shortcut_container"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:padding="5dip">
 
                     <TextView
-                        style="@style/TextAppearance"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
-                        android:layout_marginTop="10dip"
-                        android:paddingLeft="5dip"
-                        android:text="@string/FLA_shortcut_dialog_title" />
+                            style="@style/TextAppearance"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentLeft="true"
+                            android:layout_marginTop="10dip"
+                            android:paddingLeft="5dip"
+                            android:text="@string/FLA_shortcut_dialog_title"/>
 
                     <ImageButton
-                        android:id="@+id/create_shortcut"
-                        android:layout_width="40dip"
-                        android:layout_height="40dip"
-                        android:layout_alignParentRight="true"
-                        android:background="@android:color/transparent"
-                        android:scaleType="fitCenter"
-                        android:src="@drawable/icn_list_shortcut" />
+                            android:id="@+id/create_shortcut"
+                            android:layout_width="40dip"
+                            android:layout_height="40dip"
+                            android:layout_alignParentRight="true"
+                            android:background="@android:color/transparent"
+                            android:scaleType="fitCenter"
+                            android:src="@drawable/icn_list_shortcut"/>
                 </RelativeLayout>
             </LinearLayout>
 
             <Button
-                android:id="@+id/leave_list"
-                style="@style/DeleteTag"
-                android:layout_width="fill_parent"
-                android:layout_height="40dip"
-                android:layout_marginTop="15dip"
-                android:text="@string/tag_delete_button" />
+                    android:id="@+id/leave_list"
+                    style="@style/DeleteTag"
+                    android:layout_width="fill_parent"
+                    android:layout_height="40dip"
+                    android:layout_marginTop="15dip"
+                    android:text="@string/tag_delete_button"/>
         </LinearLayout>
     </ScrollView>
 
diff --git a/astrid/res/layout/tag_updates_activity.xml b/astrid/res/layout/tag_updates_activity.xml
index 8ce865d0b..d5f067315 100644
--- a/astrid/res/layout/tag_updates_activity.xml
+++ b/astrid/res/layout/tag_updates_activity.xml
@@ -5,8 +5,8 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/comments_fragment_container">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/comments_fragment_container">
 </FrameLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/tag_updates_fragment.xml b/astrid/res/layout/tag_updates_fragment.xml
index beece8b78..14eb22141 100644
--- a/astrid/res/layout/tag_updates_fragment.xml
+++ b/astrid/res/layout/tag_updates_fragment.xml
@@ -5,111 +5,110 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-    style="@style/Content"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+              style="@style/Content"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical">
 
     <LinearLayout
-        android:id="@+id/no_activity_container"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_weight="100"
-        android:orientation="vertical"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:visibility="gone">
-        
-        <ImageView
-            android:id="@+id/no_activity_image"
+            android:id="@+id/no_activity_container"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:src="@drawable/welcome_activity" />
+            android:layout_height="fill_parent"
+            android:layout_weight="100"
+            android:orientation="vertical"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:visibility="gone">
+
+        <ImageView
+                android:id="@+id/no_activity_image"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:src="@drawable/welcome_activity"/>
 
         <TextView
-            android:id="@+id/no_activity_message"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:textSize="20dip"
-            android:gravity="center"
-            style="@style/TextAppearance" />
+                android:id="@+id/no_activity_message"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:textSize="20dip"
+                android:gravity="center"
+                style="@style/TextAppearance"/>
     </LinearLayout>
 
     <com.todoroo.astrid.ui.ErrorCatchingListView
-        android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_weight="100" 
-        style="@style/ListView"
-        android:divider="@android:color/transparent"/>
-        
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="100"
+            style="@style/ListView"
+            android:divider="@android:color/transparent"/>
+
     <ProgressBar
-        android:id="@+id/comments_progressBar"
-        style="@android:style/Widget.ProgressBar.Horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="5dip"
-        android:visibility="gone" />
+            android:id="@+id/comments_progressBar"
+            style="@android:style/Widget.ProgressBar.Horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="5dip"
+            android:visibility="gone"/>
     <!-- Footer -->
 
     <LinearLayout
-        android:id="@+id/updatesFooter"
-        style="@style/Content"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="center_vertical"
-        android:minHeight="50dip"
-        android:orientation="horizontal"
-        android:background="?attr/asAbBackgroundColor"
-        android:padding="3dip"
-        android:paddingBottom="0dip" >
+            android:id="@+id/updatesFooter"
+            style="@style/Content"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:minHeight="50dip"
+            android:orientation="horizontal"
+            android:background="?attr/asAbBackgroundColor"
+            android:padding="3dip"
+            android:paddingBottom="0dip">
 
         <!-- Voice Add Button -->
 
         <ImageButton
-            android:id="@+id/picture"
-            android:layout_width="39dip"
-            android:layout_height="39dip"
-            android:layout_gravity="top"
-            android:layout_marginRight="3dip"
-            android:layout_weight="1"
-            android:background="@android:color/transparent"
-            android:paddingBottom="2dip"
-            android:scaleType="centerInside"
-            android:src="@drawable/camera_button" />
+                android:id="@+id/picture"
+                android:layout_width="39dip"
+                android:layout_height="39dip"
+                android:layout_gravity="top"
+                android:layout_marginRight="3dip"
+                android:layout_weight="1"
+                android:background="@android:color/transparent"
+                android:paddingBottom="2dip"
+                android:scaleType="centerInside"
+                android:src="@drawable/camera_button"/>
 
         <!-- Quick Add Task -->
 
         <EditText
-            android:id="@+id/commentField"
-            android:layout_width="wrap_content"
-            android:layout_height="39dip"
-            android:layout_marginBottom="2dip"
-            android:layout_marginTop="2dip"
-            android:layout_marginLeft="1dip"
-            android:layout_marginRight="8dip"
-            android:layout_weight="100"
-            android:autoText="true"
-            android:background="?attr/asEditTextBackground"
-            android:capitalize="sentences"
-            android:hint="@string/TVA_add_comment"
-            android:paddingLeft="10dip"
-            android:textColor="?attr/asTextColor"
-            android:textSize="16sp" />
+                android:id="@+id/commentField"
+                android:layout_width="wrap_content"
+                android:layout_height="39dip"
+                android:layout_marginBottom="2dip"
+                android:layout_marginTop="2dip"
+                android:layout_marginLeft="1dip"
+                android:layout_marginRight="8dip"
+                android:layout_weight="100"
+                android:autoText="true"
+                android:background="?attr/asEditTextBackground"
+                android:capitalize="sentences"
+                android:hint="@string/TVA_add_comment"
+                android:paddingLeft="10dip"
+                android:textColor="?attr/asTextColor"
+                android:textSize="16sp"/>
 
         <!-- Extended Add Button -->
 
         <ImageButton
-            android:id="@+id/commentButton"
-            android:layout_width="39dip"
-            android:layout_height="39dip"
-            android:layout_marginRight="5dip"
-            android:layout_weight="1"
-            android:background="?attr/asAddButtonImg"
-            android:scaleType="center" />
+                android:id="@+id/commentButton"
+                android:layout_width="39dip"
+                android:layout_height="39dip"
+                android:layout_marginRight="5dip"
+                android:layout_weight="1"
+                android:background="?attr/asAddButtonImg"
+                android:scaleType="center"/>
     </LinearLayout>
 
 </LinearLayout>
diff --git a/astrid/res/layout/tag_updates_header.xml b/astrid/res/layout/tag_updates_header.xml
index 0ba0dd24c..2eb908b35 100644
--- a/astrid/res/layout/tag_updates_header.xml
+++ b/astrid/res/layout/tag_updates_header.xml
@@ -5,70 +5,70 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
+              xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
 
     <LinearLayout
-        android:id="@+id/tag_header"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="10dip"
-        android:paddingBottom="5dip" >
-
-        <LinearLayout
+            android:id="@+id/tag_header"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal" >
+            android:orientation="vertical"
+            android:padding="10dip"
+            android:paddingBottom="5dip">
+
+        <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
             <com.todoroo.astrid.helper.AsyncImageView
-                android:id="@+id/tag_picture"
-                android:layout_width="80dip"
-                android:layout_height="80dip"
-                astrid:defaultSrc="@android:drawable/ic_menu_gallery"
-                android:layout_marginRight="10dip"
-                android:scaleType="fitCenter" />
+                    android:id="@+id/tag_picture"
+                    android:layout_width="80dip"
+                    android:layout_height="80dip"
+                    astrid:defaultSrc="@android:drawable/ic_menu_gallery"
+                    android:layout_marginRight="10dip"
+                    android:scaleType="fitCenter"/>
 
             <TextView
-                android:id="@+id/tag_title"
-                style="@style/TextAppearance.GEN_EditLabel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/actfm_TVA_tag_description_label"
-                android:textSize="25dip" />
+                    android:id="@+id/tag_title"
+                    style="@style/TextAppearance.GEN_EditLabel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/actfm_TVA_tag_description_label"
+                    android:textSize="25dip"/>
         </LinearLayout>
 
         <TextView
-            android:id="@+id/tag_description"
-            style="@style/TextAppearance.TAd_ItemTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dip"
-            android:textColor="#666" />
+                android:id="@+id/tag_description"
+                style="@style/TextAppearance.TAd_ItemTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dip"
+                android:textColor="#666"/>
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/activity_header"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" >
+            android:id="@+id/activity_header"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
         <TextView
-            style="@style/TextAppearance.TAd_ItemTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="10dip"
-            android:layout_marginTop="5dip"
-            android:text="@string/TEA_tab_activity"
-            android:textColor="#888" />
+                style="@style/TextAppearance.TAd_ItemTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dip"
+                android:layout_marginTop="5dip"
+                android:text="@string/TEA_tab_activity"
+                android:textColor="#888"/>
 
         <View
-            android:id="@+id/TEA_Separator"
-            style="@style/TEA_Separator"
-            android:layout_width="fill_parent"
-            android:layout_height="1px" />
+                android:id="@+id/TEA_Separator"
+                style="@style/TEA_Separator"
+                android:layout_width="fill_parent"
+                android:layout_height="1px"/>
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/task_adapter_row.xml b/astrid/res/layout/task_adapter_row.xml
index 62efbfdf8..b6d91a8c1 100644
--- a/astrid/res/layout/task_adapter_row.xml
+++ b/astrid/res/layout/task_adapter_row.xml
@@ -5,119 +5,122 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/asTaskRowSelector"
-    android:orientation="horizontal">
-
-	<RelativeLayout 
-	    android:id="@+id/rowBody"
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content"
-	    android:layout_marginTop="5dip"
-	    android:layout_marginBottom="5dip"
-	    android:minHeight="45dip">
-	
-	    <ImageView
-	        android:id="@+id/pictureBorder"
-	        android:layout_width="39dip"
-	        android:layout_height="39dip"
-	        android:layout_marginLeft="8dip"
-	        android:layout_centerVertical="true"
-	        android:background="@drawable/icn_default_person_image"
-	        android:scaleType="center"
-	        android:visibility="gone" >
-	    </ImageView>
-	    <com.todoroo.astrid.helper.AsyncImageView
-	        android:id="@+id/picture"
-	        android:layout_width="39dip"
-	        android:layout_height="39dip"
-	        android:padding="2dip"
-	        android:layout_marginLeft="8dip"
-	        android:layout_centerVertical="true"
-	        astrid:defaultSrc="@drawable/icn_default_person_image"
-	        android:scaleType="fitCenter"
-	        android:visibility="gone" />
-	    
-	    <com.todoroo.astrid.ui.CheckableImageView
-	        android:id="@+id/completeBox"
-	        android:layout_width="45dip"
-	        android:layout_marginLeft="4dip"
-	        android:layout_height="wrap_content"
-	        android:minHeight="45dip"
-	        android:scaleType="center"
-	        android:gravity="center"
-	        android:layout_centerVertical="true" />
-	
-	    <LinearLayout
-	        android:id="@+id/task_row"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_marginLeft="52dip"
-	        android:layout_centerVertical="true"
-	        android:orientation="horizontal"
-	        android:gravity="center_vertical"
-	        android:paddingLeft="4dip" >
-	
-	        <!-- task name -->
-	
-	        <TextView
-	            android:id="@+id/title"
-	            style="@style/TextAppearance.TAd_ItemTitle"
-	            android:layout_width="0dip"
-	            android:layout_height="wrap_content"
-	            android:layout_weight="100"
-	            android:gravity="center_vertical"
-	            android:maxLines="2" />
-	
-	        <!-- due date -->
-	
-	        <LinearLayout
-	            android:id="@+id/taskActionContainer"
-	            android:layout_width="wrap_content"
-	            android:layout_height="wrap_content"
-	            android:layout_marginRight="10dip"
-	            android:orientation="vertical"
-	            android:gravity="right|center_vertical">
-		        <TextView
-		            android:id="@+id/dueDate"
-		            android:layout_width="wrap_content"
-		            android:layout_height="wrap_content"
-		            android:gravity="center_vertical|right" />
-		        <ImageView
-		            android:id="@+id/taskActionIcon"
-		            android:layout_width="20dip"
-		            android:layout_height="20dip"
-		            android:scaleType="fitCenter"
-		            android:visibility="gone"/>
-	        </LinearLayout>
-	    </LinearLayout>
-	
-	    <!-- details line 1 -->
-	
-	    <TextView
-	        android:id="@+id/details1"
-	        style="@style/TextAppearance.TAd_ItemDetails"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_alignLeft="@id/task_row"
-	        android:layout_below="@id/task_row"
-	        android:visibility="gone" />
-	
-	    <!-- details line 2 -->
-	
-	    <TextView
-	        android:id="@+id/details2"
-	        style="@style/TextAppearance.TAd_ItemDetails"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_alignLeft="@id/task_row"
-	        android:layout_below="@id/details1"
-	        android:layout_marginLeft="5dip"
-	        android:visibility="gone" />
-	
-	</RelativeLayout>
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/asTaskRowSelector"
+        android:orientation="horizontal">
+
+    <RelativeLayout
+            android:id="@+id/rowBody"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dip"
+            android:layout_marginBottom="5dip"
+            android:minHeight="45dip">
+
+        <ImageView
+                android:id="@+id/pictureBorder"
+                android:layout_width="39dip"
+                android:layout_height="39dip"
+                android:layout_marginLeft="8dip"
+                android:layout_centerVertical="true"
+                android:background="@drawable/icn_default_person_image"
+                android:scaleType="center"
+                android:visibility="gone">
+        </ImageView>
+
+        <com.todoroo.astrid.helper.AsyncImageView
+                android:id="@+id/picture"
+                android:layout_width="39dip"
+                android:layout_height="39dip"
+                android:padding="2dip"
+                android:layout_marginLeft="8dip"
+                android:layout_centerVertical="true"
+                astrid:defaultSrc="@drawable/icn_default_person_image"
+                android:scaleType="fitCenter"
+                android:visibility="gone"/>
+
+        <com.todoroo.astrid.ui.CheckableImageView
+                android:id="@+id/completeBox"
+                android:layout_width="45dip"
+                android:layout_marginLeft="4dip"
+                android:layout_height="wrap_content"
+                android:minHeight="45dip"
+                android:scaleType="center"
+                android:gravity="center"
+                android:layout_centerVertical="true"/>
+
+        <LinearLayout
+                android:id="@+id/task_row"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="52dip"
+                android:layout_centerVertical="true"
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:paddingLeft="4dip">
+
+            <!-- task name -->
+
+            <TextView
+                    android:id="@+id/title"
+                    style="@style/TextAppearance.TAd_ItemTitle"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="100"
+                    android:gravity="center_vertical"
+                    android:maxLines="2"/>
+
+            <!-- due date -->
+
+            <LinearLayout
+                    android:id="@+id/taskActionContainer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10dip"
+                    android:orientation="vertical"
+                    android:gravity="right|center_vertical">
+
+                <TextView
+                        android:id="@+id/dueDate"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical|right"/>
+
+                <ImageView
+                        android:id="@+id/taskActionIcon"
+                        android:layout_width="20dip"
+                        android:layout_height="20dip"
+                        android:scaleType="fitCenter"
+                        android:visibility="gone"/>
+            </LinearLayout>
+        </LinearLayout>
+
+        <!-- details line 1 -->
+
+        <TextView
+                android:id="@+id/details1"
+                style="@style/TextAppearance.TAd_ItemDetails"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignLeft="@id/task_row"
+                android:layout_below="@id/task_row"
+                android:visibility="gone"/>
+
+        <!-- details line 2 -->
+
+        <TextView
+                android:id="@+id/details2"
+                style="@style/TextAppearance.TAd_ItemDetails"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignLeft="@id/task_row"
+                android:layout_below="@id/details1"
+                android:layout_marginLeft="5dip"
+                android:visibility="gone"/>
+
+    </RelativeLayout>
 
 </LinearLayout>
diff --git a/astrid/res/layout/task_adapter_row_simple.xml b/astrid/res/layout/task_adapter_row_simple.xml
index 0851e9e92..bb8b3d193 100644
--- a/astrid/res/layout/task_adapter_row_simple.xml
+++ b/astrid/res/layout/task_adapter_row_simple.xml
@@ -5,145 +5,150 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/asTaskRowSelector"
-    android:orientation="horizontal">
-
-	<RelativeLayout 
-	    android:id="@+id/rowBody"
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content"
-	    android:layout_marginTop="5dip"
-	    android:layout_marginBottom="5dip"
-	    android:minHeight="40dip">
-	
-	    <ImageView
-	        android:id="@+id/pictureBorder"
-	        android:layout_width="35dip"
-	        android:layout_height="35dip"
-	        android:layout_marginLeft="8dip"
-	        android:layout_centerVertical="true"
-	        android:background="@drawable/icn_default_person_image"
-	        android:scaleType="center"
-	        android:visibility="gone" >
-	    </ImageView>
-	    <com.todoroo.astrid.helper.AsyncImageView
-	        android:id="@+id/picture"
-	        android:layout_width="35dip"
-	        android:layout_height="35dip"
-	        android:padding="2dip"
-	        android:layout_marginLeft="8dip"
-	        android:layout_centerVertical="true"
-	        astrid:defaultSrc="@drawable/icn_default_person_image"
-	        android:scaleType="fitCenter"
-	        android:visibility="gone" />
-	    
-	    <com.todoroo.astrid.ui.CheckableImageView
-	        android:id="@+id/completeBox"
-	        android:layout_width="45dip"
-	        android:layout_marginLeft="4dip"
-	        android:layout_height="wrap_content"
-	        android:minHeight="40dip"
-	        android:scaleType="center"
-	        android:gravity="center"
-	        android:layout_centerVertical="true" />
-	
-	    <LinearLayout
-	        android:id="@+id/task_row"
-	        android:baselineAligned="false"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_marginLeft="52dip"
-	        android:layout_centerVertical="true"
-	        android:orientation="horizontal"
-	        android:gravity="center_vertical"
-	        android:paddingLeft="4dip" >
-	
-	        <!-- task name -->
-	
-	       <LinearLayout
-	           android:layout_width="0dip"
-	           android:layout_height="wrap_content"
-               android:layout_weight="100"
-	           android:orientation="vertical"
-	           android:gravity="center_vertical">
-		        <TextView
-		            android:id="@+id/title"
-		            style="@style/TextAppearance.TAd_ItemTitle"
-		            android:layout_width="fill_parent"
-		            android:layout_height="wrap_content"
-		            android:gravity="center_vertical"
-		            android:maxLines="1"
-		            android:singleLine="true"
-		            android:ellipsize="end" />
-		
-		        <LinearLayout
-		            android:layout_width="fill_parent"
-		            android:layout_height="wrap_content"
-		            android:orientation="horizontal">
-			        <TextView
-			            android:id="@+id/dueDate"
-			            android:layout_width="wrap_content"
-			            android:layout_height="wrap_content"
-			            android:singleLine="true"
-			            android:ellipsize="end"
-			            android:gravity="center_vertical" />
-			        <TextView
-			            android:id="@+id/tagsDisplay"
-			            android:layout_width="wrap_content"
-			            android:layout_height="wrap_content"
-			            android:singleLine="true"
-			            android:ellipsize="end"
-			            android:gravity="center_vertical" 
-			            style="@style/TextAppearance.TAd_ItemDueDate"/>
-			        
-		        </LinearLayout>
-	        </LinearLayout>
-	        <!-- due date -->
-	
-	        <LinearLayout
-	            android:id="@+id/taskActionContainer"
-	            android:layout_width="wrap_content"
-	            android:layout_height="wrap_content"
-	            android:layout_marginLeft="5dip"
-	            android:layout_marginRight="10dip"
-	            android:orientation="vertical"
-	            android:gravity="right|center_vertical">
-		        <ImageView
-		            android:id="@+id/taskActionIcon"
-		            android:layout_width="20dip"
-		            android:layout_height="20dip"
-		            android:scaleType="fitCenter"
-		            android:visibility="gone"/>
-	        </LinearLayout>
-	    </LinearLayout>
-	
-	    <!-- details line 1 -->
-	
-	    <TextView
-	        android:id="@+id/details1"
-	        style="@style/TextAppearance.TAd_ItemDetails"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_alignLeft="@id/task_row"
-	        android:layout_below="@id/task_row"
-	        android:visibility="gone" />
-	
-	    <!-- details line 2 -->
-	
-	    <TextView
-	        android:id="@+id/details2"
-	        style="@style/TextAppearance.TAd_ItemDetails"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_alignLeft="@id/task_row"
-	        android:layout_below="@id/details1"
-	        android:layout_marginLeft="5dip"
-	        android:visibility="gone" />
-	
-	</RelativeLayout>
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/asTaskRowSelector"
+        android:orientation="horizontal">
+
+    <RelativeLayout
+            android:id="@+id/rowBody"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dip"
+            android:layout_marginBottom="5dip"
+            android:minHeight="40dip">
+
+        <ImageView
+                android:id="@+id/pictureBorder"
+                android:layout_width="35dip"
+                android:layout_height="35dip"
+                android:layout_marginLeft="8dip"
+                android:layout_centerVertical="true"
+                android:background="@drawable/icn_default_person_image"
+                android:scaleType="center"
+                android:visibility="gone">
+        </ImageView>
+
+        <com.todoroo.astrid.helper.AsyncImageView
+                android:id="@+id/picture"
+                android:layout_width="35dip"
+                android:layout_height="35dip"
+                android:padding="2dip"
+                android:layout_marginLeft="8dip"
+                android:layout_centerVertical="true"
+                astrid:defaultSrc="@drawable/icn_default_person_image"
+                android:scaleType="fitCenter"
+                android:visibility="gone"/>
+
+        <com.todoroo.astrid.ui.CheckableImageView
+                android:id="@+id/completeBox"
+                android:layout_width="45dip"
+                android:layout_marginLeft="4dip"
+                android:layout_height="wrap_content"
+                android:minHeight="40dip"
+                android:scaleType="center"
+                android:gravity="center"
+                android:layout_centerVertical="true"/>
+
+        <LinearLayout
+                android:id="@+id/task_row"
+                android:baselineAligned="false"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="52dip"
+                android:layout_centerVertical="true"
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:paddingLeft="4dip">
+
+            <!-- task name -->
+
+            <LinearLayout
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="100"
+                    android:orientation="vertical"
+                    android:gravity="center_vertical">
+
+                <TextView
+                        android:id="@+id/title"
+                        style="@style/TextAppearance.TAd_ItemTitle"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:ellipsize="end"/>
+
+                <LinearLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                    <TextView
+                            android:id="@+id/dueDate"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:singleLine="true"
+                            android:ellipsize="end"
+                            android:gravity="center_vertical"/>
+
+                    <TextView
+                            android:id="@+id/tagsDisplay"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:singleLine="true"
+                            android:ellipsize="end"
+                            android:gravity="center_vertical"
+                            style="@style/TextAppearance.TAd_ItemDueDate"/>
+
+                </LinearLayout>
+            </LinearLayout>
+            <!-- due date -->
+
+            <LinearLayout
+                    android:id="@+id/taskActionContainer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="5dip"
+                    android:layout_marginRight="10dip"
+                    android:orientation="vertical"
+                    android:gravity="right|center_vertical">
+
+                <ImageView
+                        android:id="@+id/taskActionIcon"
+                        android:layout_width="20dip"
+                        android:layout_height="20dip"
+                        android:scaleType="fitCenter"
+                        android:visibility="gone"/>
+            </LinearLayout>
+        </LinearLayout>
+
+        <!-- details line 1 -->
+
+        <TextView
+                android:id="@+id/details1"
+                style="@style/TextAppearance.TAd_ItemDetails"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignLeft="@id/task_row"
+                android:layout_below="@id/task_row"
+                android:visibility="gone"/>
+
+        <!-- details line 2 -->
+
+        <TextView
+                android:id="@+id/details2"
+                style="@style/TextAppearance.TAd_ItemDetails"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignLeft="@id/task_row"
+                android:layout_below="@id/details1"
+                android:layout_marginLeft="5dip"
+                android:visibility="gone"/>
+
+    </RelativeLayout>
 
 </LinearLayout>
diff --git a/astrid/res/layout/task_adapter_row_title_only.xml b/astrid/res/layout/task_adapter_row_title_only.xml
index 94875a87e..880e197cc 100644
--- a/astrid/res/layout/task_adapter_row_title_only.xml
+++ b/astrid/res/layout/task_adapter_row_title_only.xml
@@ -5,56 +5,55 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/asTaskRowSelector"
-    android:orientation="horizontal">
-
-	<RelativeLayout 
-	    android:id="@+id/rowBody"
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content"
-	    android:layout_marginTop="10dip"
-	    android:layout_marginBottom="10dip">
-	    
-	    <com.todoroo.astrid.ui.CheckableImageView
-            android:id="@+id/completeBox"
-            android:layout_width="45dip"
-            android:layout_marginLeft="4dip"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/asTaskRowSelector"
+        android:orientation="horizontal">
+
+    <RelativeLayout
+            android:id="@+id/rowBody"
+            android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:minHeight="45dip"
-            android:scaleType="center"
-            android:gravity="center"
-            android:layout_centerVertical="true" />
-	
-	    <LinearLayout
-	        android:id="@+id/task_row"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_marginLeft="52dip"
-	        android:layout_marginRight="10dip"
-	        android:layout_centerVertical="true"
-	        android:orientation="horizontal"
-	        android:gravity="center_vertical"
-	        android:paddingLeft="4dip" >
-	
-	        <!-- task name -->
-	
-	        <TextView
-	            android:id="@+id/title"
-	            style="@style/TextAppearance.TAd_ItemTitle"
-	            android:layout_width="0dip"
-	            android:layout_height="wrap_content"
-	            android:layout_weight="100"
-	            android:gravity="center_vertical"
-	            android:maxLines="2" />
-	
-	        <!-- due date -->
-	
-	    </LinearLayout>
-	
-	</RelativeLayout>
+            android:layout_marginTop="10dip"
+            android:layout_marginBottom="10dip">
+
+        <com.todoroo.astrid.ui.CheckableImageView
+                android:id="@+id/completeBox"
+                android:layout_width="45dip"
+                android:layout_marginLeft="4dip"
+                android:layout_height="wrap_content"
+                android:minHeight="45dip"
+                android:scaleType="center"
+                android:gravity="center"
+                android:layout_centerVertical="true"/>
+
+        <LinearLayout
+                android:id="@+id/task_row"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="52dip"
+                android:layout_marginRight="10dip"
+                android:layout_centerVertical="true"
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:paddingLeft="4dip">
+
+            <!-- task name -->
+
+            <TextView
+                    android:id="@+id/title"
+                    style="@style/TextAppearance.TAd_ItemTitle"
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="100"
+                    android:gravity="center_vertical"
+                    android:maxLines="2"/>
+
+            <!-- due date -->
+
+        </LinearLayout>
+
+    </RelativeLayout>
 
 </LinearLayout>
diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml
index 66db8335d..8005db879 100644
--- a/astrid/res/layout/task_edit_activity.xml
+++ b/astrid/res/layout/task_edit_activity.xml
@@ -5,237 +5,238 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/taskEditParent"
-    style="@style/Content"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-    
+              android:id="@+id/taskEditParent"
+              style="@style/Content"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical">
+
     <com.todoroo.astrid.ui.NestableScrollView
-        android:id="@+id/edit_scroll"
-        style="@style/Content_EditScroll"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_weight="100" >
+            android:id="@+id/edit_scroll"
+            style="@style/Content_EditScroll"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="100">
 
         <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="600dip"
-            android:orientation="vertical"
-            android:gravity="center_horizontal"
-            android:padding="10dip" >
-            
-            <RelativeLayout 
-		        android:id="@+id/waiting_on_me"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
-                android:layout_margin="3dip"
-		        android:layout_marginBottom="10dip"
-		        android:padding="10dip"
-		        android:visibility="gone"
-		        android:background="?attr/asWomEditRowBackground">
-		        <ImageView 
-		            android:id="@+id/wom_icon"
-	                android:layout_marginRight="10dip"
-    	            android:layout_width="20dip"
-	                android:layout_height="20dip"
-	                android:scaleType="fitCenter"/>
-		        
-		        <TextView 
-		            android:id="@+id/wom_message"
-		            android:layout_width="fill_parent"
-		            android:layout_height="wrap_content"
-		            android:layout_marginBottom="10dip"
-		            android:textStyle="bold"
-		            android:layout_toRightOf="@id/wom_icon"/>
-		        
-		        <TextView 
-		            android:id="@+id/wom_acknowledge"
-		            android:layout_width="wrap_content"
-		            android:layout_height="fill_parent" 
-		            android:layout_below="@id/wom_message"
-		            android:layout_marginRight="10dip"
-		            android:layout_alignLeft="@id/wom_message"
-		            android:padding="6dip"
-		            android:textColor="@android:color/white"
-		            android:text="@string/wom_acknowledge"/>
-		        
-		        <TextView 
-		            android:id="@+id/wom_dismiss"
-		            android:layout_width="wrap_content"
-		            android:layout_height="fill_parent" 
-		            android:layout_marginRight="5dip"
-		            android:layout_toRightOf="@id/wom_acknowledge"
-		            android:layout_below="@id/wom_message"
-		            android:padding="6dip"
-		            android:textColor="@android:color/white"
-		            android:text="@string/wom_dismiss"/>
-		        
-		    </RelativeLayout>
+                android:layout_width="fill_parent"
+                android:layout_height="600dip"
+                android:orientation="vertical"
+                android:gravity="center_horizontal"
+                android:padding="10dip">
+
+            <RelativeLayout
+                    android:id="@+id/waiting_on_me"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="3dip"
+                    android:layout_marginBottom="10dip"
+                    android:padding="10dip"
+                    android:visibility="gone"
+                    android:background="?attr/asWomEditRowBackground">
+
+                <ImageView
+                        android:id="@+id/wom_icon"
+                        android:layout_marginRight="10dip"
+                        android:layout_width="20dip"
+                        android:layout_height="20dip"
+                        android:scaleType="fitCenter"/>
+
+                <TextView
+                        android:id="@+id/wom_message"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="10dip"
+                        android:textStyle="bold"
+                        android:layout_toRightOf="@id/wom_icon"/>
+
+                <TextView
+                        android:id="@+id/wom_acknowledge"
+                        android:layout_width="wrap_content"
+                        android:layout_height="fill_parent"
+                        android:layout_below="@id/wom_message"
+                        android:layout_marginRight="10dip"
+                        android:layout_alignLeft="@id/wom_message"
+                        android:padding="6dip"
+                        android:textColor="@android:color/white"
+                        android:text="@string/wom_acknowledge"/>
+
+                <TextView
+                        android:id="@+id/wom_dismiss"
+                        android:layout_width="wrap_content"
+                        android:layout_height="fill_parent"
+                        android:layout_marginRight="5dip"
+                        android:layout_toRightOf="@id/wom_acknowledge"
+                        android:layout_below="@id/wom_message"
+                        android:padding="6dip"
+                        android:textColor="@android:color/white"
+                        android:text="@string/wom_dismiss"/>
+
+            </RelativeLayout>
 
             <LinearLayout
-                android:id="@+id/title_controls"
-                style="@style/EditRow"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="3dip"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingRight="6dip" >
+                    android:id="@+id/title_controls"
+                    style="@style/EditRow"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="3dip"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingRight="6dip">
 
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/basic_controls"
-                style="@style/EditRow"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_margin="3dip"
-                android:layout_marginTop="10dip"
-                android:orientation="vertical" >
+                    android:id="@+id/basic_controls"
+                    style="@style/EditRow"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:layout_margin="3dip"
+                    android:layout_marginTop="10dip"
+                    android:orientation="vertical">
             </LinearLayout>
 
 
             <LinearLayout
-                android:id="@+id/more_container"
-                style="@style/EditRow"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="3dip"
-                android:layout_marginBottom="0dip"
-                android:orientation="vertical"
-                android:visibility="gone" >
+                    android:id="@+id/more_container"
+                    style="@style/EditRow"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="3dip"
+                    android:layout_marginBottom="0dip"
+                    android:orientation="vertical"
+                    android:visibility="gone">
 
                 <com.viewpagerindicator.TabPageIndicator
-                    android:id="@+id/indicator"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content" />
+                        android:id="@+id/indicator"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"/>
 
                 <ProgressBar
-                    android:id="@+id/progressBar"
-                    style="@android:style/Widget.ProgressBar.Horizontal"
-                    android:layout_width="fill_parent"
-                    android:layout_height="5dip"
-                    android:layout_weight="1"
-                    android:visibility="gone" />
+                        android:id="@+id/progressBar"
+                        style="@android:style/Widget.ProgressBar.Horizontal"
+                        android:layout_width="fill_parent"
+                        android:layout_height="5dip"
+                        android:layout_weight="1"
+                        android:visibility="gone"/>
 
                 <com.todoroo.astrid.ui.NestableViewPager
-                    android:id="@+id/pager"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content" />
+                        android:id="@+id/pager"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"/>
             </LinearLayout>
-            
+
             <TextView
-                android:id="@+id/edit_beast_mode"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingTop="17dip"
-                android:paddingBottom="17dip"
-                android:text="@string/EPr_beastMode_shortcut"
-                android:textColor="?attr/asTextColor"/>
-            
+                    android:id="@+id/edit_beast_mode"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="17dip"
+                    android:paddingBottom="17dip"
+                    android:text="@string/EPr_beastMode_shortcut"
+                    android:textColor="?attr/asTextColor"/>
+
             <ImageView
-                android:id="@+id/delete_task"
-                android:layout_width="20dip"
-                android:layout_height="20dip"
-                android:layout_marginBottom="10dip"
-                android:src="@drawable/trashcan"
-                android:scaleType="fitCenter"/>
-            
+                    android:id="@+id/delete_task"
+                    android:layout_width="20dip"
+                    android:layout_height="20dip"
+                    android:layout_marginBottom="10dip"
+                    android:src="@drawable/trashcan"
+                    android:scaleType="fitCenter"/>
+
         </LinearLayout>
     </com.todoroo.astrid.ui.NestableScrollView>
 
     <!-- Footer -->
 
     <LinearLayout
-        android:id="@+id/updatesFooter"
-        style="@style/Content"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:minHeight="50dip"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:background="?attr/asAbBackgroundColor"
-        android:padding="3dip" 
-        android:visibility="gone"
-        android:paddingBottom="0dip">
+            android:id="@+id/updatesFooter"
+            style="@style/Content"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:minHeight="50dip"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:background="?attr/asAbBackgroundColor"
+            android:padding="3dip"
+            android:visibility="gone"
+            android:paddingBottom="0dip">
 
         <!-- Voice Add Button -->
 
         <ImageButton
-            android:id="@+id/picture"
-            android:layout_width="39dip"
-            android:layout_height="39dip"
-            android:layout_marginRight="3dip"
-            android:layout_weight="1"
-            android:paddingBottom="2dip"
-            android:scaleType="centerInside"
-            android:background="@android:color/transparent"
-            android:src="@drawable/camera_button" />
+                android:id="@+id/picture"
+                android:layout_width="39dip"
+                android:layout_height="39dip"
+                android:layout_marginRight="3dip"
+                android:layout_weight="1"
+                android:paddingBottom="2dip"
+                android:scaleType="centerInside"
+                android:background="@android:color/transparent"
+                android:src="@drawable/camera_button"/>
 
         <!-- Quick Add Task -->
 
         <EditText
-            android:id="@+id/commentField"
-            android:layout_width="wrap_content"
-            android:layout_height="39dip"
-            android:layout_marginLeft="1dip"
-            android:layout_marginRight="1dip"
-            android:layout_marginBottom="2dip"
-            android:layout_marginTop="2dip"
-            android:layout_weight="100"
-            android:autoText="true"
-            android:background="?attr/asEditTextBackground"
-            android:capitalize="sentences"
-            android:imeOptions="flagNoExtractUi"
-            android:hint="@string/TVA_add_comment"
-            android:textColor="?attr/asTextColor"
-            android:paddingLeft="10dip"
-            android:textSize="16sp" />
+                android:id="@+id/commentField"
+                android:layout_width="wrap_content"
+                android:layout_height="39dip"
+                android:layout_marginLeft="1dip"
+                android:layout_marginRight="1dip"
+                android:layout_marginBottom="2dip"
+                android:layout_marginTop="2dip"
+                android:layout_weight="100"
+                android:autoText="true"
+                android:background="?attr/asEditTextBackground"
+                android:capitalize="sentences"
+                android:imeOptions="flagNoExtractUi"
+                android:hint="@string/TVA_add_comment"
+                android:textColor="?attr/asTextColor"
+                android:paddingLeft="10dip"
+                android:textSize="16sp"/>
 
         <!-- Extended Add Button -->
 
         <LinearLayout
-            android:id="@+id/timer_container"
-            android:layout_width="39dip"
-            android:layout_height="39dip"
-            android:layout_marginLeft="2dip"
-            android:layout_weight="1"
-            android:orientation="vertical" >
+                android:id="@+id/timer_container"
+                android:layout_width="39dip"
+                android:layout_height="39dip"
+                android:layout_marginLeft="2dip"
+                android:layout_weight="1"
+                android:orientation="vertical">
 
             <ImageView
-                android:id="@+id/timer_button"
-                android:layout_width="fill_parent"
-                android:layout_height="25dip"
-                android:layout_weight="1"
-                android:background="#00000000"
-                android:gravity="center_vertical|center_horizontal"
-                android:paddingRight="5dip"
-                android:paddingLeft="5dip"
-                android:scaleType="centerInside" />
+                    android:id="@+id/timer_button"
+                    android:layout_width="fill_parent"
+                    android:layout_height="25dip"
+                    android:layout_weight="1"
+                    android:background="#00000000"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:paddingRight="5dip"
+                    android:paddingLeft="5dip"
+                    android:scaleType="centerInside"/>
 
             <Chronometer
-                android:id="@+id/timer"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                android:gravity="center_horizontal"
-                android:textColor="?attr/asThemeTextColor"
-                android:textSize="10sp"
-                android:visibility="visible" />
+                    android:id="@+id/timer"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="2"
+                    android:gravity="center_horizontal"
+                    android:textColor="?attr/asThemeTextColor"
+                    android:textSize="10sp"
+                    android:visibility="visible"/>
         </LinearLayout>
 
         <ImageButton
-            android:id="@+id/commentButton"
-            android:layout_width="39dip"
-            android:layout_height="39dip"
-            android:layout_marginLeft="3dip"
-            android:layout_weight="1"
-            android:background="@android:color/transparent"
-            android:src="?attr/asAddButtonImg"
-            android:scaleType="center"
-            android:visibility="gone" />
+                android:id="@+id/commentButton"
+                android:layout_width="39dip"
+                android:layout_height="39dip"
+                android:layout_marginLeft="3dip"
+                android:layout_weight="1"
+                android:background="@android:color/transparent"
+                android:src="?attr/asAddButtonImg"
+                android:scaleType="center"
+                android:visibility="gone"/>
     </LinearLayout>
 
 </LinearLayout>
diff --git a/astrid/res/layout/task_edit_more_controls.xml b/astrid/res/layout/task_edit_more_controls.xml
index 336460140..a4c9e04d6 100644
--- a/astrid/res/layout/task_edit_more_controls.xml
+++ b/astrid/res/layout/task_edit_more_controls.xml
@@ -5,9 +5,9 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <com.todoroo.astrid.ui.TaskEditMoreControls xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/more_controls"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
+                                            android:id="@+id/more_controls"
+                                            android:layout_width="fill_parent"
+                                            android:layout_height="wrap_content"
+                                            android:orientation="vertical">
 
 </com.todoroo.astrid.ui.TaskEditMoreControls>
\ No newline at end of file
diff --git a/astrid/res/layout/task_edit_when_controls.xml b/astrid/res/layout/task_edit_when_controls.xml
index 185b6b881..c93df13ab 100644
--- a/astrid/res/layout/task_edit_when_controls.xml
+++ b/astrid/res/layout/task_edit_when_controls.xml
@@ -5,33 +5,36 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/when_dialog"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"    
-    android:padding="10dip">
-    <ScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/when_dialog"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-	    android:layout_weight="100">
-		<LinearLayout 
-		    android:id="@+id/when_controls"
-		    android:layout_width="fill_parent"
-		    android:layout_height="fill_parent"
-		    android:orientation="vertical">
-		</LinearLayout>
-	</ScrollView>
-	<Button
-	    android:id="@+id/when_dismiss"
-	    android:layout_width="150dip"
-	    android:layout_height="45dip"
-	    android:layout_marginTop="10dip"
-	    android:layout_marginBottom="5dip"
-	    android:layout_weight="1"
-	    android:layout_gravity="center_horizontal"
-	    android:background="@drawable/footer_editbutton"
-	    android:textStyle="bold"
-	    android:layout_alignParentBottom="true"
-	    android:text="@string/DLG_ok"/>
+        android:orientation="vertical"
+        android:padding="10dip">
+
+    <ScrollView
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="100">
+
+        <LinearLayout
+                android:id="@+id/when_controls"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:orientation="vertical">
+        </LinearLayout>
+    </ScrollView>
+
+    <Button
+            android:id="@+id/when_dismiss"
+            android:layout_width="150dip"
+            android:layout_height="45dip"
+            android:layout_marginTop="10dip"
+            android:layout_marginBottom="5dip"
+            android:layout_weight="1"
+            android:layout_gravity="center_horizontal"
+            android:background="@drawable/footer_editbutton"
+            android:textStyle="bold"
+            android:layout_alignParentBottom="true"
+            android:text="@string/DLG_ok"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/task_edit_wrapper_activity.xml b/astrid/res/layout/task_edit_wrapper_activity.xml
index 00f7489f1..dfaa2e457 100644
--- a/astrid/res/layout/task_edit_wrapper_activity.xml
+++ b/astrid/res/layout/task_edit_wrapper_activity.xml
@@ -5,14 +5,15 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/taskedit_fragment_container">
-	<fragment
-	    android:name="com.todoroo.astrid.activity.TaskEditFragment"
-	    android:layout_width="match_parent"
-	    android:layout_height="match_parent"
-	    android:tag="taskedit_fragment">
-	</fragment>
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/taskedit_fragment_container">
+
+    <fragment
+            android:name="com.todoroo.astrid.activity.TaskEditFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:tag="taskedit_fragment">
+    </fragment>
 </FrameLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/task_list_activity.xml b/astrid/res/layout/task_list_activity.xml
index b75e60a3a..8d2415e6a 100644
--- a/astrid/res/layout/task_list_activity.xml
+++ b/astrid/res/layout/task_list_activity.xml
@@ -5,30 +5,30 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/taskListParent"
-    android:layout_width="fill_parent" 
-    android:layout_height="fill_parent"
-    android:focusable="true"
-    android:focusableInTouchMode="true"
-    android:descendantFocusability="beforeDescendants"
-    style="@style/Content"
-    android:orientation="vertical">
-    
+              android:id="@+id/taskListParent"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:focusable="true"
+              android:focusableInTouchMode="true"
+              android:descendantFocusability="beforeDescendants"
+              style="@style/Content"
+              android:orientation="vertical">
+
     <ProgressBar
-        android:id="@+id/progressBar"
-        android:layout_width="fill_parent" 
-        android:layout_height="5dip"
-        style="@android:style/Widget.ProgressBar.Horizontal"
-        android:visibility="gone"/>
-        
+            android:id="@+id/progressBar"
+            android:layout_width="fill_parent"
+            android:layout_height="5dip"
+            style="@android:style/Widget.ProgressBar.Horizontal"
+            android:visibility="gone"/>
+
     <!-- Body goes here -->
-        
+
     <!-- Footer -->
-    <com.todoroo.astrid.ui.QuickAddBar 
-        android:id="@+id/taskListFooter"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        style="@style/Content" />
-        
+    <com.todoroo.astrid.ui.QuickAddBar
+            android:id="@+id/taskListFooter"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            style="@style/Content"/>
+
 </LinearLayout>
diff --git a/astrid/res/layout/task_list_body_featured_list.xml b/astrid/res/layout/task_list_body_featured_list.xml
index f0ed64af1..343128f9e 100644
--- a/astrid/res/layout/task_list_body_featured_list.xml
+++ b/astrid/res/layout/task_list_body_featured_list.xml
@@ -1,40 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="wrap_content"
-  android:layout_weight="100">
-  
-	  <LinearLayout
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content"
-	    android:layout_weight="1"
-	    android:background="?attr/asMembersHeaderBackground"
-	    android:padding="15dip"
-	    android:gravity="center_vertical">
-	      <com.todoroo.astrid.helper.AsyncImageView 
-	        android:id="@+id/url_image"
-	        android:layout_width="75dip"
-	        android:layout_height="75dip"
-	        android:scaleType="fitCenter"/>
-	      
-          <TextView
-            android:id="@+id/feat_list_desc"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="100">
+
+    <LinearLayout
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:gravity="left"
-            android:paddingLeft="15dip"
-            style="@style/TextAppearance"
-            android:textStyle="bold"
-            android:textColor="#333333"
-            android:singleLine="false"
-            android:lines="4"
-            android:ellipsize="end"/>
-            <!-- For some reason this degrades to two lines on 
-            pre-ICS phones. May be an OS bug with ellipsize-->
-	  </LinearLayout>
-  
-  <!-- List body goes here -->
-    
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="?attr/asMembersHeaderBackground"
+            android:padding="15dip"
+            android:gravity="center_vertical">
+
+        <com.todoroo.astrid.helper.AsyncImageView
+                android:id="@+id/url_image"
+                android:layout_width="75dip"
+                android:layout_height="75dip"
+                android:scaleType="fitCenter"/>
+
+        <TextView
+                android:id="@+id/feat_list_desc"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:gravity="left"
+                android:paddingLeft="15dip"
+                style="@style/TextAppearance"
+                android:textStyle="bold"
+                android:textColor="#333333"
+                android:singleLine="false"
+                android:lines="4"
+                android:ellipsize="end"/>
+        <!-- For some reason this degrades to two lines on
+        pre-ICS phones. May be an OS bug with ellipsize-->
+    </LinearLayout>
+
+    <!-- List body goes here -->
+
 </LinearLayout>
diff --git a/astrid/res/layout/task_list_body_reengagement.xml b/astrid/res/layout/task_list_body_reengagement.xml
index bc5180043..52fa2aa8a 100644
--- a/astrid/res/layout/task_list_body_reengagement.xml
+++ b/astrid/res/layout/task_list_body_reengagement.xml
@@ -5,72 +5,73 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="wrap_content"
-  android:layout_weight="100">
-  
-  <!-- List body goes here -->
-
-  <LinearLayout
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-  
-      <LinearLayout
-        android:id="@+id/speech_bubble_container"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginLeft="2dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="10dip"
-        android:gravity="bottom">
-        
-	        <ImageView 
-	            android:id="@+id/astridIcon"
-	            android:layout_width="75dip"
-	            android:layout_height="75dip"
-	            android:layout_marginBottom="5dip"
-	            android:src="@drawable/icon"
-	            android:scaleType="fitCenter"
-	            android:layout_alignParentLeft="true"
-	            android:layout_alignParentBottom="true"/>
-        
-	        <LinearLayout
-	            android:id="@+id/speech_bubble_content"
-	            android:layout_width="fill_parent"
-	            android:layout_height="wrap_content"
-	            android:layout_marginRight="5dip"
-	            android:layout_marginBottom="5dip"
-	            android:minHeight="60dip"
-	            android:layout_alignParentBottom="true"
-	            android:gravity="center_vertical"
-	            android:background="@drawable/speech_bubble_reminder"
-	            android:layout_toRightOf="@id/astridIcon">
-	            <TextView 
-	                android:id="@+id/reminder_message"
-	                android:layout_width="fill_parent"
-	                android:layout_height="wrap_content"
-	                style="@style/TextAppearance.TLA_Reminder"
-	                android:gravity="center_vertical"/>
-	        </LinearLayout>
+        android:layout_weight="100">
+
+    <!-- List body goes here -->
+
+    <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+        <LinearLayout
+                android:id="@+id/speech_bubble_container"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginLeft="2dip"
+                android:layout_marginRight="5dip"
+                android:layout_marginBottom="10dip"
+                android:gravity="bottom">
+
+            <ImageView
+                    android:id="@+id/astridIcon"
+                    android:layout_width="75dip"
+                    android:layout_height="75dip"
+                    android:layout_marginBottom="5dip"
+                    android:src="@drawable/icon"
+                    android:scaleType="fitCenter"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentBottom="true"/>
+
+            <LinearLayout
+                    android:id="@+id/speech_bubble_content"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="5dip"
+                    android:layout_marginBottom="5dip"
+                    android:minHeight="60dip"
+                    android:layout_alignParentBottom="true"
+                    android:gravity="center_vertical"
+                    android:background="@drawable/speech_bubble_reminder"
+                    android:layout_toRightOf="@id/astridIcon">
+
+                <TextView
+                        android:id="@+id/reminder_message"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/TextAppearance.TLA_Reminder"
+                        android:gravity="center_vertical"/>
+            </LinearLayout>
         </LinearLayout>
-	  
-	  <Button
-        android:id="@+id/reminder_snooze"
-        android:layout_width="fill_parent"
-        android:layout_height="50dip"
-        android:layout_marginLeft="10dip"
-        android:layout_marginRight="10dip"
-        android:layout_marginBottom="10dip"
-        android:textColor="@android:color/white"
-        android:textSize="24sp"
-        android:text="@string/rmd_NoA_snooze"
-        android:background="#707070"/>
-	  
-  </LinearLayout>
-  
-    
+
+        <Button
+                android:id="@+id/reminder_snooze"
+                android:layout_width="fill_parent"
+                android:layout_height="50dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:layout_marginBottom="10dip"
+                android:textColor="@android:color/white"
+                android:textSize="24sp"
+                android:text="@string/rmd_NoA_snooze"
+                android:background="#707070"/>
+
+    </LinearLayout>
+
+
 </LinearLayout>
diff --git a/astrid/res/layout/task_list_body_standard.xml b/astrid/res/layout/task_list_body_standard.xml
index b6d5b4614..bb2031c70 100644
--- a/astrid/res/layout/task_list_body_standard.xml
+++ b/astrid/res/layout/task_list_body_standard.xml
@@ -5,27 +5,29 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_weight="100">
-        
+             android:layout_width="fill_parent"
+             android:layout_height="fill_parent"
+             android:layout_weight="100">
+
     <!-- No Tasks label -->
-	<TextView android:id="@android:id/empty"
-	    android:drawableTop="@drawable/icon"
-	    android:layout_width="wrap_content" 
-	    android:layout_height="wrap_content"
-	    android:layout_gravity="center"
-	    android:gravity="center"
-	    android:visibility="gone"
-	    android:clickable="true"
-        android:text="@string/TLA_no_items"
-	    style="@style/TextAppearance.TLA_NoItems"/>
-    
+    <TextView
+            android:id="@android:id/empty"
+            android:drawableTop="@drawable/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:visibility="gone"
+            android:clickable="true"
+            android:text="@string/TLA_no_items"
+            style="@style/TextAppearance.TLA_NoItems"/>
+
     <!-- Task List -->
-    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"           
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        style="@style/ListView" />
-    
-    
+    <com.todoroo.astrid.ui.ErrorCatchingListView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            style="@style/ListView"/>
+
+
 </FrameLayout>
diff --git a/astrid/res/layout/task_list_body_subtasks.xml b/astrid/res/layout/task_list_body_subtasks.xml
index 2ec526c1e..611b81fbf 100644
--- a/astrid/res/layout/task_list_body_subtasks.xml
+++ b/astrid/res/layout/task_list_body_subtasks.xml
@@ -5,31 +5,31 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_weight="100">
-        
+             android:layout_width="fill_parent"
+             android:layout_height="wrap_content"
+             android:layout_weight="100">
+
     <!-- No Tasks label -->
-    <TextView android:id="@android:id/empty"
-        android:drawableTop="@drawable/icon"
-        android:layout_width="wrap_content" 
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:visibility="gone"
-        android:clickable="true"
-        android:text="@string/TLA_no_items"
-        style="@style/TextAppearance.TLA_NoItems"/>
+    <TextView
+            android:id="@android:id/empty"
+            android:drawableTop="@drawable/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:visibility="gone"
+            android:clickable="true"
+            android:text="@string/TLA_no_items"
+            style="@style/TextAppearance.TLA_NoItems"/>
 
     <com.todoroo.astrid.ui.DraggableListView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tlv="http://schemas.android.com/apk/res/com.timsu.astrid"
-    
-        android:id="@android:id/list"        
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:drawSelectorOnTop="false"
-        style="@style/ListView"
-    />
-                
+            xmlns:android="http://schemas.android.com/apk/res/android"
+
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:drawSelectorOnTop="false"
+            style="@style/ListView"
+            />
+
 </FrameLayout>
diff --git a/astrid/res/layout/task_list_body_tag.xml b/astrid/res/layout/task_list_body_tag.xml
index 88b8876d4..157875704 100644
--- a/astrid/res/layout/task_list_body_tag.xml
+++ b/astrid/res/layout/task_list_body_tag.xml
@@ -5,60 +5,63 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:orientation="vertical"
-  android:layout_width="fill_parent"
-  android:layout_height="wrap_content"
-  android:layout_weight="100">
-  
-  <LinearLayout
-    android:id="@+id/members_header"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-  
-	  <LinearLayout
-	    android:layout_width="fill_parent"
-	    android:layout_height="43dip"
-	    android:layout_weight="1"
-	    android:background="?attr/asMembersHeaderBackground">
-		  <HorizontalScrollView
-		    android:layout_width="fill_parent"
-		    android:layout_height="43dip"
-		    android:layout_weight="100"
-		    android:scrollbars="none">
-		    <LinearLayout
-		       android:id="@+id/shared_with"
-		       android:layout_width="wrap_content"
-		       android:paddingLeft="6dip"
-		       android:layout_height="fill_parent"
-		       android:gravity="center_vertical">
-		    </LinearLayout>
-		  </HorizontalScrollView>
-		  <ImageView 
-		    android:id="@+id/members_edit"
-		    android:layout_width="43dip"
-		    android:layout_height="43dip"
-		    android:padding="5dip"
-		    android:layout_weight="1"
-		    android:src="@drawable/list_settings"
-		    android:scaleType="fitCenter"/>
-	  </LinearLayout>
-	  
-	  <TextView
-	    android:id="@+id/filter_assigned"
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content"
-	    android:layout_weight="1"
-	    android:gravity="center"
-	    android:paddingTop="3dip"
-        android:paddingBottom="3dip"
-	    style="@style/TextAppearance"
-	    android:background="@android:color/darker_gray"
-	    android:visibility="gone"/>
-	  
-  </LinearLayout>
-  
-  <!-- List body goes here -->
-    
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="100">
+
+    <LinearLayout
+            android:id="@+id/members_header"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+        <LinearLayout
+                android:layout_width="fill_parent"
+                android:layout_height="43dip"
+                android:layout_weight="1"
+                android:background="?attr/asMembersHeaderBackground">
+
+            <HorizontalScrollView
+                    android:layout_width="fill_parent"
+                    android:layout_height="43dip"
+                    android:layout_weight="100"
+                    android:scrollbars="none">
+
+                <LinearLayout
+                        android:id="@+id/shared_with"
+                        android:layout_width="wrap_content"
+                        android:paddingLeft="6dip"
+                        android:layout_height="fill_parent"
+                        android:gravity="center_vertical">
+                </LinearLayout>
+            </HorizontalScrollView>
+
+            <ImageView
+                    android:id="@+id/members_edit"
+                    android:layout_width="43dip"
+                    android:layout_height="43dip"
+                    android:padding="5dip"
+                    android:layout_weight="1"
+                    android:src="@drawable/list_settings"
+                    android:scaleType="fitCenter"/>
+        </LinearLayout>
+
+        <TextView
+                android:id="@+id/filter_assigned"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:paddingTop="3dip"
+                android:paddingBottom="3dip"
+                style="@style/TextAppearance"
+                android:background="@android:color/darker_gray"
+                android:visibility="gone"/>
+
+    </LinearLayout>
+
+    <!-- List body goes here -->
+
 </LinearLayout>
diff --git a/astrid/res/layout/task_list_body_user.xml b/astrid/res/layout/task_list_body_user.xml
index 2c4a375e2..801958bbd 100644
--- a/astrid/res/layout/task_list_body_user.xml
+++ b/astrid/res/layout/task_list_body_user.xml
@@ -5,37 +5,37 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:layout_weight="100">
-  
-	<RelativeLayout
-	    android:id="@+id/user_header"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:padding="8dip"
-		android:background="?attr/asMembersHeaderBackground">
-		
-	    <com.todoroo.astrid.helper.AsyncImageView
-	        android:id="@+id/user_image"
-	        android:layout_height="50dip"
-	        android:layout_width="50dip"
-	        android:scaleType="fitCenter"
-	        android:layout_marginRight="8dip"
-	        android:layout_centerVertical="true"/>
-	    
-	    <TextView
-	        android:id="@+id/user_subtitle"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-            android:layout_alignTop="@id/user_image" 
-	        android:layout_toRightOf="@id/user_image"
-	        android:textColor="@android:color/black"/>
-	    
-	</RelativeLayout>
-  
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="100">
+
+    <RelativeLayout
+            android:id="@+id/user_header"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:padding="8dip"
+            android:background="?attr/asMembersHeaderBackground">
+
+        <com.todoroo.astrid.helper.AsyncImageView
+                android:id="@+id/user_image"
+                android:layout_height="50dip"
+                android:layout_width="50dip"
+                android:scaleType="fitCenter"
+                android:layout_marginRight="8dip"
+                android:layout_centerVertical="true"/>
+
+        <TextView
+                android:id="@+id/user_subtitle"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@id/user_image"
+                android:layout_toRightOf="@id/user_image"
+                android:textColor="@android:color/black"/>
+
+    </RelativeLayout>
+
     <!-- List body goes here -->
-    
+
 </LinearLayout>
diff --git a/astrid/res/layout/task_list_wrapper_activity.xml b/astrid/res/layout/task_list_wrapper_activity.xml
index 40f252db8..a5d834d2d 100644
--- a/astrid/res/layout/task_list_wrapper_activity.xml
+++ b/astrid/res/layout/task_list_wrapper_activity.xml
@@ -5,11 +5,12 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    style="@style/Content"
-    android:id="@+id/tasklist_fragment_container">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        style="@style/Content"
+        android:id="@+id/tasklist_fragment_container">
+
     <com.todoroo.astrid.ui.TaskListFragmentPager
             android:id="@+id/pager"
             android:layout_width="fill_parent"
diff --git a/astrid/res/layout/task_list_wrapper_activity_3pane.xml b/astrid/res/layout/task_list_wrapper_activity_3pane.xml
index 294a3050f..adafd242d 100644
--- a/astrid/res/layout/task_list_wrapper_activity_3pane.xml
+++ b/astrid/res/layout/task_list_wrapper_activity_3pane.xml
@@ -5,45 +5,45 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    style="@style/Content"
-    android:orientation="horizontal">
-  
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        style="@style/Content"
+        android:orientation="horizontal">
+
     <!-- Filter List -->
     <FrameLayout
-	    android:layout_width="match_parent"
-	    android:layout_height="match_parent"
-	    android:layout_weight="60"
-	    android:background="@android:color/white"
-	    android:id="@+id/filterlist_fragment_container" />
-  
-	<View 
-        android:layout_width="1px"
-        android:layout_height="match_parent"
-        android:background="?attr/asSeparatorBackground"/>
-  
-	<LinearLayout
-	    android:id="@+id/right_column"
-	    android:layout_width="match_parent"
-	    android:layout_height="match_parent"
-	    android:layout_weight="40"
-	    android:orientation="vertical">
-        <!-- Task List -->
-        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_weight="50"
-            android:id="@+id/tasklist_fragment_container" />	    
-	    
-        <!-- Task Edit -->
-		<FrameLayout
+            android:layout_weight="60"
+            android:background="@android:color/white"
+            android:id="@+id/filterlist_fragment_container"/>
+
+    <View
+            android:layout_width="1px"
+            android:layout_height="match_parent"
+            android:background="?attr/asSeparatorBackground"/>
+
+    <LinearLayout
+            android:id="@+id/right_column"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:id="@+id/taskedit_fragment_container"
-            android:visibility="gone" />
-	  
+            android:layout_weight="40"
+            android:orientation="vertical">
+        <!-- Task List -->
+        <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="50"
+                android:id="@+id/tasklist_fragment_container"/>
+
+        <!-- Task Edit -->
+        <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:id="@+id/taskedit_fragment_container"
+                android:visibility="gone"/>
+
     </LinearLayout>
-  
+
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/task_list_wrapper_activity_no_swipe.xml b/astrid/res/layout/task_list_wrapper_activity_no_swipe.xml
index 750a5557f..8058dbd41 100644
--- a/astrid/res/layout/task_list_wrapper_activity_no_swipe.xml
+++ b/astrid/res/layout/task_list_wrapper_activity_no_swipe.xml
@@ -5,9 +5,9 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    style="@style/Content"
-    android:id="@+id/tasklist_fragment_container">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        style="@style/Content"
+        android:id="@+id/tasklist_fragment_container">
 </FrameLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/time_picker_dialog.xml b/astrid/res/layout/time_picker_dialog.xml
index a5b9baa0c..651c48483 100644
--- a/astrid/res/layout/time_picker_dialog.xml
+++ b/astrid/res/layout/time_picker_dialog.xml
@@ -18,24 +18,26 @@
 -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
 
     <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="5dip"
-        android:orientation="vertical">
-            
-        <TimePicker android:id="@+id/timePicker"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"/>
-                
-        <CheckBox android:id="@+id/hasTime"
-            android:layout_width="fill_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/TEA_urgency_specific_time"/>
-            
+            android:padding="5dip"
+            android:orientation="vertical">
+
+        <TimePicker
+                android:id="@+id/timePicker"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"/>
+
+        <CheckBox
+                android:id="@+id/hasTime"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/TEA_urgency_specific_time"/>
+
     </LinearLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/astrid/res/layout/timer_decoration.xml b/astrid/res/layout/timer_decoration.xml
index de9d8f6b1..3f01a905b 100644
--- a/astrid/res/layout/timer_decoration.xml
+++ b/astrid/res/layout/timer_decoration.xml
@@ -5,37 +5,39 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:gravity="top"
-    android:layout_marginTop="-10dip"
-    android:paddingLeft="8dip">
-    
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:gravity="top"
+              android:layout_marginTop="-10dip"
+              android:paddingLeft="8dip">
+
     <ImageView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="5"
-        android:gravity="center_horizontal"
-        android:scaleType="center"
-        android:src="@drawable/task_timer" />
-      
-    <Chronometer android:id="@+id/timer"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:gravity="center_horizontal"
-        android:visibility="gone"
-        android:textColor="#5d8cbb"
-        android:textSize="10sp" />
-      
-    <TextView android:id="@+id/label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="2"
-        android:gravity="center_horizontal"
-        android:textColor="#5d8cbb"
-        android:textSize="10sp" />
-        
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="5"
+            android:gravity="center_horizontal"
+            android:scaleType="center"
+            android:src="@drawable/task_timer"/>
+
+    <Chronometer
+            android:id="@+id/timer"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="2"
+            android:gravity="center_horizontal"
+            android:visibility="gone"
+            android:textColor="#5d8cbb"
+            android:textSize="10sp"/>
+
+    <TextView
+            android:id="@+id/label"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="2"
+            android:gravity="center_horizontal"
+            android:textColor="#5d8cbb"
+            android:textSize="10sp"/>
+
 </LinearLayout>
 
diff --git a/astrid/res/layout/update_adapter_row.xml b/astrid/res/layout/update_adapter_row.xml
index f7b258701..3fc06fd8e 100644
--- a/astrid/res/layout/update_adapter_row.xml
+++ b/astrid/res/layout/update_adapter_row.xml
@@ -5,84 +5,88 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="55dip"
-    android:orientation="vertical">
-	
-	<RelativeLayout
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content"
-	    android:background="@android:drawable/list_selector_background"
-	    android:paddingTop="5dip"
-	    android:paddingBottom="5dip"
-	    android:paddingLeft="6dip"
-	    android:paddingRight="6dip">
-	        
-	    <!-- picture -->
-	    <com.todoroo.astrid.helper.AsyncImageView android:id="@+id/picture"
-	        android:layout_width="40dip"
-	        android:layout_height="40dip"
-	        android:layout_alignParentTop="true"
-	        android:layout_alignParentLeft="true"
-	        android:layout_marginTop="5dip"
-	        android:layout_marginLeft="3dip"
-	        astrid:defaultSrc="@drawable/icn_default_person_image"
-	        android:scaleType="fitCenter" />
-	        
-	    <!-- title -->
-	    <TextView android:id="@+id/title"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_alignParentTop="true"
-	        android:layout_alignParentLeft="true"
-	        android:paddingLeft="54dip" 
-	        android:paddingRight="5dip" 
-	        style="@style/TextAppearance.TAd_ItemTitle"
-	        android:textSize="16sp"/>
-	    
-	        
-        <!-- activity date -->
-        <TextView android:id="@+id/date"
+              xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:minHeight="55dip"
+              android:orientation="vertical">
+
+    <RelativeLayout
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"  
-            android:layout_below="@id/title"
-            android:layout_alignLeft="@id/title"
-            android:layout_marginLeft="54dip" 
-            android:paddingTop="1dip"
-            style="@style/TextAppearance.TAd_ItemDueDate"
-            android:textStyle="normal"
-            android:gravity="left"
-            android:ellipsize="end"
-            android:textSize="12sp"
-            android:singleLine="true"/>
-	        
-	    
+            android:layout_height="wrap_content"
+            android:background="@android:drawable/list_selector_background"
+            android:paddingTop="5dip"
+            android:paddingBottom="5dip"
+            android:paddingLeft="6dip"
+            android:paddingRight="6dip">
+
         <!-- picture -->
-        <com.todoroo.astrid.helper.AsyncImageView android:id="@+id/comment_picture"
-            android:layout_width="100dip"
-            android:layout_height="100dip"
-            android:layout_below="@id/date"
-            android:paddingTop="5dip" 
-            astrid:defaultSrc="@drawable/icn_default_person_image"
-            android:scaleType="fitStart"
-            android:layout_marginLeft="50dip"
-            android:visibility="gone" />
-        
-	        
-	</RelativeLayout>
-    
+        <com.todoroo.astrid.helper.AsyncImageView
+                android:id="@+id/picture"
+                android:layout_width="40dip"
+                android:layout_height="40dip"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentLeft="true"
+                android:layout_marginTop="5dip"
+                android:layout_marginLeft="3dip"
+                astrid:defaultSrc="@drawable/icn_default_person_image"
+                android:scaleType="fitCenter"/>
+
+        <!-- title -->
+        <TextView
+                android:id="@+id/title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentLeft="true"
+                android:paddingLeft="54dip"
+                android:paddingRight="5dip"
+                style="@style/TextAppearance.TAd_ItemTitle"
+                android:textSize="16sp"/>
+
+
+        <!-- activity date -->
+        <TextView
+                android:id="@+id/date"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/title"
+                android:layout_alignLeft="@id/title"
+                android:layout_marginLeft="54dip"
+                android:paddingTop="1dip"
+                style="@style/TextAppearance.TAd_ItemDueDate"
+                android:textStyle="normal"
+                android:gravity="left"
+                android:ellipsize="end"
+                android:textSize="12sp"
+                android:singleLine="true"/>
+
+
+        <!-- picture -->
+        <com.todoroo.astrid.helper.AsyncImageView
+                android:id="@+id/comment_picture"
+                android:layout_width="100dip"
+                android:layout_height="100dip"
+                android:layout_below="@id/date"
+                android:paddingTop="5dip"
+                astrid:defaultSrc="@drawable/icn_default_person_image"
+                android:scaleType="fitStart"
+                android:layout_marginLeft="50dip"
+                android:visibility="gone"/>
+
+
+    </RelativeLayout>
+
     <!-- picture -->
     <com.todoroo.astrid.helper.AsyncImageView
-        android:id="@+id/comment_picture"
-        android:layout_width="50dip"
-        android:layout_height="50dip"
-        android:layout_alignParentBottom="true"
-        android:layout_marginLeft="50dip"
-        android:layout_marginBottom="4dip"
-        android:visibility="gone"
-        astrid:defaultSrc="@android:drawable/ic_menu_gallery"
-        android:scaleType="fitCenter"/>
-    
+            android:id="@+id/comment_picture"
+            android:layout_width="50dip"
+            android:layout_height="50dip"
+            android:layout_alignParentBottom="true"
+            android:layout_marginLeft="50dip"
+            android:layout_marginBottom="4dip"
+            android:visibility="gone"
+            astrid:defaultSrc="@android:drawable/ic_menu_gallery"
+            android:scaleType="fitCenter"/>
+
 </LinearLayout>
diff --git a/astrid/res/layout/update_message_link.xml b/astrid/res/layout/update_message_link.xml
index 018f37067..eb37534d9 100644
--- a/astrid/res/layout/update_message_link.xml
+++ b/astrid/res/layout/update_message_link.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingLeft="10dip"
-    android:paddingRight="10dip" >
-    
-    <TextView 
-        android:id="@+id/update_message"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textSize="16sp"
-        android:layout_marginBottom="30sp"/>
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:paddingLeft="10dip"
+              android:paddingRight="10dip">
+
+    <TextView
+            android:id="@+id/update_message"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textSize="16sp"
+            android:layout_marginBottom="30sp"/>
+
+    <TextView
+            android:id="@+id/update_link"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textSize="16sp"
+            android:layout_marginBottom="10sp"
+            android:gravity="center"/>
 
-    <TextView 
-        android:id="@+id/update_link"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textSize="16sp"
-        android:layout_marginBottom="10sp"
-        android:gravity="center"/>
-    
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/update_message_speech_bubble.xml b/astrid/res/layout/update_message_speech_bubble.xml
index 89a725e69..6e62542a3 100644
--- a/astrid/res/layout/update_message_speech_bubble.xml
+++ b/astrid/res/layout/update_message_speech_bubble.xml
@@ -5,43 +5,46 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <merge>
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	    android:id="@+id/speech_bubble_container"
-	    android:layout_width="fill_parent"
-	    android:layout_height="wrap_content"
-	    android:orientation="horizontal"
-	    android:layout_marginLeft="2dip"
-	    android:layout_marginRight="5dip"
-	    android:layout_marginBottom="10dip"
-	    android:gravity="bottom">
-	    <ImageView 
-	        android:id="@+id/astridIcon"
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_marginBottom="5dip"
-	        android:src="@drawable/icon"
-	        android:scaleType="fitCenter"
-	        android:layout_alignParentLeft="true"/>
-	    
-	    
-	    <LinearLayout
-	        android:id="@+id/speech_bubble_content"
-	        android:layout_width="fill_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_marginRight="5dip"
-	        android:layout_marginBottom="5dip"
-	        android:minHeight="60dip"
-	        android:layout_alignParentBottom="true"
-	        android:gravity="center_vertical"
-	        android:background="@drawable/speech_bubble_reminder"
-	        android:layout_toRightOf="@id/astridIcon">
-	        <WebView 
-	            android:id="@+id/reminder_message"
-	            android:layout_width="fill_parent"
-	            android:layout_height="wrap_content"
-	            style="@style/TextAppearance.TLA_Reminder"
-	            android:background="@android:color/transparent"
-	            android:gravity="center_vertical"/>
-	    </LinearLayout>
-	</LinearLayout>
+
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:id="@+id/speech_bubble_container"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal"
+                  android:layout_marginLeft="2dip"
+                  android:layout_marginRight="5dip"
+                  android:layout_marginBottom="10dip"
+                  android:gravity="bottom">
+
+        <ImageView
+                android:id="@+id/astridIcon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dip"
+                android:src="@drawable/icon"
+                android:scaleType="fitCenter"
+                android:layout_alignParentLeft="true"/>
+
+
+        <LinearLayout
+                android:id="@+id/speech_bubble_content"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="5dip"
+                android:layout_marginBottom="5dip"
+                android:minHeight="60dip"
+                android:layout_alignParentBottom="true"
+                android:gravity="center_vertical"
+                android:background="@drawable/speech_bubble_reminder"
+                android:layout_toRightOf="@id/astridIcon">
+
+            <WebView
+                    android:id="@+id/reminder_message"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/TextAppearance.TLA_Reminder"
+                    android:background="@android:color/transparent"
+                    android:gravity="center_vertical"/>
+        </LinearLayout>
+    </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/astrid/res/layout/update_message_view.xml b/astrid/res/layout/update_message_view.xml
index 83160ccfc..1475e525c 100644
--- a/astrid/res/layout/update_message_view.xml
+++ b/astrid/res/layout/update_message_view.xml
@@ -5,39 +5,40 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/reminder_root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="10dip"
-    android:paddingRight="10dip"
-    android:orientation="vertical">
-    
+              android:id="@+id/reminder_root"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:paddingLeft="10dip"
+              android:paddingRight="10dip"
+              android:orientation="vertical">
+
     <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginTop="5dip"
-        android:layout_marginRight="5dip"
-        android:layout_marginBottom="20dip"
-        android:layout_marginLeft="5dip">
-        
-        <TextView 
-            android:id="@+id/update_title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:textColor="@android:color/white"
-            android:text="@string/UpS_updates_title"
-            android:layout_weight="1"/>
+            android:orientation="horizontal"
+            android:layout_marginTop="5dip"
+            android:layout_marginRight="5dip"
+            android:layout_marginBottom="20dip"
+            android:layout_marginLeft="5dip">
+
+        <TextView
+                android:id="@+id/update_title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:textSize="20sp"
+                android:textColor="@android:color/white"
+                android:text="@string/UpS_updates_title"
+                android:layout_weight="1"/>
+
         <ImageView
-            android:id="@+id/dismiss"
-            android:layout_width="25dip"
-            android:layout_height="25dip"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_menu_close"/>
-    
+                android:id="@+id/dismiss"
+                android:layout_width="25dip"
+                android:layout_height="25dip"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_menu_close"/>
+
     </LinearLayout>
-    
+
     <include layout="@layout/update_message_speech_bubble"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/web_service_amazon_row.xml b/astrid/res/layout/web_service_amazon_row.xml
index 01c9b182a..98947f276 100644
--- a/astrid/res/layout/web_service_amazon_row.xml
+++ b/astrid/res/layout/web_service_amazon_row.xml
@@ -5,89 +5,94 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"    
-    android:layout_width="fill_parent"
-    android:layout_height="100dip"
-    android:background="@android:drawable/list_selector_background">
-        
+                xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+                android:layout_width="fill_parent"
+                android:layout_height="100dip"
+                android:background="@android:drawable/list_selector_background">
+
     <!-- imageview -->
-    <com.todoroo.astrid.helper.AsyncImageView android:id="@+id/image"
-        android:layout_width="70dip"
-        android:layout_height="100dip"
-        android:layout_marginLeft="5dip"
-        android:scaleType="fitCenter"
-        astrid:defaultSrc="@drawable/ic_contact_picture_2" />
-        
+    <com.todoroo.astrid.helper.AsyncImageView
+            android:id="@+id/image"
+            android:layout_width="70dip"
+            android:layout_height="100dip"
+            android:layout_marginLeft="5dip"
+            android:scaleType="fitCenter"
+            astrid:defaultSrc="@drawable/ic_contact_picture_2"/>
+
     <!-- title -->
-    <TextView android:id="@+id/title"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/image"
-        android:layout_marginLeft="5dip"
-        android:layout_marginTop="5dip"
-        android:layout_marginBottom="3dip"
-        android:paddingRight="30dp"
-        android:lines="2"
-        android:singleLine="false"
-        android:textSize="12sp"
-        android:textStyle="bold"
-        android:gravity="center_vertical"
-        android:text="7-feet Xx-large Rust Cozy Sac Foof Bean Bag Chair"
-        android:ellipsize="end" />
-        
+    <TextView
+            android:id="@+id/title"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/image"
+            android:layout_marginLeft="5dip"
+            android:layout_marginTop="5dip"
+            android:layout_marginBottom="3dip"
+            android:paddingRight="30dp"
+            android:lines="2"
+            android:singleLine="false"
+            android:textSize="12sp"
+            android:textStyle="bold"
+            android:gravity="center_vertical"
+            android:text="7-feet Xx-large Rust Cozy Sac Foof Bean Bag Chair"
+            android:ellipsize="end"/>
+
     <!-- subtitle -->
-    <TextView android:id="@+id/subtitle"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/title"
-        android:layout_toRightOf="@id/image"
-        android:layout_marginLeft="5dip"
-        android:layout_marginBottom="3dip"
-        android:paddingRight="30dp"
-        android:singleLine="true"
-        android:textSize="12sp"
-        android:text="The Cozy Sac"
-        android:gravity="center_vertical" />
-        
+    <TextView
+            android:id="@+id/subtitle"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/title"
+            android:layout_toRightOf="@id/image"
+            android:layout_marginLeft="5dip"
+            android:layout_marginBottom="3dip"
+            android:paddingRight="30dp"
+            android:singleLine="true"
+            android:textSize="12sp"
+            android:text="The Cozy Sac"
+            android:gravity="center_vertical"/>
+
     <!-- price -->
-    <TextView android:id="@+id/price"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/subtitle"
-        android:layout_toRightOf="@id/image"
-        android:layout_marginLeft="5dip"
-        android:layout_marginBottom="3dip"
-        android:paddingRight="30dp"
-        android:singleLine="true"
-        android:textSize="12sp"
-        android:textStyle="bold"
-        android:textColor="#990000"
-        android:text="$259.00"
-        android:gravity="center_vertical" />
-        
+    <TextView
+            android:id="@+id/price"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/subtitle"
+            android:layout_toRightOf="@id/image"
+            android:layout_marginLeft="5dip"
+            android:layout_marginBottom="3dip"
+            android:paddingRight="30dp"
+            android:singleLine="true"
+            android:textSize="12sp"
+            android:textStyle="bold"
+            android:textColor="#990000"
+            android:text="$259.00"
+            android:gravity="center_vertical"/>
+
     <!-- new and used -->
-    <TextView android:id="@+id/new_and_used"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/price"
-        android:layout_toRightOf="@id/image"
-        android:layout_marginLeft="5dip"
-        android:layout_marginBottom="3dip"
-        android:paddingRight="30dp"
-        android:ellipsize="start"
-        android:singleLine="true"
-        android:textSize="12sp"
-        android:text="2 New &amp; Used from $224"
-        android:gravity="center_vertical" />
-        
+    <TextView
+            android:id="@+id/new_and_used"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/price"
+            android:layout_toRightOf="@id/image"
+            android:layout_marginLeft="5dip"
+            android:layout_marginBottom="3dip"
+            android:paddingRight="30dp"
+            android:ellipsize="start"
+            android:singleLine="true"
+            android:textSize="12sp"
+            android:text="2 New &amp; Used from $224"
+            android:gravity="center_vertical"/>
+
     <!-- arrow -->
 
     <ImageView
-        android:layout_width="10dip"
-        android:layout_height="fill_parent"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="5dip"
-        android:src="@drawable/icn_arrow_right"
-        android:scaleType="centerInside" />
-        
+            android:layout_width="10dip"
+            android:layout_height="fill_parent"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="5dip"
+            android:src="@drawable/icn_arrow_right"
+            android:scaleType="centerInside"/>
+
 </RelativeLayout>
diff --git a/astrid/res/layout/web_service_row.xml b/astrid/res/layout/web_service_row.xml
index 65a764308..9568f2092 100644
--- a/astrid/res/layout/web_service_row.xml
+++ b/astrid/res/layout/web_service_row.xml
@@ -5,55 +5,58 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"    
-    android:layout_width="fill_parent"
-    android:layout_height="100dip"
-    android:background="@android:drawable/list_selector_background">
-        
+                xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
+                android:layout_width="fill_parent"
+                android:layout_height="100dip"
+                android:background="@android:drawable/list_selector_background">
+
     <!-- imageview -->
-    <com.todoroo.astrid.helper.AsyncImageView android:id="@+id/image"
-        android:layout_width="100dip"
-        android:layout_height="100dip"
-        android:layout_marginLeft="5dip"
-        android:scaleType="fitCenter"
-        astrid:defaultSrc="@drawable/ic_contact_picture_2" />
-        
+    <com.todoroo.astrid.helper.AsyncImageView
+            android:id="@+id/image"
+            android:layout_width="100dip"
+            android:layout_height="100dip"
+            android:layout_marginLeft="5dip"
+            android:scaleType="fitCenter"
+            astrid:defaultSrc="@drawable/ic_contact_picture_2"/>
+
     <!-- title -->
-    <TextView android:id="@+id/title"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="5dip"
-        android:layout_toRightOf="@id/image"
-        android:paddingRight="30dp"
-        android:lines="3"
-        android:singleLine="false"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        android:gravity="center_vertical"
-        android:text="Probiotic - Wikepedia, the free encyclopedia"
-        android:ellipsize="end" />
-        
+    <TextView
+            android:id="@+id/title"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dip"
+            android:layout_toRightOf="@id/image"
+            android:paddingRight="30dp"
+            android:lines="3"
+            android:singleLine="false"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            android:gravity="center_vertical"
+            android:text="Probiotic - Wikepedia, the free encyclopedia"
+            android:ellipsize="end"/>
+
     <!-- url -->
-    <TextView android:id="@+id/subtitle"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/title"
-        android:layout_toRightOf="@id/image"
-        android:layout_marginLeft="5dip"
-        android:paddingRight="30dp"
-        android:singleLine="true"
-        android:textSize="14sp"
-        android:text="en.wikipedia.org"
-        android:gravity="center_vertical" />
-        
+    <TextView
+            android:id="@+id/subtitle"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/title"
+            android:layout_toRightOf="@id/image"
+            android:layout_marginLeft="5dip"
+            android:paddingRight="30dp"
+            android:singleLine="true"
+            android:textSize="14sp"
+            android:text="en.wikipedia.org"
+            android:gravity="center_vertical"/>
+
     <!-- arrow -->
 
     <ImageView
-        android:layout_width="10dip"
-        android:layout_height="fill_parent"
-        android:layout_alignParentRight="true"
-        android:layout_marginRight="5dip"
-        android:src="@drawable/icn_arrow_right"
-        android:scaleType="centerInside" />
-        
+            android:layout_width="10dip"
+            android:layout_height="fill_parent"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="5dip"
+            android:src="@drawable/icn_arrow_right"
+            android:scaleType="centerInside"/>
+
 </RelativeLayout>
diff --git a/astrid/res/layout/web_services_load_button.xml b/astrid/res/layout/web_services_load_button.xml
index 67ef2801d..caff003ca 100644
--- a/astrid/res/layout/web_services_load_button.xml
+++ b/astrid/res/layout/web_services_load_button.xml
@@ -5,13 +5,13 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/webServicesLoad"
-    style="@style/TextAppearance.TLA_NoItems"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:clickable="true"
-    android:drawableTop="@drawable/icon"
-    android:gravity="center"
-    android:text="@string/WSV_click_to_load"/>
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/webServicesLoad"
+        style="@style/TextAppearance.TLA_NoItems"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:clickable="true"
+        android:drawableTop="@drawable/icon"
+        android:gravity="center"
+        android:text="@string/WSV_click_to_load"/>
diff --git a/astrid/res/layout/welcome_walkthrough.xml b/astrid/res/layout/welcome_walkthrough.xml
index fa829e881..614ee8fed 100644
--- a/astrid/res/layout/welcome_walkthrough.xml
+++ b/astrid/res/layout/welcome_walkthrough.xml
@@ -5,52 +5,54 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
 
     <RelativeLayout
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent">
-    
-        <android.support.v4.view.ViewPager
-            android:id="@+id/pager"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"/>
-        
-        <RelativeLayout 
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_alignParentBottom="true"
-            android:paddingTop="3dip"
-            android:paddingBottom="3dip"
-            android:background="#55000000"
-            android:gravity="center_vertical">
-            <com.viewpagerindicator.CirclePageIndicator
-                android:id="@+id/indicator"
-                android:padding="15dip"
+            android:layout_height="fill_parent">
+
+        <android.support.v4.view.ViewPager
+                android:id="@+id/pager"
+                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"/>
+
+        <RelativeLayout
                 android:layout_width="fill_parent"
-                android:background="#00000000"
-                style="@style/CustomCirclePageIndicator"/>
-            <TextView
-                android:id="@+id/next"
-                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="5dip"
-                android:text="@string/welcome_next"
-                android:textColor="#444444"
-                android:textSize="20dip"
-                android:textStyle="bold"
-                android:paddingRight="10dip"
-                android:shadowRadius="2"
-                android:shadowDy="1"
-                android:shadowColor="@android:color/white" />  
+                android:orientation="horizontal"
+                android:layout_alignParentBottom="true"
+                android:paddingTop="3dip"
+                android:paddingBottom="3dip"
+                android:background="#55000000"
+                android:gravity="center_vertical">
+
+            <com.viewpagerindicator.CirclePageIndicator
+                    android:id="@+id/indicator"
+                    android:padding="15dip"
+                    android:layout_height="wrap_content"
+                    android:layout_width="fill_parent"
+                    android:background="#00000000"
+                    style="@style/CustomCirclePageIndicator"/>
+
+            <TextView
+                    android:id="@+id/next"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="5dip"
+                    android:text="@string/welcome_next"
+                    android:textColor="#444444"
+                    android:textSize="20dip"
+                    android:textStyle="bold"
+                    android:paddingRight="10dip"
+                    android:shadowRadius="2"
+                    android:shadowDy="1"
+                    android:shadowColor="@android:color/white"/>
         </RelativeLayout>
-  </RelativeLayout>
+    </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/welcome_walkthrough_login_page.xml b/astrid/res/layout/welcome_walkthrough_login_page.xml
index 0c81978bf..194086ad6 100644
--- a/astrid/res/layout/welcome_walkthrough_login_page.xml
+++ b/astrid/res/layout/welcome_walkthrough_login_page.xml
@@ -4,116 +4,116 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-  <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:paddingLeft="4dip"
-    android:paddingRight="4dip"
-    android:background="#d0d0d0"
-    android:orientation="vertical">
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:paddingLeft="4dip"
+        android:paddingRight="4dip"
+        android:background="#d0d0d0"
+        android:orientation="vertical">
 
     <TextView
-      android:id="@+id/logo"
-      android:layout_width="fill_parent"
-      android:layout_height="110dip"
-      android:gravity="center_horizontal"
-      android:paddingBottom="10dip"
-      android:layout_marginTop="30dip"
-      android:text="@string/welcome_title_7"
-      android:textColor="#444444"
-      android:textSize="40dip"
-      android:textStyle="bold"
-      android:shadowRadius="2"
-      android:shadowDy="1"
-      android:shadowColor="@android:color/white"/>
-    
-    <TextView
-      android:id="@+id/error"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:gravity="center"
-      android:textColor="#ff0000"
-      android:textSize="16sp"
-      android:textStyle="bold" />
-    
-	<RelativeLayout
-	    android:layout_width="fill_parent"
-	    android:layout_height="253dp"
-	    android:paddingTop="5dip" >
-	
-	    <TextView
-	      android:id="@+id/tos"
-	      android:layout_width="fill_parent"
-	      android:layout_height="35dip"
-	      android:layout_alignParentTop="true"
-	      android:gravity="center"
-	      android:paddingLeft="20dip"
-	      android:paddingRight="20dip"
-	      android:textSize="12.5sp"
-	      android:textColor="#444444" />   
+            android:id="@+id/logo"
+            android:layout_width="fill_parent"
+            android:layout_height="110dip"
+            android:gravity="center_horizontal"
+            android:paddingBottom="10dip"
+            android:layout_marginTop="30dip"
+            android:text="@string/welcome_title_7"
+            android:textColor="#444444"
+            android:textSize="40dip"
+            android:textStyle="bold"
+            android:shadowRadius="2"
+            android:shadowDy="1"
+            android:shadowColor="@android:color/white"/>
 
-	    <Button
-	      android:id="@+id/gg_login"
-	      android:layout_width="fill_parent"
-	      android:layout_height="45dip"
-	      android:layout_below="@id/tos"
-	      android:paddingLeft="20dip"
-	      android:paddingRight="20dip"
-          android:layout_marginLeft="15dip"
-          android:layout_marginRight="15dip"
-	      android:textSize="16sp"
-	      android:drawableLeft="@drawable/google"
-	      android:text="@string/actfm_ALA_gg_login" />
-	    
-	    <com.facebook.android.LoginButton
-	      android:id="@+id/fb_login"
-	      android:layout_width="fill_parent"
-	      android:layout_height="45dip"
-	      android:layout_below="@id/gg_login"
-	      android:paddingLeft="20dip"
-	      android:paddingRight="20dip"
-          android:layout_marginLeft="15dip"
-          android:layout_marginRight="15dip"
-	      android:textSize="16sp"
-	      android:drawableLeft="@drawable/facebook"
-	      android:text="@string/actfm_ALA_fb_login" />
-	    
-	    <Button
-	      android:id="@+id/pw_signup"
-	      android:layout_width="fill_parent"
-	      android:layout_height="45dip"
-	      android:layout_below="@id/fb_login"
-	      android:paddingLeft="20dip"
-          android:paddingRight="20dip"
-          android:layout_marginLeft="15dip"
-          android:layout_marginRight="15dip"
-	      android:textSize="16sp" 
-	      android:text="@string/welcome_login_pw"/>
-	    
-	    <TextView
-            android:id="@+id/pw_login"
-            android:layout_width="wrap_content"
-            android:layout_height="35dip"
+    <TextView
+            android:id="@+id/error"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
             android:gravity="center"
-            android:layout_centerHorizontal="true"
-            android:layout_below="@id/pw_signup" 
-            android:textColor="#444"
+            android:textColor="#ff0000"
             android:textSize="16sp"
-            android:text="@string/welcome_sign_in"/>
-	    
-	    <TextView
-	      android:id="@+id/login_later"
-	      android:layout_width="fill_parent"
-	      android:layout_height="45dip"
-	      android:gravity="center"
-	      android:layout_below="@id/pw_login"
-	      android:paddingLeft="20dip"
-	      android:paddingRight="20dip"
-	      android:paddingBottom="5dip"
-	      android:textSize="16sp"
-	      android:text="@string/welcome_login_later"
-	      android:textColor="#444444" />
-	      
-  </RelativeLayout>
+            android:textStyle="bold"/>
+
+    <RelativeLayout
+            android:layout_width="fill_parent"
+            android:layout_height="253dp"
+            android:paddingTop="5dip">
+
+        <TextView
+                android:id="@+id/tos"
+                android:layout_width="fill_parent"
+                android:layout_height="35dip"
+                android:layout_alignParentTop="true"
+                android:gravity="center"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip"
+                android:textSize="12.5sp"
+                android:textColor="#444444"/>
+
+        <Button
+                android:id="@+id/gg_login"
+                android:layout_width="fill_parent"
+                android:layout_height="45dip"
+                android:layout_below="@id/tos"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip"
+                android:layout_marginLeft="15dip"
+                android:layout_marginRight="15dip"
+                android:textSize="16sp"
+                android:drawableLeft="@drawable/google"
+                android:text="@string/actfm_ALA_gg_login"/>
+
+        <com.facebook.android.LoginButton
+                android:id="@+id/fb_login"
+                android:layout_width="fill_parent"
+                android:layout_height="45dip"
+                android:layout_below="@id/gg_login"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip"
+                android:layout_marginLeft="15dip"
+                android:layout_marginRight="15dip"
+                android:textSize="16sp"
+                android:drawableLeft="@drawable/facebook"
+                android:text="@string/actfm_ALA_fb_login"/>
+
+        <Button
+                android:id="@+id/pw_signup"
+                android:layout_width="fill_parent"
+                android:layout_height="45dip"
+                android:layout_below="@id/fb_login"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip"
+                android:layout_marginLeft="15dip"
+                android:layout_marginRight="15dip"
+                android:textSize="16sp"
+                android:text="@string/welcome_login_pw"/>
+
+        <TextView
+                android:id="@+id/pw_login"
+                android:layout_width="wrap_content"
+                android:layout_height="35dip"
+                android:gravity="center"
+                android:layout_centerHorizontal="true"
+                android:layout_below="@id/pw_signup"
+                android:textColor="#444"
+                android:textSize="16sp"
+                android:text="@string/welcome_sign_in"/>
+
+        <TextView
+                android:id="@+id/login_later"
+                android:layout_width="fill_parent"
+                android:layout_height="45dip"
+                android:gravity="center"
+                android:layout_below="@id/pw_login"
+                android:paddingLeft="20dip"
+                android:paddingRight="20dip"
+                android:paddingBottom="5dip"
+                android:textSize="16sp"
+                android:text="@string/welcome_login_later"
+                android:textColor="#444444"/>
+
+    </RelativeLayout>
 </LinearLayout>
diff --git a/astrid/res/layout/welcome_walkthrough_page.xml b/astrid/res/layout/welcome_walkthrough_page.xml
index ef703b99c..46699c0fe 100644
--- a/astrid/res/layout/welcome_walkthrough_page.xml
+++ b/astrid/res/layout/welcome_walkthrough_page.xml
@@ -5,44 +5,45 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" 
-    android:background="#d0d0d0">
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical"
+              android:background="#d0d0d0">
 
     <TextView
-        android:id="@+id/welcome_walkthrough_title"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="27dp"
-        android:gravity="center_horizontal"
-        android:text="Hello"
-        android:textColor="#444444"
-        android:textSize="40dip"
-        android:textStyle="bold"
-        android:shadowRadius="2"
-        android:shadowDy="1"
-        android:shadowColor="@android:color/white" />
+            android:id="@+id/welcome_walkthrough_title"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="27dp"
+            android:gravity="center_horizontal"
+            android:text="Hello"
+            android:textColor="#444444"
+            android:textSize="40dip"
+            android:textStyle="bold"
+            android:shadowRadius="2"
+            android:shadowDy="1"
+            android:shadowColor="@android:color/white"/>
+
     <ImageView
-        android:id="@+id/welcome_walkthrough_image"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_weight="1"
-        android:src="@drawable/welcome_walkthrough_1" 
-        android:scaleType="fitCenter"/>
-        
+            android:id="@+id/welcome_walkthrough_image"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:src="@drawable/welcome_walkthrough_1"
+            android:scaleType="fitCenter"/>
+
     <TextView
-        android:id="@+id/welcome_walkthrough_body"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="75dp"
-        android:gravity="center_horizontal"
-        android:text="Hello"
-        android:textColor="#444444"
-        android:textSize="20dip"
-        android:textStyle="bold"
-        android:shadowRadius="2"
-        android:shadowDy="1"
-        android:shadowColor="@android:color/white" />
+            android:id="@+id/welcome_walkthrough_body"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="75dp"
+            android:gravity="center_horizontal"
+            android:text="Hello"
+            android:textColor="#444444"
+            android:textSize="20dip"
+            android:textStyle="bold"
+            android:shadowRadius="2"
+            android:shadowDy="1"
+            android:shadowColor="@android:color/white"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/welcome_walkthrough_simple_login.xml b/astrid/res/layout/welcome_walkthrough_simple_login.xml
index ecd69cc33..de859a595 100644
--- a/astrid/res/layout/welcome_walkthrough_simple_login.xml
+++ b/astrid/res/layout/welcome_walkthrough_simple_login.xml
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" 
-    android:background="@drawable/astrid_com_gradient"
-    android:gravity="center_horizontal">
-    
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:background="@drawable/astrid_com_gradient"
+              android:gravity="center_horizontal">
+
     <ImageView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_weight="1"
-        android:paddingTop="39dip"
-        android:src="@drawable/astrid_com_logo_new"
-        android:scaleType="center" />
-    
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:paddingTop="39dip"
+            android:src="@drawable/astrid_com_logo_new"
+            android:scaleType="center"/>
+
     <Button
-        android:id="@+id/quick_login_google"
-        android:layout_width="280dip"
-        android:layout_height="wrap_content" 
-        android:minHeight="45dip" 
-        android:textSize="16sp"
-        android:background="@drawable/google_login_background"
-        android:textColor="@android:color/white"
-        android:layout_marginBottom="15dip"/>
-    
+            android:id="@+id/quick_login_google"
+            android:layout_width="280dip"
+            android:layout_height="wrap_content"
+            android:minHeight="45dip"
+            android:textSize="16sp"
+            android:background="@drawable/google_login_background"
+            android:textColor="@android:color/white"
+            android:layout_marginBottom="15dip"/>
+
     <TextView
-        android:id="@+id/quick_login_reject"
-        android:layout_width="wrap_content"
-        android:layout_height="45dip"
-        android:layout_marginBottom="70dip"
-        android:textSize="16sp"
-        android:textColor="@android:color/white"/>
-    
+            android:id="@+id/quick_login_reject"
+            android:layout_width="wrap_content"
+            android:layout_height="45dip"
+            android:layout_marginBottom="70dip"
+            android:textSize="16sp"
+            android:textColor="@android:color/white"/>
+
     <TextView
-      android:id="@+id/error"
-      android:layout_width="fill_parent"
-      android:layout_height="45dip"
-      android:gravity="center"
-      android:visibility="gone"
-      android:textColor="#ff0000"
-      android:textSize="16sp"
-      android:textStyle="bold" />
+            android:id="@+id/error"
+            android:layout_width="fill_parent"
+            android:layout_height="45dip"
+            android:gravity="center"
+            android:visibility="gone"
+            android:textColor="#ff0000"
+            android:textSize="16sp"
+            android:textStyle="bold"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/widget_config_activity.xml b/astrid/res/layout/widget_config_activity.xml
index 77c83808c..acef8671b 100644
--- a/astrid/res/layout/widget_config_activity.xml
+++ b/astrid/res/layout/widget_config_activity.xml
@@ -2,34 +2,36 @@
 <!-- See the file "LICENSE" for the full license governing this code.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent" 
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    style="@style/Content">       
-        
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical"
+              style="@style/Content">
+
     <!-- Title -->
     <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:text="@string/WCA_title"
-        android:padding="10dip"
-        style="TextAppearance.ActionBar_ListsHeader" />
-        
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/WCA_title"
+            android:padding="10dip"
+            style="TextAppearance.ActionBar_ListsHeader"/>
+
     <!-- List -->
-    <com.todoroo.astrid.ui.ErrorCatchingListView android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_weight="100"
-        android:scrollbars="vertical"
-        android:cacheColorHint="#00000000"/>
+    <com.todoroo.astrid.ui.ErrorCatchingListView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="100"
+            android:scrollbars="vertical"
+            android:cacheColorHint="#00000000"/>
 
     <!-- List -->
-    <Button android:id="@+id/ok"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:text="@android:string/ok"/>
-    
+    <Button
+            android:id="@+id/ok"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@android:string/ok"/>
+
 </LinearLayout>
     
diff --git a/astrid/res/layout/widget_initialized.xml b/astrid/res/layout/widget_initialized.xml
index 62b7f734f..b1c884ab7 100644
--- a/astrid/res/layout/widget_initialized.xml
+++ b/astrid/res/layout/widget_initialized.xml
@@ -6,55 +6,56 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/widget"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@android:color/transparent">
+              android:id="@+id/widget"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:background="@android:color/transparent">
 
     <LinearLayout
-        android:id="@+id/widget_header"
-        android:layout_width="150dip"
-        android:layout_height="39dip"
-        android:orientation="horizontal"
-        android:padding="3dp"
-        android:background="@color/widget_header_light">
-        
-        <TextView
-            android:id="@+id/widget_title"
-            android:layout_width="fill_parent" 
+            android:id="@+id/widget_header"
+            android:layout_width="150dip"
             android:layout_height="39dip"
-            android:layout_gravity="left|center_vertical" 
-            android:paddingLeft="2dip"
-            android:textColor="@color/widget_text_color_light"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:maxLines="2"
-            android:layout_weight="1"
-            android:gravity="left|center_vertical" 
-            android:ellipsize="end" />
-    
+            android:orientation="horizontal"
+            android:padding="3dp"
+            android:background="@color/widget_header_light">
+
+        <TextView
+                android:id="@+id/widget_title"
+                android:layout_width="fill_parent"
+                android:layout_height="39dip"
+                android:layout_gravity="left|center_vertical"
+                android:paddingLeft="2dip"
+                android:textColor="@color/widget_text_color_light"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:maxLines="2"
+                android:layout_weight="1"
+                android:gravity="left|center_vertical"
+                android:ellipsize="end"/>
+
         <ImageButton
-            android:id="@+id/widget_button"
-            android:layout_width="33dip"
-            android:layout_height="39dip"
-            android:layout_gravity="right|center_vertical"
-            android:background="@android:color/transparent"
-            android:src="@drawable/plus_button_dark_blue"
-            android:scaleType="fitCenter"/>
-      
+                android:id="@+id/widget_button"
+                android:layout_width="33dip"
+                android:layout_height="39dip"
+                android:layout_gravity="right|center_vertical"
+                android:background="@android:color/transparent"
+                android:src="@drawable/plus_button_dark_blue"
+                android:scaleType="fitCenter"/>
+
     </LinearLayout>
-    
+
     <ImageView
-        android:id="@+id/widget_header_separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:background="@color/dark_blue_theme_color"/>
+            android:id="@+id/widget_header_separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@color/dark_blue_theme_color"/>
 
-    <LinearLayout android:id="@+id/taskbody"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:background="@color/widget_body_light"
-        android:orientation="vertical">
+    <LinearLayout
+            android:id="@+id/taskbody"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:background="@color/widget_body_light"
+            android:orientation="vertical">
     </LinearLayout>
 </LinearLayout>
diff --git a/astrid/res/layout/widget_initialized_dark.xml b/astrid/res/layout/widget_initialized_dark.xml
index 599ffb788..8b6da884a 100644
--- a/astrid/res/layout/widget_initialized_dark.xml
+++ b/astrid/res/layout/widget_initialized_dark.xml
@@ -6,55 +6,56 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/widget"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@android:color/transparent">
+              android:id="@+id/widget"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:background="@android:color/transparent">
 
     <LinearLayout
-        android:id="@+id/widget_header"
-        android:layout_width="150dip"
-        android:layout_height="39dip"
-        android:orientation="horizontal"
-        android:padding="3dp"
-        android:background="@color/widget_header_dark">
-        
-        <TextView
-            android:id="@+id/widget_title"
-            android:layout_width="fill_parent" 
+            android:id="@+id/widget_header"
+            android:layout_width="150dip"
             android:layout_height="39dip"
-            android:layout_gravity="left|center_vertical" 
-            android:paddingLeft="2dip"
-            android:textColor="@color/widget_text_color_light"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:maxLines="2"
-            android:layout_weight="1"
-            android:gravity="left|center_vertical" 
-            android:ellipsize="end" />
-    
+            android:orientation="horizontal"
+            android:padding="3dp"
+            android:background="@color/widget_header_dark">
+
+        <TextView
+                android:id="@+id/widget_title"
+                android:layout_width="fill_parent"
+                android:layout_height="39dip"
+                android:layout_gravity="left|center_vertical"
+                android:paddingLeft="2dip"
+                android:textColor="@color/widget_text_color_light"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:maxLines="2"
+                android:layout_weight="1"
+                android:gravity="left|center_vertical"
+                android:ellipsize="end"/>
+
         <ImageButton
-            android:id="@+id/widget_button"
-            android:layout_width="33dip"
-            android:layout_height="39dip"
-            android:layout_gravity="right|center_vertical"
-            android:background="@android:color/transparent"
-            android:src="@drawable/plus_button_dark_blue"
-            android:scaleType="fitCenter"/>
-      
+                android:id="@+id/widget_button"
+                android:layout_width="33dip"
+                android:layout_height="39dip"
+                android:layout_gravity="right|center_vertical"
+                android:background="@android:color/transparent"
+                android:src="@drawable/plus_button_dark_blue"
+                android:scaleType="fitCenter"/>
+
     </LinearLayout>
-    
+
     <ImageView
-        android:id="@+id/widget_header_separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:background="@color/dark_blue_theme_color"/>
+            android:id="@+id/widget_header_separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@color/dark_blue_theme_color"/>
 
-    <LinearLayout android:id="@+id/taskbody"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:background="@color/widget_body_dark"
-        android:orientation="vertical">
+    <LinearLayout
+            android:id="@+id/taskbody"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:background="@color/widget_body_dark"
+            android:orientation="vertical">
     </LinearLayout>
 </LinearLayout>
diff --git a/astrid/res/layout/widget_initialized_dark_transparent.xml b/astrid/res/layout/widget_initialized_dark_transparent.xml
index afddf984a..54866dc9c 100644
--- a/astrid/res/layout/widget_initialized_dark_transparent.xml
+++ b/astrid/res/layout/widget_initialized_dark_transparent.xml
@@ -6,55 +6,56 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/widget"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@android:color/transparent">
+              android:id="@+id/widget"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:background="@android:color/transparent">
 
     <LinearLayout
-        android:id="@+id/widget_header"
-        android:layout_width="150dip"
-        android:layout_height="39dip"
-        android:orientation="horizontal"
-        android:padding="3dp"
-        android:background="@android:color/transparent">
-        
-        <TextView
-            android:id="@+id/widget_title"
-            android:layout_width="fill_parent" 
+            android:id="@+id/widget_header"
+            android:layout_width="150dip"
             android:layout_height="39dip"
-            android:layout_gravity="left|center_vertical" 
-            android:paddingLeft="2dip"
-            android:textColor="@color/widget_text_color_light"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:maxLines="2"
-            android:layout_weight="1"
-            android:gravity="left|center_vertical" 
-            android:ellipsize="end" />
-    
+            android:orientation="horizontal"
+            android:padding="3dp"
+            android:background="@android:color/transparent">
+
+        <TextView
+                android:id="@+id/widget_title"
+                android:layout_width="fill_parent"
+                android:layout_height="39dip"
+                android:layout_gravity="left|center_vertical"
+                android:paddingLeft="2dip"
+                android:textColor="@color/widget_text_color_light"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:maxLines="2"
+                android:layout_weight="1"
+                android:gravity="left|center_vertical"
+                android:ellipsize="end"/>
+
         <ImageButton
-            android:id="@+id/widget_button"
-            android:layout_width="33dip"
-            android:layout_height="39dip"
-            android:layout_gravity="right|center_vertical"
-            android:background="@android:color/transparent"
-            android:src="@drawable/plus_button_dark_blue"
-            android:scaleType="fitCenter"/>
-      
+                android:id="@+id/widget_button"
+                android:layout_width="33dip"
+                android:layout_height="39dip"
+                android:layout_gravity="right|center_vertical"
+                android:background="@android:color/transparent"
+                android:src="@drawable/plus_button_dark_blue"
+                android:scaleType="fitCenter"/>
+
     </LinearLayout>
-    
+
     <ImageView
-        android:id="@+id/widget_header_separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:background="@color/dark_blue_theme_color"/>
+            android:id="@+id/widget_header_separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@color/dark_blue_theme_color"/>
 
-    <LinearLayout android:id="@+id/taskbody"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:background="@android:color/transparent"
-        android:orientation="vertical">
+    <LinearLayout
+            android:id="@+id/taskbody"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:background="@android:color/transparent"
+            android:orientation="vertical">
     </LinearLayout>
 </LinearLayout>
diff --git a/astrid/res/layout/widget_initialized_legacy.xml b/astrid/res/layout/widget_initialized_legacy.xml
index 292bd083e..512016cb7 100644
--- a/astrid/res/layout/widget_initialized_legacy.xml
+++ b/astrid/res/layout/widget_initialized_legacy.xml
@@ -6,55 +6,56 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/widget"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@android:color/transparent">
+              android:id="@+id/widget"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:background="@android:color/transparent">
 
     <LinearLayout
-        android:id="@+id/widget_header"
-        android:layout_width="150dip"
-        android:layout_height="39dip"
-        android:orientation="horizontal"
-        android:padding="3dp"
-        android:background="@drawable/widget_header_legacy">
-        
-        <TextView
-            android:id="@+id/widget_title"
-            android:layout_width="fill_parent" 
+            android:id="@+id/widget_header"
+            android:layout_width="150dip"
             android:layout_height="39dip"
-            android:layout_gravity="left|center_vertical" 
-            android:paddingLeft="2dip"
-            android:textColor="@color/widget_text_color_light"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:maxLines="2"
-            android:layout_weight="1"
-            android:gravity="left|center_vertical" 
-            android:ellipsize="end" />
-    
+            android:orientation="horizontal"
+            android:padding="3dp"
+            android:background="@drawable/widget_header_legacy">
+
+        <TextView
+                android:id="@+id/widget_title"
+                android:layout_width="fill_parent"
+                android:layout_height="39dip"
+                android:layout_gravity="left|center_vertical"
+                android:paddingLeft="2dip"
+                android:textColor="@color/widget_text_color_light"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:maxLines="2"
+                android:layout_weight="1"
+                android:gravity="left|center_vertical"
+                android:ellipsize="end"/>
+
         <ImageButton
-            android:id="@+id/widget_button"
-            android:layout_width="33dip"
-            android:layout_height="39dip"
-            android:layout_gravity="right|center_vertical"
-            android:background="@android:color/transparent"
-            android:src="@drawable/plus_button_dark_blue"
-            android:scaleType="fitCenter"/>
-      
+                android:id="@+id/widget_button"
+                android:layout_width="33dip"
+                android:layout_height="39dip"
+                android:layout_gravity="right|center_vertical"
+                android:background="@android:color/transparent"
+                android:src="@drawable/plus_button_dark_blue"
+                android:scaleType="fitCenter"/>
+
     </LinearLayout>
-    
+
     <ImageView
-        android:id="@+id/widget_header_separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:background="@color/dark_blue_theme_color"/>
+            android:id="@+id/widget_header_separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@color/dark_blue_theme_color"/>
 
-    <LinearLayout android:id="@+id/taskbody"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:background="@color/widget_body_legacy"
-        android:orientation="vertical">
+    <LinearLayout
+            android:id="@+id/taskbody"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:background="@color/widget_body_legacy"
+            android:orientation="vertical">
     </LinearLayout>
 </LinearLayout>
diff --git a/astrid/res/layout/widget_initialized_red.xml b/astrid/res/layout/widget_initialized_red.xml
index d0fb7bb91..1f46a87a8 100644
--- a/astrid/res/layout/widget_initialized_red.xml
+++ b/astrid/res/layout/widget_initialized_red.xml
@@ -6,55 +6,56 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/widget"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@android:color/transparent">
+              android:id="@+id/widget"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:background="@android:color/transparent">
 
     <LinearLayout
-        android:id="@+id/widget_header"
-        android:layout_width="150dip"
-        android:layout_height="39dip"
-        android:orientation="horizontal"
-        android:padding="3dp"
-        android:background="@color/widget_header_light">
-        
-        <TextView
-            android:id="@+id/widget_title"
-            android:layout_width="fill_parent" 
+            android:id="@+id/widget_header"
+            android:layout_width="150dip"
             android:layout_height="39dip"
-            android:layout_gravity="left|center_vertical" 
-            android:paddingLeft="2dip"
-            android:textColor="@color/widget_text_color_light"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:maxLines="2"
-            android:layout_weight="1"
-            android:gravity="left|center_vertical" 
-            android:ellipsize="end" />
-    
+            android:orientation="horizontal"
+            android:padding="3dp"
+            android:background="@color/widget_header_light">
+
+        <TextView
+                android:id="@+id/widget_title"
+                android:layout_width="fill_parent"
+                android:layout_height="39dip"
+                android:layout_gravity="left|center_vertical"
+                android:paddingLeft="2dip"
+                android:textColor="@color/widget_text_color_light"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:maxLines="2"
+                android:layout_weight="1"
+                android:gravity="left|center_vertical"
+                android:ellipsize="end"/>
+
         <ImageButton
-            android:id="@+id/widget_button"
-            android:layout_width="33dip"
-            android:layout_height="39dip"
-            android:layout_gravity="right|center_vertical"
-            android:background="@android:color/transparent"
-            android:src="@drawable/plus_button_dark_blue"
-            android:scaleType="fitCenter"/>
-      
+                android:id="@+id/widget_button"
+                android:layout_width="33dip"
+                android:layout_height="39dip"
+                android:layout_gravity="right|center_vertical"
+                android:background="@android:color/transparent"
+                android:src="@drawable/plus_button_dark_blue"
+                android:scaleType="fitCenter"/>
+
     </LinearLayout>
-    
+
     <ImageView
-        android:id="@+id/widget_header_separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:background="@color/red_theme_color"/>
+            android:id="@+id/widget_header_separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@color/red_theme_color"/>
 
-    <LinearLayout android:id="@+id/taskbody"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:background="@color/widget_body_light"
-        android:orientation="vertical">
+    <LinearLayout
+            android:id="@+id/taskbody"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:background="@color/widget_body_light"
+            android:orientation="vertical">
     </LinearLayout>
 </LinearLayout>
diff --git a/astrid/res/layout/widget_initialized_transparent.xml b/astrid/res/layout/widget_initialized_transparent.xml
index afddf984a..54866dc9c 100644
--- a/astrid/res/layout/widget_initialized_transparent.xml
+++ b/astrid/res/layout/widget_initialized_transparent.xml
@@ -6,55 +6,56 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/widget"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@android:color/transparent">
+              android:id="@+id/widget"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:background="@android:color/transparent">
 
     <LinearLayout
-        android:id="@+id/widget_header"
-        android:layout_width="150dip"
-        android:layout_height="39dip"
-        android:orientation="horizontal"
-        android:padding="3dp"
-        android:background="@android:color/transparent">
-        
-        <TextView
-            android:id="@+id/widget_title"
-            android:layout_width="fill_parent" 
+            android:id="@+id/widget_header"
+            android:layout_width="150dip"
             android:layout_height="39dip"
-            android:layout_gravity="left|center_vertical" 
-            android:paddingLeft="2dip"
-            android:textColor="@color/widget_text_color_light"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:maxLines="2"
-            android:layout_weight="1"
-            android:gravity="left|center_vertical" 
-            android:ellipsize="end" />
-    
+            android:orientation="horizontal"
+            android:padding="3dp"
+            android:background="@android:color/transparent">
+
+        <TextView
+                android:id="@+id/widget_title"
+                android:layout_width="fill_parent"
+                android:layout_height="39dip"
+                android:layout_gravity="left|center_vertical"
+                android:paddingLeft="2dip"
+                android:textColor="@color/widget_text_color_light"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:maxLines="2"
+                android:layout_weight="1"
+                android:gravity="left|center_vertical"
+                android:ellipsize="end"/>
+
         <ImageButton
-            android:id="@+id/widget_button"
-            android:layout_width="33dip"
-            android:layout_height="39dip"
-            android:layout_gravity="right|center_vertical"
-            android:background="@android:color/transparent"
-            android:src="@drawable/plus_button_dark_blue"
-            android:scaleType="fitCenter"/>
-      
+                android:id="@+id/widget_button"
+                android:layout_width="33dip"
+                android:layout_height="39dip"
+                android:layout_gravity="right|center_vertical"
+                android:background="@android:color/transparent"
+                android:src="@drawable/plus_button_dark_blue"
+                android:scaleType="fitCenter"/>
+
     </LinearLayout>
-    
+
     <ImageView
-        android:id="@+id/widget_header_separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:background="@color/dark_blue_theme_color"/>
+            android:id="@+id/widget_header_separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@color/dark_blue_theme_color"/>
 
-    <LinearLayout android:id="@+id/taskbody"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:background="@android:color/transparent"
-        android:orientation="vertical">
+    <LinearLayout
+            android:id="@+id/taskbody"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:background="@android:color/transparent"
+            android:orientation="vertical">
     </LinearLayout>
 </LinearLayout>
diff --git a/astrid/res/layout/widget_loading.xml b/astrid/res/layout/widget_loading.xml
index 6e7f69679..ea8c726c1 100644
--- a/astrid/res/layout/widget_loading.xml
+++ b/astrid/res/layout/widget_loading.xml
@@ -5,66 +5,67 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/widget"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@android:color/transparent">
+              android:id="@+id/widget"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:background="@android:color/transparent">
 
     <LinearLayout
-        android:id="@+id/widget_header"
-        android:layout_width="150dip"
-        android:layout_height="39dip"
-        android:orientation="horizontal"
-        android:padding="3dp"
-        android:background="@color/widget_header_light">
-        
-        <TextView
-            android:id="@+id/widget_title"
-            android:layout_width="fill_parent" 
+            android:id="@+id/widget_header"
+            android:layout_width="150dip"
             android:layout_height="39dip"
-            android:layout_gravity="left|center_vertical" 
-            android:paddingLeft="2dip"
-            android:textColor="@color/widget_text_color_light"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:maxLines="2"
-            android:layout_weight="1"
-            android:gravity="left|center_vertical" 
-            android:ellipsize="end" />
-    
+            android:orientation="horizontal"
+            android:padding="3dp"
+            android:background="@color/widget_header_light">
+
+        <TextView
+                android:id="@+id/widget_title"
+                android:layout_width="fill_parent"
+                android:layout_height="39dip"
+                android:layout_gravity="left|center_vertical"
+                android:paddingLeft="2dip"
+                android:textColor="@color/widget_text_color_light"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:maxLines="2"
+                android:layout_weight="1"
+                android:gravity="left|center_vertical"
+                android:ellipsize="end"/>
+
         <ImageButton
-            android:id="@+id/widget_button"
-            android:layout_width="33dip"
-            android:layout_height="39dip"
-            android:layout_gravity="right|center_vertical"
-            android:background="@android:color/transparent"
-            android:src="@drawable/plus_button_dark_blue"
-            android:scaleType="fitCenter"/>
-      
+                android:id="@+id/widget_button"
+                android:layout_width="33dip"
+                android:layout_height="39dip"
+                android:layout_gravity="right|center_vertical"
+                android:background="@android:color/transparent"
+                android:src="@drawable/plus_button_dark_blue"
+                android:scaleType="fitCenter"/>
+
     </LinearLayout>
-    
+
     <ImageView
-        android:id="@+id/widget_header_separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1px"
-        android:background="@color/dark_blue_theme_color"/>
+            android:id="@+id/widget_header_separator"
+            android:layout_width="fill_parent"
+            android:layout_height="1px"
+            android:background="@color/dark_blue_theme_color"/>
+
+    <LinearLayout
+            android:id="@+id/taskbody"
+            android:layout_width="fill_parent"
+            android:layout_height="120dip"
+            android:background="@color/widget_body_light"
+            android:orientation="vertical">
 
-    <LinearLayout android:id="@+id/taskbody"
-        android:layout_width="fill_parent"
-        android:layout_height="120dip"
-        android:background="@color/widget_body_light"
-        android:orientation="vertical">
-        
         <TextView
-	        android:id="@+id/message"
-	        android:layout_width="fill_parent" 
-	        android:layout_height="wrap_content"
-	        android:layout_marginTop="37dip"
-	        android:padding="10dip"
-	        android:gravity="center"
-	        android:text="@string/TWi_loading"
-	        style="@style/TextAppearance.Widget" />
-        
+                android:id="@+id/message"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="37dip"
+                android:padding="10dip"
+                android:gravity="center"
+                android:text="@string/TWi_loading"
+                style="@style/TextAppearance.Widget"/>
+
     </LinearLayout>
 </LinearLayout>
diff --git a/astrid/res/layout/widget_row.xml b/astrid/res/layout/widget_row.xml
index 76643c0a0..39f636f93 100644
--- a/astrid/res/layout/widget_row.xml
+++ b/astrid/res/layout/widget_row.xml
@@ -5,15 +5,15 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content" 
-    android:id="@+id/text"
-    android:background="@android:color/transparent"
-    android:paddingLeft="5dip"
-    android:paddingTop="5dip"
-    android:paddingBottom="2dip"
-    android:paddingRight="5dip"
-    style="@style/TextAppearance.Widget"
-    android:singleLine="true">
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:id="@+id/text"
+          android:background="@android:color/transparent"
+          android:paddingLeft="5dip"
+          android:paddingTop="5dip"
+          android:paddingBottom="2dip"
+          android:paddingRight="5dip"
+          style="@style/TextAppearance.Widget"
+          android:singleLine="true">
 
 </TextView>
\ No newline at end of file
diff --git a/astrid/res/layout/widget_separator.xml b/astrid/res/layout/widget_separator.xml
index 047d1c11b..c3b88e477 100644
--- a/astrid/res/layout/widget_separator.xml
+++ b/astrid/res/layout/widget_separator.xml
@@ -5,9 +5,9 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="1px"
-    android:layout_marginLeft="5dip"
-    android:layout_marginRight="5dip"
-    android:background="#ddbababa" >
+           android:layout_width="fill_parent"
+           android:layout_height="1px"
+           android:layout_marginLeft="5dip"
+           android:layout_marginRight="5dip"
+           android:background="#ddbababa">
 </ImageView>
\ No newline at end of file
diff --git a/astrid/res/values-ca/strings.xml b/astrid/res/values-ca/strings.xml
index 2f26bf10a..d01ae6217 100644
--- a/astrid/res/values-ca/strings.xml
+++ b/astrid/res/values-ca/strings.xml
@@ -1,769 +1,843 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="actfm_person_hint">Contacte o correu electrònic</string>
-  <string name="actfm_person_or_tag_hint">Contacte o llista compartida</string>
-  <string name="actfm_tag_operation_owner_delete">Sou el propietari d’aquesta llista compartida. En suprimir-la, ho fareu per a tots els membres de la llista. Voleu continuar?</string>
-  <string name="actfm_picture_camera">Fes una fotografia</string>
-  <string name="actfm_picture_gallery">Tria una imatge de la galeria</string>
-  <string name="actfm_picture_clear">Neteja la selecció d\'imatge</string>
-  <string name="actfm_view_task_title">Voleu veure la tasca?</string>
-  <string name="actfm_view_task_text">La tasca s\'ha enviat a %s! Tu segueixes veient les teves pròpies tasques. Vols veure aquesta tasca i les altres que has assignat?</string>
-  <string name="actfm_view_task_ok">Mostra les tasques assignades</string>
-  <string name="actfm_view_task_cancel">Queda\'t aquí</string>
-  <string name="actfm_my_shared_tasks_title">Les meves tasques compartides</string>
-  <string name="actfm_my_shared_tasks_empty">No hi ha cap tasca compartida</string>
-  <string name="actfm_friendship_connect">Afegeix com a amic</string>
-  <string name="actfm_friendship_accept">Accepta</string>
-  <string name="TVA_add_comment">Afegiu un comentari...</string>
-  <string-array name="TVA_tabs">
-    <item>Tasques</item>
-    <item>Activitat</item>
-    <item>Configuració de la llista</item>
-  </string-array>
-  <string name="actfm_TVA_filtered_by_assign">Tasques d\'en/na %s. Feu clic per veure-les totes.</string>
-  <string name="actfm_TVA_filter_by_unassigned">Tasques no assignades. Feu clic per veure-les totes.</string>
-  <string name="actfm_TVA_no_members_alert">Llista privada: feu clic per editar-la o compartir-la</string>
-  <string name="actfm_TVA_menu_refresh">Actualitza</string>
-  <string name="actfm_TVA_tag_label">Llista</string>
-  <string name="actfm_TVA_members_label">Compartida amb</string>
-  <string name="actfm_TVA_members_hint">Compartiu-la amb qualsevol adreça de correu electrònic</string>
-  <string name="actfm_TVA_tag_picture">Imatge de la llista</string>
-  <string name="actfm_TVA_silence_label">Inhabilita les notificacions</string>
-  <string name="actfm_TVA_tag_description_label">Descripció</string>
-  <string name="actfm_TVA_tag_settings_label">Paràmetres</string>
-  <string name="actfm_TVA_tag_description_hint">Escriviu una descripció</string>
-  <string name="actfm_TVA_tag_name_hint">Escriviu el nom de la llista</string>
-  <string name="actfm_TVA_login_to_share">Cal que inicieu la sessió web a astrid.com abans de compartir llistes. Inicieu la sessió o bé feu que aquesta llista sigui privada.</string>
-  <string name="actfm_EPA_intro">Utilitzeu l\'Astrid per compartir llistes, plans de festa o projectes de grup. Vegeu quan els vostres amics completen activitats a l\'instant!</string>
-  <string name="actfm_EPA_assign_label_long">Qui ha de fer això?</string>
-  <string name="actfm_EPA_assign_me">Jo</string>
-  <string name="actfm_EPA_unassigned">Sense assignar</string>
-  <string name="actfm_EPA_choose_contact">Escolliu un contacte</string>
-  <string name="actfm_EPA_share_with">Comparteix-la amb:</string>
-  <string name="actfm_EPA_collaborators_header">Comparteix-la amb els amics</string>
-  <string name="actfm_EPA_list">Llista: %s</string>
-  <string name="actfm_EPA_message_text">Missatge d\'invitació:</string>
-  <string name="actfm_EPA_message_body">Ajuda\'m a acabar això!</string>
-  <string name="actfm_EPA_assign_header_members">Membres de la llista</string>
-  <string name="actfm_EPA_assign_header_friends">Amics de l\'Astrid</string>
-  <string name="actfm_EPA_facebook">Facebook</string>
-  <string name="actfm_EPA_twitter">Twitter</string>
-  <string name="actfm_EPA_invalid_email">El correu electrònic no és vàlid: %s</string>
-  <string name="actfm_EPA_login_to_share">Cal que inicieu la sessió a Astrid.com per compartir llistes</string>
-  <string name="actfm_EPA_login_button">Entra</string>
-  <string name="actfm_EPA_dont_share_button">No ho comparteixis</string>
-  <string name="actfm_ALA_title">Us donem la benvinguda a Astrid.com!</string>
-  <string name="actfm_ALA_body">Astrid.com us permet accedir a les vostres tasques en línia, compartir-les i delegar-les en altres.</string>
-  <string name="actfm_ALA_fb_login">Connecta\'t amb el Facebook</string>
-  <string name="actfm_ALA_gg_login">Connecta\'t amb Google</string>
-  <string name="actfm_ALA_firstname_label">Nom</string>
-  <string name="actfm_ALA_lastname_label">Cognoms</string>
-  <string name="actfm_ALA_email_label">Adreça electrònica</string>
-  <string name="actfm_ALA_password_label">Contrasenya</string>
-  <string name="actfm_ALA_login_title">Registra</string>
-  <string name="actfm_GAA_title">Trieu el compte de Google que vulgueu utilitzar:</string>
-  <string name="actfm_OLA_prompt">Entreu:</string>
-  <string name="actfm_feat_list_cloning">S\'està copiant...</string>
-  <string name="actfm_feat_list_clone_success">L\'operació s\'ha realitzat correctament.</string>
-  <string name="actfm_status_title_logged_in">Estat - s\'ha iniciat la sessió com a %s</string>
-  <string name="actfm_APr_header">Astrid.com</string>
-  <string name="actfm_https_title">Utilitza l\'HTTPS</string>
-  <string name="actfm_https_enabled">HTTPS habilitat (més lent)</string>
-  <string name="actfm_https_disabled">HTTPS inhabilitat (més ràpid)</string>
-  <string name="actfm_account_basic">Bàsic</string>
-  <string name="actfm_inapp_billing">Actualitzar a Premium</string>
-  <string name="alarm_ACS_label">Alarmes</string>
-  <string name="alarm_ACS_button">Afegeix una alarma</string>
-  <string-array name="reminders_alarm">
-    <item>Alarma</item>
-  </string-array>
-  <string name="backup_BPr_header">Còpies de seguretat</string>
-  <string name="backup_BPr_group_status">Estat</string>
-  <string name="backup_status_success">Còpia de seguretat més recent:\n%s</string>
-  <string name="backup_status_failed">Còpia de seguretat Fallida</string>
-  <string name="backup_status_failed_subtitle">Feu clic per veure l\'error</string>
-  <string name="backup_status_never">Encara sense Còpies!</string>
-  <string name="backup_BPr_group_options">Opcions</string>
-  <string name="backup_BPr_auto_title">Còpies de seguretat automàtiques</string>
-  <string name="backup_BPr_auto_disabled">Còpies de seguretat automàtiques desactivades</string>
-  <string name="backup_BPr_auto_enabled">Còpies de seguretat diàries</string>
-  <string name="backup_BAc_title">Administrar Còpies de seguretat</string>
-  <string name="backup_BAc_import">Importa tasques</string>
-  <string name="backup_BAc_export">Exporta tasques</string>
-  <string name="backup_TXI_error">Error d\'importació</string>
-  <string name="export_toast_no_tasks">Sense tasques que exportar</string>
-  <string name="export_progress_title">S\'està exportant...</string>
-  <string name="import_summary_title">Resum de Restauració</string>
-  <string name="import_progress_title">S\'està important...</string>
-  <string name="import_progress_read">S\'està llegint la tasca %d</string>
-  <string name="DLG_error_sdcard">No es pot accedir a la carpeta: %s</string>
-  <string name="DLG_error_sdcard_general">No s\'ha pogut accedir a la targeta SD.</string>
-  <string name="import_file_prompt">Tria un fitxer per restaurar</string>
-  <string name="app_name">Tasques Astrid</string>
-  <string name="read_permission_label">Permís de l\'Astrid</string>
-  <string name="read_permission_desc">llegir tasques, mostrar filtres de tasques</string>
-  <string name="write_permission_label">Permís de l\'Astrid</string>
-  <string name="write_permission_desc">crear noves tasques, editar tasques existents</string>
-  <string name="DLG_delete_this_task_question">Voleu suprimir aquesta tasca?</string>
-  <string name="DLG_delete_this_item_question">Voleu suprimir aquest element: %s?</string>
-  <string name="DLG_upgrading">S\'estan actualitzant les vostres tasques...</string>
-  <string name="DLG_hour_minutes">Temps (hores : minuts)</string>
-  <string name="DLG_please_update">Astrid tindria que actualitzar-se a l\'última versió disponible al Android Market! Si us plau, faci-ho abans de continuar, o esperi uns segons.</string>
-  <string name="DLG_accept">Accepto</string>
-  <string name="DLG_decline">Declino</string>
-  <string name="DLG_eula_title">Condicions d\'ús de l\'Astrid</string>
-  <string name="DLG_please_wait">Espereu</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_more">Més</string>
-  <string name="DLG_undo">Desfés</string>
-  <string name="DLG_warning">Avís</string>
-  <string name="WID_dateButtonUnset">Prem per establir</string>
-  <string name="ENA_no_comments">Encara no hi ha activitat</string>
-  <string name="ENA_no_user">Algú</string>
-  <string name="ENA_refresh_comments">Actualitza els comentaris</string>
-  <string name="TLA_no_items">No teniu tasques! \n Voleu afegir alguna cosa?</string>
-  <string name="TLA_no_items_person">En/na %s no ha\ncompartit cap tasca amb vós</string>
-  <string name="TLA_menu_sort">Ordenació i subtasques</string>
-  <string name="TLA_menu_sync">Sincronitza ara</string>
-  <string name="TLA_menu_search">Cerca</string>
-  <string name="TLA_menu_lists">Llistes</string>
-  <string name="TLA_menu_friends">Gent</string>
-  <string name="TLA_menu_suggestions">Suggeriments</string>
-  <string name="TLA_menu_settings">Paràmetres</string>
-  <string name="TLA_menu_support">Assistència</string>
-  <string name="TLA_custom">Personalitzat</string>
-  <string name="TLA_quick_add_hint">Afegeix una tasca</string>
-  <string name="TLA_quick_add_hint_assign">Afegiu quelcom per a en/na %s</string>
-  <string name="TLA_notification_volume_low">S\'han silenciat les notificacions. No sentireu res més d\'Astrid!</string>
-  <string name="TLA_notification_disabled">Els recordatoris de l\'Astrid estan inhabilitats. No rebreu cap recordatori</string>
-  <string-array name="TLA_filters">
-    <item>Actiu</item>
-    <item>Avui</item>
-    <item>Aviat</item>
-    <item>Després</item>
-    <item>Fet</item>
-    <item>Ocult</item>
-  </string-array>
-  <string name="TLA_quickadd_confirm_title">Heu dit «%s»</string>
-  <string name="TLA_quickadd_confirm_speech_bubble">He creat una tasca anomenada «%1$s» %2$s com a %3$s</string>
-  <string name="TLA_quickadd_confirm_speech_bubble_date">per a %s</string>
-  <string name="TLA_quickadd_confirm_hide_helpers">No mostris confirmacions futures</string>
-  <string name="TLA_repeat_scheduled_title">Tasca periòdica nova %s</string>
-  <string name="TLA_repeat_scheduled_speech_bubble">En rebreu recordatoris %s.</string>
-  <string-array name="TLA_priority_strings">
-    <item>màxima prioritat</item>
-    <item>prioritat alta</item>
-    <item>prioritat mitjana</item>
-    <item>prioritat baixa</item>
-  </string-array>
-  <string name="TLA_all_activity">Tota l\'activitat</string>
-  <string name="TAd_hiddenFormat">%s [ocult]</string>
-  <string name="TAd_deletedFormat">%s [eliminat]</string>
-  <string name="TAd_completed">Acabat fa\n%s</string>
-  <string name="TAd_actionEditTask">Edita</string>
-  <string name="TAd_contextEditTask">Editeu la tasca</string>
-  <string name="TAd_contextCopyTask">Copia la tasca</string>
-  <string name="TAd_contextDeleteTask">Suprimeix la tasca</string>
-  <string name="TAd_contextUndeleteTask">Recupera la tasca</string>
-  <string name="TAd_contextPurgeTask">Purgar tasques</string>
-  <string name="SSD_title">Ordenació, subtasques, i ocultació</string>
-  <string name="SSD_hidden_title">Tasques ocultes</string>
-  <string name="SSD_completed">Mostra les tasques completades</string>
-  <string name="SSD_hidden">Mostra les tasques ocultes</string>
-  <string name="SSD_deleted">Mostra les tasques suprimides</string>
-  <string name="SSD_sort_auto">Classificació intel·ligent Astrid</string>
-  <string name="SSD_sort_alpha">Per títol</string>
-  <string name="SSD_sort_due">Per data de venciment</string>
-  <string name="SSD_sort_importance">Per importància</string>
-  <string name="SSD_sort_modified">Per darrera modificació</string>
-  <string name="SSD_sort_reverse">Ordenació inversa</string>
-  <string name="SSD_save_temp">Només una vegada</string>
-  <string name="SSD_save_always">Sempre</string>
-  <string name="FSA_label">Llista o filtre de l\'Astrid</string>
-  <string name="FLA_context_shortcut">Afegir un enllaç al escriptori...</string>
-  <string name="FLA_shortcut_dialog_title">Crea una drecera a l\'escriptori</string>
-  <string name="FLA_shortcut_dialog">Nom del enllaç</string>
-  <string name="FLA_search_hint">Cerca tasques</string>
-  <string name="FLA_search_filter">Coincidència \'%s\'</string>
-  <string name="FLA_toast_onCreateShortcut">S\'ha creat l\'enllaç: %s</string>
-  <string name="FLA_new_filter">Filtre nou</string>
-  <string name="FLA_new_list">Llista nova</string>
-  <string name="FLA_no_filter_selected">No heu seleccionat cap filtre. Seleccioneu un filtre o una llista.</string>
-  <string name="TEA_when_header_label">Quan</string>
-  <string name="TEA_title_hint">Resum de la tasca</string>
-  <string name="TEA_importance_label">Importància</string>
-  <string name="TEA_urgency_specific_time">A alguna hora en concret?</string>
-  <string name="TEA_urgency_none">Cap</string>
-  <string name="TEA_hideUntil_label">Mostra la tasca</string>
-  <string name="TEA_hideUntil_message">S\'ocultarà la tasca fins %s</string>
-  <string-array name="TEA_loading">
-    <item>S\'està carregant…</item>
-  </string-array>
-  <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>
-  <string name="TEA_menu_discard">No ho desis</string>
-  <string name="TEA_menu_delete">Suprimeix la tasca</string>
-  <string name="TEA_menu_comments">Comentaris</string>
-  <string name="TEA_onTaskSave_due">Tasca desada: venç %s</string>
-  <string name="TEA_onTaskSave_notDue">Tasca desada</string>
-  <string name="TEA_tab_activity">Activitat</string>
-  <string name="TEA_tab_more">Detalls</string>
-  <string name="TEA_tab_web">Idees</string>
-  <string-array name="TEA_urgency">
-    <item>Sense venciment</item>
-    <item>Dia concret</item>
-    <item>Avui</item>
-    <item>Demà</item>
-    <item>(demà passat)</item>
-    <item>La setmana que ve</item>
-    <item>D\'aquí a dues setmanes</item>
-    <item>El mes que ve</item>
-  </string-array>
-  <string name="TEA_no_time">cap hora</string>
-  <string-array name="TEA_hideUntil">
-    <item>Sempre</item>
-    <item>Al finalitzar la data límit</item>
-    <item>Due time</item>
-    <item>El dia abans del venciment</item>
-    <item>La setmana abans del venciment</item>
-    <item>Dia/Hora concret</item>
-  </string-array>
-  <string name="TEA_control_who">Qui</string>
-  <string name="TEA_control_when">Quan</string>
-  <string name="TEA_control_more_section">----Detalls----</string>
-  <string name="TEA_control_importance">Importància</string>
-  <string name="TEA_control_lists">Llistes</string>
-  <string name="TEA_control_notes">Notes</string>
-  <string name="TEA_control_files">Fitxers</string>
-  <string name="TEA_control_reminders">Recordatoris</string>
-  <string name="TEA_control_timer">Controls de temporització</string>
-  <string name="TEA_control_hidden_section">----Oculta-ho sempre----</string>
-  <string name="hide_until_prompt">Mostra a la meva llista</string>
-  <string name="TEA_no_activity">No hi ha hagut activitat</string>
-  <string name="TEA_load_more">Carrega més...</string>
-  <string name="TEA_when_dialog_title">Quan venç?</string>
-  <string name="TEA_new_task">Tasca nova</string>
-  <string name="MCA_title">En/na %1$s\nha trucat a les %2$s</string>
-  <string name="MCA_return_call">Truca ara</string>
-  <string name="MCA_add_task">Truca després</string>
-  <string name="MCA_ignore">Ignora</string>
-  <string name="MCA_ignore_title">Voleu ignorar totes les trucades perdudes?</string>
-  <string name="MCA_ignore_all">Ignora totes les trucades</string>
-  <string name="MCA_ignore_this">Ignora només aquesta trucada</string>
-  <string name="MCA_task_title_name">Retorna la trucada a en/na %1$s a %2$s</string>
-  <string name="MCA_task_title_no_name">Retorna la trucada a %s</string>
-  <string name="MCA_schedule_dialog_title">Retorna la trucada a %s en...</string>
-  <string-array name="MCA_dialog_speech_options">
-    <item>Deu ser genial ser tan popular!</item>
-    <item>Fantàstic, la gent us estima!</item>
-    <item>Alegreu-li el dia, feu-li una trucada!</item>
-    <item>Wouldn\'t you be happy if people called you back?</item>
-    <item>Tu ho pots fer!</item>
-    <item>You can always send a text...</item>
-  </string-array>
-  <string name="UpS_changelog_title">Què hi ha de nou en Astrid?</string>
-  <string name="UpS_updates_title">Novetats de l\'Astrid</string>
-  <string name="EPr_title">Astrid: Paràmetres</string>
-  <string name="EPr_deactivated">desactivat</string>
-  <string name="EPr_appearance_header">Aparença</string>
-  <string name="EPr_fontSize_title">Mida de la llista de tasques</string>
-  <string name="EPr_showSmartConfirmation_title">Mostra la confirmació per als recordatoris intel·ligents</string>
-  <string name="EPr_fontSize_desc">Mida de lletra en la pàgina de llista principal</string>
-  <string name="EPr_showNotes_title">Mostra notes a tasques</string>
-  <string name="EPr_beastMode_reset">Restableix els valors predeterminats</string>
-  <string name="EPr_showNotes_desc_enabled">Es mostraran sempre les anotacions</string>
-  <string name="EPr_fullTask_title">Mostra el títol sencer de la tasca</string>
-  <string name="EPr_fullTask_desc_enabled">Es mostrarà el títol sencer de la tasca</string>
-  <string name="EPr_theme_title">Color del tema</string>
-  <string name="EPr_theme_desc">Actualment: %s</string>
-  <string name="EPr_theme_desc_unsupported">Aquest paràmetre requrereix l\'Android 2.0 o superior</string>
-  <string name="EPr_use_contact_picker">Utilitza el selector de contactes</string>
-  <string name="EPr_third_party_addons_desc_enabled">S\'abilitaran les extensions de tercers</string>
-  <string name="EPr_third_party_addons_desc_disabled">S\'inhabilitaran les extensions de tercers</string>
-  <string name="EPr_ideas_tab_description">Obteniu idees per ajudar-vos a completar les tasques</string>
-  <string-array name="EPr_swipe_lists_performance_mode">
-    <item>Sense lliscament</item>
-    <item>Conserva la memòria</item>
-    <item>Rendiment normal</item>
-    <item>Alt rendiment</item>
-  </string-array>
-  <string-array name="EPr_swipe_lists_performance_desc">
-    <item>Swipe between lists is disabled</item>
-    <item>Slower performance</item>
-    <item>Paràmetre per defecte</item>
-    <item>Utilitza més recursos del sistema</item>
-  </string-array>
-  <string-array name="EPr_themes">
-    <item>Dia - Blau</item>
-    <item>Dia - Vermell</item>
-    <item>Sky blue</item>
-    <item>Nit</item>
-    <item>Transparent (text blanc)</item>
-    <item>Transparent (text negre)</item>
-  </string-array>
-  <string-array name="EPr_themes_widget">
-    <item>El mateix que l\'aplicació</item>
-    <item>Dia - Blau</item>
-    <item>Dia - Vermell</item>
-    <item>Sky blue</item>
-    <item>Nit</item>
-    <item>Transparent (text blanc)</item>
-    <item>Transparent (text negre)</item>
-    <item>Estil antic</item>
-  </string-array>
-  <string name="EPr_manage_delete_completed_message">Segur que voleu suprimir totes les tasques completades?</string>
-  <string name="EPr_manage_delete_completed_status">S\'han suprimit %d tasques</string>
-  <string name="EPr_manage_delete_completed_gcal_message">Segur que voleu suprimir els esdeveniments de calendari de les tasques completades?</string>
-  <string name="AOA_internal_author">Equip d\'Astrid</string>
-  <string name="AOA_tab_installed">Instal·lat</string>
-  <string name="AOA_tab_available">Disponible</string>
-  <string name="AOA_free">Gratuït</string>
-  <string name="AOA_no_addons">Llista buida</string>
-  <string name="TWi_loading">S\'està carregant…</string>
-  <string name="WCA_title">Seleccionar les tasques a veure ...</string>
-  <string name="p_about">Quant a l\'Astrid</string>
-  <string name="p_help">Assistència</string>
-  <string name="p_forums">Fòrums</string>
-  <string name="task_killer_help">Sembla que utilitzes una aplicació que pot matar pocessos (%s)! Si pots, afegeix l\'Astrid a la llista d\'exclusió per tal de no ser morta. En cas contrari podria ser que l\'Astrid no t\'informés de les tasques quan vencin.\n</string>
-  <string name="task_killer_help_ok">No mataré l\'Astrid!</string>
-  <string name="marketplace_description">Astrid es l\'administrador / llistat de tasques més estimat, dissenyat per ajudar-li a acabar les seves coses pendent. Compte amb recordatoris, etiquetes, sincronització, un complement per Locale, un Widget i moltes més coses.</string>
-  <string name="EPr_default_urgency_desc">Actualment: %s</string>
-  <string name="EPr_default_importance_desc">Actualment: %s</string>
-  <string name="EPr_default_hideUntil_desc">Actualment: %s</string>
-  <string name="EPr_default_reminders_desc">Actualment: %s</string>
-  <string name="EPr_default_reminders_mode_desc">Actualment: %s</string>
-  <string-array name="EPr_default_importance">
-    <item>!!! (Highest)</item>
-    <item>!!</item>
-    <item>!</item>
-    <item>o (Lowest)</item>
-  </string-array>
-  <string-array name="EPr_default_urgency">
-    <item>No deadline</item>
-    <item>Avui</item>
-    <item>Demà</item>
-    <item>Demà passat</item>
-    <item>La setmana que ve</item>
-  </string-array>
-  <string-array name="EPr_default_hideUntil">
-    <item>No amagis</item>
-    <item>La tasca ha vençut</item>
-    <item>El dia abans del venciment</item>
-    <item>La setmana abans del venciment</item>
-  </string-array>
-  <string-array name="EPr_default_reminders">
-    <item>Sense recordatoris de data de venciment</item>
-    <item>Al venciment</item>
-    <item>Quan estigui endarrerida</item>
-    <item>Al venciment o endarrerida</item>
-  </string-array>
-  <string name="BFE_Active">Tasques actives</string>
-  <string name="BFE_Recent">Modificades fa poc</string>
-  <string name="BFE_Assigned">Assignades</string>
-  <string name="BFE_Saved_delete">Esborra el filtre</string>
-  <string name="CFA_title">Filtre personalitzat</string>
-  <string name="CFA_filterName_hint">Dona nom al filtre per desar-lo...</string>
-  <string name="CFA_universe_all">Tasques actives</string>
-  <string name="CFA_type_add">o</string>
-  <string name="CFA_type_subtract">no</string>
-  <string name="CFA_type_intersect">també</string>
-  <string name="CFA_context_delete">Suprimeix la fila</string>
-  <string name="CFA_help">Aquesta pantalla li permet crear nous filtres. Afegeix criteris fent servir el botó de sota, premi breu o llarg per ajustar-los, i després premi \"Veure\"!</string>
-  <string name="CFA_button_add">Afegeix criteris</string>
-  <string name="CFA_button_view">Visualitza</string>
-  <string name="CFA_button_save">Desa i Visualitza</string>
-  <string name="CFC_dueBefore_text">Vençuda per: ?</string>
-  <string name="CFC_dueBefore_name">Venciment per...</string>
-  <string-array name="CFC_dueBefore_entries">
-    <item>Sense data de venciment</item>
-    <item>Ahir</item>
-    <item>Avui</item>
-    <item>Demà</item>
-    <item>Demà passat</item>
-    <item>La setmana que ve</item>
-    <item>El mes que ve</item>
-  </string-array>
-  <string name="CFC_importance_text">Per menys important?</string>
-  <string name="CFC_importance_name">Importància...</string>
-  <string name="CFC_tag_name">Llista...</string>
-  <string name="CFC_title_contains_name">El títol conté...</string>
-  <string name="CFC_title_contains_text">Títol conté: ?</string>
-  <string name="gcal_TEA_error">Error afegint la tasca al calendari!</string>
-  <string name="gcal_TEA_addToCalendar_label">Afegeix al calendari</string>
-  <string name="gcal_TEA_showCalendar_label">Obrir Event del Calendari</string>
-  <string name="gcal_TEA_calendar_updated">Event del calendari també actualitzat</string>
-  <string name="gcal_completed_title">%s (completada)</string>
-  <string name="gcal_GCP_default">Calendari per defecte</string>
-  <string name="gtasks_FEx_create_list_dialog">Nom de la llista nova:</string>
-  <string name="gtasks_FEx_create_list_error">S\'ha produït un error en crear la llista nova</string>
-  <string name="gtasks_GTA_clearing">S\'estan netejant les tasques completades...</string>
-  <string name="gtasks_GTA_clear_completed">Neteja les tasques completades</string>
-  <string name="gtasks_GLA_authenticating">S\'està autenticant...</string>
-  <string name="welcome_login_confirm_later_cancel">No, gràcies</string>
-  <string name="locale_edit_alerts_title">Astrid alerta de filtre</string>
-  <string name="locale_edit_intro">Astrid l\'hi enviarà una notificació quan tingui qualsevol tasca al següent filtre:</string>
-  <string name="locale_interval_label">Limitar notificacions a:</string>
-  <string-array name="locale_interval">
-    <item>a cada hora</item>
-    <item>cada sis hores</item>
-    <item>cada dotze hores</item>
-    <item>cada dia</item>
-    <item>cada tres dies</item>
-    <item>cada setmana</item>
-  </string-array>
-  <string name="locale_notification">Té $NUM coincidència: $FILTER</string>
-  <string name="locale_plugin_required">Si us plau, instal·la el complement Astrid Locale!</string>
-  <string name="opencrx_FEx_dashboard">Espais de treball</string>
-  <string name="opencrx_FEx_responsible">Assignat a</string>
-  <string name="opencrx_FEx_responsible_title">Assignat a \'%s\'</string>
-  <string name="opencrx_PDE_task_from">de %s</string>
-  <string name="opencrx_TEA_notes">Afegeix un comentari</string>
-  <string name="opencrx_creator_input_hint">Creador/a</string>
-  <string name="opencrx_contact_input_hint">Assignat a</string>
-  <string name="opencrx_segment_default">Estàndard</string>
-  <string name="opencrx_PLA_signIn">Registra</string>
-  <string name="opencrx_PLA_login">Entra</string>
-  <string name="opencrx_PLA_password">Contrasenya</string>
-  <string name="opencrx_notification_text">%s tasques actualitzades / prem per mes detalls</string>
-  <string name="opencrx_ioerror">Error de conexió! Verifiqui la conexió d\'internet.</string>
-  <string name="opencrx_MLA_password_empty">Contrasenya no especificada!</string>
-  <string name="opencrx_TEA_task_assign_label">Asigna aquesta tasca a aquesta persona:</string>
-  <string name="opencrx_TEA_task_unassigned">&lt;Sense asignar&gt;</string>
-  <string name="opencrx_TEA_dashboard_default">&lt;Per defecte&gt;</string>
-  <string name="TEA_reminders_group_label">Recordatoris</string>
-  <string name="TEA_reminder_alarm_label">Tipus de So/Vibració</string>
-  <string name="TEA_reminder_mode_once">Sona una vegada</string>
-  <string name="TEA_reminder_mode_nonstop">Sona fins que es cancel·la l\'alarma</string>
-  <string-array name="TEA_reminder_random">
-    <item>an hour</item>
-    <item>a day</item>
-    <item>a week</item>
-    <item>in two weeks</item>
-    <item>a month</item>
-    <item>in two months</item>
-  </string-array>
-  <string name="rmd_NoA_filter">¡Recordatori!</string>
-  <string name="rmd_NoA_done">Acabat</string>
-  <string name="rmd_NoA_snooze">Adorm</string>
-  <string-array name="rmd_reengage_notif_titles">
-    <item>A note from Astrid</item>
-    <item>Memo for %s.</item>
-    <item>Your Astrid digest</item>
-    <item>Recordatoris de l\'Astrid</item>
-  </string-array>
-  <string-array name="rmd_reengage_dialog_options">
-    <item>Time to shorten your to-do list!</item>
-    <item>Dear sir or madam, some tasks await your inspection!</item>
-    <item>Hi there, could you take a look at these?</item>
-    <item>I\'ve got some tasks with your name on them!</item>
-    <item>A fresh batch of tasks for you today!</item>
-    <item>You look fabulous! Ready to get started?</item>
-    <item>A lovely day for getting some work done, I think!</item>
-  </string-array>
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>Don\'t you want to get organized?</item>
-    <item>I\'m Astrid! I\'m here to help you do more!</item>
-    <item>You look busy! Let me take some of those tasks off of your plate.</item>
-    <item>I can help you keep track of all of the details in your life.</item>
-    <item>You\'re serious about getting more done? So am I!</item>
-    <item>Pleasure to make your acquaintance!</item>
-  </string-array>
-  <string name="rmd_EPr_enabled_desc_true">Els recordatoris de l\'Astrid estan habilitats (això és normal)</string>
-  <string name="rmd_EPr_enabled_desc_false">Els recordatoris de l\'Astrid no apareixeran mai al vostre dispositiu</string>
-  <string name="rmd_EPr_quiet_hours_start_title">Inici de Silenci</string>
-  <string name="rmd_EPr_quiet_hours_start_desc">Cap notificació apareixerà després %s</string>
-  <string name="rmd_EPr_quiet_hours_desc_none">Silenci desactivat</string>
-  <string name="rmd_EPr_quiet_hours_end_title">Final de Silenci</string>
-  <string name="rmd_EPr_quiet_hours_end_desc">Les notificacions sortirant començant a %s</string>
-  <string name="rmd_EPr_ringtone_title">So de Notificació</string>
-  <string name="rmd_EPr_ringtone_desc_custom">To personalitzat establert</string>
-  <string name="rmd_EPr_ringtone_desc_silent">To en mode silenciós</string>
-  <string name="rmd_EPr_ringtone_desc_default">Es farà servir el so predeterminat</string>
-  <string name="rmd_EPr_persistent_title">Persistència de Notificació</string>
-  <string name="rmd_EPr_persistent_desc_true">Les notificacions han que ser vistes individualment per ser descartades</string>
-  <string name="rmd_EPr_persistent_desc_false">Les notificacions poden ser descartades amb el botó \"Descarta Tot\"</string>
-  <string name="rmd_EPr_vibrate_title">Vibrar amb les Alertes</string>
-  <string name="rmd_EPr_vibrate_desc_true">Astrid vibrarà quan enviï notificacions</string>
-  <string name="rmd_EPr_vibrate_desc_false">Astrid no vibrarà quan enviï notificacions</string>
-  <string name="rmd_EPr_nagging_desc_true">Astrid apareixerà durant les notificacions per donar-li un estímul</string>
-  <string name="rmd_EPr_nagging_desc_false">Astrid no li donarà cap missatge d\'estímul</string>
-  <string name="rmd_EPr_snooze_dialog_title">Diàleg de retard HH:MM</string>
-  <string name="rmd_EPr_snooze_dialog_desc_true">Silencia seleccionant un nou temps límit (HH:MM)</string>
-  <string name="rmd_EPr_snooze_dialog_desc_false">Silencia seleccionant # dies/hores a adormir</string>
-  <string name="rmd_EPr_defaultRemind_title">Notificacions al Atzar</string>
-  <string name="rmd_EPr_defaultRemind_desc_disabled">Les tasques noves no mostraran notificacions a l\'atzar</string>
-  <string name="rmd_EPr_defaultRemind_desc">Les tasques noves notificaràn al atzar: %s</string>
-  <string-array name="EPr_reminder_random">
-    <item>desactivat</item>
-    <item>cada hora</item>
-    <item>diariament</item>
-    <item>setmanalment</item>
-    <item>bi-setmanalment</item>
-    <item>mensualment</item>
-    <item>bi-mensualment</item>
-  </string-array>
-  <string-array name="EPr_quiet_hours_start">
-    <item>desactivat</item>
-    <item>8 PM</item>
-    <item>9 PM</item>
-    <item>10 PM</item>
-    <item>11 PM</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
-    <item>9 AM</item>
-    <item>10 AM</item>
-    <item>11 AM</item>
-    <item>12 PM</item>
-    <item>1 PM</item>
-    <item>2 PM</item>
-    <item>3 PM</item>
-    <item>4 PM</item>
-    <item>5 PM</item>
-    <item>6 PM</item>
-    <item>7 PM</item>
-  </string-array>
-  <string-array name="EPr_quiet_hours_end">
-    <item>9 AM</item>
-    <item>10 AM</item>
-    <item>11 AM</item>
-    <item>12 PM</item>
-    <item>1 PM</item>
-    <item>2 PM</item>
-    <item>3 PM</item>
-    <item>4 PM</item>
-    <item>5 PM</item>
-    <item>6 PM</item>
-    <item>7 PM</item>
-    <item>8 PM</item>
-    <item>9 PM</item>
-    <item>10 PM</item>
-    <item>11 PM</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
-  </string-array>
-  <string-array name="EPr_rmd_time">
-    <item>9 AM</item>
-    <item>10 AM</item>
-    <item>11 AM</item>
-    <item>12 PM</item>
-    <item>1 PM</item>
-    <item>2 PM</item>
-    <item>3 PM</item>
-    <item>4 PM</item>
-    <item>5 PM</item>
-    <item>6 PM</item>
-    <item>7 PM</item>
-    <item>8 PM</item>
-    <item>9 PM</item>
-    <item>10 PM</item>
-    <item>11 PM</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
-  </string-array>
-  <string-array name="reminders">
-    <item>Ei! Tens un segon?</item>
-    <item>Puc veure\'t per un segon?</item>
-    <item>Té uns minuts?</item>
-    <item>Ha oblidat?</item>
-    <item>Perdó!</item>
-    <item>Quan tingui un minut:</item>
-    <item>A la seva agenda:</item>
-    <item>Té un moment lliure?</item>
-    <item>Aquí Astrid!</item>
-    <item>¡Hola! Puc molestar-lo?</item>
-    <item>Un minut del seu temps?</item>
-    <item>Es un gran dia per</item>
-  </string-array>
-  <string-array name="reminders_due">
-    <item>Hora de treballar!</item>
-    <item>La data de venciment està aquí!</item>
-    <item>Preparat per començar?</item>
-    <item>Vas dir que faries:</item>
-    <item>Es supossa que comença:</item>
-    <item>Temps d\'inici:</item>
-    <item>Es l\'hora!</item>
-    <item>Perdó! Temps per</item>
-    <item>Està lliure? Temps per</item>
-  </string-array>
-  <string-array name="reminders_snooze">
-    <item>No siguis gandul!</item>
-    <item>S\'ha acabat el temps límit.</item>
-    <item>No més retards!</item>
-    <item>Ara està preparat?</item>
-    <item>No més ajornaments!</item>
-  </string-array>
-  <string-array name="reminder_responses">
-    <item>Tinc una cosa per vosté!</item>
-    <item>Preparat per ficar això en el pasat?</item>
-    <item>Per què no aconsegueix acabar això?</item>
-    <item>Què et sembla? Tigre llest?</item>
-    <item>Preparat per fer això?</item>
-    <item>Pot manejar això?</item>
-    <item>Pot estar content! Ha acabat això!</item>
-    <item>Li prometo que es sentirà millor si finalitza això!</item>
-    <item>No ho farà avui?</item>
-    <item>Si us plau, acabi-ho. Estic fart d\'això!</item>
-    <item>Pots acabar això? Sí que pots!</item>
-    <item>Farà això alguna vegada?</item>
-    <item>Sentir-se bé amb si mateix! Anem!</item>
-    <item>Estic tan orgullos! Anem a fer-ho!</item>
-    <item>Un petit refrigeri després d\'acabar això?</item>
-    <item>Només aquesta tasca? Si us plau?</item>
-    <item>És hora de reduir les teves tasques pendents!</item>
-    <item>Ets de l\'equip de l\'ordre o de l\'equip del caos? Equip de l\'ordre! Endavant!</item>
-    <item>Have I mentioned you are awesome recently? Keep it up!</item>
-    <item>A task a day keeps the clutter away... Goodbye clutter!</item>
-    <item>Com t\'ho has fet? Wow, estic impressionat!</item>
-    <item>You can\'t just get by on your good looks. Let\'s get to it!</item>
-    <item>Fa un temps esplèndid per una feina com aquesta, no creus?</item>
-    <item>A spot of tea while you work on this?</item>
-    <item>If only you had already done this, then you could go outside and play.</item>
-    <item>Ha arribat l\'hora. No pots esquivar més l\'inevitable.</item>
-    <item>Em moro una mica cada vegada que m\'ignores.</item>
-  </string-array>
-  <string-array name="postpone_nags">
-    <item>Si us plau, diga\'m que no es veritat que ets un procastinador!</item>
-    <item>No t\'aburreix a vegades ser un mandrós?</item>
-    <item>En algun lloc, algú està depenent de vostè per acabar això!</item>
-    <item>Quan vostè ha dit d\'ajornar, en realitat volia dir \"estic fent això, no?</item>
-    <item>Aquesta és l\'última vegada que ajornes això, oi?</item>
-    <item>Només acaba-ho avui, no ho diré a ningú.</item>
-    <item>Perquè ajornar-ho quan pots mmm... no ajornar-ho!</item>
-    <item>Suposo que acabaràs això en algun moment.</item>
-    <item>Crec que ets un crack! Què tal si no ho demorem més?</item>
-    <item>Seràs capaç d\'arribar als teus objectius si fas això?</item>
-    <item>Ajorna, ajorna, ajorna. Quan canviaràs?</item>
-    <item>Ja en tinc prou de les teves excuses! Fes-ho ja!</item>
-    <item>No va ser l\'excusa de lúltima vegada?</item>
-    <item>No puc ajudar-te a organitzar la teva vida si fas això...</item>
-  </string-array>
-  <string name="repeat_plugin">Repetició de Tasques</string>
-  <string name="repeat_plugin_desc">Permetre tasques repetides</string>
-  <string name="repeat_enabled">Repeticions</string>
-  <string name="repeat_every">Cada %d</string>
-  <string name="repeat_interval_prompt">Interval de Repecitiò</string>
-  <string-array name="repeat_interval_short">
-    <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">
-    <item>Dia/es</item>
-    <item>Setmana/es</item>
-    <item>Mes/os</item>
-    <item>Hora/es</item>
-    <item>Minut/s</item>
-    <item>Year(s)</item>
-  </string-array>
-  <string-array name="repeat_until_shortcuts">
-    <item>Forever</item>
-    <item>Specific Day</item>
-    <item>Today</item>
-    <item>Tomorrow</item>
-    <item>(day after)</item>
-    <item>Next Week</item>
-    <item>In Two Weeks</item>
-    <item>Next Month</item>
-  </string-array>
-  <string-array name="repeat_type">
-    <item>a partir de la data de venciment</item>
-    <item>desde la data de finalització</item>
-  </string-array>
-  <string name="repeat_detail_byday">$I en $D</string>
-  <string name="repeat_detail_duedate">Cada %s</string>
-  <string name="repeat_detail_completion">%s després de finalització</string>
-  <string name="repeat_rescheduling_dialog_title_last_time">S\'ha completat la tasca recurrent «%s»</string>
-  <string-array name="repeat_encouragement">
-    <item>Good job!</item>
-    <item>Wow… I\'m so proud of you!</item>
-    <item>I love when you\'re productive!</item>
-    <item>Doesn\'t it feel good to check something off?</item>
-  </string-array>
-  <string-array name="repeat_encouragement_last_time">
-    <item>Good job!</item>
-    <item>I\'m so proud of you!</item>
-    <item>I love when you\'re productive!</item>
-  </string-array>
-  <string name="TEA_tags_label">Llistes</string>
-  <string name="TEA_tag_hint">Llista nova</string>
-  <string name="tag_new_list">Llista nova</string>
-  <string name="tag_FEx_header">Llistes</string>
-  <string name="tag_FEx_untagged">A cap llista</string>
-  <string name="tag_cm_delete">Suprimeix la llista</string>
-  <string name="DLG_delete_this_tag_question">Voleu suprimir aquesta llista: %s? (no se suprimirà cap tasca.)</string>
-  <string name="tag_settings_title">Paràmetres:</string>
-  <string name="tag_updates_title">Activitat: %s</string>
-  <string name="TPl_notification">Temporitzadors actius per %s!</string>
-  <string name="TFE_workingOn">Tasques sent cronometrades</string>
-  <string name="TEA_timer_comment_started">inici d\'aquesta tasca:</string>
-  <string name="TEA_timer_comment_stopped">finalització d\'aquesta tasca:</string>
-  <string name="welcome_title_1">Benvingut a Astrid</string>
-  <string name="welcome_body_5">and much more!</string>
-  <string name="PPW_configure_title">Configurar Widget</string>
-  <string name="PPW_color">Color del widget</string>
-  <string name="PPW_enable_calendar">Mostra events del calendari</string>
-  <string name="PPW_disable_encouragements">Ocultar estímuls</string>
-  <string name="PPW_filter">Escollir el filtre</string>
-  <string name="PPW_due">Venciment:</string>
-  <string name="PPW_past_due">Vençuda:</string>
-  <string-array name="PPW_encouragements">
-    <item>Hi there!</item>
-    <item>Tens temps d\'acabar una cosa?</item>
-    <item>Vaja, se\'l veu molt tranquil avui!</item>
-    <item>Do something great today!</item>
-    <item>Make me proud today!</item>
-    <item>How are you doing today?</item>
-  </string-array>
-  <string-array name="PPW_encouragements_tod">
-    <item>Good morning!</item>
-    <item>Good afternoon!</item>
-    <item>Good evening!</item>
-    <item>Late night?</item>
-    <item>It\'s early, get something done!</item>
-    <item>Afternoon tea, perhaps?</item>
-    <item>Enjoy the evening!</item>
-    <item>Sleep is good for you, you know!</item>
-  </string-array>
-  <string-array name="PPW_encouragements_completed">
-    <item>Ja heu completat %d tasques!</item>
-    <item>Puntuació al joc de la vida: %d tasques completades</item>
-    <item>Smile! You\'ve already finished %d tasks!</item>
-  </string-array>
-  <string name="PPW_encouragements_none_completed">Encara no heu completat cap tasca. Comencem a fer-ho?</string>
-  <string-array name="PPW_colors">
-    <item>Black</item>
-    <item>White</item>
-    <item>Blue</item>
-    <item>Translucent</item>
-  </string-array>
-  <string name="PPW_info_later">Més tard</string>
+    <string name="actfm_person_hint">Contacte o correu electrònic</string>
+    <string name="actfm_person_or_tag_hint">Contacte o llista compartida</string>
+    <string name="actfm_tag_operation_owner_delete">Sou el propietari d’aquesta llista compartida.
+        En suprimir-la, ho fareu per a tots els membres de la llista. Voleu continuar?
+    </string>
+    <string name="actfm_picture_camera">Fes una fotografia</string>
+    <string name="actfm_picture_gallery">Tria una imatge de la galeria</string>
+    <string name="actfm_picture_clear">Neteja la selecció d\'imatge</string>
+    <string name="actfm_view_task_title">Voleu veure la tasca?</string>
+    <string name="actfm_view_task_text">La tasca s\'ha enviat a %s! Tu segueixes veient les teves
+        pròpies tasques. Vols veure aquesta tasca i les altres que has assignat?
+    </string>
+    <string name="actfm_view_task_ok">Mostra les tasques assignades</string>
+    <string name="actfm_view_task_cancel">Queda\'t aquí</string>
+    <string name="actfm_my_shared_tasks_title">Les meves tasques compartides</string>
+    <string name="actfm_my_shared_tasks_empty">No hi ha cap tasca compartida</string>
+    <string name="actfm_friendship_connect">Afegeix com a amic</string>
+    <string name="actfm_friendship_accept">Accepta</string>
+    <string name="TVA_add_comment">Afegiu un comentari...</string>
+    <string-array name="TVA_tabs">
+        <item>Tasques</item>
+        <item>Activitat</item>
+        <item>Configuració de la llista</item>
+    </string-array>
+    <string name="actfm_TVA_filtered_by_assign">Tasques d\'en/na %s. Feu clic per veure-les totes.
+    </string>
+    <string name="actfm_TVA_filter_by_unassigned">Tasques no assignades. Feu clic per veure-les
+        totes.
+    </string>
+    <string name="actfm_TVA_no_members_alert">Llista privada: feu clic per editar-la o
+        compartir-la
+    </string>
+    <string name="actfm_TVA_menu_refresh">Actualitza</string>
+    <string name="actfm_TVA_tag_label">Llista</string>
+    <string name="actfm_TVA_members_label">Compartida amb</string>
+    <string name="actfm_TVA_members_hint">Compartiu-la amb qualsevol adreça de correu electrònic
+    </string>
+    <string name="actfm_TVA_tag_picture">Imatge de la llista</string>
+    <string name="actfm_TVA_silence_label">Inhabilita les notificacions</string>
+    <string name="actfm_TVA_tag_description_label">Descripció</string>
+    <string name="actfm_TVA_tag_settings_label">Paràmetres</string>
+    <string name="actfm_TVA_tag_description_hint">Escriviu una descripció</string>
+    <string name="actfm_TVA_tag_name_hint">Escriviu el nom de la llista</string>
+    <string name="actfm_TVA_login_to_share">Cal que inicieu la sessió web a astrid.com abans de
+        compartir llistes. Inicieu la sessió o bé feu que aquesta llista sigui privada.
+    </string>
+    <string name="actfm_EPA_intro">Utilitzeu l\'Astrid per compartir llistes, plans de festa o
+        projectes de grup. Vegeu quan els vostres amics completen activitats a l\'instant!
+    </string>
+    <string name="actfm_EPA_assign_label_long">Qui ha de fer això?</string>
+    <string name="actfm_EPA_assign_me">Jo</string>
+    <string name="actfm_EPA_unassigned">Sense assignar</string>
+    <string name="actfm_EPA_choose_contact">Escolliu un contacte</string>
+    <string name="actfm_EPA_share_with">Comparteix-la amb:</string>
+    <string name="actfm_EPA_collaborators_header">Comparteix-la amb els amics</string>
+    <string name="actfm_EPA_list">Llista: %s</string>
+    <string name="actfm_EPA_message_text">Missatge d\'invitació:</string>
+    <string name="actfm_EPA_message_body">Ajuda\'m a acabar això!</string>
+    <string name="actfm_EPA_assign_header_members">Membres de la llista</string>
+    <string name="actfm_EPA_assign_header_friends">Amics de l\'Astrid</string>
+    <string name="actfm_EPA_facebook">Facebook</string>
+    <string name="actfm_EPA_twitter">Twitter</string>
+    <string name="actfm_EPA_invalid_email">El correu electrònic no és vàlid: %s</string>
+    <string name="actfm_EPA_login_to_share">Cal que inicieu la sessió a Astrid.com per compartir
+        llistes
+    </string>
+    <string name="actfm_EPA_login_button">Entra</string>
+    <string name="actfm_EPA_dont_share_button">No ho comparteixis</string>
+    <string name="actfm_ALA_title">Us donem la benvinguda a Astrid.com!</string>
+    <string name="actfm_ALA_body">Astrid.com us permet accedir a les vostres tasques en línia,
+        compartir-les i delegar-les en altres.
+    </string>
+    <string name="actfm_ALA_fb_login">Connecta\'t amb el Facebook</string>
+    <string name="actfm_ALA_gg_login">Connecta\'t amb Google</string>
+    <string name="actfm_ALA_firstname_label">Nom</string>
+    <string name="actfm_ALA_lastname_label">Cognoms</string>
+    <string name="actfm_ALA_email_label">Adreça electrònica</string>
+    <string name="actfm_ALA_password_label">Contrasenya</string>
+    <string name="actfm_ALA_login_title">Registra</string>
+    <string name="actfm_GAA_title">Trieu el compte de Google que vulgueu utilitzar:</string>
+    <string name="actfm_OLA_prompt">Entreu:</string>
+    <string name="actfm_feat_list_cloning">S\'està copiant...</string>
+    <string name="actfm_feat_list_clone_success">L\'operació s\'ha realitzat correctament.</string>
+    <string name="actfm_status_title_logged_in">Estat - s\'ha iniciat la sessió com a %s</string>
+    <string name="actfm_APr_header">Astrid.com</string>
+    <string name="actfm_https_title">Utilitza l\'HTTPS</string>
+    <string name="actfm_https_enabled">HTTPS habilitat (més lent)</string>
+    <string name="actfm_https_disabled">HTTPS inhabilitat (més ràpid)</string>
+    <string name="actfm_account_basic">Bàsic</string>
+    <string name="actfm_inapp_billing">Actualitzar a Premium</string>
+    <string name="alarm_ACS_label">Alarmes</string>
+    <string name="alarm_ACS_button">Afegeix una alarma</string>
+    <string-array name="reminders_alarm">
+        <item>Alarma</item>
+    </string-array>
+    <string name="backup_BPr_header">Còpies de seguretat</string>
+    <string name="backup_BPr_group_status">Estat</string>
+    <string name="backup_status_success">Còpia de seguretat més recent:\n%s</string>
+    <string name="backup_status_failed">Còpia de seguretat Fallida</string>
+    <string name="backup_status_failed_subtitle">Feu clic per veure l\'error</string>
+    <string name="backup_status_never">Encara sense Còpies!</string>
+    <string name="backup_BPr_group_options">Opcions</string>
+    <string name="backup_BPr_auto_title">Còpies de seguretat automàtiques</string>
+    <string name="backup_BPr_auto_disabled">Còpies de seguretat automàtiques desactivades</string>
+    <string name="backup_BPr_auto_enabled">Còpies de seguretat diàries</string>
+    <string name="backup_BAc_title">Administrar Còpies de seguretat</string>
+    <string name="backup_BAc_import">Importa tasques</string>
+    <string name="backup_BAc_export">Exporta tasques</string>
+    <string name="backup_TXI_error">Error d\'importació</string>
+    <string name="export_toast_no_tasks">Sense tasques que exportar</string>
+    <string name="export_progress_title">S\'està exportant...</string>
+    <string name="import_summary_title">Resum de Restauració</string>
+    <string name="import_progress_title">S\'està important...</string>
+    <string name="import_progress_read">S\'està llegint la tasca %d</string>
+    <string name="DLG_error_sdcard">No es pot accedir a la carpeta: %s</string>
+    <string name="DLG_error_sdcard_general">No s\'ha pogut accedir a la targeta SD.</string>
+    <string name="import_file_prompt">Tria un fitxer per restaurar</string>
+    <string name="app_name">Tasques Astrid</string>
+    <string name="read_permission_label">Permís de l\'Astrid</string>
+    <string name="read_permission_desc">llegir tasques, mostrar filtres de tasques</string>
+    <string name="write_permission_label">Permís de l\'Astrid</string>
+    <string name="write_permission_desc">crear noves tasques, editar tasques existents</string>
+    <string name="DLG_delete_this_task_question">Voleu suprimir aquesta tasca?</string>
+    <string name="DLG_delete_this_item_question">Voleu suprimir aquest element: %s?</string>
+    <string name="DLG_upgrading">S\'estan actualitzant les vostres tasques...</string>
+    <string name="DLG_hour_minutes">Temps (hores : minuts)</string>
+    <string name="DLG_please_update">Astrid tindria que actualitzar-se a l\'última versió disponible
+        al Android Market! Si us plau, faci-ho abans de continuar, o esperi uns segons.
+    </string>
+    <string name="DLG_accept">Accepto</string>
+    <string name="DLG_decline">Declino</string>
+    <string name="DLG_eula_title">Condicions d\'ús de l\'Astrid</string>
+    <string name="DLG_please_wait">Espereu</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_more">Més</string>
+    <string name="DLG_undo">Desfés</string>
+    <string name="DLG_warning">Avís</string>
+    <string name="WID_dateButtonUnset">Prem per establir</string>
+    <string name="ENA_no_comments">Encara no hi ha activitat</string>
+    <string name="ENA_no_user">Algú</string>
+    <string name="ENA_refresh_comments">Actualitza els comentaris</string>
+    <string name="TLA_no_items">No teniu tasques! \n Voleu afegir alguna cosa?</string>
+    <string name="TLA_no_items_person">En/na %s no ha\ncompartit cap tasca amb vós</string>
+    <string name="TLA_menu_sort">Ordenació i subtasques</string>
+    <string name="TLA_menu_sync">Sincronitza ara</string>
+    <string name="TLA_menu_search">Cerca</string>
+    <string name="TLA_menu_lists">Llistes</string>
+    <string name="TLA_menu_friends">Gent</string>
+    <string name="TLA_menu_suggestions">Suggeriments</string>
+    <string name="TLA_menu_settings">Paràmetres</string>
+    <string name="TLA_menu_support">Assistència</string>
+    <string name="TLA_custom">Personalitzat</string>
+    <string name="TLA_quick_add_hint">Afegeix una tasca</string>
+    <string name="TLA_quick_add_hint_assign">Afegiu quelcom per a en/na %s</string>
+    <string name="TLA_notification_volume_low">S\'han silenciat les notificacions. No sentireu res
+        més d\'Astrid!
+    </string>
+    <string name="TLA_notification_disabled">Els recordatoris de l\'Astrid estan inhabilitats. No
+        rebreu cap recordatori
+    </string>
+    <string-array name="TLA_filters">
+        <item>Actiu</item>
+        <item>Avui</item>
+        <item>Aviat</item>
+        <item>Després</item>
+        <item>Fet</item>
+        <item>Ocult</item>
+    </string-array>
+    <string name="TLA_quickadd_confirm_title">Heu dit «%s»</string>
+    <string name="TLA_quickadd_confirm_speech_bubble">He creat una tasca anomenada «%1$s» %2$s com a
+        %3$s
+    </string>
+    <string name="TLA_quickadd_confirm_speech_bubble_date">per a %s</string>
+    <string name="TLA_quickadd_confirm_hide_helpers">No mostris confirmacions futures</string>
+    <string name="TLA_repeat_scheduled_title">Tasca periòdica nova %s</string>
+    <string name="TLA_repeat_scheduled_speech_bubble">En rebreu recordatoris %s.</string>
+    <string-array name="TLA_priority_strings">
+        <item>màxima prioritat</item>
+        <item>prioritat alta</item>
+        <item>prioritat mitjana</item>
+        <item>prioritat baixa</item>
+    </string-array>
+    <string name="TLA_all_activity">Tota l\'activitat</string>
+    <string name="TAd_hiddenFormat">%s [ocult]</string>
+    <string name="TAd_deletedFormat">%s [eliminat]</string>
+    <string name="TAd_completed">Acabat fa\n%s</string>
+    <string name="TAd_actionEditTask">Edita</string>
+    <string name="TAd_contextEditTask">Editeu la tasca</string>
+    <string name="TAd_contextCopyTask">Copia la tasca</string>
+    <string name="TAd_contextDeleteTask">Suprimeix la tasca</string>
+    <string name="TAd_contextUndeleteTask">Recupera la tasca</string>
+    <string name="TAd_contextPurgeTask">Purgar tasques</string>
+    <string name="SSD_title">Ordenació, subtasques, i ocultació</string>
+    <string name="SSD_hidden_title">Tasques ocultes</string>
+    <string name="SSD_completed">Mostra les tasques completades</string>
+    <string name="SSD_hidden">Mostra les tasques ocultes</string>
+    <string name="SSD_deleted">Mostra les tasques suprimides</string>
+    <string name="SSD_sort_auto">Classificació intel·ligent Astrid</string>
+    <string name="SSD_sort_alpha">Per títol</string>
+    <string name="SSD_sort_due">Per data de venciment</string>
+    <string name="SSD_sort_importance">Per importància</string>
+    <string name="SSD_sort_modified">Per darrera modificació</string>
+    <string name="SSD_sort_reverse">Ordenació inversa</string>
+    <string name="SSD_save_temp">Només una vegada</string>
+    <string name="SSD_save_always">Sempre</string>
+    <string name="FSA_label">Llista o filtre de l\'Astrid</string>
+    <string name="FLA_context_shortcut">Afegir un enllaç al escriptori...</string>
+    <string name="FLA_shortcut_dialog_title">Crea una drecera a l\'escriptori</string>
+    <string name="FLA_shortcut_dialog">Nom del enllaç</string>
+    <string name="FLA_search_hint">Cerca tasques</string>
+    <string name="FLA_search_filter">Coincidència \'%s\'</string>
+    <string name="FLA_toast_onCreateShortcut">S\'ha creat l\'enllaç: %s</string>
+    <string name="FLA_new_filter">Filtre nou</string>
+    <string name="FLA_new_list">Llista nova</string>
+    <string name="FLA_no_filter_selected">No heu seleccionat cap filtre. Seleccioneu un filtre o una
+        llista.
+    </string>
+    <string name="TEA_when_header_label">Quan</string>
+    <string name="TEA_title_hint">Resum de la tasca</string>
+    <string name="TEA_importance_label">Importància</string>
+    <string name="TEA_urgency_specific_time">A alguna hora en concret?</string>
+    <string name="TEA_urgency_none">Cap</string>
+    <string name="TEA_hideUntil_label">Mostra la tasca</string>
+    <string name="TEA_hideUntil_message">S\'ocultarà la tasca fins %s</string>
+    <string-array name="TEA_loading">
+        <item>S\'està carregant…</item>
+    </string-array>
+    <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>
+    <string name="TEA_menu_discard">No ho desis</string>
+    <string name="TEA_menu_delete">Suprimeix la tasca</string>
+    <string name="TEA_menu_comments">Comentaris</string>
+    <string name="TEA_onTaskSave_due">Tasca desada: venç %s</string>
+    <string name="TEA_onTaskSave_notDue">Tasca desada</string>
+    <string name="TEA_tab_activity">Activitat</string>
+    <string name="TEA_tab_more">Detalls</string>
+    <string name="TEA_tab_web">Idees</string>
+    <string-array name="TEA_urgency">
+        <item>Sense venciment</item>
+        <item>Dia concret</item>
+        <item>Avui</item>
+        <item>Demà</item>
+        <item>(demà passat)</item>
+        <item>La setmana que ve</item>
+        <item>D\'aquí a dues setmanes</item>
+        <item>El mes que ve</item>
+    </string-array>
+    <string name="TEA_no_time">cap hora</string>
+    <string-array name="TEA_hideUntil">
+        <item>Sempre</item>
+        <item>Al finalitzar la data límit</item>
+        <item>Due time</item>
+        <item>El dia abans del venciment</item>
+        <item>La setmana abans del venciment</item>
+        <item>Dia/Hora concret</item>
+    </string-array>
+    <string name="TEA_control_who">Qui</string>
+    <string name="TEA_control_when">Quan</string>
+    <string name="TEA_control_more_section">----Detalls----</string>
+    <string name="TEA_control_importance">Importància</string>
+    <string name="TEA_control_lists">Llistes</string>
+    <string name="TEA_control_notes">Notes</string>
+    <string name="TEA_control_files">Fitxers</string>
+    <string name="TEA_control_reminders">Recordatoris</string>
+    <string name="TEA_control_timer">Controls de temporització</string>
+    <string name="TEA_control_hidden_section">----Oculta-ho sempre----</string>
+    <string name="hide_until_prompt">Mostra a la meva llista</string>
+    <string name="TEA_no_activity">No hi ha hagut activitat</string>
+    <string name="TEA_load_more">Carrega més...</string>
+    <string name="TEA_when_dialog_title">Quan venç?</string>
+    <string name="TEA_new_task">Tasca nova</string>
+    <string name="MCA_title">En/na %1$s\nha trucat a les %2$s</string>
+    <string name="MCA_return_call">Truca ara</string>
+    <string name="MCA_add_task">Truca després</string>
+    <string name="MCA_ignore">Ignora</string>
+    <string name="MCA_ignore_title">Voleu ignorar totes les trucades perdudes?</string>
+    <string name="MCA_ignore_all">Ignora totes les trucades</string>
+    <string name="MCA_ignore_this">Ignora només aquesta trucada</string>
+    <string name="MCA_task_title_name">Retorna la trucada a en/na %1$s a %2$s</string>
+    <string name="MCA_task_title_no_name">Retorna la trucada a %s</string>
+    <string name="MCA_schedule_dialog_title">Retorna la trucada a %s en...</string>
+    <string-array name="MCA_dialog_speech_options">
+        <item>Deu ser genial ser tan popular!</item>
+        <item>Fantàstic, la gent us estima!</item>
+        <item>Alegreu-li el dia, feu-li una trucada!</item>
+        <item>Wouldn\'t you be happy if people called you back?</item>
+        <item>Tu ho pots fer!</item>
+        <item>You can always send a text...</item>
+    </string-array>
+    <string name="UpS_changelog_title">Què hi ha de nou en Astrid?</string>
+    <string name="UpS_updates_title">Novetats de l\'Astrid</string>
+    <string name="EPr_title">Astrid: Paràmetres</string>
+    <string name="EPr_deactivated">desactivat</string>
+    <string name="EPr_appearance_header">Aparença</string>
+    <string name="EPr_fontSize_title">Mida de la llista de tasques</string>
+    <string name="EPr_showSmartConfirmation_title">Mostra la confirmació per als recordatoris
+        intel·ligents
+    </string>
+    <string name="EPr_fontSize_desc">Mida de lletra en la pàgina de llista principal</string>
+    <string name="EPr_showNotes_title">Mostra notes a tasques</string>
+    <string name="EPr_beastMode_reset">Restableix els valors predeterminats</string>
+    <string name="EPr_showNotes_desc_enabled">Es mostraran sempre les anotacions</string>
+    <string name="EPr_fullTask_title">Mostra el títol sencer de la tasca</string>
+    <string name="EPr_fullTask_desc_enabled">Es mostrarà el títol sencer de la tasca</string>
+    <string name="EPr_theme_title">Color del tema</string>
+    <string name="EPr_theme_desc">Actualment: %s</string>
+    <string name="EPr_theme_desc_unsupported">Aquest paràmetre requrereix l\'Android 2.0 o
+        superior
+    </string>
+    <string name="EPr_use_contact_picker">Utilitza el selector de contactes</string>
+    <string name="EPr_third_party_addons_desc_enabled">S\'abilitaran les extensions de tercers
+    </string>
+    <string name="EPr_third_party_addons_desc_disabled">S\'inhabilitaran les extensions de tercers
+    </string>
+    <string name="EPr_ideas_tab_description">Obteniu idees per ajudar-vos a completar les tasques
+    </string>
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>Sense lliscament</item>
+        <item>Conserva la memòria</item>
+        <item>Rendiment normal</item>
+        <item>Alt rendiment</item>
+    </string-array>
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <item>Swipe between lists is disabled</item>
+        <item>Slower performance</item>
+        <item>Paràmetre per defecte</item>
+        <item>Utilitza més recursos del sistema</item>
+    </string-array>
+    <string-array name="EPr_themes">
+        <item>Dia - Blau</item>
+        <item>Dia - Vermell</item>
+        <item>Sky blue</item>
+        <item>Nit</item>
+        <item>Transparent (text blanc)</item>
+        <item>Transparent (text negre)</item>
+    </string-array>
+    <string-array name="EPr_themes_widget">
+        <item>El mateix que l\'aplicació</item>
+        <item>Dia - Blau</item>
+        <item>Dia - Vermell</item>
+        <item>Sky blue</item>
+        <item>Nit</item>
+        <item>Transparent (text blanc)</item>
+        <item>Transparent (text negre)</item>
+        <item>Estil antic</item>
+    </string-array>
+    <string name="EPr_manage_delete_completed_message">Segur que voleu suprimir totes les tasques
+        completades?
+    </string>
+    <string name="EPr_manage_delete_completed_status">S\'han suprimit %d tasques</string>
+    <string name="EPr_manage_delete_completed_gcal_message">Segur que voleu suprimir els
+        esdeveniments de calendari de les tasques completades?
+    </string>
+    <string name="AOA_internal_author">Equip d\'Astrid</string>
+    <string name="AOA_tab_installed">Instal·lat</string>
+    <string name="AOA_tab_available">Disponible</string>
+    <string name="AOA_free">Gratuït</string>
+    <string name="AOA_no_addons">Llista buida</string>
+    <string name="TWi_loading">S\'està carregant…</string>
+    <string name="WCA_title">Seleccionar les tasques a veure ...</string>
+    <string name="p_about">Quant a l\'Astrid</string>
+    <string name="p_help">Assistència</string>
+    <string name="p_forums">Fòrums</string>
+    <string name="task_killer_help">Sembla que utilitzes una aplicació que pot matar pocessos (%s)!
+        Si pots, afegeix l\'Astrid a la llista d\'exclusió per tal de no ser morta. En cas contrari
+        podria ser que l\'Astrid no t\'informés de les tasques quan vencin.\n
+    </string>
+    <string name="task_killer_help_ok">No mataré l\'Astrid!</string>
+    <string name="marketplace_description">Astrid es l\'administrador / llistat de tasques més
+        estimat, dissenyat per ajudar-li a acabar les seves coses pendent. Compte amb recordatoris,
+        etiquetes, sincronització, un complement per Locale, un Widget i moltes més coses.
+    </string>
+    <string name="EPr_default_urgency_desc">Actualment: %s</string>
+    <string name="EPr_default_importance_desc">Actualment: %s</string>
+    <string name="EPr_default_hideUntil_desc">Actualment: %s</string>
+    <string name="EPr_default_reminders_desc">Actualment: %s</string>
+    <string name="EPr_default_reminders_mode_desc">Actualment: %s</string>
+    <string-array name="EPr_default_importance">
+        <item>!!! (Highest)</item>
+        <item>!!</item>
+        <item>!</item>
+        <item>o (Lowest)</item>
+    </string-array>
+    <string-array name="EPr_default_urgency">
+        <item>No deadline</item>
+        <item>Avui</item>
+        <item>Demà</item>
+        <item>Demà passat</item>
+        <item>La setmana que ve</item>
+    </string-array>
+    <string-array name="EPr_default_hideUntil">
+        <item>No amagis</item>
+        <item>La tasca ha vençut</item>
+        <item>El dia abans del venciment</item>
+        <item>La setmana abans del venciment</item>
+    </string-array>
+    <string-array name="EPr_default_reminders">
+        <item>Sense recordatoris de data de venciment</item>
+        <item>Al venciment</item>
+        <item>Quan estigui endarrerida</item>
+        <item>Al venciment o endarrerida</item>
+    </string-array>
+    <string name="BFE_Active">Tasques actives</string>
+    <string name="BFE_Recent">Modificades fa poc</string>
+    <string name="BFE_Assigned">Assignades</string>
+    <string name="BFE_Saved_delete">Esborra el filtre</string>
+    <string name="CFA_title">Filtre personalitzat</string>
+    <string name="CFA_filterName_hint">Dona nom al filtre per desar-lo...</string>
+    <string name="CFA_universe_all">Tasques actives</string>
+    <string name="CFA_type_add">o</string>
+    <string name="CFA_type_subtract">no</string>
+    <string name="CFA_type_intersect">també</string>
+    <string name="CFA_context_delete">Suprimeix la fila</string>
+    <string name="CFA_help">Aquesta pantalla li permet crear nous filtres. Afegeix criteris fent
+        servir el botó de sota, premi breu o llarg per ajustar-los, i després premi \"Veure\"!
+    </string>
+    <string name="CFA_button_add">Afegeix criteris</string>
+    <string name="CFA_button_view">Visualitza</string>
+    <string name="CFA_button_save">Desa i Visualitza</string>
+    <string name="CFC_dueBefore_text">Vençuda per: ?</string>
+    <string name="CFC_dueBefore_name">Venciment per...</string>
+    <string-array name="CFC_dueBefore_entries">
+        <item>Sense data de venciment</item>
+        <item>Ahir</item>
+        <item>Avui</item>
+        <item>Demà</item>
+        <item>Demà passat</item>
+        <item>La setmana que ve</item>
+        <item>El mes que ve</item>
+    </string-array>
+    <string name="CFC_importance_text">Per menys important?</string>
+    <string name="CFC_importance_name">Importància...</string>
+    <string name="CFC_tag_name">Llista...</string>
+    <string name="CFC_title_contains_name">El títol conté...</string>
+    <string name="CFC_title_contains_text">Títol conté: ?</string>
+    <string name="gcal_TEA_error">Error afegint la tasca al calendari!</string>
+    <string name="gcal_TEA_addToCalendar_label">Afegeix al calendari</string>
+    <string name="gcal_TEA_showCalendar_label">Obrir Event del Calendari</string>
+    <string name="gcal_TEA_calendar_updated">Event del calendari també actualitzat</string>
+    <string name="gcal_completed_title">%s (completada)</string>
+    <string name="gcal_GCP_default">Calendari per defecte</string>
+    <string name="gtasks_FEx_create_list_dialog">Nom de la llista nova:</string>
+    <string name="gtasks_FEx_create_list_error">S\'ha produït un error en crear la llista nova
+    </string>
+    <string name="gtasks_GTA_clearing">S\'estan netejant les tasques completades...</string>
+    <string name="gtasks_GTA_clear_completed">Neteja les tasques completades</string>
+    <string name="gtasks_GLA_authenticating">S\'està autenticant...</string>
+    <string name="welcome_login_confirm_later_cancel">No, gràcies</string>
+    <string name="locale_edit_alerts_title">Astrid alerta de filtre</string>
+    <string name="locale_edit_intro">Astrid l\'hi enviarà una notificació quan tingui qualsevol
+        tasca al següent filtre:
+    </string>
+    <string name="locale_interval_label">Limitar notificacions a:</string>
+    <string-array name="locale_interval">
+        <item>a cada hora</item>
+        <item>cada sis hores</item>
+        <item>cada dotze hores</item>
+        <item>cada dia</item>
+        <item>cada tres dies</item>
+        <item>cada setmana</item>
+    </string-array>
+    <string name="locale_notification">Té $NUM coincidència: $FILTER</string>
+    <string name="locale_plugin_required">Si us plau, instal·la el complement Astrid Locale!
+    </string>
+    <string name="opencrx_FEx_dashboard">Espais de treball</string>
+    <string name="opencrx_FEx_responsible">Assignat a</string>
+    <string name="opencrx_FEx_responsible_title">Assignat a \'%s\'</string>
+    <string name="opencrx_PDE_task_from">de %s</string>
+    <string name="opencrx_TEA_notes">Afegeix un comentari</string>
+    <string name="opencrx_creator_input_hint">Creador/a</string>
+    <string name="opencrx_contact_input_hint">Assignat a</string>
+    <string name="opencrx_segment_default">Estàndard</string>
+    <string name="opencrx_PLA_signIn">Registra</string>
+    <string name="opencrx_PLA_login">Entra</string>
+    <string name="opencrx_PLA_password">Contrasenya</string>
+    <string name="opencrx_notification_text">%s tasques actualitzades / prem per mes detalls
+    </string>
+    <string name="opencrx_ioerror">Error de conexió! Verifiqui la conexió d\'internet.</string>
+    <string name="opencrx_MLA_password_empty">Contrasenya no especificada!</string>
+    <string name="opencrx_TEA_task_assign_label">Asigna aquesta tasca a aquesta persona:</string>
+    <string name="opencrx_TEA_task_unassigned">&lt;Sense asignar&gt;</string>
+    <string name="opencrx_TEA_dashboard_default">&lt;Per defecte&gt;</string>
+    <string name="TEA_reminders_group_label">Recordatoris</string>
+    <string name="TEA_reminder_alarm_label">Tipus de So/Vibració</string>
+    <string name="TEA_reminder_mode_once">Sona una vegada</string>
+    <string name="TEA_reminder_mode_nonstop">Sona fins que es cancel·la l\'alarma</string>
+    <string-array name="TEA_reminder_random">
+        <item>an hour</item>
+        <item>a day</item>
+        <item>a week</item>
+        <item>in two weeks</item>
+        <item>a month</item>
+        <item>in two months</item>
+    </string-array>
+    <string name="rmd_NoA_filter">¡Recordatori!</string>
+    <string name="rmd_NoA_done">Acabat</string>
+    <string name="rmd_NoA_snooze">Adorm</string>
+    <string-array name="rmd_reengage_notif_titles">
+        <item>A note from Astrid</item>
+        <item>Memo for %s.</item>
+        <item>Your Astrid digest</item>
+        <item>Recordatoris de l\'Astrid</item>
+    </string-array>
+    <string-array name="rmd_reengage_dialog_options">
+        <item>Time to shorten your to-do list!</item>
+        <item>Dear sir or madam, some tasks await your inspection!</item>
+        <item>Hi there, could you take a look at these?</item>
+        <item>I\'ve got some tasks with your name on them!</item>
+        <item>A fresh batch of tasks for you today!</item>
+        <item>You look fabulous! Ready to get started?</item>
+        <item>A lovely day for getting some work done, I think!</item>
+    </string-array>
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>Don\'t you want to get organized?</item>
+        <item>I\'m Astrid! I\'m here to help you do more!</item>
+        <item>You look busy! Let me take some of those tasks off of your plate.</item>
+        <item>I can help you keep track of all of the details in your life.</item>
+        <item>You\'re serious about getting more done? So am I!</item>
+        <item>Pleasure to make your acquaintance!</item>
+    </string-array>
+    <string name="rmd_EPr_enabled_desc_true">Els recordatoris de l\'Astrid estan habilitats (això és
+        normal)
+    </string>
+    <string name="rmd_EPr_enabled_desc_false">Els recordatoris de l\'Astrid no apareixeran mai al
+        vostre dispositiu
+    </string>
+    <string name="rmd_EPr_quiet_hours_start_title">Inici de Silenci</string>
+    <string name="rmd_EPr_quiet_hours_start_desc">Cap notificació apareixerà després %s</string>
+    <string name="rmd_EPr_quiet_hours_desc_none">Silenci desactivat</string>
+    <string name="rmd_EPr_quiet_hours_end_title">Final de Silenci</string>
+    <string name="rmd_EPr_quiet_hours_end_desc">Les notificacions sortirant començant a %s</string>
+    <string name="rmd_EPr_ringtone_title">So de Notificació</string>
+    <string name="rmd_EPr_ringtone_desc_custom">To personalitzat establert</string>
+    <string name="rmd_EPr_ringtone_desc_silent">To en mode silenciós</string>
+    <string name="rmd_EPr_ringtone_desc_default">Es farà servir el so predeterminat</string>
+    <string name="rmd_EPr_persistent_title">Persistència de Notificació</string>
+    <string name="rmd_EPr_persistent_desc_true">Les notificacions han que ser vistes individualment
+        per ser descartades
+    </string>
+    <string name="rmd_EPr_persistent_desc_false">Les notificacions poden ser descartades amb el botó
+        \"Descarta Tot\"
+    </string>
+    <string name="rmd_EPr_vibrate_title">Vibrar amb les Alertes</string>
+    <string name="rmd_EPr_vibrate_desc_true">Astrid vibrarà quan enviï notificacions</string>
+    <string name="rmd_EPr_vibrate_desc_false">Astrid no vibrarà quan enviï notificacions</string>
+    <string name="rmd_EPr_nagging_desc_true">Astrid apareixerà durant les notificacions per donar-li
+        un estímul
+    </string>
+    <string name="rmd_EPr_nagging_desc_false">Astrid no li donarà cap missatge d\'estímul</string>
+    <string name="rmd_EPr_snooze_dialog_title">Diàleg de retard HH:MM</string>
+    <string name="rmd_EPr_snooze_dialog_desc_true">Silencia seleccionant un nou temps límit
+        (HH:MM)
+    </string>
+    <string name="rmd_EPr_snooze_dialog_desc_false">Silencia seleccionant # dies/hores a adormir
+    </string>
+    <string name="rmd_EPr_defaultRemind_title">Notificacions al Atzar</string>
+    <string name="rmd_EPr_defaultRemind_desc_disabled">Les tasques noves no mostraran notificacions
+        a l\'atzar
+    </string>
+    <string name="rmd_EPr_defaultRemind_desc">Les tasques noves notificaràn al atzar: %s</string>
+    <string-array name="EPr_reminder_random">
+        <item>desactivat</item>
+        <item>cada hora</item>
+        <item>diariament</item>
+        <item>setmanalment</item>
+        <item>bi-setmanalment</item>
+        <item>mensualment</item>
+        <item>bi-mensualment</item>
+    </string-array>
+    <string-array name="EPr_quiet_hours_start">
+        <item>desactivat</item>
+        <item>8 PM</item>
+        <item>9 PM</item>
+        <item>10 PM</item>
+        <item>11 PM</item>
+        <item>12 AM</item>
+        <item>1 AM</item>
+        <item>2 AM</item>
+        <item>3 AM</item>
+        <item>4 AM</item>
+        <item>5 AM</item>
+        <item>6 AM</item>
+        <item>7 AM</item>
+        <item>8 AM</item>
+        <item>9 AM</item>
+        <item>10 AM</item>
+        <item>11 AM</item>
+        <item>12 PM</item>
+        <item>1 PM</item>
+        <item>2 PM</item>
+        <item>3 PM</item>
+        <item>4 PM</item>
+        <item>5 PM</item>
+        <item>6 PM</item>
+        <item>7 PM</item>
+    </string-array>
+    <string-array name="EPr_quiet_hours_end">
+        <item>9 AM</item>
+        <item>10 AM</item>
+        <item>11 AM</item>
+        <item>12 PM</item>
+        <item>1 PM</item>
+        <item>2 PM</item>
+        <item>3 PM</item>
+        <item>4 PM</item>
+        <item>5 PM</item>
+        <item>6 PM</item>
+        <item>7 PM</item>
+        <item>8 PM</item>
+        <item>9 PM</item>
+        <item>10 PM</item>
+        <item>11 PM</item>
+        <item>12 AM</item>
+        <item>1 AM</item>
+        <item>2 AM</item>
+        <item>3 AM</item>
+        <item>4 AM</item>
+        <item>5 AM</item>
+        <item>6 AM</item>
+        <item>7 AM</item>
+        <item>8 AM</item>
+    </string-array>
+    <string-array name="EPr_rmd_time">
+        <item>9 AM</item>
+        <item>10 AM</item>
+        <item>11 AM</item>
+        <item>12 PM</item>
+        <item>1 PM</item>
+        <item>2 PM</item>
+        <item>3 PM</item>
+        <item>4 PM</item>
+        <item>5 PM</item>
+        <item>6 PM</item>
+        <item>7 PM</item>
+        <item>8 PM</item>
+        <item>9 PM</item>
+        <item>10 PM</item>
+        <item>11 PM</item>
+        <item>12 AM</item>
+        <item>1 AM</item>
+        <item>2 AM</item>
+        <item>3 AM</item>
+        <item>4 AM</item>
+        <item>5 AM</item>
+        <item>6 AM</item>
+        <item>7 AM</item>
+        <item>8 AM</item>
+    </string-array>
+    <string-array name="reminders">
+        <item>Ei! Tens un segon?</item>
+        <item>Puc veure\'t per un segon?</item>
+        <item>Té uns minuts?</item>
+        <item>Ha oblidat?</item>
+        <item>Perdó!</item>
+        <item>Quan tingui un minut:</item>
+        <item>A la seva agenda:</item>
+        <item>Té un moment lliure?</item>
+        <item>Aquí Astrid!</item>
+        <item>¡Hola! Puc molestar-lo?</item>
+        <item>Un minut del seu temps?</item>
+        <item>Es un gran dia per</item>
+    </string-array>
+    <string-array name="reminders_due">
+        <item>Hora de treballar!</item>
+        <item>La data de venciment està aquí!</item>
+        <item>Preparat per començar?</item>
+        <item>Vas dir que faries:</item>
+        <item>Es supossa que comença:</item>
+        <item>Temps d\'inici:</item>
+        <item>Es l\'hora!</item>
+        <item>Perdó! Temps per</item>
+        <item>Està lliure? Temps per</item>
+    </string-array>
+    <string-array name="reminders_snooze">
+        <item>No siguis gandul!</item>
+        <item>S\'ha acabat el temps límit.</item>
+        <item>No més retards!</item>
+        <item>Ara està preparat?</item>
+        <item>No més ajornaments!</item>
+    </string-array>
+    <string-array name="reminder_responses">
+        <item>Tinc una cosa per vosté!</item>
+        <item>Preparat per ficar això en el pasat?</item>
+        <item>Per què no aconsegueix acabar això?</item>
+        <item>Què et sembla? Tigre llest?</item>
+        <item>Preparat per fer això?</item>
+        <item>Pot manejar això?</item>
+        <item>Pot estar content! Ha acabat això!</item>
+        <item>Li prometo que es sentirà millor si finalitza això!</item>
+        <item>No ho farà avui?</item>
+        <item>Si us plau, acabi-ho. Estic fart d\'això!</item>
+        <item>Pots acabar això? Sí que pots!</item>
+        <item>Farà això alguna vegada?</item>
+        <item>Sentir-se bé amb si mateix! Anem!</item>
+        <item>Estic tan orgullos! Anem a fer-ho!</item>
+        <item>Un petit refrigeri després d\'acabar això?</item>
+        <item>Només aquesta tasca? Si us plau?</item>
+        <item>És hora de reduir les teves tasques pendents!</item>
+        <item>Ets de l\'equip de l\'ordre o de l\'equip del caos? Equip de l\'ordre! Endavant!
+        </item>
+        <item>Have I mentioned you are awesome recently? Keep it up!</item>
+        <item>A task a day keeps the clutter away... Goodbye clutter!</item>
+        <item>Com t\'ho has fet? Wow, estic impressionat!</item>
+        <item>You can\'t just get by on your good looks. Let\'s get to it!</item>
+        <item>Fa un temps esplèndid per una feina com aquesta, no creus?</item>
+        <item>A spot of tea while you work on this?</item>
+        <item>If only you had already done this, then you could go outside and play.</item>
+        <item>Ha arribat l\'hora. No pots esquivar més l\'inevitable.</item>
+        <item>Em moro una mica cada vegada que m\'ignores.</item>
+    </string-array>
+    <string-array name="postpone_nags">
+        <item>Si us plau, diga\'m que no es veritat que ets un procastinador!</item>
+        <item>No t\'aburreix a vegades ser un mandrós?</item>
+        <item>En algun lloc, algú està depenent de vostè per acabar això!</item>
+        <item>Quan vostè ha dit d\'ajornar, en realitat volia dir \"estic fent això, no?</item>
+        <item>Aquesta és l\'última vegada que ajornes això, oi?</item>
+        <item>Només acaba-ho avui, no ho diré a ningú.</item>
+        <item>Perquè ajornar-ho quan pots mmm... no ajornar-ho!</item>
+        <item>Suposo que acabaràs això en algun moment.</item>
+        <item>Crec que ets un crack! Què tal si no ho demorem més?</item>
+        <item>Seràs capaç d\'arribar als teus objectius si fas això?</item>
+        <item>Ajorna, ajorna, ajorna. Quan canviaràs?</item>
+        <item>Ja en tinc prou de les teves excuses! Fes-ho ja!</item>
+        <item>No va ser l\'excusa de lúltima vegada?</item>
+        <item>No puc ajudar-te a organitzar la teva vida si fas això...</item>
+    </string-array>
+    <string name="repeat_plugin">Repetició de Tasques</string>
+    <string name="repeat_plugin_desc">Permetre tasques repetides</string>
+    <string name="repeat_enabled">Repeticions</string>
+    <string name="repeat_every">Cada %d</string>
+    <string name="repeat_interval_prompt">Interval de Repecitiò</string>
+    <string-array name="repeat_interval_short">
+        <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">
+        <item>Dia/es</item>
+        <item>Setmana/es</item>
+        <item>Mes/os</item>
+        <item>Hora/es</item>
+        <item>Minut/s</item>
+        <item>Year(s)</item>
+    </string-array>
+    <string-array name="repeat_until_shortcuts">
+        <item>Forever</item>
+        <item>Specific Day</item>
+        <item>Today</item>
+        <item>Tomorrow</item>
+        <item>(day after)</item>
+        <item>Next Week</item>
+        <item>In Two Weeks</item>
+        <item>Next Month</item>
+    </string-array>
+    <string-array name="repeat_type">
+        <item>a partir de la data de venciment</item>
+        <item>desde la data de finalització</item>
+    </string-array>
+    <string name="repeat_detail_byday">$I en $D</string>
+    <string name="repeat_detail_duedate">Cada %s</string>
+    <string name="repeat_detail_completion">%s després de finalització</string>
+    <string name="repeat_rescheduling_dialog_title_last_time">S\'ha completat la tasca recurrent
+        «%s»
+    </string>
+    <string-array name="repeat_encouragement">
+        <item>Good job!</item>
+        <item>Wow… I\'m so proud of you!</item>
+        <item>I love when you\'re productive!</item>
+        <item>Doesn\'t it feel good to check something off?</item>
+    </string-array>
+    <string-array name="repeat_encouragement_last_time">
+        <item>Good job!</item>
+        <item>I\'m so proud of you!</item>
+        <item>I love when you\'re productive!</item>
+    </string-array>
+    <string name="TEA_tags_label">Llistes</string>
+    <string name="TEA_tag_hint">Llista nova</string>
+    <string name="tag_new_list">Llista nova</string>
+    <string name="tag_FEx_header">Llistes</string>
+    <string name="tag_FEx_untagged">A cap llista</string>
+    <string name="tag_cm_delete">Suprimeix la llista</string>
+    <string name="DLG_delete_this_tag_question">Voleu suprimir aquesta llista: %s? (no se suprimirà
+        cap tasca.)
+    </string>
+    <string name="tag_settings_title">Paràmetres:</string>
+    <string name="tag_updates_title">Activitat: %s</string>
+    <string name="TPl_notification">Temporitzadors actius per %s!</string>
+    <string name="TFE_workingOn">Tasques sent cronometrades</string>
+    <string name="TEA_timer_comment_started">inici d\'aquesta tasca:</string>
+    <string name="TEA_timer_comment_stopped">finalització d\'aquesta tasca:</string>
+    <string name="welcome_title_1">Benvingut a Astrid</string>
+    <string name="welcome_body_5">and much more!</string>
+    <string name="PPW_configure_title">Configurar Widget</string>
+    <string name="PPW_color">Color del widget</string>
+    <string name="PPW_enable_calendar">Mostra events del calendari</string>
+    <string name="PPW_disable_encouragements">Ocultar estímuls</string>
+    <string name="PPW_filter">Escollir el filtre</string>
+    <string name="PPW_due">Venciment:</string>
+    <string name="PPW_past_due">Vençuda:</string>
+    <string-array name="PPW_encouragements">
+        <item>Hi there!</item>
+        <item>Tens temps d\'acabar una cosa?</item>
+        <item>Vaja, se\'l veu molt tranquil avui!</item>
+        <item>Do something great today!</item>
+        <item>Make me proud today!</item>
+        <item>How are you doing today?</item>
+    </string-array>
+    <string-array name="PPW_encouragements_tod">
+        <item>Good morning!</item>
+        <item>Good afternoon!</item>
+        <item>Good evening!</item>
+        <item>Late night?</item>
+        <item>It\'s early, get something done!</item>
+        <item>Afternoon tea, perhaps?</item>
+        <item>Enjoy the evening!</item>
+        <item>Sleep is good for you, you know!</item>
+    </string-array>
+    <string-array name="PPW_encouragements_completed">
+        <item>Ja heu completat %d tasques!</item>
+        <item>Puntuació al joc de la vida: %d tasques completades</item>
+        <item>Smile! You\'ve already finished %d tasks!</item>
+    </string-array>
+    <string name="PPW_encouragements_none_completed">Encara no heu completat cap tasca. Comencem a
+        fer-ho?
+    </string>
+    <string-array name="PPW_colors">
+        <item>Black</item>
+        <item>White</item>
+        <item>Blue</item>
+        <item>Translucent</item>
+    </string-array>
+    <string name="PPW_info_later">Més tard</string>
 </resources>
diff --git a/astrid/res/values-cs/strings.xml b/astrid/res/values-cs/strings.xml
index 38b852906..5b3f46fb2 100644
--- a/astrid/res/values-cs/strings.xml
+++ b/astrid/res/values-cs/strings.xml
@@ -1,852 +1,960 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="actfm_person_hint">Kontakt nebo email</string>
-  <string name="actfm_person_or_tag_hint">Kontakt nebo Sdílený list</string>
-  <string name="actfm_tag_operation_owner_delete">Jste vlastníkem tohoto sdíleného seznamu! Pokud ho smažete, smaže se i u všech členů seznamu. Chcete skutečně pokračovat?</string>
-  <string name="actfm_picture_camera">Vyfoť obrázek</string>
-  <string name="actfm_picture_gallery">Vybrat obrázek z galerie</string>
-  <string name="actfm_picture_clear">Odebrat obrázek</string>
-  <string name="actfm_view_task_title">Zobrazit úkol?</string>
-  <string name="actfm_view_task_text">%s se stal novým vlastníkem úkolu! Teď si prohlížíte vlastní úkoly. Chcete vidět úkoly, které jste delegoval(a)?</string>
-  <string name="actfm_view_task_ok">Delegované</string>
-  <string name="actfm_view_task_cancel">Vlastní</string>
-  <string name="actfm_my_shared_tasks_title">Moje sdílené úkoly</string>
-  <string name="actfm_my_shared_tasks_empty">Žádné sdílené úkoly</string>
-  <string name="actfm_friendship_accept">Potvrdit</string>
-  <string name="TVA_add_comment">Přidej comment...</string>
-  <string-array name="TVA_tabs">
-    <item>Úkoly</item>
-    <item>Činnost</item>
-    <item>Nastavení listu</item>
-  </string-array>
-  <string name="actfm_TVA_menu_refresh">Obnovit</string>
-  <string name="actfm_TVA_tag_label">Název listu:</string>
-  <string name="actfm_TVA_members_label">Spolupracovníci:</string>
-  <string name="actfm_TVA_members_hint">Sdílet s kýmkoli, kdo má email</string>
-  <string name="actfm_TVA_tag_picture">Obrázek listu</string>
-  <string name="actfm_TVA_silence_label">Tichá upozornění</string>
-  <string name="actfm_TVA_tag_description_label">Popis</string>
-  <string name="actfm_TVA_tag_settings_label">Nastavení</string>
-  <string name="actfm_TVA_tag_description_hint">Zde zadejte popis</string>
-  <string name="actfm_TVA_tag_name_hint">Název seznamu</string>
-  <string name="actfm_TVA_login_to_share">Pro sdílení seznamů musíte být přihlášen k Astrid.com! Přihlašte se prosím, nebo tento seznam označte jako soukromý.</string>
-  <string name="actfm_EPA_intro">S pomocí Astrid sdílejte nákupní seznamy, nápady na party nebo týmové projekty a buďte okamžitě v obraze když druzí něco dokončí!</string>
-  <string name="actfm_EPA_assign_label_long">Kdo to má udělat?</string>
-  <string name="actfm_EPA_assign_me">Já</string>
-  <string name="actfm_EPA_unassigned">Nepřiřazené</string>
-  <string name="actfm_EPA_choose_contact">Vyberte kontakt</string>
-  <string name="actfm_EPA_share_with">Přidat spolupracovníky:</string>
-  <string name="actfm_EPA_collaborators_header">Sdílet s přáteli</string>
-  <string name="actfm_EPA_list">Seznam: %s</string>
-  <string name="actfm_EPA_message_text">Uvítací zpráva:</string>
-  <string name="actfm_EPA_message_body">Pomoz mi to dodělat!</string>
-  <string name="actfm_EPA_assign_header_members">Členové seznamu</string>
-  <string name="actfm_EPA_assign_header_friends">Přátelé z Astrid</string>
-  <string name="actfm_EPA_facebook">Facebook</string>
-  <string name="actfm_EPA_twitter">Twitter</string>
-  <string name="actfm_EPA_invalid_email">Špatný E-mail: %s</string>
-  <string name="actfm_EPA_login_to_share">Pro sdílení úkolů musíte být přihlášen na Astrid.com!</string>
-  <string name="actfm_EPA_login_button">Přihlásit se</string>
-  <string name="actfm_EPA_dont_share_button">Nesdílet</string>
-  <string name="actfm_ALA_title">Vítejte v Astrid.com!</string>
-  <string name="actfm_ALA_body">Díky Astrid.com můžete k úkolům přistupovat online nebo je můžete sdílet s ostatníma.</string>
-  <string name="actfm_ALA_fb_login">Přihlásit Facebookem</string>
-  <string name="actfm_ALA_gg_login">Přihlásit Google účtem</string>
-  <string name="actfm_ALA_firstname_label">Křestní jméno</string>
-  <string name="actfm_ALA_lastname_label">Příjmení</string>
-  <string name="actfm_ALA_email_label">Email</string>
-  <string name="actfm_ALA_password_label">Heslo</string>
-  <string name="actfm_GAA_title">Vyberte, který účet Google chcete použít:</string>
-  <string name="actfm_OLA_prompt">Prosím připojte se do Googlu:</string>
-  <string name="actfm_feat_list_clone_success">Povedlo se!</string>
-  <string name="actfm_feat_list_task_clone_success">Úkol zkopírován</string>
-  <string name="actfm_status_title_logged_in">Stav - přihlášen jako %s</string>
-  <string name="actfm_APr_header">Astrid.com</string>
-  <string name="actfm_https_title">Použít HTTPS</string>
-  <string name="actfm_https_enabled">HTTPS povoleno (pomalejší)</string>
-  <string name="actfm_https_disabled">HTTPS zakázáno (rychlejší)</string>
-  <string name="actfm_dual_sync_warning">Synchronizujete úkoly s Google Tasks. Berte na vědomí, že synchronizace s oběma službami může v některých případech vést k nečekaným důsledkům. Opravdu si přejete synchronizovat s Astrid.com?</string>
-  <string name="actfm_account_basic">Zakladní</string>
-  <string name="share_with_google">Sdílet na Google+</string>
-  <string name="alarm_ACS_label">Alarmy</string>
-  <string name="alarm_ACS_button">Přidat alarm</string>
-  <string-array name="reminders_alarm">
-    <item>Budík!</item>
-  </string-array>
-  <string name="backup_BPr_header">Zálohy</string>
-  <string name="backup_BPr_group_status">Stav</string>
-  <string name="backup_status_success">Předchozí:\n%s</string>
-  <string name="backup_status_failed">Předchozí zálohování selhalo</string>
-  <string name="backup_status_failed_subtitle">klikněte pro zobrazení chyby</string>
-  <string name="backup_status_never">Nikdy nezálohováno!</string>
-  <string name="backup_BPr_group_options">Možnosti</string>
-  <string name="backup_BPr_auto_title">Automatické zálohování</string>
-  <string name="backup_BPr_auto_disabled">Automatické zálohování je zakázáno</string>
-  <string name="backup_BPr_auto_enabled">Zálohování se bude provádět denně</string>
-  <string name="backup_BAc_label">Spravovat zálohy</string>
-  <string name="backup_BAc_title">Spravovat tvé zálohy</string>
-  <string name="backup_BAc_import">Importovat úkoly</string>
-  <string name="backup_BAc_export">Exportovat úkoly</string>
-  <string name="backup_TXI_error">Chyba v importu</string>
-  <string name="export_toast">Zálohovány %1$s do %2$s.</string>
-  <string name="export_toast_no_tasks">Žádné úkoly pro export.</string>
-  <string name="export_progress_title">Exportuji...</string>
-  <string name="import_summary_title">Souhrn obnovy</string>
-  <string name="import_summary_message">Soubor %1$s obsahuje %2$s.\n\n %3$s importováno,\n %4$s již existuje\n %5$s je chybných\n</string>
-  <string name="import_progress_title">Probíhá import...</string>
-  <string name="import_progress_read">Načítávání úkolu %d...</string>
-  <string name="DLG_error_sdcard">Chyba v přístupu k adresáři: %s</string>
-  <string name="DLG_error_sdcard_general">Chyba v přístupu k SD kartě!</string>
-  <string name="import_file_prompt">Zvolte soubor k obnově</string>
-  <string name="app_name">Astrid Úkoly</string>
-  <string name="read_permission_label">Astrid Práva</string>
-  <string name="read_permission_desc">zobrazit úkoly, zobrazit filtry úkolů</string>
-  <string name="write_permission_label">Astrid Práva</string>
-  <string name="write_permission_desc">vytvořit nové úkoly, upravit existující úkoly</string>
-  <string name="DLG_delete_this_task_question">Smazat tento úkol?</string>
-  <string name="DLG_delete_this_item_question">Smazat tuto položku: %s?</string>
-  <string name="DLG_upgrading">Obnovování vašich úkolů...</string>
-  <string name="DLG_hour_minutes">Čas (hodin : minut)</string>
-  <string name="DLG_please_update">Astrid by měl být aktualizován na poslední verzi z Android market! Prosím udělej to, než budeš pokračovat, nebo chvíli počkej.</string>
-  <string name="DLG_accept">Souhlasím</string>
-  <string name="DLG_decline">Odmítám</string>
-  <string name="DLG_eula_title">Podmínky užívání programu Astrid</string>
-  <string name="DLG_please_wait">Čekejte prosím</string>
-  <string name="DLG_loading">Nahrávám...</string>
-  <string name="DLG_ok">OK</string>
-  <string name="DLG_cancel">Storno</string>
-  <string name="DLG_more">Další</string>
-  <string name="DLG_undo">Vrátit změny</string>
-  <string name="DLG_warning">Výstraha</string>
-  <string name="WID_dateButtonUnset">Klikni pro nastavení</string>
-  <string name="ENA_no_comments">Nic k zobrazení</string>
-  <string name="ENA_no_user">Kdosi</string>
-  <string name="ENA_refresh_comments">Obnovit komentáře</string>
-  <string name="TLA_no_items">Žádné úkoly!</string>
-  <string name="TLA_no_items_person">%s s vámi\nnesdílí žádné úkoly</string>
-  <string name="TLA_menu_sort">Třídit &amp; skryté</string>
-  <string name="TLA_menu_sync">Sychronizovat</string>
-  <string name="TLA_menu_search">Hledat</string>
-  <string name="TLA_menu_lists">Seznamy</string>
-  <string name="TLA_menu_friends">Lidé</string>
-  <string name="TLA_menu_suggestions">Návrhy</string>
-  <string name="TLA_menu_support">Podpora</string>
-  <string name="TLA_custom">Vlastní</string>
-  <string name="TLA_quick_add_hint">Přidat úkol</string>
-  <string name="TLA_notification_volume_low">Upozornění jsou ztlumena. Neuslyšíte Astrid!</string>
-  <string name="TLA_notification_disabled">Upomínky Astrid jsou vypnuté! Nedostanete žádná upozornění</string>
-  <string-array name="TLA_filters">
-    <item>Aktivní</item>
-    <item>Dnes</item>
-    <item>Brzy</item>
-    <item>Po termínu</item>
-    <item>Hotovo</item>
-    <item>Skryté</item>
-  </string-array>
-  <string name="TLA_quickadd_confirm_speech_bubble">Vytvořila jsem úkol s názvem \"%1$s\", %3$s priorita, do %2$s</string>
-  <string name="TLA_quickadd_confirm_hide_helpers">Nezobrazovat budoucí potvrzení</string>
-  <string name="TLA_repeat_scheduled_title">Nový opakující se úkol %s</string>
-  <string name="TLA_repeat_scheduled_speech_bubble">Připomenu Ti to %s.</string>
-  <string-array name="TLA_priority_strings">
-    <item>nejvyšší důležitost</item>
-    <item>vysoká důležitost</item>
-    <item>střední důležitost</item>
-    <item>nízká důležitost</item>
-  </string-array>
-  <string name="TAd_hiddenFormat">%s [skrytý]</string>
-  <string name="TAd_deletedFormat">%s [smazán]</string>
-  <string name="TAd_completed">Dokončeno\n%s</string>
-  <string name="TAd_actionEditTask">Upravit</string>
-  <string name="TAd_contextEditTask">Upravit úkol</string>
-  <string name="TAd_contextCopyTask">Kopírovat úkol</string>
-  <string name="TAd_contextUndeleteTask">Obnovit úkol</string>
-  <string name="TAd_contextPurgeTask">Smazat úkol</string>
-  <string name="SSD_title">Tříděné a skryté úkoly</string>
-  <string name="SSD_hidden_title">Skryté úkoly</string>
-  <string name="SSD_completed">Ukázat dokončené úkoly</string>
-  <string name="SSD_hidden">Ukázat skryté úkoly</string>
-  <string name="SSD_deleted">Ukázat smazané úkoly</string>
-  <string name="SSD_sort_auto">Astrid-chytré třídění</string>
-  <string name="SSD_sort_alpha">Podle názvu</string>
-  <string name="SSD_sort_due">Podle data ukončení</string>
-  <string name="SSD_sort_importance">Podle důležitosti</string>
-  <string name="SSD_sort_modified">Podle naposled upraveného</string>
-  <string name="SSD_sort_reverse">Obrácené třídění</string>
-  <string name="SSD_save_temp">Pouze jednou</string>
-  <string name="SSD_save_always">Vždy</string>
-  <string name="FSA_label">Seznam nebo filtr Astrid</string>
-  <string name="FLA_context_shortcut">Vytvořit zástupce na ploše</string>
-  <string name="FLA_shortcut_dialog_title">Vytvořit zástupce</string>
-  <string name="FLA_shortcut_dialog">Název zástupce:</string>
-  <string name="FLA_search_hint">Hledat úkoly</string>
-  <string name="FLA_search_filter">Souhlasející \'%s\'</string>
-  <string name="FLA_toast_onCreateShortcut">Vytvořen zástupce: %s</string>
-  <string name="FLA_new_filter">Nový Filtr</string>
-  <string name="FLA_new_list">Nový seznam</string>
-  <string name="FLA_no_filter_selected">Není vybrán žádný filtr! Vyberte prosím filtr nebo seznam.</string>
-  <string name="TEA_when_header_label">Kdy</string>
-  <string name="TEA_title_hint">Souhrn úkolu</string>
-  <string name="TEA_importance_label">Důležitost</string>
-  <string name="TEA_urgency_specific_time">V přesně daný čas?</string>
-  <string name="TEA_urgency_none">Žádný</string>
-  <string name="TEA_hideUntil_label">Zobrazit úkol</string>
-  <string name="TEA_hideUntil_message">Úkol bude skrytý až do %s</string>
-  <string-array name="TEA_loading">
-    <item>Nahrávám...</item>
-  </string-array>
-  <string name="TEA_note_label">Poznámky</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>
-  <string name="TEA_menu_discard">Neukládat</string>
-  <string name="TEA_menu_delete">Smazat úkol</string>
-  <string name="TEA_menu_comments">Komentáře</string>
-  <string name="TEA_onTaskSave_due">Úkol uložen: termín je %s</string>
-  <string name="TEA_onTaskSave_notDue">Úkol uložen</string>
-  <string name="TEA_tab_activity">Činnost</string>
-  <string name="TEA_tab_more">Více</string>
-  <string name="TEA_tab_web">Tipy</string>
-  <string-array name="TEA_urgency">
-    <item>Bez termínu</item>
-    <item>Určitý den</item>
-    <item>Dnes</item>
-    <item>Zítra</item>
-    <item>(den po)</item>
-    <item>Příští týden</item>
-    <item>Za dva týdny</item>
-    <item>Příští měsíc</item>
-  </string-array>
-  <string name="TEA_no_time">Bez času</string>
-  <string-array name="TEA_hideUntil">
-    <item>Vždy</item>
-    <item>Do termínu</item>
-    <item>Due time</item>
-    <item>Den před ukončením</item>
-    <item>Týden před ukončením</item>
-    <item>Určitý den/čas</item>
-  </string-array>
-  <string name="TEA_control_who">Kdo</string>
-  <string name="TEA_control_when">Kdy</string>
-  <string name="TEA_control_more_section">----More Section----</string>
-  <string name="TEA_control_importance">Důležitost</string>
-  <string name="TEA_control_lists">Seznamy</string>
-  <string name="TEA_control_notes">Poznámky</string>
-  <string name="TEA_control_files">Soubory</string>
-  <string name="TEA_control_reminders">Upomínky</string>
-  <string name="TEA_control_hidden_section">-----Vždy skrývat----</string>
-  <string name="hide_until_prompt">Zobrazit v mém seznamu</string>
-  <string name="TEA_no_activity">Není co zobrazit</string>
-  <string name="TEA_load_more">Více...</string>
-  <string name="TEA_when_dialog_title">Kdy je termín?</string>
-  <string name="TEA_new_task">Nový úkol</string>
-  <string name="WSV_click_to_load">Klepnutím vyhledáte jak na to!</string>
-  <string name="WSV_not_online">S připojením k internetu by to byla jiná káva. Zkontrolujte prosím spojení.</string>
-  <string name="TEA_contact_error">Mrzí mě to, ale nemohu najít email pro vybraný kontakt.</string>
-  <string name="MCA_title">V %2$s volal\n%1$s</string>
-  <string name="MCA_return_call">Hned zavolat</string>
-  <string name="MCA_add_task">Zavolat později</string>
-  <string name="MCA_ignore">Ignorovat</string>
-  <string name="MCA_ignore_title">Ignorovat všechny zmeškané hovory?</string>
-  <string name="MCA_ignore_body">Ignoroval jste několik zmeškaných hovorů. Má Astrid ignorovat všechny?</string>
-  <string name="MCA_ignore_all">Ignorovat vše</string>
-  <string name="MCA_ignore_this">Ignorovat pouze tento</string>
-  <string name="MCA_missed_calls_pref_desc_enabled">Astrid Vás upozorní na zmeškané hovory a připomene Vám, abyste zavolal zpět</string>
-  <string name="MCA_missed_calls_pref_desc_disabled">Astrid Vás nebude upozorňovat na zmeškané hovory</string>
-  <string name="MCA_task_title_name">Zavolat %1$s zpět v %2$s</string>
-  <string name="MCA_task_title_no_name">Zavolat %s zpět</string>
-  <string name="MCA_schedule_dialog_title">Zavolat %s zpět...</string>
-  <string-array name="MCA_dialog_speech_options">
-    <item>To musí být super, být tak oblíbený!</item>
-    <item>Lidí Vás mají rádi! Jů!</item>
-    <item>Potěšte je, ozvěte se!</item>
-    <item>Vás by nepotěšilo, kdyby Vám lidé zavolali zpátky?</item>
-    <item>To zvládnete!</item>
-    <item>SMS můžete poslat vždycky...</item>
-  </string-array>
-  <string name="UpS_changelog_title">Co je nového v Astrid?</string>
-  <string name="UpS_updates_title">Poslední \"Astrid\" novinky</string>
-  <string name="EPr_title">Astrid: Vlastnosti</string>
-  <string name="EPr_share_astrid">Řekněte o Astrid ostatním</string>
-  <string name="EPr_appearance_header">Vzhled</string>
-  <string name="EPr_faq_title">FAQ</string>
-  <string name="EPr_fontSize_title">Velikost seznamu úkolů</string>
-  <string name="EPr_showSmartConfirmation_title">Zobrazovat potvrzení chytrých upomínek</string>
-  <string name="EPr_fontSize_desc">Velikost písma na hlavní straně seznamu</string>
-  <string name="EPr_showNotes_title">Zobrazit poznámky v úkolu</string>
-  <string name="EPr_beastMode_reset">Obnovit výchozí hodnoty</string>
-  <string name="EPr_showNotes_desc_disabled">Poznámky budou zobrazeny v liště rychlého přístupu</string>
-  <string name="EPr_showNotes_desc_enabled">Poznámky budou vždy zobrazeny</string>
-  <string name="EPr_fullTask_title">Zobrazit úplný název úkolu</string>
-  <string name="EPr_fullTask_desc_enabled">Zobrazí se úplný název úkolu</string>
-  <string name="EPr_fullTask_desc_disabled">Zobrazí se první dva řádky názvu úkolu</string>
-  <string name="EPr_ideaAuto_title">Chování záložky Tipy</string>
-  <string name="EPr_ideaAuto_desc_enabled">Při klepnutí na záložky Tipy se spustí hledání na webu</string>
-  <string name="EPr_theme_title">Barevný motiv</string>
-  <string name="EPr_theme_desc">Aktuální: %s</string>
-  <string name="EPr_theme_desc_unsupported">Nastavení vyžaduje Android 2.0+</string>
-  <string name="EPr_taskRowPrefs_title">Vzhled řádku úkolu</string>
-  <string name="EPr_third_party_addons">Zapnout doplňky třetích stran</string>
-  <string name="EPr_third_party_addons_desc_enabled">Doplňky budou povolené</string>
-  <string name="EPr_third_party_addons_desc_disabled">Doplňky budou zakázané</string>
-  <string name="EPr_ideas_tab_description">Nápady, které Vám mohou pomoci dokončit úkoly</string>
-  <string name="EPr_cal_end_or_start_at_due_time">Čas události v kalendáři</string>
-  <string name="EPr_cal_end_at_due_time">Událost v kalendáři končí splněním úkolu</string>
-  <string name="EPr_cal_start_at_due_time">Událost v kalendáři začíná splněním úkolu</string>
-  <string-array name="EPr_swipe_lists_performance_mode">
-    <item>No swipe</item>
-    <item>Šetřit pamětí</item>
-    <item>Normální Výkon</item>
-    <item>Vysoký Výkon</item>
-  </string-array>
-  <string-array name="EPr_swipe_lists_performance_desc">
-    <item>Swipe between lists is disabled</item>
-    <item>Nižší výkon</item>
-    <item>Default setting</item>
-    <item>Více zatěžuje systém</item>
-  </string-array>
-  <string-array name="EPr_themes">
-    <item>Den - Modrá</item>
-    <item>Den - Červená</item>
-    <item>Sky blue</item>
-    <item>Noc</item>
-    <item>Průhledné (Bílý text)</item>
-    <item>Průhledné (Tmavý text)</item>
-  </string-array>
-  <string-array name="EPr_themes_widget">
-    <item>Same as app</item>
-    <item>Den - Modrá</item>
-    <item>Den - Červená</item>
-    <item>Sky blue</item>
-    <item>Noc</item>
-    <item>Transparent (White Text)</item>
-    <item>Transparent (Black Text)</item>
-    <item>Starý styl</item>
-  </string-array>
-  <string name="EPr_manage_header">Spravovat staré úkoly</string>
-  <string name="EPr_manage_delete_completed">Odstranit dokončené úkoly</string>
-  <string name="EPr_manage_delete_completed_message">Opravdu chcete odstranit všechny dokončené úkoly?</string>
-  <string name="EPr_manage_delete_completed_summary">Odstraněné úkoly mohou být jeden po jednom obnoveny</string>
-  <string name="EPr_manage_delete_completed_status">Odstraněno %d úkolů!</string>
-  <string name="EPr_manage_purge_deleted">Vymazat smazané úkoly</string>
-  <string name="EPr_manage_purge_deleted_message">Opravdu chcete vymazat vaše smazané úkoly?\n\nTyto úkoly budou vymazány navždy!</string>
-  <string name="EPr_manage_purge_deleted_status">Vymyzáno %d úkolů!</string>
-  <string name="EPr_manage_purge_deleted_summary">Pozor! Vymazané úkoly nemohou být obnoveny bez souboru zálohy!</string>
-  <string name="EPr_manage_clear_all">Smazat vše</string>
-  <string name="EPr_manage_clear_all_message">Smazat všechny úkoly a nastavení Astrid?\n\nPozor: nelze vzít zpět!</string>
-  <string name="EPr_manage_delete_completed_gcal">Smazat události v kalendáři pro hotové úkoly</string>
-  <string name="EPr_manage_delete_completed_gcal_message">Opravdu chcete smazat všechny události pro dokončené úkoly?</string>
-  <string name="EPr_manage_delete_completed_gcal_status">Smazáno %d událostí z kalendáře!</string>
-  <string name="AOA_title">Doplňky</string>
-  <string name="AOA_internal_author">Astrid tým</string>
-  <string name="AOA_tab_installed">Nainstalováno</string>
-  <string name="AOA_tab_available">K dispozici</string>
-  <string name="AOA_free">Zdarma</string>
-  <string name="AOA_no_addons">Prázdný seznam!</string>
-  <string name="TWi_loading">Nahrávám...</string>
-  <string name="WCA_title">Označte úkol pro zobrazení...</string>
-  <string name="p_about">O Astrid</string>
-  <string name="p_about_text">Současná verze: %s\n\n Astrid je open-source a je vytvořena Todoroo, Inc.</string>
-  <string name="p_help">Podpora</string>
-  <string name="p_forums">Diskuzní fóra</string>
-  <string name="task_killer_help">Vypadá to, že používate aplikaci, která ukončuje programy(%s)! Pokud můžete, přidejte Astrid do vyjímek, aby nebyla ukončována. Jinak se může stát, že vás nebude upozorňovat na úkoly.\n</string>
-  <string name="task_killer_help_ok">Neukončím Astrid!</string>
-  <string name="marketplace_description">Astrid je vysoce oceňovaný open source úkolovník, jednoduše ovladatelný a přesto velice výkonný, vytvořen k tomu,aby Vám pomohl mít vše hotovo. Značky, připomenutí, synchronizace, lokalizace, widget a další.</string>
-  <string name="DB_corrupted_title">Poškozená databáze</string>
-  <string name="EPr_defaults_header">Výchozí nastavení nového úkolu</string>
-  <string name="EPr_default_urgency_desc">Aktuální: %s</string>
-  <string name="EPr_default_importance_title">Výchozí důležitost</string>
-  <string name="EPr_default_importance_desc">Aktuální: %s</string>
-  <string name="EPr_default_hideUntil_title">Výchozí Skrýt do</string>
-  <string name="EPr_default_hideUntil_desc">Aktuální: %s</string>
-  <string name="EPr_default_reminders_title">Výchozí připomenutí</string>
-  <string name="EPr_default_reminders_desc">Aktuální: %s</string>
-  <string name="EPr_default_addtocalendar_desc_disabled">Nový úkol nevytvoří událost v Kalendáři Google</string>
-  <string name="EPr_default_addtocalendar_desc">Nové úkoly se vloží do kalendáře: \"%s\"</string>
-  <string name="EPr_default_reminders_mode_desc">Aktuální: %s</string>
-  <string-array name="EPr_default_importance">
-    <item>!!! (Nejvyšší)</item>
-    <item>!!</item>
-    <item>!</item>
-    <item>o (Nejnižší)</item>
-  </string-array>
-  <string-array name="EPr_default_urgency">
-    <item>Žádný termín</item>
-    <item>Dnes</item>
-    <item>Zítra</item>
-    <item>Pozítří</item>
-    <item>Příští týden</item>
-  </string-array>
-  <string-array name="EPr_default_hideUntil">
-    <item>Neskrývat</item>
-    <item>Nastal termín úkolu</item>
-    <item>Den před ukončením</item>
-    <item>Týden před ukončením</item>
-  </string-array>
-  <string-array name="EPr_default_reminders">
-    <item>Žádné upomínky v termínu</item>
-    <item>V termínu</item>
-    <item>Po termínu</item>
-    <item>V termínu nebo po něm</item>
-  </string-array>
-  <string name="BFE_Active">Aktivní úkoly</string>
-  <string name="BFE_Recent">Nedávno upravené</string>
-  <string name="BFE_Assigned">Přidělil jsem</string>
-  <string name="BFE_Saved_delete">Smazat filtr</string>
-  <string name="CFA_title">Vlastní filtr</string>
-  <string name="CFA_filterName_hint">Pojmenujte tento filtr pro jeho uložení</string>
-  <string name="CFA_universe_all">Aktivní úkoly</string>
-  <string name="CFA_type_add">nebo</string>
-  <string name="CFA_type_subtract">ne</string>
-  <string name="CFA_type_intersect">také</string>
-  <string name="CFA_context_chain">%s má kritéria</string>
-  <string name="CFA_context_delete">Odstranit řádek</string>
-  <string name="CFA_help">Zde můžete vytvořit vlastní filtry. Tlačítkem níže přidejte kritéria. Krátkým, nebo dlouhým stiskem je upravíte. Poté zvolte \"Zobrazit\"!</string>
-  <string name="CFA_button_add">Přidat podmínku</string>
-  <string name="CFA_button_view">Zobrazit</string>
-  <string name="CFA_button_save">Uložit &amp; Zobrazit</string>
-  <string name="CFC_dueBefore_text">Podle termínu: ?</string>
-  <string name="CFC_dueBefore_name">Podle termínu...</string>
-  <string-array name="CFC_dueBefore_entries">
-    <item>Žádný termín</item>
-    <item>Včera</item>
-    <item>Dnes</item>
-    <item>Zítra</item>
-    <item>Pozítří</item>
-    <item>Příští týden</item>
-    <item>Příští měsíc</item>
-  </string-array>
-  <string name="CFC_importance_text">Alespoň důležitost?</string>
-  <string name="CFC_importance_name">Důležitost...</string>
-  <string name="CFC_tag_text">Seznam: ?</string>
-  <string name="CFC_tag_name">Seznam...</string>
-  <string name="CFC_tag_contains_name">Jméno seznamu obsahuje...</string>
-  <string name="CFC_tag_contains_text">Jméno seznamu obsahuje: ?</string>
-  <string name="CFC_title_contains_name">Název obsahuje...</string>
-  <string name="CFC_title_contains_text">Obsahuje název: ?</string>
-  <string name="gcal_TEA_error">Chyba při přidávání úkolu do kalendáře!</string>
-  <string name="gcal_TEA_addToCalendar_label">Vytvořit událost kalendáře</string>
-  <string name="gcal_TEA_showCalendar_label">Otevřít událost v kalendáři</string>
-  <string name="gcal_TEA_calendar_updated">Událost kalendáře také aktualizována!</string>
-  <string name="gcal_TEA_nocal">Nepřidávat</string>
-  <string name="gcal_TEA_none_selected">Přidat do kal.</string>
-  <string name="gcal_TEA_has_event">Událost v kal.</string>
-  <string name="gcal_completed_title">%s (dokončeno)</string>
-  <string name="gcal_GCP_default">Výchozí kalendář</string>
-  <string name="gtasks_FEx_header">Google úkoly</string>
-  <string name="gtasks_FEx_title">Google úkoly: %s</string>
-  <string name="gtasks_FEx_creating_list">Vytvářím seznam...</string>
-  <string name="gtasks_FEx_create_list_dialog">Nové jméno seznamu:</string>
-  <string name="gtasks_FEx_create_list_error">Chyba při vytváření nového seznamu</string>
-  <string name="CFC_gtasks_list_text">V seznamu: ?</string>
-  <string name="CFC_gtasks_list_name">V seznamu Google úkolů</string>
-  <string name="gtasks_GTA_clearing">Mažu hotové úkoly...</string>
-  <string name="gtasks_GTA_clear_completed">Smazat hotové</string>
-  <string name="gtasks_GLA_noaccounts">Žádný dostupný účet Google pro synchronizaci</string>
-  <string name="gtasks_GLA_authenticating">Ověřuje se...</string>
-  <string name="gtasks_GLA_errorAuth">Chyba při autentifikaci! Zkontrolujte prosím uživatelské jméno/heslo ve správci hesel svého mobilu</string>
-  <string name="gtasks_GLA_errorIOAuth">Nastali problémy při komunikaci se servery Google. Zkuste to prosím později.</string>
-  <string name="gtasks_GLA_errorAuth_captcha">Pravděpodobně jste narazili na stránky chráněné Captchou. Zkuste se přihlásit pomocí prohlížeče a poté se vraťte sem a zkuste to znovu:</string>
-  <string name="gtasks_GPr_header">Google Úkoly (Beta!)</string>
-  <string name="gtasks_error_backend">V API služby Google Task (které je ve stadiu beta) byla v něm zjištěna chyba. Služba může být nedostupná, zkuste to později znovu.</string>
-  <string name="gtasks_error_accountNotFound">Účet %s nebyl nalezen -- přes nastavení Google Tasks se odhlašte a znovu přihlaste.</string>
-  <string name="gtasks_error_authRefresh">Nelze se přihlásit ke Google Tasks. Zkontrolujte prosím heslo ke svému účtu, nebo se zkuste znovu přihlásit.</string>
-  <string name="welcome_login_tos_base">Používáním Astrid souhlasíte s</string>
-  <string name="welcome_login_confirm_later_title">Nechcete se přihlásit?</string>
-  <string name="welcome_login_confirm_later_ok">Jasně!</string>
-  <string name="welcome_login_confirm_later_cancel">Ne, díky</string>
-  <string name="welcome_login_confirm_later_dialog">Přihlašte se a získejte z Astrid více! Zdarma získáte online zálohování, plnou synchronizaci s Astrid.com, možnost přidávat úkoly emailem a dokonce můžete sdílet seznamy úkolů s přáteli!</string>
-  <string name="locale_edit_alerts_title">Astrid Upozornění filtrů</string>
-  <string name="locale_edit_intro">Astrid Ti pošle upozornění, když budeš mít úkoly v následujícím filtru:</string>
-  <string name="locale_interval_label">Omezit upozornění na:</string>
-  <string-array name="locale_interval">
-    <item>jednou za hodinu</item>
-    <item>jednou za šest hodin</item>
-    <item>jednou za dvanáct hodin</item>
-    <item>jednou denně</item>
-    <item>jednou za tři dny</item>
-    <item>jednou týdně</item>
-  </string-array>
-  <string name="locale_notification">Máš $NUM se značkou $FILTER</string>
-  <string name="locale_plugin_required">Prosím nainstalujte zásuvný modul Astrid Locale!</string>
-  <string name="opencrx_FEx_header">OpenCRX</string>
-  <string name="opencrx_FEx_dashboard">Pracovní plochy</string>
-  <string name="opencrx_FEx_responsible">Přiřazeno k</string>
-  <string name="opencrx_FEx_responsible_title">Přiřazeno k \'%s\'</string>
-  <string name="opencrx_PDE_task_from">od %s</string>
-  <string name="opencrx_TEA_notes">Přidat komentář</string>
-  <string name="opencrx_creator_input_hint">Autor</string>
-  <string name="opencrx_PPr_header">OpenCRX</string>
-  <string name="opencrx_no_creator">(Nesynchronizovat)</string>
-  <string name="opencrx_group">OpenCRX server</string>
-  <string name="opencrx_host_summary">"Např.: "<i>domena.cz</i></string>
-  <string name="opencrx_segment_title">Segment</string>
-  <string name="opencrx_segment_summary">"Např.: "<i>Standard</i></string>
-  <string name="opencrx_provider_title">Poskytovatel</string>
-  <string name="opencrx_provider_summary">"Např.: "<i>CRX</i></string>
-  <string name="opencrx_provider_default">CRX</string>
-  <string name="opencrx_PLA_signIn">Přihlásit se</string>
-  <string name="opencrx_PLA_password">Heslo</string>
-  <string name="opencrx_notification_title">OpenCRX</string>
-  <string name="opencrx_notification_text">%s úkolů zálohováno /pro více detailů klikněte</string>
-  <string name="opencrx_ioerror">Chyba připojení! Zkontrolujte vaše internetové připojení.</string>
-  <string name="opencrx_MLA_password_empty">Nebylo určeno heslo!</string>
-  <string name="opencrx_TEA_task_assign_label">Přiřadit úkol k této osobě:</string>
-  <string name="opencrx_TEA_task_unassigned">&lt;Nepřiřazeno&gt;</string>
-  <string name="opencrx_TEA_dashboard_default">&lt;Výchozí&gt;</string>
-  <string name="CFC_opencrx_in_workspace_text">Na pracovní ploše: ?</string>
-  <string name="CFC_opencrx_in_workspace_name">Na pracovní ploše...</string>
-  <string name="CFC_opencrx_assigned_to_text">Přiřazeno k: ?</string>
-  <string name="CFC_opencrx_assigned_to_name">Přiřazeno k ...</string>
-  <string name="EPr_statistics_desc_disabled">Nebudou oznámena žádná data o využití</string>
-  <string name="EPr_statistics_desc_enabled">Pomozte nám dělat Astrid lepší, anonymním odesláním dat o používání</string>
-  <string name="speech_err_network">Chyba sítě! Rozpoznávání řeči vyžaduje funkční síťové připojení.</string>
-  <string name="speech_err_no_match">Je mi líto, ale nerozuměla jsem! Zkuste to znovu.</string>
-  <string name="speech_err_default">Rozpoznávání řeči narazilo na problém. Zkuste to prosím znovu.</string>
-  <string name="premium_attach_file">Přiložit soubor</string>
-  <string name="premium_record_audio">Nahrát poznámku</string>
-  <string name="premium_no_files">Žádné přílohy</string>
-  <string name="premium_remove_file_confirm">Skutečně? Nebude cesty zpět</string>
-  <string name="audio_recording_title">Nahrávám zvuk</string>
-  <string name="audio_stop_recording">Ukončit záznam</string>
-  <string name="audio_speak_now">Hovořte!</string>
-  <string name="search_market_pdf_title">Chybí prohlížeč PDF</string>
-  <string name="search_market_ms">Chybí prohlížeč MS Office. Přejete si ho stáhnout z Android Marketu?</string>
-  <string name="search_market_ms_title">Chybí prohlížeč MS Office</string>
-  <string name="file_type_unhandled">Pro tento typ souborů nebyla nalezena žádná aplikace.</string>
-  <string name="file_type_unhandled_title">Chybí aplikace</string>
-  <string name="file_prefix_voice">Hlas</string>
-  <string name="file_browser_up">O úroveň výš</string>
-  <string name="file_browser_err_permissions">Chyba oprávnění! Ujistěte se prosím, že jste Astrid nezabránil v přístupu k SD kartě.</string>
-  <string name="file_add_picture">Připojit obrázek</string>
-  <string name="file_add_sdcard">Připojit soubor z SD karty</string>
-  <string name="file_download_title">Stáhnout soubor?</string>
-  <string name="file_download_body">Soubor nebyl stažen na SD kartu. Stáhnout nyní?</string>
-  <string name="file_download_progress">Stahuji...</string>
-  <string name="file_err_memory">Obrázek se nevejde do paměti</string>
-  <string name="file_err_copy">Chyba při kopírování souboru jako přílohy</string>
-  <string name="file_err_download">Chyba při stahování souboru</string>
-  <string name="file_err_show">Je nám líto, ale systém zatím tento typ souboru nepodporuje</string>
-  <string name="TEA_reminders_group_label">Upomínky</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 name="TEA_reminder_alarm_label">Typ vyzvánění/vybrací:</string>
-  <string name="TEA_reminder_mode_once">Vyzvánět jednou</string>
-  <string name="TEA_reminder_mode_five">Pět zazvonění</string>
-  <string name="TEA_reminder_mode_nonstop">Vyzvánět dokud nezruším Alarm</string>
-  <string-array name="TEA_reminder_random">
-    <item>an hour</item>
-    <item>a day</item>
-    <item>a week</item>
-    <item>in two weeks</item>
-    <item>a month</item>
-    <item>in two months</item>
-  </string-array>
-  <string name="rmd_NoA_filter">Připomínka!</string>
-  <string name="rmd_NoA_done">Dokončeno!</string>
-  <string name="rmd_NoA_snooze">Později...</string>
-  <string name="rmd_NoA_completed_toast">Hotovo! Gratuluji!</string>
-  <string-array name="rmd_reengage_notif_titles">
-    <item>A note from Astrid</item>
-    <item>Memo for %s.</item>
-    <item>Your Astrid digest</item>
-    <item>Reminders from Astrid</item>
-  </string-array>
-  <string-array name="rmd_reengage_dialog_options">
-    <item>Time to shorten your to-do list!</item>
-    <item>Dear sir or madam, some tasks await your inspection!</item>
-    <item>Hi there, could you take a look at these?</item>
-    <item>I\'ve got some tasks with your name on them!</item>
-    <item>A fresh batch of tasks for you today!</item>
-    <item>You look fabulous! Ready to get started?</item>
-    <item>A lovely day for getting some work done, I think!</item>
-  </string-array>
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>Don\'t you want to get organized?</item>
-    <item>I\'m Astrid! I\'m here to help you do more!</item>
-    <item>You look busy! Let me take some of those tasks off of your plate.</item>
-    <item>I can help you keep track of all of the details in your life.</item>
-    <item>You\'re serious about getting more done? So am I!</item>
-    <item>Pleasure to make your acquaintance!</item>
-  </string-array>
-  <string name="rmd_EPr_alerts_header">Nastavení upozornění</string>
-  <string name="rmd_EPr_quiet_hours_start_title">Nerušit od</string>
-  <string name="rmd_EPr_quiet_hours_desc_none">Tichý režim zakázán</string>
-  <string name="rmd_EPr_quiet_hours_end_title">Nerušit do</string>
-  <string name="rmd_EPr_ringtone_title">Zvuk upozornění</string>
-  <string name="rmd_EPr_ringtone_desc_custom">Vlastní vyzvánění bylo nastaveno</string>
-  <string name="rmd_EPr_ringtone_desc_silent">Vyzvánění ztišeno</string>
-  <string name="rmd_EPr_ringtone_desc_default">Bude použito výchozí vyzvánění</string>
-  <string name="rmd_EPr_persistent_title">Trvání upozornění</string>
-  <string name="rmd_EPr_persistent_desc_true">Pro smazání musí být upozornění zobrazeno každé zvlášť</string>
-  <string name="rmd_EPr_persistent_desc_false">Upozornění mohou být smazána s tlačítkem \"Smazat vše\"</string>
-  <string name="rmd_EPr_vibrate_title">Vibruj při upozornění</string>
-  <string name="rmd_EPr_vibrate_desc_true">Astrid bude vibrovat při odesílání upozornění</string>
-  <string name="rmd_EPr_vibrate_desc_false">Astrid nebude vibrovat při odesílání upozornění</string>
-  <string name="rmd_EPr_nagging_desc_true">Astrid bude vypisovat povzbuzující zprávy během upozornění</string>
-  <string name="rmd_EPr_defaultRemind_title">Náhodná upozornění</string>
-  <string name="rmd_EPr_defaultRemind_desc_disabled">Nové úkoly nebudou mít náhodné upozornění</string>
-  <string name="rmd_EPr_defaultRemind_desc">Na nové úkoly bude upozorňováno náhodně: %s</string>
-  <string-array name="EPr_reminder_random">
-    <item>zakázáno</item>
-    <item>každou hodinu</item>
-    <item>denně</item>
-    <item>týdně</item>
-    <item>každých ctrnáct dní</item>
-    <item>měsíčně</item>
-    <item>každý druhý měsíc</item>
-  </string-array>
-  <string-array name="EPr_quiet_hours_start">
-    <item>zakázáno</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>0:00</item>
-    <item>1:00</item>
-    <item>2:00</item>
-    <item>3:00</item>
-    <item>4:00</item>
-    <item>5:00</item>
-    <item>6:00</item>
-    <item>7:00</item>
-    <item>8:00</item>
-    <item>9:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-  </string-array>
-  <string-array name="EPr_quiet_hours_end">
-    <item>9:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>0:00</item>
-    <item>1:00</item>
-    <item>2:00</item>
-    <item>3:00</item>
-    <item>4:00</item>
-    <item>5:00</item>
-    <item>6:00</item>
-    <item>7:00</item>
-    <item>8:00</item>
-  </string-array>
-  <string-array name="EPr_rmd_time">
-    <item>9:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>0:00</item>
-    <item>1:00</item>
-    <item>2:00</item>
-    <item>3:00</item>
-    <item>4:00</item>
-    <item>5:00</item>
-    <item>6:00</item>
-    <item>7:00</item>
-    <item>8:00</item>
-  </string-array>
-  <string-array name="reminders">
-    <item>Ahoj! Máš chvíli?</item>
-    <item>Můžu Tě na chvíli vidět?</item>
-    <item>Máš pár minut?</item>
-    <item>Zapomněl jsi?</item>
-    <item>Omlouvám se!</item>
-    <item>Když máš čas:</item>
-    <item>Ve Tvém programu:</item>
-    <item>Máš chvíli čas?</item>
-    <item>Tady je Astrid!</item>
-    <item>Ahoj! Můžu Tě vyrušit?</item>
-    <item>Minuta Tvého času?</item>
-    <item>Je skvělý den na</item>
-  </string-array>
-  <string-array name="reminders_due">
-    <item>Čas na práci!</item>
-    <item>Čas dokončení úkolu je zde!</item>
-    <item>Připraven/a začít?</item>
-    <item>Řekl jsi, že uděláš:</item>
-    <item>Chtěl jsi začít:</item>
-    <item>Čas začít:</item>
-    <item>Je čas!</item>
-    <item>Omlouvám se! Čas na</item>
-    <item>Jsi volný? Čas na</item>
-  </string-array>
-  <string-array name="reminders_snooze">
-    <item>Nebuď ted líná/ý</item>
-    <item>Čas spaní vypršel!</item>
-    <item>Už zádné spaní!</item>
-    <item>Jsi teď připraven(a)?</item>
-    <item>Už žádné odkládání!</item>
-  </string-array>
-  <string-array name="reminder_responses">
-    <item>Mám pro Tebe něco!</item>
-    <item>Ready to put this in the past?</item>
-    <item>Proč tohle nedokončís?</item>
-    <item>Tak co borče? Jdeme do toho?</item>
-    <item>Jsi připraven(a) tohle udělat?</item>
-    <item>Můžes tohle zvládnout?</item>
-    <item>Můžeš výt šťastná/ý! Jen tohle dokonči!</item>
-    <item>Slibuji Ti, že se budeš cítit lépe, když tohle dokončíš!</item>
-    <item>Neuděláš tohle dnes?</item>
-    <item>Tak to konečně dodělej. Už mě to unavuje!</item>
-    <item>Můžes tohle dokončit?</item>
-    <item>Plánuješ tohle vůbec někdy udělat?</item>
-    <item>Měj ze sebe radost! Jdeme na to!</item>
-    <item>Jsem na Tebe pyšný! Pojď to dokončit!</item>
-    <item>A little snack after you finish this?</item>
-    <item>Jen tenhle úkol? Prosím?</item>
-    <item>Je čas zkrátit Tvůj seznam úkolů!</item>
-    <item>Are you on Team Order or Team Chaos? Team Order! Let\'s go!</item>
-    <item>Have I mentioned you are awesome recently? Keep it up!</item>
-    <item>A task a day keeps the clutter away... Goodbye clutter!</item>
-    <item>How do you do it? Wow, I\'m impressed!</item>
-    <item>You can\'t just get by on your good looks. Let\'s get to it!</item>
-    <item>Lovely weather for a job like this, isn\'t it?</item>
-    <item>A spot of tea while you work on this?</item>
-    <item>If only you had already done this, then you could go outside and play.</item>
-    <item>It\'s time. You can\'t put off the inevitable.</item>
-    <item>I die a little every time you ignore me.</item>
-  </string-array>
-  <string-array name="postpone_nags">
-    <item>Prosím řekni mi, že není pravda, že jsi prokrastinátor!</item>
-    <item>Doesn\'t being lazy get old sometimes?</item>
-    <item>Někdo někde čeká až tohle dokončíš!</item>
-    <item>Když jsi řekl odložit, ve skutečnosti jsi myslel \'Já to udělám\', že?</item>
-    <item>Tohle je naposledy co to odkládáš, že?</item>
-    <item>Jen to dodělej, nikomu to neřeknu!</item>
-    <item>Proč odkládat, když můžes hmm... neodkládat!</item>
-    <item>Nakonec to doděláš, že?</item>
-    <item>Myslím, že jsi opravdu úžasný. Co takhle tohle neodkládat?</item>
-    <item>Will you be able to achieve your goals if you do that?</item>
-    <item>Odkládat, odkládat, odkládat. Kdy se změníš!</item>
-    <item>Mám dost tvých omluv! Jen to dodělej!</item>
-    <item>Nepoužil jsi stejnou omluvu i posledně?</item>
-    <item>Nemůžu Ti pomoci organizovat tvůj život, když tohle děláš...</item>
-  </string-array>
-  <string name="repeat_plugin">Opakování úkolů</string>
-  <string name="repeat_plugin_desc">Povolit opakování úkolů</string>
-  <string name="repeat_enabled">Opakování</string>
-  <string name="repeat_every">Každý %d</string>
-  <string name="repeat_interval_prompt">Opakovací interval</string>
-  <string-array name="repeat_interval_short">
-    <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">
-    <item>Dnů</item>
-    <item>Týdnů</item>
-    <item>Měsíců</item>
-    <item>Hodin</item>
-    <item>Minute(s)</item>
-    <item>Year(s)</item>
-  </string-array>
-  <string-array name="repeat_until_shortcuts">
-    <item>Forever</item>
-    <item>Specific Day</item>
-    <item>Today</item>
-    <item>Tomorrow</item>
-    <item>(day after)</item>
-    <item>Next Week</item>
-    <item>In Two Weeks</item>
-    <item>Next Month</item>
-  </string-array>
-  <string-array name="repeat_type">
-    <item>od data splnění</item>
-    <item>od data dokončení</item>
-  </string-array>
-  <string name="repeat_detail_byday">$I na $D</string>
-  <string name="repeat_detail_duedate">Každý %s</string>
-  <string name="repeat_detail_completion">%s po dokončení</string>
-  <string-array name="repeat_encouragement">
-    <item>Good job!</item>
-    <item>Wow… I\'m so proud of you!</item>
-    <item>I love when you\'re productive!</item>
-    <item>Doesn\'t it feel good to check something off?</item>
-  </string-array>
-  <string-array name="repeat_encouragement_last_time">
-    <item>Good job!</item>
-    <item>I\'m so proud of you!</item>
-    <item>I love when you\'re productive!</item>
-  </string-array>
-  <string name="TEA_tags_label">Seznamy</string>
-  <string name="tag_FEx_header">Seznamy</string>
-  <string name="TEA_no_tags_modified">Nebyly provedeny žádné změny.</string>
-  <string name="tag_settings_title">Settings:</string>
-  <string name="TPl_notification">Aktivní časovače pro %s!</string>
-  <string name="TFE_workingOn">Úkol je časován</string>
-  <string name="voice_create_prompt">Mluvte pro vytvoření úkolu</string>
-  <string name="welcome_title_1">Vítej v Astrid!</string>
-  <string name="welcome_body_5">and much more!</string>
-  <string name="PPW_configure_title">Konfigurovat widget</string>
-  <string name="PPW_color">Barva widgetu</string>
-  <string name="PPW_enable_calendar">Zobrazit události v kalendáři</string>
-  <string name="PPW_disable_encouragements">Skrýt povzbuzování</string>
-  <string name="PPW_filter">Vybrat filtr</string>
-  <string name="PPW_due">Termín:</string>
-  <string name="PPW_old_astrid_notice">K používání tohoto widgetu potřebujete Astrid ve verzi 3.6 a vyšší!</string>
-  <string-array name="PPW_encouragements">
-    <item>Nazdar!</item>
-    <item>Máš čas něco dokončit?</item>
-    <item>Gosh, you are looking suave today!</item>
-    <item>Udělej dnes něco velkého</item>
-    <item>Ať jsem na Tebe dneska hrdý!</item>
-    <item>Jak se dneska máš?</item>
-  </string-array>
-  <string-array name="PPW_encouragements_tod">
-    <item>Dobré ráno!</item>
-    <item>Krásné odpoledne!</item>
-    <item>Dobrý večer!</item>
-    <item>Pozdě v noci?</item>
-    <item>Ještě je brzo, tak něco rychle udělej!</item>
-    <item>Že by čas na polední čaj?</item>
-    <item>Užij si večer!</item>
-    <item>Spánek je pro Tobe dobrý, víš to?</item>
-  </string-array>
-  <string-array name="PPW_encouragements_completed">
-    <item>Už jsi dokončil %d úkolů!</item>
-    <item>Životní skóre: %d úkolů dokončeno!</item>
-    <item>Usměj se! Už jsi dokončil %d úkolů!</item>
-  </string-array>
-  <string name="PPW_encouragements_none_completed">Ještě jsi nedokončil žádný úkol! Začneme?</string>
-  <string-array name="PPW_colors">
-    <item>Černá</item>
-    <item>Bílá</item>
-    <item>Modrá</item>
-    <item>Průhledný</item>
-  </string-array>
+    <string name="actfm_person_hint">Kontakt nebo email</string>
+    <string name="actfm_person_or_tag_hint">Kontakt nebo Sdílený list</string>
+    <string name="actfm_tag_operation_owner_delete">Jste vlastníkem tohoto sdíleného seznamu! Pokud
+        ho smažete, smaže se i u všech členů seznamu. Chcete skutečně pokračovat?
+    </string>
+    <string name="actfm_picture_camera">Vyfoť obrázek</string>
+    <string name="actfm_picture_gallery">Vybrat obrázek z galerie</string>
+    <string name="actfm_picture_clear">Odebrat obrázek</string>
+    <string name="actfm_view_task_title">Zobrazit úkol?</string>
+    <string name="actfm_view_task_text">%s se stal novým vlastníkem úkolu! Teď si prohlížíte vlastní
+        úkoly. Chcete vidět úkoly, které jste delegoval(a)?
+    </string>
+    <string name="actfm_view_task_ok">Delegované</string>
+    <string name="actfm_view_task_cancel">Vlastní</string>
+    <string name="actfm_my_shared_tasks_title">Moje sdílené úkoly</string>
+    <string name="actfm_my_shared_tasks_empty">Žádné sdílené úkoly</string>
+    <string name="actfm_friendship_accept">Potvrdit</string>
+    <string name="TVA_add_comment">Přidej comment...</string>
+    <string-array name="TVA_tabs">
+        <item>Úkoly</item>
+        <item>Činnost</item>
+        <item>Nastavení listu</item>
+    </string-array>
+    <string name="actfm_TVA_menu_refresh">Obnovit</string>
+    <string name="actfm_TVA_tag_label">Název listu:</string>
+    <string name="actfm_TVA_members_label">Spolupracovníci:</string>
+    <string name="actfm_TVA_members_hint">Sdílet s kýmkoli, kdo má email</string>
+    <string name="actfm_TVA_tag_picture">Obrázek listu</string>
+    <string name="actfm_TVA_silence_label">Tichá upozornění</string>
+    <string name="actfm_TVA_tag_description_label">Popis</string>
+    <string name="actfm_TVA_tag_settings_label">Nastavení</string>
+    <string name="actfm_TVA_tag_description_hint">Zde zadejte popis</string>
+    <string name="actfm_TVA_tag_name_hint">Název seznamu</string>
+    <string name="actfm_TVA_login_to_share">Pro sdílení seznamů musíte být přihlášen k Astrid.com!
+        Přihlašte se prosím, nebo tento seznam označte jako soukromý.
+    </string>
+    <string name="actfm_EPA_intro">S pomocí Astrid sdílejte nákupní seznamy, nápady na party nebo
+        týmové projekty a buďte okamžitě v obraze když druzí něco dokončí!
+    </string>
+    <string name="actfm_EPA_assign_label_long">Kdo to má udělat?</string>
+    <string name="actfm_EPA_assign_me">Já</string>
+    <string name="actfm_EPA_unassigned">Nepřiřazené</string>
+    <string name="actfm_EPA_choose_contact">Vyberte kontakt</string>
+    <string name="actfm_EPA_share_with">Přidat spolupracovníky:</string>
+    <string name="actfm_EPA_collaborators_header">Sdílet s přáteli</string>
+    <string name="actfm_EPA_list">Seznam: %s</string>
+    <string name="actfm_EPA_message_text">Uvítací zpráva:</string>
+    <string name="actfm_EPA_message_body">Pomoz mi to dodělat!</string>
+    <string name="actfm_EPA_assign_header_members">Členové seznamu</string>
+    <string name="actfm_EPA_assign_header_friends">Přátelé z Astrid</string>
+    <string name="actfm_EPA_facebook">Facebook</string>
+    <string name="actfm_EPA_twitter">Twitter</string>
+    <string name="actfm_EPA_invalid_email">Špatný E-mail: %s</string>
+    <string name="actfm_EPA_login_to_share">Pro sdílení úkolů musíte být přihlášen na Astrid.com!
+    </string>
+    <string name="actfm_EPA_login_button">Přihlásit se</string>
+    <string name="actfm_EPA_dont_share_button">Nesdílet</string>
+    <string name="actfm_ALA_title">Vítejte v Astrid.com!</string>
+    <string name="actfm_ALA_body">Díky Astrid.com můžete k úkolům přistupovat online nebo je můžete
+        sdílet s ostatníma.
+    </string>
+    <string name="actfm_ALA_fb_login">Přihlásit Facebookem</string>
+    <string name="actfm_ALA_gg_login">Přihlásit Google účtem</string>
+    <string name="actfm_ALA_firstname_label">Křestní jméno</string>
+    <string name="actfm_ALA_lastname_label">Příjmení</string>
+    <string name="actfm_ALA_email_label">Email</string>
+    <string name="actfm_ALA_password_label">Heslo</string>
+    <string name="actfm_GAA_title">Vyberte, který účet Google chcete použít:</string>
+    <string name="actfm_OLA_prompt">Prosím připojte se do Googlu:</string>
+    <string name="actfm_feat_list_clone_success">Povedlo se!</string>
+    <string name="actfm_feat_list_task_clone_success">Úkol zkopírován</string>
+    <string name="actfm_status_title_logged_in">Stav - přihlášen jako %s</string>
+    <string name="actfm_APr_header">Astrid.com</string>
+    <string name="actfm_https_title">Použít HTTPS</string>
+    <string name="actfm_https_enabled">HTTPS povoleno (pomalejší)</string>
+    <string name="actfm_https_disabled">HTTPS zakázáno (rychlejší)</string>
+    <string name="actfm_dual_sync_warning">Synchronizujete úkoly s Google Tasks. Berte na vědomí, že
+        synchronizace s oběma službami může v některých případech vést k nečekaným důsledkům.
+        Opravdu si přejete synchronizovat s Astrid.com?
+    </string>
+    <string name="actfm_account_basic">Zakladní</string>
+    <string name="share_with_google">Sdílet na Google+</string>
+    <string name="alarm_ACS_label">Alarmy</string>
+    <string name="alarm_ACS_button">Přidat alarm</string>
+    <string-array name="reminders_alarm">
+        <item>Budík!</item>
+    </string-array>
+    <string name="backup_BPr_header">Zálohy</string>
+    <string name="backup_BPr_group_status">Stav</string>
+    <string name="backup_status_success">Předchozí:\n%s</string>
+    <string name="backup_status_failed">Předchozí zálohování selhalo</string>
+    <string name="backup_status_failed_subtitle">klikněte pro zobrazení chyby</string>
+    <string name="backup_status_never">Nikdy nezálohováno!</string>
+    <string name="backup_BPr_group_options">Možnosti</string>
+    <string name="backup_BPr_auto_title">Automatické zálohování</string>
+    <string name="backup_BPr_auto_disabled">Automatické zálohování je zakázáno</string>
+    <string name="backup_BPr_auto_enabled">Zálohování se bude provádět denně</string>
+    <string name="backup_BAc_label">Spravovat zálohy</string>
+    <string name="backup_BAc_title">Spravovat tvé zálohy</string>
+    <string name="backup_BAc_import">Importovat úkoly</string>
+    <string name="backup_BAc_export">Exportovat úkoly</string>
+    <string name="backup_TXI_error">Chyba v importu</string>
+    <string name="export_toast">Zálohovány %1$s do %2$s.</string>
+    <string name="export_toast_no_tasks">Žádné úkoly pro export.</string>
+    <string name="export_progress_title">Exportuji...</string>
+    <string name="import_summary_title">Souhrn obnovy</string>
+    <string name="import_summary_message">Soubor %1$s obsahuje %2$s.\n\n %3$s importováno,\n %4$s
+        již existuje\n %5$s je chybných\n
+    </string>
+    <string name="import_progress_title">Probíhá import...</string>
+    <string name="import_progress_read">Načítávání úkolu %d...</string>
+    <string name="DLG_error_sdcard">Chyba v přístupu k adresáři: %s</string>
+    <string name="DLG_error_sdcard_general">Chyba v přístupu k SD kartě!</string>
+    <string name="import_file_prompt">Zvolte soubor k obnově</string>
+    <string name="app_name">Astrid Úkoly</string>
+    <string name="read_permission_label">Astrid Práva</string>
+    <string name="read_permission_desc">zobrazit úkoly, zobrazit filtry úkolů</string>
+    <string name="write_permission_label">Astrid Práva</string>
+    <string name="write_permission_desc">vytvořit nové úkoly, upravit existující úkoly</string>
+    <string name="DLG_delete_this_task_question">Smazat tento úkol?</string>
+    <string name="DLG_delete_this_item_question">Smazat tuto položku: %s?</string>
+    <string name="DLG_upgrading">Obnovování vašich úkolů...</string>
+    <string name="DLG_hour_minutes">Čas (hodin : minut)</string>
+    <string name="DLG_please_update">Astrid by měl být aktualizován na poslední verzi z Android
+        market! Prosím udělej to, než budeš pokračovat, nebo chvíli počkej.
+    </string>
+    <string name="DLG_accept">Souhlasím</string>
+    <string name="DLG_decline">Odmítám</string>
+    <string name="DLG_eula_title">Podmínky užívání programu Astrid</string>
+    <string name="DLG_please_wait">Čekejte prosím</string>
+    <string name="DLG_loading">Nahrávám...</string>
+    <string name="DLG_ok">OK</string>
+    <string name="DLG_cancel">Storno</string>
+    <string name="DLG_more">Další</string>
+    <string name="DLG_undo">Vrátit změny</string>
+    <string name="DLG_warning">Výstraha</string>
+    <string name="WID_dateButtonUnset">Klikni pro nastavení</string>
+    <string name="ENA_no_comments">Nic k zobrazení</string>
+    <string name="ENA_no_user">Kdosi</string>
+    <string name="ENA_refresh_comments">Obnovit komentáře</string>
+    <string name="TLA_no_items">Žádné úkoly!</string>
+    <string name="TLA_no_items_person">%s s vámi\nnesdílí žádné úkoly</string>
+    <string name="TLA_menu_sort">Třídit &amp; skryté</string>
+    <string name="TLA_menu_sync">Sychronizovat</string>
+    <string name="TLA_menu_search">Hledat</string>
+    <string name="TLA_menu_lists">Seznamy</string>
+    <string name="TLA_menu_friends">Lidé</string>
+    <string name="TLA_menu_suggestions">Návrhy</string>
+    <string name="TLA_menu_support">Podpora</string>
+    <string name="TLA_custom">Vlastní</string>
+    <string name="TLA_quick_add_hint">Přidat úkol</string>
+    <string name="TLA_notification_volume_low">Upozornění jsou ztlumena. Neuslyšíte Astrid!</string>
+    <string name="TLA_notification_disabled">Upomínky Astrid jsou vypnuté! Nedostanete žádná
+        upozornění
+    </string>
+    <string-array name="TLA_filters">
+        <item>Aktivní</item>
+        <item>Dnes</item>
+        <item>Brzy</item>
+        <item>Po termínu</item>
+        <item>Hotovo</item>
+        <item>Skryté</item>
+    </string-array>
+    <string name="TLA_quickadd_confirm_speech_bubble">Vytvořila jsem úkol s názvem \"%1$s\", %3$s
+        priorita, do %2$s
+    </string>
+    <string name="TLA_quickadd_confirm_hide_helpers">Nezobrazovat budoucí potvrzení</string>
+    <string name="TLA_repeat_scheduled_title">Nový opakující se úkol %s</string>
+    <string name="TLA_repeat_scheduled_speech_bubble">Připomenu Ti to %s.</string>
+    <string-array name="TLA_priority_strings">
+        <item>nejvyšší důležitost</item>
+        <item>vysoká důležitost</item>
+        <item>střední důležitost</item>
+        <item>nízká důležitost</item>
+    </string-array>
+    <string name="TAd_hiddenFormat">%s [skrytý]</string>
+    <string name="TAd_deletedFormat">%s [smazán]</string>
+    <string name="TAd_completed">Dokončeno\n%s</string>
+    <string name="TAd_actionEditTask">Upravit</string>
+    <string name="TAd_contextEditTask">Upravit úkol</string>
+    <string name="TAd_contextCopyTask">Kopírovat úkol</string>
+    <string name="TAd_contextUndeleteTask">Obnovit úkol</string>
+    <string name="TAd_contextPurgeTask">Smazat úkol</string>
+    <string name="SSD_title">Tříděné a skryté úkoly</string>
+    <string name="SSD_hidden_title">Skryté úkoly</string>
+    <string name="SSD_completed">Ukázat dokončené úkoly</string>
+    <string name="SSD_hidden">Ukázat skryté úkoly</string>
+    <string name="SSD_deleted">Ukázat smazané úkoly</string>
+    <string name="SSD_sort_auto">Astrid-chytré třídění</string>
+    <string name="SSD_sort_alpha">Podle názvu</string>
+    <string name="SSD_sort_due">Podle data ukončení</string>
+    <string name="SSD_sort_importance">Podle důležitosti</string>
+    <string name="SSD_sort_modified">Podle naposled upraveného</string>
+    <string name="SSD_sort_reverse">Obrácené třídění</string>
+    <string name="SSD_save_temp">Pouze jednou</string>
+    <string name="SSD_save_always">Vždy</string>
+    <string name="FSA_label">Seznam nebo filtr Astrid</string>
+    <string name="FLA_context_shortcut">Vytvořit zástupce na ploše</string>
+    <string name="FLA_shortcut_dialog_title">Vytvořit zástupce</string>
+    <string name="FLA_shortcut_dialog">Název zástupce:</string>
+    <string name="FLA_search_hint">Hledat úkoly</string>
+    <string name="FLA_search_filter">Souhlasející \'%s\'</string>
+    <string name="FLA_toast_onCreateShortcut">Vytvořen zástupce: %s</string>
+    <string name="FLA_new_filter">Nový Filtr</string>
+    <string name="FLA_new_list">Nový seznam</string>
+    <string name="FLA_no_filter_selected">Není vybrán žádný filtr! Vyberte prosím filtr nebo
+        seznam.
+    </string>
+    <string name="TEA_when_header_label">Kdy</string>
+    <string name="TEA_title_hint">Souhrn úkolu</string>
+    <string name="TEA_importance_label">Důležitost</string>
+    <string name="TEA_urgency_specific_time">V přesně daný čas?</string>
+    <string name="TEA_urgency_none">Žádný</string>
+    <string name="TEA_hideUntil_label">Zobrazit úkol</string>
+    <string name="TEA_hideUntil_message">Úkol bude skrytý až do %s</string>
+    <string-array name="TEA_loading">
+        <item>Nahrávám...</item>
+    </string-array>
+    <string name="TEA_note_label">Poznámky</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>
+    <string name="TEA_menu_discard">Neukládat</string>
+    <string name="TEA_menu_delete">Smazat úkol</string>
+    <string name="TEA_menu_comments">Komentáře</string>
+    <string name="TEA_onTaskSave_due">Úkol uložen: termín je %s</string>
+    <string name="TEA_onTaskSave_notDue">Úkol uložen</string>
+    <string name="TEA_tab_activity">Činnost</string>
+    <string name="TEA_tab_more">Více</string>
+    <string name="TEA_tab_web">Tipy</string>
+    <string-array name="TEA_urgency">
+        <item>Bez termínu</item>
+        <item>Určitý den</item>
+        <item>Dnes</item>
+        <item>Zítra</item>
+        <item>(den po)</item>
+        <item>Příští týden</item>
+        <item>Za dva týdny</item>
+        <item>Příští měsíc</item>
+    </string-array>
+    <string name="TEA_no_time">Bez času</string>
+    <string-array name="TEA_hideUntil">
+        <item>Vždy</item>
+        <item>Do termínu</item>
+        <item>Due time</item>
+        <item>Den před ukončením</item>
+        <item>Týden před ukončením</item>
+        <item>Určitý den/čas</item>
+    </string-array>
+    <string name="TEA_control_who">Kdo</string>
+    <string name="TEA_control_when">Kdy</string>
+    <string name="TEA_control_more_section">----More Section----</string>
+    <string name="TEA_control_importance">Důležitost</string>
+    <string name="TEA_control_lists">Seznamy</string>
+    <string name="TEA_control_notes">Poznámky</string>
+    <string name="TEA_control_files">Soubory</string>
+    <string name="TEA_control_reminders">Upomínky</string>
+    <string name="TEA_control_hidden_section">-----Vždy skrývat----</string>
+    <string name="hide_until_prompt">Zobrazit v mém seznamu</string>
+    <string name="TEA_no_activity">Není co zobrazit</string>
+    <string name="TEA_load_more">Více...</string>
+    <string name="TEA_when_dialog_title">Kdy je termín?</string>
+    <string name="TEA_new_task">Nový úkol</string>
+    <string name="WSV_click_to_load">Klepnutím vyhledáte jak na to!</string>
+    <string name="WSV_not_online">S připojením k internetu by to byla jiná káva. Zkontrolujte prosím
+        spojení.
+    </string>
+    <string name="TEA_contact_error">Mrzí mě to, ale nemohu najít email pro vybraný kontakt.
+    </string>
+    <string name="MCA_title">V %2$s volal\n%1$s</string>
+    <string name="MCA_return_call">Hned zavolat</string>
+    <string name="MCA_add_task">Zavolat později</string>
+    <string name="MCA_ignore">Ignorovat</string>
+    <string name="MCA_ignore_title">Ignorovat všechny zmeškané hovory?</string>
+    <string name="MCA_ignore_body">Ignoroval jste několik zmeškaných hovorů. Má Astrid ignorovat
+        všechny?
+    </string>
+    <string name="MCA_ignore_all">Ignorovat vše</string>
+    <string name="MCA_ignore_this">Ignorovat pouze tento</string>
+    <string name="MCA_missed_calls_pref_desc_enabled">Astrid Vás upozorní na zmeškané hovory a
+        připomene Vám, abyste zavolal zpět
+    </string>
+    <string name="MCA_missed_calls_pref_desc_disabled">Astrid Vás nebude upozorňovat na zmeškané
+        hovory
+    </string>
+    <string name="MCA_task_title_name">Zavolat %1$s zpět v %2$s</string>
+    <string name="MCA_task_title_no_name">Zavolat %s zpět</string>
+    <string name="MCA_schedule_dialog_title">Zavolat %s zpět...</string>
+    <string-array name="MCA_dialog_speech_options">
+        <item>To musí být super, být tak oblíbený!</item>
+        <item>Lidí Vás mají rádi! Jů!</item>
+        <item>Potěšte je, ozvěte se!</item>
+        <item>Vás by nepotěšilo, kdyby Vám lidé zavolali zpátky?</item>
+        <item>To zvládnete!</item>
+        <item>SMS můžete poslat vždycky...</item>
+    </string-array>
+    <string name="UpS_changelog_title">Co je nového v Astrid?</string>
+    <string name="UpS_updates_title">Poslední \"Astrid\" novinky</string>
+    <string name="EPr_title">Astrid: Vlastnosti</string>
+    <string name="EPr_share_astrid">Řekněte o Astrid ostatním</string>
+    <string name="EPr_appearance_header">Vzhled</string>
+    <string name="EPr_faq_title">FAQ</string>
+    <string name="EPr_fontSize_title">Velikost seznamu úkolů</string>
+    <string name="EPr_showSmartConfirmation_title">Zobrazovat potvrzení chytrých upomínek</string>
+    <string name="EPr_fontSize_desc">Velikost písma na hlavní straně seznamu</string>
+    <string name="EPr_showNotes_title">Zobrazit poznámky v úkolu</string>
+    <string name="EPr_beastMode_reset">Obnovit výchozí hodnoty</string>
+    <string name="EPr_showNotes_desc_disabled">Poznámky budou zobrazeny v liště rychlého přístupu
+    </string>
+    <string name="EPr_showNotes_desc_enabled">Poznámky budou vždy zobrazeny</string>
+    <string name="EPr_fullTask_title">Zobrazit úplný název úkolu</string>
+    <string name="EPr_fullTask_desc_enabled">Zobrazí se úplný název úkolu</string>
+    <string name="EPr_fullTask_desc_disabled">Zobrazí se první dva řádky názvu úkolu</string>
+    <string name="EPr_ideaAuto_title">Chování záložky Tipy</string>
+    <string name="EPr_ideaAuto_desc_enabled">Při klepnutí na záložky Tipy se spustí hledání na
+        webu
+    </string>
+    <string name="EPr_theme_title">Barevný motiv</string>
+    <string name="EPr_theme_desc">Aktuální: %s</string>
+    <string name="EPr_theme_desc_unsupported">Nastavení vyžaduje Android 2.0+</string>
+    <string name="EPr_taskRowPrefs_title">Vzhled řádku úkolu</string>
+    <string name="EPr_third_party_addons">Zapnout doplňky třetích stran</string>
+    <string name="EPr_third_party_addons_desc_enabled">Doplňky budou povolené</string>
+    <string name="EPr_third_party_addons_desc_disabled">Doplňky budou zakázané</string>
+    <string name="EPr_ideas_tab_description">Nápady, které Vám mohou pomoci dokončit úkoly</string>
+    <string name="EPr_cal_end_or_start_at_due_time">Čas události v kalendáři</string>
+    <string name="EPr_cal_end_at_due_time">Událost v kalendáři končí splněním úkolu</string>
+    <string name="EPr_cal_start_at_due_time">Událost v kalendáři začíná splněním úkolu</string>
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>No swipe</item>
+        <item>Šetřit pamětí</item>
+        <item>Normální Výkon</item>
+        <item>Vysoký Výkon</item>
+    </string-array>
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <item>Swipe between lists is disabled</item>
+        <item>Nižší výkon</item>
+        <item>Default setting</item>
+        <item>Více zatěžuje systém</item>
+    </string-array>
+    <string-array name="EPr_themes">
+        <item>Den - Modrá</item>
+        <item>Den - Červená</item>
+        <item>Sky blue</item>
+        <item>Noc</item>
+        <item>Průhledné (Bílý text)</item>
+        <item>Průhledné (Tmavý text)</item>
+    </string-array>
+    <string-array name="EPr_themes_widget">
+        <item>Same as app</item>
+        <item>Den - Modrá</item>
+        <item>Den - Červená</item>
+        <item>Sky blue</item>
+        <item>Noc</item>
+        <item>Transparent (White Text)</item>
+        <item>Transparent (Black Text)</item>
+        <item>Starý styl</item>
+    </string-array>
+    <string name="EPr_manage_header">Spravovat staré úkoly</string>
+    <string name="EPr_manage_delete_completed">Odstranit dokončené úkoly</string>
+    <string name="EPr_manage_delete_completed_message">Opravdu chcete odstranit všechny dokončené
+        úkoly?
+    </string>
+    <string name="EPr_manage_delete_completed_summary">Odstraněné úkoly mohou být jeden po jednom
+        obnoveny
+    </string>
+    <string name="EPr_manage_delete_completed_status">Odstraněno %d úkolů!</string>
+    <string name="EPr_manage_purge_deleted">Vymazat smazané úkoly</string>
+    <string name="EPr_manage_purge_deleted_message">Opravdu chcete vymazat vaše smazané
+        úkoly?\n\nTyto úkoly budou vymazány navždy!
+    </string>
+    <string name="EPr_manage_purge_deleted_status">Vymyzáno %d úkolů!</string>
+    <string name="EPr_manage_purge_deleted_summary">Pozor! Vymazané úkoly nemohou být obnoveny bez
+        souboru zálohy!
+    </string>
+    <string name="EPr_manage_clear_all">Smazat vše</string>
+    <string name="EPr_manage_clear_all_message">Smazat všechny úkoly a nastavení Astrid?\n\nPozor:
+        nelze vzít zpět!
+    </string>
+    <string name="EPr_manage_delete_completed_gcal">Smazat události v kalendáři pro hotové úkoly
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_message">Opravdu chcete smazat všechny události
+        pro dokončené úkoly?
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_status">Smazáno %d událostí z kalendáře!</string>
+    <string name="AOA_title">Doplňky</string>
+    <string name="AOA_internal_author">Astrid tým</string>
+    <string name="AOA_tab_installed">Nainstalováno</string>
+    <string name="AOA_tab_available">K dispozici</string>
+    <string name="AOA_free">Zdarma</string>
+    <string name="AOA_no_addons">Prázdný seznam!</string>
+    <string name="TWi_loading">Nahrávám...</string>
+    <string name="WCA_title">Označte úkol pro zobrazení...</string>
+    <string name="p_about">O Astrid</string>
+    <string name="p_about_text">Současná verze: %s\n\n Astrid je open-source a je vytvořena Todoroo,
+        Inc.
+    </string>
+    <string name="p_help">Podpora</string>
+    <string name="p_forums">Diskuzní fóra</string>
+    <string name="task_killer_help">Vypadá to, že používate aplikaci, která ukončuje programy(%s)!
+        Pokud můžete, přidejte Astrid do vyjímek, aby nebyla ukončována. Jinak se může stát, že vás
+        nebude upozorňovat na úkoly.\n
+    </string>
+    <string name="task_killer_help_ok">Neukončím Astrid!</string>
+    <string name="marketplace_description">Astrid je vysoce oceňovaný open source úkolovník,
+        jednoduše ovladatelný a přesto velice výkonný, vytvořen k tomu,aby Vám pomohl mít vše
+        hotovo. Značky, připomenutí, synchronizace, lokalizace, widget a další.
+    </string>
+    <string name="DB_corrupted_title">Poškozená databáze</string>
+    <string name="EPr_defaults_header">Výchozí nastavení nového úkolu</string>
+    <string name="EPr_default_urgency_desc">Aktuální: %s</string>
+    <string name="EPr_default_importance_title">Výchozí důležitost</string>
+    <string name="EPr_default_importance_desc">Aktuální: %s</string>
+    <string name="EPr_default_hideUntil_title">Výchozí Skrýt do</string>
+    <string name="EPr_default_hideUntil_desc">Aktuální: %s</string>
+    <string name="EPr_default_reminders_title">Výchozí připomenutí</string>
+    <string name="EPr_default_reminders_desc">Aktuální: %s</string>
+    <string name="EPr_default_addtocalendar_desc_disabled">Nový úkol nevytvoří událost v Kalendáři
+        Google
+    </string>
+    <string name="EPr_default_addtocalendar_desc">Nové úkoly se vloží do kalendáře: \"%s\"</string>
+    <string name="EPr_default_reminders_mode_desc">Aktuální: %s</string>
+    <string-array name="EPr_default_importance">
+        <item>!!! (Nejvyšší)</item>
+        <item>!!</item>
+        <item>!</item>
+        <item>o (Nejnižší)</item>
+    </string-array>
+    <string-array name="EPr_default_urgency">
+        <item>Žádný termín</item>
+        <item>Dnes</item>
+        <item>Zítra</item>
+        <item>Pozítří</item>
+        <item>Příští týden</item>
+    </string-array>
+    <string-array name="EPr_default_hideUntil">
+        <item>Neskrývat</item>
+        <item>Nastal termín úkolu</item>
+        <item>Den před ukončením</item>
+        <item>Týden před ukončením</item>
+    </string-array>
+    <string-array name="EPr_default_reminders">
+        <item>Žádné upomínky v termínu</item>
+        <item>V termínu</item>
+        <item>Po termínu</item>
+        <item>V termínu nebo po něm</item>
+    </string-array>
+    <string name="BFE_Active">Aktivní úkoly</string>
+    <string name="BFE_Recent">Nedávno upravené</string>
+    <string name="BFE_Assigned">Přidělil jsem</string>
+    <string name="BFE_Saved_delete">Smazat filtr</string>
+    <string name="CFA_title">Vlastní filtr</string>
+    <string name="CFA_filterName_hint">Pojmenujte tento filtr pro jeho uložení</string>
+    <string name="CFA_universe_all">Aktivní úkoly</string>
+    <string name="CFA_type_add">nebo</string>
+    <string name="CFA_type_subtract">ne</string>
+    <string name="CFA_type_intersect">také</string>
+    <string name="CFA_context_chain">%s má kritéria</string>
+    <string name="CFA_context_delete">Odstranit řádek</string>
+    <string name="CFA_help">Zde můžete vytvořit vlastní filtry. Tlačítkem níže přidejte kritéria.
+        Krátkým, nebo dlouhým stiskem je upravíte. Poté zvolte \"Zobrazit\"!
+    </string>
+    <string name="CFA_button_add">Přidat podmínku</string>
+    <string name="CFA_button_view">Zobrazit</string>
+    <string name="CFA_button_save">Uložit &amp; Zobrazit</string>
+    <string name="CFC_dueBefore_text">Podle termínu: ?</string>
+    <string name="CFC_dueBefore_name">Podle termínu...</string>
+    <string-array name="CFC_dueBefore_entries">
+        <item>Žádný termín</item>
+        <item>Včera</item>
+        <item>Dnes</item>
+        <item>Zítra</item>
+        <item>Pozítří</item>
+        <item>Příští týden</item>
+        <item>Příští měsíc</item>
+    </string-array>
+    <string name="CFC_importance_text">Alespoň důležitost?</string>
+    <string name="CFC_importance_name">Důležitost...</string>
+    <string name="CFC_tag_text">Seznam: ?</string>
+    <string name="CFC_tag_name">Seznam...</string>
+    <string name="CFC_tag_contains_name">Jméno seznamu obsahuje...</string>
+    <string name="CFC_tag_contains_text">Jméno seznamu obsahuje: ?</string>
+    <string name="CFC_title_contains_name">Název obsahuje...</string>
+    <string name="CFC_title_contains_text">Obsahuje název: ?</string>
+    <string name="gcal_TEA_error">Chyba při přidávání úkolu do kalendáře!</string>
+    <string name="gcal_TEA_addToCalendar_label">Vytvořit událost kalendáře</string>
+    <string name="gcal_TEA_showCalendar_label">Otevřít událost v kalendáři</string>
+    <string name="gcal_TEA_calendar_updated">Událost kalendáře také aktualizována!</string>
+    <string name="gcal_TEA_nocal">Nepřidávat</string>
+    <string name="gcal_TEA_none_selected">Přidat do kal.</string>
+    <string name="gcal_TEA_has_event">Událost v kal.</string>
+    <string name="gcal_completed_title">%s (dokončeno)</string>
+    <string name="gcal_GCP_default">Výchozí kalendář</string>
+    <string name="gtasks_FEx_header">Google úkoly</string>
+    <string name="gtasks_FEx_title">Google úkoly: %s</string>
+    <string name="gtasks_FEx_creating_list">Vytvářím seznam...</string>
+    <string name="gtasks_FEx_create_list_dialog">Nové jméno seznamu:</string>
+    <string name="gtasks_FEx_create_list_error">Chyba při vytváření nového seznamu</string>
+    <string name="CFC_gtasks_list_text">V seznamu: ?</string>
+    <string name="CFC_gtasks_list_name">V seznamu Google úkolů</string>
+    <string name="gtasks_GTA_clearing">Mažu hotové úkoly...</string>
+    <string name="gtasks_GTA_clear_completed">Smazat hotové</string>
+    <string name="gtasks_GLA_noaccounts">Žádný dostupný účet Google pro synchronizaci</string>
+    <string name="gtasks_GLA_authenticating">Ověřuje se...</string>
+    <string name="gtasks_GLA_errorAuth">Chyba při autentifikaci! Zkontrolujte prosím uživatelské
+        jméno/heslo ve správci hesel svého mobilu
+    </string>
+    <string name="gtasks_GLA_errorIOAuth">Nastali problémy při komunikaci se servery Google. Zkuste
+        to prosím později.
+    </string>
+    <string name="gtasks_GLA_errorAuth_captcha">Pravděpodobně jste narazili na stránky chráněné
+        Captchou. Zkuste se přihlásit pomocí prohlížeče a poté se vraťte sem a zkuste to znovu:
+    </string>
+    <string name="gtasks_GPr_header">Google Úkoly (Beta!)</string>
+    <string name="gtasks_error_backend">V API služby Google Task (které je ve stadiu beta) byla v
+        něm zjištěna chyba. Služba může být nedostupná, zkuste to později znovu.
+    </string>
+    <string name="gtasks_error_accountNotFound">Účet %s nebyl nalezen -- přes nastavení Google Tasks
+        se odhlašte a znovu přihlaste.
+    </string>
+    <string name="gtasks_error_authRefresh">Nelze se přihlásit ke Google Tasks. Zkontrolujte prosím
+        heslo ke svému účtu, nebo se zkuste znovu přihlásit.
+    </string>
+    <string name="welcome_login_tos_base">Používáním Astrid souhlasíte s</string>
+    <string name="welcome_login_confirm_later_title">Nechcete se přihlásit?</string>
+    <string name="welcome_login_confirm_later_ok">Jasně!</string>
+    <string name="welcome_login_confirm_later_cancel">Ne, díky</string>
+    <string name="welcome_login_confirm_later_dialog">Přihlašte se a získejte z Astrid více! Zdarma
+        získáte online zálohování, plnou synchronizaci s Astrid.com, možnost přidávat úkoly emailem
+        a dokonce můžete sdílet seznamy úkolů s přáteli!
+    </string>
+    <string name="locale_edit_alerts_title">Astrid Upozornění filtrů</string>
+    <string name="locale_edit_intro">Astrid Ti pošle upozornění, když budeš mít úkoly v následujícím
+        filtru:
+    </string>
+    <string name="locale_interval_label">Omezit upozornění na:</string>
+    <string-array name="locale_interval">
+        <item>jednou za hodinu</item>
+        <item>jednou za šest hodin</item>
+        <item>jednou za dvanáct hodin</item>
+        <item>jednou denně</item>
+        <item>jednou za tři dny</item>
+        <item>jednou týdně</item>
+    </string-array>
+    <string name="locale_notification">Máš $NUM se značkou $FILTER</string>
+    <string name="locale_plugin_required">Prosím nainstalujte zásuvný modul Astrid Locale!</string>
+    <string name="opencrx_FEx_header">OpenCRX</string>
+    <string name="opencrx_FEx_dashboard">Pracovní plochy</string>
+    <string name="opencrx_FEx_responsible">Přiřazeno k</string>
+    <string name="opencrx_FEx_responsible_title">Přiřazeno k \'%s\'</string>
+    <string name="opencrx_PDE_task_from">od %s</string>
+    <string name="opencrx_TEA_notes">Přidat komentář</string>
+    <string name="opencrx_creator_input_hint">Autor</string>
+    <string name="opencrx_PPr_header">OpenCRX</string>
+    <string name="opencrx_no_creator">(Nesynchronizovat)</string>
+    <string name="opencrx_group">OpenCRX server</string>
+    <string name="opencrx_host_summary">"Např.: "
+        <i>domena.cz</i>
+    </string>
+    <string name="opencrx_segment_title">Segment</string>
+    <string name="opencrx_segment_summary">"Např.: "
+        <i>Standard</i>
+    </string>
+    <string name="opencrx_provider_title">Poskytovatel</string>
+    <string name="opencrx_provider_summary">"Např.: "
+        <i>CRX</i>
+    </string>
+    <string name="opencrx_provider_default">CRX</string>
+    <string name="opencrx_PLA_signIn">Přihlásit se</string>
+    <string name="opencrx_PLA_password">Heslo</string>
+    <string name="opencrx_notification_title">OpenCRX</string>
+    <string name="opencrx_notification_text">%s úkolů zálohováno /pro více detailů klikněte</string>
+    <string name="opencrx_ioerror">Chyba připojení! Zkontrolujte vaše internetové připojení.
+    </string>
+    <string name="opencrx_MLA_password_empty">Nebylo určeno heslo!</string>
+    <string name="opencrx_TEA_task_assign_label">Přiřadit úkol k této osobě:</string>
+    <string name="opencrx_TEA_task_unassigned">&lt;Nepřiřazeno&gt;</string>
+    <string name="opencrx_TEA_dashboard_default">&lt;Výchozí&gt;</string>
+    <string name="CFC_opencrx_in_workspace_text">Na pracovní ploše: ?</string>
+    <string name="CFC_opencrx_in_workspace_name">Na pracovní ploše...</string>
+    <string name="CFC_opencrx_assigned_to_text">Přiřazeno k: ?</string>
+    <string name="CFC_opencrx_assigned_to_name">Přiřazeno k ...</string>
+    <string name="EPr_statistics_desc_disabled">Nebudou oznámena žádná data o využití</string>
+    <string name="EPr_statistics_desc_enabled">Pomozte nám dělat Astrid lepší, anonymním odesláním
+        dat o používání
+    </string>
+    <string name="speech_err_network">Chyba sítě! Rozpoznávání řeči vyžaduje funkční síťové
+        připojení.
+    </string>
+    <string name="speech_err_no_match">Je mi líto, ale nerozuměla jsem! Zkuste to znovu.</string>
+    <string name="speech_err_default">Rozpoznávání řeči narazilo na problém. Zkuste to prosím
+        znovu.
+    </string>
+    <string name="premium_attach_file">Přiložit soubor</string>
+    <string name="premium_record_audio">Nahrát poznámku</string>
+    <string name="premium_no_files">Žádné přílohy</string>
+    <string name="premium_remove_file_confirm">Skutečně? Nebude cesty zpět</string>
+    <string name="audio_recording_title">Nahrávám zvuk</string>
+    <string name="audio_stop_recording">Ukončit záznam</string>
+    <string name="audio_speak_now">Hovořte!</string>
+    <string name="search_market_pdf_title">Chybí prohlížeč PDF</string>
+    <string name="search_market_ms">Chybí prohlížeč MS Office. Přejete si ho stáhnout z Android
+        Marketu?
+    </string>
+    <string name="search_market_ms_title">Chybí prohlížeč MS Office</string>
+    <string name="file_type_unhandled">Pro tento typ souborů nebyla nalezena žádná aplikace.
+    </string>
+    <string name="file_type_unhandled_title">Chybí aplikace</string>
+    <string name="file_prefix_voice">Hlas</string>
+    <string name="file_browser_up">O úroveň výš</string>
+    <string name="file_browser_err_permissions">Chyba oprávnění! Ujistěte se prosím, že jste Astrid
+        nezabránil v přístupu k SD kartě.
+    </string>
+    <string name="file_add_picture">Připojit obrázek</string>
+    <string name="file_add_sdcard">Připojit soubor z SD karty</string>
+    <string name="file_download_title">Stáhnout soubor?</string>
+    <string name="file_download_body">Soubor nebyl stažen na SD kartu. Stáhnout nyní?</string>
+    <string name="file_download_progress">Stahuji...</string>
+    <string name="file_err_memory">Obrázek se nevejde do paměti</string>
+    <string name="file_err_copy">Chyba při kopírování souboru jako přílohy</string>
+    <string name="file_err_download">Chyba při stahování souboru</string>
+    <string name="file_err_show">Je nám líto, ale systém zatím tento typ souboru nepodporuje
+    </string>
+    <string name="TEA_reminders_group_label">Upomínky</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 name="TEA_reminder_alarm_label">Typ vyzvánění/vybrací:</string>
+    <string name="TEA_reminder_mode_once">Vyzvánět jednou</string>
+    <string name="TEA_reminder_mode_five">Pět zazvonění</string>
+    <string name="TEA_reminder_mode_nonstop">Vyzvánět dokud nezruším Alarm</string>
+    <string-array name="TEA_reminder_random">
+        <item>an hour</item>
+        <item>a day</item>
+        <item>a week</item>
+        <item>in two weeks</item>
+        <item>a month</item>
+        <item>in two months</item>
+    </string-array>
+    <string name="rmd_NoA_filter">Připomínka!</string>
+    <string name="rmd_NoA_done">Dokončeno!</string>
+    <string name="rmd_NoA_snooze">Později...</string>
+    <string name="rmd_NoA_completed_toast">Hotovo! Gratuluji!</string>
+    <string-array name="rmd_reengage_notif_titles">
+        <item>A note from Astrid</item>
+        <item>Memo for %s.</item>
+        <item>Your Astrid digest</item>
+        <item>Reminders from Astrid</item>
+    </string-array>
+    <string-array name="rmd_reengage_dialog_options">
+        <item>Time to shorten your to-do list!</item>
+        <item>Dear sir or madam, some tasks await your inspection!</item>
+        <item>Hi there, could you take a look at these?</item>
+        <item>I\'ve got some tasks with your name on them!</item>
+        <item>A fresh batch of tasks for you today!</item>
+        <item>You look fabulous! Ready to get started?</item>
+        <item>A lovely day for getting some work done, I think!</item>
+    </string-array>
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>Don\'t you want to get organized?</item>
+        <item>I\'m Astrid! I\'m here to help you do more!</item>
+        <item>You look busy! Let me take some of those tasks off of your plate.</item>
+        <item>I can help you keep track of all of the details in your life.</item>
+        <item>You\'re serious about getting more done? So am I!</item>
+        <item>Pleasure to make your acquaintance!</item>
+    </string-array>
+    <string name="rmd_EPr_alerts_header">Nastavení upozornění</string>
+    <string name="rmd_EPr_quiet_hours_start_title">Nerušit od</string>
+    <string name="rmd_EPr_quiet_hours_desc_none">Tichý režim zakázán</string>
+    <string name="rmd_EPr_quiet_hours_end_title">Nerušit do</string>
+    <string name="rmd_EPr_ringtone_title">Zvuk upozornění</string>
+    <string name="rmd_EPr_ringtone_desc_custom">Vlastní vyzvánění bylo nastaveno</string>
+    <string name="rmd_EPr_ringtone_desc_silent">Vyzvánění ztišeno</string>
+    <string name="rmd_EPr_ringtone_desc_default">Bude použito výchozí vyzvánění</string>
+    <string name="rmd_EPr_persistent_title">Trvání upozornění</string>
+    <string name="rmd_EPr_persistent_desc_true">Pro smazání musí být upozornění zobrazeno každé
+        zvlášť
+    </string>
+    <string name="rmd_EPr_persistent_desc_false">Upozornění mohou být smazána s tlačítkem \"Smazat
+        vše\"
+    </string>
+    <string name="rmd_EPr_vibrate_title">Vibruj při upozornění</string>
+    <string name="rmd_EPr_vibrate_desc_true">Astrid bude vibrovat při odesílání upozornění</string>
+    <string name="rmd_EPr_vibrate_desc_false">Astrid nebude vibrovat při odesílání upozornění
+    </string>
+    <string name="rmd_EPr_nagging_desc_true">Astrid bude vypisovat povzbuzující zprávy během
+        upozornění
+    </string>
+    <string name="rmd_EPr_defaultRemind_title">Náhodná upozornění</string>
+    <string name="rmd_EPr_defaultRemind_desc_disabled">Nové úkoly nebudou mít náhodné upozornění
+    </string>
+    <string name="rmd_EPr_defaultRemind_desc">Na nové úkoly bude upozorňováno náhodně: %s</string>
+    <string-array name="EPr_reminder_random">
+        <item>zakázáno</item>
+        <item>každou hodinu</item>
+        <item>denně</item>
+        <item>týdně</item>
+        <item>každých ctrnáct dní</item>
+        <item>měsíčně</item>
+        <item>každý druhý měsíc</item>
+    </string-array>
+    <string-array name="EPr_quiet_hours_start">
+        <item>zakázáno</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>0:00</item>
+        <item>1:00</item>
+        <item>2:00</item>
+        <item>3:00</item>
+        <item>4:00</item>
+        <item>5:00</item>
+        <item>6:00</item>
+        <item>7:00</item>
+        <item>8:00</item>
+        <item>9:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+    </string-array>
+    <string-array name="EPr_quiet_hours_end">
+        <item>9:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>0:00</item>
+        <item>1:00</item>
+        <item>2:00</item>
+        <item>3:00</item>
+        <item>4:00</item>
+        <item>5:00</item>
+        <item>6:00</item>
+        <item>7:00</item>
+        <item>8:00</item>
+    </string-array>
+    <string-array name="EPr_rmd_time">
+        <item>9:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>0:00</item>
+        <item>1:00</item>
+        <item>2:00</item>
+        <item>3:00</item>
+        <item>4:00</item>
+        <item>5:00</item>
+        <item>6:00</item>
+        <item>7:00</item>
+        <item>8:00</item>
+    </string-array>
+    <string-array name="reminders">
+        <item>Ahoj! Máš chvíli?</item>
+        <item>Můžu Tě na chvíli vidět?</item>
+        <item>Máš pár minut?</item>
+        <item>Zapomněl jsi?</item>
+        <item>Omlouvám se!</item>
+        <item>Když máš čas:</item>
+        <item>Ve Tvém programu:</item>
+        <item>Máš chvíli čas?</item>
+        <item>Tady je Astrid!</item>
+        <item>Ahoj! Můžu Tě vyrušit?</item>
+        <item>Minuta Tvého času?</item>
+        <item>Je skvělý den na</item>
+    </string-array>
+    <string-array name="reminders_due">
+        <item>Čas na práci!</item>
+        <item>Čas dokončení úkolu je zde!</item>
+        <item>Připraven/a začít?</item>
+        <item>Řekl jsi, že uděláš:</item>
+        <item>Chtěl jsi začít:</item>
+        <item>Čas začít:</item>
+        <item>Je čas!</item>
+        <item>Omlouvám se! Čas na</item>
+        <item>Jsi volný? Čas na</item>
+    </string-array>
+    <string-array name="reminders_snooze">
+        <item>Nebuď ted líná/ý</item>
+        <item>Čas spaní vypršel!</item>
+        <item>Už zádné spaní!</item>
+        <item>Jsi teď připraven(a)?</item>
+        <item>Už žádné odkládání!</item>
+    </string-array>
+    <string-array name="reminder_responses">
+        <item>Mám pro Tebe něco!</item>
+        <item>Ready to put this in the past?</item>
+        <item>Proč tohle nedokončís?</item>
+        <item>Tak co borče? Jdeme do toho?</item>
+        <item>Jsi připraven(a) tohle udělat?</item>
+        <item>Můžes tohle zvládnout?</item>
+        <item>Můžeš výt šťastná/ý! Jen tohle dokonči!</item>
+        <item>Slibuji Ti, že se budeš cítit lépe, když tohle dokončíš!</item>
+        <item>Neuděláš tohle dnes?</item>
+        <item>Tak to konečně dodělej. Už mě to unavuje!</item>
+        <item>Můžes tohle dokončit?</item>
+        <item>Plánuješ tohle vůbec někdy udělat?</item>
+        <item>Měj ze sebe radost! Jdeme na to!</item>
+        <item>Jsem na Tebe pyšný! Pojď to dokončit!</item>
+        <item>A little snack after you finish this?</item>
+        <item>Jen tenhle úkol? Prosím?</item>
+        <item>Je čas zkrátit Tvůj seznam úkolů!</item>
+        <item>Are you on Team Order or Team Chaos? Team Order! Let\'s go!</item>
+        <item>Have I mentioned you are awesome recently? Keep it up!</item>
+        <item>A task a day keeps the clutter away... Goodbye clutter!</item>
+        <item>How do you do it? Wow, I\'m impressed!</item>
+        <item>You can\'t just get by on your good looks. Let\'s get to it!</item>
+        <item>Lovely weather for a job like this, isn\'t it?</item>
+        <item>A spot of tea while you work on this?</item>
+        <item>If only you had already done this, then you could go outside and play.</item>
+        <item>It\'s time. You can\'t put off the inevitable.</item>
+        <item>I die a little every time you ignore me.</item>
+    </string-array>
+    <string-array name="postpone_nags">
+        <item>Prosím řekni mi, že není pravda, že jsi prokrastinátor!</item>
+        <item>Doesn\'t being lazy get old sometimes?</item>
+        <item>Někdo někde čeká až tohle dokončíš!</item>
+        <item>Když jsi řekl odložit, ve skutečnosti jsi myslel \'Já to udělám\', že?</item>
+        <item>Tohle je naposledy co to odkládáš, že?</item>
+        <item>Jen to dodělej, nikomu to neřeknu!</item>
+        <item>Proč odkládat, když můžes hmm... neodkládat!</item>
+        <item>Nakonec to doděláš, že?</item>
+        <item>Myslím, že jsi opravdu úžasný. Co takhle tohle neodkládat?</item>
+        <item>Will you be able to achieve your goals if you do that?</item>
+        <item>Odkládat, odkládat, odkládat. Kdy se změníš!</item>
+        <item>Mám dost tvých omluv! Jen to dodělej!</item>
+        <item>Nepoužil jsi stejnou omluvu i posledně?</item>
+        <item>Nemůžu Ti pomoci organizovat tvůj život, když tohle děláš...</item>
+    </string-array>
+    <string name="repeat_plugin">Opakování úkolů</string>
+    <string name="repeat_plugin_desc">Povolit opakování úkolů</string>
+    <string name="repeat_enabled">Opakování</string>
+    <string name="repeat_every">Každý %d</string>
+    <string name="repeat_interval_prompt">Opakovací interval</string>
+    <string-array name="repeat_interval_short">
+        <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">
+        <item>Dnů</item>
+        <item>Týdnů</item>
+        <item>Měsíců</item>
+        <item>Hodin</item>
+        <item>Minute(s)</item>
+        <item>Year(s)</item>
+    </string-array>
+    <string-array name="repeat_until_shortcuts">
+        <item>Forever</item>
+        <item>Specific Day</item>
+        <item>Today</item>
+        <item>Tomorrow</item>
+        <item>(day after)</item>
+        <item>Next Week</item>
+        <item>In Two Weeks</item>
+        <item>Next Month</item>
+    </string-array>
+    <string-array name="repeat_type">
+        <item>od data splnění</item>
+        <item>od data dokončení</item>
+    </string-array>
+    <string name="repeat_detail_byday">$I na $D</string>
+    <string name="repeat_detail_duedate">Každý %s</string>
+    <string name="repeat_detail_completion">%s po dokončení</string>
+    <string-array name="repeat_encouragement">
+        <item>Good job!</item>
+        <item>Wow… I\'m so proud of you!</item>
+        <item>I love when you\'re productive!</item>
+        <item>Doesn\'t it feel good to check something off?</item>
+    </string-array>
+    <string-array name="repeat_encouragement_last_time">
+        <item>Good job!</item>
+        <item>I\'m so proud of you!</item>
+        <item>I love when you\'re productive!</item>
+    </string-array>
+    <string name="TEA_tags_label">Seznamy</string>
+    <string name="tag_FEx_header">Seznamy</string>
+    <string name="TEA_no_tags_modified">Nebyly provedeny žádné změny.</string>
+    <string name="tag_settings_title">Settings:</string>
+    <string name="TPl_notification">Aktivní časovače pro %s!</string>
+    <string name="TFE_workingOn">Úkol je časován</string>
+    <string name="voice_create_prompt">Mluvte pro vytvoření úkolu</string>
+    <string name="welcome_title_1">Vítej v Astrid!</string>
+    <string name="welcome_body_5">and much more!</string>
+    <string name="PPW_configure_title">Konfigurovat widget</string>
+    <string name="PPW_color">Barva widgetu</string>
+    <string name="PPW_enable_calendar">Zobrazit události v kalendáři</string>
+    <string name="PPW_disable_encouragements">Skrýt povzbuzování</string>
+    <string name="PPW_filter">Vybrat filtr</string>
+    <string name="PPW_due">Termín:</string>
+    <string name="PPW_old_astrid_notice">K používání tohoto widgetu potřebujete Astrid ve verzi 3.6
+        a vyšší!
+    </string>
+    <string-array name="PPW_encouragements">
+        <item>Nazdar!</item>
+        <item>Máš čas něco dokončit?</item>
+        <item>Gosh, you are looking suave today!</item>
+        <item>Udělej dnes něco velkého</item>
+        <item>Ať jsem na Tebe dneska hrdý!</item>
+        <item>Jak se dneska máš?</item>
+    </string-array>
+    <string-array name="PPW_encouragements_tod">
+        <item>Dobré ráno!</item>
+        <item>Krásné odpoledne!</item>
+        <item>Dobrý večer!</item>
+        <item>Pozdě v noci?</item>
+        <item>Ještě je brzo, tak něco rychle udělej!</item>
+        <item>Že by čas na polední čaj?</item>
+        <item>Užij si večer!</item>
+        <item>Spánek je pro Tobe dobrý, víš to?</item>
+    </string-array>
+    <string-array name="PPW_encouragements_completed">
+        <item>Už jsi dokončil %d úkolů!</item>
+        <item>Životní skóre: %d úkolů dokončeno!</item>
+        <item>Usměj se! Už jsi dokončil %d úkolů!</item>
+    </string-array>
+    <string name="PPW_encouragements_none_completed">Ještě jsi nedokončil žádný úkol! Začneme?
+    </string>
+    <string-array name="PPW_colors">
+        <item>Černá</item>
+        <item>Bílá</item>
+        <item>Modrá</item>
+        <item>Průhledný</item>
+    </string-array>
 </resources>
diff --git a/astrid/res/values-da/strings.xml b/astrid/res/values-da/strings.xml
index 8f554626e..e2e2677de 100644
--- a/astrid/res/values-da/strings.xml
+++ b/astrid/res/values-da/strings.xml
@@ -1,622 +1,656 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="actfm_person_hint">Kontaktperson eller email</string>
-  <string name="actfm_person_or_tag_hint">Kontaktperson eller delt liste</string>
-  <string name="actfm_tag_operation_owner_delete">Du er ejeren af dette delte nøgleord! Hvis du sletter det, bliver det slettet for alle liste medlemmer. Er du sikker på du vil fortsætte?</string>
-  <string name="actfm_picture_camera">Tag et billede</string>
-  <string name="actfm_picture_gallery">Vælg fra galleri</string>
-  <string name="actfm_picture_clear">Ryd markering</string>
-  <string name="actfm_view_task_title">Vis opgave?</string>
-  <string name="actfm_view_task_text">Opgaven blev sendt til %s! Du ser lige nu dine egne opgaver. Vil du se disse og andre opgaver, du har tildelt?</string>
-  <string name="actfm_view_task_ok">Vis tildelte</string>
-  <string name="actfm_view_task_cancel">Bliv her</string>
-  <string name="actfm_my_shared_tasks_title">Mine delte opgaver</string>
-  <string name="actfm_my_shared_tasks_empty">Ingen delte opgaver</string>
-  <string name="TVA_add_comment">Tilføj en kommentar</string>
-  <string-array name="TVA_tabs">
-    <item>Opgaver</item>
-    <item>Aktivitet</item>
-    <item>Listeindstillinger</item>
-  </string-array>
-  <string name="actfm_TVA_filtered_by_assign">%s\'s opgaver. Tryk for alle</string>
-  <string name="actfm_TVA_filter_by_unassigned">Ufordelte opgaver. Tryk for alle</string>
-  <string name="actfm_TVA_no_members_alert">Privat: tryk for at redigere eller dele listen</string>
-  <string name="actfm_TVA_menu_refresh">Opdater</string>
-  <string name="actfm_TVA_tag_label">Listenavn</string>
-  <string name="actfm_TVA_members_label">Delt med</string>
-  <string name="actfm_TVA_tag_picture">Liste billede</string>
-  <string name="actfm_EPA_intro">Brug Astrid til at dele indkøbssedler, festplaner eller projektplaner og følg løbende med i, hvornår folk får afsluttet opgaver!</string>
-  <string name="actfm_EPA_assign_me">Mig</string>
-  <string name="actfm_EPA_unassigned">Hvem som helst</string>
-  <string name="actfm_EPA_share_with">Del med:</string>
-  <string name="actfm_EPA_collaborators_header">Del med venner</string>
-  <string name="actfm_EPA_message_body">Hjælp mig med at få opgaven færdig!</string>
-  <string name="actfm_EPA_invalid_email">Forkert emailadresse: %s</string>
-  <string name="actfm_ALA_title">Velkommen til Astrid.com</string>
-  <string name="actfm_ALA_email_label">E-mail</string>
-  <string name="actfm_ALA_password_label">Adgangskode</string>
-  <string name="actfm_ALA_signup_title">Opret ny brugerkonto</string>
-  <string name="actfm_ALA_login_title">Login på Astrid.com</string>
-  <string name="actfm_OLA_prompt">Forbind venligst til Google:</string>
-  <string name="actfm_https_title">Brug HTTPS</string>
-  <string name="actfm_https_enabled">HTTPS aktiveret (langsommere)</string>
-  <string name="actfm_https_disabled">HTTPS deaktiveret (hurtigere)</string>
-  <string name="alarm_ACS_label">Alarmer</string>
-  <string name="alarm_ACS_button">Tilføj en alarm</string>
-  <string-array name="reminders_alarm">
-    <item>Alarm!</item>
-  </string-array>
-  <string name="backup_BPr_header">Backup</string>
-  <string name="backup_status_success">Sidste sikkerhedskopi:\n%s</string>
-  <string name="backup_status_failed">Seneste backup fejlede</string>
-  <string name="backup_status_failed_subtitle">(tryk for at vise fejl)</string>
-  <string name="backup_status_never">Har aldrig taget backup!</string>
-  <string name="backup_BPr_group_options">Indstillinger</string>
-  <string name="backup_BPr_auto_title">Automatisk backup</string>
-  <string name="backup_BPr_auto_disabled">Automatisk backup deaktiveret</string>
-  <string name="backup_BPr_auto_enabled">Backup vil ske dagligt</string>
-  <string name="backup_BAc_label">Håndter sikkerhedskopier</string>
-  <string name="backup_BAc_title">Håndter dine sikkerhedskopier</string>
-  <string name="backup_BAc_import">Importér opgaver</string>
-  <string name="backup_BAc_export">Eksportér opgaver</string>
-  <string name="backup_TXI_error">Importfejl</string>
-  <string name="export_toast">Sikkerhedskopierede %1$s til %2$s.</string>
-  <string name="export_toast_no_tasks">Ingen opgaver at eksportere</string>
-  <string name="export_progress_title">Eksporterer...</string>
-  <string name="import_summary_title">Opsummering af gendannelse</string>
-  <string name="import_summary_message">Filen %1$s indeholdt %2$s.\n\n %3$s importeret,\n %4$s findes allerede\n %5$s indeholdt fejl\n</string>
-  <string name="import_progress_title">Importerer...</string>
-  <string name="import_progress_read">Læser opgave %d...</string>
-  <string name="DLG_error_sdcard">Kan ikke få adgang til mappen: %s</string>
-  <string name="DLG_error_sdcard_general">Kan ikke få adgang til dig SD-kort!</string>
-  <string name="import_file_prompt">Vælg en fil for at gendanne</string>
-  <string name="app_name">Astrid Opgaver</string>
-  <string name="read_permission_label">Astrid Tilladelser</string>
-  <string name="read_permission_desc">læs opgaver, vis opgavefiltre</string>
-  <string name="write_permission_label">Astrid Tilladelser</string>
-  <string name="write_permission_desc">opret nye opgaver, rediger eksisterende opgaver</string>
-  <string name="DLG_delete_this_task_question">Slet denne opgave?</string>
-  <string name="DLG_delete_this_item_question">Slet dette element: %s?</string>
-  <string name="DLG_upgrading">Opgraderer dine opgaver...</string>
-  <string name="DLG_hour_minutes">Tid (timer : minutter)</string>
-  <string name="DLG_please_update">Astrid bør opdateres til den seneste version på Android Market! Gør venligst dette før du fortsætter, eller vent nogle få sekunder.</string>
-  <string name="DLG_accept">Jeg accepterer</string>
-  <string name="DLG_decline">Jeg accepterer ikke</string>
-  <string name="DLG_eula_title">Astrid Brugsbetingelser</string>
-  <string name="DLG_loading">Indlæser...</string>
-  <string name="WID_dateButtonUnset">Tryk for at indstille</string>
-  <string name="TLA_menu_sort">Sorter &amp; skjulte</string>
-  <string name="TLA_menu_settings">Opsætning</string>
-  <string name="TLA_custom">Tilpasset</string>
-  <string-array name="TLA_filters">
-    <item>Active</item>
-    <item>I dag</item>
-    <item>Soon</item>
-    <item>Late</item>
-    <item>Færdig</item>
-    <item>Hidden</item>
-  </string-array>
-  <string-array name="TLA_priority_strings">
-    <item>highest priority</item>
-    <item>high priority</item>
-    <item>medium priority</item>
-    <item>low priority</item>
-  </string-array>
-  <string name="TAd_hiddenFormat">%s [skjult]</string>
-  <string name="TAd_deletedFormat">%s [slettet]</string>
-  <string name="TAd_actionEditTask">Rediger</string>
-  <string name="TAd_contextEditTask">Rediger opgave</string>
-  <string name="TAd_contextUndeleteTask">Gendan opgave</string>
-  <string name="TAd_contextPurgeTask">Ryd opgave</string>
-  <string name="SSD_title">Sortering og skjulte opgaver</string>
-  <string name="SSD_completed">Vis færdiggjorte opgaver</string>
-  <string name="SSD_hidden">Vis skjulte opgaver</string>
-  <string name="SSD_deleted">Vis slettede opgaver</string>
-  <string name="SSD_sort_auto">Astrid Intelligent sortering</string>
-  <string name="SSD_sort_alpha">Efter titel</string>
-  <string name="SSD_sort_due">Efter deadline</string>
-  <string name="SSD_sort_importance">Efter vigtighed</string>
-  <string name="SSD_sort_modified">Efter senest ændret</string>
-  <string name="SSD_sort_reverse">Omvendt sortering</string>
-  <string name="SSD_save_temp">Kun en gang</string>
-  <string name="SSD_save_always">Altid</string>
-  <string name="FLA_context_shortcut">Opret genvej på skrivebordet</string>
-  <string name="FLA_shortcut_dialog_title">Opret genvej</string>
-  <string name="FLA_shortcut_dialog">Navn på genvej:</string>
-  <string name="FLA_search_hint">Søg efter opgaver</string>
-  <string name="FLA_search_filter">Matcher \'%s\'</string>
-  <string name="FLA_toast_onCreateShortcut">Oprettede genvej: %s</string>
-  <string name="TEA_title_hint">Opgave Overskrift</string>
-  <string name="TEA_importance_label">Vigtighed</string>
-  <string name="TEA_urgency_specific_time">På bestemt tidspunkt?</string>
-  <string-array name="TEA_loading">
-    <item>Indlæser...</item>
-  </string-array>
-  <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>
-  <string name="TEA_menu_discard">Gem ikke</string>
-  <string name="TEA_menu_delete">Slet opgave</string>
-  <string name="TEA_onTaskSave_due">Opgave gemt: deadline %s</string>
-  <string name="TEA_onTaskSave_notDue">Opgave gemt</string>
-  <string name="TEA_tab_activity">Aktivitet</string>
-  <string name="TEA_tab_more">Mere</string>
-  <string-array name="TEA_urgency">
-    <item>No deadline</item>
-    <item>Specific day</item>
-    <item>I dag</item>
-    <item>I morgen</item>
-    <item>(dag efter)</item>
-    <item>Næste uge</item>
-    <item>In two weeks</item>
-    <item>Næste måned</item>
-  </string-array>
-  <string-array name="TEA_hideUntil">
-    <item>Altid</item>
-    <item>Due date</item>
-    <item>Due time</item>
-    <item>Dag før deadline</item>
-    <item>Uge før deadline</item>
-    <item>Specifik dag/tid</item>
-  </string-array>
-  <string name="TEA_control_who">Hvem</string>
-  <string name="TEA_control_more_section">----More Section----</string>
-  <string name="TEA_control_importance">Vigtighed</string>
-  <string name="TEA_control_notes">Noter</string>
-  <string-array name="MCA_dialog_speech_options">
-    <item>It must be nice to be so popular!</item>
-    <item>Yay! People like you!</item>
-    <item>Make their day, give \'em a call!</item>
-    <item>Wouldn\'t you be happy if people called you back?</item>
-    <item>You can do it!</item>
-    <item>You can always send a text...</item>
-  </string-array>
-  <string name="UpS_changelog_title">Hvad er nyt i Astrid</string>
-  <string name="UpS_updates_title">Seneste Astrid-nyheder</string>
-  <string name="EPr_title">Astrid: Opsætning</string>
-  <string name="EPr_appearance_header">Udseende</string>
-  <string name="EPr_fontSize_title">Opgavelistestørrelse</string>
-  <string name="EPr_fontSize_desc">Skriftstørrelse på den centrale liste</string>
-  <string name="EPr_showNotes_title">Vis noter i opgave</string>
-  <string name="EPr_showNotes_desc_enabled">Noter vises altid</string>
-  <string name="EPr_theme_desc">Nuværende: %s</string>
-  <string-array name="EPr_swipe_lists_performance_mode">
-    <item>No swipe</item>
-    <item>Conserve Memory</item>
-    <item>Normal Performance</item>
-    <item>High Performance</item>
-  </string-array>
-  <string-array name="EPr_swipe_lists_performance_desc">
-    <item>Swipe between lists is disabled</item>
-    <item>Slower performance</item>
-    <item>Default setting</item>
-    <item>Uses more system resources</item>
-  </string-array>
-  <string-array name="EPr_themes">
-    <item>Day - Blue</item>
-    <item>Day - Red</item>
-    <item>Sky blue</item>
-    <item>Night</item>
-    <item>Transparent (White Text)</item>
-    <item>Transparent (Black Text)</item>
-  </string-array>
-  <string-array name="EPr_themes_widget">
-    <item>Same as app</item>
-    <item>Day - Blue</item>
-    <item>Day - Red</item>
-    <item>Sky blue</item>
-    <item>Night</item>
-    <item>Transparent (White Text)</item>
-    <item>Transparent (Black Text)</item>
-    <item>Old Style</item>
-  </string-array>
-  <string name="AOA_title">Tilføjelser</string>
-  <string name="AOA_internal_author">Astrid team</string>
-  <string name="AOA_tab_installed">Installerede</string>
-  <string name="AOA_tab_available">Tilgængelige</string>
-  <string name="AOA_free">Gratis</string>
-  <string name="AOA_no_addons">Tom liste!</string>
-  <string name="TWi_loading">Indlæser...</string>
-  <string name="WCA_title">Vælg opgaver der skal vises...</string>
-  <string name="task_killer_help">Det ser ud som om du bruger en app der kan dræbe processer (%s)! Hvis du kan, så tilføj Astrid til udelukkelseslisten så den ikke bliver dræbt. Ellers kan Astrid muligvis ikke fortælle dig hvornår dine opgaver tidsfrist er.\n</string>
-  <string name="task_killer_help_ok">Jeg vil ikke dræbe Astrid!</string>
-  <string name="marketplace_description">Astrid er den højtelskede open-source huskeliste / opgavehåndtering designet til at hjælpe dig med at få ting ordnet. Den har påmindelser, tags, synkronisering, Locale-plug-in, et widget og meget mere.</string>
-  <string name="EPr_defaults_header">Standard for nye opgaver</string>
-  <string name="EPr_default_urgency_title">Standard Deadline</string>
-  <string name="EPr_default_urgency_desc">Nuværende: %s</string>
-  <string name="EPr_default_importance_title">Standard Vigtighed</string>
-  <string name="EPr_default_importance_desc">Nuværende: %s</string>
-  <string name="EPr_default_hideUntil_title">Standard Skjul Indtil</string>
-  <string name="EPr_default_hideUntil_desc">Nuværende: %s</string>
-  <string name="EPr_default_reminders_title">Standardpåmindelser</string>
-  <string name="EPr_default_reminders_desc">Nuværende: %s</string>
-  <string name="EPr_default_reminders_mode_desc">Nuværende: %s</string>
-  <string-array name="EPr_default_importance">
-    <item>!!! (Highest)</item>
-    <item>!!</item>
-    <item>!</item>
-    <item>o (Lowest)</item>
-  </string-array>
-  <string-array name="EPr_default_urgency">
-    <item>Ingen deadline</item>
-    <item>I dag</item>
-    <item>I morgen</item>
-    <item>I overmorgen</item>
-    <item>Næste uge</item>
-  </string-array>
-  <string-array name="EPr_default_hideUntil">
-    <item>Skjul ikke</item>
-    <item>Opgave når deadline</item>
-    <item>Dag før deadline</item>
-    <item>Uge før deadline</item>
-  </string-array>
-  <string-array name="EPr_default_reminders">
-    <item>Ingen deadline-påmindelser</item>
-    <item>Ved deadline</item>
-    <item>Ved overskredet deadline</item>
-    <item>Ved deadline eller overskredet</item>
-  </string-array>
-  <string name="BFE_Active">Aktive opgaver</string>
-  <string name="BFE_Recent">Senest ændrede</string>
-  <string name="BFE_Saved_delete">Slet filter</string>
-  <string name="CFA_title">Tilpasset filter</string>
-  <string name="CFA_filterName_hint">Navngiv dette filter for at gemme det...</string>
-  <string name="CFA_universe_all">Aktive opgaver</string>
-  <string name="CFA_type_add">eller</string>
-  <string name="CFA_type_subtract">ikke</string>
-  <string name="CFA_type_intersect">også</string>
-  <string name="CFA_context_chain">%s har kriterier</string>
-  <string name="CFA_context_delete">Slet række</string>
-  <string name="CFA_help">Denne skærm lader dig oprette et nyt filter. Tilføj kriterier ved hjælp af knappen nedenfor, tryk kort eller langt på dem for at justere, og tryk derefter \"Vis\"!</string>
-  <string name="CFA_button_add">Tilføj kriterier</string>
-  <string name="CFA_button_view">Vis</string>
-  <string name="CFA_button_save">Gem &amp; vis</string>
-  <string name="CFC_dueBefore_text">Deadline: ?</string>
-  <string name="CFC_dueBefore_name">Deadline...</string>
-  <string-array name="CFC_dueBefore_entries">
-    <item>Ingen deadline</item>
-    <item>I går</item>
-    <item>I dag</item>
-    <item>I morgen</item>
-    <item>I overmorgen</item>
-    <item>Næste uge</item>
-    <item>Næste måned</item>
-  </string-array>
-  <string name="CFC_importance_text">Vigtighed mindst ?</string>
-  <string name="CFC_importance_name">Vigtighed...</string>
-  <string name="CFC_title_contains_name">Titel indeholder...</string>
-  <string name="CFC_title_contains_text">Titel indeholder: ?</string>
-  <string name="gcal_TEA_error">Fejl ved tilføjelse af opgave til kalender!</string>
-  <string name="gcal_TEA_showCalendar_label">Åbn kalender-begivenhed</string>
-  <string name="gcal_TEA_calendar_updated">Kalenderbegivenhed også opdateret!</string>
-  <string name="gcal_completed_title">%s (fuldført)</string>
-  <string name="gcal_GCP_default">Standardkalender</string>
-  <string name="gtasks_GLA_body">Vær venlig at logge ind to Google Tasks-synkronisering (beta!). Google Apps for Domain understøttes i øjeblikket ikke, men vi arbejder på sagen!</string>
-  <string name="gtasks_GLA_further_help">For at vise dine opgaver med indryk og orden bevaret, skal du gå til Filtre-siden og vælge en Google Tasks-liste. Som standard bruger Astrid sin egen sorteringsopsætning til opgaver.</string>
-  <string name="gtasks_GLA_errorAuth_captcha">Du har muligvis støt på en captcha. Prøv at logge ind fra din standard browser, log da ind her igen:</string>
-  <string name="gtasks_GPr_header">Google Tasks (beta!)</string>
-  <string name="locale_edit_alerts_title">Astrid filter alarm</string>
-  <string name="locale_edit_intro">Astrid vil sende dig en påmindelse når du har opgaver i det følgende filter:</string>
-  <string name="locale_interval_label">Begræns påmindelser til:</string>
-  <string-array name="locale_interval">
-    <item>en gang i timen</item>
-    <item>en gang hver sjette time</item>
-    <item>en gang hver tolvte time</item>
-    <item>dagligt</item>
-    <item>en gang hver tredje dag</item>
-    <item>ugentligt</item>
-  </string-array>
-  <string name="locale_notification">Du har $NUM der matcher: $FILTER</string>
-  <string name="locale_plugin_required">Installer venligst Astrid Locale-plugin!</string>
-  <string name="opencrx_FEx_dashboard">Arbejdsområder</string>
-  <string name="opencrx_PDE_task_from">fra %s</string>
-  <string name="opencrx_TEA_notes">Tilføj en kommentar</string>
-  <string name="opencrx_no_creator">(Synkroniser ikke)</string>
-  <string name="opencrx_PLA_signIn">Log ind</string>
-  <string name="opencrx_PLA_password">Adgangskode</string>
-  <string name="opencrx_notification_text">%s opgaver opdateret / tryk for flere detaljer</string>
-  <string name="opencrx_ioerror">Forbindelsesfejl! Tjek din internetforbindelse.</string>
-  <string name="opencrx_MLA_password_empty">Adgangskode blev ikke angivet!</string>
-  <string name="opencrx_TEA_dashboard_default">&lt;Standard&gt;</string>
-  <string name="CFC_opencrx_in_workspace_text">I arbejdsområde: ?</string>
-  <string name="CFC_opencrx_in_workspace_name">I arbejdsområde...</string>
-  <string name="EPr_statistics_desc_disabled">Ingen data om brug vil blive rapporteret</string>
-  <string name="EPr_statistics_desc_enabled">Hjælp os med at forbedre Astrid ved at sende anonyme data om brug</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 name="TEA_reminder_mode_once">Ring en gang</string>
-  <string name="TEA_reminder_mode_nonstop">Ring indtil jeg slår alarmen fra</string>
-  <string-array name="TEA_reminder_random">
-    <item>an hour</item>
-    <item>a day</item>
-    <item>a week</item>
-    <item>in two weeks</item>
-    <item>a month</item>
-    <item>in two months</item>
-  </string-array>
-  <string name="rmd_NoA_filter">Påmindelse!</string>
-  <string name="rmd_NoA_done">Allerede udført!</string>
-  <string name="rmd_NoA_snooze">Slumrefunktion...</string>
-  <string-array name="rmd_reengage_notif_titles">
-    <item>A note from Astrid</item>
-    <item>Memo for %s.</item>
-    <item>Your Astrid digest</item>
-    <item>Reminders from Astrid</item>
-  </string-array>
-  <string-array name="rmd_reengage_dialog_options">
-    <item>Time to shorten your to-do list!</item>
-    <item>Dear sir or madam, some tasks await your inspection!</item>
-    <item>Hi there, could you take a look at these?</item>
-    <item>I\'ve got some tasks with your name on them!</item>
-    <item>A fresh batch of tasks for you today!</item>
-    <item>You look fabulous! Ready to get started?</item>
-    <item>A lovely day for getting some work done, I think!</item>
-  </string-array>
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>Don\'t you want to get organized?</item>
-    <item>I\'m Astrid! I\'m here to help you do more!</item>
-    <item>You look busy! Let me take some of those tasks off of your plate.</item>
-    <item>I can help you keep track of all of the details in your life.</item>
-    <item>You\'re serious about getting more done? So am I!</item>
-    <item>Pleasure to make your acquaintance!</item>
-  </string-array>
-  <string name="rmd_EPr_alerts_header">Påmindelsesopsætning</string>
-  <string name="rmd_EPr_quiet_hours_start_title">Stille timer start</string>
-  <string name="rmd_EPr_quiet_hours_start_desc">Ingen påmindelser vil blive vist efter %s</string>
-  <string name="rmd_EPr_quiet_hours_desc_none">Stille timer er deaktiveret</string>
-  <string name="rmd_EPr_quiet_hours_end_title">Stille timer slut</string>
-  <string name="rmd_EPr_ringtone_title">Påmindelsesringetone</string>
-  <string name="rmd_EPr_ringtone_desc_custom">Tilpasset ringetone er blevet sat</string>
-  <string name="rmd_EPr_ringtone_desc_silent">Ringetone sat til stille</string>
-  <string name="rmd_EPr_ringtone_desc_default">Standard ringetone vil blive brugt</string>
-  <string name="rmd_EPr_persistent_desc_true">Påmindelser skal vises individuelt for at blive ryddet</string>
-  <string name="rmd_EPr_vibrate_title">Vibrer ved påmindelse</string>
-  <string-array name="EPr_reminder_random">
-    <item>disabled</item>
-    <item>hourly</item>
-    <item>daglig</item>
-    <item>ugentlig</item>
-    <item>bi-weekly</item>
-    <item>månedlig</item>
-    <item>bi-monthly</item>
-  </string-array>
-  <string-array name="EPr_quiet_hours_start">
-    <item>disabled</item>
-    <item>8 PM</item>
-    <item>9 PM</item>
-    <item>10 PM</item>
-    <item>11 PM</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
-    <item>9 AM</item>
-    <item>10 AM</item>
-    <item>11 AM</item>
-    <item>12 PM</item>
-    <item>1 PM</item>
-    <item>2 PM</item>
-    <item>3 PM</item>
-    <item>4 PM</item>
-    <item>5 PM</item>
-    <item>6 PM</item>
-    <item>7 PM</item>
-  </string-array>
-  <string-array name="EPr_quiet_hours_end">
-    <item>9 AM</item>
-    <item>10 AM</item>
-    <item>11 AM</item>
-    <item>12 PM</item>
-    <item>1 PM</item>
-    <item>2 PM</item>
-    <item>3 PM</item>
-    <item>4 PM</item>
-    <item>5 PM</item>
-    <item>6 PM</item>
-    <item>7 PM</item>
-    <item>8 PM</item>
-    <item>9 PM</item>
-    <item>10 PM</item>
-    <item>11 PM</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
-  </string-array>
-  <string-array name="EPr_rmd_time">
-    <item>9 AM</item>
-    <item>10 AM</item>
-    <item>11 AM</item>
-    <item>12 PM</item>
-    <item>1 PM</item>
-    <item>2 PM</item>
-    <item>3 PM</item>
-    <item>4 PM</item>
-    <item>5 PM</item>
-    <item>6 PM</item>
-    <item>7 PM</item>
-    <item>8 PM</item>
-    <item>9 PM</item>
-    <item>10 PM</item>
-    <item>11 PM</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
-  </string-array>
-  <string-array name="reminders">
-    <item>Hi there! Have a sec?</item>
-    <item>Can I see you for a sec?</item>
-    <item>Have a few minutes?</item>
-    <item>Did you forget?</item>
-    <item>Undskyld mig!</item>
-    <item>When you have a minute:</item>
-    <item>On your agenda:</item>
-    <item>Free for a moment?</item>
-    <item>Astrid here!</item>
-    <item>Hi! Can I bug you?</item>
-    <item>A minute of your time?</item>
-    <item>It\'s a great day to</item>
-  </string-array>
-  <string-array name="reminders_due">
-    <item>Time to work!</item>
-    <item>Due date is here!</item>
-    <item>Klar til start?</item>
-    <item>You said you would do:</item>
-    <item>You\'re supposed to start:</item>
-    <item>Time to start:</item>
-    <item>It\'s time!</item>
-    <item>Excuse me! Time for</item>
-    <item>You free? Time to</item>
-  </string-array>
-  <string-array name="reminders_snooze">
-    <item>Don\'t be lazy now!</item>
-    <item>Snooze time is up!</item>
-    <item>No more snoozing!</item>
-    <item>Now are you ready?</item>
-    <item>No more postponing!</item>
-  </string-array>
-  <string-array name="reminder_responses">
-    <item>I\'ve got something for you!</item>
-    <item>Ready to put this in the past?</item>
-    <item>Why don\'t you get this done?</item>
-    <item>How about it? Ready tiger?</item>
-    <item>Ready to do this?</item>
-    <item>Can you handle this?</item>
-    <item>You can be happy! Just finish this!</item>
-    <item>I promise you\'ll feel better if you finish this!</item>
-    <item>Won\'t you do this today?</item>
-    <item>Please finish this, I\'m sick of it!</item>
-    <item>Can you finish this? Yes you can!</item>
-    <item>Are you ever going to do this?</item>
-    <item>Feel good about yourself! Let\'s go!</item>
-    <item>I\'m so proud of you! Lets get it done!</item>
-    <item>A little snack after you finish this?</item>
-    <item>Just this one task? Please?</item>
-    <item>Time to shorten your todo list!</item>
-    <item>Are you on Team Order or Team Chaos? Team Order! Let\'s go!</item>
-    <item>Have I mentioned you are awesome recently? Keep it up!</item>
-    <item>A task a day keeps the clutter away... Goodbye clutter!</item>
-    <item>How do you do it? Wow, I\'m impressed!</item>
-    <item>You can\'t just get by on your good looks. Let\'s get to it!</item>
-    <item>Lovely weather for a job like this, isn\'t it?</item>
-    <item>A spot of tea while you work on this?</item>
-    <item>If only you had already done this, then you could go outside and play.</item>
-    <item>It\'s time. You can\'t put off the inevitable.</item>
-    <item>I die a little every time you ignore me.</item>
-  </string-array>
-  <string-array name="postpone_nags">
-    <item>Please tell me it isn\'t true that you\'re a procrastinator!</item>
-    <item>Doesn\'t being lazy get old sometimes?</item>
-    <item>Somewhere, someone is depending on you to finish this!</item>
-    <item>When you said postpone, you really meant \'I\'m doing this\', right?</item>
-    <item>This is the last time you postpone this, right?</item>
-    <item>Just finish this today, I won\'t tell anyone!</item>
-    <item>Why postpone when you can um... not postpone!</item>
-    <item>You\'ll finish this eventually, I presume?</item>
-    <item>I think you\'re really great! How about not putting this off?</item>
-    <item>Will you be able to achieve your goals if you do that?</item>
-    <item>Postpone, postpone, postpone. When will you change!</item>
-    <item>I\'ve had enough with your excuses! Just do it already!</item>
-    <item>Didn\'t you make that excuse last time?</item>
-    <item>I can\'t help you organize your life if you do that...</item>
-  </string-array>
-  <string name="repeat_enabled">Gentagelser</string>
-  <string-array name="repeat_interval_short">
-    <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">
-    <item>Dag(e)</item>
-    <item>Uge(r)</item>
-    <item>Måned(er)</item>
-    <item>Time(r)</item>
-    <item>Minut(er)</item>
-    <item>Year(s)</item>
-  </string-array>
-  <string-array name="repeat_until_shortcuts">
-    <item>Forever</item>
-    <item>Specific Day</item>
-    <item>Today</item>
-    <item>Tomorrow</item>
-    <item>(day after)</item>
-    <item>Next Week</item>
-    <item>In Two Weeks</item>
-    <item>Next Month</item>
-  </string-array>
-  <string-array name="repeat_type">
-    <item>from due date</item>
-    <item>from completion date</item>
-  </string-array>
-  <string-array name="repeat_encouragement">
-    <item>Good job!</item>
-    <item>Wow… I\'m so proud of you!</item>
-    <item>I love when you\'re productive!</item>
-    <item>Doesn\'t it feel good to check something off?</item>
-  </string-array>
-  <string-array name="repeat_encouragement_last_time">
-    <item>Good job!</item>
-    <item>I\'m so proud of you!</item>
-    <item>I love when you\'re productive!</item>
-  </string-array>
-  <string name="tag_settings_title">Settings:</string>
-  <string name="welcome_title_1">Velkommen til Astrid!</string>
-  <string name="welcome_body_5">and much more!</string>
-  <string name="PPW_configure_title">Konfigurer Widget</string>
-  <string name="PPW_color">Widget farve</string>
-  <string name="PPW_enable_calendar">Vis kalenderbegivenheder</string>
-  <string name="PPW_filter">Vælg filter</string>
-  <string name="PPW_due">Forfalder:</string>
-  <string name="PPW_past_due">Efter forfaldsdato:</string>
-  <string name="PPW_old_astrid_notice">Du skal mindste bruge version 3.6 af Astrid for at bruge denne widget. Beklager!</string>
-  <string-array name="PPW_encouragements">
-    <item>Hi there!</item>
-    <item>Har du tid til at færdiggøre noget?</item>
-    <item>Gosh, you are looking suave today!</item>
-    <item>Lav noget godt i dag!</item>
-    <item>Gør mig stolt i dag!</item>
-    <item>Hvordan har du det i dag?</item>
-  </string-array>
-  <string-array name="PPW_encouragements_tod">
-    <item>Good morning!</item>
-    <item>Good afternoon!</item>
-    <item>Good evening!</item>
-    <item>Late night?</item>
-    <item>It\'s early, get something done!</item>
-    <item>Afternoon tea, perhaps?</item>
-    <item>Enjoy the evening!</item>
-    <item>Sleep is good for you, you know!</item>
-  </string-array>
-  <string-array name="PPW_encouragements_completed">
-    <item>You\'ve already completed %d tasks!</item>
-    <item>Score in life: %d tasks completed</item>
-    <item>Smile! You\'ve already finished %d tasks!</item>
-  </string-array>
-  <string-array name="PPW_colors">
-    <item>Black</item>
-    <item>White</item>
-    <item>Blue</item>
-    <item>Translucent</item>
-  </string-array>
+    <string name="actfm_person_hint">Kontaktperson eller email</string>
+    <string name="actfm_person_or_tag_hint">Kontaktperson eller delt liste</string>
+    <string name="actfm_tag_operation_owner_delete">Du er ejeren af dette delte nøgleord! Hvis du
+        sletter det, bliver det slettet for alle liste medlemmer. Er du sikker på du vil fortsætte?
+    </string>
+    <string name="actfm_picture_camera">Tag et billede</string>
+    <string name="actfm_picture_gallery">Vælg fra galleri</string>
+    <string name="actfm_picture_clear">Ryd markering</string>
+    <string name="actfm_view_task_title">Vis opgave?</string>
+    <string name="actfm_view_task_text">Opgaven blev sendt til %s! Du ser lige nu dine egne opgaver.
+        Vil du se disse og andre opgaver, du har tildelt?
+    </string>
+    <string name="actfm_view_task_ok">Vis tildelte</string>
+    <string name="actfm_view_task_cancel">Bliv her</string>
+    <string name="actfm_my_shared_tasks_title">Mine delte opgaver</string>
+    <string name="actfm_my_shared_tasks_empty">Ingen delte opgaver</string>
+    <string name="TVA_add_comment">Tilføj en kommentar</string>
+    <string-array name="TVA_tabs">
+        <item>Opgaver</item>
+        <item>Aktivitet</item>
+        <item>Listeindstillinger</item>
+    </string-array>
+    <string name="actfm_TVA_filtered_by_assign">%s\'s opgaver. Tryk for alle</string>
+    <string name="actfm_TVA_filter_by_unassigned">Ufordelte opgaver. Tryk for alle</string>
+    <string name="actfm_TVA_no_members_alert">Privat: tryk for at redigere eller dele listen
+    </string>
+    <string name="actfm_TVA_menu_refresh">Opdater</string>
+    <string name="actfm_TVA_tag_label">Listenavn</string>
+    <string name="actfm_TVA_members_label">Delt med</string>
+    <string name="actfm_TVA_tag_picture">Liste billede</string>
+    <string name="actfm_EPA_intro">Brug Astrid til at dele indkøbssedler, festplaner eller
+        projektplaner og følg løbende med i, hvornår folk får afsluttet opgaver!
+    </string>
+    <string name="actfm_EPA_assign_me">Mig</string>
+    <string name="actfm_EPA_unassigned">Hvem som helst</string>
+    <string name="actfm_EPA_share_with">Del med:</string>
+    <string name="actfm_EPA_collaborators_header">Del med venner</string>
+    <string name="actfm_EPA_message_body">Hjælp mig med at få opgaven færdig!</string>
+    <string name="actfm_EPA_invalid_email">Forkert emailadresse: %s</string>
+    <string name="actfm_ALA_title">Velkommen til Astrid.com</string>
+    <string name="actfm_ALA_email_label">E-mail</string>
+    <string name="actfm_ALA_password_label">Adgangskode</string>
+    <string name="actfm_ALA_signup_title">Opret ny brugerkonto</string>
+    <string name="actfm_ALA_login_title">Login på Astrid.com</string>
+    <string name="actfm_OLA_prompt">Forbind venligst til Google:</string>
+    <string name="actfm_https_title">Brug HTTPS</string>
+    <string name="actfm_https_enabled">HTTPS aktiveret (langsommere)</string>
+    <string name="actfm_https_disabled">HTTPS deaktiveret (hurtigere)</string>
+    <string name="alarm_ACS_label">Alarmer</string>
+    <string name="alarm_ACS_button">Tilføj en alarm</string>
+    <string-array name="reminders_alarm">
+        <item>Alarm!</item>
+    </string-array>
+    <string name="backup_BPr_header">Backup</string>
+    <string name="backup_status_success">Sidste sikkerhedskopi:\n%s</string>
+    <string name="backup_status_failed">Seneste backup fejlede</string>
+    <string name="backup_status_failed_subtitle">(tryk for at vise fejl)</string>
+    <string name="backup_status_never">Har aldrig taget backup!</string>
+    <string name="backup_BPr_group_options">Indstillinger</string>
+    <string name="backup_BPr_auto_title">Automatisk backup</string>
+    <string name="backup_BPr_auto_disabled">Automatisk backup deaktiveret</string>
+    <string name="backup_BPr_auto_enabled">Backup vil ske dagligt</string>
+    <string name="backup_BAc_label">Håndter sikkerhedskopier</string>
+    <string name="backup_BAc_title">Håndter dine sikkerhedskopier</string>
+    <string name="backup_BAc_import">Importér opgaver</string>
+    <string name="backup_BAc_export">Eksportér opgaver</string>
+    <string name="backup_TXI_error">Importfejl</string>
+    <string name="export_toast">Sikkerhedskopierede %1$s til %2$s.</string>
+    <string name="export_toast_no_tasks">Ingen opgaver at eksportere</string>
+    <string name="export_progress_title">Eksporterer...</string>
+    <string name="import_summary_title">Opsummering af gendannelse</string>
+    <string name="import_summary_message">Filen %1$s indeholdt %2$s.\n\n %3$s importeret,\n %4$s
+        findes allerede\n %5$s indeholdt fejl\n
+    </string>
+    <string name="import_progress_title">Importerer...</string>
+    <string name="import_progress_read">Læser opgave %d...</string>
+    <string name="DLG_error_sdcard">Kan ikke få adgang til mappen: %s</string>
+    <string name="DLG_error_sdcard_general">Kan ikke få adgang til dig SD-kort!</string>
+    <string name="import_file_prompt">Vælg en fil for at gendanne</string>
+    <string name="app_name">Astrid Opgaver</string>
+    <string name="read_permission_label">Astrid Tilladelser</string>
+    <string name="read_permission_desc">læs opgaver, vis opgavefiltre</string>
+    <string name="write_permission_label">Astrid Tilladelser</string>
+    <string name="write_permission_desc">opret nye opgaver, rediger eksisterende opgaver</string>
+    <string name="DLG_delete_this_task_question">Slet denne opgave?</string>
+    <string name="DLG_delete_this_item_question">Slet dette element: %s?</string>
+    <string name="DLG_upgrading">Opgraderer dine opgaver...</string>
+    <string name="DLG_hour_minutes">Tid (timer : minutter)</string>
+    <string name="DLG_please_update">Astrid bør opdateres til den seneste version på Android Market!
+        Gør venligst dette før du fortsætter, eller vent nogle få sekunder.
+    </string>
+    <string name="DLG_accept">Jeg accepterer</string>
+    <string name="DLG_decline">Jeg accepterer ikke</string>
+    <string name="DLG_eula_title">Astrid Brugsbetingelser</string>
+    <string name="DLG_loading">Indlæser...</string>
+    <string name="WID_dateButtonUnset">Tryk for at indstille</string>
+    <string name="TLA_menu_sort">Sorter &amp; skjulte</string>
+    <string name="TLA_menu_settings">Opsætning</string>
+    <string name="TLA_custom">Tilpasset</string>
+    <string-array name="TLA_filters">
+        <item>Active</item>
+        <item>I dag</item>
+        <item>Soon</item>
+        <item>Late</item>
+        <item>Færdig</item>
+        <item>Hidden</item>
+    </string-array>
+    <string-array name="TLA_priority_strings">
+        <item>highest priority</item>
+        <item>high priority</item>
+        <item>medium priority</item>
+        <item>low priority</item>
+    </string-array>
+    <string name="TAd_hiddenFormat">%s [skjult]</string>
+    <string name="TAd_deletedFormat">%s [slettet]</string>
+    <string name="TAd_actionEditTask">Rediger</string>
+    <string name="TAd_contextEditTask">Rediger opgave</string>
+    <string name="TAd_contextUndeleteTask">Gendan opgave</string>
+    <string name="TAd_contextPurgeTask">Ryd opgave</string>
+    <string name="SSD_title">Sortering og skjulte opgaver</string>
+    <string name="SSD_completed">Vis færdiggjorte opgaver</string>
+    <string name="SSD_hidden">Vis skjulte opgaver</string>
+    <string name="SSD_deleted">Vis slettede opgaver</string>
+    <string name="SSD_sort_auto">Astrid Intelligent sortering</string>
+    <string name="SSD_sort_alpha">Efter titel</string>
+    <string name="SSD_sort_due">Efter deadline</string>
+    <string name="SSD_sort_importance">Efter vigtighed</string>
+    <string name="SSD_sort_modified">Efter senest ændret</string>
+    <string name="SSD_sort_reverse">Omvendt sortering</string>
+    <string name="SSD_save_temp">Kun en gang</string>
+    <string name="SSD_save_always">Altid</string>
+    <string name="FLA_context_shortcut">Opret genvej på skrivebordet</string>
+    <string name="FLA_shortcut_dialog_title">Opret genvej</string>
+    <string name="FLA_shortcut_dialog">Navn på genvej:</string>
+    <string name="FLA_search_hint">Søg efter opgaver</string>
+    <string name="FLA_search_filter">Matcher \'%s\'</string>
+    <string name="FLA_toast_onCreateShortcut">Oprettede genvej: %s</string>
+    <string name="TEA_title_hint">Opgave Overskrift</string>
+    <string name="TEA_importance_label">Vigtighed</string>
+    <string name="TEA_urgency_specific_time">På bestemt tidspunkt?</string>
+    <string-array name="TEA_loading">
+        <item>Indlæser...</item>
+    </string-array>
+    <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>
+    <string name="TEA_menu_discard">Gem ikke</string>
+    <string name="TEA_menu_delete">Slet opgave</string>
+    <string name="TEA_onTaskSave_due">Opgave gemt: deadline %s</string>
+    <string name="TEA_onTaskSave_notDue">Opgave gemt</string>
+    <string name="TEA_tab_activity">Aktivitet</string>
+    <string name="TEA_tab_more">Mere</string>
+    <string-array name="TEA_urgency">
+        <item>No deadline</item>
+        <item>Specific day</item>
+        <item>I dag</item>
+        <item>I morgen</item>
+        <item>(dag efter)</item>
+        <item>Næste uge</item>
+        <item>In two weeks</item>
+        <item>Næste måned</item>
+    </string-array>
+    <string-array name="TEA_hideUntil">
+        <item>Altid</item>
+        <item>Due date</item>
+        <item>Due time</item>
+        <item>Dag før deadline</item>
+        <item>Uge før deadline</item>
+        <item>Specifik dag/tid</item>
+    </string-array>
+    <string name="TEA_control_who">Hvem</string>
+    <string name="TEA_control_more_section">----More Section----</string>
+    <string name="TEA_control_importance">Vigtighed</string>
+    <string name="TEA_control_notes">Noter</string>
+    <string-array name="MCA_dialog_speech_options">
+        <item>It must be nice to be so popular!</item>
+        <item>Yay! People like you!</item>
+        <item>Make their day, give \'em a call!</item>
+        <item>Wouldn\'t you be happy if people called you back?</item>
+        <item>You can do it!</item>
+        <item>You can always send a text...</item>
+    </string-array>
+    <string name="UpS_changelog_title">Hvad er nyt i Astrid</string>
+    <string name="UpS_updates_title">Seneste Astrid-nyheder</string>
+    <string name="EPr_title">Astrid: Opsætning</string>
+    <string name="EPr_appearance_header">Udseende</string>
+    <string name="EPr_fontSize_title">Opgavelistestørrelse</string>
+    <string name="EPr_fontSize_desc">Skriftstørrelse på den centrale liste</string>
+    <string name="EPr_showNotes_title">Vis noter i opgave</string>
+    <string name="EPr_showNotes_desc_enabled">Noter vises altid</string>
+    <string name="EPr_theme_desc">Nuværende: %s</string>
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>No swipe</item>
+        <item>Conserve Memory</item>
+        <item>Normal Performance</item>
+        <item>High Performance</item>
+    </string-array>
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <item>Swipe between lists is disabled</item>
+        <item>Slower performance</item>
+        <item>Default setting</item>
+        <item>Uses more system resources</item>
+    </string-array>
+    <string-array name="EPr_themes">
+        <item>Day - Blue</item>
+        <item>Day - Red</item>
+        <item>Sky blue</item>
+        <item>Night</item>
+        <item>Transparent (White Text)</item>
+        <item>Transparent (Black Text)</item>
+    </string-array>
+    <string-array name="EPr_themes_widget">
+        <item>Same as app</item>
+        <item>Day - Blue</item>
+        <item>Day - Red</item>
+        <item>Sky blue</item>
+        <item>Night</item>
+        <item>Transparent (White Text)</item>
+        <item>Transparent (Black Text)</item>
+        <item>Old Style</item>
+    </string-array>
+    <string name="AOA_title">Tilføjelser</string>
+    <string name="AOA_internal_author">Astrid team</string>
+    <string name="AOA_tab_installed">Installerede</string>
+    <string name="AOA_tab_available">Tilgængelige</string>
+    <string name="AOA_free">Gratis</string>
+    <string name="AOA_no_addons">Tom liste!</string>
+    <string name="TWi_loading">Indlæser...</string>
+    <string name="WCA_title">Vælg opgaver der skal vises...</string>
+    <string name="task_killer_help">Det ser ud som om du bruger en app der kan dræbe processer (%s)!
+        Hvis du kan, så tilføj Astrid til udelukkelseslisten så den ikke bliver dræbt. Ellers kan
+        Astrid muligvis ikke fortælle dig hvornår dine opgaver tidsfrist er.\n
+    </string>
+    <string name="task_killer_help_ok">Jeg vil ikke dræbe Astrid!</string>
+    <string name="marketplace_description">Astrid er den højtelskede open-source huskeliste /
+        opgavehåndtering designet til at hjælpe dig med at få ting ordnet. Den har påmindelser,
+        tags, synkronisering, Locale-plug-in, et widget og meget mere.
+    </string>
+    <string name="EPr_defaults_header">Standard for nye opgaver</string>
+    <string name="EPr_default_urgency_title">Standard Deadline</string>
+    <string name="EPr_default_urgency_desc">Nuværende: %s</string>
+    <string name="EPr_default_importance_title">Standard Vigtighed</string>
+    <string name="EPr_default_importance_desc">Nuværende: %s</string>
+    <string name="EPr_default_hideUntil_title">Standard Skjul Indtil</string>
+    <string name="EPr_default_hideUntil_desc">Nuværende: %s</string>
+    <string name="EPr_default_reminders_title">Standardpåmindelser</string>
+    <string name="EPr_default_reminders_desc">Nuværende: %s</string>
+    <string name="EPr_default_reminders_mode_desc">Nuværende: %s</string>
+    <string-array name="EPr_default_importance">
+        <item>!!! (Highest)</item>
+        <item>!!</item>
+        <item>!</item>
+        <item>o (Lowest)</item>
+    </string-array>
+    <string-array name="EPr_default_urgency">
+        <item>Ingen deadline</item>
+        <item>I dag</item>
+        <item>I morgen</item>
+        <item>I overmorgen</item>
+        <item>Næste uge</item>
+    </string-array>
+    <string-array name="EPr_default_hideUntil">
+        <item>Skjul ikke</item>
+        <item>Opgave når deadline</item>
+        <item>Dag før deadline</item>
+        <item>Uge før deadline</item>
+    </string-array>
+    <string-array name="EPr_default_reminders">
+        <item>Ingen deadline-påmindelser</item>
+        <item>Ved deadline</item>
+        <item>Ved overskredet deadline</item>
+        <item>Ved deadline eller overskredet</item>
+    </string-array>
+    <string name="BFE_Active">Aktive opgaver</string>
+    <string name="BFE_Recent">Senest ændrede</string>
+    <string name="BFE_Saved_delete">Slet filter</string>
+    <string name="CFA_title">Tilpasset filter</string>
+    <string name="CFA_filterName_hint">Navngiv dette filter for at gemme det...</string>
+    <string name="CFA_universe_all">Aktive opgaver</string>
+    <string name="CFA_type_add">eller</string>
+    <string name="CFA_type_subtract">ikke</string>
+    <string name="CFA_type_intersect">også</string>
+    <string name="CFA_context_chain">%s har kriterier</string>
+    <string name="CFA_context_delete">Slet række</string>
+    <string name="CFA_help">Denne skærm lader dig oprette et nyt filter. Tilføj kriterier ved hjælp
+        af knappen nedenfor, tryk kort eller langt på dem for at justere, og tryk derefter \"Vis\"!
+    </string>
+    <string name="CFA_button_add">Tilføj kriterier</string>
+    <string name="CFA_button_view">Vis</string>
+    <string name="CFA_button_save">Gem &amp; vis</string>
+    <string name="CFC_dueBefore_text">Deadline: ?</string>
+    <string name="CFC_dueBefore_name">Deadline...</string>
+    <string-array name="CFC_dueBefore_entries">
+        <item>Ingen deadline</item>
+        <item>I går</item>
+        <item>I dag</item>
+        <item>I morgen</item>
+        <item>I overmorgen</item>
+        <item>Næste uge</item>
+        <item>Næste måned</item>
+    </string-array>
+    <string name="CFC_importance_text">Vigtighed mindst ?</string>
+    <string name="CFC_importance_name">Vigtighed...</string>
+    <string name="CFC_title_contains_name">Titel indeholder...</string>
+    <string name="CFC_title_contains_text">Titel indeholder: ?</string>
+    <string name="gcal_TEA_error">Fejl ved tilføjelse af opgave til kalender!</string>
+    <string name="gcal_TEA_showCalendar_label">Åbn kalender-begivenhed</string>
+    <string name="gcal_TEA_calendar_updated">Kalenderbegivenhed også opdateret!</string>
+    <string name="gcal_completed_title">%s (fuldført)</string>
+    <string name="gcal_GCP_default">Standardkalender</string>
+    <string name="gtasks_GLA_body">Vær venlig at logge ind to Google Tasks-synkronisering (beta!).
+        Google Apps for Domain understøttes i øjeblikket ikke, men vi arbejder på sagen!
+    </string>
+    <string name="gtasks_GLA_further_help">For at vise dine opgaver med indryk og orden bevaret,
+        skal du gå til Filtre-siden og vælge en Google Tasks-liste. Som standard bruger Astrid sin
+        egen sorteringsopsætning til opgaver.
+    </string>
+    <string name="gtasks_GLA_errorAuth_captcha">Du har muligvis støt på en captcha. Prøv at logge
+        ind fra din standard browser, log da ind her igen:
+    </string>
+    <string name="gtasks_GPr_header">Google Tasks (beta!)</string>
+    <string name="locale_edit_alerts_title">Astrid filter alarm</string>
+    <string name="locale_edit_intro">Astrid vil sende dig en påmindelse når du har opgaver i det
+        følgende filter:
+    </string>
+    <string name="locale_interval_label">Begræns påmindelser til:</string>
+    <string-array name="locale_interval">
+        <item>en gang i timen</item>
+        <item>en gang hver sjette time</item>
+        <item>en gang hver tolvte time</item>
+        <item>dagligt</item>
+        <item>en gang hver tredje dag</item>
+        <item>ugentligt</item>
+    </string-array>
+    <string name="locale_notification">Du har $NUM der matcher: $FILTER</string>
+    <string name="locale_plugin_required">Installer venligst Astrid Locale-plugin!</string>
+    <string name="opencrx_FEx_dashboard">Arbejdsområder</string>
+    <string name="opencrx_PDE_task_from">fra %s</string>
+    <string name="opencrx_TEA_notes">Tilføj en kommentar</string>
+    <string name="opencrx_no_creator">(Synkroniser ikke)</string>
+    <string name="opencrx_PLA_signIn">Log ind</string>
+    <string name="opencrx_PLA_password">Adgangskode</string>
+    <string name="opencrx_notification_text">%s opgaver opdateret / tryk for flere detaljer</string>
+    <string name="opencrx_ioerror">Forbindelsesfejl! Tjek din internetforbindelse.</string>
+    <string name="opencrx_MLA_password_empty">Adgangskode blev ikke angivet!</string>
+    <string name="opencrx_TEA_dashboard_default">&lt;Standard&gt;</string>
+    <string name="CFC_opencrx_in_workspace_text">I arbejdsområde: ?</string>
+    <string name="CFC_opencrx_in_workspace_name">I arbejdsområde...</string>
+    <string name="EPr_statistics_desc_disabled">Ingen data om brug vil blive rapporteret</string>
+    <string name="EPr_statistics_desc_enabled">Hjælp os med at forbedre Astrid ved at sende anonyme
+        data om brug
+    </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 name="TEA_reminder_mode_once">Ring en gang</string>
+    <string name="TEA_reminder_mode_nonstop">Ring indtil jeg slår alarmen fra</string>
+    <string-array name="TEA_reminder_random">
+        <item>an hour</item>
+        <item>a day</item>
+        <item>a week</item>
+        <item>in two weeks</item>
+        <item>a month</item>
+        <item>in two months</item>
+    </string-array>
+    <string name="rmd_NoA_filter">Påmindelse!</string>
+    <string name="rmd_NoA_done">Allerede udført!</string>
+    <string name="rmd_NoA_snooze">Slumrefunktion...</string>
+    <string-array name="rmd_reengage_notif_titles">
+        <item>A note from Astrid</item>
+        <item>Memo for %s.</item>
+        <item>Your Astrid digest</item>
+        <item>Reminders from Astrid</item>
+    </string-array>
+    <string-array name="rmd_reengage_dialog_options">
+        <item>Time to shorten your to-do list!</item>
+        <item>Dear sir or madam, some tasks await your inspection!</item>
+        <item>Hi there, could you take a look at these?</item>
+        <item>I\'ve got some tasks with your name on them!</item>
+        <item>A fresh batch of tasks for you today!</item>
+        <item>You look fabulous! Ready to get started?</item>
+        <item>A lovely day for getting some work done, I think!</item>
+    </string-array>
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>Don\'t you want to get organized?</item>
+        <item>I\'m Astrid! I\'m here to help you do more!</item>
+        <item>You look busy! Let me take some of those tasks off of your plate.</item>
+        <item>I can help you keep track of all of the details in your life.</item>
+        <item>You\'re serious about getting more done? So am I!</item>
+        <item>Pleasure to make your acquaintance!</item>
+    </string-array>
+    <string name="rmd_EPr_alerts_header">Påmindelsesopsætning</string>
+    <string name="rmd_EPr_quiet_hours_start_title">Stille timer start</string>
+    <string name="rmd_EPr_quiet_hours_start_desc">Ingen påmindelser vil blive vist efter %s</string>
+    <string name="rmd_EPr_quiet_hours_desc_none">Stille timer er deaktiveret</string>
+    <string name="rmd_EPr_quiet_hours_end_title">Stille timer slut</string>
+    <string name="rmd_EPr_ringtone_title">Påmindelsesringetone</string>
+    <string name="rmd_EPr_ringtone_desc_custom">Tilpasset ringetone er blevet sat</string>
+    <string name="rmd_EPr_ringtone_desc_silent">Ringetone sat til stille</string>
+    <string name="rmd_EPr_ringtone_desc_default">Standard ringetone vil blive brugt</string>
+    <string name="rmd_EPr_persistent_desc_true">Påmindelser skal vises individuelt for at blive
+        ryddet
+    </string>
+    <string name="rmd_EPr_vibrate_title">Vibrer ved påmindelse</string>
+    <string-array name="EPr_reminder_random">
+        <item>disabled</item>
+        <item>hourly</item>
+        <item>daglig</item>
+        <item>ugentlig</item>
+        <item>bi-weekly</item>
+        <item>månedlig</item>
+        <item>bi-monthly</item>
+    </string-array>
+    <string-array name="EPr_quiet_hours_start">
+        <item>disabled</item>
+        <item>8 PM</item>
+        <item>9 PM</item>
+        <item>10 PM</item>
+        <item>11 PM</item>
+        <item>12 AM</item>
+        <item>1 AM</item>
+        <item>2 AM</item>
+        <item>3 AM</item>
+        <item>4 AM</item>
+        <item>5 AM</item>
+        <item>6 AM</item>
+        <item>7 AM</item>
+        <item>8 AM</item>
+        <item>9 AM</item>
+        <item>10 AM</item>
+        <item>11 AM</item>
+        <item>12 PM</item>
+        <item>1 PM</item>
+        <item>2 PM</item>
+        <item>3 PM</item>
+        <item>4 PM</item>
+        <item>5 PM</item>
+        <item>6 PM</item>
+        <item>7 PM</item>
+    </string-array>
+    <string-array name="EPr_quiet_hours_end">
+        <item>9 AM</item>
+        <item>10 AM</item>
+        <item>11 AM</item>
+        <item>12 PM</item>
+        <item>1 PM</item>
+        <item>2 PM</item>
+        <item>3 PM</item>
+        <item>4 PM</item>
+        <item>5 PM</item>
+        <item>6 PM</item>
+        <item>7 PM</item>
+        <item>8 PM</item>
+        <item>9 PM</item>
+        <item>10 PM</item>
+        <item>11 PM</item>
+        <item>12 AM</item>
+        <item>1 AM</item>
+        <item>2 AM</item>
+        <item>3 AM</item>
+        <item>4 AM</item>
+        <item>5 AM</item>
+        <item>6 AM</item>
+        <item>7 AM</item>
+        <item>8 AM</item>
+    </string-array>
+    <string-array name="EPr_rmd_time">
+        <item>9 AM</item>
+        <item>10 AM</item>
+        <item>11 AM</item>
+        <item>12 PM</item>
+        <item>1 PM</item>
+        <item>2 PM</item>
+        <item>3 PM</item>
+        <item>4 PM</item>
+        <item>5 PM</item>
+        <item>6 PM</item>
+        <item>7 PM</item>
+        <item>8 PM</item>
+        <item>9 PM</item>
+        <item>10 PM</item>
+        <item>11 PM</item>
+        <item>12 AM</item>
+        <item>1 AM</item>
+        <item>2 AM</item>
+        <item>3 AM</item>
+        <item>4 AM</item>
+        <item>5 AM</item>
+        <item>6 AM</item>
+        <item>7 AM</item>
+        <item>8 AM</item>
+    </string-array>
+    <string-array name="reminders">
+        <item>Hi there! Have a sec?</item>
+        <item>Can I see you for a sec?</item>
+        <item>Have a few minutes?</item>
+        <item>Did you forget?</item>
+        <item>Undskyld mig!</item>
+        <item>When you have a minute:</item>
+        <item>On your agenda:</item>
+        <item>Free for a moment?</item>
+        <item>Astrid here!</item>
+        <item>Hi! Can I bug you?</item>
+        <item>A minute of your time?</item>
+        <item>It\'s a great day to</item>
+    </string-array>
+    <string-array name="reminders_due">
+        <item>Time to work!</item>
+        <item>Due date is here!</item>
+        <item>Klar til start?</item>
+        <item>You said you would do:</item>
+        <item>You\'re supposed to start:</item>
+        <item>Time to start:</item>
+        <item>It\'s time!</item>
+        <item>Excuse me! Time for</item>
+        <item>You free? Time to</item>
+    </string-array>
+    <string-array name="reminders_snooze">
+        <item>Don\'t be lazy now!</item>
+        <item>Snooze time is up!</item>
+        <item>No more snoozing!</item>
+        <item>Now are you ready?</item>
+        <item>No more postponing!</item>
+    </string-array>
+    <string-array name="reminder_responses">
+        <item>I\'ve got something for you!</item>
+        <item>Ready to put this in the past?</item>
+        <item>Why don\'t you get this done?</item>
+        <item>How about it? Ready tiger?</item>
+        <item>Ready to do this?</item>
+        <item>Can you handle this?</item>
+        <item>You can be happy! Just finish this!</item>
+        <item>I promise you\'ll feel better if you finish this!</item>
+        <item>Won\'t you do this today?</item>
+        <item>Please finish this, I\'m sick of it!</item>
+        <item>Can you finish this? Yes you can!</item>
+        <item>Are you ever going to do this?</item>
+        <item>Feel good about yourself! Let\'s go!</item>
+        <item>I\'m so proud of you! Lets get it done!</item>
+        <item>A little snack after you finish this?</item>
+        <item>Just this one task? Please?</item>
+        <item>Time to shorten your todo list!</item>
+        <item>Are you on Team Order or Team Chaos? Team Order! Let\'s go!</item>
+        <item>Have I mentioned you are awesome recently? Keep it up!</item>
+        <item>A task a day keeps the clutter away... Goodbye clutter!</item>
+        <item>How do you do it? Wow, I\'m impressed!</item>
+        <item>You can\'t just get by on your good looks. Let\'s get to it!</item>
+        <item>Lovely weather for a job like this, isn\'t it?</item>
+        <item>A spot of tea while you work on this?</item>
+        <item>If only you had already done this, then you could go outside and play.</item>
+        <item>It\'s time. You can\'t put off the inevitable.</item>
+        <item>I die a little every time you ignore me.</item>
+    </string-array>
+    <string-array name="postpone_nags">
+        <item>Please tell me it isn\'t true that you\'re a procrastinator!</item>
+        <item>Doesn\'t being lazy get old sometimes?</item>
+        <item>Somewhere, someone is depending on you to finish this!</item>
+        <item>When you said postpone, you really meant \'I\'m doing this\', right?</item>
+        <item>This is the last time you postpone this, right?</item>
+        <item>Just finish this today, I won\'t tell anyone!</item>
+        <item>Why postpone when you can um... not postpone!</item>
+        <item>You\'ll finish this eventually, I presume?</item>
+        <item>I think you\'re really great! How about not putting this off?</item>
+        <item>Will you be able to achieve your goals if you do that?</item>
+        <item>Postpone, postpone, postpone. When will you change!</item>
+        <item>I\'ve had enough with your excuses! Just do it already!</item>
+        <item>Didn\'t you make that excuse last time?</item>
+        <item>I can\'t help you organize your life if you do that...</item>
+    </string-array>
+    <string name="repeat_enabled">Gentagelser</string>
+    <string-array name="repeat_interval_short">
+        <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">
+        <item>Dag(e)</item>
+        <item>Uge(r)</item>
+        <item>Måned(er)</item>
+        <item>Time(r)</item>
+        <item>Minut(er)</item>
+        <item>Year(s)</item>
+    </string-array>
+    <string-array name="repeat_until_shortcuts">
+        <item>Forever</item>
+        <item>Specific Day</item>
+        <item>Today</item>
+        <item>Tomorrow</item>
+        <item>(day after)</item>
+        <item>Next Week</item>
+        <item>In Two Weeks</item>
+        <item>Next Month</item>
+    </string-array>
+    <string-array name="repeat_type">
+        <item>from due date</item>
+        <item>from completion date</item>
+    </string-array>
+    <string-array name="repeat_encouragement">
+        <item>Good job!</item>
+        <item>Wow… I\'m so proud of you!</item>
+        <item>I love when you\'re productive!</item>
+        <item>Doesn\'t it feel good to check something off?</item>
+    </string-array>
+    <string-array name="repeat_encouragement_last_time">
+        <item>Good job!</item>
+        <item>I\'m so proud of you!</item>
+        <item>I love when you\'re productive!</item>
+    </string-array>
+    <string name="tag_settings_title">Settings:</string>
+    <string name="welcome_title_1">Velkommen til Astrid!</string>
+    <string name="welcome_body_5">and much more!</string>
+    <string name="PPW_configure_title">Konfigurer Widget</string>
+    <string name="PPW_color">Widget farve</string>
+    <string name="PPW_enable_calendar">Vis kalenderbegivenheder</string>
+    <string name="PPW_filter">Vælg filter</string>
+    <string name="PPW_due">Forfalder:</string>
+    <string name="PPW_past_due">Efter forfaldsdato:</string>
+    <string name="PPW_old_astrid_notice">Du skal mindste bruge version 3.6 af Astrid for at bruge
+        denne widget. Beklager!
+    </string>
+    <string-array name="PPW_encouragements">
+        <item>Hi there!</item>
+        <item>Har du tid til at færdiggøre noget?</item>
+        <item>Gosh, you are looking suave today!</item>
+        <item>Lav noget godt i dag!</item>
+        <item>Gør mig stolt i dag!</item>
+        <item>Hvordan har du det i dag?</item>
+    </string-array>
+    <string-array name="PPW_encouragements_tod">
+        <item>Good morning!</item>
+        <item>Good afternoon!</item>
+        <item>Good evening!</item>
+        <item>Late night?</item>
+        <item>It\'s early, get something done!</item>
+        <item>Afternoon tea, perhaps?</item>
+        <item>Enjoy the evening!</item>
+        <item>Sleep is good for you, you know!</item>
+    </string-array>
+    <string-array name="PPW_encouragements_completed">
+        <item>You\'ve already completed %d tasks!</item>
+        <item>Score in life: %d tasks completed</item>
+        <item>Smile! You\'ve already finished %d tasks!</item>
+    </string-array>
+    <string-array name="PPW_colors">
+        <item>Black</item>
+        <item>White</item>
+        <item>Blue</item>
+        <item>Translucent</item>
+    </string-array>
 </resources>
diff --git a/astrid/res/values-de/strings.xml b/astrid/res/values-de/strings.xml
index c7038130b..36a62e545 100755
--- a/astrid/res/values-de/strings.xml
+++ b/astrid/res/values-de/strings.xml
@@ -4,1686 +4,1860 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ================================================== general terms == -->
-
-  <!-- People Editing Activity -->    
-  
-  <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
-  <string name="actfm_person_hint">Kontakt</string>
-  
-  <!-- task sharing dialog: shared with hint -->
-  <string name="actfm_person_or_tag_hint">Kontakt oder Liste</string>
-
-  <!-- toast on transmit success -->
-
-  <!-- can\'t rename or delete shared tag message -->
-  
-  <!-- warning before deleting a list you\'re the owner of -->
-  <string name="actfm_tag_operation_owner_delete">Sie sind der Eigentümer dieser geteilten Liste! Wenn Sie die Liste löschen, wird sie bei allen Listenmitgliedern gelöscht. Sind Sie sich sicher, dass Sie fortfahren möchten?</string>
-
-  <!-- slide 29a: menu item to take a picture -->
-  <string name="actfm_picture_camera">Bild aufnehmen</string>
-
-  <!-- slide 29b: menu item to select from gallery -->
-  <string name="actfm_picture_gallery">Aus Galerie wählen</string>
-  
-  <!-- menu item to clear picture selection -->
-  <string name="actfm_picture_clear">Bild entfernen</string>
-
-  <!-- filter list activity: refresh tags -->
-  
-  <!-- Title for prompt after sharing a task -->
-  <string name="actfm_view_task_title">Aufgabe anzeigen?</string>
-
-  <!-- Text for prompt after sharing a task -->
-  <string name="actfm_view_task_text">Diese Aufgabe wurde an %s gesandt! Sie sehen momentan Ihre eigenen Aufgaben an. Möchten Sie diese und weitere Aufgaben, die Sie Anderen zugewiesen haben, ansehen?</string>
-  
-  <!-- Ok button for task view prompt -->
-  <string name="actfm_view_task_ok">Zugewiesene ansehen</string>
-      
-  <!-- Cancel button for task view prompt -->
-  <string name="actfm_view_task_cancel">Hier bleiben</string>
-  
-  <!-- slide 13a: Title for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_title">Meine freigegebenen Aufgaben</string>
-  
-  <!-- Empty list for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_empty">Keine freigegeben Aufgaben</string>
-  
-  <!-- =====================  Friendship connections -->
-  
-  <string name="actfm_friendship_pending">Du hast %s eine Freundschaftsanfrage geschickt.</string>
-
-  <string name="actfm_friendship_blocked">Du hast %s geblockt.</string>
-
-  <string name="actfm_friendship_ignored">Du hast %s ignoriert.</string>
-  
-  <string name="actfm_friendship_friends">Du bist jetzt mit %s befreundet! Füge jetzt Aufgaben für ihn hinzu.</string>
-
-  <string name="actfm_friendship_other_pending">%s möchte mit dir befreundet sein!</string>
-
-  <string name="actfm_friendship_no_status">Verbinde Dich mit %s um Deine Aktivitäten zu freizugeben und seine/ihre zu sehen.</string>
-
-  <string name="actfm_friendship_connect">Freund hinzufügen</string>
-
-  <string name="actfm_friendship_accept">Zustimmen</string>
-
-  <!-- ================================================== TagViewActivity == -->  
-
-  <!-- Tag View Activity: Add Comment hint -->    
-  <string name="TVA_add_comment">Kommentar hinzufügen …</string>
-
-  <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->    
-  
-  <!-- Tabs for Tag view -->
-  <string-array name="TVA_tabs">
-    <!-- Tab for showing tasks -->
-    <item>Aufgaben</item>
-    <!-- Tab for showing comments & updates -->
-    <item>Aktivität</item>
-    <!-- Tab for showing setting -->
-    <item>Listeneinstellungen</item>
-  </string-array>
-  
-  <!-- Tag View: filtered by assigned to user (%s => user name) -->
-  <string name="actfm_TVA_filtered_by_assign">Aufgaben von %s. Tippen zeigt alle.</string>
-  
-  <!-- Tag View: filter by unassigned tasks -->
-  <string name="actfm_TVA_filter_by_unassigned">Nicht zugewiesene Aufgaben. Tippen zeigt alle.</string>
-
-  <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Privat: Tippen um die Liste zu editieren oder zu teilen</string>
-
-  <!-- Tag View Menu: refresh -->
-  <string name="actfm_TVA_menu_refresh">Aktualisieren</string>
-
-  <!-- Tag Settings: tag name label -->
-  <string name="actfm_TVA_tag_label">Liste</string>
-
-  <!-- Tag Settings: tag owner label -->
-
-  <!-- Tag Settings: tag owner value when there is no owner -->
-
-  <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
-  <string name="actfm_TVA_members_label">Geteilt mit</string>
-  
-  <!-- Tag Settings: list collaborators hint -->
-  <string name="actfm_TVA_members_hint">Teile mit jedem (eine Email-Adresse ist erforderlich)</string>
-
-  <!-- Tag Settings: tag picture -->
-  <string name="actfm_TVA_tag_picture">Listenbild</string>
-
-  <!-- slide 25c/28b: Tag Settings: silence notifications label -->
-  <string name="actfm_TVA_silence_label">Lautlose Erinnerungen</string>
-  
-  <!-- Tag Settings: list icon label -->
-  
-  <!-- slide 25b/27d: Tag Settings: list description label -->
-  <string name="actfm_TVA_tag_description_label">Beschreibung</string>
-  
-  <!-- slide 28a: Tag Settings: list settings label -->
-  <string name="actfm_TVA_tag_settings_label">Einstellungen</string>
-
-  <!-- slide 25b: Tag Settings: list description hint -->
-  <string name="actfm_TVA_tag_description_hint">Beschreibung eingeben</string>
-  
-  <!-- slide 25d: Tag Settings: list name hint -->
-  <string name="actfm_TVA_tag_name_hint">Vergebe einen Listennamen</string>
-  
-  <!-- Tag settings: login prompt from share-->
-  <string name="actfm_TVA_login_to_share">Sie müssen bei Astrid.com eingeloggt sein um Listen zu teilen! Bitte loggen Sie sich ein oder machen Sie diese Liste privat.</string>
-  
-      
-  <!-- ============================================ edit people dialog == -->
-
-  <!-- task sharing dialog: intro -->
-  <string name="actfm_EPA_intro">Benutze Astrid um Einkaufslisten, Party Pläne, oder Team Projekte zu teilen und sehe sofort wenn Arbeit erledigt wurde.</string>
-    
-  <!-- task sharing dialog: window title -->
-    
-  <!-- task sharing dialog: save button -->
-  
-  <!-- task sharing dialog: assigned label -->
-  
-  <!-- slide 18a: task sharing dialog: assigned label long version -->
-  <string name="actfm_EPA_assign_label_long">Wer soll das machen?</string>
-  
-  <!-- task sharing dialog: assigned to me -->
-  <string name="actfm_EPA_assign_me">Ich</string>
-  
-  <!-- task sharing dialog: anyone -->
-  <string name="actfm_EPA_unassigned">Nicht zugewiesen</string>
-  
-  <!-- slide 18c: task sharing dialog: choose a contact -->
-  <string name="actfm_EPA_choose_contact">Wählen Sie einen Kontakt aus</string>
-  
-  <!-- task sharing dialog: custom email assignment -->
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_share_with">Teilen mit:</string>
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_collaborators_header">Teilen</string>
-
-      <!-- task sharing dialog: collaborator list name (%s => name of list) -->
-  <string name="actfm_EPA_list">Liste: %s</string>
-  
-  <!-- task sharing dialog: assigned hint -->
-  
-  <!-- task sharing dialog: message label text -->
-  <string name="actfm_EPA_message_text">Einladungsnachricht</string>
-  
-  <!-- task sharing dialog: message body -->
-  <string name="actfm_EPA_message_body">Hilf mir, das zu erledigen!</string>
-  
-  <!-- task sharing dialog: list members section header -->
-  <string name="actfm_EPA_assign_header_members">Listenmitglieder</string>
-
-  <!-- task sharing dialog: astrid friends section header -->
-  <string name="actfm_EPA_assign_header_friends">Freunde von Astrid</string>
-
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: share with Facebook -->
-  <string name="actfm_EPA_facebook">Facebook</string>
-  
-  <!-- task sharing dialog: share with Twitter -->
-  <string name="actfm_EPA_twitter">Twitter</string>
-
-  <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
-
-  <!-- task sharing dialog: edit people settings saved -->
-
-  <!-- task sharing dialog: invalid email (%s => email) -->
-  <string name="actfm_EPA_invalid_email">Ungültige E-Mail: %s</string>
-
-  <!-- task sharing dialog: tag not found (%s => tag) -->
-  
-  <!-- task sharing login prompt -->
-  <string name="actfm_EPA_login_to_share">Sie müssen auf Astrid.com angemeldet sein, um Aufgaben zu teilen.</string>
-  
-  <string name="actfm_EPA_login_button">Anmelden</string>
-  
-  <string name="actfm_EPA_dont_share_button">Nicht teilen.</string>
-  
-  <string name="actfm_EPA_add_person_to_list_title">Aufgabe zugewiesen</string>
-  
-  <string name="actfm_EPA_add_person_to_list">%1$s is not shared on this list. Möchten Sie %2$s dieser Liste hinzufügen?</string>
-
-  <string name="actfm_EPA_add_person_to_list_ok">Zur Liste hinzufügen</string>
-  
-  <string name="actfm_EPA_add_person_to_list_cancel">Nicht hinzufügen</string>
-  
-  <string name="actfm_list_owner">(Besitzer)</string>
-  
-  <!-- ========================================= sharing login activity == -->
-
-  <!-- share login: Title -->
-  <string name="actfm_ALA_title">Willkommen bei Astrid.com!</string>
-
-  <!-- share login: Sharing Description -->
-  <string name="actfm_ALA_body">Astrid.com lässt Sie ihre Aufgaben online abrufen, teilen, und auf andere übertragen.</string>
-
-  <!-- share login: Sharing Login FB Prompt -->
-  <string name="actfm_ALA_fb_login">Mit Facebook verbinden</string>
-
-  <!-- share login: Sharing Login GG Prompt -->
-  <string name="actfm_ALA_gg_login">Mit Google verbinden</string>
-  
-  <!-- share login: Quickly log in as <%s -> email> -->
-  <string name="actfm_quick_login">Anmelden: %s</string>
-
-  <!-- share login: Reject quick login -->
-  <string name="actfm_quick_login_reject">Nicht %s?</string>
-
-  <!-- share login: Name -->
-  <string name="actfm_ALA_firstname_label">Vorname</string>
-  
-  <!-- share login: Name -->
-  <string name="actfm_ALA_lastname_label">Nachname</string>
-
-  <!-- share login: Email -->
-  <string name="actfm_ALA_email_label">E-Mail</string>
-
-  <!-- share login: Username / Email -->
-
-  <!-- share login: Password -->
-  <string name="actfm_ALA_password_label">Passwort</string>
-
-  <!-- share login: Sign Up Title -->
-  <string name="actfm_ALA_signup_title">Registrieren</string>
-
-  <!-- share login: Login Title -->
-  <string name="actfm_ALA_login_title">Anmelden</string>
-
-  <!-- share login: Google Auth title -->
-  <string name="actfm_GAA_title">Wählen Sie den zu verwendenden Google-Account aus:</string>
-
-  <!-- share login: OAUTH Login Prompt -->
-  <string name="actfm_OLA_prompt">Log dich bitte ein:</string>
-  
-  <!-- Login error: user exists -->
-  <string name="actfm_ALA_error_user_exists">Der Benutzer existiert bereits. Bitte melden Sie sich an.</string>
-  
-  <!-- Login error: wrong password -->
-  <string name="actfm_ALA_error_wrong_password">Das eingegebene Passwort ist nicht korrekt. Bitte versuchen Sie es erneut.</string>
-  
-  <!-- Forgot password link -->
-  <string name="actfm_ALA_forgot_password">Passwort vergessen?</string>
-  
-  <!-- Forgot password email prompt -->
-  <string name="actfm_ALA_enter_email">Bitte E-Mail-Adresse eingeben</string>
-  
-  <!-- Password reset sent (%s -> email) -->
-  <string name="actfm_ALA_reset_sent">Passwortrücksetzung wurde an %s versendet</string>
-  
-  <!-- User already exists - first sync may be slow -->
-  <string name="actfm_ALA_user_exists_sync_alert">Die erste Synchronisation dauert etwas länger - Danke für deine Geduld!</string>
-  
-  <!-- User not found -->
-  <string name="actfm_ALA_error_user_not_found">Kein Nutzer mit dieser email-Adresse. Bitte loggen Sie sich erneut ein!</string>
-  
-  <!-- ================================================ Featured Lists -->
-
-  <string name="actfm_feat_list_clone">Liste kopieren</string>
-  
-  <string name="actfm_feat_list_suffix">(Kopie)</string>
-
-  <string name="actfm_feat_list_cloning">Kopiere...</string>
-
-  <string name="actfm_feat_list_clone_success">Viel Erfolg!</string>
-
-  <string name="actfm_feat_list_task_clone_success">Aufgabe kopiert</string>
-
-  <string name="actfm_feat_list_clone_empty">Keine Aufgaben zum Kopieren vorhanden</string>
-  
-  <!-- ================================================ Synchronization == -->
-      
-  <!-- Indicates the logged in user name. %s -> user\'s name -->
-  <string name="actfm_status_title_logged_in">Status - Angemeldet als %s</string>    
-      
-  <!-- Preferences Title: Act.fm -->    
-  <string name="actfm_APr_header">Astrid.com</string>
-  
-  <string name="actfm_https_title">HTTPS benutzen</string>
-  <string name="actfm_https_enabled">HTTPS aktiviert (langsamer)</string>
-  <string name="actfm_https_disabled">HTTPS deaktiviert (schneller)</string>
-
-  <!-- title for notification tray after synchronizing -->
-  
-  <!-- text for notification when comments are received -->
-    
-  <string name="actfm_dual_sync_warning">Sie synchronisieren momentan mit Google Tasks. Um doppelte Aufgaben und andere Synchronisationsprobleme zu vermeiden, 
-wird Google Tasks nicht mehr synchronisieren, wenn Sie die Synchronisierung mit Astrid.com starten. Sie können immer noch Aufgaben aus Google Tasks und der Google Tasks Einstellungsseite importieren 
-oder Sie ersetzen Ihre Google Tasks in Gmail mit der Astrid Remind Me Chrome Extension. 
-Sind Sie sicher, dass Sie mit Astrid.com synchronisieren möchten?</string>
-      
-  <!-- account types -->
-  <string name="actfm_account_type">Konto-Typ</string>
-  <string name="actfm_account_info">Konto-Informationen</string>
-  <string name="actfm_account_info_summary">Status und Optionen</string>
-  <string name="account_type_title_not_logged_in">Kostenlos registrieren</string>
-  <string name="account_type_summary_not_logged_in">Online auf Aufgaben zugreifen, Listen teilen und Aufgaben übertragen</string>
-  
-  
-  <string name="actfm_account_premium">Premium</string>
-  <string name="actfm_account_basic">Standard</string>
-  
-  <string name="actfm_inapp_billing">Auf Premium aufstocken</string>
-  <string name="actfm_inapp_billing_summary">Dateien anhängen, Sprachaufzeichnungen sichern, Premium Kundensupport und mehr</string>
-  
-  <!-- Sharing -->
-  <string name="share_with_facebook">Gefällt mir auf Facebook</string>
-  <string name="share_with_twitter">Auf Twitter folgen</string>
-  <string name="share_with_google">Auf Google+ teilen</string>
-  <string name="share_speech_bubble">In dem du es deinen Freunden erzählst, hilfst du Anderen produktiver zu sein.</string>
-  
-  
-  <!-- Sync upgrade messages -->
-  <string name="sync_upgr_both_title">Nutze Astrid.com und Google ohne Dubletten</string>
-  <string name="sync_upgr_both_body">Lass uns ehrlich sein: Google Tasks is bequem, aber nicht so cool wie Astrid. Um doppelte Einträge zu vermeiden, kannst du nicht mehr mit Astrid.com synchronisieren ...</string>
-  <string name="sync_upgr_both_btn1">Bleibe bei Astrid</string>
-  <string name="sync_upgr_both_btn2">Herunterstufen zu Google Tasks</string>
-  
-  <string name="sync_upgr_gtasks_only_title">Gratis upgraden zu Astrid Sync!</string>
-  <string name="sync_upgr_gtasks_only_body">Zugang zu deinen Aufgaben von all deinen Geräten und von Gmail duch Astrid.com Sync. Zu Astrid sync upgraden (du kannst jederzeit zu Google Tasks zurückkehren ...)</string>
-  <string name="sync_upgr_gtasks_only_btn1">Upgraden zu Astrid Sync</string>
-  <string name="sync_upgr_gtasks_only_btn2">Bei Google Tasks bleiben</string>
-  
-  <string name="sync_upgr_neither_title">Synchronisation</string>
-  <string name="sync_upgr_neither_body">Gefährde deine To-do-Liste nicht! Deine Aufgaben mit der neuen und verbesserten Astrid-Synchronisation von überall erreichen und bearbeiten.</string>
-  <string name="sync_upgr_neither_btn1">Jetzt registrieren</string>
-  
-  <string name="sync_upgr_logged_out">Du hast dich aus Astrid ausgeloggt</string>
-  
-  <string name="actfm_logout_clear_tasks_title">Daten löschen?</string>
-  <string name="actfm_logout_clear_tasks_body">Möchtest du deine Aufgaben und Listen löschen?</string>
-  <string name="actfm_logout_clear_tasks_yes">Daten löschen</string>
-  <string name="actfm_logout_clear_tasks_no">Daten nicht löschen</string>
-  
-  <string name="actfm_logged_in_different_user_title">Als anderer Nutzer einloggen</string>
-  <string name="actfm_logged_in_different_user_body">Möchtest Du die bestehenden Aufgaben auf Deinem Telefon vor der Synchronisation löschen?</string>
-  <string name="actfm_logged_in_different_user_keep_data">Daten nicht löschen</string>
-  <string name="actfm_logged_in_different_user_clear_data">Alle Daten löschen</string>
-  <string name="actfm_logged_in_different_user_processing">Verarbeite vorhandene Daten ...</string>
-  
-  <string name="actfm_tag_not_authorized_title">Nicht autorisiert!</string>
-  <string name="actfm_tag_not_authorized_body">Sie sind nicht mehr berechtigt, die Liste %s anzuzeigen (Sie wurden möglicherweise entfernt). Möchten Sie eine neue Liste mit dem gleichen Namen erstellen?</string>
-  <string name="actfm_tag_not_authorized_new_list">Neue Liste anlegen</string>
-  <string name="actfm_tag_not_authorized_leave_list">Liste verlassen</string>
-  
-  <string name="actfm_sync_ongoing">Synchronisierung läuft...</string>
-  
-  <string name="EPr_reset_sync_state">Synchronisation zurücksetzen</string>
-  <string name="EPr_reset_sync_state_summary">Setzt einige lokale Daten zur Behebung von Synchronisations-Fehlern zurück</string>
-  <string name="EPr_reset_sync_state_detailed">Bei der nächsten Synchronisation werden deine Aufgaben und Listen denjenigen auf Astrid.com angeglichen. Das behebt Synchronisationsfehler. Möchtest du damit beginen?</string>
-  
+<resources>
 
+    <!-- ================================================== general terms == -->
 
+    <!-- People Editing Activity -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
+    <string name="actfm_person_hint">Kontakt</string>
+
+    <!-- task sharing dialog: shared with hint -->
+    <string name="actfm_person_or_tag_hint">Kontakt oder Liste</string>
+
+    <!-- toast on transmit success -->
+
+    <!-- can\'t rename or delete shared tag message -->
+
+    <!-- warning before deleting a list you\'re the owner of -->
+    <string name="actfm_tag_operation_owner_delete">Sie sind der Eigentümer dieser geteilten Liste!
+        Wenn Sie die Liste löschen, wird sie bei allen Listenmitgliedern gelöscht. Sind Sie sich
+        sicher, dass Sie fortfahren möchten?
+    </string>
+
+    <!-- slide 29a: menu item to take a picture -->
+    <string name="actfm_picture_camera">Bild aufnehmen</string>
+
+    <!-- slide 29b: menu item to select from gallery -->
+    <string name="actfm_picture_gallery">Aus Galerie wählen</string>
+
+    <!-- menu item to clear picture selection -->
+    <string name="actfm_picture_clear">Bild entfernen</string>
+
+    <!-- filter list activity: refresh tags -->
+
+    <!-- Title for prompt after sharing a task -->
+    <string name="actfm_view_task_title">Aufgabe anzeigen?</string>
+
+    <!-- Text for prompt after sharing a task -->
+    <string name="actfm_view_task_text">Diese Aufgabe wurde an %s gesandt! Sie sehen momentan Ihre
+        eigenen Aufgaben an. Möchten Sie diese und weitere Aufgaben, die Sie Anderen zugewiesen
+        haben, ansehen?
+    </string>
+
+    <!-- Ok button for task view prompt -->
+    <string name="actfm_view_task_ok">Zugewiesene ansehen</string>
+
+    <!-- Cancel button for task view prompt -->
+    <string name="actfm_view_task_cancel">Hier bleiben</string>
+
+    <!-- slide 13a: Title for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_title">Meine freigegebenen Aufgaben</string>
+
+    <!-- Empty list for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_empty">Keine freigegeben Aufgaben</string>
+
+    <!-- =====================  Friendship connections -->
+
+    <string name="actfm_friendship_pending">Du hast %s eine Freundschaftsanfrage geschickt.</string>
+
+    <string name="actfm_friendship_blocked">Du hast %s geblockt.</string>
+
+    <string name="actfm_friendship_ignored">Du hast %s ignoriert.</string>
+
+    <string name="actfm_friendship_friends">Du bist jetzt mit %s befreundet! Füge jetzt Aufgaben für
+        ihn hinzu.
+    </string>
+
+    <string name="actfm_friendship_other_pending">%s möchte mit dir befreundet sein!</string>
+
+    <string name="actfm_friendship_no_status">Verbinde Dich mit %s um Deine Aktivitäten zu
+        freizugeben und seine/ihre zu sehen.
+    </string>
+
+    <string name="actfm_friendship_connect">Freund hinzufügen</string>
+
+    <string name="actfm_friendship_accept">Zustimmen</string>
+
+    <!-- ================================================== TagViewActivity == -->
+
+    <!-- Tag View Activity: Add Comment hint -->
+    <string name="TVA_add_comment">Kommentar hinzufügen …</string>
+
+    <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->
+
+    <!-- Tabs for Tag view -->
+    <string-array name="TVA_tabs">
+        <!-- Tab for showing tasks -->
+        <item>Aufgaben</item>
+        <!-- Tab for showing comments & updates -->
+        <item>Aktivität</item>
+        <!-- Tab for showing setting -->
+        <item>Listeneinstellungen</item>
+    </string-array>
+
+    <!-- Tag View: filtered by assigned to user (%s => user name) -->
+    <string name="actfm_TVA_filtered_by_assign">Aufgaben von %s. Tippen zeigt alle.</string>
+
+    <!-- Tag View: filter by unassigned tasks -->
+    <string name="actfm_TVA_filter_by_unassigned">Nicht zugewiesene Aufgaben. Tippen zeigt alle.
+    </string>
+
+    <!-- Tag View: list is private, no members -->
+    <string name="actfm_TVA_no_members_alert">Privat: Tippen um die Liste zu editieren oder zu
+        teilen
+    </string>
+
+    <!-- Tag View Menu: refresh -->
+    <string name="actfm_TVA_menu_refresh">Aktualisieren</string>
+
+    <!-- Tag Settings: tag name label -->
+    <string name="actfm_TVA_tag_label">Liste</string>
+
+    <!-- Tag Settings: tag owner label -->
+
+    <!-- Tag Settings: tag owner value when there is no owner -->
+
+    <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
+    <string name="actfm_TVA_members_label">Geteilt mit</string>
+
+    <!-- Tag Settings: list collaborators hint -->
+    <string name="actfm_TVA_members_hint">Teile mit jedem (eine Email-Adresse ist erforderlich)
+    </string>
+
+    <!-- Tag Settings: tag picture -->
+    <string name="actfm_TVA_tag_picture">Listenbild</string>
+
+    <!-- slide 25c/28b: Tag Settings: silence notifications label -->
+    <string name="actfm_TVA_silence_label">Lautlose Erinnerungen</string>
+
+    <!-- Tag Settings: list icon label -->
+
+    <!-- slide 25b/27d: Tag Settings: list description label -->
+    <string name="actfm_TVA_tag_description_label">Beschreibung</string>
+
+    <!-- slide 28a: Tag Settings: list settings label -->
+    <string name="actfm_TVA_tag_settings_label">Einstellungen</string>
+
+    <!-- slide 25b: Tag Settings: list description hint -->
+    <string name="actfm_TVA_tag_description_hint">Beschreibung eingeben</string>
+
+    <!-- slide 25d: Tag Settings: list name hint -->
+    <string name="actfm_TVA_tag_name_hint">Vergebe einen Listennamen</string>
+
+    <!-- Tag settings: login prompt from share-->
+    <string name="actfm_TVA_login_to_share">Sie müssen bei Astrid.com eingeloggt sein um Listen zu
+        teilen! Bitte loggen Sie sich ein oder machen Sie diese Liste privat.
+    </string>
+
+
+    <!-- ============================================ edit people dialog == -->
+
+    <!-- task sharing dialog: intro -->
+    <string name="actfm_EPA_intro">Benutze Astrid um Einkaufslisten, Party Pläne, oder Team Projekte
+        zu teilen und sehe sofort wenn Arbeit erledigt wurde.
+    </string>
+
+    <!-- task sharing dialog: window title -->
+
+    <!-- task sharing dialog: save button -->
+
+    <!-- task sharing dialog: assigned label -->
+
+    <!-- slide 18a: task sharing dialog: assigned label long version -->
+    <string name="actfm_EPA_assign_label_long">Wer soll das machen?</string>
+
+    <!-- task sharing dialog: assigned to me -->
+    <string name="actfm_EPA_assign_me">Ich</string>
+
+    <!-- task sharing dialog: anyone -->
+    <string name="actfm_EPA_unassigned">Nicht zugewiesen</string>
+
+    <!-- slide 18c: task sharing dialog: choose a contact -->
+    <string name="actfm_EPA_choose_contact">Wählen Sie einen Kontakt aus</string>
+
+    <!-- task sharing dialog: custom email assignment -->
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_share_with">Teilen mit:</string>
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_collaborators_header">Teilen</string>
+
+    <!-- task sharing dialog: collaborator list name (%s => name of list) -->
+    <string name="actfm_EPA_list">Liste: %s</string>
+
+    <!-- task sharing dialog: assigned hint -->
+
+    <!-- task sharing dialog: message label text -->
+    <string name="actfm_EPA_message_text">Einladungsnachricht</string>
+
+    <!-- task sharing dialog: message body -->
+    <string name="actfm_EPA_message_body">Hilf mir, das zu erledigen!</string>
+
+    <!-- task sharing dialog: list members section header -->
+    <string name="actfm_EPA_assign_header_members">Listenmitglieder</string>
+
+    <!-- task sharing dialog: astrid friends section header -->
+    <string name="actfm_EPA_assign_header_friends">Freunde von Astrid</string>
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: share with Facebook -->
+    <string name="actfm_EPA_facebook">Facebook</string>
+
+    <!-- task sharing dialog: share with Twitter -->
+    <string name="actfm_EPA_twitter">Twitter</string>
+
+    <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
+
+    <!-- task sharing dialog: edit people settings saved -->
+
+    <!-- task sharing dialog: invalid email (%s => email) -->
+    <string name="actfm_EPA_invalid_email">Ungültige E-Mail: %s</string>
+
+    <!-- task sharing dialog: tag not found (%s => tag) -->
+
+    <!-- task sharing login prompt -->
+    <string name="actfm_EPA_login_to_share">Sie müssen auf Astrid.com angemeldet sein, um Aufgaben
+        zu teilen.
+    </string>
+
+    <string name="actfm_EPA_login_button">Anmelden</string>
+
+    <string name="actfm_EPA_dont_share_button">Nicht teilen.</string>
+
+    <string name="actfm_EPA_add_person_to_list_title">Aufgabe zugewiesen</string>
+
+    <string name="actfm_EPA_add_person_to_list">%1$s is not shared on this list. Möchten Sie %2$s
+        dieser Liste hinzufügen?
+    </string>
+
+    <string name="actfm_EPA_add_person_to_list_ok">Zur Liste hinzufügen</string>
+
+    <string name="actfm_EPA_add_person_to_list_cancel">Nicht hinzufügen</string>
+
+    <string name="actfm_list_owner">(Besitzer)</string>
+
+    <!-- ========================================= sharing login activity == -->
+
+    <!-- share login: Title -->
+    <string name="actfm_ALA_title">Willkommen bei Astrid.com!</string>
+
+    <!-- share login: Sharing Description -->
+    <string name="actfm_ALA_body">Astrid.com lässt Sie ihre Aufgaben online abrufen, teilen, und auf
+        andere übertragen.
+    </string>
+
+    <!-- share login: Sharing Login FB Prompt -->
+    <string name="actfm_ALA_fb_login">Mit Facebook verbinden</string>
+
+    <!-- share login: Sharing Login GG Prompt -->
+    <string name="actfm_ALA_gg_login">Mit Google verbinden</string>
+
+    <!-- share login: Quickly log in as <%s -> email> -->
+    <string name="actfm_quick_login">Anmelden: %s</string>
+
+    <!-- share login: Reject quick login -->
+    <string name="actfm_quick_login_reject">Nicht %s?</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_firstname_label">Vorname</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_lastname_label">Nachname</string>
+
+    <!-- share login: Email -->
+    <string name="actfm_ALA_email_label">E-Mail</string>
+
+    <!-- share login: Username / Email -->
+
+    <!-- share login: Password -->
+    <string name="actfm_ALA_password_label">Passwort</string>
+
+    <!-- share login: Sign Up Title -->
+    <string name="actfm_ALA_signup_title">Registrieren</string>
+
+    <!-- share login: Login Title -->
+    <string name="actfm_ALA_login_title">Anmelden</string>
+
+    <!-- share login: Google Auth title -->
+    <string name="actfm_GAA_title">Wählen Sie den zu verwendenden Google-Account aus:</string>
+
+    <!-- share login: OAUTH Login Prompt -->
+    <string name="actfm_OLA_prompt">Log dich bitte ein:</string>
+
+    <!-- Login error: user exists -->
+    <string name="actfm_ALA_error_user_exists">Der Benutzer existiert bereits. Bitte melden Sie sich
+        an.
+    </string>
+
+    <!-- Login error: wrong password -->
+    <string name="actfm_ALA_error_wrong_password">Das eingegebene Passwort ist nicht korrekt. Bitte
+        versuchen Sie es erneut.
+    </string>
+
+    <!-- Forgot password link -->
+    <string name="actfm_ALA_forgot_password">Passwort vergessen?</string>
+
+    <!-- Forgot password email prompt -->
+    <string name="actfm_ALA_enter_email">Bitte E-Mail-Adresse eingeben</string>
+
+    <!-- Password reset sent (%s -> email) -->
+    <string name="actfm_ALA_reset_sent">Passwortrücksetzung wurde an %s versendet</string>
+
+    <!-- User already exists - first sync may be slow -->
+    <string name="actfm_ALA_user_exists_sync_alert">Die erste Synchronisation dauert etwas länger -
+        Danke für deine Geduld!
+    </string>
+
+    <!-- User not found -->
+    <string name="actfm_ALA_error_user_not_found">Kein Nutzer mit dieser email-Adresse. Bitte loggen
+        Sie sich erneut ein!
+    </string>
+
+    <!-- ================================================ Featured Lists -->
+
+    <string name="actfm_feat_list_clone">Liste kopieren</string>
+
+    <string name="actfm_feat_list_suffix">(Kopie)</string>
+
+    <string name="actfm_feat_list_cloning">Kopiere...</string>
+
+    <string name="actfm_feat_list_clone_success">Viel Erfolg!</string>
+
+    <string name="actfm_feat_list_task_clone_success">Aufgabe kopiert</string>
+
+    <string name="actfm_feat_list_clone_empty">Keine Aufgaben zum Kopieren vorhanden</string>
+
+    <!-- ================================================ Synchronization == -->
+
+    <!-- Indicates the logged in user name. %s -> user\'s name -->
+    <string name="actfm_status_title_logged_in">Status - Angemeldet als %s</string>
+
+    <!-- Preferences Title: Act.fm -->
+    <string name="actfm_APr_header">Astrid.com</string>
+
+    <string name="actfm_https_title">HTTPS benutzen</string>
+    <string name="actfm_https_enabled">HTTPS aktiviert (langsamer)</string>
+    <string name="actfm_https_disabled">HTTPS deaktiviert (schneller)</string>
+
+    <!-- title for notification tray after synchronizing -->
+
+    <!-- text for notification when comments are received -->
+
+    <string name="actfm_dual_sync_warning">Sie synchronisieren momentan mit Google Tasks. Um
+        doppelte Aufgaben und andere Synchronisationsprobleme zu vermeiden,
+        wird Google Tasks nicht mehr synchronisieren, wenn Sie die Synchronisierung mit Astrid.com
+        starten. Sie können immer noch Aufgaben aus Google Tasks und der Google Tasks
+        Einstellungsseite importieren
+        oder Sie ersetzen Ihre Google Tasks in Gmail mit der Astrid Remind Me Chrome Extension.
+        Sind Sie sicher, dass Sie mit Astrid.com synchronisieren möchten?
+    </string>
+
+    <!-- account types -->
+    <string name="actfm_account_type">Konto-Typ</string>
+    <string name="actfm_account_info">Konto-Informationen</string>
+    <string name="actfm_account_info_summary">Status und Optionen</string>
+    <string name="account_type_title_not_logged_in">Kostenlos registrieren</string>
+    <string name="account_type_summary_not_logged_in">Online auf Aufgaben zugreifen, Listen teilen
+        und Aufgaben übertragen
+    </string>
+
+
+    <string name="actfm_account_premium">Premium</string>
+    <string name="actfm_account_basic">Standard</string>
+
+    <string name="actfm_inapp_billing">Auf Premium aufstocken</string>
+    <string name="actfm_inapp_billing_summary">Dateien anhängen, Sprachaufzeichnungen sichern,
+        Premium Kundensupport und mehr
+    </string>
+
+    <!-- Sharing -->
+    <string name="share_with_facebook">Gefällt mir auf Facebook</string>
+    <string name="share_with_twitter">Auf Twitter folgen</string>
+    <string name="share_with_google">Auf Google+ teilen</string>
+    <string name="share_speech_bubble">In dem du es deinen Freunden erzählst, hilfst du Anderen
+        produktiver zu sein.
+    </string>
+
+
+    <!-- Sync upgrade messages -->
+    <string name="sync_upgr_both_title">Nutze Astrid.com und Google ohne Dubletten</string>
+    <string name="sync_upgr_both_body">Lass uns ehrlich sein: Google Tasks is bequem, aber nicht so
+        cool wie Astrid. Um doppelte Einträge zu vermeiden, kannst du nicht mehr mit Astrid.com
+        synchronisieren ...
+    </string>
+    <string name="sync_upgr_both_btn1">Bleibe bei Astrid</string>
+    <string name="sync_upgr_both_btn2">Herunterstufen zu Google Tasks</string>
+
+    <string name="sync_upgr_gtasks_only_title">Gratis upgraden zu Astrid Sync!</string>
+    <string name="sync_upgr_gtasks_only_body">Zugang zu deinen Aufgaben von all deinen Geräten und
+        von Gmail duch Astrid.com Sync. Zu Astrid sync upgraden (du kannst jederzeit zu Google Tasks
+        zurückkehren ...)
+    </string>
+    <string name="sync_upgr_gtasks_only_btn1">Upgraden zu Astrid Sync</string>
+    <string name="sync_upgr_gtasks_only_btn2">Bei Google Tasks bleiben</string>
+
+    <string name="sync_upgr_neither_title">Synchronisation</string>
+    <string name="sync_upgr_neither_body">Gefährde deine To-do-Liste nicht! Deine Aufgaben mit der
+        neuen und verbesserten Astrid-Synchronisation von überall erreichen und bearbeiten.
+    </string>
+    <string name="sync_upgr_neither_btn1">Jetzt registrieren</string>
+
+    <string name="sync_upgr_logged_out">Du hast dich aus Astrid ausgeloggt</string>
+
+    <string name="actfm_logout_clear_tasks_title">Daten löschen?</string>
+    <string name="actfm_logout_clear_tasks_body">Möchtest du deine Aufgaben und Listen löschen?
+    </string>
+    <string name="actfm_logout_clear_tasks_yes">Daten löschen</string>
+    <string name="actfm_logout_clear_tasks_no">Daten nicht löschen</string>
+
+    <string name="actfm_logged_in_different_user_title">Als anderer Nutzer einloggen</string>
+    <string name="actfm_logged_in_different_user_body">Möchtest Du die bestehenden Aufgaben auf
+        Deinem Telefon vor der Synchronisation löschen?
+    </string>
+    <string name="actfm_logged_in_different_user_keep_data">Daten nicht löschen</string>
+    <string name="actfm_logged_in_different_user_clear_data">Alle Daten löschen</string>
+    <string name="actfm_logged_in_different_user_processing">Verarbeite vorhandene Daten ...
+    </string>
+
+    <string name="actfm_tag_not_authorized_title">Nicht autorisiert!</string>
+    <string name="actfm_tag_not_authorized_body">Sie sind nicht mehr berechtigt, die Liste %s
+        anzuzeigen (Sie wurden möglicherweise entfernt). Möchten Sie eine neue Liste mit dem
+        gleichen Namen erstellen?
+    </string>
+    <string name="actfm_tag_not_authorized_new_list">Neue Liste anlegen</string>
+    <string name="actfm_tag_not_authorized_leave_list">Liste verlassen</string>
+
+    <string name="actfm_sync_ongoing">Synchronisierung läuft...</string>
+
+    <string name="EPr_reset_sync_state">Synchronisation zurücksetzen</string>
+    <string name="EPr_reset_sync_state_summary">Setzt einige lokale Daten zur Behebung von
+        Synchronisations-Fehlern zurück
+    </string>
+    <string name="EPr_reset_sync_state_detailed">Bei der nächsten Synchronisation werden deine
+        Aufgaben und Listen denjenigen auf Astrid.com angeglichen. Das behebt
+        Synchronisationsfehler. Möchtest du damit beginen?
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in timers plug-in -->
+
+    <!-- Task Edit Activity: Container Label -->
+    <string name="alarm_ACS_label">Alarme</string>
+
+    <!-- Task Edit Activity: Add New Alarm -->
+    <string name="alarm_ACS_button">Einen Alarm hinzufügen</string>
+
+    <string-array name="reminders_alarm">
+        <!-- reminders related to alarm -->
+        <item>Alarm!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in backup plug-in -->
+
+    <!-- ================================================= BackupPreferences == -->
+
+    <!-- slide 33c/48d: Backup Preferences Title -->
+    <string name="backup_BPr_header">Backups</string>
+
+    <!-- slide 48e/50c: Backup: Status Header -->
+    <string name="backup_BPr_group_status">Status</string>
+
+    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->
+    <string name="backup_status_success">Letzte Datensicherung:\n%s</string>
+    <!-- Backup Status: last error failed. Keep it short! -->
+    <string name="backup_status_failed">Letzte Datensicherung gescheitert</string>
+    <!-- Backup Status: error subtitle -->
+    <string name="backup_status_failed_subtitle">(Anklicken, um Fehler anzuzeigen)</string>
+    <!-- slide 48a: Backup Status: never backed up -->
+    <string name="backup_status_never">Bisher keine Datensicherung erstellt!</string>
+
+    <!-- slide 48f/ 50e: Backup Options Group Label -->
+    <string name="backup_BPr_group_options">Einstellungen</string>
+
+    <!-- slide 48b: Preference: Automatic Backup Title -->
+    <string name="backup_BPr_auto_title">Automatische Backups</string>
+    <!-- Preference: Automatic Backup Description (when disabled) -->
+    <string name="backup_BPr_auto_disabled">Automatische Backups deaktiviert</string>
+    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
+    <string name="backup_BPr_auto_enabled">Verwalte deine Backups</string>
+
+    <!-- Preference screen restoring Tasks Help -->
+    <!-- Preference screen Restoring Tasks Help Dialog Text-->
+
+    <string name="backup_BPr_cloud_already_logged_in">Cloud Backup auf Astrid.com ist bereits
+        aktiviert.
+    </string>
+
+    <!-- ================================================= BackupActivity == -->
+
+    <!-- slide 48c: backup activity label -->
+    <string name="backup_BAc_label">Backups verwalten</string>
+
+    <!-- backup activity title -->
+    <string name="backup_BAc_title">Ihre Backups verwalten</string>
+
+    <!-- backup activity import button -->
+    <string name="backup_BAc_import">Aufgaben importieren</string>
+
+    <!-- backup activity export button -->
+    <string name="backup_BAc_export">Aufgaben exportieren</string>
+
+    <!-- backup activity cloud (Astrid.com) option -->
+    <string name="backup_BAc_cloud">Klicke hier für kostenlose Sicherungen in der Cloud auf
+        Astrid.com
+    </string>
+
+    <!-- ============================================== Importer / Exporter == -->
+
+    <!-- Message displayed when error occurs -->
+    <string name="backup_TXI_error">Importfehler</string>
+
+    <string name="export_toast">%1$s bis %2$s gesichert.</string>
+
+    <string name="export_toast_no_tasks">Keine Aufgaben zu exportieren.</string>
+
+    <!-- Progress Dialog Title for exporting -->
+    <string name="export_progress_title">Es wird exportiert …</string>
+
+    <!-- Backup: Title of Import Summary Dialog -->
+    <string name="import_summary_title">Zusammenfassung wiederherstellen</string>
+
+    <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
+    <string name="import_summary_message">Datei %1$s enthielt %2$s Aufgaben.\n\n %3$s wurden
+        importiert,\n %4$s waren schon vorhanden (übersprungen)\n %5$s waren fehlerhaft\n
+    </string>
+
+    <!-- Progress Dialog Title for importing -->
+    <string name="import_progress_title">Es wird importiert …</string>
+
+    <!-- Progress Dialog text for import reading task (%d -> task number)-->
+    <string name="import_progress_read">Aufgabe %d wird gelesen …</string>
+
+    <!-- Backup: Dialog when unable to open a file -->
+
+    <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
+    <string name="DLG_error_sdcard">Ordner konnte nicht geöffnet werden: %s</string>
+
+    <!-- Backup: Dialog when unable to open SD card in general -->
+    <string name="DLG_error_sdcard_general">SD-Karte konnte nicht geöffnet werden!</string>
+
+    <!-- Backup: File Selector dialog for import -->
+    <string name="import_file_prompt">Wählen Sie eine Datei zum Wiederherstellen</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- ================================================== AndroidManifest == -->
+
+    <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
+    <string name="app_name">Astrid Aufgaben</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="read_permission_label">Astrid Zugriffsrechte</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="read_permission_desc">Aufgaben lesen, Aufgabenfilter anzeigen</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="write_permission_label">Astrid Zugriffsrechte</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="write_permission_desc">Aufgaben erstellen, existierende bearbeiten</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- question for deleting tasks -->
+    <string name="DLG_delete_this_task_question">Diese Aufgabe löschen?</string>
+
+    <!-- question for deleting items (%s => item name) -->
+    <string name="DLG_delete_this_item_question">Dieses Element löschen: %s?</string>
+
+    <!-- Progress dialog shown when upgrading -->
+    <string name="DLG_upgrading">Ihre Aufgaben werden aktualisiert …</string>
+
+    <!-- Title for dialog selecting a time (hours and minutes) -->
+    <string name="DLG_hour_minutes">Zeit (Stunden : Minuten)</string>
+
+    <!-- Dialog for Astrid having a critical update -->
+    <string name="DLG_please_update">Astrid sollte auf die aktuellste Version im Android Market
+        aktualisiert werden! Bitte tun Sie dies, bevor Sie fortfahren, oder warten Sie ein paar
+        Sekunden.
+    </string>
+
+    <!-- Button for going to Market -->
+
+    <!-- Button for accepting EULA -->
+    <string name="DLG_accept">Ich akzeptiere</string>
+
+    <!-- Button for declining EULA -->
+    <string name="DLG_decline">Ich akzeptiere nicht</string>
+
+    <!-- EULA title -->
+    <string name="DLG_eula_title">Astrid Nutzungsbedingungen</string>
+
+    <!-- Progress Dialog generic text -->
+    <string name="DLG_please_wait">Bitte warten Sie</string>
+
+    <!-- Dialog - loading -->
+    <string name="DLG_loading">Ladevorgang…</string>
+
+    <!-- Dialog - dismiss -->
+
+    <!-- slide 20d -->
+    <string name="DLG_ok">OK</string>
+    <!-- slide 36g -->
+    <string name="DLG_cancel">Abbrechen</string>
+
+    <string name="DLG_more">Mehr</string>
+
+    <string name="DLG_undo">Rückgängig</string>
+
+    <string name="DLG_warning">Warnung</string>
+
+    <!-- =============================================================== UI == -->
+
+    <!-- Label for DateButtons with no value -->
+    <string name="WID_dateButtonUnset">Klicken zur Bestätigung</string>
+
+    <!-- String formatter for DateButtons ($D => date, $T => time) -->
+
+    <!-- String formatter for Disable button -->
+
+    <!--  ============================================================= notes -->
+
+    <!-- Note Exposer -->
+
+    <!-- Note Exposer / Comments -->
+
+    <!-- EditNoteActivity - no comments -->
+    <string name="ENA_no_comments">Bisher keine Aktivität</string>
+
+    <!-- EditNoteActivity - no username for comment -->
+    <string name="ENA_no_user">Irgendjemand</string>
+
+    <!-- EditNoteActivity - refresh comments -->
+    <string name="ENA_refresh_comments">Kommentare aktualisieren</string>
+
+    <!-- ================================================= TaskListActivity == -->
+
+    <!-- slide 8b: Task List: Displayed instead of list when no items present -->
+    <string name="TLA_no_items">Sie haben keine Aufgaben! \n Möchten Sie welche hinzufügen?</string>
+
+    <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
+    <string name="TLA_no_items_person">%s hat noch\nkeine Aufgaben geteilt</string>
+
+    <!-- Menu: Adjust Sort and Hidden Task Settings -->
+    <string name="TLA_menu_sort">Sortieren</string>
+
+    <!-- Menu: Sync Now -->
+    <string name="TLA_menu_sync">Jetzt synchronisieren</string>
+
+    <!-- Menu: Search -->
+    <string name="TLA_menu_search">Suchen</string>
+
+    <!-- Menu: Tasks -->
+    <string name="TLA_menu_lists">Listen</string>
+
+    <!-- Menu: Friends -->
+    <string name="TLA_menu_friends">Personen</string>
+
+    <!-- Menu: Featured Lists -->
+    <string name="TLA_menu_featured_lists">Vorgeschlagene Listen</string>
+
+    <!-- Menu: Suggestions -->
+    <string name="TLA_menu_suggestions">Vorschläge</string>
+
+    <!-- Menu: Tutorial -->
+
+    <!-- Menu: Settings -->
+    <string name="TLA_menu_settings">Einstellungen</string>
+
+    <!-- slide 30b: Menu: Support -->
+    <string name="TLA_menu_support">Unterstützung</string>
+
+    <!-- Search Label-->
+
+    <!-- Window title for displaying Custom Filter -->
+    <string name="TLA_custom">Benutzerdefiniert</string>
+
+    <!-- slide 8d: Quick Add Edit Box Hint-->
+    <string name="TLA_quick_add_hint">Aufgabe hinzufügen</string>
+
+    <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
+    <string name="TLA_quick_add_hint_assign">Etwas hinzufügen für %s</string>
+
+    <!-- Notification Volumne notification-->
+    <string name="TLA_notification_volume_low">Erinnerungen sind stummgeschaltet. Du wirst Astrid
+        nicht hören!
+    </string>
+
+    <!-- Notifications disabled warning -->
+    <string name="TLA_notification_disabled">Astrids Erinnerungen sind ausgeschaltet! Du wirst keine
+        Erinnerungen mehr erhalten!
+    </string>
+
+    <string-array name="TLA_filters">
+        <item>Aktiviert</item>
+        <item>Heute</item>
+        <item>Bald</item>
+        <item>Verspätet</item>
+        <item>Erledigt</item>
+        <item>Unsichtbar</item>
+    </string-array>
+
+    <!-- Title for confirmation dialog after quick add markup -->
+    <string name="TLA_quickadd_confirm_title">Sie sagten: \"%s\"</string>
+
+    <!-- Text for speech bubble in dialog after quick add markup -->
+    <!-- First string is task title, second is due date, third is priority -->
+    <string name="TLA_quickadd_confirm_speech_bubble">Ich habe die Aufgabe \"%1$s\" %2$s mit %3$s
+        angelegt
+    </string>
+
+    <string name="TLA_quickadd_confirm_speech_bubble_date">für %s</string>
+
+    <string name="TLA_quickadd_confirm_hide_helpers">In Zukunft nicht mehr nach Bestätigung fragen
+    </string>
+
+
+    <!-- Title for alert on new repeating task. %s-> task title -->
+    <string name="TLA_repeat_scheduled_title">Neue sich wiederholende Aufgabe %s</string>
+
+    <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
+    <string name="TLA_repeat_scheduled_speech_bubble">"Ich werde dich erinnern an %s."</string>
+
+    <string-array name="TLA_priority_strings">
+        <item>höchste Priorität</item>
+        <item>hohe Priorität</item>
+        <item>mittlere Priorität</item>
+        <item>niedrige Priorität</item>
+    </string-array>
+    <!-- slide 22a -->
+    <string name="TLA_all_activity">Alle Aktivitäten</string>
+
+    <!-- ====================================================== TaskAdapter == -->
+
+    <!-- Format string to indicate task is hidden (%s => task name) -->
+    <string name="TAd_hiddenFormat">%s [versteckt]</string>
+
+    <!-- Format string to indicate task is deleted (%s => task name) -->
+    <string name="TAd_deletedFormat">%s [gelöscht]</string>
+
+    <!-- Displayed when adapter is flung (scrolled quickly) -->
+
+    <!-- slide 22b: indicates task was completed. %s => date or time ago -->
+    <string name="TAd_completed">Abgeschlossen\n%s</string>
+
+    <!-- slide 15a: Action Button: edit task -->
+    <string name="TAd_actionEditTask">Bearbeiten</string>
+
+    <!-- Context Item: edit task -->
+    <string name="TAd_contextEditTask">Aufgabe bearbeiten</string>
+
+    <!-- Context Item: copy task -->
+    <string name="TAd_contextCopyTask">Aufgabe kopieren</string>
+
+    <!-- Context Item: delete task -->
+    <string name="TAd_contextDeleteTask">Aufgabe löschen</string>
+
+    <!-- Context Item: undelete task -->
+    <string name="TAd_contextUndeleteTask">Aufgabe wiederherstellen</string>
+
+    <!-- Context Item: purge task -->
+    <string name="TAd_contextPurgeTask">Aufgabe löschen</string>
+
+    <!-- ============================================== SortSelectionDialog == -->
+
+    <!-- slide 23a: Sort Selection: dialog title -->
+    <string name="SSD_title">Sortierung, Teilaufgaben und Versteckte</string>
+
+    <!-- slide 23h:  Hidden: title -->
+    <string name="SSD_hidden_title">Versteckte Aufgaben</string>
+
+    <!-- Hidden Task Selection: show completed tasks -->
+    <string name="SSD_completed">Erledigte Aufgaben anzeigen</string>
+
+    <!-- Hidden Task Selection: show hidden tasks -->
+    <string name="SSD_hidden">Versteckte Aufgaben anzeigen</string>
+
+    <!-- Hidden Task Selection: show deleted tasks -->
+    <string name="SSD_deleted">Gelöschte Aufgaben anzeigen</string>
+
+    <!-- Sort Selection: drag with subtasks -->
+    <string name="SSD_sort_drag">Manuelle Sortierung mit Subtasks</string>
+
+    <!-- slide 23b: Sort Selection: smart sort -->
+    <string name="SSD_sort_auto">Astrid Smart Sort</string>
+
+    <!-- slide 23e: Sort Selection: sort by alpha -->
+    <string name="SSD_sort_alpha">Nach Titel</string>
+
+    <!-- slide 23c: Sort Selection: sort by due date -->
+    <string name="SSD_sort_due">Nach Fälligkeit</string>
+
+    <!-- slide 23d: Sort Selection: sort by importance -->
+    <string name="SSD_sort_importance">Nach Priorität</string>
+
+    <!-- slide 23f: Sort Selection: sort by modified date -->
+    <string name="SSD_sort_modified">Nach letzter Änderung</string>
+
+    <!-- slide 23g: Sort Selection: reverse -->
+    <string name="SSD_sort_reverse">Umgekehrte Sortierung</string>
+
+    <!-- slide 23j: Sort Button: sort temporarily -->
+    <string name="SSD_save_temp">Nur einmal</string>
+
+    <!-- slide 23i: Sort Button: sort permanently -->
+    <string name="SSD_save_always">Immer</string>
+
+    <!-- =============================================== FilterListActivity == -->
+
+    <!-- Astrid Filter Shortcut -->
+    <string name="FSA_label">Astrids Liste oder Filter</string>
+
+    <!-- Filter List Activity Title -->
+
+    <!-- Displayed when loading filters -->
+
+    <!-- Context Menu: Create Shortcut -->
+    <string name="FLA_context_shortcut">Verknüpfung auf dem Desktop erstellen</string>
+
+    <!-- Menu: Search -->
+
+    <!-- Menu: Help -->
+
+    <!-- slide 28c: Create Shortcut Dialog Title -->
+    <string name="FLA_shortcut_dialog_title">Desktop Verküpfung erstellen</string>
+
+    <!-- Create Shortcut Dialog (asks to name shortcut) -->
+    <string name="FLA_shortcut_dialog">Name der Verknüpfung</string>
+
+    <!-- Search Hint-->
+    <string name="FLA_search_hint">Suche nach Aufgabe</string>
+
+    <!-- Search Filter name (%s => query) -->
+    <string name="FLA_search_filter">Übereinstimmung mit %s</string>
+
+    <!-- Toast: created shortcut (%s => label) -->
+    <string name="FLA_toast_onCreateShortcut">Verknüpfung erstellt: %s</string>
+
+    <!-- Menu: new filter -->
+    <string name="FLA_new_filter">Neuer Filter</string>
+
+    <!-- slide 10e: Button: new list -->
+    <string name="FLA_new_list">Neue Liste</string>
+
+    <!-- Alert when creating a shortcut without selecting a filter -->
+    <string name="FLA_no_filter_selected">Kein Filter ausgewählt. Bitte Filter oder Liste
+        auswählen.
+    </string>
+
+    <!-- ================================================= TaskEditActivity == -->
+
+    <!-- Title when editing a task (%s => task title) -->
+
+    <!-- Title when creating a new task -->
+
+    <!-- Task title label -->
+
+    <!-- Task when label -->
+    <string name="TEA_when_header_label">Wann</string>
+
+    <!-- Task title hint (displayed when edit box is empty) -->
+    <string name="TEA_title_hint">Aufgabenname</string>
+
+    <!-- Task importance label -->
+    <string name="TEA_importance_label">Priorität</string>
+
+    <!-- Task due date hint -->
+    <string name="TEA_deadline_hint">Fälligkeitsdatum setzen</string>
+
+    <!-- Task assigned to string (%s -> assigned person name) -->
+    <string name="TEA_assigned_to">Zugeordnet an %s</string>
+
+    <!-- Task urgency specific time checkbox -->
+    <string name="TEA_urgency_specific_time">Zu einer bestimmten Zeit?</string>
+
+    <!-- Task urgency specific time title when specific time false -->
+    <string name="TEA_urgency_none">Keine</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_label">Verbergen bis</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_display">Verbergen bis %s</string>
+
+    <!-- Task hide until toast -->
+    <string name="TEA_hideUntil_message">Aufgabe wird bis %s versteckt</string>
+
+    <!-- Task editing data being loaded label -->
+    <string-array name="TEA_loading">
+        <item>Ladevorgang …</item>
+    </string-array>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_note_label">Beschreibung</string>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_notes_empty">Beschreibung ...</string>
+
+    <!-- Task note hint -->
+    <string name="TEA_notes_hint">Aufgabenbeschreibung eingeben ...</string>
+
+    <!-- Estimated time label -->
+    <string name="TEA_estimatedDuration_label">Wie lang wird es dauern?</string>
+
+    <!-- Elapsed time label -->
+    <string name="TEA_elapsedDuration_label">Zeit, die schon für die Aufgabe gebraucht wurde
+    </string>
+
+    <!-- Menu: Save -->
+    <string name="TEA_menu_save">Änderungen speichern</string>
+
+    <!-- Menu: Don\'t Save -->
+    <string name="TEA_menu_discard">Nicht speichern</string>
+
+    <!-- Menu: Delete Task -->
+    <string name="TEA_menu_delete">Aufgabe löschen</string>
+
+    <!-- Menu: Task comments -->
+    <string name="TEA_menu_refresh_comments">Kommentare aktualisieren</string>
+
+    <string name="TEA_menu_comments">Kommentare</string>
+
+    <!-- Toast: task saved with deadline (%s => preposition + time units) -->
+    <string name="TEA_onTaskSave_due">Aufgabe gespeichert: fällig %s</string>
+
+    <!-- Toast: task saved without deadlines -->
+    <string name="TEA_onTaskSave_notDue">Aufgabe gespeichert</string>
+
+    <!-- Toast: task was not saved -->
+
+    <!-- Toast: task was deleted -->
+
+    <!-- slide 15b: Task edit tab: activity -->
+    <string name="TEA_tab_activity">Aktivität</string>
+
+    <!-- slide 15e:  Task edit tab: more editing settings -->
+    <string name="TEA_tab_more">Details</string>
+
+    <!-- slide 15d: Task edit tab: web services -->
+    <string name="TEA_tab_web">Ideen</string>
+
+    <string name="TEA_timer_est">Est. %s</string>
+
+    <string name="TEA_timer_elap">Elapsed %s</string>
+
+    <string-array name="TEA_urgency">
+        <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
+        <item>Kein Datum</item>
+        <item>Bestimmter Tag</item>
+        <item>Heute</item>
+        <item>Morgen</item>
+        <item>Übermorgen</item>
+        <item>Nächste Woche</item>
+        <item>In zwei Wochen</item>
+        <item>Nächster Monat</item>
+    </string-array>
+
+    <string name="TEA_no_time">Ohne Uhrzeit</string>
+
+    <string-array name="TEA_hideUntil">
+        <!-- hideUntil: labels for edit page. -->
+        <item>Nie</item>
+        <item>Fälligkeitsdatum</item>
+        <item>Fälligkeitsdatum</item>
+        <item>Tag vor Fälligkeit</item>
+        <item>Woche vor Fälligkeit</item>
+        <item>Bestimmter Tag/Uhrzeit</item>
+    </string-array>
+
+    <!-- Task edit control set descriptors -->
+
+    <!-- slide 9b/35i -->
+    <string name="TEA_control_who">Wer</string>
+
+    <!-- slide 9c/ 35a -->
+    <string name="TEA_control_when">Wann</string>
+    <!-- slide 35b -->
+    <string name="TEA_control_more_section">----Details----</string>
+    <!-- slide 16a/35c -->
+    <string name="TEA_control_importance">Priorität</string>
+    <!-- slide 16b/35d -->
+    <string name="TEA_control_lists">Listen</string>
+    <!-- slide 16c/35e -->
+    <string name="TEA_control_notes">Beschreibung</string>
+
+    <string name="TEA_control_files">Dateien</string>
+
+    <!-- slide 16e / slide 35g-->
+    <string name="TEA_control_reminders">Erinnerungen</string>
+
+    <!-- slide 16f -->
+    <string name="TEA_control_timer">Timer-Einstellungen</string>
+
+    <string name="TEA_control_hidden_section">----Immer Verbergen----</string>
+
+    <string name="hide_until_prompt">Anzeigen in meiner Liste</string>
+
+    <!-- Add Ons tab when no add-ons found -->
+
+    <!-- Add Ons button -->
+
+    <!-- More row -->
+
+    <!-- slide 15c: Text when no activity to show -->
+    <string name="TEA_no_activity">Keine Tätigkeit</string>
+
+    <!-- Text to load more activity -->
+    <string name="TEA_load_more">Weitere laden …</string>
+
+    <!-- When controls dialog -->
+    <string name="TEA_when_dialog_title">Wann ist das fällig?</string>
+
+
+    <string name="TEA_new_task">Neue Aufgabe</string>
+
+    <string name="WSV_click_to_load">Drück mich, um dir beim Lösen der Aufgabe zu helfen!</string>
+
+    <string name="WSV_not_online">Ich kann mehr erreichen, wenn ich eine Verbindung zum Internet
+        habe. Bitte prüf deine Verbindung.
+    </string>
+
+    <string name="TEA_contact_error">Sorry! Kann keine Email-Adresse für den ausgewählten Kontakt
+        finden.
+    </string>
+
+    <!-- ============================================= IntroductionActivity == -->
+
+    <!-- slide 1a: Introduction Window title -->
+
+    <!-- Button to agree to EULA -->
+
+    <!-- Button to disagree with EULA -->
+
+    <!-- ===================================================== MissedCallActivity == -->
+
+    <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
+    <string name="MCA_title">%1$s hat um %2$s angerufen</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_return_call">Jetzt anrufen</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_add_task">Später anrufen</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_ignore">Ignorieren</string>
+
+    <!-- Missed call: dialog to ignore all missed calls title -->
+    <string name="MCA_ignore_title">Alle versäumten Anrufe ignorieren?</string>
+
+    <!-- Missed call: dialog to ignore all missed calls body -->
+    <string name="MCA_ignore_body">Sie haben mehrere versäumte Anrufe ignoriert. Soll Astrid nicht
+        mehr danach fragen?
+    </string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore all button -->
+    <string name="MCA_ignore_all">Alle Anrufe ignorieren</string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
+    <string name="MCA_ignore_this">Nur diesen Anruf ignorieren</string>
+
+    <!-- Missed call: preference title -->
+    <string name="MCA_missed_calls_pref_title">Verpasste Anrufe</string>
+
+    <!-- slide 49c: Missed call: preference description -->
+    <string name="MCA_missed_calls_pref_desc_enabled">Astrid wird Sie über versäumte Anrufe
+        informieren und an Rückrufe erinnern
+    </string>
+    <string name="MCA_missed_calls_pref_desc_disabled">Astrid wird Sie über versäumte Anrufe
+        informieren
+    </string>
+
+    <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
+    <string name="MCA_task_title_name">%1$s unter %2$s zurückrufen</string>
+
+    <!-- Missed call: task title no name (%s -> number)-->
+    <string name="MCA_task_title_no_name">%s zurückrufen</string>
+
+    <!-- Missed call: schedule dialog title (%s -> name or number)-->
+    <string name="MCA_schedule_dialog_title">%s zurückrufen in ...</string>
+
+    <!-- Missed call speech bubble options -->
+    <string-array name="MCA_dialog_speech_options">
+        <item>Schön, wenn man so bekannt ist!</item>
+        <item>Wow, die Leute mögen Sie!</item>
+        <item>Ein Anruf macht Ihnen sicher eine Freude</item>
+        <item>Würde es dich nicht freuen, wenn Sie zurückgerufen werden?</item>
+        <item>Du schaffst es!</item>
+        <item>Du kannst auch eine SMS senden ...</item>
+    </string-array>
+
+
+    <!-- ======================================= Calendar reminder activity == -->
+
+    <!-- Calendar remindeer ignore button -->
+    <string name="CRA_ignore">Ablehnen</string>
+
+    <!-- Calendar event -->
+    <string name="CRA_title">Willst Du eine Besprechungsliste erstellen?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls title -->
+    <string name="CRA_ignore_title">Alle Kalendertermine ablehnen?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls body -->
+    <string name="CRA_ignore_body">Sie haben mehrere Kalendertermine ignoriert. Soll Astrid nicht
+        mehr danach fragen?
+    </string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
+    <string name="CRA_ignore_all">Alle Termine ablehnen</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
+    <string name="CRA_ignore_this">Nur diesen Termin ablehnen</string>
+
+    <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
+    <string name="CRA_speech_bubble_start">Vergiss nicht, dass %s bald startet. Willst du eine Liste
+        mit Aufgaben erstellen?
+    </string>
+
+    <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
+    <string name="CRA_speech_bubble_end">Hast Du gerade %s beendet? Willst du noch eine Liste mit
+        Aufgaben erstellen?
+    </string>
+
+    <!-- Calendar reminder: create list button -->
+    <string name="CRA_create_list">Liste anlegen</string>
+
+    <!-- Calendar reminder: postpone button -->
+    <string name="CRA_postpone">Vielleicht später</string>
+
+    <!-- Calendar reminder: list exists dialog title -->
+    <string name="CRA_list_exists_title">Liste existiert bereits</string>
+
+    <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
+    <string name="CRA_list_exists_body">Es gibt bereits eine Liste mit dem Namen %s. Willst Du das
+        Ereignis zur bestehenden Liste hinzufügen oder eine neue erstellen?
+    </string>
+
+    <!-- Calendar reminder: list exists dialog create new button -->
+    <string name="CRA_create_new">Neu anlegen</string>
+
+    <!-- Calendar reminder: list exists dialog use existing button -->
+    <string name="CRA_use_existing">Vorhandene nutzen</string>
+
+    <!-- Calendar remindr: created list (%s -> list name) -->
+    <string name="CRA_created_list_dialog">Die Liste %s wurde erstellt.</string>
+
+    <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
+    <string name="CRA_one_attendee">%s nimmt teil.</string>
+
+    <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
+    <string name="CRA_two_attendees">%1$s und %2$s nehmen teil.</string>
+
+    <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
+    <string name="CRA_many_attendees">%1$s, %2$s, und %3$d weitere nehmen teil.</string>
+
+    <!-- Calendar reminder: invitation prompt -->
+    <string name="CRA_invitation_prompt">Diese Personen einladen?</string>
+
+    <!-- Calendar reminder: preference title -->
+    <string name="CRA_calendar_reminders_pref_title">Kalender-Assistent</string>
+
+    <!-- Calendar reminder: pref description disabled -->
+    <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid wird sie nicht an zukünftige
+        Kalendertermine erinnern.
+    </string>
+
+    <!-- Calendar reminder: pref description enabled -->
+    <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid wird Sie an zukünftige
+        Kalenderterrmine erinnern und Sie auf die Vorbereitung hinweisen.
+    </string>
+
+    <!-- Calendar reminder: share list title -->
+    <string name="CRA_share_list_title">Liste zum Bearbeiten oder Teilen anklicken</string>
+
+    <string name="CRA_invite_attendees">Teilnehmer einladen</string>
 
-    
-    <!-- Resources for built-in timers plug-in -->
-    
-    <!-- Task Edit Activity: Container Label -->
-    <string name="alarm_ACS_label">Alarme</string>
-    
-    <!-- Task Edit Activity: Add New Alarm -->
-    <string name="alarm_ACS_button">Einen Alarm hinzufügen</string>
-    
-    <string-array name="reminders_alarm">
-      <!-- reminders related to alarm -->
-      <item>Alarm!</item>
+    <string name="CRA_more_options">Weitere Optionen</string>
+
+    <string name="CRA_dont_invite">Nein danke</string>
+
+    <!-- Calendar reminder: share list title when no other attendees exist-->
+    <string name="CRA_list_created_title">Liste erstellt</string>
+
+    <!-- Calendar reminder: default new list name (%s -> event title) -->
+    <string name="CRA_default_list_name">Einzelaufgaben: %s</string>
+
+    <!-- ===================================================== HelpActivity == -->
+
+    <!-- Help: Button to get support from our website -->
+
+    <!-- ==================================================== UpdateService == -->
+
+    <!-- Changelog Window Title -->
+    <string name="UpS_changelog_title">Was ist neu bei Astrid?</string>
+
+    <!-- Updates Window Title -->
+    <string name="UpS_updates_title">Astrid Neuigkeiten</string>
+
+    <!-- Updats No Activity to show for offline users -->
+    <string name="UpS_no_activity_log_in">Wenn du dich einloggst, kann du den \nFortschritt deiner
+        eigenen also auch \ngemeinsamer Aufgabenlisten einsehen.
+    </string>
+
+    <!-- ================================================== EditPreferences == -->
+
+    <!-- slide 31g: Preference Window Title -->
+    <string name="EPr_title">Astrid: Einstellungen</string>
+
+    <string name="EPr_share_astrid">Astrid teilen</string>
+
+    <string name="EPr_share_astrid_summary">Erzähle von Astrid auf deinem bevorzugten sozialen
+        Netzwerk
+    </string>
+
+    <!-- slide 46a -->
+    <string name="EPr_deactivated">deaktiviert</string>
+
+    <!-- slide 30i: Preference Category: Appearance Title -->
+    <string name="EPr_appearance_header">Erscheinungsbild</string>
+
+    <!-- Preference Category: Appearance Summary -->
+    <string name="EPr_appearance_summary">Themes, Widgets, Aufgabenzeilen, Bearbeitungsansicht
+    </string>
+
+    <!-- FAQ Preference title -->
+    <string name="EPr_faq_title">FAQ</string>
+
+    <!-- Account status preference (%s -> account type) -->
+    <string name="EPr_account_title">Konto: %s</string>
+
+    <!-- Support preferences summary -->
+    <string name="EPr_support_summary">Einführung, FAQ, über</string>
+
+    <!-- slide 34a: Preference: Task List Font Size Title -->
+    <string name="EPr_fontSize_title">Größe der Aufgabenliste</string>
+
+    <!-- Preference: Filters to show pref screen title -->
+    <string name="EPr_filters_to_show_title">Angezeigte Filter</string>
+
+    <!-- slide 32a: Preference: Show confirmation for smart reminders -->
+    <string name="EPr_showSmartConfirmation_title">Bestätigung für Smart-Erinnerungen anzeigen
+    </string>
+
+    <!-- slide 34g: Preference: Task List Font Size Description -->
+    <string name="EPr_fontSize_desc">Schriftgröße auf der Hauptseite</string>
+
+    <!-- Preferemce: Show task edit confirmation toasts -->
+
+    <!-- slide 34c: Preference: Task List Show Notes -->
+    <string name="EPr_showNotes_title">Zeige Beschreibung in der Aufgabe</string>
+
+    <!-- Edit screen preference category -->
+    <string name="EPr_edit_screen_options">Bildschirmeinstellungen bearbeiten</string>
+
+    <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
+    <string name="EPr_beastMode_title">Bearbeite Anordnung</string>
+
+    <string name="EPr_beastMode_shortcut">Einstellen</string>
+
+    <string name="EPr_time_increment">5 Minuten Steigerung</string>
+
+    <string name="EPr_use_date_shortcuts">Nutze Datumsabkürzung</string>
+
+    <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
+
+    <!-- slide 35h -->
+    <string name="EPr_beastMode_desc">Erscheinungsbild Aufgabenseite anpassen</string>
+    <!-- slide 35j -->
+    <string name="EPr_beastMode_reset">Auf Standardeinstellungen zurücksetzen</string>
+
+    <string name="EPr_beastMode_hint">Du kannst die Eingabeseite für Aufgaben mit den Schiebereglern
+        links anpassen
+    </string>
+
+    <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
+    <string name="EPr_showNotes_desc_disabled">Beschreibung vom Eingabeschirm für Aufgaben
+        erreichbar
+    </string>
+    <!-- Preference: Task List Show Notes Description (enabled) -->
+    <string name="EPr_showNotes_desc_enabled">Beschreibung werden immer angezegt</string>
+
+    <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
+    <string name="EPr_compressTaskRows_title">Kompakte Aufgabenzeile</string>
+    <!-- slide 34j -->
+    <string name="EPr_compressTaskRows_desc">Aufgabenzeilengröße an Titel anpassen</string>
+
+    <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
+    <!-- slide 34k-->
+
+    <!-- slide 34b: Preferences: Wrap task titles to two lines -->
+    <string name="EPr_fullTask_title">Gesamten Aufgabentitel anzeigen</string>
+    <string name="EPr_fullTask_desc_enabled">Aufgabentitel werden vollständig angezeigt</string>
+    <!-- slide 34h -->
+    <string name="EPr_fullTask_desc_disabled">Zwei Zeilen des Aufgabentitels werden angezeigt
+    </string>
+
+    <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
+    <string name="EPr_ideaAuto_title">Ideas Tab automatisch laden</string>
+    <!-- slide 32c -->
+    <string name="EPr_ideaAuto_desc_enabled">Internetsuche für Ideas Tab wird ausgeführt, wenn Haken
+        gesetzt ist
+    </string>
+    <string name="EPr_ideaAuto_desc_disabled">Internetsuche für Ideas Tab wird nur durchgeführt,
+        wenn vom Nutzer gewünscht
+    </string>
+
+    <!-- Preferences: task row style -->
+    <string-array name="EPr_task_row_styles">
+        <item>Original</item>
+        <item>Einfach</item>
+        <item>Nur Titel</item>
     </string-array>
-    
 
+    <string-array name="EPr_task_row_style_descriptions">
+        <item>Titel auf zwei Zeilen begrenzen mit Datum rechts</item>
+        <item>Titel auf eine Zeile begrenzen, Datum und Listen darunter</item>
+        <item>Einzeilig, nur Titel</item>
+    </string-array>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- task row style title (%s -> style) -->
+    <string name="EPr_task_row_style_title">Zeilenart: %s</string>
+
+    <!-- Preference: custom filters enabled -->
+    <string name="EPr_use_filters_title">Filter nutzen</string>
+    <string name="EPr_use_filters_subtitle">Hiermit können Sie benutzerdefinierte Filter erstellen
+    </string>
+
+    <!-- Preference: show list members in shared list -->
+    <string name="EPr_show_list_members_title">Zeige Mitglieder der gemeinsam genutzten Listen
+    </string>
+
+    <!-- Preference: simple input box style -->
+    <string name="EPr_simple_input_boxes">Einfachen Textboxen</string>
+
+    <!-- Preference: simple input box style -->
+    <string name="EPr_show_quickadd_controls">Erweiterte Einstellungen für Schnelleingabe</string>
+
+    <!-- Preference: don\'t show plus button until input present -->
+    <string name="EPr_hide_plus_button">Verstecke den +-Knopf</string>
+
+    <!-- Preference: menu items -->
+    <string name="EPr_menu_items">Menüeinträge</string>
+
+    <!-- Preference: list view -->
+    <string name="EPr_list_view">Listenansicht</string>
+
+    <!-- Preference: task edit comments -->
+    <string name="EPr_show_task_edit_comments">Kommentare bei Aufgabeneingabe anzeigen</string>
+
+    <!-- slide 30f/ 36f: Preference: Theme -->
+    <string name="EPr_theme_title">Farbschema</string>
+    <!-- Preference: Theme Description (%s => value) -->
+    <string name="EPr_theme_desc">Momentan: %s</string>
+    <!-- Preference: Theme Description (android 1.6) -->
+    <string name="EPr_theme_desc_unsupported">Einstellungen benötigen mindestens Android 2.0
+    </string>
+    <!-- slide 32h/ 37b -->
+    <string name="EPr_theme_widget_title">Widget Theme</string>
+
+    <!-- slide 30d/ 34f: Preference screen: all task row settings -->
+    <string name="EPr_taskRowPrefs_title">Aussehen der Aufgabenzeilen</string>
+
+    <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
+    <string name="EPr_use_contact_picker">Verwende den Systemdialog für die Kontaktauswahl</string>
+    <!-- slide 49b -->
+    <string name="EPr_use_contact_picker_desc_enabled">Zeigt im Zuweisungsfeld für Aufgaben ein
+        Symbol für den Systemdialog für Kontaktauswahl an
+    </string>
+    <string name="EPr_use_contact_picker_desc_disabled">Das Symbol des Systemdialogs für
+        Kontaktauswahl wird nicht angezeigt
+    </string>
+
+    <!-- slide 49i: Preferences: Third party addons -->
+    <string name="EPr_third_party_addons">Schalte Drittanbieter-Erweiterungen ein</string>
+    <string name="EPr_third_party_addons_desc_enabled">Erweiterungen anderer Anbieter werden
+        aktiviert
+    </string>
+    <!-- slide 49d -->
+    <string name="EPr_third_party_addons_desc_disabled">Erweiterungen anderer Anbieter werden
+        deaktiviert
+    </string>
+
+    <!-- Preferences: ideas tab -->
+    <string name="EPr_ideas_tab_enabled">Aufgabenideen</string>
+    <string name="EPr_ideas_tab_description">Holen Sie sich Vorschläge, um Aufgaben abzuschließen
+    </string>
+
+    <!-- Preferences: calendar event start time -->
+    <string name="EPr_cal_end_or_start_at_due_time">Zeitpunkt Kalendertermin</string>
+    <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
+    <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
+
+    <string name="EPr_force_phone_layout">Telefon Layout nutzen</string>
+
+    <string name="EPr_show_featured_lists">Vorgeschlagene Listen anzeigen</string>
+
+    <!-- Configurations -->
+    <string name="EPr_configurations_title">Einstellen</string>
+    <string name="EPr_config_default">Standard</string>
+    <string name="EPr_config_lite">Astrid Lite</string>
+
+    <!-- Dialog title when setting preference configuration -->
+    <string name="EPr_config_dialog_title">Einstellen?</string>
+    <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
+    <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
+
+    <!-- default configuration name for the above dialog -->
+    <string name="EPr_config_dialog_default_id">Standard</string>
+
+    <!-- Preference title for showing save and cancel buttons in task edit page -->
+    <string name="EPr_show_save_and_cancel">Zeige speichern und abbrechen</string>
+
+
+    <!-- Swipe between lists -->
+    <!-- Preference: swipe between lists performance -->
+    <string name="EPr_swipe_lists_performance_title">Zum Wechseln der Listen \"wischen\"</string>
+
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>Kein Schieben</item>
+        <item>Minimale Speichernutzung</item>
+        <item>Normale Performance</item>
+        <item>Beste Performance</item>
+    </string-array>
 
-    
-  <!-- Resources for built-in backup plug-in -->
-  
-  <!-- ================================================= BackupPreferences == -->
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <!-- slide 49a -->
+        <item>Schieben zwischen den Listen ist Deaktiviert</item>
+        <item>Geringere Performance</item>
+        <item>Standardeinstellung</item>
+        <item>Hat höhere Leistungsanforderungen</item>
+    </string-array>
 
-    <!-- slide 33c/48d: Backup Preferences Title -->    
-    <string name="backup_BPr_header">Backups</string>
+    <string name="swipe_lists_helper_title">Zum Wechseln der Listen wischen</string>
+    <string name="swipe_lists_helper_header">Zieh nach links oder rechts, um schnell zwischen Listen
+        zu wechseln
+    </string>
+    <string name="swipe_lists_helper_subtitle">Ändere die Einstellungen unter Einstellungen -&gt;
+        Erscheinungsbild
+    </string>
+
+    <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
+
+    <string-array name="EPr_default_reminders_mode">
+        <!-- reminders duration: labels for "Task Defaults" preference item. -->
+        <item>@string/TEA_reminder_mode_once</item>
+        <item>Deutsch
+        </item>
+        <item>@string/TEA_reminder_mode_nonstop</item>
+    </string-array>
 
-    <!-- slide 48e/50c: Backup: Status Header -->    
-    <string name="backup_BPr_group_status">Status</string>
-    
-    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Letzte Datensicherung:\n%s</string>
-    <!-- Backup Status: last error failed. Keep it short! -->    
-    <string name="backup_status_failed">Letzte Datensicherung gescheitert</string>
-    <!-- Backup Status: error subtitle -->    
-    <string name="backup_status_failed_subtitle">(Anklicken, um Fehler anzuzeigen)</string>
-    <!-- slide 48a: Backup Status: never backed up -->    
-    <string name="backup_status_never">Bisher keine Datensicherung erstellt!</string>
+    <string-array name="EPr_themes">
+        <!-- theme_settings: labels for Theme preference menu -->
+        <!-- slide 36a-->
+        <item>Tag - Blau</item>
+        <!-- slide 36b -->
+        <item>Tag -Rot</item>
+        <!-- slide 36b -->
+        <item>Himmelblau</item>
+        <!-- slide 36c -->
+        <item>Nacht</item>
+        <!-- slide 36d -->
+        <item>Transparent (weißer Text)</item>
+        <!-- slide 36e -->
+        <item>Transparent (schwarzer Text)</item>
+    </string-array>
 
-    <!-- slide 48f/ 50e: Backup Options Group Label -->    
-    <string name="backup_BPr_group_options">Einstellungen</string>
+    <string-array name="EPr_themes_widget">
+        <!-- slide 32i / 37a-->
+        <item>Wie die App</item>
+        <item>Tag - Blau</item>
+        <item>Tag - Rot</item>
+        <item>Himmelblau</item>
+        <item>Nacht</item>
+        <item>Transparent (weißer Text)</item>
+        <item>Transparent (schwarzer Text)</item>
+        <item>Retro</item>
+    </string-array>
 
-    <!-- slide 48b: Preference: Automatic Backup Title -->    
-    <string name="backup_BPr_auto_title">Automatische Backups</string>
-    <!-- Preference: Automatic Backup Description (when disabled) -->
-    <string name="backup_BPr_auto_disabled">Automatische Backups deaktiviert</string>    
-    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
-    <string name="backup_BPr_auto_enabled">Verwalte deine Backups</string>
-    
-    <!-- Preference screen restoring Tasks Help -->
-    <!-- Preference screen Restoring Tasks Help Dialog Text-->
-    
-    <string name="backup_BPr_cloud_already_logged_in">Cloud Backup auf Astrid.com ist bereits aktiviert.</string>
-  
-  <!-- ================================================= BackupActivity == -->
-
-  <!-- slide 48c: backup activity label -->
-  <string name="backup_BAc_label">Backups verwalten</string>
-
-  <!-- backup activity title -->
-  <string name="backup_BAc_title">Ihre Backups verwalten</string>
-
-  <!-- backup activity import button -->
-  <string name="backup_BAc_import">Aufgaben importieren</string>
-
-  <!-- backup activity export button -->
-  <string name="backup_BAc_export">Aufgaben exportieren</string>
-  
-  <!-- backup activity cloud (Astrid.com) option -->
-  <string name="backup_BAc_cloud">Klicke hier für kostenlose Sicherungen in der Cloud auf Astrid.com</string>
-    
-  <!-- ============================================== Importer / Exporter == -->
-  
-  <!-- Message displayed when error occurs -->
-  <string name="backup_TXI_error">Importfehler</string>
-    
-  <string name="export_toast">%1$s bis %2$s gesichert.</string>
-    
-  <string name="export_toast_no_tasks">Keine Aufgaben zu exportieren.</string>
-  
-  <!-- Progress Dialog Title for exporting -->    
-  <string name="export_progress_title">Es wird exportiert …</string>
-  
-  <!-- Backup: Title of Import Summary Dialog -->
-  <string name="import_summary_title">Zusammenfassung wiederherstellen</string>
-    
-  <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">Datei %1$s enthielt %2$s Aufgaben.\n\n %3$s wurden importiert,\n %4$s waren schon vorhanden (übersprungen)\n %5$s waren fehlerhaft\n</string>
-  
-  <!-- Progress Dialog Title for importing -->    
-  <string name="import_progress_title">Es wird importiert …</string>
-  
-  <!-- Progress Dialog text for import reading task (%d -> task number)-->    
-  <string name="import_progress_read">Aufgabe %d wird gelesen …</string>
-  
-  <!-- Backup: Dialog when unable to open a file -->  
-  
-  <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
-  <string name="DLG_error_sdcard">Ordner konnte nicht geöffnet werden: %s</string>
-  
-  <!-- Backup: Dialog when unable to open SD card in general -->
-  <string name="DLG_error_sdcard_general">SD-Karte konnte nicht geöffnet werden!</string>
-    
-  <!-- Backup: File Selector dialog for import -->
-  <string name="import_file_prompt">Wählen Sie eine Datei zum Wiederherstellen</string>    
-        
+    <!-- ========================================== Task Management Settings == -->
+
+    <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
+    <string name="EPr_manage_header">Alte Aufgaben verwalten</string>
+    <!-- slide 47d -->
+    <string name="EPr_manage_delete_completed">Erledigte Aufgaben löschen</string>
+    <string name="EPr_manage_delete_completed_message">Willst du wirklich alle erledigten Aufgaben
+        löschen?
+    </string>
+    <!-- slide 47a -->
+    <string name="EPr_manage_delete_completed_summary">Gelöschte Aufgaben können einzeln
+        wiederhergestellt werden.
+    </string>
+    <string name="EPr_manage_delete_completed_status">%d Aufgaben gelöscht</string>
+    <!-- slide 47e -->
+    <string name="EPr_manage_purge_deleted">Bereinige gelöschte Aufgaben</string>
+    <string name="EPr_manage_purge_deleted_message">Willst du wirklich alle gelöschten Aufgaben
+        bereinigen?\n\nDiese Aufgaben werden für immer gelöscht bleiben!
+    </string>
+    <string name="EPr_manage_purge_deleted_status">%d Aufgaben bereinigt!</string>
+    <!-- slide 47b-->
+    <string name="EPr_manage_purge_deleted_summary">Vorsicht! Bereinigte Aufgaben können ohne
+        Backup-Datei nicht wiederhergestellt werden!
+    </string>
+    <!-- slide 47h-->
+    <string name="EPr_manage_clear_all">Alle Daten löschen</string>
+    <string name="EPr_manage_clear_all_message">Alle Aufgaben und Einstellungen von Astrid
+        löschen?\n\nWarnung: Dies kann nicht rückgängig gemacht werden!
+    </string>
+
+    <!-- slide 47f -->
+    <string name="EPr_manage_delete_completed_gcal">Lösche Kalendereinträge von erledigten
+        Aufgaben
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_message">Möchtest du wirklich alle deine
+        Kalendereinträge von erledigen Aufgaben löschen?
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_summary"></string>
+    <string name="EPr_manage_delete_completed_gcal_status">%d Kalendereinträge gelöscht!</string>
+
+    <!-- slide 47g-->
+    <string name="EPr_manage_delete_all_gcal">Lösche alle Kalendereinträge von Aufgaben</string>
+    <string name="EPr_manage_delete_all_gcal_message">Möchtest du wirklich alle Kalendereintrage von
+        Aufgaben löschen?
+    </string>
+    <string name="EPr_manage_delete_all_gcal_summary"></string>
+    <string name="EPr_manage_delete_all_gcal_status">%d Kalendereinträge gelöscht!</string>
 
+    <!-- ==================================================== AddOnActivity == -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Add Ons Activity Title -->
+    <string name="AOA_title">Erweiterungen</string>
 
+    <!-- Add-on Activity: author for internal authors  -->
+    <string name="AOA_internal_author">Astrid Team</string>
 
-  <!-- ================================================== AndroidManifest == -->
-
-  <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
-  <string name="app_name">Astrid Aufgaben</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="read_permission_label">Astrid Zugriffsrechte</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="read_permission_desc">Aufgaben lesen, Aufgabenfilter anzeigen</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="write_permission_label">Astrid Zugriffsrechte</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="write_permission_desc">Aufgaben erstellen, existierende bearbeiten</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-    
-  <!-- question for deleting tasks -->
-  <string name="DLG_delete_this_task_question">Diese Aufgabe löschen?</string>
-
-  <!-- question for deleting items (%s => item name) -->
-  <string name="DLG_delete_this_item_question">Dieses Element löschen: %s?</string>
-    
-  <!-- Progress dialog shown when upgrading -->
-  <string name="DLG_upgrading">Ihre Aufgaben werden aktualisiert …</string>
-  
-  <!-- Title for dialog selecting a time (hours and minutes) -->
-  <string name="DLG_hour_minutes">Zeit (Stunden : Minuten)</string>
-  
-  <!-- Dialog for Astrid having a critical update -->
-  <string name="DLG_please_update">Astrid sollte auf die aktuellste Version im Android Market aktualisiert werden! Bitte tun Sie dies, bevor Sie fortfahren, oder warten Sie ein paar Sekunden.</string>
-
-  <!-- Button for going to Market -->
-
-  <!-- Button for accepting EULA -->
-  <string name="DLG_accept">Ich akzeptiere</string>
-
-  <!-- Button for declining EULA -->
-  <string name="DLG_decline">Ich akzeptiere nicht</string>
-
-  <!-- EULA title -->
-  <string name="DLG_eula_title">Astrid Nutzungsbedingungen</string>
-
-  <!-- Progress Dialog generic text -->
-  <string name="DLG_please_wait">Bitte warten Sie</string>
-  
-  <!-- Dialog - loading -->
-  <string name="DLG_loading">Ladevorgang…</string>
-  
-  <!-- Dialog - dismiss -->
-
-  <!-- slide 20d -->
-  <string name="DLG_ok">OK</string>
-  <!-- slide 36g -->
-  <string name="DLG_cancel">Abbrechen</string>
-  
-  <string name="DLG_more">Mehr</string>
-  
-  <string name="DLG_undo">Rückgängig</string>
-  
-  <string name="DLG_warning">Warnung</string>
-  
-  <!-- =============================================================== UI == -->
-  
-  <!-- Label for DateButtons with no value -->
-  <string name="WID_dateButtonUnset">Klicken zur Bestätigung</string>
-  
-  <!-- String formatter for DateButtons ($D => date, $T => time) -->
-  
-  <!-- String formatter for Disable button -->
-  
-  <!--  ============================================================= notes -->
-  
-  <!-- Note Exposer -->    
-  
-  <!-- Note Exposer / Comments -->    
-  
-  <!-- EditNoteActivity - no comments -->
-  <string name="ENA_no_comments">Bisher keine Aktivität</string>
-    
-  <!-- EditNoteActivity - no username for comment -->
-  <string name="ENA_no_user">Irgendjemand</string>
-  
-  <!-- EditNoteActivity - refresh comments -->
-  <string name="ENA_refresh_comments">Kommentare aktualisieren</string>
-  
-  <!-- ================================================= TaskListActivity == -->
-  
-  <!-- slide 8b: Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">Sie haben keine Aufgaben! \n Möchten Sie welche hinzufügen?</string>
-  
-  <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->    
-  <string name="TLA_no_items_person">%s hat noch\nkeine Aufgaben geteilt</string>
-  
-  <!-- Menu: Adjust Sort and Hidden Task Settings -->    
-  <string name="TLA_menu_sort">Sortieren</string>
-  
-  <!-- Menu: Sync Now -->    
-  <string name="TLA_menu_sync">Jetzt synchronisieren</string>
-  
-  <!-- Menu: Search -->
-  <string name="TLA_menu_search">Suchen</string>
-  
-  <!-- Menu: Tasks -->
-  <string name="TLA_menu_lists">Listen</string>
-
-  <!-- Menu: Friends -->
-  <string name="TLA_menu_friends">Personen</string>
-
-  <!-- Menu: Featured Lists -->
-  <string name="TLA_menu_featured_lists">Vorgeschlagene Listen</string>
-
-  <!-- Menu: Suggestions -->
-  <string name="TLA_menu_suggestions">Vorschläge</string>
-  
-  <!-- Menu: Tutorial -->
-
-  <!-- Menu: Settings -->    
-  <string name="TLA_menu_settings">Einstellungen</string>
-  
-  <!-- slide 30b: Menu: Support -->
-  <string name="TLA_menu_support">Unterstützung</string>
-  
-  <!-- Search Label-->
-  
-  <!-- Window title for displaying Custom Filter -->
-  <string name="TLA_custom">Benutzerdefiniert</string>
-  
-  <!-- slide 8d: Quick Add Edit Box Hint-->
-  <string name="TLA_quick_add_hint">Aufgabe hinzufügen</string>
-  
-  <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
-  <string name="TLA_quick_add_hint_assign">Etwas hinzufügen für %s</string>
-  
-  <!-- Notification Volumne notification-->
-  <string name="TLA_notification_volume_low">Erinnerungen sind stummgeschaltet. Du wirst Astrid nicht hören!</string>
-  
-  <!-- Notifications disabled warning -->
-  <string name="TLA_notification_disabled">Astrids Erinnerungen sind ausgeschaltet! Du wirst keine Erinnerungen mehr erhalten!</string>
-  
-  <string-array name="TLA_filters">
-      <item>Aktiviert</item>
-      <item>Heute</item>
-      <item>Bald</item>
-      <item>Verspätet</item>
-      <item>Erledigt</item>
-      <item>Unsichtbar</item>      
-  </string-array>
-  
-  <!-- Title for confirmation dialog after quick add markup -->
-  <string name="TLA_quickadd_confirm_title">Sie sagten: \"%s\"</string>
-  
-  <!-- Text for speech bubble in dialog after quick add markup -->
-  <!-- First string is task title, second is due date, third is priority -->
-  <string name="TLA_quickadd_confirm_speech_bubble">Ich habe die Aufgabe \"%1$s\" %2$s mit %3$s angelegt</string>
-  
-  <string name="TLA_quickadd_confirm_speech_bubble_date">für %s</string>
-  
-  <string name="TLA_quickadd_confirm_hide_helpers">In Zukunft nicht mehr nach Bestätigung fragen</string>
-  
-  
-  <!-- Title for alert on new repeating task. %s-> task title -->
-  <string name="TLA_repeat_scheduled_title">Neue sich wiederholende Aufgabe %s</string>
-  
-  <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
-  <string name="TLA_repeat_scheduled_speech_bubble">"Ich werde dich erinnern an  %s."</string>
-  
-  <string-array name="TLA_priority_strings">
-      <item>höchste Priorität</item>
-      <item>hohe Priorität</item>
-      <item>mittlere Priorität</item>
-      <item>niedrige Priorität</item>
-  </string-array>
-  <!-- slide 22a -->
-  <string name="TLA_all_activity">Alle Aktivitäten</string>
-  
-  <!-- ====================================================== TaskAdapter == -->
-  
-  <!-- Format string to indicate task is hidden (%s => task name) -->
-  <string name="TAd_hiddenFormat">%s [versteckt]</string>
-  
-  <!-- Format string to indicate task is deleted (%s => task name) -->
-  <string name="TAd_deletedFormat">%s [gelöscht]</string>
-  
-  <!-- Displayed when adapter is flung (scrolled quickly) -->
-  
-  <!-- slide 22b: indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Abgeschlossen\n%s</string>
-  
-  <!-- slide 15a: Action Button: edit task -->
-  <string name="TAd_actionEditTask">Bearbeiten</string>
-  
-  <!-- Context Item: edit task -->
-  <string name="TAd_contextEditTask">Aufgabe bearbeiten</string>
-
-  <!-- Context Item: copy task -->
-  <string name="TAd_contextCopyTask">Aufgabe kopieren</string>
-
-  <!-- Context Item: delete task -->
-  <string name="TAd_contextDeleteTask">Aufgabe löschen</string>
-
-  <!-- Context Item: undelete task -->
-  <string name="TAd_contextUndeleteTask">Aufgabe wiederherstellen</string>
-
-  <!-- Context Item: purge task -->
-  <string name="TAd_contextPurgeTask">Aufgabe löschen</string>
-  
-  <!-- ============================================== SortSelectionDialog == -->
-  
-  <!-- slide 23a: Sort Selection: dialog title -->    
-  <string name="SSD_title">Sortierung, Teilaufgaben und Versteckte</string>
-  
-  <!-- slide 23h:  Hidden: title -->
-  <string name="SSD_hidden_title">Versteckte Aufgaben</string>
-  
-  <!-- Hidden Task Selection: show completed tasks -->    
-  <string name="SSD_completed">Erledigte Aufgaben anzeigen</string>
-  
-  <!-- Hidden Task Selection: show hidden tasks -->    
-  <string name="SSD_hidden">Versteckte Aufgaben anzeigen</string>
-  
-  <!-- Hidden Task Selection: show deleted tasks -->    
-  <string name="SSD_deleted">Gelöschte Aufgaben anzeigen</string>
-  
-  <!-- Sort Selection: drag with subtasks -->
-  <string name="SSD_sort_drag">Manuelle Sortierung mit Subtasks</string>
-  
-  <!-- slide 23b: Sort Selection: smart sort -->
-  <string name="SSD_sort_auto">Astrid Smart Sort</string>
-  
-  <!-- slide 23e: Sort Selection: sort by alpha -->
-  <string name="SSD_sort_alpha">Nach Titel</string>
-  
-  <!-- slide 23c: Sort Selection: sort by due date -->
-  <string name="SSD_sort_due">Nach Fälligkeit</string>
-  
-  <!-- slide 23d: Sort Selection: sort by importance -->
-  <string name="SSD_sort_importance">Nach Priorität</string>
-  
-  <!-- slide 23f: Sort Selection: sort by modified date -->
-  <string name="SSD_sort_modified">Nach letzter Änderung</string>
-  
-  <!-- slide 23g: Sort Selection: reverse -->
-  <string name="SSD_sort_reverse">Umgekehrte Sortierung</string>
-  
-  <!-- slide 23j: Sort Button: sort temporarily -->
-  <string name="SSD_save_temp">Nur einmal</string>
-  
-  <!-- slide 23i: Sort Button: sort permanently -->
-  <string name="SSD_save_always">Immer</string>
-  
-  <!-- =============================================== FilterListActivity == -->
-  
-  <!-- Astrid Filter Shortcut -->    
-  <string name="FSA_label">Astrids Liste oder Filter</string>
-
-  <!-- Filter List Activity Title -->    
-  
-  <!-- Displayed when loading filters -->    
-  
-  <!-- Context Menu: Create Shortcut -->    
-  <string name="FLA_context_shortcut">Verknüpfung auf dem Desktop erstellen</string>
-  
-  <!-- Menu: Search -->
-  
-  <!-- Menu: Help -->    
-  
-  <!-- slide 28c: Create Shortcut Dialog Title -->    
-  <string name="FLA_shortcut_dialog_title">Desktop Verküpfung erstellen</string>
-  
-  <!-- Create Shortcut Dialog (asks to name shortcut) -->    
-  <string name="FLA_shortcut_dialog">Name der Verknüpfung</string>
-  
-  <!-- Search Hint-->
-  <string name="FLA_search_hint">Suche nach Aufgabe</string>
-  
-  <!-- Search Filter name (%s => query) -->
-  <string name="FLA_search_filter">Übereinstimmung mit %s</string>
-  
-  <!-- Toast: created shortcut (%s => label) -->
-  <string name="FLA_toast_onCreateShortcut">Verknüpfung erstellt: %s</string>
-  
-  <!-- Menu: new filter -->
-  <string name="FLA_new_filter">Neuer Filter</string>
-  
-  <!-- slide 10e: Button: new list -->
-  <string name="FLA_new_list">Neue Liste</string>
-  
-  <!-- Alert when creating a shortcut without selecting a filter -->
-  <string name="FLA_no_filter_selected">Kein Filter ausgewählt. Bitte Filter oder Liste auswählen.</string>
-  
-  <!-- ================================================= TaskEditActivity == -->
-  
-  <!-- Title when editing a task (%s => task title) -->
-  
-  <!-- Title when creating a new task -->
-  
-  <!-- Task title label -->
-  
-  <!-- Task when label -->
-  <string name="TEA_when_header_label">Wann</string>
-  
-  <!-- Task title hint (displayed when edit box is empty) -->
-  <string name="TEA_title_hint">Aufgabenname</string>
-  
-  <!-- Task importance label -->
-  <string name="TEA_importance_label">Priorität</string>
-  
-  <!-- Task due date hint -->
-  <string name="TEA_deadline_hint">Fälligkeitsdatum setzen</string>
-  
-  <!-- Task assigned to string (%s -> assigned person name) -->
-  <string name="TEA_assigned_to">Zugeordnet an %s</string>
-  
-  <!-- Task urgency specific time checkbox -->
-  <string name="TEA_urgency_specific_time">Zu einer bestimmten Zeit?</string>
-  
-  <!-- Task urgency specific time title when specific time false -->
-  <string name="TEA_urgency_none">Keine</string>
-  
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_label">Verbergen bis</string>
-
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_display">Verbergen bis %s</string>
-  
-  <!-- Task hide until toast -->
-  <string name="TEA_hideUntil_message">Aufgabe wird bis %s versteckt</string>
-  
-  <!-- Task editing data being loaded label -->
-  <string-array name="TEA_loading"><item>Ladevorgang …</item></string-array>
-  
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_note_label">Beschreibung</string>
-
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_notes_empty">Beschreibung ...</string>
-  
-  <!-- Task note hint -->
-  <string name="TEA_notes_hint">Aufgabenbeschreibung eingeben ...</string>
-  
-  <!-- Estimated time label -->
-  <string name="TEA_estimatedDuration_label">Wie lang wird es dauern?</string>
-  
-  <!-- Elapsed time label -->
-  <string name="TEA_elapsedDuration_label">Zeit, die schon für die Aufgabe gebraucht wurde</string>
-
-  <!-- Menu: Save -->    
-  <string name="TEA_menu_save">Änderungen speichern</string>
-  
-  <!-- Menu: Don\'t Save -->
-  <string name="TEA_menu_discard">Nicht speichern</string>
-  
-  <!-- Menu: Delete Task -->
-  <string name="TEA_menu_delete">Aufgabe löschen</string>
-  
-  <!-- Menu: Task comments -->
-  <string name="TEA_menu_refresh_comments">Kommentare aktualisieren</string>
-
-  <string name="TEA_menu_comments">Kommentare</string>
-  
-   <!-- Toast: task saved with deadline (%s => preposition + time units) -->
-  <string name="TEA_onTaskSave_due">Aufgabe gespeichert: fällig %s</string>
-  
-  <!-- Toast: task saved without deadlines -->
-  <string name="TEA_onTaskSave_notDue">Aufgabe gespeichert</string>
-  
-  <!-- Toast: task was not saved -->
-  
-  <!-- Toast: task was deleted -->
-  
-  <!-- slide 15b: Task edit tab: activity -->
-  <string name="TEA_tab_activity">Aktivität</string>
-  
-  <!-- slide 15e:  Task edit tab: more editing settings -->
-  <string name="TEA_tab_more">Details</string>
-  
-  <!-- slide 15d: Task edit tab: web services -->
-  <string name="TEA_tab_web">Ideen</string>
-  
-  <string name="TEA_timer_est">Est. %s</string>
-
-  <string name="TEA_timer_elap">Elapsed %s</string>
-  
-  <string-array name="TEA_urgency">
-      <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
-      <item>Kein Datum</item>
-      <item>Bestimmter Tag</item>
-      <item>Heute</item>
-      <item>Morgen</item>
-      <item>Übermorgen</item>
-      <item>Nächste Woche</item>
-      <item>In zwei Wochen</item>
-      <item>Nächster Monat</item>
-  </string-array>
-  
-  <string name="TEA_no_time">Ohne Uhrzeit</string>
-      
-  <string-array name="TEA_hideUntil">
-      <!-- hideUntil: labels for edit page. -->
-      <item>Nie</item>
-      <item>Fälligkeitsdatum</item>
-      <item>Fälligkeitsdatum</item>
-      <item>Tag vor Fälligkeit</item>
-      <item>Woche vor Fälligkeit</item>
-      <item>Bestimmter Tag/Uhrzeit</item>
-  </string-array>
-  
-  <!-- Task edit control set descriptors -->
-
-  <!-- slide 9b/35i -->
-  <string name="TEA_control_who">Wer</string>
-
-  <!-- slide 9c/ 35a -->
-  <string name="TEA_control_when">Wann</string>
-  <!-- slide 35b -->
-  <string name="TEA_control_more_section">----Details----</string>
-  <!-- slide 16a/35c -->
-  <string name="TEA_control_importance">Priorität</string>  
-  <!-- slide 16b/35d -->
-  <string name="TEA_control_lists">Listen</string>  
-  <!-- slide 16c/35e -->
-  <string name="TEA_control_notes">Beschreibung</string>  
-  
-  <string name="TEA_control_files">Dateien</string>
-
-  <!-- slide 16e / slide 35g-->
-  <string name="TEA_control_reminders">Erinnerungen</string>
-
-  <!-- slide 16f -->
-  <string name="TEA_control_timer">Timer-Einstellungen</string>
-  
-  <string name="TEA_control_hidden_section">----Immer Verbergen----</string>
-  
-  <string name="hide_until_prompt">Anzeigen in meiner Liste</string>
-  
-  <!-- Add Ons tab when no add-ons found -->
-  
-  <!-- Add Ons button -->
-  
-  <!-- More row -->
-  
-  <!-- slide 15c: Text when no activity to show -->
-  <string name="TEA_no_activity">Keine Tätigkeit</string>
-  
-  <!-- Text to load more activity -->
-  <string name="TEA_load_more">Weitere laden …</string>
-  
-  <!-- When controls dialog -->
-  <string name="TEA_when_dialog_title">Wann ist das fällig?</string>
-  
-  
-  <string name="TEA_new_task">Neue Aufgabe</string>
-  
-  <string name="WSV_click_to_load">Drück mich, um dir beim Lösen der Aufgabe zu helfen!</string>
-  
-  <string name="WSV_not_online">Ich kann mehr erreichen, wenn ich eine Verbindung zum Internet habe. Bitte prüf deine Verbindung.</string>
-  
-  <string name="TEA_contact_error">Sorry! Kann keine Email-Adresse für den ausgewählten Kontakt finden.</string>
-  
-  <!-- ============================================= IntroductionActivity == -->
-  
-  <!-- slide 1a: Introduction Window title -->
-  
-  <!-- Button to agree to EULA -->
-  
-  <!-- Button to disagree with EULA -->
-  
-  <!-- ===================================================== MissedCallActivity == -->
-  
-  <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
-  <string name="MCA_title">%1$s hat um %2$s angerufen</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_return_call">Jetzt anrufen</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_add_task">Später anrufen</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_ignore">Ignorieren</string>
-  
-  <!-- Missed call: dialog to ignore all missed calls title -->
-  <string name="MCA_ignore_title">Alle versäumten Anrufe ignorieren?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls body -->
-  <string name="MCA_ignore_body">Sie haben mehrere versäumte Anrufe ignoriert. Soll Astrid nicht mehr danach fragen?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore all button -->
-  <string name="MCA_ignore_all">Alle Anrufe ignorieren</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
-  <string name="MCA_ignore_this">Nur diesen Anruf ignorieren</string>
-
-  <!-- Missed call: preference title -->
-  <string name="MCA_missed_calls_pref_title">Verpasste Anrufe</string>
-
-  <!-- slide 49c: Missed call: preference description -->
-  <string name="MCA_missed_calls_pref_desc_enabled">Astrid wird Sie über versäumte Anrufe informieren und an Rückrufe erinnern</string>
-  <string name="MCA_missed_calls_pref_desc_disabled">Astrid wird Sie über versäumte Anrufe informieren</string>
-
-  <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
-  <string name="MCA_task_title_name">%1$s unter %2$s zurückrufen</string>
-
-  <!-- Missed call: task title no name (%s -> number)-->
-  <string name="MCA_task_title_no_name">%s zurückrufen</string>
-  
-  <!-- Missed call: schedule dialog title (%s -> name or number)-->
-  <string name="MCA_schedule_dialog_title">%s zurückrufen in ...</string>
-  
-  <!-- Missed call speech bubble options -->
-  <string-array name="MCA_dialog_speech_options">
-      <item>Schön, wenn man so bekannt ist!</item>
-      <item>Wow, die Leute mögen Sie!</item>
-      <item>Ein Anruf macht Ihnen sicher eine Freude</item>
-      <item>Würde es dich nicht freuen, wenn Sie zurückgerufen werden?</item>
-      <item>Du schaffst es!</item>
-      <item>Du kannst auch eine SMS senden ...</item>
-  </string-array>
-  
-  
-  <!-- ======================================= Calendar reminder activity == -->
-  
-  <!-- Calendar remindeer ignore button -->
-  <string name="CRA_ignore">Ablehnen</string>
-  
-  <!-- Calendar event -->
-  <string name="CRA_title">Willst Du eine Besprechungsliste erstellen?</string>
-  
-  <!-- Calendar reminder: dialog to ignore all missed calls title -->
-  <string name="CRA_ignore_title">Alle Kalendertermine ablehnen?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls body -->
-  <string name="CRA_ignore_body">Sie haben mehrere Kalendertermine ignoriert. Soll Astrid nicht mehr danach fragen? </string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
-  <string name="CRA_ignore_all">Alle Termine ablehnen</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
-  <string name="CRA_ignore_this">Nur diesen Termin ablehnen</string>
-  
-  <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
-  <string name="CRA_speech_bubble_start">Vergiss nicht, dass %s bald startet. Willst du eine Liste mit Aufgaben erstellen?</string>
-
-  <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
-  <string name="CRA_speech_bubble_end">Hast Du gerade %s beendet? Willst du noch eine Liste mit Aufgaben erstellen?</string>
-  
-  <!-- Calendar reminder: create list button -->
-  <string name="CRA_create_list">Liste anlegen</string>
-
-  <!-- Calendar reminder: postpone button -->
-  <string name="CRA_postpone">Vielleicht später</string>
-  
-  <!-- Calendar reminder: list exists dialog title -->
-  <string name="CRA_list_exists_title">Liste existiert bereits</string>
-  
-  <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
-  <string name="CRA_list_exists_body">Es gibt bereits eine Liste mit dem Namen %s. Willst Du das Ereignis zur bestehenden Liste hinzufügen oder eine neue erstellen?</string>
-  
-  <!-- Calendar reminder: list exists dialog create new button -->
-  <string name="CRA_create_new">Neu anlegen</string>
-
-  <!-- Calendar reminder: list exists dialog use existing button -->
-  <string name="CRA_use_existing">Vorhandene nutzen</string>
-  
-  <!-- Calendar remindr: created list (%s -> list name) -->
-  <string name="CRA_created_list_dialog">Die Liste %s wurde erstellt.</string>
-  
-  <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
-  <string name="CRA_one_attendee">%s nimmt teil.</string>
-
-  <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
-  <string name="CRA_two_attendees">%1$s und %2$s nehmen teil.</string>
-
-  <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
-  <string name="CRA_many_attendees">%1$s, %2$s, und %3$d weitere nehmen teil.</string>
-  
-  <!-- Calendar reminder: invitation prompt -->
-  <string name="CRA_invitation_prompt">Diese Personen einladen? </string>
-  
-  <!-- Calendar reminder: preference title -->
-  <string name="CRA_calendar_reminders_pref_title">Kalender-Assistent</string>
-
-  <!-- Calendar reminder: pref description disabled -->
-  <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid wird sie nicht an zukünftige Kalendertermine erinnern.</string>
-
-  <!-- Calendar reminder: pref description enabled -->
-  <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid wird Sie an zukünftige Kalenderterrmine erinnern und Sie auf die Vorbereitung hinweisen.</string>
-  
-  <!-- Calendar reminder: share list title -->
-  <string name="CRA_share_list_title">Liste zum Bearbeiten oder Teilen anklicken</string>
-  
-  <string name="CRA_invite_attendees">Teilnehmer einladen</string>
-
-  <string name="CRA_more_options">Weitere Optionen</string>
-
-  <string name="CRA_dont_invite">Nein danke</string>
-
-  <!-- Calendar reminder: share list title when no other attendees exist-->
-  <string name="CRA_list_created_title">Liste erstellt</string>
-  
-  <!-- Calendar reminder: default new list name (%s -> event title) -->
-  <string name="CRA_default_list_name">Einzelaufgaben: %s</string>
-  
-  <!-- ===================================================== HelpActivity == -->
-  
-  <!-- Help: Button to get support from our website -->
-    
-  <!-- ==================================================== UpdateService == -->
-  
-  <!-- Changelog Window Title -->
-  <string name="UpS_changelog_title">Was ist neu bei Astrid?</string>
-  
-  <!-- Updates Window Title -->
-  <string name="UpS_updates_title">Astrid Neuigkeiten</string>
-  
-  <!-- Updats No Activity to show for offline users -->
-  <string name="UpS_no_activity_log_in">Wenn du dich einloggst, kann du den \nFortschritt deiner eigenen also auch \ngemeinsamer Aufgabenlisten einsehen.</string>
-  
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 31g: Preference Window Title -->
-  <string name="EPr_title">Astrid: Einstellungen</string>
-  
-  <string name="EPr_share_astrid">Astrid teilen</string>
-
-  <string name="EPr_share_astrid_summary">Erzähle von Astrid auf deinem bevorzugten sozialen Netzwerk</string>
-  
-  <!-- slide 46a -->
-  <string name="EPr_deactivated">deaktiviert</string>
-
-  <!-- slide 30i: Preference Category: Appearance Title -->
-  <string name="EPr_appearance_header">Erscheinungsbild</string>
-  
-  <!-- Preference Category: Appearance Summary -->
-  <string name="EPr_appearance_summary">Themes, Widgets, Aufgabenzeilen, Bearbeitungsansicht</string>
-  
-  <!-- FAQ Preference title -->
-  <string name="EPr_faq_title">FAQ</string>
-  
-  <!-- Account status preference (%s -> account type) -->
-  <string name="EPr_account_title">Konto: %s</string>
-
-  <!-- Support preferences summary -->
-  <string name="EPr_support_summary">Einführung, FAQ, über</string>
-  
-  <!-- slide 34a: Preference: Task List Font Size Title -->
-  <string name="EPr_fontSize_title">Größe der Aufgabenliste</string>
-  
-  <!-- Preference: Filters to show pref screen title -->
-  <string name="EPr_filters_to_show_title">Angezeigte Filter</string>
-  
-  <!-- slide 32a: Preference: Show confirmation for smart reminders -->
-  <string name="EPr_showSmartConfirmation_title">Bestätigung für Smart-Erinnerungen anzeigen</string>
-  
-  <!-- slide 34g: Preference: Task List Font Size Description -->                                                                                                                                                  
-  <string name="EPr_fontSize_desc">Schriftgröße auf der Hauptseite</string>  
-  
-  <!-- Preferemce: Show task edit confirmation toasts -->
-  
-  <!-- slide 34c: Preference: Task List Show Notes -->
-  <string name="EPr_showNotes_title">Zeige Beschreibung in der Aufgabe</string>
-  
-  <!-- Edit screen preference category -->
-  <string name="EPr_edit_screen_options">Bildschirmeinstellungen bearbeiten</string>
-  
-  <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
-  <string name="EPr_beastMode_title">Bearbeite Anordnung</string>
-  
-  <string name="EPr_beastMode_shortcut">Einstellen</string>
-  
-  <string name="EPr_time_increment">5 Minuten Steigerung</string>
-  
-  <string name="EPr_use_date_shortcuts">Nutze Datumsabkürzung</string>
-  
-  <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
-  
-  <!-- slide 35h -->
-  <string name="EPr_beastMode_desc">Erscheinungsbild Aufgabenseite anpassen</string>
-  <!-- slide 35j -->
-  <string name="EPr_beastMode_reset">Auf Standardeinstellungen zurücksetzen</string>
-  
-  <string name="EPr_beastMode_hint">Du kannst die Eingabeseite für Aufgaben mit den Schiebereglern links anpassen</string>
-      
-  <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Beschreibung vom Eingabeschirm für Aufgaben erreichbar </string>  
-  <!-- Preference: Task List Show Notes Description (enabled) -->
-  <string name="EPr_showNotes_desc_enabled">Beschreibung werden immer angezegt</string>
-  
-  <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
-  <string name="EPr_compressTaskRows_title">Kompakte Aufgabenzeile</string>
-  <!-- slide 34j -->
-  <string name="EPr_compressTaskRows_desc">Aufgabenzeilengröße an Titel anpassen</string>
-  
-  <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
-  <!-- slide 34k-->
-  
-  <!-- slide 34b: Preferences: Wrap task titles to two lines -->
-  <string name="EPr_fullTask_title">Gesamten Aufgabentitel anzeigen</string>
-  <string name="EPr_fullTask_desc_enabled">Aufgabentitel werden vollständig angezeigt</string>
-  <!-- slide 34h -->
-  <string name="EPr_fullTask_desc_disabled">Zwei Zeilen des Aufgabentitels werden angezeigt</string>
-  
-  <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
-  <string name="EPr_ideaAuto_title">Ideas Tab automatisch laden</string>
-  <!-- slide 32c -->
-  <string name="EPr_ideaAuto_desc_enabled">Internetsuche für Ideas Tab wird ausgeführt, wenn Haken gesetzt ist</string>
-  <string name="EPr_ideaAuto_desc_disabled">Internetsuche für Ideas Tab wird nur durchgeführt, wenn vom Nutzer gewünscht</string>
-  
-  <!-- Preferences: task row style -->
-  <string-array name="EPr_task_row_styles">
-      <item>Original</item>
-      <item>Einfach</item>
-      <item>Nur Titel</item>
-  </string-array>
-  
-  <string-array name="EPr_task_row_style_descriptions">
-      <item>Titel auf zwei Zeilen begrenzen mit Datum rechts</item>
-      <item>Titel auf eine Zeile begrenzen, Datum und Listen darunter</item>
-      <item>Einzeilig, nur Titel</item>
-  </string-array>
-  
-  <!-- task row style title (%s -> style) -->
-  <string name="EPr_task_row_style_title">Zeilenart: %s</string>
-  
-  <!-- Preference: custom filters enabled -->
-  <string name="EPr_use_filters_title">Filter nutzen</string>
-  <string name="EPr_use_filters_subtitle">Hiermit können Sie benutzerdefinierte Filter erstellen</string>
-
-  <!-- Preference: show list members in shared list -->
-  <string name="EPr_show_list_members_title">Zeige Mitglieder der gemeinsam genutzten Listen</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_simple_input_boxes">Einfachen Textboxen</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_show_quickadd_controls">Erweiterte Einstellungen für Schnelleingabe</string>
-
-  <!-- Preference: don\'t show plus button until input present -->
-  <string name="EPr_hide_plus_button">Verstecke den +-Knopf</string>
-
-  <!-- Preference: menu items -->
-  <string name="EPr_menu_items">Menüeinträge</string>
-
-  <!-- Preference: list view -->
-  <string name="EPr_list_view">Listenansicht</string>
-
-  <!-- Preference: task edit comments -->
-  <string name="EPr_show_task_edit_comments">Kommentare bei Aufgabeneingabe anzeigen </string>
-  
-  <!-- slide 30f/ 36f: Preference: Theme -->
-  <string name="EPr_theme_title">Farbschema</string>
-  <!-- Preference: Theme Description (%s => value) -->
-  <string name="EPr_theme_desc">Momentan: %s</string>  
-  <!-- Preference: Theme Description (android 1.6) -->
-  <string name="EPr_theme_desc_unsupported">Einstellungen benötigen mindestens Android 2.0</string>
-  <!-- slide 32h/ 37b -->
-  <string name="EPr_theme_widget_title">Widget Theme</string>
-  
-  <!-- slide 30d/ 34f: Preference screen: all task row settings -->
-  <string name="EPr_taskRowPrefs_title">Aussehen der Aufgabenzeilen</string>
-  
-  <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
-  <string name="EPr_use_contact_picker">Verwende den Systemdialog für die Kontaktauswahl</string>
-  <!-- slide 49b -->
-  <string name="EPr_use_contact_picker_desc_enabled">Zeigt im Zuweisungsfeld für Aufgaben ein Symbol für den Systemdialog für Kontaktauswahl an</string>
-  <string name="EPr_use_contact_picker_desc_disabled">Das Symbol des Systemdialogs für Kontaktauswahl wird nicht angezeigt</string>
-
-  <!-- slide 49i: Preferences: Third party addons -->
-  <string name="EPr_third_party_addons">Schalte Drittanbieter-Erweiterungen ein</string>
-  <string name="EPr_third_party_addons_desc_enabled">Erweiterungen anderer Anbieter werden aktiviert</string>
-  <!-- slide 49d -->
-  <string name="EPr_third_party_addons_desc_disabled">Erweiterungen anderer Anbieter werden deaktiviert</string>
-  
-  <!-- Preferences: ideas tab -->
-  <string name="EPr_ideas_tab_enabled">Aufgabenideen</string>
-  <string name="EPr_ideas_tab_description">Holen Sie sich Vorschläge, um Aufgaben abzuschließen</string>
-  
-  <!-- Preferences: calendar event start time -->
-  <string name="EPr_cal_end_or_start_at_due_time">Zeitpunkt Kalendertermin</string>
-  <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
-  <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
-  
-  <string name="EPr_force_phone_layout">Telefon Layout nutzen</string>
-
-  <string name="EPr_show_featured_lists">Vorgeschlagene Listen anzeigen</string>
-  
-  <!-- Configurations -->
-  <string name="EPr_configurations_title">Einstellen</string>
-  <string name="EPr_config_default">Standard</string>
-  <string name="EPr_config_lite">Astrid Lite</string>
-  
-  <!-- Dialog title when setting preference configuration -->
-  <string name="EPr_config_dialog_title">Einstellen?</string>
-  <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
-  <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
-  
-  <!-- default configuration name for the above dialog -->
-  <string name="EPr_config_dialog_default_id">Standard</string>
-  
-  <!-- Preference title for showing save and cancel buttons in task edit page -->
-  <string name="EPr_show_save_and_cancel">Zeige speichern und abbrechen</string>
-  
-  
-  <!-- Swipe between lists -->
-  <!-- Preference: swipe between lists performance -->
-  <string name="EPr_swipe_lists_performance_title">Zum Wechseln der Listen \"wischen\"</string>
-  
-  <string-array name="EPr_swipe_lists_performance_mode">
-      <item>Kein Schieben</item>
-      <item>Minimale Speichernutzung</item>
-      <item>Normale Performance</item>
-      <item>Beste Performance</item>
-  </string-array>
-  
-  <string-array name="EPr_swipe_lists_performance_desc">
-  <!-- slide 49a -->
-      <item>Schieben zwischen den Listen ist Deaktiviert</item>
-      <item>Geringere Performance</item>
-      <item>Standardeinstellung</item>
-      <item>Hat höhere Leistungsanforderungen</item>
-  </string-array>
-    
-  <string name="swipe_lists_helper_title">Zum Wechseln der Listen wischen</string>
-  <string name="swipe_lists_helper_header">Zieh nach links oder rechts, um schnell zwischen Listen zu wechseln</string>
-  <string name="swipe_lists_helper_subtitle">Ändere die Einstellungen unter Einstellungen -&gt; Erscheinungsbild</string>
-
-  <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
-  
-  <string-array name="EPr_default_reminders_mode">
-      <!-- reminders duration: labels for "Task Defaults" preference item. -->
-      <item>@string/TEA_reminder_mode_once</item>
-      <item>Deutsch
-</item>
-      <item>@string/TEA_reminder_mode_nonstop</item>
-  </string-array>
-    
-  <string-array name="EPr_themes">
-    <!-- theme_settings: labels for Theme preference menu -->
-    <!-- slide 36a-->
-    <item>Tag - Blau</item>
-    <!-- slide 36b -->
-    <item>Tag -Rot</item>
-    <!-- slide 36b -->
-    <item>Himmelblau</item>
-    <!-- slide 36c -->
-    <item>Nacht</item>
-    <!-- slide 36d -->
-    <item>Transparent (weißer Text)</item>
-    <!-- slide 36e -->
-    <item>Transparent (schwarzer Text)</item>
-  </string-array>
-  
-  <string-array name="EPr_themes_widget">
-    <!-- slide 32i / 37a-->
-    <item>Wie die App</item>
-    <item>Tag - Blau</item>
-    <item>Tag - Rot</item>
-    <item>Himmelblau</item>
-    <item>Nacht</item>
-    <item>Transparent (weißer Text)</item>
-    <item>Transparent (schwarzer Text)</item>
-    <item>Retro</item>
-  </string-array>
-  
-  <!-- ========================================== Task Management Settings == -->
-
-  <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
-  <string name="EPr_manage_header">Alte Aufgaben verwalten</string>
-  <!-- slide 47d -->
-  <string name="EPr_manage_delete_completed">Erledigte Aufgaben löschen</string>
-  <string name="EPr_manage_delete_completed_message">Willst du wirklich alle erledigten Aufgaben löschen?</string>
-  <!-- slide 47a -->
-  <string name="EPr_manage_delete_completed_summary">Gelöschte Aufgaben können einzeln wiederhergestellt werden.</string>
-  <string name="EPr_manage_delete_completed_status">%d Aufgaben gelöscht</string>
-  <!-- slide 47e -->
-  <string name="EPr_manage_purge_deleted">Bereinige gelöschte Aufgaben</string>
-  <string name="EPr_manage_purge_deleted_message">Willst du wirklich alle gelöschten Aufgaben bereinigen?\n\nDiese Aufgaben werden für immer gelöscht bleiben!</string>
-  <string name="EPr_manage_purge_deleted_status">%d Aufgaben bereinigt!</string>
-  <!-- slide 47b-->
-  <string name="EPr_manage_purge_deleted_summary">Vorsicht! Bereinigte Aufgaben können ohne Backup-Datei nicht wiederhergestellt werden!</string>
-  <!-- slide 47h-->
-  <string name="EPr_manage_clear_all">Alle Daten löschen</string>
-  <string name="EPr_manage_clear_all_message">Alle Aufgaben und Einstellungen von Astrid löschen?\n\nWarnung: Dies kann nicht rückgängig gemacht werden!</string>
-
-  <!-- slide 47f -->
-  <string name="EPr_manage_delete_completed_gcal">Lösche Kalendereinträge von erledigten Aufgaben</string>
-  <string name="EPr_manage_delete_completed_gcal_message">Möchtest du wirklich alle deine Kalendereinträge von erledigen Aufgaben löschen?</string>
-  <string name="EPr_manage_delete_completed_gcal_summary"></string>
-  <string name="EPr_manage_delete_completed_gcal_status">%d Kalendereinträge gelöscht!</string>
-      
-  <!-- slide 47g-->
-  <string name="EPr_manage_delete_all_gcal">Lösche alle Kalendereinträge von Aufgaben</string>
-  <string name="EPr_manage_delete_all_gcal_message">Möchtest du wirklich alle Kalendereintrage von Aufgaben löschen?</string>
-  <string name="EPr_manage_delete_all_gcal_summary"></string>
-  <string name="EPr_manage_delete_all_gcal_status">%d Kalendereinträge gelöscht!</string>
-      
-  <!-- ==================================================== AddOnActivity == -->
-  
-  <!-- Add Ons Activity Title -->
-  <string name="AOA_title">Erweiterungen</string>
-    
-  <!-- Add-on Activity: author for internal authors  -->
-  <string name="AOA_internal_author">Astrid Team</string>
-    
-  <!-- Add-on Activity: installed add-ons tab -->
-  <string name="AOA_tab_installed">Installiert</string>
-  
-  <!-- Add-on Activity - available add-ons tab -->
-  <string name="AOA_tab_available">Verfügbar</string>
-  
-  <!-- Add-on Activity - free add-ons label -->
-  <string name="AOA_free">Kostenlos</string>
-  
-  <!-- Add-on Activity - menu item to visit add-on website -->
-  
-  <!-- Add-on Activity - menu item to visit android market -->
-  
-  <!-- Add-on Activity - when list is empty -->
-  <string name="AOA_no_addons">Leere Liste!</string>
-  
-  <string name="AOA_ppack_title">Astrid Power Pack</string>
-  <string name="AOA_ppack_description">Unterstützen Sie Astrid und werden Sie produktiver mit dem Astrid Power Pack. 4x2 und 4x4 Widgets sowie Sprachintegration. Starten Sie heute noch durch!</string>
-  <string name="AOA_locale_title">Astrid Gebietsschema-Plugin</string>
-  <string name="AOA_locale_description">Erlaubt Astrid, die Gebietschema-App zum Senden von Benachrichtigunen basierend auf Filterregeln zu benutzen. Benötigt Gebietsschema-Plugin.</string>
-  
-  <!-- ====================================================== TasksWidget == -->
-
-  <!-- Widget text when loading tasks -->
-  <string name="TWi_loading">Ladevorgang …</string>
-
-  <!-- Widget configuration activity title: select a filter -->
-  <string name="WCA_title">Aufgaben zum Anzeigen wählen …</string>
-  
-  <!-- ======================================================== Waiting on me -->
-
-  <string name="wom_commented">%s commented on your task.</string>
-  <string name="wom_mentioned">%s mentioned you.</string>
-  <string name="wom_assigned">%s assigned this to you.</string>
-  <string name="wom_raised_pri">%s raised the priority.</string>
-  <string name="wom_changed_due">%s hat das Fälligkeitsdatum geändert.</string>
-  <string name="wom_default">%s wants your attention.</string>
-  
-  <string name="wom_dismiss">Ablehnen</string>
-  <string name="wom_acknowledge">Habe ich gelesen</string>
-
-  <!-- ============================================================= About == -->
-  
-  <!-- slide 30h: Title of "About" option in settings -->
-  <string name="p_about">Über Astrid</string>
-  
-  <!-- About text (%s => current version)-->
-  <string name="p_about_text">Aktuelle Version: %s\n\n Astrid ist Open-Source und wird stolz von Todoroo, Inc. gepflegt.</string>
-
-  <!-- Title of "Help" option in settings -->
-  <string name="p_help">Hilfe</string>
-  
-  <!-- slide 30c: Title of "Forums" option in settings -->
-  <string name="p_forums">Forum</string>
-  
-  <!-- Title of "Premium" option in settings -->
-  <string name="p_premium">Premium</string>
-  
-  <!-- ============================================================= Misc == -->
-  
-  <string name="feedback_positive_title">Astrid bewerten?</string>
-
-  <string name="feedback_positive_body">Schön, dass ich helfen konnte. Gibst du mir eine 5-Sterne-Bewertung?</string>
-
-  <string name="feedback_negative_title">Bewertung hinterlassen?</string>
-
-  <string name="feedback_negative_body">Tut mir leid, dass es ein Problem gibt</string>
-
-  <string name="feedback_activity_error">Huch, kann die Berwertungsfunktion des Markets nicht starten. Sie ist vielleicht auf deinem Gerät nicht verfügbar</string>
-  
-  <string name="feedback_positive_button">Astrid bewerten</string>
-
-  <string name="feedback_negative_button">Bewertung hinterlassen</string>
-  
-  <string name="feedback_not_now">Nicht jetzt</string>
-  
-  <string name="feedback_banner_text">Wie läuft es mit Astrid?</string>
-  
-  <!-- Displayed when task killer found. %s => name of the application -->
-  <string name="task_killer_help">Es scheint Sie benutzen eine Anwendung die Prozesse killen kann (%s)! Falls möglich setzen Sie Astrid auf die Liste der davon ausgenommenen Prozesse damit es nicht gekillt wird. Andernfalls kann Astrid Sie nicht über fällige Tasks informieren.\n</string>
-  
-  <!-- Task killer dialog ok button -->
-  <string name="task_killer_help_ok">Ich werde Astrid nicht killen!</string>
-    
-  <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
-  
-  <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
-  <string name="marketplace_description">Astrid ist der beliebte Open-Source ToDo-Listen / Task-Manager, der Ihnen dabei hilft, Dinge zu erledigen. Er verfügt über Erinnerungen, Tags, Synchronisation, Locale Plug-In, ein Widget und vieles mehr.</string>
-  
-  <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 Astrid 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>
-  
+    <!-- Add-on Activity: installed add-ons tab -->
+    <string name="AOA_tab_installed">Installiert</string>
 
+    <!-- Add-on Activity - available add-ons tab -->
+    <string name="AOA_tab_available">Verfügbar</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Add-on Activity - free add-ons label -->
+    <string name="AOA_free">Kostenlos</string>
 
+    <!-- Add-on Activity - menu item to visit add-on website -->
 
-  <!-- slide 32g: Preference Category: Defaults Title -->
-  <string name="EPr_defaults_header">Standardeinstellungen für neue Aufgaben</string>
-  <string name="EPr_defaults_summary">Priorität, Fälligkeitsdatum, in Kalender eintragen</string>
-  
-  <!-- slide 41f:  Preference: Default Urgency Title -->
-  <string name="EPr_default_urgency_title">Standard Dringlichkeit</string>
-  <!-- Preference: Default Urgency Description (%s => setting) -->
-  <string name="EPr_default_urgency_desc">Momentan: %s</string>
-  
-  <!-- slide 40a: Preference: Default Importance Title -->
-  <string name="EPr_default_importance_title">Standard Dringlichkeit</string>
-  <!-- Preference: Default Importance Description (%s => setting) -->
-  <string name="EPr_default_importance_desc">Momentan: %s</string>
-  
-  <!-- slide 42e: Preference: Default Hide Until Title -->
-  <string name="EPr_default_hideUntil_title">Standardmäßig verstecken bis</string>
-  <!-- Preference: Default Hide Until Description (%s => setting) -->
-  <string name="EPr_default_hideUntil_desc">Momentan: %s</string>
-  
-  <!-- slide 43e: Preference: Default Reminders Title -->
-  <string name="EPr_default_reminders_title">Standarderinnerungen</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_desc">Momentan: %s</string>
-  
-  <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
-  <string name="EPr_default_addtocalendar_title">Standardmäßig in Kalender eintragen</string>
-  <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
-  <string name="EPr_default_addtocalendar_desc_disabled">Neue Aufgaben legen keinen Eintrag in den Google Kalender an.</string>
-  <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
-  <string name="EPr_default_addtocalendar_desc">Neue Aufgaben werden in Kalender eingetragen: \"%s\"</string>
-  
-  <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
-  <string name="EPr_default_reminders_mode_title">Standard-Alarm/Vibrationssignal</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_mode_desc">Momentan: %s</string>
-  
-  <string-array name="EPr_default_importance">
-    <!-- importance: labels for "Task Defaults" preference item. -->
-    <!-- slide 40b -->
-    <item>!!! (Höchste)</item>
-    <item>!!</item>
-    <item>!</item>
-    <!-- slide 40c -->
-    <item>o (Niedrigste)</item>
-  </string-array>
-  
-  <string-array name="EPr_default_urgency">
-    <!-- urgency: labels for "Task Defaults" preference item. -->
-    <!-- slide 41a-->
-    <item>Keine Fälligkeit</item>
-    <!-- slide 41b -->
-    <item>Heute</item>
-    <!-- slide 41c-->
-    <item>Morgen</item>
-    <!-- slide 41d -->
-    <item>Übermorgen</item>
-    <!-- slide 41e -->
-    <item>Nächste Woche</item>
-  </string-array>
-  
-  <string-array name="EPr_default_hideUntil">
-    <!-- hideUntil: labels for "Task Defaults" preference item. -->
-    <!-- slide 42a -->
-    <item>Nicht verstecken</item>
-    <!-- slide 42b -->
-    <item>Aufgabe fällig ist</item>
-    <!-- slide 42c -->
-    <item>Tag vor der Fälligkeit</item>
-    <!-- slide 42d-->
-    <item>Woche vor der Fälligkeit</item>
-  </string-array>
-  
-  <string-array name="EPr_default_reminders">
-    <!-- reminders: labels for "Task Defaults" preference item. -->
-    <!-- slide 43a -->
-    <item>Keine Frist-Erinnerungen</item>
-    <!-- slide 43b -->
-    <item>Am Stichtag</item>
-    <!-- slide 43c -->
-    <item>Wenn überfällig</item>
-    <!-- slide 43d -->
-    <item>Am Stichtag oder überfällig</item>
-  </string-array>
-  
-  <string-array name="EPr_default_addtocalendar">
-    <!-- addtocalendar: labels for "Task Defaults" preference item. -->
-    <item>@string/EPr_deactivated</item>
-  </string-array>      
+    <!-- Add-on Activity - menu item to visit android market -->
 
+    <!-- Add-on Activity - when list is empty -->
+    <string name="AOA_no_addons">Leere Liste!</string>
+
+    <string name="AOA_ppack_title">Astrid Power Pack</string>
+    <string name="AOA_ppack_description">Unterstützen Sie Astrid und werden Sie produktiver mit dem
+        Astrid Power Pack. 4x2 und 4x4 Widgets sowie Sprachintegration. Starten Sie heute noch
+        durch!
+    </string>
+    <string name="AOA_locale_title">Astrid Gebietsschema-Plugin</string>
+    <string name="AOA_locale_description">Erlaubt Astrid, die Gebietschema-App zum Senden von
+        Benachrichtigunen basierend auf Filterregeln zu benutzen. Benötigt Gebietsschema-Plugin.
+    </string>
+
+    <!-- ====================================================== TasksWidget == -->
+
+    <!-- Widget text when loading tasks -->
+    <string name="TWi_loading">Ladevorgang …</string>
+
+    <!-- Widget configuration activity title: select a filter -->
+    <string name="WCA_title">Aufgaben zum Anzeigen wählen …</string>
+
+    <!-- ======================================================== Waiting on me -->
+
+    <string name="wom_commented">%s commented on your task.</string>
+    <string name="wom_mentioned">%s mentioned you.</string>
+    <string name="wom_assigned">%s assigned this to you.</string>
+    <string name="wom_raised_pri">%s raised the priority.</string>
+    <string name="wom_changed_due">%s hat das Fälligkeitsdatum geändert.</string>
+    <string name="wom_default">%s wants your attention.</string>
+
+    <string name="wom_dismiss">Ablehnen</string>
+    <string name="wom_acknowledge">Habe ich gelesen</string>
+
+    <!-- ============================================================= About == -->
+
+    <!-- slide 30h: Title of "About" option in settings -->
+    <string name="p_about">Über Astrid</string>
+
+    <!-- About text (%s => current version)-->
+    <string name="p_about_text">Aktuelle Version: %s\n\n Astrid ist Open-Source und wird stolz von
+        Todoroo, Inc. gepflegt.
+    </string>
+
+    <!-- Title of "Help" option in settings -->
+    <string name="p_help">Hilfe</string>
+
+    <!-- slide 30c: Title of "Forums" option in settings -->
+    <string name="p_forums">Forum</string>
+
+    <!-- Title of "Premium" option in settings -->
+    <string name="p_premium">Premium</string>
+
+    <!-- ============================================================= Misc == -->
+
+    <string name="feedback_positive_title">Astrid bewerten?</string>
+
+    <string name="feedback_positive_body">Schön, dass ich helfen konnte. Gibst du mir eine
+        5-Sterne-Bewertung?
+    </string>
+
+    <string name="feedback_negative_title">Bewertung hinterlassen?</string>
+
+    <string name="feedback_negative_body">Tut mir leid, dass es ein Problem gibt</string>
+
+    <string name="feedback_activity_error">Huch, kann die Berwertungsfunktion des Markets nicht
+        starten. Sie ist vielleicht auf deinem Gerät nicht verfügbar
+    </string>
+
+    <string name="feedback_positive_button">Astrid bewerten</string>
+
+    <string name="feedback_negative_button">Bewertung hinterlassen</string>
+
+    <string name="feedback_not_now">Nicht jetzt</string>
+
+    <string name="feedback_banner_text">Wie läuft es mit Astrid?</string>
+
+    <!-- Displayed when task killer found. %s => name of the application -->
+    <string name="task_killer_help">Es scheint Sie benutzen eine Anwendung die Prozesse killen kann
+        (%s)! Falls möglich setzen Sie Astrid auf die Liste der davon ausgenommenen Prozesse damit
+        es nicht gekillt wird. Andernfalls kann Astrid Sie nicht über fällige Tasks informieren.\n
+    </string>
+
+    <!-- Task killer dialog ok button -->
+    <string name="task_killer_help_ok">Ich werde Astrid nicht killen!</string>
+
+    <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
+
+    <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
+    <string name="marketplace_description">Astrid ist der beliebte Open-Source ToDo-Listen /
+        Task-Manager, der Ihnen dabei hilft, Dinge zu erledigen. Er verfügt über Erinnerungen, Tags,
+        Synchronisation, Locale Plug-In, ein Widget und vieles mehr.
+    </string>
+
+    <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 Astrid 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>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 32g: Preference Category: Defaults Title -->
+    <string name="EPr_defaults_header">Standardeinstellungen für neue Aufgaben</string>
+    <string name="EPr_defaults_summary">Priorität, Fälligkeitsdatum, in Kalender eintragen</string>
+
+    <!-- slide 41f:  Preference: Default Urgency Title -->
+    <string name="EPr_default_urgency_title">Standard Dringlichkeit</string>
+    <!-- Preference: Default Urgency Description (%s => setting) -->
+    <string name="EPr_default_urgency_desc">Momentan: %s</string>
+
+    <!-- slide 40a: Preference: Default Importance Title -->
+    <string name="EPr_default_importance_title">Standard Dringlichkeit</string>
+    <!-- Preference: Default Importance Description (%s => setting) -->
+    <string name="EPr_default_importance_desc">Momentan: %s</string>
+
+    <!-- slide 42e: Preference: Default Hide Until Title -->
+    <string name="EPr_default_hideUntil_title">Standardmäßig verstecken bis</string>
+    <!-- Preference: Default Hide Until Description (%s => setting) -->
+    <string name="EPr_default_hideUntil_desc">Momentan: %s</string>
+
+    <!-- slide 43e: Preference: Default Reminders Title -->
+    <string name="EPr_default_reminders_title">Standarderinnerungen</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_desc">Momentan: %s</string>
+
+    <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
+    <string name="EPr_default_addtocalendar_title">Standardmäßig in Kalender eintragen</string>
+    <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
+    <string name="EPr_default_addtocalendar_desc_disabled">Neue Aufgaben legen keinen Eintrag in den
+        Google Kalender an.
+    </string>
+    <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
+    <string name="EPr_default_addtocalendar_desc">Neue Aufgaben werden in Kalender eingetragen:
+        \"%s\"
+    </string>
+
+    <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
+    <string name="EPr_default_reminders_mode_title">Standard-Alarm/Vibrationssignal</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_mode_desc">Momentan: %s</string>
+
+    <string-array name="EPr_default_importance">
+        <!-- importance: labels for "Task Defaults" preference item. -->
+        <!-- slide 40b -->
+        <item>!!! (Höchste)</item>
+        <item>!!</item>
+        <item>!</item>
+        <!-- slide 40c -->
+        <item>o (Niedrigste)</item>
+    </string-array>
+
+    <string-array name="EPr_default_urgency">
+        <!-- urgency: labels for "Task Defaults" preference item. -->
+        <!-- slide 41a-->
+        <item>Keine Fälligkeit</item>
+        <!-- slide 41b -->
+        <item>Heute</item>
+        <!-- slide 41c-->
+        <item>Morgen</item>
+        <!-- slide 41d -->
+        <item>Übermorgen</item>
+        <!-- slide 41e -->
+        <item>Nächste Woche</item>
+    </string-array>
+
+    <string-array name="EPr_default_hideUntil">
+        <!-- hideUntil: labels for "Task Defaults" preference item. -->
+        <!-- slide 42a -->
+        <item>Nicht verstecken</item>
+        <!-- slide 42b -->
+        <item>Aufgabe fällig ist</item>
+        <!-- slide 42c -->
+        <item>Tag vor der Fälligkeit</item>
+        <!-- slide 42d-->
+        <item>Woche vor der Fälligkeit</item>
+    </string-array>
+
+    <string-array name="EPr_default_reminders">
+        <!-- reminders: labels for "Task Defaults" preference item. -->
+        <!-- slide 43a -->
+        <item>Keine Frist-Erinnerungen</item>
+        <!-- slide 43b -->
+        <item>Am Stichtag</item>
+        <!-- slide 43c -->
+        <item>Wenn überfällig</item>
+        <!-- slide 43d -->
+        <item>Am Stichtag oder überfällig</item>
+    </string-array>
+
+    <string-array name="EPr_default_addtocalendar">
+        <!-- addtocalendar: labels for "Task Defaults" preference item. -->
+        <item>@string/EPr_deactivated</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in filter plug-in -->
-    
+
     <!-- ================================================= Filter Exposer == -->
-    
+
     <!-- Active Tasks Filter -->
     <string name="BFE_Active">Meine Aufgaben</string>
-    
+
     <!-- Waiting on me filter -->
     <string name="BFE_waiting_on_me">Das erwartet mich</string>
-        
+
     <!-- Search Filter -->
-    
+
     <!-- slide 10b: Recently Modified -->
     <string name="BFE_Recent">Kürzlich bearbeitet</string>
-    
+
     <!-- slide 10c: I\'ve assigned -->
     <string name="BFE_Assigned">Ich habe zugeordnet</string>
-    
+
     <!-- Build Your Own Filter -->
-    
+
     <!-- Saved Filters Header -->
-    
+
     <!-- Saved Filters Context Menu: delete -->
     <string name="BFE_Saved_delete">Filter löschen</string>
 
     <!-- =========================================== CustomFilterActivity == -->
-    
+
     <!-- slide 30d: Build Your Own Filter Activity Title-->
     <string name="CFA_title">Benutzerdefinierter Filter</string>
-    
+
     <!-- slide 30e: Filter Name edit box hint (if user types here, filter will be saved) -->
     <string name="CFA_filterName_hint">Benennen Sie den Filter, um ihn zu speichern …</string>
-    
+
     <!-- Filter Name default for copied filters (%s => old filter name) -->
-    
+
     <!-- slide 30a: Filter Starting Universe: all tasks -->
     <string name="CFA_universe_all">Aktuelle Aufgaben</string>
-    
+
     <!-- Filter Criteria Type: add (at the begging of title of the criteria) -->
     <string name="CFA_type_add">oder</string>
-    
+
     <!-- Filter Criteria Type: subtract (at the begging of title of the criteria) -->
     <string name="CFA_type_subtract">nicht</string>
-    
+
     <!-- Filter Criteria Type: intersect (at the begging of title of the criteria) -->
     <string name="CFA_type_intersect">auch</string>
-    
+
     <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
     <string name="CFA_context_chain">%s hat Kriterien</string>
-    
+
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">Zeile löschen</string>
-    
+
     <!-- slide 30b: Filter Screen Help Text -->
     <string name="CFA_help">Langes drücken auf Elemente für zusätzliche Optionen</string>
-    
+
     <!-- slide 30c: Filter Button: add new -->
     <string name="CFA_button_add">Kriterium hinzufügen</string>
-    
+
     <!-- slide 30f: Filter Button: view without saving -->
     <string name="CFA_button_view">Anzeigen</string>
-    
+
     <!-- Filter Button: save & view filter -->
     <string name="CFA_button_save">Speichern &amp; Anzeigen</string>
 
     <!-- =========================================== CustomFilterCriteria == -->
-        
+
     <!-- Criteria: due by X - display text (? -> user input) -->
     <string name="CFC_dueBefore_text">Fällig am: ?</string>
     <!-- Criteria: due by X - name of criteria -->
@@ -1698,322 +1872,352 @@ Sind Sie sicher, dass Sie mit Astrid.com synchronisieren möchten?</string>
         <item>Nächste Woche</item>
         <item>Nächster Monat</item>
     </string-array>
-    
+
     <!-- Criteria: importance - display text (? -> user input)-->
     <string name="CFC_importance_text">Priority at least ?</string>
     <!-- Criteria: importance - name of criteria -->
-    <string name="CFC_importance_name">Dringlichkeit...</string>        
-    
+    <string name="CFC_importance_name">Dringlichkeit...</string>
+
     <!-- Criteria: tag - display text (? -> user input) -->
     <string name="CFC_tag_text">Liste: ?</string>
     <!-- Criteria: tag - name of criteria -->
     <string name="CFC_tag_name">Liste …</string>
-    
+
     <!-- Criteria: tag_contains - name of criteria -->
     <string name="CFC_tag_contains_name">Listenname enthält …</string>
     <!-- Criteria: tag_contains - text (? -> user input) -->
     <string name="CFC_tag_contains_text">Listenname enthält: ?</string>
-    
+
     <!-- Criteria: title_contains - name of criteria -->
     <string name="CFC_title_contains_name">Titel enthält …</string>
     <!-- Criteria: title_contains - text (? -> user input) -->
     <string name="CFC_title_contains_text">Titel enthält: ?</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-  
-  <!-- Error message for adding to calendar  -->
-  <string name="gcal_TEA_error">Fehler beim Hinzufügen der Aufgabe zum Kalender</string>
-
-  <!-- Label for adding task to calendar -->
-
-  <!-- slide 21c: Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">In Kalender eintragen</string>
-  
-  <!-- Label when calendar event already exists -->
-  <string name="gcal_TEA_showCalendar_label">Öffne Termin im Kalender</string>
-  
-  <!-- Toast when unable to open calendar event -->
-  
-  <!-- Toast when calendar event updated because task changed -->
-  <string name="gcal_TEA_calendar_updated">Termin im Kalender wurde ebenfalls aktualisiert!</string>
-  
-  <!-- No calendar label (don\'t add option) -->
-  <string name="gcal_TEA_nocal">Nicht eintragen</string>
-  
-  <string name="gcal_TEA_none_selected">In den Kalender?</string>
-  
-  <string name="gcal_TEA_has_event">Kalendereintrag</string>
-  
-  <!-- ======================================================== Calendars == -->
-  
-  <!-- Calendar event name when task is completed (%s => task title) -->
-  <string name="gcal_completed_title">%s (abgeschlossen)</string>
-
-  <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
-  <string name="gcal_GCP_default">Standardkalender</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Error message for adding to calendar  -->
+    <string name="gcal_TEA_error">Fehler beim Hinzufügen der Aufgabe zum Kalender</string>
 
+    <!-- Label for adding task to calendar -->
 
+    <!-- slide 21c: Label for adding task to calendar -->
+    <string name="gcal_TEA_addToCalendar_label">In Kalender eintragen</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Label when calendar event already exists -->
+    <string name="gcal_TEA_showCalendar_label">Öffne Termin im Kalender</string>
+
+    <!-- Toast when unable to open calendar event -->
+
+    <!-- Toast when calendar event updated because task changed -->
+    <string name="gcal_TEA_calendar_updated">Termin im Kalender wurde ebenfalls aktualisiert!
+    </string>
+
+    <!-- No calendar label (don\'t add option) -->
+    <string name="gcal_TEA_nocal">Nicht eintragen</string>
+
+    <string name="gcal_TEA_none_selected">In den Kalender?</string>
+
+    <string name="gcal_TEA_has_event">Kalendereintrag</string>
+
+    <!-- ======================================================== Calendars == -->
+
+    <!-- Calendar event name when task is completed (%s => task title) -->
+    <string name="gcal_completed_title">%s (abgeschlossen)</string>
+
+    <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
+    <string name="gcal_GCP_default">Standardkalender</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ============================================================= UI == -->
 
     <!-- filters header: GTasks -->
     <string name="gtasks_FEx_header">Google Tasks</string>
-    
+
     <!-- filter category for GTasks lists -->
-    
+
     <!-- filter title for GTasks lists (%s => list name) -->
     <string name="gtasks_FEx_title">Google Tasks: %s</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_creating_list">Liste wird erstellt …</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_create_list_dialog">Neuer Listenname:</string>
-    
+
     <!-- error to show when list creation fails -->
     <string name="gtasks_FEx_create_list_error">Fehler beim Erstllen einer neuen Liste.</string>
-    
+
     <!-- short help title for Gtasks -->
-    
+
     <string name="CFC_gtasks_list_text">In der Liste: ?</string>
 
     <string name="CFC_gtasks_list_name">In GTasks-Liste …</string>
-    
+
     <!-- Message while clearing completed tasks -->
     <string name="gtasks_GTA_clearing">Erledigte Aufgaben werden entfernt …</string>
-    
+
     <!-- Label for clear completed menu item -->
     <string name="gtasks_GTA_clear_completed">Entferne erledigte Aufgaben</string>
-        
+
     <!-- ============================================ GtasksLoginActivity == -->
-    
-    <!-- Activity Title: Gtasks Login -->    
 
-    <!-- Instructions: Gtasks login -->    
-    <string name="gtasks_GLA_body">Bitte logge dich bei Google Tasks Sync (Beta!) ein. Nicht-migrierte Google Apps Accounts werden zur Zeit nicht unterstützt.</string>
-    
-    <string name="gtasks_GLA_noaccounts">Keine verfügbaren Google Accounts zum synchronisieren.</string>
+    <!-- Activity Title: Gtasks Login -->
 
-    <!-- Instructions: Gtasks further help -->    
-    <string name="gtasks_GLA_further_help">Um deine Aufgaben mit Einrückung und Ordnung anzuzeigen, gehe auf die Filter-Seite und wähle eine Google Tasks Liste. Standartmässig benutzt Astrid seine eigenen Sortiereinstellungen.</string>
+    <!-- Instructions: Gtasks login -->
+    <string name="gtasks_GLA_body">Bitte logge dich bei Google Tasks Sync (Beta!) ein.
+        Nicht-migrierte Google Apps Accounts werden zur Zeit nicht unterstützt.
+    </string>
 
-    <!-- Sign In Button -->    
+    <string name="gtasks_GLA_noaccounts">Keine verfügbaren Google Accounts zum synchronisieren.
+    </string>
 
-    <!-- E-mail Address Label -->    
+    <!-- Instructions: Gtasks further help -->
+    <string name="gtasks_GLA_further_help">Um deine Aufgaben mit Einrückung und Ordnung anzuzeigen,
+        gehe auf die Filter-Seite und wähle eine Google Tasks Liste. Standartmässig benutzt Astrid
+        seine eigenen Sortiereinstellungen.
+    </string>
+
+    <!-- Sign In Button -->
+
+    <!-- E-mail Address Label -->
+
+    <!-- Password Label -->
 
-    <!-- Password Label -->    
-    
     <!--  Authenticating toast -->
     <string name="gtasks_GLA_authenticating">Legitimierung …</string>
-    
+
     <!-- Google Apps for Domain checkbox -->
 
-    <!-- Error Message when fields aren\'t filled out -->    
+    <!-- Error Message when fields aren\'t filled out -->
 
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
-    <string name="gtasks_GLA_errorAuth">Anmeldefehler! Bitte Nutzernamen und Passwort in den Kontoeinstellungen des Telefons prüfen</string>
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
+    <string name="gtasks_GLA_errorAuth">Anmeldefehler! Bitte Nutzernamen und Passwort in den
+        Kontoeinstellungen des Telefons prüfen
+    </string>
+
+    <!-- Error Message when we receive an IO Exception -->
+    <string name="gtasks_GLA_errorIOAuth">Entschuldigung, während der Kommunikation mit den
+        Google-Servern ist ein Problem aufgetreten. Bitte versuchen Sie es später noch einmal.
+    </string>
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->
+    <string name="gtasks_GLA_errorAuth_captcha">Die Seite enthält möglicherweise ein CAPTCHA.
+        Versuchen Sie das Anmelden über den Browser und probieren sie es dann noch einmal.
+    </string>
 
-    <!-- Error Message when we receive an IO Exception -->    
-    <string name="gtasks_GLA_errorIOAuth">Entschuldigung, während der Kommunikation mit den Google-Servern ist ein Problem aufgetreten. Bitte versuchen Sie es später noch einmal.</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->    
-    <string name="gtasks_GLA_errorAuth_captcha">Die Seite enthält möglicherweise ein CAPTCHA. Versuchen Sie das Anmelden über den Browser und probieren sie es dann noch einmal.</string>
-    
     <!-- ============================================== GtasksPreferences == -->
 
-    <!-- GTasks Preferences Title -->    
+    <!-- GTasks Preferences Title -->
     <string name="gtasks_GPr_header">Google Tasks</string>
-    
-    <!-- ================================================ Synchronization == -->    
-    
+
+    <!-- ================================================ Synchronization == -->
+
     <!-- title for notification tray when synchronizing -->
 
     <!-- Error Message when we receive a HTTP 503 error -->
-    <string name="gtasks_error_backend">Google Task API ist im Beta-Status und hat einen Fehler festgestellt. Der Dienst könnte nicht aktiv sein, bitte später erneut versuchen.</string>
-    
+    <string name="gtasks_error_backend">Google Task API ist im Beta-Status und hat einen Fehler
+        festgestellt. Der Dienst könnte nicht aktiv sein, bitte später erneut versuchen.
+    </string>
+
     <!-- Error for account not found -->
-    <string name="gtasks_error_accountNotFound">Konto %s nicht gefunden. Bitte ausloggen und erneut einloggen über die Einstellungen von Google Tasks.</string>
-    
+    <string name="gtasks_error_accountNotFound">Konto %s nicht gefunden. Bitte ausloggen und erneut
+        einloggen über die Einstellungen von Google Tasks.
+    </string>
+
     <!-- Error when ping after refreshing token fails -->
-    <string name="gtasks_error_authRefresh">Anmeldung beo Google Tasks nicht möglich. Bitte Passwort prüfen oder später erneut versuchen.</string>
-    
+    <string name="gtasks_error_authRefresh">Anmeldung beo Google Tasks nicht möglich. Bitte Passwort
+        prüfen oder später erneut versuchen.
+    </string>
+
     <!-- Error when account manager returns no auth token or throws exception -->
     <string name="gtasks_error_accountManager">Fehler in den</string>
 
     <!-- Error when authorization error happens in background sync -->
-    <string name="gtasks_error_background_sync_auth">Fehler bei der Hintergrunautehntifizierung. Starte eine Synchronisation in der App.</string>
-      
+    <string name="gtasks_error_background_sync_auth">Fehler bei der Hintergrunautehntifizierung.
+        Starte eine Synchronisation in der App.
+    </string>
+
     <string name="gtasks_import_progress">Google Tasks importieren</string>
 
-    <string name="gtasks_import_add_to_shared_list">Die Liste %1$s wird mit anderen geteilt! Wollen Sie die Aufgabe %2$s wirklich hinzuzufügen?</string>
+    <string name="gtasks_import_add_to_shared_list">Die Liste %1$s wird mit anderen geteilt! Wollen
+        Sie die Aufgabe %2$s wirklich hinzuzufügen?
+    </string>
 
     <string name="gtasks_import_dlg_title">Google Tasks Import</string>
 
     <string name="gtasks_import_add_task_ok">Aufgabe hinzufügen</string>
 
     <string name="gtasks_import_add_task_cancel">Aufgabe nicht hinzufügen</string>
-        
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- NEW USER EXPERIENCE -->
-  
-  <!-- help bubbles -->
-  <!-- slide 8c: Shown the first time a user sees the task list activity -->
-  <string name="help_popover_add_task">Beginnen Sie, indem Sie ein oder zwei Aufgaben hinzufügen</string>
-
-  <!-- Shown the first time a user adds a task to a list -->  
-  <string name="help_popover_tap_task">Aufgabe zur Bearbeitung und Freigabe anklicken</string>
-  
-  <!-- slide 14a: Shown the first time a user sees the list activity -->
-  <string name="help_popover_list_settings">Liste uur Bearbeitung und Frage anklicken</string>
-  
-  <!-- slide 26c: Shown the first time a user sees the list settings tab -->
-  <string name="help_popover_collaborators">Personen, mit denen Du Aufgaben\nteilst, können Dir dabei helfen,\nDeine Liste zu erstellen oder\nAufgaben abzuschließen</string>
-  
-  <!-- Shown after user adds a task on tablet-->
-  <string name="help_popover_add_lists">Hier tippen um eine neue Liste anzulegen</string>
-  
-  <!-- Shown after a user adds a task on phones -->
-  <string name="help_popover_switch_lists">ZUm Hinzufügen einer Liste oder zum Wechsel zwischen Listen anklicken</string>
-  
-  
-  
-  <!-- Login activity -->
-  
-  
-  <!-- slide 7b -->
-  <string name="welcome_login_tos_base">Mit der Nutzung von Astrid stimmst du zu den</string>
-  
-  <string name="welcome_login_tos_link">Nutzungsbestimmungen</string>
-  
-  <!-- slide 7e -->
-  <string name="welcome_login_pw">Registrieren</string>
-  
-  <string name="welcome_sign_in">Anmelden</string>
-
-  <!-- slide 7f -->
-  <string name="welcome_login_later">Später</string>
-  
-  <string name="welcome_login_confirm_later_title">Warum meldest du dich nicht an?</string>
-  
-  <string name="welcome_login_confirm_later_ok">Ich mach\'s!</string>
-  
-  <string name="welcome_login_confirm_later_cancel">Kein Interesse</string>
-  
-  <string name="welcome_login_confirm_later_dialog">"Melde dich an, um alles aus Astrid rauszuholen! Gratis, du kannst mit Astrid.com synchronisieren, Aufgaben per email hinzufügen  und du kannst sogar Aufgaben mit Freunden teilen!"</string>
+    <!-- NEW USER EXPERIENCE -->
 
+    <!-- help bubbles -->
+    <!-- slide 8c: Shown the first time a user sees the task list activity -->
+    <string name="help_popover_add_task">Beginnen Sie, indem Sie ein oder zwei Aufgaben hinzufügen
+    </string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown the first time a user adds a task to a list -->
+    <string name="help_popover_tap_task">Aufgabe zur Bearbeitung und Freigabe anklicken</string>
 
+    <!-- slide 14a: Shown the first time a user sees the list activity -->
+    <string name="help_popover_list_settings">Liste uur Bearbeitung und Frage anklicken</string>
 
-  <!-- Resources for built-in locale plug-in -->
-
-  <!-- Locale Alert Editing Window Title -->
-  <string name="locale_edit_alerts_title">Astrid Filter Alarm</string>
-  
-  <!-- Locale Window Help -->                                                                                                                                            
-  <string name="locale_edit_intro">Astrid wird dich erinnern, wenn du Aufgaben in den folgenden Filtern hast:</string>
-      
-  <!-- Locale Window Filter Picker UI -->                                                                                                                                        
-      
-  <!-- Locale Window Interval Label -->                                                                                                                                        
-  <string name="locale_interval_label">Beschränke Erinnerungen auf:</string>        
-      
-  <!-- Locale Window Interval Values -->                                                                                                                                        
-  <string-array name="locale_interval">
-    <item>einmal pro Stunde</item>
-    <item>alle sechs Stunden</item>
-    <item>einmal in zwölf Stunden</item>
-    <item>einmal pro Tag</item>
-    <item>Einmal in drei Tagen</item>
-    <item>Einmal pro Woche</item>
-  </string-array>        
-      
-  <!-- Locale Notification text -->                                                                                                                                        
-  <string name="locale_notification">Du hast $NUM Übereinstimmungen mit: $FILTER</string>     
-      
-  <!-- Locale Plugin was not found, it is required -->
-  <string name="locale_plugin_required">Bitte installieren Sie das Astrid Locale Plug-In!</string>        
-     
+    <!-- slide 26c: Shown the first time a user sees the list settings tab -->
+    <string name="help_popover_collaborators">Personen, mit denen Du Aufgaben\nteilst, können Dir
+        dabei helfen,\nDeine Liste zu erstellen oder\nAufgaben abzuschließen
+    </string>
 
+    <!-- Shown after user adds a task on tablet-->
+    <string name="help_popover_add_lists">Hier tippen um eine neue Liste anzulegen</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown after a user adds a task on phones -->
+    <string name="help_popover_switch_lists">ZUm Hinzufügen einer Liste oder zum Wechsel zwischen
+        Listen anklicken
+    </string>
+
+
+    <!-- Login activity -->
+
+
+    <!-- slide 7b -->
+    <string name="welcome_login_tos_base">Mit der Nutzung von Astrid stimmst du zu den</string>
+
+    <string name="welcome_login_tos_link">Nutzungsbestimmungen</string>
+
+    <!-- slide 7e -->
+    <string name="welcome_login_pw">Registrieren</string>
+
+    <string name="welcome_sign_in">Anmelden</string>
+
+    <!-- slide 7f -->
+    <string name="welcome_login_later">Später</string>
+
+    <string name="welcome_login_confirm_later_title">Warum meldest du dich nicht an?</string>
+
+    <string name="welcome_login_confirm_later_ok">Ich mach\'s!</string>
+
+    <string name="welcome_login_confirm_later_cancel">Kein Interesse</string>
+
+    <string name="welcome_login_confirm_later_dialog">"Melde dich an, um alles aus Astrid
+        rauszuholen! Gratis, du kannst mit Astrid.com synchronisieren, Aufgaben per email hinzufügen
+        und du kannst sogar Aufgaben mit Freunden teilen!"
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in locale plug-in -->
+
+    <!-- Locale Alert Editing Window Title -->
+    <string name="locale_edit_alerts_title">Astrid Filter Alarm</string>
+
+    <!-- Locale Window Help -->
+    <string name="locale_edit_intro">Astrid wird dich erinnern, wenn du Aufgaben in den folgenden
+        Filtern hast:
+    </string>
+
+    <!-- Locale Window Filter Picker UI -->
+
+    <!-- Locale Window Interval Label -->
+    <string name="locale_interval_label">Beschränke Erinnerungen auf:</string>
+
+    <!-- Locale Window Interval Values -->
+    <string-array name="locale_interval">
+        <item>einmal pro Stunde</item>
+        <item>alle sechs Stunden</item>
+        <item>einmal in zwölf Stunden</item>
+        <item>einmal pro Tag</item>
+        <item>Einmal in drei Tagen</item>
+        <item>Einmal pro Woche</item>
+    </string-array>
+
+    <!-- Locale Notification text -->
+    <string name="locale_notification">Du hast $NUM Übereinstimmungen mit: $FILTER</string>
+
+    <!-- Locale Plugin was not found, it is required -->
+    <string name="locale_plugin_required">Bitte installieren Sie das Astrid Locale Plug-In!</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ====================== Plugin Boilerplate ========================= -->
 
-	<!-- filters header: OpenCRX -->
+    <!-- filters header: OpenCRX -->
     <string name="opencrx_FEx_header">OpenCRX</string>
-    
+
     <!-- filter category for OpenCRX ActivityCreators -->
     <string name="opencrx_FEx_dashboard">Arbeitsbereiche</string>
-    
+
     <!-- filter category for OpenCRX responsible person -->
     <string name="opencrx_FEx_responsible">Zugeordnet an</string>
-    
+
     <!--  OpenCRX assignedTo filter title (%s => assigned contact) -->
     <string name="opencrx_FEx_responsible_title">Zugeordnet an \'%s\'</string>
-    
+
     <!-- detail for showing tasks created by someone else (%s => person name) -->
     <string name="opencrx_PDE_task_from">von %s</string>
-    
+
     <!-- replacement string for task edit "Notes" when using OpenCRX -->
     <string name="opencrx_TEA_notes">Einen Kommentar hinzufügen</string>
-    
+
     <string name="opencrx_creator_input_hint">Ersteller</string>
 
     <string name="opencrx_contact_input_hint">Zugewiesen an</string>
     <!-- ==================================================== Preferences == -->
 
-    <!-- Preferences Title: OpenCRX -->    
+    <!-- Preferences Title: OpenCRX -->
     <string name="opencrx_PPr_header">OpenCRX</string>
 
     <!-- creator title for tasks that are not synchronized -->
     <string name="opencrx_no_creator">(Nicht syncronisieren)</string>
 
-	<!-- preference title for default creator -->
+    <!-- preference title for default creator -->
     <string name="opencrx_PPr_defaultcreator_title">Standart Aktivitätenersteller</string>
 
     <!-- preference description for default creator (%s -> setting) -->
-    <string name="opencrx_PPr_defaultcreator_summary">Neue Aktivitäten werden erstellt durch: %s</string>
+    <string name="opencrx_PPr_defaultcreator_summary">Neue Aktivitäten werden erstellt durch: %s
+    </string>
 
     <!-- preference description for default dashboard (when set to \'not synchronized\') -->
-    <string name="opencrx_PPr_defaultcreator_summary_none">Neue Aktivitäten werden standartmässig nicht synchronisiert.</string>
-    
+    <string name="opencrx_PPr_defaultcreator_summary_none">Neue Aktivitäten werden standartmässig
+        nicht synchronisiert.
+    </string>
+
     <!--  OpenCRX host and segment group name -->
     <string name="opencrx_group">OpenCRX Server</string>
 
@@ -2022,81 +2226,88 @@ Sind Sie sicher, dass Sie mit Astrid.com synchronisieren möchten?</string>
 
     <!--  dialog title for OpenCRX host -->
     <string name="opencrx_host_dialog_title">OpenCRX Host</string>
-    
+
     <!--  example for OpenCRX host -->
-    <string name="opencrx_host_summary">"Zum Beispiel: "<i>mydomain.com</i></string>
-    
+    <string name="opencrx_host_summary">"Zum Beispiel: "
+        <i>mydomain.com</i>
+    </string>
+
     <!--  preference description for OpenCRX segment -->
     <string name="opencrx_segment_title">Segment</string>
 
     <!--  dialog title for OpenCRX segment -->
     <string name="opencrx_segment_dialog_title">Synchronisiertes Segment</string>
-    
+
     <!--  example for OpenCRX segment -->
-    <string name="opencrx_segment_summary">"Zum Beispiel: "<i>Standard</i></string>
-    
+    <string name="opencrx_segment_summary">"Zum Beispiel: "
+        <i>Standard</i>
+    </string>
+
     <!--  default value for OpenCRX segment -->
     <string name="opencrx_segment_default">Standard</string>
-    
+
     <!--  preference description for OpenCRX provider -->
     <string name="opencrx_provider_title">Anbieter</string>
 
     <!--  dialog title for OpenCRX provider -->
     <string name="opencrx_provider_dialog_title">OpenCRX Daten Provider</string>
-    
+
     <!--  example for OpenCRX provider -->
-    <string name="opencrx_provider_summary">"Zum Beispiel: "<i>CRX</i></string>
-    
+    <string name="opencrx_provider_summary">"Zum Beispiel: "
+        <i>CRX</i>
+    </string>
+
     <!--  default value for OpenCRX provider -->
     <string name="opencrx_provider_default">CRX</string>
     <!-- ================================================= Login Activity == -->
 
-    <!-- Activity Title: Opencrx Login -->    
+    <!-- Activity Title: Opencrx Login -->
     <string name="opencrx_PLA_title">Bei OpenCRX einloggen</string>
 
-    <!-- Instructions: Opencrx login -->    
+    <!-- Instructions: Opencrx login -->
     <string name="opencrx_PLA_body">Mit deinem OpenCRX Account anmelden</string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
     <string name="opencrx_PLA_signIn">Anmelden</string>
 
-    <!-- Login Label -->    
+    <!-- Login Label -->
     <string name="opencrx_PLA_login">Anmelden</string>
 
-    <!-- Password Label -->    
+    <!-- Password Label -->
     <string name="opencrx_PLA_password">Passwort</string>
-    
-        <!-- Error Message when fields aren\'t filled out -->    
+
+    <!-- Error Message when fields aren\'t filled out -->
     <string name="opencrx_PLA_errorEmpty">Fehler: Alle Felder ausfüllen</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
     <string name="opencrx_PLA_errorAuth">Fehler: Login oder Password ist falsch!</string>
 
     <!-- ================================================ Synchronization == -->
-        
+
     <!-- title for notification tray after synchronizing -->
     <string name="opencrx_notification_title">OpenCRX</string>
-    
+
     <!-- text for notification tray when synchronizing -->
-    <string name="opencrx_notification_text">%s Aufgaben aktualisiert / Klicken Sie für Details</string>
-    
+    <string name="opencrx_notification_text">%s Aufgaben aktualisiert / Klicken Sie für Details
+    </string>
+
     <!-- Error msg when io exception  -->
     <string name="opencrx_ioerror">Verbindungsfehler! Überprüfe Deine Internetverbindung.</string>
 
     <!-- opencrx Login not specified-->
     <string name="opencrx_MLA_email_empty">Login wurde nicht angegeben!</string>
-    
+
     <!-- opencrx password not specified-->
     <string name="opencrx_MLA_password_empty">Kennwort wurde nicht angegeben!</string>
-    
+
     <!-- ================================================ labels for layout-elements == -->
-    
+
     <!-- label for task-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_task_assign_label">Aufgabe dieser Person zuordnen:</string>
-    
+
     <!-- Spinner-item for unassigned tasks on taskeditactivity -->
     <string name="opencrx_TEA_task_unassigned">&lt;Nicht zugeordnet&gt;</string>
-    
+
     <!-- label for dashboard-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_creator_assign_label">Aufgabe diesem Ersteller zuordnen:</string>
 
@@ -2104,7 +2315,7 @@ Sind Sie sicher, dass Sie mit Astrid.com synchronisieren möchten?</string>
     <string name="opencrx_TEA_dashboard_default">&lt;Standard&gt;</string>
 
     <string name="opencrx_TEA_opencrx_title">OpenCRX-Steuerung</string>
-        
+
     <string name="CFC_opencrx_in_workspace_text">Im Arbeitsbereich: ?</string>
 
     <string name="CFC_opencrx_in_workspace_name">Im Arbeitsbereich …</string>
@@ -2114,117 +2325,159 @@ Sind Sie sicher, dass Sie mit Astrid.com synchronisieren möchten?</string>
     <string name="CFC_opencrx_assigned_to_name">Zugeordnet zu …</string>
 
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
+    <!-- ================================================== EditPreferences == -->
 
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 32j: Preference Category: Power Pack -->
-  <string name="EPr_powerpack_header">Premium und verschiedene Einstellungen</string>
-  <string name="EPr_powerpack_summary">Verpasste Anruf Erinnerungen, Spracheingabe und Andere Einstellungen</string>
-  
-  <!-- slide 32e: Preference: Anonymous User Statistics -->
-  <string name="EPr_statistics_title">Anonyme Nutzungsstatistiken</string>
-  <!-- Preference: User Statistics (disabled) -->
-  <string name="EPr_statistics_desc_disabled">Nutzungsstatistik wird nicht übertragen</string>  
-  <!-- slide 32f: Preference: User Statistics (enabled) -->
-  <string name="EPr_statistics_desc_enabled">Helfen Sie uns, Astrid durch anonymisierte Nutzungsdaten besser zu machen</string>
-      
+    <!-- slide 32j: Preference Category: Power Pack -->
+    <string name="EPr_powerpack_header">Premium und verschiedene Einstellungen</string>
+    <string name="EPr_powerpack_summary">Verpasste Anruf Erinnerungen, Spracheingabe und Andere
+        Einstellungen
+    </string>
 
+    <!-- slide 32e: Preference: Anonymous User Statistics -->
+    <string name="EPr_statistics_title">Anonyme Nutzungsstatistiken</string>
+    <!-- Preference: User Statistics (disabled) -->
+    <string name="EPr_statistics_desc_disabled">Nutzungsstatistik wird nicht übertragen</string>
+    <!-- slide 32f: Preference: User Statistics (enabled) -->
+    <string name="EPr_statistics_desc_enabled">Helfen Sie uns, Astrid durch anonymisierte
+        Nutzungsdaten besser zu machen
+    </string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
-    <string name="speech_err_network">Netzwerkfehler! Spracherkennung benötigt eine Internetverbindung um zu funktionieren.</string>
-    <string name="speech_err_no_match">Entschuldigung! Ich konnte das nicht verstehen! Bitte versuchen Sie es erneut.</string>
-    <string name="speech_err_default">Tut uns leid, die Spracherkennung konnte das nicht verarbeiten. Bitte versuchen Sie es erneut.</string>
-    
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <string name="speech_err_network">Netzwerkfehler! Spracherkennung benötigt eine
+        Internetverbindung um zu funktionieren.
+    </string>
+    <string name="speech_err_no_match">Entschuldigung! Ich konnte das nicht verstehen! Bitte
+        versuchen Sie es erneut.
+    </string>
+    <string name="speech_err_default">Tut uns leid, die Spracherkennung konnte das nicht
+        verarbeiten. Bitte versuchen Sie es erneut.
+    </string>
+
     <string name="premium_attach_file">Datei anhängen</string>
     <string name="premium_record_audio">Notiz aufzeichnen</string>
     <string name="premium_no_files">Keine Dateien angehängt</string>
-    <string name="premium_remove_file_confirm">Sind Sie sicher? Das kann nicht rückgängig gemacht werden</string>
-    
+    <string name="premium_remove_file_confirm">Sind Sie sicher? Das kann nicht rückgängig gemacht
+        werden
+    </string>
+
     <string name="audio_recording_title">Audio aufnehmen</string>
     <string name="audio_stop_recording">Aufnahme stoppen</string>
     <string name="audio_speak_now">Sprechen Sie jetzt!</string>
     <string name="audio_encoding">Kodieren...</string>
     <string name="audio_err_encoding">Fehler bei der Audiocodierung</string>
     <string name="audio_err_playback">Tut uns leid, dieser Dateityp wird nicht unterstützt</string>
-    
-    <string name="search_market_audio">Dieser Dateityp kann nicht geöffnet werden. Möchten Sie einen Audio-Player von Google Play herunterladen?</string>
+
+    <string name="search_market_audio">Dieser Dateityp kann nicht geöffnet werden. Möchten Sie einen
+        Audio-Player von Google Play herunterladen?
+    </string>
     <string name="search_market_audio_title">Es wurde kein Audio-Player gefunden</string>
 
-    <string name="search_market_pdf">Dieser Dateityp kann nicht geöffnet werden. Möchten Sie einen PDF-Reader von Google Play herunterladen?</string>
+    <string name="search_market_pdf">Dieser Dateityp kann nicht geöffnet werden. Möchten Sie einen
+        PDF-Reader von Google Play herunterladen?
+    </string>
     <string name="search_market_pdf_title">Es wurde kein PDF-Reader gefunden</string>
 
-    <string name="search_market_ms">Dieser Dateityp kann nicht geöffnet werden. Möchten Sie einen Office-Reader von Google Play herunterladen?</string>
+    <string name="search_market_ms">Dieser Dateityp kann nicht geöffnet werden. Möchten Sie einen
+        Office-Reader von Google Play herunterladen?
+    </string>
     <string name="search_market_ms_title">Es wurde kein Office-Reader gefunden</string>
-    
-    <string name="file_type_unhandled">Tut mir leid! Dieser Dateityp kann nicht geöffnet werden.</string>
+
+    <string name="file_type_unhandled">Tut mir leid! Dieser Dateityp kann nicht geöffnet werden.
+    </string>
     <string name="file_type_unhandled_title">Es wurde keine Anwendung gefunden</string>
-    
+
     <string name="file_prefix_image">Bild</string>
     <string name="file_prefix_voice">Stimme</string>
     <string name="file_browser_up">Nach oben</string>
     <string name="file_browser_title">Wählen Sie eine Datei</string>
     <string name="dir_browser_title">Wähle ein Verzeichnis</string>
-    <string name="file_browser_err_permissions">Konnte nicht auf die SD-Karte zugreifen. Bitte stellen Sie sicher, das sie den Zugriff auf sie SD Karte nicht eingeschränkt haben.</string>
+    <string name="file_browser_err_permissions">Konnte nicht auf die SD-Karte zugreifen. Bitte
+        stellen Sie sicher, das sie den Zugriff auf sie SD Karte nicht eingeschränkt haben.
+    </string>
     <string name="file_add_picture">Ein Bild anhängen</string>
     <string name="file_add_sdcard">Eine Datei von der SD-Karte anhängen</string>
     <string name="file_download_title">Datei herunterladen?</string>
-    <string name="file_download_body">Diese Daten befindet sich noch nicht auf Ihrer SD-Karte. Wollen Sie sie herunterladen ?</string>
+    <string name="file_download_body">Diese Daten befindet sich noch nicht auf Ihrer SD-Karte.
+        Wollen Sie sie herunterladen ?
+    </string>
     <string name="file_download_progress">Herunterladen...</string>
     <string name="file_err_memory">Das Bild ist zu groß um dekodiert zu werden</string>
     <string name="file_err_copy">Fehler beim Kopieren der angehängten Datei</string>
     <string name="file_err_download">Fehler beim Herunterladen</string>
-    <string name="file_err_no_directory">Hoppla! Sieht aus wie die Dateien Verzeichnis nicht vorhanden ist. Bitte wählen Sie ein Verzeichnis, um Dateien in den Astrid-Einstellungen zu speichern.</string>
+    <string name="file_err_no_directory">Hoppla! Sieht aus wie die Dateien Verzeichnis nicht
+        vorhanden ist. Bitte wählen Sie ein Verzeichnis, um Dateien in den Astrid-Einstellungen zu
+        speichern.
+    </string>
     <string name="file_err_show">Tut uns leid, das System unterstützt diesen Dateityp nicht</string>
-    
+
     <string name="file_dir_dialog_ok">Verwenden Sie dieses Verzeichnis</string>
     <string name="file_dir_dialog_default">Auf Standardeinstellungen zurücksetzen</string>
-    
+
     <string name="p_files_dir">Premium-Downloadverzeichnis</string>
     <!-- Description for file download directory preference. %s -> chosen directory -->
     <string name="p_files_dir_desc">Aufgabe Anhänge gespeichert zu: %s</string>
     <string name="p_files_dir_desc_default">Standard-Verzeichnis</string>
 
-    
+
     <!-- in app billing -->
     <string name="billing_not_supported_title">Kauf war nicht möglich.</string>
-    <string name="billing_not_supported_message">Der Market-Abrechnungsdienst ist zur Zeit nicht verfügbar. Du kannst diese App weiterhin benutzen, aber Du kannst keine Einkäufe tätigen.</string>
-    <string name="subscriptions_not_supported_title">Abonnement konnte nicht gekauft werden.</string>
-    <string name="subscriptions_not_supported_message">Der Market-Abrechnungsdienst unterstützt zur Zeit keine Abonnements auf diesem Gerät. Du kannst Astrid Premium unter http://astrid.com/premium abonnieren.</string>
-    <string name="cannot_connect_title">Verbindung zum Market konnte nicht hergestellt werden.</string>
-    <string name="cannot_connect_message">Die App kann sich nicht mit dem Market verbinden. Deine Market-Version ist eventuell veraltet. Du kannst diese App weiterhin benutzen, aber Du kannst keine Einkäufe tätigen.</string>
-    
+    <string name="billing_not_supported_message">Der Market-Abrechnungsdienst ist zur Zeit nicht
+        verfügbar. Du kannst diese App weiterhin benutzen, aber Du kannst keine Einkäufe tätigen.
+    </string>
+    <string name="subscriptions_not_supported_title">Abonnement konnte nicht gekauft werden.
+    </string>
+    <string name="subscriptions_not_supported_message">Der Market-Abrechnungsdienst unterstützt zur
+        Zeit keine Abonnements auf diesem Gerät. Du kannst Astrid Premium unter
+        http://astrid.com/premium abonnieren.
+    </string>
+    <string name="cannot_connect_title">Verbindung zum Market konnte nicht hergestellt werden.
+    </string>
+    <string name="cannot_connect_message">Die App kann sich nicht mit dem Market verbinden. Deine
+        Market-Version ist eventuell veraltet. Du kannst diese App weiterhin benutzen, aber Du
+        kannst keine Einkäufe tätigen.
+    </string>
+
     <string name="restoring_transactions">Transaktionen werden wiederhergestellt.</string>
-    
+
     <string name="subscriptions_learn_more">Mehr erfahren</string>
-    
-    <string name="kii_premium_success">Vielen Dank für die Teilnahme an diesem Angebot. Dein kostenloser Astrid Premium Monat ist nun freigeschaltet.</string>
+
+    <string name="kii_premium_success">Vielen Dank für die Teilnahme an diesem Angebot. Dein
+        kostenloser Astrid Premium Monat ist nun freigeschaltet.
+    </string>
     <string name="kii_premium_abort">Vorgang abgebrochen</string>
     <string name="kii_premium_declined">Vorgang abgelehnt</string>
-    <string name="kii_premium_error">Es trat ein Fehler auf. Bitte versuche es später erneut. </string>
-    
+    <string name="kii_premium_error">Es trat ein Fehler auf. Bitte versuche es später erneut.
+    </string>
+
     <string name="premium_offers_title">Angebot</string>
-    <string name="premium_offers_subtitle">Möchtest Du einen kostenlosen Astrid Premium Monat?</string>
-    <string name="premium_offers_detail">Um einen kostenlosen Astrid Premium Monat zu erhalten, schauen Dir dieses Kurze Video von diesem Sponsor an. (Er wird außerdem nach Deiner E-Mail Adresse fragen.)</string>
+    <string name="premium_offers_subtitle">Möchtest Du einen kostenlosen Astrid Premium Monat?
+    </string>
+    <string name="premium_offers_detail">Um einen kostenlosen Astrid Premium Monat zu erhalten,
+        schauen Dir dieses Kurze Video von diesem Sponsor an. (Er wird außerdem nach Deiner E-Mail
+        Adresse fragen.)
+    </string>
     <string name="premium_offers_start">Hole es Dir kostenlos!</string>
-    
+
     <string name="premium_billing_title">Astrid Premium</string>
     <string name="premium_buy_month">Ein Monat</string>
     <string name="premium_buy_year">Ein Jahr</string>
     <string name="premium_description_header">Schaff noch mehr, mit der Premium Version!</string>
-    <string name="premium_description_1">Hänge Dateien an To-Do Listen an \n(PDF, DOC, PPT...)</string>
+    <string name="premium_description_1">Hänge Dateien an To-Do Listen an \n(PDF, DOC, PPT...)
+    </string>
     <string name="premium_description_2">Dateien my astrid.com synchronisieren</string>
     <string name="premium_description_3">Füge Anhänge per E-Mail</string>
     <string name="premium_description_4">Speichere Sprachnotizen als Audio-Dateien</string>
@@ -2233,725 +2486,779 @@ Sind Sie sicher, dass Sie mit Astrid.com synchronisieren möchten?</string>
     <string name="premium_speech_bubble_1">Premium wird deine Produktivität erhöhen!</string>
     <string name="premium_speech_bubble_2">Bestell für ein Jahr und spare 25%%!</string>
     <string name="premium_already_subscribed">Du hast bereits Astrid Premium!</string>
-    <string name="premium_login_prompt">Du brauchst einen Astrid.com Account um dich für Astrid Premium anzumelden. Bitte log dich ein oder registriere dich.</string>
+    <string name="premium_login_prompt">Du brauchst einen Astrid.com Account um dich für Astrid
+        Premium anzumelden. Bitte log dich ein oder registriere dich.
+    </string>
     <string name="premium_success">Vielen Dank für die Anmeldung bei Astrid Premium!</string>
-    <string name="premium_success_with_server_error">Vielen Dank für die Anmeldung bei Astrid Premium! Die neuen Funktionen werden bald für dich auf astrid.com verfügbar sein und sollten bereits jetzt auf deinem Handy funktionieren.</string>
-    <string name="premium_verification_error">Der Premium Account für dieses Google Play Konto ist mit einem anderen Benutzer verknüpft. Um weitere E-Mail-Adressen zu deinem Account hinzuzufügen, besuche astrid.com/users/profile</string>
-    <string name="premium_check_for_purchases">Schon mal Premium gekauft? Hier klicken um die Einkaufhistorie in Googe Play zu sehen.</string>
+    <string name="premium_success_with_server_error">Vielen Dank für die Anmeldung bei Astrid
+        Premium! Die neuen Funktionen werden bald für dich auf astrid.com verfügbar sein und sollten
+        bereits jetzt auf deinem Handy funktionieren.
+    </string>
+    <string name="premium_verification_error">Der Premium Account für dieses Google Play Konto ist
+        mit einem anderen Benutzer verknüpft. Um weitere E-Mail-Adressen zu deinem Account
+        hinzuzufügen, besuche astrid.com/users/profile
+    </string>
+    <string name="premium_check_for_purchases">Schon mal Premium gekauft? Hier klicken um die
+        Einkaufhistorie in Googe Play zu sehen.
+    </string>
     <string name="premium_checking_for_purchases">Prüfe Deine Einkäufe...</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- Resources for built-in reminders plug-in -->
-    
-  <!-- =============================================== task edit activity == -->
-
-  <!-- Task Edit: Reminder group label -->  
-  <string name="TEA_reminders_group_label">Erinnerungseinstellungen</string>
-
-  <!-- Task Edit: Reminder header label -->  
-  <string name="TEA_reminder_label">Erinnere mich:</string>
-
-  <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">Wenn Aufgabe fällig ist</string>
-
-  <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">Wenn Aufgabe überfällig ist</string>
-
-  <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_randomly">Einmal zufällig</string>
-
-  <!-- Task Edit: Reminder alarm clock label -->  
-  <string name="TEA_reminder_alarm_label">Klingeln/Vibrieren Typ:</string>
-
-  <!--  slide 45a: Task Edit: Reminder mode: ring once -->  
-  <string name="TEA_reminder_mode_once">Einmal</string>
-
-  <!-- slide 45b: Task Edit: Reminder mode: ring five times -->  
-  <string name="TEA_reminder_mode_five">Fünfmal</string>
-
-  <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->  
-  <string name="TEA_reminder_mode_nonstop">Bis ich den Alarm abschalte</string>
-  
-  <string name="TEA_reminder_when">when</string>
-  
-  <string name="TEA_reminder_due_short">fällig</string>
-
-  <string name="TEA_reminder_overdue_short">überfällig</string>
-
-  <string name="TEA_reminder_randomly_short">zufällig</string>
-
-  <string name="TEA_reminder_display_one">Erinnere mich %s</string>
-  
-  <string name="TEA_reminder_display_multiple">Erinnern %s</string>
-
-  <string-array name="TEA_reminder_random">
-    <!-- random reminder choices for task edit page. -->
-    <item>einer Stunde</item>
-    <item>einem Tag</item>
-    <item>einer Woche</item>
-    <item>2 Wochen</item>
-    <item>einem Monat</item>
-    <item>in 2 Monaten</item>
-  </string-array>
-  
-  <!-- ==================================================== notifications == -->
-  
-  <!-- Name of filter when viewing a reminder -->
-  <string name="rmd_NoA_filter">Erinnerung!</string>
-  
-  <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Abgeschlossen</string>
-  
-  <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Schlummern</string>
-  
-  <!-- Reminder: Completed Toast -->
-  <string name="rmd_NoA_completed_toast">Herzlichen Glückwunsch zum Abschluss!</string>
-  
-  <!-- Prefix for reminder dialog title -->
-  <string name="rmd_NoA_dlg_title">Erinnerung:</string>
-  
-  <!-- ==================================================== user reengagement == -->
-
-  <!-- Titles for user reengagement notifications -->
-  <string-array name="rmd_reengage_notif_titles">
-    <item>Eine Mitteilung von Astrid</item>
-    <!-- %s -> first name -->
-    <item>Notiz für %s.</item> 
-    <item>Ihre Astrid-Übersicht</item>
-    <item>Erinnerungen von Astrid</item>
-  </string-array>
-    
-  <string name="rmd_reengage_name_default">Sie</string>
-
-  
-  <string name="rmd_reengage_add_tasks">Aufgabe hinzufügen</string>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs -->
-  <string-array name="rmd_reengage_dialog_options">
-    <item>Zeit, Ihre Todo-Liste zu verkürzen!</item>
-    <item>Sehr geehrte Damen und Herren, einige Aufgaben warten zur Durchsicht!</item>
-    <item>Hallo, könnten Sie sich das bitte ansehen?</item>
-    <item>Ich haben einige Aufgaben, die Ihnen zugewiesen wurden!</item>
-    <item>Ein neuer Stapel Aufgaben für Sie!</item>
-    <item>Sie sehen großartig aus! Können wir loslegen?</item>
-    <item>Heute ist ein wunderbarer Tag um ein paar Dinge fertig zu bekommen!</item>
-  </string-array>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>Möchten Sie Ihre Aufgaben nicht besser organisieren?</item>
-    <item>Ich bin Astrid! Meine Aufgabe ist es, Sie bei Ihren Aufgaben zu unterstützen!</item>
-    <item>Sie sehen beschäftigt aus, kann ich Ihnen diese Aufgaben abnehmen?</item>
-    <item>Ich kann Sie bei Ihrer gesamten Aufgabenplanung unterstützen.</item>
-    <item>Wollen Sie mehr schaffen? Ich auch!</item>
-    <item>Sehr erfreut, Sie kennenzulernen!</item>
-  </string-array>
-  <!-- ============================================= reminder preferences == -->
-  
-  <!-- slide 33d: Reminder Preference Screen Title -->
-  <string name="rmd_EPr_alerts_header">Erinnerungseinstellungen</string>
-  <string name="rmd_EPr_alerts_summary">Ruhezeiten, Snooze Einstellungen, Hartnäckigkeit</string>
-    
-  <!-- Reminder Preference: Reminders Enabled Title -->
-  <string name="rmd_EPr_enabled_title">Erinnerungen aktiviert?</string>
-  <!-- Reminder Preference Reminders Enabled Description (true) -->
-  <string name="rmd_EPr_enabled_desc_true">Astrids Erinnerung sind aktiviert (Standard)</string>
-  <!-- Reminder Preference Reminders Enabled Description (false) -->
-  <string name="rmd_EPr_enabled_desc_false">Astrid wird keine Erinnerungen auf deinem Telefon anzeigen</string>  
-    
-  <!-- Reminder Preference: Quiet Hours Start Title -->
-  <string name="rmd_EPr_quiet_hours_start_title">Stille Stunden beginnen.</string>
-  <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">Benachrichtigungen sind lautlos nach %s.\nHinweis: Vibrieren wird durch Einstellungen weiter unten gesteuert!</string>
-  <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
-  <string name="rmd_EPr_quiet_hours_desc_none">Stille Stunden sind deaktiviert</string>
-  
-  <!-- Reminder Preference: Quiet Hours End Title -->
-  <string name="rmd_EPr_quiet_hours_end_title">Stille Stunden beenden</string>
-  <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_end_desc">Benachrichtigungen werden nicht mehr lautlos sein ab %s</string>
-
-  <!-- Reminder Preference: Default Reminder Title -->
-  <string name="rmd_EPr_rmd_time_title">Standarderinnerumg</string>
-  <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
-  <string name="rmd_EPr_rmd_time_desc">Benachrichtigungen für Aufgaben ohne Fälligkeit werden um %s angezeigt</string>
-
-  <!-- Reminder Preference: Notification Ringtone Title -->
-  <string name="rmd_EPr_ringtone_title">Erinnerungsklingelton</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
-  <string name="rmd_EPr_ringtone_desc_custom">Eigener Klingelton eingestellt</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
-  <string name="rmd_EPr_ringtone_desc_silent">Klingelton auf Lautlos eingestellt</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
-  <string name="rmd_EPr_ringtone_desc_default">Standardklingelton wird benutzt</string>
-  
-  <!-- Reminder Preference: Notification Persistence Title -->
-  <string name="rmd_EPr_persistent_title">Meldungsbeharrlichkeit</string>
-  <!-- Reminder Preference: Notification Persistence Description (true) -->
-  <string name="rmd_EPr_persistent_desc_true">Benachrichtigungen müssen einzeln angesehen werden um sie zu löschen</string>
-  <!-- Reminder Preference: Notification Persistence Description (false) -->
-  <string name="rmd_EPr_persistent_desc_false">Erinnerungen können mit dem \"Alle Löschen\" Button gelöscht werden</string>
-
-  <!-- Reminder Preference: Social Reminders Title -->
-  <string name="rmd_EPr_social_title">Soziale Förderung</string>
-  <!-- Reminder Preference: Social Reminders Summary (enabled) -->
-  <string name="rmd_EPr_social_summary_enabled">Die Erinnerung wird Zeigen, wer auf Dich bei geteilten Aufgaben zählt.</string>
-  <!-- Reminder Preference: Social Reminders Summary (disabled) -->
-  <string name="rmd_EPr_social_summary_disabled">Die Erinnerung wird nicht Zeigen, wer auf Dich bei geteilten Aufgaben zählt.</string>
-  
-  
-  
-  <!-- Reminder Preference: Notification Icon Title -->
-  <!-- Reminder Preference: Notification Icon Description -->
-
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
-  <string name="rmd_EPr_multiple_maxvolume_title">Maximale Lautstärke für mehrfachläutende Erinnerungen</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid wird die Lautstärke für mehrfachläutende Erinnerungen maximalisieren</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid wird die Systemeinstellungen für die Lautstärke benutzen</string>
-
-  <!-- Reminder Preference: Vibrate Title -->
-  <string name="rmd_EPr_vibrate_title">Vibrieren beim Alarm</string>
-  <!-- Reminder Preference: Vibrate Description (true) -->
-  <string name="rmd_EPr_vibrate_desc_true">Astrid wird beim Senden von Benachrichtigungen vibrieren</string>
-  <!-- Reminder Preference: Vibrate Description (false) -->
-  <string name="rmd_EPr_vibrate_desc_false">Astrid wird beim Senden von Erinnerungen nicht vibrieren</string>
-
-  <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">Astrid Ermutigungen</string>
-  <!-- Reminder Preference: Nagging Description (true) -->
-  <string name="rmd_EPr_nagging_desc_true">Astrid wird Ermutigungen zu den Erinnerungen hinzufügen</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_nagging_desc_false">Astrid wird keine Ermutigungen hinzufügen</string>
-
-  <!-- Reminder Preference: Snooze Dialog Title -->  
-  <string name="rmd_EPr_snooze_dialog_title">Schlummer-Dialog HH:MM</string>
-  <!-- Reminder Preference: Snooze Dialog Description (true) -->
-  <string name="rmd_EPr_snooze_dialog_desc_true">Schlummerfunktion durch Auswahl neuer Zeit (HH:MM) aktivieren</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_snooze_dialog_desc_false">Schlummern durch Auswahl von # Tagen/Stunden</string>
-  
-  <!-- slide 44g: Reminder Preference: Default Reminders Title -->
-  <string name="rmd_EPr_defaultRemind_title">Zufällige Erinnerungen</string>
-  <!-- Reminder Preference: Default Reminders Setting (disabled) -->
-  <string name="rmd_EPr_defaultRemind_desc_disabled">Aufgaben sollen keine zufälligen Erinnerungen haben</string>
-  <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
-  <string name="rmd_EPr_defaultRemind_desc">Neue Aufgaben werden zufällig erinnern: %s</string>
-  
-  <!-- slide 39a: Defaults Title -->
-  
-  <string-array name="EPr_reminder_random">
-    <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
-    <item>deaktiviert</item>
-    <!-- slide 44b -->
-    <item>stündlich</item>
-    <!-- slide 44c -->
-    <item>täglich</item>
-    <!-- slide 44d-->
-    <item>wöchentlich</item>
-    <!-- slide 44e-->
-    <item>vierzehntägig</item>
-    <!-- slide 44f -->
-    <item>monatlich</item>
-    <item>alle zwei Monate</item>
-  </string-array>
-        
-  <string-array name="EPr_quiet_hours_start">
-    <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
-    <item>deaktiviert</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>00:00</item>
-    <item>01:00</item>
-    <item>02:00</item>
-    <item>03:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-  </string-array>
-  
-  <string-array name="EPr_quiet_hours_end">
-    <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>00:00</item>
-    <item>01:00</item>
-    <item>02:00</item>
-    <item>03:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-  </string-array>
-  
-  <string-array name="EPr_rmd_time">
-    <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>00:00</item>
-    <item>01:00</item>
-    <item>02:00</item>
-    <item>03:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-  </string-array>
-  
-  <!-- =============================================== random reminders == -->
-  
-  <string name="reminders_social_one">%s zählt auf dich!</string>
-  
-  <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
-
-  <string-array name="reminders">
-      <!-- reminders: Make these < 20 chars so the task name is displayed -->
-      <item>Haste \'ne Sekunde?</item>
-      <item>Kann ich dich für ne Sekunde sehen?</item>
-      <item>Haste \'ne Minute?</item>
-      <item>Hast du vergessen?</item>
-      <item>Entschuldigung!</item>
-      <item>Wenn du Zeit hast:</item>
-      <item>Was noch zu tun ist:</item>
-      <item>Hast du einen Moment?</item>
-      <item>Astrid ist hier!</item>
-      <item>Hi! Darf ich kurz stören?</item>
-      <item>Eine Minute deiner Zeit!?</item>
-      <item>Heute ist ein toller Tag für:</item>
-  </string-array>
-
-  <string-array name="reminders_due">
-      <!-- reminders related to task due date -->
-      <item>Arbeite:</item>
-      <item>Fälligkeit ist hier!</item>
-      <item>Bereit zum Anfangen?</item>
-      <item>Du sagtest, du willst:</item>
-      <item>Du solltest anfangen mit:</item>
-      <item>Es ist Zeit für:</item>
-      <item>Es ist soweit:</item>
-      <item>Entschuldige mich! Zeit für</item>
-      <item>Hast du frei? Zeit für</item>
-  </string-array>
-
-  <string-array name="reminders_snooze">
-      <!-- reminders related to snooze -->
-      <item>Sei nicht so faul!</item>
-      <item>Die Schlummerzeit ist vorbei!</item>
-      <item>Nicht mehr schlummern!</item>
-      <item>Jetzt bist du bereit?</item>
-      <item>Kein weiteres Aufschieben mehr!</item>
-  </string-array>
-  
-  <string-array name="reminder_responses">
-      <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
-      <item>Ich hab was für dich!</item> 
-      <item>Bereit die Sache abzuhaken?</item>
-      <item>Warum erledigst du das nicht endlich?</item>
-      <item>Wie sieht\'s hiermit aus? Fertig, Tiger?</item>
-      <item>Bist du bereit für diesen Job?</item>
-      <item>Bist du dem gewachsen?</item>
-      <item>Du kannst glücklich sein! Mach das eben fertig!</item>
-      <item>Du wirst dich besser fühlen, wenn es fertig ist! Ich versprech\'s dir.</item>
-      <item>Willst du es nicht heute erledigen?</item>
-      <item>Mach es zu Ende, mir reicht\'s!</item>
-      <item>Kannst du es erledigen? Ja, du kannst!</item>
-      <item>Möchten Sie es erledigen?</item>
-      <item>Fühl dich gut! Pack\'s an!</item>
-      <item>Ich bin stolz auf dich! Mach es endlich fertig!</item>
-      <item>Wie wäre es mit einem kleinen Snack nach getaner Arbeit?</item>
-      <item>Nur diese eine Aufgabe, bitte?</item>
-      <item>Es ist an der Zeit, deine Aufganliste zu verkürzen!</item>
-      <item>Gehörst du zum \"Team Ordnung\" oder zum \"Team Chaos\"? Fang an!</item>
-      <item>Habe ich dir schon gesagt, dass du mich zurzeit beeindruckst? Weiter so!</item>
-      <item>Eine Aufgabe am Tag verhindert das Chaos! Tschüss Chaos!</item>
-      <item>Wie machst du das nur? Ich bin schwer beeindruckt!</item>
-      <item>Du kommst mir nicht mit deinen schönen Aussehen davon! Kümmer dich drum!</item>
-      <item>Gutes Wetter für so einen Job, nicht wahr?</item>
-      <item>Ein Täschen Tee, während du die Aufgabe löst?</item>
-      <item>Wenn du es endlich gemacht hättest, könntest du rausgehen und spielen.</item>
-      <item>Its time. You cant put off the inevitable.</item>
-      <item>Es kränkt mich immer ein bisschen, wenn du mich ignorierst.</item>
-  </string-array>
-
-  <string-array name="postpone_nags">
-      <!-- Astrid\'s nagging when user clicks postpone -->
-      <item>Beweise bitte dass du kein Zauderer bist!</item>
-      <item>Ist Faulenzen nicht langweilig?</item>
-      <item>Irgendwo gibt es jemanden der auf dich wartet!</item>
-      <item>Als du Aufschieben sagtest, meintest du \"Bin gerade dabei\", oder?</item>
-      <item>Das ist aber das letzte Mal, dass du es aufschiebst, oder?</item>
-      <item>Mach\'s einfach heute fertig. Ich verrate es auch niemanden!</item>
-      <item>Was du heute kannst besorgen, dass verschiebe nicht auf morgen!</item>
-      <item>Ich gehe einfach mal davon aus, dass du es am Ende doch erledigen wirst</item>
-      <item>Du bist großartig! Wie wäre es das nicht zu verschieben?</item>
-      <item>Kannst du deine Ziele erreichen, wenn du das tust?</item>
-      <item>Später, später, später. Wann wirst du dich ändern?</item>
-      <item>Genug der Ausreden! Tu es jetzt!</item>
-      <item>Hab ich die Entschuldigung nicht schon letztes mal gehört?</item>
-      <item>Ich kann dir nicht helfen dein Leben zu organisieren, wenn du das tust...</item>
-  </string-array>
+    <!-- Resources for built-in reminders plug-in -->
 
+    <!-- =============================================== task edit activity == -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder group label -->
+    <string name="TEA_reminders_group_label">Erinnerungseinstellungen</string>
 
+    <!-- Task Edit: Reminder header label -->
+    <string name="TEA_reminder_label">Erinnere mich:</string>
 
-  <!-- Resources for built-in repeat plug-in -->
-
-  <!-- repeating plugin name -->
-  <string name="repeat_plugin">Wiederkehrende Aufgaben</string>
-  
-  <!-- repeating plugin description -->
-  <string name="repeat_plugin_desc">Aufgaben erlauben sich zu wiederholen</string>
-  
-  <!-- slide 20a: checkbox for turning on/off repeats -->
-  <string name="repeat_enabled">Wiederholungen</string>
-  
-  <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
-  <string name="repeat_every">Alle %d</string>
-  
-  <!-- hint when opening repeat interval -->
-  <string name="repeat_interval_prompt">Wiederholungsintervall</string>
-  
-  <!-- slide 19b-->
-  <string name="repeat_never">Nicht wiederholen</string>
-  <!-- slide 20f-->
-  <string name="repeat_dont">Nicht wiederholen</string>
-      
-  <string-array name="repeat_interval_short">
-    <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>t</item>
-    <item>w</item>
-    <item>Mo</item>
-    <item>Std</item>
-    <item>Min</item>
-    <item>Jahr</item>
-  </string-array>
-  
-  
-  <string-array name="repeat_interval">
-    <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>Tag(e)</item>
-    <item>Woche(n)</item>
-    <item>Monat(e)</item>
-    <item>Stunde(n)</item>
-    <item>Minute(n)</item>
-    <item>Jahr(e)</item>
-  </string-array>
-  
-  <string name="repeat_days">Tage</string>
-  <string name="repeat_weekdays">Wochentage</string>
-  <string name="repeat_weeks">Wochen</string>
-  <string name="repeat_months">Monate</string>
-  <string name="repeat_years">Jahre</string>
-  <string name="repeat_hours">Stunden</string>
-  <string name="repeat_minutes">Minuten</string>
-  
-  <string-array name="repeat_until_shortcuts">
-      <item>Für immer</item>
-      <item>Bestimmter Tag</item>
-      <item>Heute</item>
-      <item>Morgen</item>
-      <item>(Tag danach)</item>
-      <item>Nächste Woche</item>
-      <item>In zwei Wochen</item>
-      <item>Nächster Monat</item>
-  </string-array>
-  
-  <string name="repeat_until_title">Wiederhole bis...</string>
-  
-  <string name="repeat_keep_going">Weitermachen</string>
-  
-  <string-array name="repeat_type">
-    <!-- slide 20c: repeat type (date to repeat from) -->
-    <item>bei Fälligkeit</item>
-    <!-- slide 20c -->
-    <item>bei Erledigung</item>
-  </string-array>
-  
-  <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
-  <string name="repeat_detail_byday">$D jede $I</string>
-  
-  <!-- task detail for repeat from due date (%s -> interval) -->
-  <string name="repeat_detail_duedate">Jede(n) %s</string>
-
-  <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
-  <string name="repeat_detail_duedate_until">Jede(n) %1$s\nbis %2$s</string>
-  
-  <!-- task detail for repeat from completion date (%s -> interval) -->
-  <string name="repeat_detail_completion">%s nach Abschluss</string>
-  
-  <!-- text for button when repeating task indefinitely -->
-  <string name="repeat_forever">Endlos wiederholen</string>
-
-  <!-- text for button when repeating task until specified date (%s -> date string) -->
-  <string name="repeat_until">Wiederhole bis %s</string>
-  
-  <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title">Aufgabe \"%s\" erneut planen</string>
-
-  <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title_last_time">Sie haben die sich wiederholende Aufgabe \"%s\" erledigt</string>
-      
-  <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->  
-  <string name="repeat_rescheduling_dialog_bubble">%1$s Ich habe die Wiederholungsaufgabe neu terminiert von %2$s auf %3$s</string>
-  
-  <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
-  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s wurde auf %2$s verschoben</string>
-  
-  <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
-  <string name="repeat_rescheduling_dialog_bubble_last_time">Diese Aufgabe wurde bis %1$s wiederholt, jetzt sind Sie fertig. %2$s</string>
-  
-  <string-array name="repeat_encouragement">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>Gute Arbeit!</item>
-      <item>Wow...Ich bin so stolz auf dich!</item>
-      <item>Ich liebe Produktivität!</item>
-      <item>Ist es nicht ein schönes Gefühl, etwas abzuhaken?</item>
-  </string-array>
-
-  <string-array name="repeat_encouragement_last_time">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>Gute Arbeit!</item>
-      <item>Ich bin stolz auf Sie!</item>
-      <item>Es gefällt mir, wenn Sie produktiv sind!</item>
-  </string-array>
-  
+    <!-- Task Edit: Reminder @ deadline -->
+    <string name="TEA_reminder_due">Wenn Aufgabe fällig ist</string>
 
+    <!-- Task Edit: Reminder after deadline -->
+    <string name="TEA_reminder_overdue">Wenn Aufgabe überfällig ist</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder at random times (%s => time plural)-->
+    <string name="TEA_reminder_randomly">Einmal zufällig</string>
 
-    
-  <!-- Subtasks Help Introduction -->
-  <string name="subtasks_help_title">Sortieren und einrücken in Astrid</string>
-  <string name="subtasks_help_1">Drücken und halten, um Aufgabe zu verschieben</string>
-  <string name="subtasks_help_2">Sortieren ändern durch Ziehen nach oben oder unten</string>
-  <string name="subtasks_help_3">Zum Einrücken waagerecht ziehen</string>
-    
+    <!-- Task Edit: Reminder alarm clock label -->
+    <string name="TEA_reminder_alarm_label">Klingeln/Vibrieren Typ:</string>
 
+    <!--  slide 45a: Task Edit: Reminder mode: ring once -->
+    <string name="TEA_reminder_mode_once">Einmal</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 45b: Task Edit: Reminder mode: ring five times -->
+    <string name="TEA_reminder_mode_five">Fünfmal</string>
+
+    <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
+    <string name="TEA_reminder_mode_nonstop">Bis ich den Alarm abschalte</string>
+
+    <string name="TEA_reminder_when">when</string>
+
+    <string name="TEA_reminder_due_short">fällig</string>
+
+    <string name="TEA_reminder_overdue_short">überfällig</string>
+
+    <string name="TEA_reminder_randomly_short">zufällig</string>
+
+    <string name="TEA_reminder_display_one">Erinnere mich %s</string>
+
+    <string name="TEA_reminder_display_multiple">Erinnern %s</string>
+
+    <string-array name="TEA_reminder_random">
+        <!-- random reminder choices for task edit page. -->
+        <item>einer Stunde</item>
+        <item>einem Tag</item>
+        <item>einer Woche</item>
+        <item>2 Wochen</item>
+        <item>einem Monat</item>
+        <item>in 2 Monaten</item>
+    </string-array>
+
+    <!-- ==================================================== notifications == -->
+
+    <!-- Name of filter when viewing a reminder -->
+    <string name="rmd_NoA_filter">Erinnerung!</string>
+
+    <!-- Reminder: Task was already done -->
+    <string name="rmd_NoA_done">Abgeschlossen</string>
+
+    <!-- Reminder: Snooze button (remind again later) -->
+    <string name="rmd_NoA_snooze">Schlummern</string>
+
+    <!-- Reminder: Completed Toast -->
+    <string name="rmd_NoA_completed_toast">Herzlichen Glückwunsch zum Abschluss!</string>
+
+    <!-- Prefix for reminder dialog title -->
+    <string name="rmd_NoA_dlg_title">Erinnerung:</string>
+
+    <!-- ==================================================== user reengagement == -->
+
+    <!-- Titles for user reengagement notifications -->
+    <string-array name="rmd_reengage_notif_titles">
+        <item>Eine Mitteilung von Astrid</item>
+        <!-- %s -> first name -->
+        <item>Notiz für %s.</item>
+        <item>Ihre Astrid-Übersicht</item>
+        <item>Erinnerungen von Astrid</item>
+    </string-array>
+
+    <string name="rmd_reengage_name_default">Sie</string>
+
+
+    <string name="rmd_reengage_add_tasks">Aufgabe hinzufügen</string>
+
+    <!-- Speech bubble options for astrid in reengagement notifs -->
+    <string-array name="rmd_reengage_dialog_options">
+        <item>Zeit, Ihre Todo-Liste zu verkürzen!</item>
+        <item>Sehr geehrte Damen und Herren, einige Aufgaben warten zur Durchsicht!</item>
+        <item>Hallo, könnten Sie sich das bitte ansehen?</item>
+        <item>Ich haben einige Aufgaben, die Ihnen zugewiesen wurden!</item>
+        <item>Ein neuer Stapel Aufgaben für Sie!</item>
+        <item>Sie sehen großartig aus! Können wir loslegen?</item>
+        <item>Heute ist ein wunderbarer Tag um ein paar Dinge fertig zu bekommen!</item>
+    </string-array>
+
+    <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>Möchten Sie Ihre Aufgaben nicht besser organisieren?</item>
+        <item>Ich bin Astrid! Meine Aufgabe ist es, Sie bei Ihren Aufgaben zu unterstützen!</item>
+        <item>Sie sehen beschäftigt aus, kann ich Ihnen diese Aufgaben abnehmen?</item>
+        <item>Ich kann Sie bei Ihrer gesamten Aufgabenplanung unterstützen.</item>
+        <item>Wollen Sie mehr schaffen? Ich auch!</item>
+        <item>Sehr erfreut, Sie kennenzulernen!</item>
+    </string-array>
+    <!-- ============================================= reminder preferences == -->
+
+    <!-- slide 33d: Reminder Preference Screen Title -->
+    <string name="rmd_EPr_alerts_header">Erinnerungseinstellungen</string>
+    <string name="rmd_EPr_alerts_summary">Ruhezeiten, Snooze Einstellungen, Hartnäckigkeit</string>
+
+    <!-- Reminder Preference: Reminders Enabled Title -->
+    <string name="rmd_EPr_enabled_title">Erinnerungen aktiviert?</string>
+    <!-- Reminder Preference Reminders Enabled Description (true) -->
+    <string name="rmd_EPr_enabled_desc_true">Astrids Erinnerung sind aktiviert (Standard)</string>
+    <!-- Reminder Preference Reminders Enabled Description (false) -->
+    <string name="rmd_EPr_enabled_desc_false">Astrid wird keine Erinnerungen auf deinem Telefon
+        anzeigen
+    </string>
+
+    <!-- Reminder Preference: Quiet Hours Start Title -->
+    <string name="rmd_EPr_quiet_hours_start_title">Stille Stunden beginnen.</string>
+    <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_start_desc">Benachrichtigungen sind lautlos nach %s.\nHinweis:
+        Vibrieren wird durch Einstellungen weiter unten gesteuert!
+    </string>
+    <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
+    <string name="rmd_EPr_quiet_hours_desc_none">Stille Stunden sind deaktiviert</string>
+
+    <!-- Reminder Preference: Quiet Hours End Title -->
+    <string name="rmd_EPr_quiet_hours_end_title">Stille Stunden beenden</string>
+    <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_end_desc">Benachrichtigungen werden nicht mehr lautlos sein ab
+        %s
+    </string>
+
+    <!-- Reminder Preference: Default Reminder Title -->
+    <string name="rmd_EPr_rmd_time_title">Standarderinnerumg</string>
+    <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
+    <string name="rmd_EPr_rmd_time_desc">Benachrichtigungen für Aufgaben ohne Fälligkeit werden um
+        %s angezeigt
+    </string>
+
+    <!-- Reminder Preference: Notification Ringtone Title -->
+    <string name="rmd_EPr_ringtone_title">Erinnerungsklingelton</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
+    <string name="rmd_EPr_ringtone_desc_custom">Eigener Klingelton eingestellt</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
+    <string name="rmd_EPr_ringtone_desc_silent">Klingelton auf Lautlos eingestellt</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
+    <string name="rmd_EPr_ringtone_desc_default">Standardklingelton wird benutzt</string>
+
+    <!-- Reminder Preference: Notification Persistence Title -->
+    <string name="rmd_EPr_persistent_title">Meldungsbeharrlichkeit</string>
+    <!-- Reminder Preference: Notification Persistence Description (true) -->
+    <string name="rmd_EPr_persistent_desc_true">Benachrichtigungen müssen einzeln angesehen werden
+        um sie zu löschen
+    </string>
+    <!-- Reminder Preference: Notification Persistence Description (false) -->
+    <string name="rmd_EPr_persistent_desc_false">Erinnerungen können mit dem \"Alle Löschen\" Button
+        gelöscht werden
+    </string>
+
+    <!-- Reminder Preference: Social Reminders Title -->
+    <string name="rmd_EPr_social_title">Soziale Förderung</string>
+    <!-- Reminder Preference: Social Reminders Summary (enabled) -->
+    <string name="rmd_EPr_social_summary_enabled">Die Erinnerung wird Zeigen, wer auf Dich bei
+        geteilten Aufgaben zählt.
+    </string>
+    <!-- Reminder Preference: Social Reminders Summary (disabled) -->
+    <string name="rmd_EPr_social_summary_disabled">Die Erinnerung wird nicht Zeigen, wer auf Dich
+        bei geteilten Aufgaben zählt.
+    </string>
+
+
+    <!-- Reminder Preference: Notification Icon Title -->
+    <!-- Reminder Preference: Notification Icon Description -->
+
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
+    <string name="rmd_EPr_multiple_maxvolume_title">Maximale Lautstärke für mehrfachläutende
+        Erinnerungen
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid wird die Lautstärke für
+        mehrfachläutende Erinnerungen maximalisieren
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid wird die Systemeinstellungen für die
+        Lautstärke benutzen
+    </string>
+
+    <!-- Reminder Preference: Vibrate Title -->
+    <string name="rmd_EPr_vibrate_title">Vibrieren beim Alarm</string>
+    <!-- Reminder Preference: Vibrate Description (true) -->
+    <string name="rmd_EPr_vibrate_desc_true">Astrid wird beim Senden von Benachrichtigungen
+        vibrieren
+    </string>
+    <!-- Reminder Preference: Vibrate Description (false) -->
+    <string name="rmd_EPr_vibrate_desc_false">Astrid wird beim Senden von Erinnerungen nicht
+        vibrieren
+    </string>
+
+    <!-- Reminder Preference: Nagging Title -->
+    <string name="rmd_EPr_nagging_title">Astrid Ermutigungen</string>
+    <!-- Reminder Preference: Nagging Description (true) -->
+    <string name="rmd_EPr_nagging_desc_true">Astrid wird Ermutigungen zu den Erinnerungen
+        hinzufügen
+    </string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_nagging_desc_false">Astrid wird keine Ermutigungen hinzufügen</string>
+
+    <!-- Reminder Preference: Snooze Dialog Title -->
+    <string name="rmd_EPr_snooze_dialog_title">Schlummer-Dialog HH:MM</string>
+    <!-- Reminder Preference: Snooze Dialog Description (true) -->
+    <string name="rmd_EPr_snooze_dialog_desc_true">Schlummerfunktion durch Auswahl neuer Zeit
+        (HH:MM) aktivieren
+    </string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_snooze_dialog_desc_false">Schlummern durch Auswahl von # Tagen/Stunden
+    </string>
+
+    <!-- slide 44g: Reminder Preference: Default Reminders Title -->
+    <string name="rmd_EPr_defaultRemind_title">Zufällige Erinnerungen</string>
+    <!-- Reminder Preference: Default Reminders Setting (disabled) -->
+    <string name="rmd_EPr_defaultRemind_desc_disabled">Aufgaben sollen keine zufälligen Erinnerungen
+        haben
+    </string>
+    <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
+    <string name="rmd_EPr_defaultRemind_desc">Neue Aufgaben werden zufällig erinnern: %s</string>
+
+    <!-- slide 39a: Defaults Title -->
+
+    <string-array name="EPr_reminder_random">
+        <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
+        <item>deaktiviert</item>
+        <!-- slide 44b -->
+        <item>stündlich</item>
+        <!-- slide 44c -->
+        <item>täglich</item>
+        <!-- slide 44d-->
+        <item>wöchentlich</item>
+        <!-- slide 44e-->
+        <item>vierzehntägig</item>
+        <!-- slide 44f -->
+        <item>monatlich</item>
+        <item>alle zwei Monate</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_start">
+        <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
+        <item>deaktiviert</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>00:00</item>
+        <item>01:00</item>
+        <item>02:00</item>
+        <item>03:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_end">
+        <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>00:00</item>
+        <item>01:00</item>
+        <item>02:00</item>
+        <item>03:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+    </string-array>
+
+    <string-array name="EPr_rmd_time">
+        <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>00:00</item>
+        <item>01:00</item>
+        <item>02:00</item>
+        <item>03:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+    </string-array>
+
+    <!-- =============================================== random reminders == -->
+
+    <string name="reminders_social_one">%s zählt auf dich!</string>
+
+    <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
+
+    <string-array name="reminders">
+        <!-- reminders: Make these < 20 chars so the task name is displayed -->
+        <item>Haste \'ne Sekunde?</item>
+        <item>Kann ich dich für ne Sekunde sehen?</item>
+        <item>Haste \'ne Minute?</item>
+        <item>Hast du vergessen?</item>
+        <item>Entschuldigung!</item>
+        <item>Wenn du Zeit hast:</item>
+        <item>Was noch zu tun ist:</item>
+        <item>Hast du einen Moment?</item>
+        <item>Astrid ist hier!</item>
+        <item>Hi! Darf ich kurz stören?</item>
+        <item>Eine Minute deiner Zeit!?</item>
+        <item>Heute ist ein toller Tag für:</item>
+    </string-array>
+
+    <string-array name="reminders_due">
+        <!-- reminders related to task due date -->
+        <item>Arbeite:</item>
+        <item>Fälligkeit ist hier!</item>
+        <item>Bereit zum Anfangen?</item>
+        <item>Du sagtest, du willst:</item>
+        <item>Du solltest anfangen mit:</item>
+        <item>Es ist Zeit für:</item>
+        <item>Es ist soweit:</item>
+        <item>Entschuldige mich! Zeit für</item>
+        <item>Hast du frei? Zeit für</item>
+    </string-array>
+
+    <string-array name="reminders_snooze">
+        <!-- reminders related to snooze -->
+        <item>Sei nicht so faul!</item>
+        <item>Die Schlummerzeit ist vorbei!</item>
+        <item>Nicht mehr schlummern!</item>
+        <item>Jetzt bist du bereit?</item>
+        <item>Kein weiteres Aufschieben mehr!</item>
+    </string-array>
+
+    <string-array name="reminder_responses">
+        <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
+        <item>Ich hab was für dich!</item>
+        <item>Bereit die Sache abzuhaken?</item>
+        <item>Warum erledigst du das nicht endlich?</item>
+        <item>Wie sieht\'s hiermit aus? Fertig, Tiger?</item>
+        <item>Bist du bereit für diesen Job?</item>
+        <item>Bist du dem gewachsen?</item>
+        <item>Du kannst glücklich sein! Mach das eben fertig!</item>
+        <item>Du wirst dich besser fühlen, wenn es fertig ist! Ich versprech\'s dir.</item>
+        <item>Willst du es nicht heute erledigen?</item>
+        <item>Mach es zu Ende, mir reicht\'s!</item>
+        <item>Kannst du es erledigen? Ja, du kannst!</item>
+        <item>Möchten Sie es erledigen?</item>
+        <item>Fühl dich gut! Pack\'s an!</item>
+        <item>Ich bin stolz auf dich! Mach es endlich fertig!</item>
+        <item>Wie wäre es mit einem kleinen Snack nach getaner Arbeit?</item>
+        <item>Nur diese eine Aufgabe, bitte?</item>
+        <item>Es ist an der Zeit, deine Aufganliste zu verkürzen!</item>
+        <item>Gehörst du zum \"Team Ordnung\" oder zum \"Team Chaos\"? Fang an!</item>
+        <item>Habe ich dir schon gesagt, dass du mich zurzeit beeindruckst? Weiter so!</item>
+        <item>Eine Aufgabe am Tag verhindert das Chaos! Tschüss Chaos!</item>
+        <item>Wie machst du das nur? Ich bin schwer beeindruckt!</item>
+        <item>Du kommst mir nicht mit deinen schönen Aussehen davon! Kümmer dich drum!</item>
+        <item>Gutes Wetter für so einen Job, nicht wahr?</item>
+        <item>Ein Täschen Tee, während du die Aufgabe löst?</item>
+        <item>Wenn du es endlich gemacht hättest, könntest du rausgehen und spielen.</item>
+        <item>Its time. You cant put off the inevitable.</item>
+        <item>Es kränkt mich immer ein bisschen, wenn du mich ignorierst.</item>
+    </string-array>
+
+    <string-array name="postpone_nags">
+        <!-- Astrid\'s nagging when user clicks postpone -->
+        <item>Beweise bitte dass du kein Zauderer bist!</item>
+        <item>Ist Faulenzen nicht langweilig?</item>
+        <item>Irgendwo gibt es jemanden der auf dich wartet!</item>
+        <item>Als du Aufschieben sagtest, meintest du \"Bin gerade dabei\", oder?</item>
+        <item>Das ist aber das letzte Mal, dass du es aufschiebst, oder?</item>
+        <item>Mach\'s einfach heute fertig. Ich verrate es auch niemanden!</item>
+        <item>Was du heute kannst besorgen, dass verschiebe nicht auf morgen!</item>
+        <item>Ich gehe einfach mal davon aus, dass du es am Ende doch erledigen wirst</item>
+        <item>Du bist großartig! Wie wäre es das nicht zu verschieben?</item>
+        <item>Kannst du deine Ziele erreichen, wenn du das tust?</item>
+        <item>Später, später, später. Wann wirst du dich ändern?</item>
+        <item>Genug der Ausreden! Tu es jetzt!</item>
+        <item>Hab ich die Entschuldigung nicht schon letztes mal gehört?</item>
+        <item>Ich kann dir nicht helfen dein Leben zu organisieren, wenn du das tust...</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in repeat plug-in -->
+
+    <!-- repeating plugin name -->
+    <string name="repeat_plugin">Wiederkehrende Aufgaben</string>
+
+    <!-- repeating plugin description -->
+    <string name="repeat_plugin_desc">Aufgaben erlauben sich zu wiederholen</string>
+
+    <!-- slide 20a: checkbox for turning on/off repeats -->
+    <string name="repeat_enabled">Wiederholungen</string>
+
+    <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
+    <string name="repeat_every">Alle %d</string>
+
+    <!-- hint when opening repeat interval -->
+    <string name="repeat_interval_prompt">Wiederholungsintervall</string>
+
+    <!-- slide 19b-->
+    <string name="repeat_never">Nicht wiederholen</string>
+    <!-- slide 20f-->
+    <string name="repeat_dont">Nicht wiederholen</string>
+
+    <string-array name="repeat_interval_short">
+        <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>t</item>
+        <item>w</item>
+        <item>Mo</item>
+        <item>Std</item>
+        <item>Min</item>
+        <item>Jahr</item>
+    </string-array>
+
+
+    <string-array name="repeat_interval">
+        <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>Tag(e)</item>
+        <item>Woche(n)</item>
+        <item>Monat(e)</item>
+        <item>Stunde(n)</item>
+        <item>Minute(n)</item>
+        <item>Jahr(e)</item>
+    </string-array>
+
+    <string name="repeat_days">Tage</string>
+    <string name="repeat_weekdays">Wochentage</string>
+    <string name="repeat_weeks">Wochen</string>
+    <string name="repeat_months">Monate</string>
+    <string name="repeat_years">Jahre</string>
+    <string name="repeat_hours">Stunden</string>
+    <string name="repeat_minutes">Minuten</string>
+
+    <string-array name="repeat_until_shortcuts">
+        <item>Für immer</item>
+        <item>Bestimmter Tag</item>
+        <item>Heute</item>
+        <item>Morgen</item>
+        <item>(Tag danach)</item>
+        <item>Nächste Woche</item>
+        <item>In zwei Wochen</item>
+        <item>Nächster Monat</item>
+    </string-array>
+
+    <string name="repeat_until_title">Wiederhole bis...</string>
+
+    <string name="repeat_keep_going">Weitermachen</string>
+
+    <string-array name="repeat_type">
+        <!-- slide 20c: repeat type (date to repeat from) -->
+        <item>bei Fälligkeit</item>
+        <!-- slide 20c -->
+        <item>bei Erledigung</item>
+    </string-array>
+
+    <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
+    <string name="repeat_detail_byday">$D jede $I</string>
+
+    <!-- task detail for repeat from due date (%s -> interval) -->
+    <string name="repeat_detail_duedate">Jede(n) %s</string>
+
+    <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
+    <string name="repeat_detail_duedate_until">Jede(n) %1$s\nbis %2$s</string>
+
+    <!-- task detail for repeat from completion date (%s -> interval) -->
+    <string name="repeat_detail_completion">%s nach Abschluss</string>
+
+    <!-- text for button when repeating task indefinitely -->
+    <string name="repeat_forever">Endlos wiederholen</string>
+
+    <!-- text for button when repeating task until specified date (%s -> date string) -->
+    <string name="repeat_until">Wiederhole bis %s</string>
+
+    <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title">Aufgabe \"%s\" erneut planen</string>
+
+    <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title_last_time">Sie haben die sich wiederholende
+        Aufgabe \"%s\" erledigt
+    </string>
+
+    <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->
+    <string name="repeat_rescheduling_dialog_bubble">%1$s Ich habe die Wiederholungsaufgabe neu
+        terminiert von %2$s auf %3$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
+    <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s wurde auf %2$s verschoben</string>
+
+    <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
+    <string name="repeat_rescheduling_dialog_bubble_last_time">Diese Aufgabe wurde bis %1$s
+        wiederholt, jetzt sind Sie fertig. %2$s
+    </string>
+
+    <string-array name="repeat_encouragement">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>Gute Arbeit!</item>
+        <item>Wow...Ich bin so stolz auf dich!</item>
+        <item>Ich liebe Produktivität!</item>
+        <item>Ist es nicht ein schönes Gefühl, etwas abzuhaken?</item>
+    </string-array>
+
+    <string-array name="repeat_encouragement_last_time">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>Gute Arbeit!</item>
+        <item>Ich bin stolz auf Sie!</item>
+        <item>Es gefällt mir, wenn Sie produktiv sind!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Subtasks Help Introduction -->
+    <string name="subtasks_help_title">Sortieren und einrücken in Astrid</string>
+    <string name="subtasks_help_1">Drücken und halten, um Aufgabe zu verschieben</string>
+    <string name="subtasks_help_2">Sortieren ändern durch Ziehen nach oben oder unten</string>
+    <string name="subtasks_help_3">Zum Einrücken waagerecht ziehen</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-
-  <!-- Tags label -->
-  <string name="TEA_tags_label">Listen</string>
-  
-  <!-- Tags label long version -->
-  <string name="TEA_tags_label_long">Zur Liste hinzufügen</string>
- 
-  <!-- Tags hint -->
-  <string name="TEA_tag_hint">Wähle eine Liste</string>
-  
-  <!-- Tags dropdown -->
-    
-  <!-- =============================================== Task List Controls == -->
-  
-  <!-- menu item for tags -->
-  
-  <!-- ========================================================== Extras == -->
-  
-  <!-- Context Item: show tag -->
-  
-  <!-- slide 25a: Dialog: new list -->
-  <string name="tag_new_list">Neue Liste</string>
-  
-  <!-- Dialog: list saved -->
-  
-  <!-- Dialog: task created without title -->
-  <string name="tag_no_title_error">Bitte gib zuerst einen Namen für die Liste ein!</string>
-  
-  <!-- ========================================================== Filters == -->
-  
-  <!-- filter button to add tag -->
-  <string name="tag_FEx_add_new">Neu</string>
-  
-  <!-- filter header for tags -->
-  <string name="tag_FEx_header">Listen</string>
-  
-  <!-- filter header for tags user created -->
-  
-  <!-- filter header for tags, shared with user -->
-  
-  <!-- filter header for tags which have no active tasks -->
-  
-  <!-- slide 10d: filter for untagged tasks -->
-  <string name="tag_FEx_untagged">Nicht kategorisiert</string>
-  
-  <!-- slide 27a: %s => tag name -->
-
-  <!-- context menu option to rename a tag -->
-  <string name="tag_cm_rename">Liste umbenennen</string>
-
-  <!-- context menu option to delete a tag -->
-  <string name="tag_cm_delete">Liste löschen</string>
-  
-  <!-- context menu option to leave a shared list -->
-  <string name="tag_cm_leave">Liste verlassen</string>
-
-  <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
-  <string name="DLG_delete_this_tag_question">Diese Liste löschen: %s ? (Es werden keine Aufgaben werden gelöscht.)</string>
-  
-  <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
-  <string name="DLG_leave_this_shared_tag_question">Geteilte Liste \"%s\" verlassen? (Aufgaben werden nicht gelöscht)</string>
-
-  <!-- Dialog to rename tag -->
-  <string name="DLG_rename_this_tag_header">Die Liste %s umbnennen nach:</string>
-
-  <!-- Toast notification that no changes have been made -->
-  <string name="TEA_no_tags_modified">Es gibt keine Änderungen</string>
-
-  <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_deleted">Löschen der Liste %1$s beeinflusste %2$d Aufgaben</string>
-  
-  <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_left">Sie haben die geteilte Liste %1$s verlassen (betrifft %2$d Aufgaben)</string>
-
-  <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
-  <string name="TEA_tags_renamed">%1$s umbennant nach %2$s für %3$d Aufgaben</string>
-  
-  <!-- Tag case migration -->
-  <string name="tag_case_migration_notice">Ich habe festgestellt, dass du änhliche Listen mit leicht unterschiedlichen Schreibweisen angelegt hast. Du hast sicherlich die gleiche Liste gemeint, daher habe ich sie zusammenführt. Keine Angst, deine Listen habe ich erhalten (z. B. Einkauf_1, Einkauf_2). Fallls du keine automatische Zusammenfassung wünschst, lösche die zusammengefügte neue Liste einfach.</string>
-  
-  <!-- Header for tag settings -->
-  <string name="tag_settings_title">Listeneinstellungen</string>
-  
-  <!-- Header for tag activity -->
-  <string name="tag_updates_title">Aktivität: %s</string>
-  
-  <!-- Delete button for tag settings -->
-  <string name="tag_delete_button">Liste löschen</string>
-  
-  <!-- slide 28d: Leave button for tag settings -->
-  <string name="tag_leave_button">Diese Liste verlassen</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Tags label -->
+    <string name="TEA_tags_label">Listen</string>
 
+    <!-- Tags label long version -->
+    <string name="TEA_tags_label_long">Zur Liste hinzufügen</string>
+
+    <!-- Tags hint -->
+    <string name="TEA_tag_hint">Wähle eine Liste</string>
+
+    <!-- Tags dropdown -->
+
+    <!-- =============================================== Task List Controls == -->
+
+    <!-- menu item for tags -->
+
+    <!-- ========================================================== Extras == -->
+
+    <!-- Context Item: show tag -->
+
+    <!-- slide 25a: Dialog: new list -->
+    <string name="tag_new_list">Neue Liste</string>
+
+    <!-- Dialog: list saved -->
+
+    <!-- Dialog: task created without title -->
+    <string name="tag_no_title_error">Bitte gib zuerst einen Namen für die Liste ein!</string>
+
+    <!-- ========================================================== Filters == -->
+
+    <!-- filter button to add tag -->
+    <string name="tag_FEx_add_new">Neu</string>
+
+    <!-- filter header for tags -->
+    <string name="tag_FEx_header">Listen</string>
+
+    <!-- filter header for tags user created -->
+
+    <!-- filter header for tags, shared with user -->
+
+    <!-- filter header for tags which have no active tasks -->
+
+    <!-- slide 10d: filter for untagged tasks -->
+    <string name="tag_FEx_untagged">Nicht kategorisiert</string>
+
+    <!-- slide 27a: %s => tag name -->
+
+    <!-- context menu option to rename a tag -->
+    <string name="tag_cm_rename">Liste umbenennen</string>
+
+    <!-- context menu option to delete a tag -->
+    <string name="tag_cm_delete">Liste löschen</string>
+
+    <!-- context menu option to leave a shared list -->
+    <string name="tag_cm_leave">Liste verlassen</string>
+
+    <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
+    <string name="DLG_delete_this_tag_question">Diese Liste löschen: %s ? (Es werden keine Aufgaben
+        werden gelöscht.)
+    </string>
+
+    <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
+    <string name="DLG_leave_this_shared_tag_question">Geteilte Liste \"%s\" verlassen? (Aufgaben
+        werden nicht gelöscht)
+    </string>
+
+    <!-- Dialog to rename tag -->
+    <string name="DLG_rename_this_tag_header">Die Liste %s umbnennen nach:</string>
+
+    <!-- Toast notification that no changes have been made -->
+    <string name="TEA_no_tags_modified">Es gibt keine Änderungen</string>
+
+    <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_deleted">Löschen der Liste %1$s beeinflusste %2$d Aufgaben</string>
+
+    <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_left">Sie haben die geteilte Liste %1$s verlassen (betrifft %2$d
+        Aufgaben)
+    </string>
+
+    <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
+    <string name="TEA_tags_renamed">%1$s umbennant nach %2$s für %3$d Aufgaben</string>
+
+    <!-- Tag case migration -->
+    <string name="tag_case_migration_notice">Ich habe festgestellt, dass du änhliche Listen mit
+        leicht unterschiedlichen Schreibweisen angelegt hast. Du hast sicherlich die gleiche Liste
+        gemeint, daher habe ich sie zusammenführt. Keine Angst, deine Listen habe ich erhalten (z.
+        B. Einkauf_1, Einkauf_2). Fallls du keine automatische Zusammenfassung wünschst, lösche die
+        zusammengefügte neue Liste einfach.
+    </string>
+
+    <!-- Header for tag settings -->
+    <string name="tag_settings_title">Listeneinstellungen</string>
+
+    <!-- Header for tag activity -->
+    <string name="tag_updates_title">Aktivität: %s</string>
+
+    <!-- Delete button for tag settings -->
+    <string name="tag_delete_button">Liste löschen</string>
+
+    <!-- slide 28d: Leave button for tag settings -->
+    <string name="tag_leave_button">Diese Liste verlassen</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in timers plug-in -->
-    
+
     <!-- Task List: Start Timer button -->
-    
+
     <!-- Task List: Stop Timer button -->
-    
+
     <!-- Android Notification Title (%s => # tasks) -->
     <string name="TPl_notification">Timer ist aktiv für %s!</string>
-    
+
     <!-- Filter Header for Timer plugin -->
-    
+
     <!-- Filter for Timed Tasks -->
     <string name="TFE_workingOn">Zeitlich festgelegte Aufgaben</string>
-    
+
     <!-- Title for TEA -->
     <string name="TEA_timer_controls">Timer</string>
-    
-    
+
+
     <!-- Edit Notes: create comment for when timer is started -->
     <string name="TEA_timer_comment_started">Aufgabe begonnen:</string>
-    
+
     <!-- Edit Notes: create comment for when timer is stopped -->
     <string name="TEA_timer_comment_stopped">Bearbeitung abgebrochen:</string>
-    
+
     <!-- Edit Notes: comment to notify how long was spent on task -->
     <string name="TEA_timer_comment_spent">Benötigte Zeit:</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Update string from activity codes %1$s - user, %2$s - target name, %3$s - message, %4$s - other_user-->
-    
+
     <!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
     Please do not translate this part of the string. -->
-    
+
     <!-- These are still in use -->
     <string name="update_string_default_comment">%1$s hat kommentiert: %3$s</string>
     <string name="update_string_task_comment">%1$s in $link_task: %3$s</string>
     <string name="update_string_tag_comment">%1$s in %2$s: %3$s</string>
     <string name="update_string_user_self">Sie</string>
-    
+
     <string name="history_yourself">Du selbst</string>
     <string name="history_you">Sie</string>
     <string name="history_a_deleted_user">(Ein gelöschter Nutzer)</string>
-    
+
     <string name="history_this_list">diese Liste</string>
     <string name="history_this_task">diese Aufgabe</string>
     <string name="history_tag_added">füge %1$s zu %2$s hinzu</string>
@@ -2977,9 +3284,12 @@ Sind Sie sicher, dass Sie mit Astrid.com synchronisieren möchten?</string>
     <string name="history_favorited">favorited %s</string>
     <string name="history_unfavorited">unfavorited %s</string>
     <string name="history_changed_list_picture">Listenbild ändern</string>
-    <string name="history_added_description_characters">added %1$d characters to %2$s description</string>
+    <string name="history_added_description_characters">added %1$d characters to %2$s description
+    </string>
     <string name="history_removed_description">removed %s description</string>
-    <string name="history_removed_description_characters">removed %1$d characters from %2$s description</string>
+    <string name="history_removed_description_characters">removed %1$d characters from %2$s
+        description
+    </string>
     <string name="history_updated_description">%s Beschreibung aktualisiert</string>
     <string name="history_changed_list_owner">hat den Eigentümer der Liste auf %s geändert</string>
     <string name="history_created_this_list">hat diese Liste erstellt</string>
@@ -2989,7 +3299,8 @@ Sind Sie sicher, dass Sie mit Astrid.com synchronisieren möchten?</string>
     <string name="history_created_for">created %1$s for %2$s</string>
     <string name="history_created">created %s</string>
     <string name="history_changed_due_date">changed %1$s due date from %2$s to %3$s</string>
-    <string name="history_set_due_date">haben/hat das Fälligkeitsdatum von %1$s auf %2$s gesetzt.</string>
+    <string name="history_set_due_date">haben/hat das Fälligkeitsdatum von %1$s auf %2$s gesetzt.
+    </string>
     <string name="history_removed_due_date">removed %s due date</string>
     <string name="history_completed_repeating_task">completed %1$s (now due on %2$s)</string>
     <string name="history_added_user">%1$s wurde zu %2$s hinzugefügt</string>
@@ -3002,195 +3313,230 @@ Sind Sie sicher, dass Sie mit Astrid.com synchronisieren möchten?</string>
     <string name="history_repeat_on">am %s</string>
     <string name="history_repeat_from_completion">nach abschluss</string>
     <string name="history_acknowledged">viewed %s</string>
-    
-    <string name="history_default">changed %1$s to %2$s</string>
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-    
-  <!-- Voice Add Prompt Text -->
-  <string name="voice_create_prompt">Sprechen Sie, um eine Aufgabe anzulegen</string>
-  <string name="voice_edit_title_prompt">Sprechen Sie, um einen Auftragsnamen zu vergeben</string>
-  <string name="voice_edit_note_prompt">Sprechen Sie, um Aufgabennotizen zu setzen</string>
-    
-  <!-- Preference: Task List recognition-service is not installed, but available -->
-  <string name="EPr_voiceInputInstall_dlg">Spracheingabe ist nicht installiert.\nWollen Sie in den Markt wechseln und das nachholen?</string>
-  <!-- Preference: Task List recognition-service is not available for this system -->
-  <string name="EPr_voiceInputUnavailable_dlg">Leider ist Spracheingabe für Ihr System nicht verfügbar.\nWenn möglich, aktualisieren Sie bitte auf Android 2.1 oder höher.</string>
-  <!-- Preference: Market is not available for this system -->
-  <string name="EPr_marketUnavailable_dlg">Leider ist der Marktplatz für Ihr System nicht verfügbar.\nWenn möglich, laden Sie die sprachgestützte Suchfunktion bitte aus einer anderen Quelle herunter.</string>
-  <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
-  <string name="EPr_voiceInputEnabled_title">Spracheingabe aktivieren</string>
-  <!-- slide 38a: Preference: voice button description (true) -->
-  <string name="EPr_voiceInputEnabled_desc_enabled">Mikrofon-Button wird angezeigt</string>
-  <!-- Preference: voice button description (false) -->
-  <string name="EPr_voiceInputEnabled_desc_disabled">Mikrofon-Button wird ausgeblendet</string>
-  <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
-  <string name="EPr_voiceInputCreatesTask_title">Aufgaben direkt erzeugen</string>
-  <!-- Preference: Task List Voice-creation description (true) -->
-  <string name="EPr_voiceInputCreatesTask_desc_enabled">Aufgaben werden direkt aus Spracheingaben erzeugt</string>
-  <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
-  <string name="EPr_voiceInputCreatesTask_desc_disabled">Sie können die Aufgabentitel nach der Spracheingabe ändern</string>
-  <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
-  <string name="EPr_voiceRemindersEnabled_title">Sprach-Erinnerungen</string>
-  <!-- Preference: Voice reminders description (true) -->
-  <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid wird Aufgabennamen bei der Erinnerung aussprechen</string>
-  <!-- slide 38c: Preference: Voice reminders description (false) -->
-  <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid wird bei der Erinnerung einen Klingelton abspielen</string>    
-  
-  <!-- slide 32d: Preference Category: Voice Title -->
-  <string name="EPr_voice_header">Sprachfunktionen</string>
-    
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-  
-  <!-- slide 30a-->
-  <string name="welcome_setting">Tutorial anzeigen</string>
-  
-  <string name="welcome_title_1">Willkommen zu Astrid</string>
-
-  <!-- slide 2a -->
-  <string name="welcome_title_2">Erstelle Listen</string>
-
-  <!-- slide 3a-->
-  <string name="welcome_title_3">Zwischen Listen wechseln</string>
-
-  <!-- slide 4a -->
-  <string name="welcome_title_4">Teile Listen</string>
-
-  <!-- slide 5a -->
-  <string name="welcome_title_5">Verteile Aufgaben</string>
-
-  <!-- slide 6a -->
-  <string name="welcome_title_6">Details angeben</string>
 
-  <!-- slide 7a -->
-  <string name="welcome_title_7">Jetzt verbinden\num anzufangen!</string>
-  
-  <string name="welcome_title_7_return">Fertig!</string>
-  
-  <!-- slide 1b -->
-  <string name="welcome_body_1">Die perfekte Aufgabenverwaltung - \nperfekt für die Zusammenarbeit mit anderen geeignet</string>
-
-  <!-- slide 2b-->
-  <string name="welcome_body_2">In Listen erfassen: \nzu lesen, zu sehen, zu kaufen, zu besuchen!</string>
-
-  <!-- slide 3b -->
-  <string name="welcome_body_3">Teilen Sie Listen mit\nFreunden, Mitbewohnern\noder Ihrem Partner!</string>
-
-  <!-- slide 4b -->
-  <string name="welcome_body_4">Listen freigeben für\nFreunde, Haushaltshilfen\noder deine/deinen Liebsten!</string>
-
-  <!-- slide 5b -->
-  <string name="welcome_body_5">and much more!</string>
+    <string name="history_default">changed %1$s to %2$s</string>
 
-  <!-- slide 6b-->
-  <string name="welcome_body_6">Zum Hinzufügen von Notizen anklicken\nErinnerungen einstellen\nund vieles mehr!</string>
-  <string name="welcome_body_7">Anmelden</string>
-  
-  <string name="welcome_body_7_return">Berühren Sie Astrid\num zurückzukehren.</string>
-  
-  <!-- slide 1c -->
-  <string name="welcome_next">Weiter</string>
-  
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Voice Add Prompt Text -->
+    <string name="voice_create_prompt">Sprechen Sie, um eine Aufgabe anzulegen</string>
+    <string name="voice_edit_title_prompt">Sprechen Sie, um einen Auftragsnamen zu vergeben</string>
+    <string name="voice_edit_note_prompt">Sprechen Sie, um Aufgabennotizen zu setzen</string>
+
+    <!-- Preference: Task List recognition-service is not installed, but available -->
+    <string name="EPr_voiceInputInstall_dlg">Spracheingabe ist nicht installiert.\nWollen Sie in den
+        Markt wechseln und das nachholen?
+    </string>
+    <!-- Preference: Task List recognition-service is not available for this system -->
+    <string name="EPr_voiceInputUnavailable_dlg">Leider ist Spracheingabe für Ihr System nicht
+        verfügbar.\nWenn möglich, aktualisieren Sie bitte auf Android 2.1 oder höher.
+    </string>
+    <!-- Preference: Market is not available for this system -->
+    <string name="EPr_marketUnavailable_dlg">Leider ist der Marktplatz für Ihr System nicht
+        verfügbar.\nWenn möglich, laden Sie die sprachgestützte Suchfunktion bitte aus einer anderen
+        Quelle herunter.
+    </string>
+    <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
+    <string name="EPr_voiceInputEnabled_title">Spracheingabe aktivieren</string>
+    <!-- slide 38a: Preference: voice button description (true) -->
+    <string name="EPr_voiceInputEnabled_desc_enabled">Mikrofon-Button wird angezeigt</string>
+    <!-- Preference: voice button description (false) -->
+    <string name="EPr_voiceInputEnabled_desc_disabled">Mikrofon-Button wird ausgeblendet</string>
+    <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
+    <string name="EPr_voiceInputCreatesTask_title">Aufgaben direkt erzeugen</string>
+    <!-- Preference: Task List Voice-creation description (true) -->
+    <string name="EPr_voiceInputCreatesTask_desc_enabled">Aufgaben werden direkt aus Spracheingaben
+        erzeugt
+    </string>
+    <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
+    <string name="EPr_voiceInputCreatesTask_desc_disabled">Sie können die Aufgabentitel nach der
+        Spracheingabe ändern
+    </string>
+    <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
+    <string name="EPr_voiceRemindersEnabled_title">Sprach-Erinnerungen</string>
+    <!-- Preference: Voice reminders description (true) -->
+    <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid wird Aufgabennamen bei der
+        Erinnerung aussprechen
+    </string>
+    <!-- slide 38c: Preference: Voice reminders description (false) -->
+    <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid wird bei der Erinnerung einen
+        Klingelton abspielen
+    </string>
+
+    <!-- slide 32d: Preference Category: Voice Title -->
+    <string name="EPr_voice_header">Sprachfunktionen</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 30a-->
+    <string name="welcome_setting">Tutorial anzeigen</string>
+
+    <string name="welcome_title_1">Willkommen zu Astrid</string>
+
+    <!-- slide 2a -->
+    <string name="welcome_title_2">Erstelle Listen</string>
+
+    <!-- slide 3a-->
+    <string name="welcome_title_3">Zwischen Listen wechseln</string>
+
+    <!-- slide 4a -->
+    <string name="welcome_title_4">Teile Listen</string>
+
+    <!-- slide 5a -->
+    <string name="welcome_title_5">Verteile Aufgaben</string>
+
+    <!-- slide 6a -->
+    <string name="welcome_title_6">Details angeben</string>
+
+    <!-- slide 7a -->
+    <string name="welcome_title_7">Jetzt verbinden\num anzufangen!</string>
+
+    <string name="welcome_title_7_return">Fertig!</string>
+
+    <!-- slide 1b -->
+    <string name="welcome_body_1">Die perfekte Aufgabenverwaltung - \nperfekt für die Zusammenarbeit
+        mit anderen geeignet
+    </string>
+
+    <!-- slide 2b-->
+    <string name="welcome_body_2">In Listen erfassen: \nzu lesen, zu sehen, zu kaufen, zu
+        besuchen!
+    </string>
+
+    <!-- slide 3b -->
+    <string name="welcome_body_3">Teilen Sie Listen mit\nFreunden, Mitbewohnern\noder Ihrem
+        Partner!
+    </string>
+
+    <!-- slide 4b -->
+    <string name="welcome_body_4">Listen freigeben für\nFreunde, Haushaltshilfen\noder deine/deinen
+        Liebsten!
+    </string>
+
+    <!-- slide 5b -->
+    <string name="welcome_body_5">and much more!</string>
+
+    <!-- slide 6b-->
+    <string name="welcome_body_6">Zum Hinzufügen von Notizen anklicken\nErinnerungen einstellen\nund
+        vieles mehr!
+    </string>
+    <string name="welcome_body_7">Anmelden</string>
+
+    <string name="welcome_body_7_return">Berühren Sie Astrid\num zurückzukehren.</string>
+
+    <!-- slide 1c -->
+    <string name="welcome_next">Weiter</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <string name="widget_mini">- Astrid Mini -</string>
-    
+
     <!-- Resources for power pack widget -->
-    
+
     <string name="PPW_widget_42_label">Old Astrid 4x2</string>
     <string name="PPW_widget_43_label">Old Astrid 4x3</string>
     <string name="PPW_widget_44_label">Old Astrid 4x4</string>
     <string name="PPW_widget_v11_label">- Astrid -</string>
     <string name="PPW_widget_custom_label">Astrid Premium für Custom Launcher</string>
     <string name="PPW_widget_custom_launcherpro_label">Astrid Premium für Launcher Pro</string>
-    
+
     <string name="PPW_configure_title">Widget konfigurieren</string>
-    
+
     <string name="PPW_color">Widget-Farbe</string>
     <string name="PPW_enable_calendar">Kalendereinträge anzeigen</string>
     <string name="PPW_disable_encouragements">Ermutigungen verstecken</string>
     <string name="PPW_show_dates">Zeige Fälligkeitsdatum</string>
     <string name="PPW_filter">Filter auswählen</string>
-    
+
     <string name="PPW_due">Fällig:</string>
     <string name="PPW_past_due">Überfällig:</string>
-    
-    <string name="PPW_old_astrid_notice">Sie benötigen mindestens Astrid 3.6, um dieses Widget verwenden zu können. Tut uns leid!</string>
-    
+
+    <string name="PPW_old_astrid_notice">Sie benötigen mindestens Astrid 3.6, um dieses Widget
+        verwenden zu können. Tut uns leid!
+    </string>
+
     <string-array name="PPW_encouragements">
         <!-- general encouragements -->
-    	<item>Hallo!</item>
-    	<item>Haben Sie Zeit etwas abzuschliessen?</item>
-    	<item>Donnerwetter, Sie sehen charmant aus heute!</item>
-    	<item>Mache heute etwas Grossartiges!</item>
-    	<item>Mach mich heute stolz!</item>
-    	<item>Wie geht es dir heute?</item>
+        <item>Hallo!</item>
+        <item>Haben Sie Zeit etwas abzuschliessen?</item>
+        <item>Donnerwetter, Sie sehen charmant aus heute!</item>
+        <item>Mache heute etwas Grossartiges!</item>
+        <item>Mach mich heute stolz!</item>
+        <item>Wie geht es dir heute?</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_tod">
         <!-- encouragements based on time of day -->
-    	<item>Guten Morgen!</item>
-    	<item>Schönen Nachmittag!</item>
-    	<item>Guten Abend!</item>
-    	<item>Spät in der Nacht?</item>
-    	<item>Es ist früh, fangen Sie mit etwas an!</item>
-    	<item>Vielleicht ein Nachmittagstee?</item>
-    	<item>Einen schönen Abend!</item>
-    	<item>Schlaf ist gut für dich, weisst du?</item>
+        <item>Guten Morgen!</item>
+        <item>Schönen Nachmittag!</item>
+        <item>Guten Abend!</item>
+        <item>Spät in der Nacht?</item>
+        <item>Es ist früh, fangen Sie mit etwas an!</item>
+        <item>Vielleicht ein Nachmittagstee?</item>
+        <item>Einen schönen Abend!</item>
+        <item>Schlaf ist gut für dich, weisst du?</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_completed">
         <!-- encouragements based on tasks completed (%d => completed) -->
-    	<item>Es wurden bereits %d Tasks erledigt!</item>
-    	<item>Lebenspunktzahl: %d Aufgaben erledigt</item>
-    	<item>Freu dich! %d Aufgaben hast du schon erledigt!</item>
+        <item>Es wurden bereits %d Tasks erledigt!</item>
+        <item>Lebenspunktzahl: %d Aufgaben erledigt</item>
+        <item>Freu dich! %d Aufgaben hast du schon erledigt!</item>
     </string-array>
-  	<string name="PPW_encouragements_none_completed">Sie haben noch nicht sehr viele Aufgaben abgeschlossen! Sollen wir beginnen?</string>
-        
+    <string name="PPW_encouragements_none_completed">Sie haben noch nicht sehr viele Aufgaben
+        abgeschlossen! Sollen wir beginnen?
+    </string>
+
     <string-array name="PPW_colors">
         <item>Schwarz</item>
         <item>Weiss</item>
         <item>Blau</item>
         <item>Durchscheinend</item>
     </string-array>
-    
-    <string name="PPW_widget_dlg_text">Dieses Widget steht nur für Käufer des PowerPacks zur Verfügung!</string>
+
+    <string name="PPW_widget_dlg_text">Dieses Widget steht nur für Käufer des PowerPacks zur
+        Verfügung!
+    </string>
     <string name="PPW_widget_dlg_ok">Vorschau</string>
-    
+
     <string name="PPW_demo_title1">Eintragungen zu %s werden hier abgelegt</string>
     <string name="PPW_demo_title2">Das Powerpack umfasst auch Premium-Widgets …</string>
     <string name="PPW_demo_title3">… Aufgaben per Sprache hinzufügen und gut fühlen!</string>
     <string name="PPW_demo_title4">Anllicken um mehr zu erfahren!</string>
-    
+
     <string name="PPW_info_title">Kostenloses Power</string>
     <string name="PPW_info_signin">Melde dich an!</string>
     <string name="PPW_info_later">Später</string>
-    <string name="PPW_unlock_howto">Listen mit andren teilen! Du kannst das kostenlose Powerpack freischalten, wenn sich 3 deiner Freunde bei Astrid angemeldet haben.</string>
+    <string name="PPW_unlock_howto">Listen mit andren teilen! Du kannst das kostenlose Powerpack
+        freischalten, wenn sich 3 deiner Freunde bei Astrid angemeldet haben.
+    </string>
     <string name="PPW_check_button">Du kannst das Power Pack kostenlos bekommen!</string>
     <string name="PPW_check_share_lists">Listen freigeben!</string>
-    <string name="PPW_api_level">Es tut uns leid, aber für dieses Widget wird Android 3.0 oder höher benötigt.</string>
-    
+    <string name="PPW_api_level">Es tut uns leid, aber für dieses Widget wird Android 3.0 oder höher
+        benötigt.
+    </string>
+
     <string name="EPr_widget_enabled_title">Aktiviere/Deaktiviere Widgets</string>
-    <string name="PPW_restart_for_enabled_state">Es kann sein, dass das Telefon neu gestartet werden muss, damit diese Änderung wirksam wird.</string>
+    <string name="PPW_restart_for_enabled_state">Es kann sein, dass das Telefon neu gestartet werden
+        muss, damit diese Änderung wirksam wird.
+    </string>
 
 </resources>
diff --git a/astrid/res/values-es/strings.xml b/astrid/res/values-es/strings.xml
index ded242305..68cadc23a 100755
--- a/astrid/res/values-es/strings.xml
+++ b/astrid/res/values-es/strings.xml
@@ -4,1687 +4,1855 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ================================================== general terms == -->
-
-  <!-- People Editing Activity -->    
-  
-  <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
-  <string name="actfm_person_hint">Contacto o email</string>
-  
-  <!-- task sharing dialog: shared with hint -->
-  <string name="actfm_person_or_tag_hint">Contacto o lista compartida</string>
-
-  <!-- toast on transmit success -->
-
-  <!-- can\'t rename or delete shared tag message -->
-  
-  <!-- warning before deleting a list you\'re the owner of -->
-  <string name="actfm_tag_operation_owner_delete">Usted es el propietario de esta lista compartida. Si la elimina, se eliminará para todos los miembros de la lista. ¿Continuar?</string>
-
-  <!-- slide 29a: menu item to take a picture -->
-  <string name="actfm_picture_camera">Tomar una foto</string>
-
-  <!-- slide 29b: menu item to select from gallery -->
-  <string name="actfm_picture_gallery">Elegir de la galería</string>
-  
-  <!-- menu item to clear picture selection -->
-  <string name="actfm_picture_clear">Borrar imagen</string>
-
-  <!-- filter list activity: refresh tags -->
-  
-  <!-- Title for prompt after sharing a task -->
-  <string name="actfm_view_task_title">¿Ver tarea?</string>
-
-  <!-- Text for prompt after sharing a task -->
-  <string name="actfm_view_task_text">La tarea se envió a %s. Está viendo sus propias tareas. ¿Quiere ver además otras tareas que ha asignado?</string>
-  
-  <!-- Ok button for task view prompt -->
-  <string name="actfm_view_task_ok">Ver asignadas</string>
-      
-  <!-- Cancel button for task view prompt -->
-  <string name="actfm_view_task_cancel">Quedarse aquí</string>
-  
-  <!-- slide 13a: Title for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_title">Mis tareas compartidas</string>
-  
-  <!-- Empty list for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_empty">No hay tareas compartidas</string>
-  
-  <!-- =====================  Friendship connections -->
-  
-  <string name="actfm_friendship_pending">¡Ha enviado una solicitud de amistad a %s!</string>
-
-  <string name="actfm_friendship_blocked">Ha bloqueado a %s.</string>
-
-  <string name="actfm_friendship_ignored">Ha ignorado %s.</string>
-  
-  <string name="actfm_friendship_friends">Es amigo/a de %s. Añada tareas para ellos abajo.</string>
-
-  <string name="actfm_friendship_other_pending">%s quiere ser su amigo/a.</string>
-
-  <string name="actfm_friendship_no_status">Conectar con %s para compartir y ver la actividad de las tareas públicas.</string>
-
-  <string name="actfm_friendship_connect">Añadir amigo</string>
-
-  <string name="actfm_friendship_accept">Aceptar</string>
-
-  <!-- ================================================== TagViewActivity == -->  
-
-  <!-- Tag View Activity: Add Comment hint -->    
-  <string name="TVA_add_comment">Agregue un comentario...</string>
-
-  <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->    
-  
-  <!-- Tabs for Tag view -->
-  <string-array name="TVA_tabs">
-    <!-- Tab for showing tasks -->
-    <item>Tareas</item>
-    <!-- Tab for showing comments & updates -->
-    <item>Actividad</item>
-    <!-- Tab for showing setting -->
-    <item>Configuración de lista</item>
-  </string-array>
-  
-  <!-- Tag View: filtered by assigned to user (%s => user name) -->
-  <string name="actfm_TVA_filtered_by_assign">Tareas de %s. Toque para ver todas.</string>
-  
-  <!-- Tag View: filter by unassigned tasks -->
-  <string name="actfm_TVA_filter_by_unassigned">Tareas sin asignar. Toque para ver todas.</string>
-
-  <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Privado: Tocar para editar o compartir la lista</string>
-
-  <!-- Tag View Menu: refresh -->
-  <string name="actfm_TVA_menu_refresh">Actualizar</string>
-
-  <!-- Tag Settings: tag name label -->
-  <string name="actfm_TVA_tag_label">Lista</string>
-
-  <!-- Tag Settings: tag owner label -->
-
-  <!-- Tag Settings: tag owner value when there is no owner -->
-
-  <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
-  <string name="actfm_TVA_members_label">Compartido con</string>
-  
-  <!-- Tag Settings: list collaborators hint -->
-  <string name="actfm_TVA_members_hint">Compartir con cualquiera que posea una dirección de correo electrónico</string>
-
-  <!-- Tag Settings: tag picture -->
-  <string name="actfm_TVA_tag_picture">Imagen de lista</string>
-
-  <!-- slide 25c/28b: Tag Settings: silence notifications label -->
-  <string name="actfm_TVA_silence_label">Silenciar notificaciones</string>
-  
-  <!-- Tag Settings: list icon label -->
-  
-  <!-- slide 25b/27d: Tag Settings: list description label -->
-  <string name="actfm_TVA_tag_description_label">Descripción</string>
-  
-  <!-- slide 28a: Tag Settings: list settings label -->
-  <string name="actfm_TVA_tag_settings_label">Configuración</string>
-
-  <!-- slide 25b: Tag Settings: list description hint -->
-  <string name="actfm_TVA_tag_description_hint">Escriba una descripción aquí</string>
-  
-  <!-- slide 25d: Tag Settings: list name hint -->
-  <string name="actfm_TVA_tag_name_hint">Indique nombre de lista</string>
-  
-  <!-- Tag settings: login prompt from share-->
-  <string name="actfm_TVA_login_to_share">Necesita iniciar sesión en Astrid.com para compartir listas. Inicie sesión o haga que esta lista sea privada.</string>
-  
-      
-  <!-- ============================================ edit people dialog == -->
-
-  <!-- task sharing dialog: intro -->
-  <string name="actfm_EPA_intro">Use Astrid para compartir listas de la compra, planes de fiesta o proyectos en equipo y vea al momento cuándo la gente termina sus tareas.</string>
-    
-  <!-- task sharing dialog: window title -->
-    
-  <!-- task sharing dialog: save button -->
-  
-  <!-- task sharing dialog: assigned label -->
-  
-  <!-- slide 18a: task sharing dialog: assigned label long version -->
-  <string name="actfm_EPA_assign_label_long">¿Quién debería hacer esto?</string>
-  
-  <!-- task sharing dialog: assigned to me -->
-  <string name="actfm_EPA_assign_me">Yo</string>
-  
-  <!-- task sharing dialog: anyone -->
-  <string name="actfm_EPA_unassigned">Sin asignar</string>
-  
-  <!-- slide 18c: task sharing dialog: choose a contact -->
-  <string name="actfm_EPA_choose_contact">Elegir un contacto</string>
-  
-  <!-- task sharing dialog: custom email assignment -->
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_share_with">Compartir con:</string>
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_collaborators_header">Compartir</string>
-
-      <!-- task sharing dialog: collaborator list name (%s => name of list) -->
-  <string name="actfm_EPA_list">Lista: %s</string>
-  
-  <!-- task sharing dialog: assigned hint -->
-  
-  <!-- task sharing dialog: message label text -->
-  <string name="actfm_EPA_message_text">Mensaje de invitación:</string>
-  
-  <!-- task sharing dialog: message body -->
-  <string name="actfm_EPA_message_body">¡Ayúdame a terminar esto!</string>
-  
-  <!-- task sharing dialog: list members section header -->
-  <string name="actfm_EPA_assign_header_members">Lista de miembros</string>
-
-  <!-- task sharing dialog: astrid friends section header -->
-  <string name="actfm_EPA_assign_header_friends">Amigos Astrid</string>
-
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: share with Facebook -->
-  <string name="actfm_EPA_facebook">Facebook</string>
-  
-  <!-- task sharing dialog: share with Twitter -->
-  <string name="actfm_EPA_twitter">Twitter</string>
-
-  <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
-
-  <!-- task sharing dialog: edit people settings saved -->
-
-  <!-- task sharing dialog: invalid email (%s => email) -->
-  <string name="actfm_EPA_invalid_email">E-mail no válido: %s</string>
-
-  <!-- task sharing dialog: tag not found (%s => tag) -->
-  
-  <!-- task sharing login prompt -->
-  <string name="actfm_EPA_login_to_share">¡Necesitas haber iniciado sesión en Astrid.com para compartir tareas!</string>
-  
-  <string name="actfm_EPA_login_button">Iniciar sesión</string>
-  
-  <string name="actfm_EPA_dont_share_button">No compartir</string>
-  
-  <string name="actfm_EPA_add_person_to_list_title">Tarea asignada</string>
-  
-  <string name="actfm_EPA_add_person_to_list">%1$s no está compartido en esta lista. ¿Quieres añadir %2$s a esta lista?</string>
-
-  <string name="actfm_EPA_add_person_to_list_ok">Agregar a lista</string>
-  
-  <string name="actfm_EPA_add_person_to_list_cancel">No agregar</string>
-  
-  <string name="actfm_list_owner">(propietario)</string>
-  
-  <!-- ========================================= sharing login activity == -->
-
-  <!-- share login: Title -->
-  <string name="actfm_ALA_title">¡Bienvenido a Astrid.com!</string>
-
-  <!-- share login: Sharing Description -->
-  <string name="actfm_ALA_body">Astrid.com le permite acceder a sus tareas en línea, compartirlas, y delegarlas en otros.</string>
-
-  <!-- share login: Sharing Login FB Prompt -->
-  <string name="actfm_ALA_fb_login">Conectarse con Facebook</string>
-
-  <!-- share login: Sharing Login GG Prompt -->
-  <string name="actfm_ALA_gg_login">Conectarse con Google</string>
-  
-  <!-- share login: Quickly log in as <%s -> email> -->
-  <string name="actfm_quick_login">Iniciar sesión: %s</string>
-
-  <!-- share login: Reject quick login -->
-  <string name="actfm_quick_login_reject">¿No es %s?</string>
-
-  <!-- share login: Name -->
-  <string name="actfm_ALA_firstname_label">Nombre</string>
-  
-  <!-- share login: Name -->
-  <string name="actfm_ALA_lastname_label">Apellidos</string>
-
-  <!-- share login: Email -->
-  <string name="actfm_ALA_email_label">Correo electrónico</string>
-
-  <!-- share login: Username / Email -->
-
-  <!-- share login: Password -->
-  <string name="actfm_ALA_password_label">Contraseña</string>
-
-  <!-- share login: Sign Up Title -->
-  <string name="actfm_ALA_signup_title">Registro</string>
-
-  <!-- share login: Login Title -->
-  <string name="actfm_ALA_login_title">Iniciar sesión</string>
-
-  <!-- share login: Google Auth title -->
-  <string name="actfm_GAA_title">Elija la cuenta de Google que desea usar:</string>
-
-  <!-- share login: OAUTH Login Prompt -->
-  <string name="actfm_OLA_prompt">Por favor, inicie sesión:</string>
-  
-  <!-- Login error: user exists -->
-  <string name="actfm_ALA_error_user_exists">El usuario ya existe. Por favor ingresa con él, en lugar de crear uno nuevo.</string>
-  
-  <!-- Login error: wrong password -->
-  <string name="actfm_ALA_error_wrong_password">Lo siento, la contraseña es incorrecta. Por favor intenté de nuevo.</string>
-  
-  <!-- Forgot password link -->
-  <string name="actfm_ALA_forgot_password">¿Olvidó su contraseña?</string>
-  
-  <!-- Forgot password email prompt -->
-  <string name="actfm_ALA_enter_email">Por favor, ingrese su correo electrónico</string>
-  
-  <!-- Password reset sent (%s -> email) -->
-  <string name="actfm_ALA_reset_sent">El enlace para restaurar la contraseña se ha enviado a  %s\'</string>
-  
-  <!-- User already exists - first sync may be slow -->
-  <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your patience!</string>
-  
-  <!-- User not found -->
-  <string name="actfm_ALA_error_user_not_found">Usuario no encontrado con dicho correo electrónico. Intente registrarse en su lugar!</string>
-  
-  <!-- ================================================ Featured Lists -->
-
-  <string name="actfm_feat_list_clone">Copiar lista</string>
-  
-  <string name="actfm_feat_list_suffix">(Copiar)</string>
-
-  <string name="actfm_feat_list_cloning">Copiando...</string>
-
-  <string name="actfm_feat_list_clone_success">La operación se ha realizado correctamente.</string>
-
-  <string name="actfm_feat_list_task_clone_success">Tarea copiada</string>
-
-  <string name="actfm_feat_list_clone_empty">No hay tareas para copiar</string>
-  
-  <!-- ================================================ Synchronization == -->
-      
-  <!-- Indicates the logged in user name. %s -> user\'s name -->
-  <string name="actfm_status_title_logged_in">Estado - sesión iniciada como %s</string>    
-      
-  <!-- Preferences Title: Act.fm -->    
-  <string name="actfm_APr_header">Astrid.com</string>
-  
-  <string name="actfm_https_title">Usar HTTPS</string>
-  <string name="actfm_https_enabled">HTTPS activado (más lento)</string>
-  <string name="actfm_https_disabled">HTTPS desactivado (más rápido)</string>
-
-  <!-- title for notification tray after synchronizing -->
-  
-  <!-- text for notification when comments are received -->
-    
-  <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, 
-      Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page,
-      or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.  
-      Are you sure you want to sync with Astrid.com?</string>
-      
-  <!-- account types -->
-  <string name="actfm_account_type">Tipo de cuenta</string>
-  <string name="actfm_account_info">Información de la cuenta</string>
-  <string name="actfm_account_info_summary">Estado y opciones</string>
-  <string name="account_type_title_not_logged_in">Regístrate para obtener una cuenta gratuita</string>
-  <string name="account_type_summary_not_logged_in">Accede a tus tareas en línea, comparte listas y delega</string>
-  
-  
-  <string name="actfm_account_premium">Premium</string>
-  <string name="actfm_account_basic">Básica</string>
-  
-  <string name="actfm_inapp_billing">Actualizar a Premium</string>
-  <string name="actfm_inapp_billing_summary">Adjuntar archivos, respaldos de voz, soporte premium y más</string>
-  
-  <!-- Sharing -->
-  <string name="share_with_facebook">Comparte en Facebook</string>
-  <string name="share_with_twitter">Síguenos en Twitter</string>
-  <string name="share_with_google">Comparte en Google+</string>
-  <string name="share_speech_bubble">Compartiendo, puedes ayudar a otros a ser mas productivos!</string>
-  
-  
-  <!-- Sync upgrade messages -->
-  <string name="sync_upgr_both_title">Usando Astrid.com + Google sin Duplicados</string>
-  <string name="sync_upgr_both_body">Seamos honestos. Google Tasks es práctico pero no es tan guay como Astrid. Para evitar duplicados ya no puedes sincronizar con Astrid.com y al mismo tiempo sincronizar en segundo plano con Google Tasks. Todavía puedes importar tus Google Tasks yendo a Configuración → Copias y Sincronización o reducir la sincronización a sólo con Google Tasks.</string>
-  <string name="sync_upgr_both_btn1">Quédate en Astrid</string>
-  <string name="sync_upgr_both_btn2">Downgrade to Google Tasks</string>
-  
-  <string name="sync_upgr_gtasks_only_title">¡Apúntate a Astrid Sync gratis!</string>
-  <string name="sync_upgr_gtasks_only_body">Ten acceso a tus tareas desde todos tus dispositivos y desde Gmail con Astrid.com sync. ¡Apúntate a Astrid.com Sync (siempre puedes volver a Google tasas, ¡pero no vas a querer!)!</string>
-  <string name="sync_upgr_gtasks_only_btn1">Apúntate a Astrid Sync</string>
-  <string name="sync_upgr_gtasks_only_btn2">Quedarse en Google Tasks</string>
-  
-  <string name="sync_upgr_neither_title">¡Copia de seguridad &amp; sincronización gratuitas!</string>
-  <string name="sync_upgr_neither_body">Don\'t put your to-dos at risk! New and improved Astrid sync to keep and access your tasks from anywhere.</string>
-  <string name="sync_upgr_neither_btn1">Regístrese ahora</string>
-  
-  <string name="sync_upgr_logged_out">Te has desconectado de Astrid</string>
-  
-  <string name="actfm_logout_clear_tasks_title">¿Borrar los datos?</string>
-  <string name="actfm_logout_clear_tasks_body">¿Deseas borrar tus tareas y tus listas?</string>
-  <string name="actfm_logout_clear_tasks_yes">Borrar datos</string>
-  <string name="actfm_logout_clear_tasks_no">Mantener los datos</string>
-  
-  <string name="actfm_logged_in_different_user_title">Conectarse como otro usuario</string>
-  <string name="actfm_logged_in_different_user_body">Would you like to delete existing phone tasks before syncing?</string>
-  <string name="actfm_logged_in_different_user_keep_data">Mantener los datos</string>
-  <string name="actfm_logged_in_different_user_clear_data">Borrar todos los datos</string>
-  <string name="actfm_logged_in_different_user_processing">Procesando los datos existentes...</string>
-  
-  <string name="actfm_tag_not_authorized_title">No autorizado</string>
-  <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name?</string>
-  <string name="actfm_tag_not_authorized_new_list">Crea una nueva lista</string>
-  <string name="actfm_tag_not_authorized_leave_list">Abandonar lista</string>
-  
-  <string name="actfm_sync_ongoing">Sincronización en marcha</string>
-  
-  <string name="EPr_reset_sync_state">Reset sync</string>
-  <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors</string>
-  <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue?</string>
-  
+<resources>
 
+    <!-- ================================================== general terms == -->
 
+    <!-- People Editing Activity -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
+    <string name="actfm_person_hint">Contacto o email</string>
+
+    <!-- task sharing dialog: shared with hint -->
+    <string name="actfm_person_or_tag_hint">Contacto o lista compartida</string>
+
+    <!-- toast on transmit success -->
+
+    <!-- can\'t rename or delete shared tag message -->
+
+    <!-- warning before deleting a list you\'re the owner of -->
+    <string name="actfm_tag_operation_owner_delete">Usted es el propietario de esta lista
+        compartida. Si la elimina, se eliminará para todos los miembros de la lista. ¿Continuar?
+    </string>
+
+    <!-- slide 29a: menu item to take a picture -->
+    <string name="actfm_picture_camera">Tomar una foto</string>
+
+    <!-- slide 29b: menu item to select from gallery -->
+    <string name="actfm_picture_gallery">Elegir de la galería</string>
+
+    <!-- menu item to clear picture selection -->
+    <string name="actfm_picture_clear">Borrar imagen</string>
+
+    <!-- filter list activity: refresh tags -->
+
+    <!-- Title for prompt after sharing a task -->
+    <string name="actfm_view_task_title">¿Ver tarea?</string>
+
+    <!-- Text for prompt after sharing a task -->
+    <string name="actfm_view_task_text">La tarea se envió a %s. Está viendo sus propias tareas.
+        ¿Quiere ver además otras tareas que ha asignado?
+    </string>
+
+    <!-- Ok button for task view prompt -->
+    <string name="actfm_view_task_ok">Ver asignadas</string>
+
+    <!-- Cancel button for task view prompt -->
+    <string name="actfm_view_task_cancel">Quedarse aquí</string>
+
+    <!-- slide 13a: Title for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_title">Mis tareas compartidas</string>
+
+    <!-- Empty list for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_empty">No hay tareas compartidas</string>
+
+    <!-- =====================  Friendship connections -->
+
+    <string name="actfm_friendship_pending">¡Ha enviado una solicitud de amistad a %s!</string>
+
+    <string name="actfm_friendship_blocked">Ha bloqueado a %s.</string>
+
+    <string name="actfm_friendship_ignored">Ha ignorado %s.</string>
+
+    <string name="actfm_friendship_friends">Es amigo/a de %s. Añada tareas para ellos abajo.
+    </string>
+
+    <string name="actfm_friendship_other_pending">%s quiere ser su amigo/a.</string>
+
+    <string name="actfm_friendship_no_status">Conectar con %s para compartir y ver la actividad de
+        las tareas públicas.
+    </string>
+
+    <string name="actfm_friendship_connect">Añadir amigo</string>
+
+    <string name="actfm_friendship_accept">Aceptar</string>
+
+    <!-- ================================================== TagViewActivity == -->
+
+    <!-- Tag View Activity: Add Comment hint -->
+    <string name="TVA_add_comment">Agregue un comentario...</string>
+
+    <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->
+
+    <!-- Tabs for Tag view -->
+    <string-array name="TVA_tabs">
+        <!-- Tab for showing tasks -->
+        <item>Tareas</item>
+        <!-- Tab for showing comments & updates -->
+        <item>Actividad</item>
+        <!-- Tab for showing setting -->
+        <item>Configuración de lista</item>
+    </string-array>
+
+    <!-- Tag View: filtered by assigned to user (%s => user name) -->
+    <string name="actfm_TVA_filtered_by_assign">Tareas de %s. Toque para ver todas.</string>
+
+    <!-- Tag View: filter by unassigned tasks -->
+    <string name="actfm_TVA_filter_by_unassigned">Tareas sin asignar. Toque para ver todas.</string>
+
+    <!-- Tag View: list is private, no members -->
+    <string name="actfm_TVA_no_members_alert">Privado: Tocar para editar o compartir la lista
+    </string>
+
+    <!-- Tag View Menu: refresh -->
+    <string name="actfm_TVA_menu_refresh">Actualizar</string>
+
+    <!-- Tag Settings: tag name label -->
+    <string name="actfm_TVA_tag_label">Lista</string>
+
+    <!-- Tag Settings: tag owner label -->
+
+    <!-- Tag Settings: tag owner value when there is no owner -->
+
+    <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
+    <string name="actfm_TVA_members_label">Compartido con</string>
+
+    <!-- Tag Settings: list collaborators hint -->
+    <string name="actfm_TVA_members_hint">Compartir con cualquiera que posea una dirección de correo
+        electrónico
+    </string>
+
+    <!-- Tag Settings: tag picture -->
+    <string name="actfm_TVA_tag_picture">Imagen de lista</string>
+
+    <!-- slide 25c/28b: Tag Settings: silence notifications label -->
+    <string name="actfm_TVA_silence_label">Silenciar notificaciones</string>
+
+    <!-- Tag Settings: list icon label -->
+
+    <!-- slide 25b/27d: Tag Settings: list description label -->
+    <string name="actfm_TVA_tag_description_label">Descripción</string>
+
+    <!-- slide 28a: Tag Settings: list settings label -->
+    <string name="actfm_TVA_tag_settings_label">Configuración</string>
+
+    <!-- slide 25b: Tag Settings: list description hint -->
+    <string name="actfm_TVA_tag_description_hint">Escriba una descripción aquí</string>
+
+    <!-- slide 25d: Tag Settings: list name hint -->
+    <string name="actfm_TVA_tag_name_hint">Indique nombre de lista</string>
+
+    <!-- Tag settings: login prompt from share-->
+    <string name="actfm_TVA_login_to_share">Necesita iniciar sesión en Astrid.com para compartir
+        listas. Inicie sesión o haga que esta lista sea privada.
+    </string>
+
+
+    <!-- ============================================ edit people dialog == -->
+
+    <!-- task sharing dialog: intro -->
+    <string name="actfm_EPA_intro">Use Astrid para compartir listas de la compra, planes de fiesta o
+        proyectos en equipo y vea al momento cuándo la gente termina sus tareas.
+    </string>
+
+    <!-- task sharing dialog: window title -->
+
+    <!-- task sharing dialog: save button -->
+
+    <!-- task sharing dialog: assigned label -->
+
+    <!-- slide 18a: task sharing dialog: assigned label long version -->
+    <string name="actfm_EPA_assign_label_long">¿Quién debería hacer esto?</string>
+
+    <!-- task sharing dialog: assigned to me -->
+    <string name="actfm_EPA_assign_me">Yo</string>
+
+    <!-- task sharing dialog: anyone -->
+    <string name="actfm_EPA_unassigned">Sin asignar</string>
+
+    <!-- slide 18c: task sharing dialog: choose a contact -->
+    <string name="actfm_EPA_choose_contact">Elegir un contacto</string>
+
+    <!-- task sharing dialog: custom email assignment -->
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_share_with">Compartir con:</string>
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_collaborators_header">Compartir</string>
+
+    <!-- task sharing dialog: collaborator list name (%s => name of list) -->
+    <string name="actfm_EPA_list">Lista: %s</string>
+
+    <!-- task sharing dialog: assigned hint -->
+
+    <!-- task sharing dialog: message label text -->
+    <string name="actfm_EPA_message_text">Mensaje de invitación:</string>
+
+    <!-- task sharing dialog: message body -->
+    <string name="actfm_EPA_message_body">¡Ayúdame a terminar esto!</string>
+
+    <!-- task sharing dialog: list members section header -->
+    <string name="actfm_EPA_assign_header_members">Lista de miembros</string>
+
+    <!-- task sharing dialog: astrid friends section header -->
+    <string name="actfm_EPA_assign_header_friends">Amigos Astrid</string>
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: share with Facebook -->
+    <string name="actfm_EPA_facebook">Facebook</string>
+
+    <!-- task sharing dialog: share with Twitter -->
+    <string name="actfm_EPA_twitter">Twitter</string>
+
+    <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
+
+    <!-- task sharing dialog: edit people settings saved -->
+
+    <!-- task sharing dialog: invalid email (%s => email) -->
+    <string name="actfm_EPA_invalid_email">E-mail no válido: %s</string>
+
+    <!-- task sharing dialog: tag not found (%s => tag) -->
+
+    <!-- task sharing login prompt -->
+    <string name="actfm_EPA_login_to_share">¡Necesitas haber iniciado sesión en Astrid.com para
+        compartir tareas!
+    </string>
+
+    <string name="actfm_EPA_login_button">Iniciar sesión</string>
+
+    <string name="actfm_EPA_dont_share_button">No compartir</string>
+
+    <string name="actfm_EPA_add_person_to_list_title">Tarea asignada</string>
+
+    <string name="actfm_EPA_add_person_to_list">%1$s no está compartido en esta lista. ¿Quieres
+        añadir %2$s a esta lista?
+    </string>
+
+    <string name="actfm_EPA_add_person_to_list_ok">Agregar a lista</string>
+
+    <string name="actfm_EPA_add_person_to_list_cancel">No agregar</string>
+
+    <string name="actfm_list_owner">(propietario)</string>
+
+    <!-- ========================================= sharing login activity == -->
+
+    <!-- share login: Title -->
+    <string name="actfm_ALA_title">¡Bienvenido a Astrid.com!</string>
+
+    <!-- share login: Sharing Description -->
+    <string name="actfm_ALA_body">Astrid.com le permite acceder a sus tareas en línea, compartirlas,
+        y delegarlas en otros.
+    </string>
+
+    <!-- share login: Sharing Login FB Prompt -->
+    <string name="actfm_ALA_fb_login">Conectarse con Facebook</string>
+
+    <!-- share login: Sharing Login GG Prompt -->
+    <string name="actfm_ALA_gg_login">Conectarse con Google</string>
+
+    <!-- share login: Quickly log in as <%s -> email> -->
+    <string name="actfm_quick_login">Iniciar sesión: %s</string>
+
+    <!-- share login: Reject quick login -->
+    <string name="actfm_quick_login_reject">¿No es %s?</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_firstname_label">Nombre</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_lastname_label">Apellidos</string>
+
+    <!-- share login: Email -->
+    <string name="actfm_ALA_email_label">Correo electrónico</string>
+
+    <!-- share login: Username / Email -->
+
+    <!-- share login: Password -->
+    <string name="actfm_ALA_password_label">Contraseña</string>
+
+    <!-- share login: Sign Up Title -->
+    <string name="actfm_ALA_signup_title">Registro</string>
+
+    <!-- share login: Login Title -->
+    <string name="actfm_ALA_login_title">Iniciar sesión</string>
+
+    <!-- share login: Google Auth title -->
+    <string name="actfm_GAA_title">Elija la cuenta de Google que desea usar:</string>
+
+    <!-- share login: OAUTH Login Prompt -->
+    <string name="actfm_OLA_prompt">Por favor, inicie sesión:</string>
+
+    <!-- Login error: user exists -->
+    <string name="actfm_ALA_error_user_exists">El usuario ya existe. Por favor ingresa con él, en
+        lugar de crear uno nuevo.
+    </string>
+
+    <!-- Login error: wrong password -->
+    <string name="actfm_ALA_error_wrong_password">Lo siento, la contraseña es incorrecta. Por favor
+        intenté de nuevo.
+    </string>
+
+    <!-- Forgot password link -->
+    <string name="actfm_ALA_forgot_password">¿Olvidó su contraseña?</string>
+
+    <!-- Forgot password email prompt -->
+    <string name="actfm_ALA_enter_email">Por favor, ingrese su correo electrónico</string>
+
+    <!-- Password reset sent (%s -> email) -->
+    <string name="actfm_ALA_reset_sent">El enlace para restaurar la contraseña se ha enviado a
+        %s\'
+    </string>
+
+    <!-- User already exists - first sync may be slow -->
+    <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your
+        patience!
+    </string>
+
+    <!-- User not found -->
+    <string name="actfm_ALA_error_user_not_found">Usuario no encontrado con dicho correo
+        electrónico. Intente registrarse en su lugar!
+    </string>
+
+    <!-- ================================================ Featured Lists -->
+
+    <string name="actfm_feat_list_clone">Copiar lista</string>
+
+    <string name="actfm_feat_list_suffix">(Copiar)</string>
+
+    <string name="actfm_feat_list_cloning">Copiando...</string>
+
+    <string name="actfm_feat_list_clone_success">La operación se ha realizado correctamente.
+    </string>
+
+    <string name="actfm_feat_list_task_clone_success">Tarea copiada</string>
+
+    <string name="actfm_feat_list_clone_empty">No hay tareas para copiar</string>
+
+    <!-- ================================================ Synchronization == -->
+
+    <!-- Indicates the logged in user name. %s -> user\'s name -->
+    <string name="actfm_status_title_logged_in">Estado - sesión iniciada como %s</string>
+
+    <!-- Preferences Title: Act.fm -->
+    <string name="actfm_APr_header">Astrid.com</string>
+
+    <string name="actfm_https_title">Usar HTTPS</string>
+    <string name="actfm_https_enabled">HTTPS activado (más lento)</string>
+    <string name="actfm_https_disabled">HTTPS desactivado (más rápido)</string>
+
+    <!-- title for notification tray after synchronizing -->
+
+    <!-- text for notification when comments are received -->
+
+    <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid
+        duplicate tasks and other synchronization issues,
+        Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You
+        can still import tasks from Google Tasks from the Google Tasks settings page,
+        or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.
+        Are you sure you want to sync with Astrid.com?
+    </string>
+
+    <!-- account types -->
+    <string name="actfm_account_type">Tipo de cuenta</string>
+    <string name="actfm_account_info">Información de la cuenta</string>
+    <string name="actfm_account_info_summary">Estado y opciones</string>
+    <string name="account_type_title_not_logged_in">Regístrate para obtener una cuenta gratuita
+    </string>
+    <string name="account_type_summary_not_logged_in">Accede a tus tareas en línea, comparte listas
+        y delega
+    </string>
+
+
+    <string name="actfm_account_premium">Premium</string>
+    <string name="actfm_account_basic">Básica</string>
+
+    <string name="actfm_inapp_billing">Actualizar a Premium</string>
+    <string name="actfm_inapp_billing_summary">Adjuntar archivos, respaldos de voz, soporte premium
+        y más
+    </string>
+
+    <!-- Sharing -->
+    <string name="share_with_facebook">Comparte en Facebook</string>
+    <string name="share_with_twitter">Síguenos en Twitter</string>
+    <string name="share_with_google">Comparte en Google+</string>
+    <string name="share_speech_bubble">Compartiendo, puedes ayudar a otros a ser mas productivos!
+    </string>
+
+
+    <!-- Sync upgrade messages -->
+    <string name="sync_upgr_both_title">Usando Astrid.com + Google sin Duplicados</string>
+    <string name="sync_upgr_both_body">Seamos honestos. Google Tasks es práctico pero no es tan guay
+        como Astrid. Para evitar duplicados ya no puedes sincronizar con Astrid.com y al mismo
+        tiempo sincronizar en segundo plano con Google Tasks. Todavía puedes importar tus Google
+        Tasks yendo a Configuración → Copias y Sincronización o reducir la sincronización a sólo con
+        Google Tasks.
+    </string>
+    <string name="sync_upgr_both_btn1">Quédate en Astrid</string>
+    <string name="sync_upgr_both_btn2">Downgrade to Google Tasks</string>
+
+    <string name="sync_upgr_gtasks_only_title">¡Apúntate a Astrid Sync gratis!</string>
+    <string name="sync_upgr_gtasks_only_body">Ten acceso a tus tareas desde todos tus dispositivos y
+        desde Gmail con Astrid.com sync. ¡Apúntate a Astrid.com Sync (siempre puedes volver a Google
+        tasas, ¡pero no vas a querer!)!
+    </string>
+    <string name="sync_upgr_gtasks_only_btn1">Apúntate a Astrid Sync</string>
+    <string name="sync_upgr_gtasks_only_btn2">Quedarse en Google Tasks</string>
+
+    <string name="sync_upgr_neither_title">¡Copia de seguridad &amp; sincronización gratuitas!
+    </string>
+    <string name="sync_upgr_neither_body">Don\'t put your to-dos at risk! New and improved Astrid
+        sync to keep and access your tasks from anywhere.
+    </string>
+    <string name="sync_upgr_neither_btn1">Regístrese ahora</string>
+
+    <string name="sync_upgr_logged_out">Te has desconectado de Astrid</string>
+
+    <string name="actfm_logout_clear_tasks_title">¿Borrar los datos?</string>
+    <string name="actfm_logout_clear_tasks_body">¿Deseas borrar tus tareas y tus listas?</string>
+    <string name="actfm_logout_clear_tasks_yes">Borrar datos</string>
+    <string name="actfm_logout_clear_tasks_no">Mantener los datos</string>
+
+    <string name="actfm_logged_in_different_user_title">Conectarse como otro usuario</string>
+    <string name="actfm_logged_in_different_user_body">Would you like to delete existing phone tasks
+        before syncing?
+    </string>
+    <string name="actfm_logged_in_different_user_keep_data">Mantener los datos</string>
+    <string name="actfm_logged_in_different_user_clear_data">Borrar todos los datos</string>
+    <string name="actfm_logged_in_different_user_processing">Procesando los datos existentes...
+    </string>
+
+    <string name="actfm_tag_not_authorized_title">No autorizado</string>
+    <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you
+        may have been removed). Would you like to create a new list with the same name?
+    </string>
+    <string name="actfm_tag_not_authorized_new_list">Crea una nueva lista</string>
+    <string name="actfm_tag_not_authorized_leave_list">Abandonar lista</string>
+
+    <string name="actfm_sync_ongoing">Sincronización en marcha</string>
+
+    <string name="EPr_reset_sync_state">Reset sync</string>
+    <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors
+    </string>
+    <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will
+        be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you
+        wish to continue?
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in timers plug-in -->
+
+    <!-- Task Edit Activity: Container Label -->
+    <string name="alarm_ACS_label">Alarmas</string>
+
+    <!-- Task Edit Activity: Add New Alarm -->
+    <string name="alarm_ACS_button">Añadir una alarma</string>
+
+    <string-array name="reminders_alarm">
+        <!-- reminders related to alarm -->
+        <item>¡Alarma!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in backup plug-in -->
+
+    <!-- ================================================= BackupPreferences == -->
+
+    <!-- slide 33c/48d: Backup Preferences Title -->
+    <string name="backup_BPr_header">Copias de seguridad</string>
+
+    <!-- slide 48e/50c: Backup: Status Header -->
+    <string name="backup_BPr_group_status">Estado</string>
+
+    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->
+    <string name="backup_status_success">Última copia:\n%s</string>
+    <!-- Backup Status: last error failed. Keep it short! -->
+    <string name="backup_status_failed">La última copia de seguridad falló</string>
+    <!-- Backup Status: error subtitle -->
+    <string name="backup_status_failed_subtitle">(toque para visualizar los errores)</string>
+    <!-- slide 48a: Backup Status: never backed up -->
+    <string name="backup_status_never">Nunca se hizo copia de seguridad!</string>
+
+    <!-- slide 48f/ 50e: Backup Options Group Label -->
+    <string name="backup_BPr_group_options">Opciones</string>
+
+    <!-- slide 48b: Preference: Automatic Backup Title -->
+    <string name="backup_BPr_auto_title">Copias de seguridad automáticas</string>
+    <!-- Preference: Automatic Backup Description (when disabled) -->
+    <string name="backup_BPr_auto_disabled">Copias de seguridad automáticas desactivadas</string>
+    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
+    <string name="backup_BPr_auto_enabled">La copia de seguridad se hará diariamente</string>
+
+    <!-- Preference screen restoring Tasks Help -->
+    <!-- Preference screen Restoring Tasks Help Dialog Text-->
+
+    <string name="backup_BPr_cloud_already_logged_in">Ya tienes una copia de seguridad en la nube de
+        Astrid.com!
+    </string>
+
+    <!-- ================================================= BackupActivity == -->
+
+    <!-- slide 48c: backup activity label -->
+    <string name="backup_BAc_label">Administrar copias de seguridad</string>
+
+    <!-- backup activity title -->
+    <string name="backup_BAc_title">Gestionar sus copias de seguridad</string>
+
+    <!-- backup activity import button -->
+    <string name="backup_BAc_import">Importar tareas</string>
+
+    <!-- backup activity export button -->
+    <string name="backup_BAc_export">Exportar tareas</string>
+
+    <!-- backup activity cloud (Astrid.com) option -->
+    <string name="backup_BAc_cloud">Presiona para respaldar gratis en la nube en Astrid.com</string>
+
+    <!-- ============================================== Importer / Exporter == -->
+
+    <!-- Message displayed when error occurs -->
+    <string name="backup_TXI_error">Error al importar</string>
+
+    <string name="export_toast">Respaldadas %1$s de %2$s.</string>
+
+    <string name="export_toast_no_tasks">No hay tareas para exportar</string>
+
+    <!-- Progress Dialog Title for exporting -->
+    <string name="export_progress_title">Exportando...</string>
+
+    <!-- Backup: Title of Import Summary Dialog -->
+    <string name="import_summary_title">Resumen de restauración</string>
+
+    <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
+    <string name="import_summary_message">El fichero %1$s contenia %2$s.\n\n %3$s importadas\n %4$s
+        ya existian\n %5$s tenian errores\n
+    </string>
+
+    <!-- Progress Dialog Title for importing -->
+    <string name="import_progress_title">Importando...</string>
+
+    <!-- Progress Dialog text for import reading task (%d -> task number)-->
+    <string name="import_progress_read">Leyendo tarea %d...</string>
+
+    <!-- Backup: Dialog when unable to open a file -->
+
+    <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
+    <string name="DLG_error_sdcard">No se puede acceder a la carpeta: %s</string>
+
+    <!-- Backup: Dialog when unable to open SD card in general -->
+    <string name="DLG_error_sdcard_general">¡No se pudo acceder a su tarjeta de memoria SD!</string>
+
+    <!-- Backup: File Selector dialog for import -->
+    <string name="import_file_prompt">Selecciona un archivo a restaurar</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- ================================================== AndroidManifest == -->
+
+    <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
+    <string name="app_name">Tareas de Astrid</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="read_permission_label">Permisos de Astrid</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="read_permission_desc">leer tareas, mostrar filtros de tareas</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="write_permission_label">Permisos de Astrid</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="write_permission_desc">crear nuevas tareas, editar tareas existentes</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- question for deleting tasks -->
+    <string name="DLG_delete_this_task_question">¿Borrar esta tarea?</string>
+
+    <!-- question for deleting items (%s => item name) -->
+    <string name="DLG_delete_this_item_question">¿Eliminar este elemento: %s?</string>
+
+    <!-- Progress dialog shown when upgrading -->
+    <string name="DLG_upgrading">Actualizando sus tareas....</string>
+
+    <!-- Title for dialog selecting a time (hours and minutes) -->
+    <string name="DLG_hour_minutes">Tiempo (horas : minutos)</string>
+
+    <!-- Dialog for Astrid having a critical update -->
+    <string name="DLG_please_update">¡Astrid debería ser actualizado a la última versión disponible
+        en Android Market! Por favor, hágalo antes de continuar, o espere unos segundos.
+    </string>
+
+    <!-- Button for going to Market -->
+
+    <!-- Button for accepting EULA -->
+    <string name="DLG_accept">Acepto</string>
+
+    <!-- Button for declining EULA -->
+    <string name="DLG_decline">No acepto</string>
+
+    <!-- EULA title -->
+    <string name="DLG_eula_title">Términos de uso de Astrid</string>
+
+    <!-- Progress Dialog generic text -->
+    <string name="DLG_please_wait">Por favor, espere</string>
+
+    <!-- Dialog - loading -->
+    <string name="DLG_loading">Cargando...</string>
+
+    <!-- Dialog - dismiss -->
+
+    <!-- slide 20d -->
+    <string name="DLG_ok">Aceptar</string>
+    <!-- slide 36g -->
+    <string name="DLG_cancel">Cancelar</string>
+
+    <string name="DLG_more">Más</string>
+
+    <string name="DLG_undo">Deshacer</string>
+
+    <string name="DLG_warning">Advertencia</string>
+
+    <!-- =============================================================== UI == -->
+
+    <!-- Label for DateButtons with no value -->
+    <string name="WID_dateButtonUnset">Pulsar para establecer</string>
+
+    <!-- String formatter for DateButtons ($D => date, $T => time) -->
+
+    <!-- String formatter for Disable button -->
+
+    <!--  ============================================================= notes -->
+
+    <!-- Note Exposer -->
+
+    <!-- Note Exposer / Comments -->
+
+    <!-- EditNoteActivity - no comments -->
+    <string name="ENA_no_comments">Aun sin actividad</string>
+
+    <!-- EditNoteActivity - no username for comment -->
+    <string name="ENA_no_user">Alguien</string>
+
+    <!-- EditNoteActivity - refresh comments -->
+    <string name="ENA_refresh_comments">Actualizar Comentarios</string>
+
+    <!-- ================================================= TaskListActivity == -->
+
+    <!-- slide 8b: Task List: Displayed instead of list when no items present -->
+    <string name="TLA_no_items">No tienes tareas! \n Quieres agregar alguna?</string>
+
+    <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
+    <string name="TLA_no_items_person">%s no tiene\ntareas compartidas contigo</string>
+
+    <!-- Menu: Adjust Sort and Hidden Task Settings -->
+    <string name="TLA_menu_sort">Ordenar</string>
+
+    <!-- Menu: Sync Now -->
+    <string name="TLA_menu_sync">Sincronizar ahora</string>
+
+    <!-- Menu: Search -->
+    <string name="TLA_menu_search">Buscar</string>
+
+    <!-- Menu: Tasks -->
+    <string name="TLA_menu_lists">Listas</string>
+
+    <!-- Menu: Friends -->
+    <string name="TLA_menu_friends">Gente</string>
+
+    <!-- Menu: Featured Lists -->
+    <string name="TLA_menu_featured_lists">Listas destacadas</string>
+
+    <!-- Menu: Suggestions -->
+    <string name="TLA_menu_suggestions">Sugerencias</string>
+
+    <!-- Menu: Tutorial -->
+
+    <!-- Menu: Settings -->
+    <string name="TLA_menu_settings">Configuración</string>
+
+    <!-- slide 30b: Menu: Support -->
+    <string name="TLA_menu_support">Soporte</string>
+
+    <!-- Search Label-->
+
+    <!-- Window title for displaying Custom Filter -->
+    <string name="TLA_custom">Personalizar</string>
+
+    <!-- slide 8d: Quick Add Edit Box Hint-->
+    <string name="TLA_quick_add_hint">Añadir una tarea</string>
+
+    <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
+    <string name="TLA_quick_add_hint_assign">Agregar algo para %s</string>
+
+    <!-- Notification Volumne notification-->
+    <string name="TLA_notification_volume_low">Las notificaciones están silenciadas. ¡No podrá oír
+        Astrid!
+    </string>
+
+    <!-- Notifications disabled warning -->
+    <string name="TLA_notification_disabled">¡Los recordatorios de Astrid están deshabilitados! No
+        recibirás ningún recordatorio
+    </string>
+
+    <string-array name="TLA_filters">
+        <item>Activo</item>
+        <item>Hoy</item>
+        <item>Próximamente</item>
+        <item>Tarde</item>
+        <item>Listo</item>
+        <item>Oculto</item>
+    </string-array>
+
+    <!-- Title for confirmation dialog after quick add markup -->
+    <string name="TLA_quickadd_confirm_title">Dijiste, \"%s\"</string>
+
+    <!-- Text for speech bubble in dialog after quick add markup -->
+    <!-- First string is task title, second is due date, third is priority -->
+    <string name="TLA_quickadd_confirm_speech_bubble">He creado una tarea llamada \"%1$s\" %2$s con
+        prioridad %3$s
+    </string>
+
+    <string name="TLA_quickadd_confirm_speech_bubble_date">para %s</string>
+
+    <string name="TLA_quickadd_confirm_hide_helpers">No mostrar futuras confirmaciones</string>
+
+
+    <!-- Title for alert on new repeating task. %s-> task title -->
+    <string name="TLA_repeat_scheduled_title">Nueva tarea repetitiva %s</string>
+
+    <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
+    <string name="TLA_repeat_scheduled_speech_bubble">Le recordaré acerca de %s.</string>
+
+    <string-array name="TLA_priority_strings">
+        <item>máxima prioridad</item>
+        <item>alta prioridad</item>
+        <item>prioridad media</item>
+        <item>prioridad baja</item>
+    </string-array>
+    <!-- slide 22a -->
+    <string name="TLA_all_activity">Toda la actividad</string>
+
+    <!-- ====================================================== TaskAdapter == -->
+
+    <!-- Format string to indicate task is hidden (%s => task name) -->
+    <string name="TAd_hiddenFormat">%s [oculto]</string>
+
+    <!-- Format string to indicate task is deleted (%s => task name) -->
+    <string name="TAd_deletedFormat">%s [borrado]</string>
+
+    <!-- Displayed when adapter is flung (scrolled quickly) -->
+
+    <!-- slide 22b: indicates task was completed. %s => date or time ago -->
+    <string name="TAd_completed">Terminado\n%s</string>
+
+    <!-- slide 15a: Action Button: edit task -->
+    <string name="TAd_actionEditTask">Editar</string>
+
+    <!-- Context Item: edit task -->
+    <string name="TAd_contextEditTask">Editar tarea</string>
+
+    <!-- Context Item: copy task -->
+    <string name="TAd_contextCopyTask">Copiar tarea</string>
+
+    <!-- Context Item: delete task -->
+    <string name="TAd_contextDeleteTask">Eliminar tarea</string>
+
+    <!-- Context Item: undelete task -->
+    <string name="TAd_contextUndeleteTask">Restaurar Tarea</string>
+
+    <!-- Context Item: purge task -->
+    <string name="TAd_contextPurgeTask">Purgar Tareas</string>
+
+    <!-- ============================================== SortSelectionDialog == -->
+
+    <!-- slide 23a: Sort Selection: dialog title -->
+    <string name="SSD_title">Ordenar Subtareas y ocultas</string>
+
+    <!-- slide 23h:  Hidden: title -->
+    <string name="SSD_hidden_title">Tareas Ocultas</string>
+
+    <!-- Hidden Task Selection: show completed tasks -->
+    <string name="SSD_completed">Mostrar Tareas Completadas</string>
+
+    <!-- Hidden Task Selection: show hidden tasks -->
+    <string name="SSD_hidden">Mostrar Tareas Ocultas</string>
+
+    <!-- Hidden Task Selection: show deleted tasks -->
+    <string name="SSD_deleted">Mostrar Tareas Eliminadas</string>
+
+    <!-- Sort Selection: drag with subtasks -->
+    <string name="SSD_sort_drag">Manual order with subtasks</string>
+
+    <!-- slide 23b: Sort Selection: smart sort -->
+    <string name="SSD_sort_auto">Clasificación Inteligente Astrid</string>
+
+    <!-- slide 23e: Sort Selection: sort by alpha -->
+    <string name="SSD_sort_alpha">Por título</string>
+
+    <!-- slide 23c: Sort Selection: sort by due date -->
+    <string name="SSD_sort_due">Por fecha límite</string>
+
+    <!-- slide 23d: Sort Selection: sort by importance -->
+    <string name="SSD_sort_importance">Por prioridad</string>
+
+    <!-- slide 23f: Sort Selection: sort by modified date -->
+    <string name="SSD_sort_modified">Por última modificación</string>
+
+    <!-- slide 23g: Sort Selection: reverse -->
+    <string name="SSD_sort_reverse">Invertir Orden</string>
+
+    <!-- slide 23j: Sort Button: sort temporarily -->
+    <string name="SSD_save_temp">Sólo una vez</string>
+
+    <!-- slide 23i: Sort Button: sort permanently -->
+    <string name="SSD_save_always">Siempre</string>
+
+    <!-- =============================================== FilterListActivity == -->
+
+    <!-- Astrid Filter Shortcut -->
+    <string name="FSA_label">Lista Astrid o Filtro</string>
+
+    <!-- Filter List Activity Title -->
+
+    <!-- Displayed when loading filters -->
+
+    <!-- Context Menu: Create Shortcut -->
+    <string name="FLA_context_shortcut">Crear enlace en escritorio</string>
+
+    <!-- Menu: Search -->
+
+    <!-- Menu: Help -->
+
+    <!-- slide 28c: Create Shortcut Dialog Title -->
+    <string name="FLA_shortcut_dialog_title">Crear acceso directo</string>
+
+    <!-- Create Shortcut Dialog (asks to name shortcut) -->
+    <string name="FLA_shortcut_dialog">Nombre del acceso directo:</string>
+
+    <!-- Search Hint-->
+    <string name="FLA_search_hint">Buscar tareas</string>
+
+    <!-- Search Filter name (%s => query) -->
+    <string name="FLA_search_filter">Coincidencias con \'%s\'</string>
+
+    <!-- Toast: created shortcut (%s => label) -->
+    <string name="FLA_toast_onCreateShortcut">Acceso directo creado: %s</string>
+
+    <!-- Menu: new filter -->
+    <string name="FLA_new_filter">Nuevo filtro</string>
+
+    <!-- slide 10e: Button: new list -->
+    <string name="FLA_new_list">Nueva lista</string>
+
+    <!-- Alert when creating a shortcut without selecting a filter -->
+    <string name="FLA_no_filter_selected">No hay filtro seleccionado! Por favor seleccione un filtro
+        o lista.
+    </string>
+
+    <!-- ================================================= TaskEditActivity == -->
+
+    <!-- Title when editing a task (%s => task title) -->
+
+    <!-- Title when creating a new task -->
+
+    <!-- Task title label -->
+
+    <!-- Task when label -->
+    <string name="TEA_when_header_label">Cuando</string>
+
+    <!-- Task title hint (displayed when edit box is empty) -->
+    <string name="TEA_title_hint">Nombre de la tarea</string>
+
+    <!-- Task importance label -->
+    <string name="TEA_importance_label">Prioridad</string>
+
+    <!-- Task due date hint -->
+    <string name="TEA_deadline_hint">Set due date</string>
+
+    <!-- Task assigned to string (%s -> assigned person name) -->
+    <string name="TEA_assigned_to">Assigned to %s</string>
+
+    <!-- Task urgency specific time checkbox -->
+    <string name="TEA_urgency_specific_time">A una hora específica?</string>
+
+    <!-- Task urgency specific time title when specific time false -->
+    <string name="TEA_urgency_none">Ninguna</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_label">Ocultar hasta</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_display">Hide until %s</string>
+
+    <!-- Task hide until toast -->
+    <string name="TEA_hideUntil_message">La tarea estara oculta hasta %s</string>
+
+    <!-- Task editing data being loaded label -->
+    <string-array name="TEA_loading">
+        <item>Cargando…</item>
+    </string-array>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_note_label">Descripción</string>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_notes_empty">Description...</string>
+
+    <!-- Task note hint -->
+    <string name="TEA_notes_hint">Introducir descripción de la tarea...</string>
+
+    <!-- Estimated time label -->
+    <string name="TEA_estimatedDuration_label">¿Cuanto tiempo llevará?</string>
+
+    <!-- Elapsed time label -->
+    <string name="TEA_elapsedDuration_label">Tiempo ya empleado en la tarea</string>
+
+    <!-- Menu: Save -->
+    <string name="TEA_menu_save">Guardar cambios</string>
+
+    <!-- Menu: Don\'t Save -->
+    <string name="TEA_menu_discard">No guardar</string>
+
+    <!-- Menu: Delete Task -->
+    <string name="TEA_menu_delete">Borrar Tarea</string>
+
+    <!-- Menu: Task comments -->
+    <string name="TEA_menu_refresh_comments">Actualizar comentarios</string>
+
+    <string name="TEA_menu_comments">Comentarios</string>
+
+    <!-- Toast: task saved with deadline (%s => preposition + time units) -->
+    <string name="TEA_onTaskSave_due">Tarea guardada: finaliza %s</string>
+
+    <!-- Toast: task saved without deadlines -->
+    <string name="TEA_onTaskSave_notDue">Tarea guardada</string>
+
+    <!-- Toast: task was not saved -->
+
+    <!-- Toast: task was deleted -->
+
+    <!-- slide 15b: Task edit tab: activity -->
+    <string name="TEA_tab_activity">Actividad</string>
+
+    <!-- slide 15e:  Task edit tab: more editing settings -->
+    <string name="TEA_tab_more">Detalles</string>
+
+    <!-- slide 15d: Task edit tab: web services -->
+    <string name="TEA_tab_web">Ideas</string>
+
+    <string name="TEA_timer_est">Est. %s</string>
+
+    <string name="TEA_timer_elap">Elapsed %s</string>
+
+    <string-array name="TEA_urgency">
+        <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
+        <item>Sin fecha</item>
+        <item>Día específico</item>
+        <item>Hoy</item>
+        <item>Mañana</item>
+        <item>(día siguiente)</item>
+        <item>Semana siguiente</item>
+        <item>en dos semanas</item>
+        <item>Mes siguiente</item>
+    </string-array>
+
+    <string name="TEA_no_time">Sin horario</string>
+
+    <string-array name="TEA_hideUntil">
+        <!-- hideUntil: labels for edit page. -->
+        <item>Nunca</item>
+        <item>Fecha de vencimiento</item>
+        <item>Due time</item>
+        <item>Day before due</item>
+        <item>Week before due</item>
+        <item>Día/Hora específicos</item>
+    </string-array>
+
+    <!-- Task edit control set descriptors -->
+
+    <!-- slide 9b/35i -->
+    <string name="TEA_control_who">Quién</string>
+
+    <!-- slide 9c/ 35a -->
+    <string name="TEA_control_when">Cuando</string>
+    <!-- slide 35b -->
+    <string name="TEA_control_more_section">----Detalles----</string>
+    <!-- slide 16a/35c -->
+    <string name="TEA_control_importance">Prioridad</string>
+    <!-- slide 16b/35d -->
+    <string name="TEA_control_lists">Listas</string>
+    <!-- slide 16c/35e -->
+    <string name="TEA_control_notes">Descripción</string>
+
+    <string name="TEA_control_files">Archivos</string>
+
+    <!-- slide 16e / slide 35g-->
+    <string name="TEA_control_reminders">Recordatorios</string>
+
+    <!-- slide 16f -->
+    <string name="TEA_control_timer">Controles de tiempo</string>
+
+    <string name="TEA_control_hidden_section">---Ocultar Siempre---</string>
+
+    <string name="hide_until_prompt">Mostrar en mi lista</string>
+
+    <!-- Add Ons tab when no add-ons found -->
+
+    <!-- Add Ons button -->
+
+    <!-- More row -->
+
+    <!-- slide 15c: Text when no activity to show -->
+    <string name="TEA_no_activity">Sin actividad</string>
+
+    <!-- Text to load more activity -->
+    <string name="TEA_load_more">Cargar mas...</string>
+
+    <!-- When controls dialog -->
+    <string name="TEA_when_dialog_title">¿Para cuando esta previsto?</string>
+
+
+    <string name="TEA_new_task">Nueva Tarea</string>
+
+    <string name="WSV_click_to_load">Púlsame para buscar forma de completarlo</string>
+
+    <string name="WSV_not_online">Puedo hacer mas cuando estoy conectado a Internet. Por favor
+        revisa tu conexión.
+    </string>
+
+    <string name="TEA_contact_error">¡Disculpa! No pudimos encontrar una dirección de email para el
+        contacto seleccionado.
+    </string>
+
+    <!-- ============================================= IntroductionActivity == -->
+
+    <!-- slide 1a: Introduction Window title -->
+
+    <!-- Button to agree to EULA -->
+
+    <!-- Button to disagree with EULA -->
+
+    <!-- ===================================================== MissedCallActivity == -->
+
+    <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
+    <string name="MCA_title">%1$s\nllamó a las %2$s</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_return_call">Llamar ahora</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_add_task">Llamar luego</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_ignore">Ignorar</string>
+
+    <!-- Missed call: dialog to ignore all missed calls title -->
+    <string name="MCA_ignore_title">Ignorar todas las llamadas perdidas?</string>
+
+    <!-- Missed call: dialog to ignore all missed calls body -->
+    <string name="MCA_ignore_body">Ha ignorado varias llamadas perdidas. ¿Quiere que Astrid deje de
+        preguntarle sobre ellas?
+    </string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore all button -->
+    <string name="MCA_ignore_all">Ignorar todas las llamadas</string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
+    <string name="MCA_ignore_this">Ignorar solamente esta llamada</string>
+
+    <!-- Missed call: preference title -->
+    <string name="MCA_missed_calls_pref_title">Campo de llamadas perdidas</string>
+
+    <!-- slide 49c: Missed call: preference description -->
+    <string name="MCA_missed_calls_pref_desc_enabled">Astrid le notificará de las llamadas perdidas
+        y le recordará que devuelva la llamada.
+    </string>
+    <string name="MCA_missed_calls_pref_desc_disabled">Astrid no te notificara acerca de las
+        llamadas perdidas
+    </string>
+
+    <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
+    <string name="MCA_task_title_name">Devolver la llamada a %1$s al %2$s</string>
+
+    <!-- Missed call: task title no name (%s -> number)-->
+    <string name="MCA_task_title_no_name">Devolver la llamada a %s</string>
+
+    <!-- Missed call: schedule dialog title (%s -> name or number)-->
+    <string name="MCA_schedule_dialog_title">Devolver la llamada a %s en...</string>
+
+    <!-- Missed call speech bubble options -->
+    <string-array name="MCA_dialog_speech_options">
+        <item>Debe ser bueno ser tan popular!</item>
+        <item>¡Ey! ¡Le gustas a la gente!</item>
+        <item>Alégrales el día, ¡llámalos!</item>
+        <item>¿No te haría feliz que la gente te devolviera las llamadas?</item>
+        <item>¡Puedes hacerlo!</item>
+        <item>Siempre puede enviar un mensaje de texto...</item>
+    </string-array>
+
+
+    <!-- ======================================= Calendar reminder activity == -->
+
+    <!-- Calendar remindeer ignore button -->
+    <string name="CRA_ignore">Ignorar</string>
+
+    <!-- Calendar event -->
+    <string name="CRA_title">¿Necesita una lista de reuniones?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls title -->
+    <string name="CRA_ignore_title">¿Ignorar todos los eventos del calendario?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls body -->
+    <string name="CRA_ignore_body">Ha ignorado varios eventos de calendario. ¿Debe Astrid dejar de
+        preguntarle sobre ellos?
+    </string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
+    <string name="CRA_ignore_all">Ignorar todos los eventos</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
+    <string name="CRA_ignore_this">Ignorar solo este evento</string>
+
+    <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
+    <string name="CRA_speech_bubble_start">Parece que %s va a comenzar pronto. ¿Quiere crear una
+        lista de acciones?
+    </string>
+
+    <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
+    <string name="CRA_speech_bubble_end">Parece que acaba de terminar %s. ¿Quiere crear una lista de
+        acciones?
+    </string>
+
+    <!-- Calendar reminder: create list button -->
+    <string name="CRA_create_list">Crear lista</string>
+
+    <!-- Calendar reminder: postpone button -->
+    <string name="CRA_postpone">Quizá después</string>
+
+    <!-- Calendar reminder: list exists dialog title -->
+    <string name="CRA_list_exists_title">La lista ya existe</string>
+
+    <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
+    <string name="CRA_list_exists_body">Ya hay una lista llamada %s. ¿Quiere usar la lista actual o
+        crear una nueva para el evento?
+    </string>
+
+    <!-- Calendar reminder: list exists dialog create new button -->
+    <string name="CRA_create_new">Crear nuevo</string>
+
+    <!-- Calendar reminder: list exists dialog use existing button -->
+    <string name="CRA_use_existing">Usar existente</string>
+
+    <!-- Calendar remindr: created list (%s -> list name) -->
+    <string name="CRA_created_list_dialog">Creé una lista %s.</string>
+
+    <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
+    <string name="CRA_one_attendee">%s asistirá.</string>
+
+    <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
+    <string name="CRA_two_attendees">%1$s y %2$s asistirán.</string>
+
+    <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
+    <string name="CRA_many_attendees">%1$s, %2$s y %3$d más asistirán.</string>
+
+    <!-- Calendar reminder: invitation prompt -->
+    <string name="CRA_invitation_prompt">¿Quiere invitarlos?</string>
+
+    <!-- Calendar reminder: preference title -->
+    <string name="CRA_calendar_reminders_pref_title">Asistente de calendario</string>
 
-    
-    <!-- Resources for built-in timers plug-in -->
-    
-    <!-- Task Edit Activity: Container Label -->
-    <string name="alarm_ACS_label">Alarmas</string>
-    
-    <!-- Task Edit Activity: Add New Alarm -->
-    <string name="alarm_ACS_button">Añadir una alarma</string>
-    
-    <string-array name="reminders_alarm">
-      <!-- reminders related to alarm -->
-      <item>¡Alarma!</item>
+    <!-- Calendar reminder: pref description disabled -->
+    <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid no le volverá a recordar los
+        próximos eventos de calendario
+    </string>
+
+    <!-- Calendar reminder: pref description enabled -->
+    <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid le recordará los próximos eventos
+        de calendario y le pedirá que se prepare para ellos
+    </string>
+
+    <!-- Calendar reminder: share list title -->
+    <string name="CRA_share_list_title">¿Compartir la lista?</string>
+
+    <string name="CRA_invite_attendees">Invitar asistentes</string>
+
+    <string name="CRA_more_options">Más opciones</string>
+
+    <string name="CRA_dont_invite">No, gracias</string>
+
+    <!-- Calendar reminder: share list title when no other attendees exist-->
+    <string name="CRA_list_created_title">Lista creada</string>
+
+    <!-- Calendar reminder: default new list name (%s -> event title) -->
+    <string name="CRA_default_list_name">Acciones: %s</string>
+
+    <!-- ===================================================== HelpActivity == -->
+
+    <!-- Help: Button to get support from our website -->
+
+    <!-- ==================================================== UpdateService == -->
+
+    <!-- Changelog Window Title -->
+    <string name="UpS_changelog_title">¿Que hay de nuevo en Astrid?</string>
+
+    <!-- Updates Window Title -->
+    <string name="UpS_updates_title">Últimas Noticias de Astrid</string>
+
+    <!-- Updats No Activity to show for offline users -->
+    <string name="UpS_no_activity_log_in">Inicie sesión para ver el registro de \nsu progreso, así
+        como la \nactividad en las listas compartidas.
+    </string>
+
+    <!-- ================================================== EditPreferences == -->
+
+    <!-- slide 31g: Preference Window Title -->
+    <string name="EPr_title">Astrid: Preferencias</string>
+
+    <string name="EPr_share_astrid">Compartir Astrid</string>
+
+    <string name="EPr_share_astrid_summary">Comparte Astrid en tu red social favorita</string>
+
+    <!-- slide 46a -->
+    <string name="EPr_deactivated">desactivada</string>
+
+    <!-- slide 30i: Preference Category: Appearance Title -->
+    <string name="EPr_appearance_header">Apariencia</string>
+
+    <!-- Preference Category: Appearance Summary -->
+    <string name="EPr_appearance_summary">Temas, widgets, filas de tareas, editar pantalla</string>
+
+    <!-- FAQ Preference title -->
+    <string name="EPr_faq_title">FAQ (Preguntas frecuentes)</string>
+
+    <!-- Account status preference (%s -> account type) -->
+    <string name="EPr_account_title">Cuenta: %s</string>
+
+    <!-- Support preferences summary -->
+    <string name="EPr_support_summary">Tutorial, FAQ (Preguntas frecuentes), Acerca de...</string>
+
+    <!-- slide 34a: Preference: Task List Font Size Title -->
+    <string name="EPr_fontSize_title">Tamaño de la lista de tareas</string>
+
+    <!-- Preference: Filters to show pref screen title -->
+    <string name="EPr_filters_to_show_title">Filtros a mostrar</string>
+
+    <!-- slide 32a: Preference: Show confirmation for smart reminders -->
+    <string name="EPr_showSmartConfirmation_title">Mostrar confirmación para recordatorios
+        inteligentes
+    </string>
+
+    <!-- slide 34g: Preference: Task List Font Size Description -->
+    <string name="EPr_fontSize_desc">Tamaño de letra en el listado de la página principal</string>
+
+    <!-- Preferemce: Show task edit confirmation toasts -->
+
+    <!-- slide 34c: Preference: Task List Show Notes -->
+    <string name="EPr_showNotes_title">Mostrar descripción en tarea</string>
+
+    <!-- Edit screen preference category -->
+    <string name="EPr_edit_screen_options">Editar opciones de pantalla</string>
+
+    <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
+    <string name="EPr_beastMode_title">Editar el orden de pantalla</string>
+
+    <string name="EPr_beastMode_shortcut">Personalizar</string>
+
+    <string name="EPr_time_increment">Incrementos de 5 minutos</string>
+
+    <string name="EPr_use_date_shortcuts">Utilizar abreviaturas de fecha</string>
+
+    <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
+
+    <!-- slide 35h -->
+    <string name="EPr_beastMode_desc">Personalizar la disposición de la pantalla de edición de
+        tareas
+    </string>
+    <!-- slide 35j -->
+    <string name="EPr_beastMode_reset">Restablecer valores predeterminados</string>
+
+    <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on
+        each row
+    </string>
+
+    <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
+    <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit
+        screen
+    </string>
+    <!-- Preference: Task List Show Notes Description (enabled) -->
+    <string name="EPr_showNotes_desc_enabled">La descripción se mostrará siempre</string>
+
+    <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
+    <string name="EPr_compressTaskRows_title">Fila de tarea compacta</string>
+    <!-- slide 34j -->
+    <string name="EPr_compressTaskRows_desc">Comprimir las filas de la tarea para ajustar al
+        título
+    </string>
+
+    <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
+    <!-- slide 34k-->
+
+    <!-- slide 34b: Preferences: Wrap task titles to two lines -->
+    <string name="EPr_fullTask_title">Mostrar completo el título de la tarea</string>
+    <string name="EPr_fullTask_desc_enabled">Se mostrará completo el título de la tarea</string>
+    <!-- slide 34h -->
+    <string name="EPr_fullTask_desc_disabled">Las primeras dos lineas de las tareas serán
+        mostradas
+    </string>
+
+    <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
+    <string name="EPr_ideaAuto_title">Auto cargar la pestaña Ideas</string>
+    <!-- slide 32c -->
+    <string name="EPr_ideaAuto_desc_enabled">La búsqueda para la pestaña Ideas se realizará cuando a
+        la pestaña se le de clic
+    </string>
+    <string name="EPr_ideaAuto_desc_disabled">La búsqueda para la pestaña Ideas se realizará solo
+        cuando se solicite manualmente
+    </string>
+
+    <!-- Preferences: task row style -->
+    <string-array name="EPr_task_row_styles">
+        <item>Original</item>
+        <item>Simple</item>
+        <item>Solo título</item>
     </string-array>
-    
 
+    <string-array name="EPr_task_row_style_descriptions">
+        <item>Truncar el título a dos líneas con la fecha a la derecha</item>
+        <item>Truncar el título a una línea con la fecha y listas debajo</item>
+        <item>Single line title only</item>
+    </string-array>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- task row style title (%s -> style) -->
+    <string name="EPr_task_row_style_title">Estilo de fila: %s</string>
+
+    <!-- Preference: custom filters enabled -->
+    <string name="EPr_use_filters_title">Usar filtros</string>
+    <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
+
+    <!-- Preference: show list members in shared list -->
+    <string name="EPr_show_list_members_title">Show list members in shared lists</string>
+
+    <!-- Preference: simple input box style -->
+    <string name="EPr_simple_input_boxes">Simple text boxes</string>
+
+    <!-- Preference: simple input box style -->
+    <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
+
+    <!-- Preference: don\'t show plus button until input present -->
+    <string name="EPr_hide_plus_button">Hide plus button</string>
+
+    <!-- Preference: menu items -->
+    <string name="EPr_menu_items">Objetos del menú</string>
+
+    <!-- Preference: list view -->
+    <string name="EPr_list_view">Vista de listas</string>
+
+    <!-- Preference: task edit comments -->
+    <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
+
+    <!-- slide 30f/ 36f: Preference: Theme -->
+    <string name="EPr_theme_title">Combinación de colores</string>
+    <!-- Preference: Theme Description (%s => value) -->
+    <string name="EPr_theme_desc">Actualmente: %s</string>
+    <!-- Preference: Theme Description (android 1.6) -->
+    <string name="EPr_theme_desc_unsupported">Esta configuración requiere Android 2.0+</string>
+    <!-- slide 32h/ 37b -->
+    <string name="EPr_theme_widget_title">Tema del widget</string>
+
+    <!-- slide 30d/ 34f: Preference screen: all task row settings -->
+    <string name="EPr_taskRowPrefs_title">Apariencia de la fila de tareas</string>
+
+    <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
+    <string name="EPr_use_contact_picker">Usar selector de contactos</string>
+    <!-- slide 49b -->
+    <string name="EPr_use_contact_picker_desc_enabled">El selector de contactos del sistema se
+        mostrará en la pantalla de asignación de tareas
+    </string>
+    <string name="EPr_use_contact_picker_desc_disabled">El selector de contactos del sistema no se
+        mostrará
+    </string>
+
+    <!-- slide 49i: Preferences: Third party addons -->
+    <string name="EPr_third_party_addons">Activar complementos de terceros</string>
+    <string name="EPr_third_party_addons_desc_enabled">Los complementos de terceros serán
+        habilitados.
+    </string>
+    <!-- slide 49d -->
+    <string name="EPr_third_party_addons_desc_disabled">Los complementos hechos por terceros se
+        deshabilitarán
+    </string>
+
+    <!-- Preferences: ideas tab -->
+    <string name="EPr_ideas_tab_enabled">Ideas de tareas</string>
+    <string name="EPr_ideas_tab_description">Obtén ideas para ayudarte a completar tareas</string>
+
+    <!-- Preferences: calendar event start time -->
+    <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
+    <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
+    <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
+
+    <string name="EPr_force_phone_layout">Usar diseño de teléfono</string>
+
+    <string name="EPr_show_featured_lists">Mostrar listas destacadas</string>
+
+    <!-- Configurations -->
+    <string name="EPr_configurations_title">Definir configuración</string>
+    <string name="EPr_config_default">Predeterminado</string>
+    <string name="EPr_config_lite">Astrid Lite</string>
+
+    <!-- Dialog title when setting preference configuration -->
+    <string name="EPr_config_dialog_title">¿Definir configuración?</string>
+    <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
+    <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
+
+    <!-- default configuration name for the above dialog -->
+    <string name="EPr_config_dialog_default_id">predeterminado</string>
+
+    <!-- Preference title for showing save and cancel buttons in task edit page -->
+    <string name="EPr_show_save_and_cancel">Show save and cancel</string>
+
+
+    <!-- Swipe between lists -->
+    <!-- Preference: swipe between lists performance -->
+    <string name="EPr_swipe_lists_performance_title">Deslizar entre las listas</string>
+
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>Sin deslizar</item>
+        <item>Conservar memoria</item>
+        <item>Rendimiento Normal</item>
+        <item>Rendimiento Alto</item>
+    </string-array>
 
-    
-  <!-- Resources for built-in backup plug-in -->
-  
-  <!-- ================================================= BackupPreferences == -->
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <!-- slide 49a -->
+        <item>Deslizarse entre las listas esta deshabilitado</item>
+        <item>Rendimiento bajo</item>
+        <item>Configuración predeterminada</item>
+        <item>Utiliza más recursos del sistema</item>
+    </string-array>
 
-    <!-- slide 33c/48d: Backup Preferences Title -->    
-    <string name="backup_BPr_header">Copias de seguridad</string>
+    <string name="swipe_lists_helper_title">Deslizar entre listas</string>
+    <string name="swipe_lists_helper_header">Deslizar a izquierda o derecha para moverse rápidamente
+        entre listas
+    </string>
+    <string name="swipe_lists_helper_subtitle">Cambiar configuración en Ajustes -> Apariencia
+    </string>
 
-    <!-- slide 48e/50c: Backup: Status Header -->    
-    <string name="backup_BPr_group_status">Estado</string>
-    
-    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Última copia:\n%s</string>
-    <!-- Backup Status: last error failed. Keep it short! -->    
-    <string name="backup_status_failed">La última copia de seguridad falló</string>
-    <!-- Backup Status: error subtitle -->    
-    <string name="backup_status_failed_subtitle">(toque para visualizar los errores)</string>
-    <!-- slide 48a: Backup Status: never backed up -->    
-    <string name="backup_status_never">Nunca se hizo copia de seguridad!</string>
+    <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
 
-    <!-- slide 48f/ 50e: Backup Options Group Label -->    
-    <string name="backup_BPr_group_options">Opciones</string>
+    <string-array name="EPr_default_reminders_mode">
+        <!-- reminders duration: labels for "Task Defaults" preference item. -->
+        <item>@string/TEA_reminder_mode_once</item>
+        <item>@string/TEA_reminder_mode_five</item>
+        <item>@string/TEA_reminder_mode_nonstop</item>
+    </string-array>
 
-    <!-- slide 48b: Preference: Automatic Backup Title -->    
-    <string name="backup_BPr_auto_title">Copias de seguridad automáticas</string>
-    <!-- Preference: Automatic Backup Description (when disabled) -->
-    <string name="backup_BPr_auto_disabled">Copias de seguridad automáticas desactivadas</string>    
-    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
-    <string name="backup_BPr_auto_enabled">La copia de seguridad se hará diariamente</string>
-    
-    <!-- Preference screen restoring Tasks Help -->
-    <!-- Preference screen Restoring Tasks Help Dialog Text-->
-    
-    <string name="backup_BPr_cloud_already_logged_in">Ya tienes una copia de seguridad en la nube de Astrid.com!</string>
-  
-  <!-- ================================================= BackupActivity == -->
-
-  <!-- slide 48c: backup activity label -->
-  <string name="backup_BAc_label">Administrar copias de seguridad</string>
-
-  <!-- backup activity title -->
-  <string name="backup_BAc_title">Gestionar sus copias de seguridad</string>
-
-  <!-- backup activity import button -->
-  <string name="backup_BAc_import">Importar tareas</string>
-
-  <!-- backup activity export button -->
-  <string name="backup_BAc_export">Exportar tareas</string>
-  
-  <!-- backup activity cloud (Astrid.com) option -->
-  <string name="backup_BAc_cloud">Presiona para respaldar gratis en la nube en Astrid.com</string>
-    
-  <!-- ============================================== Importer / Exporter == -->
-  
-  <!-- Message displayed when error occurs -->
-  <string name="backup_TXI_error">Error al importar</string>
-    
-  <string name="export_toast">Respaldadas %1$s de %2$s.</string>
-    
-  <string name="export_toast_no_tasks">No hay tareas para exportar</string>
-  
-  <!-- Progress Dialog Title for exporting -->    
-  <string name="export_progress_title">Exportando...</string>
-  
-  <!-- Backup: Title of Import Summary Dialog -->
-  <string name="import_summary_title">Resumen de restauración</string>
-    
-  <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">El fichero %1$s contenia %2$s.\n\n %3$s importadas\n %4$s ya existian\n %5$s tenian errores\n</string>
-  
-  <!-- Progress Dialog Title for importing -->    
-  <string name="import_progress_title">Importando...</string>
-  
-  <!-- Progress Dialog text for import reading task (%d -> task number)-->    
-  <string name="import_progress_read">Leyendo tarea %d...</string>
-  
-  <!-- Backup: Dialog when unable to open a file -->  
-  
-  <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
-  <string name="DLG_error_sdcard">No se puede acceder a la carpeta: %s</string>
-  
-  <!-- Backup: Dialog when unable to open SD card in general -->
-  <string name="DLG_error_sdcard_general">¡No se pudo acceder a su tarjeta de memoria SD!</string>
-    
-  <!-- Backup: File Selector dialog for import -->
-  <string name="import_file_prompt">Selecciona un archivo a restaurar</string>    
-        
+    <string-array name="EPr_themes">
+        <!-- theme_settings: labels for Theme preference menu -->
+        <!-- slide 36a-->
+        <item>Día - Azul</item>
+        <!-- slide 36b -->
+        <item>Día - Rojo</item>
+        <!-- slide 36b -->
+        <item>Azul cielo</item>
+        <!-- slide 36c -->
+        <item>Noche</item>
+        <!-- slide 36d -->
+        <item>Transparent (white text)</item>
+        <!-- slide 36e -->
+        <item>Transparente (Texto Negro)</item>
+    </string-array>
 
+    <string-array name="EPr_themes_widget">
+        <!-- slide 32i / 37a-->
+        <item>El mismo que la app</item>
+        <item>Día - Azul</item>
+        <item>Día - Rojo</item>
+        <item>Sky blue</item>
+        <item>Night</item>
+        <item>Transparent (white text)</item>
+        <item>Transparent (black text)</item>
+        <item>Estilo antiguo</item>
+    </string-array>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- ========================================== Task Management Settings == -->
+
+    <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
+    <string name="EPr_manage_header">Administrar tareas antiguas</string>
+    <!-- slide 47d -->
+    <string name="EPr_manage_delete_completed">Borrar tareas completadas</string>
+    <string name="EPr_manage_delete_completed_message">¿Seguro que desea borrar todas las tareas
+        completadas?
+    </string>
+    <!-- slide 47a -->
+    <string name="EPr_manage_delete_completed_summary">Las tareas borradas se pueden recuperar una a
+        una
+    </string>
+    <string name="EPr_manage_delete_completed_status">¡%d tareas borradas!</string>
+    <!-- slide 47e -->
+    <string name="EPr_manage_purge_deleted">Limpiar tareas eliminadas</string>
+    <string name="EPr_manage_purge_deleted_message">¿Seguro que desea limpiar todas las tareas
+        eliminadas?\n\n¡Estas tareas se perderán por siempre!
+    </string>
+    <string name="EPr_manage_purge_deleted_status">¡%d tareas purgadas!</string>
+    <!-- slide 47b-->
+    <string name="EPr_manage_purge_deleted_summary">¡Atención! Las tareas purgadas no se pueden
+        recuperar sin su archivo de copia de seguridad!
+    </string>
+    <!-- slide 47h-->
+    <string name="EPr_manage_clear_all">Limpiar todos los datos</string>
+    <string name="EPr_manage_clear_all_message">¿Borrar todas las tareas y configuraciones de
+        Astrid?\n\n¡Advertencia: No hay vuelta atrás!
+    </string>
+
+    <!-- slide 47f -->
+    <string name="EPr_manage_delete_completed_gcal">Borrar eventos del calendario para las tareas
+        completas
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_message">¿Seguro que realmente desea borrar todas
+        las tareas completadas?
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_summary"></string>
+    <string name="EPr_manage_delete_completed_gcal_status">Borrados %d eventos del calendario!
+    </string>
+
+    <!-- slide 47g-->
+    <string name="EPr_manage_delete_all_gcal">Borrar todos los eventos del calendario de las
+        tareas
+    </string>
+    <string name="EPr_manage_delete_all_gcal_message">¿Seguro que quieres borrar todos tus eventos
+        para las tareas?
+    </string>
+    <string name="EPr_manage_delete_all_gcal_summary"></string>
+    <string name="EPr_manage_delete_all_gcal_status">¡Borrados %d eventos del calendario!</string>
+
+    <!-- ==================================================== AddOnActivity == -->
+
+    <!-- Add Ons Activity Title -->
+    <string name="AOA_title">Complementos</string>
+
+    <!-- Add-on Activity: author for internal authors  -->
+    <string name="AOA_internal_author">Equipo de Astrid</string>
 
+    <!-- Add-on Activity: installed add-ons tab -->
+    <string name="AOA_tab_installed">Instalado</string>
 
-  <!-- ================================================== AndroidManifest == -->
-
-  <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
-  <string name="app_name">Tareas de Astrid</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="read_permission_label">Permisos de Astrid</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="read_permission_desc">leer tareas, mostrar filtros de tareas</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="write_permission_label">Permisos de Astrid</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="write_permission_desc">crear nuevas tareas, editar tareas existentes</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-    
-  <!-- question for deleting tasks -->
-  <string name="DLG_delete_this_task_question">¿Borrar esta tarea?</string>
-
-  <!-- question for deleting items (%s => item name) -->
-  <string name="DLG_delete_this_item_question">¿Eliminar este elemento: %s?</string>
-    
-  <!-- Progress dialog shown when upgrading -->
-  <string name="DLG_upgrading">Actualizando sus tareas....</string>
-  
-  <!-- Title for dialog selecting a time (hours and minutes) -->
-  <string name="DLG_hour_minutes">Tiempo (horas : minutos)</string>
-  
-  <!-- Dialog for Astrid having a critical update -->
-  <string name="DLG_please_update">¡Astrid debería ser actualizado a la última versión disponible en Android Market! Por favor, hágalo antes de continuar, o espere unos segundos.</string>
-
-  <!-- Button for going to Market -->
-
-  <!-- Button for accepting EULA -->
-  <string name="DLG_accept">Acepto</string>
-
-  <!-- Button for declining EULA -->
-  <string name="DLG_decline">No acepto</string>
-
-  <!-- EULA title -->
-  <string name="DLG_eula_title">Términos de uso de Astrid</string>
-
-  <!-- Progress Dialog generic text -->
-  <string name="DLG_please_wait">Por favor, espere</string>
-  
-  <!-- Dialog - loading -->
-  <string name="DLG_loading">Cargando...</string>
-  
-  <!-- Dialog - dismiss -->
-
-  <!-- slide 20d -->
-  <string name="DLG_ok">Aceptar</string>
-  <!-- slide 36g -->
-  <string name="DLG_cancel">Cancelar</string>
-  
-  <string name="DLG_more">Más</string>
-  
-  <string name="DLG_undo">Deshacer</string>
-  
-  <string name="DLG_warning">Advertencia</string>
-  
-  <!-- =============================================================== UI == -->
-  
-  <!-- Label for DateButtons with no value -->
-  <string name="WID_dateButtonUnset">Pulsar para establecer</string>
-  
-  <!-- String formatter for DateButtons ($D => date, $T => time) -->
-  
-  <!-- String formatter for Disable button -->
-  
-  <!--  ============================================================= notes -->
-  
-  <!-- Note Exposer -->    
-  
-  <!-- Note Exposer / Comments -->    
-  
-  <!-- EditNoteActivity - no comments -->
-  <string name="ENA_no_comments">Aun sin actividad</string>
-    
-  <!-- EditNoteActivity - no username for comment -->
-  <string name="ENA_no_user">Alguien</string>
-  
-  <!-- EditNoteActivity - refresh comments -->
-  <string name="ENA_refresh_comments">Actualizar Comentarios</string>
-  
-  <!-- ================================================= TaskListActivity == -->
-  
-  <!-- slide 8b: Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">No tienes tareas! \n Quieres agregar alguna?</string>
-  
-  <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->    
-  <string name="TLA_no_items_person">%s no tiene\ntareas compartidas contigo</string>
-  
-  <!-- Menu: Adjust Sort and Hidden Task Settings -->    
-  <string name="TLA_menu_sort">Ordenar</string>
-  
-  <!-- Menu: Sync Now -->    
-  <string name="TLA_menu_sync">Sincronizar ahora</string>
-  
-  <!-- Menu: Search -->
-  <string name="TLA_menu_search">Buscar</string>
-  
-  <!-- Menu: Tasks -->
-  <string name="TLA_menu_lists">Listas</string>
-
-  <!-- Menu: Friends -->
-  <string name="TLA_menu_friends">Gente</string>
-
-  <!-- Menu: Featured Lists -->
-  <string name="TLA_menu_featured_lists">Listas destacadas</string>
-
-  <!-- Menu: Suggestions -->
-  <string name="TLA_menu_suggestions">Sugerencias</string>
-  
-  <!-- Menu: Tutorial -->
-
-  <!-- Menu: Settings -->    
-  <string name="TLA_menu_settings">Configuración</string>
-  
-  <!-- slide 30b: Menu: Support -->
-  <string name="TLA_menu_support">Soporte</string>
-  
-  <!-- Search Label-->
-  
-  <!-- Window title for displaying Custom Filter -->
-  <string name="TLA_custom">Personalizar</string>
-  
-  <!-- slide 8d: Quick Add Edit Box Hint-->
-  <string name="TLA_quick_add_hint">Añadir una tarea</string>
-  
-  <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
-  <string name="TLA_quick_add_hint_assign">Agregar algo para %s</string>
-  
-  <!-- Notification Volumne notification-->
-  <string name="TLA_notification_volume_low">Las notificaciones están silenciadas. ¡No podrá oír Astrid!</string>
-  
-  <!-- Notifications disabled warning -->
-  <string name="TLA_notification_disabled">¡Los recordatorios de Astrid están deshabilitados! No recibirás ningún recordatorio</string>
-  
-  <string-array name="TLA_filters">
-      <item>Activo</item>
-      <item>Hoy</item>
-      <item>Próximamente</item>
-      <item>Tarde</item>
-      <item>Listo</item>
-      <item>Oculto</item>      
-  </string-array>
-  
-  <!-- Title for confirmation dialog after quick add markup -->
-  <string name="TLA_quickadd_confirm_title">Dijiste, \"%s\"</string>
-  
-  <!-- Text for speech bubble in dialog after quick add markup -->
-  <!-- First string is task title, second is due date, third is priority -->
-  <string name="TLA_quickadd_confirm_speech_bubble">He creado una tarea llamada \"%1$s\" %2$s con prioridad %3$s</string>
-  
-  <string name="TLA_quickadd_confirm_speech_bubble_date">para %s</string>
-  
-  <string name="TLA_quickadd_confirm_hide_helpers">No mostrar futuras confirmaciones</string>
-  
-  
-  <!-- Title for alert on new repeating task. %s-> task title -->
-  <string name="TLA_repeat_scheduled_title">Nueva tarea repetitiva %s</string>
-  
-  <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
-  <string name="TLA_repeat_scheduled_speech_bubble">Le recordaré acerca de %s.</string>
-  
-  <string-array name="TLA_priority_strings">
-      <item>máxima prioridad</item>
-      <item>alta prioridad</item>
-      <item>prioridad media</item>
-      <item>prioridad baja</item>
-  </string-array>
-  <!-- slide 22a -->
-  <string name="TLA_all_activity">Toda la actividad</string>
-  
-  <!-- ====================================================== TaskAdapter == -->
-  
-  <!-- Format string to indicate task is hidden (%s => task name) -->
-  <string name="TAd_hiddenFormat">%s [oculto]</string>
-  
-  <!-- Format string to indicate task is deleted (%s => task name) -->
-  <string name="TAd_deletedFormat">%s [borrado]</string>
-  
-  <!-- Displayed when adapter is flung (scrolled quickly) -->
-  
-  <!-- slide 22b: indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Terminado\n%s</string>
-  
-  <!-- slide 15a: Action Button: edit task -->
-  <string name="TAd_actionEditTask">Editar</string>
-  
-  <!-- Context Item: edit task -->
-  <string name="TAd_contextEditTask">Editar tarea</string>
-
-  <!-- Context Item: copy task -->
-  <string name="TAd_contextCopyTask">Copiar tarea</string>
-
-  <!-- Context Item: delete task -->
-  <string name="TAd_contextDeleteTask">Eliminar tarea</string>
-
-  <!-- Context Item: undelete task -->
-  <string name="TAd_contextUndeleteTask">Restaurar Tarea</string>
-
-  <!-- Context Item: purge task -->
-  <string name="TAd_contextPurgeTask">Purgar Tareas</string>
-  
-  <!-- ============================================== SortSelectionDialog == -->
-  
-  <!-- slide 23a: Sort Selection: dialog title -->    
-  <string name="SSD_title">Ordenar Subtareas y ocultas</string>
-  
-  <!-- slide 23h:  Hidden: title -->
-  <string name="SSD_hidden_title">Tareas Ocultas</string>
-  
-  <!-- Hidden Task Selection: show completed tasks -->    
-  <string name="SSD_completed">Mostrar Tareas Completadas</string>
-  
-  <!-- Hidden Task Selection: show hidden tasks -->    
-  <string name="SSD_hidden">Mostrar Tareas Ocultas</string>
-  
-  <!-- Hidden Task Selection: show deleted tasks -->    
-  <string name="SSD_deleted">Mostrar Tareas Eliminadas</string>
-  
-  <!-- Sort Selection: drag with subtasks -->
-  <string name="SSD_sort_drag">Manual order with subtasks</string>
-  
-  <!-- slide 23b: Sort Selection: smart sort -->
-  <string name="SSD_sort_auto">Clasificación Inteligente Astrid</string>
-  
-  <!-- slide 23e: Sort Selection: sort by alpha -->
-  <string name="SSD_sort_alpha">Por título</string>
-  
-  <!-- slide 23c: Sort Selection: sort by due date -->
-  <string name="SSD_sort_due">Por fecha límite</string>
-  
-  <!-- slide 23d: Sort Selection: sort by importance -->
-  <string name="SSD_sort_importance">Por prioridad</string>
-  
-  <!-- slide 23f: Sort Selection: sort by modified date -->
-  <string name="SSD_sort_modified">Por última modificación</string>
-  
-  <!-- slide 23g: Sort Selection: reverse -->
-  <string name="SSD_sort_reverse">Invertir Orden</string>
-  
-  <!-- slide 23j: Sort Button: sort temporarily -->
-  <string name="SSD_save_temp">Sólo una vez</string>
-  
-  <!-- slide 23i: Sort Button: sort permanently -->
-  <string name="SSD_save_always">Siempre</string>
-  
-  <!-- =============================================== FilterListActivity == -->
-  
-  <!-- Astrid Filter Shortcut -->    
-  <string name="FSA_label">Lista Astrid o Filtro</string>
-
-  <!-- Filter List Activity Title -->    
-  
-  <!-- Displayed when loading filters -->    
-  
-  <!-- Context Menu: Create Shortcut -->    
-  <string name="FLA_context_shortcut">Crear enlace en escritorio</string>
-  
-  <!-- Menu: Search -->
-  
-  <!-- Menu: Help -->    
-  
-  <!-- slide 28c: Create Shortcut Dialog Title -->    
-  <string name="FLA_shortcut_dialog_title">Crear acceso directo</string>
-  
-  <!-- Create Shortcut Dialog (asks to name shortcut) -->    
-  <string name="FLA_shortcut_dialog">Nombre del acceso directo:</string>
-  
-  <!-- Search Hint-->
-  <string name="FLA_search_hint">Buscar tareas</string>
-  
-  <!-- Search Filter name (%s => query) -->
-  <string name="FLA_search_filter">Coincidencias con \'%s\'</string>
-  
-  <!-- Toast: created shortcut (%s => label) -->
-  <string name="FLA_toast_onCreateShortcut">Acceso directo creado: %s</string>
-  
-  <!-- Menu: new filter -->
-  <string name="FLA_new_filter">Nuevo filtro</string>
-  
-  <!-- slide 10e: Button: new list -->
-  <string name="FLA_new_list">Nueva lista</string>
-  
-  <!-- Alert when creating a shortcut without selecting a filter -->
-  <string name="FLA_no_filter_selected">No hay filtro seleccionado! Por favor seleccione un filtro o lista.</string>
-  
-  <!-- ================================================= TaskEditActivity == -->
-  
-  <!-- Title when editing a task (%s => task title) -->
-  
-  <!-- Title when creating a new task -->
-  
-  <!-- Task title label -->
-  
-  <!-- Task when label -->
-  <string name="TEA_when_header_label">Cuando</string>
-  
-  <!-- Task title hint (displayed when edit box is empty) -->
-  <string name="TEA_title_hint">Nombre de la tarea</string>
-  
-  <!-- Task importance label -->
-  <string name="TEA_importance_label">Prioridad</string>
-  
-  <!-- Task due date hint -->
-  <string name="TEA_deadline_hint">Set due date</string>
-  
-  <!-- Task assigned to string (%s -> assigned person name) -->
-  <string name="TEA_assigned_to">Assigned to %s</string>
-  
-  <!-- Task urgency specific time checkbox -->
-  <string name="TEA_urgency_specific_time">A una hora específica?</string>
-  
-  <!-- Task urgency specific time title when specific time false -->
-  <string name="TEA_urgency_none">Ninguna</string>
-  
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_label">Ocultar hasta</string>
-
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_display">Hide until %s</string>
-  
-  <!-- Task hide until toast -->
-  <string name="TEA_hideUntil_message">La tarea estara oculta hasta %s</string>
-  
-  <!-- Task editing data being loaded label -->
-  <string-array name="TEA_loading"><item>Cargando…</item></string-array>
-  
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_note_label">Descripción</string>
-
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_notes_empty">Description...</string>
-  
-  <!-- Task note hint -->
-  <string name="TEA_notes_hint">Introducir descripción de la tarea...</string>
-  
-  <!-- Estimated time label -->
-  <string name="TEA_estimatedDuration_label">¿Cuanto tiempo llevará?</string>
-  
-  <!-- Elapsed time label -->
-  <string name="TEA_elapsedDuration_label">Tiempo ya empleado en la tarea</string>
-
-  <!-- Menu: Save -->    
-  <string name="TEA_menu_save">Guardar cambios</string>
-  
-  <!-- Menu: Don\'t Save -->
-  <string name="TEA_menu_discard">No guardar</string>
-  
-  <!-- Menu: Delete Task -->
-  <string name="TEA_menu_delete">Borrar Tarea</string>
-  
-  <!-- Menu: Task comments -->
-  <string name="TEA_menu_refresh_comments">Actualizar comentarios</string>
-
-  <string name="TEA_menu_comments">Comentarios</string>
-  
-   <!-- Toast: task saved with deadline (%s => preposition + time units) -->
-  <string name="TEA_onTaskSave_due">Tarea guardada: finaliza %s</string>
-  
-  <!-- Toast: task saved without deadlines -->
-  <string name="TEA_onTaskSave_notDue">Tarea guardada</string>
-  
-  <!-- Toast: task was not saved -->
-  
-  <!-- Toast: task was deleted -->
-  
-  <!-- slide 15b: Task edit tab: activity -->
-  <string name="TEA_tab_activity">Actividad</string>
-  
-  <!-- slide 15e:  Task edit tab: more editing settings -->
-  <string name="TEA_tab_more">Detalles</string>
-  
-  <!-- slide 15d: Task edit tab: web services -->
-  <string name="TEA_tab_web">Ideas</string>
-  
-  <string name="TEA_timer_est">Est. %s</string>
-
-  <string name="TEA_timer_elap">Elapsed %s</string>
-  
-  <string-array name="TEA_urgency">
-      <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
-      <item>Sin fecha</item>
-      <item>Día específico</item>
-      <item>Hoy</item>
-      <item>Mañana</item>
-      <item>(día siguiente)</item>
-      <item>Semana siguiente</item>
-      <item>en dos semanas</item>
-      <item>Mes siguiente</item>
-  </string-array>
-  
-  <string name="TEA_no_time">Sin horario</string>
-      
-  <string-array name="TEA_hideUntil">
-      <!-- hideUntil: labels for edit page. -->
-      <item>Nunca</item>
-      <item>Fecha de vencimiento</item>
-      <item>Due time</item>
-      <item>Day before due</item>
-      <item>Week before due</item>
-      <item>Día/Hora específicos</item>
-  </string-array>
-  
-  <!-- Task edit control set descriptors -->
-
-  <!-- slide 9b/35i -->
-  <string name="TEA_control_who">Quién</string>
-
-  <!-- slide 9c/ 35a -->
-  <string name="TEA_control_when">Cuando</string>
-  <!-- slide 35b -->
-  <string name="TEA_control_more_section">----Detalles----</string>
-  <!-- slide 16a/35c -->
-  <string name="TEA_control_importance">Prioridad</string>  
-  <!-- slide 16b/35d -->
-  <string name="TEA_control_lists">Listas</string>  
-  <!-- slide 16c/35e -->
-  <string name="TEA_control_notes">Descripción</string>  
-  
-  <string name="TEA_control_files">Archivos</string>
-
-  <!-- slide 16e / slide 35g-->
-  <string name="TEA_control_reminders">Recordatorios</string>
-
-  <!-- slide 16f -->
-  <string name="TEA_control_timer">Controles de tiempo</string>
-  
-  <string name="TEA_control_hidden_section">---Ocultar Siempre---</string>
-  
-  <string name="hide_until_prompt">Mostrar en mi lista</string>
-  
-  <!-- Add Ons tab when no add-ons found -->
-  
-  <!-- Add Ons button -->
-  
-  <!-- More row -->
-  
-  <!-- slide 15c: Text when no activity to show -->
-  <string name="TEA_no_activity">Sin actividad</string>
-  
-  <!-- Text to load more activity -->
-  <string name="TEA_load_more">Cargar mas...</string>
-  
-  <!-- When controls dialog -->
-  <string name="TEA_when_dialog_title">¿Para cuando esta previsto?</string>
-  
-  
-  <string name="TEA_new_task">Nueva Tarea</string>
-  
-  <string name="WSV_click_to_load">Púlsame para buscar forma de completarlo</string>
-  
-  <string name="WSV_not_online">Puedo hacer mas cuando estoy conectado a Internet. Por favor revisa tu conexión.</string>
-  
-  <string name="TEA_contact_error">¡Disculpa! No pudimos encontrar una dirección de email para el contacto seleccionado.</string>
-  
-  <!-- ============================================= IntroductionActivity == -->
-  
-  <!-- slide 1a: Introduction Window title -->
-  
-  <!-- Button to agree to EULA -->
-  
-  <!-- Button to disagree with EULA -->
-  
-  <!-- ===================================================== MissedCallActivity == -->
-  
-  <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
-  <string name="MCA_title">%1$s\nllamó a las %2$s</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_return_call">Llamar ahora</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_add_task">Llamar luego</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_ignore">Ignorar</string>
-  
-  <!-- Missed call: dialog to ignore all missed calls title -->
-  <string name="MCA_ignore_title">Ignorar todas las llamadas perdidas?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls body -->
-  <string name="MCA_ignore_body">Ha ignorado varias llamadas perdidas. ¿Quiere que Astrid deje de preguntarle sobre ellas?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore all button -->
-  <string name="MCA_ignore_all">Ignorar todas las llamadas</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
-  <string name="MCA_ignore_this">Ignorar solamente esta llamada</string>
-
-  <!-- Missed call: preference title -->
-  <string name="MCA_missed_calls_pref_title">Campo de llamadas perdidas</string>
-
-  <!-- slide 49c: Missed call: preference description -->
-  <string name="MCA_missed_calls_pref_desc_enabled">Astrid le notificará de las llamadas perdidas y le recordará que devuelva la llamada.</string>
-  <string name="MCA_missed_calls_pref_desc_disabled">Astrid no te notificara acerca de las llamadas perdidas</string>
-
-  <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
-  <string name="MCA_task_title_name">Devolver la llamada a %1$s al %2$s</string>
-
-  <!-- Missed call: task title no name (%s -> number)-->
-  <string name="MCA_task_title_no_name">Devolver la llamada a %s</string>
-  
-  <!-- Missed call: schedule dialog title (%s -> name or number)-->
-  <string name="MCA_schedule_dialog_title">Devolver la llamada a %s en...</string>
-  
-  <!-- Missed call speech bubble options -->
-  <string-array name="MCA_dialog_speech_options">
-      <item>Debe ser bueno ser tan popular!</item>
-      <item>¡Ey! ¡Le gustas a la gente!</item>
-      <item>Alégrales el día, ¡llámalos!</item>
-      <item>¿No te haría feliz que la gente te devolviera las llamadas?</item>
-      <item>¡Puedes hacerlo!</item>
-      <item>Siempre puede enviar un mensaje de texto...</item>
-  </string-array>
-  
-  
-  <!-- ======================================= Calendar reminder activity == -->
-  
-  <!-- Calendar remindeer ignore button -->
-  <string name="CRA_ignore">Ignorar</string>
-  
-  <!-- Calendar event -->
-  <string name="CRA_title">¿Necesita una lista de reuniones?</string>
-  
-  <!-- Calendar reminder: dialog to ignore all missed calls title -->
-  <string name="CRA_ignore_title">¿Ignorar todos los eventos del calendario?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls body -->
-  <string name="CRA_ignore_body">Ha ignorado varios eventos de calendario. ¿Debe Astrid dejar de preguntarle sobre ellos?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
-  <string name="CRA_ignore_all">Ignorar todos los eventos</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
-  <string name="CRA_ignore_this">Ignorar solo este evento</string>
-  
-  <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
-  <string name="CRA_speech_bubble_start">Parece que %s va a comenzar pronto. ¿Quiere crear una lista de acciones?</string>
-
-  <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
-  <string name="CRA_speech_bubble_end">Parece que acaba de terminar %s. ¿Quiere crear una lista de acciones?</string>
-  
-  <!-- Calendar reminder: create list button -->
-  <string name="CRA_create_list">Crear lista</string>
-
-  <!-- Calendar reminder: postpone button -->
-  <string name="CRA_postpone">Quizá después</string>
-  
-  <!-- Calendar reminder: list exists dialog title -->
-  <string name="CRA_list_exists_title">La lista ya existe</string>
-  
-  <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
-  <string name="CRA_list_exists_body">Ya hay una lista llamada %s. ¿Quiere usar la lista actual o crear una nueva para el evento?</string>
-  
-  <!-- Calendar reminder: list exists dialog create new button -->
-  <string name="CRA_create_new">Crear nuevo</string>
-
-  <!-- Calendar reminder: list exists dialog use existing button -->
-  <string name="CRA_use_existing">Usar existente</string>
-  
-  <!-- Calendar remindr: created list (%s -> list name) -->
-  <string name="CRA_created_list_dialog">Creé una lista %s.</string>
-  
-  <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
-  <string name="CRA_one_attendee">%s asistirá.</string>
-
-  <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
-  <string name="CRA_two_attendees">%1$s y %2$s asistirán.</string>
-
-  <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
-  <string name="CRA_many_attendees">%1$s, %2$s y %3$d más asistirán.</string>
-  
-  <!-- Calendar reminder: invitation prompt -->
-  <string name="CRA_invitation_prompt">¿Quiere invitarlos?</string>
-  
-  <!-- Calendar reminder: preference title -->
-  <string name="CRA_calendar_reminders_pref_title">Asistente de calendario</string>
-
-  <!-- Calendar reminder: pref description disabled -->
-  <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid no le volverá a recordar los próximos eventos de calendario</string>
-
-  <!-- Calendar reminder: pref description enabled -->
-  <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid le recordará los próximos eventos de calendario y le pedirá que se prepare para ellos</string>
-  
-  <!-- Calendar reminder: share list title -->
-  <string name="CRA_share_list_title">¿Compartir la lista?</string>
-  
-  <string name="CRA_invite_attendees">Invitar asistentes</string>
-
-  <string name="CRA_more_options">Más opciones</string>
-
-  <string name="CRA_dont_invite">No, gracias</string>
-
-  <!-- Calendar reminder: share list title when no other attendees exist-->
-  <string name="CRA_list_created_title">Lista creada</string>
-  
-  <!-- Calendar reminder: default new list name (%s -> event title) -->
-  <string name="CRA_default_list_name">Acciones: %s</string>
-  
-  <!-- ===================================================== HelpActivity == -->
-  
-  <!-- Help: Button to get support from our website -->
-    
-  <!-- ==================================================== UpdateService == -->
-  
-  <!-- Changelog Window Title -->
-  <string name="UpS_changelog_title">¿Que hay de nuevo en Astrid?</string>
-  
-  <!-- Updates Window Title -->
-  <string name="UpS_updates_title">Últimas Noticias de Astrid</string>
-  
-  <!-- Updats No Activity to show for offline users -->
-  <string name="UpS_no_activity_log_in">Inicie sesión para ver el registro de \nsu progreso, así como la \nactividad en las listas compartidas.</string>
-  
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 31g: Preference Window Title -->
-  <string name="EPr_title">Astrid: Preferencias</string>
-  
-  <string name="EPr_share_astrid">Compartir Astrid</string>
-
-  <string name="EPr_share_astrid_summary">Comparte Astrid en tu red social favorita</string>
-  
-  <!-- slide 46a -->
-  <string name="EPr_deactivated">desactivada</string>
-
-  <!-- slide 30i: Preference Category: Appearance Title -->
-  <string name="EPr_appearance_header">Apariencia</string>
-  
-  <!-- Preference Category: Appearance Summary -->
-  <string name="EPr_appearance_summary">Temas, widgets, filas de tareas, editar pantalla</string>
-  
-  <!-- FAQ Preference title -->
-  <string name="EPr_faq_title">FAQ (Preguntas frecuentes)</string>
-  
-  <!-- Account status preference (%s -> account type) -->
-  <string name="EPr_account_title">Cuenta: %s</string>
-
-  <!-- Support preferences summary -->
-  <string name="EPr_support_summary">Tutorial, FAQ (Preguntas frecuentes), Acerca de...</string>
-  
-  <!-- slide 34a: Preference: Task List Font Size Title -->
-  <string name="EPr_fontSize_title">Tamaño de la lista de tareas</string>
-  
-  <!-- Preference: Filters to show pref screen title -->
-  <string name="EPr_filters_to_show_title">Filtros a mostrar</string>
-  
-  <!-- slide 32a: Preference: Show confirmation for smart reminders -->
-  <string name="EPr_showSmartConfirmation_title">Mostrar confirmación para recordatorios inteligentes</string>
-  
-  <!-- slide 34g: Preference: Task List Font Size Description -->                                                                                                                                                  
-  <string name="EPr_fontSize_desc">Tamaño de letra en el listado de la página principal</string>  
-  
-  <!-- Preferemce: Show task edit confirmation toasts -->
-  
-  <!-- slide 34c: Preference: Task List Show Notes -->
-  <string name="EPr_showNotes_title">Mostrar descripción en tarea</string>
-  
-  <!-- Edit screen preference category -->
-  <string name="EPr_edit_screen_options">Editar opciones de pantalla</string>
-  
-  <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
-  <string name="EPr_beastMode_title">Editar el orden de pantalla</string>
-  
-  <string name="EPr_beastMode_shortcut">Personalizar</string>
-  
-  <string name="EPr_time_increment">Incrementos de 5 minutos</string>
-  
-  <string name="EPr_use_date_shortcuts">Utilizar abreviaturas de fecha</string>
-  
-  <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
-  
-  <!-- slide 35h -->
-  <string name="EPr_beastMode_desc">Personalizar la disposición de la pantalla de edición de tareas</string>
-  <!-- slide 35j -->
-  <string name="EPr_beastMode_reset">Restablecer valores predeterminados</string>
-  
-  <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on each row</string>
-      
-  <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit screen</string>  
-  <!-- Preference: Task List Show Notes Description (enabled) -->
-  <string name="EPr_showNotes_desc_enabled">La descripción se mostrará siempre</string>
-  
-  <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
-  <string name="EPr_compressTaskRows_title">Fila de tarea compacta</string>
-  <!-- slide 34j -->
-  <string name="EPr_compressTaskRows_desc">Comprimir las filas de la tarea para ajustar al título</string>
-  
-  <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
-  <!-- slide 34k-->
-  
-  <!-- slide 34b: Preferences: Wrap task titles to two lines -->
-  <string name="EPr_fullTask_title">Mostrar completo el título de la tarea</string>
-  <string name="EPr_fullTask_desc_enabled">Se mostrará completo el título de la tarea</string>
-  <!-- slide 34h -->
-  <string name="EPr_fullTask_desc_disabled">Las primeras dos lineas de las tareas serán mostradas</string>
-  
-  <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
-  <string name="EPr_ideaAuto_title">Auto cargar la pestaña Ideas</string>
-  <!-- slide 32c -->
-  <string name="EPr_ideaAuto_desc_enabled">La búsqueda para la pestaña Ideas se realizará cuando a la pestaña se le de clic</string>
-  <string name="EPr_ideaAuto_desc_disabled">La búsqueda para la pestaña Ideas se realizará solo cuando se solicite manualmente</string>
-  
-  <!-- Preferences: task row style -->
-  <string-array name="EPr_task_row_styles">
-      <item>Original</item>
-      <item>Simple</item>
-      <item>Solo título</item>
-  </string-array>
-  
-  <string-array name="EPr_task_row_style_descriptions">
-      <item>Truncar el título a dos líneas con la fecha a la derecha</item>
-      <item>Truncar el título a una línea con la fecha y listas debajo</item>
-      <item>Single line title only</item>
-  </string-array>
-  
-  <!-- task row style title (%s -> style) -->
-  <string name="EPr_task_row_style_title">Estilo de fila: %s</string>
-  
-  <!-- Preference: custom filters enabled -->
-  <string name="EPr_use_filters_title">Usar filtros</string>
-  <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
-
-  <!-- Preference: show list members in shared list -->
-  <string name="EPr_show_list_members_title">Show list members in shared lists</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_simple_input_boxes">Simple text boxes</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
-
-  <!-- Preference: don\'t show plus button until input present -->
-  <string name="EPr_hide_plus_button">Hide plus button</string>
-
-  <!-- Preference: menu items -->
-  <string name="EPr_menu_items">Objetos del menú</string>
-
-  <!-- Preference: list view -->
-  <string name="EPr_list_view">Vista de listas</string>
-
-  <!-- Preference: task edit comments -->
-  <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
-  
-  <!-- slide 30f/ 36f: Preference: Theme -->
-  <string name="EPr_theme_title">Combinación de colores</string>
-  <!-- Preference: Theme Description (%s => value) -->
-  <string name="EPr_theme_desc">Actualmente: %s</string>  
-  <!-- Preference: Theme Description (android 1.6) -->
-  <string name="EPr_theme_desc_unsupported">Esta configuración requiere Android 2.0+</string>
-  <!-- slide 32h/ 37b -->
-  <string name="EPr_theme_widget_title">Tema del widget</string>
-  
-  <!-- slide 30d/ 34f: Preference screen: all task row settings -->
-  <string name="EPr_taskRowPrefs_title">Apariencia de la fila de tareas</string>
-  
-  <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
-  <string name="EPr_use_contact_picker">Usar selector de contactos</string>
-  <!-- slide 49b -->
-  <string name="EPr_use_contact_picker_desc_enabled">El selector de contactos del sistema se mostrará en la pantalla de asignación de tareas</string>
-  <string name="EPr_use_contact_picker_desc_disabled">El selector de contactos del sistema no se mostrará</string>
-
-  <!-- slide 49i: Preferences: Third party addons -->
-  <string name="EPr_third_party_addons">Activar complementos de terceros</string>
-  <string name="EPr_third_party_addons_desc_enabled">Los complementos de terceros serán habilitados.</string>
-  <!-- slide 49d -->
-  <string name="EPr_third_party_addons_desc_disabled">Los complementos hechos por terceros se deshabilitarán</string>
-  
-  <!-- Preferences: ideas tab -->
-  <string name="EPr_ideas_tab_enabled">Ideas de tareas</string>
-  <string name="EPr_ideas_tab_description">Obtén ideas para ayudarte a completar tareas</string>
-  
-  <!-- Preferences: calendar event start time -->
-  <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
-  <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
-  <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
-  
-  <string name="EPr_force_phone_layout">Usar diseño de teléfono</string>
-
-  <string name="EPr_show_featured_lists">Mostrar listas destacadas</string>
-  
-  <!-- Configurations -->
-  <string name="EPr_configurations_title">Definir configuración</string>
-  <string name="EPr_config_default">Predeterminado</string>
-  <string name="EPr_config_lite">Astrid Lite</string>
-  
-  <!-- Dialog title when setting preference configuration -->
-  <string name="EPr_config_dialog_title">¿Definir configuración?</string>
-  <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
-  <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
-  
-  <!-- default configuration name for the above dialog -->
-  <string name="EPr_config_dialog_default_id">predeterminado</string>
-  
-  <!-- Preference title for showing save and cancel buttons in task edit page -->
-  <string name="EPr_show_save_and_cancel">Show save and cancel </string>
-  
-  
-  <!-- Swipe between lists -->
-  <!-- Preference: swipe between lists performance -->
-  <string name="EPr_swipe_lists_performance_title">Deslizar entre las listas</string>
-  
-  <string-array name="EPr_swipe_lists_performance_mode">
-      <item>Sin deslizar</item>
-      <item>Conservar memoria</item>
-      <item>Rendimiento Normal</item>
-      <item>Rendimiento Alto</item>
-  </string-array>
-  
-  <string-array name="EPr_swipe_lists_performance_desc">
-  <!-- slide 49a -->
-      <item>Deslizarse entre las listas esta deshabilitado</item>
-      <item>Rendimiento bajo</item>
-      <item>Configuración predeterminada</item>
-      <item>Utiliza más recursos del sistema</item>
-  </string-array>
-    
-  <string name="swipe_lists_helper_title">Deslizar entre listas</string>
-  <string name="swipe_lists_helper_header">Deslizar a izquierda o derecha para moverse rápidamente entre listas</string>
-  <string name="swipe_lists_helper_subtitle">Cambiar configuración en Ajustes -> Apariencia</string>
-
-  <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
-  
-  <string-array name="EPr_default_reminders_mode">
-      <!-- reminders duration: labels for "Task Defaults" preference item. -->
-      <item>@string/TEA_reminder_mode_once</item>
-      <item>@string/TEA_reminder_mode_five</item>
-      <item>@string/TEA_reminder_mode_nonstop</item>
-  </string-array>
-    
-  <string-array name="EPr_themes">
-    <!-- theme_settings: labels for Theme preference menu -->
-    <!-- slide 36a-->
-    <item>Día - Azul</item>
-    <!-- slide 36b -->
-    <item>Día - Rojo</item>
-    <!-- slide 36b -->
-    <item>Azul cielo</item>
-    <!-- slide 36c -->
-    <item>Noche</item>
-    <!-- slide 36d -->
-    <item>Transparent (white text)</item>
-    <!-- slide 36e -->
-    <item>Transparente (Texto Negro)</item>
-  </string-array>
-  
-  <string-array name="EPr_themes_widget">
-    <!-- slide 32i / 37a-->
-    <item>El mismo que la app</item>
-    <item>Día - Azul</item>
-    <item>Día - Rojo</item>
-    <item>Sky blue</item>
-    <item>Night</item>
-    <item>Transparent (white text)</item>
-    <item>Transparent (black text)</item>
-    <item>Estilo antiguo</item>
-  </string-array>
-  
-  <!-- ========================================== Task Management Settings == -->
-
-  <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
-  <string name="EPr_manage_header">Administrar tareas antiguas</string>
-  <!-- slide 47d -->
-  <string name="EPr_manage_delete_completed">Borrar tareas completadas</string>
-  <string name="EPr_manage_delete_completed_message">¿Seguro que desea borrar todas las tareas completadas?</string>
-  <!-- slide 47a -->
-  <string name="EPr_manage_delete_completed_summary">Las tareas borradas se pueden recuperar una a una</string>
-  <string name="EPr_manage_delete_completed_status">¡%d tareas borradas!</string>
-  <!-- slide 47e -->
-  <string name="EPr_manage_purge_deleted">Limpiar tareas eliminadas</string>
-  <string name="EPr_manage_purge_deleted_message">¿Seguro que desea limpiar todas las tareas eliminadas?\n\n¡Estas tareas se perderán por siempre!</string>
-  <string name="EPr_manage_purge_deleted_status">¡%d tareas purgadas!</string>
-  <!-- slide 47b-->
-  <string name="EPr_manage_purge_deleted_summary">¡Atención! Las tareas purgadas no se pueden recuperar sin su archivo de copia de seguridad!</string>
-  <!-- slide 47h-->
-  <string name="EPr_manage_clear_all">Limpiar todos los datos</string>
-  <string name="EPr_manage_clear_all_message">¿Borrar todas las tareas y configuraciones de Astrid?\n\n¡Advertencia: No hay vuelta atrás!</string>
-
-  <!-- slide 47f -->
-  <string name="EPr_manage_delete_completed_gcal">Borrar eventos del calendario para las tareas completas</string>
-  <string name="EPr_manage_delete_completed_gcal_message">¿Seguro que realmente desea borrar todas las tareas completadas?</string>
-  <string name="EPr_manage_delete_completed_gcal_summary"></string>
-  <string name="EPr_manage_delete_completed_gcal_status">Borrados %d eventos del calendario!</string>
-      
-  <!-- slide 47g-->
-  <string name="EPr_manage_delete_all_gcal">Borrar todos los eventos del calendario de las tareas</string>
-  <string name="EPr_manage_delete_all_gcal_message">¿Seguro que quieres borrar todos tus eventos para las tareas?</string>
-  <string name="EPr_manage_delete_all_gcal_summary"></string>
-  <string name="EPr_manage_delete_all_gcal_status">¡Borrados %d eventos del calendario!</string>
-      
-  <!-- ==================================================== AddOnActivity == -->
-  
-  <!-- Add Ons Activity Title -->
-  <string name="AOA_title">Complementos</string>
-    
-  <!-- Add-on Activity: author for internal authors  -->
-  <string name="AOA_internal_author">Equipo de Astrid</string>
-    
-  <!-- Add-on Activity: installed add-ons tab -->
-  <string name="AOA_tab_installed">Instalado</string>
-  
-  <!-- Add-on Activity - available add-ons tab -->
-  <string name="AOA_tab_available">Disponible</string>
-  
-  <!-- Add-on Activity - free add-ons label -->
-  <string name="AOA_free">Gratis</string>
-  
-  <!-- Add-on Activity - menu item to visit add-on website -->
-  
-  <!-- Add-on Activity - menu item to visit android market -->
-  
-  <!-- Add-on Activity - when list is empty -->
-  <string name="AOA_no_addons">¡Lista vacía!</string>
-  
-  <string name="AOA_ppack_title">Astrid Power Pack</string>
-  <string name="AOA_ppack_description">Apoya a Astrid y sé más productivo con el Astrid Power Pack. Widgets de 4x2 y 4x4 e integración de voz. ¡Actualiza hoy!</string>
-  <string name="AOA_locale_title">Complemento Astrid Locale</string>
-  <string name="AOA_locale_description">Permitir a Astrid utilizar la aplicación Locale para enviarle notificaciones basadas en filtros. Requiere el complemento Locale.</string>
-  
-  <!-- ====================================================== TasksWidget == -->
-
-  <!-- Widget text when loading tasks -->
-  <string name="TWi_loading">Cargando…</string>
-
-  <!-- Widget configuration activity title: select a filter -->
-  <string name="WCA_title">Seleccione las tareas que ver...</string>
-  
-  <!-- ======================================================== Waiting on me -->
-
-  <string name="wom_commented">%s commented on your task.</string>
-  <string name="wom_mentioned">%s mentioned you.</string>
-  <string name="wom_assigned">%s assigned this to you.</string>
-  <string name="wom_raised_pri">%s raised the priority.</string>
-  <string name="wom_changed_due">%s changed the due date.</string>
-  <string name="wom_default">%s wants your attention.</string>
-  
-  <string name="wom_dismiss">Dismiss</string>
-  <string name="wom_acknowledge">I\'ve read this</string>
-
-  <!-- ============================================================= About == -->
-  
-  <!-- slide 30h: Title of "About" option in settings -->
-  <string name="p_about">Sobre Astrid</string>
-  
-  <!-- About text (%s => current version)-->
-  <string name="p_about_text">Versión actual: %s\n\n Astrid es código abierto y orgullosamente mantenido por Todoroo, Inc.</string>
-
-  <!-- Title of "Help" option in settings -->
-  <string name="p_help">Soporte</string>
-  
-  <!-- slide 30c: Title of "Forums" option in settings -->
-  <string name="p_forums">Foros</string>
-  
-  <!-- Title of "Premium" option in settings -->
-  <string name="p_premium">Premium</string>
-  
-  <!-- ============================================================= Misc == -->
-  
-  <string name="feedback_positive_title">Rate Astrid?</string>
-
-  <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star rating?</string>
-
-  <string name="feedback_negative_title">Leave feedback?</string>
-
-  <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
-
-  <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback section--it might not be available on your device.</string>
-  
-  <string name="feedback_positive_button">Rate Astrid</string>
-
-  <string name="feedback_negative_button">Leave feedback</string>
-  
-  <string name="feedback_not_now">Not now</string>
-  
-  <string name="feedback_banner_text">How\'s Astrid working for you?</string>
-  
-  <!-- Displayed when task killer found. %s => name of the application -->
-  <string name="task_killer_help">¡Parece que está usando una app que puede matar procesos (%s)! Si puede, 
-agregue Astrid a la lista de exclusión para que no se cierre. Si no lo hace, 
-Astrid podría no avisarle cuanto venza una tarea.\n</string>
-  
-  <!-- Task killer dialog ok button -->
-  <string name="task_killer_help_ok">¡No cerraré Astrid!</string>
-    
-  <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
-  
-  <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
-  <string name="marketplace_description">Astrid es el administrador de listas/tareas de código abierto más querido diseñado específicamente para ayudarte a conseguir terminar tus tareas/cosas. Entre sus características se incluye recordatorios, etiquetas, sincronización, un complemento para Locale, un widget y mucho más.</string>
-  
-  <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 Astrid."</string>
-      
-  <string name="market_unavailable">Desafortunadamente el Market no está disponible para tu sistema</string>
-  
+    <!-- Add-on Activity - available add-ons tab -->
+    <string name="AOA_tab_available">Disponible</string>
+
+    <!-- Add-on Activity - free add-ons label -->
+    <string name="AOA_free">Gratis</string>
 
+    <!-- Add-on Activity - menu item to visit add-on website -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Add-on Activity - menu item to visit android market -->
+
+    <!-- Add-on Activity - when list is empty -->
+    <string name="AOA_no_addons">¡Lista vacía!</string>
+
+    <string name="AOA_ppack_title">Astrid Power Pack</string>
+    <string name="AOA_ppack_description">Apoya a Astrid y sé más productivo con el Astrid Power
+        Pack. Widgets de 4x2 y 4x4 e integración de voz. ¡Actualiza hoy!
+    </string>
+    <string name="AOA_locale_title">Complemento Astrid Locale</string>
+    <string name="AOA_locale_description">Permitir a Astrid utilizar la aplicación Locale para
+        enviarle notificaciones basadas en filtros. Requiere el complemento Locale.
+    </string>
+
+    <!-- ====================================================== TasksWidget == -->
 
+    <!-- Widget text when loading tasks -->
+    <string name="TWi_loading">Cargando…</string>
 
-  <!-- slide 32g: Preference Category: Defaults Title -->
-  <string name="EPr_defaults_header">Configuración por defecto de nuevas tareas.</string>
-  <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
-  
-  <!-- slide 41f:  Preference: Default Urgency Title -->
-  <string name="EPr_default_urgency_title">Fecha límite por defecto</string>
-  <!-- Preference: Default Urgency Description (%s => setting) -->
-  <string name="EPr_default_urgency_desc">Actualmente: %s</string>
-  
-  <!-- slide 40a: Preference: Default Importance Title -->
-  <string name="EPr_default_importance_title">Prioridad predeterminada</string>
-  <!-- Preference: Default Importance Description (%s => setting) -->
-  <string name="EPr_default_importance_desc">Actualmente: %s</string>
-  
-  <!-- slide 42e: Preference: Default Hide Until Title -->
-  <string name="EPr_default_hideUntil_title">Ocultar por defecto hasta</string>
-  <!-- Preference: Default Hide Until Description (%s => setting) -->
-  <string name="EPr_default_hideUntil_desc">Actualmente: %s</string>
-  
-  <!-- slide 43e: Preference: Default Reminders Title -->
-  <string name="EPr_default_reminders_title">Recordatorios por defecto</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_desc">Actualmente: %s</string>
-  
-  <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
-  <string name="EPr_default_addtocalendar_title">Por defecto, agregar al calendario</string>
-  <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
-  <string name="EPr_default_addtocalendar_desc_disabled">Las nuevas tareas no crearán un evento en Google Calendar</string>
-  <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
-  <string name="EPr_default_addtocalendar_desc">Las nuevas tareas estarán en el calendario: \"%s\"</string>
-  
-  <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
-  <string name="EPr_default_reminders_mode_title">Tipo predeterminado de timbre/vibración</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_mode_desc">Actualmente: %s</string>
-  
-  <string-array name="EPr_default_importance">
-    <!-- importance: labels for "Task Defaults" preference item. -->
-    <!-- slide 40b -->
-    <item>!!! (máximo)</item>
-    <item>!!</item>
-    <item>!</item>
-    <!-- slide 40c -->
-    <item>o (Mínimo)</item>
-  </string-array>
-  
-  <string-array name="EPr_default_urgency">
-    <!-- urgency: labels for "Task Defaults" preference item. -->
-    <!-- slide 41a-->
-    <item>Sin fecha límite</item>
-    <!-- slide 41b -->
-    <item>Hoy</item>
-    <!-- slide 41c-->
-    <item>Mañana</item>
-    <!-- slide 41d -->
-    <item>Pasado mañana</item>
-    <!-- slide 41e -->
-    <item>Próxima semana</item>
-  </string-array>
-  
-  <string-array name="EPr_default_hideUntil">
-    <!-- hideUntil: labels for "Task Defaults" preference item. -->
-    <!-- slide 42a -->
-    <item>No ocultar</item>
-    <!-- slide 42b -->
-    <item>Tarea vencida</item>
-    <!-- slide 42c -->
-    <item>Día antes de fecha límite</item>
-    <!-- slide 42d-->
-    <item>Semana antes de fecha límite</item>
-  </string-array>
-  
-  <string-array name="EPr_default_reminders">
-    <!-- reminders: labels for "Task Defaults" preference item. -->
-    <!-- slide 43a -->
-    <item>Sin recordatorios de fecha límite</item>
-    <!-- slide 43b -->
-    <item>En fecha límite</item>
-    <!-- slide 43c -->
-    <item>Cuando esté atrasada</item>
-    <!-- slide 43d -->
-    <item>En fecha límite o atrasada</item>
-  </string-array>
-  
-  <string-array name="EPr_default_addtocalendar">
-    <!-- addtocalendar: labels for "Task Defaults" preference item. -->
-    <item>@string/EPr_deactivated</item>
-  </string-array>      
+    <!-- Widget configuration activity title: select a filter -->
+    <string name="WCA_title">Seleccione las tareas que ver...</string>
 
+    <!-- ======================================================== Waiting on me -->
+
+    <string name="wom_commented">%s commented on your task.</string>
+    <string name="wom_mentioned">%s mentioned you.</string>
+    <string name="wom_assigned">%s assigned this to you.</string>
+    <string name="wom_raised_pri">%s raised the priority.</string>
+    <string name="wom_changed_due">%s changed the due date.</string>
+    <string name="wom_default">%s wants your attention.</string>
+
+    <string name="wom_dismiss">Dismiss</string>
+    <string name="wom_acknowledge">I\'ve read this</string>
+
+    <!-- ============================================================= About == -->
+
+    <!-- slide 30h: Title of "About" option in settings -->
+    <string name="p_about">Sobre Astrid</string>
+
+    <!-- About text (%s => current version)-->
+    <string name="p_about_text">Versión actual: %s\n\n Astrid es código abierto y orgullosamente
+        mantenido por Todoroo, Inc.
+    </string>
+
+    <!-- Title of "Help" option in settings -->
+    <string name="p_help">Soporte</string>
+
+    <!-- slide 30c: Title of "Forums" option in settings -->
+    <string name="p_forums">Foros</string>
+
+    <!-- Title of "Premium" option in settings -->
+    <string name="p_premium">Premium</string>
+
+    <!-- ============================================================= Misc == -->
+
+    <string name="feedback_positive_title">Rate Astrid?</string>
+
+    <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star
+        rating?
+    </string>
+
+    <string name="feedback_negative_title">Leave feedback?</string>
+
+    <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
+
+    <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback
+        section--it might not be available on your device.
+    </string>
+
+    <string name="feedback_positive_button">Rate Astrid</string>
+
+    <string name="feedback_negative_button">Leave feedback</string>
+
+    <string name="feedback_not_now">Not now</string>
+
+    <string name="feedback_banner_text">How\'s Astrid working for you?</string>
+
+    <!-- Displayed when task killer found. %s => name of the application -->
+    <string name="task_killer_help">¡Parece que está usando una app que puede matar procesos (%s)!
+        Si puede,
+        agregue Astrid a la lista de exclusión para que no se cierre. Si no lo hace,
+        Astrid podría no avisarle cuanto venza una tarea.\n
+    </string>
+
+    <!-- Task killer dialog ok button -->
+    <string name="task_killer_help_ok">¡No cerraré Astrid!</string>
+
+    <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
+
+    <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
+    <string name="marketplace_description">Astrid es el administrador de listas/tareas de código
+        abierto más querido diseñado específicamente para ayudarte a conseguir terminar tus
+        tareas/cosas. Entre sus características se incluye recordatorios, etiquetas, sincronización,
+        un complemento para Locale, un widget y mucho más.
+    </string>
+
+    <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 Astrid."
+    </string>
+
+    <string name="market_unavailable">Desafortunadamente el Market no está disponible para tu
+        sistema
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 32g: Preference Category: Defaults Title -->
+    <string name="EPr_defaults_header">Configuración por defecto de nuevas tareas.</string>
+    <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
+
+    <!-- slide 41f:  Preference: Default Urgency Title -->
+    <string name="EPr_default_urgency_title">Fecha límite por defecto</string>
+    <!-- Preference: Default Urgency Description (%s => setting) -->
+    <string name="EPr_default_urgency_desc">Actualmente: %s</string>
+
+    <!-- slide 40a: Preference: Default Importance Title -->
+    <string name="EPr_default_importance_title">Prioridad predeterminada</string>
+    <!-- Preference: Default Importance Description (%s => setting) -->
+    <string name="EPr_default_importance_desc">Actualmente: %s</string>
+
+    <!-- slide 42e: Preference: Default Hide Until Title -->
+    <string name="EPr_default_hideUntil_title">Ocultar por defecto hasta</string>
+    <!-- Preference: Default Hide Until Description (%s => setting) -->
+    <string name="EPr_default_hideUntil_desc">Actualmente: %s</string>
+
+    <!-- slide 43e: Preference: Default Reminders Title -->
+    <string name="EPr_default_reminders_title">Recordatorios por defecto</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_desc">Actualmente: %s</string>
+
+    <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
+    <string name="EPr_default_addtocalendar_title">Por defecto, agregar al calendario</string>
+    <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
+    <string name="EPr_default_addtocalendar_desc_disabled">Las nuevas tareas no crearán un evento en
+        Google Calendar
+    </string>
+    <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
+    <string name="EPr_default_addtocalendar_desc">Las nuevas tareas estarán en el calendario:
+        \"%s\"
+    </string>
+
+    <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
+    <string name="EPr_default_reminders_mode_title">Tipo predeterminado de timbre/vibración</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_mode_desc">Actualmente: %s</string>
+
+    <string-array name="EPr_default_importance">
+        <!-- importance: labels for "Task Defaults" preference item. -->
+        <!-- slide 40b -->
+        <item>!!! (máximo)</item>
+        <item>!!</item>
+        <item>!</item>
+        <!-- slide 40c -->
+        <item>o (Mínimo)</item>
+    </string-array>
+
+    <string-array name="EPr_default_urgency">
+        <!-- urgency: labels for "Task Defaults" preference item. -->
+        <!-- slide 41a-->
+        <item>Sin fecha límite</item>
+        <!-- slide 41b -->
+        <item>Hoy</item>
+        <!-- slide 41c-->
+        <item>Mañana</item>
+        <!-- slide 41d -->
+        <item>Pasado mañana</item>
+        <!-- slide 41e -->
+        <item>Próxima semana</item>
+    </string-array>
+
+    <string-array name="EPr_default_hideUntil">
+        <!-- hideUntil: labels for "Task Defaults" preference item. -->
+        <!-- slide 42a -->
+        <item>No ocultar</item>
+        <!-- slide 42b -->
+        <item>Tarea vencida</item>
+        <!-- slide 42c -->
+        <item>Día antes de fecha límite</item>
+        <!-- slide 42d-->
+        <item>Semana antes de fecha límite</item>
+    </string-array>
+
+    <string-array name="EPr_default_reminders">
+        <!-- reminders: labels for "Task Defaults" preference item. -->
+        <!-- slide 43a -->
+        <item>Sin recordatorios de fecha límite</item>
+        <!-- slide 43b -->
+        <item>En fecha límite</item>
+        <!-- slide 43c -->
+        <item>Cuando esté atrasada</item>
+        <!-- slide 43d -->
+        <item>En fecha límite o atrasada</item>
+    </string-array>
+
+    <string-array name="EPr_default_addtocalendar">
+        <!-- addtocalendar: labels for "Task Defaults" preference item. -->
+        <item>@string/EPr_deactivated</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in filter plug-in -->
-    
+
     <!-- ================================================= Filter Exposer == -->
-    
+
     <!-- Active Tasks Filter -->
     <string name="BFE_Active">Mis Tareas</string>
-    
+
     <!-- Waiting on me filter -->
     <string name="BFE_waiting_on_me">Waiting On Me</string>
-        
+
     <!-- Search Filter -->
-    
+
     <!-- slide 10b: Recently Modified -->
     <string name="BFE_Recent">Recién modificadas</string>
-    
+
     <!-- slide 10c: I\'ve assigned -->
     <string name="BFE_Assigned">Yo he asignado</string>
-    
+
     <!-- Build Your Own Filter -->
-    
+
     <!-- Saved Filters Header -->
-    
+
     <!-- Saved Filters Context Menu: delete -->
     <string name="BFE_Saved_delete">Borrar filtro</string>
 
     <!-- =========================================== CustomFilterActivity == -->
-    
+
     <!-- slide 30d: Build Your Own Filter Activity Title-->
     <string name="CFA_title">Filtro Personalizado</string>
-    
+
     <!-- slide 30e: Filter Name edit box hint (if user types here, filter will be saved) -->
     <string name="CFA_filterName_hint">Da nombre al filtro para grabarlo...</string>
-    
+
     <!-- Filter Name default for copied filters (%s => old filter name) -->
-    
+
     <!-- slide 30a: Filter Starting Universe: all tasks -->
     <string name="CFA_universe_all">Tareas activas</string>
-    
+
     <!-- Filter Criteria Type: add (at the begging of title of the criteria) -->
     <string name="CFA_type_add">o</string>
-    
+
     <!-- Filter Criteria Type: subtract (at the begging of title of the criteria) -->
     <string name="CFA_type_subtract">no</string>
-    
+
     <!-- Filter Criteria Type: intersect (at the begging of title of the criteria) -->
     <string name="CFA_type_intersect">también</string>
-    
+
     <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
     <string name="CFA_context_chain">%s cumple el criterio</string>
-    
+
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">Eliminar fila</string>
-    
+
     <!-- slide 30b: Filter Screen Help Text -->
     <string name="CFA_help">Long press on items for additional options</string>
-    
+
     <!-- slide 30c: Filter Button: add new -->
     <string name="CFA_button_add">Añadir Criterio</string>
-    
+
     <!-- slide 30f: Filter Button: view without saving -->
     <string name="CFA_button_view">Ver</string>
-    
+
     <!-- Filter Button: save & view filter -->
     <string name="CFA_button_save">Guardar &amp; ver</string>
 
     <!-- =========================================== CustomFilterCriteria == -->
-        
+
     <!-- Criteria: due by X - display text (? -> user input) -->
     <string name="CFC_dueBefore_text">Vence el: ?</string>
     <!-- Criteria: due by X - name of criteria -->
@@ -1699,327 +1867,355 @@ Astrid podría no avisarle cuanto venza una tarea.\n</string>
         <item>Próxima semana</item>
         <item>Próximo mes</item>
     </string-array>
-    
+
     <!-- Criteria: importance - display text (? -> user input)-->
     <string name="CFC_importance_text">Priority at least ?</string>
     <!-- Criteria: importance - name of criteria -->
-    <string name="CFC_importance_name">Prioridad...</string>        
-    
+    <string name="CFC_importance_name">Prioridad...</string>
+
     <!-- Criteria: tag - display text (? -> user input) -->
     <string name="CFC_tag_text">Lista: ?</string>
     <!-- Criteria: tag - name of criteria -->
     <string name="CFC_tag_name">Lista...</string>
-    
+
     <!-- Criteria: tag_contains - name of criteria -->
     <string name="CFC_tag_contains_name">El nombre de la lista contiene...</string>
     <!-- Criteria: tag_contains - text (? -> user input) -->
     <string name="CFC_tag_contains_text">El nombre de la lista contiene: ?</string>
-    
+
     <!-- Criteria: title_contains - name of criteria -->
     <string name="CFC_title_contains_name">Título contiene...</string>
     <!-- Criteria: title_contains - text (? -> user input) -->
     <string name="CFC_title_contains_text">Título contiene: ?</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-  
-  <!-- Error message for adding to calendar  -->
-  <string name="gcal_TEA_error">¡Ocurrió un error al agregar la tarea al calendario!</string>
-
-  <!-- Label for adding task to calendar -->
-
-  <!-- slide 21c: Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">Agregar al calendario</string>
-  
-  <!-- Label when calendar event already exists -->
-  <string name="gcal_TEA_showCalendar_label">Abrir evento del calendario</string>
-  
-  <!-- Toast when unable to open calendar event -->
-  
-  <!-- Toast when calendar event updated because task changed -->
-  <string name="gcal_TEA_calendar_updated">También actualizado el evento de calendario!</string>
-  
-  <!-- No calendar label (don\'t add option) -->
-  <string name="gcal_TEA_nocal">No agregar</string>
-  
-  <string name="gcal_TEA_none_selected">¿Al calendario?</string>
-  
-  <string name="gcal_TEA_has_event">Evento de llamada</string>
-  
-  <!-- ======================================================== Calendars == -->
-  
-  <!-- Calendar event name when task is completed (%s => task title) -->
-  <string name="gcal_completed_title">%s (completado)</string>
-
-  <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
-  <string name="gcal_GCP_default">Calendario predeterminado</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Error message for adding to calendar  -->
+    <string name="gcal_TEA_error">¡Ocurrió un error al agregar la tarea al calendario!</string>
 
+    <!-- Label for adding task to calendar -->
 
+    <!-- slide 21c: Label for adding task to calendar -->
+    <string name="gcal_TEA_addToCalendar_label">Agregar al calendario</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Label when calendar event already exists -->
+    <string name="gcal_TEA_showCalendar_label">Abrir evento del calendario</string>
+
+    <!-- Toast when unable to open calendar event -->
+
+    <!-- Toast when calendar event updated because task changed -->
+    <string name="gcal_TEA_calendar_updated">También actualizado el evento de calendario!</string>
+
+    <!-- No calendar label (don\'t add option) -->
+    <string name="gcal_TEA_nocal">No agregar</string>
+
+    <string name="gcal_TEA_none_selected">¿Al calendario?</string>
+
+    <string name="gcal_TEA_has_event">Evento de llamada</string>
+
+    <!-- ======================================================== Calendars == -->
+
+    <!-- Calendar event name when task is completed (%s => task title) -->
+    <string name="gcal_completed_title">%s (completado)</string>
+
+    <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
+    <string name="gcal_GCP_default">Calendario predeterminado</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ============================================================= UI == -->
 
     <!-- filters header: GTasks -->
     <string name="gtasks_FEx_header">Tareas de Google</string>
-    
+
     <!-- filter category for GTasks lists -->
-    
+
     <!-- filter title for GTasks lists (%s => list name) -->
     <string name="gtasks_FEx_title">Google Tasks: %s</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_creating_list">Creando lista...</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_create_list_dialog">Nuevo nombre de lista:</string>
-    
+
     <!-- error to show when list creation fails -->
     <string name="gtasks_FEx_create_list_error">Error al crear la nueva lista</string>
-    
+
     <!-- short help title for Gtasks -->
-    
+
     <string name="CFC_gtasks_list_text">En la Lista: ?</string>
 
     <string name="CFC_gtasks_list_name">en la Lista GTasks...</string>
-    
+
     <!-- Message while clearing completed tasks -->
     <string name="gtasks_GTA_clearing">Limpiando tareas completadas...</string>
-    
+
     <!-- Label for clear completed menu item -->
     <string name="gtasks_GTA_clear_completed">Quitar finalizadas</string>
-        
+
     <!-- ============================================ GtasksLoginActivity == -->
-    
-    <!-- Activity Title: Gtasks Login -->    
 
-    <!-- Instructions: Gtasks login -->    
-    <string name="gtasks_GLA_body">Por favor inicia sesión en Google Tasks Sync (Beta!). Las cuentas de Google Apps sin migrar no están soportadas actualmente.</string>
-    
-    <string name="gtasks_GLA_noaccounts">No hay disponible una cuenta de Google con la cual sincronizarse.</string>
+    <!-- Activity Title: Gtasks Login -->
 
-    <!-- Instructions: Gtasks further help -->    
-    <string name="gtasks_GLA_further_help">Para visualizar sus tareas con sangría y orden preservado,
-vaya a Filtros y seleccione una lista de Google Tasks. 
-Por defecto, Astrid usa sus propias configuraciones de ordenación para tareas.</string>
+    <!-- Instructions: Gtasks login -->
+    <string name="gtasks_GLA_body">Por favor inicia sesión en Google Tasks Sync (Beta!). Las cuentas
+        de Google Apps sin migrar no están soportadas actualmente.
+    </string>
 
-    <!-- Sign In Button -->    
+    <string name="gtasks_GLA_noaccounts">No hay disponible una cuenta de Google con la cual
+        sincronizarse.
+    </string>
 
-    <!-- E-mail Address Label -->    
+    <!-- Instructions: Gtasks further help -->
+    <string name="gtasks_GLA_further_help">Para visualizar sus tareas con sangría y orden
+        preservado,
+        vaya a Filtros y seleccione una lista de Google Tasks.
+        Por defecto, Astrid usa sus propias configuraciones de ordenación para tareas.
+    </string>
+
+    <!-- Sign In Button -->
+
+    <!-- E-mail Address Label -->
+
+    <!-- Password Label -->
 
-    <!-- Password Label -->    
-    
     <!--  Authenticating toast -->
     <string name="gtasks_GLA_authenticating">Autenticando...</string>
-    
+
     <!-- Google Apps for Domain checkbox -->
 
-    <!-- Error Message when fields aren\'t filled out -->    
+    <!-- Error Message when fields aren\'t filled out -->
 
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
-    <string name="gtasks_GLA_errorAuth">¡Error de autenticación! ¡Por favor revisa tu nombre de usuario y contraseña en el administrador de cuentas de tu teléfono!</string>
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
+    <string name="gtasks_GLA_errorAuth">¡Error de autenticación! ¡Por favor revisa tu nombre de
+        usuario y contraseña en el administrador de cuentas de tu teléfono!
+    </string>
 
-    <!-- Error Message when we receive an IO Exception -->    
-    <string name="gtasks_GLA_errorIOAuth">Perdón, hubo un problema al comunicarse con los servidores de Google. Por favor inténtalo mas tarde.</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->    
+    <!-- Error Message when we receive an IO Exception -->
+    <string name="gtasks_GLA_errorIOAuth">Perdón, hubo un problema al comunicarse con los servidores
+        de Google. Por favor inténtalo mas tarde.
+    </string>
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->
     <string name="gtasks_GLA_errorAuth_captcha">Puedes haber encontrado un captcha.
-Intenta acceder desde el navegador, a continuación vuelve a reintentarlo nuevamente:</string>
-    
+        Intenta acceder desde el navegador, a continuación vuelve a reintentarlo nuevamente:
+    </string>
+
     <!-- ============================================== GtasksPreferences == -->
 
-    <!-- GTasks Preferences Title -->    
+    <!-- GTasks Preferences Title -->
     <string name="gtasks_GPr_header">Google Tasks</string>
-    
-    <!-- ================================================ Synchronization == -->    
-    
+
+    <!-- ================================================ Synchronization == -->
+
     <!-- title for notification tray when synchronizing -->
 
     <!-- Error Message when we receive a HTTP 503 error -->
-    <string name="gtasks_error_backend">La API de Google Tasks está aun en beta y ha encontrado un error. El servicio tal vez no esté disponible, por favor inténtalo mas tarde.</string>
-    
+    <string name="gtasks_error_backend">La API de Google Tasks está aun en beta y ha encontrado un
+        error. El servicio tal vez no esté disponible, por favor inténtalo mas tarde.
+    </string>
+
     <!-- Error for account not found -->
-    <string name="gtasks_error_accountNotFound">No se ha encontrado la cuenta %s --por favor, cierra sesión y vuelve a iniciarla desde la configuración de Google Tasks</string>
-    
+    <string name="gtasks_error_accountNotFound">No se ha encontrado la cuenta %s --por favor, cierra
+        sesión y vuelve a iniciarla desde la configuración de Google Tasks
+    </string>
+
     <!-- Error when ping after refreshing token fails -->
-    <string name="gtasks_error_authRefresh">No se pudo autenticar con Google Tasks. Por favor revisa la contraseña de tu cuenta o intenta de nuevo mas tarde.</string>
-    
+    <string name="gtasks_error_authRefresh">No se pudo autenticar con Google Tasks. Por favor revisa
+        la contraseña de tu cuenta o intenta de nuevo mas tarde.
+    </string>
+
     <!-- Error when account manager returns no auth token or throws exception -->
-    <string name="gtasks_error_accountManager">Error en el administrador de cuentas de tu teléfono. Por favor reinicia sesión desde la configuración de Google Tasks.</string>
+    <string name="gtasks_error_accountManager">Error en el administrador de cuentas de tu teléfono.
+        Por favor reinicia sesión desde la configuración de Google Tasks.
+    </string>
 
     <!-- Error when authorization error happens in background sync -->
-    <string name="gtasks_error_background_sync_auth">Error al autenticarse en un segundo plano. Por favor, intente iniciar la sincronización mientras Astrid está ejecutándose.</string>
-      
+    <string name="gtasks_error_background_sync_auth">Error al autenticarse en un segundo plano. Por
+        favor, intente iniciar la sincronización mientras Astrid está ejecutándose.
+    </string>
+
     <string name="gtasks_import_progress">Importing Google Tasks...</string>
 
-    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you still want to add the task %2$s to it?</string>
+    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you
+        still want to add the task %2$s to it?
+    </string>
 
     <string name="gtasks_import_dlg_title">Google Tasks Import</string>
 
     <string name="gtasks_import_add_task_ok">Añadir tarea</string>
 
     <string name="gtasks_import_add_task_cancel">No añadir tarea</string>
-        
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- NEW USER EXPERIENCE -->
-  
-  <!-- help bubbles -->
-  <!-- slide 8c: Shown the first time a user sees the task list activity -->
-  <string name="help_popover_add_task">Comience agregando una o varias tareas</string>
-
-  <!-- Shown the first time a user adds a task to a list -->  
-  <string name="help_popover_tap_task">Pulsa la tarea para editar y compartir</string>
-  
-  <!-- slide 14a: Shown the first time a user sees the list activity -->
-  <string name="help_popover_list_settings">Pulsa para editar o compartir esta lista</string>
-  
-  <!-- slide 26c: Shown the first time a user sees the list settings tab -->
-  <string name="help_popover_collaborators">La gente con quien compartes puede\nayudar a hacer tu lista o completar tareas.</string>
-  
-  <!-- Shown after user adds a task on tablet-->
-  <string name="help_popover_add_lists">Presiona para agregar una lista</string>
-  
-  <!-- Shown after a user adds a task on phones -->
-  <string name="help_popover_switch_lists">Toca para agregar una lista o cambiar entre listas</string>
-  
-  
-  
-  <!-- Login activity -->
-  
-  
-  <!-- slide 7b -->
-  <string name="welcome_login_tos_base">Al usar Astrid estás de acuerdo con el</string>
-  
-  <string name="welcome_login_tos_link">Términos del servicio</string>
-  
-  <!-- slide 7e -->
-  <string name="welcome_login_pw">Registrarse</string>
-  
-  <string name="welcome_sign_in">Iniciar sesión</string>
-
-  <!-- slide 7f -->
-  <string name="welcome_login_later">Más tarde</string>
-  
-  <string name="welcome_login_confirm_later_title">¿Por qué no iniciar sesión?</string>
-  
-  <string name="welcome_login_confirm_later_ok">¡Lo haré!</string>
-  
-  <string name="welcome_login_confirm_later_cancel">No gracias</string>
-  
-  <string name="welcome_login_confirm_later_dialog">¡Inicia sesión para aprovechar Astrid al máximo!
-Es gratis, obtienes copias de seguridad en línea, sincronización completa con Astrid.com,
-podrás agregar tareas vía correo electrónico, e incluso compartir listas de tareas con tus amigos!</string>
+    <!-- NEW USER EXPERIENCE -->
 
+    <!-- help bubbles -->
+    <!-- slide 8c: Shown the first time a user sees the task list activity -->
+    <string name="help_popover_add_task">Comience agregando una o varias tareas</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown the first time a user adds a task to a list -->
+    <string name="help_popover_tap_task">Pulsa la tarea para editar y compartir</string>
 
+    <!-- slide 14a: Shown the first time a user sees the list activity -->
+    <string name="help_popover_list_settings">Pulsa para editar o compartir esta lista</string>
 
-  <!-- Resources for built-in locale plug-in -->
-
-  <!-- Locale Alert Editing Window Title -->
-  <string name="locale_edit_alerts_title">Alerta de filtro Astrid</string>
-  
-  <!-- Locale Window Help -->                                                                                                                                            
-  <string name="locale_edit_intro">Astrid le enviará un recordatorio cuando tenga cualquier tarea en el siguiente filtro.</string>
-      
-  <!-- Locale Window Filter Picker UI -->                                                                                                                                        
-      
-  <!-- Locale Window Interval Label -->                                                                                                                                        
-  <string name="locale_interval_label">Limitar notificaciones a:</string>        
-      
-  <!-- Locale Window Interval Values -->                                                                                                                                        
-  <string-array name="locale_interval">
-    <item>una vez por hora</item>
-    <item>una vez cada seis horas</item>
-    <item>una vez cada doce horas</item>
-    <item>una vez por día</item>
-    <item>una vez cada tres días</item>
-    <item>una vez por semana</item>
-  </string-array>        
-      
-  <!-- Locale Notification text -->                                                                                                                                        
-  <string name="locale_notification">Tiene $NUM que coincide con: $FILTER</string>     
-      
-  <!-- Locale Plugin was not found, it is required -->
-  <string name="locale_plugin_required">Por favor, instale el complemento Astrid Locale</string>        
-     
+    <!-- slide 26c: Shown the first time a user sees the list settings tab -->
+    <string name="help_popover_collaborators">La gente con quien compartes puede\nayudar a hacer tu
+        lista o completar tareas.
+    </string>
 
+    <!-- Shown after user adds a task on tablet-->
+    <string name="help_popover_add_lists">Presiona para agregar una lista</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown after a user adds a task on phones -->
+    <string name="help_popover_switch_lists">Toca para agregar una lista o cambiar entre listas
+    </string>
+
+
+    <!-- Login activity -->
+
+
+    <!-- slide 7b -->
+    <string name="welcome_login_tos_base">Al usar Astrid estás de acuerdo con el</string>
+
+    <string name="welcome_login_tos_link">Términos del servicio</string>
+
+    <!-- slide 7e -->
+    <string name="welcome_login_pw">Registrarse</string>
+
+    <string name="welcome_sign_in">Iniciar sesión</string>
+
+    <!-- slide 7f -->
+    <string name="welcome_login_later">Más tarde</string>
+
+    <string name="welcome_login_confirm_later_title">¿Por qué no iniciar sesión?</string>
+
+    <string name="welcome_login_confirm_later_ok">¡Lo haré!</string>
+
+    <string name="welcome_login_confirm_later_cancel">No gracias</string>
+
+    <string name="welcome_login_confirm_later_dialog">¡Inicia sesión para aprovechar Astrid al
+        máximo!
+        Es gratis, obtienes copias de seguridad en línea, sincronización completa con Astrid.com,
+        podrás agregar tareas vía correo electrónico, e incluso compartir listas de tareas con tus
+        amigos!
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in locale plug-in -->
+
+    <!-- Locale Alert Editing Window Title -->
+    <string name="locale_edit_alerts_title">Alerta de filtro Astrid</string>
+
+    <!-- Locale Window Help -->
+    <string name="locale_edit_intro">Astrid le enviará un recordatorio cuando tenga cualquier tarea
+        en el siguiente filtro.
+    </string>
+
+    <!-- Locale Window Filter Picker UI -->
+
+    <!-- Locale Window Interval Label -->
+    <string name="locale_interval_label">Limitar notificaciones a:</string>
+
+    <!-- Locale Window Interval Values -->
+    <string-array name="locale_interval">
+        <item>una vez por hora</item>
+        <item>una vez cada seis horas</item>
+        <item>una vez cada doce horas</item>
+        <item>una vez por día</item>
+        <item>una vez cada tres días</item>
+        <item>una vez por semana</item>
+    </string-array>
+
+    <!-- Locale Notification text -->
+    <string name="locale_notification">Tiene $NUM que coincide con: $FILTER</string>
+
+    <!-- Locale Plugin was not found, it is required -->
+    <string name="locale_plugin_required">Por favor, instale el complemento Astrid Locale</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ====================== Plugin Boilerplate ========================= -->
 
-	<!-- filters header: OpenCRX -->
+    <!-- filters header: OpenCRX -->
     <string name="opencrx_FEx_header">OpenCRX</string>
-    
+
     <!-- filter category for OpenCRX ActivityCreators -->
     <string name="opencrx_FEx_dashboard">Espacios de trabajo</string>
-    
+
     <!-- filter category for OpenCRX responsible person -->
     <string name="opencrx_FEx_responsible">Asignado a</string>
-    
+
     <!--  OpenCRX assignedTo filter title (%s => assigned contact) -->
     <string name="opencrx_FEx_responsible_title">Asignado a \'%s\'</string>
-    
+
     <!-- detail for showing tasks created by someone else (%s => person name) -->
     <string name="opencrx_PDE_task_from">de %s</string>
-    
+
     <!-- replacement string for task edit "Notes" when using OpenCRX -->
     <string name="opencrx_TEA_notes">Añadir un comentario</string>
-    
+
     <string name="opencrx_creator_input_hint">Creador</string>
 
     <string name="opencrx_contact_input_hint">Asignado a</string>
     <!-- ==================================================== Preferences == -->
 
-    <!-- Preferences Title: OpenCRX -->    
+    <!-- Preferences Title: OpenCRX -->
     <string name="opencrx_PPr_header">OpenCRX</string>
 
     <!-- creator title for tasks that are not synchronized -->
     <string name="opencrx_no_creator">(No sincronizar)</string>
 
-	<!-- preference title for default creator -->
+    <!-- preference title for default creator -->
     <string name="opencrx_PPr_defaultcreator_title">Creador de actividades predeterminado</string>
 
     <!-- preference description for default creator (%s -> setting) -->
-    <string name="opencrx_PPr_defaultcreator_summary">Nuevas actividades serán creadas por: : %s</string>
+    <string name="opencrx_PPr_defaultcreator_summary">Nuevas actividades serán creadas por: : %s
+    </string>
 
     <!-- preference description for default dashboard (when set to \'not synchronized\') -->
-    <string name="opencrx_PPr_defaultcreator_summary_none">Por defecto, las actividades nuevas  no serán sincronizadas</string>
-    
+    <string name="opencrx_PPr_defaultcreator_summary_none">Por defecto, las actividades nuevas no
+        serán sincronizadas
+    </string>
+
     <!--  OpenCRX host and segment group name -->
     <string name="opencrx_group">servidor de OpenCRX</string>
 
@@ -2028,81 +2224,89 @@ podrás agregar tareas vía correo electrónico, e incluso compartir listas de t
 
     <!--  dialog title for OpenCRX host -->
     <string name="opencrx_host_dialog_title">Servidor OpenCRX</string>
-    
+
     <!--  example for OpenCRX host -->
-    <string name="opencrx_host_summary">"Por ejemplo: "<i>midominio.com</i></string>
-    
+    <string name="opencrx_host_summary">"Por ejemplo: "
+        <i>midominio.com</i>
+    </string>
+
     <!--  preference description for OpenCRX segment -->
     <string name="opencrx_segment_title">Segmento</string>
 
     <!--  dialog title for OpenCRX segment -->
     <string name="opencrx_segment_dialog_title">Segmento sincronizado</string>
-    
+
     <!--  example for OpenCRX segment -->
-    <string name="opencrx_segment_summary">"Por ejemplo: "<i>" Estándar"</i></string>
-    
+    <string name="opencrx_segment_summary">"Por ejemplo: "
+        <i>" Estándar"</i>
+    </string>
+
     <!--  default value for OpenCRX segment -->
     <string name="opencrx_segment_default">Estándar</string>
-    
+
     <!--  preference description for OpenCRX provider -->
     <string name="opencrx_provider_title">Proveedor</string>
 
     <!--  dialog title for OpenCRX provider -->
     <string name="opencrx_provider_dialog_title">Proveedor de datos OpenCRX</string>
-    
+
     <!--  example for OpenCRX provider -->
-    <string name="opencrx_provider_summary">"Por ejemplo: "<i>CRX</i></string>
-    
+    <string name="opencrx_provider_summary">"Por ejemplo: "
+        <i>CRX</i>
+    </string>
+
     <!--  default value for OpenCRX provider -->
     <string name="opencrx_provider_default">CRX</string>
     <!-- ================================================= Login Activity == -->
 
-    <!-- Activity Title: Opencrx Login -->    
+    <!-- Activity Title: Opencrx Login -->
     <string name="opencrx_PLA_title">Iniciar sesión en OpenCRX</string>
 
-    <!-- Instructions: Opencrx login -->    
+    <!-- Instructions: Opencrx login -->
     <string name="opencrx_PLA_body">Conéctate con tu cuenta de OpenCRX</string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
     <string name="opencrx_PLA_signIn">Ingresar</string>
 
-    <!-- Login Label -->    
+    <!-- Login Label -->
     <string name="opencrx_PLA_login">Iniciar sesión</string>
 
-    <!-- Password Label -->    
+    <!-- Password Label -->
     <string name="opencrx_PLA_password">Contraseña</string>
-    
-        <!-- Error Message when fields aren\'t filled out -->    
+
+    <!-- Error Message when fields aren\'t filled out -->
     <string name="opencrx_PLA_errorEmpty">Error: debe llenar todos los campos</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
     <string name="opencrx_PLA_errorAuth">¡Error: usuario o contraseña incorrectos!</string>
 
     <!-- ================================================ Synchronization == -->
-        
+
     <!-- title for notification tray after synchronizing -->
     <string name="opencrx_notification_title">OpenCRX</string>
-    
+
     <!-- text for notification tray when synchronizing -->
-    <string name="opencrx_notification_text">%s tareas actualizadas / toque para más detalles</string>
-    
+    <string name="opencrx_notification_text">%s tareas actualizadas / toque para más detalles
+    </string>
+
     <!-- Error msg when io exception  -->
-    <string name="opencrx_ioerror">¡Error en la conexión! Compruebe su conexión de Internet.</string>
+    <string name="opencrx_ioerror">¡Error en la conexión! Compruebe su conexión de Internet.
+    </string>
 
     <!-- opencrx Login not specified-->
     <string name="opencrx_MLA_email_empty">¡El inicio de sesión no fue especificado!</string>
-    
+
     <!-- opencrx password not specified-->
     <string name="opencrx_MLA_password_empty">¡No se especificó una contraseña!</string>
-    
+
     <!-- ================================================ labels for layout-elements == -->
-    
+
     <!-- label for task-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_task_assign_label">Asignar esta tarea a esta persona:</string>
-    
+
     <!-- Spinner-item for unassigned tasks on taskeditactivity -->
     <string name="opencrx_TEA_task_unassigned">&lt;Sin asignar&gt;</string>
-    
+
     <!-- label for dashboard-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_creator_assign_label">Asignar esta tarea a este creador:</string>
 
@@ -2110,7 +2314,7 @@ podrás agregar tareas vía correo electrónico, e incluso compartir listas de t
     <string name="opencrx_TEA_dashboard_default">&lt;Predeterminado&gt;</string>
 
     <string name="opencrx_TEA_opencrx_title">Controles OpenCRX</string>
-        
+
     <string name="CFC_opencrx_in_workspace_text">¿En qué espacio de trabajo?</string>
 
     <string name="CFC_opencrx_in_workspace_name">En el espacio de trabajo...</string>
@@ -2120,120 +2324,157 @@ podrás agregar tareas vía correo electrónico, e incluso compartir listas de t
     <string name="CFC_opencrx_assigned_to_name">Asignado a...</string>
 
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
+    <!-- ================================================== EditPreferences == -->
 
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 32j: Preference Category: Power Pack -->
-  <string name="EPr_powerpack_header">Premium y configuraciones varias</string>
-  <string name="EPr_powerpack_summary">Recordatorios de llamadas perdidas, reconocimiento de voz y ajustes varios</string>
-  
-  <!-- slide 32e: Preference: Anonymous User Statistics -->
-  <string name="EPr_statistics_title">Estadísticas de uso anónimas</string>
-  <!-- Preference: User Statistics (disabled) -->
-  <string name="EPr_statistics_desc_disabled">No se enviará ninguna información de uso</string>  
-  <!-- slide 32f: Preference: User Statistics (enabled) -->
-  <string name="EPr_statistics_desc_enabled">Ayúdanos a mejorar Astrid permitiendo anónimamente el envío de datos del uso de esta aplicación</string>
-      
+    <!-- slide 32j: Preference Category: Power Pack -->
+    <string name="EPr_powerpack_header">Premium y configuraciones varias</string>
+    <string name="EPr_powerpack_summary">Recordatorios de llamadas perdidas, reconocimiento de voz y
+        ajustes varios
+    </string>
 
+    <!-- slide 32e: Preference: Anonymous User Statistics -->
+    <string name="EPr_statistics_title">Estadísticas de uso anónimas</string>
+    <!-- Preference: User Statistics (disabled) -->
+    <string name="EPr_statistics_desc_disabled">No se enviará ninguna información de uso</string>
+    <!-- slide 32f: Preference: User Statistics (enabled) -->
+    <string name="EPr_statistics_desc_enabled">Ayúdanos a mejorar Astrid permitiendo anónimamente el
+        envío de datos del uso de esta aplicación
+    </string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
-    <string name="speech_err_network">¡Error en la red! El reconocimiento de voz requiere una conexión de red para funcionar.</string>
-    <string name="speech_err_no_match">Lo siento. ¡No lo comprendo! Por favor, inténtalo de nuevo.</string>
-    <string name="speech_err_default">Lo siento. Ha habido un error en el reconocimiento de voz. Por favor, Inténtalo de nuevo.</string>
-    
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <string name="speech_err_network">¡Error en la red! El reconocimiento de voz requiere una
+        conexión de red para funcionar.
+    </string>
+    <string name="speech_err_no_match">Lo siento. ¡No lo comprendo! Por favor, inténtalo de nuevo.
+    </string>
+    <string name="speech_err_default">Lo siento. Ha habido un error en el reconocimiento de voz. Por
+        favor, Inténtalo de nuevo.
+    </string>
+
     <string name="premium_attach_file">Adjuntar un archivo</string>
     <string name="premium_record_audio">Grabar una nota</string>
     <string name="premium_no_files">No se adjuntó ningún archivo</string>
     <string name="premium_remove_file_confirm">Está seguro? No se puede deshacer</string>
-    
+
     <string name="audio_recording_title">Grabando Audio</string>
     <string name="audio_stop_recording">Detener grabación</string>
     <string name="audio_speak_now">Hable ahora!</string>
     <string name="audio_encoding">Codificando...</string>
     <string name="audio_err_encoding">Error al codificar audio</string>
-    <string name="audio_err_playback">Lo siento. El sistema no reconoce este tipo de archivo de audio</string>
-    
-    <string name="search_market_audio">No se ha encontrado programa para reproducir ese tipo de audio. ¿Te gustaría descargar un reproductor de audio desde el Android Market?</string>
+    <string name="audio_err_playback">Lo siento. El sistema no reconoce este tipo de archivo de
+        audio
+    </string>
+
+    <string name="search_market_audio">No se ha encontrado programa para reproducir ese tipo de
+        audio. ¿Te gustaría descargar un reproductor de audio desde el Android Market?
+    </string>
     <string name="search_market_audio_title">No se encontró reproductor de audio</string>
 
-    <string name="search_market_pdf">No se encontró lector de archivos PDF. ¿Desea descargar uno de Android Market?</string>
+    <string name="search_market_pdf">No se encontró lector de archivos PDF. ¿Desea descargar uno de
+        Android Market?
+    </string>
     <string name="search_market_pdf_title">No se encontró lector de archivos PDF</string>
 
-    <string name="search_market_ms">No se encontró lector de archivos MS Office. ¿Desea descargar uno de Android Market?</string>
+    <string name="search_market_ms">No se encontró lector de archivos MS Office. ¿Desea descargar
+        uno de Android Market?
+    </string>
     <string name="search_market_ms_title">No se encontró lector para archivos de MS Office</string>
-    
-    <string name="file_type_unhandled">Lo sentimos! No se encontró ninguna aplicación para abrir este tipo de archivo.</string>
+
+    <string name="file_type_unhandled">Lo sentimos! No se encontró ninguna aplicación para abrir
+        este tipo de archivo.
+    </string>
     <string name="file_type_unhandled_title">No se encontró ninguna aplicación</string>
-    
+
     <string name="file_prefix_image">Imagen</string>
     <string name="file_prefix_voice">Voz</string>
     <string name="file_browser_up">Arriba</string>
     <string name="file_browser_title">Elija un archivo</string>
     <string name="dir_browser_title">Elija un directorio</string>
-    <string name="file_browser_err_permissions">¡Permiso denegado! Por favor asegúrese permitir a Astrid el acceso a la tarjeta SD.</string>
+    <string name="file_browser_err_permissions">¡Permiso denegado! Por favor asegúrese permitir a
+        Astrid el acceso a la tarjeta SD.
+    </string>
     <string name="file_add_picture">Adjuntar una imagen</string>
     <string name="file_add_sdcard">Adjuntar un archivo desde su tarjeta SD</string>
     <string name="file_download_title">¿Descargar archivo?</string>
-    <string name="file_download_body">Este archivo se ha descargado a su tarjeta SD. ¿Descargar ahora?</string>
+    <string name="file_download_body">Este archivo se ha descargado a su tarjeta SD. ¿Descargar
+        ahora?
+    </string>
     <string name="file_download_progress">Descargando...</string>
     <string name="file_err_memory">La imagen es muy grande para caber en la memoria</string>
     <string name="file_err_copy">Error al copiar el archivo a adjuntar</string>
     <string name="file_err_download">Error al descargar el archivo</string>
-    <string name="file_err_no_directory">¡Oops! Al parecer la carpeta de archivos no existe. Por favor elije una carpeta para guardar archivos en Preferencias de Astrid</string>
-    <string name="file_err_show">Lo sentimos. El sistema aún no soporta este tipo de archivo</string>
-    
+    <string name="file_err_no_directory">¡Oops! Al parecer la carpeta de archivos no existe. Por
+        favor elije una carpeta para guardar archivos en Preferencias de Astrid
+    </string>
+    <string name="file_err_show">Lo sentimos. El sistema aún no soporta este tipo de archivo
+    </string>
+
     <string name="file_dir_dialog_ok">Usar este directorio</string>
     <string name="file_dir_dialog_default">Restaurar a valores por defecto</string>
-    
+
     <string name="p_files_dir">Directorio de descargas Premium</string>
     <!-- Description for file download directory preference. %s -> chosen directory -->
     <string name="p_files_dir_desc">Archivos adjuntos de tareas guardados en: %s</string>
     <string name="p_files_dir_desc_default">Directorio predeterminado</string>
 
-    
+
     <!-- in app billing -->
     <string name="billing_not_supported_title">No se pueden realizar compras</string>
-    <string name="billing_not_supported_message">El servicio de cobro de Market no está disponible en éste momento. Puedes seguir usando la aplicación pero no será posible hacer compras.</string>
+    <string name="billing_not_supported_message">El servicio de cobro de Market no está disponible
+        en éste momento. Puedes seguir usando la aplicación pero no será posible hacer compras.
+    </string>
     <string name="subscriptions_not_supported_title">No se pueden comprar suscripciones</string>
-    <string name="subscriptions_not_supported_message">El servicio de cobro de Market en éste dispositivo no permite suscripciones en éste momento. Te puedes suscribir a Astrid Premium desde http://astrid.com/premium.</string>
+    <string name="subscriptions_not_supported_message">El servicio de cobro de Market en éste
+        dispositivo no permite suscripciones en éste momento. Te puedes suscribir a Astrid Premium
+        desde http://astrid.com/premium.
+    </string>
     <string name="cannot_connect_title">No es posible conectarse al Market</string>
     <string name="cannot_connect_message">Esta aplicación no se puede conectar al Market.
-Su versión de Market puede estar desactualizada.
-Puedes seguir utilizando la aplicación pero
-no le será posible hacer compras.</string>
-    
+        Su versión de Market puede estar desactualizada.
+        Puedes seguir utilizando la aplicación pero
+        no le será posible hacer compras.
+    </string>
+
     <string name="restoring_transactions">Recuperando transacciones</string>
-    
+
     <string name="subscriptions_learn_more">Más información</string>
-    
-    <string name="kii_premium_success">¡Gracias por participar en esta oferta! Se ha desbloqueado su mes gratuito de Astrid Premium.</string>
+
+    <string name="kii_premium_success">¡Gracias por participar en esta oferta! Se ha desbloqueado su
+        mes gratuito de Astrid Premium.
+    </string>
     <string name="kii_premium_abort">Oferta especial interrumpida</string>
     <string name="kii_premium_declined">Oferta especial rechazada</string>
-    <string name="kii_premium_error">There was an error processing this offer. Please try again later.</string>
-    
+    <string name="kii_premium_error">There was an error processing this offer. Please try again
+        later.
+    </string>
+
     <string name="premium_offers_title">Oferta especial</string>
     <string name="premium_offers_subtitle">Want one month of Astrid Premium for free?</string>
-    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a short video by this sponsor. (They will also require your email address.)</string>
+    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a
+        short video by this sponsor. (They will also require your email address.)
+    </string>
     <string name="premium_offers_start">¡Consíguelo gratis!</string>
-    
+
     <string name="premium_billing_title">Astrid Premium</string>
     <string name="premium_buy_month">1 mes</string>
     <string name="premium_buy_year">1 año</string>
     <string name="premium_description_header">¡Haz más con Premium!</string>
-    <string name="premium_description_1">Adjunta archivos a las tareas \n(pdfs, doc, ppt...)</string>
+    <string name="premium_description_1">Adjunta archivos a las tareas \n(pdfs, doc, ppt...)
+    </string>
     <string name="premium_description_2">Sincroniza archivos con astrid.com</string>
     <string name="premium_description_3">Agregar archivos adjuntos via correo electrónico</string>
     <string name="premium_description_4">Guarda notas de voz como archivos de audio</string>
@@ -2242,727 +2483,783 @@ no le será posible hacer compras.</string>
     <string name="premium_speech_bubble_1">¡Premium mejorará tu productividad!</string>
     <string name="premium_speech_bubble_2">¡Ordena un año y ahorra un 25%%!</string>
     <string name="premium_already_subscribed">¡Ya estás suscrito a Astrid Premium!</string>
-    <string name="premium_login_prompt">Necesitas tener una cuenta de Astrid.com para suscribirte a Premium. Por favor inicia sesión o crea una cuenta.</string>
+    <string name="premium_login_prompt">Necesitas tener una cuenta de Astrid.com para suscribirte a
+        Premium. Por favor inicia sesión o crea una cuenta.
+    </string>
     <string name="premium_success">¡Gracias por suscribirte a Astrid Premium!</string>
-    <string name="premium_success_with_server_error">¡Gracias por suscribirte a Astrid Premium! Tendrá pronto disponibles las nuevas funciones en astrid.com, y deberían estar ya disponibles en su teléfono.</string>
-    <string name="premium_verification_error">La suscripción Premium para ésta cuenta de Google Play está conectada a un usuario diferente. Para ligar direcciones de correo electrónico adicionales a tu cuenta, visita astrid.com/users/profile</string>
-    <string name="premium_check_for_purchases">¿Ya has adquirido premium? Pulsa aquí para comprobar el historial de compras en Google Play.</string>
+    <string name="premium_success_with_server_error">¡Gracias por suscribirte a Astrid Premium!
+        Tendrá pronto disponibles las nuevas funciones en astrid.com, y deberían estar ya
+        disponibles en su teléfono.
+    </string>
+    <string name="premium_verification_error">La suscripción Premium para ésta cuenta de Google Play
+        está conectada a un usuario diferente. Para ligar direcciones de correo electrónico
+        adicionales a tu cuenta, visita astrid.com/users/profile
+    </string>
+    <string name="premium_check_for_purchases">¿Ya has adquirido premium? Pulsa aquí para comprobar
+        el historial de compras en Google Play.
+    </string>
     <string name="premium_checking_for_purchases">Comprando compras...</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- 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">Recordarme:</string>
-
-  <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">Cuando la tarea es finalizada</string>
-
-  <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">Cuando la tarea está retrasada</string>
-
-  <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_randomly">Aleatorio, una sola vez</string>
-
-  <!-- Task Edit: Reminder alarm clock label -->  
-  <string name="TEA_reminder_alarm_label">Tipo de Tono/Vibración:</string>
-
-  <!--  slide 45a: Task Edit: Reminder mode: ring once -->  
-  <string name="TEA_reminder_mode_once">Una vez</string>
-
-  <!-- slide 45b: Task Edit: Reminder mode: ring five times -->  
-  <string name="TEA_reminder_mode_five">Cinco veces</string>
-
-  <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->  
-  <string name="TEA_reminder_mode_nonstop">Hasta que cancele la alarma</string>
-  
-  <string name="TEA_reminder_when">when</string>
-  
-  <string name="TEA_reminder_due_short">due</string>
-
-  <string name="TEA_reminder_overdue_short">overdue</string>
-
-  <string name="TEA_reminder_randomly_short">randomly</string>
-
-  <string name="TEA_reminder_display_one">Remind me %s</string>
-  
-  <string name="TEA_reminder_display_multiple">Remind %s</string>
-
-  <string-array name="TEA_reminder_random">
-    <!-- random reminder choices for task edit page. -->
-    <item>una hora</item>
-    <item>un día</item>
-    <item>una semana</item>
-    <item>en dos semanas</item>
-    <item>un mes</item>
-    <item>en dos meses</item>
-  </string-array>
-  
-  <!-- ==================================================== notifications == -->
-  
-  <!-- Name of filter when viewing a reminder -->
-  <string name="rmd_NoA_filter">¡Aviso!</string>
-  
-  <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">¡Terminada!</string>
-  
-  <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Espera...</string>
-  
-  <!-- Reminder: Completed Toast -->
-  <string name="rmd_NoA_completed_toast">¡Felicitaciones por terminar!</string>
-  
-  <!-- Prefix for reminder dialog title -->
-  <string name="rmd_NoA_dlg_title">Recordatorio:</string>
-  
-  <!-- ==================================================== user reengagement == -->
-
-  <!-- Titles for user reengagement notifications -->
-  <string-array name="rmd_reengage_notif_titles">
-    <item>Una nota desde Astrid</item>
-    <!-- %s -> first name -->
-    <item>Memorándum para %s.</item> 
-    <item>Tu resumen Astrid</item>
-    <item>Recordatorios de Astrid</item>
-  </string-array>
-    
-  <string name="rmd_reengage_name_default">tú</string>
-
-  
-  <string name="rmd_reengage_add_tasks">Añadir una tarea</string>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs -->
-  <string-array name="rmd_reengage_dialog_options">
-    <item>¡Es hora de acortar la lista de tareas!</item>
-    <item>Estimada dama o caballero, ¡algunas tareas esperan su inspección!</item>
-    <item>Hola, ¿Podrías darle una revisada a éstas?</item>
-    <item>¡Tengo unas tareas con tu nombre en ellas!</item>
-    <item>¡Un lote de frescas tareas para ti hoy!</item>
-    <item>¡Luces espectacular! ¿Listo para empezar?</item>
-    <item>Un hermoso día para hacer un poco de trabajo, ¡eso creo!</item>
-  </string-array>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>¿No quieres estar organizado?</item>
-    <item>¡Soy Astrid! ¡Estoy aquí para ayudarte a hacer más!</item>
-    <item>¡Pareces ocupado! Déjame quitarte alguna de esas tareas de tu plato.</item>
-    <item>Puedo ayudarle a rastrear todos los detalles en tu vida.</item>
-    <item>¿Tomaste seriamente acerca de hacer más? ¡Yo también!</item>
-    <item>¡Es un placer conocerlo!</item>
-  </string-array>
-  <!-- ============================================= reminder preferences == -->
-  
-  <!-- slide 33d: Reminder Preference Screen Title -->
-  <string name="rmd_EPr_alerts_header">Configurar recordatorios</string>
-  <string name="rmd_EPr_alerts_summary">Horas tranquilas, opciones de vigilia, nivel de persistencia</string>
-    
-  <!-- Reminder Preference: Reminders Enabled Title -->
-  <string name="rmd_EPr_enabled_title">¿Habilitar recordatorios?</string>
-  <!-- Reminder Preference Reminders Enabled Description (true) -->
-  <string name="rmd_EPr_enabled_desc_true">Los avisos de Astrid están habilitados (esto es lo normal)</string>
-  <!-- Reminder Preference Reminders Enabled Description (false) -->
-  <string name="rmd_EPr_enabled_desc_false">Los avisos de Astrid no aparecerán nunca en el teléfono</string>  
-    
-  <!-- Reminder Preference: Quiet Hours Start Title -->
-  <string name="rmd_EPr_quiet_hours_start_title">El horario en silencio empieza</string>
-  <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">Notificaciones serán silenciadas después de %s.\nNota: las vibraciones están controladas según la configuración "Vibrar en alerta"</string>
-  <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
-  <string name="rmd_EPr_quiet_hours_desc_none">Horario en silencio deshabilitado</string>
-  
-  <!-- Reminder Preference: Quiet Hours End Title -->
-  <string name="rmd_EPr_quiet_hours_end_title">El horario en silencio termina</string>
-  <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_end_desc">Las notificaciones dejarán de estar en silencio desde las %s</string>
-
-  <!-- Reminder Preference: Default Reminder Title -->
-  <string name="rmd_EPr_rmd_time_title">Aviso por defecto</string>
-  <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
-  <string name="rmd_EPr_rmd_time_desc">Notificaciones para tareas sin fecha límites aparecerán a %s</string>
-
-  <!-- Reminder Preference: Notification Ringtone Title -->
-  <string name="rmd_EPr_ringtone_title">Tono de notificación</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
-  <string name="rmd_EPr_ringtone_desc_custom">Tono personalizado establecido</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
-  <string name="rmd_EPr_ringtone_desc_silent">Tono configurado como silencio</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
-  <string name="rmd_EPr_ringtone_desc_default">Se usará el tono por defecto</string>
-  
-  <!-- Reminder Preference: Notification Persistence Title -->
-  <string name="rmd_EPr_persistent_title">Persistencia de notificación</string>
-  <!-- Reminder Preference: Notification Persistence Description (true) -->
-  <string name="rmd_EPr_persistent_desc_true">Las notificaciones deben verse individualmente para quitarlas</string>
-  <!-- Reminder Preference: Notification Persistence Description (false) -->
-  <string name="rmd_EPr_persistent_desc_false">Las notificaciones se pueden borrar con el botón \"Borrar Todo\"</string>
-
-  <!-- Reminder Preference: Social Reminders Title -->
-  <string name="rmd_EPr_social_title">Social encouragement</string>
-  <!-- Reminder Preference: Social Reminders Summary (enabled) -->
-  <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for shared tasks</string>
-  <!-- Reminder Preference: Social Reminders Summary (disabled) -->
-  <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you for shared tasks</string>
-  
-  
-  
-  <!-- Reminder Preference: Notification Icon Title -->
-  <!-- Reminder Preference: Notification Icon Description -->
-
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
-  <string name="rmd_EPr_multiple_maxvolume_title">Máximo volumen para recordatorios con tonos múltiples</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid fijará el volumen máximo para avisos con tonos múltiples</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid usará la configuración del sistema para el volumen</string>
-
-  <!-- Reminder Preference: Vibrate Title -->
-  <string name="rmd_EPr_vibrate_title">Vibrar en alerta</string>
-  <!-- Reminder Preference: Vibrate Description (true) -->
-  <string name="rmd_EPr_vibrate_desc_true">Astrid vibrará cuando envíe notificaciones</string>
-  <!-- Reminder Preference: Vibrate Description (false) -->
-  <string name="rmd_EPr_vibrate_desc_false">Astrid no vibrará al enviar notificaciones</string>
-
-  <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">Incentivos de Astrid</string>
-  <!-- Reminder Preference: Nagging Description (true) -->
-  <string name="rmd_EPr_nagging_desc_true">Astrid te mostrará mensajes de ánimo en los recordatorios</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_nagging_desc_false">Astrid no te dará mensajes de ánimo</string>
-
-  <!-- Reminder Preference: Snooze Dialog Title -->  
-  <string name="rmd_EPr_snooze_dialog_title">Diálogo de espera HH:MM</string>
-  <!-- Reminder Preference: Snooze Dialog Description (true) -->
-  <string name="rmd_EPr_snooze_dialog_desc_true">Retrasa seleccionando un nuevo tiempo de vigilia (HH:MM)</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_snooze_dialog_desc_false">Retrasar seleccionando # días/horas de espera</string>
-  
-  <!-- slide 44g: Reminder Preference: Default Reminders Title -->
-  <string name="rmd_EPr_defaultRemind_title">Recordatorios aleatorios</string>
-  <!-- Reminder Preference: Default Reminders Setting (disabled) -->
-  <string name="rmd_EPr_defaultRemind_desc_disabled">Las nuevas tareas no tendrán recordatorios al azar</string>
-  <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
-  <string name="rmd_EPr_defaultRemind_desc">Las nuevas tareas tendrán recordatorios al azar: %s</string>
-  
-  <!-- slide 39a: Defaults Title -->
-  
-  <string-array name="EPr_reminder_random">
-    <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
-    <item>deshabilitado</item>
-    <!-- slide 44b -->
-    <item>por hora</item>
-    <!-- slide 44c -->
-    <item>diariamente</item>
-    <!-- slide 44d-->
-    <item>semanalmente</item>
-    <!-- slide 44e-->
-    <item>quincenalmente</item>
-    <!-- slide 44f -->
-    <item>mensualmente</item>
-    <item>bimensualmente</item>
-  </string-array>
-        
-  <string-array name="EPr_quiet_hours_start">
-    <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
-    <item>deshabilitado</item>
-    <item>8 p.m.</item>
-    <item>9 pm</item>
-    <item>10 pm</item>
-    <item>11 pm</item>
-    <item>12 am</item>
-    <item>1 am</item>
-    <item>2 am</item>
-    <item>3 am</item>
-    <item>4 am</item>
-    <item>5 am</item>
-    <item>6 am</item>
-    <item>7 am</item>
-    <item>8 am</item>
-    <item>9 am</item>
-    <item>10 am</item>
-    <item>11 am</item>
-    <item>12 pm</item>
-    <item>1 pm</item>
-    <item>2 pm</item>
-    <item>3 pm</item>
-    <item>4 pm</item>
-    <item>5 pm</item>
-    <item>6 pm</item>
-    <item>7 pm</item>
-  </string-array>
-  
-  <string-array name="EPr_quiet_hours_end">
-    <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
-    <item>9 am</item>
-    <item>10 am</item>
-    <item>11 am</item>
-    <item>12 pm</item>
-    <item>1 pm</item>
-    <item>2 pm</item>
-    <item>3 pm</item>
-    <item>4 pm</item>
-    <item>5 pm</item>
-    <item>6 pm</item>
-    <item>7 pm</item>
-    <item>8 pm</item>
-    <item>9 pm</item>
-    <item>10 pm</item>
-    <item>11 pm</item>
-    <item>12 am</item>
-    <item>1 am</item>
-    <item>2 am</item>
-    <item>3 am</item>
-    <item>4 am</item>
-    <item>5 am</item>
-    <item>6 am</item>
-    <item>7 am</item>
-    <item>8 am</item>
-  </string-array>
-  
-  <string-array name="EPr_rmd_time">
-    <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
-    <item>9 am</item>
-    <item>10 am</item>
-    <item>11 am</item>
-    <item>12 pm</item>
-    <item>1 pm</item>
-    <item>2 pm</item>
-    <item>3 pm</item>
-    <item>4 pm</item>
-    <item>5 pm</item>
-    <item>6 pm</item>
-    <item>7 pm</item>
-    <item>8 pm</item>
-    <item>9 pm</item>
-    <item>10 pm</item>
-    <item>11 pm</item>
-    <item>12 am</item>
-    <item>1 am</item>
-    <item>2 am</item>
-    <item>3 am</item>
-    <item>4 am</item>
-    <item>5 am</item>
-    <item>6 am</item>
-    <item>7 am</item>
-    <item>8 am</item>
-  </string-array>
-  
-  <!-- =============================================== random reminders == -->
-
-  <string name="reminders_social">Estas personas están contando con usted!</string>
-  
-  <string name="reminders_social_one">%s is counting on you!</string>
-  
-  <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
-
-  <string-array name="reminders">
-      <!-- reminders: Make these < 20 chars so the task name is displayed -->
-      <item>¡Hola! ¿Tienes un segundo?</item>
-      <item>¿Puedo verte un segundo?</item>
-      <item>¿Tiene unos minutos?</item>
-      <item>¿Ha olvidado?</item>
-      <item>¡Perdón!</item>
-      <item>Cuando tenga un minuto:</item>
-      <item>En su agenda:</item>
-      <item>¿Tienes un momento?</item>
-      <item>¡Astrid aquí!</item>
-      <item>¡Hola! ¿Puedo molestarte?</item>
-      <item>¿Un minuto de tu tiempo?</item>
-      <item>Es un gran día para</item>
-  </string-array>
-
-  <string-array name="reminders_due">
-      <!-- reminders related to task due date -->
-      <item>¡Hora de trabajar!</item>
-      <item>¡Ha llegado la fecha límite!</item>
-      <item>¿Está listo para comenzar?</item>
-      <item>Dijiste que harías:</item>
-      <item>Se supone que tienes que empezar:</item>
-      <item>Hora de empezar:</item>
-      <item>¡Ahora!</item>
-      <item>¡Perdón! Es la hora de</item>
-      <item>¿Está libre? Tiempo para:</item>
-  </string-array>
-
-  <string-array name="reminders_snooze">
-      <!-- reminders related to snooze -->
-      <item>¡No seas vago ahora!</item>
-      <item>Tiempo de pausa ha concluido!</item>
-      <item>¡No más pausas!</item>
-      <item>¿Estás listo ya?</item>
-      <item>¡No lo pospongo más!</item>
-  </string-array>
-  
-  <string-array name="reminder_responses">
-      <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
-      <item>¡Tengo algo para usted!</item> 
-      <item>¿Listo para dejarlo en el pasado?</item>
-      <item>¿Por qué no acabas esto?</item>
-      <item>¿Qué te parece? ¿Estás listo, tigre?</item>
-      <item>¿Preparado para hacer esto?</item>
-      <item>¿Puedes encargarte de esto?</item>
-      <item>Puede ser feliz! Acabe esto!</item>
-      <item>¡Te prometo que te sentirás mejor si finalizas esto!</item>
-      <item>¿No vas a hacer esto hoy?</item>
-      <item>Por favor, termina esto, ¡estoy harto de verlo!</item>
-      <item>¿Puedes terminar esto? ¡Sí que puedes!</item>
-      <item>¿Acaso nunca va a hacer esto?</item>
-      <item>¡Siéntase bien consigo mismo! ¡Vamos!</item>
-      <item>¡Estoy tan orgulloso de ti! ¡Vamos a hacerlo!</item>
-      <item>¿Un pequeño refrigerio cuando finalices esto?</item>
-      <item>¿Sólo esta tarea una? ¿Por favor?</item>
-      <item>Es hora de acortar la lista de tareas!</item>
-      <item>¿Estás en el Equipo Orden o Desorden? En el Equipo Orden, ¡Vamos!</item>
-      <item>¿Te he dicho ultimamente que eres impresionante? ¡Seguí así!</item>
-      <item>Una tarea al día mantiene el desorden a raya... ¡Adiós desorden!</item>
-      <item>¿Cómo lo haces? Guau, estoy impresionado!</item>
-      <item>Con solo mirar no lo logrará. ¡Vamos a trabajar!</item>
-      <item>Muy buen clima para un trabajo como éste. ¿No?</item>
-      <item>¿Una taza de té mientras trabajas en esto?</item>
-      <item>Si ya has terminado, puedes salir fuera a jugar.</item>
-      <item>¡Ya es hora! No puedes posponer lo inevitable.</item>
-      <item>Muero un poco cada vez que me ignoras.</item>
-  </string-array>
-
-  <string-array name="postpone_nags">
-      <!-- Astrid\'s nagging when user clicks postpone -->
-      <item>Por favor, dime que no es cierto que eres un indeciso!</item>
-      <item>No ser perezoso tiene sus recompensas</item>
-      <item>¡En algún lugar, alguien está esperando a que lo finalices!</item>
-      <item>¿Cuando dice posponer... realmente quiere decir \'lo estoy haciendo\'? ¿es verdad?</item>
-      <item>¿Esta es la última vez que pospone esto? ¿verdad?</item>
-      <item>Hoy sólo finalicé esto. ¡No se lo diré a nadie!</item>
-      <item>¿Por qué posponer cuando puede... no posponer!</item>
-      <item>¿Supongo que terminará esto en algún momento?</item>
-      <item>Pienso que eres fenomenal! ¿Qué hay de no demorar esto?</item>
-      <item>¿Será capaz de alcanzar sus metas si hace eso?</item>
-      <item>Posponer, posponer, posponer. ¡Cuándo va a cambiar!</item>
-      <item>¡Ya tengo suficientes excusas! ¡Hágalo de una vez!</item>
-      <item>¿Esa no fue la excusa que usó la última vez?</item>
-      <item>No puedo ayudarlo a organizar su vida si hace esto...</item>
-  </string-array>
+    <!-- Resources for built-in reminders plug-in -->
 
+    <!-- =============================================== task edit activity == -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder group label -->
+    <string name="TEA_reminders_group_label">Reminder settings</string>
 
+    <!-- Task Edit: Reminder header label -->
+    <string name="TEA_reminder_label">Recordarme:</string>
 
-  <!-- Resources for built-in repeat plug-in -->
-
-  <!-- repeating plugin name -->
-  <string name="repeat_plugin">Tareas recurrentes</string>
-  
-  <!-- repeating plugin description -->
-  <string name="repeat_plugin_desc">Permitir que las tareas se repitan</string>
-  
-  <!-- slide 20a: checkbox for turning on/off repeats -->
-  <string name="repeat_enabled">Repeticiones</string>
-  
-  <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
-  <string name="repeat_every">Cada %d</string>
-  
-  <!-- hint when opening repeat interval -->
-  <string name="repeat_interval_prompt">Intervalo de repetición</string>
-  
-  <!-- slide 19b-->
-  <string name="repeat_never">Not repeating</string>
-  <!-- slide 20f-->
-  <string name="repeat_dont">No repetir</string>
-      
-  <string-array name="repeat_interval_short">
-    <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
-    <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">
-    <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>Día(s)</item>
-    <item>Semana(s)</item>
-    <item>Mes(es)</item>
-    <item>Hora(s)</item>
-    <item>Minuto(s)</item>
-    <item>Año(s)</item>
-  </string-array>
-  
-  <string name="repeat_days">días</string>
-  <string name="repeat_weekdays">días laborales</string>
-  <string name="repeat_weeks">semanas</string>
-  <string name="repeat_months">meses</string>
-  <string name="repeat_years">años</string>
-  <string name="repeat_hours">horas</string>
-  <string name="repeat_minutes">minutos</string>
-  
-  <string-array name="repeat_until_shortcuts">
-      <item>Por siempre</item>
-      <item>Día específico</item>
-      <item>Hoy</item>
-      <item>Mañana</item>
-      <item>(día siguiente)</item>
-      <item>Próxima semana</item>
-      <item>En dos semanas</item>
-      <item>Próximo mes</item>
-  </string-array>
-  
-  <string name="repeat_until_title">Repetir hasta...</string>
-  
-  <string name="repeat_keep_going">Continúe</string>
-  
-  <string-array name="repeat_type">
-    <!-- slide 20c: repeat type (date to repeat from) -->
-    <item>desde la fecha límite</item>
-    <!-- slide 20c -->
-    <item>Desde la fecha de finalización</item>
-  </string-array>
-  
-  <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
-  <string name="repeat_detail_byday">$I en $D</string>
-  
-  <!-- task detail for repeat from due date (%s -> interval) -->
-  <string name="repeat_detail_duedate">Cada %s</string>
-
-  <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
-  <string name="repeat_detail_duedate_until">Cada %1$s\nhasta %2$s</string>
-  
-  <!-- task detail for repeat from completion date (%s -> interval) -->
-  <string name="repeat_detail_completion">%s una vez completada</string>
-  
-  <!-- text for button when repeating task indefinitely -->
-  <string name="repeat_forever">Repetir por siempre</string>
-
-  <!-- text for button when repeating task until specified date (%s -> date string) -->
-  <string name="repeat_until">Repetir hasta %s</string>
-  
-  <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title">Reprogramar tarea \"%s\"</string>
-
-  <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title_last_time">Tarea recurrente \"%s\" terminada</string>
-      
-  <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->  
-  <string name="repeat_rescheduling_dialog_bubble">%1$s he reprogramado esta tarea recurrente de %2$s a %3$s</string>
-  
-  <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
-  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s He reprogramado esta tarea recurrente para %2$s</string>
-  
-  <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
-  <string name="repeat_rescheduling_dialog_bubble_last_time">Tenía esta tarea recurrente programada hasta %1$s, y ya la ha terminado. %2$s</string>
-  
-  <string-array name="repeat_encouragement">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>¡Buen trabajo!</item>
-      <item>¡Guau... Estoy tan orgulloso de usted!</item>
-      <item>¡Me encanta cuando es tan productivo!</item>
-      <item>¿A que te sientes bien por haber terminado algo?</item>
-  </string-array>
-
-  <string-array name="repeat_encouragement_last_time">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>¡Bien hecho!</item>
-      <item>¡Estoy tan orgulloso de usted!</item>
-      <item>¡Me encanta cuando es productivo!</item>
-  </string-array>
-  
+    <!-- Task Edit: Reminder @ deadline -->
+    <string name="TEA_reminder_due">Cuando la tarea es finalizada</string>
 
+    <!-- Task Edit: Reminder after deadline -->
+    <string name="TEA_reminder_overdue">Cuando la tarea está retrasada</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder at random times (%s => time plural)-->
+    <string name="TEA_reminder_randomly">Aleatorio, una sola vez</string>
 
-    
-  <!-- Subtasks Help Introduction -->
-  <string name="subtasks_help_title">Ordenar y aplicar sangria en Astrid</string>
-  <string name="subtasks_help_1">Mantenga presionado para mover una tarea</string>
-  <string name="subtasks_help_2">Arrastre verticalmente para reordenar</string>
-  <string name="subtasks_help_3">Arrastre horizontalmente para aplicar una sangría</string>
-    
+    <!-- Task Edit: Reminder alarm clock label -->
+    <string name="TEA_reminder_alarm_label">Tipo de Tono/Vibración:</string>
 
+    <!--  slide 45a: Task Edit: Reminder mode: ring once -->
+    <string name="TEA_reminder_mode_once">Una vez</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 45b: Task Edit: Reminder mode: ring five times -->
+    <string name="TEA_reminder_mode_five">Cinco veces</string>
+
+    <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
+    <string name="TEA_reminder_mode_nonstop">Hasta que cancele la alarma</string>
+
+    <string name="TEA_reminder_when">when</string>
+
+    <string name="TEA_reminder_due_short">due</string>
+
+    <string name="TEA_reminder_overdue_short">overdue</string>
+
+    <string name="TEA_reminder_randomly_short">randomly</string>
+
+    <string name="TEA_reminder_display_one">Remind me %s</string>
+
+    <string name="TEA_reminder_display_multiple">Remind %s</string>
+
+    <string-array name="TEA_reminder_random">
+        <!-- random reminder choices for task edit page. -->
+        <item>una hora</item>
+        <item>un día</item>
+        <item>una semana</item>
+        <item>en dos semanas</item>
+        <item>un mes</item>
+        <item>en dos meses</item>
+    </string-array>
+
+    <!-- ==================================================== notifications == -->
+
+    <!-- Name of filter when viewing a reminder -->
+    <string name="rmd_NoA_filter">¡Aviso!</string>
+
+    <!-- Reminder: Task was already done -->
+    <string name="rmd_NoA_done">¡Terminada!</string>
+
+    <!-- Reminder: Snooze button (remind again later) -->
+    <string name="rmd_NoA_snooze">Espera...</string>
+
+    <!-- Reminder: Completed Toast -->
+    <string name="rmd_NoA_completed_toast">¡Felicitaciones por terminar!</string>
+
+    <!-- Prefix for reminder dialog title -->
+    <string name="rmd_NoA_dlg_title">Recordatorio:</string>
+
+    <!-- ==================================================== user reengagement == -->
+
+    <!-- Titles for user reengagement notifications -->
+    <string-array name="rmd_reengage_notif_titles">
+        <item>Una nota desde Astrid</item>
+        <!-- %s -> first name -->
+        <item>Memorándum para %s.</item>
+        <item>Tu resumen Astrid</item>
+        <item>Recordatorios de Astrid</item>
+    </string-array>
+
+    <string name="rmd_reengage_name_default">tú</string>
+
+
+    <string name="rmd_reengage_add_tasks">Añadir una tarea</string>
+
+    <!-- Speech bubble options for astrid in reengagement notifs -->
+    <string-array name="rmd_reengage_dialog_options">
+        <item>¡Es hora de acortar la lista de tareas!</item>
+        <item>Estimada dama o caballero, ¡algunas tareas esperan su inspección!</item>
+        <item>Hola, ¿Podrías darle una revisada a éstas?</item>
+        <item>¡Tengo unas tareas con tu nombre en ellas!</item>
+        <item>¡Un lote de frescas tareas para ti hoy!</item>
+        <item>¡Luces espectacular! ¿Listo para empezar?</item>
+        <item>Un hermoso día para hacer un poco de trabajo, ¡eso creo!</item>
+    </string-array>
+
+    <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>¿No quieres estar organizado?</item>
+        <item>¡Soy Astrid! ¡Estoy aquí para ayudarte a hacer más!</item>
+        <item>¡Pareces ocupado! Déjame quitarte alguna de esas tareas de tu plato.</item>
+        <item>Puedo ayudarle a rastrear todos los detalles en tu vida.</item>
+        <item>¿Tomaste seriamente acerca de hacer más? ¡Yo también!</item>
+        <item>¡Es un placer conocerlo!</item>
+    </string-array>
+    <!-- ============================================= reminder preferences == -->
+
+    <!-- slide 33d: Reminder Preference Screen Title -->
+    <string name="rmd_EPr_alerts_header">Configurar recordatorios</string>
+    <string name="rmd_EPr_alerts_summary">Horas tranquilas, opciones de vigilia, nivel de
+        persistencia
+    </string>
+
+    <!-- Reminder Preference: Reminders Enabled Title -->
+    <string name="rmd_EPr_enabled_title">¿Habilitar recordatorios?</string>
+    <!-- Reminder Preference Reminders Enabled Description (true) -->
+    <string name="rmd_EPr_enabled_desc_true">Los avisos de Astrid están habilitados (esto es lo
+        normal)
+    </string>
+    <!-- Reminder Preference Reminders Enabled Description (false) -->
+    <string name="rmd_EPr_enabled_desc_false">Los avisos de Astrid no aparecerán nunca en el
+        teléfono
+    </string>
+
+    <!-- Reminder Preference: Quiet Hours Start Title -->
+    <string name="rmd_EPr_quiet_hours_start_title">El horario en silencio empieza</string>
+    <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_start_desc">Notificaciones serán silenciadas después de
+        %s.\nNota: las vibraciones están controladas según la configuración "Vibrar en alerta"
+    </string>
+    <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
+    <string name="rmd_EPr_quiet_hours_desc_none">Horario en silencio deshabilitado</string>
+
+    <!-- Reminder Preference: Quiet Hours End Title -->
+    <string name="rmd_EPr_quiet_hours_end_title">El horario en silencio termina</string>
+    <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_end_desc">Las notificaciones dejarán de estar en silencio
+        desde las %s
+    </string>
+
+    <!-- Reminder Preference: Default Reminder Title -->
+    <string name="rmd_EPr_rmd_time_title">Aviso por defecto</string>
+    <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
+    <string name="rmd_EPr_rmd_time_desc">Notificaciones para tareas sin fecha límites aparecerán a
+        %s
+    </string>
+
+    <!-- Reminder Preference: Notification Ringtone Title -->
+    <string name="rmd_EPr_ringtone_title">Tono de notificación</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
+    <string name="rmd_EPr_ringtone_desc_custom">Tono personalizado establecido</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
+    <string name="rmd_EPr_ringtone_desc_silent">Tono configurado como silencio</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
+    <string name="rmd_EPr_ringtone_desc_default">Se usará el tono por defecto</string>
+
+    <!-- Reminder Preference: Notification Persistence Title -->
+    <string name="rmd_EPr_persistent_title">Persistencia de notificación</string>
+    <!-- Reminder Preference: Notification Persistence Description (true) -->
+    <string name="rmd_EPr_persistent_desc_true">Las notificaciones deben verse individualmente para
+        quitarlas
+    </string>
+    <!-- Reminder Preference: Notification Persistence Description (false) -->
+    <string name="rmd_EPr_persistent_desc_false">Las notificaciones se pueden borrar con el botón
+        \"Borrar Todo\"
+    </string>
+
+    <!-- Reminder Preference: Social Reminders Title -->
+    <string name="rmd_EPr_social_title">Social encouragement</string>
+    <!-- Reminder Preference: Social Reminders Summary (enabled) -->
+    <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for
+        shared tasks
+    </string>
+    <!-- Reminder Preference: Social Reminders Summary (disabled) -->
+    <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you
+        for shared tasks
+    </string>
+
+
+    <!-- Reminder Preference: Notification Icon Title -->
+    <!-- Reminder Preference: Notification Icon Description -->
+
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
+    <string name="rmd_EPr_multiple_maxvolume_title">Máximo volumen para recordatorios con tonos
+        múltiples
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid fijará el volumen máximo para avisos
+        con tonos múltiples
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid usará la configuración del sistema
+        para el volumen
+    </string>
+
+    <!-- Reminder Preference: Vibrate Title -->
+    <string name="rmd_EPr_vibrate_title">Vibrar en alerta</string>
+    <!-- Reminder Preference: Vibrate Description (true) -->
+    <string name="rmd_EPr_vibrate_desc_true">Astrid vibrará cuando envíe notificaciones</string>
+    <!-- Reminder Preference: Vibrate Description (false) -->
+    <string name="rmd_EPr_vibrate_desc_false">Astrid no vibrará al enviar notificaciones</string>
+
+    <!-- Reminder Preference: Nagging Title -->
+    <string name="rmd_EPr_nagging_title">Incentivos de Astrid</string>
+    <!-- Reminder Preference: Nagging Description (true) -->
+    <string name="rmd_EPr_nagging_desc_true">Astrid te mostrará mensajes de ánimo en los
+        recordatorios
+    </string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_nagging_desc_false">Astrid no te dará mensajes de ánimo</string>
+
+    <!-- Reminder Preference: Snooze Dialog Title -->
+    <string name="rmd_EPr_snooze_dialog_title">Diálogo de espera HH:MM</string>
+    <!-- Reminder Preference: Snooze Dialog Description (true) -->
+    <string name="rmd_EPr_snooze_dialog_desc_true">Retrasa seleccionando un nuevo tiempo de vigilia
+        (HH:MM)
+    </string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_snooze_dialog_desc_false">Retrasar seleccionando # días/horas de espera
+    </string>
+
+    <!-- slide 44g: Reminder Preference: Default Reminders Title -->
+    <string name="rmd_EPr_defaultRemind_title">Recordatorios aleatorios</string>
+    <!-- Reminder Preference: Default Reminders Setting (disabled) -->
+    <string name="rmd_EPr_defaultRemind_desc_disabled">Las nuevas tareas no tendrán recordatorios al
+        azar
+    </string>
+    <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
+    <string name="rmd_EPr_defaultRemind_desc">Las nuevas tareas tendrán recordatorios al azar: %s
+    </string>
+
+    <!-- slide 39a: Defaults Title -->
+
+    <string-array name="EPr_reminder_random">
+        <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
+        <item>deshabilitado</item>
+        <!-- slide 44b -->
+        <item>por hora</item>
+        <!-- slide 44c -->
+        <item>diariamente</item>
+        <!-- slide 44d-->
+        <item>semanalmente</item>
+        <!-- slide 44e-->
+        <item>quincenalmente</item>
+        <!-- slide 44f -->
+        <item>mensualmente</item>
+        <item>bimensualmente</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_start">
+        <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
+        <item>deshabilitado</item>
+        <item>8 p.m.</item>
+        <item>9 pm</item>
+        <item>10 pm</item>
+        <item>11 pm</item>
+        <item>12 am</item>
+        <item>1 am</item>
+        <item>2 am</item>
+        <item>3 am</item>
+        <item>4 am</item>
+        <item>5 am</item>
+        <item>6 am</item>
+        <item>7 am</item>
+        <item>8 am</item>
+        <item>9 am</item>
+        <item>10 am</item>
+        <item>11 am</item>
+        <item>12 pm</item>
+        <item>1 pm</item>
+        <item>2 pm</item>
+        <item>3 pm</item>
+        <item>4 pm</item>
+        <item>5 pm</item>
+        <item>6 pm</item>
+        <item>7 pm</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_end">
+        <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
+        <item>9 am</item>
+        <item>10 am</item>
+        <item>11 am</item>
+        <item>12 pm</item>
+        <item>1 pm</item>
+        <item>2 pm</item>
+        <item>3 pm</item>
+        <item>4 pm</item>
+        <item>5 pm</item>
+        <item>6 pm</item>
+        <item>7 pm</item>
+        <item>8 pm</item>
+        <item>9 pm</item>
+        <item>10 pm</item>
+        <item>11 pm</item>
+        <item>12 am</item>
+        <item>1 am</item>
+        <item>2 am</item>
+        <item>3 am</item>
+        <item>4 am</item>
+        <item>5 am</item>
+        <item>6 am</item>
+        <item>7 am</item>
+        <item>8 am</item>
+    </string-array>
+
+    <string-array name="EPr_rmd_time">
+        <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
+        <item>9 am</item>
+        <item>10 am</item>
+        <item>11 am</item>
+        <item>12 pm</item>
+        <item>1 pm</item>
+        <item>2 pm</item>
+        <item>3 pm</item>
+        <item>4 pm</item>
+        <item>5 pm</item>
+        <item>6 pm</item>
+        <item>7 pm</item>
+        <item>8 pm</item>
+        <item>9 pm</item>
+        <item>10 pm</item>
+        <item>11 pm</item>
+        <item>12 am</item>
+        <item>1 am</item>
+        <item>2 am</item>
+        <item>3 am</item>
+        <item>4 am</item>
+        <item>5 am</item>
+        <item>6 am</item>
+        <item>7 am</item>
+        <item>8 am</item>
+    </string-array>
+
+    <!-- =============================================== random reminders == -->
+
+    <string name="reminders_social">Estas personas están contando con usted!</string>
+
+    <string name="reminders_social_one">%s is counting on you!</string>
+
+    <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
+
+    <string-array name="reminders">
+        <!-- reminders: Make these < 20 chars so the task name is displayed -->
+        <item>¡Hola! ¿Tienes un segundo?</item>
+        <item>¿Puedo verte un segundo?</item>
+        <item>¿Tiene unos minutos?</item>
+        <item>¿Ha olvidado?</item>
+        <item>¡Perdón!</item>
+        <item>Cuando tenga un minuto:</item>
+        <item>En su agenda:</item>
+        <item>¿Tienes un momento?</item>
+        <item>¡Astrid aquí!</item>
+        <item>¡Hola! ¿Puedo molestarte?</item>
+        <item>¿Un minuto de tu tiempo?</item>
+        <item>Es un gran día para</item>
+    </string-array>
+
+    <string-array name="reminders_due">
+        <!-- reminders related to task due date -->
+        <item>¡Hora de trabajar!</item>
+        <item>¡Ha llegado la fecha límite!</item>
+        <item>¿Está listo para comenzar?</item>
+        <item>Dijiste que harías:</item>
+        <item>Se supone que tienes que empezar:</item>
+        <item>Hora de empezar:</item>
+        <item>¡Ahora!</item>
+        <item>¡Perdón! Es la hora de</item>
+        <item>¿Está libre? Tiempo para:</item>
+    </string-array>
+
+    <string-array name="reminders_snooze">
+        <!-- reminders related to snooze -->
+        <item>¡No seas vago ahora!</item>
+        <item>Tiempo de pausa ha concluido!</item>
+        <item>¡No más pausas!</item>
+        <item>¿Estás listo ya?</item>
+        <item>¡No lo pospongo más!</item>
+    </string-array>
+
+    <string-array name="reminder_responses">
+        <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
+        <item>¡Tengo algo para usted!</item>
+        <item>¿Listo para dejarlo en el pasado?</item>
+        <item>¿Por qué no acabas esto?</item>
+        <item>¿Qué te parece? ¿Estás listo, tigre?</item>
+        <item>¿Preparado para hacer esto?</item>
+        <item>¿Puedes encargarte de esto?</item>
+        <item>Puede ser feliz! Acabe esto!</item>
+        <item>¡Te prometo que te sentirás mejor si finalizas esto!</item>
+        <item>¿No vas a hacer esto hoy?</item>
+        <item>Por favor, termina esto, ¡estoy harto de verlo!</item>
+        <item>¿Puedes terminar esto? ¡Sí que puedes!</item>
+        <item>¿Acaso nunca va a hacer esto?</item>
+        <item>¡Siéntase bien consigo mismo! ¡Vamos!</item>
+        <item>¡Estoy tan orgulloso de ti! ¡Vamos a hacerlo!</item>
+        <item>¿Un pequeño refrigerio cuando finalices esto?</item>
+        <item>¿Sólo esta tarea una? ¿Por favor?</item>
+        <item>Es hora de acortar la lista de tareas!</item>
+        <item>¿Estás en el Equipo Orden o Desorden? En el Equipo Orden, ¡Vamos!</item>
+        <item>¿Te he dicho ultimamente que eres impresionante? ¡Seguí así!</item>
+        <item>Una tarea al día mantiene el desorden a raya... ¡Adiós desorden!</item>
+        <item>¿Cómo lo haces? Guau, estoy impresionado!</item>
+        <item>Con solo mirar no lo logrará. ¡Vamos a trabajar!</item>
+        <item>Muy buen clima para un trabajo como éste. ¿No?</item>
+        <item>¿Una taza de té mientras trabajas en esto?</item>
+        <item>Si ya has terminado, puedes salir fuera a jugar.</item>
+        <item>¡Ya es hora! No puedes posponer lo inevitable.</item>
+        <item>Muero un poco cada vez que me ignoras.</item>
+    </string-array>
+
+    <string-array name="postpone_nags">
+        <!-- Astrid\'s nagging when user clicks postpone -->
+        <item>Por favor, dime que no es cierto que eres un indeciso!</item>
+        <item>No ser perezoso tiene sus recompensas</item>
+        <item>¡En algún lugar, alguien está esperando a que lo finalices!</item>
+        <item>¿Cuando dice posponer... realmente quiere decir \'lo estoy haciendo\'? ¿es verdad?
+        </item>
+        <item>¿Esta es la última vez que pospone esto? ¿verdad?</item>
+        <item>Hoy sólo finalicé esto. ¡No se lo diré a nadie!</item>
+        <item>¿Por qué posponer cuando puede... no posponer!</item>
+        <item>¿Supongo que terminará esto en algún momento?</item>
+        <item>Pienso que eres fenomenal! ¿Qué hay de no demorar esto?</item>
+        <item>¿Será capaz de alcanzar sus metas si hace eso?</item>
+        <item>Posponer, posponer, posponer. ¡Cuándo va a cambiar!</item>
+        <item>¡Ya tengo suficientes excusas! ¡Hágalo de una vez!</item>
+        <item>¿Esa no fue la excusa que usó la última vez?</item>
+        <item>No puedo ayudarlo a organizar su vida si hace esto...</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in repeat plug-in -->
+
+    <!-- repeating plugin name -->
+    <string name="repeat_plugin">Tareas recurrentes</string>
+
+    <!-- repeating plugin description -->
+    <string name="repeat_plugin_desc">Permitir que las tareas se repitan</string>
+
+    <!-- slide 20a: checkbox for turning on/off repeats -->
+    <string name="repeat_enabled">Repeticiones</string>
+
+    <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
+    <string name="repeat_every">Cada %d</string>
+
+    <!-- hint when opening repeat interval -->
+    <string name="repeat_interval_prompt">Intervalo de repetición</string>
+
+    <!-- slide 19b-->
+    <string name="repeat_never">Not repeating</string>
+    <!-- slide 20f-->
+    <string name="repeat_dont">No repetir</string>
+
+    <string-array name="repeat_interval_short">
+        <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
+        <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">
+        <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>Día(s)</item>
+        <item>Semana(s)</item>
+        <item>Mes(es)</item>
+        <item>Hora(s)</item>
+        <item>Minuto(s)</item>
+        <item>Año(s)</item>
+    </string-array>
+
+    <string name="repeat_days">días</string>
+    <string name="repeat_weekdays">días laborales</string>
+    <string name="repeat_weeks">semanas</string>
+    <string name="repeat_months">meses</string>
+    <string name="repeat_years">años</string>
+    <string name="repeat_hours">horas</string>
+    <string name="repeat_minutes">minutos</string>
+
+    <string-array name="repeat_until_shortcuts">
+        <item>Por siempre</item>
+        <item>Día específico</item>
+        <item>Hoy</item>
+        <item>Mañana</item>
+        <item>(día siguiente)</item>
+        <item>Próxima semana</item>
+        <item>En dos semanas</item>
+        <item>Próximo mes</item>
+    </string-array>
+
+    <string name="repeat_until_title">Repetir hasta...</string>
+
+    <string name="repeat_keep_going">Continúe</string>
+
+    <string-array name="repeat_type">
+        <!-- slide 20c: repeat type (date to repeat from) -->
+        <item>desde la fecha límite</item>
+        <!-- slide 20c -->
+        <item>Desde la fecha de finalización</item>
+    </string-array>
+
+    <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
+    <string name="repeat_detail_byday">$I en $D</string>
+
+    <!-- task detail for repeat from due date (%s -> interval) -->
+    <string name="repeat_detail_duedate">Cada %s</string>
+
+    <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
+    <string name="repeat_detail_duedate_until">Cada %1$s\nhasta %2$s</string>
+
+    <!-- task detail for repeat from completion date (%s -> interval) -->
+    <string name="repeat_detail_completion">%s una vez completada</string>
+
+    <!-- text for button when repeating task indefinitely -->
+    <string name="repeat_forever">Repetir por siempre</string>
+
+    <!-- text for button when repeating task until specified date (%s -> date string) -->
+    <string name="repeat_until">Repetir hasta %s</string>
+
+    <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title">Reprogramar tarea \"%s\"</string>
+
+    <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title_last_time">Tarea recurrente \"%s\" terminada
+    </string>
+
+    <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->
+    <string name="repeat_rescheduling_dialog_bubble">%1$s he reprogramado esta tarea recurrente de
+        %2$s a %3$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
+    <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s He reprogramado esta tarea
+        recurrente para %2$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
+    <string name="repeat_rescheduling_dialog_bubble_last_time">Tenía esta tarea recurrente
+        programada hasta %1$s, y ya la ha terminado. %2$s
+    </string>
+
+    <string-array name="repeat_encouragement">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>¡Buen trabajo!</item>
+        <item>¡Guau... Estoy tan orgulloso de usted!</item>
+        <item>¡Me encanta cuando es tan productivo!</item>
+        <item>¿A que te sientes bien por haber terminado algo?</item>
+    </string-array>
+
+    <string-array name="repeat_encouragement_last_time">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>¡Bien hecho!</item>
+        <item>¡Estoy tan orgulloso de usted!</item>
+        <item>¡Me encanta cuando es productivo!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Subtasks Help Introduction -->
+    <string name="subtasks_help_title">Ordenar y aplicar sangria en Astrid</string>
+    <string name="subtasks_help_1">Mantenga presionado para mover una tarea</string>
+    <string name="subtasks_help_2">Arrastre verticalmente para reordenar</string>
+    <string name="subtasks_help_3">Arrastre horizontalmente para aplicar una sangría</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-
-  <!-- Tags label -->
-  <string name="TEA_tags_label">Listas</string>
-  
-  <!-- Tags label long version -->
-  <string name="TEA_tags_label_long">Añadir a listas</string>
- 
-  <!-- Tags hint -->
-  <string name="TEA_tag_hint">Nueva lista</string>
-  
-  <!-- Tags dropdown -->
-    
-  <!-- =============================================== Task List Controls == -->
-  
-  <!-- menu item for tags -->
-  
-  <!-- ========================================================== Extras == -->
-  
-  <!-- Context Item: show tag -->
-  
-  <!-- slide 25a: Dialog: new list -->
-  <string name="tag_new_list">Nueva lista</string>
-  
-  <!-- Dialog: list saved -->
-  
-  <!-- Dialog: task created without title -->
-  <string name="tag_no_title_error">Por favor, ¡introduce un nombre para la primera lista!</string>
-  
-  <!-- ========================================================== Filters == -->
-  
-  <!-- filter button to add tag -->
-  <string name="tag_FEx_add_new">Nueva</string>
-  
-  <!-- filter header for tags -->
-  <string name="tag_FEx_header">Listas</string>
-  
-  <!-- filter header for tags user created -->
-  
-  <!-- filter header for tags, shared with user -->
-  
-  <!-- filter header for tags which have no active tasks -->
-  
-  <!-- slide 10d: filter for untagged tasks -->
-  <string name="tag_FEx_untagged">Uncategorized</string>
-  
-  <!-- slide 27a: %s => tag name -->
-
-  <!-- context menu option to rename a tag -->
-  <string name="tag_cm_rename">Renombrar lista</string>
-
-  <!-- context menu option to delete a tag -->
-  <string name="tag_cm_delete">Eliminar lista</string>
-  
-  <!-- context menu option to leave a shared list -->
-  <string name="tag_cm_leave">Abandonar lista</string>
-
-  <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
-  <string name="DLG_delete_this_tag_question">¿Eliminar esta lista: %s? (Ninguna tarea será eliminada.)</string>
-  
-  <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
-  <string name="DLG_leave_this_shared_tag_question">¿Abandonar esta lista compartida: %s? (No se eliminará ninguna tarea.)</string>
-
-  <!-- Dialog to rename tag -->
-  <string name="DLG_rename_this_tag_header">Renombrar la lista %s a :</string>
-
-  <!-- Toast notification that no changes have been made -->
-  <string name="TEA_no_tags_modified">No se han hecho cambios</string>
-
-  <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_deleted">La lista %1$s fue eliminada, afectando %2$d tareas</string>
-  
-  <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_left">Abandonó la lista compartida %1$s, afectando %2$d tareas</string>
-
-  <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
-  <string name="TEA_tags_renamed">Renombrada %1$s como %2$s en %3$d tareas</string>
-  
-  <!-- Tag case migration -->
-  <string name="tag_case_migration_notice">Hemos detectado que tiene algunas listas con los mismos nombres pero mayúsculas/minúsculas distintas. Creemos que su intención es que fuesen la misma lista, así que hemos combinado los duplicados. No te preocupes: las listas originales se han renombrado con números (ej. Compras_1, Compras_2). Si no estás de acuerdo, ¡sólo tienes que borrar la nueva lista combinada!</string>
-  
-  <!-- Header for tag settings -->
-  <string name="tag_settings_title">Configuración de lista</string>
-  
-  <!-- Header for tag activity -->
-  <string name="tag_updates_title">Actividad: %s</string>
-  
-  <!-- Delete button for tag settings -->
-  <string name="tag_delete_button">Eliminar lista</string>
-  
-  <!-- slide 28d: Leave button for tag settings -->
-  <string name="tag_leave_button">Abandonar esta lista</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Tags label -->
+    <string name="TEA_tags_label">Listas</string>
 
+    <!-- Tags label long version -->
+    <string name="TEA_tags_label_long">Añadir a listas</string>
+
+    <!-- Tags hint -->
+    <string name="TEA_tag_hint">Nueva lista</string>
+
+    <!-- Tags dropdown -->
+
+    <!-- =============================================== Task List Controls == -->
+
+    <!-- menu item for tags -->
+
+    <!-- ========================================================== Extras == -->
+
+    <!-- Context Item: show tag -->
+
+    <!-- slide 25a: Dialog: new list -->
+    <string name="tag_new_list">Nueva lista</string>
+
+    <!-- Dialog: list saved -->
+
+    <!-- Dialog: task created without title -->
+    <string name="tag_no_title_error">Por favor, ¡introduce un nombre para la primera lista!
+    </string>
+
+    <!-- ========================================================== Filters == -->
+
+    <!-- filter button to add tag -->
+    <string name="tag_FEx_add_new">Nueva</string>
+
+    <!-- filter header for tags -->
+    <string name="tag_FEx_header">Listas</string>
+
+    <!-- filter header for tags user created -->
+
+    <!-- filter header for tags, shared with user -->
+
+    <!-- filter header for tags which have no active tasks -->
+
+    <!-- slide 10d: filter for untagged tasks -->
+    <string name="tag_FEx_untagged">Uncategorized</string>
+
+    <!-- slide 27a: %s => tag name -->
+
+    <!-- context menu option to rename a tag -->
+    <string name="tag_cm_rename">Renombrar lista</string>
+
+    <!-- context menu option to delete a tag -->
+    <string name="tag_cm_delete">Eliminar lista</string>
+
+    <!-- context menu option to leave a shared list -->
+    <string name="tag_cm_leave">Abandonar lista</string>
+
+    <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
+    <string name="DLG_delete_this_tag_question">¿Eliminar esta lista: %s? (Ninguna tarea será
+        eliminada.)
+    </string>
+
+    <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
+    <string name="DLG_leave_this_shared_tag_question">¿Abandonar esta lista compartida: %s? (No se
+        eliminará ninguna tarea.)
+    </string>
+
+    <!-- Dialog to rename tag -->
+    <string name="DLG_rename_this_tag_header">Renombrar la lista %s a :</string>
+
+    <!-- Toast notification that no changes have been made -->
+    <string name="TEA_no_tags_modified">No se han hecho cambios</string>
+
+    <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_deleted">La lista %1$s fue eliminada, afectando %2$d tareas</string>
+
+    <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_left">Abandonó la lista compartida %1$s, afectando %2$d tareas</string>
+
+    <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
+    <string name="TEA_tags_renamed">Renombrada %1$s como %2$s en %3$d tareas</string>
+
+    <!-- Tag case migration -->
+    <string name="tag_case_migration_notice">Hemos detectado que tiene algunas listas con los mismos
+        nombres pero mayúsculas/minúsculas distintas. Creemos que su intención es que fuesen la
+        misma lista, así que hemos combinado los duplicados. No te preocupes: las listas originales
+        se han renombrado con números (ej. Compras_1, Compras_2). Si no estás de acuerdo, ¡sólo
+        tienes que borrar la nueva lista combinada!
+    </string>
+
+    <!-- Header for tag settings -->
+    <string name="tag_settings_title">Configuración de lista</string>
+
+    <!-- Header for tag activity -->
+    <string name="tag_updates_title">Actividad: %s</string>
+
+    <!-- Delete button for tag settings -->
+    <string name="tag_delete_button">Eliminar lista</string>
+
+    <!-- slide 28d: Leave button for tag settings -->
+    <string name="tag_leave_button">Abandonar esta lista</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in timers plug-in -->
-    
+
     <!-- Task List: Start Timer button -->
-    
+
     <!-- Task List: Stop Timer button -->
-    
+
     <!-- Android Notification Title (%s => # tasks) -->
     <string name="TPl_notification">Temporizadores activos para %s!</string>
-    
+
     <!-- Filter Header for Timer plugin -->
-    
+
     <!-- Filter for Timed Tasks -->
     <string name="TFE_workingOn">Tareas que se están cronometrando</string>
-    
+
     <!-- Title for TEA -->
     <string name="TEA_timer_controls">Temporizador</string>
-    
-    
+
+
     <!-- Edit Notes: create comment for when timer is started -->
     <string name="TEA_timer_comment_started">comenzó esta tarea:</string>
-    
+
     <!-- Edit Notes: create comment for when timer is stopped -->
     <string name="TEA_timer_comment_stopped">dejó de hacer esta tarea:</string>
-    
+
     <!-- Edit Notes: comment to notify how long was spent on task -->
     <string name="TEA_timer_comment_spent">Tiempo dedicado:</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Update string from activity codes %1$s - user, %2$s - target name, %3$s - message, %4$s - other_user-->
-    
+
     <!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
     Please do not translate this part of the string. -->
-    
+
     <!-- These are still in use -->
     <string name="update_string_default_comment">%1$s comentó: %3$s</string>
     <string name="update_string_task_comment">%1$s on $link_task: %3$s</string>
     <string name="update_string_tag_comment">%1$s on %2$s: %3$s</string>
     <string name="update_string_user_self">Tú</string>
-    
+
     <string name="history_yourself">tú mismo</string>
     <string name="history_you">tú</string>
     <string name="history_a_deleted_user">(un usuario borrado)</string>
-    
+
     <string name="history_this_list">esta lista</string>
     <string name="history_this_task">esta tarea</string>
     <string name="history_tag_added">added %1$s to %2$s</string>
@@ -2988,9 +3285,12 @@ no le será posible hacer compras.</string>
     <string name="history_favorited">favorited %s</string>
     <string name="history_unfavorited">unfavorited %s</string>
     <string name="history_changed_list_picture">change this list\'s picture</string>
-    <string name="history_added_description_characters">added %1$d characters to %2$s description</string>
+    <string name="history_added_description_characters">added %1$d characters to %2$s description
+    </string>
     <string name="history_removed_description">removed %s description</string>
-    <string name="history_removed_description_characters">removed %1$d characters from %2$s description</string>
+    <string name="history_removed_description_characters">removed %1$d characters from %2$s
+        description
+    </string>
     <string name="history_updated_description">updated %s description</string>
     <string name="history_changed_list_owner">changed list owner to %s</string>
     <string name="history_created_this_list">created this list</string>
@@ -3013,195 +3313,227 @@ no le será posible hacer compras.</string>
     <string name="history_repeat_on">en %s</string>
     <string name="history_repeat_from_completion">after completion</string>
     <string name="history_acknowledged">viewed %s</string>
-    
-    <string name="history_default">changed %1$s to %2$s</string>
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-    
-  <!-- Voice Add Prompt Text -->
-  <string name="voice_create_prompt">Hable para crear una tarea</string>
-  <string name="voice_edit_title_prompt">Hable para establecer título de tarea</string>
-  <string name="voice_edit_note_prompt">Hable para establecer notas de tarea</string>
-    
-  <!-- Preference: Task List recognition-service is not installed, but available -->
-  <string name="EPr_voiceInputInstall_dlg">El ingreso de datos por voz no está instalado.\n¿Desea ir al market e instalarlo?</string>
-  <!-- Preference: Task List recognition-service is not available for this system -->
-  <string name="EPr_voiceInputUnavailable_dlg">Desafortunadamente, el reconocimiento de voz no está disponible para su sistema.\nSi es posible, actualice a Android 2.1 o superior.</string>
-  <!-- Preference: Market is not available for this system -->
-  <string name="EPr_marketUnavailable_dlg">Lamentablemente el market no está disponible para su sistema.\nDe ser posible, descargue \"búsqueda por voz\" desde otra fuente.</string>
-  <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
-  <string name="EPr_voiceInputEnabled_title">Ingreso por voz</string>
-  <!-- slide 38a: Preference: voice button description (true) -->
-  <string name="EPr_voiceInputEnabled_desc_enabled">El botón de ingreso por voz se mostrará en la página de tareas</string>
-  <!-- Preference: voice button description (false) -->
-  <string name="EPr_voiceInputEnabled_desc_disabled">El botón de ingreso por voz se ocultará en la página de tareas</string>
-  <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
-  <string name="EPr_voiceInputCreatesTask_title">Crear tarea directamente</string>
-  <!-- Preference: Task List Voice-creation description (true) -->
-  <string name="EPr_voiceInputCreatesTask_desc_enabled">Las tareas se crearán automáticamente por medio de su voz</string>
-  <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
-  <string name="EPr_voiceInputCreatesTask_desc_disabled">Puede editar el título de la tarea al finalizar la introducción por voz</string>
-  <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
-  <string name="EPr_voiceRemindersEnabled_title">Avisos de voz</string>
-  <!-- Preference: Voice reminders description (true) -->
-  <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid dirá los nombres de las tareas durante los avisos</string>
-  <!-- slide 38c: Preference: Voice reminders description (false) -->
-  <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid reproducirá un tono durante los recordatorios</string>    
-  
-  <!-- slide 32d: Preference Category: Voice Title -->
-  <string name="EPr_voice_header">Configuración de Ingreso por Voz</string>
-    
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-  
-  <!-- slide 30a-->
-  <string name="welcome_setting">Mostrar tutorial</string>
-  
-  <string name="welcome_title_1">¡Bienvenido a Astrid!</string>
-
-  <!-- slide 2a -->
-  <string name="welcome_title_2">Hacer listas</string>
-
-  <!-- slide 3a-->
-  <string name="welcome_title_3">Alternar entre listas</string>
-
-  <!-- slide 4a -->
-  <string name="welcome_title_4">Compartir listas</string>
-
-  <!-- slide 5a -->
-  <string name="welcome_title_5">Repartir tareas</string>
-
-  <!-- slide 6a -->
-  <string name="welcome_title_6">Proporcionar detalles</string>
 
-  <!-- slide 7a -->
-  <string name="welcome_title_7">¡Conectarse ahora\npara comenzar!</string>
-  
-  <string name="welcome_title_7_return">¡Eso es todo!</string>
-  
-  <!-- slide 1b -->
-  <string name="welcome_body_1">El administrador personal de tareas perfecto \nque funciona maravillosamente con tus amigos</string>
-
-  <!-- slide 2b-->
-  <string name="welcome_body_2">¡Excelente para cualquier lista:\nlea, observe, compre, visite!</string>
-
-  <!-- slide 3b -->
-  <string name="welcome_body_3">Toque el título de la lista \npara ver todas tus listas</string>
-
-  <!-- slide 4b -->
-  <string name="welcome_body_4">¡Comparte listas con\namigos, compañeros\no con tu amor!</string>
-
-  <!-- slide 5b -->
-  <string name="welcome_body_5">¡Nunca te preguntes quién \ntraerá el postre!</string>
+    <string name="history_default">changed %1$s to %2$s</string>
 
-  <!-- slide 6b-->
-  <string name="welcome_body_6">Pulse aquí para añadir notas, recordatorios \n, \ny mucho más!</string>
-  <string name="welcome_body_7">Iniciar sesión</string>
-  
-  <string name="welcome_body_7_return">Toque para volver a Astrid.</string>
-  
-  <!-- slide 1c -->
-  <string name="welcome_next">Siguiente</string>
-  
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Voice Add Prompt Text -->
+    <string name="voice_create_prompt">Hable para crear una tarea</string>
+    <string name="voice_edit_title_prompt">Hable para establecer título de tarea</string>
+    <string name="voice_edit_note_prompt">Hable para establecer notas de tarea</string>
+
+    <!-- Preference: Task List recognition-service is not installed, but available -->
+    <string name="EPr_voiceInputInstall_dlg">El ingreso de datos por voz no está instalado.\n¿Desea
+        ir al market e instalarlo?
+    </string>
+    <!-- Preference: Task List recognition-service is not available for this system -->
+    <string name="EPr_voiceInputUnavailable_dlg">Desafortunadamente, el reconocimiento de voz no
+        está disponible para su sistema.\nSi es posible, actualice a Android 2.1 o superior.
+    </string>
+    <!-- Preference: Market is not available for this system -->
+    <string name="EPr_marketUnavailable_dlg">Lamentablemente el market no está disponible para su
+        sistema.\nDe ser posible, descargue \"búsqueda por voz\" desde otra fuente.
+    </string>
+    <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
+    <string name="EPr_voiceInputEnabled_title">Ingreso por voz</string>
+    <!-- slide 38a: Preference: voice button description (true) -->
+    <string name="EPr_voiceInputEnabled_desc_enabled">El botón de ingreso por voz se mostrará en la
+        página de tareas
+    </string>
+    <!-- Preference: voice button description (false) -->
+    <string name="EPr_voiceInputEnabled_desc_disabled">El botón de ingreso por voz se ocultará en la
+        página de tareas
+    </string>
+    <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
+    <string name="EPr_voiceInputCreatesTask_title">Crear tarea directamente</string>
+    <!-- Preference: Task List Voice-creation description (true) -->
+    <string name="EPr_voiceInputCreatesTask_desc_enabled">Las tareas se crearán automáticamente por
+        medio de su voz
+    </string>
+    <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
+    <string name="EPr_voiceInputCreatesTask_desc_disabled">Puede editar el título de la tarea al
+        finalizar la introducción por voz
+    </string>
+    <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
+    <string name="EPr_voiceRemindersEnabled_title">Avisos de voz</string>
+    <!-- Preference: Voice reminders description (true) -->
+    <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid dirá los nombres de las tareas
+        durante los avisos
+    </string>
+    <!-- slide 38c: Preference: Voice reminders description (false) -->
+    <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid reproducirá un tono durante los
+        recordatorios
+    </string>
+
+    <!-- slide 32d: Preference Category: Voice Title -->
+    <string name="EPr_voice_header">Configuración de Ingreso por Voz</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 30a-->
+    <string name="welcome_setting">Mostrar tutorial</string>
+
+    <string name="welcome_title_1">¡Bienvenido a Astrid!</string>
+
+    <!-- slide 2a -->
+    <string name="welcome_title_2">Hacer listas</string>
+
+    <!-- slide 3a-->
+    <string name="welcome_title_3">Alternar entre listas</string>
+
+    <!-- slide 4a -->
+    <string name="welcome_title_4">Compartir listas</string>
+
+    <!-- slide 5a -->
+    <string name="welcome_title_5">Repartir tareas</string>
+
+    <!-- slide 6a -->
+    <string name="welcome_title_6">Proporcionar detalles</string>
+
+    <!-- slide 7a -->
+    <string name="welcome_title_7">¡Conectarse ahora\npara comenzar!</string>
+
+    <string name="welcome_title_7_return">¡Eso es todo!</string>
+
+    <!-- slide 1b -->
+    <string name="welcome_body_1">El administrador personal de tareas perfecto \nque funciona
+        maravillosamente con tus amigos
+    </string>
+
+    <!-- slide 2b-->
+    <string name="welcome_body_2">¡Excelente para cualquier lista:\nlea, observe, compre, visite!
+    </string>
+
+    <!-- slide 3b -->
+    <string name="welcome_body_3">Toque el título de la lista \npara ver todas tus listas</string>
+
+    <!-- slide 4b -->
+    <string name="welcome_body_4">¡Comparte listas con\namigos, compañeros\no con tu amor!</string>
+
+    <!-- slide 5b -->
+    <string name="welcome_body_5">¡Nunca te preguntes quién \ntraerá el postre!</string>
+
+    <!-- slide 6b-->
+    <string name="welcome_body_6">Pulse aquí para añadir notas, recordatorios \n, \ny mucho más!
+    </string>
+    <string name="welcome_body_7">Iniciar sesión</string>
+
+    <string name="welcome_body_7_return">Toque para volver a Astrid.</string>
+
+    <!-- slide 1c -->
+    <string name="welcome_next">Siguiente</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <string name="widget_mini">- Astrid Mini -</string>
-    
+
     <!-- Resources for power pack widget -->
-    
+
     <string name="PPW_widget_42_label">Old Astrid 4x2</string>
     <string name="PPW_widget_43_label">Old Astrid 4x3</string>
     <string name="PPW_widget_44_label">Old Astrid 4x4</string>
     <string name="PPW_widget_v11_label">- Astrid -</string>
     <string name="PPW_widget_custom_label">Astrid Custom Premium Launcher</string>
     <string name="PPW_widget_custom_launcherpro_label">Astrid Launcher Pro Premium</string>
-    
+
     <string name="PPW_configure_title">Configurar widget</string>
-    
+
     <string name="PPW_color">Color del widget</string>
     <string name="PPW_enable_calendar">Mostrar eventos del calendario</string>
     <string name="PPW_disable_encouragements">Ocultar estímulos</string>
     <string name="PPW_show_dates">Mostrar fechas límite</string>
     <string name="PPW_filter">Seleccionar filtro</string>
-    
+
     <string name="PPW_due">Vence:</string>
     <string name="PPW_past_due">Vencido:</string>
-    
-    <string name="PPW_old_astrid_notice">Se requiere como mínimo la version 3.6 de Astrid para usar este widget. ¡Lo sentimos!</string>
-    
+
+    <string name="PPW_old_astrid_notice">Se requiere como mínimo la version 3.6 de Astrid para usar
+        este widget. ¡Lo sentimos!
+    </string>
+
     <string-array name="PPW_encouragements">
         <!-- general encouragements -->
-    	<item>¡Qué tal!</item>
-    	<item>¿Tiene tiempo para finalizar algo?</item>
-    	<item>¡Vaya, se le ve muy tranquilo hoy!</item>
-    	<item>¡Haga algo fabuloso hoy!</item>
-    	<item>¡Hoy hágame sentirme orgulloso!</item>
-    	<item>¿Cómo le está yendo hoy?</item>
+        <item>¡Qué tal!</item>
+        <item>¿Tiene tiempo para finalizar algo?</item>
+        <item>¡Vaya, se le ve muy tranquilo hoy!</item>
+        <item>¡Haga algo fabuloso hoy!</item>
+        <item>¡Hoy hágame sentirme orgulloso!</item>
+        <item>¿Cómo le está yendo hoy?</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_tod">
         <!-- encouragements based on time of day -->
-    	<item>¡Buenos días!</item>
-    	<item>¡Buenas tardes!</item>
-    	<item>¡Buenas noches!</item>
-    	<item>Tarde en la noche?</item>
-    	<item>¡Es temprano, haga algo!</item>
-    	<item>¿Tarde de té, tal vez?</item>
-    	<item>¡Disfrute la tarde!</item>
-    	<item>Dormir es saludable, ¡lo sabe!</item>
+        <item>¡Buenos días!</item>
+        <item>¡Buenas tardes!</item>
+        <item>¡Buenas noches!</item>
+        <item>Tarde en la noche?</item>
+        <item>¡Es temprano, haga algo!</item>
+        <item>¿Tarde de té, tal vez?</item>
+        <item>¡Disfrute la tarde!</item>
+        <item>Dormir es saludable, ¡lo sabe!</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_completed">
         <!-- encouragements based on tasks completed (%d => completed) -->
-    	<item>¡Ya ha finalizado %d tareas!</item>
-    	<item>Puntaje en vida: %d tareas finalizadas</item>
-    	<item>¡Sonría! ¡Ha finalizado %d tareas!</item>
+        <item>¡Ya ha finalizado %d tareas!</item>
+        <item>Puntaje en vida: %d tareas finalizadas</item>
+        <item>¡Sonría! ¡Ha finalizado %d tareas!</item>
     </string-array>
-  	<string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet! Shall we?</string>
-        
+    <string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet!
+        Shall we?
+    </string>
+
     <string-array name="PPW_colors">
         <item>Negro</item>
         <item>Blanco</item>
         <item>Azul</item>
         <item>Translúcido</item>
     </string-array>
-    
-    <string name="PPW_widget_dlg_text">¡Este widget está sólo disponible para propietarios del PowerPack!</string>
+
+    <string name="PPW_widget_dlg_text">¡Este widget está sólo disponible para propietarios del
+        PowerPack!
+    </string>
     <string name="PPW_widget_dlg_ok">Vista previa</string>
-    
+
     <string name="PPW_demo_title1">ítems en %s irán aquí</string>
     <string name="PPW_demo_title2">El Power Pack incluye widgets Premium</string>
     <string name="PPW_demo_title3">...¡agregue voz y buenos sentimientos!</string>
     <string name="PPW_demo_title4">¡Toque para aprender más!</string>
-    
+
     <string name="PPW_info_title">¡Power Pack Gratuito!</string>
     <string name="PPW_info_signin">¡Inicie sesión!</string>
     <string name="PPW_info_later">Más tarde</string>
-    <string name="PPW_unlock_howto">¡Comparta listas con sus amigos! Desbloquee el Power Pack gratuito una vez que 3 amigos se registren en Astrid.</string>
+    <string name="PPW_unlock_howto">¡Comparta listas con sus amigos! Desbloquee el Power Pack
+        gratuito una vez que 3 amigos se registren en Astrid.
+    </string>
     <string name="PPW_check_button">¡Obtenga gratis el Power Pack!</string>
     <string name="PPW_check_share_lists">¡Comparta listas!</string>
-    <string name="PPW_api_level">¡Lo sentimos! Éste widget sólo se puede utilizar en Android 3.0 o superior.</string>
-    
+    <string name="PPW_api_level">¡Lo sentimos! Éste widget sólo se puede utilizar en Android 3.0 o
+        superior.
+    </string>
+
     <string name="EPr_widget_enabled_title">Activar/Desactivar widgets</string>
-    <string name="PPW_restart_for_enabled_state">Puede que tengas que reiniciar tu teléfono para que este cambio surta efecto.</string>
+    <string name="PPW_restart_for_enabled_state">Puede que tengas que reiniciar tu teléfono para que
+        este cambio surta efecto.
+    </string>
 
 </resources>
diff --git a/astrid/res/values-fr/strings.xml b/astrid/res/values-fr/strings.xml
index af8508510..3537b4a75 100755
--- a/astrid/res/values-fr/strings.xml
+++ b/astrid/res/values-fr/strings.xml
@@ -4,1685 +4,1857 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ================================================== general terms == -->
-
-  <!-- People Editing Activity -->    
-  
-  <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
-  <string name="actfm_person_hint">Contact ou courriel</string>
-  
-  <!-- task sharing dialog: shared with hint -->
-  <string name="actfm_person_or_tag_hint">Contact ou liste partagée</string>
-
-  <!-- toast on transmit success -->
-
-  <!-- can\'t rename or delete shared tag message -->
-  
-  <!-- warning before deleting a list you\'re the owner of -->
-  <string name="actfm_tag_operation_owner_delete">Vous êtes le propriétaire de cette liste partagée ! Si vous la supprimez, elle sera aussi détruite pour tous les autres membres. Êtes-vous sûr de vouloir continuer ?</string>
-
-  <!-- slide 29a: menu item to take a picture -->
-  <string name="actfm_picture_camera">Prendre une photo</string>
-
-  <!-- slide 29b: menu item to select from gallery -->
-  <string name="actfm_picture_gallery">Choisir depuis la bibliothèque</string>
-  
-  <!-- menu item to clear picture selection -->
-  <string name="actfm_picture_clear">Supprimer l\'image</string>
-
-  <!-- filter list activity: refresh tags -->
-  
-  <!-- Title for prompt after sharing a task -->
-  <string name="actfm_view_task_title">Voir la tâche ?</string>
-
-  <!-- Text for prompt after sharing a task -->
-  <string name="actfm_view_task_text">La tâche a été envoyée à %s ! Vous voyez actuellement vos propres tâches. Voulez-vous également voir celle-ci et les autres tâches que vous avez envoyées ?</string>
-  
-  <!-- Ok button for task view prompt -->
-  <string name="actfm_view_task_ok">Vue assignée</string>
-      
-  <!-- Cancel button for task view prompt -->
-  <string name="actfm_view_task_cancel">Rester ici</string>
-  
-  <!-- slide 13a: Title for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_title">Mes tâches partagées</string>
-  
-  <!-- Empty list for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_empty">Aucune tâche partagée</string>
-  
-  <!-- =====================  Friendship connections -->
-  
-  <string name="actfm_friendship_pending">Vous avez envoyé une demande d\'amitié à %s!</string>
-
-  <string name="actfm_friendship_blocked">Vous avez bloqué %s.</string>
-
-  <string name="actfm_friendship_ignored">Vous avez ignoré %s.</string>
-  
-  <string name="actfm_friendship_friends">Vous êtes ami avec %s! Assignez-lui une tâche.</string>
-
-  <string name="actfm_friendship_other_pending">%s désire être votre ami !</string>
-
-  <string name="actfm_friendship_no_status">Connectez-vous, comme %s, pour partager et faire le suivi des tâches publiques !</string>
-
-  <string name="actfm_friendship_connect">Ajoutez un ami</string>
-
-  <string name="actfm_friendship_accept">Accepter</string>
-
-  <!-- ================================================== TagViewActivity == -->  
-
-  <!-- Tag View Activity: Add Comment hint -->    
-  <string name="TVA_add_comment">Ajouter un commentaire</string>
-
-  <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->    
-  
-  <!-- Tabs for Tag view -->
-  <string-array name="TVA_tabs">
-    <!-- Tab for showing tasks -->
-    <item>Tâches</item>
-    <!-- Tab for showing comments & updates -->
-    <item>Activité</item>
-    <!-- Tab for showing setting -->
-    <item>Options de la liste</item>
-  </string-array>
-  
-  <!-- Tag View: filtered by assigned to user (%s => user name) -->
-  <string name="actfm_TVA_filtered_by_assign">Les tâches de %s. Cliquer pour tout voir.</string>
-  
-  <!-- Tag View: filter by unassigned tasks -->
-  <string name="actfm_TVA_filter_by_unassigned">Les tâches non assignées. Cliquer pour tout voir.</string>
-
-  <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Privée. Cliquer pour éditer ou partager la liste.</string>
-
-  <!-- Tag View Menu: refresh -->
-  <string name="actfm_TVA_menu_refresh">Mettre à jour</string>
-
-  <!-- Tag Settings: tag name label -->
-  <string name="actfm_TVA_tag_label">Nom de la liste :</string>
-
-  <!-- Tag Settings: tag owner label -->
-
-  <!-- Tag Settings: tag owner value when there is no owner -->
-
-  <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
-  <string name="actfm_TVA_members_label">Collaborateurs</string>
-  
-  <!-- Tag Settings: list collaborators hint -->
-  <string name="actfm_TVA_members_hint">Partager avec toute personne ayant une adresse email</string>
-
-  <!-- Tag Settings: tag picture -->
-  <string name="actfm_TVA_tag_picture">Liste des Images</string>
-
-  <!-- slide 25c/28b: Tag Settings: silence notifications label -->
-  <string name="actfm_TVA_silence_label">Notifications silencieuses</string>
-  
-  <!-- Tag Settings: list icon label -->
-  
-  <!-- slide 25b/27d: Tag Settings: list description label -->
-  <string name="actfm_TVA_tag_description_label">Description</string>
-  
-  <!-- slide 28a: Tag Settings: list settings label -->
-  <string name="actfm_TVA_tag_settings_label">Paramètres</string>
-
-  <!-- slide 25b: Tag Settings: list description hint -->
-  <string name="actfm_TVA_tag_description_hint">Entrez une description ici</string>
-  
-  <!-- slide 25d: Tag Settings: list name hint -->
-  <string name="actfm_TVA_tag_name_hint">Entrez un nom de liste</string>
-  
-  <!-- Tag settings: login prompt from share-->
-  <string name="actfm_TVA_login_to_share">Vous devez être connecté sur Astrid.com pour partager des listes ! Veuillez vous connecter ou rendre cette liste privée.</string>
-  
-      
-  <!-- ============================================ edit people dialog == -->
-
-  <!-- task sharing dialog: intro -->
-  <string name="actfm_EPA_intro">Utilisez Astrid pour partager des listes de course, des idées de sorties, des projets en équipe et être informé immédiatement des tâches accomplies par d\'autres !</string>
-    
-  <!-- task sharing dialog: window title -->
-    
-  <!-- task sharing dialog: save button -->
-  
-  <!-- task sharing dialog: assigned label -->
-  
-  <!-- slide 18a: task sharing dialog: assigned label long version -->
-  <string name="actfm_EPA_assign_label_long">Qui devrait faire cela ?</string>
-  
-  <!-- task sharing dialog: assigned to me -->
-  <string name="actfm_EPA_assign_me">Moi</string>
-  
-  <!-- task sharing dialog: anyone -->
-  <string name="actfm_EPA_unassigned">N\'importe qui</string>
-  
-  <!-- slide 18c: task sharing dialog: choose a contact -->
-  <string name="actfm_EPA_choose_contact">Choisissez un contact</string>
-  
-  <!-- task sharing dialog: custom email assignment -->
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_share_with">Partager avec :</string>
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_collaborators_header">Partager</string>
-
-      <!-- task sharing dialog: collaborator list name (%s => name of list) -->
-  <string name="actfm_EPA_list">Liste : %s</string>
-  
-  <!-- task sharing dialog: assigned hint -->
-  
-  <!-- task sharing dialog: message label text -->
-  <string name="actfm_EPA_message_text">Message d\'invitation :</string>
-  
-  <!-- task sharing dialog: message body -->
-  <string name="actfm_EPA_message_body">Aidez moi à terminer ce truc !</string>
-  
-  <!-- task sharing dialog: list members section header -->
-  <string name="actfm_EPA_assign_header_members">Membres de la liste</string>
-
-  <!-- task sharing dialog: astrid friends section header -->
-  <string name="actfm_EPA_assign_header_friends">Amis Astrid</string>
-
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: share with Facebook -->
-  <string name="actfm_EPA_facebook">Facebook</string>
-  
-  <!-- task sharing dialog: share with Twitter -->
-  <string name="actfm_EPA_twitter">Twitter</string>
-
-  <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
-
-  <!-- task sharing dialog: edit people settings saved -->
-
-  <!-- task sharing dialog: invalid email (%s => email) -->
-  <string name="actfm_EPA_invalid_email">E-mail incorrecte : %s</string>
-
-  <!-- task sharing dialog: tag not found (%s => tag) -->
-  
-  <!-- task sharing login prompt -->
-  <string name="actfm_EPA_login_to_share">Une connexion à Astrid.com est nécessaire pour partager des tâches !</string>
-  
-  <string name="actfm_EPA_login_button">Connectez-vous</string>
-  
-  <string name="actfm_EPA_dont_share_button">Ne pas partager</string>
-  
-  <string name="actfm_EPA_add_person_to_list_title">Tâche assignée</string>
-  
-  <string name="actfm_EPA_add_person_to_list">%1$s n\'est pas partagé dans cette liste. Souhaitez-vous ajouter %2$s à cette liste ? </string>
-
-  <string name="actfm_EPA_add_person_to_list_ok">Ajouter à la liste</string>
-  
-  <string name="actfm_EPA_add_person_to_list_cancel">Ne pas ajouter</string>
-  
-  <string name="actfm_list_owner">(owner)</string>
-  
-  <!-- ========================================= sharing login activity == -->
-
-  <!-- share login: Title -->
-  <string name="actfm_ALA_title">Bienvenue sur Astrid.com !</string>
-
-  <!-- share login: Sharing Description -->
-  <string name="actfm_ALA_body">Astrid.com vous permet d\'accéder à vos tâches en ligne, les partager et les transmettre à d\'autres personnes.</string>
-
-  <!-- share login: Sharing Login FB Prompt -->
-  <string name="actfm_ALA_fb_login">Se connecter avec Facebook</string>
-
-  <!-- share login: Sharing Login GG Prompt -->
-  <string name="actfm_ALA_gg_login">Se connecter avec Google</string>
-  
-  <!-- share login: Quickly log in as <%s -> email> -->
-  <string name="actfm_quick_login">Sign in: %s</string>
-
-  <!-- share login: Reject quick login -->
-  <string name="actfm_quick_login_reject">Not %s?</string>
-
-  <!-- share login: Name -->
-  <string name="actfm_ALA_firstname_label">Prénom</string>
-  
-  <!-- share login: Name -->
-  <string name="actfm_ALA_lastname_label">Nom</string>
-
-  <!-- share login: Email -->
-  <string name="actfm_ALA_email_label">E-mail</string>
-
-  <!-- share login: Username / Email -->
-
-  <!-- share login: Password -->
-  <string name="actfm_ALA_password_label">Mot de passe</string>
-
-  <!-- share login: Sign Up Title -->
-  <string name="actfm_ALA_signup_title">S\'inscrire</string>
-
-  <!-- share login: Login Title -->
-  <string name="actfm_ALA_login_title">Connexion</string>
-
-  <!-- share login: Google Auth title -->
-  <string name="actfm_GAA_title">Sélectionnez le compte Google que vous voulez utiliser :</string>
-
-  <!-- share login: OAUTH Login Prompt -->
-  <string name="actfm_OLA_prompt">Veuillez vous connecter sur Google :</string>
-  
-  <!-- Login error: user exists -->
-  <string name="actfm_ALA_error_user_exists">L\'utilisateur existe déjà. Veuillez plutôt vous identifier.</string>
-  
-  <!-- Login error: wrong password -->
-  <string name="actfm_ALA_error_wrong_password">Désolé, ce mot de passe est incorrect. Veuillez réessayer.</string>
-  
-  <!-- Forgot password link -->
-  <string name="actfm_ALA_forgot_password">Mot de passe oublié ? </string>
-  
-  <!-- Forgot password email prompt -->
-  <string name="actfm_ALA_enter_email">Veuillez entrer votre courriel</string>
-  
-  <!-- Password reset sent (%s -> email) -->
-  <string name="actfm_ALA_reset_sent">Mise à jour du mot de passe envoyée à %s</string>
-  
-  <!-- User already exists - first sync may be slow -->
-  <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your patience!</string>
-  
-  <!-- User not found -->
-  <string name="actfm_ALA_error_user_not_found">L\'e-mail de cet utilisateur n\'est pas reconnu. Inscrivez-vous plutôt ! </string>
-  
-  <!-- ================================================ Featured Lists -->
-
-  <string name="actfm_feat_list_clone">Copier la liste</string>
-  
-  <string name="actfm_feat_list_suffix">(Copier)</string>
-
-  <string name="actfm_feat_list_cloning">Copie en cours...</string>
-
-  <string name="actfm_feat_list_clone_success">Opération réussie !</string>
-
-  <string name="actfm_feat_list_task_clone_success">Tâche copiée</string>
-
-  <string name="actfm_feat_list_clone_empty">Aucune tâche à copier</string>
-  
-  <!-- ================================================ Synchronization == -->
-      
-  <!-- Indicates the logged in user name. %s -> user\'s name -->
-  <string name="actfm_status_title_logged_in">Statut - %s est connecté(e)</string>    
-      
-  <!-- Preferences Title: Act.fm -->    
-  <string name="actfm_APr_header">Astrid.com</string>
-  
-  <string name="actfm_https_title">Utiliser HTTPS</string>
-  <string name="actfm_https_enabled">HTTPS activé (plus lent)</string>
-  <string name="actfm_https_disabled">HTTPS désactivé (plus rapide)</string>
-
-  <!-- title for notification tray after synchronizing -->
-  
-  <!-- text for notification when comments are received -->
-    
-  <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, 
-      Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page,
-      or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.  
-      Are you sure you want to sync with Astrid.com?</string>
-      
-  <!-- account types -->
-  <string name="actfm_account_type">Type de compte</string>
-  <string name="actfm_account_info">Informations du compte</string>
-  <string name="actfm_account_info_summary">Infos et options</string>
-  <string name="account_type_title_not_logged_in">Inscrivez-vous gratuitement</string>
-  <string name="account_type_summary_not_logged_in">Accédez à vos tâches en ligne, partagez vos listes et déléguez</string>
-  
-  
-  <string name="actfm_account_premium">Premium</string>
-  <string name="actfm_account_basic">Simple</string>
-  
-  <string name="actfm_inapp_billing">Passer en premium</string>
-  <string name="actfm_inapp_billing_summary">Attachez des fichiers, faites des sauvegardes vocales, bénéficiez du support premium et bien plus</string>
-  
-  <!-- Sharing -->
-  <string name="share_with_facebook">Likez sur Facebook</string>
-  <string name="share_with_twitter">Suivez nous sur Twitter</string>
-  <string name="share_with_google">Partagez sur Google+</string>
-  <string name="share_speech_bubble">En partageant, aidez les autres a être plus productif !</string>
-  
-  
-  <!-- Sync upgrade messages -->
-  <string name="sync_upgr_both_title">Using Astrid.com + Google without Duplicates</string>
-  <string name="sync_upgr_both_body">Let\'s be honest. Google Tasks is convenient but not as cool as Astrid. To avoid duplicates you can no longer sync with Astrid.com and background sync with Google Tasks at the same time. You can still import your Google Tasks by visiting Settings → Backup &amp; Sync, or downgrade to Google Tasks only sync</string>
-  <string name="sync_upgr_both_btn1">Stick with Astrid</string>
-  <string name="sync_upgr_both_btn2">Downgrade to Google Tasks</string>
-  
-  <string name="sync_upgr_gtasks_only_title">Upgrade to Astrid Sync for Free!</string>
-  <string name="sync_upgr_gtasks_only_body">Access your tasks from all your devices and from Gmail with Astrid.com sync. Upgrade to Astrid.com Sync (you can always go back to Google Tasks - but you won\'t want to)!</string>
-  <string name="sync_upgr_gtasks_only_btn1">Upgrade to Astrid Sync</string>
-  <string name="sync_upgr_gtasks_only_btn2">Stick with Google Tasks</string>
-  
-  <string name="sync_upgr_neither_title">Free backup &amp; Sync!</string>
-  <string name="sync_upgr_neither_body">Don\'t put your to-dos at risk! New and improved Astrid sync to keep and access your tasks from anywhere.</string>
-  <string name="sync_upgr_neither_btn1">S\'inscrire maintenant</string>
-  
-  <string name="sync_upgr_logged_out">You have been logged out of Astrid</string>
-  
-  <string name="actfm_logout_clear_tasks_title">Effacer les données ?</string>
-  <string name="actfm_logout_clear_tasks_body">Souhaitez-vous supprimer vos tâches et listes ?</string>
-  <string name="actfm_logout_clear_tasks_yes">Effacer les données</string>
-  <string name="actfm_logout_clear_tasks_no">Conserver les données</string>
-  
-  <string name="actfm_logged_in_different_user_title">Se connecter avec un autre compte</string>
-  <string name="actfm_logged_in_different_user_body">Souhaitez-vous effacer les tâches de votre téléphone avant la synchronisation ?</string>
-  <string name="actfm_logged_in_different_user_keep_data">Conserver les données</string>
-  <string name="actfm_logged_in_different_user_clear_data">Effacer toutes les données</string>
-  <string name="actfm_logged_in_different_user_processing">Traitement des données existantes...</string>
-  
-  <string name="actfm_tag_not_authorized_title">Not authorized</string>
-  <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name?</string>
-  <string name="actfm_tag_not_authorized_new_list">Créer une nouvelle liste</string>
-  <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
-  
-  <string name="actfm_sync_ongoing">Synchronisation en cours...</string>
-  
-  <string name="EPr_reset_sync_state">Reset sync</string>
-  <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors</string>
-  <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue?</string>
-  
+<resources>
 
+    <!-- ================================================== general terms == -->
 
+    <!-- People Editing Activity -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
+    <string name="actfm_person_hint">Contact ou courriel</string>
+
+    <!-- task sharing dialog: shared with hint -->
+    <string name="actfm_person_or_tag_hint">Contact ou liste partagée</string>
+
+    <!-- toast on transmit success -->
+
+    <!-- can\'t rename or delete shared tag message -->
+
+    <!-- warning before deleting a list you\'re the owner of -->
+    <string name="actfm_tag_operation_owner_delete">Vous êtes le propriétaire de cette liste
+        partagée ! Si vous la supprimez, elle sera aussi détruite pour tous les autres membres.
+        Êtes-vous sûr de vouloir continuer ?
+    </string>
+
+    <!-- slide 29a: menu item to take a picture -->
+    <string name="actfm_picture_camera">Prendre une photo</string>
+
+    <!-- slide 29b: menu item to select from gallery -->
+    <string name="actfm_picture_gallery">Choisir depuis la bibliothèque</string>
+
+    <!-- menu item to clear picture selection -->
+    <string name="actfm_picture_clear">Supprimer l\'image</string>
+
+    <!-- filter list activity: refresh tags -->
+
+    <!-- Title for prompt after sharing a task -->
+    <string name="actfm_view_task_title">Voir la tâche ?</string>
+
+    <!-- Text for prompt after sharing a task -->
+    <string name="actfm_view_task_text">La tâche a été envoyée à %s ! Vous voyez actuellement vos
+        propres tâches. Voulez-vous également voir celle-ci et les autres tâches que vous avez
+        envoyées ?
+    </string>
+
+    <!-- Ok button for task view prompt -->
+    <string name="actfm_view_task_ok">Vue assignée</string>
+
+    <!-- Cancel button for task view prompt -->
+    <string name="actfm_view_task_cancel">Rester ici</string>
+
+    <!-- slide 13a: Title for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_title">Mes tâches partagées</string>
+
+    <!-- Empty list for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_empty">Aucune tâche partagée</string>
+
+    <!-- =====================  Friendship connections -->
+
+    <string name="actfm_friendship_pending">Vous avez envoyé une demande d\'amitié à %s!</string>
+
+    <string name="actfm_friendship_blocked">Vous avez bloqué %s.</string>
+
+    <string name="actfm_friendship_ignored">Vous avez ignoré %s.</string>
+
+    <string name="actfm_friendship_friends">Vous êtes ami avec %s! Assignez-lui une tâche.</string>
+
+    <string name="actfm_friendship_other_pending">%s désire être votre ami !</string>
+
+    <string name="actfm_friendship_no_status">Connectez-vous, comme %s, pour partager et faire le
+        suivi des tâches publiques !
+    </string>
+
+    <string name="actfm_friendship_connect">Ajoutez un ami</string>
+
+    <string name="actfm_friendship_accept">Accepter</string>
+
+    <!-- ================================================== TagViewActivity == -->
+
+    <!-- Tag View Activity: Add Comment hint -->
+    <string name="TVA_add_comment">Ajouter un commentaire</string>
+
+    <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->
+
+    <!-- Tabs for Tag view -->
+    <string-array name="TVA_tabs">
+        <!-- Tab for showing tasks -->
+        <item>Tâches</item>
+        <!-- Tab for showing comments & updates -->
+        <item>Activité</item>
+        <!-- Tab for showing setting -->
+        <item>Options de la liste</item>
+    </string-array>
+
+    <!-- Tag View: filtered by assigned to user (%s => user name) -->
+    <string name="actfm_TVA_filtered_by_assign">Les tâches de %s. Cliquer pour tout voir.</string>
+
+    <!-- Tag View: filter by unassigned tasks -->
+    <string name="actfm_TVA_filter_by_unassigned">Les tâches non assignées. Cliquer pour tout
+        voir.
+    </string>
+
+    <!-- Tag View: list is private, no members -->
+    <string name="actfm_TVA_no_members_alert">Privée. Cliquer pour éditer ou partager la liste.
+    </string>
+
+    <!-- Tag View Menu: refresh -->
+    <string name="actfm_TVA_menu_refresh">Mettre à jour</string>
+
+    <!-- Tag Settings: tag name label -->
+    <string name="actfm_TVA_tag_label">Nom de la liste :</string>
+
+    <!-- Tag Settings: tag owner label -->
+
+    <!-- Tag Settings: tag owner value when there is no owner -->
+
+    <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
+    <string name="actfm_TVA_members_label">Collaborateurs</string>
+
+    <!-- Tag Settings: list collaborators hint -->
+    <string name="actfm_TVA_members_hint">Partager avec toute personne ayant une adresse email
+    </string>
+
+    <!-- Tag Settings: tag picture -->
+    <string name="actfm_TVA_tag_picture">Liste des Images</string>
+
+    <!-- slide 25c/28b: Tag Settings: silence notifications label -->
+    <string name="actfm_TVA_silence_label">Notifications silencieuses</string>
+
+    <!-- Tag Settings: list icon label -->
+
+    <!-- slide 25b/27d: Tag Settings: list description label -->
+    <string name="actfm_TVA_tag_description_label">Description</string>
+
+    <!-- slide 28a: Tag Settings: list settings label -->
+    <string name="actfm_TVA_tag_settings_label">Paramètres</string>
+
+    <!-- slide 25b: Tag Settings: list description hint -->
+    <string name="actfm_TVA_tag_description_hint">Entrez une description ici</string>
+
+    <!-- slide 25d: Tag Settings: list name hint -->
+    <string name="actfm_TVA_tag_name_hint">Entrez un nom de liste</string>
+
+    <!-- Tag settings: login prompt from share-->
+    <string name="actfm_TVA_login_to_share">Vous devez être connecté sur Astrid.com pour partager
+        des listes ! Veuillez vous connecter ou rendre cette liste privée.
+    </string>
+
+
+    <!-- ============================================ edit people dialog == -->
+
+    <!-- task sharing dialog: intro -->
+    <string name="actfm_EPA_intro">Utilisez Astrid pour partager des listes de course, des idées de
+        sorties, des projets en équipe et être informé immédiatement des tâches accomplies par
+        d\'autres !
+    </string>
+
+    <!-- task sharing dialog: window title -->
+
+    <!-- task sharing dialog: save button -->
+
+    <!-- task sharing dialog: assigned label -->
+
+    <!-- slide 18a: task sharing dialog: assigned label long version -->
+    <string name="actfm_EPA_assign_label_long">Qui devrait faire cela ?</string>
+
+    <!-- task sharing dialog: assigned to me -->
+    <string name="actfm_EPA_assign_me">Moi</string>
+
+    <!-- task sharing dialog: anyone -->
+    <string name="actfm_EPA_unassigned">N\'importe qui</string>
+
+    <!-- slide 18c: task sharing dialog: choose a contact -->
+    <string name="actfm_EPA_choose_contact">Choisissez un contact</string>
+
+    <!-- task sharing dialog: custom email assignment -->
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_share_with">Partager avec :</string>
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_collaborators_header">Partager</string>
+
+    <!-- task sharing dialog: collaborator list name (%s => name of list) -->
+    <string name="actfm_EPA_list">Liste : %s</string>
+
+    <!-- task sharing dialog: assigned hint -->
+
+    <!-- task sharing dialog: message label text -->
+    <string name="actfm_EPA_message_text">Message d\'invitation :</string>
+
+    <!-- task sharing dialog: message body -->
+    <string name="actfm_EPA_message_body">Aidez moi à terminer ce truc !</string>
+
+    <!-- task sharing dialog: list members section header -->
+    <string name="actfm_EPA_assign_header_members">Membres de la liste</string>
+
+    <!-- task sharing dialog: astrid friends section header -->
+    <string name="actfm_EPA_assign_header_friends">Amis Astrid</string>
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: share with Facebook -->
+    <string name="actfm_EPA_facebook">Facebook</string>
+
+    <!-- task sharing dialog: share with Twitter -->
+    <string name="actfm_EPA_twitter">Twitter</string>
+
+    <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
+
+    <!-- task sharing dialog: edit people settings saved -->
+
+    <!-- task sharing dialog: invalid email (%s => email) -->
+    <string name="actfm_EPA_invalid_email">E-mail incorrecte : %s</string>
+
+    <!-- task sharing dialog: tag not found (%s => tag) -->
+
+    <!-- task sharing login prompt -->
+    <string name="actfm_EPA_login_to_share">Une connexion à Astrid.com est nécessaire pour partager
+        des tâches !
+    </string>
+
+    <string name="actfm_EPA_login_button">Connectez-vous</string>
+
+    <string name="actfm_EPA_dont_share_button">Ne pas partager</string>
+
+    <string name="actfm_EPA_add_person_to_list_title">Tâche assignée</string>
+
+    <string name="actfm_EPA_add_person_to_list">%1$s n\'est pas partagé dans cette liste.
+        Souhaitez-vous ajouter %2$s à cette liste ?
+    </string>
+
+    <string name="actfm_EPA_add_person_to_list_ok">Ajouter à la liste</string>
+
+    <string name="actfm_EPA_add_person_to_list_cancel">Ne pas ajouter</string>
+
+    <string name="actfm_list_owner">(owner)</string>
+
+    <!-- ========================================= sharing login activity == -->
+
+    <!-- share login: Title -->
+    <string name="actfm_ALA_title">Bienvenue sur Astrid.com !</string>
+
+    <!-- share login: Sharing Description -->
+    <string name="actfm_ALA_body">Astrid.com vous permet d\'accéder à vos tâches en ligne, les
+        partager et les transmettre à d\'autres personnes.
+    </string>
+
+    <!-- share login: Sharing Login FB Prompt -->
+    <string name="actfm_ALA_fb_login">Se connecter avec Facebook</string>
+
+    <!-- share login: Sharing Login GG Prompt -->
+    <string name="actfm_ALA_gg_login">Se connecter avec Google</string>
+
+    <!-- share login: Quickly log in as <%s -> email> -->
+    <string name="actfm_quick_login">Sign in: %s</string>
+
+    <!-- share login: Reject quick login -->
+    <string name="actfm_quick_login_reject">Not %s?</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_firstname_label">Prénom</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_lastname_label">Nom</string>
+
+    <!-- share login: Email -->
+    <string name="actfm_ALA_email_label">E-mail</string>
+
+    <!-- share login: Username / Email -->
+
+    <!-- share login: Password -->
+    <string name="actfm_ALA_password_label">Mot de passe</string>
+
+    <!-- share login: Sign Up Title -->
+    <string name="actfm_ALA_signup_title">S\'inscrire</string>
+
+    <!-- share login: Login Title -->
+    <string name="actfm_ALA_login_title">Connexion</string>
+
+    <!-- share login: Google Auth title -->
+    <string name="actfm_GAA_title">Sélectionnez le compte Google que vous voulez utiliser :</string>
+
+    <!-- share login: OAUTH Login Prompt -->
+    <string name="actfm_OLA_prompt">Veuillez vous connecter sur Google :</string>
+
+    <!-- Login error: user exists -->
+    <string name="actfm_ALA_error_user_exists">L\'utilisateur existe déjà. Veuillez plutôt vous
+        identifier.
+    </string>
+
+    <!-- Login error: wrong password -->
+    <string name="actfm_ALA_error_wrong_password">Désolé, ce mot de passe est incorrect. Veuillez
+        réessayer.
+    </string>
+
+    <!-- Forgot password link -->
+    <string name="actfm_ALA_forgot_password">Mot de passe oublié ?</string>
+
+    <!-- Forgot password email prompt -->
+    <string name="actfm_ALA_enter_email">Veuillez entrer votre courriel</string>
+
+    <!-- Password reset sent (%s -> email) -->
+    <string name="actfm_ALA_reset_sent">Mise à jour du mot de passe envoyée à %s</string>
+
+    <!-- User already exists - first sync may be slow -->
+    <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your
+        patience!
+    </string>
+
+    <!-- User not found -->
+    <string name="actfm_ALA_error_user_not_found">L\'e-mail de cet utilisateur n\'est pas reconnu.
+        Inscrivez-vous plutôt !
+    </string>
+
+    <!-- ================================================ Featured Lists -->
+
+    <string name="actfm_feat_list_clone">Copier la liste</string>
+
+    <string name="actfm_feat_list_suffix">(Copier)</string>
+
+    <string name="actfm_feat_list_cloning">Copie en cours...</string>
+
+    <string name="actfm_feat_list_clone_success">Opération réussie !</string>
+
+    <string name="actfm_feat_list_task_clone_success">Tâche copiée</string>
+
+    <string name="actfm_feat_list_clone_empty">Aucune tâche à copier</string>
+
+    <!-- ================================================ Synchronization == -->
+
+    <!-- Indicates the logged in user name. %s -> user\'s name -->
+    <string name="actfm_status_title_logged_in">Statut - %s est connecté(e)</string>
+
+    <!-- Preferences Title: Act.fm -->
+    <string name="actfm_APr_header">Astrid.com</string>
+
+    <string name="actfm_https_title">Utiliser HTTPS</string>
+    <string name="actfm_https_enabled">HTTPS activé (plus lent)</string>
+    <string name="actfm_https_disabled">HTTPS désactivé (plus rapide)</string>
+
+    <!-- title for notification tray after synchronizing -->
+
+    <!-- text for notification when comments are received -->
+
+    <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid
+        duplicate tasks and other synchronization issues,
+        Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You
+        can still import tasks from Google Tasks from the Google Tasks settings page,
+        or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.
+        Are you sure you want to sync with Astrid.com?
+    </string>
+
+    <!-- account types -->
+    <string name="actfm_account_type">Type de compte</string>
+    <string name="actfm_account_info">Informations du compte</string>
+    <string name="actfm_account_info_summary">Infos et options</string>
+    <string name="account_type_title_not_logged_in">Inscrivez-vous gratuitement</string>
+    <string name="account_type_summary_not_logged_in">Accédez à vos tâches en ligne, partagez vos
+        listes et déléguez
+    </string>
+
+
+    <string name="actfm_account_premium">Premium</string>
+    <string name="actfm_account_basic">Simple</string>
+
+    <string name="actfm_inapp_billing">Passer en premium</string>
+    <string name="actfm_inapp_billing_summary">Attachez des fichiers, faites des sauvegardes
+        vocales, bénéficiez du support premium et bien plus
+    </string>
+
+    <!-- Sharing -->
+    <string name="share_with_facebook">Likez sur Facebook</string>
+    <string name="share_with_twitter">Suivez nous sur Twitter</string>
+    <string name="share_with_google">Partagez sur Google+</string>
+    <string name="share_speech_bubble">En partageant, aidez les autres a être plus productif !
+    </string>
+
+
+    <!-- Sync upgrade messages -->
+    <string name="sync_upgr_both_title">Using Astrid.com + Google without Duplicates</string>
+    <string name="sync_upgr_both_body">Let\'s be honest. Google Tasks is convenient but not as cool
+        as Astrid. To avoid duplicates you can no longer sync with Astrid.com and background sync
+        with Google Tasks at the same time. You can still import your Google Tasks by visiting
+        Settings → Backup &amp; Sync, or downgrade to Google Tasks only sync
+    </string>
+    <string name="sync_upgr_both_btn1">Stick with Astrid</string>
+    <string name="sync_upgr_both_btn2">Downgrade to Google Tasks</string>
+
+    <string name="sync_upgr_gtasks_only_title">Upgrade to Astrid Sync for Free!</string>
+    <string name="sync_upgr_gtasks_only_body">Access your tasks from all your devices and from Gmail
+        with Astrid.com sync. Upgrade to Astrid.com Sync (you can always go back to Google Tasks -
+        but you won\'t want to)!
+    </string>
+    <string name="sync_upgr_gtasks_only_btn1">Upgrade to Astrid Sync</string>
+    <string name="sync_upgr_gtasks_only_btn2">Stick with Google Tasks</string>
+
+    <string name="sync_upgr_neither_title">Free backup &amp; Sync!</string>
+    <string name="sync_upgr_neither_body">Don\'t put your to-dos at risk! New and improved Astrid
+        sync to keep and access your tasks from anywhere.
+    </string>
+    <string name="sync_upgr_neither_btn1">S\'inscrire maintenant</string>
+
+    <string name="sync_upgr_logged_out">You have been logged out of Astrid</string>
+
+    <string name="actfm_logout_clear_tasks_title">Effacer les données ?</string>
+    <string name="actfm_logout_clear_tasks_body">Souhaitez-vous supprimer vos tâches et listes ?
+    </string>
+    <string name="actfm_logout_clear_tasks_yes">Effacer les données</string>
+    <string name="actfm_logout_clear_tasks_no">Conserver les données</string>
+
+    <string name="actfm_logged_in_different_user_title">Se connecter avec un autre compte</string>
+    <string name="actfm_logged_in_different_user_body">Souhaitez-vous effacer les tâches de votre
+        téléphone avant la synchronisation ?
+    </string>
+    <string name="actfm_logged_in_different_user_keep_data">Conserver les données</string>
+    <string name="actfm_logged_in_different_user_clear_data">Effacer toutes les données</string>
+    <string name="actfm_logged_in_different_user_processing">Traitement des données existantes...
+    </string>
+
+    <string name="actfm_tag_not_authorized_title">Not authorized</string>
+    <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you
+        may have been removed). Would you like to create a new list with the same name?
+    </string>
+    <string name="actfm_tag_not_authorized_new_list">Créer une nouvelle liste</string>
+    <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
+
+    <string name="actfm_sync_ongoing">Synchronisation en cours...</string>
+
+    <string name="EPr_reset_sync_state">Reset sync</string>
+    <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors
+    </string>
+    <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will
+        be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you
+        wish to continue?
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in timers plug-in -->
+
+    <!-- Task Edit Activity: Container Label -->
+    <string name="alarm_ACS_label">Alarmes</string>
+
+    <!-- Task Edit Activity: Add New Alarm -->
+    <string name="alarm_ACS_button">Ajouter une alarme</string>
+
+    <string-array name="reminders_alarm">
+        <!-- reminders related to alarm -->
+        <item>Alarme !</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in backup plug-in -->
+
+    <!-- ================================================= BackupPreferences == -->
+
+    <!-- slide 33c/48d: Backup Preferences Title -->
+    <string name="backup_BPr_header">Sauvegardes</string>
+
+    <!-- slide 48e/50c: Backup: Status Header -->
+    <string name="backup_BPr_group_status">Statut</string>
+
+    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->
+    <string name="backup_status_success">Dernière sauvegarde : \n%s</string>
+    <!-- Backup Status: last error failed. Keep it short! -->
+    <string name="backup_status_failed">La dernière sauvegarde a échoué</string>
+    <!-- Backup Status: error subtitle -->
+    <string name="backup_status_failed_subtitle">(appuyer pour afficher l\'erreur)</string>
+    <!-- slide 48a: Backup Status: never backed up -->
+    <string name="backup_status_never">Jamais sauvegardé !</string>
+
+    <!-- slide 48f/ 50e: Backup Options Group Label -->
+    <string name="backup_BPr_group_options">Options</string>
+
+    <!-- slide 48b: Preference: Automatic Backup Title -->
+    <string name="backup_BPr_auto_title">Sauvegardes automatiques</string>
+    <!-- Preference: Automatic Backup Description (when disabled) -->
+    <string name="backup_BPr_auto_disabled">Sauvegardes automatiques désactivées</string>
+    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
+    <string name="backup_BPr_auto_enabled">Une sauvegarde sera effectuée quotidiennement.</string>
+
+    <!-- Preference screen restoring Tasks Help -->
+    <!-- Preference screen Restoring Tasks Help Dialog Text-->
+
+    <string name="backup_BPr_cloud_already_logged_in">Vous possédez déjà une sauvegarde à distance
+        sur Astrid.com !
+    </string>
+
+    <!-- ================================================= BackupActivity == -->
+
+    <!-- slide 48c: backup activity label -->
+    <string name="backup_BAc_label">Gérer les sauvegardes</string>
+
+    <!-- backup activity title -->
+    <string name="backup_BAc_title">Gérer vos sauvegardes</string>
+
+    <!-- backup activity import button -->
+    <string name="backup_BAc_import">Importer des tâches</string>
+
+    <!-- backup activity export button -->
+    <string name="backup_BAc_export">Exporter des tâches</string>
+
+    <!-- backup activity cloud (Astrid.com) option -->
+    <string name="backup_BAc_cloud">Cliquez ici pour une sauvegarde à distance gratuite sur
+        Astrid.com
+    </string>
+
+    <!-- ============================================== Importer / Exporter == -->
+
+    <!-- Message displayed when error occurs -->
+    <string name="backup_TXI_error">Erreur d\'importation</string>
+
+    <string name="export_toast">Sauvegardé %1$s dans %2$s.</string>
+
+    <string name="export_toast_no_tasks">Pas de tâche à exporter</string>
+
+    <!-- Progress Dialog Title for exporting -->
+    <string name="export_progress_title">Exportation en cours…</string>
+
+    <!-- Backup: Title of Import Summary Dialog -->
+    <string name="import_summary_title">Résumé de la restoration</string>
+
+    <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
+    <string name="import_summary_message">Le fichier %1$s contenait %2$s.\n\n %3$s importées,\n %4$s
+        existent déjà\n %5$s avaient des erreurs\n
+    </string>
+
+    <!-- Progress Dialog Title for importing -->
+    <string name="import_progress_title">Importation en cours…</string>
+
+    <!-- Progress Dialog text for import reading task (%d -> task number)-->
+    <string name="import_progress_read">Lecture de la tâche %d…</string>
+
+    <!-- Backup: Dialog when unable to open a file -->
+
+    <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
+    <string name="DLG_error_sdcard">Impossible d\'accéder au dossier : %s</string>
+
+    <!-- Backup: Dialog when unable to open SD card in general -->
+    <string name="DLG_error_sdcard_general">Impossible d\'accéder à la carte SD !</string>
+
+    <!-- Backup: File Selector dialog for import -->
+    <string name="import_file_prompt">Choisissez un fichier à restaurer</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- ================================================== AndroidManifest == -->
+
+    <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
+    <string name="app_name">Tâches d\'Astrid</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="read_permission_label">Permission d\'Astrid</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="read_permission_desc">lire les tâches, afficher les filtres de tâches</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="write_permission_label">Permission d\'Astrid</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="write_permission_desc">créer de nouvelles tâches, modifier les tâches existantes
+    </string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- question for deleting tasks -->
+    <string name="DLG_delete_this_task_question">Supprimer cette tâche ?</string>
+
+    <!-- question for deleting items (%s => item name) -->
+    <string name="DLG_delete_this_item_question">Effacer cet élément: %s</string>
+
+    <!-- Progress dialog shown when upgrading -->
+    <string name="DLG_upgrading">Mise à jour de vos tâches…</string>
+
+    <!-- Title for dialog selecting a time (hours and minutes) -->
+    <string name="DLG_hour_minutes">Temps (heures : minutes)</string>
+
+    <!-- Dialog for Astrid having a critical update -->
+    <string name="DLG_please_update">Astrid devrait être mis à jour vers sa dernière version depuis
+        l\'Android market ! Veuillez procéder à cette mise à jour avant de continuer ou attendre
+        quelques secondes.
+    </string>
+
+    <!-- Button for going to Market -->
+
+    <!-- Button for accepting EULA -->
+    <string name="DLG_accept">J\'accepte</string>
+
+    <!-- Button for declining EULA -->
+    <string name="DLG_decline">Je refuse</string>
+
+    <!-- EULA title -->
+    <string name="DLG_eula_title">Conditions d\'utilisation d\'Astrid</string>
+
+    <!-- Progress Dialog generic text -->
+    <string name="DLG_please_wait">Veuillez patienter</string>
+
+    <!-- Dialog - loading -->
+    <string name="DLG_loading">Chargement…</string>
+
+    <!-- Dialog - dismiss -->
+
+    <!-- slide 20d -->
+    <string name="DLG_ok">OK</string>
+    <!-- slide 36g -->
+    <string name="DLG_cancel">Annuler</string>
+
+    <string name="DLG_more">Plus</string>
+
+    <string name="DLG_undo">Annuler Action</string>
+
+    <string name="DLG_warning">Avertissement</string>
+
+    <!-- =============================================================== UI == -->
+
+    <!-- Label for DateButtons with no value -->
+    <string name="WID_dateButtonUnset">Cliquez pour définir</string>
+
+    <!-- String formatter for DateButtons ($D => date, $T => time) -->
+
+    <!-- String formatter for Disable button -->
+
+    <!--  ============================================================= notes -->
+
+    <!-- Note Exposer -->
+
+    <!-- Note Exposer / Comments -->
+
+    <!-- EditNoteActivity - no comments -->
+    <string name="ENA_no_comments">Rien à afficher</string>
+
+    <!-- EditNoteActivity - no username for comment -->
+    <string name="ENA_no_user">Quelqu\'un</string>
+
+    <!-- EditNoteActivity - refresh comments -->
+    <string name="ENA_refresh_comments">Mettre à jour les commentaires</string>
+
+    <!-- ================================================= TaskListActivity == -->
+
+    <!-- slide 8b: Task List: Displayed instead of list when no items present -->
+    <string name="TLA_no_items">Aucune tâche !</string>
+
+    <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
+    <string name="TLA_no_items_person">%s n\'a aucune tâche partagée avec vous</string>
+
+    <!-- Menu: Adjust Sort and Hidden Task Settings -->
+    <string name="TLA_menu_sort">Trier</string>
+
+    <!-- Menu: Sync Now -->
+    <string name="TLA_menu_sync">Synchroniser maintenant</string>
+
+    <!-- Menu: Search -->
+    <string name="TLA_menu_search">Rechercher</string>
+
+    <!-- Menu: Tasks -->
+    <string name="TLA_menu_lists">Listes</string>
+
+    <!-- Menu: Friends -->
+    <string name="TLA_menu_friends">Contacts</string>
+
+    <!-- Menu: Featured Lists -->
+    <string name="TLA_menu_featured_lists">Listes favorites</string>
+
+    <!-- Menu: Suggestions -->
+    <string name="TLA_menu_suggestions">Suggestions</string>
+
+    <!-- Menu: Tutorial -->
+
+    <!-- Menu: Settings -->
+    <string name="TLA_menu_settings">Paramètres</string>
+
+    <!-- slide 30b: Menu: Support -->
+    <string name="TLA_menu_support">Assistance</string>
+
+    <!-- Search Label-->
+
+    <!-- Window title for displaying Custom Filter -->
+    <string name="TLA_custom">Personnalisé</string>
+
+    <!-- slide 8d: Quick Add Edit Box Hint-->
+    <string name="TLA_quick_add_hint">Ajouter une tâche</string>
+
+    <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
+    <string name="TLA_quick_add_hint_assign">Ajouter quelque chose pour %s</string>
+
+    <!-- Notification Volumne notification-->
+    <string name="TLA_notification_volume_low">Les notifications sont désactivées. Vous ne pourrez
+        plus entendre Astrid !
+    </string>
+
+    <!-- Notifications disabled warning -->
+    <string name="TLA_notification_disabled">Les rappels d\'Astrid sont désactivés ! Vous ne
+        recevrez plus de rappels
+    </string>
+
+    <string-array name="TLA_filters">
+        <item>Actif</item>
+        <item>Aujourd\'hui</item>
+        <item>Bientôt</item>
+        <item>Plus tard</item>
+        <item>Fnalizado</item>
+        <item>Masqué</item>
+    </string-array>
+
+    <!-- Title for confirmation dialog after quick add markup -->
+    <string name="TLA_quickadd_confirm_title">Vous avez dit \"%s\"</string>
+
+    <!-- Text for speech bubble in dialog after quick add markup -->
+    <!-- First string is task title, second is due date, third is priority -->
+    <string name="TLA_quickadd_confirm_speech_bubble">J\'ai créé une tâche appelée \"%1$s\" %2$s à
+        %3$s
+    </string>
+
+    <string name="TLA_quickadd_confirm_speech_bubble_date">pour %s</string>
+
+    <string name="TLA_quickadd_confirm_hide_helpers">Ne pas afficher de confirmations futures
+    </string>
+
+
+    <!-- Title for alert on new repeating task. %s-> task title -->
+    <string name="TLA_repeat_scheduled_title">Nouvelle tâche récurrente %s</string>
+
+    <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
+    <string name="TLA_repeat_scheduled_speech_bubble">Je vais vous rappeler à propos de %s.</string>
+
+    <string-array name="TLA_priority_strings">
+        <item>Priorité max</item>
+        <item>Priorité haute</item>
+        <item>Priorité ,oyenne</item>
+        <item>Priorité basse</item>
+    </string-array>
+    <!-- slide 22a -->
+    <string name="TLA_all_activity">Toute activité</string>
+
+    <!-- ====================================================== TaskAdapter == -->
+
+    <!-- Format string to indicate task is hidden (%s => task name) -->
+    <string name="TAd_hiddenFormat">%s [masqué(e)]</string>
+
+    <!-- Format string to indicate task is deleted (%s => task name) -->
+    <string name="TAd_deletedFormat">%s [supprimé(e)]</string>
+
+    <!-- Displayed when adapter is flung (scrolled quickly) -->
+
+    <!-- slide 22b: indicates task was completed. %s => date or time ago -->
+    <string name="TAd_completed">Accomplie\n%s</string>
+
+    <!-- slide 15a: Action Button: edit task -->
+    <string name="TAd_actionEditTask">Modifier</string>
+
+    <!-- Context Item: edit task -->
+    <string name="TAd_contextEditTask">Modifier la tâche</string>
+
+    <!-- Context Item: copy task -->
+    <string name="TAd_contextCopyTask">Copier la tâche</string>
+
+    <!-- Context Item: delete task -->
+    <string name="TAd_contextDeleteTask">Supprimer la tâche</string>
+
+    <!-- Context Item: undelete task -->
+    <string name="TAd_contextUndeleteTask">Récupérer la tâche</string>
+
+    <!-- Context Item: purge task -->
+    <string name="TAd_contextPurgeTask">Purger la tâche</string>
+
+    <!-- ============================================== SortSelectionDialog == -->
+
+    <!-- slide 23a: Sort Selection: dialog title -->
+    <string name="SSD_title">Tri et tâches cachées</string>
+
+    <!-- slide 23h:  Hidden: title -->
+    <string name="SSD_hidden_title">Tâches masquées</string>
+
+    <!-- Hidden Task Selection: show completed tasks -->
+    <string name="SSD_completed">Afficher les tâches complétées</string>
+
+    <!-- Hidden Task Selection: show hidden tasks -->
+    <string name="SSD_hidden">Afficher les tâches cachées</string>
+
+    <!-- Hidden Task Selection: show deleted tasks -->
+    <string name="SSD_deleted">Afficher les tâches supprimées</string>
+
+    <!-- Sort Selection: drag with subtasks -->
+    <string name="SSD_sort_drag">Ordonner manuellement avec les sous-tâches</string>
+
+    <!-- slide 23b: Sort Selection: smart sort -->
+    <string name="SSD_sort_auto">Tri intelligent Astrid</string>
+
+    <!-- slide 23e: Sort Selection: sort by alpha -->
+    <string name="SSD_sort_alpha">Par Titre</string>
+
+    <!-- slide 23c: Sort Selection: sort by due date -->
+    <string name="SSD_sort_due">Par date d\'échéance</string>
+
+    <!-- slide 23d: Sort Selection: sort by importance -->
+    <string name="SSD_sort_importance">Par priorité</string>
+
+    <!-- slide 23f: Sort Selection: sort by modified date -->
+    <string name="SSD_sort_modified">Dernier modifié</string>
+
+    <!-- slide 23g: Sort Selection: reverse -->
+    <string name="SSD_sort_reverse">Tri inversé</string>
+
+    <!-- slide 23j: Sort Button: sort temporarily -->
+    <string name="SSD_save_temp">Une fois seulement</string>
+
+    <!-- slide 23i: Sort Button: sort permanently -->
+    <string name="SSD_save_always">Toujours</string>
+
+    <!-- =============================================== FilterListActivity == -->
+
+    <!-- Astrid Filter Shortcut -->
+    <string name="FSA_label">Liste ou filtre Astrid</string>
+
+    <!-- Filter List Activity Title -->
+
+    <!-- Displayed when loading filters -->
+
+    <!-- Context Menu: Create Shortcut -->
+    <string name="FLA_context_shortcut">Créer un raccourci sur le bureau</string>
+
+    <!-- Menu: Search -->
+
+    <!-- Menu: Help -->
+
+    <!-- slide 28c: Create Shortcut Dialog Title -->
+    <string name="FLA_shortcut_dialog_title">Créer un raccourci</string>
+
+    <!-- Create Shortcut Dialog (asks to name shortcut) -->
+    <string name="FLA_shortcut_dialog">Nom du raccourci :</string>
+
+    <!-- Search Hint-->
+    <string name="FLA_search_hint">Rechercher des tâches</string>
+
+    <!-- Search Filter name (%s => query) -->
+    <string name="FLA_search_filter">Correspondant \'%s\'</string>
+
+    <!-- Toast: created shortcut (%s => label) -->
+    <string name="FLA_toast_onCreateShortcut">Raccourci créé : %s</string>
+
+    <!-- Menu: new filter -->
+    <string name="FLA_new_filter">Nouveau filtre</string>
+
+    <!-- slide 10e: Button: new list -->
+    <string name="FLA_new_list">Nouvelle liste</string>
+
+    <!-- Alert when creating a shortcut without selecting a filter -->
+    <string name="FLA_no_filter_selected">Aucun filtre sélectionné ! Veuillez sélectionner un filtre
+        ou une liste.
+    </string>
+
+    <!-- ================================================= TaskEditActivity == -->
+
+    <!-- Title when editing a task (%s => task title) -->
+
+    <!-- Title when creating a new task -->
+
+    <!-- Task title label -->
+
+    <!-- Task when label -->
+    <string name="TEA_when_header_label">Quand</string>
+
+    <!-- Task title hint (displayed when edit box is empty) -->
+    <string name="TEA_title_hint">Task name</string>
+
+    <!-- Task importance label -->
+    <string name="TEA_importance_label">Priorité</string>
+
+    <!-- Task due date hint -->
+    <string name="TEA_deadline_hint">Set due date</string>
+
+    <!-- Task assigned to string (%s -> assigned person name) -->
+    <string name="TEA_assigned_to">Assigned to %s</string>
+
+    <!-- Task urgency specific time checkbox -->
+    <string name="TEA_urgency_specific_time">À une heure précise ?</string>
+
+    <!-- Task urgency specific time title when specific time false -->
+    <string name="TEA_urgency_none">Aucune</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_label">Hide until</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_display">Hide until %s</string>
+
+    <!-- Task hide until toast -->
+    <string name="TEA_hideUntil_message">La tâche sera masquée jusqu\'à %s</string>
+
+    <!-- Task editing data being loaded label -->
+    <string-array name="TEA_loading">
+        <item>Chargement…</item>
+    </string-array>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_note_label">Description</string>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_notes_empty">Description...</string>
+
+    <!-- Task note hint -->
+    <string name="TEA_notes_hint">Décrire la tâche</string>
+
+    <!-- Estimated time label -->
+    <string name="TEA_estimatedDuration_label">Combien de temps cela va-t-il prendre ?</string>
+
+    <!-- Elapsed time label -->
+    <string name="TEA_elapsedDuration_label">Temps déjà passé sur la tâche</string>
+
+    <!-- Menu: Save -->
+    <string name="TEA_menu_save">Sauvegarder les modifications</string>
+
+    <!-- Menu: Don\'t Save -->
+    <string name="TEA_menu_discard">Ne pas enregistrer</string>
+
+    <!-- Menu: Delete Task -->
+    <string name="TEA_menu_delete">Supprimer la tâche</string>
+
+    <!-- Menu: Task comments -->
+    <string name="TEA_menu_refresh_comments">Refresh comments</string>
+
+    <string name="TEA_menu_comments">Commentaires</string>
+
+    <!-- Toast: task saved with deadline (%s => preposition + time units) -->
+    <string name="TEA_onTaskSave_due">Tâche enregistrée : prévue dans %s</string>
+
+    <!-- Toast: task saved without deadlines -->
+    <string name="TEA_onTaskSave_notDue">Tâche enregistrée</string>
+
+    <!-- Toast: task was not saved -->
+
+    <!-- Toast: task was deleted -->
+
+    <!-- slide 15b: Task edit tab: activity -->
+    <string name="TEA_tab_activity">Activité</string>
+
+    <!-- slide 15e:  Task edit tab: more editing settings -->
+    <string name="TEA_tab_more">Plus</string>
+
+    <!-- slide 15d: Task edit tab: web services -->
+    <string name="TEA_tab_web">Idées</string>
+
+    <string name="TEA_timer_est">Est. %s</string>
+
+    <string name="TEA_timer_elap">Elapsed %s</string>
+
+    <string-array name="TEA_urgency">
+        <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
+        <item>No date</item>
+        <item>Un jour particulier</item>
+        <item>Aujourd\'hui</item>
+        <item>Demain</item>
+        <item>(jour d\'après)</item>
+        <item>La semaine prochaine</item>
+        <item>Dans deux semaines</item>
+        <item>Le mois prochain</item>
+    </string-array>
+
+    <string name="TEA_no_time">Pas d\'heure</string>
+
+    <string-array name="TEA_hideUntil">
+        <!-- hideUntil: labels for edit page. -->
+        <item>Jamais</item>
+        <item>Date d\'échéance</item>
+        <item>Due time</item>
+        <item>Day before due</item>
+        <item>Week before due</item>
+        <item>Jour/horaire spécifique</item>
+    </string-array>
+
+    <!-- Task edit control set descriptors -->
+
+    <!-- slide 9b/35i -->
+    <string name="TEA_control_who">Qui</string>
+
+    <!-- slide 9c/ 35a -->
+    <string name="TEA_control_when">Quand</string>
+    <!-- slide 35b -->
+    <string name="TEA_control_more_section">----Détails----</string>
+    <!-- slide 16a/35c -->
+    <string name="TEA_control_importance">Priorité</string>
+    <!-- slide 16b/35d -->
+    <string name="TEA_control_lists">Listes</string>
+    <!-- slide 16c/35e -->
+    <string name="TEA_control_notes">Description</string>
+
+    <string name="TEA_control_files">Fichiers</string>
+
+    <!-- slide 16e / slide 35g-->
+    <string name="TEA_control_reminders">Rappels</string>
+
+    <!-- slide 16f -->
+    <string name="TEA_control_timer">Contrôle de rappel</string>
+
+    <string name="TEA_control_hidden_section">---- Toujours masquer ----</string>
+
+    <string name="hide_until_prompt">Montrer dans ma liste</string>
+
+    <!-- Add Ons tab when no add-ons found -->
+
+    <!-- Add Ons button -->
+
+    <!-- More row -->
+
+    <!-- slide 15c: Text when no activity to show -->
+    <string name="TEA_no_activity">Aucune activité</string>
+
+    <!-- Text to load more activity -->
+    <string name="TEA_load_more">Charger plus...</string>
+
+    <!-- When controls dialog -->
+    <string name="TEA_when_dialog_title">Pour quand est-ce prévu ?</string>
+
+
+    <string name="TEA_new_task">Nouvelle tâche</string>
+
+    <string name="WSV_click_to_load">Clique moi pour chercher des moyens pour finir cela !</string>
+
+    <string name="WSV_not_online">Je peux faire plus quand je suis connectée à internet. Vérifie ta
+        connexion.
+    </string>
+
+    <string name="TEA_contact_error">Désolé! Impossible de trouver une adresse email pour le contact
+        sélectionné.
+    </string>
+
+    <!-- ============================================= IntroductionActivity == -->
+
+    <!-- slide 1a: Introduction Window title -->
+
+    <!-- Button to agree to EULA -->
+
+    <!-- Button to disagree with EULA -->
+
+    <!-- ===================================================== MissedCallActivity == -->
+
+    <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
+    <string name="MCA_title">"%1$s\na appelé à %2$s"</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_return_call">Appeler maintenant</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_add_task">Appeler plus tard</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_ignore">Ignorer</string>
+
+    <!-- Missed call: dialog to ignore all missed calls title -->
+    <string name="MCA_ignore_title">Ignorer tous les appels manqués?</string>
+
+    <!-- Missed call: dialog to ignore all missed calls body -->
+    <string name="MCA_ignore_body">Vous avez ignoré plusieurs appels manqués. Astrid doit-il arrêter
+        de vous questionner à ce propos?
+    </string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore all button -->
+    <string name="MCA_ignore_all">Ignorer tous les appels</string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
+    <string name="MCA_ignore_this">Ignorer cet appel seulement</string>
+
+    <!-- Missed call: preference title -->
+    <string name="MCA_missed_calls_pref_title">Champ des appels manqués.</string>
+
+    <!-- slide 49c: Missed call: preference description -->
+    <string name="MCA_missed_calls_pref_desc_enabled">Atrid vous avertira en cas d\'appels manqués
+        et vous proposera de rappeler.
+    </string>
+    <string name="MCA_missed_calls_pref_desc_disabled">Astrid ne vous avertira pas en cas d\'appels
+        manqués
+    </string>
+
+    <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
+    <string name="MCA_task_title_name">Rappeler %1$s au %2$s</string>
+
+    <!-- Missed call: task title no name (%s -> number)-->
+    <string name="MCA_task_title_no_name">Rappeler %s</string>
+
+    <!-- Missed call: schedule dialog title (%s -> name or number)-->
+    <string name="MCA_schedule_dialog_title">Rappeler %s dans...</string>
+
+    <!-- Missed call speech bubble options -->
+    <string-array name="MCA_dialog_speech_options">
+        <item>Ça doit être chouette d\'être si populaire!</item>
+        <item>Youpi! Des gens vous aiment!</item>
+        <item>Faites leur plaisir, appelez les!</item>
+        <item>Aimeriez vous que les gens vous rappellent?</item>
+        <item>Allez, vous pouvez le faire!</item>
+        <item>Vous pouvez toujours envoyer un message...</item>
+    </string-array>
+
+
+    <!-- ======================================= Calendar reminder activity == -->
+
+    <!-- Calendar remindeer ignore button -->
+    <string name="CRA_ignore">Ignorer</string>
+
+    <!-- Calendar event -->
+    <string name="CRA_title">Besoin d\'une liste de réunion ?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls title -->
+    <string name="CRA_ignore_title">Ignorer tous les évènements du calendrier ?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls body -->
+    <string name="CRA_ignore_body">Vous avez ignoré plusieurs évènements du calendrier.
+        Souhaitez-vous qu\'Astrid cesse de vous questionner à ce sujet ?
+    </string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
+    <string name="CRA_ignore_all">Ignorer tous les événements</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
+    <string name="CRA_ignore_this">Ignorer uniquement cet événement</string>
+
+    <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
+    <string name="CRA_speech_bubble_start">Il semble que %s débute bientôt. Désirez-vous créer une
+        liste d\'actions à accomplir ?
+    </string>
+
+    <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
+    <string name="CRA_speech_bubble_end">Il semble que %s débute bientôt. Désirez-vous créer une
+        liste d\'actions à accomplir ?
+    </string>
+
+    <!-- Calendar reminder: create list button -->
+    <string name="CRA_create_list">Créer une liste</string>
+
+    <!-- Calendar reminder: postpone button -->
+    <string name="CRA_postpone">Peut-être plus tard</string>
+
+    <!-- Calendar reminder: list exists dialog title -->
+    <string name="CRA_list_exists_title">Liste déjà existante</string>
+
+    <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
+    <string name="CRA_list_exists_body">Une liste appelée %s existe déjà. Voulez-vous utiliser la
+        liste existante ou en créer une nouvelle pour cet événement ?
+    </string>
+
+    <!-- Calendar reminder: list exists dialog create new button -->
+    <string name="CRA_create_new">Créer un nouveau</string>
+
+    <!-- Calendar reminder: list exists dialog use existing button -->
+    <string name="CRA_use_existing">Utiliser l\'existant</string>
+
+    <!-- Calendar remindr: created list (%s -> list name) -->
+    <string name="CRA_created_list_dialog">J\'ai créé une liste %s.</string>
+
+    <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
+    <string name="CRA_one_attendee">%s participe.</string>
+
+    <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
+    <string name="CRA_two_attendees">%1$s et %2$s participent.</string>
+
+    <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
+    <string name="CRA_many_attendees">%1$s, %2$s, et %3$d autres participent.</string>
+
+    <!-- Calendar reminder: invitation prompt -->
+    <string name="CRA_invitation_prompt">Voulez-vous les inviter ?</string>
+
+    <!-- Calendar reminder: preference title -->
+    <string name="CRA_calendar_reminders_pref_title">Assistant du calendrier</string>
+
+    <!-- Calendar reminder: pref description disabled -->
+    <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid n’émettra pas de rappel au sujet
+        des prochains évènements.
+    </string>
+
+    <!-- Calendar reminder: pref description enabled -->
+    <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid émettra un rappel au sujet des
+        prochains évènements et vous proposera de vous y préparer.
+    </string>
+
+    <!-- Calendar reminder: share list title -->
+    <string name="CRA_share_list_title">Partager la liste ?</string>
+
+    <string name="CRA_invite_attendees">Inviter des participants</string>
+
+    <string name="CRA_more_options">Plus d\'options</string>
+
+    <string name="CRA_dont_invite">Non merci</string>
+
+    <!-- Calendar reminder: share list title when no other attendees exist-->
+    <string name="CRA_list_created_title">Liste créée !</string>
+
+    <!-- Calendar reminder: default new list name (%s -> event title) -->
+    <string name="CRA_default_list_name">Choix d\'actions: %s</string>
+
+    <!-- ===================================================== HelpActivity == -->
+
+    <!-- Help: Button to get support from our website -->
+
+    <!-- ==================================================== UpdateService == -->
+
+    <!-- Changelog Window Title -->
+    <string name="UpS_changelog_title">Quoi de neuf dans Astrid ?</string>
+
+    <!-- Updates Window Title -->
+    <string name="UpS_updates_title">Dernières nouvelles d\'Astrid</string>
+
+    <!-- Updats No Activity to show for offline users -->
+    <string name="UpS_no_activity_log_in">Connecte toi pour voir \nun enregistrement\nde ton progrès
+        ainsi que\nl\'activité de tes listes \npartagées.
+    </string>
+
+    <!-- ================================================== EditPreferences == -->
+
+    <!-- slide 31g: Preference Window Title -->
+    <string name="EPr_title">Astrid : Paramètres</string>
 
-    
-    <!-- Resources for built-in timers plug-in -->
-    
-    <!-- Task Edit Activity: Container Label -->
-    <string name="alarm_ACS_label">Alarmes</string>
-    
-    <!-- Task Edit Activity: Add New Alarm -->
-    <string name="alarm_ACS_button">Ajouter une alarme</string>
-    
-    <string-array name="reminders_alarm">
-      <!-- reminders related to alarm -->
-      <item>Alarme !</item>
+    <string name="EPr_share_astrid">Share Astrid</string>
+
+    <string name="EPr_share_astrid_summary">Partagez Astrid sur vos réseaux sociaux préférés
+    </string>
+
+    <!-- slide 46a -->
+    <string name="EPr_deactivated">désactivé</string>
+
+    <!-- slide 30i: Preference Category: Appearance Title -->
+    <string name="EPr_appearance_header">Apparence</string>
+
+    <!-- Preference Category: Appearance Summary -->
+    <string name="EPr_appearance_summary">Thèmes, gadgets, ligne de tâche, écran d\'édition</string>
+
+    <!-- FAQ Preference title -->
+    <string name="EPr_faq_title">FAQ</string>
+
+    <!-- Account status preference (%s -> account type) -->
+    <string name="EPr_account_title">Compte : %s</string>
+
+    <!-- Support preferences summary -->
+    <string name="EPr_support_summary">Didactitiel, FAQ, À propos</string>
+
+    <!-- slide 34a: Preference: Task List Font Size Title -->
+    <string name="EPr_fontSize_title">Taillede la liste de tâche</string>
+
+    <!-- Preference: Filters to show pref screen title -->
+    <string name="EPr_filters_to_show_title">Filters to show</string>
+
+    <!-- slide 32a: Preference: Show confirmation for smart reminders -->
+    <string name="EPr_showSmartConfirmation_title">Montrer une confirmation pour les rappels
+        intelligents
+    </string>
+
+    <!-- slide 34g: Preference: Task List Font Size Description -->
+    <string name="EPr_fontSize_desc">Taille de la police pour la page principale des listes</string>
+
+    <!-- Preferemce: Show task edit confirmation toasts -->
+
+    <!-- slide 34c: Preference: Task List Show Notes -->
+    <string name="EPr_showNotes_title">Show description in task</string>
+
+    <!-- Edit screen preference category -->
+    <string name="EPr_edit_screen_options">Edit screen options</string>
+
+    <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
+    <string name="EPr_beastMode_title">Edit screen order</string>
+
+    <string name="EPr_beastMode_shortcut">Customize</string>
+
+    <string name="EPr_time_increment">5 minute increments</string>
+
+    <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
+
+    <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
+
+    <!-- slide 35h -->
+    <string name="EPr_beastMode_desc">Personnaliser la disposition de l\'écran d\'édition de tâche
+    </string>
+    <!-- slide 35j -->
+    <string name="EPr_beastMode_reset">Rétablir les valeurs par défaut</string>
+
+    <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on
+        each row
+    </string>
+
+    <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
+    <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit
+        screen
+    </string>
+    <!-- Preference: Task List Show Notes Description (enabled) -->
+    <string name="EPr_showNotes_desc_enabled">Description will always be displayed</string>
+
+    <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
+    <string name="EPr_compressTaskRows_title">Compresser la ligne de tâche</string>
+    <!-- slide 34j -->
+    <string name="EPr_compressTaskRows_desc">Réduire la taille d\'une tâche pour s\'adapter au
+        titre
+    </string>
+
+    <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
+    <!-- slide 34k-->
+
+    <!-- slide 34b: Preferences: Wrap task titles to two lines -->
+    <string name="EPr_fullTask_title">Voir le titre complet de la tâche</string>
+    <string name="EPr_fullTask_desc_enabled">Le titre entier de la tâche sera montré</string>
+    <!-- slide 34h -->
+    <string name="EPr_fullTask_desc_disabled">Les deux premières lignes du titre de la tâche seront
+        montrées
+    </string>
+
+    <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
+    <string name="EPr_ideaAuto_title">Charger automatiquement l\'onglet d\'idées</string>
+    <!-- slide 32c -->
+    <string name="EPr_ideaAuto_desc_enabled">Les recherches web pour l\'onglet d\'idées seront
+        effectuées quand vous cliquerez sur l\'onglet
+    </string>
+    <string name="EPr_ideaAuto_desc_disabled">Les recherches web pour l\'onglet d\'idées seront
+        effectuées quand vous le demanderez
+    </string>
+
+    <!-- Preferences: task row style -->
+    <string-array name="EPr_task_row_styles">
+        <item>Original</item>
+        <item>Simple</item>
+        <item>Title only</item>
     </string-array>
-    
 
+    <string-array name="EPr_task_row_style_descriptions">
+        <item>Tronquer le titre en deux lignes avec la date sur la droite</item>
+        <item>Tronquer le titre en une ligne avec la date et les listes en dessous</item>
+        <item>Single line title only</item>
+    </string-array>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- task row style title (%s -> style) -->
+    <string name="EPr_task_row_style_title">Row style: %s</string>
 
-    
-  <!-- Resources for built-in backup plug-in -->
-  
-  <!-- ================================================= BackupPreferences == -->
+    <!-- Preference: custom filters enabled -->
+    <string name="EPr_use_filters_title">Use filters</string>
+    <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
 
-    <!-- slide 33c/48d: Backup Preferences Title -->    
-    <string name="backup_BPr_header">Sauvegardes</string>
+    <!-- Preference: show list members in shared list -->
+    <string name="EPr_show_list_members_title">Show list members in shared lists</string>
 
-    <!-- slide 48e/50c: Backup: Status Header -->    
-    <string name="backup_BPr_group_status">Statut</string>
-    
-    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Dernière sauvegarde : \n%s</string>
-    <!-- Backup Status: last error failed. Keep it short! -->    
-    <string name="backup_status_failed">La dernière sauvegarde a échoué</string>
-    <!-- Backup Status: error subtitle -->    
-    <string name="backup_status_failed_subtitle">(appuyer pour afficher l\'erreur)</string>
-    <!-- slide 48a: Backup Status: never backed up -->    
-    <string name="backup_status_never">Jamais sauvegardé !</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_simple_input_boxes">Simple text boxes</string>
 
-    <!-- slide 48f/ 50e: Backup Options Group Label -->    
-    <string name="backup_BPr_group_options">Options</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
 
-    <!-- slide 48b: Preference: Automatic Backup Title -->    
-    <string name="backup_BPr_auto_title">Sauvegardes automatiques</string>
-    <!-- Preference: Automatic Backup Description (when disabled) -->
-    <string name="backup_BPr_auto_disabled">Sauvegardes automatiques désactivées</string>    
-    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
-    <string name="backup_BPr_auto_enabled">Une sauvegarde sera effectuée quotidiennement.</string>
-    
-    <!-- Preference screen restoring Tasks Help -->
-    <!-- Preference screen Restoring Tasks Help Dialog Text-->
-    
-    <string name="backup_BPr_cloud_already_logged_in">Vous possédez déjà une sauvegarde à distance sur Astrid.com !</string>
-  
-  <!-- ================================================= BackupActivity == -->
-
-  <!-- slide 48c: backup activity label -->
-  <string name="backup_BAc_label">Gérer les sauvegardes</string>
-
-  <!-- backup activity title -->
-  <string name="backup_BAc_title">Gérer vos sauvegardes</string>
-
-  <!-- backup activity import button -->
-  <string name="backup_BAc_import">Importer des tâches</string>
-
-  <!-- backup activity export button -->
-  <string name="backup_BAc_export">Exporter des tâches</string>
-  
-  <!-- backup activity cloud (Astrid.com) option -->
-  <string name="backup_BAc_cloud">Cliquez ici pour une sauvegarde à distance gratuite sur Astrid.com</string>
-    
-  <!-- ============================================== Importer / Exporter == -->
-  
-  <!-- Message displayed when error occurs -->
-  <string name="backup_TXI_error">Erreur d\'importation</string>
-    
-  <string name="export_toast">Sauvegardé %1$s dans %2$s.</string>
-    
-  <string name="export_toast_no_tasks">Pas de tâche à exporter</string>
-  
-  <!-- Progress Dialog Title for exporting -->    
-  <string name="export_progress_title">Exportation en cours…</string>
-  
-  <!-- Backup: Title of Import Summary Dialog -->
-  <string name="import_summary_title">Résumé de la restoration</string>
-    
-  <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">Le fichier %1$s contenait %2$s.\n\n %3$s importées,\n %4$s existent déjà\n %5$s avaient des erreurs\n</string>
-  
-  <!-- Progress Dialog Title for importing -->    
-  <string name="import_progress_title">Importation en cours…</string>
-  
-  <!-- Progress Dialog text for import reading task (%d -> task number)-->    
-  <string name="import_progress_read">Lecture de la tâche %d…</string>
-  
-  <!-- Backup: Dialog when unable to open a file -->  
-  
-  <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
-  <string name="DLG_error_sdcard">Impossible d\'accéder au dossier : %s</string>
-  
-  <!-- Backup: Dialog when unable to open SD card in general -->
-  <string name="DLG_error_sdcard_general">Impossible d\'accéder à la carte SD !</string>
-    
-  <!-- Backup: File Selector dialog for import -->
-  <string name="import_file_prompt">Choisissez un fichier à restaurer</string>    
-        
+    <!-- Preference: don\'t show plus button until input present -->
+    <string name="EPr_hide_plus_button">Hide plus button</string>
 
+    <!-- Preference: menu items -->
+    <string name="EPr_menu_items">Menu items</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Preference: list view -->
+    <string name="EPr_list_view">List view</string>
 
+    <!-- Preference: task edit comments -->
+    <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
 
-  <!-- ================================================== AndroidManifest == -->
-
-  <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
-  <string name="app_name">Tâches d\'Astrid</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="read_permission_label">Permission d\'Astrid</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="read_permission_desc">lire les tâches, afficher les filtres de tâches</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="write_permission_label">Permission d\'Astrid</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="write_permission_desc">créer de nouvelles tâches, modifier les tâches existantes</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-    
-  <!-- question for deleting tasks -->
-  <string name="DLG_delete_this_task_question">Supprimer cette tâche ?</string>
-
-  <!-- question for deleting items (%s => item name) -->
-  <string name="DLG_delete_this_item_question">Effacer cet élément: %s</string>
-    
-  <!-- Progress dialog shown when upgrading -->
-  <string name="DLG_upgrading">Mise à jour de vos tâches…</string>
-  
-  <!-- Title for dialog selecting a time (hours and minutes) -->
-  <string name="DLG_hour_minutes">Temps (heures : minutes)</string>
-  
-  <!-- Dialog for Astrid having a critical update -->
-  <string name="DLG_please_update">Astrid devrait être mis à jour vers sa dernière version depuis l\'Android market ! Veuillez procéder à cette mise à jour avant de continuer ou attendre quelques secondes.</string>
-
-  <!-- Button for going to Market -->
-
-  <!-- Button for accepting EULA -->
-  <string name="DLG_accept">J\'accepte</string>
-
-  <!-- Button for declining EULA -->
-  <string name="DLG_decline">Je refuse</string>
-
-  <!-- EULA title -->
-  <string name="DLG_eula_title">Conditions d\'utilisation d\'Astrid</string>
-
-  <!-- Progress Dialog generic text -->
-  <string name="DLG_please_wait">Veuillez patienter</string>
-  
-  <!-- Dialog - loading -->
-  <string name="DLG_loading">Chargement…</string>
-  
-  <!-- Dialog - dismiss -->
-
-  <!-- slide 20d -->
-  <string name="DLG_ok">OK</string>
-  <!-- slide 36g -->
-  <string name="DLG_cancel">Annuler</string>
-  
-  <string name="DLG_more">Plus</string>
-  
-  <string name="DLG_undo">Annuler Action</string>
-  
-  <string name="DLG_warning">Avertissement</string>
-  
-  <!-- =============================================================== UI == -->
-  
-  <!-- Label for DateButtons with no value -->
-  <string name="WID_dateButtonUnset">Cliquez pour définir</string>
-  
-  <!-- String formatter for DateButtons ($D => date, $T => time) -->
-  
-  <!-- String formatter for Disable button -->
-  
-  <!--  ============================================================= notes -->
-  
-  <!-- Note Exposer -->    
-  
-  <!-- Note Exposer / Comments -->    
-  
-  <!-- EditNoteActivity - no comments -->
-  <string name="ENA_no_comments">Rien à afficher</string>
-    
-  <!-- EditNoteActivity - no username for comment -->
-  <string name="ENA_no_user">Quelqu\'un</string>
-  
-  <!-- EditNoteActivity - refresh comments -->
-  <string name="ENA_refresh_comments">Mettre à jour les commentaires</string>
-  
-  <!-- ================================================= TaskListActivity == -->
-  
-  <!-- slide 8b: Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">Aucune tâche !</string>
-  
-  <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->    
-  <string name="TLA_no_items_person">%s n\'a aucune tâche partagée avec vous</string>
-  
-  <!-- Menu: Adjust Sort and Hidden Task Settings -->    
-  <string name="TLA_menu_sort">Trier</string>
-  
-  <!-- Menu: Sync Now -->    
-  <string name="TLA_menu_sync">Synchroniser maintenant</string>
-  
-  <!-- Menu: Search -->
-  <string name="TLA_menu_search">Rechercher</string>
-  
-  <!-- Menu: Tasks -->
-  <string name="TLA_menu_lists">Listes</string>
-
-  <!-- Menu: Friends -->
-  <string name="TLA_menu_friends">Contacts</string>
-
-  <!-- Menu: Featured Lists -->
-  <string name="TLA_menu_featured_lists">Listes favorites</string>
-
-  <!-- Menu: Suggestions -->
-  <string name="TLA_menu_suggestions">Suggestions</string>
-  
-  <!-- Menu: Tutorial -->
-
-  <!-- Menu: Settings -->    
-  <string name="TLA_menu_settings">Paramètres</string>
-  
-  <!-- slide 30b: Menu: Support -->
-  <string name="TLA_menu_support">Assistance</string>
-  
-  <!-- Search Label-->
-  
-  <!-- Window title for displaying Custom Filter -->
-  <string name="TLA_custom">Personnalisé</string>
-  
-  <!-- slide 8d: Quick Add Edit Box Hint-->
-  <string name="TLA_quick_add_hint">Ajouter une tâche</string>
-  
-  <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
-  <string name="TLA_quick_add_hint_assign">Ajouter quelque chose pour %s</string>
-  
-  <!-- Notification Volumne notification-->
-  <string name="TLA_notification_volume_low">Les notifications sont désactivées. Vous ne pourrez plus entendre Astrid !</string>
-  
-  <!-- Notifications disabled warning -->
-  <string name="TLA_notification_disabled">Les rappels d\'Astrid sont désactivés ! Vous ne recevrez plus de rappels</string>
-  
-  <string-array name="TLA_filters">
-      <item>Actif</item>
-      <item>Aujourd\'hui</item>
-      <item>Bientôt</item>
-      <item>Plus tard</item>
-      <item>Fnalizado</item>
-      <item>Masqué</item>      
-  </string-array>
-  
-  <!-- Title for confirmation dialog after quick add markup -->
-  <string name="TLA_quickadd_confirm_title">Vous avez dit \"%s\"</string>
-  
-  <!-- Text for speech bubble in dialog after quick add markup -->
-  <!-- First string is task title, second is due date, third is priority -->
-  <string name="TLA_quickadd_confirm_speech_bubble">J\'ai créé une tâche appelée \"%1$s\" %2$s à %3$s</string>
-  
-  <string name="TLA_quickadd_confirm_speech_bubble_date">pour %s</string>
-  
-  <string name="TLA_quickadd_confirm_hide_helpers">Ne pas afficher de confirmations futures</string>
-  
-  
-  <!-- Title for alert on new repeating task. %s-> task title -->
-  <string name="TLA_repeat_scheduled_title">Nouvelle tâche récurrente %s</string>
-  
-  <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
-  <string name="TLA_repeat_scheduled_speech_bubble">Je vais vous rappeler à propos de %s.</string>
-  
-  <string-array name="TLA_priority_strings">
-      <item>Priorité max</item>
-      <item>Priorité haute</item>
-      <item>Priorité ,oyenne</item>
-      <item>Priorité basse</item>
-  </string-array>
-  <!-- slide 22a -->
-  <string name="TLA_all_activity">Toute activité</string>
-  
-  <!-- ====================================================== TaskAdapter == -->
-  
-  <!-- Format string to indicate task is hidden (%s => task name) -->
-  <string name="TAd_hiddenFormat">%s [masqué(e)]</string>
-  
-  <!-- Format string to indicate task is deleted (%s => task name) -->
-  <string name="TAd_deletedFormat">%s [supprimé(e)]</string>
-  
-  <!-- Displayed when adapter is flung (scrolled quickly) -->
-  
-  <!-- slide 22b: indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Accomplie\n%s</string>
-  
-  <!-- slide 15a: Action Button: edit task -->
-  <string name="TAd_actionEditTask">Modifier</string>
-  
-  <!-- Context Item: edit task -->
-  <string name="TAd_contextEditTask">Modifier la tâche</string>
-
-  <!-- Context Item: copy task -->
-  <string name="TAd_contextCopyTask">Copier la tâche</string>
-
-  <!-- Context Item: delete task -->
-  <string name="TAd_contextDeleteTask">Supprimer la tâche</string>
-
-  <!-- Context Item: undelete task -->
-  <string name="TAd_contextUndeleteTask">Récupérer la tâche</string>
-
-  <!-- Context Item: purge task -->
-  <string name="TAd_contextPurgeTask">Purger la tâche</string>
-  
-  <!-- ============================================== SortSelectionDialog == -->
-  
-  <!-- slide 23a: Sort Selection: dialog title -->    
-  <string name="SSD_title">Tri et tâches cachées</string>
-  
-  <!-- slide 23h:  Hidden: title -->
-  <string name="SSD_hidden_title">Tâches masquées</string>
-  
-  <!-- Hidden Task Selection: show completed tasks -->    
-  <string name="SSD_completed">Afficher les tâches complétées</string>
-  
-  <!-- Hidden Task Selection: show hidden tasks -->    
-  <string name="SSD_hidden">Afficher les tâches cachées</string>
-  
-  <!-- Hidden Task Selection: show deleted tasks -->    
-  <string name="SSD_deleted">Afficher les tâches supprimées</string>
-  
-  <!-- Sort Selection: drag with subtasks -->
-  <string name="SSD_sort_drag">Ordonner manuellement avec les sous-tâches</string>
-  
-  <!-- slide 23b: Sort Selection: smart sort -->
-  <string name="SSD_sort_auto">Tri intelligent Astrid</string>
-  
-  <!-- slide 23e: Sort Selection: sort by alpha -->
-  <string name="SSD_sort_alpha">Par Titre</string>
-  
-  <!-- slide 23c: Sort Selection: sort by due date -->
-  <string name="SSD_sort_due">Par date d\'échéance</string>
-  
-  <!-- slide 23d: Sort Selection: sort by importance -->
-  <string name="SSD_sort_importance">Par priorité</string>
-  
-  <!-- slide 23f: Sort Selection: sort by modified date -->
-  <string name="SSD_sort_modified">Dernier modifié</string>
-  
-  <!-- slide 23g: Sort Selection: reverse -->
-  <string name="SSD_sort_reverse">Tri inversé</string>
-  
-  <!-- slide 23j: Sort Button: sort temporarily -->
-  <string name="SSD_save_temp">Une fois seulement</string>
-  
-  <!-- slide 23i: Sort Button: sort permanently -->
-  <string name="SSD_save_always">Toujours</string>
-  
-  <!-- =============================================== FilterListActivity == -->
-  
-  <!-- Astrid Filter Shortcut -->    
-  <string name="FSA_label">Liste ou filtre Astrid</string>
-
-  <!-- Filter List Activity Title -->    
-  
-  <!-- Displayed when loading filters -->    
-  
-  <!-- Context Menu: Create Shortcut -->    
-  <string name="FLA_context_shortcut">Créer un raccourci sur le bureau</string>
-  
-  <!-- Menu: Search -->
-  
-  <!-- Menu: Help -->    
-  
-  <!-- slide 28c: Create Shortcut Dialog Title -->    
-  <string name="FLA_shortcut_dialog_title">Créer un raccourci</string>
-  
-  <!-- Create Shortcut Dialog (asks to name shortcut) -->    
-  <string name="FLA_shortcut_dialog">Nom du raccourci :</string>
-  
-  <!-- Search Hint-->
-  <string name="FLA_search_hint">Rechercher des tâches</string>
-  
-  <!-- Search Filter name (%s => query) -->
-  <string name="FLA_search_filter">Correspondant \'%s\'</string>
-  
-  <!-- Toast: created shortcut (%s => label) -->
-  <string name="FLA_toast_onCreateShortcut">Raccourci créé : %s</string>
-  
-  <!-- Menu: new filter -->
-  <string name="FLA_new_filter">Nouveau filtre</string>
-  
-  <!-- slide 10e: Button: new list -->
-  <string name="FLA_new_list">Nouvelle liste</string>
-  
-  <!-- Alert when creating a shortcut without selecting a filter -->
-  <string name="FLA_no_filter_selected">Aucun filtre sélectionné ! Veuillez sélectionner un filtre ou une liste.</string>
-  
-  <!-- ================================================= TaskEditActivity == -->
-  
-  <!-- Title when editing a task (%s => task title) -->
-  
-  <!-- Title when creating a new task -->
-  
-  <!-- Task title label -->
-  
-  <!-- Task when label -->
-  <string name="TEA_when_header_label">Quand</string>
-  
-  <!-- Task title hint (displayed when edit box is empty) -->
-  <string name="TEA_title_hint">Task name</string>
-  
-  <!-- Task importance label -->
-  <string name="TEA_importance_label">Priorité</string>
-  
-  <!-- Task due date hint -->
-  <string name="TEA_deadline_hint">Set due date</string>
-  
-  <!-- Task assigned to string (%s -> assigned person name) -->
-  <string name="TEA_assigned_to">Assigned to %s</string>
-  
-  <!-- Task urgency specific time checkbox -->
-  <string name="TEA_urgency_specific_time">À une heure précise ?</string>
-  
-  <!-- Task urgency specific time title when specific time false -->
-  <string name="TEA_urgency_none">Aucune</string>
-  
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_label">Hide until</string>
-
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_display">Hide until %s</string>
-  
-  <!-- Task hide until toast -->
-  <string name="TEA_hideUntil_message">La tâche sera masquée jusqu\'à %s</string>
-  
-  <!-- Task editing data being loaded label -->
-  <string-array name="TEA_loading"><item>Chargement…</item></string-array>
-  
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_note_label">Description</string>
-
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_notes_empty">Description...</string>
-  
-  <!-- Task note hint -->
-  <string name="TEA_notes_hint">Décrire la tâche</string>
-  
-  <!-- Estimated time label -->
-  <string name="TEA_estimatedDuration_label">Combien de temps cela va-t-il prendre ?</string>
-  
-  <!-- Elapsed time label -->
-  <string name="TEA_elapsedDuration_label">Temps déjà passé sur la tâche</string>
-
-  <!-- Menu: Save -->    
-  <string name="TEA_menu_save">Sauvegarder les modifications</string>
-  
-  <!-- Menu: Don\'t Save -->
-  <string name="TEA_menu_discard">Ne pas enregistrer</string>
-  
-  <!-- Menu: Delete Task -->
-  <string name="TEA_menu_delete">Supprimer la tâche</string>
-  
-  <!-- Menu: Task comments -->
-  <string name="TEA_menu_refresh_comments">Refresh comments</string>
-
-  <string name="TEA_menu_comments">Commentaires</string>
-  
-   <!-- Toast: task saved with deadline (%s => preposition + time units) -->
-  <string name="TEA_onTaskSave_due">Tâche enregistrée : prévue dans %s</string>
-  
-  <!-- Toast: task saved without deadlines -->
-  <string name="TEA_onTaskSave_notDue">Tâche enregistrée</string>
-  
-  <!-- Toast: task was not saved -->
-  
-  <!-- Toast: task was deleted -->
-  
-  <!-- slide 15b: Task edit tab: activity -->
-  <string name="TEA_tab_activity">Activité</string>
-  
-  <!-- slide 15e:  Task edit tab: more editing settings -->
-  <string name="TEA_tab_more">Plus</string>
-  
-  <!-- slide 15d: Task edit tab: web services -->
-  <string name="TEA_tab_web">Idées</string>
-  
-  <string name="TEA_timer_est">Est. %s</string>
-
-  <string name="TEA_timer_elap">Elapsed %s</string>
-  
-  <string-array name="TEA_urgency">
-      <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No date</item>
-      <item>Un jour particulier</item>
-      <item>Aujourd\'hui</item>
-      <item>Demain</item>
-      <item>(jour d\'après)</item>
-      <item>La semaine prochaine</item>
-      <item>Dans deux semaines</item>
-      <item>Le mois prochain</item>
-  </string-array>
-  
-  <string name="TEA_no_time">Pas d\'heure</string>
-      
-  <string-array name="TEA_hideUntil">
-      <!-- hideUntil: labels for edit page. -->
-      <item>Jamais</item>
-      <item>Date d\'échéance</item>
-      <item>Due time</item>
-      <item>Day before due</item>
-      <item>Week before due</item>
-      <item>Jour/horaire spécifique</item>
-  </string-array>
-  
-  <!-- Task edit control set descriptors -->
-
-  <!-- slide 9b/35i -->
-  <string name="TEA_control_who">Qui</string>
-
-  <!-- slide 9c/ 35a -->
-  <string name="TEA_control_when">Quand</string>
-  <!-- slide 35b -->
-  <string name="TEA_control_more_section">----Détails----</string>
-  <!-- slide 16a/35c -->
-  <string name="TEA_control_importance">Priorité</string>  
-  <!-- slide 16b/35d -->
-  <string name="TEA_control_lists">Listes</string>  
-  <!-- slide 16c/35e -->
-  <string name="TEA_control_notes">Description</string>  
-  
-  <string name="TEA_control_files">Fichiers</string>
-
-  <!-- slide 16e / slide 35g-->
-  <string name="TEA_control_reminders">Rappels</string>
-
-  <!-- slide 16f -->
-  <string name="TEA_control_timer">Contrôle de rappel</string>
-  
-  <string name="TEA_control_hidden_section">---- Toujours masquer ----</string>
-  
-  <string name="hide_until_prompt">Montrer dans ma liste</string>
-  
-  <!-- Add Ons tab when no add-ons found -->
-  
-  <!-- Add Ons button -->
-  
-  <!-- More row -->
-  
-  <!-- slide 15c: Text when no activity to show -->
-  <string name="TEA_no_activity">Aucune activité</string>
-  
-  <!-- Text to load more activity -->
-  <string name="TEA_load_more">Charger plus...</string>
-  
-  <!-- When controls dialog -->
-  <string name="TEA_when_dialog_title">Pour quand est-ce prévu ?</string>
-  
-  
-  <string name="TEA_new_task">Nouvelle tâche</string>
-  
-  <string name="WSV_click_to_load">Clique moi pour chercher des moyens pour finir cela !</string>
-  
-  <string name="WSV_not_online">Je peux faire plus quand je suis connectée à internet. Vérifie ta connexion.</string>
-  
-  <string name="TEA_contact_error">Désolé! Impossible de trouver une adresse email pour le contact sélectionné.</string>
-  
-  <!-- ============================================= IntroductionActivity == -->
-  
-  <!-- slide 1a: Introduction Window title -->
-  
-  <!-- Button to agree to EULA -->
-  
-  <!-- Button to disagree with EULA -->
-  
-  <!-- ===================================================== MissedCallActivity == -->
-  
-  <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
-  <string name="MCA_title">"%1$s\na appelé à  %2$s"</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_return_call">Appeler maintenant</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_add_task">Appeler plus tard</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_ignore">Ignorer</string>
-  
-  <!-- Missed call: dialog to ignore all missed calls title -->
-  <string name="MCA_ignore_title">Ignorer tous les appels manqués?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls body -->
-  <string name="MCA_ignore_body">Vous avez ignoré plusieurs appels manqués. Astrid doit-il arrêter de vous questionner à ce propos?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore all button -->
-  <string name="MCA_ignore_all">Ignorer tous les appels</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
-  <string name="MCA_ignore_this">Ignorer cet appel seulement</string>
-
-  <!-- Missed call: preference title -->
-  <string name="MCA_missed_calls_pref_title">Champ des appels manqués.</string>
-
-  <!-- slide 49c: Missed call: preference description -->
-  <string name="MCA_missed_calls_pref_desc_enabled">Atrid vous avertira en cas d\'appels manqués et vous proposera de rappeler.</string>
-  <string name="MCA_missed_calls_pref_desc_disabled">Astrid ne vous avertira pas en cas d\'appels manqués</string>
-
-  <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
-  <string name="MCA_task_title_name">Rappeler %1$s au %2$s</string>
-
-  <!-- Missed call: task title no name (%s -> number)-->
-  <string name="MCA_task_title_no_name">Rappeler %s</string>
-  
-  <!-- Missed call: schedule dialog title (%s -> name or number)-->
-  <string name="MCA_schedule_dialog_title">Rappeler %s dans...</string>
-  
-  <!-- Missed call speech bubble options -->
-  <string-array name="MCA_dialog_speech_options">
-      <item>Ça doit être chouette d\'être si populaire!</item>
-      <item>Youpi! Des gens vous aiment!</item>
-      <item>Faites leur plaisir, appelez les!</item>
-      <item>Aimeriez vous que les gens vous rappellent?</item>
-      <item>Allez, vous pouvez le faire!</item>
-      <item>Vous pouvez toujours envoyer un message...</item>
-  </string-array>
-  
-  
-  <!-- ======================================= Calendar reminder activity == -->
-  
-  <!-- Calendar remindeer ignore button -->
-  <string name="CRA_ignore">Ignorer</string>
-  
-  <!-- Calendar event -->
-  <string name="CRA_title">Besoin d\'une liste de réunion ? </string>
-  
-  <!-- Calendar reminder: dialog to ignore all missed calls title -->
-  <string name="CRA_ignore_title">Ignorer tous les évènements du calendrier ? </string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls body -->
-  <string name="CRA_ignore_body">Vous avez ignoré plusieurs évènements du calendrier. Souhaitez-vous qu\'Astrid cesse de vous questionner à ce sujet ? </string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
-  <string name="CRA_ignore_all">Ignorer tous les événements</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
-  <string name="CRA_ignore_this">Ignorer uniquement cet événement</string>
-  
-  <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
-  <string name="CRA_speech_bubble_start">Il semble que %s débute bientôt. Désirez-vous créer une liste d\'actions à accomplir ? </string>
-
-  <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
-  <string name="CRA_speech_bubble_end">Il semble que %s débute bientôt. Désirez-vous créer une liste d\'actions à accomplir ? </string>
-  
-  <!-- Calendar reminder: create list button -->
-  <string name="CRA_create_list">Créer une liste</string>
-
-  <!-- Calendar reminder: postpone button -->
-  <string name="CRA_postpone">Peut-être plus tard</string>
-  
-  <!-- Calendar reminder: list exists dialog title -->
-  <string name="CRA_list_exists_title">Liste déjà existante</string>
-  
-  <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
-  <string name="CRA_list_exists_body">Une liste appelée %s existe déjà. Voulez-vous utiliser la liste existante ou en créer une nouvelle pour cet événement ?</string>
-  
-  <!-- Calendar reminder: list exists dialog create new button -->
-  <string name="CRA_create_new">Créer un nouveau</string>
-
-  <!-- Calendar reminder: list exists dialog use existing button -->
-  <string name="CRA_use_existing">Utiliser l\'existant</string>
-  
-  <!-- Calendar remindr: created list (%s -> list name) -->
-  <string name="CRA_created_list_dialog">J\'ai créé une liste %s.</string>
-  
-  <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
-  <string name="CRA_one_attendee">%s participe.</string>
-
-  <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
-  <string name="CRA_two_attendees">%1$s et %2$s participent.</string>
-
-  <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
-  <string name="CRA_many_attendees">%1$s, %2$s, et %3$d autres participent.</string>
-  
-  <!-- Calendar reminder: invitation prompt -->
-  <string name="CRA_invitation_prompt">Voulez-vous les inviter ? </string>
-  
-  <!-- Calendar reminder: preference title -->
-  <string name="CRA_calendar_reminders_pref_title">Assistant du calendrier</string>
-
-  <!-- Calendar reminder: pref description disabled -->
-  <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid n’émettra pas de rappel au sujet des prochains évènements. </string>
-
-  <!-- Calendar reminder: pref description enabled -->
-  <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid émettra un rappel au sujet des prochains évènements et vous proposera de vous y préparer. </string>
-  
-  <!-- Calendar reminder: share list title -->
-  <string name="CRA_share_list_title">Partager la liste ?</string>
-  
-  <string name="CRA_invite_attendees">Inviter des participants</string>
-
-  <string name="CRA_more_options">Plus d\'options</string>
-
-  <string name="CRA_dont_invite">Non merci</string>
-
-  <!-- Calendar reminder: share list title when no other attendees exist-->
-  <string name="CRA_list_created_title">Liste créée !</string>
-  
-  <!-- Calendar reminder: default new list name (%s -> event title) -->
-  <string name="CRA_default_list_name">Choix d\'actions: %s</string>
-  
-  <!-- ===================================================== HelpActivity == -->
-  
-  <!-- Help: Button to get support from our website -->
-    
-  <!-- ==================================================== UpdateService == -->
-  
-  <!-- Changelog Window Title -->
-  <string name="UpS_changelog_title">Quoi de neuf dans Astrid ?</string>
-  
-  <!-- Updates Window Title -->
-  <string name="UpS_updates_title">Dernières nouvelles d\'Astrid</string>
-  
-  <!-- Updats No Activity to show for offline users -->
-  <string name="UpS_no_activity_log_in">Connecte toi pour voir \nun enregistrement\nde ton progrès ainsi que\nl\'activité de tes listes \npartagées.</string>
-  
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 31g: Preference Window Title -->
-  <string name="EPr_title">Astrid : Paramètres</string>
-  
-  <string name="EPr_share_astrid">Share Astrid</string>
-
-  <string name="EPr_share_astrid_summary">Partagez Astrid sur vos réseaux sociaux préférés</string>
-  
-  <!-- slide 46a -->
-  <string name="EPr_deactivated">désactivé</string>
-
-  <!-- slide 30i: Preference Category: Appearance Title -->
-  <string name="EPr_appearance_header">Apparence</string>
-  
-  <!-- Preference Category: Appearance Summary -->
-  <string name="EPr_appearance_summary">Thèmes, gadgets, ligne de tâche, écran d\'édition</string>
-  
-  <!-- FAQ Preference title -->
-  <string name="EPr_faq_title">FAQ</string>
-  
-  <!-- Account status preference (%s -> account type) -->
-  <string name="EPr_account_title">Compte : %s</string>
-
-  <!-- Support preferences summary -->
-  <string name="EPr_support_summary">Didactitiel, FAQ, À propos</string>
-  
-  <!-- slide 34a: Preference: Task List Font Size Title -->
-  <string name="EPr_fontSize_title">Taillede la liste de tâche</string>
-  
-  <!-- Preference: Filters to show pref screen title -->
-  <string name="EPr_filters_to_show_title">Filters to show</string>
-  
-  <!-- slide 32a: Preference: Show confirmation for smart reminders -->
-  <string name="EPr_showSmartConfirmation_title">Montrer une confirmation pour les rappels intelligents</string>
-  
-  <!-- slide 34g: Preference: Task List Font Size Description -->                                                                                                                                                  
-  <string name="EPr_fontSize_desc">Taille de la police pour la page principale des listes</string>  
-  
-  <!-- Preferemce: Show task edit confirmation toasts -->
-  
-  <!-- slide 34c: Preference: Task List Show Notes -->
-  <string name="EPr_showNotes_title">Show description in task</string>
-  
-  <!-- Edit screen preference category -->
-  <string name="EPr_edit_screen_options">Edit screen options</string>
-  
-  <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
-  <string name="EPr_beastMode_title">Edit screen order</string>
-  
-  <string name="EPr_beastMode_shortcut">Customize</string>
-  
-  <string name="EPr_time_increment">5 minute increments</string>
-  
-  <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
-  
-  <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
-  
-  <!-- slide 35h -->
-  <string name="EPr_beastMode_desc">Personnaliser la disposition de l\'écran d\'édition de tâche</string>
-  <!-- slide 35j -->
-  <string name="EPr_beastMode_reset">Rétablir les valeurs par défaut</string>
-  
-  <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on each row</string>
-      
-  <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit screen</string>  
-  <!-- Preference: Task List Show Notes Description (enabled) -->
-  <string name="EPr_showNotes_desc_enabled">Description will always be displayed</string>
-  
-  <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
-  <string name="EPr_compressTaskRows_title">Compresser la ligne de tâche</string>
-  <!-- slide 34j -->
-  <string name="EPr_compressTaskRows_desc">Réduire la taille d\'une tâche pour s\'adapter au titre</string>
-  
-  <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
-  <!-- slide 34k-->
-  
-  <!-- slide 34b: Preferences: Wrap task titles to two lines -->
-  <string name="EPr_fullTask_title">Voir le titre complet de la tâche</string>
-  <string name="EPr_fullTask_desc_enabled">Le titre entier de la tâche sera montré</string>
-  <!-- slide 34h -->
-  <string name="EPr_fullTask_desc_disabled">Les deux premières lignes du titre de la tâche seront montrées</string>
-  
-  <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
-  <string name="EPr_ideaAuto_title">Charger automatiquement l\'onglet d\'idées</string>
-  <!-- slide 32c -->
-  <string name="EPr_ideaAuto_desc_enabled">Les recherches web pour l\'onglet d\'idées seront effectuées quand vous cliquerez sur l\'onglet</string>
-  <string name="EPr_ideaAuto_desc_disabled">Les recherches web pour l\'onglet d\'idées seront effectuées quand vous le demanderez</string>
-  
-  <!-- Preferences: task row style -->
-  <string-array name="EPr_task_row_styles">
-      <item>Original</item>
-      <item>Simple</item>
-      <item>Title only</item>
-  </string-array>
-  
-  <string-array name="EPr_task_row_style_descriptions">
-      <item>Tronquer le titre en deux lignes avec la date sur la droite</item>
-      <item>Tronquer le titre en une ligne avec la date et les listes en dessous</item>
-      <item>Single line title only</item>
-  </string-array>
-  
-  <!-- task row style title (%s -> style) -->
-  <string name="EPr_task_row_style_title">Row style: %s</string>
-  
-  <!-- Preference: custom filters enabled -->
-  <string name="EPr_use_filters_title">Use filters</string>
-  <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
-
-  <!-- Preference: show list members in shared list -->
-  <string name="EPr_show_list_members_title">Show list members in shared lists</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_simple_input_boxes">Simple text boxes</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
-
-  <!-- Preference: don\'t show plus button until input present -->
-  <string name="EPr_hide_plus_button">Hide plus button</string>
-
-  <!-- Preference: menu items -->
-  <string name="EPr_menu_items">Menu items</string>
-
-  <!-- Preference: list view -->
-  <string name="EPr_list_view">List view</string>
-
-  <!-- Preference: task edit comments -->
-  <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
-  
-  <!-- slide 30f/ 36f: Preference: Theme -->
-  <string name="EPr_theme_title">Thème de couleur</string>
-  <!-- Preference: Theme Description (%s => value) -->
-  <string name="EPr_theme_desc">Actuellement : %s</string>  
-  <!-- Preference: Theme Description (android 1.6) -->
-  <string name="EPr_theme_desc_unsupported">Ce paramètre requiert Android 2.0+.</string>
-  <!-- slide 32h/ 37b -->
-  <string name="EPr_theme_widget_title">Thème de gadget</string>
-  
-  <!-- slide 30d/ 34f: Preference screen: all task row settings -->
-  <string name="EPr_taskRowPrefs_title">Style des lignes de tâche</string>
-  
-  <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
-  <string name="EPr_use_contact_picker">Utiliser le selecteur de contacts.</string>
-  <!-- slide 49b -->
-  <string name="EPr_use_contact_picker_desc_enabled">L\'option de sélection de contacts sera affiché dans la fenêtre d\'assignation des tâches.</string>
-  <string name="EPr_use_contact_picker_desc_disabled">L\'option de sélection de contacts ne sera pas affichée.</string>
-
-  <!-- slide 49i: Preferences: Third party addons -->
-  <string name="EPr_third_party_addons">Autoriser les greffons extérieurs</string>
-  <string name="EPr_third_party_addons_desc_enabled">Les extensions tierces seront activées</string>
-  <!-- slide 49d -->
-  <string name="EPr_third_party_addons_desc_disabled">Les extensions tierces seront désactivées</string>
-  
-  <!-- Preferences: ideas tab -->
-  <string name="EPr_ideas_tab_enabled">Idées pour la tâche</string>
-  <string name="EPr_ideas_tab_description">Recevez des idées pour finir vos tâches</string>
-  
-  <!-- Preferences: calendar event start time -->
-  <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
-  <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
-  <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
-  
-  <string name="EPr_force_phone_layout">Utiliser la mise en page du téléphone</string>
-
-  <string name="EPr_show_featured_lists">Afficher les listes favorites</string>
-  
-  <!-- Configurations -->
-  <string name="EPr_configurations_title">Set configuration</string>
-  <string name="EPr_config_default">Default</string>
-  <string name="EPr_config_lite">Astrid Lite</string>
-  
-  <!-- Dialog title when setting preference configuration -->
-  <string name="EPr_config_dialog_title">Set configuration?</string>
-  <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
-  <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
-  
-  <!-- default configuration name for the above dialog -->
-  <string name="EPr_config_dialog_default_id">default</string>
-  
-  <!-- Preference title for showing save and cancel buttons in task edit page -->
-  <string name="EPr_show_save_and_cancel">Show save and cancel </string>
-  
-  
-  <!-- Swipe between lists -->
-  <!-- Preference: swipe between lists performance -->
-  <string name="EPr_swipe_lists_performance_title">Glisser entre les listes.</string>
-  
-  <string-array name="EPr_swipe_lists_performance_mode">
-      <item>Aucun glissement</item>
-      <item>Conserve la mémoire</item>
-      <item>Performance normale</item>
-      <item>Haute Performance</item>
-  </string-array>
-  
-  <string-array name="EPr_swipe_lists_performance_desc">
-  <!-- slide 49a -->
-      <item>Le passage d\'une liste à l\'autre est désactivé</item>
-      <item>Performance plus lente</item>
-      <item>Paramètre par défaut</item>
-      <item>Utilise d\'avantage de ressource système</item>
-  </string-array>
-    
-  <string name="swipe_lists_helper_title">Glisser entre les listes.</string>
-  <string name="swipe_lists_helper_header">"Glissez  vers la gauche ou la droite pour passer rapidement d\'une liste à l\'autre"</string>
-  <string name="swipe_lists_helper_subtitle">Changez les préférences dans Préférences -&gt; Apparence</string>
-
-  <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
-  
-  <string-array name="EPr_default_reminders_mode">
-      <!-- reminders duration: labels for "Task Defaults" preference item. -->
-      <item>@string/TEA_reminder_mode_once</item>
-      <item>@string/TEA_reminder_mode_five</item>
-      <item>@string/TEA_reminder_mode_nonstop</item>
-  </string-array>
-    
-  <string-array name="EPr_themes">
-    <!-- theme_settings: labels for Theme preference menu -->
-    <!-- slide 36a-->
-    <item>Jour - Bleu</item>
-    <!-- slide 36b -->
-    <item>Jour - Rouge</item>
-    <!-- slide 36b -->
-    <item>Bleu ciel</item>
-    <!-- slide 36c -->
-    <item>Night</item>
-    <!-- slide 36d -->
-    <item>Transparent (white text)</item>
-    <!-- slide 36e -->
-    <item>Transparent (Texte Noir)</item>
-  </string-array>
-  
-  <string-array name="EPr_themes_widget">
-    <!-- slide 32i / 37a-->
-    <item>Même que l\'application</item>
-    <item>Jour - Bleu</item>
-    <item>Jour - Rouge</item>
-    <item>Sky blue</item>
-    <item>Night</item>
-    <item>Transparent (white text)</item>
-    <item>Transparent (black text)</item>
-    <item>Ancien Style</item>
-  </string-array>
-  
-  <!-- ========================================== Task Management Settings == -->
-
-  <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
-  <string name="EPr_manage_header">Gérer les anciennes tâches</string>
-  <!-- slide 47d -->
-  <string name="EPr_manage_delete_completed">Supprimer les tâches terminées</string>
-  <string name="EPr_manage_delete_completed_message">Confirmer la suppression de toutes vos tâches ?</string>
-  <!-- slide 47a -->
-  <string name="EPr_manage_delete_completed_summary">Les tâches supprimées peuvent être restaurées une par une</string>
-  <string name="EPr_manage_delete_completed_status">%d tâches supprimées !</string>
-  <!-- slide 47e -->
-  <string name="EPr_manage_purge_deleted">Purger les tâches supprimées</string>
-  <string name="EPr_manage_purge_deleted_message">Voulez vous vraiment purger toutes vos tâches supprimées ?\n\nCes tâches seront perdues pour toujours !</string>
-  <string name="EPr_manage_purge_deleted_status">%d tâches purgées!</string>
-  <!-- slide 47b-->
-  <string name="EPr_manage_purge_deleted_summary">Attention! Les tâches purgées ne peuvent pas être restaurées sans fichier de sauvegarde!</string>
-  <!-- slide 47h-->
-  <string name="EPr_manage_clear_all">Effacer toutes les données</string>
-  <string name="EPr_manage_clear_all_message">Supprimer toutes les tâches et configuration?\n\nAttention: cela est irréversible!</string>
-
-  <!-- slide 47f -->
-  <string name="EPr_manage_delete_completed_gcal">Supprimer les entrées de calendrier des tâches terminées</string>
-  <string name="EPr_manage_delete_completed_gcal_message">Voulez-vous réellement supprimer tous les évènements pour les tâches complétées?</string>
-  <string name="EPr_manage_delete_completed_gcal_summary"></string>
-  <string name="EPr_manage_delete_completed_gcal_status">Supprimer %d évènements du calendrier.</string>
-      
-  <!-- slide 47g-->
-  <string name="EPr_manage_delete_all_gcal">Supprimer toutes les entrées de calendrier des tâches</string>
-  <string name="EPr_manage_delete_all_gcal_message">Voulez vous vraiment supprimer tous les évènement du calendrier pour Tasks</string>
-  <string name="EPr_manage_delete_all_gcal_summary"></string>
-  <string name="EPr_manage_delete_all_gcal_status">Supprimer %d évènements du calendrier.</string>
-      
-  <!-- ==================================================== AddOnActivity == -->
-  
-  <!-- Add Ons Activity Title -->
-  <string name="AOA_title">Greffons</string>
-    
-  <!-- Add-on Activity: author for internal authors  -->
-  <string name="AOA_internal_author">L\'équipe d\'Astrid</string>
-    
-  <!-- Add-on Activity: installed add-ons tab -->
-  <string name="AOA_tab_installed">Installé</string>
-  
-  <!-- Add-on Activity - available add-ons tab -->
-  <string name="AOA_tab_available">Disponible</string>
-  
-  <!-- Add-on Activity - free add-ons label -->
-  <string name="AOA_free">Gratuit</string>
-  
-  <!-- Add-on Activity - menu item to visit add-on website -->
-  
-  <!-- Add-on Activity - menu item to visit android market -->
-  
-  <!-- Add-on Activity - when list is empty -->
-  <string name="AOA_no_addons">Liste vide !</string>
-  
-  <string name="AOA_ppack_title">Power Pack Astrid</string>
-  <string name="AOA_ppack_description">Aidez Astrid et augmentez votre productivité avec le Power Pack Astrid. Gadgets en 4x2 et 4x4 et utilisation de la voix. Montez en puissance aujourd\'hui !</string>
-  <string name="AOA_locale_title">Greffon Astrid de localisation</string>
-  <string name="AOA_locale_description">Autorise Astrid à utiliser l\'application de localisation pour vous envoyer des notifications en fonction de filtres. Nécessite la localisation</string>
-  
-  <!-- ====================================================== TasksWidget == -->
-
-  <!-- Widget text when loading tasks -->
-  <string name="TWi_loading">Chargement…</string>
-
-  <!-- Widget configuration activity title: select a filter -->
-  <string name="WCA_title">Sélectionnez les tâches à afficher…</string>
-  
-  <!-- ======================================================== Waiting on me -->
-
-  <string name="wom_commented">%s commented on your task.</string>
-  <string name="wom_mentioned">%s mentioned you.</string>
-  <string name="wom_assigned">%s assigned this to you.</string>
-  <string name="wom_raised_pri">%s raised the priority.</string>
-  <string name="wom_changed_due">%s changed the due date.</string>
-  <string name="wom_default">%s wants your attention.</string>
-  
-  <string name="wom_dismiss">Dismiss</string>
-  <string name="wom_acknowledge">I\'ve read this</string>
-
-  <!-- ============================================================= About == -->
-  
-  <!-- slide 30h: Title of "About" option in settings -->
-  <string name="p_about">À propos d\'Astrid</string>
-  
-  <!-- About text (%s => current version)-->
-  <string name="p_about_text">Version actuelle : %s\n\n Astrid est un logiciel libre maintenu fièrement par Todoroo, Inc.</string>
-
-  <!-- Title of "Help" option in settings -->
-  <string name="p_help">Support</string>
-  
-  <!-- slide 30c: Title of "Forums" option in settings -->
-  <string name="p_forums">Forums</string>
-  
-  <!-- Title of "Premium" option in settings -->
-  <string name="p_premium">Premium</string>
-  
-  <!-- ============================================================= Misc == -->
-  
-  <string name="feedback_positive_title">Rate Astrid?</string>
-
-  <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star rating?</string>
-
-  <string name="feedback_negative_title">Leave feedback?</string>
-
-  <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
-
-  <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback section--it might not be available on your device.</string>
-  
-  <string name="feedback_positive_button">Rate Astrid</string>
-
-  <string name="feedback_negative_button">Leave feedback</string>
-  
-  <string name="feedback_not_now">Not now</string>
-  
-  <string name="feedback_banner_text">How\'s Astrid working for you?</string>
-  
-  <!-- Displayed when task killer found. %s => name of the application -->
-  <string name="task_killer_help">Il semble que vous utilisiez un logiciel capable de fermer les processus (%s) ! Si vous pouvez, ajoutez Astrid à la liste d\'exception afin qu\'il ne soit pas fermé. Sinon, Astrid ne pourra probablement pas vous avertir lorsque vos tâches seront dues.\n</string>
-  
-  <!-- Task killer dialog ok button -->
-  <string name="task_killer_help_ok">Je n\'éliminerai pas Astrid !</string>
-    
-  <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
-  
-  <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
-  <string name="marketplace_description">Astrid est le très aimé gestionnaire de tâches open-source, conçu pour vous faciliter la vie. Il intègre des rappels, des étiquettes, la synchronisation, un plugin Locale, un widget et plus encore.</string>
-  
-  <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 Astrid</string>
-      
-  <string name="market_unavailable">Malheureusement le Play Store n\'est pas disponible sur votre système</string>
-  
+    <!-- slide 30f/ 36f: Preference: Theme -->
+    <string name="EPr_theme_title">Thème de couleur</string>
+    <!-- Preference: Theme Description (%s => value) -->
+    <string name="EPr_theme_desc">Actuellement : %s</string>
+    <!-- Preference: Theme Description (android 1.6) -->
+    <string name="EPr_theme_desc_unsupported">Ce paramètre requiert Android 2.0+.</string>
+    <!-- slide 32h/ 37b -->
+    <string name="EPr_theme_widget_title">Thème de gadget</string>
 
+    <!-- slide 30d/ 34f: Preference screen: all task row settings -->
+    <string name="EPr_taskRowPrefs_title">Style des lignes de tâche</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
+    <string name="EPr_use_contact_picker">Utiliser le selecteur de contacts.</string>
+    <!-- slide 49b -->
+    <string name="EPr_use_contact_picker_desc_enabled">L\'option de sélection de contacts sera
+        affiché dans la fenêtre d\'assignation des tâches.
+    </string>
+    <string name="EPr_use_contact_picker_desc_disabled">L\'option de sélection de contacts ne sera
+        pas affichée.
+    </string>
 
+    <!-- slide 49i: Preferences: Third party addons -->
+    <string name="EPr_third_party_addons">Autoriser les greffons extérieurs</string>
+    <string name="EPr_third_party_addons_desc_enabled">Les extensions tierces seront activées
+    </string>
+    <!-- slide 49d -->
+    <string name="EPr_third_party_addons_desc_disabled">Les extensions tierces seront désactivées
+    </string>
 
-  <!-- slide 32g: Preference Category: Defaults Title -->
-  <string name="EPr_defaults_header">Valeurs par défaut pour une nouvelle tâche</string>
-  <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
-  
-  <!-- slide 41f:  Preference: Default Urgency Title -->
-  <string name="EPr_default_urgency_title">Échéance par défaut</string>
-  <!-- Preference: Default Urgency Description (%s => setting) -->
-  <string name="EPr_default_urgency_desc">Actuellement : %s</string>
-  
-  <!-- slide 40a: Preference: Default Importance Title -->
-  <string name="EPr_default_importance_title">Default priority</string>
-  <!-- Preference: Default Importance Description (%s => setting) -->
-  <string name="EPr_default_importance_desc">Actuellement : %s</string>
-  
-  <!-- slide 42e: Preference: Default Hide Until Title -->
-  <string name="EPr_default_hideUntil_title">Masquer par défaut jusqu\'à</string>
-  <!-- Preference: Default Hide Until Description (%s => setting) -->
-  <string name="EPr_default_hideUntil_desc">Actuellement : %s</string>
-  
-  <!-- slide 43e: Preference: Default Reminders Title -->
-  <string name="EPr_default_reminders_title">Rappels par défaut</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_desc">Actuellement : %s</string>
-  
-  <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
-  <string name="EPr_default_addtocalendar_title">Ajout au calendrier par défaut</string>
-  <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
-  <string name="EPr_default_addtocalendar_desc_disabled">Les nouvelles tâches ne vont pas créer d\'évènement dans Google Calendar</string>
-  <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
-  <string name="EPr_default_addtocalendar_desc">Les nouvelles tâches seront dans le calendrier \"%s\"</string>
-  
-  <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
-  <string name="EPr_default_reminders_mode_title">Type de sonnerie/vibration par défaut</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_mode_desc">Actuellement : %s</string>
-  
-  <string-array name="EPr_default_importance">
-    <!-- importance: labels for "Task Defaults" preference item. -->
-    <!-- slide 40b -->
-    <item>!!! (la plus haute)</item>
-    <item>!!</item>
-    <item>!</item>
-    <!-- slide 40c -->
-    <item>o (la plus basse)</item>
-  </string-array>
-  
-  <string-array name="EPr_default_urgency">
-    <!-- urgency: labels for "Task Defaults" preference item. -->
-    <!-- slide 41a-->
-    <item>Aucune échéance</item>
-    <!-- slide 41b -->
-    <item>Aujourd\'hui</item>
-    <!-- slide 41c-->
-    <item>Demain</item>
-    <!-- slide 41d -->
-    <item>Après-demain</item>
-    <!-- slide 41e -->
-    <item>La semaine prochaine</item>
-  </string-array>
-  
-  <string-array name="EPr_default_hideUntil">
-    <!-- hideUntil: labels for "Task Defaults" preference item. -->
-    <!-- slide 42a -->
-    <item>Ne pas masquer</item>
-    <!-- slide 42b -->
-    <item>La tâche est échue</item>
-    <!-- slide 42c -->
-    <item>Jour avant échéance</item>
-    <!-- slide 42d-->
-    <item>Semaine avant échéance</item>
-  </string-array>
-  
-  <string-array name="EPr_default_reminders">
-    <!-- reminders: labels for "Task Defaults" preference item. -->
-    <!-- slide 43a -->
-    <item>Pas de rappel de date limite</item>
-    <!-- slide 43b -->
-    <item>À la date limite</item>
-    <!-- slide 43c -->
-    <item>En cas de retard</item>
-    <!-- slide 43d -->
-    <item>À la date limite ou après</item>
-  </string-array>
-  
-  <string-array name="EPr_default_addtocalendar">
-    <!-- addtocalendar: labels for "Task Defaults" preference item. -->
-    <item>@string/EPr_deactivated</item>
-  </string-array>      
+    <!-- Preferences: ideas tab -->
+    <string name="EPr_ideas_tab_enabled">Idées pour la tâche</string>
+    <string name="EPr_ideas_tab_description">Recevez des idées pour finir vos tâches</string>
 
+    <!-- Preferences: calendar event start time -->
+    <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
+    <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
+    <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
+
+    <string name="EPr_force_phone_layout">Utiliser la mise en page du téléphone</string>
+
+    <string name="EPr_show_featured_lists">Afficher les listes favorites</string>
+
+    <!-- Configurations -->
+    <string name="EPr_configurations_title">Set configuration</string>
+    <string name="EPr_config_default">Default</string>
+    <string name="EPr_config_lite">Astrid Lite</string>
+
+    <!-- Dialog title when setting preference configuration -->
+    <string name="EPr_config_dialog_title">Set configuration?</string>
+    <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
+    <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
+
+    <!-- default configuration name for the above dialog -->
+    <string name="EPr_config_dialog_default_id">default</string>
+
+    <!-- Preference title for showing save and cancel buttons in task edit page -->
+    <string name="EPr_show_save_and_cancel">Show save and cancel</string>
+
+
+    <!-- Swipe between lists -->
+    <!-- Preference: swipe between lists performance -->
+    <string name="EPr_swipe_lists_performance_title">Glisser entre les listes.</string>
+
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>Aucun glissement</item>
+        <item>Conserve la mémoire</item>
+        <item>Performance normale</item>
+        <item>Haute Performance</item>
+    </string-array>
+
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <!-- slide 49a -->
+        <item>Le passage d\'une liste à l\'autre est désactivé</item>
+        <item>Performance plus lente</item>
+        <item>Paramètre par défaut</item>
+        <item>Utilise d\'avantage de ressource système</item>
+    </string-array>
+
+    <string name="swipe_lists_helper_title">Glisser entre les listes.</string>
+    <string name="swipe_lists_helper_header">"Glissez vers la gauche ou la droite pour passer
+        rapidement d\'une liste à l\'autre"
+    </string>
+    <string name="swipe_lists_helper_subtitle">Changez les préférences dans Préférences -&gt;
+        Apparence
+    </string>
+
+    <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
+
+    <string-array name="EPr_default_reminders_mode">
+        <!-- reminders duration: labels for "Task Defaults" preference item. -->
+        <item>@string/TEA_reminder_mode_once</item>
+        <item>@string/TEA_reminder_mode_five</item>
+        <item>@string/TEA_reminder_mode_nonstop</item>
+    </string-array>
+
+    <string-array name="EPr_themes">
+        <!-- theme_settings: labels for Theme preference menu -->
+        <!-- slide 36a-->
+        <item>Jour - Bleu</item>
+        <!-- slide 36b -->
+        <item>Jour - Rouge</item>
+        <!-- slide 36b -->
+        <item>Bleu ciel</item>
+        <!-- slide 36c -->
+        <item>Night</item>
+        <!-- slide 36d -->
+        <item>Transparent (white text)</item>
+        <!-- slide 36e -->
+        <item>Transparent (Texte Noir)</item>
+    </string-array>
+
+    <string-array name="EPr_themes_widget">
+        <!-- slide 32i / 37a-->
+        <item>Même que l\'application</item>
+        <item>Jour - Bleu</item>
+        <item>Jour - Rouge</item>
+        <item>Sky blue</item>
+        <item>Night</item>
+        <item>Transparent (white text)</item>
+        <item>Transparent (black text)</item>
+        <item>Ancien Style</item>
+    </string-array>
+
+    <!-- ========================================== Task Management Settings == -->
+
+    <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
+    <string name="EPr_manage_header">Gérer les anciennes tâches</string>
+    <!-- slide 47d -->
+    <string name="EPr_manage_delete_completed">Supprimer les tâches terminées</string>
+    <string name="EPr_manage_delete_completed_message">Confirmer la suppression de toutes vos tâches
+        ?
+    </string>
+    <!-- slide 47a -->
+    <string name="EPr_manage_delete_completed_summary">Les tâches supprimées peuvent être restaurées
+        une par une
+    </string>
+    <string name="EPr_manage_delete_completed_status">%d tâches supprimées !</string>
+    <!-- slide 47e -->
+    <string name="EPr_manage_purge_deleted">Purger les tâches supprimées</string>
+    <string name="EPr_manage_purge_deleted_message">Voulez vous vraiment purger toutes vos tâches
+        supprimées ?\n\nCes tâches seront perdues pour toujours !
+    </string>
+    <string name="EPr_manage_purge_deleted_status">%d tâches purgées!</string>
+    <!-- slide 47b-->
+    <string name="EPr_manage_purge_deleted_summary">Attention! Les tâches purgées ne peuvent pas
+        être restaurées sans fichier de sauvegarde!
+    </string>
+    <!-- slide 47h-->
+    <string name="EPr_manage_clear_all">Effacer toutes les données</string>
+    <string name="EPr_manage_clear_all_message">Supprimer toutes les tâches et
+        configuration?\n\nAttention: cela est irréversible!
+    </string>
+
+    <!-- slide 47f -->
+    <string name="EPr_manage_delete_completed_gcal">Supprimer les entrées de calendrier des tâches
+        terminées
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_message">Voulez-vous réellement supprimer tous
+        les évènements pour les tâches complétées?
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_summary"></string>
+    <string name="EPr_manage_delete_completed_gcal_status">Supprimer %d évènements du calendrier.
+    </string>
+
+    <!-- slide 47g-->
+    <string name="EPr_manage_delete_all_gcal">Supprimer toutes les entrées de calendrier des
+        tâches
+    </string>
+    <string name="EPr_manage_delete_all_gcal_message">Voulez vous vraiment supprimer tous les
+        évènement du calendrier pour Tasks
+    </string>
+    <string name="EPr_manage_delete_all_gcal_summary"></string>
+    <string name="EPr_manage_delete_all_gcal_status">Supprimer %d évènements du calendrier.</string>
+
+    <!-- ==================================================== AddOnActivity == -->
+
+    <!-- Add Ons Activity Title -->
+    <string name="AOA_title">Greffons</string>
+
+    <!-- Add-on Activity: author for internal authors  -->
+    <string name="AOA_internal_author">L\'équipe d\'Astrid</string>
+
+    <!-- Add-on Activity: installed add-ons tab -->
+    <string name="AOA_tab_installed">Installé</string>
+
+    <!-- Add-on Activity - available add-ons tab -->
+    <string name="AOA_tab_available">Disponible</string>
+
+    <!-- Add-on Activity - free add-ons label -->
+    <string name="AOA_free">Gratuit</string>
+
+    <!-- Add-on Activity - menu item to visit add-on website -->
+
+    <!-- Add-on Activity - menu item to visit android market -->
+
+    <!-- Add-on Activity - when list is empty -->
+    <string name="AOA_no_addons">Liste vide !</string>
+
+    <string name="AOA_ppack_title">Power Pack Astrid</string>
+    <string name="AOA_ppack_description">Aidez Astrid et augmentez votre productivité avec le Power
+        Pack Astrid. Gadgets en 4x2 et 4x4 et utilisation de la voix. Montez en puissance
+        aujourd\'hui !
+    </string>
+    <string name="AOA_locale_title">Greffon Astrid de localisation</string>
+    <string name="AOA_locale_description">Autorise Astrid à utiliser l\'application de localisation
+        pour vous envoyer des notifications en fonction de filtres. Nécessite la localisation
+    </string>
+
+    <!-- ====================================================== TasksWidget == -->
+
+    <!-- Widget text when loading tasks -->
+    <string name="TWi_loading">Chargement…</string>
+
+    <!-- Widget configuration activity title: select a filter -->
+    <string name="WCA_title">Sélectionnez les tâches à afficher…</string>
+
+    <!-- ======================================================== Waiting on me -->
+
+    <string name="wom_commented">%s commented on your task.</string>
+    <string name="wom_mentioned">%s mentioned you.</string>
+    <string name="wom_assigned">%s assigned this to you.</string>
+    <string name="wom_raised_pri">%s raised the priority.</string>
+    <string name="wom_changed_due">%s changed the due date.</string>
+    <string name="wom_default">%s wants your attention.</string>
+
+    <string name="wom_dismiss">Dismiss</string>
+    <string name="wom_acknowledge">I\'ve read this</string>
+
+    <!-- ============================================================= About == -->
+
+    <!-- slide 30h: Title of "About" option in settings -->
+    <string name="p_about">À propos d\'Astrid</string>
+
+    <!-- About text (%s => current version)-->
+    <string name="p_about_text">Version actuelle : %s\n\n Astrid est un logiciel libre maintenu
+        fièrement par Todoroo, Inc.
+    </string>
+
+    <!-- Title of "Help" option in settings -->
+    <string name="p_help">Support</string>
+
+    <!-- slide 30c: Title of "Forums" option in settings -->
+    <string name="p_forums">Forums</string>
+
+    <!-- Title of "Premium" option in settings -->
+    <string name="p_premium">Premium</string>
+
+    <!-- ============================================================= Misc == -->
+
+    <string name="feedback_positive_title">Rate Astrid?</string>
+
+    <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star
+        rating?
+    </string>
+
+    <string name="feedback_negative_title">Leave feedback?</string>
+
+    <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
+
+    <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback
+        section--it might not be available on your device.
+    </string>
+
+    <string name="feedback_positive_button">Rate Astrid</string>
+
+    <string name="feedback_negative_button">Leave feedback</string>
+
+    <string name="feedback_not_now">Not now</string>
+
+    <string name="feedback_banner_text">How\'s Astrid working for you?</string>
+
+    <!-- Displayed when task killer found. %s => name of the application -->
+    <string name="task_killer_help">Il semble que vous utilisiez un logiciel capable de fermer les
+        processus (%s) ! Si vous pouvez, ajoutez Astrid à la liste d\'exception afin qu\'il ne soit
+        pas fermé. Sinon, Astrid ne pourra probablement pas vous avertir lorsque vos tâches seront
+        dues.\n
+    </string>
+
+    <!-- Task killer dialog ok button -->
+    <string name="task_killer_help_ok">Je n\'éliminerai pas Astrid !</string>
+
+    <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
+
+    <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
+    <string name="marketplace_description">Astrid est le très aimé gestionnaire de tâches
+        open-source, conçu pour vous faciliter la vie. Il intègre des rappels, des étiquettes, la
+        synchronisation, un plugin Locale, un widget et plus encore.
+    </string>
+
+    <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 Astrid
+    </string>
+
+    <string name="market_unavailable">Malheureusement le Play Store n\'est pas disponible sur votre
+        système
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 32g: Preference Category: Defaults Title -->
+    <string name="EPr_defaults_header">Valeurs par défaut pour une nouvelle tâche</string>
+    <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
+
+    <!-- slide 41f:  Preference: Default Urgency Title -->
+    <string name="EPr_default_urgency_title">Échéance par défaut</string>
+    <!-- Preference: Default Urgency Description (%s => setting) -->
+    <string name="EPr_default_urgency_desc">Actuellement : %s</string>
+
+    <!-- slide 40a: Preference: Default Importance Title -->
+    <string name="EPr_default_importance_title">Default priority</string>
+    <!-- Preference: Default Importance Description (%s => setting) -->
+    <string name="EPr_default_importance_desc">Actuellement : %s</string>
+
+    <!-- slide 42e: Preference: Default Hide Until Title -->
+    <string name="EPr_default_hideUntil_title">Masquer par défaut jusqu\'à</string>
+    <!-- Preference: Default Hide Until Description (%s => setting) -->
+    <string name="EPr_default_hideUntil_desc">Actuellement : %s</string>
+
+    <!-- slide 43e: Preference: Default Reminders Title -->
+    <string name="EPr_default_reminders_title">Rappels par défaut</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_desc">Actuellement : %s</string>
+
+    <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
+    <string name="EPr_default_addtocalendar_title">Ajout au calendrier par défaut</string>
+    <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
+    <string name="EPr_default_addtocalendar_desc_disabled">Les nouvelles tâches ne vont pas créer
+        d\'évènement dans Google Calendar
+    </string>
+    <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
+    <string name="EPr_default_addtocalendar_desc">Les nouvelles tâches seront dans le calendrier
+        \"%s\"
+    </string>
+
+    <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
+    <string name="EPr_default_reminders_mode_title">Type de sonnerie/vibration par défaut</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_mode_desc">Actuellement : %s</string>
+
+    <string-array name="EPr_default_importance">
+        <!-- importance: labels for "Task Defaults" preference item. -->
+        <!-- slide 40b -->
+        <item>!!! (la plus haute)</item>
+        <item>!!</item>
+        <item>!</item>
+        <!-- slide 40c -->
+        <item>o (la plus basse)</item>
+    </string-array>
+
+    <string-array name="EPr_default_urgency">
+        <!-- urgency: labels for "Task Defaults" preference item. -->
+        <!-- slide 41a-->
+        <item>Aucune échéance</item>
+        <!-- slide 41b -->
+        <item>Aujourd\'hui</item>
+        <!-- slide 41c-->
+        <item>Demain</item>
+        <!-- slide 41d -->
+        <item>Après-demain</item>
+        <!-- slide 41e -->
+        <item>La semaine prochaine</item>
+    </string-array>
+
+    <string-array name="EPr_default_hideUntil">
+        <!-- hideUntil: labels for "Task Defaults" preference item. -->
+        <!-- slide 42a -->
+        <item>Ne pas masquer</item>
+        <!-- slide 42b -->
+        <item>La tâche est échue</item>
+        <!-- slide 42c -->
+        <item>Jour avant échéance</item>
+        <!-- slide 42d-->
+        <item>Semaine avant échéance</item>
+    </string-array>
+
+    <string-array name="EPr_default_reminders">
+        <!-- reminders: labels for "Task Defaults" preference item. -->
+        <!-- slide 43a -->
+        <item>Pas de rappel de date limite</item>
+        <!-- slide 43b -->
+        <item>À la date limite</item>
+        <!-- slide 43c -->
+        <item>En cas de retard</item>
+        <!-- slide 43d -->
+        <item>À la date limite ou après</item>
+    </string-array>
+
+    <string-array name="EPr_default_addtocalendar">
+        <!-- addtocalendar: labels for "Task Defaults" preference item. -->
+        <item>@string/EPr_deactivated</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in filter plug-in -->
-    
+
     <!-- ================================================= Filter Exposer == -->
-    
+
     <!-- Active Tasks Filter -->
     <string name="BFE_Active">Mes tâches</string>
-    
+
     <!-- Waiting on me filter -->
     <string name="BFE_waiting_on_me">Waiting On Me</string>
-        
+
     <!-- Search Filter -->
-    
+
     <!-- slide 10b: Recently Modified -->
     <string name="BFE_Recent">Récemment modifié</string>
-    
+
     <!-- slide 10c: I\'ve assigned -->
     <string name="BFE_Assigned">J\'ai attribué</string>
-    
+
     <!-- Build Your Own Filter -->
-    
+
     <!-- Saved Filters Header -->
-    
+
     <!-- Saved Filters Context Menu: delete -->
     <string name="BFE_Saved_delete">Supprimer le filtre</string>
 
     <!-- =========================================== CustomFilterActivity == -->
-    
+
     <!-- slide 30d: Build Your Own Filter Activity Title-->
     <string name="CFA_title">Filtre utilisateur</string>
-    
+
     <!-- slide 30e: Filter Name edit box hint (if user types here, filter will be saved) -->
     <string name="CFA_filterName_hint">Donnez un nom à ce filtre pour le sauver...</string>
-    
+
     <!-- Filter Name default for copied filters (%s => old filter name) -->
-    
+
     <!-- slide 30a: Filter Starting Universe: all tasks -->
     <string name="CFA_universe_all">Tâches actives</string>
-    
+
     <!-- Filter Criteria Type: add (at the begging of title of the criteria) -->
     <string name="CFA_type_add">ou</string>
-    
+
     <!-- Filter Criteria Type: subtract (at the begging of title of the criteria) -->
     <string name="CFA_type_subtract">non</string>
-    
+
     <!-- Filter Criteria Type: intersect (at the begging of title of the criteria) -->
     <string name="CFA_type_intersect">aussi</string>
-    
+
     <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
     <string name="CFA_context_chain">%s comme critère</string>
-    
+
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">Supprimer la ligne</string>
-    
+
     <!-- slide 30b: Filter Screen Help Text -->
     <string name="CFA_help">Long press on items for additional options</string>
-    
+
     <!-- slide 30c: Filter Button: add new -->
     <string name="CFA_button_add">Ajouter un critère</string>
-    
+
     <!-- slide 30f: Filter Button: view without saving -->
     <string name="CFA_button_view">Affichage</string>
-    
+
     <!-- Filter Button: save & view filter -->
     <string name="CFA_button_save">Sauver &amp; Voir</string>
 
     <!-- =========================================== CustomFilterCriteria == -->
-        
+
     <!-- Criteria: due by X - display text (? -> user input) -->
     <string name="CFC_dueBefore_text">Échue le : ?</string>
     <!-- Criteria: due by X - name of criteria -->
@@ -1697,323 +1869,356 @@
         <item>Semaine prochaine</item>
         <item>Mois suivant</item>
     </string-array>
-    
+
     <!-- Criteria: importance - display text (? -> user input)-->
     <string name="CFC_importance_text">Priority at least ?</string>
     <!-- Criteria: importance - name of criteria -->
-    <string name="CFC_importance_name">Priority...</string>        
-    
+    <string name="CFC_importance_name">Priority...</string>
+
     <!-- Criteria: tag - display text (? -> user input) -->
     <string name="CFC_tag_text">Liste : ?</string>
     <!-- Criteria: tag - name of criteria -->
     <string name="CFC_tag_name">Liste...</string>
-    
+
     <!-- Criteria: tag_contains - name of criteria -->
     <string name="CFC_tag_contains_name">Nom de liste contient...</string>
     <!-- Criteria: tag_contains - text (? -> user input) -->
     <string name="CFC_tag_contains_text">Nom de liste contient : ?</string>
-    
+
     <!-- Criteria: title_contains - name of criteria -->
     <string name="CFC_title_contains_name">Titre contient...</string>
     <!-- Criteria: title_contains - text (? -> user input) -->
     <string name="CFC_title_contains_text">Titre contient: ?</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-  
-  <!-- Error message for adding to calendar  -->
-  <string name="gcal_TEA_error">Erreur d\'ajout de tâche à l\'agenda !</string>
-
-  <!-- Label for adding task to calendar -->
-
-  <!-- slide 21c: Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">Créer un évènement d\'agenda</string>
-  
-  <!-- Label when calendar event already exists -->
-  <string name="gcal_TEA_showCalendar_label">Ouvrir l\'événement de l\'agenda</string>
-  
-  <!-- Toast when unable to open calendar event -->
-  
-  <!-- Toast when calendar event updated because task changed -->
-  <string name="gcal_TEA_calendar_updated">Événement du calendrier également mis à jour</string>
-  
-  <!-- No calendar label (don\'t add option) -->
-  <string name="gcal_TEA_nocal">Ne pas ajouter</string>
-  
-  <string name="gcal_TEA_none_selected">To calendar?</string>
-  
-  <string name="gcal_TEA_has_event">Evènement d\'appel</string>
-  
-  <!-- ======================================================== Calendars == -->
-  
-  <!-- Calendar event name when task is completed (%s => task title) -->
-  <string name="gcal_completed_title">%s (complété)</string>
-
-  <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
-  <string name="gcal_GCP_default">Agenda par défaut</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Error message for adding to calendar  -->
+    <string name="gcal_TEA_error">Erreur d\'ajout de tâche à l\'agenda !</string>
 
+    <!-- Label for adding task to calendar -->
 
+    <!-- slide 21c: Label for adding task to calendar -->
+    <string name="gcal_TEA_addToCalendar_label">Créer un évènement d\'agenda</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Label when calendar event already exists -->
+    <string name="gcal_TEA_showCalendar_label">Ouvrir l\'événement de l\'agenda</string>
+
+    <!-- Toast when unable to open calendar event -->
+
+    <!-- Toast when calendar event updated because task changed -->
+    <string name="gcal_TEA_calendar_updated">Événement du calendrier également mis à jour</string>
+
+    <!-- No calendar label (don\'t add option) -->
+    <string name="gcal_TEA_nocal">Ne pas ajouter</string>
+
+    <string name="gcal_TEA_none_selected">To calendar?</string>
+
+    <string name="gcal_TEA_has_event">Evènement d\'appel</string>
+
+    <!-- ======================================================== Calendars == -->
+
+    <!-- Calendar event name when task is completed (%s => task title) -->
+    <string name="gcal_completed_title">%s (complété)</string>
+
+    <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
+    <string name="gcal_GCP_default">Agenda par défaut</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ============================================================= UI == -->
 
     <!-- filters header: GTasks -->
     <string name="gtasks_FEx_header">Google Tasks</string>
-    
+
     <!-- filter category for GTasks lists -->
-    
+
     <!-- filter title for GTasks lists (%s => list name) -->
     <string name="gtasks_FEx_title">Google Tasks: %s</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_creating_list">Création de la liste...</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_create_list_dialog">Nom de la nouvelle liste :</string>
-    
+
     <!-- error to show when list creation fails -->
     <string name="gtasks_FEx_create_list_error">Impossible de créer une nouvelle liste</string>
-    
+
     <!-- short help title for Gtasks -->
-    
+
     <string name="CFC_gtasks_list_text">Dans la liste : ?</string>
 
     <string name="CFC_gtasks_list_name">Dans la liste GTasks...</string>
-    
+
     <!-- Message while clearing completed tasks -->
     <string name="gtasks_GTA_clearing">Suppression des tâches terminés</string>
-    
+
     <!-- Label for clear completed menu item -->
     <string name="gtasks_GTA_clear_completed">Effacer les tâches terminés</string>
-        
+
     <!-- ============================================ GtasksLoginActivity == -->
-    
-    <!-- Activity Title: Gtasks Login -->    
 
-    <!-- Instructions: Gtasks login -->    
-    <string name="gtasks_GLA_body">Veuillez vous connecter à Google Tasks Sync (Beta !). Les comptes Google Apps non migrés ne sont pas encore supportés.</string>
-    
-    <string name="gtasks_GLA_noaccounts">Aucun compte Google trouvé pour la synchronisation.</string>
+    <!-- Activity Title: Gtasks Login -->
+
+    <!-- Instructions: Gtasks login -->
+    <string name="gtasks_GLA_body">Veuillez vous connecter à Google Tasks Sync (Beta !). Les comptes
+        Google Apps non migrés ne sont pas encore supportés.
+    </string>
+
+    <string name="gtasks_GLA_noaccounts">Aucun compte Google trouvé pour la synchronisation.
+    </string>
+
+    <!-- Instructions: Gtasks further help -->
+    <string name="gtasks_GLA_further_help">Pour afficher vos tâches avec l\'indentation et l\'ordre
+        préservé, allez à la page Filtres et sélectionnez une liste Google Task. Par défaut, Astrid
+        utilise ses propres paramètres de tri pour les tâches.
+    </string>
 
-    <!-- Instructions: Gtasks further help -->    
-    <string name="gtasks_GLA_further_help">Pour afficher vos tâches avec l\'indentation et l\'ordre préservé, allez à la page Filtres et sélectionnez une liste Google Task. Par défaut, Astrid utilise ses propres paramètres de tri pour les tâches.</string>
+    <!-- Sign In Button -->
 
-    <!-- Sign In Button -->    
+    <!-- E-mail Address Label -->
 
-    <!-- E-mail Address Label -->    
+    <!-- Password Label -->
 
-    <!-- Password Label -->    
-    
     <!--  Authenticating toast -->
     <string name="gtasks_GLA_authenticating">Authentification en cours...</string>
-    
+
     <!-- Google Apps for Domain checkbox -->
 
-    <!-- Error Message when fields aren\'t filled out -->    
+    <!-- Error Message when fields aren\'t filled out -->
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
+    <string name="gtasks_GLA_errorAuth">Erreur d\'authentification! Veuillez vérifier votre nom
+        d\'utilisateur et votre mot de passe dans le gestionnaire de compte de votre téléphone
+    </string>
 
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
-    <string name="gtasks_GLA_errorAuth">Erreur d\'authentification! Veuillez vérifier votre nom d\'utilisateur et votre mot de passe dans le gestionnaire de compte de votre téléphone</string>
+    <!-- Error Message when we receive an IO Exception -->
+    <string name="gtasks_GLA_errorIOAuth">Erreur de communication avec les serveurs Google. Veuillez
+        essayer plus tard.
+    </string>
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->
+    <string name="gtasks_GLA_errorAuth_captcha">Vous avez peut-être rencontré une captcha. Essayez
+        de vous enregistrer à partir du navigateur et revenez pour essayer à nouveau :
+    </string>
 
-    <!-- Error Message when we receive an IO Exception -->    
-    <string name="gtasks_GLA_errorIOAuth">Erreur de communication avec les serveurs Google. Veuillez essayer plus tard.</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->    
-    <string name="gtasks_GLA_errorAuth_captcha">Vous avez peut-être rencontré une captcha. Essayez de vous enregistrer à partir du navigateur et revenez pour essayer à nouveau :</string>
-    
     <!-- ============================================== GtasksPreferences == -->
 
-    <!-- GTasks Preferences Title -->    
+    <!-- GTasks Preferences Title -->
     <string name="gtasks_GPr_header">Google Tasks (Bêta !)</string>
-    
-    <!-- ================================================ Synchronization == -->    
-    
+
+    <!-- ================================================ Synchronization == -->
+
     <!-- title for notification tray when synchronizing -->
 
     <!-- Error Message when we receive a HTTP 503 error -->
-    <string name="gtasks_error_backend">Erreur lors de l\'API Google Tasks(beta). Le service peut être inaccessible. Veuillez essayer plus tard.</string>
-    
+    <string name="gtasks_error_backend">Erreur lors de l\'API Google Tasks(beta). Le service peut
+        être inaccessible. Veuillez essayer plus tard.
+    </string>
+
     <!-- Error for account not found -->
-    <string name="gtasks_error_accountNotFound">Le compte %s est introuvable--veuillez vous déconnecter puis vous reconnecter depuis les préférences Google Tasks.</string>
-    
+    <string name="gtasks_error_accountNotFound">Le compte %s est introuvable--veuillez vous
+        déconnecter puis vous reconnecter depuis les préférences Google Tasks.
+    </string>
+
     <!-- Error when ping after refreshing token fails -->
-    <string name="gtasks_error_authRefresh">Impossible de s\'authentifier avec Google Tasks. Veuillez vérifier votre mot de passe ou essayez plus tard.</string>
-    
+    <string name="gtasks_error_authRefresh">Impossible de s\'authentifier avec Google Tasks.
+        Veuillez vérifier votre mot de passe ou essayez plus tard.
+    </string>
+
     <!-- Error when account manager returns no auth token or throws exception -->
-    <string name="gtasks_error_accountManager">Une erreur est apparue dans le gestionnaire de comptes de votre téléphone. Veuillez vous deconnecter de votre compte Google Task puis vous reconnecter.</string>
+    <string name="gtasks_error_accountManager">Une erreur est apparue dans le gestionnaire de
+        comptes de votre téléphone. Veuillez vous deconnecter de votre compte Google Task puis vous
+        reconnecter.
+    </string>
 
     <!-- Error when authorization error happens in background sync -->
-    <string name="gtasks_error_background_sync_auth">"Erreur d\'authentification en arrière plan.  Réessayez de vous synchroniser quand Astrid est lancé."</string>
-      
+    <string name="gtasks_error_background_sync_auth">"Erreur d\'authentification en arrière plan.
+        Réessayez de vous synchroniser quand Astrid est lancé."
+    </string>
+
     <string name="gtasks_import_progress">Importing Google Tasks...</string>
 
-    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you still want to add the task %2$s to it?</string>
+    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you
+        still want to add the task %2$s to it?
+    </string>
 
     <string name="gtasks_import_dlg_title">Google Tasks Import</string>
 
     <string name="gtasks_import_add_task_ok">Add task</string>
 
-    <string name="gtasks_import_add_task_cancel">Ne pas ajouter de tâche 
-</string>
-        
+    <string name="gtasks_import_add_task_cancel">Ne pas ajouter de tâche
+    </string>
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- NEW USER EXPERIENCE -->
-  
-  <!-- help bubbles -->
-  <!-- slide 8c: Shown the first time a user sees the task list activity -->
-  <string name="help_popover_add_task">Commencez par ajouter une tâche ou deux.</string>
-
-  <!-- Shown the first time a user adds a task to a list -->  
-  <string name="help_popover_tap_task">Appuyez sur la tâche pour l\'éditer et la partager</string>
-  
-  <!-- slide 14a: Shown the first time a user sees the list activity -->
-  <string name="help_popover_list_settings">Appuyez pour éditer ou partager cette liste</string>
-  
-  <!-- slide 26c: Shown the first time a user sees the list settings tab -->
-  <string name="help_popover_collaborators">Les gens avec qui vous partagez vos listes peuvent vous aider à les compléter ou à finir des tâches</string>
-  
-  <!-- Shown after user adds a task on tablet-->
-  <string name="help_popover_add_lists">Appuyez pour ajouter une liste</string>
-  
-  <!-- Shown after a user adds a task on phones -->
-  <string name="help_popover_switch_lists">Appuyez pour ajouter une liste ou passer d\'une liste à l\'autre.</string>
-  
-  
-  
-  <!-- Login activity -->
-  
-  
-  <!-- slide 7b -->
-  <string name="welcome_login_tos_base">En utilisant Astrid vous acceptez que</string>
-  
-  <string name="welcome_login_tos_link">Conditions d\'utilisation</string>
-  
-  <!-- slide 7e -->
-  <string name="welcome_login_pw">S\'inscrire</string>
-  
-  <string name="welcome_sign_in">Connectez-vous</string>
-
-  <!-- slide 7f -->
-  <string name="welcome_login_later">Plus tard</string>
-  
-  <string name="welcome_login_confirm_later_title">Pourquoi ne pas s\'enregistrer ?</string>
-  
-  <string name="welcome_login_confirm_later_ok">Je vais le faire !</string>
-  
-  <string name="welcome_login_confirm_later_cancel">Non merci</string>
-  
-  <string name="welcome_login_confirm_later_dialog">"Connectez-vous pour tirer le maximum d\'Astrid!  Cela comprend la sauvegarde en ligne, la syncronisation complète avec le serveur Astrid.com, la possibilité d\'ajout de taches par courriel, et même de partager des listes de taches avec ses amis et tout cela gratuitement!"</string>
+    <!-- NEW USER EXPERIENCE -->
 
+    <!-- help bubbles -->
+    <!-- slide 8c: Shown the first time a user sees the task list activity -->
+    <string name="help_popover_add_task">Commencez par ajouter une tâche ou deux.</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown the first time a user adds a task to a list -->
+    <string name="help_popover_tap_task">Appuyez sur la tâche pour l\'éditer et la partager</string>
 
+    <!-- slide 14a: Shown the first time a user sees the list activity -->
+    <string name="help_popover_list_settings">Appuyez pour éditer ou partager cette liste</string>
 
-  <!-- Resources for built-in locale plug-in -->
-
-  <!-- Locale Alert Editing Window Title -->
-  <string name="locale_edit_alerts_title">Filtre d\'alertes Astrid</string>
-  
-  <!-- Locale Window Help -->                                                                                                                                            
-  <string name="locale_edit_intro">Astrid vous enverra un rappel si vous avez des tâches dans le filtre suivant :</string>
-      
-  <!-- Locale Window Filter Picker UI -->                                                                                                                                        
-      
-  <!-- Locale Window Interval Label -->                                                                                                                                        
-  <string name="locale_interval_label">Limiter les notifications à :</string>        
-      
-  <!-- Locale Window Interval Values -->                                                                                                                                        
-  <string-array name="locale_interval">
-    <item>une fois par heure</item>
-    <item>une fois toutes les six heures</item>
-    <item>une fois toutes les douzes heures</item>
-    <item>une fois par jour</item>
-    <item>une fois tous les trois jours</item>
-    <item>une fois par semaine</item>
-  </string-array>        
-      
-  <!-- Locale Notification text -->                                                                                                                                        
-  <string name="locale_notification">Vous avez $NUM correspondant(s) : $FILTER</string>     
-      
-  <!-- Locale Plugin was not found, it is required -->
-  <string name="locale_plugin_required">Veuillez installer le greffon local d\'Astrid !</string>        
-     
+    <!-- slide 26c: Shown the first time a user sees the list settings tab -->
+    <string name="help_popover_collaborators">Les gens avec qui vous partagez vos listes peuvent
+        vous aider à les compléter ou à finir des tâches
+    </string>
 
+    <!-- Shown after user adds a task on tablet-->
+    <string name="help_popover_add_lists">Appuyez pour ajouter une liste</string>
+
+    <!-- Shown after a user adds a task on phones -->
+    <string name="help_popover_switch_lists">Appuyez pour ajouter une liste ou passer d\'une liste à
+        l\'autre.
+    </string>
+
+
+    <!-- Login activity -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+
+    <!-- slide 7b -->
+    <string name="welcome_login_tos_base">En utilisant Astrid vous acceptez que</string>
+
+    <string name="welcome_login_tos_link">Conditions d\'utilisation</string>
+
+    <!-- slide 7e -->
+    <string name="welcome_login_pw">S\'inscrire</string>
+
+    <string name="welcome_sign_in">Connectez-vous</string>
+
+    <!-- slide 7f -->
+    <string name="welcome_login_later">Plus tard</string>
+
+    <string name="welcome_login_confirm_later_title">Pourquoi ne pas s\'enregistrer ?</string>
+
+    <string name="welcome_login_confirm_later_ok">Je vais le faire !</string>
+
+    <string name="welcome_login_confirm_later_cancel">Non merci</string>
+
+    <string name="welcome_login_confirm_later_dialog">"Connectez-vous pour tirer le maximum
+        d\'Astrid! Cela comprend la sauvegarde en ligne, la syncronisation complète avec le serveur
+        Astrid.com, la possibilité d\'ajout de taches par courriel, et même de partager des listes
+        de taches avec ses amis et tout cela gratuitement!"
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in locale plug-in -->
+
+    <!-- Locale Alert Editing Window Title -->
+    <string name="locale_edit_alerts_title">Filtre d\'alertes Astrid</string>
+
+    <!-- Locale Window Help -->
+    <string name="locale_edit_intro">Astrid vous enverra un rappel si vous avez des tâches dans le
+        filtre suivant :
+    </string>
+
+    <!-- Locale Window Filter Picker UI -->
+
+    <!-- Locale Window Interval Label -->
+    <string name="locale_interval_label">Limiter les notifications à :</string>
+
+    <!-- Locale Window Interval Values -->
+    <string-array name="locale_interval">
+        <item>une fois par heure</item>
+        <item>une fois toutes les six heures</item>
+        <item>une fois toutes les douzes heures</item>
+        <item>une fois par jour</item>
+        <item>une fois tous les trois jours</item>
+        <item>une fois par semaine</item>
+    </string-array>
+
+    <!-- Locale Notification text -->
+    <string name="locale_notification">Vous avez $NUM correspondant(s) : $FILTER</string>
+
+    <!-- Locale Plugin was not found, it is required -->
+    <string name="locale_plugin_required">Veuillez installer le greffon local d\'Astrid !</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ====================== Plugin Boilerplate ========================= -->
 
-	<!-- filters header: OpenCRX -->
+    <!-- filters header: OpenCRX -->
     <string name="opencrx_FEx_header">OpenCRX</string>
-    
+
     <!-- filter category for OpenCRX ActivityCreators -->
     <string name="opencrx_FEx_dashboard">Espaces de travail</string>
-    
+
     <!-- filter category for OpenCRX responsible person -->
     <string name="opencrx_FEx_responsible">Confié à</string>
-    
+
     <!--  OpenCRX assignedTo filter title (%s => assigned contact) -->
     <string name="opencrx_FEx_responsible_title">Attribué à « %s »</string>
-    
+
     <!-- detail for showing tasks created by someone else (%s => person name) -->
     <string name="opencrx_PDE_task_from">de %s</string>
-    
+
     <!-- replacement string for task edit "Notes" when using OpenCRX -->
     <string name="opencrx_TEA_notes">Ajouter un commentaire</string>
-    
+
     <string name="opencrx_creator_input_hint">Auteur</string>
 
     <string name="opencrx_contact_input_hint">Assignée à</string>
     <!-- ==================================================== Preferences == -->
 
-    <!-- Preferences Title: OpenCRX -->    
+    <!-- Preferences Title: OpenCRX -->
     <string name="opencrx_PPr_header">OpenCRX</string>
 
     <!-- creator title for tasks that are not synchronized -->
     <string name="opencrx_no_creator">(Ne pas synchroniser)</string>
 
-	<!-- preference title for default creator -->
+    <!-- preference title for default creator -->
     <string name="opencrx_PPr_defaultcreator_title">Créateur d\'activité par default</string>
 
     <!-- preference description for default creator (%s -> setting) -->
-    <string name="opencrx_PPr_defaultcreator_summary">Les nouvelles activités seront créées par: %s</string>
+    <string name="opencrx_PPr_defaultcreator_summary">Les nouvelles activités seront créées par:
+        %s
+    </string>
 
     <!-- preference description for default dashboard (when set to \'not synchronized\') -->
-    <string name="opencrx_PPr_defaultcreator_summary_none">Les nouvelles activités ne seront par synchrinisées par défaut</string>
-    
+    <string name="opencrx_PPr_defaultcreator_summary_none">Les nouvelles activités ne seront par
+        synchrinisées par défaut
+    </string>
+
     <!--  OpenCRX host and segment group name -->
     <string name="opencrx_group">Serveur OpenCRX</string>
 
@@ -2022,81 +2227,90 @@
 
     <!--  dialog title for OpenCRX host -->
     <string name="opencrx_host_dialog_title">Hôte OpenCRX</string>
-    
+
     <!--  example for OpenCRX host -->
-    <string name="opencrx_host_summary">"Par exemple: "<i>mondomaine.com</i></string>
-    
+    <string name="opencrx_host_summary">"Par exemple: "
+        <i>mondomaine.com</i>
+    </string>
+
     <!--  preference description for OpenCRX segment -->
     <string name="opencrx_segment_title">Segment</string>
 
     <!--  dialog title for OpenCRX segment -->
     <string name="opencrx_segment_dialog_title">Segment synchronisé</string>
-    
+
     <!--  example for OpenCRX segment -->
-    <string name="opencrx_segment_summary">"Par exemple: "<i>Standard</i></string>
-    
+    <string name="opencrx_segment_summary">"Par exemple: "
+        <i>Standard</i>
+    </string>
+
     <!--  default value for OpenCRX segment -->
     <string name="opencrx_segment_default">Standard</string>
-    
+
     <!--  preference description for OpenCRX provider -->
     <string name="opencrx_provider_title">Fournisseur</string>
 
     <!--  dialog title for OpenCRX provider -->
     <string name="opencrx_provider_dialog_title">Fournisseur de données pour OpenCRX</string>
-    
+
     <!--  example for OpenCRX provider -->
-    <string name="opencrx_provider_summary">"Par exemple: "<i>CRX</i></string>
-    
+    <string name="opencrx_provider_summary">"Par exemple: "
+        <i>CRX</i>
+    </string>
+
     <!--  default value for OpenCRX provider -->
     <string name="opencrx_provider_default">CRX</string>
     <!-- ================================================= Login Activity == -->
 
-    <!-- Activity Title: Opencrx Login -->    
+    <!-- Activity Title: Opencrx Login -->
     <string name="opencrx_PLA_title">Se connecter à OpenCRX</string>
 
-    <!-- Instructions: Opencrx login -->    
+    <!-- Instructions: Opencrx login -->
     <string name="opencrx_PLA_body">Se connecter avec votre compte OpenCRX</string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
     <string name="opencrx_PLA_signIn">S\'identifier</string>
 
-    <!-- Login Label -->    
+    <!-- Login Label -->
     <string name="opencrx_PLA_login">Identifiant</string>
 
-    <!-- Password Label -->    
+    <!-- Password Label -->
     <string name="opencrx_PLA_password">Mot de passe</string>
-    
-        <!-- Error Message when fields aren\'t filled out -->    
+
+    <!-- Error Message when fields aren\'t filled out -->
     <string name="opencrx_PLA_errorEmpty">Erreur: remplissez tous les champs</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
     <string name="opencrx_PLA_errorAuth">Erreur: compte ou mot de passe incorrect!</string>
 
     <!-- ================================================ Synchronization == -->
-        
+
     <!-- title for notification tray after synchronizing -->
     <string name="opencrx_notification_title">OpenCRX</string>
-    
+
     <!-- text for notification tray when synchronizing -->
-    <string name="opencrx_notification_text">%s tâches mises à jour / Cliquez pour plus de détails</string>
-    
+    <string name="opencrx_notification_text">%s tâches mises à jour / Cliquez pour plus de détails
+    </string>
+
     <!-- Error msg when io exception  -->
-    <string name="opencrx_ioerror">Erreur de connexion ! Veuillez vérifier votre connexion Internet.</string>
+    <string name="opencrx_ioerror">Erreur de connexion ! Veuillez vérifier votre connexion
+        Internet.
+    </string>
 
     <!-- opencrx Login not specified-->
     <string name="opencrx_MLA_email_empty">L\'authentification n\'a pas été specifié!</string>
-    
+
     <!-- opencrx password not specified-->
     <string name="opencrx_MLA_password_empty">Mot de passe non spécifié !</string>
-    
+
     <!-- ================================================ labels for layout-elements == -->
-    
+
     <!-- label for task-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_task_assign_label">Attribuer cette tâche à cette personne :</string>
-    
+
     <!-- Spinner-item for unassigned tasks on taskeditactivity -->
     <string name="opencrx_TEA_task_unassigned">&lt;Non attribué&gt;</string>
-    
+
     <!-- label for dashboard-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_creator_assign_label">Assigner cette tâche à ce créateur:</string>
 
@@ -2104,7 +2318,7 @@
     <string name="opencrx_TEA_dashboard_default">&lt;Par défaut&gt;</string>
 
     <string name="opencrx_TEA_opencrx_title">Paramètres d\'OpenCRX</string>
-        
+
     <string name="CFC_opencrx_in_workspace_text">Dans l\'espace de travail : ?</string>
 
     <string name="CFC_opencrx_in_workspace_name">Dans l\'espace de travail...</string>
@@ -2114,846 +2328,957 @@
     <string name="CFC_opencrx_assigned_to_name">Attribué à...</string>
 
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
+    <!-- ================================================== EditPreferences == -->
 
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 32j: Preference Category: Power Pack -->
-  <string name="EPr_powerpack_header">Premium et réglages divers</string>
-  <string name="EPr_powerpack_summary">Rappel des appels manqués, commande vocale et paramètres divers</string>
-  
-  <!-- slide 32e: Preference: Anonymous User Statistics -->
-  <string name="EPr_statistics_title">Statistiques d\'utilisation anonymes</string>
-  <!-- Preference: User Statistics (disabled) -->
-  <string name="EPr_statistics_desc_disabled">Aucune donnée d\'utilisation ne sera signalée</string>  
-  <!-- slide 32f: Preference: User Statistics (enabled) -->
-  <string name="EPr_statistics_desc_enabled">Aidez-nous à améliorer Astrid en envoyant des données d\'utilisation anonymes</string>
-      
+    <!-- slide 32j: Preference Category: Power Pack -->
+    <string name="EPr_powerpack_header">Premium et réglages divers</string>
+    <string name="EPr_powerpack_summary">Rappel des appels manqués, commande vocale et paramètres
+        divers
+    </string>
 
+    <!-- slide 32e: Preference: Anonymous User Statistics -->
+    <string name="EPr_statistics_title">Statistiques d\'utilisation anonymes</string>
+    <!-- Preference: User Statistics (disabled) -->
+    <string name="EPr_statistics_desc_disabled">Aucune donnée d\'utilisation ne sera signalée
+    </string>
+    <!-- slide 32f: Preference: User Statistics (enabled) -->
+    <string name="EPr_statistics_desc_enabled">Aidez-nous à améliorer Astrid en envoyant des données
+        d\'utilisation anonymes
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
-    <string name="speech_err_network">Problème de connexion réseau. La reconaissance vocale demande une connexion internet pour fonctionner.</string>
-    <string name="speech_err_no_match">Excusez-moi, je n\'ais pas compris! Veuillez répeter.</string>
-    <string name="speech_err_default">Excusez-moi, la reconaissance vocale a rencontrer une erreur. Veuillez réessayer.</string>
-    
+    <string name="speech_err_network">Problème de connexion réseau. La reconaissance vocale demande
+        une connexion internet pour fonctionner.
+    </string>
+    <string name="speech_err_no_match">Excusez-moi, je n\'ais pas compris! Veuillez répeter.
+    </string>
+    <string name="speech_err_default">Excusez-moi, la reconaissance vocale a rencontrer une erreur.
+        Veuillez réessayer.
+    </string>
+
     <string name="premium_attach_file">Joindre un fichier</string>
     <string name="premium_record_audio">Enregistrer un commentaire</string>
     <string name="premium_no_files">Aucun fichier joint</string>
-    <string name="premium_remove_file_confirm">Ètes-vous certain? Cette opération est irréversible</string>
-    
+    <string name="premium_remove_file_confirm">Ètes-vous certain? Cette opération est irréversible
+    </string>
+
     <string name="audio_recording_title">Enregistrement Audio</string>
     <string name="audio_stop_recording">Arrêter l\'enregistrement</string>
     <string name="audio_speak_now">Veuillez parler!</string>
     <string name="audio_encoding">Encodage ...</string>
     <string name="audio_err_encoding">Erreur d\'encodage audio</string>
-    <string name="audio_err_playback">Excusez-moi, le système ne supporte pas ce format de fichier audio</string>
-    
-    <string name="search_market_audio">Aucun lecteur supporte ce format audio. Voulez-vous télécharger un lecteur audio du Play Store?</string>
+    <string name="audio_err_playback">Excusez-moi, le système ne supporte pas ce format de fichier
+        audio
+    </string>
+
+    <string name="search_market_audio">Aucun lecteur supporte ce format audio. Voulez-vous
+        télécharger un lecteur audio du Play Store?
+    </string>
     <string name="search_market_audio_title">Aucun lecteur audio trouvé</string>
 
-    <string name="search_market_pdf">Aucun logiciel permettant de lire les fichiers PDF n\'a été trouvé. Souhaitez vous en télécharger un à partir de Android Market ?</string>
-    <string name="search_market_pdf_title">Aucun logiciel permettant de lire les fichiers PDF trouvé</string>
+    <string name="search_market_pdf">Aucun logiciel permettant de lire les fichiers PDF n\'a été
+        trouvé. Souhaitez vous en télécharger un à partir de Android Market ?
+    </string>
+    <string name="search_market_pdf_title">Aucun logiciel permettant de lire les fichiers PDF
+        trouvé
+    </string>
 
-    <string name="search_market_ms">Aucun logiciel permettant de lire les fichiers MS Office n\'a été trouvé. Souhaitez vous en télécharger un à partir de Android Market ?</string>
+    <string name="search_market_ms">Aucun logiciel permettant de lire les fichiers MS Office n\'a
+        été trouvé. Souhaitez vous en télécharger un à partir de Android Market ?
+    </string>
     <string name="search_market_ms_title">Aucun lecteur MS Office n\'a été trouvé</string>
-    
-    <string name="file_type_unhandled">Désolé ! Aucune application n\'a été trouvé pour gérer ce type de fichier.</string>
+
+    <string name="file_type_unhandled">Désolé ! Aucune application n\'a été trouvé pour gérer ce
+        type de fichier.
+    </string>
     <string name="file_type_unhandled_title">Aucune application trouvée</string>
-    
+
     <string name="file_prefix_image">Image</string>
     <string name="file_prefix_voice">Voix</string>
     <string name="file_browser_up">Remonter</string>
     <string name="file_browser_title">Choisissez un fichier</string>
     <string name="dir_browser_title">Choisissez un dossier</string>
-    <string name="file_browser_err_permissions">Erreur de permissions ! Assurez-vous qu\'Astrid à le droit d\'accéder à la carte SD.</string>
+    <string name="file_browser_err_permissions">Erreur de permissions ! Assurez-vous qu\'Astrid à le
+        droit d\'accéder à la carte SD.
+    </string>
     <string name="file_add_picture">Joindre une photo</string>
     <string name="file_add_sdcard">Joindre un fichier à partir de votre carte SD</string>
     <string name="file_download_title">Télécharger le fichier ?</string>
-    <string name="file_download_body">Ce fichier n\'a pas été téléchargé vers votre carte SD. Souhaitez-vous le télécharger maintenant ?</string>
+    <string name="file_download_body">Ce fichier n\'a pas été téléchargé vers votre carte SD.
+        Souhaitez-vous le télécharger maintenant ?
+    </string>
     <string name="file_download_progress">Téléchargement en cours...</string>
     <string name="file_err_memory">L\'image est trop lourde pour la mémoire</string>
     <string name="file_err_copy">Erreur lors de la copie du fichier à joindre</string>
     <string name="file_err_download">Erreur lors du téléchargement du fichier</string>
-    <string name="file_err_no_directory">Oups ! Il semble que le dossier n\'existe pas. Veuillez choisir un autre dossier dans les préférences d\'Astrid pour sauvegarder les fichiers.</string>
-    <string name="file_err_show">Désolé, le système ne prend pas encore en charge ce type de fichier</string>
-    
+    <string name="file_err_no_directory">Oups ! Il semble que le dossier n\'existe pas. Veuillez
+        choisir un autre dossier dans les préférences d\'Astrid pour sauvegarder les fichiers.
+    </string>
+    <string name="file_err_show">Désolé, le système ne prend pas encore en charge ce type de
+        fichier
+    </string>
+
     <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="p_files_dir">Dossier de téléchargements premium</string>
     <!-- Description for file download directory preference. %s -> chosen directory -->
-    <string name="p_files_dir_desc">Les fichiers joints des tâches sont sauvegardés vers : %s</string>
+    <string name="p_files_dir_desc">Les fichiers joints des tâches sont sauvegardés vers : %s
+    </string>
     <string name="p_files_dir_desc_default">Dossier par défaut</string>
 
-    
+
     <!-- in app billing -->
     <string name="billing_not_supported_title">Vous ne pouvez pas faire d\'achats</string>
-    <string name="billing_not_supported_message">Le service de facturation du marché n\'est momentanément pas disponible. Vous pouvez continuer à utiliser l\'application mais vous ne pourrez pas faire d\'achats.</string>
-    <string name="subscriptions_not_supported_title">Vous ne pouvez pas acheter d\'abonnements</string>
-    <string name="subscriptions_not_supported_message">Le service de facturation du marché ne peut momentanément pas supporter les abonnements. Vous pouvez vous abonner à Astrid Premium sur http://astrid.com/premium.</string>
+    <string name="billing_not_supported_message">Le service de facturation du marché n\'est
+        momentanément pas disponible. Vous pouvez continuer à utiliser l\'application mais vous ne
+        pourrez pas faire d\'achats.
+    </string>
+    <string name="subscriptions_not_supported_title">Vous ne pouvez pas acheter d\'abonnements
+    </string>
+    <string name="subscriptions_not_supported_message">Le service de facturation du marché ne peut
+        momentanément pas supporter les abonnements. Vous pouvez vous abonner à Astrid Premium sur
+        http://astrid.com/premium.
+    </string>
     <string name="cannot_connect_title">Impossible de se connecter au marché</string>
-    <string name="cannot_connect_message">L\'application ne peut pas se connecter au marché. Votre version du marché est peut-être trop vieille. Vous pouvez continuer à utiliser l\'application mais vous ne pourrez pas faire d\'achats.</string>
-    
+    <string name="cannot_connect_message">L\'application ne peut pas se connecter au marché. Votre
+        version du marché est peut-être trop vieille. Vous pouvez continuer à utiliser
+        l\'application mais vous ne pourrez pas faire d\'achats.
+    </string>
+
     <string name="restoring_transactions">Rétablissement des transactions</string>
-    
+
     <string name="subscriptions_learn_more">Pour en savoir plus</string>
-    
-    <string name="kii_premium_success">Thanks for participating in this offer! Your free month of Astrid Premium is now unlocked.</string>
+
+    <string name="kii_premium_success">Thanks for participating in this offer! Your free month of
+        Astrid Premium is now unlocked.
+    </string>
     <string name="kii_premium_abort">Special offer aborted</string>
     <string name="kii_premium_declined">Special offer declined</string>
-    <string name="kii_premium_error">There was an error processing this offer. Please try again later.</string>
-    
+    <string name="kii_premium_error">There was an error processing this offer. Please try again
+        later.
+    </string>
+
     <string name="premium_offers_title">Special Offer</string>
     <string name="premium_offers_subtitle">Want one month of Astrid Premium for free?</string>
-    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a short video by this sponsor. (They will also require your email address.)</string>
+    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a
+        short video by this sponsor. (They will also require your email address.)
+    </string>
     <string name="premium_offers_start">Obtenez le gratuitement!</string>
-    
+
     <string name="premium_billing_title">Astrid Premium</string>
     <string name="premium_buy_month">1 mois</string>
     <string name="premium_buy_year">1 an</string>
     <string name="premium_description_header">Encore plus avec Premium !</string>
-    <string name="premium_description_1">Attachez des fichiers à vos listes de tâches\n(pdfs, doc, ppt…)</string>
+    <string name="premium_description_1">Attachez des fichiers à vos listes de tâches\n(pdfs, doc,
+        ppt…)
+    </string>
     <string name="premium_description_2">Synchronisez vos fichiers avec astrid.com</string>
     <string name="premium_description_3">Ajoutez des pièces jointes par e-mail</string>
     <string name="premium_description_4">Sauvegardez vos mémos vocaux en fichiers audio</string>
-    <string name="premium_description_5">Bénéficiez des nouvelles fonctionnalités en avant-première</string>
+    <string name="premium_description_5">Bénéficiez des nouvelles fonctionnalités en
+        avant-première
+    </string>
     <string name="premium_description_6">Soutenez l\'équipe Astrid !</string>
     <string name="premium_speech_bubble_1">Premium va booster votre productivité !</string>
     <string name="premium_speech_bubble_2">Commandez pour un an et économisez 25%%!</string>
     <string name="premium_already_subscribed">Vous êtes déjà Astrid Premium !</string>
-    <string name="premium_login_prompt">Vous devez avoir un compte Astrid.com pour passer en premium. Connectez-vous ou inscrivez-vous.</string>
+    <string name="premium_login_prompt">Vous devez avoir un compte Astrid.com pour passer en
+        premium. Connectez-vous ou inscrivez-vous.
+    </string>
     <string name="premium_success">Merci pour votre inscription à Astrid Premium !</string>
-    <string name="premium_success_with_server_error">Merci pour votre inscription à Astrid Premium ! Vos nouvelles fonctionnalités vont être débloquées sur astrid.com et devrait être disponible sur votre téléphone aussitôt.</string>
-    <string name="premium_verification_error">L\'abonnement premium de ce compte Google Play est lié à un utilisateur différent. Pour ajouter une adresse mail à votre compte, allez sur astrid.com/users/profile</string>
-    <string name="premium_check_for_purchases">Vous avez déjà acheté la version Premium ? Cliquez ici pour visualiser l\'historique des achats de Google Play. </string>
+    <string name="premium_success_with_server_error">Merci pour votre inscription à Astrid Premium !
+        Vos nouvelles fonctionnalités vont être débloquées sur astrid.com et devrait être disponible
+        sur votre téléphone aussitôt.
+    </string>
+    <string name="premium_verification_error">L\'abonnement premium de ce compte Google Play est lié
+        à un utilisateur différent. Pour ajouter une adresse mail à votre compte, allez sur
+        astrid.com/users/profile
+    </string>
+    <string name="premium_check_for_purchases">Vous avez déjà acheté la version Premium ? Cliquez
+        ici pour visualiser l\'historique des achats de Google Play.
+    </string>
     <string name="premium_checking_for_purchases">Vérification des achats...</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- 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">Rappel moi :</string>
-
-  <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">... lorsque la tâche est échue</string>
-
-  <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">... lorsque la tâche est en retard</string>
-
-  <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_randomly">Une fois aléatoirement</string>
-
-  <!-- Task Edit: Reminder alarm clock label -->  
-  <string name="TEA_reminder_alarm_label">Type de sonnerie/vibration :</string>
-
-  <!--  slide 45a: Task Edit: Reminder mode: ring once -->  
-  <string name="TEA_reminder_mode_once">Une fois</string>
-
-  <!-- slide 45b: Task Edit: Reminder mode: ring five times -->  
-  <string name="TEA_reminder_mode_five">Cinq fois</string>
-
-  <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->  
-  <string name="TEA_reminder_mode_nonstop">Jusqu\'à ce que j\'annule l\'alarme</string>
-  
-  <string name="TEA_reminder_when">when</string>
-  
-  <string name="TEA_reminder_due_short">due</string>
-
-  <string name="TEA_reminder_overdue_short">overdue</string>
-
-  <string name="TEA_reminder_randomly_short">randomly</string>
-
-  <string name="TEA_reminder_display_one">Remind me %s</string>
-  
-  <string name="TEA_reminder_display_multiple">Remind %s</string>
-
-  <string-array name="TEA_reminder_random">
-    <!-- random reminder choices for task edit page. -->
-    <item>Une heure</item>
-    <item>Un jour</item>
-    <item>Une semaine</item>
-    <item>Dans deux semaines</item>
-    <item>Un mois</item>
-    <item>Dans deux mois</item>
-  </string-array>
-  
-  <!-- ==================================================== notifications == -->
-  
-  <!-- Name of filter when viewing a reminder -->
-  <string name="rmd_NoA_filter">Rappel !</string>
-  
-  <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Déjà fait !</string>
-  
-  <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Rappeler ultérieurement...</string>
-  
-  <!-- Reminder: Completed Toast -->
-  <string name="rmd_NoA_completed_toast">Félicitations pour avoir fini cette tâche</string>
-  
-  <!-- Prefix for reminder dialog title -->
-  <string name="rmd_NoA_dlg_title">Rappel :</string>
-  
-  <!-- ==================================================== user reengagement == -->
-
-  <!-- Titles for user reengagement notifications -->
-  <string-array name="rmd_reengage_notif_titles">
-    <item>Une note de la part d\'Astrid</item>
-    <!-- %s -> first name -->
-    <item>Mémo pour %s.</item> 
-    <item>Votre résumé Astrid</item>
-    <item>Rappels d\'Astrid</item>
-  </string-array>
-    
-  <string name="rmd_reengage_name_default">vous</string>
-
-  
-  <string name="rmd_reengage_add_tasks">Ajouter une tâche</string>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs -->
-  <string-array name="rmd_reengage_dialog_options">
-    <item>Il est temps de réduire votre liste de tâches!</item>
-    <item>Cher Monsieur ou Madame, certaines tâches attendent votre inspection !</item>
-    <item>Bonjour ! Pourriez-vous jeter un œil à ça ?</item>
-    <item>Il y a des tâches avec votre nom dessus !</item>
-    <item>Une livraison de tâches toute fraiche pour vous aujourd\'hui !</item>
-    <item>Vous êtes magnifique ! Prêt à commencer ?</item>
-    <item>Un jour idéal pour travailler, à mon avis !</item>
-  </string-array>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>Vous ne voulez pas être organisé ?</item>
-    <item>Je suis Astrid ! Je suis ici pour t\'aider à en faire plus !</item>
-    <item>Vous avez l\'air occupé ! Laissez moi vous débarrasser de ces tâches.</item>
-    <item>Je peux vous aider à garder des traces de tous les détails de votre vie.</item>
-    <item>Vous voulez vraiment en faire plus ? Moi aussi !</item>
-    <item>Enchanté de faire votre connaissance !</item>
-  </string-array>
-  <!-- ============================================= reminder preferences == -->
-  
-  <!-- slide 33d: Reminder Preference Screen Title -->
-  <string name="rmd_EPr_alerts_header">Paramètres de rappel</string>
-  <string name="rmd_EPr_alerts_summary">Heures de repos, options de report, niveau de persistance</string>
-    
-  <!-- Reminder Preference: Reminders Enabled Title -->
-  <string name="rmd_EPr_enabled_title">Activer les rappels ?</string>
-  <!-- Reminder Preference Reminders Enabled Description (true) -->
-  <string name="rmd_EPr_enabled_desc_true">Les rappels d\'Astrid sont activés (c\'est normal)</string>
-  <!-- Reminder Preference Reminders Enabled Description (false) -->
-  <string name="rmd_EPr_enabled_desc_false">Les rappels d\'Astrid n\' apparaîtront jamais sur votre téléphone</string>  
-    
-  <!-- Reminder Preference: Quiet Hours Start Title -->
-  <string name="rmd_EPr_quiet_hours_start_title">Début des heures de repos</string>
-  <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">Les notifications seront silencieuses après %s.\nNote : les vibrations sont contrôlées par le paramètre Vibrations</string>
-  <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
-  <string name="rmd_EPr_quiet_hours_desc_none">Les heures de repos sont désactivées</string>
-  
-  <!-- Reminder Preference: Quiet Hours End Title -->
-  <string name="rmd_EPr_quiet_hours_end_title">Fin des heures de repos</string>
-  <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_end_desc">Les notifications ne seront plus silencieuses à partir de %s</string>
-
-  <!-- Reminder Preference: Default Reminder Title -->
-  <string name="rmd_EPr_rmd_time_title">Rappel par défaut</string>
-  <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
-  <string name="rmd_EPr_rmd_time_desc">Les notifications pour les tâches sans échéances apparaîtront à %s</string>
-
-  <!-- Reminder Preference: Notification Ringtone Title -->
-  <string name="rmd_EPr_ringtone_title">Sonnerie de notification</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
-  <string name="rmd_EPr_ringtone_desc_custom">La sonnerie personnalisée a été configurée</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
-  <string name="rmd_EPr_ringtone_desc_silent">Configurer la sonnerie en mode silencieux</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
-  <string name="rmd_EPr_ringtone_desc_default">La sonnerie par défaut sera utilisée</string>
-  
-  <!-- Reminder Preference: Notification Persistence Title -->
-  <string name="rmd_EPr_persistent_title">Persistance de la notification</string>
-  <!-- Reminder Preference: Notification Persistence Description (true) -->
-  <string name="rmd_EPr_persistent_desc_true">Les notifications doivent être affichées séparément afin d\'être purgées</string>
-  <!-- Reminder Preference: Notification Persistence Description (false) -->
-  <string name="rmd_EPr_persistent_desc_false">Les notifications peuvent être purgées grâce au bouton « Tout purger »</string>
-
-  <!-- Reminder Preference: Social Reminders Title -->
-  <string name="rmd_EPr_social_title">Social encouragement</string>
-  <!-- Reminder Preference: Social Reminders Summary (enabled) -->
-  <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for shared tasks</string>
-  <!-- Reminder Preference: Social Reminders Summary (disabled) -->
-  <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you for shared tasks</string>
-  
-  
-  
-  <!-- Reminder Preference: Notification Icon Title -->
-  <!-- Reminder Preference: Notification Icon Description -->
-
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
-  <string name="rmd_EPr_multiple_maxvolume_title">Volume maximum pour les rappels multi sonneries</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid va maximiser le volume de multiples anneaux rappels</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid utilisera les réglages du système pour le volume</string>
-
-  <!-- Reminder Preference: Vibrate Title -->
-  <string name="rmd_EPr_vibrate_title">Vibre lors d\'une alerte</string>
-  <!-- Reminder Preference: Vibrate Description (true) -->
-  <string name="rmd_EPr_vibrate_desc_true">Astrid vibrera lors de l\'envoi de notifications</string>
-  <!-- Reminder Preference: Vibrate Description (false) -->
-  <string name="rmd_EPr_vibrate_desc_false">Astrid ne vibrera pas lors de l\'envoi de notifications</string>
-
-  <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">Encouragements d\'Astrid</string>
-  <!-- Reminder Preference: Nagging Description (true) -->
-  <string name="rmd_EPr_nagging_desc_true">Astrid s\'affichera afin de vous encourager lors des rappels</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_nagging_desc_false">Astrid ne vous donnera pas les messages d\'encouragements</string>
-
-  <!-- Reminder Preference: Snooze Dialog Title -->  
-  <string name="rmd_EPr_snooze_dialog_title">Info-bulle de report HH:MM</string>
-  <!-- Reminder Preference: Snooze Dialog Description (true) -->
-  <string name="rmd_EPr_snooze_dialog_desc_true">Reporter en sélectionnant un nouvel horaire de report (HH:MM)</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_snooze_dialog_desc_false">Reporter en sélectionnant # jours/heures à reporter</string>
-  
-  <!-- slide 44g: Reminder Preference: Default Reminders Title -->
-  <string name="rmd_EPr_defaultRemind_title">Rappels aléatoires</string>
-  <!-- Reminder Preference: Default Reminders Setting (disabled) -->
-  <string name="rmd_EPr_defaultRemind_desc_disabled">Les nouvelles tâches n\'auront pas de rappels aléatoires</string>
-  <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
-  <string name="rmd_EPr_defaultRemind_desc">Les nouvelles tâches rappèleront aléatoirement : %s</string>
-  
-  <!-- slide 39a: Defaults Title -->
-  
-  <string-array name="EPr_reminder_random">
-    <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
-    <item>désactivé</item>
-    <!-- slide 44b -->
-    <item>chaque heure</item>
-    <!-- slide 44c -->
-    <item>chaque jour</item>
-    <!-- slide 44d-->
-    <item>hebdomadaire</item>
-    <!-- slide 44e-->
-    <item>bi-hebdomadaire</item>
-    <!-- slide 44f -->
-    <item>mensuel</item>
-    <item>bi-mensuel</item>
-  </string-array>
-        
-  <string-array name="EPr_quiet_hours_start">
-    <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
-    <item>désactivé</item>
-    <item>20 h</item>
-    <item>21 h</item>
-    <item>22 h</item>
-    <item>23 h</item>
-    <item>24 h</item>
-    <item>1 h</item>
-    <item>2 h</item>
-    <item>3 h</item>
-    <item>4 h</item>
-    <item>5 h</item>
-    <item>6 h</item>
-    <item>7 h</item>
-    <item>8 h</item>
-    <item>9 h</item>
-    <item>10 h</item>
-    <item>11 h</item>
-    <item>12 h</item>
-    <item>13 h</item>
-    <item>14 h</item>
-    <item>15 h</item>
-    <item>16 h</item>
-    <item>17 h</item>
-    <item>18 h</item>
-    <item>19 h</item>
-  </string-array>
-  
-  <string-array name="EPr_quiet_hours_end">
-    <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
-    <item>9 h</item>
-    <item>10 h</item>
-    <item>11 h</item>
-    <item>12 h</item>
-    <item>13 h</item>
-    <item>14 h</item>
-    <item>15 h</item>
-    <item>16 h</item>
-    <item>17 h</item>
-    <item>18 h</item>
-    <item>19 h</item>
-    <item>20 h</item>
-    <item>21 h</item>
-    <item>22 h</item>
-    <item>23 h</item>
-    <item>24 h</item>
-    <item>1 h</item>
-    <item>2 h</item>
-    <item>3 h</item>
-    <item>4 h</item>
-    <item>5 h</item>
-    <item>6 h</item>
-    <item>7 h</item>
-    <item>8 h</item>
-  </string-array>
-  
-  <string-array name="EPr_rmd_time">
-    <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
-    <item>9 h</item>
-    <item>10 h</item>
-    <item>11 h</item>
-    <item>12 h</item>
-    <item>13 h</item>
-    <item>14 h</item>
-    <item>15 h</item>
-    <item>16 h</item>
-    <item>17 h</item>
-    <item>18 h</item>
-    <item>19 h</item>
-    <item>20 h</item>
-    <item>21 h</item>
-    <item>22 h</item>
-    <item>23 h</item>
-    <item>24 h</item>
-    <item>1 h</item>
-    <item>2 h</item>
-    <item>3 h</item>
-    <item>4 h</item>
-    <item>5 h</item>
-    <item>6 h</item>
-    <item>7 h</item>
-    <item>8 h</item>
-  </string-array>
-  
-  <!-- =============================================== random reminders == -->
-
-  <string name="reminders_social">Ces personnes comptent sur vous !</string>
-  
-  <string name="reminders_social_one">%s is counting on you!</string>
-  
-  <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
-
-  <string-array name="reminders">
-      <!-- reminders: Make these < 20 chars so the task name is displayed -->
-      <item>Salut ! Tu as une seconde ?</item>
-      <item>Je peux te voir une seconde ?</item>
-      <item>Tu as quelques minutes ?</item>
-      <item>Tu as oublié ?</item>
-      <item>Excusez-moi !</item>
-      <item>Dès que tu as une minute :</item>
-      <item>Sur votre agenda :</item>
-      <item>Disponible pour un moment ?</item>
-      <item>C\'est Astrid !</item>
-      <item>Salut ! Je peux te déranger ?</item>
-      <item>Une minute de votre temps ?</item>
-      <item>C\'est un beau jour pour</item>
-  </string-array>
-
-  <string-array name="reminders_due">
-      <!-- reminders related to task due date -->
-      <item>Il est temps de travailler !</item>
-      <item>La date due est là !</item>
-      <item>Prêt à commencer ?</item>
-      <item>Tu avais prévu de faire :</item>
-      <item>Tu es censé commencer :</item>
-      <item>Il est temps de commencer :</item>
-      <item>Il est temps !</item>
-      <item>Excusez-moi ! C\'est le moment pour</item>
-      <item>Disponible ? Temps de</item>
-  </string-array>
-
-  <string-array name="reminders_snooze">
-      <!-- reminders related to snooze -->
-      <item>Ne soyez pas feignant maintenant !</item>
-      <item>Le temps de rappel d\'alarme est activé !</item>
-      <item>Plus de rappel d\'alarme !</item>
-      <item>Et là, tu es prêt(e) ?</item>
-      <item>Plus de décalage !</item>
-  </string-array>
-  
-  <string-array name="reminder_responses">
-      <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
-      <item>J\'ai quelque chose pour toi !</item> 
-      <item>Prêt à ranger ça au passé ?</item>
-      <item>Pourquoi ne pas finir ça ?</item>
-      <item>Quoi de neuf ? Prêt ?</item>
-      <item>Tu es prêt(e) pour cela ?</item>
-      <item>Tu crois que tu peux gérer ça ?</item>
-      <item>Tu peux être heureux(se) ! Finis simplement cela !</item>
-      <item>Je te promets que tu te sentiras mieux si tu finis cela !</item>
-      <item>Vas-tu terminer cela aujourd\'hui ?</item>
-      <item>Je t\'en supplie, finis donc cela, je l\'ai assez vu !</item>
-      <item>Peux-tu finir cela ? Oui, tu le peux !</item>
-      <item>Tu crois que tu vas faire cela un jour ?</item>
-      <item>Aie bonne conscience ! Allons-y !</item>
-      <item>Je suis fière de toi ! Finissons ça !</item>
-      <item>Une petite pause après avoir fini cela ?</item>
-      <item>Juste cette tâche, s\'il te plaît ?</item>
-      <item>Il est temps de réduire votre liste de tâches !</item>
-      <item>Êtes-vous dans l\'équipe Ordre ou dans l\'équipe Chaos ? Équipe Ordre ! En avant !</item>
-      <item>Je vous ai déjà dit que vous êtes super ? Continuez comme ça !</item>
-      <item>Une action par jour et plus rien ne traîne !</item>
-      <item>Comment fais-tu cela ? Wow, je suis impressionnée !</item>
-      <item>Vous ne vous en sortirez pas juste sur votre bonne mine. Allons-y!</item>
-      <item>Un temps parfait pour ce travail, non ?</item>
-      <item>Un petit café en travaillant là-dessus?</item>
-      <item>Si vous aviez déjà fait ça, vous pourriez aller jouer dehors.</item>
-      <item>C\'est l\'heure. Vous ne pouvez pas repousser l\'inévitable</item>
-      <item>À chaque fois que vous m\'ignorez, je meurs un peu.</item>
-  </string-array>
-
-  <string-array name="postpone_nags">
-      <!-- Astrid\'s nagging when user clicks postpone -->
-      <item>Ne me dis pas que tu procrastines !</item>
-      <item>Être feignant ne devient pas démodé des fois ?</item>
-      <item>Quelque part quelqu\'un compte sur toi pour finir ça !</item>
-      <item>Quand tu as dis \"je repousse\", tu voulais dire \'je le fais\", c\'est ça ?</item>
-      <item>C\'est la dernière fois que tu repousses, n\'est-ce pas ?</item>
-      <item>Finissez-le simplement aujourd\'hui, je ne le dirai à personne !</item>
-      <item>Pourquoi remettre au lendemain... ce qu\'on peut faire tout de suite ?</item>
-      <item>Tu finiras ça un jour, je suppose ?</item>
-      <item>Je te trouve extraordinaire. Et si tu ne repoussais pas ça à plus tard ?</item>
-      <item>Seras-tu en mesure d\'atteindre tes objectifs si tu fais cela ?</item>
-      <item>Repousser, repousser, repousser. Mais quand changeras-tu ?</item>
-      <item>J\'en ai assez de vos excuses ! Faites-le simplement !</item>
-      <item>Ne serai-ce pas la même excuse que la dernière fois ?</item>
-      <item>Je ne peux pas t\'aider à organiser ta vie si tu fais ça...</item>
-  </string-array>
+    <!-- Resources for built-in reminders plug-in -->
 
+    <!-- =============================================== task edit activity == -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder group label -->
+    <string name="TEA_reminders_group_label">Reminder settings</string>
 
+    <!-- Task Edit: Reminder header label -->
+    <string name="TEA_reminder_label">Rappel moi :</string>
 
-  <!-- Resources for built-in repeat plug-in -->
-
-  <!-- repeating plugin name -->
-  <string name="repeat_plugin">Répétition de tâches</string>
-  
-  <!-- repeating plugin description -->
-  <string name="repeat_plugin_desc">Permet aux tâches d\'être répétées</string>
-  
-  <!-- slide 20a: checkbox for turning on/off repeats -->
-  <string name="repeat_enabled">Répétitions</string>
-  
-  <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
-  <string name="repeat_every">Tous les %d</string>
-  
-  <!-- hint when opening repeat interval -->
-  <string name="repeat_interval_prompt">Interval de répétition</string>
-  
-  <!-- slide 19b-->
-  <string name="repeat_never">Not repeating</string>
-  <!-- slide 20f-->
-  <string name="repeat_dont">Ne pas répéter</string>
-      
-  <string-array name="repeat_interval_short">
-    <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
-    <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">
-    <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>Jour(s)</item>
-    <item>Semaine(s)</item>
-    <item>Mois</item>
-    <item>Heure(s)</item>
-    <item>Minute(s)</item>
-    <item>Année(s)</item>
-  </string-array>
-  
-  <string name="repeat_days">jours</string>
-  <string name="repeat_weekdays">Jours de la semaine</string>
-  <string name="repeat_weeks">Semaines</string>
-  <string name="repeat_months">Mois</string>
-  <string name="repeat_years">Annees</string>
-  <string name="repeat_hours">Heures</string>
-  <string name="repeat_minutes">minutes</string>
-  
-  <string-array name="repeat_until_shortcuts">
-      <item>Indéfiniment</item>
-      <item>Jour précis</item>
-      <item>Aujourd\'hui</item>
-      <item>Demain</item>
-      <item>(jour d\'après)</item>
-      <item>Semaine Prochaine</item>
-      <item>Dans deux semaines</item>
-      <item>Mois suivant</item>
-  </string-array>
-  
-  <string name="repeat_until_title">Répéter jusqu\'à...</string>
-  
-  <string name="repeat_keep_going">Continuer</string>
-  
-  <string-array name="repeat_type">
-    <!-- slide 20c: repeat type (date to repeat from) -->
-    <item>à partir de la date due</item>
-    <!-- slide 20c -->
-    <item>à partir de la date d\'achèvement</item>
-  </string-array>
-  
-  <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
-  <string name="repeat_detail_byday">$I sur $D</string>
-  
-  <!-- task detail for repeat from due date (%s -> interval) -->
-  <string name="repeat_detail_duedate">Tous les %s</string>
-
-  <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
-  <string name="repeat_detail_duedate_until">Tous les %1$s jusqu\'à %2$s</string>
-  
-  <!-- task detail for repeat from completion date (%s -> interval) -->
-  <string name="repeat_detail_completion">%s après achèvement</string>
-  
-  <!-- text for button when repeating task indefinitely -->
-  <string name="repeat_forever">Répéter indéfiniment</string>
-
-  <!-- text for button when repeating task until specified date (%s -> date string) -->
-  <string name="repeat_until">Répéter jusqu\'à %s</string>
-  
-  <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title">Reprogrammer la tâche \"%s\"</string>
-
-  <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title_last_time">Fin des répétitions pour la tâche \"%s\"</string>
-      
-  <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->  
-  <string name="repeat_rescheduling_dialog_bubble">%1$s J\'ai reprogrammé la tâche répétitive de %2$s à %3$s</string>
-  
-  <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
-  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s J\'ai reprogrammé la tâche répétitive jusqu\'à %2$s</string>
-  
-  <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
-  <string name="repeat_rescheduling_dialog_bubble_last_time">Cette tâche est répétée depuis %1$s, et c\'est maintenant fini. %2$s</string>
-  
-  <string-array name="repeat_encouragement">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>Bon travail !</item>
-      <item>Wow... Je suis si fière de toi !</item>
-      <item>J\'adore quand vous êtes productif !</item>
-      <item>Ça ne fait pas du bien de rayer quelque chose ?</item>
-  </string-array>
-
-  <string-array name="repeat_encouragement_last_time">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>Bon travail !</item>
-      <item>Je suis si fière de toi !</item>
-      <item>J\'adore quand vous êtes productif !</item>
-  </string-array>
-  
+    <!-- Task Edit: Reminder @ deadline -->
+    <string name="TEA_reminder_due">... lorsque la tâche est échue</string>
 
+    <!-- Task Edit: Reminder after deadline -->
+    <string name="TEA_reminder_overdue">... lorsque la tâche est en retard</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder at random times (%s => time plural)-->
+    <string name="TEA_reminder_randomly">Une fois aléatoirement</string>
 
-    
-  <!-- Subtasks Help Introduction -->
-  <string name="subtasks_help_title">Trier et indenter dans Astrid</string>
-  <string name="subtasks_help_1">Garder appuyer pour déplacer une tâche</string>
-  <string name="subtasks_help_2">Déplacer verticalement pour réorganiser</string>
-  <string name="subtasks_help_3">Déplacer horizontalement pour indenter</string>
-    
+    <!-- Task Edit: Reminder alarm clock label -->
+    <string name="TEA_reminder_alarm_label">Type de sonnerie/vibration :</string>
 
+    <!--  slide 45a: Task Edit: Reminder mode: ring once -->
+    <string name="TEA_reminder_mode_once">Une fois</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 45b: Task Edit: Reminder mode: ring five times -->
+    <string name="TEA_reminder_mode_five">Cinq fois</string>
+
+    <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
+    <string name="TEA_reminder_mode_nonstop">Jusqu\'à ce que j\'annule l\'alarme</string>
+
+    <string name="TEA_reminder_when">when</string>
+
+    <string name="TEA_reminder_due_short">due</string>
+
+    <string name="TEA_reminder_overdue_short">overdue</string>
+
+    <string name="TEA_reminder_randomly_short">randomly</string>
+
+    <string name="TEA_reminder_display_one">Remind me %s</string>
+
+    <string name="TEA_reminder_display_multiple">Remind %s</string>
+
+    <string-array name="TEA_reminder_random">
+        <!-- random reminder choices for task edit page. -->
+        <item>Une heure</item>
+        <item>Un jour</item>
+        <item>Une semaine</item>
+        <item>Dans deux semaines</item>
+        <item>Un mois</item>
+        <item>Dans deux mois</item>
+    </string-array>
+
+    <!-- ==================================================== notifications == -->
+
+    <!-- Name of filter when viewing a reminder -->
+    <string name="rmd_NoA_filter">Rappel !</string>
+
+    <!-- Reminder: Task was already done -->
+    <string name="rmd_NoA_done">Déjà fait !</string>
+
+    <!-- Reminder: Snooze button (remind again later) -->
+    <string name="rmd_NoA_snooze">Rappeler ultérieurement...</string>
+
+    <!-- Reminder: Completed Toast -->
+    <string name="rmd_NoA_completed_toast">Félicitations pour avoir fini cette tâche</string>
+
+    <!-- Prefix for reminder dialog title -->
+    <string name="rmd_NoA_dlg_title">Rappel :</string>
+
+    <!-- ==================================================== user reengagement == -->
+
+    <!-- Titles for user reengagement notifications -->
+    <string-array name="rmd_reengage_notif_titles">
+        <item>Une note de la part d\'Astrid</item>
+        <!-- %s -> first name -->
+        <item>Mémo pour %s.</item>
+        <item>Votre résumé Astrid</item>
+        <item>Rappels d\'Astrid</item>
+    </string-array>
+
+    <string name="rmd_reengage_name_default">vous</string>
+
+
+    <string name="rmd_reengage_add_tasks">Ajouter une tâche</string>
+
+    <!-- Speech bubble options for astrid in reengagement notifs -->
+    <string-array name="rmd_reengage_dialog_options">
+        <item>Il est temps de réduire votre liste de tâches!</item>
+        <item>Cher Monsieur ou Madame, certaines tâches attendent votre inspection !</item>
+        <item>Bonjour ! Pourriez-vous jeter un œil à ça ?</item>
+        <item>Il y a des tâches avec votre nom dessus !</item>
+        <item>Une livraison de tâches toute fraiche pour vous aujourd\'hui !</item>
+        <item>Vous êtes magnifique ! Prêt à commencer ?</item>
+        <item>Un jour idéal pour travailler, à mon avis !</item>
+    </string-array>
+
+    <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>Vous ne voulez pas être organisé ?</item>
+        <item>Je suis Astrid ! Je suis ici pour t\'aider à en faire plus !</item>
+        <item>Vous avez l\'air occupé ! Laissez moi vous débarrasser de ces tâches.</item>
+        <item>Je peux vous aider à garder des traces de tous les détails de votre vie.</item>
+        <item>Vous voulez vraiment en faire plus ? Moi aussi !</item>
+        <item>Enchanté de faire votre connaissance !</item>
+    </string-array>
+    <!-- ============================================= reminder preferences == -->
+
+    <!-- slide 33d: Reminder Preference Screen Title -->
+    <string name="rmd_EPr_alerts_header">Paramètres de rappel</string>
+    <string name="rmd_EPr_alerts_summary">Heures de repos, options de report, niveau de
+        persistance
+    </string>
+
+    <!-- Reminder Preference: Reminders Enabled Title -->
+    <string name="rmd_EPr_enabled_title">Activer les rappels ?</string>
+    <!-- Reminder Preference Reminders Enabled Description (true) -->
+    <string name="rmd_EPr_enabled_desc_true">Les rappels d\'Astrid sont activés (c\'est normal)
+    </string>
+    <!-- Reminder Preference Reminders Enabled Description (false) -->
+    <string name="rmd_EPr_enabled_desc_false">Les rappels d\'Astrid n\' apparaîtront jamais sur
+        votre téléphone
+    </string>
+
+    <!-- Reminder Preference: Quiet Hours Start Title -->
+    <string name="rmd_EPr_quiet_hours_start_title">Début des heures de repos</string>
+    <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_start_desc">Les notifications seront silencieuses après
+        %s.\nNote : les vibrations sont contrôlées par le paramètre Vibrations
+    </string>
+    <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
+    <string name="rmd_EPr_quiet_hours_desc_none">Les heures de repos sont désactivées</string>
+
+    <!-- Reminder Preference: Quiet Hours End Title -->
+    <string name="rmd_EPr_quiet_hours_end_title">Fin des heures de repos</string>
+    <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_end_desc">Les notifications ne seront plus silencieuses à
+        partir de %s
+    </string>
+
+    <!-- Reminder Preference: Default Reminder Title -->
+    <string name="rmd_EPr_rmd_time_title">Rappel par défaut</string>
+    <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
+    <string name="rmd_EPr_rmd_time_desc">Les notifications pour les tâches sans échéances
+        apparaîtront à %s
+    </string>
+
+    <!-- Reminder Preference: Notification Ringtone Title -->
+    <string name="rmd_EPr_ringtone_title">Sonnerie de notification</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
+    <string name="rmd_EPr_ringtone_desc_custom">La sonnerie personnalisée a été configurée</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
+    <string name="rmd_EPr_ringtone_desc_silent">Configurer la sonnerie en mode silencieux</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
+    <string name="rmd_EPr_ringtone_desc_default">La sonnerie par défaut sera utilisée</string>
+
+    <!-- Reminder Preference: Notification Persistence Title -->
+    <string name="rmd_EPr_persistent_title">Persistance de la notification</string>
+    <!-- Reminder Preference: Notification Persistence Description (true) -->
+    <string name="rmd_EPr_persistent_desc_true">Les notifications doivent être affichées séparément
+        afin d\'être purgées
+    </string>
+    <!-- Reminder Preference: Notification Persistence Description (false) -->
+    <string name="rmd_EPr_persistent_desc_false">Les notifications peuvent être purgées grâce au
+        bouton « Tout purger »
+    </string>
+
+    <!-- Reminder Preference: Social Reminders Title -->
+    <string name="rmd_EPr_social_title">Social encouragement</string>
+    <!-- Reminder Preference: Social Reminders Summary (enabled) -->
+    <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for
+        shared tasks
+    </string>
+    <!-- Reminder Preference: Social Reminders Summary (disabled) -->
+    <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you
+        for shared tasks
+    </string>
+
+
+    <!-- Reminder Preference: Notification Icon Title -->
+    <!-- Reminder Preference: Notification Icon Description -->
+
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
+    <string name="rmd_EPr_multiple_maxvolume_title">Volume maximum pour les rappels multi
+        sonneries
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid va maximiser le volume de multiples
+        anneaux rappels
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid utilisera les réglages du système
+        pour le volume
+    </string>
+
+    <!-- Reminder Preference: Vibrate Title -->
+    <string name="rmd_EPr_vibrate_title">Vibre lors d\'une alerte</string>
+    <!-- Reminder Preference: Vibrate Description (true) -->
+    <string name="rmd_EPr_vibrate_desc_true">Astrid vibrera lors de l\'envoi de notifications
+    </string>
+    <!-- Reminder Preference: Vibrate Description (false) -->
+    <string name="rmd_EPr_vibrate_desc_false">Astrid ne vibrera pas lors de l\'envoi de
+        notifications
+    </string>
+
+    <!-- Reminder Preference: Nagging Title -->
+    <string name="rmd_EPr_nagging_title">Encouragements d\'Astrid</string>
+    <!-- Reminder Preference: Nagging Description (true) -->
+    <string name="rmd_EPr_nagging_desc_true">Astrid s\'affichera afin de vous encourager lors des
+        rappels
+    </string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_nagging_desc_false">Astrid ne vous donnera pas les messages
+        d\'encouragements
+    </string>
+
+    <!-- Reminder Preference: Snooze Dialog Title -->
+    <string name="rmd_EPr_snooze_dialog_title">Info-bulle de report HH:MM</string>
+    <!-- Reminder Preference: Snooze Dialog Description (true) -->
+    <string name="rmd_EPr_snooze_dialog_desc_true">Reporter en sélectionnant un nouvel horaire de
+        report (HH:MM)
+    </string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_snooze_dialog_desc_false">Reporter en sélectionnant # jours/heures à
+        reporter
+    </string>
+
+    <!-- slide 44g: Reminder Preference: Default Reminders Title -->
+    <string name="rmd_EPr_defaultRemind_title">Rappels aléatoires</string>
+    <!-- Reminder Preference: Default Reminders Setting (disabled) -->
+    <string name="rmd_EPr_defaultRemind_desc_disabled">Les nouvelles tâches n\'auront pas de rappels
+        aléatoires
+    </string>
+    <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
+    <string name="rmd_EPr_defaultRemind_desc">Les nouvelles tâches rappèleront aléatoirement : %s
+    </string>
+
+    <!-- slide 39a: Defaults Title -->
+
+    <string-array name="EPr_reminder_random">
+        <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
+        <item>désactivé</item>
+        <!-- slide 44b -->
+        <item>chaque heure</item>
+        <!-- slide 44c -->
+        <item>chaque jour</item>
+        <!-- slide 44d-->
+        <item>hebdomadaire</item>
+        <!-- slide 44e-->
+        <item>bi-hebdomadaire</item>
+        <!-- slide 44f -->
+        <item>mensuel</item>
+        <item>bi-mensuel</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_start">
+        <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
+        <item>désactivé</item>
+        <item>20 h</item>
+        <item>21 h</item>
+        <item>22 h</item>
+        <item>23 h</item>
+        <item>24 h</item>
+        <item>1 h</item>
+        <item>2 h</item>
+        <item>3 h</item>
+        <item>4 h</item>
+        <item>5 h</item>
+        <item>6 h</item>
+        <item>7 h</item>
+        <item>8 h</item>
+        <item>9 h</item>
+        <item>10 h</item>
+        <item>11 h</item>
+        <item>12 h</item>
+        <item>13 h</item>
+        <item>14 h</item>
+        <item>15 h</item>
+        <item>16 h</item>
+        <item>17 h</item>
+        <item>18 h</item>
+        <item>19 h</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_end">
+        <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
+        <item>9 h</item>
+        <item>10 h</item>
+        <item>11 h</item>
+        <item>12 h</item>
+        <item>13 h</item>
+        <item>14 h</item>
+        <item>15 h</item>
+        <item>16 h</item>
+        <item>17 h</item>
+        <item>18 h</item>
+        <item>19 h</item>
+        <item>20 h</item>
+        <item>21 h</item>
+        <item>22 h</item>
+        <item>23 h</item>
+        <item>24 h</item>
+        <item>1 h</item>
+        <item>2 h</item>
+        <item>3 h</item>
+        <item>4 h</item>
+        <item>5 h</item>
+        <item>6 h</item>
+        <item>7 h</item>
+        <item>8 h</item>
+    </string-array>
+
+    <string-array name="EPr_rmd_time">
+        <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
+        <item>9 h</item>
+        <item>10 h</item>
+        <item>11 h</item>
+        <item>12 h</item>
+        <item>13 h</item>
+        <item>14 h</item>
+        <item>15 h</item>
+        <item>16 h</item>
+        <item>17 h</item>
+        <item>18 h</item>
+        <item>19 h</item>
+        <item>20 h</item>
+        <item>21 h</item>
+        <item>22 h</item>
+        <item>23 h</item>
+        <item>24 h</item>
+        <item>1 h</item>
+        <item>2 h</item>
+        <item>3 h</item>
+        <item>4 h</item>
+        <item>5 h</item>
+        <item>6 h</item>
+        <item>7 h</item>
+        <item>8 h</item>
+    </string-array>
+
+    <!-- =============================================== random reminders == -->
+
+    <string name="reminders_social">Ces personnes comptent sur vous !</string>
+
+    <string name="reminders_social_one">%s is counting on you!</string>
+
+    <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
+
+    <string-array name="reminders">
+        <!-- reminders: Make these < 20 chars so the task name is displayed -->
+        <item>Salut ! Tu as une seconde ?</item>
+        <item>Je peux te voir une seconde ?</item>
+        <item>Tu as quelques minutes ?</item>
+        <item>Tu as oublié ?</item>
+        <item>Excusez-moi !</item>
+        <item>Dès que tu as une minute :</item>
+        <item>Sur votre agenda :</item>
+        <item>Disponible pour un moment ?</item>
+        <item>C\'est Astrid !</item>
+        <item>Salut ! Je peux te déranger ?</item>
+        <item>Une minute de votre temps ?</item>
+        <item>C\'est un beau jour pour</item>
+    </string-array>
+
+    <string-array name="reminders_due">
+        <!-- reminders related to task due date -->
+        <item>Il est temps de travailler !</item>
+        <item>La date due est là !</item>
+        <item>Prêt à commencer ?</item>
+        <item>Tu avais prévu de faire :</item>
+        <item>Tu es censé commencer :</item>
+        <item>Il est temps de commencer :</item>
+        <item>Il est temps !</item>
+        <item>Excusez-moi ! C\'est le moment pour</item>
+        <item>Disponible ? Temps de</item>
+    </string-array>
+
+    <string-array name="reminders_snooze">
+        <!-- reminders related to snooze -->
+        <item>Ne soyez pas feignant maintenant !</item>
+        <item>Le temps de rappel d\'alarme est activé !</item>
+        <item>Plus de rappel d\'alarme !</item>
+        <item>Et là, tu es prêt(e) ?</item>
+        <item>Plus de décalage !</item>
+    </string-array>
+
+    <string-array name="reminder_responses">
+        <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
+        <item>J\'ai quelque chose pour toi !</item>
+        <item>Prêt à ranger ça au passé ?</item>
+        <item>Pourquoi ne pas finir ça ?</item>
+        <item>Quoi de neuf ? Prêt ?</item>
+        <item>Tu es prêt(e) pour cela ?</item>
+        <item>Tu crois que tu peux gérer ça ?</item>
+        <item>Tu peux être heureux(se) ! Finis simplement cela !</item>
+        <item>Je te promets que tu te sentiras mieux si tu finis cela !</item>
+        <item>Vas-tu terminer cela aujourd\'hui ?</item>
+        <item>Je t\'en supplie, finis donc cela, je l\'ai assez vu !</item>
+        <item>Peux-tu finir cela ? Oui, tu le peux !</item>
+        <item>Tu crois que tu vas faire cela un jour ?</item>
+        <item>Aie bonne conscience ! Allons-y !</item>
+        <item>Je suis fière de toi ! Finissons ça !</item>
+        <item>Une petite pause après avoir fini cela ?</item>
+        <item>Juste cette tâche, s\'il te plaît ?</item>
+        <item>Il est temps de réduire votre liste de tâches !</item>
+        <item>Êtes-vous dans l\'équipe Ordre ou dans l\'équipe Chaos ? Équipe Ordre ! En avant !
+        </item>
+        <item>Je vous ai déjà dit que vous êtes super ? Continuez comme ça !</item>
+        <item>Une action par jour et plus rien ne traîne !</item>
+        <item>Comment fais-tu cela ? Wow, je suis impressionnée !</item>
+        <item>Vous ne vous en sortirez pas juste sur votre bonne mine. Allons-y!</item>
+        <item>Un temps parfait pour ce travail, non ?</item>
+        <item>Un petit café en travaillant là-dessus?</item>
+        <item>Si vous aviez déjà fait ça, vous pourriez aller jouer dehors.</item>
+        <item>C\'est l\'heure. Vous ne pouvez pas repousser l\'inévitable</item>
+        <item>À chaque fois que vous m\'ignorez, je meurs un peu.</item>
+    </string-array>
+
+    <string-array name="postpone_nags">
+        <!-- Astrid\'s nagging when user clicks postpone -->
+        <item>Ne me dis pas que tu procrastines !</item>
+        <item>Être feignant ne devient pas démodé des fois ?</item>
+        <item>Quelque part quelqu\'un compte sur toi pour finir ça !</item>
+        <item>Quand tu as dis \"je repousse\", tu voulais dire \'je le fais\", c\'est ça ?</item>
+        <item>C\'est la dernière fois que tu repousses, n\'est-ce pas ?</item>
+        <item>Finissez-le simplement aujourd\'hui, je ne le dirai à personne !</item>
+        <item>Pourquoi remettre au lendemain... ce qu\'on peut faire tout de suite ?</item>
+        <item>Tu finiras ça un jour, je suppose ?</item>
+        <item>Je te trouve extraordinaire. Et si tu ne repoussais pas ça à plus tard ?</item>
+        <item>Seras-tu en mesure d\'atteindre tes objectifs si tu fais cela ?</item>
+        <item>Repousser, repousser, repousser. Mais quand changeras-tu ?</item>
+        <item>J\'en ai assez de vos excuses ! Faites-le simplement !</item>
+        <item>Ne serai-ce pas la même excuse que la dernière fois ?</item>
+        <item>Je ne peux pas t\'aider à organiser ta vie si tu fais ça...</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in repeat plug-in -->
+
+    <!-- repeating plugin name -->
+    <string name="repeat_plugin">Répétition de tâches</string>
+
+    <!-- repeating plugin description -->
+    <string name="repeat_plugin_desc">Permet aux tâches d\'être répétées</string>
+
+    <!-- slide 20a: checkbox for turning on/off repeats -->
+    <string name="repeat_enabled">Répétitions</string>
+
+    <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
+    <string name="repeat_every">Tous les %d</string>
+
+    <!-- hint when opening repeat interval -->
+    <string name="repeat_interval_prompt">Interval de répétition</string>
+
+    <!-- slide 19b-->
+    <string name="repeat_never">Not repeating</string>
+    <!-- slide 20f-->
+    <string name="repeat_dont">Ne pas répéter</string>
+
+    <string-array name="repeat_interval_short">
+        <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
+        <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">
+        <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>Jour(s)</item>
+        <item>Semaine(s)</item>
+        <item>Mois</item>
+        <item>Heure(s)</item>
+        <item>Minute(s)</item>
+        <item>Année(s)</item>
+    </string-array>
+
+    <string name="repeat_days">jours</string>
+    <string name="repeat_weekdays">Jours de la semaine</string>
+    <string name="repeat_weeks">Semaines</string>
+    <string name="repeat_months">Mois</string>
+    <string name="repeat_years">Annees</string>
+    <string name="repeat_hours">Heures</string>
+    <string name="repeat_minutes">minutes</string>
+
+    <string-array name="repeat_until_shortcuts">
+        <item>Indéfiniment</item>
+        <item>Jour précis</item>
+        <item>Aujourd\'hui</item>
+        <item>Demain</item>
+        <item>(jour d\'après)</item>
+        <item>Semaine Prochaine</item>
+        <item>Dans deux semaines</item>
+        <item>Mois suivant</item>
+    </string-array>
+
+    <string name="repeat_until_title">Répéter jusqu\'à...</string>
+
+    <string name="repeat_keep_going">Continuer</string>
+
+    <string-array name="repeat_type">
+        <!-- slide 20c: repeat type (date to repeat from) -->
+        <item>à partir de la date due</item>
+        <!-- slide 20c -->
+        <item>à partir de la date d\'achèvement</item>
+    </string-array>
+
+    <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
+    <string name="repeat_detail_byday">$I sur $D</string>
+
+    <!-- task detail for repeat from due date (%s -> interval) -->
+    <string name="repeat_detail_duedate">Tous les %s</string>
+
+    <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
+    <string name="repeat_detail_duedate_until">Tous les %1$s jusqu\'à %2$s</string>
+
+    <!-- task detail for repeat from completion date (%s -> interval) -->
+    <string name="repeat_detail_completion">%s après achèvement</string>
+
+    <!-- text for button when repeating task indefinitely -->
+    <string name="repeat_forever">Répéter indéfiniment</string>
+
+    <!-- text for button when repeating task until specified date (%s -> date string) -->
+    <string name="repeat_until">Répéter jusqu\'à %s</string>
+
+    <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title">Reprogrammer la tâche \"%s\"</string>
+
+    <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title_last_time">Fin des répétitions pour la tâche
+        \"%s\"
+    </string>
+
+    <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->
+    <string name="repeat_rescheduling_dialog_bubble">%1$s J\'ai reprogrammé la tâche répétitive de
+        %2$s à %3$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
+    <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s J\'ai reprogrammé la tâche
+        répétitive jusqu\'à %2$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
+    <string name="repeat_rescheduling_dialog_bubble_last_time">Cette tâche est répétée depuis %1$s,
+        et c\'est maintenant fini. %2$s
+    </string>
+
+    <string-array name="repeat_encouragement">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>Bon travail !</item>
+        <item>Wow... Je suis si fière de toi !</item>
+        <item>J\'adore quand vous êtes productif !</item>
+        <item>Ça ne fait pas du bien de rayer quelque chose ?</item>
+    </string-array>
+
+    <string-array name="repeat_encouragement_last_time">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>Bon travail !</item>
+        <item>Je suis si fière de toi !</item>
+        <item>J\'adore quand vous êtes productif !</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Subtasks Help Introduction -->
+    <string name="subtasks_help_title">Trier et indenter dans Astrid</string>
+    <string name="subtasks_help_1">Garder appuyer pour déplacer une tâche</string>
+    <string name="subtasks_help_2">Déplacer verticalement pour réorganiser</string>
+    <string name="subtasks_help_3">Déplacer horizontalement pour indenter</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-
-  <!-- Tags label -->
-  <string name="TEA_tags_label">Listes</string>
-  
-  <!-- Tags label long version -->
-  <string name="TEA_tags_label_long">Ajouter à la liste</string>
- 
-  <!-- Tags hint -->
-  <string name="TEA_tag_hint">Nouvelle liste</string>
-  
-  <!-- Tags dropdown -->
-    
-  <!-- =============================================== Task List Controls == -->
-  
-  <!-- menu item for tags -->
-  
-  <!-- ========================================================== Extras == -->
-  
-  <!-- Context Item: show tag -->
-  
-  <!-- slide 25a: Dialog: new list -->
-  <string name="tag_new_list">Nouvelle liste</string>
-  
-  <!-- Dialog: list saved -->
-  
-  <!-- Dialog: task created without title -->
-  <string name="tag_no_title_error">Veuillez d\'abord entrer un nom pour cette liste.</string>
-  
-  <!-- ========================================================== Filters == -->
-  
-  <!-- filter button to add tag -->
-  <string name="tag_FEx_add_new">Nouveau</string>
-  
-  <!-- filter header for tags -->
-  <string name="tag_FEx_header">Listes</string>
-  
-  <!-- filter header for tags user created -->
-  
-  <!-- filter header for tags, shared with user -->
-  
-  <!-- filter header for tags which have no active tasks -->
-  
-  <!-- slide 10d: filter for untagged tasks -->
-  <string name="tag_FEx_untagged">Uncategorized</string>
-  
-  <!-- slide 27a: %s => tag name -->
-
-  <!-- context menu option to rename a tag -->
-  <string name="tag_cm_rename">Renommer la liste</string>
-
-  <!-- context menu option to delete a tag -->
-  <string name="tag_cm_delete">Supprimer la liste</string>
-  
-  <!-- context menu option to leave a shared list -->
-  <string name="tag_cm_leave">Quitter la liste</string>
-
-  <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
-  <string name="DLG_delete_this_tag_question">Supprimer cette liste : %s ? (Aucune tâche ne sera supprimée.)</string>
-  
-  <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
-  <string name="DLG_leave_this_shared_tag_question">Quitter cette liste partagée : %s ? (Aucune tâche ne sera supprimée.)</string>
-
-  <!-- Dialog to rename tag -->
-  <string name="DLG_rename_this_tag_header">Renommer la liste %s en:</string>
-
-  <!-- Toast notification that no changes have been made -->
-  <string name="TEA_no_tags_modified">Aucun changement effectué</string>
-
-  <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_deleted">La liste %1$s a été supprimée, affectant %2$d tâches</string>
-  
-  <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_left">Vous avez quitté la liste %1$s, affectant %2$d tâches</string>
-
-  <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
-  <string name="TEA_tags_renamed">%1$s renommé en %2$s pour %3$d tâches</string>
-  
-  <!-- Tag case migration -->
-  <string name="tag_case_migration_notice">Nous avons remarqué que vous avez des listes ayant le même nom avec des majuscules différentes. Nous pensons que vous parliez des même listes, donc nous avons combiné les doublons. Mais ne vous inquiétez pas, les listes originelles ont simplement été renommées avec des nombres (ex. Courses_1, Courses_2). Si vous ne le voulez pas, vous pouvez juste supprimer la nouvelle liste combinée !</string>
-  
-  <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings:</string>
-  
-  <!-- Header for tag activity -->
-  <string name="tag_updates_title">Activité : %s</string>
-  
-  <!-- Delete button for tag settings -->
-  <string name="tag_delete_button">Supprimer la liste</string>
-  
-  <!-- slide 28d: Leave button for tag settings -->
-  <string name="tag_leave_button">Quitter la liste</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Tags label -->
+    <string name="TEA_tags_label">Listes</string>
 
+    <!-- Tags label long version -->
+    <string name="TEA_tags_label_long">Ajouter à la liste</string>
+
+    <!-- Tags hint -->
+    <string name="TEA_tag_hint">Nouvelle liste</string>
+
+    <!-- Tags dropdown -->
+
+    <!-- =============================================== Task List Controls == -->
+
+    <!-- menu item for tags -->
+
+    <!-- ========================================================== Extras == -->
+
+    <!-- Context Item: show tag -->
+
+    <!-- slide 25a: Dialog: new list -->
+    <string name="tag_new_list">Nouvelle liste</string>
+
+    <!-- Dialog: list saved -->
+
+    <!-- Dialog: task created without title -->
+    <string name="tag_no_title_error">Veuillez d\'abord entrer un nom pour cette liste.</string>
+
+    <!-- ========================================================== Filters == -->
+
+    <!-- filter button to add tag -->
+    <string name="tag_FEx_add_new">Nouveau</string>
+
+    <!-- filter header for tags -->
+    <string name="tag_FEx_header">Listes</string>
+
+    <!-- filter header for tags user created -->
+
+    <!-- filter header for tags, shared with user -->
+
+    <!-- filter header for tags which have no active tasks -->
+
+    <!-- slide 10d: filter for untagged tasks -->
+    <string name="tag_FEx_untagged">Uncategorized</string>
+
+    <!-- slide 27a: %s => tag name -->
+
+    <!-- context menu option to rename a tag -->
+    <string name="tag_cm_rename">Renommer la liste</string>
+
+    <!-- context menu option to delete a tag -->
+    <string name="tag_cm_delete">Supprimer la liste</string>
+
+    <!-- context menu option to leave a shared list -->
+    <string name="tag_cm_leave">Quitter la liste</string>
+
+    <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
+    <string name="DLG_delete_this_tag_question">Supprimer cette liste : %s ? (Aucune tâche ne sera
+        supprimée.)
+    </string>
+
+    <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
+    <string name="DLG_leave_this_shared_tag_question">Quitter cette liste partagée : %s ? (Aucune
+        tâche ne sera supprimée.)
+    </string>
+
+    <!-- Dialog to rename tag -->
+    <string name="DLG_rename_this_tag_header">Renommer la liste %s en:</string>
+
+    <!-- Toast notification that no changes have been made -->
+    <string name="TEA_no_tags_modified">Aucun changement effectué</string>
+
+    <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_deleted">La liste %1$s a été supprimée, affectant %2$d tâches</string>
+
+    <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_left">Vous avez quitté la liste %1$s, affectant %2$d tâches</string>
+
+    <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
+    <string name="TEA_tags_renamed">%1$s renommé en %2$s pour %3$d tâches</string>
+
+    <!-- Tag case migration -->
+    <string name="tag_case_migration_notice">Nous avons remarqué que vous avez des listes ayant le
+        même nom avec des majuscules différentes. Nous pensons que vous parliez des même listes,
+        donc nous avons combiné les doublons. Mais ne vous inquiétez pas, les listes originelles ont
+        simplement été renommées avec des nombres (ex. Courses_1, Courses_2). Si vous ne le voulez
+        pas, vous pouvez juste supprimer la nouvelle liste combinée !
+    </string>
+
+    <!-- Header for tag settings -->
+    <string name="tag_settings_title">Settings:</string>
+
+    <!-- Header for tag activity -->
+    <string name="tag_updates_title">Activité : %s</string>
+
+    <!-- Delete button for tag settings -->
+    <string name="tag_delete_button">Supprimer la liste</string>
+
+    <!-- slide 28d: Leave button for tag settings -->
+    <string name="tag_leave_button">Quitter la liste</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in timers plug-in -->
-    
+
     <!-- Task List: Start Timer button -->
-    
+
     <!-- Task List: Stop Timer button -->
-    
+
     <!-- Android Notification Title (%s => # tasks) -->
     <string name="TPl_notification">Chronomètre actif pour %s !</string>
-    
+
     <!-- Filter Header for Timer plugin -->
-    
+
     <!-- Filter for Timed Tasks -->
     <string name="TFE_workingOn">Tâches chronométrées</string>
-    
+
     <!-- Title for TEA -->
     <string name="TEA_timer_controls">Timer</string>
-    
-    
+
+
     <!-- Edit Notes: create comment for when timer is started -->
     <string name="TEA_timer_comment_started">Cette tâche est commencée :</string>
-    
+
     <!-- Edit Notes: create comment for when timer is stopped -->
     <string name="TEA_timer_comment_stopped">Cette tâche a été arretée :</string>
-    
+
     <!-- Edit Notes: comment to notify how long was spent on task -->
     <string name="TEA_timer_comment_spent">Temps passé :</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Update string from activity codes %1$s - user, %2$s - target name, %3$s - message, %4$s - other_user-->
-    
+
     <!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
     Please do not translate this part of the string. -->
-    
+
     <!-- These are still in use -->
     <string name="update_string_default_comment">%1$s a commenté : %3$s</string>
     <string name="update_string_task_comment">%1$s on $link_task: %3$s</string>
     <string name="update_string_tag_comment">%1$s on %2$s: %3$s</string>
     <string name="update_string_user_self">Vous</string>
-    
+
     <string name="history_yourself">yourself</string>
     <string name="history_you">vous</string>
     <string name="history_a_deleted_user">(a deleted user)</string>
-    
+
     <string name="history_this_list">cette liste</string>
     <string name="history_this_task">cette tâche</string>
     <string name="history_tag_added">added %1$s to %2$s</string>
@@ -2979,9 +3304,12 @@
     <string name="history_favorited">favorited %s</string>
     <string name="history_unfavorited">unfavorited %s</string>
     <string name="history_changed_list_picture">change this list\'s picture</string>
-    <string name="history_added_description_characters">added %1$d characters to %2$s description</string>
+    <string name="history_added_description_characters">added %1$d characters to %2$s description
+    </string>
     <string name="history_removed_description">removed %s description</string>
-    <string name="history_removed_description_characters">removed %1$d characters from %2$s description</string>
+    <string name="history_removed_description_characters">removed %1$d characters from %2$s
+        description
+    </string>
     <string name="history_updated_description">updated %s description</string>
     <string name="history_changed_list_owner">changed list owner to %s</string>
     <string name="history_created_this_list">created this list</string>
@@ -3004,195 +3332,230 @@
     <string name="history_repeat_on">on %s</string>
     <string name="history_repeat_from_completion">after completion</string>
     <string name="history_acknowledged">viewed %s</string>
-    
-    <string name="history_default">changed %1$s to %2$s</string>
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-    
-  <!-- Voice Add Prompt Text -->
-  <string name="voice_create_prompt">Parlez pour créer une nouvelle tâche</string>
-  <string name="voice_edit_title_prompt">Parlez pour définir un titre</string>
-  <string name="voice_edit_note_prompt">Parlez pour définir les notes de la tâche</string>
-    
-  <!-- Preference: Task List recognition-service is not installed, but available -->
-  <string name="EPr_voiceInputInstall_dlg">La reconnaissance vocale n\'est pas installé.\nVoulez-vous l\'installer depuis le market ?</string>
-  <!-- Preference: Task List recognition-service is not available for this system -->
-  <string name="EPr_voiceInputUnavailable_dlg">Malheureusement, la reconnaissance vocale n\'est pas disponible pour votre système.\nSi possible, faites une mise à jour vers Android 2.1 ou ultérieur.</string>
-  <!-- Preference: Market is not available for this system -->
-  <string name="EPr_marketUnavailable_dlg">Malheureusement, le market n\'est pas accessible sur votre système.\nSi possible, essayez de télécharger le module de reconnaissance vocale depuis une autre source.</string>
-  <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
-  <string name="EPr_voiceInputEnabled_title">Entrée voix</string>
-  <!-- slide 38a: Preference: voice button description (true) -->
-  <string name="EPr_voiceInputEnabled_desc_enabled">Le bouton de la reconnaissance vocale sera affiché sur la page d\'accueil</string>
-  <!-- Preference: voice button description (false) -->
-  <string name="EPr_voiceInputEnabled_desc_disabled">Le bouton de la reconnaissance vocale ne sera pas affiché sur la page d\'accueil</string>
-  <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
-  <string name="EPr_voiceInputCreatesTask_title">Créer les tâches directement</string>
-  <!-- Preference: Task List Voice-creation description (true) -->
-  <string name="EPr_voiceInputCreatesTask_desc_enabled">Les tâches seront crées automatiquement à partir de la reconnaissance vocale</string>
-  <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
-  <string name="EPr_voiceInputCreatesTask_desc_disabled">Editer le titre de la tâche après la reconnaissance vocale</string>
-  <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
-  <string name="EPr_voiceRemindersEnabled_title">Rappels vocaux</string>
-  <!-- Preference: Voice reminders description (true) -->
-  <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid donnera le nom de la tâche</string>
-  <!-- slide 38c: Preference: Voice reminders description (false) -->
-  <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid sonnera pendant les rappels</string>    
-  
-  <!-- slide 32d: Preference Category: Voice Title -->
-  <string name="EPr_voice_header">Paramètres de l\'entrée voix</string>
-    
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-  
-  <!-- slide 30a-->
-  <string name="welcome_setting">Regarder le didactitiel</string>
-  
-  <string name="welcome_title_1">Bienvenue dans Astrid !</string>
-
-  <!-- slide 2a -->
-  <string name="welcome_title_2">Créez des listes</string>
-
-  <!-- slide 3a-->
-  <string name="welcome_title_3">Changer de liste</string>
-
-  <!-- slide 4a -->
-  <string name="welcome_title_4">Partagez des listes</string>
-
-  <!-- slide 5a -->
-  <string name="welcome_title_5">Divisez les tâches</string>
-
-  <!-- slide 6a -->
-  <string name="welcome_title_6">Apportez des détails</string>
 
-  <!-- slide 7a -->
-  <string name="welcome_title_7">Connectez vous maintenant\npour commencer</string>
-  
-  <string name="welcome_title_7_return">C\'est tout</string>
-  
-  <!-- slide 1b -->
-  <string name="welcome_body_1">Le gestionnaire de tâche personnel parfait\nqui marche bien avec les amis</string>
-
-  <!-- slide 2b-->
-  <string name="welcome_body_2">Parfait pour tous les types de listes :\nLisez, regardez, achetez, visitez !</string>
-
-  <!-- slide 3b -->
-  <string name="welcome_body_3">Appuyez sur le titre de la liste\npour voir toutes vos listes</string>
-
-  <!-- slide 4b -->
-  <string name="welcome_body_4">Partagez les listes avec\ndes amis, colocataires,\nou votre chéri(e) !</string>
-
-  <!-- slide 5b -->
-  <string name="welcome_body_5">and much more!</string>
+    <string name="history_default">changed %1$s to %2$s</string>
 
-  <!-- slide 6b-->
-  <string name="welcome_body_6">Appuyez pour ajouter des notes,\nmettre des rappels,\net bien plus !</string>
-  <string name="welcome_body_7">Identifiant</string>
-  
-  <string name="welcome_body_7_return">Appuyez sur Astrid pour revenir.</string>
-  
-  <!-- slide 1c -->
-  <string name="welcome_next">Suivant</string>
-  
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Voice Add Prompt Text -->
+    <string name="voice_create_prompt">Parlez pour créer une nouvelle tâche</string>
+    <string name="voice_edit_title_prompt">Parlez pour définir un titre</string>
+    <string name="voice_edit_note_prompt">Parlez pour définir les notes de la tâche</string>
+
+    <!-- Preference: Task List recognition-service is not installed, but available -->
+    <string name="EPr_voiceInputInstall_dlg">La reconnaissance vocale n\'est pas
+        installé.\nVoulez-vous l\'installer depuis le market ?
+    </string>
+    <!-- Preference: Task List recognition-service is not available for this system -->
+    <string name="EPr_voiceInputUnavailable_dlg">Malheureusement, la reconnaissance vocale n\'est
+        pas disponible pour votre système.\nSi possible, faites une mise à jour vers Android 2.1 ou
+        ultérieur.
+    </string>
+    <!-- Preference: Market is not available for this system -->
+    <string name="EPr_marketUnavailable_dlg">Malheureusement, le market n\'est pas accessible sur
+        votre système.\nSi possible, essayez de télécharger le module de reconnaissance vocale
+        depuis une autre source.
+    </string>
+    <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
+    <string name="EPr_voiceInputEnabled_title">Entrée voix</string>
+    <!-- slide 38a: Preference: voice button description (true) -->
+    <string name="EPr_voiceInputEnabled_desc_enabled">Le bouton de la reconnaissance vocale sera
+        affiché sur la page d\'accueil
+    </string>
+    <!-- Preference: voice button description (false) -->
+    <string name="EPr_voiceInputEnabled_desc_disabled">Le bouton de la reconnaissance vocale ne sera
+        pas affiché sur la page d\'accueil
+    </string>
+    <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
+    <string name="EPr_voiceInputCreatesTask_title">Créer les tâches directement</string>
+    <!-- Preference: Task List Voice-creation description (true) -->
+    <string name="EPr_voiceInputCreatesTask_desc_enabled">Les tâches seront crées automatiquement à
+        partir de la reconnaissance vocale
+    </string>
+    <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
+    <string name="EPr_voiceInputCreatesTask_desc_disabled">Editer le titre de la tâche après la
+        reconnaissance vocale
+    </string>
+    <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
+    <string name="EPr_voiceRemindersEnabled_title">Rappels vocaux</string>
+    <!-- Preference: Voice reminders description (true) -->
+    <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid donnera le nom de la tâche</string>
+    <!-- slide 38c: Preference: Voice reminders description (false) -->
+    <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid sonnera pendant les rappels
+    </string>
+
+    <!-- slide 32d: Preference Category: Voice Title -->
+    <string name="EPr_voice_header">Paramètres de l\'entrée voix</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 30a-->
+    <string name="welcome_setting">Regarder le didactitiel</string>
+
+    <string name="welcome_title_1">Bienvenue dans Astrid !</string>
+
+    <!-- slide 2a -->
+    <string name="welcome_title_2">Créez des listes</string>
+
+    <!-- slide 3a-->
+    <string name="welcome_title_3">Changer de liste</string>
+
+    <!-- slide 4a -->
+    <string name="welcome_title_4">Partagez des listes</string>
+
+    <!-- slide 5a -->
+    <string name="welcome_title_5">Divisez les tâches</string>
+
+    <!-- slide 6a -->
+    <string name="welcome_title_6">Apportez des détails</string>
+
+    <!-- slide 7a -->
+    <string name="welcome_title_7">Connectez vous maintenant\npour commencer</string>
+
+    <string name="welcome_title_7_return">C\'est tout</string>
+
+    <!-- slide 1b -->
+    <string name="welcome_body_1">Le gestionnaire de tâche personnel parfait\nqui marche bien avec
+        les amis
+    </string>
+
+    <!-- slide 2b-->
+    <string name="welcome_body_2">Parfait pour tous les types de listes :\nLisez, regardez, achetez,
+        visitez !
+    </string>
+
+    <!-- slide 3b -->
+    <string name="welcome_body_3">Appuyez sur le titre de la liste\npour voir toutes vos listes
+    </string>
+
+    <!-- slide 4b -->
+    <string name="welcome_body_4">Partagez les listes avec\ndes amis, colocataires,\nou votre
+        chéri(e) !
+    </string>
+
+    <!-- slide 5b -->
+    <string name="welcome_body_5">and much more!</string>
+
+    <!-- slide 6b-->
+    <string name="welcome_body_6">Appuyez pour ajouter des notes,\nmettre des rappels,\net bien plus
+        !
+    </string>
+    <string name="welcome_body_7">Identifiant</string>
+
+    <string name="welcome_body_7_return">Appuyez sur Astrid pour revenir.</string>
+
+    <!-- slide 1c -->
+    <string name="welcome_next">Suivant</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <string name="widget_mini">- Astrid Mini -</string>
-    
+
     <!-- Resources for power pack widget -->
-    
+
     <string name="PPW_widget_42_label">Old Astrid 4x2</string>
     <string name="PPW_widget_43_label">Old Astrid 4x3</string>
     <string name="PPW_widget_44_label">Old Astrid 4x4</string>
     <string name="PPW_widget_v11_label">- Astrid -</string>
     <string name="PPW_widget_custom_label">Lanceur personnalisé Astrid Premium</string>
     <string name="PPW_widget_custom_launcherpro_label">Lanceur Pro Astrid Premium</string>
-    
+
     <string name="PPW_configure_title">Configurer le widget</string>
-    
+
     <string name="PPW_color">Couleur du widget</string>
     <string name="PPW_enable_calendar">Afficher les évènements de calendrier</string>
     <string name="PPW_disable_encouragements">Masquer les encouragements</string>
     <string name="PPW_show_dates">Voir les échéances</string>
     <string name="PPW_filter">Sélectionner un filtre</string>
-    
+
     <string name="PPW_due">Échéance :</string>
     <string name="PPW_past_due">Échéance passée :</string>
-    
-    <string name="PPW_old_astrid_notice">Vous avez besoin d\'au moins la version 3.6 d\'Astrid pour utiliser ce widget. Désolée !</string>
-    
+
+    <string name="PPW_old_astrid_notice">Vous avez besoin d\'au moins la version 3.6 d\'Astrid pour
+        utiliser ce widget. Désolée !
+    </string>
+
     <string-array name="PPW_encouragements">
         <!-- general encouragements -->
-    	<item>Salut là-dedans !</item>
-    	<item>Le temps de finir quelque chose ?</item>
-    	<item>Mon dieu, tu es non chalant aujourd\'hui !</item>
-    	<item>Fais quelque chose de grand aujourd\'hui !</item>
-    	<item>Rends-moi fier de toi aujourd\'hui !</item>
-    	<item>Comment vas-tu aujourd\'hui ?</item>
+        <item>Salut là-dedans !</item>
+        <item>Le temps de finir quelque chose ?</item>
+        <item>Mon dieu, tu es non chalant aujourd\'hui !</item>
+        <item>Fais quelque chose de grand aujourd\'hui !</item>
+        <item>Rends-moi fier de toi aujourd\'hui !</item>
+        <item>Comment vas-tu aujourd\'hui ?</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_tod">
         <!-- encouragements based on time of day -->
-    	<item>Bon matin !</item>
-    	<item>Bonne après-midi !</item>
-    	<item>Bonne soirée !</item>
-    	<item>Longue nuit ?</item>
-    	<item>Il est tôt, fais donc quelque chose !</item>
-    	<item>Une pause thé peut être ?</item>
-    	<item>Profites bien de ton après-midi !</item>
-    	<item>Le sommeil est bon pour toi, tu sais !</item>
+        <item>Bon matin !</item>
+        <item>Bonne après-midi !</item>
+        <item>Bonne soirée !</item>
+        <item>Longue nuit ?</item>
+        <item>Il est tôt, fais donc quelque chose !</item>
+        <item>Une pause thé peut être ?</item>
+        <item>Profites bien de ton après-midi !</item>
+        <item>Le sommeil est bon pour toi, tu sais !</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_completed">
         <!-- encouragements based on tasks completed (%d => completed) -->
-    	<item>Tu as déjà complété %d tâches !</item>
-    	<item>Score dans la vie : %d tâches accomplies</item>
-    	<item>Souris ! Tu as déjà terminé %d tâches !</item>
+        <item>Tu as déjà complété %d tâches !</item>
+        <item>Score dans la vie : %d tâches accomplies</item>
+        <item>Souris ! Tu as déjà terminé %d tâches !</item>
     </string-array>
-  	<string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet! Shall we?</string>
-        
+    <string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet!
+        Shall we?
+    </string>
+
     <string-array name="PPW_colors">
         <item>Noir</item>
         <item>Blanc</item>
         <item>Bleu</item>
         <item>Translucide</item>
     </string-array>
-    
-    <string name="PPW_widget_dlg_text">Ce widget n\'est disponible qu\'aux possesseurs du PowerPack!</string>
+
+    <string name="PPW_widget_dlg_text">Ce widget n\'est disponible qu\'aux possesseurs du
+        PowerPack!
+    </string>
     <string name="PPW_widget_dlg_ok">Aperçu</string>
-    
+
     <string name="PPW_demo_title1">Les objets de %s iront ici</string>
     <string name="PPW_demo_title2">Le PowerPack contient des widgets Premium...</string>
     <string name="PPW_demo_title3">...ajout de voix et bonnes vibrations !</string>
     <string name="PPW_demo_title4">Appuyez pour en savoir plus</string>
-    
+
     <string name="PPW_info_title">Power Pack gratuit!</string>
     <string name="PPW_info_signin">Connexion</string>
     <string name="PPW_info_later">Plus tard</string>
-    <string name="PPW_unlock_howto">Partagez vos listes avec des amis! Débloquez le Power Pack gratuitement quand trois amis auront rejoint Astrid.</string>
+    <string name="PPW_unlock_howto">Partagez vos listes avec des amis! Débloquez le Power Pack
+        gratuitement quand trois amis auront rejoint Astrid.
+    </string>
     <string name="PPW_check_button">Obtenez le Power Pack gratuitement!</string>
     <string name="PPW_check_share_lists">Partagez les listes !</string>
-    <string name="PPW_api_level">Désolé, ce gadget nécessite Android 3.0 ou plus pour fonctionner.</string>
-    
+    <string name="PPW_api_level">Désolé, ce gadget nécessite Android 3.0 ou plus pour fonctionner.
+    </string>
+
     <string name="EPr_widget_enabled_title">Activer/Désactiver les gadgets</string>
-    <string name="PPW_restart_for_enabled_state">Il est possible qu\'un redémarrage de votre téléphone soit nécessaire pour prendre en compte ce changement.</string>
+    <string name="PPW_restart_for_enabled_state">Il est possible qu\'un redémarrage de votre
+        téléphone soit nécessaire pour prendre en compte ce changement.
+    </string>
 
 </resources>
diff --git a/astrid/res/values-it/strings.xml b/astrid/res/values-it/strings.xml
index 570268a39..587defcc3 100755
--- a/astrid/res/values-it/strings.xml
+++ b/astrid/res/values-it/strings.xml
@@ -4,1688 +4,1850 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ================================================== general terms == -->
-
-  <!-- People Editing Activity -->    
-  
-  <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
-  <string name="actfm_person_hint">Contatto o Email</string>
-  
-  <!-- task sharing dialog: shared with hint -->
-  <string name="actfm_person_or_tag_hint">Contatto o Lista condivisa</string>
-
-  <!-- toast on transmit success -->
-
-  <!-- can\'t rename or delete shared tag message -->
-  
-  <!-- warning before deleting a list you\'re the owner of -->
-  <string name="actfm_tag_operation_owner_delete">Sei il proprietario di questa lista condivisa! Se la elimini verrà eliminata da tutti i membri della lista. Sei sicuro di voler continuare?</string>
-
-  <!-- slide 29a: menu item to take a picture -->
-  <string name="actfm_picture_camera">Scatta una foto</string>
-
-  <!-- slide 29b: menu item to select from gallery -->
-  <string name="actfm_picture_gallery">Scegli dalla Galleria</string>
-  
-  <!-- menu item to clear picture selection -->
-  <string name="actfm_picture_clear">Deseleziona Immagine</string>
-
-  <!-- filter list activity: refresh tags -->
-  
-  <!-- Title for prompt after sharing a task -->
-  <string name="actfm_view_task_title">Mostra l\'attività?</string>
-
-  <!-- Text for prompt after sharing a task -->
-  <string name="actfm_view_task_text">Attività inviata a %s! Adesso stai vedendo le tue attività . Vuoi vedere anche quelle che hai assegnato?</string>
-  
-  <!-- Ok button for task view prompt -->
-  <string name="actfm_view_task_ok">Vedi Assegnate</string>
-      
-  <!-- Cancel button for task view prompt -->
-  <string name="actfm_view_task_cancel">Resta quì</string>
-  
-  <!-- slide 13a: Title for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_title">Le mie attività condivise</string>
-  
-  <!-- Empty list for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_empty">Nessuna attività condivisa</string>
-  
-  <!-- =====================  Friendship connections -->
-  
-  <string name="actfm_friendship_pending">Hai inviato una richiesta di amicizia a %s!</string>
-
-  <string name="actfm_friendship_blocked">Hai bloccato %s.</string>
-
-  <string name="actfm_friendship_ignored">You\'ve ignored %s.</string>
-  
-  <string name="actfm_friendship_friends">Hai stretto amicizia con %s! Aggiungi attività per loro qui sotto. </string>
-
-  <string name="actfm_friendship_other_pending">%s vorrebbe diventare tuo amico!</string>
-
-  <string name="actfm_friendship_no_status">Collegati a %s per condividere le attività e vedere quelle pubbliche!</string>
-
-  <string name="actfm_friendship_connect">Aggiungi amico</string>
-
-  <string name="actfm_friendship_accept">Accetta</string>
-
-  <!-- ================================================== TagViewActivity == -->  
-
-  <!-- Tag View Activity: Add Comment hint -->    
-  <string name="TVA_add_comment">Aggiungi un commento...</string>
-
-  <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->    
-  
-  <!-- Tabs for Tag view -->
-  <string-array name="TVA_tabs">
-    <!-- Tab for showing tasks -->
-    <item>Attività</item>
-    <!-- Tab for showing comments & updates -->
-    <item>attività</item>
-    <!-- Tab for showing setting -->
-    <item>Impostazioni Lista</item>
-  </string-array>
-  
-  <!-- Tag View: filtered by assigned to user (%s => user name) -->
-  <string name="actfm_TVA_filtered_by_assign">Attività di %s. Tocca per vederle tutte.</string>
-  
-  <!-- Tag View: filter by unassigned tasks -->
-  <string name="actfm_TVA_filter_by_unassigned">Attività non assegnate. Tocca per vederle tutte.</string>
-
-  <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Privata: tocca per modificare o condividere la lista</string>
-
-  <!-- Tag View Menu: refresh -->
-  <string name="actfm_TVA_menu_refresh">Aggiorna</string>
-
-  <!-- Tag Settings: tag name label -->
-  <string name="actfm_TVA_tag_label">Lista</string>
-
-  <!-- Tag Settings: tag owner label -->
-
-  <!-- Tag Settings: tag owner value when there is no owner -->
-
-  <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
-  <string name="actfm_TVA_members_label">Condivisa Con</string>
-  
-  <!-- Tag Settings: list collaborators hint -->
-  <string name="actfm_TVA_members_hint">Condividi con chiunque abbia un indirizzo email</string>
-
-  <!-- Tag Settings: tag picture -->
-  <string name="actfm_TVA_tag_picture">Elenco Immagini</string>
-
-  <!-- slide 25c/28b: Tag Settings: silence notifications label -->
-  <string name="actfm_TVA_silence_label">Notifiche Silenziose</string>
-  
-  <!-- Tag Settings: list icon label -->
-  
-  <!-- slide 25b/27d: Tag Settings: list description label -->
-  <string name="actfm_TVA_tag_description_label">Descrizione</string>
-  
-  <!-- slide 28a: Tag Settings: list settings label -->
-  <string name="actfm_TVA_tag_settings_label">Impostazioni</string>
-
-  <!-- slide 25b: Tag Settings: list description hint -->
-  <string name="actfm_TVA_tag_description_hint">Digita qui una descrizione</string>
-  
-  <!-- slide 25d: Tag Settings: list name hint -->
-  <string name="actfm_TVA_tag_name_hint">Inserisci il nome della lista</string>
-  
-  <!-- Tag settings: login prompt from share-->
-  <string name="actfm_TVA_login_to_share">Devi essere collegato ad Astrid.com per condividere le liste! Per favore effettua l\'accesso o rendi questa lista privata.</string>
-  
-      
-  <!-- ============================================ edit people dialog == -->
-
-  <!-- task sharing dialog: intro -->
-  <string name="actfm_EPA_intro">Usa Astrid per condividere liste della spesa, piani per una festa o progetti di gruppo e vedi subito quando qualcuno porta a termine il compito!</string>
-    
-  <!-- task sharing dialog: window title -->
-    
-  <!-- task sharing dialog: save button -->
-  
-  <!-- task sharing dialog: assigned label -->
-  
-  <!-- slide 18a: task sharing dialog: assigned label long version -->
-  <string name="actfm_EPA_assign_label_long">Chi dovrebbe farlo?</string>
-  
-  <!-- task sharing dialog: assigned to me -->
-  <string name="actfm_EPA_assign_me">Io</string>
-  
-  <!-- task sharing dialog: anyone -->
-  <string name="actfm_EPA_unassigned">Non assegnato</string>
-  
-  <!-- slide 18c: task sharing dialog: choose a contact -->
-  <string name="actfm_EPA_choose_contact">Scegli un contatto</string>
-  
-  <!-- task sharing dialog: custom email assignment -->
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_share_with">Condividi con:</string>
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_collaborators_header">Condividi</string>
-
-      <!-- task sharing dialog: collaborator list name (%s => name of list) -->
-  <string name="actfm_EPA_list">Lista: %s</string>
-  
-  <!-- task sharing dialog: assigned hint -->
-  
-  <!-- task sharing dialog: message label text -->
-  <string name="actfm_EPA_message_text">Messaggio di invito</string>
-  
-  <!-- task sharing dialog: message body -->
-  <string name="actfm_EPA_message_body">Aiutami a finirlo!</string>
-  
-  <!-- task sharing dialog: list members section header -->
-  <string name="actfm_EPA_assign_header_members">Membri della Lista</string>
-
-  <!-- task sharing dialog: astrid friends section header -->
-  <string name="actfm_EPA_assign_header_friends">Amici in Astrid</string>
-
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: share with Facebook -->
-  <string name="actfm_EPA_facebook">Facebook</string>
-  
-  <!-- task sharing dialog: share with Twitter -->
-  <string name="actfm_EPA_twitter">Twitter</string>
-
-  <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
-
-  <!-- task sharing dialog: edit people settings saved -->
-
-  <!-- task sharing dialog: invalid email (%s => email) -->
-  <string name="actfm_EPA_invalid_email">E-mail non valida: %s</string>
-
-  <!-- task sharing dialog: tag not found (%s => tag) -->
-  
-  <!-- task sharing login prompt -->
-  <string name="actfm_EPA_login_to_share">Devi essere loggato in Astrid.com per condividere attività!</string>
-  
-  <string name="actfm_EPA_login_button">Accedi</string>
-  
-  <string name="actfm_EPA_dont_share_button">Non condividere</string>
-  
-  <string name="actfm_EPA_add_person_to_list_title">Attività assegnata</string>
-  
-  <string name="actfm_EPA_add_person_to_list">%1$s non è condiviso in questa lista. Vuoi aggiungere %2$s a questa lista?</string>
-
-  <string name="actfm_EPA_add_person_to_list_ok">Aggiungi alla lista</string>
-  
-  <string name="actfm_EPA_add_person_to_list_cancel">Non aggiungere</string>
-  
-  <string name="actfm_list_owner">(owner)</string>
-  
-  <!-- ========================================= sharing login activity == -->
-
-  <!-- share login: Title -->
-  <string name="actfm_ALA_title">Benvenuto in Astrid.com!</string>
-
-  <!-- share login: Sharing Description -->
-  <string name="actfm_ALA_body">Con Astrid.com puoi accedere alle tue attività online,
-condividerle e delegarle ad altri.</string>
-
-  <!-- share login: Sharing Login FB Prompt -->
-  <string name="actfm_ALA_fb_login">Connetti con Facebook</string>
-
-  <!-- share login: Sharing Login GG Prompt -->
-  <string name="actfm_ALA_gg_login">Connetti con Google</string>
-  
-  <!-- share login: Quickly log in as <%s -> email> -->
-  <string name="actfm_quick_login">Accedi: %s</string>
-
-  <!-- share login: Reject quick login -->
-  <string name="actfm_quick_login_reject">Non sei %s?</string>
-
-  <!-- share login: Name -->
-  <string name="actfm_ALA_firstname_label">Nome</string>
-  
-  <!-- share login: Name -->
-  <string name="actfm_ALA_lastname_label">Cognome</string>
-
-  <!-- share login: Email -->
-  <string name="actfm_ALA_email_label">Email</string>
-
-  <!-- share login: Username / Email -->
-
-  <!-- share login: Password -->
-  <string name="actfm_ALA_password_label">Password</string>
-
-  <!-- share login: Sign Up Title -->
-  <string name="actfm_ALA_signup_title">Registrati</string>
-
-  <!-- share login: Login Title -->
-  <string name="actfm_ALA_login_title">Accedi</string>
-
-  <!-- share login: Google Auth title -->
-  <string name="actfm_GAA_title">Seleziona l\'account Google che vuoi utilizzare:</string>
-
-  <!-- share login: OAUTH Login Prompt -->
-  <string name="actfm_OLA_prompt">Accedi per favore:</string>
-  
-  <!-- Login error: user exists -->
-  <string name="actfm_ALA_error_user_exists">L\'utente esiste già. Accedi per favore.</string>
-  
-  <!-- Login error: wrong password -->
-  <string name="actfm_ALA_error_wrong_password">Spiacente, questa password non è corretta. Prova ancora.</string>
-  
-  <!-- Forgot password link -->
-  <string name="actfm_ALA_forgot_password">Password dimenticata?</string>
-  
-  <!-- Forgot password email prompt -->
-  <string name="actfm_ALA_enter_email">Inserisci la tua email per favore</string>
-  
-  <!-- Password reset sent (%s -> email) -->
-  <string name="actfm_ALA_reset_sent">Link per reimpostare la password inviato a \'%s\'</string>
-  
-  <!-- User already exists - first sync may be slow -->
-  <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your patience!</string>
-  
-  <!-- User not found -->
-  <string name="actfm_ALA_error_user_not_found">Nessun utente corrisponde a questa email. In alternativa effettuate il login.</string>
-  
-  <!-- ================================================ Featured Lists -->
-
-  <string name="actfm_feat_list_clone">Copia lista</string>
-  
-  <string name="actfm_feat_list_suffix">(Copia)</string>
-
-  <string name="actfm_feat_list_cloning">Copia...</string>
-
-  <string name="actfm_feat_list_clone_success">Operazione riuscita!</string>
-
-  <string name="actfm_feat_list_task_clone_success">Compito copiato</string>
-
-  <string name="actfm_feat_list_clone_empty">Nessun compito da copiare</string>
-  
-  <!-- ================================================ Synchronization == -->
-      
-  <!-- Indicates the logged in user name. %s -> user\'s name -->
-  <string name="actfm_status_title_logged_in">Stato: Loggato come %s</string>    
-      
-  <!-- Preferences Title: Act.fm -->    
-  <string name="actfm_APr_header">Astrid.com</string>
-  
-  <string name="actfm_https_title">Utilizza HTTPS</string>
-  <string name="actfm_https_enabled">HTTPS abilitato (più lento)</string>
-  <string name="actfm_https_disabled">HTTPS disabilitato (più veloce)</string>
-
-  <!-- title for notification tray after synchronizing -->
-  
-  <!-- text for notification when comments are received -->
-    
-  <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, 
-      Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page,
-      or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.  
-      Are you sure you want to sync with Astrid.com?</string>
-      
-  <!-- account types -->
-  <string name="actfm_account_type">Tipo di account</string>
-  <string name="actfm_account_info">Informazioni sull\'account</string>
-  <string name="actfm_account_info_summary">Stato e opzioni</string>
-  <string name="account_type_title_not_logged_in">Registrati un account gratuito</string>
-  <string name="account_type_summary_not_logged_in">Accedi ai compiti online, condividi le liste e delega</string>
-  
-  
-  <string name="actfm_account_premium">Premium</string>
-  <string name="actfm_account_basic">Base</string>
-  
-  <string name="actfm_inapp_billing">Aggiorna al Premium</string>
-  <string name="actfm_inapp_billing_summary">Allega files, archivio registrazioni vocali, supporto premium &amp; altro</string>
-  
-  <!-- Sharing -->
-  <string name="share_with_facebook">Mi piace su Facebook</string>
-  <string name="share_with_twitter">Seguici su Twitter</string>
-  <string name="share_with_google">Condividi su Google+</string>
-  <string name="share_speech_bubble">Condividendo aiuti gli altri ad essere più produttivi!</string>
-  
-  
-  <!-- Sync upgrade messages -->
-  <string name="sync_upgr_both_title">Usare Astrid.com + Google senza duplicati</string>
-  <string name="sync_upgr_both_body">Siamo onesti. Google Tasks è utile, ma non fico come Astrid. Per non avere più duplicati, non è più possibile sincronizzare Astrid.com e Google Tasks contemporaneamente nei due sensi. Puoi ancora importare le attività di Google Tasks da Impostazioni → Backup &amp; Sync, o tornare indietro alla sola sincronizzazione con Google Tasks.</string>
-  <string name="sync_upgr_both_btn1">Stick with Astrid</string>
-  <string name="sync_upgr_both_btn2">Downgrade to Google Tasks</string>
-  
-  <string name="sync_upgr_gtasks_only_title">Upgrade to Astrid Sync for Free!</string>
-  <string name="sync_upgr_gtasks_only_body">Access your tasks from all your devices and from Gmail with Astrid.com sync. Upgrade to Astrid.com Sync (you can always go back to Google Tasks - but you won\'t want to)!</string>
-  <string name="sync_upgr_gtasks_only_btn1">Upgrade to Astrid Sync</string>
-  <string name="sync_upgr_gtasks_only_btn2">Stick with Google Tasks</string>
-  
-  <string name="sync_upgr_neither_title">Free backup &amp; Sync!</string>
-  <string name="sync_upgr_neither_body">Don\'t put your to-dos at risk! New and improved Astrid sync to keep and access your tasks from anywhere.</string>
-  <string name="sync_upgr_neither_btn1">Registrati ora</string>
-  
-  <string name="sync_upgr_logged_out">You have been logged out of Astrid</string>
-  
-  <string name="actfm_logout_clear_tasks_title">Clear data?</string>
-  <string name="actfm_logout_clear_tasks_body">Would you like to clear your tasks and lists?</string>
-  <string name="actfm_logout_clear_tasks_yes">Clear data</string>
-  <string name="actfm_logout_clear_tasks_no">Keep data</string>
-  
-  <string name="actfm_logged_in_different_user_title">Logging in as different user</string>
-  <string name="actfm_logged_in_different_user_body">Would you like to delete existing phone tasks before syncing?</string>
-  <string name="actfm_logged_in_different_user_keep_data">Keep data</string>
-  <string name="actfm_logged_in_different_user_clear_data">Clear all data</string>
-  <string name="actfm_logged_in_different_user_processing">Processing existing data...</string>
-  
-  <string name="actfm_tag_not_authorized_title">Not authorized</string>
-  <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name?</string>
-  <string name="actfm_tag_not_authorized_new_list">Crea nuova lista</string>
-  <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
-  
-  <string name="actfm_sync_ongoing">Sincronizzazione in corso...</string>
-  
-  <string name="EPr_reset_sync_state">Reset sync</string>
-  <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors</string>
-  <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue?</string>
-  
+<resources>
 
+    <!-- ================================================== general terms == -->
 
+    <!-- People Editing Activity -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
+    <string name="actfm_person_hint">Contatto o Email</string>
+
+    <!-- task sharing dialog: shared with hint -->
+    <string name="actfm_person_or_tag_hint">Contatto o Lista condivisa</string>
+
+    <!-- toast on transmit success -->
+
+    <!-- can\'t rename or delete shared tag message -->
+
+    <!-- warning before deleting a list you\'re the owner of -->
+    <string name="actfm_tag_operation_owner_delete">Sei il proprietario di questa lista condivisa!
+        Se la elimini verrà eliminata da tutti i membri della lista. Sei sicuro di voler continuare?
+    </string>
+
+    <!-- slide 29a: menu item to take a picture -->
+    <string name="actfm_picture_camera">Scatta una foto</string>
+
+    <!-- slide 29b: menu item to select from gallery -->
+    <string name="actfm_picture_gallery">Scegli dalla Galleria</string>
+
+    <!-- menu item to clear picture selection -->
+    <string name="actfm_picture_clear">Deseleziona Immagine</string>
+
+    <!-- filter list activity: refresh tags -->
+
+    <!-- Title for prompt after sharing a task -->
+    <string name="actfm_view_task_title">Mostra l\'attività?</string>
+
+    <!-- Text for prompt after sharing a task -->
+    <string name="actfm_view_task_text">Attività inviata a %s! Adesso stai vedendo le tue attività .
+        Vuoi vedere anche quelle che hai assegnato?
+    </string>
+
+    <!-- Ok button for task view prompt -->
+    <string name="actfm_view_task_ok">Vedi Assegnate</string>
+
+    <!-- Cancel button for task view prompt -->
+    <string name="actfm_view_task_cancel">Resta quì</string>
+
+    <!-- slide 13a: Title for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_title">Le mie attività condivise</string>
+
+    <!-- Empty list for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_empty">Nessuna attività condivisa</string>
+
+    <!-- =====================  Friendship connections -->
+
+    <string name="actfm_friendship_pending">Hai inviato una richiesta di amicizia a %s!</string>
+
+    <string name="actfm_friendship_blocked">Hai bloccato %s.</string>
+
+    <string name="actfm_friendship_ignored">You\'ve ignored %s.</string>
+
+    <string name="actfm_friendship_friends">Hai stretto amicizia con %s! Aggiungi attività per loro
+        qui sotto.
+    </string>
+
+    <string name="actfm_friendship_other_pending">%s vorrebbe diventare tuo amico!</string>
+
+    <string name="actfm_friendship_no_status">Collegati a %s per condividere le attività e vedere
+        quelle pubbliche!
+    </string>
+
+    <string name="actfm_friendship_connect">Aggiungi amico</string>
+
+    <string name="actfm_friendship_accept">Accetta</string>
+
+    <!-- ================================================== TagViewActivity == -->
+
+    <!-- Tag View Activity: Add Comment hint -->
+    <string name="TVA_add_comment">Aggiungi un commento...</string>
+
+    <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->
+
+    <!-- Tabs for Tag view -->
+    <string-array name="TVA_tabs">
+        <!-- Tab for showing tasks -->
+        <item>Attività</item>
+        <!-- Tab for showing comments & updates -->
+        <item>attività</item>
+        <!-- Tab for showing setting -->
+        <item>Impostazioni Lista</item>
+    </string-array>
+
+    <!-- Tag View: filtered by assigned to user (%s => user name) -->
+    <string name="actfm_TVA_filtered_by_assign">Attività di %s. Tocca per vederle tutte.</string>
+
+    <!-- Tag View: filter by unassigned tasks -->
+    <string name="actfm_TVA_filter_by_unassigned">Attività non assegnate. Tocca per vederle tutte.
+    </string>
+
+    <!-- Tag View: list is private, no members -->
+    <string name="actfm_TVA_no_members_alert">Privata: tocca per modificare o condividere la lista
+    </string>
+
+    <!-- Tag View Menu: refresh -->
+    <string name="actfm_TVA_menu_refresh">Aggiorna</string>
+
+    <!-- Tag Settings: tag name label -->
+    <string name="actfm_TVA_tag_label">Lista</string>
+
+    <!-- Tag Settings: tag owner label -->
+
+    <!-- Tag Settings: tag owner value when there is no owner -->
+
+    <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
+    <string name="actfm_TVA_members_label">Condivisa Con</string>
+
+    <!-- Tag Settings: list collaborators hint -->
+    <string name="actfm_TVA_members_hint">Condividi con chiunque abbia un indirizzo email</string>
+
+    <!-- Tag Settings: tag picture -->
+    <string name="actfm_TVA_tag_picture">Elenco Immagini</string>
+
+    <!-- slide 25c/28b: Tag Settings: silence notifications label -->
+    <string name="actfm_TVA_silence_label">Notifiche Silenziose</string>
+
+    <!-- Tag Settings: list icon label -->
+
+    <!-- slide 25b/27d: Tag Settings: list description label -->
+    <string name="actfm_TVA_tag_description_label">Descrizione</string>
+
+    <!-- slide 28a: Tag Settings: list settings label -->
+    <string name="actfm_TVA_tag_settings_label">Impostazioni</string>
+
+    <!-- slide 25b: Tag Settings: list description hint -->
+    <string name="actfm_TVA_tag_description_hint">Digita qui una descrizione</string>
+
+    <!-- slide 25d: Tag Settings: list name hint -->
+    <string name="actfm_TVA_tag_name_hint">Inserisci il nome della lista</string>
+
+    <!-- Tag settings: login prompt from share-->
+    <string name="actfm_TVA_login_to_share">Devi essere collegato ad Astrid.com per condividere le
+        liste! Per favore effettua l\'accesso o rendi questa lista privata.
+    </string>
+
+
+    <!-- ============================================ edit people dialog == -->
+
+    <!-- task sharing dialog: intro -->
+    <string name="actfm_EPA_intro">Usa Astrid per condividere liste della spesa, piani per una festa
+        o progetti di gruppo e vedi subito quando qualcuno porta a termine il compito!
+    </string>
+
+    <!-- task sharing dialog: window title -->
+
+    <!-- task sharing dialog: save button -->
+
+    <!-- task sharing dialog: assigned label -->
+
+    <!-- slide 18a: task sharing dialog: assigned label long version -->
+    <string name="actfm_EPA_assign_label_long">Chi dovrebbe farlo?</string>
+
+    <!-- task sharing dialog: assigned to me -->
+    <string name="actfm_EPA_assign_me">Io</string>
+
+    <!-- task sharing dialog: anyone -->
+    <string name="actfm_EPA_unassigned">Non assegnato</string>
+
+    <!-- slide 18c: task sharing dialog: choose a contact -->
+    <string name="actfm_EPA_choose_contact">Scegli un contatto</string>
+
+    <!-- task sharing dialog: custom email assignment -->
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_share_with">Condividi con:</string>
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_collaborators_header">Condividi</string>
+
+    <!-- task sharing dialog: collaborator list name (%s => name of list) -->
+    <string name="actfm_EPA_list">Lista: %s</string>
+
+    <!-- task sharing dialog: assigned hint -->
+
+    <!-- task sharing dialog: message label text -->
+    <string name="actfm_EPA_message_text">Messaggio di invito</string>
+
+    <!-- task sharing dialog: message body -->
+    <string name="actfm_EPA_message_body">Aiutami a finirlo!</string>
+
+    <!-- task sharing dialog: list members section header -->
+    <string name="actfm_EPA_assign_header_members">Membri della Lista</string>
+
+    <!-- task sharing dialog: astrid friends section header -->
+    <string name="actfm_EPA_assign_header_friends">Amici in Astrid</string>
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: share with Facebook -->
+    <string name="actfm_EPA_facebook">Facebook</string>
+
+    <!-- task sharing dialog: share with Twitter -->
+    <string name="actfm_EPA_twitter">Twitter</string>
+
+    <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
+
+    <!-- task sharing dialog: edit people settings saved -->
+
+    <!-- task sharing dialog: invalid email (%s => email) -->
+    <string name="actfm_EPA_invalid_email">E-mail non valida: %s</string>
+
+    <!-- task sharing dialog: tag not found (%s => tag) -->
+
+    <!-- task sharing login prompt -->
+    <string name="actfm_EPA_login_to_share">Devi essere loggato in Astrid.com per condividere
+        attività!
+    </string>
+
+    <string name="actfm_EPA_login_button">Accedi</string>
+
+    <string name="actfm_EPA_dont_share_button">Non condividere</string>
+
+    <string name="actfm_EPA_add_person_to_list_title">Attività assegnata</string>
+
+    <string name="actfm_EPA_add_person_to_list">%1$s non è condiviso in questa lista. Vuoi
+        aggiungere %2$s a questa lista?
+    </string>
+
+    <string name="actfm_EPA_add_person_to_list_ok">Aggiungi alla lista</string>
+
+    <string name="actfm_EPA_add_person_to_list_cancel">Non aggiungere</string>
+
+    <string name="actfm_list_owner">(owner)</string>
+
+    <!-- ========================================= sharing login activity == -->
+
+    <!-- share login: Title -->
+    <string name="actfm_ALA_title">Benvenuto in Astrid.com!</string>
+
+    <!-- share login: Sharing Description -->
+    <string name="actfm_ALA_body">Con Astrid.com puoi accedere alle tue attività online,
+        condividerle e delegarle ad altri.
+    </string>
+
+    <!-- share login: Sharing Login FB Prompt -->
+    <string name="actfm_ALA_fb_login">Connetti con Facebook</string>
+
+    <!-- share login: Sharing Login GG Prompt -->
+    <string name="actfm_ALA_gg_login">Connetti con Google</string>
+
+    <!-- share login: Quickly log in as <%s -> email> -->
+    <string name="actfm_quick_login">Accedi: %s</string>
+
+    <!-- share login: Reject quick login -->
+    <string name="actfm_quick_login_reject">Non sei %s?</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_firstname_label">Nome</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_lastname_label">Cognome</string>
+
+    <!-- share login: Email -->
+    <string name="actfm_ALA_email_label">Email</string>
+
+    <!-- share login: Username / Email -->
+
+    <!-- share login: Password -->
+    <string name="actfm_ALA_password_label">Password</string>
+
+    <!-- share login: Sign Up Title -->
+    <string name="actfm_ALA_signup_title">Registrati</string>
+
+    <!-- share login: Login Title -->
+    <string name="actfm_ALA_login_title">Accedi</string>
+
+    <!-- share login: Google Auth title -->
+    <string name="actfm_GAA_title">Seleziona l\'account Google che vuoi utilizzare:</string>
+
+    <!-- share login: OAUTH Login Prompt -->
+    <string name="actfm_OLA_prompt">Accedi per favore:</string>
+
+    <!-- Login error: user exists -->
+    <string name="actfm_ALA_error_user_exists">L\'utente esiste già. Accedi per favore.</string>
+
+    <!-- Login error: wrong password -->
+    <string name="actfm_ALA_error_wrong_password">Spiacente, questa password non è corretta. Prova
+        ancora.
+    </string>
+
+    <!-- Forgot password link -->
+    <string name="actfm_ALA_forgot_password">Password dimenticata?</string>
+
+    <!-- Forgot password email prompt -->
+    <string name="actfm_ALA_enter_email">Inserisci la tua email per favore</string>
+
+    <!-- Password reset sent (%s -> email) -->
+    <string name="actfm_ALA_reset_sent">Link per reimpostare la password inviato a \'%s\'</string>
+
+    <!-- User already exists - first sync may be slow -->
+    <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your
+        patience!
+    </string>
+
+    <!-- User not found -->
+    <string name="actfm_ALA_error_user_not_found">Nessun utente corrisponde a questa email. In
+        alternativa effettuate il login.
+    </string>
+
+    <!-- ================================================ Featured Lists -->
+
+    <string name="actfm_feat_list_clone">Copia lista</string>
+
+    <string name="actfm_feat_list_suffix">(Copia)</string>
+
+    <string name="actfm_feat_list_cloning">Copia...</string>
+
+    <string name="actfm_feat_list_clone_success">Operazione riuscita!</string>
+
+    <string name="actfm_feat_list_task_clone_success">Compito copiato</string>
+
+    <string name="actfm_feat_list_clone_empty">Nessun compito da copiare</string>
+
+    <!-- ================================================ Synchronization == -->
+
+    <!-- Indicates the logged in user name. %s -> user\'s name -->
+    <string name="actfm_status_title_logged_in">Stato: Loggato come %s</string>
+
+    <!-- Preferences Title: Act.fm -->
+    <string name="actfm_APr_header">Astrid.com</string>
+
+    <string name="actfm_https_title">Utilizza HTTPS</string>
+    <string name="actfm_https_enabled">HTTPS abilitato (più lento)</string>
+    <string name="actfm_https_disabled">HTTPS disabilitato (più veloce)</string>
+
+    <!-- title for notification tray after synchronizing -->
+
+    <!-- text for notification when comments are received -->
+
+    <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid
+        duplicate tasks and other synchronization issues,
+        Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You
+        can still import tasks from Google Tasks from the Google Tasks settings page,
+        or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.
+        Are you sure you want to sync with Astrid.com?
+    </string>
+
+    <!-- account types -->
+    <string name="actfm_account_type">Tipo di account</string>
+    <string name="actfm_account_info">Informazioni sull\'account</string>
+    <string name="actfm_account_info_summary">Stato e opzioni</string>
+    <string name="account_type_title_not_logged_in">Registrati un account gratuito</string>
+    <string name="account_type_summary_not_logged_in">Accedi ai compiti online, condividi le liste e
+        delega
+    </string>
+
+
+    <string name="actfm_account_premium">Premium</string>
+    <string name="actfm_account_basic">Base</string>
+
+    <string name="actfm_inapp_billing">Aggiorna al Premium</string>
+    <string name="actfm_inapp_billing_summary">Allega files, archivio registrazioni vocali, supporto
+        premium &amp; altro
+    </string>
+
+    <!-- Sharing -->
+    <string name="share_with_facebook">Mi piace su Facebook</string>
+    <string name="share_with_twitter">Seguici su Twitter</string>
+    <string name="share_with_google">Condividi su Google+</string>
+    <string name="share_speech_bubble">Condividendo aiuti gli altri ad essere più produttivi!
+    </string>
+
+
+    <!-- Sync upgrade messages -->
+    <string name="sync_upgr_both_title">Usare Astrid.com + Google senza duplicati</string>
+    <string name="sync_upgr_both_body">Siamo onesti. Google Tasks è utile, ma non fico come Astrid.
+        Per non avere più duplicati, non è più possibile sincronizzare Astrid.com e Google Tasks
+        contemporaneamente nei due sensi. Puoi ancora importare le attività di Google Tasks da
+        Impostazioni → Backup &amp; Sync, o tornare indietro alla sola sincronizzazione con Google
+        Tasks.
+    </string>
+    <string name="sync_upgr_both_btn1">Stick with Astrid</string>
+    <string name="sync_upgr_both_btn2">Downgrade to Google Tasks</string>
+
+    <string name="sync_upgr_gtasks_only_title">Upgrade to Astrid Sync for Free!</string>
+    <string name="sync_upgr_gtasks_only_body">Access your tasks from all your devices and from Gmail
+        with Astrid.com sync. Upgrade to Astrid.com Sync (you can always go back to Google Tasks -
+        but you won\'t want to)!
+    </string>
+    <string name="sync_upgr_gtasks_only_btn1">Upgrade to Astrid Sync</string>
+    <string name="sync_upgr_gtasks_only_btn2">Stick with Google Tasks</string>
+
+    <string name="sync_upgr_neither_title">Free backup &amp; Sync!</string>
+    <string name="sync_upgr_neither_body">Don\'t put your to-dos at risk! New and improved Astrid
+        sync to keep and access your tasks from anywhere.
+    </string>
+    <string name="sync_upgr_neither_btn1">Registrati ora</string>
+
+    <string name="sync_upgr_logged_out">You have been logged out of Astrid</string>
+
+    <string name="actfm_logout_clear_tasks_title">Clear data?</string>
+    <string name="actfm_logout_clear_tasks_body">Would you like to clear your tasks and lists?
+    </string>
+    <string name="actfm_logout_clear_tasks_yes">Clear data</string>
+    <string name="actfm_logout_clear_tasks_no">Keep data</string>
+
+    <string name="actfm_logged_in_different_user_title">Logging in as different user</string>
+    <string name="actfm_logged_in_different_user_body">Would you like to delete existing phone tasks
+        before syncing?
+    </string>
+    <string name="actfm_logged_in_different_user_keep_data">Keep data</string>
+    <string name="actfm_logged_in_different_user_clear_data">Clear all data</string>
+    <string name="actfm_logged_in_different_user_processing">Processing existing data...</string>
+
+    <string name="actfm_tag_not_authorized_title">Not authorized</string>
+    <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you
+        may have been removed). Would you like to create a new list with the same name?
+    </string>
+    <string name="actfm_tag_not_authorized_new_list">Crea nuova lista</string>
+    <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
+
+    <string name="actfm_sync_ongoing">Sincronizzazione in corso...</string>
+
+    <string name="EPr_reset_sync_state">Reset sync</string>
+    <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors
+    </string>
+    <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will
+        be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you
+        wish to continue?
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in timers plug-in -->
+
+    <!-- Task Edit Activity: Container Label -->
+    <string name="alarm_ACS_label">Promemoria</string>
+
+    <!-- Task Edit Activity: Add New Alarm -->
+    <string name="alarm_ACS_button">Aggiungi un promemoria</string>
+
+    <string-array name="reminders_alarm">
+        <!-- reminders related to alarm -->
+        <item>Avviso!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in backup plug-in -->
+
+    <!-- ================================================= BackupPreferences == -->
+
+    <!-- slide 33c/48d: Backup Preferences Title -->
+    <string name="backup_BPr_header">Salvataggi</string>
+
+    <!-- slide 48e/50c: Backup: Status Header -->
+    <string name="backup_BPr_group_status">Stato</string>
+
+    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->
+    <string name="backup_status_success">Backup più recente:\n%s</string>
+    <!-- Backup Status: last error failed. Keep it short! -->
+    <string name="backup_status_failed">Ultimo Backup Fallito</string>
+    <!-- Backup Status: error subtitle -->
+    <string name="backup_status_failed_subtitle">(clicca per visualizzare l\'errore)</string>
+    <!-- slide 48a: Backup Status: never backed up -->
+    <string name="backup_status_never">Mai eseguito!</string>
+
+    <!-- slide 48f/ 50e: Backup Options Group Label -->
+    <string name="backup_BPr_group_options">Preferenze</string>
+
+    <!-- slide 48b: Preference: Automatic Backup Title -->
+    <string name="backup_BPr_auto_title">Backup automatici</string>
+    <!-- Preference: Automatic Backup Description (when disabled) -->
+    <string name="backup_BPr_auto_disabled">Backup Automatico Disabilitato</string>
+    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
+    <string name="backup_BPr_auto_enabled">I Backup verranno eseguiti giornalmente</string>
+
+    <!-- Preference screen restoring Tasks Help -->
+    <!-- Preference screen Restoring Tasks Help Dialog Text-->
+
+    <string name="backup_BPr_cloud_already_logged_in">Hai già un backup cloud su Astrid.com!
+    </string>
+
+    <!-- ================================================= BackupActivity == -->
+
+    <!-- slide 48c: backup activity label -->
+    <string name="backup_BAc_label">Gestisci i backup</string>
+
+    <!-- backup activity title -->
+    <string name="backup_BAc_title">Gestione dei Backup</string>
+
+    <!-- backup activity import button -->
+    <string name="backup_BAc_import">Importa compiti</string>
+
+    <!-- backup activity export button -->
+    <string name="backup_BAc_export">Esporta compiti</string>
+
+    <!-- backup activity cloud (Astrid.com) option -->
+    <string name="backup_BAc_cloud">Clicca per un account cloud gratuito su Astrid.com</string>
+
+    <!-- ============================================== Importer / Exporter == -->
+
+    <!-- Message displayed when error occurs -->
+    <string name="backup_TXI_error">Errore d\'importazione</string>
+
+    <string name="export_toast">Backup di %1$s su %2$s eseguito.</string>
+
+    <string name="export_toast_no_tasks">Nessun compito da esportare.</string>
+
+    <!-- Progress Dialog Title for exporting -->
+    <string name="export_progress_title">Esportazione...</string>
+
+    <!-- Backup: Title of Import Summary Dialog -->
+    <string name="import_summary_title">Ripristina sommario</string>
+
+    <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
+    <string name="import_summary_message">Il File %1$s contiene %2$s.\n\n %3$s importati\n %4$s
+        esiste già\n %5$s contiene errori\n
+    </string>
+
+    <!-- Progress Dialog Title for importing -->
+    <string name="import_progress_title">Importazione in corso...</string>
+
+    <!-- Progress Dialog text for import reading task (%d -> task number)-->
+    <string name="import_progress_read">Lettura compito %d...</string>
+
+    <!-- Backup: Dialog when unable to open a file -->
+
+    <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
+    <string name="DLG_error_sdcard">Impossibile accedere alla cartella: %s</string>
+
+    <!-- Backup: Dialog when unable to open SD card in general -->
+    <string name="DLG_error_sdcard_general">Impossibile accedere alla scheda SD!</string>
+
+    <!-- Backup: File Selector dialog for import -->
+    <string name="import_file_prompt">Seleziona un file da ripristinare</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- ================================================== AndroidManifest == -->
+
+    <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
+    <string name="app_name">Astrid Tasks</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="read_permission_label">Permessi Astrid</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="read_permission_desc">vedere i compiti, mostrare i filtri</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="write_permission_label">Permessi Astrid</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="write_permission_desc">crea nuove attività, modifica le attività esistenti
+    </string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- question for deleting tasks -->
+    <string name="DLG_delete_this_task_question">Eliminare questa attività?</string>
+
+    <!-- question for deleting items (%s => item name) -->
+    <string name="DLG_delete_this_item_question">Cancella questo articolo: %s?</string>
+
+    <!-- Progress dialog shown when upgrading -->
+    <string name="DLG_upgrading">Aggiornare le attività ...</string>
+
+    <!-- Title for dialog selecting a time (hours and minutes) -->
+    <string name="DLG_hour_minutes">Tempo (ore : minuti)</string>
+
+    <!-- Dialog for Astrid having a critical update -->
+    <string name="DLG_please_update">Astrid dovrebbe essere aggiornato alla versione più recente
+        disponibile su Android market! Si prega di farlo prima di proseguire, o attendere qualche
+        secondo.
+    </string>
+
+    <!-- Button for going to Market -->
+
+    <!-- Button for accepting EULA -->
+    <string name="DLG_accept">Accetto</string>
+
+    <!-- Button for declining EULA -->
+    <string name="DLG_decline">Rifiuto</string>
+
+    <!-- EULA title -->
+    <string name="DLG_eula_title">Termini di Utilizzo di Astrid</string>
+
+    <!-- Progress Dialog generic text -->
+    <string name="DLG_please_wait">Attendi, per piacere</string>
+
+    <!-- Dialog - loading -->
+    <string name="DLG_loading">Caricamento...</string>
+
+    <!-- Dialog - dismiss -->
+
+    <!-- slide 20d -->
+    <string name="DLG_ok">OK</string>
+    <!-- slide 36g -->
+    <string name="DLG_cancel">Annulla</string>
+
+    <string name="DLG_more">Ancora</string>
+
+    <string name="DLG_undo">Annulla l\'ultima azione</string>
+
+    <string name="DLG_warning">Attenzione</string>
+
+    <!-- =============================================================== UI == -->
+
+    <!-- Label for DateButtons with no value -->
+    <string name="WID_dateButtonUnset">Clicca per Impostare</string>
+
+    <!-- String formatter for DateButtons ($D => date, $T => time) -->
+
+    <!-- String formatter for Disable button -->
+
+    <!--  ============================================================= notes -->
+
+    <!-- Note Exposer -->
+
+    <!-- Note Exposer / Comments -->
+
+    <!-- EditNoteActivity - no comments -->
+    <string name="ENA_no_comments">Nessuna attività</string>
+
+    <!-- EditNoteActivity - no username for comment -->
+    <string name="ENA_no_user">Qualcuno</string>
+
+    <!-- EditNoteActivity - refresh comments -->
+    <string name="ENA_refresh_comments">Aggiorna i commenti</string>
+
+    <!-- ================================================= TaskListActivity == -->
+
+    <!-- slide 8b: Task List: Displayed instead of list when no items present -->
+    <string name="TLA_no_items">Nessuna Attività!</string>
+
+    <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
+    <string name="TLA_no_items_person">%s non ha attività\ncondivise con te.</string>
+
+    <!-- Menu: Adjust Sort and Hidden Task Settings -->
+    <string name="TLA_menu_sort">Sort</string>
+
+    <!-- Menu: Sync Now -->
+    <string name="TLA_menu_sync">Sincronizza Ora</string>
+
+    <!-- Menu: Search -->
+    <string name="TLA_menu_search">Cerca</string>
+
+    <!-- Menu: Tasks -->
+    <string name="TLA_menu_lists">Liste</string>
+
+    <!-- Menu: Friends -->
+    <string name="TLA_menu_friends">Persone</string>
+
+    <!-- Menu: Featured Lists -->
+    <string name="TLA_menu_featured_lists">Liste in primo piano</string>
+
+    <!-- Menu: Suggestions -->
+    <string name="TLA_menu_suggestions">Suggerimenti</string>
+
+    <!-- Menu: Tutorial -->
+
+    <!-- Menu: Settings -->
+    <string name="TLA_menu_settings">Impostazioni</string>
+
+    <!-- slide 30b: Menu: Support -->
+    <string name="TLA_menu_support">Supporto</string>
+
+    <!-- Search Label-->
+
+    <!-- Window title for displaying Custom Filter -->
+    <string name="TLA_custom">Personalizzato</string>
+
+    <!-- slide 8d: Quick Add Edit Box Hint-->
+    <string name="TLA_quick_add_hint">Aggiungi un\'attività</string>
+
+    <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
+    <string name="TLA_quick_add_hint_assign">Aggiungi qualcosa per %s</string>
+
+    <!-- Notification Volumne notification-->
+    <string name="TLA_notification_volume_low">Le notifiche sono mutate. Non dovresti essere più in
+        grado di sentire Astrid!
+    </string>
+
+    <!-- Notifications disabled warning -->
+    <string name="TLA_notification_disabled">I promemoria di Astrid sono disabilitati! Non riceverai
+        nessun promemoria
+    </string>
+
+    <string-array name="TLA_filters">
+        <item>Attivo</item>
+        <item>Oggi</item>
+        <item>Tra poco</item>
+        <item>Tardi</item>
+        <item>Completata</item>
+        <item>Nascosto</item>
+    </string-array>
+
+    <!-- Title for confirmation dialog after quick add markup -->
+    <string name="TLA_quickadd_confirm_title">Hai detto, \"%s\"</string>
+
+    <!-- Text for speech bubble in dialog after quick add markup -->
+    <!-- First string is task title, second is due date, third is priority -->
+    <string name="TLA_quickadd_confirm_speech_bubble">Ho creato un\'attività chiamata \"%1$s\" %2$s
+        con %3$s
+    </string>
+
+    <string name="TLA_quickadd_confirm_speech_bubble_date">per %s</string>
+
+    <string name="TLA_quickadd_confirm_hide_helpers">Non mostrare conferme future</string>
+
+
+    <!-- Title for alert on new repeating task. %s-> task title -->
+    <string name="TLA_repeat_scheduled_title">Nuova attività ricorrente: %s</string>
+
+    <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
+    <string name="TLA_repeat_scheduled_speech_bubble">Ti ricorderò di questa per %s volte.</string>
+
+    <string-array name="TLA_priority_strings">
+        <item>Massima priorità</item>
+        <item>priorità alta</item>
+        <item>priorità media</item>
+        <item>priorità bassa</item>
+    </string-array>
+    <!-- slide 22a -->
+    <string name="TLA_all_activity">Tutte le Attività</string>
+
+    <!-- ====================================================== TaskAdapter == -->
+
+    <!-- Format string to indicate task is hidden (%s => task name) -->
+    <string name="TAd_hiddenFormat">%s [Nascosto]</string>
+
+    <!-- Format string to indicate task is deleted (%s => task name) -->
+    <string name="TAd_deletedFormat">%s [eliminato]</string>
+
+    <!-- Displayed when adapter is flung (scrolled quickly) -->
+
+    <!-- slide 22b: indicates task was completed. %s => date or time ago -->
+    <string name="TAd_completed">Terminata\n%s</string>
+
+    <!-- slide 15a: Action Button: edit task -->
+    <string name="TAd_actionEditTask">Modifica</string>
+
+    <!-- Context Item: edit task -->
+    <string name="TAd_contextEditTask">Modifica attività</string>
+
+    <!-- Context Item: copy task -->
+    <string name="TAd_contextCopyTask">Copia Attività</string>
+
+    <!-- Context Item: delete task -->
+    <string name="TAd_contextDeleteTask">Elimina attività</string>
+
+    <!-- Context Item: undelete task -->
+    <string name="TAd_contextUndeleteTask">Ripristina Attività</string>
+
+    <!-- Context Item: purge task -->
+    <string name="TAd_contextPurgeTask">Elimina Attività</string>
+
+    <!-- ============================================== SortSelectionDialog == -->
+
+    <!-- slide 23a: Sort Selection: dialog title -->
+    <string name="SSD_title">Ordinamento e Attività Nascoste</string>
+
+    <!-- slide 23h:  Hidden: title -->
+    <string name="SSD_hidden_title">Attività Nascoste</string>
+
+    <!-- Hidden Task Selection: show completed tasks -->
+    <string name="SSD_completed">Mostra Attività Collegate</string>
+
+    <!-- Hidden Task Selection: show hidden tasks -->
+    <string name="SSD_hidden">Mostra Attività Nascoste</string>
+
+    <!-- Hidden Task Selection: show deleted tasks -->
+    <string name="SSD_deleted">Mostra Attività Cancellate</string>
+
+    <!-- Sort Selection: drag with subtasks -->
+    <string name="SSD_sort_drag">Manual order with subtasks</string>
+
+    <!-- slide 23b: Sort Selection: smart sort -->
+    <string name="SSD_sort_auto">Ordinamento Intelligente</string>
+
+    <!-- slide 23e: Sort Selection: sort by alpha -->
+    <string name="SSD_sort_alpha">Per Titotlo</string>
+
+    <!-- slide 23c: Sort Selection: sort by due date -->
+    <string name="SSD_sort_due">Per scadenza</string>
+
+    <!-- slide 23d: Sort Selection: sort by importance -->
+    <string name="SSD_sort_importance">By priority</string>
+
+    <!-- slide 23f: Sort Selection: sort by modified date -->
+    <string name="SSD_sort_modified">Per Ultima Modifica</string>
+
+    <!-- slide 23g: Sort Selection: reverse -->
+    <string name="SSD_sort_reverse">Inverti Ordinamento</string>
+
+    <!-- slide 23j: Sort Button: sort temporarily -->
+    <string name="SSD_save_temp">Solo una Volta</string>
+
+    <!-- slide 23i: Sort Button: sort permanently -->
+    <string name="SSD_save_always">Sempre</string>
+
+    <!-- =============================================== FilterListActivity == -->
+
+    <!-- Astrid Filter Shortcut -->
+    <string name="FSA_label">Lista Astrid o Filtra</string>
+
+    <!-- Filter List Activity Title -->
+
+    <!-- Displayed when loading filters -->
+
+    <!-- Context Menu: Create Shortcut -->
+    <string name="FLA_context_shortcut">Crea collegamento sul Desktop</string>
+
+    <!-- Menu: Search -->
+
+    <!-- Menu: Help -->
+
+    <!-- slide 28c: Create Shortcut Dialog Title -->
+    <string name="FLA_shortcut_dialog_title">Crea scorciatoia</string>
+
+    <!-- Create Shortcut Dialog (asks to name shortcut) -->
+    <string name="FLA_shortcut_dialog">Nome della scorciatoia:</string>
+
+    <!-- Search Hint-->
+    <string name="FLA_search_hint">Cerca Per Attività</string>
+
+    <!-- Search Filter name (%s => query) -->
+    <string name="FLA_search_filter">Confrontando \'%s\'</string>
+
+    <!-- Toast: created shortcut (%s => label) -->
+    <string name="FLA_toast_onCreateShortcut">Creata Scorciatoia: %s</string>
+
+    <!-- Menu: new filter -->
+    <string name="FLA_new_filter">Nuovo Filtro</string>
+
+    <!-- slide 10e: Button: new list -->
+    <string name="FLA_new_list">Nuova lista</string>
+
+    <!-- Alert when creating a shortcut without selecting a filter -->
+    <string name="FLA_no_filter_selected">Filtro non selezionato! Perfavore seleziona un filtro o
+        una lista.
+    </string>
+
+    <!-- ================================================= TaskEditActivity == -->
+
+    <!-- Title when editing a task (%s => task title) -->
+
+    <!-- Title when creating a new task -->
+
+    <!-- Task title label -->
+
+    <!-- Task when label -->
+    <string name="TEA_when_header_label">Quando</string>
+
+    <!-- Task title hint (displayed when edit box is empty) -->
+    <string name="TEA_title_hint">Task name</string>
+
+    <!-- Task importance label -->
+    <string name="TEA_importance_label">Priorità</string>
+
+    <!-- Task due date hint -->
+    <string name="TEA_deadline_hint">Set due date</string>
+
+    <!-- Task assigned to string (%s -> assigned person name) -->
+    <string name="TEA_assigned_to">Assigned to %s</string>
+
+    <!-- Task urgency specific time checkbox -->
+    <string name="TEA_urgency_specific_time">In un orario specifico?</string>
+
+    <!-- Task urgency specific time title when specific time false -->
+    <string name="TEA_urgency_none">Nessuna</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_label">Hide until</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_display">Hide until %s</string>
+
+    <!-- Task hide until toast -->
+    <string name="TEA_hideUntil_message">L\'attività verrà nascosta fino a: %s</string>
+
+    <!-- Task editing data being loaded label -->
+    <string-array name="TEA_loading">
+        <item>Caricamento...</item>
+    </string-array>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_note_label">Descrizione</string>
+
+    <!-- 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">Quanto tempo impiegherà?</string>
+
+    <!-- Elapsed time label -->
+    <string name="TEA_elapsedDuration_label">Tempo già speso per l\'attività</string>
+
+    <!-- Menu: Save -->
+    <string name="TEA_menu_save">Salva le modifiche</string>
+
+    <!-- Menu: Don\'t Save -->
+    <string name="TEA_menu_discard">Non salvare</string>
+
+    <!-- Menu: Delete Task -->
+    <string name="TEA_menu_delete">Elimina attività</string>
+
+    <!-- Menu: Task comments -->
+    <string name="TEA_menu_refresh_comments">Refresh comments</string>
+
+    <string name="TEA_menu_comments">Commenti</string>
+
+    <!-- Toast: task saved with deadline (%s => preposition + time units) -->
+    <string name="TEA_onTaskSave_due">Attività Salvata: entro %s</string>
+
+    <!-- Toast: task saved without deadlines -->
+    <string name="TEA_onTaskSave_notDue">Attvità salvata</string>
+
+    <!-- Toast: task was not saved -->
+
+    <!-- Toast: task was deleted -->
+
+    <!-- slide 15b: Task edit tab: activity -->
+    <string name="TEA_tab_activity">Attività</string>
+
+    <!-- slide 15e:  Task edit tab: more editing settings -->
+    <string name="TEA_tab_more">Altro</string>
+
+    <!-- slide 15d: Task edit tab: web services -->
+    <string name="TEA_tab_web">Idee</string>
+
+    <string name="TEA_timer_est">Est. %s</string>
+
+    <string name="TEA_timer_elap">Elapsed %s</string>
+
+    <string-array name="TEA_urgency">
+        <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
+        <item>No date</item>
+        <item>Giorno specifico</item>
+        <item>Oggi</item>
+        <item>Domani</item>
+        <item>(giorno dopo)</item>
+        <item>Settimana successiva</item>
+        <item>Ogni due settimane</item>
+        <item>Mese successivo</item>
+    </string-array>
+
+    <string name="TEA_no_time">Nessuna ora</string>
+
+    <string-array name="TEA_hideUntil">
+        <!-- hideUntil: labels for edit page. -->
+        <item>Never</item>
+        <item>Data di scadenza</item>
+        <item>Due time</item>
+        <item>Day before due</item>
+        <item>Week before due</item>
+        <item>Giorno/Tempo Specifici</item>
+    </string-array>
+
+    <!-- Task edit control set descriptors -->
+
+    <!-- slide 9b/35i -->
+    <string name="TEA_control_who">Chi</string>
+
+    <!-- slide 9c/ 35a -->
+    <string name="TEA_control_when">Quando</string>
+    <!-- slide 35b -->
+    <string name="TEA_control_more_section">----More Section----</string>
+    <!-- slide 16a/35c -->
+    <string name="TEA_control_importance">Priorità</string>
+    <!-- slide 16b/35d -->
+    <string name="TEA_control_lists">Liste</string>
+    <!-- slide 16c/35e -->
+    <string name="TEA_control_notes">Descrizione</string>
+
+    <string name="TEA_control_files">Files</string>
+
+    <!-- slide 16e / slide 35g-->
+    <string name="TEA_control_reminders">Promemoria</string>
+
+    <!-- slide 16f -->
+    <string name="TEA_control_timer">Regolazioni Tempo</string>
+
+    <string name="TEA_control_hidden_section">----Nascondi Sempre----</string>
+
+    <string name="hide_until_prompt">Mostra nella mia lista</string>
+
+    <!-- Add Ons tab when no add-ons found -->
+
+    <!-- Add Ons button -->
+
+    <!-- More row -->
+
+    <!-- slide 15c: Text when no activity to show -->
+    <string name="TEA_no_activity">Nessuna attività</string>
+
+    <!-- Text to load more activity -->
+    <string name="TEA_load_more">Caricane di più...</string>
+
+    <!-- When controls dialog -->
+    <string name="TEA_when_dialog_title">Quando dovrà terminare?</string>
+
+
+    <string name="TEA_new_task">Nuova Attività</string>
+
+    <string name="WSV_click_to_load">Cliccami per cercare il modo di effettuare questa operazione.
+    </string>
+
+    <string name="WSV_not_online">Posso fare di più se sono connesso a Internet. Controlla la tua
+        connessione
+    </string>
+
+    <string name="TEA_contact_error">Scusa! Non riusciamo a trovare un indirizzo email per il
+        contatto selezionato.
+    </string>
+
+    <!-- ============================================= IntroductionActivity == -->
+
+    <!-- slide 1a: Introduction Window title -->
+
+    <!-- Button to agree to EULA -->
+
+    <!-- Button to disagree with EULA -->
+
+    <!-- ===================================================== MissedCallActivity == -->
+
+    <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
+    <string name="MCA_title">%1$s\nha chiamato alle %2$s</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_return_call">Chiama ora</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_add_task">Chiama più tardi</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_ignore">Ignora</string>
+
+    <!-- Missed call: dialog to ignore all missed calls title -->
+    <string name="MCA_ignore_title">Ignorare tutte le chiamate perse?</string>
+
+    <!-- Missed call: dialog to ignore all missed calls body -->
+    <string name="MCA_ignore_body">Tu hai ignorato varie chiamate perse. Astrid dovrebbe smettere di
+        chiedere a riguardo?
+    </string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore all button -->
+    <string name="MCA_ignore_all">Ignora tutte le chiamate</string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
+    <string name="MCA_ignore_this">Ignora solo questa chiamata</string>
+
+    <!-- Missed call: preference title -->
+    <string name="MCA_missed_calls_pref_title">Campo chiamate perse</string>
+
+    <!-- slide 49c: Missed call: preference description -->
+    <string name="MCA_missed_calls_pref_desc_enabled">Astrid ti notificherà per le chiamate perse e
+        ti offrirà di ricordarti di richiamare
+    </string>
+    <string name="MCA_missed_calls_pref_desc_disabled">Astrid non ti notificherà per le chiamate
+        perse
+    </string>
+
+    <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
+    <string name="MCA_task_title_name">Richiama %1$s al %2$s</string>
+
+    <!-- Missed call: task title no name (%s -> number)-->
+    <string name="MCA_task_title_no_name">Richiama %s</string>
+
+    <!-- Missed call: schedule dialog title (%s -> name or number)-->
+    <string name="MCA_schedule_dialog_title">Richiama %s tra...</string>
+
+    <!-- Missed call speech bubble options -->
+    <string-array name="MCA_dialog_speech_options">
+        <item>Dev\'essere fantastico essere così popolari!</item>
+        <item>Yay! Piaci alla gente!</item>
+        <item>Rendili felici, telefonagli!</item>
+        <item>Non saresti felice se le persone ti richiamassero?</item>
+        <item>Puoi farlo!</item>
+        <item>Puoi sempre inviare un messaggio...</item>
+    </string-array>
+
+
+    <!-- ======================================= Calendar reminder activity == -->
+
+    <!-- Calendar remindeer ignore button -->
+    <string name="CRA_ignore">Ignora</string>
+
+    <!-- Calendar event -->
+    <string name="CRA_title">Hai bisogno di una lista per le riunioni?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls title -->
+    <string name="CRA_ignore_title">Ignora tutti gli eventi del calendario?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls body -->
+    <string name="CRA_ignore_body">Tu hai ignorato varie chiamate perse. Astrid dovrebbe smettere di
+        chiedere a riguardo?
+    </string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
+    <string name="CRA_ignore_all">Ignora tutti gli eventi</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
+    <string name="CRA_ignore_this">Ignora solo questo evento</string>
+
+    <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
+    <string name="CRA_speech_bubble_start">Sembra che %s stia per iniziare. Vuoi creare una lista
+        per le azioni?
+    </string>
+
+    <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
+    <string name="CRA_speech_bubble_end">Sembra che tu abbia appena terminato %s. Vuoi creare una
+        lista per le azioni?
+    </string>
+
+    <!-- Calendar reminder: create list button -->
+    <string name="CRA_create_list">Crea la lista</string>
+
+    <!-- Calendar reminder: postpone button -->
+    <string name="CRA_postpone">Forse in seguito</string>
+
+    <!-- Calendar reminder: list exists dialog title -->
+    <string name="CRA_list_exists_title">La lista è già esistente</string>
+
+    <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
+    <string name="CRA_list_exists_body">Una lista chiamata %s è già esistente. Vuoi usare la lista
+        esistente o crearne una nuova per questo evento?
+    </string>
+
+    <!-- Calendar reminder: list exists dialog create new button -->
+    <string name="CRA_create_new">Crea nuovo</string>
+
+    <!-- Calendar reminder: list exists dialog use existing button -->
+    <string name="CRA_use_existing">Usa l\'esistente</string>
 
-    
-    <!-- Resources for built-in timers plug-in -->
-    
-    <!-- Task Edit Activity: Container Label -->
-    <string name="alarm_ACS_label">Promemoria</string>
-    
-    <!-- Task Edit Activity: Add New Alarm -->
-    <string name="alarm_ACS_button">Aggiungi un promemoria</string>
-    
-    <string-array name="reminders_alarm">
-      <!-- reminders related to alarm -->
-      <item>Avviso!</item>
+    <!-- Calendar remindr: created list (%s -> list name) -->
+    <string name="CRA_created_list_dialog">Ho creato una lista chiamata %s</string>
+
+    <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
+    <string name="CRA_one_attendee">%s è in attesa</string>
+
+    <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
+    <string name="CRA_two_attendees">%1$s e %2$s sono in attesa.</string>
+
+    <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
+    <string name="CRA_many_attendees">%1$s, %2$s, e %3$d altre sono in attesa.</string>
+
+    <!-- Calendar reminder: invitation prompt -->
+    <string name="CRA_invitation_prompt">Vuoi invitarli?</string>
+
+    <!-- Calendar reminder: preference title -->
+    <string name="CRA_calendar_reminders_pref_title">Assistente del Calendario</string>
+
+    <!-- Calendar reminder: pref description disabled -->
+    <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid non ti avviserà dei prossimi
+        eventi sul calendario
+    </string>
+
+    <!-- Calendar reminder: pref description enabled -->
+    <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid ti avviserà dei prossimi eventi
+        sul calendario e ti chiederà di prepararti a questi
+    </string>
+
+    <!-- Calendar reminder: share list title -->
+    <string name="CRA_share_list_title">Condividi la lista?</string>
+
+    <string name="CRA_invite_attendees">Invita partecipanti</string>
+
+    <string name="CRA_more_options">Più opzioni</string>
+
+    <string name="CRA_dont_invite">No, grazie</string>
+
+    <!-- Calendar reminder: share list title when no other attendees exist-->
+    <string name="CRA_list_created_title">Lista creata!</string>
+
+    <!-- Calendar reminder: default new list name (%s -> event title) -->
+    <string name="CRA_default_list_name">Azioni: %s</string>
+
+    <!-- ===================================================== HelpActivity == -->
+
+    <!-- Help: Button to get support from our website -->
+
+    <!-- ==================================================== UpdateService == -->
+
+    <!-- Changelog Window Title -->
+    <string name="UpS_changelog_title">Novità in Astrid?</string>
+
+    <!-- Updates Window Title -->
+    <string name="UpS_updates_title">Ultime Novità di Astrid</string>
+
+    <!-- Updats No Activity to show for offline users -->
+    <string name="UpS_no_activity_log_in">Effettua il login per vedere\nla storia del tuo
+        avanzamento\ne le attività sulle liste condivise
+    </string>
+
+    <!-- ================================================== EditPreferences == -->
+
+    <!-- slide 31g: Preference Window Title -->
+    <string name="EPr_title">Astrid: Preferenze</string>
+
+    <string name="EPr_share_astrid">Share Astrid</string>
+
+    <string name="EPr_share_astrid_summary">Condividi Astrid nel tuo social network preferito
+    </string>
+
+    <!-- slide 46a -->
+    <string name="EPr_deactivated">disattivato</string>
+
+    <!-- slide 30i: Preference Category: Appearance Title -->
+    <string name="EPr_appearance_header">Aspetto</string>
+
+    <!-- Preference Category: Appearance Summary -->
+    <string name="EPr_appearance_summary">Temi, widgets, righe delle attività, modifica schermo
+    </string>
+
+    <!-- FAQ Preference title -->
+    <string name="EPr_faq_title">FAQ</string>
+
+    <!-- Account status preference (%s -> account type) -->
+    <string name="EPr_account_title">Account: %s</string>
+
+    <!-- Support preferences summary -->
+    <string name="EPr_support_summary">Tutorial, FAQ, about</string>
+
+    <!-- slide 34a: Preference: Task List Font Size Title -->
+    <string name="EPr_fontSize_title">Dimensione dell\'elenco di attività</string>
+
+    <!-- Preference: Filters to show pref screen title -->
+    <string name="EPr_filters_to_show_title">Filters to show</string>
+
+    <!-- slide 32a: Preference: Show confirmation for smart reminders -->
+    <string name="EPr_showSmartConfirmation_title">Mostra conferma per promemoria rapidi</string>
+
+    <!-- slide 34g: Preference: Task List Font Size Description -->
+    <string name="EPr_fontSize_desc">Dimensione carattere nella pagina principale</string>
+
+    <!-- Preferemce: Show task edit confirmation toasts -->
+
+    <!-- slide 34c: Preference: Task List Show Notes -->
+    <string name="EPr_showNotes_title">Show description in task</string>
+
+    <!-- Edit screen preference category -->
+    <string name="EPr_edit_screen_options">Edit screen options</string>
+
+    <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
+    <string name="EPr_beastMode_title">Edit screen order</string>
+
+    <string name="EPr_beastMode_shortcut">Customize</string>
+
+    <string name="EPr_time_increment">5 minute increments</string>
+
+    <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
+
+    <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
+
+    <!-- slide 35h -->
+    <string name="EPr_beastMode_desc">Personalizza il layout della schermata di modifica attività
+    </string>
+    <!-- slide 35j -->
+    <string name="EPr_beastMode_reset">Ripristina predefiniti</string>
+
+    <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on
+        each row
+    </string>
+
+    <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
+    <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit
+        screen
+    </string>
+    <!-- Preference: Task List Show Notes Description (enabled) -->
+    <string name="EPr_showNotes_desc_enabled">Description will always be displayed</string>
+
+    <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
+    <string name="EPr_compressTaskRows_title">Compatta la riga dell\'attività</string>
+    <!-- slide 34j -->
+    <string name="EPr_compressTaskRows_desc">Adatta la riga dell\'attività alla dimensione del
+        titolo
+    </string>
+
+    <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
+    <!-- slide 34k-->
+
+    <!-- slide 34b: Preferences: Wrap task titles to two lines -->
+    <string name="EPr_fullTask_title">Visualizza titolo completo dell\'attività</string>
+    <string name="EPr_fullTask_desc_enabled">Sarà mostrato il titolo completo</string>
+    <!-- slide 34h -->
+    <string name="EPr_fullTask_desc_disabled">Saranno mostrate le prime due righe del titolo
+        dell\'attività
+    </string>
+
+    <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
+    <string name="EPr_ideaAuto_title">Carica automaticamente il tab delle Idee</string>
+    <!-- slide 32c -->
+    <string name="EPr_ideaAuto_desc_enabled">Le ricerche su web del tab Idee saranno effettuate
+        quando cliccherai sul tab
+    </string>
+    <string name="EPr_ideaAuto_desc_disabled">Le ricerche su web del tab Idee saranno effettuate
+        solo quando richieste manualmente
+    </string>
+
+    <!-- Preferences: task row style -->
+    <string-array name="EPr_task_row_styles">
+        <item>Original</item>
+        <item>Simple</item>
+        <item>Title only</item>
     </string-array>
-    
 
+    <string-array name="EPr_task_row_style_descriptions">
+        <item>Riduci il titolo a due righe con la data a destra</item>
+        <item>Riduci il titolo a una riga con la data e gli elenchi sotto</item>
+        <item>Single line title only</item>
+    </string-array>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- task row style title (%s -> style) -->
+    <string name="EPr_task_row_style_title">Row style: %s</string>
+
+    <!-- Preference: custom filters enabled -->
+    <string name="EPr_use_filters_title">Use filters</string>
+    <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
+
+    <!-- Preference: show list members in shared list -->
+    <string name="EPr_show_list_members_title">Show list members in shared lists</string>
+
+    <!-- Preference: simple input box style -->
+    <string name="EPr_simple_input_boxes">Simple text boxes</string>
+
+    <!-- Preference: simple input box style -->
+    <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
+
+    <!-- Preference: don\'t show plus button until input present -->
+    <string name="EPr_hide_plus_button">Hide plus button</string>
+
+    <!-- Preference: menu items -->
+    <string name="EPr_menu_items">Menu items</string>
+
+    <!-- Preference: list view -->
+    <string name="EPr_list_view">List view</string>
+
+    <!-- Preference: task edit comments -->
+    <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
+
+    <!-- slide 30f/ 36f: Preference: Theme -->
+    <string name="EPr_theme_title">Tema del colore</string>
+    <!-- Preference: Theme Description (%s => value) -->
+    <string name="EPr_theme_desc">Attualmente: %s</string>
+    <!-- Preference: Theme Description (android 1.6) -->
+    <string name="EPr_theme_desc_unsupported">L\'impostazione richiede Android 2.0+</string>
+    <!-- slide 32h/ 37b -->
+    <string name="EPr_theme_widget_title">Tema del widget</string>
+
+    <!-- slide 30d/ 34f: Preference screen: all task row settings -->
+    <string name="EPr_taskRowPrefs_title">Aspetto della riga dei task</string>
+
+    <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
+    <string name="EPr_use_contact_picker">Usa il selettore contatto</string>
+    <!-- slide 49b -->
+    <string name="EPr_use_contact_picker_desc_enabled">L\'opzione del sistema di selezione del
+        contatto sarà mostrata nella finestra di assegnazione dell\'attività
+    </string>
+    <string name="EPr_use_contact_picker_desc_disabled">L\'opzione del sistema di selezione del
+        contatto non sarà mostrata
+    </string>
+
+    <!-- slide 49i: Preferences: Third party addons -->
+    <string name="EPr_third_party_addons">Abilita componenti aggiuntivi di terze parti</string>
+    <string name="EPr_third_party_addons_desc_enabled">Gli Add-ons di terze parti saranno
+        abilitati
+    </string>
+    <!-- slide 49d -->
+    <string name="EPr_third_party_addons_desc_disabled">Gli Add-ons di terze parti saranno
+        disabilitati
+    </string>
+
+    <!-- Preferences: ideas tab -->
+    <string name="EPr_ideas_tab_enabled">Suggerimenti</string>
+    <string name="EPr_ideas_tab_description">Ottieni idee per aiutarti a completare le attività
+    </string>
+
+    <!-- Preferences: calendar event start time -->
+    <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
+    <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
+    <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
+
+    <string name="EPr_force_phone_layout">Usa il layout del telefono</string>
+
+    <string name="EPr_show_featured_lists">Mostra le liste caratterizzanti</string>
+
+    <!-- Configurations -->
+    <string name="EPr_configurations_title">Set configuration</string>
+    <string name="EPr_config_default">Default</string>
+    <string name="EPr_config_lite">Astrid Lite</string>
+
+    <!-- Dialog title when setting preference configuration -->
+    <string name="EPr_config_dialog_title">Set configuration?</string>
+    <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
+    <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
+
+    <!-- default configuration name for the above dialog -->
+    <string name="EPr_config_dialog_default_id">default</string>
+
+    <!-- Preference title for showing save and cancel buttons in task edit page -->
+    <string name="EPr_show_save_and_cancel">Show save and cancel</string>
+
+
+    <!-- Swipe between lists -->
+    <!-- Preference: swipe between lists performance -->
+    <string name="EPr_swipe_lists_performance_title">Scorri tra le liste</string>
+
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>No scorrimento</item>
+        <item>Conserva Memoria</item>
+        <item>Prestazione Normale</item>
+        <item>Alte Prestazioni</item>
+    </string-array>
 
-    
-  <!-- Resources for built-in backup plug-in -->
-  
-  <!-- ================================================= BackupPreferences == -->
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <!-- slide 49a -->
+        <item>Scorrimento tra liste disabilitato</item>
+        <item>Prestazioni lente</item>
+        <item>Impostazione predefinita</item>
+        <item>Usa più risorse di sistema</item>
+    </string-array>
 
-    <!-- slide 33c/48d: Backup Preferences Title -->    
-    <string name="backup_BPr_header">Salvataggi</string>
+    <string name="swipe_lists_helper_title">Scorri tra le liste</string>
+    <string name="swipe_lists_helper_header">Scorri a destra o a sinistra per muoverti rapidamente
+        fra le liste
+    </string>
+    <string name="swipe_lists_helper_subtitle">Modifica le impostazioni in Impostazioni -> Aspetto
+    </string>
 
-    <!-- slide 48e/50c: Backup: Status Header -->    
-    <string name="backup_BPr_group_status">Stato</string>
-    
-    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Backup più recente:\n%s</string>
-    <!-- Backup Status: last error failed. Keep it short! -->    
-    <string name="backup_status_failed">Ultimo Backup Fallito</string>
-    <!-- Backup Status: error subtitle -->    
-    <string name="backup_status_failed_subtitle">(clicca per visualizzare l\'errore)</string>
-    <!-- slide 48a: Backup Status: never backed up -->    
-    <string name="backup_status_never">Mai eseguito!</string>
+    <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
 
-    <!-- slide 48f/ 50e: Backup Options Group Label -->    
-    <string name="backup_BPr_group_options">Preferenze</string>
+    <string-array name="EPr_default_reminders_mode">
+        <!-- reminders duration: labels for "Task Defaults" preference item. -->
+        <item>@string/TEA_reminder_mode_once</item>
+        <item>@string/TEA_reminder_mode_five</item>
+        <item>@string/TEA_reminder_mode_nonstop</item>
+    </string-array>
 
-    <!-- slide 48b: Preference: Automatic Backup Title -->    
-    <string name="backup_BPr_auto_title">Backup automatici</string>
-    <!-- Preference: Automatic Backup Description (when disabled) -->
-    <string name="backup_BPr_auto_disabled">Backup Automatico Disabilitato</string>    
-    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
-    <string name="backup_BPr_auto_enabled">I Backup verranno eseguiti giornalmente</string>
-    
-    <!-- Preference screen restoring Tasks Help -->
-    <!-- Preference screen Restoring Tasks Help Dialog Text-->
-    
-    <string name="backup_BPr_cloud_already_logged_in">Hai già un backup cloud su Astrid.com!</string>
-  
-  <!-- ================================================= BackupActivity == -->
-
-  <!-- slide 48c: backup activity label -->
-  <string name="backup_BAc_label">Gestisci i backup</string>
-
-  <!-- backup activity title -->
-  <string name="backup_BAc_title">Gestione dei Backup</string>
-
-  <!-- backup activity import button -->
-  <string name="backup_BAc_import">Importa compiti</string>
-
-  <!-- backup activity export button -->
-  <string name="backup_BAc_export">Esporta compiti</string>
-  
-  <!-- backup activity cloud (Astrid.com) option -->
-  <string name="backup_BAc_cloud">Clicca per un account cloud gratuito su Astrid.com</string>
-    
-  <!-- ============================================== Importer / Exporter == -->
-  
-  <!-- Message displayed when error occurs -->
-  <string name="backup_TXI_error">Errore d\'importazione</string>
-    
-  <string name="export_toast">Backup di %1$s su %2$s eseguito.</string>
-    
-  <string name="export_toast_no_tasks">Nessun compito da esportare.</string>
-  
-  <!-- Progress Dialog Title for exporting -->    
-  <string name="export_progress_title">Esportazione...</string>
-  
-  <!-- Backup: Title of Import Summary Dialog -->
-  <string name="import_summary_title">Ripristina sommario</string>
-    
-  <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">Il File %1$s contiene %2$s.\n\n %3$s importati\n %4$s esiste già\n %5$s contiene errori\n</string>
-  
-  <!-- Progress Dialog Title for importing -->    
-  <string name="import_progress_title">Importazione in corso...</string>
-  
-  <!-- Progress Dialog text for import reading task (%d -> task number)-->    
-  <string name="import_progress_read">Lettura compito %d...</string>
-  
-  <!-- Backup: Dialog when unable to open a file -->  
-  
-  <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
-  <string name="DLG_error_sdcard">Impossibile accedere alla cartella: %s</string>
-  
-  <!-- Backup: Dialog when unable to open SD card in general -->
-  <string name="DLG_error_sdcard_general">Impossibile accedere alla scheda SD!</string>
-    
-  <!-- Backup: File Selector dialog for import -->
-  <string name="import_file_prompt">Seleziona un file da ripristinare</string>    
-        
+    <string-array name="EPr_themes">
+        <!-- theme_settings: labels for Theme preference menu -->
+        <!-- slide 36a-->
+        <item>Giorno - Blu</item>
+        <!-- slide 36b -->
+        <item>Giorno - Rosso</item>
+        <!-- slide 36b -->
+        <item>Sky blue</item>
+        <!-- slide 36c -->
+        <item>Night</item>
+        <!-- slide 36d -->
+        <item>Transparent (white text)</item>
+        <!-- slide 36e -->
+        <item>Transparent (Black Text)</item>
+    </string-array>
 
+    <string-array name="EPr_themes_widget">
+        <!-- slide 32i / 37a-->
+        <item>Come l\'app</item>
+        <item>Giorno - Blu</item>
+        <item>Giorno - Rosso</item>
+        <item>Sky blue</item>
+        <item>Night</item>
+        <item>Transparent (white text)</item>
+        <item>Transparent (black text)</item>
+        <item>Vecchio Stile</item>
+    </string-array>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- ========================================== Task Management Settings == -->
+
+    <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
+    <string name="EPr_manage_header">Gestisci compiti vecchi</string>
+    <!-- slide 47d -->
+    <string name="EPr_manage_delete_completed">Elimina i compiti completati</string>
+    <string name="EPr_manage_delete_completed_message">Vuoi davvero eliminare tutti i compiti
+        completati?
+    </string>
+    <!-- slide 47a -->
+    <string name="EPr_manage_delete_completed_summary">I compiti eliminati possono essere
+        ripristinati uno ad uno
+    </string>
+    <string name="EPr_manage_delete_completed_status">Eliminate %d attività!</string>
+    <!-- slide 47e -->
+    <string name="EPr_manage_purge_deleted">Elimina definitivamente i compiti eliminati</string>
+    <string name="EPr_manage_purge_deleted_message">Vuoi davvero eliminare definitivamente i compiti
+        eliminati?\n\nQuesti compiti saranno persi per sempre!
+    </string>
+    <string name="EPr_manage_purge_deleted_status">Rimosse %d attività!</string>
+    <!-- slide 47b-->
+    <string name="EPr_manage_purge_deleted_summary">Attenzione! I compiti eliminati definitivamente
+        non possono essere recuperati senza file di backup!
+    </string>
+    <!-- slide 47h-->
+    <string name="EPr_manage_clear_all">Elimina tutti i dati</string>
+    <string name="EPr_manage_clear_all_message">Elimina tutti i programmi e tutte le impostazioni in
+        Astrid?\n\nWarning: non può essere annullato!
+    </string>
+
+    <!-- slide 47f -->
+    <string name="EPr_manage_delete_completed_gcal">Elimina gli eventi del calendario in programmi
+        completati
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_message">Vuoi davvero eliminare tutti gli eventi
+        in programmi completati?
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_summary"></string>
+    <string name="EPr_manage_delete_completed_gcal_status">Eliminato il %d degli eventi del
+        calendario!
+    </string>
+
+    <!-- slide 47g-->
+    <string name="EPr_manage_delete_all_gcal">Elimina tutti gli eventi del calendario in programmi
+    </string>
+    <string name="EPr_manage_delete_all_gcal_message">Vuoi davvero eliminare tutti i tuoi eventi in
+        programmi?
+    </string>
+    <string name="EPr_manage_delete_all_gcal_summary"></string>
+    <string name="EPr_manage_delete_all_gcal_status">Eliminato il %d degli eventi del calendario!
+    </string>
+
+    <!-- ==================================================== AddOnActivity == -->
+
+    <!-- Add Ons Activity Title -->
+    <string name="AOA_title">Componenti aggiuntivi</string>
+
+    <!-- Add-on Activity: author for internal authors  -->
+    <string name="AOA_internal_author">Team Astrid</string>
 
+    <!-- Add-on Activity: installed add-ons tab -->
+    <string name="AOA_tab_installed">Installato</string>
+
+    <!-- Add-on Activity - available add-ons tab -->
+    <string name="AOA_tab_available">Disponibile</string>
+
+    <!-- Add-on Activity - free add-ons label -->
+    <string name="AOA_free">Gratuito</string>
 
-  <!-- ================================================== AndroidManifest == -->
-
-  <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
-  <string name="app_name">Astrid Tasks</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="read_permission_label">Permessi Astrid</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="read_permission_desc">vedere i compiti, mostrare i filtri</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="write_permission_label">Permessi Astrid</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="write_permission_desc">crea nuove attività, modifica le attività esistenti</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-    
-  <!-- question for deleting tasks -->
-  <string name="DLG_delete_this_task_question">Eliminare questa attività?</string>
-
-  <!-- question for deleting items (%s => item name) -->
-  <string name="DLG_delete_this_item_question">Cancella questo articolo: %s?</string>
-    
-  <!-- Progress dialog shown when upgrading -->
-  <string name="DLG_upgrading">Aggiornare le attività ...</string>
-  
-  <!-- Title for dialog selecting a time (hours and minutes) -->
-  <string name="DLG_hour_minutes">Tempo (ore : minuti)</string>
-  
-  <!-- Dialog for Astrid having a critical update -->
-  <string name="DLG_please_update">Astrid dovrebbe essere aggiornato alla versione più recente disponibile su Android market! Si prega di farlo prima di proseguire, o attendere qualche secondo.</string>
-
-  <!-- Button for going to Market -->
-
-  <!-- Button for accepting EULA -->
-  <string name="DLG_accept">Accetto</string>
-
-  <!-- Button for declining EULA -->
-  <string name="DLG_decline">Rifiuto</string>
-
-  <!-- EULA title -->
-  <string name="DLG_eula_title">Termini di Utilizzo di Astrid</string>
-
-  <!-- Progress Dialog generic text -->
-  <string name="DLG_please_wait">Attendi, per piacere</string>
-  
-  <!-- Dialog - loading -->
-  <string name="DLG_loading">Caricamento...</string>
-  
-  <!-- Dialog - dismiss -->
-
-  <!-- slide 20d -->
-  <string name="DLG_ok">OK</string>
-  <!-- slide 36g -->
-  <string name="DLG_cancel">Annulla</string>
-  
-  <string name="DLG_more">Ancora</string>
-  
-  <string name="DLG_undo">Annulla l\'ultima azione</string>
-  
-  <string name="DLG_warning">Attenzione</string>
-  
-  <!-- =============================================================== UI == -->
-  
-  <!-- Label for DateButtons with no value -->
-  <string name="WID_dateButtonUnset">Clicca per Impostare</string>
-  
-  <!-- String formatter for DateButtons ($D => date, $T => time) -->
-  
-  <!-- String formatter for Disable button -->
-  
-  <!--  ============================================================= notes -->
-  
-  <!-- Note Exposer -->    
-  
-  <!-- Note Exposer / Comments -->    
-  
-  <!-- EditNoteActivity - no comments -->
-  <string name="ENA_no_comments">Nessuna attività</string>
-    
-  <!-- EditNoteActivity - no username for comment -->
-  <string name="ENA_no_user">Qualcuno</string>
-  
-  <!-- EditNoteActivity - refresh comments -->
-  <string name="ENA_refresh_comments">Aggiorna i commenti</string>
-  
-  <!-- ================================================= TaskListActivity == -->
-  
-  <!-- slide 8b: Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">Nessuna Attività!</string>
-  
-  <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->    
-  <string name="TLA_no_items_person">%s non ha attività\ncondivise con te.</string>
-  
-  <!-- Menu: Adjust Sort and Hidden Task Settings -->    
-  <string name="TLA_menu_sort">Sort</string>
-  
-  <!-- Menu: Sync Now -->    
-  <string name="TLA_menu_sync">Sincronizza Ora</string>
-  
-  <!-- Menu: Search -->
-  <string name="TLA_menu_search">Cerca</string>
-  
-  <!-- Menu: Tasks -->
-  <string name="TLA_menu_lists">Liste</string>
-
-  <!-- Menu: Friends -->
-  <string name="TLA_menu_friends">Persone</string>
-
-  <!-- Menu: Featured Lists -->
-  <string name="TLA_menu_featured_lists">Liste in primo piano</string>
-
-  <!-- Menu: Suggestions -->
-  <string name="TLA_menu_suggestions">Suggerimenti</string>
-  
-  <!-- Menu: Tutorial -->
-
-  <!-- Menu: Settings -->    
-  <string name="TLA_menu_settings">Impostazioni</string>
-  
-  <!-- slide 30b: Menu: Support -->
-  <string name="TLA_menu_support">Supporto</string>
-  
-  <!-- Search Label-->
-  
-  <!-- Window title for displaying Custom Filter -->
-  <string name="TLA_custom">Personalizzato</string>
-  
-  <!-- slide 8d: Quick Add Edit Box Hint-->
-  <string name="TLA_quick_add_hint">Aggiungi un\'attività</string>
-  
-  <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
-  <string name="TLA_quick_add_hint_assign">Aggiungi qualcosa per %s</string>
-  
-  <!-- Notification Volumne notification-->
-  <string name="TLA_notification_volume_low">Le notifiche sono mutate. Non dovresti essere più in grado di sentire Astrid!</string>
-  
-  <!-- Notifications disabled warning -->
-  <string name="TLA_notification_disabled">I promemoria di Astrid sono disabilitati! Non riceverai nessun promemoria</string>
-  
-  <string-array name="TLA_filters">
-      <item>Attivo</item>
-      <item>Oggi</item>
-      <item>Tra poco</item>
-      <item>Tardi</item>
-      <item>Completata</item>
-      <item>Nascosto</item>      
-  </string-array>
-  
-  <!-- Title for confirmation dialog after quick add markup -->
-  <string name="TLA_quickadd_confirm_title">Hai detto, \"%s\"</string>
-  
-  <!-- Text for speech bubble in dialog after quick add markup -->
-  <!-- First string is task title, second is due date, third is priority -->
-  <string name="TLA_quickadd_confirm_speech_bubble">Ho creato un\'attività chiamata \"%1$s\" %2$s con %3$s</string>
-  
-  <string name="TLA_quickadd_confirm_speech_bubble_date">per %s</string>
-  
-  <string name="TLA_quickadd_confirm_hide_helpers">Non mostrare conferme future</string>
-  
-  
-  <!-- Title for alert on new repeating task. %s-> task title -->
-  <string name="TLA_repeat_scheduled_title">Nuova attività ricorrente: %s</string>
-  
-  <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
-  <string name="TLA_repeat_scheduled_speech_bubble">Ti ricorderò di questa per %s volte.</string>
-  
-  <string-array name="TLA_priority_strings">
-      <item>Massima priorità</item>
-      <item>priorità alta</item>
-      <item>priorità media</item>
-      <item>priorità bassa</item>
-  </string-array>
-  <!-- slide 22a -->
-  <string name="TLA_all_activity">Tutte le Attività</string>
-  
-  <!-- ====================================================== TaskAdapter == -->
-  
-  <!-- Format string to indicate task is hidden (%s => task name) -->
-  <string name="TAd_hiddenFormat">%s [Nascosto]</string>
-  
-  <!-- Format string to indicate task is deleted (%s => task name) -->
-  <string name="TAd_deletedFormat">%s [eliminato]</string>
-  
-  <!-- Displayed when adapter is flung (scrolled quickly) -->
-  
-  <!-- slide 22b: indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Terminata\n%s</string>
-  
-  <!-- slide 15a: Action Button: edit task -->
-  <string name="TAd_actionEditTask">Modifica</string>
-  
-  <!-- Context Item: edit task -->
-  <string name="TAd_contextEditTask">Modifica attività</string>
-
-  <!-- Context Item: copy task -->
-  <string name="TAd_contextCopyTask">Copia Attività</string>
-
-  <!-- Context Item: delete task -->
-  <string name="TAd_contextDeleteTask">Elimina attività</string>
-
-  <!-- Context Item: undelete task -->
-  <string name="TAd_contextUndeleteTask">Ripristina Attività</string>
-
-  <!-- Context Item: purge task -->
-  <string name="TAd_contextPurgeTask">Elimina Attività</string>
-  
-  <!-- ============================================== SortSelectionDialog == -->
-  
-  <!-- slide 23a: Sort Selection: dialog title -->    
-  <string name="SSD_title">Ordinamento e Attività Nascoste</string>
-  
-  <!-- slide 23h:  Hidden: title -->
-  <string name="SSD_hidden_title">Attività Nascoste</string>
-  
-  <!-- Hidden Task Selection: show completed tasks -->    
-  <string name="SSD_completed">Mostra Attività Collegate</string>
-  
-  <!-- Hidden Task Selection: show hidden tasks -->    
-  <string name="SSD_hidden">Mostra Attività Nascoste</string>
-  
-  <!-- Hidden Task Selection: show deleted tasks -->    
-  <string name="SSD_deleted">Mostra Attività Cancellate</string>
-  
-  <!-- Sort Selection: drag with subtasks -->
-  <string name="SSD_sort_drag">Manual order with subtasks</string>
-  
-  <!-- slide 23b: Sort Selection: smart sort -->
-  <string name="SSD_sort_auto">Ordinamento Intelligente</string>
-  
-  <!-- slide 23e: Sort Selection: sort by alpha -->
-  <string name="SSD_sort_alpha">Per Titotlo</string>
-  
-  <!-- slide 23c: Sort Selection: sort by due date -->
-  <string name="SSD_sort_due">Per scadenza</string>
-  
-  <!-- slide 23d: Sort Selection: sort by importance -->
-  <string name="SSD_sort_importance">By priority</string>
-  
-  <!-- slide 23f: Sort Selection: sort by modified date -->
-  <string name="SSD_sort_modified">Per Ultima Modifica</string>
-  
-  <!-- slide 23g: Sort Selection: reverse -->
-  <string name="SSD_sort_reverse">Inverti Ordinamento</string>
-  
-  <!-- slide 23j: Sort Button: sort temporarily -->
-  <string name="SSD_save_temp">Solo una Volta</string>
-  
-  <!-- slide 23i: Sort Button: sort permanently -->
-  <string name="SSD_save_always">Sempre</string>
-  
-  <!-- =============================================== FilterListActivity == -->
-  
-  <!-- Astrid Filter Shortcut -->    
-  <string name="FSA_label">Lista Astrid o Filtra</string>
-
-  <!-- Filter List Activity Title -->    
-  
-  <!-- Displayed when loading filters -->    
-  
-  <!-- Context Menu: Create Shortcut -->    
-  <string name="FLA_context_shortcut">Crea collegamento sul Desktop</string>
-  
-  <!-- Menu: Search -->
-  
-  <!-- Menu: Help -->    
-  
-  <!-- slide 28c: Create Shortcut Dialog Title -->    
-  <string name="FLA_shortcut_dialog_title">Crea scorciatoia</string>
-  
-  <!-- Create Shortcut Dialog (asks to name shortcut) -->    
-  <string name="FLA_shortcut_dialog">Nome della scorciatoia:</string>
-  
-  <!-- Search Hint-->
-  <string name="FLA_search_hint">Cerca Per Attività</string>
-  
-  <!-- Search Filter name (%s => query) -->
-  <string name="FLA_search_filter">Confrontando \'%s\'</string>
-  
-  <!-- Toast: created shortcut (%s => label) -->
-  <string name="FLA_toast_onCreateShortcut">Creata Scorciatoia: %s</string>
-  
-  <!-- Menu: new filter -->
-  <string name="FLA_new_filter">Nuovo Filtro</string>
-  
-  <!-- slide 10e: Button: new list -->
-  <string name="FLA_new_list">Nuova lista</string>
-  
-  <!-- Alert when creating a shortcut without selecting a filter -->
-  <string name="FLA_no_filter_selected">Filtro non selezionato! Perfavore seleziona un filtro o una lista.</string>
-  
-  <!-- ================================================= TaskEditActivity == -->
-  
-  <!-- Title when editing a task (%s => task title) -->
-  
-  <!-- Title when creating a new task -->
-  
-  <!-- Task title label -->
-  
-  <!-- Task when label -->
-  <string name="TEA_when_header_label">Quando</string>
-  
-  <!-- Task title hint (displayed when edit box is empty) -->
-  <string name="TEA_title_hint">Task name</string>
-  
-  <!-- Task importance label -->
-  <string name="TEA_importance_label">Priorità</string>
-  
-  <!-- Task due date hint -->
-  <string name="TEA_deadline_hint">Set due date</string>
-  
-  <!-- Task assigned to string (%s -> assigned person name) -->
-  <string name="TEA_assigned_to">Assigned to %s</string>
-  
-  <!-- Task urgency specific time checkbox -->
-  <string name="TEA_urgency_specific_time">In un orario specifico?</string>
-  
-  <!-- Task urgency specific time title when specific time false -->
-  <string name="TEA_urgency_none">Nessuna</string>
-  
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_label">Hide until</string>
-
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_display">Hide until %s</string>
-  
-  <!-- Task hide until toast -->
-  <string name="TEA_hideUntil_message">L\'attività verrà nascosta fino a: %s</string>
-  
-  <!-- Task editing data being loaded label -->
-  <string-array name="TEA_loading"><item>Caricamento...</item></string-array>
-  
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_note_label">Descrizione</string>
-
-  <!-- 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">Quanto tempo impiegherà?</string>
-  
-  <!-- Elapsed time label -->
-  <string name="TEA_elapsedDuration_label">Tempo già speso per l\'attività</string>
-
-  <!-- Menu: Save -->    
-  <string name="TEA_menu_save">Salva le modifiche</string>
-  
-  <!-- Menu: Don\'t Save -->
-  <string name="TEA_menu_discard">Non salvare</string>
-  
-  <!-- Menu: Delete Task -->
-  <string name="TEA_menu_delete">Elimina attività</string>
-  
-  <!-- Menu: Task comments -->
-  <string name="TEA_menu_refresh_comments">Refresh comments</string>
-
-  <string name="TEA_menu_comments">Commenti</string>
-  
-   <!-- Toast: task saved with deadline (%s => preposition + time units) -->
-  <string name="TEA_onTaskSave_due">Attività Salvata: entro %s</string>
-  
-  <!-- Toast: task saved without deadlines -->
-  <string name="TEA_onTaskSave_notDue">Attvità salvata</string>
-  
-  <!-- Toast: task was not saved -->
-  
-  <!-- Toast: task was deleted -->
-  
-  <!-- slide 15b: Task edit tab: activity -->
-  <string name="TEA_tab_activity">Attività</string>
-  
-  <!-- slide 15e:  Task edit tab: more editing settings -->
-  <string name="TEA_tab_more">Altro</string>
-  
-  <!-- slide 15d: Task edit tab: web services -->
-  <string name="TEA_tab_web">Idee</string>
-  
-  <string name="TEA_timer_est">Est. %s</string>
-
-  <string name="TEA_timer_elap">Elapsed %s</string>
-  
-  <string-array name="TEA_urgency">
-      <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No date</item>
-      <item>Giorno specifico</item>
-      <item>Oggi</item>
-      <item>Domani</item>
-      <item>(giorno dopo)</item>
-      <item>Settimana successiva</item>
-      <item>Ogni due settimane</item>
-      <item>Mese successivo</item>
-  </string-array>
-  
-  <string name="TEA_no_time">Nessuna ora</string>
-      
-  <string-array name="TEA_hideUntil">
-      <!-- hideUntil: labels for edit page. -->
-      <item>Never</item>
-      <item>Data di scadenza</item>
-      <item>Due time</item>
-      <item>Day before due</item>
-      <item>Week before due</item>
-      <item>Giorno/Tempo Specifici</item>
-  </string-array>
-  
-  <!-- Task edit control set descriptors -->
-
-  <!-- slide 9b/35i -->
-  <string name="TEA_control_who">Chi</string>
-
-  <!-- slide 9c/ 35a -->
-  <string name="TEA_control_when">Quando</string>
-  <!-- slide 35b -->
-  <string name="TEA_control_more_section">----More Section----</string>
-  <!-- slide 16a/35c -->
-  <string name="TEA_control_importance">Priorità</string>  
-  <!-- slide 16b/35d -->
-  <string name="TEA_control_lists">Liste</string>  
-  <!-- slide 16c/35e -->
-  <string name="TEA_control_notes">Descrizione</string>  
-  
-  <string name="TEA_control_files">Files</string>
-
-  <!-- slide 16e / slide 35g-->
-  <string name="TEA_control_reminders">Promemoria</string>
-
-  <!-- slide 16f -->
-  <string name="TEA_control_timer">Regolazioni Tempo</string>
-  
-  <string name="TEA_control_hidden_section">----Nascondi Sempre----</string>
-  
-  <string name="hide_until_prompt">Mostra nella mia lista</string>
-  
-  <!-- Add Ons tab when no add-ons found -->
-  
-  <!-- Add Ons button -->
-  
-  <!-- More row -->
-  
-  <!-- slide 15c: Text when no activity to show -->
-  <string name="TEA_no_activity">Nessuna attività</string>
-  
-  <!-- Text to load more activity -->
-  <string name="TEA_load_more">Caricane di più...</string>
-  
-  <!-- When controls dialog -->
-  <string name="TEA_when_dialog_title">Quando dovrà terminare?</string>
-  
-  
-  <string name="TEA_new_task">Nuova Attività</string>
-  
-  <string name="WSV_click_to_load">Cliccami per cercare il modo di effettuare questa operazione.</string>
-  
-  <string name="WSV_not_online">Posso fare di più se sono connesso a Internet. Controlla la tua connessione</string>
-  
-  <string name="TEA_contact_error">Scusa! Non riusciamo a trovare un indirizzo email per il contatto selezionato.</string>
-  
-  <!-- ============================================= IntroductionActivity == -->
-  
-  <!-- slide 1a: Introduction Window title -->
-  
-  <!-- Button to agree to EULA -->
-  
-  <!-- Button to disagree with EULA -->
-  
-  <!-- ===================================================== MissedCallActivity == -->
-  
-  <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
-  <string name="MCA_title">%1$s\nha chiamato alle %2$s</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_return_call">Chiama ora</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_add_task">Chiama più tardi</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_ignore">Ignora</string>
-  
-  <!-- Missed call: dialog to ignore all missed calls title -->
-  <string name="MCA_ignore_title">Ignorare tutte le chiamate perse?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls body -->
-  <string name="MCA_ignore_body">Tu hai ignorato varie chiamate perse. Astrid dovrebbe smettere di chiedere a riguardo?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore all button -->
-  <string name="MCA_ignore_all">Ignora tutte le chiamate</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
-  <string name="MCA_ignore_this">Ignora solo questa chiamata</string>
-
-  <!-- Missed call: preference title -->
-  <string name="MCA_missed_calls_pref_title">Campo chiamate perse</string>
-
-  <!-- slide 49c: Missed call: preference description -->
-  <string name="MCA_missed_calls_pref_desc_enabled">Astrid ti notificherà per le chiamate perse e ti offrirà di ricordarti di richiamare</string>
-  <string name="MCA_missed_calls_pref_desc_disabled">Astrid non ti notificherà per le chiamate perse</string>
-
-  <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
-  <string name="MCA_task_title_name">Richiama %1$s al %2$s</string>
-
-  <!-- Missed call: task title no name (%s -> number)-->
-  <string name="MCA_task_title_no_name">Richiama %s</string>
-  
-  <!-- Missed call: schedule dialog title (%s -> name or number)-->
-  <string name="MCA_schedule_dialog_title">Richiama %s tra...</string>
-  
-  <!-- Missed call speech bubble options -->
-  <string-array name="MCA_dialog_speech_options">
-      <item>Dev\'essere fantastico essere così popolari!</item>
-      <item>Yay! Piaci alla gente!</item>
-      <item>Rendili felici, telefonagli!</item>
-      <item>Non saresti felice se le persone ti richiamassero?</item>
-      <item>Puoi farlo!</item>
-      <item>Puoi sempre inviare un messaggio...</item>
-  </string-array>
-  
-  
-  <!-- ======================================= Calendar reminder activity == -->
-  
-  <!-- Calendar remindeer ignore button -->
-  <string name="CRA_ignore">Ignora</string>
-  
-  <!-- Calendar event -->
-  <string name="CRA_title">Hai bisogno di una lista per le riunioni?</string>
-  
-  <!-- Calendar reminder: dialog to ignore all missed calls title -->
-  <string name="CRA_ignore_title">Ignora tutti gli eventi del calendario?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls body -->
-  <string name="CRA_ignore_body">Tu hai ignorato varie chiamate perse. Astrid dovrebbe smettere di chiedere a riguardo?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
-  <string name="CRA_ignore_all">Ignora tutti gli eventi</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
-  <string name="CRA_ignore_this">Ignora solo questo evento</string>
-  
-  <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
-  <string name="CRA_speech_bubble_start">Sembra che %s stia per iniziare. Vuoi creare una lista per le azioni?</string>
-
-  <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
-  <string name="CRA_speech_bubble_end">Sembra che tu abbia appena terminato %s. Vuoi creare una lista per le azioni?</string>
-  
-  <!-- Calendar reminder: create list button -->
-  <string name="CRA_create_list">Crea la lista</string>
-
-  <!-- Calendar reminder: postpone button -->
-  <string name="CRA_postpone">Forse in seguito</string>
-  
-  <!-- Calendar reminder: list exists dialog title -->
-  <string name="CRA_list_exists_title">La lista è già esistente</string>
-  
-  <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
-  <string name="CRA_list_exists_body">Una lista chiamata %s è già esistente. Vuoi usare la lista esistente o crearne una nuova per questo evento?</string>
-  
-  <!-- Calendar reminder: list exists dialog create new button -->
-  <string name="CRA_create_new">Crea nuovo</string>
-
-  <!-- Calendar reminder: list exists dialog use existing button -->
-  <string name="CRA_use_existing">Usa l\'esistente</string>
-  
-  <!-- Calendar remindr: created list (%s -> list name) -->
-  <string name="CRA_created_list_dialog">Ho creato una lista chiamata %s</string>
-  
-  <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
-  <string name="CRA_one_attendee">%s è in attesa</string>
-
-  <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
-  <string name="CRA_two_attendees">%1$s e %2$s sono in attesa.</string>
-
-  <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
-  <string name="CRA_many_attendees">%1$s, %2$s, e %3$d altre sono in attesa.</string>
-  
-  <!-- Calendar reminder: invitation prompt -->
-  <string name="CRA_invitation_prompt">Vuoi invitarli?</string>
-  
-  <!-- Calendar reminder: preference title -->
-  <string name="CRA_calendar_reminders_pref_title">Assistente del Calendario</string>
-
-  <!-- Calendar reminder: pref description disabled -->
-  <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid non ti avviserà dei prossimi eventi sul calendario</string>
-
-  <!-- Calendar reminder: pref description enabled -->
-  <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid ti avviserà dei prossimi eventi sul calendario e ti chiederà di prepararti a questi</string>
-  
-  <!-- Calendar reminder: share list title -->
-  <string name="CRA_share_list_title">Condividi la lista?</string>
-  
-  <string name="CRA_invite_attendees">Invita partecipanti</string>
-
-  <string name="CRA_more_options">Più opzioni</string>
-
-  <string name="CRA_dont_invite">No, grazie</string>
-
-  <!-- Calendar reminder: share list title when no other attendees exist-->
-  <string name="CRA_list_created_title">Lista creata!</string>
-  
-  <!-- Calendar reminder: default new list name (%s -> event title) -->
-  <string name="CRA_default_list_name">Azioni: %s</string>
-  
-  <!-- ===================================================== HelpActivity == -->
-  
-  <!-- Help: Button to get support from our website -->
-    
-  <!-- ==================================================== UpdateService == -->
-  
-  <!-- Changelog Window Title -->
-  <string name="UpS_changelog_title">Novità in Astrid?</string>
-  
-  <!-- Updates Window Title -->
-  <string name="UpS_updates_title">Ultime Novità di Astrid</string>
-  
-  <!-- Updats No Activity to show for offline users -->
-  <string name="UpS_no_activity_log_in">Effettua il login per vedere\nla storia del tuo avanzamento\ne le attività sulle liste condivise</string>
-  
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 31g: Preference Window Title -->
-  <string name="EPr_title">Astrid: Preferenze</string>
-  
-  <string name="EPr_share_astrid">Share Astrid</string>
-
-  <string name="EPr_share_astrid_summary">Condividi Astrid nel tuo social network preferito</string>
-  
-  <!-- slide 46a -->
-  <string name="EPr_deactivated">disattivato</string>
-
-  <!-- slide 30i: Preference Category: Appearance Title -->
-  <string name="EPr_appearance_header">Aspetto</string>
-  
-  <!-- Preference Category: Appearance Summary -->
-  <string name="EPr_appearance_summary">Temi, widgets, righe delle attività, modifica schermo</string>
-  
-  <!-- FAQ Preference title -->
-  <string name="EPr_faq_title">FAQ</string>
-  
-  <!-- Account status preference (%s -> account type) -->
-  <string name="EPr_account_title">Account: %s</string>
-
-  <!-- Support preferences summary -->
-  <string name="EPr_support_summary">Tutorial, FAQ, about</string>
-  
-  <!-- slide 34a: Preference: Task List Font Size Title -->
-  <string name="EPr_fontSize_title">Dimensione dell\'elenco di attività</string>
-  
-  <!-- Preference: Filters to show pref screen title -->
-  <string name="EPr_filters_to_show_title">Filters to show</string>
-  
-  <!-- slide 32a: Preference: Show confirmation for smart reminders -->
-  <string name="EPr_showSmartConfirmation_title">Mostra conferma per promemoria rapidi</string>
-  
-  <!-- slide 34g: Preference: Task List Font Size Description -->                                                                                                                                                  
-  <string name="EPr_fontSize_desc">Dimensione carattere nella pagina principale</string>  
-  
-  <!-- Preferemce: Show task edit confirmation toasts -->
-  
-  <!-- slide 34c: Preference: Task List Show Notes -->
-  <string name="EPr_showNotes_title">Show description in task</string>
-  
-  <!-- Edit screen preference category -->
-  <string name="EPr_edit_screen_options">Edit screen options</string>
-  
-  <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
-  <string name="EPr_beastMode_title">Edit screen order</string>
-  
-  <string name="EPr_beastMode_shortcut">Customize</string>
-  
-  <string name="EPr_time_increment">5 minute increments</string>
-  
-  <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
-  
-  <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
-  
-  <!-- slide 35h -->
-  <string name="EPr_beastMode_desc">Personalizza il layout della schermata di modifica attività</string>
-  <!-- slide 35j -->
-  <string name="EPr_beastMode_reset">Ripristina predefiniti</string>
-  
-  <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on each row</string>
-      
-  <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit screen</string>  
-  <!-- Preference: Task List Show Notes Description (enabled) -->
-  <string name="EPr_showNotes_desc_enabled">Description will always be displayed</string>
-  
-  <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
-  <string name="EPr_compressTaskRows_title">Compatta la riga dell\'attività</string>
-  <!-- slide 34j -->
-  <string name="EPr_compressTaskRows_desc">Adatta la riga dell\'attività alla dimensione del titolo</string>
-  
-  <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
-  <!-- slide 34k-->
-  
-  <!-- slide 34b: Preferences: Wrap task titles to two lines -->
-  <string name="EPr_fullTask_title">Visualizza titolo completo dell\'attività</string>
-  <string name="EPr_fullTask_desc_enabled">Sarà mostrato il titolo completo</string>
-  <!-- slide 34h -->
-  <string name="EPr_fullTask_desc_disabled">Saranno mostrate le prime due righe del titolo dell\'attività</string>
-  
-  <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
-  <string name="EPr_ideaAuto_title">Carica automaticamente il tab delle Idee</string>
-  <!-- slide 32c -->
-  <string name="EPr_ideaAuto_desc_enabled">Le ricerche su web del tab Idee saranno effettuate quando cliccherai sul tab</string>
-  <string name="EPr_ideaAuto_desc_disabled">Le ricerche su web del tab Idee saranno effettuate solo quando richieste manualmente</string>
-  
-  <!-- Preferences: task row style -->
-  <string-array name="EPr_task_row_styles">
-      <item>Original</item>
-      <item>Simple</item>
-      <item>Title only</item>
-  </string-array>
-  
-  <string-array name="EPr_task_row_style_descriptions">
-      <item>Riduci il titolo a due righe con la data a destra</item>
-      <item>Riduci il titolo a una riga con la data e gli elenchi sotto</item>
-      <item>Single line title only</item>
-  </string-array>
-  
-  <!-- task row style title (%s -> style) -->
-  <string name="EPr_task_row_style_title">Row style: %s</string>
-  
-  <!-- Preference: custom filters enabled -->
-  <string name="EPr_use_filters_title">Use filters</string>
-  <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
-
-  <!-- Preference: show list members in shared list -->
-  <string name="EPr_show_list_members_title">Show list members in shared lists</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_simple_input_boxes">Simple text boxes</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
-
-  <!-- Preference: don\'t show plus button until input present -->
-  <string name="EPr_hide_plus_button">Hide plus button</string>
-
-  <!-- Preference: menu items -->
-  <string name="EPr_menu_items">Menu items</string>
-
-  <!-- Preference: list view -->
-  <string name="EPr_list_view">List view</string>
-
-  <!-- Preference: task edit comments -->
-  <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
-  
-  <!-- slide 30f/ 36f: Preference: Theme -->
-  <string name="EPr_theme_title">Tema del colore</string>
-  <!-- Preference: Theme Description (%s => value) -->
-  <string name="EPr_theme_desc">Attualmente: %s</string>  
-  <!-- Preference: Theme Description (android 1.6) -->
-  <string name="EPr_theme_desc_unsupported">L\'impostazione richiede Android 2.0+</string>
-  <!-- slide 32h/ 37b -->
-  <string name="EPr_theme_widget_title">Tema del widget</string>
-  
-  <!-- slide 30d/ 34f: Preference screen: all task row settings -->
-  <string name="EPr_taskRowPrefs_title">Aspetto della riga dei task</string>
-  
-  <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
-  <string name="EPr_use_contact_picker">Usa il selettore contatto</string>
-  <!-- slide 49b -->
-  <string name="EPr_use_contact_picker_desc_enabled">L\'opzione del sistema di selezione del contatto sarà mostrata nella finestra di assegnazione dell\'attività</string>
-  <string name="EPr_use_contact_picker_desc_disabled">L\'opzione del sistema di selezione del contatto non sarà mostrata</string>
-
-  <!-- slide 49i: Preferences: Third party addons -->
-  <string name="EPr_third_party_addons">Abilita componenti aggiuntivi di terze parti</string>
-  <string name="EPr_third_party_addons_desc_enabled">Gli Add-ons di terze parti saranno abilitati</string>
-  <!-- slide 49d -->
-  <string name="EPr_third_party_addons_desc_disabled">Gli Add-ons di terze parti saranno disabilitati</string>
-  
-  <!-- Preferences: ideas tab -->
-  <string name="EPr_ideas_tab_enabled">Suggerimenti</string>
-  <string name="EPr_ideas_tab_description">Ottieni idee per aiutarti a completare le attività</string>
-  
-  <!-- Preferences: calendar event start time -->
-  <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
-  <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
-  <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
-  
-  <string name="EPr_force_phone_layout">Usa il layout del telefono</string>
-
-  <string name="EPr_show_featured_lists">Mostra le liste caratterizzanti</string>
-  
-  <!-- Configurations -->
-  <string name="EPr_configurations_title">Set configuration</string>
-  <string name="EPr_config_default">Default</string>
-  <string name="EPr_config_lite">Astrid Lite</string>
-  
-  <!-- Dialog title when setting preference configuration -->
-  <string name="EPr_config_dialog_title">Set configuration?</string>
-  <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
-  <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
-  
-  <!-- default configuration name for the above dialog -->
-  <string name="EPr_config_dialog_default_id">default</string>
-  
-  <!-- Preference title for showing save and cancel buttons in task edit page -->
-  <string name="EPr_show_save_and_cancel">Show save and cancel </string>
-  
-  
-  <!-- Swipe between lists -->
-  <!-- Preference: swipe between lists performance -->
-  <string name="EPr_swipe_lists_performance_title">Scorri tra le liste</string>
-  
-  <string-array name="EPr_swipe_lists_performance_mode">
-      <item>No scorrimento</item>
-      <item>Conserva Memoria</item>
-      <item>Prestazione Normale</item>
-      <item>Alte Prestazioni</item>
-  </string-array>
-  
-  <string-array name="EPr_swipe_lists_performance_desc">
-  <!-- slide 49a -->
-      <item>Scorrimento tra liste disabilitato</item>
-      <item>Prestazioni lente</item>
-      <item>Impostazione predefinita</item>
-      <item>Usa più risorse di sistema</item>
-  </string-array>
-    
-  <string name="swipe_lists_helper_title">Scorri tra le liste</string>
-  <string name="swipe_lists_helper_header">Scorri a destra o a sinistra per muoverti rapidamente fra le liste</string>
-  <string name="swipe_lists_helper_subtitle">Modifica le impostazioni in Impostazioni -> Aspetto</string>
-
-  <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
-  
-  <string-array name="EPr_default_reminders_mode">
-      <!-- reminders duration: labels for "Task Defaults" preference item. -->
-      <item>@string/TEA_reminder_mode_once</item>
-      <item>@string/TEA_reminder_mode_five</item>
-      <item>@string/TEA_reminder_mode_nonstop</item>
-  </string-array>
-    
-  <string-array name="EPr_themes">
-    <!-- theme_settings: labels for Theme preference menu -->
-    <!-- slide 36a-->
-    <item>Giorno - Blu</item>
-    <!-- slide 36b -->
-    <item>Giorno - Rosso</item>
-    <!-- slide 36b -->
-    <item>Sky blue</item>
-    <!-- slide 36c -->
-    <item>Night</item>
-    <!-- slide 36d -->
-    <item>Transparent (white text)</item>
-    <!-- slide 36e -->
-    <item>Transparent (Black Text)</item>
-  </string-array>
-  
-  <string-array name="EPr_themes_widget">
-    <!-- slide 32i / 37a-->
-    <item>Come l\'app</item>
-    <item>Giorno - Blu</item>
-    <item>Giorno - Rosso</item>
-    <item>Sky blue</item>
-    <item>Night</item>
-    <item>Transparent (white text)</item>
-    <item>Transparent (black text)</item>
-    <item>Vecchio Stile</item>
-  </string-array>
-  
-  <!-- ========================================== Task Management Settings == -->
-
-  <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
-  <string name="EPr_manage_header">Gestisci compiti vecchi</string>
-  <!-- slide 47d -->
-  <string name="EPr_manage_delete_completed">Elimina i compiti completati</string>
-  <string name="EPr_manage_delete_completed_message">Vuoi davvero eliminare tutti i compiti completati?</string>
-  <!-- slide 47a -->
-  <string name="EPr_manage_delete_completed_summary">I compiti eliminati possono essere ripristinati uno ad uno</string>
-  <string name="EPr_manage_delete_completed_status">Eliminate %d attività!</string>
-  <!-- slide 47e -->
-  <string name="EPr_manage_purge_deleted">Elimina definitivamente i compiti eliminati</string>
-  <string name="EPr_manage_purge_deleted_message">Vuoi davvero eliminare definitivamente i compiti eliminati?\n\nQuesti compiti saranno persi per sempre!</string>
-  <string name="EPr_manage_purge_deleted_status">Rimosse %d attività!</string>
-  <!-- slide 47b-->
-  <string name="EPr_manage_purge_deleted_summary">Attenzione! I compiti eliminati definitivamente non possono essere recuperati senza file di backup!</string>
-  <!-- slide 47h-->
-  <string name="EPr_manage_clear_all">Elimina tutti i dati</string>
-  <string name="EPr_manage_clear_all_message">Elimina tutti i programmi e tutte le impostazioni in Astrid?\n\nWarning: non può essere annullato!</string>
-
-  <!-- slide 47f -->
-  <string name="EPr_manage_delete_completed_gcal">Elimina gli eventi del calendario in programmi completati</string>
-  <string name="EPr_manage_delete_completed_gcal_message">Vuoi davvero eliminare tutti gli eventi in programmi completati?</string>
-  <string name="EPr_manage_delete_completed_gcal_summary"></string>
-  <string name="EPr_manage_delete_completed_gcal_status">Eliminato il %d degli eventi del calendario!</string>
-      
-  <!-- slide 47g-->
-  <string name="EPr_manage_delete_all_gcal">Elimina tutti gli eventi del calendario in programmi</string>
-  <string name="EPr_manage_delete_all_gcal_message">Vuoi davvero eliminare tutti i tuoi eventi in programmi?</string>
-  <string name="EPr_manage_delete_all_gcal_summary"></string>
-  <string name="EPr_manage_delete_all_gcal_status">Eliminato il %d degli eventi del calendario!</string>
-      
-  <!-- ==================================================== AddOnActivity == -->
-  
-  <!-- Add Ons Activity Title -->
-  <string name="AOA_title">Componenti aggiuntivi</string>
-    
-  <!-- Add-on Activity: author for internal authors  -->
-  <string name="AOA_internal_author">Team Astrid</string>
-    
-  <!-- Add-on Activity: installed add-ons tab -->
-  <string name="AOA_tab_installed">Installato</string>
-  
-  <!-- Add-on Activity - available add-ons tab -->
-  <string name="AOA_tab_available">Disponibile</string>
-  
-  <!-- Add-on Activity - free add-ons label -->
-  <string name="AOA_free">Gratuito</string>
-  
-  <!-- Add-on Activity - menu item to visit add-on website -->
-  
-  <!-- Add-on Activity - menu item to visit android market -->
-  
-  <!-- Add-on Activity - when list is empty -->
-  <string name="AOA_no_addons">Lista vuota!</string>
-  
-  <string name="AOA_ppack_title">Astrid Power Pack</string>
-  <string name="AOA_ppack_description">Sostieni Astrid e diventa più produttivo con Astrid Power Pack. 4x2 e 4x4 di widgets e integrazione vocale. Provalo adesso!</string>
-  <string name="AOA_locale_title">Plugin Astrid per Locale</string>
-  <string name="AOA_locale_description">Consenti ad Astrid di usare l\'applicazione Locale per inviarti notifiche in base ai tuoi filtri. è richiesta l\'applicazione Locale.</string>
-  
-  <!-- ====================================================== TasksWidget == -->
-
-  <!-- Widget text when loading tasks -->
-  <string name="TWi_loading">Caricamento...</string>
-
-  <!-- Widget configuration activity title: select a filter -->
-  <string name="WCA_title">Seleziona le attività da visualizzare...</string>
-  
-  <!-- ======================================================== Waiting on me -->
-
-  <string name="wom_commented">%s commented on your task.</string>
-  <string name="wom_mentioned">%s mentioned you.</string>
-  <string name="wom_assigned">%s assigned this to you.</string>
-  <string name="wom_raised_pri">%s raised the priority.</string>
-  <string name="wom_changed_due">%s changed the due date.</string>
-  <string name="wom_default">%s wants your attention.</string>
-  
-  <string name="wom_dismiss">Dismiss</string>
-  <string name="wom_acknowledge">I\'ve read this</string>
-
-  <!-- ============================================================= About == -->
-  
-  <!-- slide 30h: Title of "About" option in settings -->
-  <string name="p_about">Informazioni su Astrid</string>
-  
-  <!-- About text (%s => current version)-->
-  <string name="p_about_text">Versione attuale: %s\n\n
-Astrid è un open-source ed è sostenuto con orgoglio da Todoroo, Inc.</string>
-
-  <!-- Title of "Help" option in settings -->
-  <string name="p_help">Supporto</string>
-  
-  <!-- slide 30c: Title of "Forums" option in settings -->
-  <string name="p_forums">Forum</string>
-  
-  <!-- Title of "Premium" option in settings -->
-  <string name="p_premium">Premium</string>
-  
-  <!-- ============================================================= Misc == -->
-  
-  <string name="feedback_positive_title">Rate Astrid?</string>
-
-  <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star rating?</string>
-
-  <string name="feedback_negative_title">Leave feedback?</string>
-
-  <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
-
-  <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback section--it might not be available on your device.</string>
-  
-  <string name="feedback_positive_button">Rate Astrid</string>
-
-  <string name="feedback_negative_button">Leave feedback</string>
-  
-  <string name="feedback_not_now">Not now</string>
-  
-  <string name="feedback_banner_text">How\'s Astrid working for you?</string>
-  
-  <!-- Displayed when task killer found. %s => name of the application -->
-  <string name="task_killer_help">Sembra che si stia utilizzando un\'applicazione che può terminare i processi (%s)! Se è possibile, aggiungere Astrid all\'elenco di esclusione in modo che non venga terminato. Contrariamente, Astrid potrebbe non avvisarti quando le tue attività saranno compiute.\n</string>
-  
-  <!-- Task killer dialog ok button -->
-  <string name="task_killer_help_ok">Voglio terminare Astrid!</string>
-    
-  <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
-  
-  <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
-  <string name="marketplace_description">Astrid è la lista / gestore di attività personali open-source che tutti amano, preparata per aiutarti a portare a termine le tue attività. Ti permette di impostare promemoria, etichette, di sincronizzare, ha un plugin per la localizzazione, un widget e molto altro.</string>
-  
-  <string name="DB_corrupted_title">Database corrotto</string>
-  
-  <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->Sincronizzazione e backup->Gestire tutti i dati->Cancellare tutti i dati) e ripristinare i tuoi task da un backup in Astrid (Impostazioni->Sincronizzazione e backup->Backup->Importa task).</string>
-      
-  <string name="market_unavailable">Sfortunatamente il market non è disponibile sul tuo sistema.</string>
-  
+    <!-- Add-on Activity - menu item to visit add-on website -->
+
+    <!-- Add-on Activity - menu item to visit android market -->
+
+    <!-- Add-on Activity - when list is empty -->
+    <string name="AOA_no_addons">Lista vuota!</string>
+
+    <string name="AOA_ppack_title">Astrid Power Pack</string>
+    <string name="AOA_ppack_description">Sostieni Astrid e diventa più produttivo con Astrid Power
+        Pack. 4x2 e 4x4 di widgets e integrazione vocale. Provalo adesso!
+    </string>
+    <string name="AOA_locale_title">Plugin Astrid per Locale</string>
+    <string name="AOA_locale_description">Consenti ad Astrid di usare l\'applicazione Locale per
+        inviarti notifiche in base ai tuoi filtri. è richiesta l\'applicazione Locale.
+    </string>
+
+    <!-- ====================================================== TasksWidget == -->
 
+    <!-- Widget text when loading tasks -->
+    <string name="TWi_loading">Caricamento...</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Widget configuration activity title: select a filter -->
+    <string name="WCA_title">Seleziona le attività da visualizzare...</string>
 
+    <!-- ======================================================== Waiting on me -->
+
+    <string name="wom_commented">%s commented on your task.</string>
+    <string name="wom_mentioned">%s mentioned you.</string>
+    <string name="wom_assigned">%s assigned this to you.</string>
+    <string name="wom_raised_pri">%s raised the priority.</string>
+    <string name="wom_changed_due">%s changed the due date.</string>
+    <string name="wom_default">%s wants your attention.</string>
+
+    <string name="wom_dismiss">Dismiss</string>
+    <string name="wom_acknowledge">I\'ve read this</string>
+
+    <!-- ============================================================= About == -->
+
+    <!-- slide 30h: Title of "About" option in settings -->
+    <string name="p_about">Informazioni su Astrid</string>
+
+    <!-- About text (%s => current version)-->
+    <string name="p_about_text">Versione attuale: %s\n\n
+        Astrid è un open-source ed è sostenuto con orgoglio da Todoroo, Inc.
+    </string>
 
-  <!-- slide 32g: Preference Category: Defaults Title -->
-  <string name="EPr_defaults_header">Nuove impostazioni predefinite attività</string>
-  <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
-  
-  <!-- slide 41f:  Preference: Default Urgency Title -->
-  <string name="EPr_default_urgency_title">Urgenza Predefinita</string>
-  <!-- Preference: Default Urgency Description (%s => setting) -->
-  <string name="EPr_default_urgency_desc">Attualmente: %s</string>
-  
-  <!-- slide 40a: Preference: Default Importance Title -->
-  <string name="EPr_default_importance_title">Default priority</string>
-  <!-- Preference: Default Importance Description (%s => setting) -->
-  <string name="EPr_default_importance_desc">Attualmente: %s</string>
-  
-  <!-- slide 42e: Preference: Default Hide Until Title -->
-  <string name="EPr_default_hideUntil_title">Nascondi Fino Predefinito</string>
-  <!-- Preference: Default Hide Until Description (%s => setting) -->
-  <string name="EPr_default_hideUntil_desc">Attualmente: %s</string>
-  
-  <!-- slide 43e: Preference: Default Reminders Title -->
-  <string name="EPr_default_reminders_title">Promemoria predefiniti</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_desc">Attualmente: %s</string>
-  
-  <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
-  <string name="EPr_default_addtocalendar_title">Aggiungi automaticamente al calendario</string>
-  <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
-  <string name="EPr_default_addtocalendar_desc_disabled">Nuovi programmi non creerà alcun evento in Google Calendar</string>
-  <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
-  <string name="EPr_default_addtocalendar_desc">Le nuove attività verranno inserite nel calendario: \"%s\"</string>
-  
-  <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
-  <string name="EPr_default_reminders_mode_title">Tipo di squillo/vibrazione predefinito</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_mode_desc">Attualmente: %s</string>
-  
-  <string-array name="EPr_default_importance">
-    <!-- importance: labels for "Task Defaults" preference item. -->
-    <!-- slide 40b -->
-    <item>!!! (Massima)</item>
-    <item>!!</item>
-    <item>!</item>
-    <!-- slide 40c -->
-    <item>o (Minima)</item>
-  </string-array>
-  
-  <string-array name="EPr_default_urgency">
-    <!-- urgency: labels for "Task Defaults" preference item. -->
-    <!-- slide 41a-->
-    <item>Nessun Termine</item>
-    <!-- slide 41b -->
-    <item>Oggi</item>
-    <!-- slide 41c-->
-    <item>Domani</item>
-    <!-- slide 41d -->
-    <item>Dopodomani</item>
-    <!-- slide 41e -->
-    <item>Prossima Settimana</item>
-  </string-array>
-  
-  <string-array name="EPr_default_hideUntil">
-    <!-- hideUntil: labels for "Task Defaults" preference item. -->
-    <!-- slide 42a -->
-    <item>Non nascondere</item>
-    <!-- slide 42b -->
-    <item>Attività completata</item>
-    <!-- slide 42c -->
-    <item>Giorno prima della scadenza</item>
-    <!-- slide 42d-->
-    <item>Settimana prima della scadenza</item>
-  </string-array>
-  
-  <string-array name="EPr_default_reminders">
-    <!-- reminders: labels for "Task Defaults" preference item. -->
-    <!-- slide 43a -->
-    <item>Nessun promemoria scadenza</item>
-    <!-- slide 43b -->
-    <item>Alla scadenza</item>
-    <!-- slide 43c -->
-    <item>Quando è scaduta</item>
-    <!-- slide 43d -->
-    <item>Alla scadenza o quando scaduto</item>
-  </string-array>
-  
-  <string-array name="EPr_default_addtocalendar">
-    <!-- addtocalendar: labels for "Task Defaults" preference item. -->
-    <item>@string/EPr_deactivated</item>
-  </string-array>      
+    <!-- Title of "Help" option in settings -->
+    <string name="p_help">Supporto</string>
 
+    <!-- slide 30c: Title of "Forums" option in settings -->
+    <string name="p_forums">Forum</string>
+
+    <!-- Title of "Premium" option in settings -->
+    <string name="p_premium">Premium</string>
+
+    <!-- ============================================================= Misc == -->
+
+    <string name="feedback_positive_title">Rate Astrid?</string>
+
+    <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star
+        rating?
+    </string>
+
+    <string name="feedback_negative_title">Leave feedback?</string>
+
+    <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
+
+    <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback
+        section--it might not be available on your device.
+    </string>
+
+    <string name="feedback_positive_button">Rate Astrid</string>
+
+    <string name="feedback_negative_button">Leave feedback</string>
+
+    <string name="feedback_not_now">Not now</string>
+
+    <string name="feedback_banner_text">How\'s Astrid working for you?</string>
+
+    <!-- Displayed when task killer found. %s => name of the application -->
+    <string name="task_killer_help">Sembra che si stia utilizzando un\'applicazione che può
+        terminare i processi (%s)! Se è possibile, aggiungere Astrid all\'elenco di esclusione in
+        modo che non venga terminato. Contrariamente, Astrid potrebbe non avvisarti quando le tue
+        attività saranno compiute.\n
+    </string>
+
+    <!-- Task killer dialog ok button -->
+    <string name="task_killer_help_ok">Voglio terminare Astrid!</string>
+
+    <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
+
+    <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
+    <string name="marketplace_description">Astrid è la lista / gestore di attività personali
+        open-source che tutti amano, preparata per aiutarti a portare a termine le tue attività. Ti
+        permette di impostare promemoria, etichette, di sincronizzare, ha un plugin per la
+        localizzazione, un widget e molto altro.
+    </string>
+
+    <string name="DB_corrupted_title">Database corrotto</string>
+
+    <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->Sincronizzazione e backup->Gestire tutti i dati->Cancellare tutti i dati) e
+        ripristinare i tuoi task da un backup in Astrid (Impostazioni->Sincronizzazione e
+        backup->Backup->Importa task).
+    </string>
+
+    <string name="market_unavailable">Sfortunatamente il market non è disponibile sul tuo sistema.
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 32g: Preference Category: Defaults Title -->
+    <string name="EPr_defaults_header">Nuove impostazioni predefinite attività</string>
+    <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
+
+    <!-- slide 41f:  Preference: Default Urgency Title -->
+    <string name="EPr_default_urgency_title">Urgenza Predefinita</string>
+    <!-- Preference: Default Urgency Description (%s => setting) -->
+    <string name="EPr_default_urgency_desc">Attualmente: %s</string>
+
+    <!-- slide 40a: Preference: Default Importance Title -->
+    <string name="EPr_default_importance_title">Default priority</string>
+    <!-- Preference: Default Importance Description (%s => setting) -->
+    <string name="EPr_default_importance_desc">Attualmente: %s</string>
+
+    <!-- slide 42e: Preference: Default Hide Until Title -->
+    <string name="EPr_default_hideUntil_title">Nascondi Fino Predefinito</string>
+    <!-- Preference: Default Hide Until Description (%s => setting) -->
+    <string name="EPr_default_hideUntil_desc">Attualmente: %s</string>
+
+    <!-- slide 43e: Preference: Default Reminders Title -->
+    <string name="EPr_default_reminders_title">Promemoria predefiniti</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_desc">Attualmente: %s</string>
+
+    <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
+    <string name="EPr_default_addtocalendar_title">Aggiungi automaticamente al calendario</string>
+    <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
+    <string name="EPr_default_addtocalendar_desc_disabled">Nuovi programmi non creerà alcun evento
+        in Google Calendar
+    </string>
+    <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
+    <string name="EPr_default_addtocalendar_desc">Le nuove attività verranno inserite nel
+        calendario: \"%s\"
+    </string>
+
+    <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
+    <string name="EPr_default_reminders_mode_title">Tipo di squillo/vibrazione predefinito</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_mode_desc">Attualmente: %s</string>
+
+    <string-array name="EPr_default_importance">
+        <!-- importance: labels for "Task Defaults" preference item. -->
+        <!-- slide 40b -->
+        <item>!!! (Massima)</item>
+        <item>!!</item>
+        <item>!</item>
+        <!-- slide 40c -->
+        <item>o (Minima)</item>
+    </string-array>
+
+    <string-array name="EPr_default_urgency">
+        <!-- urgency: labels for "Task Defaults" preference item. -->
+        <!-- slide 41a-->
+        <item>Nessun Termine</item>
+        <!-- slide 41b -->
+        <item>Oggi</item>
+        <!-- slide 41c-->
+        <item>Domani</item>
+        <!-- slide 41d -->
+        <item>Dopodomani</item>
+        <!-- slide 41e -->
+        <item>Prossima Settimana</item>
+    </string-array>
+
+    <string-array name="EPr_default_hideUntil">
+        <!-- hideUntil: labels for "Task Defaults" preference item. -->
+        <!-- slide 42a -->
+        <item>Non nascondere</item>
+        <!-- slide 42b -->
+        <item>Attività completata</item>
+        <!-- slide 42c -->
+        <item>Giorno prima della scadenza</item>
+        <!-- slide 42d-->
+        <item>Settimana prima della scadenza</item>
+    </string-array>
+
+    <string-array name="EPr_default_reminders">
+        <!-- reminders: labels for "Task Defaults" preference item. -->
+        <!-- slide 43a -->
+        <item>Nessun promemoria scadenza</item>
+        <!-- slide 43b -->
+        <item>Alla scadenza</item>
+        <!-- slide 43c -->
+        <item>Quando è scaduta</item>
+        <!-- slide 43d -->
+        <item>Alla scadenza o quando scaduto</item>
+    </string-array>
+
+    <string-array name="EPr_default_addtocalendar">
+        <!-- addtocalendar: labels for "Task Defaults" preference item. -->
+        <item>@string/EPr_deactivated</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in filter plug-in -->
-    
+
     <!-- ================================================= Filter Exposer == -->
-    
+
     <!-- Active Tasks Filter -->
     <string name="BFE_Active">Le mie attività</string>
-    
+
     <!-- Waiting on me filter -->
     <string name="BFE_waiting_on_me">Waiting On Me</string>
-        
+
     <!-- Search Filter -->
-    
+
     <!-- slide 10b: Recently Modified -->
     <string name="BFE_Recent">Modificate di recente</string>
-    
+
     <!-- slide 10c: I\'ve assigned -->
     <string name="BFE_Assigned">Assegnate da me</string>
-    
+
     <!-- Build Your Own Filter -->
-    
+
     <!-- Saved Filters Header -->
-    
+
     <!-- Saved Filters Context Menu: delete -->
     <string name="BFE_Saved_delete">Cancella Filtro</string>
 
     <!-- =========================================== CustomFilterActivity == -->
-    
+
     <!-- slide 30d: Build Your Own Filter Activity Title-->
     <string name="CFA_title">Filtro Personalizzato</string>
-    
+
     <!-- slide 30e: Filter Name edit box hint (if user types here, filter will be saved) -->
     <string name="CFA_filterName_hint">Dai un nome al filtro per salvarlo...</string>
-    
+
     <!-- Filter Name default for copied filters (%s => old filter name) -->
-    
+
     <!-- slide 30a: Filter Starting Universe: all tasks -->
     <string name="CFA_universe_all">Attività in corso</string>
-    
+
     <!-- Filter Criteria Type: add (at the begging of title of the criteria) -->
     <string name="CFA_type_add">o</string>
-    
+
     <!-- Filter Criteria Type: subtract (at the begging of title of the criteria) -->
     <string name="CFA_type_subtract">non</string>
-    
+
     <!-- Filter Criteria Type: intersect (at the begging of title of the criteria) -->
     <string name="CFA_type_intersect">anche</string>
-    
+
     <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
     <string name="CFA_context_chain">%s ha dei criteri</string>
-    
+
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">Cancella Riga</string>
-    
+
     <!-- slide 30b: Filter Screen Help Text -->
     <string name="CFA_help">Long press on items for additional options</string>
-    
+
     <!-- slide 30c: Filter Button: add new -->
     <string name="CFA_button_add">Aggiungi Criteri</string>
-    
+
     <!-- slide 30f: Filter Button: view without saving -->
     <string name="CFA_button_view">Visualizza</string>
-    
+
     <!-- Filter Button: save & view filter -->
     <string name="CFA_button_save">Salva &amp; Visualizzazione</string>
 
     <!-- =========================================== CustomFilterCriteria == -->
-        
+
     <!-- Criteria: due by X - display text (? -> user input) -->
     <string name="CFC_dueBefore_text">Entro: ?</string>
     <!-- Criteria: due by X - name of criteria -->
@@ -1700,325 +1862,355 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat
         <item>Prossima Settimana</item>
         <item>Mese successivo</item>
     </string-array>
-    
+
     <!-- Criteria: importance - display text (? -> user input)-->
     <string name="CFC_importance_text">Priority at least ?</string>
     <!-- Criteria: importance - name of criteria -->
-    <string name="CFC_importance_name">Priority...</string>        
-    
+    <string name="CFC_importance_name">Priority...</string>
+
     <!-- Criteria: tag - display text (? -> user input) -->
     <string name="CFC_tag_text">Lista: ?</string>
     <!-- Criteria: tag - name of criteria -->
     <string name="CFC_tag_name">Lista..</string>
-    
+
     <!-- Criteria: tag_contains - name of criteria -->
     <string name="CFC_tag_contains_name">Lista il cui nome contiene...</string>
     <!-- Criteria: tag_contains - text (? -> user input) -->
     <string name="CFC_tag_contains_text">Lista il cui nome contiene: ?</string>
-    
+
     <!-- Criteria: title_contains - name of criteria -->
     <string name="CFC_title_contains_name">Il titolo contiene...</string>
     <!-- Criteria: title_contains - text (? -> user input) -->
     <string name="CFC_title_contains_text">Il titolo contiene: ?</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-  
-  <!-- Error message for adding to calendar  -->
-  <string name="gcal_TEA_error">Errore durante l\'aggiunta dell\'attività al calendario!</string>
-
-  <!-- Label for adding task to calendar -->
-
-  <!-- slide 21c: Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">Aggiungi al Calendario</string>
-  
-  <!-- Label when calendar event already exists -->
-  <string name="gcal_TEA_showCalendar_label">Apri Calendario Eventi</string>
-  
-  <!-- Toast when unable to open calendar event -->
-  
-  <!-- Toast when calendar event updated because task changed -->
-  <string name="gcal_TEA_calendar_updated">Evento del calendario aggiornato!</string>
-  
-  <!-- No calendar label (don\'t add option) -->
-  <string name="gcal_TEA_nocal">Non aggiungere</string>
-  
-  <string name="gcal_TEA_none_selected">To calendar?</string>
-  
-  <string name="gcal_TEA_has_event">Evento del calendario</string>
-  
-  <!-- ======================================================== Calendars == -->
-  
-  <!-- Calendar event name when task is completed (%s => task title) -->
-  <string name="gcal_completed_title">%s (completato)</string>
-
-  <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
-  <string name="gcal_GCP_default">Calendario Predefinito</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Error message for adding to calendar  -->
+    <string name="gcal_TEA_error">Errore durante l\'aggiunta dell\'attività al calendario!</string>
 
+    <!-- Label for adding task to calendar -->
 
+    <!-- slide 21c: Label for adding task to calendar -->
+    <string name="gcal_TEA_addToCalendar_label">Aggiungi al Calendario</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Label when calendar event already exists -->
+    <string name="gcal_TEA_showCalendar_label">Apri Calendario Eventi</string>
+
+    <!-- Toast when unable to open calendar event -->
+
+    <!-- Toast when calendar event updated because task changed -->
+    <string name="gcal_TEA_calendar_updated">Evento del calendario aggiornato!</string>
+
+    <!-- No calendar label (don\'t add option) -->
+    <string name="gcal_TEA_nocal">Non aggiungere</string>
+
+    <string name="gcal_TEA_none_selected">To calendar?</string>
+
+    <string name="gcal_TEA_has_event">Evento del calendario</string>
+
+    <!-- ======================================================== Calendars == -->
+
+    <!-- Calendar event name when task is completed (%s => task title) -->
+    <string name="gcal_completed_title">%s (completato)</string>
+
+    <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
+    <string name="gcal_GCP_default">Calendario Predefinito</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ============================================================= UI == -->
 
     <!-- filters header: GTasks -->
     <string name="gtasks_FEx_header">Google Tasks</string>
-    
+
     <!-- filter category for GTasks lists -->
-    
+
     <!-- filter title for GTasks lists (%s => list name) -->
     <string name="gtasks_FEx_title">Google Tasks: %s</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_creating_list">Creazione della lista...</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_create_list_dialog">Nome Nuova Lista:</string>
-    
+
     <!-- error to show when list creation fails -->
     <string name="gtasks_FEx_create_list_error">Errore nel creare un nuovo elenco</string>
-    
+
     <!-- short help title for Gtasks -->
-    
+
     <string name="CFC_gtasks_list_text">Nella lista: ?</string>
 
     <string name="CFC_gtasks_list_name">Nella lista GTasks...</string>
-    
+
     <!-- Message while clearing completed tasks -->
     <string name="gtasks_GTA_clearing">Pulizia task completi...</string>
-    
+
     <!-- Label for clear completed menu item -->
     <string name="gtasks_GTA_clear_completed">Elimina attività completate</string>
-        
+
     <!-- ============================================ GtasksLoginActivity == -->
-    
-    <!-- Activity Title: Gtasks Login -->    
 
-    <!-- Instructions: Gtasks login -->    
-    <string name="gtasks_GLA_body">Per favore, fai il login su Google Tasks Sync (Beta!). Google Apps for Domain non è attualmente supportato, ci stiamo lavorando!</string>
-    
-    <string name="gtasks_GLA_noaccounts">Non è disponibile nessun Google account con cui sincronizzarsi.</string>
+    <!-- Activity Title: Gtasks Login -->
+
+    <!-- Instructions: Gtasks login -->
+    <string name="gtasks_GLA_body">Per favore, fai il login su Google Tasks Sync (Beta!). Google
+        Apps for Domain non è attualmente supportato, ci stiamo lavorando!
+    </string>
+
+    <string name="gtasks_GLA_noaccounts">Non è disponibile nessun Google account con cui
+        sincronizzarsi.
+    </string>
 
-    <!-- Instructions: Gtasks further help -->    
-    <string name="gtasks_GLA_further_help">Per vedere le tue attività preservando indentazione e ordine, vai nella pagina dei filtri e seleziona una lista di Google Tasks. Di default, Astrid usa un suo ordine personale per ordinare le attività.</string>
+    <!-- Instructions: Gtasks further help -->
+    <string name="gtasks_GLA_further_help">Per vedere le tue attività preservando indentazione e
+        ordine, vai nella pagina dei filtri e seleziona una lista di Google Tasks. Di default,
+        Astrid usa un suo ordine personale per ordinare le attività.
+    </string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
 
-    <!-- E-mail Address Label -->    
+    <!-- E-mail Address Label -->
+
+    <!-- Password Label -->
 
-    <!-- Password Label -->    
-    
     <!--  Authenticating toast -->
     <string name="gtasks_GLA_authenticating">Autenticazione...</string>
-    
+
     <!-- Google Apps for Domain checkbox -->
 
-    <!-- Error Message when fields aren\'t filled out -->    
+    <!-- Error Message when fields aren\'t filled out -->
 
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
-    <string name="gtasks_GLA_errorAuth">Errore di autenticazione! Per favore controlla i tuoi username e password nell\'account manager del tuo telefono.</string>
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
+    <string name="gtasks_GLA_errorAuth">Errore di autenticazione! Per favore controlla i tuoi
+        username e password nell\'account manager del tuo telefono.
+    </string>
 
-    <!-- Error Message when we receive an IO Exception -->    
-    <string name="gtasks_GLA_errorIOAuth">Ci scusiamo per il disagio, abbiamo dei problemi a comunicare con i server di Google. Per favore riprovare più tardi.</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->    
+    <!-- Error Message when we receive an IO Exception -->
+    <string name="gtasks_GLA_errorIOAuth">Ci scusiamo per il disagio, abbiamo dei problemi a
+        comunicare con i server di Google. Per favore riprovare più tardi.
+    </string>
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->
     <string name="gtasks_GLA_errorAuth_captcha">Potresti avere incontrato un codice captcha.
-Prova ad autenticarti con un browser, poi torna e riprova:</string>
-    
+        Prova ad autenticarti con un browser, poi torna e riprova:
+    </string>
+
     <!-- ============================================== GtasksPreferences == -->
 
-    <!-- GTasks Preferences Title -->    
+    <!-- GTasks Preferences Title -->
     <string name="gtasks_GPr_header">Google Tasks</string>
-    
-    <!-- ================================================ Synchronization == -->    
-    
+
+    <!-- ================================================ Synchronization == -->
+
     <!-- title for notification tray when synchronizing -->
 
     <!-- Error Message when we receive a HTTP 503 error -->
-    <string name="gtasks_error_backend">Google\'s Task Api è in versione beta e ha trovato un errore. Il servizio potrebbe non essere disponibile, ti preghiamo di riprovare più tardi.</string>
-    
+    <string name="gtasks_error_backend">Google\'s Task Api è in versione beta e ha trovato un
+        errore. Il servizio potrebbe non essere disponibile, ti preghiamo di riprovare più tardi.
+    </string>
+
     <!-- Error for account not found -->
-    <string name="gtasks_error_accountNotFound">Account %s non trovato--per favore fai logout e di nuovo login dalla configurazione di Google Tasks.</string>
-    
+    <string name="gtasks_error_accountNotFound">Account %s non trovato--per favore fai logout e di
+        nuovo login dalla configurazione di Google Tasks.
+    </string>
+
     <!-- Error when ping after refreshing token fails -->
-    <string name="gtasks_error_authRefresh">Impossibile autenticarsi con Google Tasks. Per favore verifica la tua password o ritenta più tardi.</string>
-    
+    <string name="gtasks_error_authRefresh">Impossibile autenticarsi con Google Tasks. Per favore
+        verifica la tua password o ritenta più tardi.
+    </string>
+
     <!-- Error when account manager returns no auth token or throws exception -->
-    <string name="gtasks_error_accountManager">Account non trovato--per favore fai logout e di nuovo login dalla configurazione di Google Tasks.</string>
+    <string name="gtasks_error_accountManager">Account non trovato--per favore fai logout e di nuovo
+        login dalla configurazione di Google Tasks.
+    </string>
 
     <!-- Error when authorization error happens in background sync -->
-    <string name="gtasks_error_background_sync_auth">Errore di autenticazione in background. Per favore prova ad avviare una sincronizzazione durante l\'esecuzione di Astrid.</string>
-      
+    <string name="gtasks_error_background_sync_auth">Errore di autenticazione in background. Per
+        favore prova ad avviare una sincronizzazione durante l\'esecuzione di Astrid.
+    </string>
+
     <string name="gtasks_import_progress">Importing Google Tasks...</string>
 
-    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you still want to add the task %2$s to it?</string>
+    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you
+        still want to add the task %2$s to it?
+    </string>
 
     <string name="gtasks_import_dlg_title">Google Tasks Import</string>
 
     <string name="gtasks_import_add_task_ok">Add task</string>
 
     <string name="gtasks_import_add_task_cancel">Don\'t add task</string>
-        
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- NEW USER EXPERIENCE -->
-  
-  <!-- help bubbles -->
-  <!-- slide 8c: Shown the first time a user sees the task list activity -->
-  <string name="help_popover_add_task">Inizia aggiungendo una o due attività</string>
-
-  <!-- Shown the first time a user adds a task to a list -->  
-  <string name="help_popover_tap_task">Seleziona programmi per modificare o condividere</string>
-  
-  <!-- slide 14a: Shown the first time a user sees the list activity -->
-  <string name="help_popover_list_settings">Seleziona per modificare o condividere questo elenco</string>
-  
-  <!-- slide 26c: Shown the first time a user sees the list settings tab -->
-  <string name="help_popover_collaborators">Le persone con cui condividi posso aiutarti\na costruire la tua lista o completare i task</string>
-  
-  <!-- Shown after user adds a task on tablet-->
-  <string name="help_popover_add_lists">Seleziona per aggiungere un elenco</string>
-  
-  <!-- Shown after a user adds a task on phones -->
-  <string name="help_popover_switch_lists">Seleziona per aggiungere un elenco o passa ad un altro elenco</string>
-  
-  
-  
-  <!-- Login activity -->
-  
-  
-  <!-- slide 7b -->
-  <string name="welcome_login_tos_base">Utilizzando Astrid accetti </string>
-  
-  <string name="welcome_login_tos_link">Termini di Servizio</string>
-  
-  <!-- slide 7e -->
-  <string name="welcome_login_pw">Registrati</string>
-  
-  <string name="welcome_sign_in">Accedi</string>
-
-  <!-- slide 7f -->
-  <string name="welcome_login_later">Più tardi</string>
-  
-  <string name="welcome_login_confirm_later_title">Perchè non autenticato?</string>
-  
-  <string name="welcome_login_confirm_later_ok">Lo farò!</string>
-  
-  <string name="welcome_login_confirm_later_cancel">No grazie</string>
-  
-  <string name="welcome_login_confirm_later_dialog">Accedi per ottenere il massimo da Astrid!
-Gratuitamente, hai il backup online, la sincronizzazione completa con Astrid.com, la
-possibilità di aggiungere attività via email, e puoi anche condividere elenchi di attività con gli amici!</string>
+    <!-- NEW USER EXPERIENCE -->
 
+    <!-- help bubbles -->
+    <!-- slide 8c: Shown the first time a user sees the task list activity -->
+    <string name="help_popover_add_task">Inizia aggiungendo una o due attività</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown the first time a user adds a task to a list -->
+    <string name="help_popover_tap_task">Seleziona programmi per modificare o condividere</string>
 
+    <!-- slide 14a: Shown the first time a user sees the list activity -->
+    <string name="help_popover_list_settings">Seleziona per modificare o condividere questo elenco
+    </string>
 
-  <!-- Resources for built-in locale plug-in -->
-
-  <!-- Locale Alert Editing Window Title -->
-  <string name="locale_edit_alerts_title">Filtro Promemoria Astrid</string>
-  
-  <!-- Locale Window Help -->                                                                                                                                            
-  <string name="locale_edit_intro">Astrid ti invierà un promemoria quando avrai qualsiasi attività nel seguente filtro:</string>
-      
-  <!-- Locale Window Filter Picker UI -->                                                                                                                                        
-      
-  <!-- Locale Window Interval Label -->                                                                                                                                        
-  <string name="locale_interval_label">Limite di notifiche a:</string>        
-      
-  <!-- Locale Window Interval Values -->                                                                                                                                        
-  <string-array name="locale_interval">
-    <item>una volta ogni ora</item>
-    <item>una volta ogni sei ore</item>
-    <item>una volta ogni dodici ore</item>
-    <item>una volta al giorno</item>
-    <item>una volta ogni tre giorni</item>
-    <item>una volta a settimana</item>
-  </string-array>        
-      
-  <!-- Locale Notification text -->                                                                                                                                        
-  <string name="locale_notification">Hai $NUM corrispondenti: $FILTER</string>     
-      
-  <!-- Locale Plugin was not found, it is required -->
-  <string name="locale_plugin_required">Installare il plugin di Localizzazione di Astrid!</string>        
-     
+    <!-- slide 26c: Shown the first time a user sees the list settings tab -->
+    <string name="help_popover_collaborators">Le persone con cui condividi posso aiutarti\na
+        costruire la tua lista o completare i task
+    </string>
 
+    <!-- Shown after user adds a task on tablet-->
+    <string name="help_popover_add_lists">Seleziona per aggiungere un elenco</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown after a user adds a task on phones -->
+    <string name="help_popover_switch_lists">Seleziona per aggiungere un elenco o passa ad un altro
+        elenco
+    </string>
+
+
+    <!-- Login activity -->
+
+
+    <!-- slide 7b -->
+    <string name="welcome_login_tos_base">Utilizzando Astrid accetti</string>
+
+    <string name="welcome_login_tos_link">Termini di Servizio</string>
+
+    <!-- slide 7e -->
+    <string name="welcome_login_pw">Registrati</string>
+
+    <string name="welcome_sign_in">Accedi</string>
+
+    <!-- slide 7f -->
+    <string name="welcome_login_later">Più tardi</string>
+
+    <string name="welcome_login_confirm_later_title">Perchè non autenticato?</string>
+
+    <string name="welcome_login_confirm_later_ok">Lo farò!</string>
+
+    <string name="welcome_login_confirm_later_cancel">No grazie</string>
+
+    <string name="welcome_login_confirm_later_dialog">Accedi per ottenere il massimo da Astrid!
+        Gratuitamente, hai il backup online, la sincronizzazione completa con Astrid.com, la
+        possibilità di aggiungere attività via email, e puoi anche condividere elenchi di attività
+        con gli amici!
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in locale plug-in -->
+
+    <!-- Locale Alert Editing Window Title -->
+    <string name="locale_edit_alerts_title">Filtro Promemoria Astrid</string>
+
+    <!-- Locale Window Help -->
+    <string name="locale_edit_intro">Astrid ti invierà un promemoria quando avrai qualsiasi attività
+        nel seguente filtro:
+    </string>
+
+    <!-- Locale Window Filter Picker UI -->
+
+    <!-- Locale Window Interval Label -->
+    <string name="locale_interval_label">Limite di notifiche a:</string>
+
+    <!-- Locale Window Interval Values -->
+    <string-array name="locale_interval">
+        <item>una volta ogni ora</item>
+        <item>una volta ogni sei ore</item>
+        <item>una volta ogni dodici ore</item>
+        <item>una volta al giorno</item>
+        <item>una volta ogni tre giorni</item>
+        <item>una volta a settimana</item>
+    </string-array>
+
+    <!-- Locale Notification text -->
+    <string name="locale_notification">Hai $NUM corrispondenti: $FILTER</string>
+
+    <!-- Locale Plugin was not found, it is required -->
+    <string name="locale_plugin_required">Installare il plugin di Localizzazione di Astrid!</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ====================== Plugin Boilerplate ========================= -->
 
-	<!-- filters header: OpenCRX -->
+    <!-- filters header: OpenCRX -->
     <string name="opencrx_FEx_header">OpenCRX</string>
-    
+
     <!-- filter category for OpenCRX ActivityCreators -->
     <string name="opencrx_FEx_dashboard">Aree di lavoro</string>
-    
+
     <!-- filter category for OpenCRX responsible person -->
     <string name="opencrx_FEx_responsible">Assegnato a</string>
-    
+
     <!--  OpenCRX assignedTo filter title (%s => assigned contact) -->
     <string name="opencrx_FEx_responsible_title">Assegnato a \'%s\'</string>
-    
+
     <!-- detail for showing tasks created by someone else (%s => person name) -->
     <string name="opencrx_PDE_task_from">da %s</string>
-    
+
     <!-- replacement string for task edit "Notes" when using OpenCRX -->
     <string name="opencrx_TEA_notes">Aggiungi un Commento</string>
-    
+
     <string name="opencrx_creator_input_hint">Proprietario</string>
 
     <string name="opencrx_contact_input_hint">Assegnato a</string>
     <!-- ==================================================== Preferences == -->
 
-    <!-- Preferences Title: OpenCRX -->    
+    <!-- Preferences Title: OpenCRX -->
     <string name="opencrx_PPr_header">OpenCRX</string>
 
     <!-- creator title for tasks that are not synchronized -->
     <string name="opencrx_no_creator">(Non Sincronizzare)</string>
 
-	<!-- preference title for default creator -->
+    <!-- preference title for default creator -->
     <string name="opencrx_PPr_defaultcreator_title">ActivityCreator Predefinito</string>
 
     <!-- preference description for default creator (%s -> setting) -->
-    <string name="opencrx_PPr_defaultcreator_summary">Le nuove attività saranno create da: %s</string>
+    <string name="opencrx_PPr_defaultcreator_summary">Le nuove attività saranno create da: %s
+    </string>
 
     <!-- preference description for default dashboard (when set to \'not synchronized\') -->
-    <string name="opencrx_PPr_defaultcreator_summary_none">Le nuove attività non verranno sincronizzate in modo predefinito</string>
-    
+    <string name="opencrx_PPr_defaultcreator_summary_none">Le nuove attività non verranno
+        sincronizzate in modo predefinito
+    </string>
+
     <!--  OpenCRX host and segment group name -->
     <string name="opencrx_group">Serever OpenCRX</string>
 
@@ -2027,81 +2219,89 @@ possibilità di aggiungere attività via email, e puoi anche condividere elenchi
 
     <!--  dialog title for OpenCRX host -->
     <string name="opencrx_host_dialog_title">Host OpenCRX</string>
-    
+
     <!--  example for OpenCRX host -->
-    <string name="opencrx_host_summary">Per esempio: <i>miodominio.com</i></string>
-    
+    <string name="opencrx_host_summary">Per esempio:
+        <i>miodominio.com</i>
+    </string>
+
     <!--  preference description for OpenCRX segment -->
     <string name="opencrx_segment_title">Segmento</string>
 
     <!--  dialog title for OpenCRX segment -->
     <string name="opencrx_segment_dialog_title">Segmento sincronizzato</string>
-    
+
     <!--  example for OpenCRX segment -->
-    <string name="opencrx_segment_summary">Per esempio: <i>Standard</i></string>
-    
+    <string name="opencrx_segment_summary">Per esempio:
+        <i>Standard</i>
+    </string>
+
     <!--  default value for OpenCRX segment -->
     <string name="opencrx_segment_default">Standard</string>
-    
+
     <!--  preference description for OpenCRX provider -->
     <string name="opencrx_provider_title">Fornitore</string>
 
     <!--  dialog title for OpenCRX provider -->
     <string name="opencrx_provider_dialog_title">Fornitore dati OpenCRX</string>
-    
+
     <!--  example for OpenCRX provider -->
-    <string name="opencrx_provider_summary">Per esempio: <i>CRX</i></string>
-    
+    <string name="opencrx_provider_summary">Per esempio:
+        <i>CRX</i>
+    </string>
+
     <!--  default value for OpenCRX provider -->
     <string name="opencrx_provider_default">CRX</string>
     <!-- ================================================= Login Activity == -->
 
-    <!-- Activity Title: Opencrx Login -->    
-    <string name="opencrx_PLA_title">Accedi a OpenCRX </string>
+    <!-- Activity Title: Opencrx Login -->
+    <string name="opencrx_PLA_title">Accedi a OpenCRX</string>
 
-    <!-- Instructions: Opencrx login -->    
-    <string name="opencrx_PLA_body">Accedi con il tuo account OpenCRX </string>
+    <!-- Instructions: Opencrx login -->
+    <string name="opencrx_PLA_body">Accedi con il tuo account OpenCRX</string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
     <string name="opencrx_PLA_signIn">Accedi</string>
 
-    <!-- Login Label -->    
+    <!-- Login Label -->
     <string name="opencrx_PLA_login">Accedi</string>
 
-    <!-- Password Label -->    
+    <!-- Password Label -->
     <string name="opencrx_PLA_password">Password</string>
-    
-        <!-- Error Message when fields aren\'t filled out -->    
+
+    <!-- Error Message when fields aren\'t filled out -->
     <string name="opencrx_PLA_errorEmpty">Errore: completare tutti i campi</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
     <string name="opencrx_PLA_errorAuth">Errore: e-mail o password sbagliate!</string>
 
     <!-- ================================================ Synchronization == -->
-        
+
     <!-- title for notification tray after synchronizing -->
     <string name="opencrx_notification_title">OpenCRX</string>
-    
+
     <!-- text for notification tray when synchronizing -->
     <string name="opencrx_notification_text">%s attività aggiornate / clicca per i dettagli</string>
-    
+
     <!-- Error msg when io exception  -->
-    <string name="opencrx_ioerror">Errore di Connessione! Controlla la tua connessione Internet.</string>
+    <string name="opencrx_ioerror">Errore di Connessione! Controlla la tua connessione Internet.
+    </string>
 
     <!-- opencrx Login not specified-->
     <string name="opencrx_MLA_email_empty">Dati di accesso non specificati!</string>
-    
+
     <!-- opencrx password not specified-->
     <string name="opencrx_MLA_password_empty">La password non è stata inserita!</string>
-    
+
     <!-- ================================================ labels for layout-elements == -->
-    
+
     <!-- label for task-assignment spinner on taskeditactivity -->
-    <string name="opencrx_TEA_task_assign_label">Assegna questa attività alla persona seguente:</string>
-    
+    <string name="opencrx_TEA_task_assign_label">Assegna questa attività alla persona seguente:
+    </string>
+
     <!-- Spinner-item for unassigned tasks on taskeditactivity -->
     <string name="opencrx_TEA_task_unassigned">&lt;Non assegnata&gt;</string>
-    
+
     <!-- label for dashboard-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_creator_assign_label">Assegna questo task al proprietario:</string>
 
@@ -2109,7 +2309,7 @@ possibilità di aggiungere attività via email, e puoi anche condividere elenchi
     <string name="opencrx_TEA_dashboard_default">&lt;Predefinito&gt;</string>
 
     <string name="opencrx_TEA_opencrx_title">Controlli OpenCRX</string>
-        
+
     <string name="CFC_opencrx_in_workspace_text">Nello spazio di lavoro: ?</string>
 
     <string name="CFC_opencrx_in_workspace_name">Nello spazio di lavoro...</string>
@@ -2119,118 +2319,156 @@ possibilità di aggiungere attività via email, e puoi anche condividere elenchi
     <string name="CFC_opencrx_assigned_to_name">Assegnato a...</string>
 
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
+    <!-- ================================================== EditPreferences == -->
 
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 32j: Preference Category: Power Pack -->
-  <string name="EPr_powerpack_header">Impostazioni Premium e varie</string>
-  <string name="EPr_powerpack_summary">Promemoria chiamate mancate, comandi vocali e impostazioni varie</string>
-  
-  <!-- slide 32e: Preference: Anonymous User Statistics -->
-  <string name="EPr_statistics_title">Statistiche Anomime Utilizzo</string>
-  <!-- Preference: User Statistics (disabled) -->
-  <string name="EPr_statistics_desc_disabled">Nessun dato verrà inviato</string>  
-  <!-- slide 32f: Preference: User Statistics (enabled) -->
-  <string name="EPr_statistics_desc_enabled">Aiutaci a migliorare Astrid inviando informazioni anonime sull\'utilizzo</string>
-      
+    <!-- slide 32j: Preference Category: Power Pack -->
+    <string name="EPr_powerpack_header">Impostazioni Premium e varie</string>
+    <string name="EPr_powerpack_summary">Promemoria chiamate mancate, comandi vocali e impostazioni
+        varie
+    </string>
 
+    <!-- slide 32e: Preference: Anonymous User Statistics -->
+    <string name="EPr_statistics_title">Statistiche Anomime Utilizzo</string>
+    <!-- Preference: User Statistics (disabled) -->
+    <string name="EPr_statistics_desc_disabled">Nessun dato verrà inviato</string>
+    <!-- slide 32f: Preference: User Statistics (enabled) -->
+    <string name="EPr_statistics_desc_enabled">Aiutaci a migliorare Astrid inviando informazioni
+        anonime sull\'utilizzo
+    </string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
-    <string name="speech_err_network">Errore di rete! Il riconoscimento vocale richiede una connessione di rete per funzionare.</string>
-    <string name="speech_err_no_match">Mi dispiace, non riesco a capire! Si prega di riprovare.</string>
-    <string name="speech_err_default">Ci dispiace, si è verificato un errore nel riconoscimento vocale. Si prega di riprovare.</string>
-    
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <string name="speech_err_network">Errore di rete! Il riconoscimento vocale richiede una
+        connessione di rete per funzionare.
+    </string>
+    <string name="speech_err_no_match">Mi dispiace, non riesco a capire! Si prega di riprovare.
+    </string>
+    <string name="speech_err_default">Ci dispiace, si è verificato un errore nel riconoscimento
+        vocale. Si prega di riprovare.
+    </string>
+
     <string name="premium_attach_file">Allega un file</string>
     <string name="premium_record_audio">Registra una nota</string>
     <string name="premium_no_files">Nessun file allegato</string>
     <string name="premium_remove_file_confirm">Se sicuro? Non può essere eseguito</string>
-    
+
     <string name="audio_recording_title">Registrazione Audio</string>
     <string name="audio_stop_recording">Fine Registrazione</string>
     <string name="audio_speak_now">Parla ora!</string>
     <string name="audio_encoding">Encoding...</string>
     <string name="audio_err_encoding">Errore codifica audio</string>
-    <string name="audio_err_playback">Spiacente, il sistema non supporta questa tipologia di file audio</string>
-    
-    <string name="search_market_audio">Non è stato trovato nessun lettore per quel tipo di audio. Vuoi scaricarne uno da Android Market?</string>
+    <string name="audio_err_playback">Spiacente, il sistema non supporta questa tipologia di file
+        audio
+    </string>
+
+    <string name="search_market_audio">Non è stato trovato nessun lettore per quel tipo di audio.
+        Vuoi scaricarne uno da Android Market?
+    </string>
     <string name="search_market_audio_title">Non è stato trovato nessun riproduttore audio</string>
 
-    <string name="search_market_pdf">Non è stato trovato nessun lettore di file PDF. Vuoi scaricare un lettore di file PDF da Google Play (Android Market)?</string>
+    <string name="search_market_pdf">Non è stato trovato nessun lettore di file PDF. Vuoi scaricare
+        un lettore di file PDF da Google Play (Android Market)?
+    </string>
     <string name="search_market_pdf_title">Non è stato trovato nessun lettore di file PDF</string>
 
-    <string name="search_market_ms">Non è stato trovato nessun lettore di file MS Office. Vuoi scaricarne uno da Android Market?</string>
-    <string name="search_market_ms_title">Non è stato trovato nessun lettore di documenti MS Office</string>
-    
-    <string name="file_type_unhandled">Spiacente! Non è stata trovata nessuna applicazione per gestire questo tipo di file</string>
-    <string name="file_type_unhandled_title">Spiacente! Non è stata trovata nessuna applicazione</string>
-    
+    <string name="search_market_ms">Non è stato trovato nessun lettore di file MS Office. Vuoi
+        scaricarne uno da Android Market?
+    </string>
+    <string name="search_market_ms_title">Non è stato trovato nessun lettore di documenti MS
+        Office
+    </string>
+
+    <string name="file_type_unhandled">Spiacente! Non è stata trovata nessuna applicazione per
+        gestire questo tipo di file
+    </string>
+    <string name="file_type_unhandled_title">Spiacente! Non è stata trovata nessuna applicazione
+    </string>
+
     <string name="file_prefix_image">Immagine</string>
     <string name="file_prefix_voice">Voce</string>
     <string name="file_browser_up">Su</string>
     <string name="file_browser_title">Scegli un file</string>
     <string name="dir_browser_title">Scegli una cartella</string>
-    <string name="file_browser_err_permissions">Errore di autorizzazioni! Assicurati di non aver bloccato l\'accesso alla scheda SD da parte di Astrid</string>
+    <string name="file_browser_err_permissions">Errore di autorizzazioni! Assicurati di non aver
+        bloccato l\'accesso alla scheda SD da parte di Astrid
+    </string>
     <string name="file_add_picture">Allega una foto</string>
     <string name="file_add_sdcard">Allega un file dalla tua scheda SD</string>
     <string name="file_download_title">Vuoi scaricare il file?</string>
-    <string name="file_download_body">Questo file non è stato ancora scaricato nella scheda SD. Vuoi scaricarlo ora?</string>
+    <string name="file_download_body">Questo file non è stato ancora scaricato nella scheda SD. Vuoi
+        scaricarlo ora?
+    </string>
     <string name="file_download_progress">Download in corso...</string>
     <string name="file_err_memory">L\'immagine è troppo grande per la memoria disponibile</string>
     <string name="file_err_copy">Errore di copia dei file da allegare</string>
     <string name="file_err_download">Errore nel download del file</string>
-    <string name="file_err_no_directory">Whoops! Sembra che la directory non esista. Scegliere nelle Preferenze di Astrid una directory dove salvare i file .</string>
-    <string name="file_err_show">Spiacente, il sistema non supporta ancora questa tipologia di file</string>
-    
+    <string name="file_err_no_directory">Whoops! Sembra che la directory non esista. Scegliere nelle
+        Preferenze di Astrid una directory dove salvare i file .
+    </string>
+    <string name="file_err_show">Spiacente, il sistema non supporta ancora questa tipologia di
+        file
+    </string>
+
     <string name="file_dir_dialog_ok">Utilizza questa directory</string>
     <string name="file_dir_dialog_default">Ripristino impostazioni iniziali</string>
-    
+
     <string name="p_files_dir">Cartella download Premium</string>
     <!-- Description for file download directory preference. %s -> chosen directory -->
     <string name="p_files_dir_desc">Allegati dell\'attivitá salvati in: %s</string>
     <string name="p_files_dir_desc_default">Cartella predefinita</string>
 
-    
+
     <!-- in app billing -->
     <string name="billing_not_supported_title">Pagamenti non disponibili</string>
     <string name="billing_not_supported_message">Il servizio di fatturazione
-del Market non è disponibile al momento. Puoi continuare ad usare questa app ma
-non potrai fare acquisti.</string>
+        del Market non è disponibile al momento. Puoi continuare ad usare questa app ma
+        non potrai fare acquisti.
+    </string>
     <string name="subscriptions_not_supported_title">Non è possibile acquistare abbonamenti</string>
     <string name="subscriptions_not_supported_message">Il servizio di fatturazione
-del Market su questo dispositivo non supporta gli abbonamenti al momento. Puoi abbonarti ad Astrid Premium tramite http://astrid.com/premium.</string>
+        del Market su questo dispositivo non supporta gli abbonamenti al momento. Puoi abbonarti ad
+        Astrid Premium tramite http://astrid.com/premium.
+    </string>
     <string name="cannot_connect_title">Impossibile connettersi al Market</string>
     <string name="cannot_connect_message">Questa app non è in grado collegarsi al Market.
-La tua versione del Market potrebbe non essere aggiornata.
-Puoi continuare ad usare questa app ma
-non potrai fare acquisti.</string>
-    
+        La tua versione del Market potrebbe non essere aggiornata.
+        Puoi continuare ad usare questa app ma
+        non potrai fare acquisti.
+    </string>
+
     <string name="restoring_transactions">Ripristino transazioni</string>
-    
+
     <string name="subscriptions_learn_more">Maggiori informazioni</string>
-    
-    <string name="kii_premium_success">Thanks for participating in this offer! Your free month of Astrid Premium is now unlocked.</string>
+
+    <string name="kii_premium_success">Thanks for participating in this offer! Your free month of
+        Astrid Premium is now unlocked.
+    </string>
     <string name="kii_premium_abort">Special offer aborted</string>
     <string name="kii_premium_declined">Special offer declined</string>
-    <string name="kii_premium_error">There was an error processing this offer. Please try again later.</string>
-    
+    <string name="kii_premium_error">There was an error processing this offer. Please try again
+        later.
+    </string>
+
     <string name="premium_offers_title">Special Offer</string>
     <string name="premium_offers_subtitle">Want one month of Astrid Premium for free?</string>
-    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a short video by this sponsor. (They will also require your email address.)</string>
+    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a
+        short video by this sponsor. (They will also require your email address.)
+    </string>
     <string name="premium_offers_start">Get it free!</string>
-    
+
     <string name="premium_billing_title">Astrid Premium</string>
     <string name="premium_buy_month">1 Mese</string>
     <string name="premium_buy_year">1 Anno</string>
@@ -2241,732 +2479,791 @@ non potrai fare acquisti.</string>
     <string name="premium_description_4">Salva note vocali come file audio</string>
     <string name="premium_description_5">Anteprima delle prossime funzionalità</string>
     <string name="premium_description_6">Sostieni il Team Astrid</string>
-    <string name="premium_speech_bubble_1">La versione Premium incrementerà la vostra produttività!</string>
+    <string name="premium_speech_bubble_1">La versione Premium incrementerà la vostra
+        produttività!
+    </string>
     <string name="premium_speech_bubble_2">Sottoscrivi 1 anno e risparmia il 25%%!</string>
     <string name="premium_already_subscribed">Sei già iscritto ad Astrid Premium!</string>
-    <string name="premium_login_prompt">È necessario disporre di un account Astrid.com per iscriversi alla versione Premium. Effettua il login o registrati.</string>
+    <string name="premium_login_prompt">È necessario disporre di un account Astrid.com per
+        iscriversi alla versione Premium. Effettua il login o registrati.
+    </string>
     <string name="premium_success">Grazie per aver sottoscritto Astrid Premium!</string>
-    <string name="premium_success_with_server_error">Grazie per aver sottoscritto Astrid Premium! Le nuove funzionalità saranno presto sbloccate per te su Astrid.com e dovrebbero essere disponibili da subito sul tuo telefono.</string>
-    <string name="premium_verification_error">L\'abbonamento premium per questo account Google Play è collegato ad un altro utente. Per creare un collegamento e-mail aggiuntivo al tuo account, visita il sito astrid.com / utenti / profili</string>
-    <string name="premium_check_for_purchases">Hai già acquistato premium? Fai click qui per verificare lo storico degli acquisti su Google Play.</string>
+    <string name="premium_success_with_server_error">Grazie per aver sottoscritto Astrid Premium! Le
+        nuove funzionalità saranno presto sbloccate per te su Astrid.com e dovrebbero essere
+        disponibili da subito sul tuo telefono.
+    </string>
+    <string name="premium_verification_error">L\'abbonamento premium per questo account Google Play
+        è collegato ad un altro utente. Per creare un collegamento e-mail aggiuntivo al tuo account,
+        visita il sito astrid.com / utenti / profili
+    </string>
+    <string name="premium_check_for_purchases">Hai già acquistato premium? Fai click qui per
+        verificare lo storico degli acquisti su Google Play.
+    </string>
     <string name="premium_checking_for_purchases">Controllo acquisti ...</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- 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">Ricordamelo:</string>
-
-  <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">Alla scadenza dell\'attività</string>
-
-  <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">Quando l\'attività è in ritardo</string>
-
-  <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_randomly">In modo casuale</string>
-
-  <!-- Task Edit: Reminder alarm clock label -->  
-  <string name="TEA_reminder_alarm_label">Tipo di squillo/vibrazione:</string>
-
-  <!--  slide 45a: Task Edit: Reminder mode: ring once -->  
-  <string name="TEA_reminder_mode_once">Once</string>
-
-  <!-- slide 45b: Task Edit: Reminder mode: ring five times -->  
-  <string name="TEA_reminder_mode_five">Five times</string>
-
-  <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->  
-  <string name="TEA_reminder_mode_nonstop">Until I dismiss alarm</string>
-  
-  <string name="TEA_reminder_when">when</string>
-  
-  <string name="TEA_reminder_due_short">due</string>
-
-  <string name="TEA_reminder_overdue_short">overdue</string>
-
-  <string name="TEA_reminder_randomly_short">randomly</string>
-
-  <string name="TEA_reminder_display_one">Remind me %s</string>
-  
-  <string name="TEA_reminder_display_multiple">Remind %s</string>
-
-  <string-array name="TEA_reminder_random">
-    <!-- random reminder choices for task edit page. -->
-    <item>an hour</item>
-    <item>ogni giorno</item>
-    <item>ogni settimana</item>
-    <item>ogni due settimane</item>
-    <item>ogni mese</item>
-    <item>ogni due mesi</item>
-  </string-array>
-  
-  <!-- ==================================================== notifications == -->
-  
-  <!-- Name of filter when viewing a reminder -->
-  <string name="rmd_NoA_filter">Promemoria!</string>
-  
-  <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Completata</string>
-  
-  <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Rimanda...</string>
-  
-  <!-- Reminder: Completed Toast -->
-  <string name="rmd_NoA_completed_toast">Congratulazioni per il completamento!</string>
-  
-  <!-- Prefix for reminder dialog title -->
-  <string name="rmd_NoA_dlg_title">Promemoria:</string>
-  
-  <!-- ==================================================== user reengagement == -->
-
-  <!-- Titles for user reengagement notifications -->
-  <string-array name="rmd_reengage_notif_titles">
-    <item>Nota da Astrid</item>
-    <!-- %s -> first name -->
-    <item>Memo per %s</item> 
-    <item>Your Astrid digest</item>
-    <item>Promemoria da Astrid</item>
-  </string-array>
-    
-  <string name="rmd_reengage_name_default">tu</string>
-
-  
-  <string name="rmd_reengage_add_tasks">Aggiungi un\'attività</string>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs -->
-  <string-array name="rmd_reengage_dialog_options">
-    <item>E\' tempo di accorciare la tua lista delle cose da fare!</item>
-    <item>Caro signore o signora, alcune attività attendono di essere visionate!</item>
-    <item>Ehi, puoi dare un\'occhiata a queste?</item>
-    <item>Ho alcune attività con il tuo nome!</item>
-    <item>Un nuovo elenco di attività per te oggi!</item>
-    <item>Hai un aspetto favoloso! Sei pronto ad iniziare?</item>
-    <item>Un giorno perfetto per completare qualche attività, credo!</item>
-  </string-array>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>Non vuoi organizzarti?</item>
-    <item>Sono Astrid! Sono qui ad aiutarti a fare di più!</item>
-    <item>Sembri impegnato! Fammi togliere alcune attività dal tuo carico di lavoro.</item>
-    <item>Posso aiutarti a tenere traccia di tutti i dettagli nella tua vita.</item>
-    <item>Sei serio sul volerne completare ancora? Allora anch\'io!</item>
-    <item>Pleasure to make your acquaintance!</item>
-  </string-array>
-  <!-- ============================================= reminder preferences == -->
-  
-  <!-- slide 33d: Reminder Preference Screen Title -->
-  <string name="rmd_EPr_alerts_header">Impostazioni promemoria</string>
-  <string name="rmd_EPr_alerts_summary">Ore tranquille, funzione di ripetizione, livello di persistenza</string>
-    
-  <!-- Reminder Preference: Reminders Enabled Title -->
-  <string name="rmd_EPr_enabled_title">I promemoria sono abilitati?</string>
-  <!-- Reminder Preference Reminders Enabled Description (true) -->
-  <string name="rmd_EPr_enabled_desc_true">I promemoria di Astrid sono abilitati (impostazione di default)</string>
-  <!-- Reminder Preference Reminders Enabled Description (false) -->
-  <string name="rmd_EPr_enabled_desc_false">I promemoria Astrid non appariranno mai sul tuo telefono</string>  
-    
-  <!-- Reminder Preference: Quiet Hours Start Title -->
-  <string name="rmd_EPr_quiet_hours_start_title">Ora inizio silenzio</string>
-  <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">Nessuna notifica apparirà dopo le %s</string>
-  <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
-  <string name="rmd_EPr_quiet_hours_desc_none">Ora inizio silenzio non abilitato</string>
-  
-  <!-- Reminder Preference: Quiet Hours End Title -->
-  <string name="rmd_EPr_quiet_hours_end_title">Ora fine silenzio</string>
-  <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_end_desc">Le notifiche smetteranno di essere silenziose dopo le %s</string>
-
-  <!-- Reminder Preference: Default Reminder Title -->
-  <string name="rmd_EPr_rmd_time_title">Promemoria predefiniti</string>
-  <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
-  <string name="rmd_EPr_rmd_time_desc">Le notifiche per le attività senza scadenza appariranno alle %s</string>
-
-  <!-- Reminder Preference: Notification Ringtone Title -->
-  <string name="rmd_EPr_ringtone_title">Suoneria notifiche</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
-  <string name="rmd_EPr_ringtone_desc_custom">La suoneria personalizzata è stata impostata</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
-  <string name="rmd_EPr_ringtone_desc_silent">Suoneria impostata in modalità silenziosa</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
-  <string name="rmd_EPr_ringtone_desc_default">Verrà utilizzata la suoneria predefinita</string>
-  
-  <!-- Reminder Preference: Notification Persistence Title -->
-  <string name="rmd_EPr_persistent_title">Notifica Persistente</string>
-  <!-- Reminder Preference: Notification Persistence Description (true) -->
-  <string name="rmd_EPr_persistent_desc_true">Le notifiche devono essere visualizzate singolarmente per essere cancellate</string>
-  <!-- Reminder Preference: Notification Persistence Description (false) -->
-  <string name="rmd_EPr_persistent_desc_false">Le notifiche possono essere cancellate attraverso il pulsante \"Canella tutto\"</string>
-
-  <!-- Reminder Preference: Social Reminders Title -->
-  <string name="rmd_EPr_social_title">Social encouragement</string>
-  <!-- Reminder Preference: Social Reminders Summary (enabled) -->
-  <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for shared tasks</string>
-  <!-- Reminder Preference: Social Reminders Summary (disabled) -->
-  <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you for shared tasks</string>
-  
-  
-  
-  <!-- Reminder Preference: Notification Icon Title -->
-  <!-- Reminder Preference: Notification Icon Description -->
-
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
-  <string name="rmd_EPr_multiple_maxvolume_title">Volume massimo per promemoria "ring-multipli"</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid metterà il volume al massimo per i promemoria "ring-multipli"</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid userà le impostazioni di sistema per il volume</string>
-
-  <!-- Reminder Preference: Vibrate Title -->
-  <string name="rmd_EPr_vibrate_title">Vibrazione telefono</string>
-  <!-- Reminder Preference: Vibrate Description (true) -->
-  <string name="rmd_EPr_vibrate_desc_true">Astrid vibrerà durante l\'invio di notifiche</string>
-  <!-- Reminder Preference: Vibrate Description (false) -->
-  <string name="rmd_EPr_vibrate_desc_false">Astrid non vibrerà durante l\'invio di notifiche</string>
-
-  <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">Promemoria Astrid</string>
-  <!-- Reminder Preference: Nagging Description (true) -->
-  <string name="rmd_EPr_nagging_desc_true">Astrid si mostrerà per incoraggiarti durante i promemoria</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_nagging_desc_false">Astrid non ti darà nessun messaggio di incoraggiamento</string>
-
-  <!-- Reminder Preference: Snooze Dialog Title -->  
-  <string name="rmd_EPr_snooze_dialog_title">Posticipa a HH:MM</string>
-  <!-- Reminder Preference: Snooze Dialog Description (true) -->
-  <string name="rmd_EPr_snooze_dialog_desc_true">Posticipa scegliendo un nuovo orario (HH:MM)</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_snooze_dialog_desc_false">Posticipa scegliendo il numero di giorni/ore</string>
-  
-  <!-- slide 44g: Reminder Preference: Default Reminders Title -->
-  <string name="rmd_EPr_defaultRemind_title">Promemoria Casuali</string>
-  <!-- Reminder Preference: Default Reminders Setting (disabled) -->
-  <string name="rmd_EPr_defaultRemind_desc_disabled">Le nuove attività non avranno promemoria casuali</string>
-  <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
-  <string name="rmd_EPr_defaultRemind_desc">Le nuove attività saranno ricordate a caso: %s</string>
-  
-  <!-- slide 39a: Defaults Title -->
-  
-  <string-array name="EPr_reminder_random">
-    <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
-    <item>disabilitato</item>
-    <!-- slide 44b -->
-    <item>ogni ora</item>
-    <!-- slide 44c -->
-    <item>quotidianamente</item>
-    <!-- slide 44d-->
-    <item>settimanalmente</item>
-    <!-- slide 44e-->
-    <item>bi-settimanalmente</item>
-    <!-- slide 44f -->
-    <item>mensilmente</item>
-    <item>bi-mensilmente</item>
-  </string-array>
-        
-  <string-array name="EPr_quiet_hours_start">
-    <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
-    <item>disabilitato</item>
-    <item>8 PM</item>
-    <item>9 PM</item>
-    <item>10 PM</item>
-    <item>11 PM</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
-    <item>9 AM</item>
-    <item>10 AM</item>
-    <item>11 AM</item>
-    <item>12 PM</item>
-    <item>1 PM</item>
-    <item>2 PM</item>
-    <item>3 PM</item>
-    <item>4 PM</item>
-    <item>5 PM</item>
-    <item>6 PM</item>
-    <item>7 PM</item>
-  </string-array>
-  
-  <string-array name="EPr_quiet_hours_end">
-    <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
-    <item>9 AM</item>
-    <item>10 AM</item>
-    <item>11 AM</item>
-    <item>12 PM</item>
-    <item>1 PM</item>
-    <item>2 PM</item>
-    <item>3 PM</item>
-    <item>4 PM</item>
-    <item>5 PM</item>
-    <item>6 PM</item>
-    <item>7 PM</item>
-    <item>8 PM</item>
-    <item>9 PM</item>
-    <item>10 PM</item>
-    <item>11 PM</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
-  </string-array>
-  
-  <string-array name="EPr_rmd_time">
-    <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
-    <item>9 AM</item>
-    <item>10 AM</item>
-    <item>11 AM</item>
-    <item>12 PM</item>
-    <item>1 PM</item>
-    <item>2 PM</item>
-    <item>3 PM</item>
-    <item>4 PM</item>
-    <item>5 PM</item>
-    <item>6 PM</item>
-    <item>7 PM</item>
-    <item>8 PM</item>
-    <item>9 PM</item>
-    <item>10 PM</item>
-    <item>11 PM</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
-  </string-array>
-  
-  <!-- =============================================== random reminders == -->
-
-  <string name="reminders_social">Questa gente conta su di te!</string>
-  
-  <string name="reminders_social_one">%s is counting on you!</string>
-  
-  <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
-
-  <string-array name="reminders">
-      <!-- reminders: Make these < 20 chars so the task name is displayed -->
-      <item>Ciao! Hai un secondo?</item>
-      <item>Posso vederti per un secondo?</item>
-      <item>Hai qualche minuto?</item>
-      <item>Ti sei dimenticato?</item>
-      <item>Scusami!</item>
-      <item>Quando hai un minuto:</item>
-      <item>Nella tua agenda:</item>
-      <item>Sei libero per un momento?</item>
-      <item>Astrid è qui!</item>
-      <item>Ciao! Posso disturbarti?</item>
-      <item>Un minuto del tuo tempo?</item>
-      <item>È un gran giorno per</item>
-  </string-array>
-
-  <string-array name="reminders_due">
-      <!-- reminders related to task due date -->
-      <item>Ora al lavoro!</item>
-      <item>La scadenza è qui!</item>
-      <item>Pronto per iniziare?</item>
-      <item>Hai detto che avresti fatto:</item>
-      <item>Dovresti iniziare:</item>
-      <item>Tempo per iniziare:</item>
-      <item>E\' il momento!</item>
-      <item>Scusami! E\' il momento di</item>
-      <item>Sei libero? E\' il momento di</item>
-  </string-array>
-
-  <string-array name="reminders_snooze">
-      <!-- reminders related to snooze -->
-      <item>Non essere pigro ora!</item>
-      <item>Posticipo terminato!</item>
-      <item>Basta con i posticipi!</item>
-      <item>Adesso sei pronto?</item>
-      <item>Non rimandare più!</item>
-  </string-array>
-  
-  <string-array name="reminder_responses">
-      <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
-      <item>Ho qualcosa per te!</item> 
-      <item>Sei pronto a dimenticarti di questo?</item>
-      <item>Perché non lo completi?</item>
-      <item>Cosa ne pensi? Pronto come una tigre?</item>
-      <item>Sei pronto per questo?</item>
-      <item>Riesci a gestirlo?</item>
-      <item>Puoi essere felice! Basta che tu lo finisca!</item>
-      <item>Ti prometto che ti sentirai meglio se lo finisci!</item>
-      <item>Non lo farai oggi?</item>
-      <item>Ti prego finiscilo, sono stufo!</item>
-      <item>Puoi terminarlo? Si che puoi!</item>
-      <item>Hai intenzione di farlo prima o poi?</item>
-      <item>Sentiti bene con te stesso! Andiamo!</item>
-      <item>Sono fiero di te! Finiamolo!</item>
-      <item>Che ne pensi di un piccolo spuntino dopo che avrai finito?</item>
-      <item>Solo questo compito? Per favore?</item>
-      <item>E\' tempo di accorciare la tua lista delle cose da fare!</item>
-      <item>Are you on Team Order or Team Chaos? Team Order! Let\'s go!</item>
-      <item>Ti ho ricordato di recente che sei fantastico? Continua così!</item>
-      <item>Un\'attività al giorno leva il disordine di torno... Addio disordine!</item>
-      <item>Come ci sei riuscito? Wow..sono impressionato!</item>
-      <item>You can\'t just get by on your good looks. Let\'s get to it!</item>
-      <item>Un tempo ideale per un lavoro come questo, non è così?</item>
-      <item>Una tazza di tè mentre lavori a quest\'attività?</item>
-      <item>Se solo tu avessi già finito, allora potresti uscire e giocare.</item>
-      <item>E\' il momento. Non puoi evitare l\'inevitabile.</item>
-      <item>Muoio un po\' ogni volta che mi ignori.</item>
-  </string-array>
-
-  <string-array name="postpone_nags">
-      <!-- Astrid\'s nagging when user clicks postpone -->
-      <item>Non dirmi che sei uno che continua a posticipare!</item>
-      <item>Non essere pigro fa invecchiare qualche volta?</item>
-      <item>Da qualche parte, qualcuno dipende da te nel finire ciò!</item>
-      <item>Quando hai detto \"rimando\", volevi dire \"lo sto facendo\", giusto?</item>
-      <item>Questa è l\'ultima volta che rimandi ciò, giusto?</item>
-      <item>Finiscilo oggi, non lo ripeterò più!</item>
-      <item>Perché rimandare quando puoi uhm... non rimandare!</item>
-      <item>Potrai finire questo eventualmente, presumo?</item>
-      <item>Penso che tu sia veramente grande! Che ne dici di non mettere questa via?</item>
-      <item>Sarai in grado di raggiungere i tuoi obiettivi se fai ciò?</item>
-      <item>Rimandare, rimandare, rimandare. Quando cambierai!</item>
-      <item>Ne ho avuto abbastanza con le tue scuse! Basta farlo già!</item>
-      <item>Non ti sei scusato allo stesso modo l\'ultima volta?</item>
-      <item>Non posso aiutarti ad organizzare la tua vita se lo fai ...</item>
-  </string-array>
+    <!-- Resources for built-in reminders plug-in -->
 
+    <!-- =============================================== task edit activity == -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder group label -->
+    <string name="TEA_reminders_group_label">Reminder settings</string>
 
+    <!-- Task Edit: Reminder header label -->
+    <string name="TEA_reminder_label">Ricordamelo:</string>
 
-  <!-- Resources for built-in repeat plug-in -->
-
-  <!-- repeating plugin name -->
-  <string name="repeat_plugin">Attività ricorrente</string>
-  
-  <!-- repeating plugin description -->
-  <string name="repeat_plugin_desc">Permette di ripetere le attività</string>
-  
-  <!-- slide 20a: checkbox for turning on/off repeats -->
-  <string name="repeat_enabled">Ripeti</string>
-  
-  <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
-  <string name="repeat_every">Ogni %d</string>
-  
-  <!-- hint when opening repeat interval -->
-  <string name="repeat_interval_prompt">Intervallo di ripetizione</string>
-  
-  <!-- slide 19b-->
-  <string name="repeat_never">Not repeating</string>
-  <!-- slide 20f-->
-  <string name="repeat_dont">Non ripetere</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>Giorno(i)</item>
-    <item>Settimana(e)</item>
-    <item>Mese(i)</item>
-    <item>Ora(e)</item>
-    <item>Minuto(i)</item>
-    <item>Anno(i)</item>
-  </string-array>
-  
-  <string name="repeat_days">giorni</string>
-  <string name="repeat_weekdays">weekdays</string>
-  <string name="repeat_weeks">weeks</string>
-  <string name="repeat_months">months</string>
-  <string name="repeat_years">years</string>
-  <string name="repeat_hours">hours</string>
-  <string name="repeat_minutes">minuti</string>
-  
-  <string-array name="repeat_until_shortcuts">
-      <item>Forever</item>
-      <item>Specific Day</item>
-      <item>Oggi</item>
-      <item>Domani</item>
-      <item>(day after)</item>
-      <item>Settimana Successiva</item>
-      <item>Ogni Due Settimane</item>
-      <item>Mese Successivo</item>
-  </string-array>
-  
-  <string name="repeat_until_title">Ripeti fino a...</string>
-  
-  <string name="repeat_keep_going">Continua</string>
-  
-  <string-array name="repeat_type">
-    <!-- slide 20c: repeat type (date to repeat from) -->
-    <item>dalla data di scadenza</item>
-    <!-- slide 20c -->
-    <item>dalla data di completamento</item>
-  </string-array>
-  
-  <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
-  <string name="repeat_detail_byday">$I su $D</string>
-  
-  <!-- task detail for repeat from due date (%s -> interval) -->
-  <string name="repeat_detail_duedate">Ogni %s</string>
-
-  <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
-  <string name="repeat_detail_duedate_until">Ogni %1$s\nfino %2$s</string>
-  
-  <!-- task detail for repeat from completion date (%s -> interval) -->
-  <string name="repeat_detail_completion">%s dopo il completamento</string>
-  
-  <!-- text for button when repeating task indefinitely -->
-  <string name="repeat_forever">Ripeti all\'infinito</string>
-
-  <!-- text for button when repeating task until specified date (%s -> date string) -->
-  <string name="repeat_until">Ripeti fino %s</string>
-  
-  <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title">Ripianifica attività \"%s\"</string>
-
-  <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title_last_time">Attività ricorrente completata \"%s\"</string>
-      
-  <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->  
-  <string name="repeat_rescheduling_dialog_bubble">%1$s Ho ri-pianificato questa attività ricorrente da %2$s a %3$s</string>
-  
-  <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
-  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s Ho ri-pianificato questa attività ricorrente a %2$s</string>
-  
-  <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
-  <string name="repeat_rescheduling_dialog_bubble_last_time">Avevi questa ricorrenza fino %1$s, ed ora hai fatto tutto. %2$s</string>
-  
-  <string-array name="repeat_encouragement">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>Good job!</item>
-      <item>Wow… I\'m so proud of you!</item>
-      <item>I love when you\'re productive!</item>
-      <item>Doesn\'t it feel good to check something off?</item>
-  </string-array>
-
-  <string-array name="repeat_encouragement_last_time">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>Good job!</item>
-      <item>I\'m so proud of you!</item>
-      <item>I love when you\'re productive!</item>
-  </string-array>
-  
+    <!-- Task Edit: Reminder @ deadline -->
+    <string name="TEA_reminder_due">Alla scadenza dell\'attività</string>
 
+    <!-- Task Edit: Reminder after deadline -->
+    <string name="TEA_reminder_overdue">Quando l\'attività è in ritardo</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder at random times (%s => time plural)-->
+    <string name="TEA_reminder_randomly">In modo casuale</string>
 
-    
-  <!-- Subtasks Help Introduction -->
-  <string name="subtasks_help_title">Ordina e Indenta in Astrid</string>
-  <string name="subtasks_help_1">Tocca e tieni premuto per spostare un\'attività</string>
-  <string name="subtasks_help_2">Trascina verticalmente per riordinare</string>
-  <string name="subtasks_help_3">Trascina orizzontalmente per indentare</string>
-    
+    <!-- Task Edit: Reminder alarm clock label -->
+    <string name="TEA_reminder_alarm_label">Tipo di squillo/vibrazione:</string>
 
+    <!--  slide 45a: Task Edit: Reminder mode: ring once -->
+    <string name="TEA_reminder_mode_once">Once</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 45b: Task Edit: Reminder mode: ring five times -->
+    <string name="TEA_reminder_mode_five">Five times</string>
+
+    <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
+    <string name="TEA_reminder_mode_nonstop">Until I dismiss alarm</string>
+
+    <string name="TEA_reminder_when">when</string>
+
+    <string name="TEA_reminder_due_short">due</string>
+
+    <string name="TEA_reminder_overdue_short">overdue</string>
+
+    <string name="TEA_reminder_randomly_short">randomly</string>
+
+    <string name="TEA_reminder_display_one">Remind me %s</string>
+
+    <string name="TEA_reminder_display_multiple">Remind %s</string>
+
+    <string-array name="TEA_reminder_random">
+        <!-- random reminder choices for task edit page. -->
+        <item>an hour</item>
+        <item>ogni giorno</item>
+        <item>ogni settimana</item>
+        <item>ogni due settimane</item>
+        <item>ogni mese</item>
+        <item>ogni due mesi</item>
+    </string-array>
+
+    <!-- ==================================================== notifications == -->
+
+    <!-- Name of filter when viewing a reminder -->
+    <string name="rmd_NoA_filter">Promemoria!</string>
+
+    <!-- Reminder: Task was already done -->
+    <string name="rmd_NoA_done">Completata</string>
+
+    <!-- Reminder: Snooze button (remind again later) -->
+    <string name="rmd_NoA_snooze">Rimanda...</string>
+
+    <!-- Reminder: Completed Toast -->
+    <string name="rmd_NoA_completed_toast">Congratulazioni per il completamento!</string>
+
+    <!-- Prefix for reminder dialog title -->
+    <string name="rmd_NoA_dlg_title">Promemoria:</string>
+
+    <!-- ==================================================== user reengagement == -->
+
+    <!-- Titles for user reengagement notifications -->
+    <string-array name="rmd_reengage_notif_titles">
+        <item>Nota da Astrid</item>
+        <!-- %s -> first name -->
+        <item>Memo per %s</item>
+        <item>Your Astrid digest</item>
+        <item>Promemoria da Astrid</item>
+    </string-array>
+
+    <string name="rmd_reengage_name_default">tu</string>
+
+
+    <string name="rmd_reengage_add_tasks">Aggiungi un\'attività</string>
+
+    <!-- Speech bubble options for astrid in reengagement notifs -->
+    <string-array name="rmd_reengage_dialog_options">
+        <item>E\' tempo di accorciare la tua lista delle cose da fare!</item>
+        <item>Caro signore o signora, alcune attività attendono di essere visionate!</item>
+        <item>Ehi, puoi dare un\'occhiata a queste?</item>
+        <item>Ho alcune attività con il tuo nome!</item>
+        <item>Un nuovo elenco di attività per te oggi!</item>
+        <item>Hai un aspetto favoloso! Sei pronto ad iniziare?</item>
+        <item>Un giorno perfetto per completare qualche attività, credo!</item>
+    </string-array>
+
+    <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>Non vuoi organizzarti?</item>
+        <item>Sono Astrid! Sono qui ad aiutarti a fare di più!</item>
+        <item>Sembri impegnato! Fammi togliere alcune attività dal tuo carico di lavoro.</item>
+        <item>Posso aiutarti a tenere traccia di tutti i dettagli nella tua vita.</item>
+        <item>Sei serio sul volerne completare ancora? Allora anch\'io!</item>
+        <item>Pleasure to make your acquaintance!</item>
+    </string-array>
+    <!-- ============================================= reminder preferences == -->
+
+    <!-- slide 33d: Reminder Preference Screen Title -->
+    <string name="rmd_EPr_alerts_header">Impostazioni promemoria</string>
+    <string name="rmd_EPr_alerts_summary">Ore tranquille, funzione di ripetizione, livello di
+        persistenza
+    </string>
+
+    <!-- Reminder Preference: Reminders Enabled Title -->
+    <string name="rmd_EPr_enabled_title">I promemoria sono abilitati?</string>
+    <!-- Reminder Preference Reminders Enabled Description (true) -->
+    <string name="rmd_EPr_enabled_desc_true">I promemoria di Astrid sono abilitati (impostazione di
+        default)
+    </string>
+    <!-- Reminder Preference Reminders Enabled Description (false) -->
+    <string name="rmd_EPr_enabled_desc_false">I promemoria Astrid non appariranno mai sul tuo
+        telefono
+    </string>
+
+    <!-- Reminder Preference: Quiet Hours Start Title -->
+    <string name="rmd_EPr_quiet_hours_start_title">Ora inizio silenzio</string>
+    <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_start_desc">Nessuna notifica apparirà dopo le %s</string>
+    <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
+    <string name="rmd_EPr_quiet_hours_desc_none">Ora inizio silenzio non abilitato</string>
+
+    <!-- Reminder Preference: Quiet Hours End Title -->
+    <string name="rmd_EPr_quiet_hours_end_title">Ora fine silenzio</string>
+    <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_end_desc">Le notifiche smetteranno di essere silenziose dopo
+        le %s
+    </string>
+
+    <!-- Reminder Preference: Default Reminder Title -->
+    <string name="rmd_EPr_rmd_time_title">Promemoria predefiniti</string>
+    <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
+    <string name="rmd_EPr_rmd_time_desc">Le notifiche per le attività senza scadenza appariranno
+        alle %s
+    </string>
+
+    <!-- Reminder Preference: Notification Ringtone Title -->
+    <string name="rmd_EPr_ringtone_title">Suoneria notifiche</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
+    <string name="rmd_EPr_ringtone_desc_custom">La suoneria personalizzata è stata impostata
+    </string>
+    <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
+    <string name="rmd_EPr_ringtone_desc_silent">Suoneria impostata in modalità silenziosa</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
+    <string name="rmd_EPr_ringtone_desc_default">Verrà utilizzata la suoneria predefinita</string>
+
+    <!-- Reminder Preference: Notification Persistence Title -->
+    <string name="rmd_EPr_persistent_title">Notifica Persistente</string>
+    <!-- Reminder Preference: Notification Persistence Description (true) -->
+    <string name="rmd_EPr_persistent_desc_true">Le notifiche devono essere visualizzate
+        singolarmente per essere cancellate
+    </string>
+    <!-- Reminder Preference: Notification Persistence Description (false) -->
+    <string name="rmd_EPr_persistent_desc_false">Le notifiche possono essere cancellate attraverso
+        il pulsante \"Canella tutto\"
+    </string>
+
+    <!-- Reminder Preference: Social Reminders Title -->
+    <string name="rmd_EPr_social_title">Social encouragement</string>
+    <!-- Reminder Preference: Social Reminders Summary (enabled) -->
+    <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for
+        shared tasks
+    </string>
+    <!-- Reminder Preference: Social Reminders Summary (disabled) -->
+    <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you
+        for shared tasks
+    </string>
+
+
+    <!-- Reminder Preference: Notification Icon Title -->
+    <!-- Reminder Preference: Notification Icon Description -->
+
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
+    <string name="rmd_EPr_multiple_maxvolume_title">Volume massimo per promemoria "ring-multipli"
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid metterà il volume al massimo per i
+        promemoria "ring-multipli"
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid userà le impostazioni di sistema per
+        il volume
+    </string>
+
+    <!-- Reminder Preference: Vibrate Title -->
+    <string name="rmd_EPr_vibrate_title">Vibrazione telefono</string>
+    <!-- Reminder Preference: Vibrate Description (true) -->
+    <string name="rmd_EPr_vibrate_desc_true">Astrid vibrerà durante l\'invio di notifiche</string>
+    <!-- Reminder Preference: Vibrate Description (false) -->
+    <string name="rmd_EPr_vibrate_desc_false">Astrid non vibrerà durante l\'invio di notifiche
+    </string>
+
+    <!-- Reminder Preference: Nagging Title -->
+    <string name="rmd_EPr_nagging_title">Promemoria Astrid</string>
+    <!-- Reminder Preference: Nagging Description (true) -->
+    <string name="rmd_EPr_nagging_desc_true">Astrid si mostrerà per incoraggiarti durante i
+        promemoria
+    </string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_nagging_desc_false">Astrid non ti darà nessun messaggio di
+        incoraggiamento
+    </string>
+
+    <!-- Reminder Preference: Snooze Dialog Title -->
+    <string name="rmd_EPr_snooze_dialog_title">Posticipa a HH:MM</string>
+    <!-- Reminder Preference: Snooze Dialog Description (true) -->
+    <string name="rmd_EPr_snooze_dialog_desc_true">Posticipa scegliendo un nuovo orario (HH:MM)
+    </string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_snooze_dialog_desc_false">Posticipa scegliendo il numero di giorni/ore
+    </string>
+
+    <!-- slide 44g: Reminder Preference: Default Reminders Title -->
+    <string name="rmd_EPr_defaultRemind_title">Promemoria Casuali</string>
+    <!-- Reminder Preference: Default Reminders Setting (disabled) -->
+    <string name="rmd_EPr_defaultRemind_desc_disabled">Le nuove attività non avranno promemoria
+        casuali
+    </string>
+    <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
+    <string name="rmd_EPr_defaultRemind_desc">Le nuove attività saranno ricordate a caso: %s
+    </string>
+
+    <!-- slide 39a: Defaults Title -->
+
+    <string-array name="EPr_reminder_random">
+        <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
+        <item>disabilitato</item>
+        <!-- slide 44b -->
+        <item>ogni ora</item>
+        <!-- slide 44c -->
+        <item>quotidianamente</item>
+        <!-- slide 44d-->
+        <item>settimanalmente</item>
+        <!-- slide 44e-->
+        <item>bi-settimanalmente</item>
+        <!-- slide 44f -->
+        <item>mensilmente</item>
+        <item>bi-mensilmente</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_start">
+        <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
+        <item>disabilitato</item>
+        <item>8 PM</item>
+        <item>9 PM</item>
+        <item>10 PM</item>
+        <item>11 PM</item>
+        <item>12 AM</item>
+        <item>1 AM</item>
+        <item>2 AM</item>
+        <item>3 AM</item>
+        <item>4 AM</item>
+        <item>5 AM</item>
+        <item>6 AM</item>
+        <item>7 AM</item>
+        <item>8 AM</item>
+        <item>9 AM</item>
+        <item>10 AM</item>
+        <item>11 AM</item>
+        <item>12 PM</item>
+        <item>1 PM</item>
+        <item>2 PM</item>
+        <item>3 PM</item>
+        <item>4 PM</item>
+        <item>5 PM</item>
+        <item>6 PM</item>
+        <item>7 PM</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_end">
+        <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
+        <item>9 AM</item>
+        <item>10 AM</item>
+        <item>11 AM</item>
+        <item>12 PM</item>
+        <item>1 PM</item>
+        <item>2 PM</item>
+        <item>3 PM</item>
+        <item>4 PM</item>
+        <item>5 PM</item>
+        <item>6 PM</item>
+        <item>7 PM</item>
+        <item>8 PM</item>
+        <item>9 PM</item>
+        <item>10 PM</item>
+        <item>11 PM</item>
+        <item>12 AM</item>
+        <item>1 AM</item>
+        <item>2 AM</item>
+        <item>3 AM</item>
+        <item>4 AM</item>
+        <item>5 AM</item>
+        <item>6 AM</item>
+        <item>7 AM</item>
+        <item>8 AM</item>
+    </string-array>
+
+    <string-array name="EPr_rmd_time">
+        <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
+        <item>9 AM</item>
+        <item>10 AM</item>
+        <item>11 AM</item>
+        <item>12 PM</item>
+        <item>1 PM</item>
+        <item>2 PM</item>
+        <item>3 PM</item>
+        <item>4 PM</item>
+        <item>5 PM</item>
+        <item>6 PM</item>
+        <item>7 PM</item>
+        <item>8 PM</item>
+        <item>9 PM</item>
+        <item>10 PM</item>
+        <item>11 PM</item>
+        <item>12 AM</item>
+        <item>1 AM</item>
+        <item>2 AM</item>
+        <item>3 AM</item>
+        <item>4 AM</item>
+        <item>5 AM</item>
+        <item>6 AM</item>
+        <item>7 AM</item>
+        <item>8 AM</item>
+    </string-array>
+
+    <!-- =============================================== random reminders == -->
+
+    <string name="reminders_social">Questa gente conta su di te!</string>
+
+    <string name="reminders_social_one">%s is counting on you!</string>
+
+    <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
+
+    <string-array name="reminders">
+        <!-- reminders: Make these < 20 chars so the task name is displayed -->
+        <item>Ciao! Hai un secondo?</item>
+        <item>Posso vederti per un secondo?</item>
+        <item>Hai qualche minuto?</item>
+        <item>Ti sei dimenticato?</item>
+        <item>Scusami!</item>
+        <item>Quando hai un minuto:</item>
+        <item>Nella tua agenda:</item>
+        <item>Sei libero per un momento?</item>
+        <item>Astrid è qui!</item>
+        <item>Ciao! Posso disturbarti?</item>
+        <item>Un minuto del tuo tempo?</item>
+        <item>È un gran giorno per</item>
+    </string-array>
+
+    <string-array name="reminders_due">
+        <!-- reminders related to task due date -->
+        <item>Ora al lavoro!</item>
+        <item>La scadenza è qui!</item>
+        <item>Pronto per iniziare?</item>
+        <item>Hai detto che avresti fatto:</item>
+        <item>Dovresti iniziare:</item>
+        <item>Tempo per iniziare:</item>
+        <item>E\' il momento!</item>
+        <item>Scusami! E\' il momento di</item>
+        <item>Sei libero? E\' il momento di</item>
+    </string-array>
+
+    <string-array name="reminders_snooze">
+        <!-- reminders related to snooze -->
+        <item>Non essere pigro ora!</item>
+        <item>Posticipo terminato!</item>
+        <item>Basta con i posticipi!</item>
+        <item>Adesso sei pronto?</item>
+        <item>Non rimandare più!</item>
+    </string-array>
+
+    <string-array name="reminder_responses">
+        <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
+        <item>Ho qualcosa per te!</item>
+        <item>Sei pronto a dimenticarti di questo?</item>
+        <item>Perché non lo completi?</item>
+        <item>Cosa ne pensi? Pronto come una tigre?</item>
+        <item>Sei pronto per questo?</item>
+        <item>Riesci a gestirlo?</item>
+        <item>Puoi essere felice! Basta che tu lo finisca!</item>
+        <item>Ti prometto che ti sentirai meglio se lo finisci!</item>
+        <item>Non lo farai oggi?</item>
+        <item>Ti prego finiscilo, sono stufo!</item>
+        <item>Puoi terminarlo? Si che puoi!</item>
+        <item>Hai intenzione di farlo prima o poi?</item>
+        <item>Sentiti bene con te stesso! Andiamo!</item>
+        <item>Sono fiero di te! Finiamolo!</item>
+        <item>Che ne pensi di un piccolo spuntino dopo che avrai finito?</item>
+        <item>Solo questo compito? Per favore?</item>
+        <item>E\' tempo di accorciare la tua lista delle cose da fare!</item>
+        <item>Are you on Team Order or Team Chaos? Team Order! Let\'s go!</item>
+        <item>Ti ho ricordato di recente che sei fantastico? Continua così!</item>
+        <item>Un\'attività al giorno leva il disordine di torno... Addio disordine!</item>
+        <item>Come ci sei riuscito? Wow..sono impressionato!</item>
+        <item>You can\'t just get by on your good looks. Let\'s get to it!</item>
+        <item>Un tempo ideale per un lavoro come questo, non è così?</item>
+        <item>Una tazza di tè mentre lavori a quest\'attività?</item>
+        <item>Se solo tu avessi già finito, allora potresti uscire e giocare.</item>
+        <item>E\' il momento. Non puoi evitare l\'inevitabile.</item>
+        <item>Muoio un po\' ogni volta che mi ignori.</item>
+    </string-array>
+
+    <string-array name="postpone_nags">
+        <!-- Astrid\'s nagging when user clicks postpone -->
+        <item>Non dirmi che sei uno che continua a posticipare!</item>
+        <item>Non essere pigro fa invecchiare qualche volta?</item>
+        <item>Da qualche parte, qualcuno dipende da te nel finire ciò!</item>
+        <item>Quando hai detto \"rimando\", volevi dire \"lo sto facendo\", giusto?</item>
+        <item>Questa è l\'ultima volta che rimandi ciò, giusto?</item>
+        <item>Finiscilo oggi, non lo ripeterò più!</item>
+        <item>Perché rimandare quando puoi uhm... non rimandare!</item>
+        <item>Potrai finire questo eventualmente, presumo?</item>
+        <item>Penso che tu sia veramente grande! Che ne dici di non mettere questa via?</item>
+        <item>Sarai in grado di raggiungere i tuoi obiettivi se fai ciò?</item>
+        <item>Rimandare, rimandare, rimandare. Quando cambierai!</item>
+        <item>Ne ho avuto abbastanza con le tue scuse! Basta farlo già!</item>
+        <item>Non ti sei scusato allo stesso modo l\'ultima volta?</item>
+        <item>Non posso aiutarti ad organizzare la tua vita se lo fai ...</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in repeat plug-in -->
+
+    <!-- repeating plugin name -->
+    <string name="repeat_plugin">Attività ricorrente</string>
+
+    <!-- repeating plugin description -->
+    <string name="repeat_plugin_desc">Permette di ripetere le attività</string>
+
+    <!-- slide 20a: checkbox for turning on/off repeats -->
+    <string name="repeat_enabled">Ripeti</string>
+
+    <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
+    <string name="repeat_every">Ogni %d</string>
+
+    <!-- hint when opening repeat interval -->
+    <string name="repeat_interval_prompt">Intervallo di ripetizione</string>
+
+    <!-- slide 19b-->
+    <string name="repeat_never">Not repeating</string>
+    <!-- slide 20f-->
+    <string name="repeat_dont">Non ripetere</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>Giorno(i)</item>
+        <item>Settimana(e)</item>
+        <item>Mese(i)</item>
+        <item>Ora(e)</item>
+        <item>Minuto(i)</item>
+        <item>Anno(i)</item>
+    </string-array>
+
+    <string name="repeat_days">giorni</string>
+    <string name="repeat_weekdays">weekdays</string>
+    <string name="repeat_weeks">weeks</string>
+    <string name="repeat_months">months</string>
+    <string name="repeat_years">years</string>
+    <string name="repeat_hours">hours</string>
+    <string name="repeat_minutes">minuti</string>
+
+    <string-array name="repeat_until_shortcuts">
+        <item>Forever</item>
+        <item>Specific Day</item>
+        <item>Oggi</item>
+        <item>Domani</item>
+        <item>(day after)</item>
+        <item>Settimana Successiva</item>
+        <item>Ogni Due Settimane</item>
+        <item>Mese Successivo</item>
+    </string-array>
+
+    <string name="repeat_until_title">Ripeti fino a...</string>
+
+    <string name="repeat_keep_going">Continua</string>
+
+    <string-array name="repeat_type">
+        <!-- slide 20c: repeat type (date to repeat from) -->
+        <item>dalla data di scadenza</item>
+        <!-- slide 20c -->
+        <item>dalla data di completamento</item>
+    </string-array>
+
+    <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
+    <string name="repeat_detail_byday">$I su $D</string>
+
+    <!-- task detail for repeat from due date (%s -> interval) -->
+    <string name="repeat_detail_duedate">Ogni %s</string>
+
+    <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
+    <string name="repeat_detail_duedate_until">Ogni %1$s\nfino %2$s</string>
+
+    <!-- task detail for repeat from completion date (%s -> interval) -->
+    <string name="repeat_detail_completion">%s dopo il completamento</string>
+
+    <!-- text for button when repeating task indefinitely -->
+    <string name="repeat_forever">Ripeti all\'infinito</string>
+
+    <!-- text for button when repeating task until specified date (%s -> date string) -->
+    <string name="repeat_until">Ripeti fino %s</string>
+
+    <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title">Ripianifica attività \"%s\"</string>
+
+    <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title_last_time">Attività ricorrente completata
+        \"%s\"
+    </string>
+
+    <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->
+    <string name="repeat_rescheduling_dialog_bubble">%1$s Ho ri-pianificato questa attività
+        ricorrente da %2$s a %3$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
+    <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s Ho ri-pianificato questa attività
+        ricorrente a %2$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
+    <string name="repeat_rescheduling_dialog_bubble_last_time">Avevi questa ricorrenza fino %1$s, ed
+        ora hai fatto tutto. %2$s
+    </string>
+
+    <string-array name="repeat_encouragement">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>Good job!</item>
+        <item>Wow… I\'m so proud of you!</item>
+        <item>I love when you\'re productive!</item>
+        <item>Doesn\'t it feel good to check something off?</item>
+    </string-array>
+
+    <string-array name="repeat_encouragement_last_time">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>Good job!</item>
+        <item>I\'m so proud of you!</item>
+        <item>I love when you\'re productive!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Subtasks Help Introduction -->
+    <string name="subtasks_help_title">Ordina e Indenta in Astrid</string>
+    <string name="subtasks_help_1">Tocca e tieni premuto per spostare un\'attività</string>
+    <string name="subtasks_help_2">Trascina verticalmente per riordinare</string>
+    <string name="subtasks_help_3">Trascina orizzontalmente per indentare</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-
-  <!-- Tags label -->
-  <string name="TEA_tags_label">Liste</string>
-  
-  <!-- Tags label long version -->
-  <string name="TEA_tags_label_long">Add to lists</string>
- 
-  <!-- Tags hint -->
-  <string name="TEA_tag_hint">Nuova lista</string>
-  
-  <!-- Tags dropdown -->
-    
-  <!-- =============================================== Task List Controls == -->
-  
-  <!-- menu item for tags -->
-  
-  <!-- ========================================================== Extras == -->
-  
-  <!-- Context Item: show tag -->
-  
-  <!-- slide 25a: Dialog: new list -->
-  <string name="tag_new_list">Nuova lista</string>
-  
-  <!-- Dialog: list saved -->
-  
-  <!-- Dialog: task created without title -->
-  <string name="tag_no_title_error">Per cortesia, prima inserisci un nome per questa lista</string>
-  
-  <!-- ========================================================== Filters == -->
-  
-  <!-- filter button to add tag -->
-  <string name="tag_FEx_add_new">Nuova</string>
-  
-  <!-- filter header for tags -->
-  <string name="tag_FEx_header">Liste</string>
-  
-  <!-- filter header for tags user created -->
-  
-  <!-- filter header for tags, shared with user -->
-  
-  <!-- filter header for tags which have no active tasks -->
-  
-  <!-- slide 10d: filter for untagged tasks -->
-  <string name="tag_FEx_untagged">Uncategorized</string>
-  
-  <!-- slide 27a: %s => tag name -->
-
-  <!-- context menu option to rename a tag -->
-  <string name="tag_cm_rename">Rinomina Lista</string>
-
-  <!-- context menu option to delete a tag -->
-  <string name="tag_cm_delete">Cancella Lista</string>
-  
-  <!-- context menu option to leave a shared list -->
-  <string name="tag_cm_leave">Abbandona la Lista</string>
-
-  <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
-  <string name="DLG_delete_this_tag_question">Cancellare questa Lista: %s? (Nessuna attività sarà cancellata.)</string>
-  
-  <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
-  <string name="DLG_leave_this_shared_tag_question">Abbandonare questa lista condivisa: %s? (Nessuna attività sarà cancellata.)</string>
-
-  <!-- Dialog to rename tag -->
-  <string name="DLG_rename_this_tag_header">Rinomina la lista %s in:</string>
-
-  <!-- Toast notification that no changes have been made -->
-  <string name="TEA_no_tags_modified">Nessuna modifica effettuata</string>
-
-  <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_deleted">Lista %1$s è stata cancellata, interressate %2$d attività</string>
-  
-  <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_left">Hai lasciato condivisa la lista %1$s, coinvolte %2$d attività</string>
-
-  <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
-  <string name="TEA_tags_renamed">Rinominato %1$s in %2$s per le attivitá %3$d</string>
-  
-  <!-- Tag case migration -->
-  <string name="tag_case_migration_notice">Abbiamo notato che hai delle liste con lo stesso nome ma con la capitale in maiuscolo e in minuscolo. Abbiamo combinato le due liste, pensando
- che ti riferissi alla stessa lista. Non c\'é da preoccuparsi le liste originali sono state semplicemente rinominate con un suffisso numerico (es. Shopping_1, Shopping_2). Se questo non 
-è ció che desideravi, basta cancellare la nuova lista combinata!</string>
-  
-  <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings:</string>
-  
-  <!-- Header for tag activity -->
-  <string name="tag_updates_title">Attività: %s</string>
-  
-  <!-- Delete button for tag settings -->
-  <string name="tag_delete_button">Cancella Lista</string>
-  
-  <!-- slide 28d: Leave button for tag settings -->
-  <string name="tag_leave_button">Lascia questa lista</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Tags label -->
+    <string name="TEA_tags_label">Liste</string>
 
+    <!-- Tags label long version -->
+    <string name="TEA_tags_label_long">Add to lists</string>
+
+    <!-- Tags hint -->
+    <string name="TEA_tag_hint">Nuova lista</string>
+
+    <!-- Tags dropdown -->
+
+    <!-- =============================================== Task List Controls == -->
+
+    <!-- menu item for tags -->
+
+    <!-- ========================================================== Extras == -->
+
+    <!-- Context Item: show tag -->
+
+    <!-- slide 25a: Dialog: new list -->
+    <string name="tag_new_list">Nuova lista</string>
+
+    <!-- Dialog: list saved -->
+
+    <!-- Dialog: task created without title -->
+    <string name="tag_no_title_error">Per cortesia, prima inserisci un nome per questa lista
+    </string>
+
+    <!-- ========================================================== Filters == -->
+
+    <!-- filter button to add tag -->
+    <string name="tag_FEx_add_new">Nuova</string>
+
+    <!-- filter header for tags -->
+    <string name="tag_FEx_header">Liste</string>
+
+    <!-- filter header for tags user created -->
+
+    <!-- filter header for tags, shared with user -->
+
+    <!-- filter header for tags which have no active tasks -->
+
+    <!-- slide 10d: filter for untagged tasks -->
+    <string name="tag_FEx_untagged">Uncategorized</string>
+
+    <!-- slide 27a: %s => tag name -->
+
+    <!-- context menu option to rename a tag -->
+    <string name="tag_cm_rename">Rinomina Lista</string>
+
+    <!-- context menu option to delete a tag -->
+    <string name="tag_cm_delete">Cancella Lista</string>
+
+    <!-- context menu option to leave a shared list -->
+    <string name="tag_cm_leave">Abbandona la Lista</string>
+
+    <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
+    <string name="DLG_delete_this_tag_question">Cancellare questa Lista: %s? (Nessuna attività sarà
+        cancellata.)
+    </string>
+
+    <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
+    <string name="DLG_leave_this_shared_tag_question">Abbandonare questa lista condivisa: %s?
+        (Nessuna attività sarà cancellata.)
+    </string>
+
+    <!-- Dialog to rename tag -->
+    <string name="DLG_rename_this_tag_header">Rinomina la lista %s in:</string>
+
+    <!-- Toast notification that no changes have been made -->
+    <string name="TEA_no_tags_modified">Nessuna modifica effettuata</string>
+
+    <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_deleted">Lista %1$s è stata cancellata, interressate %2$d attività
+    </string>
+
+    <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_left">Hai lasciato condivisa la lista %1$s, coinvolte %2$d attività
+    </string>
+
+    <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
+    <string name="TEA_tags_renamed">Rinominato %1$s in %2$s per le attivitá %3$d</string>
+
+    <!-- Tag case migration -->
+    <string name="tag_case_migration_notice">Abbiamo notato che hai delle liste con lo stesso nome
+        ma con la capitale in maiuscolo e in minuscolo. Abbiamo combinato le due liste, pensando
+        che ti riferissi alla stessa lista. Non c\'é da preoccuparsi le liste originali sono state
+        semplicemente rinominate con un suffisso numerico (es. Shopping_1, Shopping_2). Se questo
+        non
+        è ció che desideravi, basta cancellare la nuova lista combinata!
+    </string>
+
+    <!-- Header for tag settings -->
+    <string name="tag_settings_title">Settings:</string>
+
+    <!-- Header for tag activity -->
+    <string name="tag_updates_title">Attività: %s</string>
+
+    <!-- Delete button for tag settings -->
+    <string name="tag_delete_button">Cancella Lista</string>
+
+    <!-- slide 28d: Leave button for tag settings -->
+    <string name="tag_leave_button">Lascia questa lista</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in timers plug-in -->
-    
+
     <!-- Task List: Start Timer button -->
-    
+
     <!-- Task List: Stop Timer button -->
-    
+
     <!-- Android Notification Title (%s => # tasks) -->
     <string name="TPl_notification">Timer attivi per %s!</string>
-    
+
     <!-- Filter Header for Timer plugin -->
-    
+
     <!-- Filter for Timed Tasks -->
     <string name="TFE_workingOn">Attività cronometrate</string>
-    
+
     <!-- Title for TEA -->
     <string name="TEA_timer_controls">Timer</string>
-    
-    
+
+
     <!-- Edit Notes: create comment for when timer is started -->
     <string name="TEA_timer_comment_started">inizio attività</string>
-    
+
     <!-- Edit Notes: create comment for when timer is stopped -->
     <string name="TEA_timer_comment_stopped">fine attività</string>
-    
+
     <!-- Edit Notes: comment to notify how long was spent on task -->
     <string name="TEA_timer_comment_spent">Tempo speso:</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Update string from activity codes %1$s - user, %2$s - target name, %3$s - message, %4$s - other_user-->
-    
+
     <!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
     Please do not translate this part of the string. -->
-    
+
     <!-- These are still in use -->
     <string name="update_string_default_comment">%1$s ha commentato: %3$s</string>
     <string name="update_string_task_comment">%1$s on $link_task: %3$s</string>
     <string name="update_string_tag_comment">%1$s on %2$s: %3$s</string>
     <string name="update_string_user_self">Tu</string>
-    
+
     <string name="history_yourself">yourself</string>
     <string name="history_you">tu</string>
     <string name="history_a_deleted_user">(a deleted user)</string>
-    
+
     <string name="history_this_list">Questa lista</string>
     <string name="history_this_task">Questa attività</string>
     <string name="history_tag_added">added %1$s to %2$s</string>
@@ -2992,9 +3289,12 @@ non potrai fare acquisti.</string>
     <string name="history_favorited">favorited %s</string>
     <string name="history_unfavorited">unfavorited %s</string>
     <string name="history_changed_list_picture">change this list\'s picture</string>
-    <string name="history_added_description_characters">added %1$d characters to %2$s description</string>
+    <string name="history_added_description_characters">added %1$d characters to %2$s description
+    </string>
     <string name="history_removed_description">removed %s description</string>
-    <string name="history_removed_description_characters">removed %1$d characters from %2$s description</string>
+    <string name="history_removed_description_characters">removed %1$d characters from %2$s
+        description
+    </string>
     <string name="history_updated_description">updated %s description</string>
     <string name="history_changed_list_owner">changed list owner to %s</string>
     <string name="history_created_this_list">created this list</string>
@@ -3017,195 +3317,230 @@ non potrai fare acquisti.</string>
     <string name="history_repeat_on">on %s</string>
     <string name="history_repeat_from_completion">after completion</string>
     <string name="history_acknowledged">viewed %s</string>
-    
-    <string name="history_default">changed %1$s to %2$s</string>
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-    
-  <!-- Voice Add Prompt Text -->
-  <string name="voice_create_prompt">Parla per creare un\'attività</string>
-  <string name="voice_edit_title_prompt">Parla per aggiungere il titolo</string>
-  <string name="voice_edit_note_prompt">Parla per aggiungere le note</string>
-    
-  <!-- Preference: Task List recognition-service is not installed, but available -->
-  <string name="EPr_voiceInputInstall_dlg">Riconoscimento vocale non installato.\nVuoi andare al market e installarlo?</string>
-  <!-- Preference: Task List recognition-service is not available for this system -->
-  <string name="EPr_voiceInputUnavailable_dlg">Sfortunatamente il riconoscimento vocale non è disponibile per il tuo sistema.\nSe possibile, aggiorna Android alla versione 2.1 o superiore.</string>
-  <!-- Preference: Market is not available for this system -->
-  <string name="EPr_marketUnavailable_dlg">Sfortunatamente il market non è dsponibile sul tuo sistema.\nSe possibile, prova a scaricare il riconoscimento vocale da un\'altra fonte.</string>
-  <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
-  <string name="EPr_voiceInputEnabled_title">Voce</string>
-  <!-- slide 38a: Preference: voice button description (true) -->
-  <string name="EPr_voiceInputEnabled_desc_enabled">Il pulsante per il riconoscimento vocale sarà visibile nella lista delle attività</string>
-  <!-- Preference: voice button description (false) -->
-  <string name="EPr_voiceInputEnabled_desc_disabled">Il pulsante per il riconoscimento vocale sarà nascosto nella lista delle attività</string>
-  <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
-  <string name="EPr_voiceInputCreatesTask_title">Crea Attività direttamente</string>
-  <!-- Preference: Task List Voice-creation description (true) -->
-  <string name="EPr_voiceInputCreatesTask_desc_enabled">Le attività saranno create automaticamente con il riconoscimento vocale</string>
-  <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
-  <string name="EPr_voiceInputCreatesTask_desc_disabled">Potrai modificare il titolo dell\'attività dopo il riconoscimento vocale</string>
-  <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
-  <string name="EPr_voiceRemindersEnabled_title">Promemoria vocali</string>
-  <!-- Preference: Voice reminders description (true) -->
-  <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid pronuncerà il nome dell\'attività durante i promemoria</string>
-  <!-- slide 38c: Preference: Voice reminders description (false) -->
-  <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid emetterà una suoneria durante i promemoria</string>    
-  
-  <!-- slide 32d: Preference Category: Voice Title -->
-  <string name="EPr_voice_header">Impostazioni Voce</string>
-    
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-  
-  <!-- slide 30a-->
-  <string name="welcome_setting">Visualizza tutorial</string>
-  
-  <string name="welcome_title_1">Benvenuto in Astrid!</string>
-
-  <!-- slide 2a -->
-  <string name="welcome_title_2">Crea Lista</string>
-
-  <!-- slide 3a-->
-  <string name="welcome_title_3">Cambio tra liste</string>
-
-  <!-- slide 4a -->
-  <string name="welcome_title_4">Condividi le liste!</string>
-
-  <!-- slide 5a -->
-  <string name="welcome_title_5">Spartisci le attività</string>
-
-  <!-- slide 6a -->
-  <string name="welcome_title_6">Fornisci dettagli</string>
 
-  <!-- slide 7a -->
-  <string name="welcome_title_7">Collegati adesso per iniziare!</string>
-  
-  <string name="welcome_title_7_return">Fatto!</string>
-  
-  <!-- slide 1b -->
-  <string name="welcome_body_1">La to-do list personale perfetta\nche funziona anche tra amici</string>
-
-  <!-- slide 2b-->
-  <string name="welcome_body_2">Perfetto per qualsiasi lista: letture, film, acquisti, luoghi da visitare!</string>
-
-  <!-- slide 3b -->
-  <string name="welcome_body_3">Tappa sul titolo \n per vedere tutte le tue liste</string>
-
-  <!-- slide 4b -->
-  <string name="welcome_body_4">Condividi le tue liste con\namici, coinquilini\n o il tuo amore!</string>
-
-  <!-- slide 5b -->
-  <string name="welcome_body_5">and much more!</string>
+    <string name="history_default">changed %1$s to %2$s</string>
 
-  <!-- slide 6b-->
-  <string name="welcome_body_6">Tappa per aggiungere una nota\n aggiungere un promemoria\n e molto altro!</string>
-  <string name="welcome_body_7">Accedi</string>
-  
-  <string name="welcome_body_7_return">Fai tap su Astrid per tornare indietro</string>
-  
-  <!-- slide 1c -->
-  <string name="welcome_next">Successivo</string>
-  
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Voice Add Prompt Text -->
+    <string name="voice_create_prompt">Parla per creare un\'attività</string>
+    <string name="voice_edit_title_prompt">Parla per aggiungere il titolo</string>
+    <string name="voice_edit_note_prompt">Parla per aggiungere le note</string>
+
+    <!-- Preference: Task List recognition-service is not installed, but available -->
+    <string name="EPr_voiceInputInstall_dlg">Riconoscimento vocale non installato.\nVuoi andare al
+        market e installarlo?
+    </string>
+    <!-- Preference: Task List recognition-service is not available for this system -->
+    <string name="EPr_voiceInputUnavailable_dlg">Sfortunatamente il riconoscimento vocale non è
+        disponibile per il tuo sistema.\nSe possibile, aggiorna Android alla versione 2.1 o
+        superiore.
+    </string>
+    <!-- Preference: Market is not available for this system -->
+    <string name="EPr_marketUnavailable_dlg">Sfortunatamente il market non è dsponibile sul tuo
+        sistema.\nSe possibile, prova a scaricare il riconoscimento vocale da un\'altra fonte.
+    </string>
+    <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
+    <string name="EPr_voiceInputEnabled_title">Voce</string>
+    <!-- slide 38a: Preference: voice button description (true) -->
+    <string name="EPr_voiceInputEnabled_desc_enabled">Il pulsante per il riconoscimento vocale sarà
+        visibile nella lista delle attività
+    </string>
+    <!-- Preference: voice button description (false) -->
+    <string name="EPr_voiceInputEnabled_desc_disabled">Il pulsante per il riconoscimento vocale sarà
+        nascosto nella lista delle attività
+    </string>
+    <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
+    <string name="EPr_voiceInputCreatesTask_title">Crea Attività direttamente</string>
+    <!-- Preference: Task List Voice-creation description (true) -->
+    <string name="EPr_voiceInputCreatesTask_desc_enabled">Le attività saranno create automaticamente
+        con il riconoscimento vocale
+    </string>
+    <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
+    <string name="EPr_voiceInputCreatesTask_desc_disabled">Potrai modificare il titolo
+        dell\'attività dopo il riconoscimento vocale
+    </string>
+    <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
+    <string name="EPr_voiceRemindersEnabled_title">Promemoria vocali</string>
+    <!-- Preference: Voice reminders description (true) -->
+    <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid pronuncerà il nome dell\'attività
+        durante i promemoria
+    </string>
+    <!-- slide 38c: Preference: Voice reminders description (false) -->
+    <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid emetterà una suoneria durante i
+        promemoria
+    </string>
+
+    <!-- slide 32d: Preference Category: Voice Title -->
+    <string name="EPr_voice_header">Impostazioni Voce</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 30a-->
+    <string name="welcome_setting">Visualizza tutorial</string>
+
+    <string name="welcome_title_1">Benvenuto in Astrid!</string>
+
+    <!-- slide 2a -->
+    <string name="welcome_title_2">Crea Lista</string>
+
+    <!-- slide 3a-->
+    <string name="welcome_title_3">Cambio tra liste</string>
+
+    <!-- slide 4a -->
+    <string name="welcome_title_4">Condividi le liste!</string>
+
+    <!-- slide 5a -->
+    <string name="welcome_title_5">Spartisci le attività</string>
+
+    <!-- slide 6a -->
+    <string name="welcome_title_6">Fornisci dettagli</string>
+
+    <!-- slide 7a -->
+    <string name="welcome_title_7">Collegati adesso per iniziare!</string>
+
+    <string name="welcome_title_7_return">Fatto!</string>
+
+    <!-- slide 1b -->
+    <string name="welcome_body_1">La to-do list personale perfetta\nche funziona anche tra amici
+    </string>
+
+    <!-- slide 2b-->
+    <string name="welcome_body_2">Perfetto per qualsiasi lista: letture, film, acquisti, luoghi da
+        visitare!
+    </string>
+
+    <!-- slide 3b -->
+    <string name="welcome_body_3">Tappa sul titolo \n per vedere tutte le tue liste</string>
+
+    <!-- slide 4b -->
+    <string name="welcome_body_4">Condividi le tue liste con\namici, coinquilini\n o il tuo amore!
+    </string>
+
+    <!-- slide 5b -->
+    <string name="welcome_body_5">and much more!</string>
+
+    <!-- slide 6b-->
+    <string name="welcome_body_6">Tappa per aggiungere una nota\n aggiungere un promemoria\n e molto
+        altro!
+    </string>
+    <string name="welcome_body_7">Accedi</string>
+
+    <string name="welcome_body_7_return">Fai tap su Astrid per tornare indietro</string>
+
+    <!-- slide 1c -->
+    <string name="welcome_next">Successivo</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <string name="widget_mini">- Astrid Mini -</string>
-    
+
     <!-- Resources for power pack widget -->
-    
+
     <string name="PPW_widget_42_label">Old Astrid 4x2</string>
     <string name="PPW_widget_43_label">Old Astrid 4x3</string>
     <string name="PPW_widget_44_label">Old Astrid 4x4</string>
     <string name="PPW_widget_v11_label">- Astrid -</string>
     <string name="PPW_widget_custom_label">Astrid Custom Launcher Premium</string>
     <string name="PPW_widget_custom_launcherpro_label">Astrid Launcher Pro Premium</string>
-    
+
     <string name="PPW_configure_title">Configura Widget</string>
-    
+
     <string name="PPW_color">Colore Widget</string>
     <string name="PPW_enable_calendar">Mostra eventi calendario</string>
     <string name="PPW_disable_encouragements">Nascondi incoraggiamenti</string>
     <string name="PPW_show_dates">Mostra le scadenze</string>
     <string name="PPW_filter">Seleziona Filtro</string>
-    
+
     <string name="PPW_due">Entro:</string>
     <string name="PPW_past_due">Già terminato:</string>
-    
-    <string name="PPW_old_astrid_notice">Per usare questo widget ti serve almeno la versione 3.6 di Astrid. Mi dispiace!</string>
-    
+
+    <string name="PPW_old_astrid_notice">Per usare questo widget ti serve almeno la versione 3.6 di
+        Astrid. Mi dispiace!
+    </string>
+
     <string-array name="PPW_encouragements">
         <!-- general encouragements -->
-    	<item>Ehilà!</item>
-    	<item>Hai un minuto per finire qualcosa?</item>
-    	<item>Wow, sembri soave oggi!</item>
-    	<item>Fai qualcosa di grandioso oggi!</item>
-    	<item>Rendimi fiero di te!</item>
-    	<item>Come va oggi?</item>
+        <item>Ehilà!</item>
+        <item>Hai un minuto per finire qualcosa?</item>
+        <item>Wow, sembri soave oggi!</item>
+        <item>Fai qualcosa di grandioso oggi!</item>
+        <item>Rendimi fiero di te!</item>
+        <item>Come va oggi?</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_tod">
         <!-- encouragements based on time of day -->
-    	<item>Buon giorno!</item>
-    	<item>Buon pomeriggio!</item>
-    	<item>Buona sera?</item>
-    	<item>Ore piccole?</item>
-    	<item>It\'s early, get something done!</item>
-    	<item>Tè pomeridiano magari?</item>
-    	<item>Buona serata!</item>
-    	<item>Dormire ti fa bene, lo sai!</item>
+        <item>Buon giorno!</item>
+        <item>Buon pomeriggio!</item>
+        <item>Buona sera?</item>
+        <item>Ore piccole?</item>
+        <item>It\'s early, get something done!</item>
+        <item>Tè pomeridiano magari?</item>
+        <item>Buona serata!</item>
+        <item>Dormire ti fa bene, lo sai!</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_completed">
         <!-- encouragements based on tasks completed (%d => completed) -->
-    	<item>Hai già completato %d attività!</item>
-    	<item>Punteggio vita: %d attività completate</item>
-    	<item>Sorridi! Hai già finito %d attività!</item>
+        <item>Hai già completato %d attività!</item>
+        <item>Punteggio vita: %d attività completate</item>
+        <item>Sorridi! Hai già finito %d attività!</item>
     </string-array>
-  	<string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet! Shall we?</string>
-        
+    <string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet!
+        Shall we?
+    </string>
+
     <string-array name="PPW_colors">
         <item>Nero</item>
         <item>Bianco</item>
         <item>Blu</item>
         <item>Traslucido</item>
     </string-array>
-    
-    <string name="PPW_widget_dlg_text">Questo widget è disponibile solo per i possessori del PowerPack</string>
+
+    <string name="PPW_widget_dlg_text">Questo widget è disponibile solo per i possessori del
+        PowerPack
+    </string>
     <string name="PPW_widget_dlg_ok">Anteprima</string>
-    
+
     <string name="PPW_demo_title1">Gli oggetti in %s andranno qui</string>
     <string name="PPW_demo_title2">Il Power Pack include i Widget Premium...</string>
     <string name="PPW_demo_title3">...segnala aggiunte e incoraggiamenti!</string>
     <string name="PPW_demo_title4">Tocca per maggiori informazioni!</string>
-    
+
     <string name="PPW_info_title">Astrid Power Pack gratis</string>
     <string name="PPW_info_signin">Accedi</string>
     <string name="PPW_info_later">Più tardi</string>
-    <string name="PPW_unlock_howto">Condividi le liste con gli amici! Ottieni il Power Pack gratuito quando 3 amici si iscrivono ad Astrid.</string>
+    <string name="PPW_unlock_howto">Condividi le liste con gli amici! Ottieni il Power Pack gratuito
+        quando 3 amici si iscrivono ad Astrid.
+    </string>
     <string name="PPW_check_button">Astrid Power Pack gratis!</string>
     <string name="PPW_check_share_lists">Condividi gli elenchi!</string>
-    <string name="PPW_api_level">Spiacenti! Questo widget funziona solo con Android 3.0 o successivi.</string>
-    
+    <string name="PPW_api_level">Spiacenti! Questo widget funziona solo con Android 3.0 o
+        successivi.
+    </string>
+
     <string name="EPr_widget_enabled_title">(Dis)Abilita i Widgets</string>
-    <string name="PPW_restart_for_enabled_state">Per applicare le modifiche è necessario riavviare il telefono.</string>
+    <string name="PPW_restart_for_enabled_state">Per applicare le modifiche è necessario riavviare
+        il telefono.
+    </string>
 
 </resources>
diff --git a/astrid/res/values-iw/strings.xml b/astrid/res/values-iw/strings.xml
index efabf2289..0f3ee4194 100755
--- a/astrid/res/values-iw/strings.xml
+++ b/astrid/res/values-iw/strings.xml
@@ -4,1691 +4,1792 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ================================================== general terms == -->
-
-  <!-- People Editing Activity -->    
-  
-  <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
-  <string name="actfm_person_hint">איש קשר או דוא״ל</string>
-  
-  <!-- task sharing dialog: shared with hint -->
-  <string name="actfm_person_or_tag_hint">איש קשר או רשימה משותפת</string>
-
-  <!-- toast on transmit success -->
-
-  <!-- can\'t rename or delete shared tag message -->
-  
-  <!-- warning before deleting a list you\'re the owner of -->
-  <string name="actfm_tag_operation_owner_delete">אתה הבעלים של רשימה זו! אם תמחק אותה, היא תימחק עבור השותפים בה. האם אתה בטוח שברצונך להמשיך?</string>
-
-  <!-- slide 29a: menu item to take a picture -->
-  <string name="actfm_picture_camera">צַלֵּם תמונה</string>
-
-  <!-- slide 29b: menu item to select from gallery -->
-  <string name="actfm_picture_gallery">בחר מגלריה</string>
-  
-  <!-- menu item to clear picture selection -->
-  <string name="actfm_picture_clear">הסר תמונה</string>
-
-  <!-- filter list activity: refresh tags -->
-  
-  <!-- Title for prompt after sharing a task -->
-  <string name="actfm_view_task_title">להציג את המשימה?</string>
-
-  <!-- Text for prompt after sharing a task -->
-  <string name="actfm_view_task_text">משימה נשלחה אל %s! הנך מביט במשימות שלך. הֲתִּרְצֶה לעיין במשימה זו ובמשימות אשר הטלת על אחרים?</string>
-  
-  <!-- Ok button for task view prompt -->
-  <string name="actfm_view_task_ok">הצג משימות שהטלת</string>
-      
-  <!-- Cancel button for task view prompt -->
-  <string name="actfm_view_task_cancel">הִשָּׁאֵר כאן</string>
-  
-  <!-- slide 13a: Title for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_title">המשימות ששיתפתי</string>
-  
-  <!-- Empty list for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_empty">אין מטלות משותפות</string>
-  
-  <!-- =====================  Friendship connections -->
-  
-  <string name="actfm_friendship_pending">שלחת בקשת חברות ל-%s!</string>
-
-  <string name="actfm_friendship_blocked">חסמת את %s.</string>
-
-  <string name="actfm_friendship_ignored">התעלמת מ-%s</string>
-  
-  <string name="actfm_friendship_friends">אתה חבר של %s! הוסף משימות עבורם למטה.</string>
-
-  <string name="actfm_friendship_other_pending">%s רוצה להיות חבר שלך</string>
-
-  <string name="actfm_friendship_no_status">התחבר ל-%s כדי לשתף ולראות פעילות במשימות ציבוריות!</string>
-
-  <string name="actfm_friendship_connect">הוסף חבר</string>
-
-  <string name="actfm_friendship_accept">אני מאשר</string>
-
-  <!-- ================================================== TagViewActivity == -->  
-
-  <!-- Tag View Activity: Add Comment hint -->    
-  <string name="TVA_add_comment">הוסף הערה</string>
-
-  <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->    
-  
-  <!-- Tabs for Tag view -->
-  <string-array name="TVA_tabs">
-    <!-- Tab for showing tasks -->
-    <item>משימות</item>
-    <!-- Tab for showing comments & updates -->
-    <item>פעילות</item>
-    <!-- Tab for showing setting -->
-    <item>הגדרות רשימה</item>
-  </string-array>
-  
-  <!-- Tag View: filtered by assigned to user (%s => user name) -->
-  <string name="actfm_TVA_filtered_by_assign">המשימות של %s. טְפַח כדי לראות הכל</string>
-  
-  <!-- Tag View: filter by unassigned tasks -->
-  <string name="actfm_TVA_filter_by_unassigned">משימות לא מוקצות. טְפַח כדי לקבל את כל המשימות.</string>
-
-  <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">פרטי: טְפַח כדי לערוך או לשתף</string>
-
-  <!-- Tag View Menu: refresh -->
-  <string name="actfm_TVA_menu_refresh">רַעְנֵן</string>
-
-  <!-- Tag Settings: tag name label -->
-  <string name="actfm_TVA_tag_label">רשימה</string>
-
-  <!-- Tag Settings: tag owner label -->
-
-  <!-- Tag Settings: tag owner value when there is no owner -->
-
-  <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
-  <string name="actfm_TVA_members_label">משותפת עם</string>
-  
-  <!-- Tag Settings: list collaborators hint -->
-  <string name="actfm_TVA_members_hint">שתף עם אי מי שיש לו כתובת דוא״ל</string>
-
-  <!-- Tag Settings: tag picture -->
-  <string name="actfm_TVA_tag_picture">תמונת רשימה</string>
-
-  <!-- slide 25c/28b: Tag Settings: silence notifications label -->
-  <string name="actfm_TVA_silence_label">השתק התראות</string>
-  
-  <!-- Tag Settings: list icon label -->
-  
-  <!-- slide 25b/27d: Tag Settings: list description label -->
-  <string name="actfm_TVA_tag_description_label">תיאור</string>
-  
-  <!-- slide 28a: Tag Settings: list settings label -->
-  <string name="actfm_TVA_tag_settings_label">הגדרות</string>
-
-  <!-- slide 25b: Tag Settings: list description hint -->
-  <string name="actfm_TVA_tag_description_hint">הכנס תיאור כאן</string>
-  
-  <!-- slide 25d: Tag Settings: list name hint -->
-  <string name="actfm_TVA_tag_name_hint">הכנס שם רשימה</string>
-  
-  <!-- Tag settings: login prompt from share-->
-  <string name="actfm_TVA_login_to_share">עליך להיות מחובר לאתר אסטריד בכדי לשתף רשימות. אנא התחבר או סמן רשימה זו כפרטית.</string>
-  
-      
-  <!-- ============================================ edit people dialog == -->
-
-  <!-- task sharing dialog: intro -->
-  <string name="actfm_EPA_intro">השתמש באסטריד לשתף רשימות קניות, תכנוני מסיבות או פרויקטים ותדע מיד כשהמשימה בוצעה!</string>
-    
-  <!-- task sharing dialog: window title -->
-    
-  <!-- task sharing dialog: save button -->
-  
-  <!-- task sharing dialog: assigned label -->
-  
-  <!-- slide 18a: task sharing dialog: assigned label long version -->
-  <string name="actfm_EPA_assign_label_long">על מי להטיל את המשימה?</string>
-  
-  <!-- task sharing dialog: assigned to me -->
-  <string name="actfm_EPA_assign_me">עלי</string>
-  
-  <!-- task sharing dialog: anyone -->
-  <string name="actfm_EPA_unassigned">לא מוטלת</string>
-  
-  <!-- slide 18c: task sharing dialog: choose a contact -->
-  <string name="actfm_EPA_choose_contact">בחר איש קשר</string>
-  
-  <!-- task sharing dialog: custom email assignment -->
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_share_with">שתף עם:</string>
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_collaborators_header">שתפי</string>
-
-      <!-- task sharing dialog: collaborator list name (%s => name of list) -->
-  <string name="actfm_EPA_list">רשימה: %s</string>
-  
-  <!-- task sharing dialog: assigned hint -->
-  
-  <!-- task sharing dialog: message label text -->
-  <string name="actfm_EPA_message_text">הזמנה</string>
-  
-  <!-- task sharing dialog: message body -->
-  <string name="actfm_EPA_message_body">עזרי לי לבצע את זה!</string>
-  
-  <!-- task sharing dialog: list members section header -->
-  <string name="actfm_EPA_assign_header_members">חברים ברשימה</string>
-
-  <!-- task sharing dialog: astrid friends section header -->
-  <string name="actfm_EPA_assign_header_friends">שותפים באסטריד</string>
-
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: share with Facebook -->
-  <string name="actfm_EPA_facebook">פייסבוק</string>
-  
-  <!-- task sharing dialog: share with Twitter -->
-  <string name="actfm_EPA_twitter">טוויטר</string>
-
-  <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
-
-  <!-- task sharing dialog: edit people settings saved -->
-
-  <!-- task sharing dialog: invalid email (%s => email) -->
-  <string name="actfm_EPA_invalid_email">כתובת דוא״ל לא תקינה: %s</string>
-
-  <!-- task sharing dialog: tag not found (%s => tag) -->
-  
-  <!-- task sharing login prompt -->
-  <string name="actfm_EPA_login_to_share">עליך להתחבר לאתר אסטריד כדי לשתף משימות!</string>
-  
-  <string name="actfm_EPA_login_button">התחברות</string>
-  
-  <string name="actfm_EPA_dont_share_button">אל תשתפי</string>
-  
-  <string name="actfm_EPA_add_person_to_list_title">משימה הוטלה</string>
-  
-  <string name="actfm_EPA_add_person_to_list">%1$s אינו שותף ברשימה זו. הֲתִּרְצֶה להוסיף את %2$s לרשימה זו?</string>
-
-  <string name="actfm_EPA_add_person_to_list_ok">הוסף לרשימה</string>
-  
-  <string name="actfm_EPA_add_person_to_list_cancel">אל תוסיף</string>
-  
-  <string name="actfm_list_owner">(owner)</string>
-  
-  <!-- ========================================= sharing login activity == -->
-
-  <!-- share login: Title -->
-  <string name="actfm_ALA_title">ברוך הבא ל-Astrid.com!</string>
-
-  <!-- share login: Sharing Description -->
-  <string name="actfm_ALA_body">אתר astrid.com מאפשר גישה מקוונת למשימות, ומאפשר לך לשתף אותן או להקצותן לאחרים</string>
-
-  <!-- share login: Sharing Login FB Prompt -->
-  <string name="actfm_ALA_fb_login">התחבר באמצעות פייסבוק</string>
-
-  <!-- share login: Sharing Login GG Prompt -->
-  <string name="actfm_ALA_gg_login">התחבר באמצעות גוגל</string>
-  
-  <!-- share login: Quickly log in as <%s -> email> -->
-  <string name="actfm_quick_login">התחבר: %s</string>
-
-  <!-- share login: Reject quick login -->
-  <string name="actfm_quick_login_reject">לא %s?</string>
-
-  <!-- share login: Name -->
-  <string name="actfm_ALA_firstname_label">שם פרטי</string>
-  
-  <!-- share login: Name -->
-  <string name="actfm_ALA_lastname_label">שם משפחה</string>
-
-  <!-- share login: Email -->
-  <string name="actfm_ALA_email_label">דוא״ל</string>
-
-  <!-- share login: Username / Email -->
-
-  <!-- share login: Password -->
-  <string name="actfm_ALA_password_label">סיסמא</string>
-
-  <!-- share login: Sign Up Title -->
-  <string name="actfm_ALA_signup_title">הרשמה</string>
-
-  <!-- share login: Login Title -->
-  <string name="actfm_ALA_login_title">התחברות</string>
-
-  <!-- share login: Google Auth title -->
-  <string name="actfm_GAA_title">בחר חשבון גוגל</string>
-
-  <!-- share login: OAUTH Login Prompt -->
-  <string name="actfm_OLA_prompt">אנא התחבר למערכת</string>
-  
-  <!-- Login error: user exists -->
-  <string name="actfm_ALA_error_user_exists">שם המשתמש כבר קיים. אולי תרצה להתחבר עם שם זה.</string>
-  
-  <!-- Login error: wrong password -->
-  <string name="actfm_ALA_error_wrong_password">מצטערים, הסיסמא הזו אינה נכונה. אנא נסה שנית .</string>
-  
-  <!-- Forgot password link -->
-  <string name="actfm_ALA_forgot_password">שכחת סיסמא?</string>
-  
-  <!-- Forgot password email prompt -->
-  <string name="actfm_ALA_enter_email"> אנא הזן את הדוא״ל שלך </string>
-  
-  <!-- Password reset sent (%s -> email) -->
-  <string name="actfm_ALA_reset_sent">איפוס ססמא נשלח ל-%s</string>
-  
-  <!-- User already exists - first sync may be slow -->
-  <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your patience!</string>
-  
-  <!-- User not found -->
-  <string name="actfm_ALA_error_user_not_found">לא רשום משתמש עם דוא״ל זה. נסה ליצור חשבון חדש.</string>
-  
-  <!-- ================================================ Featured Lists -->
-
-  <string name="actfm_feat_list_clone">העתקת רשימה</string>
-  
-  <string name="actfm_feat_list_suffix">(העתק)</string>
-
-  <string name="actfm_feat_list_cloning">מעתיקה...</string>
-
-  <string name="actfm_feat_list_clone_success">הצלחה!</string>
-
-  <string name="actfm_feat_list_task_clone_success">משימה הועתקה</string>
-
-  <string name="actfm_feat_list_clone_empty">אין משימות להעתיק</string>
-  
-  <!-- ================================================ Synchronization == -->
-      
-  <!-- Indicates the logged in user name. %s -> user\'s name -->
-  <string name="actfm_status_title_logged_in"> מצב - מחובר כ %s</string>    
-      
-  <!-- Preferences Title: Act.fm -->    
-  <string name="actfm_APr_header">Astrid.com</string>
-  
-  <string name="actfm_https_title">השתמש ב־HTTPS</string>
-  <string name="actfm_https_enabled">HTTPS מופעל (איטי יותר)</string>
-  <string name="actfm_https_disabled">HTTPS מָנוּעַ (מהיר יותר)</string>
-
-  <!-- title for notification tray after synchronizing -->
-  
-  <!-- text for notification when comments are received -->
-    
-  <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, 
-      Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page,
-      or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.  
-      Are you sure you want to sync with Astrid.com?</string>
-      
-  <!-- account types -->
-  <string name="actfm_account_type">סוג חשבון</string>
-  <string name="actfm_account_info">נתוני חשבון</string>
-  <string name="actfm_account_info_summary">מצב ואפשרויות</string>
-  <string name="account_type_title_not_logged_in">הרשמה ופתיחת חשבון חינם</string>
-  <string name="account_type_summary_not_logged_in">גישה מקוונת למשימות, שיתוף משימות והטלתן</string>
-  
-  
-  <string name="actfm_account_premium">פרימיום</string>
-  <string name="actfm_account_basic">בסיסי</string>
-  
-  <string name="actfm_inapp_billing">שידרוג לפרימיום</string>
-  <string name="actfm_inapp_billing_summary">צרפ קבצים, גיבוי קולי, תמיכת פרימיום ועוד</string>
-  
-  <!-- Sharing -->
-  <string name="share_with_facebook">לייק בפייסבוק</string>
-  <string name="share_with_twitter">עקוב בטוויטר</string>
-  <string name="share_with_google">שיתוף בגוגל+</string>
-  <string name="share_speech_bubble">ע"י שיתוף, תעזור לאחרים להיות פּוֹרִיִּים יותר!</string>
-  
-  
-  <!-- Sync upgrade messages -->
-  <string name="sync_upgr_both_title">שימוש באסטריד ובגוגל ללא כפילויות</string>
-  <string name="sync_upgr_both_body">הבה נאמר את האמת.״משימות גוגל״ הוא מוצר נוח, אבל לא מגניב כמו אסטריד. כדי למנוע כפילויות, לא תוכל יותר לסנכרן ברקע בו זמנית  גם מול astrid.com   גם מול משימות גוגל. תוכל עדיין ליבא את משימות גוגל באמצעות הגדרות/גיבוי וסינכרון, או לשנמך את פעילותך לסנכרון מול גוגל בלבד.</string>
-  <string name="sync_upgr_both_btn1">השאר עם אסטריד</string>
-  <string name="sync_upgr_both_btn2">שנמוך ל״משימות גוגל״</string>
-  
-  <string name="sync_upgr_gtasks_only_title">שדרג חינם לסנכרון מול אתר אסטריד</string>
-  <string name="sync_upgr_gtasks_only_body"> קבל גישה למשימות שלך מכל המכשירים של, כולל מג\'ימייל,  בעזרת סינכרון מול אתר אסטריד. שדרג לסנכררון מול אתר אסטריד )תוכל תמיד לחזור ל״משימות גוגל״ אבל אני בטוח שלא תרצה לעשות זאת).</string>
-  <string name="sync_upgr_gtasks_only_btn1">שדרג לסנכרון מול אתר אסטריד</string>
-  <string name="sync_upgr_gtasks_only_btn2">השאר עם ״משימות גוגל״</string>
-  
-  <string name="sync_upgr_neither_title">סינכרון וגיבוי חינם!</string>
-  <string name="sync_upgr_neither_body">אל תשים את משימותיך על קרן הצבי! הגיבוי החדש והמשופר מול אתר אסטריד יאפשר לך לשמור את משימותיך ולגשת אליהן מכל מקום.</string>
-  <string name="sync_upgr_neither_btn1">הרשם עכשו</string>
-  
-  <string name="sync_upgr_logged_out">התנתקת מאסטריד</string>
-  
-  <string name="actfm_logout_clear_tasks_title">לְהָסִיר את הנתונים?</string>
-  <string name="actfm_logout_clear_tasks_body">הֲתִּרְצֶה להסיר את המשימות והרשימות?</string>
-  <string name="actfm_logout_clear_tasks_yes">הסרת נתונים</string>
-  <string name="actfm_logout_clear_tasks_no">שמירת הנתונם</string>
-  
-  <string name="actfm_logged_in_different_user_title">התחברות עם משתמש אחר</string>
-  <string name="actfm_logged_in_different_user_body">הֲתִּרְצֶה למחוק משימות שעל הטלפון טרם הסנכרון?</string>
-  <string name="actfm_logged_in_different_user_keep_data">שמירת הנתונם</string>
-  <string name="actfm_logged_in_different_user_clear_data">הסרת כל הנתונים</string>
-  <string name="actfm_logged_in_different_user_processing">מעבדת נתונים קיימים...</string>
-  
-  <string name="actfm_tag_not_authorized_title">Not authorized</string>
-  <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name?</string>
-  <string name="actfm_tag_not_authorized_new_list">צור רשימה חדשה</string>
-  <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
-  
-  <string name="actfm_sync_ongoing">הסינכרון מתבצע</string>
-  
-  <string name="EPr_reset_sync_state">Reset sync</string>
-  <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors</string>
-  <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue?</string>
-  
+<resources>
 
+    <!-- ================================================== general terms == -->
 
+    <!-- People Editing Activity -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
+    <string name="actfm_person_hint">איש קשר או דוא״ל</string>
+
+    <!-- task sharing dialog: shared with hint -->
+    <string name="actfm_person_or_tag_hint">איש קשר או רשימה משותפת</string>
+
+    <!-- toast on transmit success -->
+
+    <!-- can\'t rename or delete shared tag message -->
+
+    <!-- warning before deleting a list you\'re the owner of -->
+    <string name="actfm_tag_operation_owner_delete">אתה הבעלים של רשימה זו! אם תמחק אותה, היא תימחק
+        עבור השותפים בה. האם אתה בטוח שברצונך להמשיך?
+    </string>
+
+    <!-- slide 29a: menu item to take a picture -->
+    <string name="actfm_picture_camera">צַלֵּם תמונה</string>
+
+    <!-- slide 29b: menu item to select from gallery -->
+    <string name="actfm_picture_gallery">בחר מגלריה</string>
+
+    <!-- menu item to clear picture selection -->
+    <string name="actfm_picture_clear">הסר תמונה</string>
+
+    <!-- filter list activity: refresh tags -->
+
+    <!-- Title for prompt after sharing a task -->
+    <string name="actfm_view_task_title">להציג את המשימה?</string>
+
+    <!-- Text for prompt after sharing a task -->
+    <string name="actfm_view_task_text">משימה נשלחה אל %s! הנך מביט במשימות שלך. הֲתִּרְצֶה לעיין
+        במשימה זו ובמשימות אשר הטלת על אחרים?
+    </string>
+
+    <!-- Ok button for task view prompt -->
+    <string name="actfm_view_task_ok">הצג משימות שהטלת</string>
+
+    <!-- Cancel button for task view prompt -->
+    <string name="actfm_view_task_cancel">הִשָּׁאֵר כאן</string>
+
+    <!-- slide 13a: Title for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_title">המשימות ששיתפתי</string>
+
+    <!-- Empty list for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_empty">אין מטלות משותפות</string>
+
+    <!-- =====================  Friendship connections -->
+
+    <string name="actfm_friendship_pending">שלחת בקשת חברות ל-%s!</string>
+
+    <string name="actfm_friendship_blocked">חסמת את %s.</string>
+
+    <string name="actfm_friendship_ignored">התעלמת מ-%s</string>
+
+    <string name="actfm_friendship_friends">אתה חבר של %s! הוסף משימות עבורם למטה.</string>
+
+    <string name="actfm_friendship_other_pending">%s רוצה להיות חבר שלך</string>
+
+    <string name="actfm_friendship_no_status">התחבר ל-%s כדי לשתף ולראות פעילות במשימות ציבוריות!
+    </string>
+
+    <string name="actfm_friendship_connect">הוסף חבר</string>
+
+    <string name="actfm_friendship_accept">אני מאשר</string>
+
+    <!-- ================================================== TagViewActivity == -->
+
+    <!-- Tag View Activity: Add Comment hint -->
+    <string name="TVA_add_comment">הוסף הערה</string>
+
+    <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->
+
+    <!-- Tabs for Tag view -->
+    <string-array name="TVA_tabs">
+        <!-- Tab for showing tasks -->
+        <item>משימות</item>
+        <!-- Tab for showing comments & updates -->
+        <item>פעילות</item>
+        <!-- Tab for showing setting -->
+        <item>הגדרות רשימה</item>
+    </string-array>
+
+    <!-- Tag View: filtered by assigned to user (%s => user name) -->
+    <string name="actfm_TVA_filtered_by_assign">המשימות של %s. טְפַח כדי לראות הכל</string>
+
+    <!-- Tag View: filter by unassigned tasks -->
+    <string name="actfm_TVA_filter_by_unassigned">משימות לא מוקצות. טְפַח כדי לקבל את כל המשימות.
+    </string>
+
+    <!-- Tag View: list is private, no members -->
+    <string name="actfm_TVA_no_members_alert">פרטי: טְפַח כדי לערוך או לשתף</string>
+
+    <!-- Tag View Menu: refresh -->
+    <string name="actfm_TVA_menu_refresh">רַעְנֵן</string>
+
+    <!-- Tag Settings: tag name label -->
+    <string name="actfm_TVA_tag_label">רשימה</string>
+
+    <!-- Tag Settings: tag owner label -->
+
+    <!-- Tag Settings: tag owner value when there is no owner -->
+
+    <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
+    <string name="actfm_TVA_members_label">משותפת עם</string>
+
+    <!-- Tag Settings: list collaborators hint -->
+    <string name="actfm_TVA_members_hint">שתף עם אי מי שיש לו כתובת דוא״ל</string>
+
+    <!-- Tag Settings: tag picture -->
+    <string name="actfm_TVA_tag_picture">תמונת רשימה</string>
+
+    <!-- slide 25c/28b: Tag Settings: silence notifications label -->
+    <string name="actfm_TVA_silence_label">השתק התראות</string>
+
+    <!-- Tag Settings: list icon label -->
+
+    <!-- slide 25b/27d: Tag Settings: list description label -->
+    <string name="actfm_TVA_tag_description_label">תיאור</string>
+
+    <!-- slide 28a: Tag Settings: list settings label -->
+    <string name="actfm_TVA_tag_settings_label">הגדרות</string>
+
+    <!-- slide 25b: Tag Settings: list description hint -->
+    <string name="actfm_TVA_tag_description_hint">הכנס תיאור כאן</string>
+
+    <!-- slide 25d: Tag Settings: list name hint -->
+    <string name="actfm_TVA_tag_name_hint">הכנס שם רשימה</string>
+
+    <!-- Tag settings: login prompt from share-->
+    <string name="actfm_TVA_login_to_share">עליך להיות מחובר לאתר אסטריד בכדי לשתף רשימות. אנא התחבר
+        או סמן רשימה זו כפרטית.
+    </string>
+
+
+    <!-- ============================================ edit people dialog == -->
+
+    <!-- task sharing dialog: intro -->
+    <string name="actfm_EPA_intro">השתמש באסטריד לשתף רשימות קניות, תכנוני מסיבות או פרויקטים ותדע
+        מיד כשהמשימה בוצעה!
+    </string>
+
+    <!-- task sharing dialog: window title -->
+
+    <!-- task sharing dialog: save button -->
+
+    <!-- task sharing dialog: assigned label -->
+
+    <!-- slide 18a: task sharing dialog: assigned label long version -->
+    <string name="actfm_EPA_assign_label_long">על מי להטיל את המשימה?</string>
+
+    <!-- task sharing dialog: assigned to me -->
+    <string name="actfm_EPA_assign_me">עלי</string>
+
+    <!-- task sharing dialog: anyone -->
+    <string name="actfm_EPA_unassigned">לא מוטלת</string>
+
+    <!-- slide 18c: task sharing dialog: choose a contact -->
+    <string name="actfm_EPA_choose_contact">בחר איש קשר</string>
+
+    <!-- task sharing dialog: custom email assignment -->
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_share_with">שתף עם:</string>
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_collaborators_header">שתפי</string>
+
+    <!-- task sharing dialog: collaborator list name (%s => name of list) -->
+    <string name="actfm_EPA_list">רשימה: %s</string>
+
+    <!-- task sharing dialog: assigned hint -->
+
+    <!-- task sharing dialog: message label text -->
+    <string name="actfm_EPA_message_text">הזמנה</string>
+
+    <!-- task sharing dialog: message body -->
+    <string name="actfm_EPA_message_body">עזרי לי לבצע את זה!</string>
+
+    <!-- task sharing dialog: list members section header -->
+    <string name="actfm_EPA_assign_header_members">חברים ברשימה</string>
+
+    <!-- task sharing dialog: astrid friends section header -->
+    <string name="actfm_EPA_assign_header_friends">שותפים באסטריד</string>
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: share with Facebook -->
+    <string name="actfm_EPA_facebook">פייסבוק</string>
+
+    <!-- task sharing dialog: share with Twitter -->
+    <string name="actfm_EPA_twitter">טוויטר</string>
+
+    <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
+
+    <!-- task sharing dialog: edit people settings saved -->
+
+    <!-- task sharing dialog: invalid email (%s => email) -->
+    <string name="actfm_EPA_invalid_email">כתובת דוא״ל לא תקינה: %s</string>
+
+    <!-- task sharing dialog: tag not found (%s => tag) -->
+
+    <!-- task sharing login prompt -->
+    <string name="actfm_EPA_login_to_share">עליך להתחבר לאתר אסטריד כדי לשתף משימות!</string>
+
+    <string name="actfm_EPA_login_button">התחברות</string>
+
+    <string name="actfm_EPA_dont_share_button">אל תשתפי</string>
+
+    <string name="actfm_EPA_add_person_to_list_title">משימה הוטלה</string>
+
+    <string name="actfm_EPA_add_person_to_list">%1$s אינו שותף ברשימה זו. הֲתִּרְצֶה להוסיף את %2$s
+        לרשימה זו?
+    </string>
+
+    <string name="actfm_EPA_add_person_to_list_ok">הוסף לרשימה</string>
+
+    <string name="actfm_EPA_add_person_to_list_cancel">אל תוסיף</string>
+
+    <string name="actfm_list_owner">(owner)</string>
+
+    <!-- ========================================= sharing login activity == -->
+
+    <!-- share login: Title -->
+    <string name="actfm_ALA_title">ברוך הבא ל-Astrid.com!</string>
+
+    <!-- share login: Sharing Description -->
+    <string name="actfm_ALA_body">אתר astrid.com מאפשר גישה מקוונת למשימות, ומאפשר לך לשתף אותן או
+        להקצותן לאחרים
+    </string>
+
+    <!-- share login: Sharing Login FB Prompt -->
+    <string name="actfm_ALA_fb_login">התחבר באמצעות פייסבוק</string>
+
+    <!-- share login: Sharing Login GG Prompt -->
+    <string name="actfm_ALA_gg_login">התחבר באמצעות גוגל</string>
+
+    <!-- share login: Quickly log in as <%s -> email> -->
+    <string name="actfm_quick_login">התחבר: %s</string>
+
+    <!-- share login: Reject quick login -->
+    <string name="actfm_quick_login_reject">לא %s?</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_firstname_label">שם פרטי</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_lastname_label">שם משפחה</string>
+
+    <!-- share login: Email -->
+    <string name="actfm_ALA_email_label">דוא״ל</string>
+
+    <!-- share login: Username / Email -->
+
+    <!-- share login: Password -->
+    <string name="actfm_ALA_password_label">סיסמא</string>
+
+    <!-- share login: Sign Up Title -->
+    <string name="actfm_ALA_signup_title">הרשמה</string>
+
+    <!-- share login: Login Title -->
+    <string name="actfm_ALA_login_title">התחברות</string>
+
+    <!-- share login: Google Auth title -->
+    <string name="actfm_GAA_title">בחר חשבון גוגל</string>
+
+    <!-- share login: OAUTH Login Prompt -->
+    <string name="actfm_OLA_prompt">אנא התחבר למערכת</string>
+
+    <!-- Login error: user exists -->
+    <string name="actfm_ALA_error_user_exists">שם המשתמש כבר קיים. אולי תרצה להתחבר עם שם זה.
+    </string>
+
+    <!-- Login error: wrong password -->
+    <string name="actfm_ALA_error_wrong_password">מצטערים, הסיסמא הזו אינה נכונה. אנא נסה שנית .
+    </string>
+
+    <!-- Forgot password link -->
+    <string name="actfm_ALA_forgot_password">שכחת סיסמא?</string>
+
+    <!-- Forgot password email prompt -->
+    <string name="actfm_ALA_enter_email">אנא הזן את הדוא״ל שלך</string>
+
+    <!-- Password reset sent (%s -> email) -->
+    <string name="actfm_ALA_reset_sent">איפוס ססמא נשלח ל-%s</string>
+
+    <!-- User already exists - first sync may be slow -->
+    <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your
+        patience!
+    </string>
+
+    <!-- User not found -->
+    <string name="actfm_ALA_error_user_not_found">לא רשום משתמש עם דוא״ל זה. נסה ליצור חשבון חדש.
+    </string>
+
+    <!-- ================================================ Featured Lists -->
+
+    <string name="actfm_feat_list_clone">העתקת רשימה</string>
+
+    <string name="actfm_feat_list_suffix">(העתק)</string>
+
+    <string name="actfm_feat_list_cloning">מעתיקה...</string>
+
+    <string name="actfm_feat_list_clone_success">הצלחה!</string>
+
+    <string name="actfm_feat_list_task_clone_success">משימה הועתקה</string>
+
+    <string name="actfm_feat_list_clone_empty">אין משימות להעתיק</string>
+
+    <!-- ================================================ Synchronization == -->
+
+    <!-- Indicates the logged in user name. %s -> user\'s name -->
+    <string name="actfm_status_title_logged_in">מצב - מחובר כ %s</string>
+
+    <!-- Preferences Title: Act.fm -->
+    <string name="actfm_APr_header">Astrid.com</string>
+
+    <string name="actfm_https_title">השתמש ב־HTTPS</string>
+    <string name="actfm_https_enabled">HTTPS מופעל (איטי יותר)</string>
+    <string name="actfm_https_disabled">HTTPS מָנוּעַ (מהיר יותר)</string>
+
+    <!-- title for notification tray after synchronizing -->
+
+    <!-- text for notification when comments are received -->
+
+    <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid
+        duplicate tasks and other synchronization issues,
+        Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You
+        can still import tasks from Google Tasks from the Google Tasks settings page,
+        or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.
+        Are you sure you want to sync with Astrid.com?
+    </string>
+
+    <!-- account types -->
+    <string name="actfm_account_type">סוג חשבון</string>
+    <string name="actfm_account_info">נתוני חשבון</string>
+    <string name="actfm_account_info_summary">מצב ואפשרויות</string>
+    <string name="account_type_title_not_logged_in">הרשמה ופתיחת חשבון חינם</string>
+    <string name="account_type_summary_not_logged_in">גישה מקוונת למשימות, שיתוף משימות והטלתן
+    </string>
+
+
+    <string name="actfm_account_premium">פרימיום</string>
+    <string name="actfm_account_basic">בסיסי</string>
+
+    <string name="actfm_inapp_billing">שידרוג לפרימיום</string>
+    <string name="actfm_inapp_billing_summary">צרפ קבצים, גיבוי קולי, תמיכת פרימיום ועוד</string>
+
+    <!-- Sharing -->
+    <string name="share_with_facebook">לייק בפייסבוק</string>
+    <string name="share_with_twitter">עקוב בטוויטר</string>
+    <string name="share_with_google">שיתוף בגוגל+</string>
+    <string name="share_speech_bubble">ע"י שיתוף, תעזור לאחרים להיות פּוֹרִיִּים יותר!</string>
+
+
+    <!-- Sync upgrade messages -->
+    <string name="sync_upgr_both_title">שימוש באסטריד ובגוגל ללא כפילויות</string>
+    <string name="sync_upgr_both_body">הבה נאמר את האמת.״משימות גוגל״ הוא מוצר נוח, אבל לא מגניב כמו
+        אסטריד. כדי למנוע כפילויות, לא תוכל יותר לסנכרן ברקע בו זמנית גם מול astrid.com גם מול
+        משימות גוגל. תוכל עדיין ליבא את משימות גוגל באמצעות הגדרות/גיבוי וסינכרון, או לשנמך את
+        פעילותך לסנכרון מול גוגל בלבד.
+    </string>
+    <string name="sync_upgr_both_btn1">השאר עם אסטריד</string>
+    <string name="sync_upgr_both_btn2">שנמוך ל״משימות גוגל״</string>
+
+    <string name="sync_upgr_gtasks_only_title">שדרג חינם לסנכרון מול אתר אסטריד</string>
+    <string name="sync_upgr_gtasks_only_body">קבל גישה למשימות שלך מכל המכשירים של, כולל מג\'ימייל,
+        בעזרת סינכרון מול אתר אסטריד. שדרג לסנכררון מול אתר אסטריד )תוכל תמיד לחזור ל״משימות גוגל״
+        אבל אני בטוח שלא תרצה לעשות זאת).
+    </string>
+    <string name="sync_upgr_gtasks_only_btn1">שדרג לסנכרון מול אתר אסטריד</string>
+    <string name="sync_upgr_gtasks_only_btn2">השאר עם ״משימות גוגל״</string>
+
+    <string name="sync_upgr_neither_title">סינכרון וגיבוי חינם!</string>
+    <string name="sync_upgr_neither_body">אל תשים את משימותיך על קרן הצבי! הגיבוי החדש והמשופר מול
+        אתר אסטריד יאפשר לך לשמור את משימותיך ולגשת אליהן מכל מקום.
+    </string>
+    <string name="sync_upgr_neither_btn1">הרשם עכשו</string>
+
+    <string name="sync_upgr_logged_out">התנתקת מאסטריד</string>
+
+    <string name="actfm_logout_clear_tasks_title">לְהָסִיר את הנתונים?</string>
+    <string name="actfm_logout_clear_tasks_body">הֲתִּרְצֶה להסיר את המשימות והרשימות?</string>
+    <string name="actfm_logout_clear_tasks_yes">הסרת נתונים</string>
+    <string name="actfm_logout_clear_tasks_no">שמירת הנתונם</string>
+
+    <string name="actfm_logged_in_different_user_title">התחברות עם משתמש אחר</string>
+    <string name="actfm_logged_in_different_user_body">הֲתִּרְצֶה למחוק משימות שעל הטלפון טרם
+        הסנכרון?
+    </string>
+    <string name="actfm_logged_in_different_user_keep_data">שמירת הנתונם</string>
+    <string name="actfm_logged_in_different_user_clear_data">הסרת כל הנתונים</string>
+    <string name="actfm_logged_in_different_user_processing">מעבדת נתונים קיימים...</string>
+
+    <string name="actfm_tag_not_authorized_title">Not authorized</string>
+    <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you
+        may have been removed). Would you like to create a new list with the same name?
+    </string>
+    <string name="actfm_tag_not_authorized_new_list">צור רשימה חדשה</string>
+    <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
+
+    <string name="actfm_sync_ongoing">הסינכרון מתבצע</string>
+
+    <string name="EPr_reset_sync_state">Reset sync</string>
+    <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors
+    </string>
+    <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will
+        be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you
+        wish to continue?
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in timers plug-in -->
+
+    <!-- Task Edit Activity: Container Label -->
+    <string name="alarm_ACS_label">התראות</string>
+
+    <!-- Task Edit Activity: Add New Alarm -->
+    <string name="alarm_ACS_button">הוסף התראה</string>
+
+    <string-array name="reminders_alarm">
+        <!-- reminders related to alarm -->
+        <item>התראה!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in backup plug-in -->
+
+    <!-- ================================================= BackupPreferences == -->
+
+    <!-- slide 33c/48d: Backup Preferences Title -->
+    <string name="backup_BPr_header">גיבויים</string>
+
+    <!-- slide 48e/50c: Backup: Status Header -->
+    <string name="backup_BPr_group_status">מצב</string>
+
+    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->
+    <string name="backup_status_success">גיבוי אחרון: %s</string>
+    <!-- Backup Status: last error failed. Keep it short! -->
+    <string name="backup_status_failed">הגיבוי האחרון נכשל</string>
+    <!-- Backup Status: error subtitle -->
+    <string name="backup_status_failed_subtitle">"(טפח כדי להציג את השגיאה)"</string>
+    <!-- slide 48a: Backup Status: never backed up -->
+    <string name="backup_status_never">לא נעשו גיבויים מעולם!</string>
+
+    <!-- slide 48f/ 50e: Backup Options Group Label -->
+    <string name="backup_BPr_group_options">אפשרויות</string>
+
+    <!-- slide 48b: Preference: Automatic Backup Title -->
+    <string name="backup_BPr_auto_title">גיבויים אוטומטיים</string>
+    <!-- Preference: Automatic Backup Description (when disabled) -->
+    <string name="backup_BPr_auto_disabled">הגיבויים האוטומטיים הופסקו</string>
+    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
+    <string name="backup_BPr_auto_enabled">הגיבוי יתבצע מדי יום</string>
+
+    <!-- Preference screen restoring Tasks Help -->
+    <!-- Preference screen Restoring Tasks Help Dialog Text-->
+
+    <string name="backup_BPr_cloud_already_logged_in">יש לך כבר גיבוי בענן באתר astrid.com</string>
+
+    <!-- ================================================= BackupActivity == -->
+
+    <!-- slide 48c: backup activity label -->
+    <string name="backup_BAc_label">ניהול גיבויים</string>
+
+    <!-- backup activity title -->
+    <string name="backup_BAc_title">ניהול הגיבויים שלך</string>
+
+    <!-- backup activity import button -->
+    <string name="backup_BAc_import">ייבוא משימות</string>
+
+    <!-- backup activity export button -->
+    <string name="backup_BAc_export">ייצוא משימות</string>
+
+    <!-- backup activity cloud (Astrid.com) option -->
+    <string name="backup_BAc_cloud">הקלק לגיבוי חינם בענן באתר astrid.com</string>
+
+    <!-- ============================================== Importer / Exporter == -->
+
+    <!-- Message displayed when error occurs -->
+    <string name="backup_TXI_error">שגיאת ייבוא</string>
+
+    <string name="export_toast">בוצע גיבוי של %1$s אל %2$s.</string>
+
+    <string name="export_toast_no_tasks">אין משימות לייצוא.</string>
+
+    <!-- Progress Dialog Title for exporting -->
+    <string name="export_progress_title">מייצאת...</string>
+
+    <!-- Backup: Title of Import Summary Dialog -->
+    <string name="import_summary_title">סיכום פעולת השחזור</string>
+
+    <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
+    <string name="import_summary_message">"הקובץ \' %1$s\' הכיל %2$s משימות: \n\n %3$s יובאו,\n %4$s
+        היו קיימות כבר,\nוב־%5$s היו שגיאות.\n"
+    </string>
+
+    <!-- Progress Dialog Title for importing -->
+    <string name="import_progress_title">מייבאת...</string>
+
+    <!-- Progress Dialog text for import reading task (%d -> task number)-->
+    <string name="import_progress_read">קוראת משימה %d...</string>
+
+    <!-- Backup: Dialog when unable to open a file -->
+
+    <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
+    <string name="DLG_error_sdcard">לא ניתן לגשת לתיקיה: %s</string>
+
+    <!-- Backup: Dialog when unable to open SD card in general -->
+    <string name="DLG_error_sdcard_general">לא ניתן לגשת לכרטיס ה־SD שלך!</string>
+
+    <!-- Backup: File Selector dialog for import -->
+    <string name="import_file_prompt">נא לבחור קובץ לשחזור</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- ================================================== AndroidManifest == -->
+
+    <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
+    <string name="app_name">משימות אסטריד</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="read_permission_label">הרשאות אסטריד</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="read_permission_desc">קריאת משימות, הצגת מַסְנְנֵי משימות</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="write_permission_label">הרשאות אסטריד</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="write_permission_desc">יצירת משימות חדשות, עריכת משימות קיימות.</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- question for deleting tasks -->
+    <string name="DLG_delete_this_task_question">למחוק משימה זו?</string>
+
+    <!-- question for deleting items (%s => item name) -->
+    <string name="DLG_delete_this_item_question">למחוק את %s?</string>
+
+    <!-- Progress dialog shown when upgrading -->
+    <string name="DLG_upgrading">משדרגת את משימותיך...</string>
+
+    <!-- Title for dialog selecting a time (hours and minutes) -->
+    <string name="DLG_hour_minutes">זמן (שעות : דקות)</string>
+
+    <!-- Dialog for Astrid having a critical update -->
+    <string name="DLG_please_update">נדרש עדכון לתכנת אסטריד לגירסה האחרונה בחנות היישומים של גוגל.
+        אנא עשה זאת לפני שתמשיך, או המתן מספר שניות.
+    </string>
+
+    <!-- Button for going to Market -->
+
+    <!-- Button for accepting EULA -->
+    <string name="DLG_accept">אני מסכים</string>
+
+    <!-- Button for declining EULA -->
+    <string name="DLG_decline">אינני מסכים</string>
+
+    <!-- EULA title -->
+    <string name="DLG_eula_title">Astrid תנאי שימוש</string>
+
+    <!-- Progress Dialog generic text -->
+    <string name="DLG_please_wait">נא המתן</string>
+
+    <!-- Dialog - loading -->
+    <string name="DLG_loading">טוענת...</string>
+
+    <!-- Dialog - dismiss -->
+
+    <!-- slide 20d -->
+    <string name="DLG_ok">אישור</string>
+    <!-- slide 36g -->
+    <string name="DLG_cancel">בטל</string>
+
+    <string name="DLG_more">עוד</string>
+
+    <string name="DLG_undo">בטל פעולה אחרונה</string>
+
+    <string name="DLG_warning">התראה</string>
+
+    <!-- =============================================================== UI == -->
+
+    <!-- Label for DateButtons with no value -->
+    <string name="WID_dateButtonUnset">הקלק כדי לקבוע</string>
+
+    <!-- String formatter for DateButtons ($D => date, $T => time) -->
+
+    <!-- String formatter for Disable button -->
+
+    <!--  ============================================================= notes -->
+
+    <!-- Note Exposer -->
+
+    <!-- Note Exposer / Comments -->
+
+    <!-- EditNoteActivity - no comments -->
+    <string name="ENA_no_comments">אין פעילות עדיין</string>
+
+    <!-- EditNoteActivity - no username for comment -->
+    <string name="ENA_no_user">מישהו</string>
+
+    <!-- EditNoteActivity - refresh comments -->
+    <string name="ENA_refresh_comments">רַעְנֵן הערות</string>
+
+    <!-- ================================================= TaskListActivity == -->
+
+    <!-- slide 8b: Task List: Displayed instead of list when no items present -->
+    <string name="TLA_no_items">אין לך משימות!\n הֲתִּרְצֶה להוסיף משימה?</string>
+
+    <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
+    <string name="TLA_no_items_person">%s אינו משתף עמך אף משימה</string>
+
+    <!-- Menu: Adjust Sort and Hidden Task Settings -->
+    <string name="TLA_menu_sort">מיון</string>
+
+    <!-- Menu: Sync Now -->
+    <string name="TLA_menu_sync">סנכרני כעת</string>
+
+    <!-- Menu: Search -->
+    <string name="TLA_menu_search">חיפוש</string>
+
+    <!-- Menu: Tasks -->
+    <string name="TLA_menu_lists">רשימות</string>
+
+    <!-- Menu: Friends -->
+    <string name="TLA_menu_friends">אנשים</string>
+
+    <!-- Menu: Featured Lists -->
+    <string name="TLA_menu_featured_lists">רשימות נבחרות</string>
+
+    <!-- Menu: Suggestions -->
+    <string name="TLA_menu_suggestions">הצעות</string>
+
+    <!-- Menu: Tutorial -->
+
+    <!-- Menu: Settings -->
+    <string name="TLA_menu_settings">הגדרות</string>
+
+    <!-- slide 30b: Menu: Support -->
+    <string name="TLA_menu_support">תמיכה</string>
+
+    <!-- Search Label-->
+
+    <!-- Window title for displaying Custom Filter -->
+    <string name="TLA_custom">מותאם אישית</string>
+
+    <!-- slide 8d: Quick Add Edit Box Hint-->
+    <string name="TLA_quick_add_hint">הוסף משימה</string>
+
+    <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
+    <string name="TLA_quick_add_hint_assign">משהו לעשות %s תן ל</string>
+
+    <!-- Notification Volumne notification-->
+    <string name="TLA_notification_volume_low">ההתראות מוחרשות. לא תשמע את אסטריד יותר!</string>
+
+    <!-- Notifications disabled warning -->
+    <string name="TLA_notification_disabled">התזכורות של אסטריד מושתקות! לא תקבל תזכורות נוספות
+    </string>
+
+    <string-array name="TLA_filters">
+        <item>פעיל</item>
+        <item>היום</item>
+        <item>בקרוב</item>
+        <item>באיחור</item>
+        <item>בוצע</item>
+        <item>מוסתר</item>
+    </string-array>
+
+    <!-- Title for confirmation dialog after quick add markup -->
+    <string name="TLA_quickadd_confirm_title">אמרת ״%s״</string>
+
+    <!-- Text for speech bubble in dialog after quick add markup -->
+    <!-- First string is task title, second is due date, third is priority -->
+    <string name="TLA_quickadd_confirm_speech_bubble">"יצרתי את המשימה \'%1$s\' עם תאריך יעד
+        \'%2$s\' בעדיפות \'%3$s\'"
+    </string>
+
+    <string name="TLA_quickadd_confirm_speech_bubble_date">לתאריך יעד %s</string>
+
+    <string name="TLA_quickadd_confirm_hide_helpers">אל תציג אישורים נוספים</string>
+
+
+    <!-- Title for alert on new repeating task. %s-> task title -->
+    <string name="TLA_repeat_scheduled_title">משימה חוזרת חדשה %s</string>
+
+    <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
+    <string name="TLA_repeat_scheduled_speech_bubble">"אזכיר לך את %s."</string>
+
+    <string-array name="TLA_priority_strings">
+        <item>עדיפות עליונה</item>
+        <item>עדיפות גבוהה</item>
+        <item>עדיפות בינונית</item>
+        <item>עדיפות נמוכה</item>
+    </string-array>
+    <!-- slide 22a -->
+    <string name="TLA_all_activity">כל הפעילות</string>
+
+    <!-- ====================================================== TaskAdapter == -->
+
+    <!-- Format string to indicate task is hidden (%s => task name) -->
+    <string name="TAd_hiddenFormat">%s [מוסתרת]</string>
+
+    <!-- Format string to indicate task is deleted (%s => task name) -->
+    <string name="TAd_deletedFormat">%s [נמחקה]</string>
+
+    <!-- Displayed when adapter is flung (scrolled quickly) -->
+
+    <!-- slide 22b: indicates task was completed. %s => date or time ago -->
+    <string name="TAd_completed">הסתיימה\n%s</string>
+
+    <!-- slide 15a: Action Button: edit task -->
+    <string name="TAd_actionEditTask">עריכה</string>
+
+    <!-- Context Item: edit task -->
+    <string name="TAd_contextEditTask">עריכת משימה</string>
+
+    <!-- Context Item: copy task -->
+    <string name="TAd_contextCopyTask">העתק משימה</string>
+
+    <!-- Context Item: delete task -->
+    <string name="TAd_contextDeleteTask">מַחֲקֵי משימה</string>
+
+    <!-- Context Item: undelete task -->
+    <string name="TAd_contextUndeleteTask">בטלי מחיקת משימה</string>
+
+    <!-- Context Item: purge task -->
+    <string name="TAd_contextPurgeTask">אַיֵּן משימה</string>
+
+    <!-- ============================================== SortSelectionDialog == -->
+
+    <!-- slide 23a: Sort Selection: dialog title -->
+    <string name="SSD_title">מיון, תתי-משימות, ומשימות מוסתרות</string>
+
+    <!-- slide 23h:  Hidden: title -->
+    <string name="SSD_hidden_title">משימות מוסתרות</string>
+
+    <!-- Hidden Task Selection: show completed tasks -->
+    <string name="SSD_completed">הצג משימות שבוצעו</string>
+
+    <!-- Hidden Task Selection: show hidden tasks -->
+    <string name="SSD_hidden">הצג משימות מוסתרות</string>
+
+    <!-- Hidden Task Selection: show deleted tasks -->
+    <string name="SSD_deleted">הצג משימות שנמחקו</string>
+
+    <!-- Sort Selection: drag with subtasks -->
+    <string name="SSD_sort_drag">סידור ידני עם תתי-משימות</string>
+
+    <!-- slide 23b: Sort Selection: smart sort -->
+    <string name="SSD_sort_auto">Astrid מיון חכם</string>
+
+    <!-- slide 23e: Sort Selection: sort by alpha -->
+    <string name="SSD_sort_alpha">ע״פ כותרת</string>
+
+    <!-- slide 23c: Sort Selection: sort by due date -->
+    <string name="SSD_sort_due">ע״פ מועד יעד</string>
+
+    <!-- slide 23d: Sort Selection: sort by importance -->
+    <string name="SSD_sort_importance">ע״פ עדיפות</string>
+
+    <!-- slide 23f: Sort Selection: sort by modified date -->
+    <string name="SSD_sort_modified">ע״פ מועד עדכון אחרון</string>
+
+    <!-- slide 23g: Sort Selection: reverse -->
+    <string name="SSD_sort_reverse">מיון בסדר הפוך</string>
+
+    <!-- slide 23j: Sort Button: sort temporarily -->
+    <string name="SSD_save_temp">רק הפעם</string>
+
+    <!-- slide 23i: Sort Button: sort permanently -->
+    <string name="SSD_save_always">תמיד</string>
+
+    <!-- =============================================== FilterListActivity == -->
+
+    <!-- Astrid Filter Shortcut -->
+    <string name="FSA_label">רשימת משימות או מַסְנֵן</string>
+
+    <!-- Filter List Activity Title -->
+
+    <!-- Displayed when loading filters -->
+
+    <!-- Context Menu: Create Shortcut -->
+    <string name="FLA_context_shortcut">יצירת קיצור על שולחן העבודה</string>
+
+    <!-- Menu: Search -->
+
+    <!-- Menu: Help -->
+
+    <!-- slide 28c: Create Shortcut Dialog Title -->
+    <string name="FLA_shortcut_dialog_title">יצירת קיצור על שולחן העבודה</string>
+
+    <!-- Create Shortcut Dialog (asks to name shortcut) -->
+    <string name="FLA_shortcut_dialog">שם הקיצור:</string>
+
+    <!-- Search Hint-->
+    <string name="FLA_search_hint">חיפוש אחר משימות</string>
+
+    <!-- Search Filter name (%s => query) -->
+    <string name="FLA_search_filter">התאים ל\'%s\'</string>
+
+    <!-- Toast: created shortcut (%s => label) -->
+    <string name="FLA_toast_onCreateShortcut">נוצר קיצור: %s</string>
+
+    <!-- Menu: new filter -->
+    <string name="FLA_new_filter">מַסְנֵן חדש</string>
+
+    <!-- slide 10e: Button: new list -->
+    <string name="FLA_new_list">רשימה חדשה</string>
+
+    <!-- Alert when creating a shortcut without selecting a filter -->
+    <string name="FLA_no_filter_selected">לא נבחר מַסְנֵן! אנא בחר מַסְנֵן או רשימה.</string>
+
+    <!-- ================================================= TaskEditActivity == -->
+
+    <!-- Title when editing a task (%s => task title) -->
+
+    <!-- Title when creating a new task -->
+
+    <!-- Task title label -->
+
+    <!-- Task when label -->
+    <string name="TEA_when_header_label">מתי</string>
+
+    <!-- Task title hint (displayed when edit box is empty) -->
+    <string name="TEA_title_hint">Task name</string>
+
+    <!-- Task importance label -->
+    <string name="TEA_importance_label">עדיפות</string>
+
+    <!-- Task due date hint -->
+    <string name="TEA_deadline_hint">Set due date</string>
+
+    <!-- Task assigned to string (%s -> assigned person name) -->
+    <string name="TEA_assigned_to">Assigned to %s</string>
+
+    <!-- Task urgency specific time checkbox -->
+    <string name="TEA_urgency_specific_time">בזמן מסויים?</string>
+
+    <!-- Task urgency specific time title when specific time false -->
+    <string name="TEA_urgency_none">ללא</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_label">הסתרה עד</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_display">Hide until %s</string>
+
+    <!-- Task hide until toast -->
+    <string name="TEA_hideUntil_message">המשימה תוסתר עד %s</string>
+
+    <!-- Task editing data being loaded label -->
+    <string-array name="TEA_loading">
+        <item>טוענת...</item>
+    </string-array>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_note_label">תיאור</string>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_notes_empty">Description...</string>
+
+    <!-- Task note hint -->
+    <string name="TEA_notes_hint">הזן את תיאור המשימה...</string>
+
+    <!-- Estimated time label -->
+    <string name="TEA_estimatedDuration_label">כמה זמן תיקח המשימה?</string>
+
+    <!-- Elapsed time label -->
+    <string name="TEA_elapsedDuration_label">זמן שכבר הושקע במשימה</string>
+
+    <!-- Menu: Save -->
+    <string name="TEA_menu_save">שמירת השינויים</string>
+
+    <!-- Menu: Don\'t Save -->
+    <string name="TEA_menu_discard">לא לשמור</string>
+
+    <!-- Menu: Delete Task -->
+    <string name="TEA_menu_delete">מחיקת משימה</string>
+
+    <!-- Menu: Task comments -->
+    <string name="TEA_menu_refresh_comments">רַעְנֵן הערות</string>
+
+    <string name="TEA_menu_comments">הערות</string>
+
+    <!-- Toast: task saved with deadline (%s => preposition + time units) -->
+    <string name="TEA_onTaskSave_due">המשימה נשמרה: יעד %s</string>
+
+    <!-- Toast: task saved without deadlines -->
+    <string name="TEA_onTaskSave_notDue">המשימה נשמרה</string>
+
+    <!-- Toast: task was not saved -->
+
+    <!-- Toast: task was deleted -->
+
+    <!-- slide 15b: Task edit tab: activity -->
+    <string name="TEA_tab_activity">פעילות</string>
+
+    <!-- slide 15e:  Task edit tab: more editing settings -->
+    <string name="TEA_tab_more">פרטים</string>
+
+    <!-- slide 15d: Task edit tab: web services -->
+    <string name="TEA_tab_web">רעיונות</string>
+
+    <string name="TEA_timer_est">Est. %s</string>
+
+    <string name="TEA_timer_elap">Elapsed %s</string>
+
+    <string-array name="TEA_urgency">
+        <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
+        <item>ללא תאריך</item>
+        <item>יום מסוים</item>
+        <item>היום</item>
+        <item>מחר</item>
+        <item>(ביום שלאחר)</item>
+        <item>בשבוע הבא</item>
+        <item>בתוך שבועיים</item>
+        <item>בחודש הבא</item>
+    </string-array>
+
+    <string name="TEA_no_time">ללא שעה מסויימת</string>
+
+    <string-array name="TEA_hideUntil">
+        <!-- hideUntil: labels for edit page. -->
+        <item>אף פעם</item>
+        <item>עד ה</item>
+        <item>Due time</item>
+        <item>Day before due</item>
+        <item>Week before due</item>
+        <item>תאריך/שעה מסוימים</item>
+    </string-array>
+
+    <!-- Task edit control set descriptors -->
+
+    <!-- slide 9b/35i -->
+    <string name="TEA_control_who">מי</string>
+
+    <!-- slide 9c/ 35a -->
+    <string name="TEA_control_when">מתי</string>
+    <!-- slide 35b -->
+    <string name="TEA_control_more_section">----פרטים----</string>
+    <!-- slide 16a/35c -->
+    <string name="TEA_control_importance">עדיפות</string>
+    <!-- slide 16b/35d -->
+    <string name="TEA_control_lists">רשימות</string>
+    <!-- slide 16c/35e -->
+    <string name="TEA_control_notes">תיאור</string>
+
+    <string name="TEA_control_files">קבצים</string>
+
+    <!-- slide 16e / slide 35g-->
+    <string name="TEA_control_reminders">תזכורות</string>
+
+    <!-- slide 16f -->
+    <string name="TEA_control_timer">הערכת זמן</string>
+
+    <string name="TEA_control_hidden_section">----מוסתר תמיד----</string>
+
+    <string name="hide_until_prompt">הצג ברשימה שלי</string>
+
+    <!-- Add Ons tab when no add-ons found -->
+
+    <!-- Add Ons button -->
+
+    <!-- More row -->
+
+    <!-- slide 15c: Text when no activity to show -->
+    <string name="TEA_no_activity">אין פעילות</string>
+
+    <!-- Text to load more activity -->
+    <string name="TEA_load_more">טען עוד...</string>
+
+    <!-- When controls dialog -->
+    <string name="TEA_when_dialog_title">למתי?</string>
+
+
+    <string name="TEA_new_task">משימה חדשה</string>
+
+    <string name="WSV_click_to_load">טְפַח עלי כדי לחפש דרכים לבצע זאת!</string>
+
+    <string name="WSV_not_online">ביכולתי לעשות יותר למענך כאשר אני מחוברת לַמִּרְשֶׁתֶת. אנא בדוק
+        את החיבור.
+    </string>
+
+    <string name="TEA_contact_error">מצטערת, לא מצאתי את כתובת הדוא״ל עבור איש קשר זה.</string>
+
+    <!-- ============================================= IntroductionActivity == -->
+
+    <!-- slide 1a: Introduction Window title -->
+
+    <!-- Button to agree to EULA -->
+
+    <!-- Button to disagree with EULA -->
+
+    <!-- ===================================================== MissedCallActivity == -->
+
+    <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
+    <string name="MCA_title">%1$s \nהתקשר ב־%2$s</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_return_call">התקשר כעת</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_add_task">התקשר מאוחר יותר</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_ignore">התעלם</string>
+
+    <!-- Missed call: dialog to ignore all missed calls title -->
+    <string name="MCA_ignore_title">להתעלם מכל השיחות שלא נענו?</string>
+
+    <!-- Missed call: dialog to ignore all missed calls body -->
+    <string name="MCA_ignore_body">התעלמת ממספר שיחות שלא נענו. האם עלי לחדול מלהזכיר שיחות שלא
+        נענו?
+    </string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore all button -->
+    <string name="MCA_ignore_all">התעלם מכל השיחות</string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
+    <string name="MCA_ignore_this">התעלם משיחה זו בלבד</string>
+
+    <!-- Missed call: preference title -->
+    <string name="MCA_missed_calls_pref_title">תייק שיחות שלא נענו</string>
+
+    <!-- slide 49c: Missed call: preference description -->
+    <string name="MCA_missed_calls_pref_desc_enabled">אסטריד תודיע לך על שיחות שלא נענו, ותציע
+        להזכיר לך להחזיר שיחה.
+    </string>
+    <string name="MCA_missed_calls_pref_desc_disabled">אסטריד לא תתריע על שיחות שלא נענו</string>
+
+    <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
+    <string name="MCA_task_title_name">"החזר שיחה ל־%1$s ב־%2$s"</string>
+
+    <!-- Missed call: task title no name (%s -> number)-->
+    <string name="MCA_task_title_no_name">החזר שיחה ל־%s</string>
+
+    <!-- Missed call: schedule dialog title (%s -> name or number)-->
+    <string name="MCA_schedule_dialog_title">החזר שיחה ל־%s ב...</string>
+
+    <!-- Missed call speech bubble options -->
+    <string-array name="MCA_dialog_speech_options">
+        <item>ודאי נחמד להיות כל כך פופולרי</item>
+        <item>יש! אנשים מחבבים אותך!</item>
+        <item>עשה להם את היום, החזר שיחה!</item>
+        <item>האם לא היית אתה שמח לו היו מחזירים לך שיחות?</item>
+        <item>אתה יכול!</item>
+        <item>תמיד תוכל לשלוח מסרון...</item>
+    </string-array>
+
+
+    <!-- ======================================= Calendar reminder activity == -->
+
+    <!-- Calendar remindeer ignore button -->
+    <string name="CRA_ignore">התעלם</string>
+
+    <!-- Calendar event -->
+    <string name="CRA_title">צריך רשימה לפגישה?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls title -->
+    <string name="CRA_ignore_title">להתעלם מכל אירועי היומן?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls body -->
+    <string name="CRA_ignore_body">התעלמת ממספר אירועי יומן. האם עלי לחדול מלהזכיר לך אירועי יומן?
+    </string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
+    <string name="CRA_ignore_all">התעלם מכל האירועים</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
+    <string name="CRA_ignore_this">התעלם מאירוע זה בלבד</string>
+
+    <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
+    <string name="CRA_speech_bubble_start">נראה כי %s מתחילה בקרוב. הֲתִּרְצֶה ליצור רשימה לפריטי
+        פעולה?
+    </string>
+
+    <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
+    <string name="CRA_speech_bubble_end">נראה כי בדיוק סיימת את %s. הֲתִּרְצֶה ליצור רשימה לפריטי
+        פעולה?
+    </string>
+
+    <!-- Calendar reminder: create list button -->
+    <string name="CRA_create_list">צור רשימה</string>
+
+    <!-- Calendar reminder: postpone button -->
+    <string name="CRA_postpone">אולי אחר-כך</string>
+
+    <!-- Calendar reminder: list exists dialog title -->
+    <string name="CRA_list_exists_title">רשימה כבר קיימת</string>
+
+    <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
+    <string name="CRA_list_exists_body">רשימה בשם %s כבר קיימת. הֲתִּרְצֶה להשתמש ברשימה הקיימת או
+        ליצור אחת חדשה לאירוע זה?
+    </string>
+
+    <!-- Calendar reminder: list exists dialog create new button -->
+    <string name="CRA_create_new">צור חדש</string>
+
+    <!-- Calendar reminder: list exists dialog use existing button -->
+    <string name="CRA_use_existing">השתמש בקיים</string>
+
+    <!-- Calendar remindr: created list (%s -> list name) -->
+    <string name="CRA_created_list_dialog">יצרתי רשימה %s.</string>
+
+    <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
+    <string name="CRA_one_attendee">%s מגיע.</string>
+
+    <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
+    <string name="CRA_two_attendees">%1$s ו-%2$s מגיעים.</string>
+
+    <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
+    <string name="CRA_many_attendees">%1$s, %2$s, ו-%3$d אחרים מגיעים.</string>
+
+    <!-- Calendar reminder: invitation prompt -->
+    <string name="CRA_invitation_prompt">הֲתִּרְצֶה להזמין אותם?</string>
+
+    <!-- Calendar reminder: preference title -->
+    <string name="CRA_calendar_reminders_pref_title">יועץ יומן</string>
+
+    <!-- Calendar reminder: pref description disabled -->
+    <string name="CRA_calendar_reminders_pref_desc_disabled">אסטריד לא תזכיר לך אירועי יומן
+        עתידיים.
+    </string>
+
+    <!-- Calendar reminder: pref description enabled -->
+    <string name="CRA_calendar_reminders_pref_desc_enabled">אסטריד תזכיר לך אירועי יומן עתידיים
+        ותעודד אותך להתכונן אליהם.
+    </string>
+
+    <!-- Calendar reminder: share list title -->
+    <string name="CRA_share_list_title">לשתף את הרשימה?</string>
+
+    <string name="CRA_invite_attendees">הזמן אחרים.</string>
+
+    <string name="CRA_more_options">אפשרויות נוספות</string>
+
+    <string name="CRA_dont_invite">לא תודה</string>
+
+    <!-- Calendar reminder: share list title when no other attendees exist-->
+    <string name="CRA_list_created_title">רשימה נוצרה!</string>
+
+    <!-- Calendar reminder: default new list name (%s -> event title) -->
+    <string name="CRA_default_list_name">פריטי פעולה: %s</string>
+
+    <!-- ===================================================== HelpActivity == -->
+
+    <!-- Help: Button to get support from our website -->
+
+    <!-- ==================================================== UpdateService == -->
+
+    <!-- Changelog Window Title -->
+    <string name="UpS_changelog_title">מה חדש אצל אסטריד?</string>
+
+    <!-- Updates Window Title -->
+    <string name="UpS_updates_title">חדשות Astrid אחרונות</string>
+
+    <!-- Updats No Activity to show for offline users -->
+    <string name="UpS_no_activity_log_in">התחבר כדי לראות דו״ח על\n\nהתקדמותך ועל הפעילות\n\nברשימות
+        המשותפות.
+    </string>
+
+    <!-- ================================================== EditPreferences == -->
+
+    <!-- slide 31g: Preference Window Title -->
+    <string name="EPr_title">הגדרות אסטריד</string>
+
+    <string name="EPr_share_astrid">שיתוף אסטריד</string>
+
+    <string name="EPr_share_astrid_summary">ספר על אסטריד ברשתות חברתיות</string>
+
+    <!-- slide 46a -->
+    <string name="EPr_deactivated">מופסק</string>
+
+    <!-- slide 30i: Preference Category: Appearance Title -->
+    <string name="EPr_appearance_header">חזות</string>
+
+    <!-- Preference Category: Appearance Summary -->
+    <string name="EPr_appearance_summary">ערכות נושא, חֲפִיצִים, שורת משימות, ערוך מסך</string>
+
+    <!-- FAQ Preference title -->
+    <string name="EPr_faq_title">שאלות נפוצות</string>
+
+    <!-- Account status preference (%s -> account type) -->
+    <string name="EPr_account_title">חשבון: %s</string>
+
+    <!-- Support preferences summary -->
+    <string name="EPr_support_summary">הדרכה, תשובות לשאלות נפוצות, אודות</string>
+
+    <!-- slide 34a: Preference: Task List Font Size Title -->
+    <string name="EPr_fontSize_title">אורך רשימת משימות</string>
+
+    <!-- Preference: Filters to show pref screen title -->
+    <string name="EPr_filters_to_show_title">אילו מַסְנְנִים להציג</string>
+
+    <!-- slide 32a: Preference: Show confirmation for smart reminders -->
+    <string name="EPr_showSmartConfirmation_title">הצג אישור על תזכורות חכמות</string>
+
+    <!-- slide 34g: Preference: Task List Font Size Description -->
+    <string name="EPr_fontSize_desc">גודל הגופן בדף הרישום הראשי</string>
+
+    <!-- Preferemce: Show task edit confirmation toasts -->
+
+    <!-- slide 34c: Preference: Task List Show Notes -->
+    <string name="EPr_showNotes_title">הצג תיאור עם המשימה</string>
+
+    <!-- Edit screen preference category -->
+    <string name="EPr_edit_screen_options">עריכת אפשרויות מסך</string>
+
+    <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
+    <string name="EPr_beastMode_title">עריכת סדר מסך</string>
+
+    <string name="EPr_beastMode_shortcut">התאמה אישית</string>
+
+    <string name="EPr_time_increment">צעדים של 5 דקות</string>
 
-    
-    <!-- Resources for built-in timers plug-in -->
-    
-    <!-- Task Edit Activity: Container Label -->
-    <string name="alarm_ACS_label">התראות</string>
-    
-    <!-- Task Edit Activity: Add New Alarm -->
-    <string name="alarm_ACS_button">הוסף התראה</string>
-    
-    <string-array name="reminders_alarm">
-      <!-- reminders related to alarm -->
-      <item>התראה!</item>
+    <string name="EPr_use_date_shortcuts">הצג קיצורי תאריך</string>
+
+    <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
+
+    <!-- slide 35h -->
+    <string name="EPr_beastMode_desc">התאם אישית את מסך עריכת משימה</string>
+    <!-- slide 35j -->
+    <string name="EPr_beastMode_reset">אפס להגדרות ברירת מחדל</string>
+
+    <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on
+        each row
+    </string>
+
+    <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
+    <string name="EPr_showNotes_desc_disabled">התיאור יהיה נגיש ממסך עריכת המשימה</string>
+    <!-- Preference: Task List Show Notes Description (enabled) -->
+    <string name="EPr_showNotes_desc_enabled">התיאור יוצג תמיד</string>
+
+    <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
+    <string name="EPr_compressTaskRows_title">שורת משימות דחוסה</string>
+    <!-- slide 34j -->
+    <string name="EPr_compressTaskRows_desc">דחוס את שורות המשימות כך שיתאימו לכותרת.</string>
+
+    <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
+    <!-- slide 34k-->
+
+    <!-- slide 34b: Preferences: Wrap task titles to two lines -->
+    <string name="EPr_fullTask_title">הצג כותרת מלאה</string>
+    <string name="EPr_fullTask_desc_enabled">כותרות משימה מלאות תוצגנה</string>
+    <!-- slide 34h -->
+    <string name="EPr_fullTask_desc_disabled">שתי השורות הראשונות של שם המשימה תוצגנה</string>
+
+    <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
+    <string name="EPr_ideaAuto_title">טען אוטומטית את לשונית הרעיונות</string>
+    <!-- slide 32c -->
+    <string name="EPr_ideaAuto_desc_enabled">חיפוש באינטרנט בעבור לשונית הרעיונות יופעל כשהלשונית
+        תוקלק
+    </string>
+    <string name="EPr_ideaAuto_desc_disabled">חיפוש באינטרנט עבור לשונית הרעיונות יעשה ידנית בלבד
+    </string>
+
+    <!-- Preferences: task row style -->
+    <string-array name="EPr_task_row_styles">
+        <item>מקורי</item>
+        <item>פשוט</item>
+        <item>כותרת בלבד</item>
     </string-array>
-    
 
+    <string-array name="EPr_task_row_style_descriptions">
+        <item>צמצם את הכותרת לשתי שורות עם תאריך מצד ימין</item>
+        <item>צמצם את הכותרת לשורה אחת כולל תאריך ורשימות מתחת</item>
+        <item>שורת כותרת פשוטה בלבד</item>
+    </string-array>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- task row style title (%s -> style) -->
+    <string name="EPr_task_row_style_title">סגנון שורה: %s</string>
 
-    
-  <!-- Resources for built-in backup plug-in -->
-  
-  <!-- ================================================= BackupPreferences == -->
+    <!-- Preference: custom filters enabled -->
+    <string name="EPr_use_filters_title">השתמש בְּמַסְנְנִים</string>
+    <string name="EPr_use_filters_subtitle">מאפשר לך ליצור מַסְנְנִים מותאמים אישית</string>
 
-    <!-- slide 33c/48d: Backup Preferences Title -->    
-    <string name="backup_BPr_header">גיבויים</string>
+    <!-- Preference: show list members in shared list -->
+    <string name="EPr_show_list_members_title">הצג חברים ברשימה ברשימות משותפות</string>
 
-    <!-- slide 48e/50c: Backup: Status Header -->    
-    <string name="backup_BPr_group_status">מצב</string>
-    
-    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">גיבוי אחרון: %s</string>
-    <!-- Backup Status: last error failed. Keep it short! -->    
-    <string name="backup_status_failed">הגיבוי האחרון נכשל</string>
-    <!-- Backup Status: error subtitle -->    
-    <string name="backup_status_failed_subtitle">"(טפח  כדי להציג את השגיאה)"</string>
-    <!-- slide 48a: Backup Status: never backed up -->    
-    <string name="backup_status_never">לא נעשו גיבויים מעולם!</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_simple_input_boxes">תיבות טקסט פשוטות</string>
 
-    <!-- slide 48f/ 50e: Backup Options Group Label -->    
-    <string name="backup_BPr_group_options">אפשרויות</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_show_quickadd_controls">בקרת הוספה מהירה מתקדם</string>
 
-    <!-- slide 48b: Preference: Automatic Backup Title -->    
-    <string name="backup_BPr_auto_title">גיבויים אוטומטיים</string>
-    <!-- Preference: Automatic Backup Description (when disabled) -->
-    <string name="backup_BPr_auto_disabled">הגיבויים האוטומטיים הופסקו</string>    
-    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
-    <string name="backup_BPr_auto_enabled">הגיבוי יתבצע מדי יום</string>
-    
-    <!-- Preference screen restoring Tasks Help -->
-    <!-- Preference screen Restoring Tasks Help Dialog Text-->
-    
-    <string name="backup_BPr_cloud_already_logged_in">יש לך כבר גיבוי בענן באתר astrid.com</string>
-  
-  <!-- ================================================= BackupActivity == -->
-
-  <!-- slide 48c: backup activity label -->
-  <string name="backup_BAc_label">ניהול גיבויים</string>
-
-  <!-- backup activity title -->
-  <string name="backup_BAc_title">ניהול הגיבויים שלך</string>
-
-  <!-- backup activity import button -->
-  <string name="backup_BAc_import">ייבוא משימות</string>
-
-  <!-- backup activity export button -->
-  <string name="backup_BAc_export">ייצוא משימות</string>
-  
-  <!-- backup activity cloud (Astrid.com) option -->
-  <string name="backup_BAc_cloud">הקלק לגיבוי חינם בענן באתר astrid.com</string>
-    
-  <!-- ============================================== Importer / Exporter == -->
-  
-  <!-- Message displayed when error occurs -->
-  <string name="backup_TXI_error">שגיאת ייבוא</string>
-    
-  <string name="export_toast">בוצע גיבוי של %1$s אל %2$s.</string>
-    
-  <string name="export_toast_no_tasks">אין משימות לייצוא.</string>
-  
-  <!-- Progress Dialog Title for exporting -->    
-  <string name="export_progress_title">מייצאת...</string>
-  
-  <!-- Backup: Title of Import Summary Dialog -->
-  <string name="import_summary_title">סיכום פעולת השחזור</string>
-    
-  <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">"הקובץ \' %1$s\' הכיל  %2$s משימות: \n\n %3$s יובאו,\n %4$s היו קיימות כבר,\nוב־%5$s היו שגיאות.\n"</string>
-  
-  <!-- Progress Dialog Title for importing -->    
-  <string name="import_progress_title">מייבאת...</string>
-  
-  <!-- Progress Dialog text for import reading task (%d -> task number)-->    
-  <string name="import_progress_read">קוראת משימה %d...</string>
-  
-  <!-- Backup: Dialog when unable to open a file -->  
-  
-  <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
-  <string name="DLG_error_sdcard">לא ניתן לגשת לתיקיה: %s</string>
-  
-  <!-- Backup: Dialog when unable to open SD card in general -->
-  <string name="DLG_error_sdcard_general">לא ניתן לגשת לכרטיס ה־SD שלך!</string>
-    
-  <!-- Backup: File Selector dialog for import -->
-  <string name="import_file_prompt">נא לבחור קובץ לשחזור</string>    
-        
+    <!-- Preference: don\'t show plus button until input present -->
+    <string name="EPr_hide_plus_button">Hide plus button</string>
 
+    <!-- Preference: menu items -->
+    <string name="EPr_menu_items">פריטי תפריט</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Preference: list view -->
+    <string name="EPr_list_view">תצוגת רשימה</string>
 
+    <!-- Preference: task edit comments -->
+    <string name="EPr_show_task_edit_comments">הצגת הערות בעריכת משימה</string>
 
-  <!-- ================================================== AndroidManifest == -->
-
-  <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
-  <string name="app_name">משימות אסטריד</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="read_permission_label">הרשאות אסטריד</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="read_permission_desc">קריאת משימות, הצגת מַסְנְנֵי משימות</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="write_permission_label">הרשאות אסטריד</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="write_permission_desc">יצירת משימות חדשות, עריכת משימות קיימות.</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-    
-  <!-- question for deleting tasks -->
-  <string name="DLG_delete_this_task_question">למחוק משימה זו?</string>
-
-  <!-- question for deleting items (%s => item name) -->
-  <string name="DLG_delete_this_item_question">למחוק את %s?</string>
-    
-  <!-- Progress dialog shown when upgrading -->
-  <string name="DLG_upgrading">משדרגת את משימותיך...</string>
-  
-  <!-- Title for dialog selecting a time (hours and minutes) -->
-  <string name="DLG_hour_minutes">זמן (שעות : דקות)</string>
-  
-  <!-- Dialog for Astrid having a critical update -->
-  <string name="DLG_please_update">נדרש עדכון לתכנת אסטריד לגירסה האחרונה בחנות היישומים של גוגל. אנא עשה זאת לפני שתמשיך, או המתן מספר שניות.</string>
-
-  <!-- Button for going to Market -->
-
-  <!-- Button for accepting EULA -->
-  <string name="DLG_accept">אני מסכים</string>
-
-  <!-- Button for declining EULA -->
-  <string name="DLG_decline">אינני מסכים</string>
-
-  <!-- EULA title -->
-  <string name="DLG_eula_title">Astrid תנאי שימוש</string>
-
-  <!-- Progress Dialog generic text -->
-  <string name="DLG_please_wait">נא המתן</string>
-  
-  <!-- Dialog - loading -->
-  <string name="DLG_loading">טוענת...</string>
-  
-  <!-- Dialog - dismiss -->
-
-  <!-- slide 20d -->
-  <string name="DLG_ok">אישור</string>
-  <!-- slide 36g -->
-  <string name="DLG_cancel">בטל</string>
-  
-  <string name="DLG_more">עוד</string>
-  
-  <string name="DLG_undo">בטל פעולה אחרונה</string>
-  
-  <string name="DLG_warning">התראה</string>
-  
-  <!-- =============================================================== UI == -->
-  
-  <!-- Label for DateButtons with no value -->
-  <string name="WID_dateButtonUnset">הקלק כדי לקבוע</string>
-  
-  <!-- String formatter for DateButtons ($D => date, $T => time) -->
-  
-  <!-- String formatter for Disable button -->
-  
-  <!--  ============================================================= notes -->
-  
-  <!-- Note Exposer -->    
-  
-  <!-- Note Exposer / Comments -->    
-  
-  <!-- EditNoteActivity - no comments -->
-  <string name="ENA_no_comments">אין פעילות עדיין</string>
-    
-  <!-- EditNoteActivity - no username for comment -->
-  <string name="ENA_no_user">מישהו</string>
-  
-  <!-- EditNoteActivity - refresh comments -->
-  <string name="ENA_refresh_comments">רַעְנֵן הערות</string>
-  
-  <!-- ================================================= TaskListActivity == -->
-  
-  <!-- slide 8b: Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">אין לך משימות!\n הֲתִּרְצֶה להוסיף משימה?</string>
-  
-  <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->    
-  <string name="TLA_no_items_person">%s אינו משתף עמך אף משימה</string>
-  
-  <!-- Menu: Adjust Sort and Hidden Task Settings -->    
-  <string name="TLA_menu_sort">מיון</string>
-  
-  <!-- Menu: Sync Now -->    
-  <string name="TLA_menu_sync">סנכרני כעת</string>
-  
-  <!-- Menu: Search -->
-  <string name="TLA_menu_search">חיפוש</string>
-  
-  <!-- Menu: Tasks -->
-  <string name="TLA_menu_lists">רשימות</string>
-
-  <!-- Menu: Friends -->
-  <string name="TLA_menu_friends">אנשים</string>
-
-  <!-- Menu: Featured Lists -->
-  <string name="TLA_menu_featured_lists">רשימות נבחרות</string>
-
-  <!-- Menu: Suggestions -->
-  <string name="TLA_menu_suggestions">הצעות</string>
-  
-  <!-- Menu: Tutorial -->
-
-  <!-- Menu: Settings -->    
-  <string name="TLA_menu_settings">הגדרות</string>
-  
-  <!-- slide 30b: Menu: Support -->
-  <string name="TLA_menu_support">תמיכה</string>
-  
-  <!-- Search Label-->
-  
-  <!-- Window title for displaying Custom Filter -->
-  <string name="TLA_custom">מותאם אישית</string>
-  
-  <!-- slide 8d: Quick Add Edit Box Hint-->
-  <string name="TLA_quick_add_hint">הוסף משימה</string>
-  
-  <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
-  <string name="TLA_quick_add_hint_assign">משהו לעשות %s תן ל</string>
-  
-  <!-- Notification Volumne notification-->
-  <string name="TLA_notification_volume_low">ההתראות מוחרשות. לא תשמע את אסטריד יותר!</string>
-  
-  <!-- Notifications disabled warning -->
-  <string name="TLA_notification_disabled">התזכורות של אסטריד מושתקות! לא תקבל תזכורות נוספות</string>
-  
-  <string-array name="TLA_filters">
-      <item>פעיל</item>
-      <item>היום</item>
-      <item>בקרוב</item>
-      <item>באיחור</item>
-      <item>בוצע</item>
-      <item>מוסתר</item>      
-  </string-array>
-  
-  <!-- Title for confirmation dialog after quick add markup -->
-  <string name="TLA_quickadd_confirm_title">אמרת ״%s״</string>
-  
-  <!-- Text for speech bubble in dialog after quick add markup -->
-  <!-- First string is task title, second is due date, third is priority -->
-  <string name="TLA_quickadd_confirm_speech_bubble">"יצרתי את המשימה \'%1$s\' עם תאריך יעד \'%2$s\'  בעדיפות \'%3$s\'"</string>
-  
-  <string name="TLA_quickadd_confirm_speech_bubble_date">לתאריך יעד %s</string>
-  
-  <string name="TLA_quickadd_confirm_hide_helpers">אל תציג אישורים נוספים</string>
-  
-  
-  <!-- Title for alert on new repeating task. %s-> task title -->
-  <string name="TLA_repeat_scheduled_title">משימה חוזרת חדשה %s</string>
-  
-  <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
-  <string name="TLA_repeat_scheduled_speech_bubble">"אזכיר לך את  %s."</string>
-  
-  <string-array name="TLA_priority_strings">
-      <item>עדיפות עליונה</item>
-      <item>עדיפות גבוהה</item>
-      <item>עדיפות בינונית</item>
-      <item>עדיפות נמוכה</item>
-  </string-array>
-  <!-- slide 22a -->
-  <string name="TLA_all_activity">כל הפעילות</string>
-  
-  <!-- ====================================================== TaskAdapter == -->
-  
-  <!-- Format string to indicate task is hidden (%s => task name) -->
-  <string name="TAd_hiddenFormat">%s [מוסתרת]</string>
-  
-  <!-- Format string to indicate task is deleted (%s => task name) -->
-  <string name="TAd_deletedFormat">%s [נמחקה]</string>
-  
-  <!-- Displayed when adapter is flung (scrolled quickly) -->
-  
-  <!-- slide 22b: indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">הסתיימה\n%s</string>
-  
-  <!-- slide 15a: Action Button: edit task -->
-  <string name="TAd_actionEditTask">עריכה</string>
-  
-  <!-- Context Item: edit task -->
-  <string name="TAd_contextEditTask">עריכת משימה</string>
-
-  <!-- Context Item: copy task -->
-  <string name="TAd_contextCopyTask">העתק משימה</string>
-
-  <!-- Context Item: delete task -->
-  <string name="TAd_contextDeleteTask">מַחֲקֵי משימה</string>
-
-  <!-- Context Item: undelete task -->
-  <string name="TAd_contextUndeleteTask">בטלי מחיקת משימה</string>
-
-  <!-- Context Item: purge task -->
-  <string name="TAd_contextPurgeTask">אַיֵּן משימה</string>
-  
-  <!-- ============================================== SortSelectionDialog == -->
-  
-  <!-- slide 23a: Sort Selection: dialog title -->    
-  <string name="SSD_title">מיון, תתי-משימות, ומשימות מוסתרות</string>
-  
-  <!-- slide 23h:  Hidden: title -->
-  <string name="SSD_hidden_title">משימות מוסתרות</string>
-  
-  <!-- Hidden Task Selection: show completed tasks -->    
-  <string name="SSD_completed">הצג משימות שבוצעו</string>
-  
-  <!-- Hidden Task Selection: show hidden tasks -->    
-  <string name="SSD_hidden">הצג משימות מוסתרות</string>
-  
-  <!-- Hidden Task Selection: show deleted tasks -->    
-  <string name="SSD_deleted">הצג משימות שנמחקו</string>
-  
-  <!-- Sort Selection: drag with subtasks -->
-  <string name="SSD_sort_drag">סידור ידני עם תתי-משימות</string>
-  
-  <!-- slide 23b: Sort Selection: smart sort -->
-  <string name="SSD_sort_auto">Astrid מיון חכם</string>
-  
-  <!-- slide 23e: Sort Selection: sort by alpha -->
-  <string name="SSD_sort_alpha">ע״פ כותרת</string>
-  
-  <!-- slide 23c: Sort Selection: sort by due date -->
-  <string name="SSD_sort_due">ע״פ מועד יעד</string>
-  
-  <!-- slide 23d: Sort Selection: sort by importance -->
-  <string name="SSD_sort_importance">ע״פ עדיפות</string>
-  
-  <!-- slide 23f: Sort Selection: sort by modified date -->
-  <string name="SSD_sort_modified">ע״פ מועד עדכון אחרון</string>
-  
-  <!-- slide 23g: Sort Selection: reverse -->
-  <string name="SSD_sort_reverse">מיון בסדר הפוך</string>
-  
-  <!-- slide 23j: Sort Button: sort temporarily -->
-  <string name="SSD_save_temp">רק הפעם</string>
-  
-  <!-- slide 23i: Sort Button: sort permanently -->
-  <string name="SSD_save_always">תמיד</string>
-  
-  <!-- =============================================== FilterListActivity == -->
-  
-  <!-- Astrid Filter Shortcut -->    
-  <string name="FSA_label">רשימת משימות או מַסְנֵן</string>
-
-  <!-- Filter List Activity Title -->    
-  
-  <!-- Displayed when loading filters -->    
-  
-  <!-- Context Menu: Create Shortcut -->    
-  <string name="FLA_context_shortcut">יצירת קיצור על שולחן העבודה</string>
-  
-  <!-- Menu: Search -->
-  
-  <!-- Menu: Help -->    
-  
-  <!-- slide 28c: Create Shortcut Dialog Title -->    
-  <string name="FLA_shortcut_dialog_title">יצירת קיצור על שולחן העבודה</string>
-  
-  <!-- Create Shortcut Dialog (asks to name shortcut) -->    
-  <string name="FLA_shortcut_dialog">שם הקיצור:</string>
-  
-  <!-- Search Hint-->
-  <string name="FLA_search_hint">חיפוש אחר משימות</string>
-  
-  <!-- Search Filter name (%s => query) -->
-  <string name="FLA_search_filter">התאים ל\'%s\'</string>
-  
-  <!-- Toast: created shortcut (%s => label) -->
-  <string name="FLA_toast_onCreateShortcut">נוצר קיצור: %s</string>
-  
-  <!-- Menu: new filter -->
-  <string name="FLA_new_filter">מַסְנֵן חדש</string>
-  
-  <!-- slide 10e: Button: new list -->
-  <string name="FLA_new_list">רשימה חדשה</string>
-  
-  <!-- Alert when creating a shortcut without selecting a filter -->
-  <string name="FLA_no_filter_selected">לא נבחר מַסְנֵן! אנא בחר מַסְנֵן או רשימה.</string>
-  
-  <!-- ================================================= TaskEditActivity == -->
-  
-  <!-- Title when editing a task (%s => task title) -->
-  
-  <!-- Title when creating a new task -->
-  
-  <!-- Task title label -->
-  
-  <!-- Task when label -->
-  <string name="TEA_when_header_label">מתי</string>
-  
-  <!-- Task title hint (displayed when edit box is empty) -->
-  <string name="TEA_title_hint">Task name</string>
-  
-  <!-- Task importance label -->
-  <string name="TEA_importance_label">עדיפות</string>
-  
-  <!-- Task due date hint -->
-  <string name="TEA_deadline_hint">Set due date</string>
-  
-  <!-- Task assigned to string (%s -> assigned person name) -->
-  <string name="TEA_assigned_to">Assigned to %s</string>
-  
-  <!-- Task urgency specific time checkbox -->
-  <string name="TEA_urgency_specific_time">בזמן מסויים?</string>
-  
-  <!-- Task urgency specific time title when specific time false -->
-  <string name="TEA_urgency_none">ללא</string>
-  
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_label">הסתרה עד</string>
-
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_display">Hide until %s</string>
-  
-  <!-- Task hide until toast -->
-  <string name="TEA_hideUntil_message">המשימה תוסתר עד %s</string>
-  
-  <!-- Task editing data being loaded label -->
-  <string-array name="TEA_loading"><item>טוענת...</item></string-array>
-  
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_note_label">תיאור</string>
-
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_notes_empty">Description...</string>
-  
-  <!-- Task note hint -->
-  <string name="TEA_notes_hint">הזן את תיאור המשימה...</string>
-  
-  <!-- Estimated time label -->
-  <string name="TEA_estimatedDuration_label">כמה זמן תיקח המשימה?</string>
-  
-  <!-- Elapsed time label -->
-  <string name="TEA_elapsedDuration_label">זמן שכבר הושקע במשימה</string>
-
-  <!-- Menu: Save -->    
-  <string name="TEA_menu_save">שמירת השינויים</string>
-  
-  <!-- Menu: Don\'t Save -->
-  <string name="TEA_menu_discard">לא לשמור</string>
-  
-  <!-- Menu: Delete Task -->
-  <string name="TEA_menu_delete">מחיקת משימה</string>
-  
-  <!-- Menu: Task comments -->
-  <string name="TEA_menu_refresh_comments">רַעְנֵן הערות</string>
-
-  <string name="TEA_menu_comments">הערות</string>
-  
-   <!-- Toast: task saved with deadline (%s => preposition + time units) -->
-  <string name="TEA_onTaskSave_due">המשימה נשמרה: יעד %s</string>
-  
-  <!-- Toast: task saved without deadlines -->
-  <string name="TEA_onTaskSave_notDue">המשימה נשמרה</string>
-  
-  <!-- Toast: task was not saved -->
-  
-  <!-- Toast: task was deleted -->
-  
-  <!-- slide 15b: Task edit tab: activity -->
-  <string name="TEA_tab_activity">פעילות</string>
-  
-  <!-- slide 15e:  Task edit tab: more editing settings -->
-  <string name="TEA_tab_more">פרטים</string>
-  
-  <!-- slide 15d: Task edit tab: web services -->
-  <string name="TEA_tab_web">רעיונות</string>
-  
-  <string name="TEA_timer_est">Est. %s</string>
-
-  <string name="TEA_timer_elap">Elapsed %s</string>
-  
-  <string-array name="TEA_urgency">
-      <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
-      <item>ללא תאריך</item>
-      <item>יום מסוים</item>
-      <item>היום</item>
-      <item>מחר</item>
-      <item>(ביום שלאחר)</item>
-      <item>בשבוע הבא</item>
-      <item>בתוך שבועיים</item>
-      <item>בחודש הבא</item>
-  </string-array>
-  
-  <string name="TEA_no_time">ללא שעה מסויימת</string>
-      
-  <string-array name="TEA_hideUntil">
-      <!-- hideUntil: labels for edit page. -->
-      <item>אף פעם</item>
-      <item>עד ה</item>
-      <item>Due time</item>
-      <item>Day before due</item>
-      <item>Week before due</item>
-      <item>תאריך/שעה מסוימים</item>
-  </string-array>
-  
-  <!-- Task edit control set descriptors -->
-
-  <!-- slide 9b/35i -->
-  <string name="TEA_control_who">מי</string>
-
-  <!-- slide 9c/ 35a -->
-  <string name="TEA_control_when">מתי</string>
-  <!-- slide 35b -->
-  <string name="TEA_control_more_section">----פרטים----</string>
-  <!-- slide 16a/35c -->
-  <string name="TEA_control_importance">עדיפות</string>  
-  <!-- slide 16b/35d -->
-  <string name="TEA_control_lists">רשימות</string>  
-  <!-- slide 16c/35e -->
-  <string name="TEA_control_notes">תיאור</string>  
-  
-  <string name="TEA_control_files">קבצים</string>
-
-  <!-- slide 16e / slide 35g-->
-  <string name="TEA_control_reminders">תזכורות</string>
-
-  <!-- slide 16f -->
-  <string name="TEA_control_timer">הערכת זמן</string>
-  
-  <string name="TEA_control_hidden_section">----מוסתר תמיד----</string>
-  
-  <string name="hide_until_prompt">הצג ברשימה שלי</string>
-  
-  <!-- Add Ons tab when no add-ons found -->
-  
-  <!-- Add Ons button -->
-  
-  <!-- More row -->
-  
-  <!-- slide 15c: Text when no activity to show -->
-  <string name="TEA_no_activity">אין פעילות</string>
-  
-  <!-- Text to load more activity -->
-  <string name="TEA_load_more">טען עוד...</string>
-  
-  <!-- When controls dialog -->
-  <string name="TEA_when_dialog_title">למתי?</string>
-  
-  
-  <string name="TEA_new_task">משימה חדשה</string>
-  
-  <string name="WSV_click_to_load">טְפַח עלי כדי לחפש דרכים לבצע זאת!</string>
-  
-  <string name="WSV_not_online">ביכולתי לעשות יותר למענך כאשר אני מחוברת לַמִּרְשֶׁתֶת. אנא בדוק את החיבור.</string>
-  
-  <string name="TEA_contact_error">מצטערת, לא מצאתי את כתובת הדוא״ל עבור איש קשר זה.</string>
-  
-  <!-- ============================================= IntroductionActivity == -->
-  
-  <!-- slide 1a: Introduction Window title -->
-  
-  <!-- Button to agree to EULA -->
-  
-  <!-- Button to disagree with EULA -->
-  
-  <!-- ===================================================== MissedCallActivity == -->
-  
-  <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
-  <string name="MCA_title">%1$s \nהתקשר ב־%2$s</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_return_call">התקשר כעת</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_add_task">התקשר מאוחר יותר</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_ignore">התעלם</string>
-  
-  <!-- Missed call: dialog to ignore all missed calls title -->
-  <string name="MCA_ignore_title">להתעלם מכל השיחות שלא נענו?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls body -->
-  <string name="MCA_ignore_body">התעלמת ממספר שיחות שלא נענו. האם עלי לחדול מלהזכיר שיחות שלא נענו?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore all button -->
-  <string name="MCA_ignore_all">התעלם מכל השיחות</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
-  <string name="MCA_ignore_this">התעלם משיחה זו בלבד</string>
-
-  <!-- Missed call: preference title -->
-  <string name="MCA_missed_calls_pref_title">תייק שיחות שלא נענו</string>
-
-  <!-- slide 49c: Missed call: preference description -->
-  <string name="MCA_missed_calls_pref_desc_enabled">אסטריד תודיע לך על שיחות שלא נענו, ותציע להזכיר לך להחזיר שיחה.</string>
-  <string name="MCA_missed_calls_pref_desc_disabled">אסטריד לא תתריע על שיחות שלא  נענו</string>
-
-  <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
-  <string name="MCA_task_title_name">"החזר שיחה ל־%1$s  ב־%2$s"</string>
-
-  <!-- Missed call: task title no name (%s -> number)-->
-  <string name="MCA_task_title_no_name">החזר שיחה ל־%s</string>
-  
-  <!-- Missed call: schedule dialog title (%s -> name or number)-->
-  <string name="MCA_schedule_dialog_title">החזר שיחה ל־%s ב...</string>
-  
-  <!-- Missed call speech bubble options -->
-  <string-array name="MCA_dialog_speech_options">
-      <item>ודאי נחמד להיות כל כך פופולרי</item>
-      <item>יש! אנשים מחבבים אותך!</item>
-      <item>עשה להם את היום, החזר שיחה!</item>
-      <item>האם לא היית אתה שמח לו היו מחזירים לך שיחות?</item>
-      <item>אתה יכול!</item>
-      <item>תמיד תוכל לשלוח מסרון...</item>
-  </string-array>
-  
-  
-  <!-- ======================================= Calendar reminder activity == -->
-  
-  <!-- Calendar remindeer ignore button -->
-  <string name="CRA_ignore">התעלם</string>
-  
-  <!-- Calendar event -->
-  <string name="CRA_title">צריך רשימה לפגישה?</string>
-  
-  <!-- Calendar reminder: dialog to ignore all missed calls title -->
-  <string name="CRA_ignore_title">להתעלם מכל אירועי היומן?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls body -->
-  <string name="CRA_ignore_body"> התעלמת ממספר אירועי יומן. האם עלי לחדול מלהזכיר לך אירועי יומן?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
-  <string name="CRA_ignore_all">התעלם מכל האירועים</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
-  <string name="CRA_ignore_this">התעלם מאירוע זה בלבד</string>
-  
-  <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
-  <string name="CRA_speech_bubble_start">נראה כי %s מתחילה בקרוב. הֲתִּרְצֶה ליצור רשימה לפריטי פעולה?</string>
-
-  <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
-  <string name="CRA_speech_bubble_end">נראה כי בדיוק סיימת את %s. הֲתִּרְצֶה ליצור רשימה לפריטי פעולה?</string>
-  
-  <!-- Calendar reminder: create list button -->
-  <string name="CRA_create_list">צור רשימה</string>
-
-  <!-- Calendar reminder: postpone button -->
-  <string name="CRA_postpone">אולי אחר-כך</string>
-  
-  <!-- Calendar reminder: list exists dialog title -->
-  <string name="CRA_list_exists_title">רשימה כבר קיימת</string>
-  
-  <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
-  <string name="CRA_list_exists_body">רשימה בשם %s כבר קיימת. הֲתִּרְצֶה להשתמש ברשימה הקיימת או ליצור אחת חדשה לאירוע זה?</string>
-  
-  <!-- Calendar reminder: list exists dialog create new button -->
-  <string name="CRA_create_new">צור חדש</string>
-
-  <!-- Calendar reminder: list exists dialog use existing button -->
-  <string name="CRA_use_existing">השתמש בקיים</string>
-  
-  <!-- Calendar remindr: created list (%s -> list name) -->
-  <string name="CRA_created_list_dialog">יצרתי רשימה %s.</string>
-  
-  <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
-  <string name="CRA_one_attendee">%s מגיע.</string>
-
-  <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
-  <string name="CRA_two_attendees">%1$s ו-%2$s מגיעים.</string>
-
-  <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
-  <string name="CRA_many_attendees">%1$s, %2$s, ו-%3$d אחרים מגיעים.</string>
-  
-  <!-- Calendar reminder: invitation prompt -->
-  <string name="CRA_invitation_prompt">הֲתִּרְצֶה להזמין אותם?</string>
-  
-  <!-- Calendar reminder: preference title -->
-  <string name="CRA_calendar_reminders_pref_title">יועץ יומן</string>
-
-  <!-- Calendar reminder: pref description disabled -->
-  <string name="CRA_calendar_reminders_pref_desc_disabled">אסטריד לא תזכיר לך אירועי יומן עתידיים.</string>
-
-  <!-- Calendar reminder: pref description enabled -->
-  <string name="CRA_calendar_reminders_pref_desc_enabled">אסטריד תזכיר לך אירועי יומן עתידיים ותעודד אותך להתכונן אליהם.</string>
-  
-  <!-- Calendar reminder: share list title -->
-  <string name="CRA_share_list_title">לשתף את הרשימה?</string>
-  
-  <string name="CRA_invite_attendees">הזמן אחרים.</string>
-
-  <string name="CRA_more_options">אפשרויות נוספות</string>
-
-  <string name="CRA_dont_invite">לא תודה</string>
-
-  <!-- Calendar reminder: share list title when no other attendees exist-->
-  <string name="CRA_list_created_title">רשימה נוצרה!</string>
-  
-  <!-- Calendar reminder: default new list name (%s -> event title) -->
-  <string name="CRA_default_list_name">פריטי פעולה: %s</string>
-  
-  <!-- ===================================================== HelpActivity == -->
-  
-  <!-- Help: Button to get support from our website -->
-    
-  <!-- ==================================================== UpdateService == -->
-  
-  <!-- Changelog Window Title -->
-  <string name="UpS_changelog_title">מה חדש אצל אסטריד?</string>
-  
-  <!-- Updates Window Title -->
-  <string name="UpS_updates_title">חדשות Astrid אחרונות</string>
-  
-  <!-- Updats No Activity to show for offline users -->
-  <string name="UpS_no_activity_log_in">התחבר כדי לראות דו״ח על\n\nהתקדמותך ועל הפעילות\n\nברשימות המשותפות.</string>
-  
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 31g: Preference Window Title -->
-  <string name="EPr_title">הגדרות אסטריד</string>
-  
-  <string name="EPr_share_astrid">שיתוף אסטריד</string>
-
-  <string name="EPr_share_astrid_summary">ספר על אסטריד ברשתות חברתיות</string>
-  
-  <!-- slide 46a -->
-  <string name="EPr_deactivated">מופסק</string>
-
-  <!-- slide 30i: Preference Category: Appearance Title -->
-  <string name="EPr_appearance_header">חזות</string>
-  
-  <!-- Preference Category: Appearance Summary -->
-  <string name="EPr_appearance_summary">ערכות נושא, חֲפִיצִים, שורת משימות, ערוך מסך</string>
-  
-  <!-- FAQ Preference title -->
-  <string name="EPr_faq_title">שאלות נפוצות</string>
-  
-  <!-- Account status preference (%s -> account type) -->
-  <string name="EPr_account_title">חשבון: %s</string>
-
-  <!-- Support preferences summary -->
-  <string name="EPr_support_summary">הדרכה, תשובות לשאלות נפוצות, אודות</string>
-  
-  <!-- slide 34a: Preference: Task List Font Size Title -->
-  <string name="EPr_fontSize_title">אורך רשימת משימות</string>
-  
-  <!-- Preference: Filters to show pref screen title -->
-  <string name="EPr_filters_to_show_title">אילו מַסְנְנִים להציג</string>
-  
-  <!-- slide 32a: Preference: Show confirmation for smart reminders -->
-  <string name="EPr_showSmartConfirmation_title">הצג אישור על תזכורות חכמות</string>
-  
-  <!-- slide 34g: Preference: Task List Font Size Description -->                                                                                                                                                  
-  <string name="EPr_fontSize_desc">גודל הגופן בדף הרישום הראשי</string>  
-  
-  <!-- Preferemce: Show task edit confirmation toasts -->
-  
-  <!-- slide 34c: Preference: Task List Show Notes -->
-  <string name="EPr_showNotes_title">הצג תיאור עם המשימה</string>
-  
-  <!-- Edit screen preference category -->
-  <string name="EPr_edit_screen_options">עריכת אפשרויות מסך</string>
-  
-  <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
-  <string name="EPr_beastMode_title">עריכת סדר מסך</string>
-  
-  <string name="EPr_beastMode_shortcut">התאמה אישית</string>
-  
-  <string name="EPr_time_increment">צעדים של 5 דקות</string>
-  
-  <string name="EPr_use_date_shortcuts">הצג קיצורי תאריך</string>
-  
-  <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
-  
-  <!-- slide 35h -->
-  <string name="EPr_beastMode_desc">התאם אישית את מסך עריכת משימה</string>
-  <!-- slide 35j -->
-  <string name="EPr_beastMode_reset">אפס להגדרות ברירת מחדל</string>
-  
-  <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on each row</string>
-      
-  <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">התיאור יהיה נגיש ממסך עריכת המשימה</string>  
-  <!-- Preference: Task List Show Notes Description (enabled) -->
-  <string name="EPr_showNotes_desc_enabled">התיאור יוצג תמיד</string>
-  
-  <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
-  <string name="EPr_compressTaskRows_title">שורת משימות דחוסה</string>
-  <!-- slide 34j -->
-  <string name="EPr_compressTaskRows_desc">דחוס את שורות המשימות כך שיתאימו לכותרת.</string>
-  
-  <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
-  <!-- slide 34k-->
-  
-  <!-- slide 34b: Preferences: Wrap task titles to two lines -->
-  <string name="EPr_fullTask_title">הצג כותרת מלאה</string>
-  <string name="EPr_fullTask_desc_enabled">כותרות משימה מלאות תוצגנה</string>
-  <!-- slide 34h -->
-  <string name="EPr_fullTask_desc_disabled">שתי השורות הראשונות של שם המשימה תוצגנה</string>
-  
-  <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
-  <string name="EPr_ideaAuto_title">טען אוטומטית את לשונית הרעיונות</string>
-  <!-- slide 32c -->
-  <string name="EPr_ideaAuto_desc_enabled">חיפוש באינטרנט בעבור לשונית הרעיונות יופעל כשהלשונית תוקלק</string>
-  <string name="EPr_ideaAuto_desc_disabled">חיפוש באינטרנט עבור לשונית הרעיונות יעשה ידנית בלבד</string>
-  
-  <!-- Preferences: task row style -->
-  <string-array name="EPr_task_row_styles">
-      <item>מקורי</item>
-      <item>פשוט</item>
-      <item>כותרת בלבד</item>
-  </string-array>
-  
-  <string-array name="EPr_task_row_style_descriptions">
-      <item>צמצם את הכותרת לשתי שורות עם תאריך מצד ימין</item>
-      <item>צמצם את הכותרת לשורה אחת כולל תאריך ורשימות מתחת</item>
-      <item>שורת כותרת פשוטה בלבד</item>
-  </string-array>
-  
-  <!-- task row style title (%s -> style) -->
-  <string name="EPr_task_row_style_title">סגנון שורה: %s</string>
-  
-  <!-- Preference: custom filters enabled -->
-  <string name="EPr_use_filters_title">השתמש בְּמַסְנְנִים</string>
-  <string name="EPr_use_filters_subtitle">מאפשר לך ליצור מַסְנְנִים מותאמים אישית</string>
-
-  <!-- Preference: show list members in shared list -->
-  <string name="EPr_show_list_members_title">הצג חברים ברשימה ברשימות משותפות</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_simple_input_boxes">תיבות טקסט פשוטות</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_show_quickadd_controls">בקרת הוספה מהירה מתקדם</string>
-
-  <!-- Preference: don\'t show plus button until input present -->
-  <string name="EPr_hide_plus_button">Hide plus button</string>
-
-  <!-- Preference: menu items -->
-  <string name="EPr_menu_items">פריטי תפריט</string>
-
-  <!-- Preference: list view -->
-  <string name="EPr_list_view">תצוגת רשימה</string>
-
-  <!-- Preference: task edit comments -->
-  <string name="EPr_show_task_edit_comments">הצגת הערות בעריכת משימה</string>
-  
-  <!-- slide 30f/ 36f: Preference: Theme -->
-  <string name="EPr_theme_title">צבע ערכת נושא</string>
-  <!-- Preference: Theme Description (%s => value) -->
-  <string name="EPr_theme_desc">כעת: %s</string>  
-  <!-- Preference: Theme Description (android 1.6) -->
-  <string name="EPr_theme_desc_unsupported">הפעלת הגדרות דורשת גירסא 2.0 ומעלה של אנדרואיד</string>
-  <!-- slide 32h/ 37b -->
-  <string name="EPr_theme_widget_title">ערכת חֲפִיץ מסך</string>
-  
-  <!-- slide 30d/ 34f: Preference screen: all task row settings -->
-  <string name="EPr_taskRowPrefs_title">חזות שורת המשימה</string>
-  
-  <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
-  <string name="EPr_use_contact_picker">השתמש בבוחר אנשי הקשר</string>
-  <!-- slide 49b -->
-  <string name="EPr_use_contact_picker_desc_enabled">בוחר אנשי הקשר של המערכת יוצג בחלון הטלת משימה</string>
-  <string name="EPr_use_contact_picker_desc_disabled">בוחר אנשי הקשר של המערכת לא יוצג</string>
-
-  <!-- slide 49i: Preferences: Third party addons -->
-  <string name="EPr_third_party_addons">אַפְשְׁרִי תוספי צד שלישי</string>
-  <string name="EPr_third_party_addons_desc_enabled">תוספי צד ג\' יאופשרו</string>
-  <!-- slide 49d -->
-  <string name="EPr_third_party_addons_desc_disabled">תוספי צד ג\' יִמָּנְעוּ</string>
-  
-  <!-- Preferences: ideas tab -->
-  <string name="EPr_ideas_tab_enabled">רעיונות למשימה</string>
-  <string name="EPr_ideas_tab_description">קבל רעיונות שיסייעו לך לבצע משימות</string>
-  
-  <!-- Preferences: calendar event start time -->
-  <string name="EPr_cal_end_or_start_at_due_time">משך אירוע יומן</string>
-  <string name="EPr_cal_end_at_due_time">סיים את אירועי היומן במועד היעד?</string>
-  <string name="EPr_cal_start_at_due_time">התחל את מאורעות היומן במועד היעד</string>
-  
-  <string name="EPr_force_phone_layout">מקלדת טלפון</string>
-
-  <string name="EPr_show_featured_lists">הצג רשימות מועדפות</string>
-  
-  <!-- Configurations -->
-  <string name="EPr_configurations_title">קביעת קונפיגורציה</string>
-  <string name="EPr_config_default">מחדל</string>
-  <string name="EPr_config_lite">אסטריד לייט</string>
-  
-  <!-- Dialog title when setting preference configuration -->
-  <string name="EPr_config_dialog_title">לקבוע קונפיגורציה?</string>
-  <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
-  <string name="EPr_config_dialog_text">שחזר את כל ההעדפות לקונפיגורציה %s?</string>
-  
-  <!-- default configuration name for the above dialog -->
-  <string name="EPr_config_dialog_default_id">מחדל</string>
-  
-  <!-- Preference title for showing save and cancel buttons in task edit page -->
-  <string name="EPr_show_save_and_cancel">Show save and cancel </string>
-  
-  
-  <!-- Swipe between lists -->
-  <!-- Preference: swipe between lists performance -->
-  <string name="EPr_swipe_lists_performance_title">עִלְעוּל בין רשימות</string>
-  
-  <string-array name="EPr_swipe_lists_performance_mode">
-      <item>ללא עִלְעוּל</item>
-      <item>חיסכון בזיכרון</item>
-      <item>ביצועים רגילים</item>
-      <item>ביצועים גבוהים</item>
-  </string-array>
-  
-  <string-array name="EPr_swipe_lists_performance_desc">
-  <!-- slide 49a -->
-      <item>עִלְעוּל בין רשימות מופסק</item>
-      <item>ביצועים נמוכים</item>
-      <item>הגדרות ברירת מחדל</item>
-      <item>השתמש ביותר משאבי מערכת</item>
-  </string-array>
-    
-  <string name="swipe_lists_helper_title">עִלְעוּל בין רשימות</string>
-  <string name="swipe_lists_helper_header">עִלְעוּל ימינה ושמאלה למעבר מהיר בין רשימות</string>
-  <string name="swipe_lists_helper_subtitle">שנה הגדרות תחת הגדרות>חזות</string>
-
-  <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
-  
-  <string-array name="EPr_default_reminders_mode">
-      <!-- reminders duration: labels for "Task Defaults" preference item. -->
-      <item>@string/TEA_reminder_mode_once</item>
-      <item>@string/TEA_reminder_mode_five</item>
-      <item>@string/TEA_reminder_mode_nonstop</item>
-  </string-array>
-    
-  <string-array name="EPr_themes">
-    <!-- theme_settings: labels for Theme preference menu -->
-    <!-- slide 36a-->
-    <item>יום - כחול</item>
-    <!-- slide 36b -->
-    <item>יום - אדום</item>
-    <!-- slide 36b -->
-    <item>תכלת</item>
-    <!-- slide 36c -->
-    <item>לילה</item>
-    <!-- slide 36d -->
-    <item>שקוף (טקסט לבן)</item>
-    <!-- slide 36e -->
-    <item>שקוף (טקסט שחור)</item>
-  </string-array>
-  
-  <string-array name="EPr_themes_widget">
-    <!-- slide 32i / 37a-->
-    <item>שמור כְּיִשּׂוּמוֹן</item>
-    <item>יום - כחול</item>
-    <item>יום - אדום</item>
-    <item>תכלת</item>
-    <item>לילה</item>
-    <item>שקוף (טקסט לבן)</item>
-    <item>שקוף (טקסט שחור)</item>
-    <item>סגנון ישן</item>
-  </string-array>
-  
-  <!-- ========================================== Task Management Settings == -->
-
-  <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
-  <string name="EPr_manage_header">נהל משימות ישנות</string>
-  <!-- slide 47d -->
-  <string name="EPr_manage_delete_completed">מַחֲקִי משימות שבוצעו</string>
-  <string name="EPr_manage_delete_completed_message">האם אתה בטוח שברצונך למחוק את כל המשימות שבוצעו?</string>
-  <!-- slide 47a -->
-  <string name="EPr_manage_delete_completed_summary">ניתן לבטל את המחיקה של המשימות שנמחקו, יש לעשות זאת משימה-אחר-משימה.</string>
-  <string name="EPr_manage_delete_completed_status">%d משימות נמחקו!</string>
-  <!-- slide 47e -->
-  <string name="EPr_manage_purge_deleted">אַיְּנִי משימות שנמחקו</string>
-  <string name="EPr_manage_purge_deleted_message">האם אתה בטוח שברצונך לְאַיֵּן את כל המשימות שנמחקו?</string>
-  <string name="EPr_manage_purge_deleted_status">%d משימות אֻיְּנוּ!</string>
-  <!-- slide 47b-->
-  <string name="EPr_manage_purge_deleted_summary">"שים לב! לא  ניתן לאחזר משימות  שֶׁאֻיְּנוּ בלי קובץ גיבוי!"</string>
-  <!-- slide 47h-->
-  <string name="EPr_manage_clear_all">הָסִירִי את כל הנתונים</string>
-  <string name="EPr_manage_clear_all_message">למחוק את כל המשימות ואת כל ההגדרות?\nאזהרה: לא ניתן לבטל פעולה זו!</string>
-
-  <!-- slide 47f -->
-  <string name="EPr_manage_delete_completed_gcal">מחקי אירועי יומן בעבור משימות שבוצעו</string>
-  <string name="EPr_manage_delete_completed_gcal_message">האם אתה בטוח שברצונך למחוק את כל אירועי היומן של משימות שבוצעו?</string>
-  <string name="EPr_manage_delete_completed_gcal_summary"></string>
-  <string name="EPr_manage_delete_completed_gcal_status">%d אירועי יומן נמחקו!</string>
-      
-  <!-- slide 47g-->
-  <string name="EPr_manage_delete_all_gcal">מַחֲקִי את כל אירועי היומן הקשורים למשימות</string>
-  <string name="EPr_manage_delete_all_gcal_message">האם אתה בטוח שברצונך למחוק את כל אירועי היומן בעבור המשימות?</string>
-  <string name="EPr_manage_delete_all_gcal_summary"></string>
-  <string name="EPr_manage_delete_all_gcal_status">%d אירועי יומן נמחקו</string>
-      
-  <!-- ==================================================== AddOnActivity == -->
-  
-  <!-- Add Ons Activity Title -->
-  <string name="AOA_title">תוספים</string>
-    
-  <!-- Add-on Activity: author for internal authors  -->
-  <string name="AOA_internal_author">הצוות של אסטריד</string>
-    
-  <!-- Add-on Activity: installed add-ons tab -->
-  <string name="AOA_tab_installed">מותקן</string>
-  
-  <!-- Add-on Activity - available add-ons tab -->
-  <string name="AOA_tab_available">זמין</string>
-  
-  <!-- Add-on Activity - free add-ons label -->
-  <string name="AOA_free">חינם</string>
-  
-  <!-- Add-on Activity - menu item to visit add-on website -->
-  
-  <!-- Add-on Activity - menu item to visit android market -->
-  
-  <!-- Add-on Activity - when list is empty -->
-  <string name="AOA_no_addons">רשימה ריקה!</string>
-  
-  <string name="AOA_ppack_title">חבילת כֹּחַ של אסטריד</string>
-  <string name="AOA_ppack_description">תמוך באסריד, הֱיֵה פּוֹרֶה יוֹתֵר וקבל את  חבילת הַכֹּחַ הכוללת  חֲפִיצֵי מסך 4x2 ו 4x4 ותמיכה בתפעול קולי</string>
-  <string name="AOA_locale_title">אנא התקן את תוסף אסטריד לתוכנת Locale</string>
-  <string name="AOA_locale_description">אפשר לאסטריד להשתמש בתכונות "מציאת מקום" על מנת לשלוח לך התראות מבוססות על תנאי סינון. עליך להפעיל שירותי מיקום.</string>
-  
-  <!-- ====================================================== TasksWidget == -->
-
-  <!-- Widget text when loading tasks -->
-  <string name="TWi_loading">טוענת...</string>
-
-  <!-- Widget configuration activity title: select a filter -->
-  <string name="WCA_title">בחר משימות להצגה...</string>
-  
-  <!-- ======================================================== Waiting on me -->
-
-  <string name="wom_commented">%s commented on your task.</string>
-  <string name="wom_mentioned">%s mentioned you.</string>
-  <string name="wom_assigned">%s assigned this to you.</string>
-  <string name="wom_raised_pri">%s raised the priority.</string>
-  <string name="wom_changed_due">%s changed the due date.</string>
-  <string name="wom_default">%s wants your attention.</string>
-  
-  <string name="wom_dismiss">Dismiss</string>
-  <string name="wom_acknowledge">I\'ve read this</string>
-
-  <!-- ============================================================= About == -->
-  
-  <!-- slide 30h: Title of "About" option in settings -->
-  <string name="p_about">אודות אסטריד</string>
-  
-  <!-- About text (%s => current version)-->
-  <string name="p_about_text">גירסא נוכחית: %s\n אסטריד היא תכנת קוד פתוח המתוחזקת בגאווה ע״י Todoroo, Inc.</string>
-
-  <!-- Title of "Help" option in settings -->
-  <string name="p_help">תמיכה</string>
-  
-  <!-- slide 30c: Title of "Forums" option in settings -->
-  <string name="p_forums">פורומים</string>
-  
-  <!-- Title of "Premium" option in settings -->
-  <string name="p_premium">פרימיום</string>
-  
-  <!-- ============================================================= Misc == -->
-  
-  <string name="feedback_positive_title">Rate Astrid?</string>
-
-  <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star rating?</string>
-
-  <string name="feedback_negative_title">Leave feedback?</string>
-
-  <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
-
-  <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback section--it might not be available on your device.</string>
-  
-  <string name="feedback_positive_button">Rate Astrid</string>
-
-  <string name="feedback_negative_button">Leave feedback</string>
-  
-  <string name="feedback_not_now">Not now</string>
-  
-  <string name="feedback_banner_text">How\'s Astrid working for you?</string>
-  
-  <!-- Displayed when task killer found. %s => name of the application -->
-  <string name="task_killer_help">ככל הנראה הנך משתמש ביישום אשר יכול להרוג תהליכים (%s)!
-.אם הדבר אפשרי, אנא הוסף את אסטריד לרשימת היישומים אשר ישום זה לא יהרוג. 
-אחרת , יתכן שאסטריד לא תוכל להודיע לך כאשר זמן היעד של המשימות שלך יגיע.</string>
-  
-  <!-- Task killer dialog ok button -->
-  <string name="task_killer_help_ok">אני לא אהרוג את אסטריד!</string>
-    
-  <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
-  
-  <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
-  <string name="marketplace_description">אסטריד הינה תכנת קוד פתוח פופולרית לניהול משימות ומטלות אשר תוכננה כדי לסייע 
-לך לעשות יותר. התכנה כוללת תזכורות, תגיות, סנכרון, התאמה מקומית, חפיץ מסך, ועוד.</string>
-  
-  <string name="DB_corrupted_title">בסיס נתונים פגום</string>
-  
-  <string name="DB_corrupted_body">הו לא! נראה כי בסיס הנתונים אינו תקין.
-אם אתה נתקל השגיאה זאת האופן תדיר, אנו מציעים שתמחק את כל הנתונים
-(הגדרות->סינכרון וגיבוי->ניהול משימות ישנות->הסרת כל הנתונים) ושחזר את המשימות
-מגיבוי (הגדרות->סנכרון וגיבוי->גיבוי->יבא משימות).</string>
-      
-  <string name="market_unavailable">לרוע המזל חנות היישומים אינה זמינה</string>
-  
+    <!-- slide 30f/ 36f: Preference: Theme -->
+    <string name="EPr_theme_title">צבע ערכת נושא</string>
+    <!-- Preference: Theme Description (%s => value) -->
+    <string name="EPr_theme_desc">כעת: %s</string>
+    <!-- Preference: Theme Description (android 1.6) -->
+    <string name="EPr_theme_desc_unsupported">הפעלת הגדרות דורשת גירסא 2.0 ומעלה של אנדרואיד
+    </string>
+    <!-- slide 32h/ 37b -->
+    <string name="EPr_theme_widget_title">ערכת חֲפִיץ מסך</string>
 
+    <!-- slide 30d/ 34f: Preference screen: all task row settings -->
+    <string name="EPr_taskRowPrefs_title">חזות שורת המשימה</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
+    <string name="EPr_use_contact_picker">השתמש בבוחר אנשי הקשר</string>
+    <!-- slide 49b -->
+    <string name="EPr_use_contact_picker_desc_enabled">בוחר אנשי הקשר של המערכת יוצג בחלון הטלת
+        משימה
+    </string>
+    <string name="EPr_use_contact_picker_desc_disabled">בוחר אנשי הקשר של המערכת לא יוצג</string>
 
+    <!-- slide 49i: Preferences: Third party addons -->
+    <string name="EPr_third_party_addons">אַפְשְׁרִי תוספי צד שלישי</string>
+    <string name="EPr_third_party_addons_desc_enabled">תוספי צד ג\' יאופשרו</string>
+    <!-- slide 49d -->
+    <string name="EPr_third_party_addons_desc_disabled">תוספי צד ג\' יִמָּנְעוּ</string>
 
-  <!-- slide 32g: Preference Category: Defaults Title -->
-  <string name="EPr_defaults_header">ברירות המחדל למשימה חדשה</string>
-  <string name="EPr_defaults_summary">עדיפות, מועד יעד, הוספה ליומן</string>
-  
-  <!-- slide 41f:  Preference: Default Urgency Title -->
-  <string name="EPr_default_urgency_title">דחיפות ברירת המחדל</string>
-  <!-- Preference: Default Urgency Description (%s => setting) -->
-  <string name="EPr_default_urgency_desc">כעת: %s</string>
-  
-  <!-- slide 40a: Preference: Default Importance Title -->
-  <string name="EPr_default_importance_title">עדיפות מחדל</string>
-  <!-- Preference: Default Importance Description (%s => setting) -->
-  <string name="EPr_default_importance_desc">כעת: %s</string>
-  
-  <!-- slide 42e: Preference: Default Hide Until Title -->
-  <string name="EPr_default_hideUntil_title">ברירת מחדל לזמן הסתרה</string>
-  <!-- Preference: Default Hide Until Description (%s => setting) -->
-  <string name="EPr_default_hideUntil_desc">כעת: %s</string>
-  
-  <!-- slide 43e: Preference: Default Reminders Title -->
-  <string name="EPr_default_reminders_title">תזכורות ברירת מחדל</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_desc">כעת: %s</string>
-  
-  <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
-  <string name="EPr_default_addtocalendar_title">הוספה ליומן כברירת מחדל</string>
-  <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
-  <string name="EPr_default_addtocalendar_desc_disabled">משימות חדשות לא תיצורנה אירוע בלוח השנה של גוגל</string>
-  <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
-  <string name="EPr_default_addtocalendar_desc">משימות חדשות תיווצרנה ביומן \'%s\'</string>
-  
-  <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
-  <string name="EPr_default_reminders_mode_title">ברירת מחדל לסוג צלצול/רטט</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_mode_desc">כעת: %s</string>
-  
-  <string-array name="EPr_default_importance">
-    <!-- importance: labels for "Task Defaults" preference item. -->
-    <!-- slide 40b -->
-    <item>!!!</item>
-    <item>!!</item>
-    <item>!</item>
-    <!-- slide 40c -->
-    <item>o (נמוכה ביותר)</item>
-  </string-array>
-  
-  <string-array name="EPr_default_urgency">
-    <!-- urgency: labels for "Task Defaults" preference item. -->
-    <!-- slide 41a-->
-    <item>ללא מועד סף</item>
-    <!-- slide 41b -->
-    <item>היום</item>
-    <!-- slide 41c-->
-    <item>מחר</item>
-    <!-- slide 41d -->
-    <item>מחרתיים</item>
-    <!-- slide 41e -->
-    <item>בשבוע הבא</item>
-  </string-array>
-  
-  <string-array name="EPr_default_hideUntil">
-    <!-- hideUntil: labels for "Task Defaults" preference item. -->
-    <!-- slide 42a -->
-    <item>אל תסתיר</item>
-    <!-- slide 42b -->
-    <item>מועד היעד של המשימה הגיע</item>
-    <!-- slide 42c -->
-    <item>יום לפני תאריך היעד</item>
-    <!-- slide 42d-->
-    <item>שבוע לפני תאריך היעד</item>
-  </string-array>
-  
-  <string-array name="EPr_default_reminders">
-    <!-- reminders: labels for "Task Defaults" preference item. -->
-    <!-- slide 43a -->
-    <item>ללא תזכורות במועד הסף</item>
-    <!-- slide 43b -->
-    <item>במועד הסף</item>
-    <!-- slide 43c -->
-    <item>אחרי מועד היעד</item>
-    <!-- slide 43d -->
-    <item>במועד היעד או לאחריו</item>
-  </string-array>
-  
-  <string-array name="EPr_default_addtocalendar">
-    <!-- addtocalendar: labels for "Task Defaults" preference item. -->
-    <item>@string/EPr_deactivated</item>
-  </string-array>      
+    <!-- Preferences: ideas tab -->
+    <string name="EPr_ideas_tab_enabled">רעיונות למשימה</string>
+    <string name="EPr_ideas_tab_description">קבל רעיונות שיסייעו לך לבצע משימות</string>
 
+    <!-- Preferences: calendar event start time -->
+    <string name="EPr_cal_end_or_start_at_due_time">משך אירוע יומן</string>
+    <string name="EPr_cal_end_at_due_time">סיים את אירועי היומן במועד היעד?</string>
+    <string name="EPr_cal_start_at_due_time">התחל את מאורעות היומן במועד היעד</string>
+
+    <string name="EPr_force_phone_layout">מקלדת טלפון</string>
+
+    <string name="EPr_show_featured_lists">הצג רשימות מועדפות</string>
+
+    <!-- Configurations -->
+    <string name="EPr_configurations_title">קביעת קונפיגורציה</string>
+    <string name="EPr_config_default">מחדל</string>
+    <string name="EPr_config_lite">אסטריד לייט</string>
+
+    <!-- Dialog title when setting preference configuration -->
+    <string name="EPr_config_dialog_title">לקבוע קונפיגורציה?</string>
+    <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
+    <string name="EPr_config_dialog_text">שחזר את כל ההעדפות לקונפיגורציה %s?</string>
+
+    <!-- default configuration name for the above dialog -->
+    <string name="EPr_config_dialog_default_id">מחדל</string>
+
+    <!-- Preference title for showing save and cancel buttons in task edit page -->
+    <string name="EPr_show_save_and_cancel">Show save and cancel</string>
+
+
+    <!-- Swipe between lists -->
+    <!-- Preference: swipe between lists performance -->
+    <string name="EPr_swipe_lists_performance_title">עִלְעוּל בין רשימות</string>
+
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>ללא עִלְעוּל</item>
+        <item>חיסכון בזיכרון</item>
+        <item>ביצועים רגילים</item>
+        <item>ביצועים גבוהים</item>
+    </string-array>
+
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <!-- slide 49a -->
+        <item>עִלְעוּל בין רשימות מופסק</item>
+        <item>ביצועים נמוכים</item>
+        <item>הגדרות ברירת מחדל</item>
+        <item>השתמש ביותר משאבי מערכת</item>
+    </string-array>
+
+    <string name="swipe_lists_helper_title">עִלְעוּל בין רשימות</string>
+    <string name="swipe_lists_helper_header">עִלְעוּל ימינה ושמאלה למעבר מהיר בין רשימות</string>
+    <string name="swipe_lists_helper_subtitle">שנה הגדרות תחת הגדרות>חזות</string>
+
+    <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
+
+    <string-array name="EPr_default_reminders_mode">
+        <!-- reminders duration: labels for "Task Defaults" preference item. -->
+        <item>@string/TEA_reminder_mode_once</item>
+        <item>@string/TEA_reminder_mode_five</item>
+        <item>@string/TEA_reminder_mode_nonstop</item>
+    </string-array>
+
+    <string-array name="EPr_themes">
+        <!-- theme_settings: labels for Theme preference menu -->
+        <!-- slide 36a-->
+        <item>יום - כחול</item>
+        <!-- slide 36b -->
+        <item>יום - אדום</item>
+        <!-- slide 36b -->
+        <item>תכלת</item>
+        <!-- slide 36c -->
+        <item>לילה</item>
+        <!-- slide 36d -->
+        <item>שקוף (טקסט לבן)</item>
+        <!-- slide 36e -->
+        <item>שקוף (טקסט שחור)</item>
+    </string-array>
+
+    <string-array name="EPr_themes_widget">
+        <!-- slide 32i / 37a-->
+        <item>שמור כְּיִשּׂוּמוֹן</item>
+        <item>יום - כחול</item>
+        <item>יום - אדום</item>
+        <item>תכלת</item>
+        <item>לילה</item>
+        <item>שקוף (טקסט לבן)</item>
+        <item>שקוף (טקסט שחור)</item>
+        <item>סגנון ישן</item>
+    </string-array>
+
+    <!-- ========================================== Task Management Settings == -->
+
+    <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
+    <string name="EPr_manage_header">נהל משימות ישנות</string>
+    <!-- slide 47d -->
+    <string name="EPr_manage_delete_completed">מַחֲקִי משימות שבוצעו</string>
+    <string name="EPr_manage_delete_completed_message">האם אתה בטוח שברצונך למחוק את כל המשימות
+        שבוצעו?
+    </string>
+    <!-- slide 47a -->
+    <string name="EPr_manage_delete_completed_summary">ניתן לבטל את המחיקה של המשימות שנמחקו, יש
+        לעשות זאת משימה-אחר-משימה.
+    </string>
+    <string name="EPr_manage_delete_completed_status">%d משימות נמחקו!</string>
+    <!-- slide 47e -->
+    <string name="EPr_manage_purge_deleted">אַיְּנִי משימות שנמחקו</string>
+    <string name="EPr_manage_purge_deleted_message">האם אתה בטוח שברצונך לְאַיֵּן את כל המשימות
+        שנמחקו?
+    </string>
+    <string name="EPr_manage_purge_deleted_status">%d משימות אֻיְּנוּ!</string>
+    <!-- slide 47b-->
+    <string name="EPr_manage_purge_deleted_summary">"שים לב! לא ניתן לאחזר משימות שֶׁאֻיְּנוּ בלי
+        קובץ גיבוי!"
+    </string>
+    <!-- slide 47h-->
+    <string name="EPr_manage_clear_all">הָסִירִי את כל הנתונים</string>
+    <string name="EPr_manage_clear_all_message">למחוק את כל המשימות ואת כל ההגדרות?\nאזהרה: לא ניתן
+        לבטל פעולה זו!
+    </string>
+
+    <!-- slide 47f -->
+    <string name="EPr_manage_delete_completed_gcal">מחקי אירועי יומן בעבור משימות שבוצעו</string>
+    <string name="EPr_manage_delete_completed_gcal_message">האם אתה בטוח שברצונך למחוק את כל אירועי
+        היומן של משימות שבוצעו?
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_summary"></string>
+    <string name="EPr_manage_delete_completed_gcal_status">%d אירועי יומן נמחקו!</string>
+
+    <!-- slide 47g-->
+    <string name="EPr_manage_delete_all_gcal">מַחֲקִי את כל אירועי היומן הקשורים למשימות</string>
+    <string name="EPr_manage_delete_all_gcal_message">האם אתה בטוח שברצונך למחוק את כל אירועי היומן
+        בעבור המשימות?
+    </string>
+    <string name="EPr_manage_delete_all_gcal_summary"></string>
+    <string name="EPr_manage_delete_all_gcal_status">%d אירועי יומן נמחקו</string>
+
+    <!-- ==================================================== AddOnActivity == -->
+
+    <!-- Add Ons Activity Title -->
+    <string name="AOA_title">תוספים</string>
+
+    <!-- Add-on Activity: author for internal authors  -->
+    <string name="AOA_internal_author">הצוות של אסטריד</string>
+
+    <!-- Add-on Activity: installed add-ons tab -->
+    <string name="AOA_tab_installed">מותקן</string>
+
+    <!-- Add-on Activity - available add-ons tab -->
+    <string name="AOA_tab_available">זמין</string>
+
+    <!-- Add-on Activity - free add-ons label -->
+    <string name="AOA_free">חינם</string>
+
+    <!-- Add-on Activity - menu item to visit add-on website -->
+
+    <!-- Add-on Activity - menu item to visit android market -->
+
+    <!-- Add-on Activity - when list is empty -->
+    <string name="AOA_no_addons">רשימה ריקה!</string>
+
+    <string name="AOA_ppack_title">חבילת כֹּחַ של אסטריד</string>
+    <string name="AOA_ppack_description">תמוך באסריד, הֱיֵה פּוֹרֶה יוֹתֵר וקבל את חבילת הַכֹּחַ
+        הכוללת חֲפִיצֵי מסך 4x2 ו 4x4 ותמיכה בתפעול קולי
+    </string>
+    <string name="AOA_locale_title">אנא התקן את תוסף אסטריד לתוכנת Locale</string>
+    <string name="AOA_locale_description">אפשר לאסטריד להשתמש בתכונות "מציאת מקום" על מנת לשלוח לך
+        התראות מבוססות על תנאי סינון. עליך להפעיל שירותי מיקום.
+    </string>
+
+    <!-- ====================================================== TasksWidget == -->
+
+    <!-- Widget text when loading tasks -->
+    <string name="TWi_loading">טוענת...</string>
+
+    <!-- Widget configuration activity title: select a filter -->
+    <string name="WCA_title">בחר משימות להצגה...</string>
+
+    <!-- ======================================================== Waiting on me -->
+
+    <string name="wom_commented">%s commented on your task.</string>
+    <string name="wom_mentioned">%s mentioned you.</string>
+    <string name="wom_assigned">%s assigned this to you.</string>
+    <string name="wom_raised_pri">%s raised the priority.</string>
+    <string name="wom_changed_due">%s changed the due date.</string>
+    <string name="wom_default">%s wants your attention.</string>
+
+    <string name="wom_dismiss">Dismiss</string>
+    <string name="wom_acknowledge">I\'ve read this</string>
+
+    <!-- ============================================================= About == -->
+
+    <!-- slide 30h: Title of "About" option in settings -->
+    <string name="p_about">אודות אסטריד</string>
+
+    <!-- About text (%s => current version)-->
+    <string name="p_about_text">גירסא נוכחית: %s\n אסטריד היא תכנת קוד פתוח המתוחזקת בגאווה ע״י
+        Todoroo, Inc.
+    </string>
+
+    <!-- Title of "Help" option in settings -->
+    <string name="p_help">תמיכה</string>
+
+    <!-- slide 30c: Title of "Forums" option in settings -->
+    <string name="p_forums">פורומים</string>
+
+    <!-- Title of "Premium" option in settings -->
+    <string name="p_premium">פרימיום</string>
+
+    <!-- ============================================================= Misc == -->
+
+    <string name="feedback_positive_title">Rate Astrid?</string>
+
+    <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star
+        rating?
+    </string>
+
+    <string name="feedback_negative_title">Leave feedback?</string>
+
+    <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
+
+    <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback
+        section--it might not be available on your device.
+    </string>
+
+    <string name="feedback_positive_button">Rate Astrid</string>
+
+    <string name="feedback_negative_button">Leave feedback</string>
+
+    <string name="feedback_not_now">Not now</string>
+
+    <string name="feedback_banner_text">How\'s Astrid working for you?</string>
+
+    <!-- Displayed when task killer found. %s => name of the application -->
+    <string name="task_killer_help">ככל הנראה הנך משתמש ביישום אשר יכול להרוג תהליכים (%s)!
+        .אם הדבר אפשרי, אנא הוסף את אסטריד לרשימת היישומים אשר ישום זה לא יהרוג.
+        אחרת , יתכן שאסטריד לא תוכל להודיע לך כאשר זמן היעד של המשימות שלך יגיע.
+    </string>
+
+    <!-- Task killer dialog ok button -->
+    <string name="task_killer_help_ok">אני לא אהרוג את אסטריד!</string>
+
+    <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
+
+    <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
+    <string name="marketplace_description">אסטריד הינה תכנת קוד פתוח פופולרית לניהול משימות ומטלות
+        אשר תוכננה כדי לסייע
+        לך לעשות יותר. התכנה כוללת תזכורות, תגיות, סנכרון, התאמה מקומית, חפיץ מסך, ועוד.
+    </string>
+
+    <string name="DB_corrupted_title">בסיס נתונים פגום</string>
+
+    <string name="DB_corrupted_body">הו לא! נראה כי בסיס הנתונים אינו תקין.
+        אם אתה נתקל השגיאה זאת האופן תדיר, אנו מציעים שתמחק את כל הנתונים
+        (הגדרות->סינכרון וגיבוי->ניהול משימות ישנות->הסרת כל הנתונים) ושחזר את המשימות
+        מגיבוי (הגדרות->סנכרון וגיבוי->גיבוי->יבא משימות).
+    </string>
+
+    <string name="market_unavailable">לרוע המזל חנות היישומים אינה זמינה</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 32g: Preference Category: Defaults Title -->
+    <string name="EPr_defaults_header">ברירות המחדל למשימה חדשה</string>
+    <string name="EPr_defaults_summary">עדיפות, מועד יעד, הוספה ליומן</string>
+
+    <!-- slide 41f:  Preference: Default Urgency Title -->
+    <string name="EPr_default_urgency_title">דחיפות ברירת המחדל</string>
+    <!-- Preference: Default Urgency Description (%s => setting) -->
+    <string name="EPr_default_urgency_desc">כעת: %s</string>
+
+    <!-- slide 40a: Preference: Default Importance Title -->
+    <string name="EPr_default_importance_title">עדיפות מחדל</string>
+    <!-- Preference: Default Importance Description (%s => setting) -->
+    <string name="EPr_default_importance_desc">כעת: %s</string>
+
+    <!-- slide 42e: Preference: Default Hide Until Title -->
+    <string name="EPr_default_hideUntil_title">ברירת מחדל לזמן הסתרה</string>
+    <!-- Preference: Default Hide Until Description (%s => setting) -->
+    <string name="EPr_default_hideUntil_desc">כעת: %s</string>
+
+    <!-- slide 43e: Preference: Default Reminders Title -->
+    <string name="EPr_default_reminders_title">תזכורות ברירת מחדל</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_desc">כעת: %s</string>
+
+    <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
+    <string name="EPr_default_addtocalendar_title">הוספה ליומן כברירת מחדל</string>
+    <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
+    <string name="EPr_default_addtocalendar_desc_disabled">משימות חדשות לא תיצורנה אירוע בלוח השנה
+        של גוגל
+    </string>
+    <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
+    <string name="EPr_default_addtocalendar_desc">משימות חדשות תיווצרנה ביומן \'%s\'</string>
+
+    <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
+    <string name="EPr_default_reminders_mode_title">ברירת מחדל לסוג צלצול/רטט</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_mode_desc">כעת: %s</string>
+
+    <string-array name="EPr_default_importance">
+        <!-- importance: labels for "Task Defaults" preference item. -->
+        <!-- slide 40b -->
+        <item>!!!</item>
+        <item>!!</item>
+        <item>!</item>
+        <!-- slide 40c -->
+        <item>o (נמוכה ביותר)</item>
+    </string-array>
+
+    <string-array name="EPr_default_urgency">
+        <!-- urgency: labels for "Task Defaults" preference item. -->
+        <!-- slide 41a-->
+        <item>ללא מועד סף</item>
+        <!-- slide 41b -->
+        <item>היום</item>
+        <!-- slide 41c-->
+        <item>מחר</item>
+        <!-- slide 41d -->
+        <item>מחרתיים</item>
+        <!-- slide 41e -->
+        <item>בשבוע הבא</item>
+    </string-array>
+
+    <string-array name="EPr_default_hideUntil">
+        <!-- hideUntil: labels for "Task Defaults" preference item. -->
+        <!-- slide 42a -->
+        <item>אל תסתיר</item>
+        <!-- slide 42b -->
+        <item>מועד היעד של המשימה הגיע</item>
+        <!-- slide 42c -->
+        <item>יום לפני תאריך היעד</item>
+        <!-- slide 42d-->
+        <item>שבוע לפני תאריך היעד</item>
+    </string-array>
+
+    <string-array name="EPr_default_reminders">
+        <!-- reminders: labels for "Task Defaults" preference item. -->
+        <!-- slide 43a -->
+        <item>ללא תזכורות במועד הסף</item>
+        <!-- slide 43b -->
+        <item>במועד הסף</item>
+        <!-- slide 43c -->
+        <item>אחרי מועד היעד</item>
+        <!-- slide 43d -->
+        <item>במועד היעד או לאחריו</item>
+    </string-array>
+
+    <string-array name="EPr_default_addtocalendar">
+        <!-- addtocalendar: labels for "Task Defaults" preference item. -->
+        <item>@string/EPr_deactivated</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in filter plug-in -->
-    
+
     <!-- ================================================= Filter Exposer == -->
-    
+
     <!-- Active Tasks Filter -->
     <string name="BFE_Active">המשימות שלי</string>
-    
+
     <!-- Waiting on me filter -->
     <string name="BFE_waiting_on_me">Waiting On Me</string>
-        
+
     <!-- Search Filter -->
-    
+
     <!-- slide 10b: Recently Modified -->
     <string name="BFE_Recent">עודכנו לאחרונה</string>
-    
+
     <!-- slide 10c: I\'ve assigned -->
     <string name="BFE_Assigned">משימות שהטלתי</string>
-    
+
     <!-- Build Your Own Filter -->
-    
+
     <!-- Saved Filters Header -->
-    
+
     <!-- Saved Filters Context Menu: delete -->
     <string name="BFE_Saved_delete">מַחֲקִי מַסְנֵן</string>
 
     <!-- =========================================== CustomFilterActivity == -->
-    
+
     <!-- slide 30d: Build Your Own Filter Activity Title-->
     <string name="CFA_title">מַסְנֵן מותאם אישית</string>
-    
+
     <!-- slide 30e: Filter Name edit box hint (if user types here, filter will be saved) -->
     <string name="CFA_filterName_hint">בחר שם לַמַּסְנֵן כדי לשמור אותו...</string>
-    
+
     <!-- Filter Name default for copied filters (%s => old filter name) -->
-    
+
     <!-- slide 30a: Filter Starting Universe: all tasks -->
     <string name="CFA_universe_all">משימות פעילות</string>
-    
+
     <!-- Filter Criteria Type: add (at the begging of title of the criteria) -->
     <string name="CFA_type_add">או</string>
-    
+
     <!-- Filter Criteria Type: subtract (at the begging of title of the criteria) -->
     <string name="CFA_type_subtract">לא</string>
-    
+
     <!-- Filter Criteria Type: intersect (at the begging of title of the criteria) -->
     <string name="CFA_type_intersect">וגם</string>
-    
+
     <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
     <string name="CFA_context_chain">%s כולל קריטריונים</string>
-    
+
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">מַחֲקִי שורה</string>
-    
+
     <!-- slide 30b: Filter Screen Help Text -->
     <string name="CFA_help">Long press on items for additional options</string>
-    
+
     <!-- slide 30c: Filter Button: add new -->
     <string name="CFA_button_add">הוסף קריטריון</string>
-    
+
     <!-- slide 30f: Filter Button: view without saving -->
     <string name="CFA_button_view">הצג</string>
-    
+
     <!-- Filter Button: save & view filter -->
     <string name="CFA_button_save">שמור והצג</string>
 
     <!-- =========================================== CustomFilterCriteria == -->
-        
+
     <!-- Criteria: due by X - display text (? -> user input) -->
     <string name="CFC_dueBefore_text">למתי: ?</string>
     <!-- Criteria: due by X - name of criteria -->
@@ -1703,314 +1804,336 @@
         <item>בשבוע הבא</item>
         <item>בחודש הבא</item>
     </string-array>
-    
+
     <!-- Criteria: importance - display text (? -> user input)-->
     <string name="CFC_importance_text">עדיפות לפחות?</string>
     <!-- Criteria: importance - name of criteria -->
-    <string name="CFC_importance_name">עדיפות</string>        
-    
+    <string name="CFC_importance_name">עדיפות</string>
+
     <!-- Criteria: tag - display text (? -> user input) -->
     <string name="CFC_tag_text">רשימה: ?</string>
     <!-- Criteria: tag - name of criteria -->
     <string name="CFC_tag_name">רשימה.</string>
-    
+
     <!-- Criteria: tag_contains - name of criteria -->
     <string name="CFC_tag_contains_name">שם הרשימה מכיל...</string>
     <!-- Criteria: tag_contains - text (? -> user input) -->
     <string name="CFC_tag_contains_text">שם הרשימה מכיל: ?</string>
-    
+
     <!-- Criteria: title_contains - name of criteria -->
     <string name="CFC_title_contains_name">כותרת מכילה...</string>
     <!-- Criteria: title_contains - text (? -> user input) -->
     <string name="CFC_title_contains_text">כותרת מכילה: ?</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-  
-  <!-- Error message for adding to calendar  -->
-  <string name="gcal_TEA_error">שגיאה בהוספת המשימה ליומן!</string>
-
-  <!-- Label for adding task to calendar -->
-
-  <!-- slide 21c: Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">הוסף ליומן</string>
-  
-  <!-- Label when calendar event already exists -->
-  <string name="gcal_TEA_showCalendar_label">פתח אירוע ביומן</string>
-  
-  <!-- Toast when unable to open calendar event -->
-  
-  <!-- Toast when calendar event updated because task changed -->
-  <string name="gcal_TEA_calendar_updated">אירוע יומן עודכן!</string>
-  
-  <!-- No calendar label (don\'t add option) -->
-  <string name="gcal_TEA_nocal">אל תוסיף</string>
-  
-  <string name="gcal_TEA_none_selected">ליומן?</string>
-  
-  <string name="gcal_TEA_has_event">אירוע יומן</string>
-  
-  <!-- ======================================================== Calendars == -->
-  
-  <!-- Calendar event name when task is completed (%s => task title) -->
-  <string name="gcal_completed_title">%s (בוצעה)</string>
-
-  <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
-  <string name="gcal_GCP_default">ברירת מחדל ליומן</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Error message for adding to calendar  -->
+    <string name="gcal_TEA_error">שגיאה בהוספת המשימה ליומן!</string>
 
+    <!-- Label for adding task to calendar -->
 
+    <!-- slide 21c: Label for adding task to calendar -->
+    <string name="gcal_TEA_addToCalendar_label">הוסף ליומן</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Label when calendar event already exists -->
+    <string name="gcal_TEA_showCalendar_label">פתח אירוע ביומן</string>
+
+    <!-- Toast when unable to open calendar event -->
+
+    <!-- Toast when calendar event updated because task changed -->
+    <string name="gcal_TEA_calendar_updated">אירוע יומן עודכן!</string>
+
+    <!-- No calendar label (don\'t add option) -->
+    <string name="gcal_TEA_nocal">אל תוסיף</string>
+
+    <string name="gcal_TEA_none_selected">ליומן?</string>
+
+    <string name="gcal_TEA_has_event">אירוע יומן</string>
+
+    <!-- ======================================================== Calendars == -->
+
+    <!-- Calendar event name when task is completed (%s => task title) -->
+    <string name="gcal_completed_title">%s (בוצעה)</string>
+
+    <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
+    <string name="gcal_GCP_default">ברירת מחדל ליומן</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ============================================================= UI == -->
 
     <!-- filters header: GTasks -->
     <string name="gtasks_FEx_header">״משימות גוגל״</string>
-    
+
     <!-- filter category for GTasks lists -->
-    
+
     <!-- filter title for GTasks lists (%s => list name) -->
     <string name="gtasks_FEx_title">״משימות גוגל״: %s</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_creating_list">יוצרת רשימה...</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_create_list_dialog">שם הרשימה החדשה:</string>
-    
+
     <!-- error to show when list creation fails -->
     <string name="gtasks_FEx_create_list_error">יצירת משימה חדשה נכשלה</string>
-    
+
     <!-- short help title for Gtasks -->
-    
+
     <string name="CFC_gtasks_list_text">ברשימה: ?</string>
 
     <string name="CFC_gtasks_list_name">ברשימה של ״משימות גוגל״</string>
-    
+
     <!-- Message while clearing completed tasks -->
     <string name="gtasks_GTA_clearing">מְסִירָה משימות שבוצעו...</string>
-    
+
     <!-- Label for clear completed menu item -->
     <string name="gtasks_GTA_clear_completed">הסירי משימות שבוצעו</string>
-        
+
     <!-- ============================================ GtasksLoginActivity == -->
-    
-    <!-- Activity Title: Gtasks Login -->    
 
-    <!-- Instructions: Gtasks login -->    
-    <string name="gtasks_GLA_body">אנא התחבר לשירותי הסנכרון של ״משימות גוגל״. חשבונות של יישומי הרשת של גוגל אשר לא הומרו, אינם נתמכים כעת.</string>
-    
+    <!-- Activity Title: Gtasks Login -->
+
+    <!-- Instructions: Gtasks login -->
+    <string name="gtasks_GLA_body">אנא התחבר לשירותי הסנכרון של ״משימות גוגל״. חשבונות של יישומי
+        הרשת של גוגל אשר לא הומרו, אינם נתמכים כעת.
+    </string>
+
     <string name="gtasks_GLA_noaccounts">לא מצאתי חשבון גוגל לסנכרן איתו</string>
 
-    <!-- Instructions: Gtasks further help -->    
-    <string name="gtasks_GLA_further_help">כדי לראות את המשימות שלך מוזחות ובסדרן הנכון, לך למסך הַמַּסְנְנִים ובחר ברשימה של משימות גוגל. כברירת מחדל, אסטריד משתמשת בהגדרות המיון שלה עבור משימות.</string>
+    <!-- Instructions: Gtasks further help -->
+    <string name="gtasks_GLA_further_help">כדי לראות את המשימות שלך מוזחות ובסדרן הנכון, לך למסך
+        הַמַּסְנְנִים ובחר ברשימה של משימות גוגל. כברירת מחדל, אסטריד משתמשת בהגדרות המיון שלה עבור
+        משימות.
+    </string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
 
-    <!-- E-mail Address Label -->    
+    <!-- E-mail Address Label -->
+
+    <!-- Password Label -->
 
-    <!-- Password Label -->    
-    
     <!--  Authenticating toast -->
     <string name="gtasks_GLA_authenticating">מאמתת...</string>
-    
+
     <!-- Google Apps for Domain checkbox -->
 
-    <!-- Error Message when fields aren\'t filled out -->    
+    <!-- Error Message when fields aren\'t filled out -->
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
+    <string name="gtasks_GLA_errorAuth">האימות נכשל! אנא בדוק את שם המשתמש והסיסמא במנהל החשבונות של
+        הטלפון שלך.
+    </string>
+
+    <!-- Error Message when we receive an IO Exception -->
+    <string name="gtasks_GLA_errorIOAuth">מצטערת, נתקלתי בבעיה בהתקשרות לשרתי גוגל. אנא נסה שוב
+        מאוחר יותר.
+    </string>
 
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
-    <string name="gtasks_GLA_errorAuth">האימות נכשל! אנא בדוק את שם המשתמש והסיסמא במנהל החשבונות של הטלפון שלך.</string>
+    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->
+    <string name="gtasks_GLA_errorAuth_captcha">יתכן שנתקלת בקאפצ\'ה. אנא נסה להתחבר מהדפדפן, ואחר
+        כך חזור לכאן ונסה שנית:
+    </string>
 
-    <!-- Error Message when we receive an IO Exception -->    
-    <string name="gtasks_GLA_errorIOAuth">מצטערת, נתקלתי בבעיה בהתקשרות לשרתי גוגל. אנא נסה שוב מאוחר יותר.</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->    
-    <string name="gtasks_GLA_errorAuth_captcha">יתכן שנתקלת בקאפצ\'ה. אנא נסה להתחבר מהדפדפן, ואחר כך חזור לכאן ונסה שנית:</string>
-    
     <!-- ============================================== GtasksPreferences == -->
 
-    <!-- GTasks Preferences Title -->    
+    <!-- GTasks Preferences Title -->
     <string name="gtasks_GPr_header">״משימות גוגל״</string>
-    
-    <!-- ================================================ Synchronization == -->    
-    
+
+    <!-- ================================================ Synchronization == -->
+
     <!-- title for notification tray when synchronizing -->
 
     <!-- Error Message when we receive a HTTP 503 error -->
-    <string name="gtasks_error_backend">מנשק התכנה של ״משימות גוגל״ הוא בשלב ביתא, ונתקל בשגיאה. יתכן אף שהשירות אינו מקוון. אנא נסה שנית מאוחר יותר.</string>
-    
+    <string name="gtasks_error_backend">מנשק התכנה של ״משימות גוגל״ הוא בשלב ביתא, ונתקל בשגיאה.
+        יתכן אף שהשירות אינו מקוון. אנא נסה שנית מאוחר יותר.
+    </string>
+
     <!-- Error for account not found -->
-    <string name="gtasks_error_accountNotFound">החשבון %s לא נמצא. אנא התנתק והתחבר שוב במסך הגדרות של ״משימות גוגל״.</string>
-    
+    <string name="gtasks_error_accountNotFound">החשבון %s לא נמצא. אנא התנתק והתחבר שוב במסך הגדרות
+        של ״משימות גוגל״.
+    </string>
+
     <!-- Error when ping after refreshing token fails -->
-    <string name="gtasks_error_authRefresh">איני מצליחה לאמת אותך מול ״משימות גוגל״. אנא בדוק את הסיסמא שהזנת, או נסה מאוחר יותר.</string>
-    
+    <string name="gtasks_error_authRefresh">איני מצליחה לאמת אותך מול ״משימות גוגל״. אנא בדוק את
+        הסיסמא שהזנת, או נסה מאוחר יותר.
+    </string>
+
     <!-- Error when account manager returns no auth token or throws exception -->
-    <string name="gtasks_error_accountManager">מנהל החשבונות של הטלפון שלך נתקל בשגיאה. אנא התנתק והתחבר מתוך הגדרות ״משימות גוגל״.</string>
+    <string name="gtasks_error_accountManager">מנהל החשבונות של הטלפון שלך נתקל בשגיאה. אנא התנתק
+        והתחבר מתוך הגדרות ״משימות גוגל״.
+    </string>
 
     <!-- Error when authorization error happens in background sync -->
-    <string name="gtasks_error_background_sync_auth">האימות המתבצע ברקע נכשל. אנא נסה להתחיל את הסינכרון בזמן שאסטריד פועלת.</string>
-      
-    <string name="gtasks_import_progress"> מייבאת את ״משימות גוגל״</string>
+    <string name="gtasks_error_background_sync_auth">האימות המתבצע ברקע נכשל. אנא נסה להתחיל את
+        הסינכרון בזמן שאסטריד פועלת.
+    </string>
 
-    <string name="gtasks_import_add_to_shared_list">הרשימה %1$s משותפת עם אחרים! האם אתה בטוח שברצונך להוסיף את המשימה %2$sלרשימה זו?</string>
+    <string name="gtasks_import_progress">מייבאת את ״משימות גוגל״</string>
+
+    <string name="gtasks_import_add_to_shared_list">הרשימה %1$s משותפת עם אחרים! האם אתה בטוח
+        שברצונך להוסיף את המשימה %2$sלרשימה זו?
+    </string>
 
     <string name="gtasks_import_dlg_title">ייבוא ״משימות גוגל״</string>
 
     <string name="gtasks_import_add_task_ok">הוסף משימה</string>
 
     <string name="gtasks_import_add_task_cancel">אל תוסיף משימה</string>
-        
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- NEW USER EXPERIENCE -->
-  
-  <!-- help bubbles -->
-  <!-- slide 8c: Shown the first time a user sees the task list activity -->
-  <string name="help_popover_add_task">התחל ע״י הוספת משימה או שתיים</string>
-
-  <!-- Shown the first time a user adds a task to a list -->  
-  <string name="help_popover_tap_task">גע במשימה כדי לערוך ולשתף</string>
-  
-  <!-- slide 14a: Shown the first time a user sees the list activity -->
-  <string name="help_popover_list_settings">טְפַח כדי לערוך או לשתף רשימה זו</string>
-  
-  <!-- slide 26c: Shown the first time a user sees the list settings tab -->
-  <string name="help_popover_collaborators">אנשים שתשתף עימם יכולים לעזור\nלך לבנות את הרשימה או להשלים משימות.</string>
-  
-  <!-- Shown after user adds a task on tablet-->
-  <string name="help_popover_add_lists">טְפַח כדי להוסיף רשימה</string>
-  
-  <!-- Shown after a user adds a task on phones -->
-  <string name="help_popover_switch_lists">טְפַח כדי להוסיף רשימה או לעבור בין רשימות</string>
-  
-  
-  
-  <!-- Login activity -->
-  
-  
-  <!-- slide 7b -->
-  <string name="welcome_login_tos_base">בשימוש בתכנת אסטריד אתה מסכים ל</string>
-  
-  <string name="welcome_login_tos_link">תנאי שימוש</string>
-  
-  <!-- slide 7e -->
-  <string name="welcome_login_pw">הרשם</string>
-  
-  <string name="welcome_sign_in">התחברות</string>
-
-  <!-- slide 7f -->
-  <string name="welcome_login_later">מאוחר יותר</string>
-  
-  <string name="welcome_login_confirm_later_title">מדוע לא תתחבר כעת?</string>
-  
-  <string name="welcome_login_confirm_later_ok">אעשה זאת!</string>
-  
-  <string name="welcome_login_confirm_later_cancel">לא, תודה</string>
-  
-  <string name="welcome_login_confirm_later_dialog">עליך להרשם כדי להפיק את המירב מאסטריד! תוכל לקבל גיבויים חינם, סינכרון מלא עם אתר astrid.com, אפשרות להוסיף משימות בדוא״ל, ואפילו אפשרות לשתף משימות עם חברים!</string>
+    <!-- NEW USER EXPERIENCE -->
 
+    <!-- help bubbles -->
+    <!-- slide 8c: Shown the first time a user sees the task list activity -->
+    <string name="help_popover_add_task">התחל ע״י הוספת משימה או שתיים</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown the first time a user adds a task to a list -->
+    <string name="help_popover_tap_task">גע במשימה כדי לערוך ולשתף</string>
 
+    <!-- slide 14a: Shown the first time a user sees the list activity -->
+    <string name="help_popover_list_settings">טְפַח כדי לערוך או לשתף רשימה זו</string>
 
-  <!-- Resources for built-in locale plug-in -->
-
-  <!-- Locale Alert Editing Window Title -->
-  <string name="locale_edit_alerts_title">התראת מַסְנֵן של אסטריד</string>
-  
-  <!-- Locale Window Help -->                                                                                                                                            
-  <string name="locale_edit_intro">אסטריד תציג תזכורת כאשר יש משימות בַּמַּסְנֵן</string>
-      
-  <!-- Locale Window Filter Picker UI -->                                                                                                                                        
-      
-  <!-- Locale Window Interval Label -->                                                                                                                                        
-  <string name="locale_interval_label">הגבלת ההתראות ל־</string>        
-      
-  <!-- Locale Window Interval Values -->                                                                                                                                        
-  <string-array name="locale_interval">
-    <item>אחת לשעה</item>
-    <item>אחת לשש שעות</item>
-    <item>אחת ל־12 שעות</item>
-    <item>אחת ליום</item>
-    <item>אחת לשלושה ימים</item>
-    <item>אחת לשבוע</item>
-  </string-array>        
-      
-  <!-- Locale Notification text -->                                                                                                                                        
-  <string name="locale_notification">יש לך $NUM המתאימים: $FILTER</string>     
-      
-  <!-- Locale Plugin was not found, it is required -->
-  <string name="locale_plugin_required">אנא התקן את תוסף אסטריד להגדרות איזור</string>        
-     
+    <!-- slide 26c: Shown the first time a user sees the list settings tab -->
+    <string name="help_popover_collaborators">אנשים שתשתף עימם יכולים לעזור\nלך לבנות את הרשימה או
+        להשלים משימות.
+    </string>
 
+    <!-- Shown after user adds a task on tablet-->
+    <string name="help_popover_add_lists">טְפַח כדי להוסיף רשימה</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown after a user adds a task on phones -->
+    <string name="help_popover_switch_lists">טְפַח כדי להוסיף רשימה או לעבור בין רשימות</string>
+
+
+    <!-- Login activity -->
+
+
+    <!-- slide 7b -->
+    <string name="welcome_login_tos_base">בשימוש בתכנת אסטריד אתה מסכים ל</string>
+
+    <string name="welcome_login_tos_link">תנאי שימוש</string>
+
+    <!-- slide 7e -->
+    <string name="welcome_login_pw">הרשם</string>
+
+    <string name="welcome_sign_in">התחברות</string>
+
+    <!-- slide 7f -->
+    <string name="welcome_login_later">מאוחר יותר</string>
+
+    <string name="welcome_login_confirm_later_title">מדוע לא תתחבר כעת?</string>
+
+    <string name="welcome_login_confirm_later_ok">אעשה זאת!</string>
+
+    <string name="welcome_login_confirm_later_cancel">לא, תודה</string>
+
+    <string name="welcome_login_confirm_later_dialog">עליך להרשם כדי להפיק את המירב מאסטריד! תוכל
+        לקבל גיבויים חינם, סינכרון מלא עם אתר astrid.com, אפשרות להוסיף משימות בדוא״ל, ואפילו אפשרות
+        לשתף משימות עם חברים!
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in locale plug-in -->
+
+    <!-- Locale Alert Editing Window Title -->
+    <string name="locale_edit_alerts_title">התראת מַסְנֵן של אסטריד</string>
+
+    <!-- Locale Window Help -->
+    <string name="locale_edit_intro">אסטריד תציג תזכורת כאשר יש משימות בַּמַּסְנֵן</string>
+
+    <!-- Locale Window Filter Picker UI -->
+
+    <!-- Locale Window Interval Label -->
+    <string name="locale_interval_label">הגבלת ההתראות ל־</string>
+
+    <!-- Locale Window Interval Values -->
+    <string-array name="locale_interval">
+        <item>אחת לשעה</item>
+        <item>אחת לשש שעות</item>
+        <item>אחת ל־12 שעות</item>
+        <item>אחת ליום</item>
+        <item>אחת לשלושה ימים</item>
+        <item>אחת לשבוע</item>
+    </string-array>
+
+    <!-- Locale Notification text -->
+    <string name="locale_notification">יש לך $NUM המתאימים: $FILTER</string>
+
+    <!-- Locale Plugin was not found, it is required -->
+    <string name="locale_plugin_required">אנא התקן את תוסף אסטריד להגדרות איזור</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ====================== Plugin Boilerplate ========================= -->
 
-	<!-- filters header: OpenCRX -->
+    <!-- filters header: OpenCRX -->
     <string name="opencrx_FEx_header">OpenCRX</string>
-    
+
     <!-- filter category for OpenCRX ActivityCreators -->
     <string name="opencrx_FEx_dashboard">משטחי עבודה</string>
-    
+
     <!-- filter category for OpenCRX responsible person -->
     <string name="opencrx_FEx_responsible">הוטל על</string>
-    
+
     <!--  OpenCRX assignedTo filter title (%s => assigned contact) -->
     <string name="opencrx_FEx_responsible_title">הוטל על \'%s\'</string>
-    
+
     <!-- detail for showing tasks created by someone else (%s => person name) -->
     <string name="opencrx_PDE_task_from">נוצר ע״י %s</string>
-    
+
     <!-- replacement string for task edit "Notes" when using OpenCRX -->
     <string name="opencrx_TEA_notes">הוסף הערה</string>
-    
+
     <string name="opencrx_creator_input_hint">יוצר</string>
 
     <string name="opencrx_contact_input_hint">הוטל על</string>
     <!-- ==================================================== Preferences == -->
 
-    <!-- Preferences Title: OpenCRX -->    
+    <!-- Preferences Title: OpenCRX -->
     <string name="opencrx_PPr_header">OpenCRX</string>
 
     <!-- creator title for tasks that are not synchronized -->
     <string name="opencrx_no_creator">(אל תסנכרני)</string>
 
-	<!-- preference title for default creator -->
+    <!-- preference title for default creator -->
     <string name="opencrx_PPr_defaultcreator_title">ברירת מחדל של יוצר פעילויות</string>
 
     <!-- preference description for default creator (%s -> setting) -->
@@ -2018,7 +2141,7 @@
 
     <!-- preference description for default dashboard (when set to \'not synchronized\') -->
     <string name="opencrx_PPr_defaultcreator_summary_none">פעילויות חדשות לא תסונכרנה במחדל</string>
-    
+
     <!--  OpenCRX host and segment group name -->
     <string name="opencrx_group">שרת OpenCRX</string>
 
@@ -2027,81 +2150,87 @@
 
     <!--  dialog title for OpenCRX host -->
     <string name="opencrx_host_dialog_title">שרת OpenCRX</string>
-    
+
     <!--  example for OpenCRX host -->
-    <string name="opencrx_host_summary">"לדוגמא: "<i>mydomain.com</i></string>
-    
+    <string name="opencrx_host_summary">"לדוגמא: "
+        <i>mydomain.com</i>
+    </string>
+
     <!--  preference description for OpenCRX segment -->
     <string name="opencrx_segment_title">מִקְטָע</string>
 
     <!--  dialog title for OpenCRX segment -->
     <string name="opencrx_segment_dialog_title">מִקְטָע מסונכרן</string>
-    
+
     <!--  example for OpenCRX segment -->
-    <string name="opencrx_segment_summary">"לדוגמא: "<i>סטנדרטי</i></string>
-    
+    <string name="opencrx_segment_summary">"לדוגמא: "
+        <i>סטנדרטי</i>
+    </string>
+
     <!--  default value for OpenCRX segment -->
     <string name="opencrx_segment_default">סטנדרטי</string>
-    
+
     <!--  preference description for OpenCRX provider -->
     <string name="opencrx_provider_title">סַפָּק</string>
 
     <!--  dialog title for OpenCRX provider -->
     <string name="opencrx_provider_dialog_title">סַפָּק נתונים של OpenCRX</string>
-    
+
     <!--  example for OpenCRX provider -->
-    <string name="opencrx_provider_summary">"לדוגמא: "<i>CRX</i></string>
-    
+    <string name="opencrx_provider_summary">"לדוגמא: "
+        <i>CRX</i>
+    </string>
+
     <!--  default value for OpenCRX provider -->
     <string name="opencrx_provider_default">CRX</string>
     <!-- ================================================= Login Activity == -->
 
-    <!-- Activity Title: Opencrx Login -->    
+    <!-- Activity Title: Opencrx Login -->
     <string name="opencrx_PLA_title">התחבר ל־OpenCRX</string>
 
-    <!-- Instructions: Opencrx login -->    
+    <!-- Instructions: Opencrx login -->
     <string name="opencrx_PLA_body">התחבר עם חשבון OpenCRX</string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
     <string name="opencrx_PLA_signIn">התחבר</string>
 
-    <!-- Login Label -->    
+    <!-- Login Label -->
     <string name="opencrx_PLA_login">כניסה</string>
 
-    <!-- Password Label -->    
+    <!-- Password Label -->
     <string name="opencrx_PLA_password">סיסמא</string>
-    
-        <!-- Error Message when fields aren\'t filled out -->    
+
+    <!-- Error Message when fields aren\'t filled out -->
     <string name="opencrx_PLA_errorEmpty">שגיאה: מַלֵּא את כל השדות</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
     <string name="opencrx_PLA_errorAuth">שגיאה: שם משתמש או סיסמא אינם נכונים!</string>
 
     <!-- ================================================ Synchronization == -->
-        
+
     <!-- title for notification tray after synchronizing -->
     <string name="opencrx_notification_title">OpenCRX</string>
-    
+
     <!-- text for notification tray when synchronizing -->
     <string name="opencrx_notification_text">%s משימות עודכנו / הקלק לפרטים נוספים</string>
-    
+
     <!-- Error msg when io exception  -->
     <string name="opencrx_ioerror">שגיאה בחיבור! בדוק את חיבור הרשת שלך</string>
 
     <!-- opencrx Login not specified-->
     <string name="opencrx_MLA_email_empty">לא הקלדת שם משתמש</string>
-    
+
     <!-- opencrx password not specified-->
     <string name="opencrx_MLA_password_empty">לא הקלדת סיסמא</string>
-    
+
     <!-- ================================================ labels for layout-elements == -->
-    
+
     <!-- label for task-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_task_assign_label">הטל משימה זו על אדם זה:</string>
-    
+
     <!-- Spinner-item for unassigned tasks on taskeditactivity -->
     <string name="opencrx_TEA_task_unassigned">&lt;לא מוטלת&gt;</string>
-    
+
     <!-- label for dashboard-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_creator_assign_label">הטל משימה זו על היוצר:</string>
 
@@ -2109,7 +2238,7 @@
     <string name="opencrx_TEA_dashboard_default">&lt;מחדל&gt;</string>
 
     <string name="opencrx_TEA_opencrx_title">הגדרות OpenCRX</string>
-        
+
     <string name="CFC_opencrx_in_workspace_text">במשטח עבודה: ?</string>
 
     <string name="CFC_opencrx_in_workspace_name">במשטח עבודה...</string>
@@ -2119,70 +2248,78 @@
     <string name="CFC_opencrx_assigned_to_name">הוטל על...</string>
 
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
+    <!-- ================================================== EditPreferences == -->
 
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 32j: Preference Category: Power Pack -->
-  <string name="EPr_powerpack_header">פרימיום והגדרות שונות</string>
-  <string name="EPr_powerpack_summary">תזכורת קולית הוחמצה, קלט קולי והגדרות כלליות</string>
-  
-  <!-- slide 32e: Preference: Anonymous User Statistics -->
-  <string name="EPr_statistics_title">סטטיסטיקת שימוש אנונימית</string>
-  <!-- Preference: User Statistics (disabled) -->
-  <string name="EPr_statistics_desc_disabled">נתוני שימוש לא ידווחו</string>  
-  <!-- slide 32f: Preference: User Statistics (enabled) -->
-  <string name="EPr_statistics_desc_enabled">עזור לנו לשפר את אסטריד ע״י שליחת נתוני שימוש אנונימיים</string>
-      
+    <!-- slide 32j: Preference Category: Power Pack -->
+    <string name="EPr_powerpack_header">פרימיום והגדרות שונות</string>
+    <string name="EPr_powerpack_summary">תזכורת קולית הוחמצה, קלט קולי והגדרות כלליות</string>
 
+    <!-- slide 32e: Preference: Anonymous User Statistics -->
+    <string name="EPr_statistics_title">סטטיסטיקת שימוש אנונימית</string>
+    <!-- Preference: User Statistics (disabled) -->
+    <string name="EPr_statistics_desc_disabled">נתוני שימוש לא ידווחו</string>
+    <!-- slide 32f: Preference: User Statistics (enabled) -->
+    <string name="EPr_statistics_desc_enabled">עזור לנו לשפר את אסטריד ע״י שליחת נתוני שימוש
+        אנונימיים
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <string name="speech_err_network">שגיאת חיבור! זיהוי דיבור דורש חיבור לאינטרנט.</string>
     <string name="speech_err_no_match">סליחה, לא הבנתי! אנא נסה שוב.</string>
     <string name="speech_err_default">סליחה, מזהה הדיבור נתקל בבעיה. אנא נסה שנית.</string>
-    
+
     <string name="premium_attach_file">צרף קובץ</string>
     <string name="premium_record_audio">הקלד הערה</string>
     <string name="premium_no_files">לא צורפו קבצים</string>
     <string name="premium_remove_file_confirm">בטוח? לא ניתן לבטל את הפעולה</string>
-    
+
     <string name="audio_recording_title">מקליטה שֵׁמַע</string>
     <string name="audio_stop_recording">הפסק הקלטה</string>
     <string name="audio_speak_now">דַּבֵּר כעת!</string>
     <string name="audio_encoding">מקודדת...</string>
     <string name="audio_err_encoding">שגיאה בקידוד שֵׁמַע</string>
-    <string name="audio_err_playback">"מצטערת, אך המערכת אינה תומכת בקבצי  שֵׁמַע מסוג זה"</string>
-    
-    <string name="search_market_audio">לא מצאתי נגן לסוג זה של קובץ שֵׁמַע. הֲתִּרְצֶה להוריד נגן מחנות גוגל?</string>
+    <string name="audio_err_playback">"מצטערת, אך המערכת אינה תומכת בקבצי שֵׁמַע מסוג זה"</string>
+
+    <string name="search_market_audio">לא מצאתי נגן לסוג זה של קובץ שֵׁמַע. הֲתִּרְצֶה להוריד נגן
+        מחנות גוגל?
+    </string>
     <string name="search_market_audio_title">לא נמצא נגן לקבצי שֵׁמַע</string>
 
-    <string name="search_market_pdf">לא מצאתי קורא קבצי PDF. הֲתִּרְצֶה להוריד קורא קבצי PDF מחנות היישומים?</string>
+    <string name="search_market_pdf">לא מצאתי קורא קבצי PDF. הֲתִּרְצֶה להוריד קורא קבצי PDF מחנות
+        היישומים?
+    </string>
     <string name="search_market_pdf_title">לא מצאתי קורא לקבצי PDF</string>
 
-    <string name="search_market_ms">לא מצאתי קורא לקבצי אופיס. הֲתִּרְצֶה להוריד קורא קבצי אופיס מחנות היישומים</string>
+    <string name="search_market_ms">לא מצאתי קורא לקבצי אופיס. הֲתִּרְצֶה להוריד קורא קבצי אופיס
+        מחנות היישומים
+    </string>
     <string name="search_market_ms_title">לא נמצא קורא לקבצי אופיס</string>
-    
-    <string name="file_type_unhandled">"מצטערת! לא מצאתי ישום שיכול  לטפל בקבצים מסוג זה"</string>
+
+    <string name="file_type_unhandled">"מצטערת! לא מצאתי ישום שיכול לטפל בקבצים מסוג זה"</string>
     <string name="file_type_unhandled_title">יישום לא נמצא</string>
-    
+
     <string name="file_prefix_image">תמונה</string>
     <string name="file_prefix_voice">קול</string>
     <string name="file_browser_up">מעלה</string>
     <string name="file_browser_title">בחר קובץ</string>
     <string name="dir_browser_title">יש לבחור תיקייה</string>
-    <string name="file_browser_err_permissions">הרשאות לא מספיקות! אנא בדוק שלא חסמת את אסטריד מלגשת לכרטיס הזיכרון</string>
+    <string name="file_browser_err_permissions">הרשאות לא מספיקות! אנא בדוק שלא חסמת את אסטריד מלגשת
+        לכרטיס הזיכרון
+    </string>
     <string name="file_add_picture">צרף תמונה</string>
     <string name="file_add_sdcard">צרף קובץ מכרטיס הזיכרון</string>
     <string name="file_download_title">להוריד קובץ?</string>
@@ -2191,52 +2328,64 @@
     <string name="file_err_memory">תמונה זו גדולה מכדי להכנס לזכרון...</string>
     <string name="file_err_copy">שגיאה בהעתקת הקובץ המצורף</string>
     <string name="file_err_download">שגיאה בהורדת הקובץ</string>
-    <string name="file_err_no_directory">אווופס! נראה שהקבצים מהתיקייה לא קיימים. יש לבחור תיקייה לשמירת הקבצים אליה בהעדפות אסטריד.</string>
+    <string name="file_err_no_directory">אווופס! נראה שהקבצים מהתיקייה לא קיימים. יש לבחור תיקייה
+        לשמירת הקבצים אליה בהעדפות אסטריד.
+    </string>
     <string name="file_err_show">מצטערת, אך המערכת אינה תומכת עדיין בקבצים מסוג זה</string>
-    
+
     <string name="file_dir_dialog_ok">השתמש בתיקיה זו</string>
     <string name="file_dir_dialog_default">אפס לברירת מחדל</string>
-    
+
     <string name="p_files_dir">תיקיית הורדות פרימיום</string>
     <!-- Description for file download directory preference. %s -> chosen directory -->
     <string name="p_files_dir_desc">צְרוּפוֹת נשמרו בתיקיה %s</string>
     <string name="p_files_dir_desc_default">תיקייית ברירת מחדל</string>
 
-    
+
     <!-- in app billing -->
     <string name="billing_not_supported_title">לא ניתן לרכוש ישומים כעת</string>
     <string name="billing_not_supported_message">שירות החיובים בחנות היישומים אינו זמין כעת.
-תוכל להמשיך ולהשתמש באסטריד, אך
-לא תוכל לבצע רכישות.</string>
+        תוכל להמשיך ולהשתמש באסטריד, אך
+        לא תוכל לבצע רכישות.
+    </string>
     <string name="subscriptions_not_supported_title">לא ניתן לרכוש מִנּוּיִים</string>
     <string name="subscriptions_not_supported_message">שוק החיוב.
-השירות על התקן זה אינו תומך בְּמִנּוּיִים כעת. אתה מוזמן להרשם לשירותי הפרימיום של אסטריד בכתובת: http://astrid.com/premium</string>
+        השירות על התקן זה אינו תומך בְּמִנּוּיִים כעת. אתה מוזמן להרשם לשירותי הפרימיום של אסטריד
+        בכתובת: http://astrid.com/premium
+    </string>
     <string name="cannot_connect_title">איני מצליחה להתחבר לחנות היישומים</string>
     <string name="cannot_connect_message">איני מצליחה להתחבר לחנות היישומים.
-יתכן והגירסה של חנות הישומים שברשותך איננה עדכנית.
-תוכל להמשיך להשתמש באסטריד, אך
-לא תוכל לבצע רכישות.</string>
-    
+        יתכן והגירסה של חנות הישומים שברשותך איננה עדכנית.
+        תוכל להמשיך להשתמש באסטריד, אך
+        לא תוכל לבצע רכישות.
+    </string>
+
     <string name="restoring_transactions">משחזר טרנזאקציות</string>
-    
+
     <string name="subscriptions_learn_more">מידע נוסף</string>
-    
-    <string name="kii_premium_success">תודה על שנענית להצעה המיוחדת שלנו. מיד אפתח לחודש את הנעילה של אסריד פרימיום.</string>
+
+    <string name="kii_premium_success">תודה על שנענית להצעה המיוחדת שלנו. מיד אפתח לחודש את הנעילה
+        של אסריד פרימיום.
+    </string>
     <string name="kii_premium_abort">ההצעה המיוחדת בוטלה</string>
     <string name="kii_premium_declined">סירבת להצעה המיוחדת</string>
-    <string name="kii_premium_error">הטיפול בעיבוד הצעה המיוחדת לא הצליח. אנא נסה שוב מאוחר יותר.</string>
-    
+    <string name="kii_premium_error">הטיפול בעיבוד הצעה המיוחדת לא הצליח. אנא נסה שוב מאוחר יותר.
+    </string>
+
     <string name="premium_offers_title">הצעה מיוחדת</string>
     <string name="premium_offers_subtitle">רוצה חודש של אסטריד פרימיום חינם?</string>
-    <string name="premium_offers_detail">כדי לקבל חודש חינם של אסטריד פרימיום, יהיה עליך לצפות בסירטון חסות קצר. (הם יבקשו את כתובת הדוא"ל שלך</string>
+    <string name="premium_offers_detail">כדי לקבל חודש חינם של אסטריד פרימיום, יהיה עליך לצפות
+        בסירטון חסות קצר. (הם יבקשו את כתובת הדוא"ל שלך
+    </string>
     <string name="premium_offers_start">קבל חינם!</string>
-    
+
     <string name="premium_billing_title">אסטריד פרימיום</string>
     <string name="premium_buy_month">חודש</string>
     <string name="premium_buy_year">שנה</string>
     <string name="premium_description_header">עשה יותר בעזרת פרימיום!</string>
     <string name="premium_description_1">צרף קבצים למשימות
-(pdfs,doc,ppt...)</string>
+        (pdfs,doc,ppt...)
+    </string>
     <string name="premium_description_2">סינכרון קבצים עם אתר astrid.com</string>
     <string name="premium_description_3">הוסף צְרוּפוֹת דרך דוא״ל</string>
     <string name="premium_description_4">שמור הערה קולית כקובץ אודיו</string>
@@ -2245,730 +2394,757 @@
     <string name="premium_speech_bubble_1">חבילת הפרימיום תשדרג את הפרודוקטיביות שלך!</string>
     <string name="premium_speech_bubble_2">הזמן לשנה וחסוך !25%%</string>
     <string name="premium_already_subscribed">הנך כבר מָנוּי על שירותי הפרימיום של אסטריד!</string>
-    <string name="premium_login_prompt">יש צורך בחשבון באתר astrid.com כדי להרשם לגירסת הפרימיום. אנא התחבר או הרשם.</string>
+    <string name="premium_login_prompt">יש צורך בחשבון באתר astrid.com כדי להרשם לגירסת הפרימיום.
+        אנא התחבר או הרשם.
+    </string>
     <string name="premium_success">תודה על הַמִּנּוּי לאסטריד פרימיום!</string>
-    <string name="premium_success_with_server_error">תודה על הַמִּנּוּי לאסטריד פרימיום! התכונות החדשות תיפתחנה לשימוש באתר astrid.com בקרוב, ותהיינה זמינות בטלפון שלך מיידית.</string>
-    <string name="premium_verification_error">מָנוּי הפרימיום לחשבון בחנות הישומים של גוג מחובר למשתמש אחר. בכדי לקשר כתובות דוא״ל נוספות לחשבונך,  בקר ב: astrid.com/users/profile</string>
-    <string name="premium_check_for_purchases"> רכשת כבר את חבילת הפרימיום? הקלק כאן בכדי לבדוק את היסטורית הרכישות בחנות היישומים של גוגל</string>
+    <string name="premium_success_with_server_error">תודה על הַמִּנּוּי לאסטריד פרימיום! התכונות
+        החדשות תיפתחנה לשימוש באתר astrid.com בקרוב, ותהיינה זמינות בטלפון שלך מיידית.
+    </string>
+    <string name="premium_verification_error">מָנוּי הפרימיום לחשבון בחנות הישומים של גוג מחובר
+        למשתמש אחר. בכדי לקשר כתובות דוא״ל נוספות לחשבונך, בקר ב: astrid.com/users/profile
+    </string>
+    <string name="premium_check_for_purchases">רכשת כבר את חבילת הפרימיום? הקלק כאן בכדי לבדוק את
+        היסטורית הרכישות בחנות היישומים של גוגל
+    </string>
     <string name="premium_checking_for_purchases">בודקת רכישות...</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- 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">הזכירי לי:</string>
-
-  <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">כאשר הגיע מועד היעד</string>
-
-  <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">כשעבר מועד היעד</string>
-
-  <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_randomly">אקראי יחיד</string>
-
-  <!-- Task Edit: Reminder alarm clock label -->  
-  <string name="TEA_reminder_alarm_label">סוג צלצול/רטט:</string>
-
-  <!--  slide 45a: Task Edit: Reminder mode: ring once -->  
-  <string name="TEA_reminder_mode_once">פעם אחת</string>
-
-  <!-- slide 45b: Task Edit: Reminder mode: ring five times -->  
-  <string name="TEA_reminder_mode_five">חמש פעמים</string>
-
-  <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->  
-  <string name="TEA_reminder_mode_nonstop">עד אשר אבטל את התזכורות</string>
-  
-  <string name="TEA_reminder_when">when</string>
-  
-  <string name="TEA_reminder_due_short">due</string>
-
-  <string name="TEA_reminder_overdue_short">overdue</string>
-
-  <string name="TEA_reminder_randomly_short">randomly</string>
-
-  <string name="TEA_reminder_display_one">Remind me %s</string>
-  
-  <string name="TEA_reminder_display_multiple">Remind %s</string>
-
-  <string-array name="TEA_reminder_random">
-    <!-- random reminder choices for task edit page. -->
-    <item>שעה</item>
-    <item>יום</item>
-    <item>שבוע</item>
-    <item>שבועיים</item>
-    <item>חודש</item>
-    <item>חדשיים</item>
-  </string-array>
-  
-  <!-- ==================================================== notifications == -->
-  
-  <!-- Name of filter when viewing a reminder -->
-  <string name="rmd_NoA_filter">תזכורת!</string>
-  
-  <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">בוצעה</string>
-  
-  <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">השתק</string>
-  
-  <!-- Reminder: Completed Toast -->
-  <string name="rmd_NoA_completed_toast">איחולי על השלמת המשימה!</string>
-  
-  <!-- Prefix for reminder dialog title -->
-  <string name="rmd_NoA_dlg_title">תזכורת:</string>
-  
-  <!-- ==================================================== user reengagement == -->
-
-  <!-- Titles for user reengagement notifications -->
-  <string-array name="rmd_reengage_notif_titles">
-    <item>הודעה מאסטריד</item>
-    <!-- %s -> first name -->
-    <item>מזכר עבור %s</item> 
-    <item>תמצית מאסטריד</item>
-    <item>תזכורות מאסטריד</item>
-  </string-array>
-    
-  <string name="rmd_reengage_name_default">אתה</string>
-
-  
-  <string name="rmd_reengage_add_tasks">הוסף משימה</string>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs -->
-  <string-array name="rmd_reengage_dialog_options">
-    <item>הגיע הזמן לקצר את רשימת המשימות שלך!</item>
-    <item>אדוני היקר, יש לך כמה משימות לבדוק!</item>
-    <item>תוכל בבקשה להביט באילו?</item>
-    <item>יש לי כמה משימות ששמך מתנוסס עליהן!</item>
-    <item>ערימה חדשה של משימות עבורך היום!</item>
-    <item>אתה נראה נהדר! מוכן להתחיל לעבוד?</item>
-    <item>אני חושבת שהיום הוא יום מצויין לעבוד קצת!</item>
-  </string-array>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>אתה לא מתכוון להתחיל להתחיל להתארגן?</item>
-    <item>שמי אסטריד ואני אעזור לך לעשות יותר דברים!</item>
-    <item>אתה נראה עסוק! תן לי להקל עליך.</item>
-    <item>אני יכולה לעזור לך לארגן את כל הדברים הקטנים שבחייך.</item>
-    <item>אתה</item>
-    <item>נעים להכיר!</item>
-  </string-array>
-  <!-- ============================================= reminder preferences == -->
-  
-  <!-- slide 33d: Reminder Preference Screen Title -->
-  <string name="rmd_EPr_alerts_header">הגדרות תזכורת</string>
-  <string name="rmd_EPr_alerts_summary">שעות שקטות, אשפרויות נימנום, רמת המשכות</string>
-    
-  <!-- Reminder Preference: Reminders Enabled Title -->
-  <string name="rmd_EPr_enabled_title">\?תזכורות מאופשרות</string>
-  <!-- Reminder Preference Reminders Enabled Description (true) -->
-  <string name="rmd_EPr_enabled_desc_true">התזכורות של אסטריד פעילות (זה המצב הרגיל)</string>
-  <!-- Reminder Preference Reminders Enabled Description (false) -->
-  <string name="rmd_EPr_enabled_desc_false">התזכורות של אסטריד לא תופענה יותר בטלפון שלך</string>  
-    
-  <!-- Reminder Preference: Quiet Hours Start Title -->
-  <string name="rmd_EPr_quiet_hours_start_title">תחילת שעות השקט</string>
-  <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">האתראות תוחרשנה אחרי %s.\nשים לב: הגדרות הן חתחת "רטט  בזמן התראה"!</string>
-  <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
-  <string name="rmd_EPr_quiet_hours_desc_none">תכונת «שעות שקט» אינה פעילה</string>
-  
-  <!-- Reminder Preference: Quiet Hours End Title -->
-  <string name="rmd_EPr_quiet_hours_end_title">סיום שעות השקט</string>
-  <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_end_desc">החרשת האתראות תחדל החל מ %s</string>
-
-  <!-- Reminder Preference: Default Reminder Title -->
-  <string name="rmd_EPr_rmd_time_title">תזכורת ברירת מחדל</string>
-  <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
-  <string name="rmd_EPr_rmd_time_desc">התראות משימות ללא מועד יעד תגענה ב-%s</string>
-
-  <!-- Reminder Preference: Notification Ringtone Title -->
-  <string name="rmd_EPr_ringtone_title">נְעִימוֹן אתראות</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
-  <string name="rmd_EPr_ringtone_desc_custom">נְעִימוֹן מוגדר אישית נקבע</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
-  <string name="rmd_EPr_ringtone_desc_silent">נְעִימוֹן נקבע להיות שקט</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
-  <string name="rmd_EPr_ringtone_desc_default">יעשה שימוש בִּנְעִימוֹן ברירת מחדל</string>
-  
-  <!-- Reminder Preference: Notification Persistence Title -->
-  <string name="rmd_EPr_persistent_title">התמדת התראות</string>
-  <!-- Reminder Preference: Notification Persistence Description (true) -->
-  <string name="rmd_EPr_persistent_desc_true">יש לצפות בכל התראה בנפרד כדי להסירה</string>
-  <!-- Reminder Preference: Notification Persistence Description (false) -->
-  <string name="rmd_EPr_persistent_desc_false">כפתור «הָסִירִי הכל» יסיר את כל ההתראות</string>
-
-  <!-- Reminder Preference: Social Reminders Title -->
-  <string name="rmd_EPr_social_title">עידוד חברתי</string>
-  <!-- Reminder Preference: Social Reminders Summary (enabled) -->
-  <string name="rmd_EPr_social_summary_enabled">התזכורות תראינה מי סומך עליך לביצוע משימות משותפות.</string>
-  <!-- Reminder Preference: Social Reminders Summary (disabled) -->
-  <string name="rmd_EPr_social_summary_disabled">התזכורות לא תראינה מי סומך עליך לביצוע משימות משותפות.</string>
-  
-  
-  
-  <!-- Reminder Preference: Notification Icon Title -->
-  <!-- Reminder Preference: Notification Icon Description -->
-
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
-  <string name="rmd_EPr_multiple_maxvolume_title">עוצמת קול מירבית לתזכורות מרובות צילצולים</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_true">אסטריד תשתמש בעוצמת קול מירבית לתזכורות רבות צלצולים</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_false">אסטריד תשתמש בהגדרת המערכת לקביעת עוצמת הצליל</string>
-
-  <!-- Reminder Preference: Vibrate Title -->
-  <string name="rmd_EPr_vibrate_title">רטט בזמן אתראה</string>
-  <!-- Reminder Preference: Vibrate Description (true) -->
-  <string name="rmd_EPr_vibrate_desc_true">אסטריד תצרף רטט להתראות</string>
-  <!-- Reminder Preference: Vibrate Description (false) -->
-  <string name="rmd_EPr_vibrate_desc_false">אסטריד לא תצרף רטט להתראות</string>
-
-  <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">עידוד על ידי אסטריד</string>
-  <!-- Reminder Preference: Nagging Description (true) -->
-  <string name="rmd_EPr_nagging_desc_true">אסטריד תלווה את התזכורות בקריאות עידוד וחיזוק</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_nagging_desc_false">אסטריד תחדל מקריאות העידוד והחיזוק</string>
-
-  <!-- Reminder Preference: Snooze Dialog Title -->  
-  <string name="rmd_EPr_snooze_dialog_title">בקרת השתקה HH:MM</string>
-  <!-- Reminder Preference: Snooze Dialog Description (true) -->
-  <string name="rmd_EPr_snooze_dialog_desc_true">השתק עד לשעה מסויימת (HH:MM)</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_snooze_dialog_desc_false">השתק ע״י בחירת שקט למס\' שעות/ימים</string>
-  
-  <!-- slide 44g: Reminder Preference: Default Reminders Title -->
-  <string name="rmd_EPr_defaultRemind_title">תזכורות אקראיות</string>
-  <!-- Reminder Preference: Default Reminders Setting (disabled) -->
-  <string name="rmd_EPr_defaultRemind_desc_disabled">משימות חדשות לא תכלנה תזכורות אקראיות</string>
-  <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
-  <string name="rmd_EPr_defaultRemind_desc">משימות חדשות יתזכרו אותך אקראית: %s</string>
-  
-  <!-- slide 39a: Defaults Title -->
-  
-  <string-array name="EPr_reminder_random">
-    <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
-    <item>מָנוּעַ</item>
-    <!-- slide 44b -->
-    <item>שְׁעָתִי</item>
-    <!-- slide 44c -->
-    <item>יוֹמִי</item>
-    <!-- slide 44d-->
-    <item>שְׁבוּעִי</item>
-    <!-- slide 44e-->
-    <item>דּוּ-שְׁבוּעִי</item>
-    <!-- slide 44f -->
-    <item>חָדְשִׁי</item>
-    <item>דּוּ-חָדְשִׁי</item>
-  </string-array>
-        
-  <string-array name="EPr_quiet_hours_start">
-    <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
-    <item>מָנוּעַ</item>
-    <item>8 בערב</item>
-    <item>9 בערב</item>
-    <item>10 בלילה</item>
-    <item>11 בלילה</item>
-    <item>חצות</item>
-    <item>1 לפנות בוקר</item>
-    <item>2 לפנות בוקר</item>
-    <item>3 לפנות בוקר</item>
-    <item>4 לפנות בוקר</item>
-    <item>5 לפנות בוקר</item>
-    <item>6 בבוקר</item>
-    <item>7 בבוקר</item>
-    <item>8 בבוקר</item>
-    <item>9 בבוקר</item>
-    <item>10 בבוקר</item>
-    <item>11 בבוקר</item>
-    <item>12 בצהריים</item>
-    <item>1 אחה״צ</item>
-    <item>2 אחה״צ</item>
-    <item>3 אחה״צ</item>
-    <item>4 אחה״צ</item>
-    <item>5 אחה״צ</item>
-    <item>6 בערב</item>
-    <item>7 בערב</item>
-  </string-array>
-  
-  <string-array name="EPr_quiet_hours_end">
-    <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
-    <item>9 בערב</item>
-    <item>10 בבוקר</item>
-    <item>11 בבוקר</item>
-    <item>12 בצהריים</item>
-    <item>1 אחה״צ</item>
-    <item>2 אחה״צ</item>
-    <item>3 אחה״צ</item>
-    <item>4 אחה״צ</item>
-    <item>4 אחה״צ</item>
-    <item>6 בערב</item>
-    <item>7 בערב</item>
-    <item>8 בערב</item>
-    <item>9 בערב</item>
-    <item>10 בלילה</item>
-    <item>11 בלילה</item>
-    <item>חצות</item>
-    <item>1 לפנות בוקר</item>
-    <item>2 לפנות בוקר</item>
-    <item>3 לפנות בוקר</item>
-    <item>4 לפנות בוקר</item>
-    <item>5 לפנות בוקר</item>
-    <item>6 בבוקר</item>
-    <item>7 בבוקר</item>
-    <item>8 בבוקר</item>
-  </string-array>
-  
-  <string-array name="EPr_rmd_time">
-    <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
-    <item>9 בבוקר</item>
-    <item>10 בבוקר</item>
-    <item>11 בבוקר</item>
-    <item>12 בצהריים</item>
-    <item>1 אחה״צ</item>
-    <item>2 אחה״צ</item>
-    <item>3 אחה״צ</item>
-    <item>4 אחה״צ</item>
-    <item>5 אחה״צ</item>
-    <item>6 בערב</item>
-    <item>7 בערב</item>
-    <item>8 בערב</item>
-    <item>9 בערב</item>
-    <item>10 בלילה</item>
-    <item>11 בלילה</item>
-    <item>חצות</item>
-    <item>1 לפנות בוקר</item>
-    <item>2 לפנות בוקר</item>
-    <item>3 לפנות בוקר</item>
-    <item>4 לפנות בוקר</item>
-    <item>5 לפנות בוקר</item>
-    <item>6 בבוקר</item>
-    <item>7 בבוקר</item>
-    <item>8 בבוקר</item>
-  </string-array>
-  
-  <!-- =============================================== random reminders == -->
-
-  <string name="reminders_social">האנשים האלו סומכים עליך!</string>
-  
-  <string name="reminders_social_one">%s is counting on you!</string>
-  
-  <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
-
-  <string-array name="reminders">
-      <!-- reminders: Make these < 20 chars so the task name is displayed -->
-      <item>הי אתה! יש לך דקה?</item>
-      <item>אפשר לקבל את תשומת לִבְּךָ לרגע?</item>
-      <item>יש לך כמה רגעים?</item>
-      <item>האם שכחת?</item>
-      <item>סליחה!</item>
-      <item>כיהיה לך רגע פנאי:</item>
-      <item>על השולחן:</item>
-      <item>פנוי לרגע?</item>
-      <item>אסטריד כאן</item>
-      <item>סליחה, אפשר להציק לך?</item>
-      <item>אפשר דקה מזמנך?</item>
-      <item>יום מצויין בשביל</item>
-  </string-array>
-
-  <string-array name="reminders_due">
-      <!-- reminders related to task due date -->
-      <item>קדימה לעבודה!</item>
-      <item>תאריך היעד הגיע!</item>
-      <item>מוכן להתחיל?</item>
-      <item>אמרת שתעשה את:</item>
-      <item>אתה אמור להתחיל:</item>
-      <item>זמן ההתחלה</item>
-      <item>הגיעה העת!</item>
-      <item>סליחה, הגיעה העת</item>
-      <item>פנוי? זה הזמן ל...</item>
-  </string-array>
-
-  <string-array name="reminders_snooze">
-      <!-- reminders related to snooze -->
-      <item>תפסיק להיות עצלן!</item>
-      <item>ההשתקה שלי הסתיימה!</item>
-      <item>די להשתקות!</item>
-      <item>מוכן?</item>
-      <item>די לדחות!</item>
-  </string-array>
-  
-  <string-array name="reminder_responses">
-      <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
-      <item>יש לי משהו בשבילך!</item> 
-      <item>מוכן לשים את זה מאחוריך?</item>
-      <item>למה שלא תגמור את זה וזהו?</item>
-      <item>מה דעתך?</item>
-      <item>קדימה?</item>
-      <item>קטן עליך!</item>
-      <item>בקרוב תהיה מאושר! רק תגמור את זה ודי!</item>
-      <item>מילה שלי: תרגיש הרבה יותר טוב כשרק תגמור את זה!</item>
-      <item>מה דעתך לעשות זאת?</item>
-      <item>אנא גמור, נמאס לי להזכיר לך!</item>
-      <item>אתה חושב שתוכל לעשות זאת? אני בטוחה שכן!</item>
-      <item>מתי כבר תעשה זאת?</item>
-      <item>תרגיש שוב עם עצמך! קדימה לעבודה!</item>
-      <item>אני כל כך גֵּאָה בְּךָ! עשה זאת!</item>
-      <item>חטיף קטן לפני שמתחילים?</item>
-      <item>רק את זה? בבקשה???</item>
-      <item>הגיע הזמן לקצר את רשימת המשימות שלך!</item>
-      <item>אתה תותח-לענין או נמושת-בלגן? אני בטוחה שתותח לענין! קדימה!</item>
-      <item>אמרתי כבר שאתה נהדר לאחרונה? בוא נמשיך!</item>
-      <item>משימה אחת ליום, והעומס ימוג כחלום... די לעומס!</item>
-      <item>איך עשית זאת? אני נפעמת!</item>
-      <item>אתה לא יכול להסתדר בחיים רק בזכות הפנים היפות שלך. כדאי להתחיל לעבוד!</item>
-      <item>מזג אוויר מצויין לעבודה מסוג זה, לא?</item>
-      <item>כוס קפה בזמן שאתה עובד על כך?</item>
-      <item>אם היית גומר את זה, יכולת ללכת ולעשות חיים.</item>
-      <item>זה הזמן. אי אפשר לדחות עוד ועוד.</item>
-      <item>אני נעלבת בכל פעם שאתה מתעלם ממני.</item>
-  </string-array>
-
-  <string-array name="postpone_nags">
-      <!-- Astrid\'s nagging when user clicks postpone -->
-      <item>מי שדוחה משימות, הוא פשוט טיפוס דוחה!</item>
-      <item>אתה לא מתעייף מלהיות עצלן כל כך?</item>
-      <item>איפשהו, מישהו תלוי בכך שתגמור את המשימה הזו!</item>
-      <item>כשאמרת לדחות, מה שהתכוונת באמת היה «אני עושה זאת» נכון?</item>
-      <item>זו הפעם האחרונה שאתה דוחה את זה, נכון?</item>
-      <item>רק תגמור את זה היום, ואני מבטיחה לא לספר לאף אחד על ההזנחות שלך!</item>
-      <item>למה לדחות, כאשר אפשר, אההם... פשוט לא לדחות!</item>
-      <item>מה יהיה? בכלל תגמור את זה פעם?</item>
-      <item>אתה בחור כל כך נחמד! מה דעתך פשוט לא לדחות?</item>
-      <item>אתה בטוח שתוכל להשיג את מטרותיך אם תדחה זאת?</item>
-      <item>דוחה, דוחה, דוחה... מתי תשתנה?</item>
-      <item>נמאס לי מהתירוצים שלך! פשוט עשה זאת ודי!</item>
-      <item>זה לא היה בדיוק אותו התירוץ בו השתמש בפעם הקודמת שדחית ?</item>
-      <item>אני ממש לא יכולה לעזור לך לארגן את החיים שלך, אם תעשה זאת...</item>
-  </string-array>
+    <!-- Resources for built-in reminders plug-in -->
 
+    <!-- =============================================== task edit activity == -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder group label -->
+    <string name="TEA_reminders_group_label">Reminder settings</string>
 
+    <!-- Task Edit: Reminder header label -->
+    <string name="TEA_reminder_label">הזכירי לי:</string>
 
-  <!-- Resources for built-in repeat plug-in -->
-
-  <!-- repeating plugin name -->
-  <string name="repeat_plugin">משימות חוזרות</string>
-  
-  <!-- repeating plugin description -->
-  <string name="repeat_plugin_desc">אפשר למשימות לחזור</string>
-  
-  <!-- slide 20a: checkbox for turning on/off repeats -->
-  <string name="repeat_enabled">חזרה</string>
-  
-  <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
-  <string name="repeat_every">כל %d</string>
-  
-  <!-- hint when opening repeat interval -->
-  <string name="repeat_interval_prompt">אינטרוול חזרות</string>
-  
-  <!-- slide 19b-->
-  <string name="repeat_never">Not repeating</string>
-  <!-- slide 20f-->
-  <string name="repeat_dont">ללא חזרות</string>
-      
-  <string-array name="repeat_interval_short">
-    <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>יום</item>
-    <item>שב\'</item>
-    <item>חד\'</item>
-    <item>שע\'</item>
-    <item>דק\'</item>
-    <item>שנ\'</item>
-  </string-array>
-  
-  
-  <string-array name="repeat_interval">
-    <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>יום/ימים</item>
-    <item>שבוע/(ות)</item>
-    <item>חודש/ים</item>
-    <item>שעה/ות</item>
-    <item>דקה/דקות</item>
-    <item>שנה/שנים</item>
-  </string-array>
-  
-  <string name="repeat_days">ימים</string>
-  <string name="repeat_weekdays">ימי עבודה</string>
-  <string name="repeat_weeks">שבועות</string>
-  <string name="repeat_months">חודשים</string>
-  <string name="repeat_years">שנים</string>
-  <string name="repeat_hours">שעות</string>
-  <string name="repeat_minutes">דקות</string>
-  
-  <string-array name="repeat_until_shortcuts">
-      <item>לנצח</item>
-      <item>תאריך מסויים</item>
-      <item>היום</item>
-      <item>מחר</item>
-      <item>(יום אחרי)</item>
-      <item>שבוע הבא</item>
-      <item>שבועיים</item>
-      <item>החודש הבא</item>
-  </string-array>
-  
-  <string name="repeat_until_title">חזור עד...</string>
-  
-  <string name="repeat_keep_going">המשך</string>
-  
-  <string-array name="repeat_type">
-    <!-- slide 20c: repeat type (date to repeat from) -->
-    <item>מתאריך היעד</item>
-    <!-- slide 20c -->
-    <item>מהיום שהמשימה הושלמה</item>
-  </string-array>
-  
-  <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
-  <string name="repeat_detail_byday">$I על $D</string>
-  
-  <!-- task detail for repeat from due date (%s -> interval) -->
-  <string name="repeat_detail_duedate">כל %s</string>
-
-  <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
-  <string name="repeat_detail_duedate_until">כל %1$s\nעד %2$s</string>
-  
-  <!-- task detail for repeat from completion date (%s -> interval) -->
-  <string name="repeat_detail_completion">%s אחרי שהמשימה הושלמה</string>
-  
-  <!-- text for button when repeating task indefinitely -->
-  <string name="repeat_forever">חזור לנצח</string>
-
-  <!-- text for button when repeating task until specified date (%s -> date string) -->
-  <string name="repeat_until">חזרה עד %s</string>
-  
-  <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title">תזמון מחדש של משימה «%s\»</string>
-
-  <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title_last_time">«%s» משימה חוזרת בוצעה:</string>
-      
-  <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->  
-  <string name="repeat_rescheduling_dialog_bubble">%1$s תיזמנתי מחדש משימה חוזרת זו מ־%2$s ל־%3$s</string>
-  
-  <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
-  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s תזמנתי מחדש משימה חוזרת זו ל־%2$s</string>
-  
-  <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
-  <string name="repeat_rescheduling_dialog_bubble_last_time">משימה זו חזרה עד %1$s, וכעת כל החזרות הסתיימו. %2$s</string>
-  
-  <string-array name="repeat_encouragement">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>עבודה יפה!</item>
-      <item>יפה... אני כל כך גֵּאָה בְּךָ!</item>
-      <item>אני אוהבת שאתה פּוֹרֶה!</item>
-      <item>איזו הרגשה נהדרת לסמן ״בוצע״?</item>
-  </string-array>
-
-  <string-array name="repeat_encouragement_last_time">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>עבודה יפה!</item>
-      <item>אני כל כך גֵּאָה בְּךָ!</item>
-      <item>אני אוהבת שאתה פּוֹרֶה!</item>
-  </string-array>
-  
+    <!-- Task Edit: Reminder @ deadline -->
+    <string name="TEA_reminder_due">כאשר הגיע מועד היעד</string>
 
+    <!-- Task Edit: Reminder after deadline -->
+    <string name="TEA_reminder_overdue">כשעבר מועד היעד</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder at random times (%s => time plural)-->
+    <string name="TEA_reminder_randomly">אקראי יחיד</string>
 
-    
-  <!-- Subtasks Help Introduction -->
-  <string name="subtasks_help_title">מיין והזח באסטריד</string>
-  <string name="subtasks_help_1">גע והחזק כדי להעביר משימה</string>
-  <string name="subtasks_help_2">גרור אנכית כדי לארגן מחדש</string>
-  <string name="subtasks_help_3">גרור אופקית כדי להזיח</string>
-    
+    <!-- Task Edit: Reminder alarm clock label -->
+    <string name="TEA_reminder_alarm_label">סוג צלצול/רטט:</string>
 
+    <!--  slide 45a: Task Edit: Reminder mode: ring once -->
+    <string name="TEA_reminder_mode_once">פעם אחת</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 45b: Task Edit: Reminder mode: ring five times -->
+    <string name="TEA_reminder_mode_five">חמש פעמים</string>
+
+    <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
+    <string name="TEA_reminder_mode_nonstop">עד אשר אבטל את התזכורות</string>
+
+    <string name="TEA_reminder_when">when</string>
+
+    <string name="TEA_reminder_due_short">due</string>
+
+    <string name="TEA_reminder_overdue_short">overdue</string>
+
+    <string name="TEA_reminder_randomly_short">randomly</string>
+
+    <string name="TEA_reminder_display_one">Remind me %s</string>
+
+    <string name="TEA_reminder_display_multiple">Remind %s</string>
+
+    <string-array name="TEA_reminder_random">
+        <!-- random reminder choices for task edit page. -->
+        <item>שעה</item>
+        <item>יום</item>
+        <item>שבוע</item>
+        <item>שבועיים</item>
+        <item>חודש</item>
+        <item>חדשיים</item>
+    </string-array>
+
+    <!-- ==================================================== notifications == -->
+
+    <!-- Name of filter when viewing a reminder -->
+    <string name="rmd_NoA_filter">תזכורת!</string>
+
+    <!-- Reminder: Task was already done -->
+    <string name="rmd_NoA_done">בוצעה</string>
+
+    <!-- Reminder: Snooze button (remind again later) -->
+    <string name="rmd_NoA_snooze">השתק</string>
+
+    <!-- Reminder: Completed Toast -->
+    <string name="rmd_NoA_completed_toast">איחולי על השלמת המשימה!</string>
+
+    <!-- Prefix for reminder dialog title -->
+    <string name="rmd_NoA_dlg_title">תזכורת:</string>
+
+    <!-- ==================================================== user reengagement == -->
+
+    <!-- Titles for user reengagement notifications -->
+    <string-array name="rmd_reengage_notif_titles">
+        <item>הודעה מאסטריד</item>
+        <!-- %s -> first name -->
+        <item>מזכר עבור %s</item>
+        <item>תמצית מאסטריד</item>
+        <item>תזכורות מאסטריד</item>
+    </string-array>
+
+    <string name="rmd_reengage_name_default">אתה</string>
+
+
+    <string name="rmd_reengage_add_tasks">הוסף משימה</string>
+
+    <!-- Speech bubble options for astrid in reengagement notifs -->
+    <string-array name="rmd_reengage_dialog_options">
+        <item>הגיע הזמן לקצר את רשימת המשימות שלך!</item>
+        <item>אדוני היקר, יש לך כמה משימות לבדוק!</item>
+        <item>תוכל בבקשה להביט באילו?</item>
+        <item>יש לי כמה משימות ששמך מתנוסס עליהן!</item>
+        <item>ערימה חדשה של משימות עבורך היום!</item>
+        <item>אתה נראה נהדר! מוכן להתחיל לעבוד?</item>
+        <item>אני חושבת שהיום הוא יום מצויין לעבוד קצת!</item>
+    </string-array>
+
+    <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>אתה לא מתכוון להתחיל להתחיל להתארגן?</item>
+        <item>שמי אסטריד ואני אעזור לך לעשות יותר דברים!</item>
+        <item>אתה נראה עסוק! תן לי להקל עליך.</item>
+        <item>אני יכולה לעזור לך לארגן את כל הדברים הקטנים שבחייך.</item>
+        <item>אתה</item>
+        <item>נעים להכיר!</item>
+    </string-array>
+    <!-- ============================================= reminder preferences == -->
+
+    <!-- slide 33d: Reminder Preference Screen Title -->
+    <string name="rmd_EPr_alerts_header">הגדרות תזכורת</string>
+    <string name="rmd_EPr_alerts_summary">שעות שקטות, אשפרויות נימנום, רמת המשכות</string>
+
+    <!-- Reminder Preference: Reminders Enabled Title -->
+    <string name="rmd_EPr_enabled_title">\?תזכורות מאופשרות</string>
+    <!-- Reminder Preference Reminders Enabled Description (true) -->
+    <string name="rmd_EPr_enabled_desc_true">התזכורות של אסטריד פעילות (זה המצב הרגיל)</string>
+    <!-- Reminder Preference Reminders Enabled Description (false) -->
+    <string name="rmd_EPr_enabled_desc_false">התזכורות של אסטריד לא תופענה יותר בטלפון שלך</string>
+
+    <!-- Reminder Preference: Quiet Hours Start Title -->
+    <string name="rmd_EPr_quiet_hours_start_title">תחילת שעות השקט</string>
+    <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_start_desc">האתראות תוחרשנה אחרי %s.\nשים לב: הגדרות הן חתחת
+        "רטט בזמן התראה"!
+    </string>
+    <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
+    <string name="rmd_EPr_quiet_hours_desc_none">תכונת «שעות שקט» אינה פעילה</string>
+
+    <!-- Reminder Preference: Quiet Hours End Title -->
+    <string name="rmd_EPr_quiet_hours_end_title">סיום שעות השקט</string>
+    <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_end_desc">החרשת האתראות תחדל החל מ %s</string>
+
+    <!-- Reminder Preference: Default Reminder Title -->
+    <string name="rmd_EPr_rmd_time_title">תזכורת ברירת מחדל</string>
+    <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
+    <string name="rmd_EPr_rmd_time_desc">התראות משימות ללא מועד יעד תגענה ב-%s</string>
+
+    <!-- Reminder Preference: Notification Ringtone Title -->
+    <string name="rmd_EPr_ringtone_title">נְעִימוֹן אתראות</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
+    <string name="rmd_EPr_ringtone_desc_custom">נְעִימוֹן מוגדר אישית נקבע</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
+    <string name="rmd_EPr_ringtone_desc_silent">נְעִימוֹן נקבע להיות שקט</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
+    <string name="rmd_EPr_ringtone_desc_default">יעשה שימוש בִּנְעִימוֹן ברירת מחדל</string>
+
+    <!-- Reminder Preference: Notification Persistence Title -->
+    <string name="rmd_EPr_persistent_title">התמדת התראות</string>
+    <!-- Reminder Preference: Notification Persistence Description (true) -->
+    <string name="rmd_EPr_persistent_desc_true">יש לצפות בכל התראה בנפרד כדי להסירה</string>
+    <!-- Reminder Preference: Notification Persistence Description (false) -->
+    <string name="rmd_EPr_persistent_desc_false">כפתור «הָסִירִי הכל» יסיר את כל ההתראות</string>
+
+    <!-- Reminder Preference: Social Reminders Title -->
+    <string name="rmd_EPr_social_title">עידוד חברתי</string>
+    <!-- Reminder Preference: Social Reminders Summary (enabled) -->
+    <string name="rmd_EPr_social_summary_enabled">התזכורות תראינה מי סומך עליך לביצוע משימות
+        משותפות.
+    </string>
+    <!-- Reminder Preference: Social Reminders Summary (disabled) -->
+    <string name="rmd_EPr_social_summary_disabled">התזכורות לא תראינה מי סומך עליך לביצוע משימות
+        משותפות.
+    </string>
+
+
+    <!-- Reminder Preference: Notification Icon Title -->
+    <!-- Reminder Preference: Notification Icon Description -->
+
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
+    <string name="rmd_EPr_multiple_maxvolume_title">עוצמת קול מירבית לתזכורות מרובות צילצולים
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_true">אסטריד תשתמש בעוצמת קול מירבית לתזכורות רבות
+        צלצולים
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_false">אסטריד תשתמש בהגדרת המערכת לקביעת עוצמת
+        הצליל
+    </string>
+
+    <!-- Reminder Preference: Vibrate Title -->
+    <string name="rmd_EPr_vibrate_title">רטט בזמן אתראה</string>
+    <!-- Reminder Preference: Vibrate Description (true) -->
+    <string name="rmd_EPr_vibrate_desc_true">אסטריד תצרף רטט להתראות</string>
+    <!-- Reminder Preference: Vibrate Description (false) -->
+    <string name="rmd_EPr_vibrate_desc_false">אסטריד לא תצרף רטט להתראות</string>
+
+    <!-- Reminder Preference: Nagging Title -->
+    <string name="rmd_EPr_nagging_title">עידוד על ידי אסטריד</string>
+    <!-- Reminder Preference: Nagging Description (true) -->
+    <string name="rmd_EPr_nagging_desc_true">אסטריד תלווה את התזכורות בקריאות עידוד וחיזוק</string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_nagging_desc_false">אסטריד תחדל מקריאות העידוד והחיזוק</string>
+
+    <!-- Reminder Preference: Snooze Dialog Title -->
+    <string name="rmd_EPr_snooze_dialog_title">בקרת השתקה HH:MM</string>
+    <!-- Reminder Preference: Snooze Dialog Description (true) -->
+    <string name="rmd_EPr_snooze_dialog_desc_true">השתק עד לשעה מסויימת (HH:MM)</string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_snooze_dialog_desc_false">השתק ע״י בחירת שקט למס\' שעות/ימים</string>
+
+    <!-- slide 44g: Reminder Preference: Default Reminders Title -->
+    <string name="rmd_EPr_defaultRemind_title">תזכורות אקראיות</string>
+    <!-- Reminder Preference: Default Reminders Setting (disabled) -->
+    <string name="rmd_EPr_defaultRemind_desc_disabled">משימות חדשות לא תכלנה תזכורות אקראיות
+    </string>
+    <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
+    <string name="rmd_EPr_defaultRemind_desc">משימות חדשות יתזכרו אותך אקראית: %s</string>
+
+    <!-- slide 39a: Defaults Title -->
+
+    <string-array name="EPr_reminder_random">
+        <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
+        <item>מָנוּעַ</item>
+        <!-- slide 44b -->
+        <item>שְׁעָתִי</item>
+        <!-- slide 44c -->
+        <item>יוֹמִי</item>
+        <!-- slide 44d-->
+        <item>שְׁבוּעִי</item>
+        <!-- slide 44e-->
+        <item>דּוּ-שְׁבוּעִי</item>
+        <!-- slide 44f -->
+        <item>חָדְשִׁי</item>
+        <item>דּוּ-חָדְשִׁי</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_start">
+        <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
+        <item>מָנוּעַ</item>
+        <item>8 בערב</item>
+        <item>9 בערב</item>
+        <item>10 בלילה</item>
+        <item>11 בלילה</item>
+        <item>חצות</item>
+        <item>1 לפנות בוקר</item>
+        <item>2 לפנות בוקר</item>
+        <item>3 לפנות בוקר</item>
+        <item>4 לפנות בוקר</item>
+        <item>5 לפנות בוקר</item>
+        <item>6 בבוקר</item>
+        <item>7 בבוקר</item>
+        <item>8 בבוקר</item>
+        <item>9 בבוקר</item>
+        <item>10 בבוקר</item>
+        <item>11 בבוקר</item>
+        <item>12 בצהריים</item>
+        <item>1 אחה״צ</item>
+        <item>2 אחה״צ</item>
+        <item>3 אחה״צ</item>
+        <item>4 אחה״צ</item>
+        <item>5 אחה״צ</item>
+        <item>6 בערב</item>
+        <item>7 בערב</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_end">
+        <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
+        <item>9 בערב</item>
+        <item>10 בבוקר</item>
+        <item>11 בבוקר</item>
+        <item>12 בצהריים</item>
+        <item>1 אחה״צ</item>
+        <item>2 אחה״צ</item>
+        <item>3 אחה״צ</item>
+        <item>4 אחה״צ</item>
+        <item>4 אחה״צ</item>
+        <item>6 בערב</item>
+        <item>7 בערב</item>
+        <item>8 בערב</item>
+        <item>9 בערב</item>
+        <item>10 בלילה</item>
+        <item>11 בלילה</item>
+        <item>חצות</item>
+        <item>1 לפנות בוקר</item>
+        <item>2 לפנות בוקר</item>
+        <item>3 לפנות בוקר</item>
+        <item>4 לפנות בוקר</item>
+        <item>5 לפנות בוקר</item>
+        <item>6 בבוקר</item>
+        <item>7 בבוקר</item>
+        <item>8 בבוקר</item>
+    </string-array>
+
+    <string-array name="EPr_rmd_time">
+        <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
+        <item>9 בבוקר</item>
+        <item>10 בבוקר</item>
+        <item>11 בבוקר</item>
+        <item>12 בצהריים</item>
+        <item>1 אחה״צ</item>
+        <item>2 אחה״צ</item>
+        <item>3 אחה״צ</item>
+        <item>4 אחה״צ</item>
+        <item>5 אחה״צ</item>
+        <item>6 בערב</item>
+        <item>7 בערב</item>
+        <item>8 בערב</item>
+        <item>9 בערב</item>
+        <item>10 בלילה</item>
+        <item>11 בלילה</item>
+        <item>חצות</item>
+        <item>1 לפנות בוקר</item>
+        <item>2 לפנות בוקר</item>
+        <item>3 לפנות בוקר</item>
+        <item>4 לפנות בוקר</item>
+        <item>5 לפנות בוקר</item>
+        <item>6 בבוקר</item>
+        <item>7 בבוקר</item>
+        <item>8 בבוקר</item>
+    </string-array>
+
+    <!-- =============================================== random reminders == -->
+
+    <string name="reminders_social">האנשים האלו סומכים עליך!</string>
+
+    <string name="reminders_social_one">%s is counting on you!</string>
+
+    <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
+
+    <string-array name="reminders">
+        <!-- reminders: Make these < 20 chars so the task name is displayed -->
+        <item>הי אתה! יש לך דקה?</item>
+        <item>אפשר לקבל את תשומת לִבְּךָ לרגע?</item>
+        <item>יש לך כמה רגעים?</item>
+        <item>האם שכחת?</item>
+        <item>סליחה!</item>
+        <item>כיהיה לך רגע פנאי:</item>
+        <item>על השולחן:</item>
+        <item>פנוי לרגע?</item>
+        <item>אסטריד כאן</item>
+        <item>סליחה, אפשר להציק לך?</item>
+        <item>אפשר דקה מזמנך?</item>
+        <item>יום מצויין בשביל</item>
+    </string-array>
+
+    <string-array name="reminders_due">
+        <!-- reminders related to task due date -->
+        <item>קדימה לעבודה!</item>
+        <item>תאריך היעד הגיע!</item>
+        <item>מוכן להתחיל?</item>
+        <item>אמרת שתעשה את:</item>
+        <item>אתה אמור להתחיל:</item>
+        <item>זמן ההתחלה</item>
+        <item>הגיעה העת!</item>
+        <item>סליחה, הגיעה העת</item>
+        <item>פנוי? זה הזמן ל...</item>
+    </string-array>
+
+    <string-array name="reminders_snooze">
+        <!-- reminders related to snooze -->
+        <item>תפסיק להיות עצלן!</item>
+        <item>ההשתקה שלי הסתיימה!</item>
+        <item>די להשתקות!</item>
+        <item>מוכן?</item>
+        <item>די לדחות!</item>
+    </string-array>
+
+    <string-array name="reminder_responses">
+        <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
+        <item>יש לי משהו בשבילך!</item>
+        <item>מוכן לשים את זה מאחוריך?</item>
+        <item>למה שלא תגמור את זה וזהו?</item>
+        <item>מה דעתך?</item>
+        <item>קדימה?</item>
+        <item>קטן עליך!</item>
+        <item>בקרוב תהיה מאושר! רק תגמור את זה ודי!</item>
+        <item>מילה שלי: תרגיש הרבה יותר טוב כשרק תגמור את זה!</item>
+        <item>מה דעתך לעשות זאת?</item>
+        <item>אנא גמור, נמאס לי להזכיר לך!</item>
+        <item>אתה חושב שתוכל לעשות זאת? אני בטוחה שכן!</item>
+        <item>מתי כבר תעשה זאת?</item>
+        <item>תרגיש שוב עם עצמך! קדימה לעבודה!</item>
+        <item>אני כל כך גֵּאָה בְּךָ! עשה זאת!</item>
+        <item>חטיף קטן לפני שמתחילים?</item>
+        <item>רק את זה? בבקשה???</item>
+        <item>הגיע הזמן לקצר את רשימת המשימות שלך!</item>
+        <item>אתה תותח-לענין או נמושת-בלגן? אני בטוחה שתותח לענין! קדימה!</item>
+        <item>אמרתי כבר שאתה נהדר לאחרונה? בוא נמשיך!</item>
+        <item>משימה אחת ליום, והעומס ימוג כחלום... די לעומס!</item>
+        <item>איך עשית זאת? אני נפעמת!</item>
+        <item>אתה לא יכול להסתדר בחיים רק בזכות הפנים היפות שלך. כדאי להתחיל לעבוד!</item>
+        <item>מזג אוויר מצויין לעבודה מסוג זה, לא?</item>
+        <item>כוס קפה בזמן שאתה עובד על כך?</item>
+        <item>אם היית גומר את זה, יכולת ללכת ולעשות חיים.</item>
+        <item>זה הזמן. אי אפשר לדחות עוד ועוד.</item>
+        <item>אני נעלבת בכל פעם שאתה מתעלם ממני.</item>
+    </string-array>
+
+    <string-array name="postpone_nags">
+        <!-- Astrid\'s nagging when user clicks postpone -->
+        <item>מי שדוחה משימות, הוא פשוט טיפוס דוחה!</item>
+        <item>אתה לא מתעייף מלהיות עצלן כל כך?</item>
+        <item>איפשהו, מישהו תלוי בכך שתגמור את המשימה הזו!</item>
+        <item>כשאמרת לדחות, מה שהתכוונת באמת היה «אני עושה זאת» נכון?</item>
+        <item>זו הפעם האחרונה שאתה דוחה את זה, נכון?</item>
+        <item>רק תגמור את זה היום, ואני מבטיחה לא לספר לאף אחד על ההזנחות שלך!</item>
+        <item>למה לדחות, כאשר אפשר, אההם... פשוט לא לדחות!</item>
+        <item>מה יהיה? בכלל תגמור את זה פעם?</item>
+        <item>אתה בחור כל כך נחמד! מה דעתך פשוט לא לדחות?</item>
+        <item>אתה בטוח שתוכל להשיג את מטרותיך אם תדחה זאת?</item>
+        <item>דוחה, דוחה, דוחה... מתי תשתנה?</item>
+        <item>נמאס לי מהתירוצים שלך! פשוט עשה זאת ודי!</item>
+        <item>זה לא היה בדיוק אותו התירוץ בו השתמש בפעם הקודמת שדחית ?</item>
+        <item>אני ממש לא יכולה לעזור לך לארגן את החיים שלך, אם תעשה זאת...</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in repeat plug-in -->
+
+    <!-- repeating plugin name -->
+    <string name="repeat_plugin">משימות חוזרות</string>
+
+    <!-- repeating plugin description -->
+    <string name="repeat_plugin_desc">אפשר למשימות לחזור</string>
+
+    <!-- slide 20a: checkbox for turning on/off repeats -->
+    <string name="repeat_enabled">חזרה</string>
+
+    <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
+    <string name="repeat_every">כל %d</string>
+
+    <!-- hint when opening repeat interval -->
+    <string name="repeat_interval_prompt">אינטרוול חזרות</string>
+
+    <!-- slide 19b-->
+    <string name="repeat_never">Not repeating</string>
+    <!-- slide 20f-->
+    <string name="repeat_dont">ללא חזרות</string>
+
+    <string-array name="repeat_interval_short">
+        <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>יום</item>
+        <item>שב\'</item>
+        <item>חד\'</item>
+        <item>שע\'</item>
+        <item>דק\'</item>
+        <item>שנ\'</item>
+    </string-array>
+
+
+    <string-array name="repeat_interval">
+        <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>יום/ימים</item>
+        <item>שבוע/(ות)</item>
+        <item>חודש/ים</item>
+        <item>שעה/ות</item>
+        <item>דקה/דקות</item>
+        <item>שנה/שנים</item>
+    </string-array>
+
+    <string name="repeat_days">ימים</string>
+    <string name="repeat_weekdays">ימי עבודה</string>
+    <string name="repeat_weeks">שבועות</string>
+    <string name="repeat_months">חודשים</string>
+    <string name="repeat_years">שנים</string>
+    <string name="repeat_hours">שעות</string>
+    <string name="repeat_minutes">דקות</string>
+
+    <string-array name="repeat_until_shortcuts">
+        <item>לנצח</item>
+        <item>תאריך מסויים</item>
+        <item>היום</item>
+        <item>מחר</item>
+        <item>(יום אחרי)</item>
+        <item>שבוע הבא</item>
+        <item>שבועיים</item>
+        <item>החודש הבא</item>
+    </string-array>
+
+    <string name="repeat_until_title">חזור עד...</string>
+
+    <string name="repeat_keep_going">המשך</string>
+
+    <string-array name="repeat_type">
+        <!-- slide 20c: repeat type (date to repeat from) -->
+        <item>מתאריך היעד</item>
+        <!-- slide 20c -->
+        <item>מהיום שהמשימה הושלמה</item>
+    </string-array>
+
+    <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
+    <string name="repeat_detail_byday">$I על $D</string>
+
+    <!-- task detail for repeat from due date (%s -> interval) -->
+    <string name="repeat_detail_duedate">כל %s</string>
+
+    <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
+    <string name="repeat_detail_duedate_until">כל %1$s\nעד %2$s</string>
+
+    <!-- task detail for repeat from completion date (%s -> interval) -->
+    <string name="repeat_detail_completion">%s אחרי שהמשימה הושלמה</string>
+
+    <!-- text for button when repeating task indefinitely -->
+    <string name="repeat_forever">חזור לנצח</string>
+
+    <!-- text for button when repeating task until specified date (%s -> date string) -->
+    <string name="repeat_until">חזרה עד %s</string>
+
+    <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title">תזמון מחדש של משימה «%s\»</string>
+
+    <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title_last_time">«%s» משימה חוזרת בוצעה:</string>
+
+    <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->
+    <string name="repeat_rescheduling_dialog_bubble">%1$s תיזמנתי מחדש משימה חוזרת זו מ־%2$s
+        ל־%3$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
+    <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s תזמנתי מחדש משימה חוזרת זו
+        ל־%2$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
+    <string name="repeat_rescheduling_dialog_bubble_last_time">משימה זו חזרה עד %1$s, וכעת כל החזרות
+        הסתיימו. %2$s
+    </string>
+
+    <string-array name="repeat_encouragement">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>עבודה יפה!</item>
+        <item>יפה... אני כל כך גֵּאָה בְּךָ!</item>
+        <item>אני אוהבת שאתה פּוֹרֶה!</item>
+        <item>איזו הרגשה נהדרת לסמן ״בוצע״?</item>
+    </string-array>
+
+    <string-array name="repeat_encouragement_last_time">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>עבודה יפה!</item>
+        <item>אני כל כך גֵּאָה בְּךָ!</item>
+        <item>אני אוהבת שאתה פּוֹרֶה!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Subtasks Help Introduction -->
+    <string name="subtasks_help_title">מיין והזח באסטריד</string>
+    <string name="subtasks_help_1">גע והחזק כדי להעביר משימה</string>
+    <string name="subtasks_help_2">גרור אנכית כדי לארגן מחדש</string>
+    <string name="subtasks_help_3">גרור אופקית כדי להזיח</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-
-  <!-- Tags label -->
-  <string name="TEA_tags_label">רשימות</string>
-  
-  <!-- Tags label long version -->
-  <string name="TEA_tags_label_long">הוסף לרשימות</string>
- 
-  <!-- Tags hint -->
-  <string name="TEA_tag_hint">רשימה חדשה</string>
-  
-  <!-- Tags dropdown -->
-    
-  <!-- =============================================== Task List Controls == -->
-  
-  <!-- menu item for tags -->
-  
-  <!-- ========================================================== Extras == -->
-  
-  <!-- Context Item: show tag -->
-  
-  <!-- slide 25a: Dialog: new list -->
-  <string name="tag_new_list">רשימה חדשה</string>
-  
-  <!-- Dialog: list saved -->
-  
-  <!-- Dialog: task created without title -->
-  <string name="tag_no_title_error">אנא הכנס שם לרשימה זו</string>
-  
-  <!-- ========================================================== Filters == -->
-  
-  <!-- filter button to add tag -->
-  <string name="tag_FEx_add_new">חדש</string>
-  
-  <!-- filter header for tags -->
-  <string name="tag_FEx_header">רשימות</string>
-  
-  <!-- filter header for tags user created -->
-  
-  <!-- filter header for tags, shared with user -->
-  
-  <!-- filter header for tags which have no active tasks -->
-  
-  <!-- slide 10d: filter for untagged tasks -->
-  <string name="tag_FEx_untagged">Uncategorized</string>
-  
-  <!-- slide 27a: %s => tag name -->
-
-  <!-- context menu option to rename a tag -->
-  <string name="tag_cm_rename">שנה שם רשימה</string>
-
-  <!-- context menu option to delete a tag -->
-  <string name="tag_cm_delete">מַחֲקִי רשימה</string>
-  
-  <!-- context menu option to leave a shared list -->
-  <string name="tag_cm_leave">עזוב רשימה</string>
-
-  <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
-  <string name="DLG_delete_this_tag_question">למחוק את הרשימה %s? (המשימות שברשימה לא תימחקנה.)</string>
-  
-  <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
-  <string name="DLG_leave_this_shared_tag_question">לעזוב את הרשימה המשותפת %s? (המשימות לא תימחקנה.)</string>
-
-  <!-- Dialog to rename tag -->
-  <string name="DLG_rename_this_tag_header">שינוי שם הרשימה %s ל:</string>
-
-  <!-- Toast notification that no changes have been made -->
-  <string name="TEA_no_tags_modified">לא נעשו שינויים</string>
-
-  <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_deleted">"הרשימה %1$s נמחקה,  %2$d משימות השתנו"</string>
-  
-  <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_left">"עזבת את הרשימה המשותפת  %1$s,   %2$d משימות השתנו"</string>
-
-  <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
-  <string name="TEA_tags_renamed">"החלפתי את  %1$s ב %2$s עבור %3$d משימות"</string>
-  
-  <!-- Tag case migration -->
-  <string name="tag_case_migration_notice">"שמתי לב שיש לך רשימות ששמן נבדל זו מזו רק בגודל האותיות הלועזיות. לדעתי, התכוונת לאותה רשימה, ועל כן מיזגתי את הרשימות. אם זה אינו מה שרצית, תוכל תמיד למחוק את הרשימה הממוזגת. לידיעתך, הרשימות המקומיות נשמרו תוך הוספת מספר לשמן (לדוגמא,  Shopping_1, Shopping_2)."</string>
-  
-  <!-- Header for tag settings -->
-  <string name="tag_settings_title">הגדרות רשימה:</string>
-  
-  <!-- Header for tag activity -->
-  <string name="tag_updates_title">פעילות: %s</string>
-  
-  <!-- Delete button for tag settings -->
-  <string name="tag_delete_button">מחיקת רשימה</string>
-  
-  <!-- slide 28d: Leave button for tag settings -->
-  <string name="tag_leave_button">עזוב רשימה זו</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Tags label -->
+    <string name="TEA_tags_label">רשימות</string>
 
+    <!-- Tags label long version -->
+    <string name="TEA_tags_label_long">הוסף לרשימות</string>
+
+    <!-- Tags hint -->
+    <string name="TEA_tag_hint">רשימה חדשה</string>
+
+    <!-- Tags dropdown -->
+
+    <!-- =============================================== Task List Controls == -->
+
+    <!-- menu item for tags -->
+
+    <!-- ========================================================== Extras == -->
+
+    <!-- Context Item: show tag -->
+
+    <!-- slide 25a: Dialog: new list -->
+    <string name="tag_new_list">רשימה חדשה</string>
+
+    <!-- Dialog: list saved -->
+
+    <!-- Dialog: task created without title -->
+    <string name="tag_no_title_error">אנא הכנס שם לרשימה זו</string>
+
+    <!-- ========================================================== Filters == -->
+
+    <!-- filter button to add tag -->
+    <string name="tag_FEx_add_new">חדש</string>
+
+    <!-- filter header for tags -->
+    <string name="tag_FEx_header">רשימות</string>
+
+    <!-- filter header for tags user created -->
+
+    <!-- filter header for tags, shared with user -->
+
+    <!-- filter header for tags which have no active tasks -->
+
+    <!-- slide 10d: filter for untagged tasks -->
+    <string name="tag_FEx_untagged">Uncategorized</string>
+
+    <!-- slide 27a: %s => tag name -->
+
+    <!-- context menu option to rename a tag -->
+    <string name="tag_cm_rename">שנה שם רשימה</string>
+
+    <!-- context menu option to delete a tag -->
+    <string name="tag_cm_delete">מַחֲקִי רשימה</string>
+
+    <!-- context menu option to leave a shared list -->
+    <string name="tag_cm_leave">עזוב רשימה</string>
+
+    <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
+    <string name="DLG_delete_this_tag_question">למחוק את הרשימה %s? (המשימות שברשימה לא תימחקנה.)
+    </string>
+
+    <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
+    <string name="DLG_leave_this_shared_tag_question">לעזוב את הרשימה המשותפת %s? (המשימות לא
+        תימחקנה.)
+    </string>
+
+    <!-- Dialog to rename tag -->
+    <string name="DLG_rename_this_tag_header">שינוי שם הרשימה %s ל:</string>
+
+    <!-- Toast notification that no changes have been made -->
+    <string name="TEA_no_tags_modified">לא נעשו שינויים</string>
+
+    <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_deleted">"הרשימה %1$s נמחקה, %2$d משימות השתנו"</string>
+
+    <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_left">"עזבת את הרשימה המשותפת %1$s, %2$d משימות השתנו"</string>
+
+    <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
+    <string name="TEA_tags_renamed">"החלפתי את %1$s ב %2$s עבור %3$d משימות"</string>
+
+    <!-- Tag case migration -->
+    <string name="tag_case_migration_notice">"שמתי לב שיש לך רשימות ששמן נבדל זו מזו רק בגודל
+        האותיות הלועזיות. לדעתי, התכוונת לאותה רשימה, ועל כן מיזגתי את הרשימות. אם זה אינו מה שרצית,
+        תוכל תמיד למחוק את הרשימה הממוזגת. לידיעתך, הרשימות המקומיות נשמרו תוך הוספת מספר לשמן
+        (לדוגמא, Shopping_1, Shopping_2)."
+    </string>
+
+    <!-- Header for tag settings -->
+    <string name="tag_settings_title">הגדרות רשימה:</string>
+
+    <!-- Header for tag activity -->
+    <string name="tag_updates_title">פעילות: %s</string>
+
+    <!-- Delete button for tag settings -->
+    <string name="tag_delete_button">מחיקת רשימה</string>
+
+    <!-- slide 28d: Leave button for tag settings -->
+    <string name="tag_leave_button">עזוב רשימה זו</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in timers plug-in -->
-    
+
     <!-- Task List: Start Timer button -->
-    
+
     <!-- Task List: Stop Timer button -->
-    
+
     <!-- Android Notification Title (%s => # tasks) -->
     <string name="TPl_notification">קוצב זמן הופעל עבור %s משימות</string>
-    
+
     <!-- Filter Header for Timer plugin -->
-    
+
     <!-- Filter for Timed Tasks -->
     <string name="TFE_workingOn">משימות עם הערכת זמן</string>
-    
+
     <!-- Title for TEA -->
     <string name="TEA_timer_controls">טיימר</string>
-    
-    
+
+
     <!-- Edit Notes: create comment for when timer is started -->
     <string name="TEA_timer_comment_started">התחיל משימה זו:</string>
-    
+
     <!-- Edit Notes: create comment for when timer is stopped -->
     <string name="TEA_timer_comment_stopped">הפסק ביצוע של משימה זו:</string>
-    
+
     <!-- Edit Notes: comment to notify how long was spent on task -->
     <string name="TEA_timer_comment_spent">זמן שהושקע:</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Update string from activity codes %1$s - user, %2$s - target name, %3$s - message, %4$s - other_user-->
-    
+
     <!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
     Please do not translate this part of the string. -->
-    
+
     <!-- These are still in use -->
     <string name="update_string_default_comment">%1$s הוסיף: %3$s</string>
     <string name="update_string_task_comment">%1$s על $link_task: %3$s</string>
     <string name="update_string_tag_comment">%1$s על %2$s: %3$s</string>
     <string name="update_string_user_self">את/אתה</string>
-    
+
     <string name="history_yourself">אתה</string>
     <string name="history_you">אתה</string>
     <string name="history_a_deleted_user">(משתמש שנמחק)</string>
-    
+
     <string name="history_this_list">רשימה זו</string>
     <string name="history_this_task">משימה זו</string>
-    <string name="history_tag_added">הוסיף את  %1$s ל%2$s</string>
+    <string name="history_tag_added">הוסיף את %1$s ל%2$s</string>
     <string name="history_tag_removed">הסיר את %1$s מ%2$s</string>
     <string name="history_attach_added">צירף את %1$s ל %2$s</string>
     <string name="history_attach_removed">הסיר את %1$s מ %2$s</string>
@@ -2977,10 +3153,10 @@
     <string name="history_undeleted">%s: מחיקה בוטלה</string>
     <string name="history_completed">%s: בוצעה</string>
     <string name="history_uncompleted">%s: לא בוצעה</string>
-    <string name="history_importance_changed">שינה את העדיפות של %1$s מ %2$s   ל %3$s</string>
-    <string name="history_title_changed">שינה את הכותרת של  %1$s מ   %2$s ל %3$s </string>
-    <string name="history_title_set">קבע את הכותרת של  %1$s ל %2$s</string>
-    <string name="history_name_changed">שינה את השם מ  %1$s  ל  %2$s</string>
+    <string name="history_importance_changed">שינה את העדיפות של %1$s מ %2$s ל %3$s</string>
+    <string name="history_title_changed">שינה את הכותרת של %1$s מ %2$s ל %3$s</string>
+    <string name="history_title_set">קבע את הכותרת של %1$s ל %2$s</string>
+    <string name="history_name_changed">שינה את השם מ %1$s ל %2$s</string>
     <string name="history_name_set">קבע את השם ל %2$s</string>
     <string name="history_description_changed">שינה את התיאור מ %1$s ל %2$s</string>
     <string name="history_description_set">קבע את התיאור ל %2$s</string>
@@ -2988,10 +3164,10 @@
     <string name="history_made_private">הפך את %s לפרטית</string>
     <string name="history_silenced">החריש את %s</string>
     <string name="history_unsilenced">ביטל את ההחרשה של %s</string>
-    <string name="history_favorited">הפך את  %s למועדפת</string>
+    <string name="history_favorited">הפך את %s למועדפת</string>
     <string name="history_unfavorited">ביטל את ההעדפה של %s</string>
     <string name="history_changed_list_picture">שינה את התמונה של רשימה זו</string>
-    <string name="history_added_description_characters">הוסיף %1$d תווים לתיאור של  %2$s </string>
+    <string name="history_added_description_characters">הוסיף %1$d תווים לתיאור של %2$s</string>
     <string name="history_removed_description">הסיר את התיאור של %s</string>
     <string name="history_removed_description_characters">הסיר %1$d תווים מהתיאור של %2$s</string>
     <string name="history_updated_description">עדכן את התיאור של %s</string>
@@ -3002,7 +3178,7 @@
     <string name="history_assigned_to">הטיל את %1$s על %2$s</string>
     <string name="history_created_for">יצר את %1$s בעבור %2$s</string>
     <string name="history_created">יצר את %s</string>
-    <string name="history_changed_due_date">שינה את תאריך היעד של  %1$s מ- %2$s ל %3$s</string>
+    <string name="history_changed_due_date">שינה את תאריך היעד של %1$s מ- %2$s ל %3$s</string>
     <string name="history_set_due_date">קבע %1$s תאריך היעד ל %2$s</string>
     <string name="history_removed_due_date">הסיר את תאריך היעד של %s</string>
     <string name="history_completed_repeating_task">ביצע את %1$s (מועד יעד כעת: %2$s)</string>
@@ -3016,195 +3192,217 @@
     <string name="history_repeat_on">על %s</string>
     <string name="history_repeat_from_completion">אחרי ביצוע</string>
     <string name="history_acknowledged">הציג את %s</string>
-    
-    <string name="history_default">שינה את %1$s ל %2$s</string>
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-    
-  <!-- Voice Add Prompt Text -->
-  <string name="voice_create_prompt">דַּבֵּר כדי ליצור משימה</string>
-  <string name="voice_edit_title_prompt">דַּבֵּר כדי לקבוע את כותרת המשימה</string>
-  <string name="voice_edit_note_prompt">דַּבֵּר כדי לקבוע את ההערות למשימה</string>
-    
-  <!-- Preference: Task List recognition-service is not installed, but available -->
-  <string name="EPr_voiceInputInstall_dlg">קלט קולי אינו מותקן עדיין.\nהֲתִּרְצֶה ללכת לחנות של גוגל ולהתקינו משם?</string>
-  <!-- Preference: Task List recognition-service is not available for this system -->
-  <string name="EPr_voiceInputUnavailable_dlg">לצערי, קלט קולי איוו נתמשך על המערכת שלך. \nאם אפשרי, נסה לעדכן לגירסת 2.1 ומעלה של אנדרואיד.</string>
-  <!-- Preference: Market is not available for this system -->
-  <string name="EPr_marketUnavailable_dlg">לרוע המזל, חנות היישומים אינה נגישה כעת,נסה אולי להוריד את החיפוש הקולי ממקור אחר</string>
-  <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
-  <string name="EPr_voiceInputEnabled_title">קלט קולי</string>
-  <!-- slide 38a: Preference: voice button description (true) -->
-  <string name="EPr_voiceInputEnabled_desc_enabled">כפתור קלט קולי יוצג ברשימת המשימות</string>
-  <!-- Preference: voice button description (false) -->
-  <string name="EPr_voiceInputEnabled_desc_disabled">כפתור קלט קולי לא יוצג ברשימת המשימות</string>
-  <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
-  <string name="EPr_voiceInputCreatesTask_title">צור משימות ישירות</string>
-  <!-- Preference: Task List Voice-creation description (true) -->
-  <string name="EPr_voiceInputCreatesTask_desc_enabled">משימות תיווצרנה באופן אוטומטי מקלט קולי</string>
-  <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
-  <string name="EPr_voiceInputCreatesTask_desc_disabled">תוכל לערוך את כותרת המשימה אחרי שהתזכורת הקולית תסתיים</string>
-  <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
-  <string name="EPr_voiceRemindersEnabled_title">תזכורות קוליות</string>
-  <!-- Preference: Voice reminders description (true) -->
-  <string name="EPr_voiceRemindersEnabled_desc_enabled">אסטריד תאמר את שם המשימה כחלק מהתזכורת</string>
-  <!-- slide 38c: Preference: Voice reminders description (false) -->
-  <string name="EPr_voiceRemindersEnabled_desc_disabled">אסטריד תשמיע נְעִימוֹן במתן תזכורות למשימות</string>    
-  
-  <!-- slide 32d: Preference Category: Voice Title -->
-  <string name="EPr_voice_header">הגדרות קלט קולי</string>
-    
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-  
-  <!-- slide 30a-->
-  <string name="welcome_setting">הציגי מדריך</string>
-  
-  <string name="welcome_title_1">ברוך בואך לאסטריד!</string>
-
-  <!-- slide 2a -->
-  <string name="welcome_title_2">הכנת רשימות</string>
-
-  <!-- slide 3a-->
-  <string name="welcome_title_3">מעבר בין רשימות</string>
-
-  <!-- slide 4a -->
-  <string name="welcome_title_4">שַׁתְּפִי רשימות</string>
-
-  <!-- slide 5a -->
-  <string name="welcome_title_5">חלוקת משימות בין חברים</string>
-
-  <!-- slide 6a -->
-  <string name="welcome_title_6">הוסף פרטים</string>
 
-  <!-- slide 7a -->
-  <string name="welcome_title_7">התחבר כעת\nכדי להתחיל!</string>
-  
-  <string name="welcome_title_7_return">זהו זה!</string>
-  
-  <!-- slide 1b -->
-  <string name="welcome_body_1">המנהלת האישית המושלמת של רשימת המשימות אשר עובדת מצויין עם שותפים</string>
-
-  <!-- slide 2b-->
-  <string name="welcome_body_2">מעולה לכל סוגי הרשימות:\nרשימת קריאה, רשימת קניות, רשימת ביקורים ורשימת מעקב!</string>
-
-  <!-- slide 3b -->
-  <string name="welcome_body_3">טְפַח על כותרת הרשימה \nכדי לראות את כל הרשימות</string>
-
-  <!-- slide 4b -->
-  <string name="welcome_body_4">שתף רשימות עם חברים,\nשותפים, וגם עם אהובתך</string>
-
-  <!-- slide 5b -->
-  <string name="welcome_body_5">איתי תוכל להיות תמיד\nבטוח מי יביא קינוח!</string>
+    <string name="history_default">שינה את %1$s ל %2$s</string>
 
-  <!-- slide 6b-->
-  <string name="welcome_body_6">גע כדי להוסיף הערות, לקבוע\nתזכורות, ועוד הרבה יותר!</string>
-  <string name="welcome_body_7">התחבר</string>
-  
-  <string name="welcome_body_7_return">טְפַח על אסטריד כדי לחזור</string>
-  
-  <!-- slide 1c -->
-  <string name="welcome_next">הבא</string>
-  
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Voice Add Prompt Text -->
+    <string name="voice_create_prompt">דַּבֵּר כדי ליצור משימה</string>
+    <string name="voice_edit_title_prompt">דַּבֵּר כדי לקבוע את כותרת המשימה</string>
+    <string name="voice_edit_note_prompt">דַּבֵּר כדי לקבוע את ההערות למשימה</string>
+
+    <!-- Preference: Task List recognition-service is not installed, but available -->
+    <string name="EPr_voiceInputInstall_dlg">קלט קולי אינו מותקן עדיין.\nהֲתִּרְצֶה ללכת לחנות של
+        גוגל ולהתקינו משם?
+    </string>
+    <!-- Preference: Task List recognition-service is not available for this system -->
+    <string name="EPr_voiceInputUnavailable_dlg">לצערי, קלט קולי איוו נתמשך על המערכת שלך. \nאם
+        אפשרי, נסה לעדכן לגירסת 2.1 ומעלה של אנדרואיד.
+    </string>
+    <!-- Preference: Market is not available for this system -->
+    <string name="EPr_marketUnavailable_dlg">לרוע המזל, חנות היישומים אינה נגישה כעת,נסה אולי להוריד
+        את החיפוש הקולי ממקור אחר
+    </string>
+    <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
+    <string name="EPr_voiceInputEnabled_title">קלט קולי</string>
+    <!-- slide 38a: Preference: voice button description (true) -->
+    <string name="EPr_voiceInputEnabled_desc_enabled">כפתור קלט קולי יוצג ברשימת המשימות</string>
+    <!-- Preference: voice button description (false) -->
+    <string name="EPr_voiceInputEnabled_desc_disabled">כפתור קלט קולי לא יוצג ברשימת המשימות
+    </string>
+    <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
+    <string name="EPr_voiceInputCreatesTask_title">צור משימות ישירות</string>
+    <!-- Preference: Task List Voice-creation description (true) -->
+    <string name="EPr_voiceInputCreatesTask_desc_enabled">משימות תיווצרנה באופן אוטומטי מקלט קולי
+    </string>
+    <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
+    <string name="EPr_voiceInputCreatesTask_desc_disabled">תוכל לערוך את כותרת המשימה אחרי שהתזכורת
+        הקולית תסתיים
+    </string>
+    <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
+    <string name="EPr_voiceRemindersEnabled_title">תזכורות קוליות</string>
+    <!-- Preference: Voice reminders description (true) -->
+    <string name="EPr_voiceRemindersEnabled_desc_enabled">אסטריד תאמר את שם המשימה כחלק מהתזכורת
+    </string>
+    <!-- slide 38c: Preference: Voice reminders description (false) -->
+    <string name="EPr_voiceRemindersEnabled_desc_disabled">אסטריד תשמיע נְעִימוֹן במתן תזכורות
+        למשימות
+    </string>
+
+    <!-- slide 32d: Preference Category: Voice Title -->
+    <string name="EPr_voice_header">הגדרות קלט קולי</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 30a-->
+    <string name="welcome_setting">הציגי מדריך</string>
+
+    <string name="welcome_title_1">ברוך בואך לאסטריד!</string>
+
+    <!-- slide 2a -->
+    <string name="welcome_title_2">הכנת רשימות</string>
+
+    <!-- slide 3a-->
+    <string name="welcome_title_3">מעבר בין רשימות</string>
+
+    <!-- slide 4a -->
+    <string name="welcome_title_4">שַׁתְּפִי רשימות</string>
+
+    <!-- slide 5a -->
+    <string name="welcome_title_5">חלוקת משימות בין חברים</string>
+
+    <!-- slide 6a -->
+    <string name="welcome_title_6">הוסף פרטים</string>
+
+    <!-- slide 7a -->
+    <string name="welcome_title_7">התחבר כעת\nכדי להתחיל!</string>
+
+    <string name="welcome_title_7_return">זהו זה!</string>
+
+    <!-- slide 1b -->
+    <string name="welcome_body_1">המנהלת האישית המושלמת של רשימת המשימות אשר עובדת מצויין עם
+        שותפים
+    </string>
+
+    <!-- slide 2b-->
+    <string name="welcome_body_2">מעולה לכל סוגי הרשימות:\nרשימת קריאה, רשימת קניות, רשימת ביקורים
+        ורשימת מעקב!
+    </string>
+
+    <!-- slide 3b -->
+    <string name="welcome_body_3">טְפַח על כותרת הרשימה \nכדי לראות את כל הרשימות</string>
+
+    <!-- slide 4b -->
+    <string name="welcome_body_4">שתף רשימות עם חברים,\nשותפים, וגם עם אהובתך</string>
+
+    <!-- slide 5b -->
+    <string name="welcome_body_5">איתי תוכל להיות תמיד\nבטוח מי יביא קינוח!</string>
+
+    <!-- slide 6b-->
+    <string name="welcome_body_6">גע כדי להוסיף הערות, לקבוע\nתזכורות, ועוד הרבה יותר!</string>
+    <string name="welcome_body_7">התחבר</string>
+
+    <string name="welcome_body_7_return">טְפַח על אסטריד כדי לחזור</string>
+
+    <!-- slide 1c -->
+    <string name="welcome_next">הבא</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <string name="widget_mini">- Astrid Mini -</string>
-    
+
     <!-- Resources for power pack widget -->
-    
+
     <string name="PPW_widget_42_label">Old Astrid 4x2</string>
     <string name="PPW_widget_43_label">Old Astrid 4x3</string>
     <string name="PPW_widget_44_label">Old Astrid 4x4</string>
     <string name="PPW_widget_v11_label">- Astrid -</string>
     <string name="PPW_widget_custom_label">משגר אסטריד פרימיום מותאם אישית</string>
     <string name="PPW_widget_custom_launcherpro_label">משגר אסטריד פרימיום פרו</string>
-    
+
     <string name="PPW_configure_title">הגדרות חֲפִיץ מסך</string>
-    
+
     <string name="PPW_color">צבע חֲפִיץ מסך</string>
     <string name="PPW_enable_calendar">הצג מאורעות יומן</string>
     <string name="PPW_disable_encouragements">הסתר קריאות עידוד</string>
     <string name="PPW_show_dates">להציג תאריכי יעד?</string>
     <string name="PPW_filter">בחר מַסְנֵן</string>
-    
+
     <string name="PPW_due">למתי:</string>
     <string name="PPW_past_due">באיחור:</string>
-    
-    <string name="PPW_old_astrid_notice">מצטערת, אך עליך להשתמש בגירסא 3.6 לפחות כדי להשתמש בְּחֲפִיץ מסך זה!</string>
-    
+
+    <string name="PPW_old_astrid_notice">מצטערת, אך עליך להשתמש בגירסא 3.6 לפחות כדי להשתמש
+        בְּחֲפִיץ מסך זה!
+    </string>
+
     <string-array name="PPW_encouragements">
         <!-- general encouragements -->
-    	<item>שלום!</item>
-    	<item>אולי יש לך זמן כדי לגמור משהו?</item>
-    	<item>אתה נראה כל כך מוצלח היום יקירי!</item>
-    	<item>עשה משהו גדול היום!</item>
-    	<item>תן לי להתגאות בְּךָ היום!</item>
-    	<item>מה שלומך היום?</item>
+        <item>שלום!</item>
+        <item>אולי יש לך זמן כדי לגמור משהו?</item>
+        <item>אתה נראה כל כך מוצלח היום יקירי!</item>
+        <item>עשה משהו גדול היום!</item>
+        <item>תן לי להתגאות בְּךָ היום!</item>
+        <item>מה שלומך היום?</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_tod">
         <!-- encouragements based on time of day -->
-    	<item>בוקר טוב!</item>
-    	<item>אחר-צהריים טובים!</item>
-    	<item>ערב טוב!</item>
-    	<item>מאוחר בלילה?</item>
-    	<item>מוקדם כעת, אולי תעשה משהו?</item>
-    	<item>אולי כוס תה של אחרי-הצהריים?</item>
-    	<item>ערב נעים!</item>
-    	<item>אתה הרי יודע ששינה תיטיב עמך!</item>
+        <item>בוקר טוב!</item>
+        <item>אחר-צהריים טובים!</item>
+        <item>ערב טוב!</item>
+        <item>מאוחר בלילה?</item>
+        <item>מוקדם כעת, אולי תעשה משהו?</item>
+        <item>אולי כוס תה של אחרי-הצהריים?</item>
+        <item>ערב נעים!</item>
+        <item>אתה הרי יודע ששינה תיטיב עמך!</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_completed">
         <!-- encouragements based on tasks completed (%d => completed) -->
-    	<item>בצעת כבר %d משימות</item>
-    	<item>תוצאה בחיים: %d משימות בוצעו</item>
-    	<item>חַיֵּךְ! גמרת כבר %d משימות!</item>
+        <item>בצעת כבר %d משימות</item>
+        <item>תוצאה בחיים: %d משימות בוצעו</item>
+        <item>חַיֵּךְ! גמרת כבר %d משימות!</item>
     </string-array>
-  	<string name="PPW_encouragements_none_completed">לא סיימת יותר מדי משימות עדיין! שנתחיל?</string>
-        
+    <string name="PPW_encouragements_none_completed">לא סיימת יותר מדי משימות עדיין! שנתחיל?
+    </string>
+
     <string-array name="PPW_colors">
         <item>שחור</item>
         <item>לבן</item>
         <item>כחול</item>
         <item>שקוף למחצה</item>
     </string-array>
-    
+
     <string name="PPW_widget_dlg_text">חֲפִיץ מסך זה זמין רק למי שיש לו חֲבִילַת הַכֹּחַ</string>
     <string name="PPW_widget_dlg_ok">תצוגה מקדימה</string>
-    
+
     <string name="PPW_demo_title1">פריטים ב־%s יגיעו לכאן</string>
     <string name="PPW_demo_title2">חבילת הַכֹּחַ כוללת גם חֲפִיצֵי מסך מתקדמים...</string>
     <string name="PPW_demo_title3">ותן הרגשה טובה!</string>
     <string name="PPW_demo_title4">טְפַח כדי ללמוד עוד</string>
-    
+
     <string name="PPW_info_title">חבילת כֹּחַ חינם!</string>
     <string name="PPW_info_signin">התחבר!</string>
     <string name="PPW_info_later">מאוחר יותר</string>
-    <string name="PPW_unlock_howto">שתף רשימות עם חברים! ושחרר את הנעילה של חבילת הַכֹּחַ של אסטריד כאשר שלושה חברים ירשמו לאסטריד</string>
+    <string name="PPW_unlock_howto">שתף רשימות עם חברים! ושחרר את הנעילה של חבילת הַכֹּחַ של אסטריד
+        כאשר שלושה חברים ירשמו לאסטריד
+    </string>
     <string name="PPW_check_button">קבל את חבילת הַכֹּחַ חינם!</string>
     <string name="PPW_check_share_lists">שתף רשימות!</string>
     <string name="PPW_api_level">סליחה! היישומון נתמך בגירסת אנדרואיד 3.0 ומעלה בלבד.</string>
-    
+
     <string name="EPr_widget_enabled_title">אַפְשְׁרִי\חִסְמִי חֲפִיצִים</string>
-    <string name="PPW_restart_for_enabled_state">ייתכן ותזדקק לאתחל את מכשיר הפלאפון שברשותך על מנת לגרום לשינוי להשפיע.</string>
+    <string name="PPW_restart_for_enabled_state">ייתכן ותזדקק לאתחל את מכשיר הפלאפון שברשותך על מנת
+        לגרום לשינוי להשפיע.
+    </string>
 
 </resources>
diff --git a/astrid/res/values-ja/strings.xml b/astrid/res/values-ja/strings.xml
index fe188866e..d6d567399 100755
--- a/astrid/res/values-ja/strings.xml
+++ b/astrid/res/values-ja/strings.xml
@@ -4,1697 +4,1818 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ================================================== general terms == -->
-
-  <!-- People Editing Activity -->    
-  
-  <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
-  <string name="actfm_person_hint">連絡先またはメールアドレス</string>
-  
-  <!-- task sharing dialog: shared with hint -->
-  <string name="actfm_person_or_tag_hint">連絡先または共有リスト</string>
-
-  <!-- toast on transmit success -->
-
-  <!-- can\'t rename or delete shared tag message -->
-  
-  <!-- warning before deleting a list you\'re the owner of -->
-  <string name="actfm_tag_operation_owner_delete">あなたはこの共有リストの所有者です！もしリストを削除すると、リストのすべてのメンバーからも削除されます。本当によろしいですか？</string>
-
-  <!-- slide 29a: menu item to take a picture -->
-  <string name="actfm_picture_camera">写真を撮る</string>
-
-  <!-- slide 29b: menu item to select from gallery -->
-  <string name="actfm_picture_gallery">ギャラリーから選択</string>
-  
-  <!-- menu item to clear picture selection -->
-  <string name="actfm_picture_clear">写真を削除</string>
-
-  <!-- filter list activity: refresh tags -->
-  
-  <!-- Title for prompt after sharing a task -->
-  <string name="actfm_view_task_title">タスクを表示しますか？</string>
-
-  <!-- Text for prompt after sharing a task -->
-  <string name="actfm_view_task_text">タスクは%sに送信されました！只今あなたのタスクが表示されています。あなたが割り当ていた他のタスクもここで表示しますか？</string>
-  
-  <!-- Ok button for task view prompt -->
-  <string name="actfm_view_task_ok">表示する</string>
-      
-  <!-- Cancel button for task view prompt -->
-  <string name="actfm_view_task_cancel">表示しない</string>
-  
-  <!-- slide 13a: Title for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_title">自分の共有タスク</string>
-  
-  <!-- Empty list for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_empty">共有タスクがありません</string>
-  
-  <!-- =====================  Friendship connections -->
-  
-  <string name="actfm_friendship_pending">You\'ve sent a friend request to %s!</string>
-
-  <string name="actfm_friendship_blocked">You\'ve blocked %s.</string>
-
-  <string name="actfm_friendship_ignored">You\'ve ignored %s.</string>
-  
-  <string name="actfm_friendship_friends">You\'re friends with %s! Add tasks for them below.</string>
-
-  <string name="actfm_friendship_other_pending">%s wants to be friends with you!</string>
-
-  <string name="actfm_friendship_no_status">Connect with %s to share and see activity on public tasks!</string>
-
-  <string name="actfm_friendship_connect">Add friend</string>
-
-  <string name="actfm_friendship_accept">受け入れる</string>
-
-  <!-- ================================================== TagViewActivity == -->  
-
-  <!-- Tag View Activity: Add Comment hint -->    
-  <string name="TVA_add_comment">コメントする</string>
-
-  <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->    
-  
-  <!-- Tabs for Tag view -->
-  <string-array name="TVA_tabs">
-    <!-- Tab for showing tasks -->
-    <item>タスク</item>
-    <!-- Tab for showing comments & updates -->
-    <item>活動</item>
-    <!-- Tab for showing setting -->
-    <item>リストの設定</item>
-  </string-array>
-  
-  <!-- Tag View: filtered by assigned to user (%s => user name) -->
-  <string name="actfm_TVA_filtered_by_assign">%sさんのタスク。すべてのタスクを表示する</string>
-  
-  <!-- Tag View: filter by unassigned tasks -->
-  <string name="actfm_TVA_filter_by_unassigned">割り当てられていないタスク。皆のためにタップして。</string>
-
-  <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">マイリスト。リストを編集するまたは共有する</string>
-
-  <!-- Tag View Menu: refresh -->
-  <string name="actfm_TVA_menu_refresh">更新</string>
-
-  <!-- Tag Settings: tag name label -->
-  <string name="actfm_TVA_tag_label">リスト</string>
-
-  <!-- Tag Settings: tag owner label -->
-
-  <!-- Tag Settings: tag owner value when there is no owner -->
-
-  <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
-  <string name="actfm_TVA_members_label">共有者</string>
-  
-  <!-- Tag Settings: list collaborators hint -->
-  <string name="actfm_TVA_members_hint">メールアドレスで共有できます</string>
-
-  <!-- Tag Settings: tag picture -->
-  <string name="actfm_TVA_tag_picture">リスト写真</string>
-
-  <!-- slide 25c/28b: Tag Settings: silence notifications label -->
-  <string name="actfm_TVA_silence_label">通知を無効する</string>
-  
-  <!-- Tag Settings: list icon label -->
-  
-  <!-- slide 25b/27d: Tag Settings: list description label -->
-  <string name="actfm_TVA_tag_description_label">説明</string>
-  
-  <!-- slide 28a: Tag Settings: list settings label -->
-  <string name="actfm_TVA_tag_settings_label">設定</string>
-
-  <!-- slide 25b: Tag Settings: list description hint -->
-  <string name="actfm_TVA_tag_description_hint">ここに説明をタイプする</string>
-  
-  <!-- slide 25d: Tag Settings: list name hint -->
-  <string name="actfm_TVA_tag_name_hint">リスト名を記入してください</string>
-  
-  <!-- Tag settings: login prompt from share-->
-  <string name="actfm_TVA_login_to_share">リストを共有するためにはAstrid.comへのログインが必要です！ログインするか、プライベートリストに設定してください。</string>
-  
-      
-  <!-- ============================================ edit people dialog == -->
-
-  <!-- task sharing dialog: intro -->
-  <string name="actfm_EPA_intro">Use Astrid to share shopping lists, party plans, or team projects and instantly see when people get stuff done!</string>
-    
-  <!-- task sharing dialog: window title -->
-    
-  <!-- task sharing dialog: save button -->
-  
-  <!-- task sharing dialog: assigned label -->
-  
-  <!-- slide 18a: task sharing dialog: assigned label long version -->
-  <string name="actfm_EPA_assign_label_long">参加者を追加します</string>
-  
-  <!-- task sharing dialog: assigned to me -->
-  <string name="actfm_EPA_assign_me">私</string>
-  
-  <!-- task sharing dialog: anyone -->
-  <string name="actfm_EPA_unassigned">割り当てられていない</string>
-  
-  <!-- slide 18c: task sharing dialog: choose a contact -->
-  <string name="actfm_EPA_choose_contact">連絡先を選択する</string>
-  
-  <!-- task sharing dialog: custom email assignment -->
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_share_with">共有者:</string>
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_collaborators_header">Share</string>
-
-      <!-- task sharing dialog: collaborator list name (%s => name of list) -->
-  <string name="actfm_EPA_list">リスト: %s</string>
-  
-  <!-- task sharing dialog: assigned hint -->
-  
-  <!-- task sharing dialog: message label text -->
-  <string name="actfm_EPA_message_text">招待メッセージ:</string>
-  
-  <!-- task sharing dialog: message body -->
-  <string name="actfm_EPA_message_body">Help me get this done!</string>
-  
-  <!-- task sharing dialog: list members section header -->
-  <string name="actfm_EPA_assign_header_members">リストメンバー</string>
-
-  <!-- task sharing dialog: astrid friends section header -->
-  <string name="actfm_EPA_assign_header_friends">Astridユーザー</string>
-
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: share with Facebook -->
-  <string name="actfm_EPA_facebook">フェイスブック</string>
-  
-  <!-- task sharing dialog: share with Twitter -->
-  <string name="actfm_EPA_twitter">ツィッター</string>
-
-  <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
-
-  <!-- task sharing dialog: edit people settings saved -->
-
-  <!-- task sharing dialog: invalid email (%s => email) -->
-  <string name="actfm_EPA_invalid_email">無効なEメール: %s</string>
-
-  <!-- task sharing dialog: tag not found (%s => tag) -->
-  
-  <!-- task sharing login prompt -->
-  <string name="actfm_EPA_login_to_share">You need to be logged in to Astrid.com to share tasks!</string>
-  
-  <string name="actfm_EPA_login_button">ログイン</string>
-  
-  <string name="actfm_EPA_dont_share_button">共有しない</string>
-  
-  <string name="actfm_EPA_add_person_to_list_title">割り当てられたタスク</string>
-  
-  <string name="actfm_EPA_add_person_to_list">%1$s is not shared on this list. Would you like to add %2$s to this list?</string>
-
-  <string name="actfm_EPA_add_person_to_list_ok">リストに追加する</string>
-  
-  <string name="actfm_EPA_add_person_to_list_cancel">追加しないで</string>
-  
-  <string name="actfm_list_owner">(owner)</string>
-  
-  <!-- ========================================= sharing login activity == -->
-
-  <!-- share login: Title -->
-  <string name="actfm_ALA_title">Asteroid.comにようこそ！</string>
-
-  <!-- share login: Sharing Description -->
-  <string name="actfm_ALA_body">Astrid.com lets you access your tasks online,
-  share, and delegate with others.</string>
-
-  <!-- share login: Sharing Login FB Prompt -->
-  <string name="actfm_ALA_fb_login">フェイスブックと繋がる</string>
-
-  <!-- share login: Sharing Login GG Prompt -->
-  <string name="actfm_ALA_gg_login">Googleと接続する</string>
-  
-  <!-- share login: Quickly log in as <%s -> email> -->
-  <string name="actfm_quick_login">Sign in: %s</string>
-
-  <!-- share login: Reject quick login -->
-  <string name="actfm_quick_login_reject">Not %s?</string>
-
-  <!-- share login: Name -->
-  <string name="actfm_ALA_firstname_label">名</string>
-  
-  <!-- share login: Name -->
-  <string name="actfm_ALA_lastname_label">姓</string>
-
-  <!-- share login: Email -->
-  <string name="actfm_ALA_email_label">Eメール</string>
-
-  <!-- share login: Username / Email -->
-
-  <!-- share login: Password -->
-  <string name="actfm_ALA_password_label">パスワード</string>
-
-  <!-- share login: Sign Up Title -->
-  <string name="actfm_ALA_signup_title">Sign Up</string>
-
-  <!-- share login: Login Title -->
-  <string name="actfm_ALA_login_title">Sign In</string>
-
-  <!-- share login: Google Auth title -->
-  <string name="actfm_GAA_title">使用したいGoogleアカウントを選択してください:</string>
-
-  <!-- share login: OAUTH Login Prompt -->
-  <string name="actfm_OLA_prompt">ログインしてください:</string>
-  
-  <!-- Login error: user exists -->
-  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
-  
-  <!-- Login error: wrong password -->
-  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
-  
-  <!-- Forgot password link -->
-  <string name="actfm_ALA_forgot_password">Forgot password?</string>
-  
-  <!-- Forgot password email prompt -->
-  <string name="actfm_ALA_enter_email">Please enter your email</string>
-  
-  <!-- Password reset sent (%s -> email) -->
-  <string name="actfm_ALA_reset_sent">Password reset sent to %s</string>
-  
-  <!-- User already exists - first sync may be slow -->
-  <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your patience!</string>
-  
-  <!-- User not found -->
-  <string name="actfm_ALA_error_user_not_found">User not found by that email. Try signing up instead!</string>
-  
-  <!-- ================================================ Featured Lists -->
-
-  <string name="actfm_feat_list_clone">Copy list</string>
-  
-  <string name="actfm_feat_list_suffix">(Copy)</string>
-
-  <string name="actfm_feat_list_cloning">Copying...</string>
-
-  <string name="actfm_feat_list_clone_success">成功！</string>
-
-  <string name="actfm_feat_list_task_clone_success">Task copied</string>
-
-  <string name="actfm_feat_list_clone_empty">No tasks to copy</string>
-  
-  <!-- ================================================ Synchronization == -->
-      
-  <!-- Indicates the logged in user name. %s -> user\'s name -->
-  <string name="actfm_status_title_logged_in">Logged in as %s</string>    
-      
-  <!-- Preferences Title: Act.fm -->    
-  <string name="actfm_APr_header">Astrid.com</string>
-  
-  <string name="actfm_https_title">HTTPS を使う</string>
-  <string name="actfm_https_enabled">HTTPS有効(遅い)</string>
-  <string name="actfm_https_disabled">HTTPS無効(早い)</string>
-
-  <!-- title for notification tray after synchronizing -->
-  
-  <!-- text for notification when comments are received -->
-    
-  <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, 
-      Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page,
-      or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.  
-      Are you sure you want to sync with Astrid.com?</string>
-      
-  <!-- account types -->
-  <string name="actfm_account_type">アカウント タイプ</string>
-  <string name="actfm_account_info">Account info</string>
-  <string name="actfm_account_info_summary">Status and options</string>
-  <string name="account_type_title_not_logged_in">Sign up for a free account</string>
-  <string name="account_type_summary_not_logged_in">Access tasks online, share lists and delegate</string>
-  
-  
-  <string name="actfm_account_premium">プレミアム</string>
-  <string name="actfm_account_basic">Basic</string>
-  
-  <string name="actfm_inapp_billing">Upgrade to Premium</string>
-  <string name="actfm_inapp_billing_summary">Attach files, voice backups, premium support &amp; more</string>
-  
-  <!-- Sharing -->
-  <string name="share_with_facebook">Like on Facebook</string>
-  <string name="share_with_twitter">Follow on Twitter</string>
-  <string name="share_with_google">Share on Google+</string>
-  <string name="share_speech_bubble">By sharing, you\'ll help others be more productive!</string>
-  
-  
-  <!-- Sync upgrade messages -->
-  <string name="sync_upgr_both_title">Using Astrid.com + Google without Duplicates</string>
-  <string name="sync_upgr_both_body">Let\'s be honest. Google Tasks is convenient but not as cool as Astrid. To avoid duplicates you can no longer sync with Astrid.com and background sync with Google Tasks at the same time. You can still import your Google Tasks by visiting Settings → Backup &amp; Sync, or downgrade to Google Tasks only sync</string>
-  <string name="sync_upgr_both_btn1">Stick with Astrid</string>
-  <string name="sync_upgr_both_btn2">Downgrade to Google Tasks</string>
-  
-  <string name="sync_upgr_gtasks_only_title">Upgrade to Astrid Sync for Free!</string>
-  <string name="sync_upgr_gtasks_only_body">Access your tasks from all your devices and from Gmail with Astrid.com sync. Upgrade to Astrid.com Sync (you can always go back to Google Tasks - but you won\'t want to)!</string>
-  <string name="sync_upgr_gtasks_only_btn1">Upgrade to Astrid Sync</string>
-  <string name="sync_upgr_gtasks_only_btn2">Stick with Google Tasks</string>
-  
-  <string name="sync_upgr_neither_title">Free backup &amp; Sync!</string>
-  <string name="sync_upgr_neither_body">Don\'t put your to-dos at risk! New and improved Astrid sync to keep and access your tasks from anywhere.</string>
-  <string name="sync_upgr_neither_btn1">今登録する</string>
-  
-  <string name="sync_upgr_logged_out">You have been logged out of Astrid</string>
-  
-  <string name="actfm_logout_clear_tasks_title">Clear data?</string>
-  <string name="actfm_logout_clear_tasks_body">Would you like to clear your tasks and lists?</string>
-  <string name="actfm_logout_clear_tasks_yes">Clear data</string>
-  <string name="actfm_logout_clear_tasks_no">Keep data</string>
-  
-  <string name="actfm_logged_in_different_user_title">Logging in as different user</string>
-  <string name="actfm_logged_in_different_user_body">Would you like to delete existing phone tasks before syncing?</string>
-  <string name="actfm_logged_in_different_user_keep_data">Keep data</string>
-  <string name="actfm_logged_in_different_user_clear_data">Clear all data</string>
-  <string name="actfm_logged_in_different_user_processing">Processing existing data...</string>
-  
-  <string name="actfm_tag_not_authorized_title">Not authorized</string>
-  <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name?</string>
-  <string name="actfm_tag_not_authorized_new_list">Create new list</string>
-  <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
-  
-  <string name="actfm_sync_ongoing">同期中</string>
-  
-  <string name="EPr_reset_sync_state">Reset sync</string>
-  <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors</string>
-  <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue?</string>
-  
+<resources>
 
+    <!-- ================================================== general terms == -->
 
+    <!-- People Editing Activity -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
+    <string name="actfm_person_hint">連絡先またはメールアドレス</string>
+
+    <!-- task sharing dialog: shared with hint -->
+    <string name="actfm_person_or_tag_hint">連絡先または共有リスト</string>
+
+    <!-- toast on transmit success -->
+
+    <!-- can\'t rename or delete shared tag message -->
+
+    <!-- warning before deleting a list you\'re the owner of -->
+    <string name="actfm_tag_operation_owner_delete">
+        あなたはこの共有リストの所有者です！もしリストを削除すると、リストのすべてのメンバーからも削除されます。本当によろしいですか？
+    </string>
+
+    <!-- slide 29a: menu item to take a picture -->
+    <string name="actfm_picture_camera">写真を撮る</string>
+
+    <!-- slide 29b: menu item to select from gallery -->
+    <string name="actfm_picture_gallery">ギャラリーから選択</string>
+
+    <!-- menu item to clear picture selection -->
+    <string name="actfm_picture_clear">写真を削除</string>
+
+    <!-- filter list activity: refresh tags -->
+
+    <!-- Title for prompt after sharing a task -->
+    <string name="actfm_view_task_title">タスクを表示しますか？</string>
+
+    <!-- Text for prompt after sharing a task -->
+    <string name="actfm_view_task_text">
+        タスクは%sに送信されました！只今あなたのタスクが表示されています。あなたが割り当ていた他のタスクもここで表示しますか？
+    </string>
+
+    <!-- Ok button for task view prompt -->
+    <string name="actfm_view_task_ok">表示する</string>
+
+    <!-- Cancel button for task view prompt -->
+    <string name="actfm_view_task_cancel">表示しない</string>
+
+    <!-- slide 13a: Title for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_title">自分の共有タスク</string>
+
+    <!-- Empty list for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_empty">共有タスクがありません</string>
+
+    <!-- =====================  Friendship connections -->
+
+    <string name="actfm_friendship_pending">You\'ve sent a friend request to %s!</string>
+
+    <string name="actfm_friendship_blocked">You\'ve blocked %s.</string>
+
+    <string name="actfm_friendship_ignored">You\'ve ignored %s.</string>
+
+    <string name="actfm_friendship_friends">You\'re friends with %s! Add tasks for them below.
+    </string>
+
+    <string name="actfm_friendship_other_pending">%s wants to be friends with you!</string>
+
+    <string name="actfm_friendship_no_status">Connect with %s to share and see activity on public
+        tasks!
+    </string>
+
+    <string name="actfm_friendship_connect">Add friend</string>
+
+    <string name="actfm_friendship_accept">受け入れる</string>
+
+    <!-- ================================================== TagViewActivity == -->
+
+    <!-- Tag View Activity: Add Comment hint -->
+    <string name="TVA_add_comment">コメントする</string>
+
+    <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->
+
+    <!-- Tabs for Tag view -->
+    <string-array name="TVA_tabs">
+        <!-- Tab for showing tasks -->
+        <item>タスク</item>
+        <!-- Tab for showing comments & updates -->
+        <item>活動</item>
+        <!-- Tab for showing setting -->
+        <item>リストの設定</item>
+    </string-array>
+
+    <!-- Tag View: filtered by assigned to user (%s => user name) -->
+    <string name="actfm_TVA_filtered_by_assign">%sさんのタスク。すべてのタスクを表示する</string>
+
+    <!-- Tag View: filter by unassigned tasks -->
+    <string name="actfm_TVA_filter_by_unassigned">割り当てられていないタスク。皆のためにタップして。</string>
+
+    <!-- Tag View: list is private, no members -->
+    <string name="actfm_TVA_no_members_alert">マイリスト。リストを編集するまたは共有する</string>
+
+    <!-- Tag View Menu: refresh -->
+    <string name="actfm_TVA_menu_refresh">更新</string>
+
+    <!-- Tag Settings: tag name label -->
+    <string name="actfm_TVA_tag_label">リスト</string>
+
+    <!-- Tag Settings: tag owner label -->
+
+    <!-- Tag Settings: tag owner value when there is no owner -->
+
+    <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
+    <string name="actfm_TVA_members_label">共有者</string>
+
+    <!-- Tag Settings: list collaborators hint -->
+    <string name="actfm_TVA_members_hint">メールアドレスで共有できます</string>
+
+    <!-- Tag Settings: tag picture -->
+    <string name="actfm_TVA_tag_picture">リスト写真</string>
+
+    <!-- slide 25c/28b: Tag Settings: silence notifications label -->
+    <string name="actfm_TVA_silence_label">通知を無効する</string>
+
+    <!-- Tag Settings: list icon label -->
+
+    <!-- slide 25b/27d: Tag Settings: list description label -->
+    <string name="actfm_TVA_tag_description_label">説明</string>
+
+    <!-- slide 28a: Tag Settings: list settings label -->
+    <string name="actfm_TVA_tag_settings_label">設定</string>
+
+    <!-- slide 25b: Tag Settings: list description hint -->
+    <string name="actfm_TVA_tag_description_hint">ここに説明をタイプする</string>
+
+    <!-- slide 25d: Tag Settings: list name hint -->
+    <string name="actfm_TVA_tag_name_hint">リスト名を記入してください</string>
+
+    <!-- Tag settings: login prompt from share-->
+    <string name="actfm_TVA_login_to_share">
+        リストを共有するためにはAstrid.comへのログインが必要です！ログインするか、プライベートリストに設定してください。
+    </string>
+
+
+    <!-- ============================================ edit people dialog == -->
+
+    <!-- task sharing dialog: intro -->
+    <string name="actfm_EPA_intro">Use Astrid to share shopping lists, party plans, or team projects
+        and instantly see when people get stuff done!
+    </string>
+
+    <!-- task sharing dialog: window title -->
+
+    <!-- task sharing dialog: save button -->
+
+    <!-- task sharing dialog: assigned label -->
+
+    <!-- slide 18a: task sharing dialog: assigned label long version -->
+    <string name="actfm_EPA_assign_label_long">参加者を追加します</string>
+
+    <!-- task sharing dialog: assigned to me -->
+    <string name="actfm_EPA_assign_me">私</string>
+
+    <!-- task sharing dialog: anyone -->
+    <string name="actfm_EPA_unassigned">割り当てられていない</string>
+
+    <!-- slide 18c: task sharing dialog: choose a contact -->
+    <string name="actfm_EPA_choose_contact">連絡先を選択する</string>
+
+    <!-- task sharing dialog: custom email assignment -->
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_share_with">共有者:</string>
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_collaborators_header">Share</string>
+
+    <!-- task sharing dialog: collaborator list name (%s => name of list) -->
+    <string name="actfm_EPA_list">リスト: %s</string>
+
+    <!-- task sharing dialog: assigned hint -->
+
+    <!-- task sharing dialog: message label text -->
+    <string name="actfm_EPA_message_text">招待メッセージ:</string>
+
+    <!-- task sharing dialog: message body -->
+    <string name="actfm_EPA_message_body">Help me get this done!</string>
+
+    <!-- task sharing dialog: list members section header -->
+    <string name="actfm_EPA_assign_header_members">リストメンバー</string>
+
+    <!-- task sharing dialog: astrid friends section header -->
+    <string name="actfm_EPA_assign_header_friends">Astridユーザー</string>
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: share with Facebook -->
+    <string name="actfm_EPA_facebook">フェイスブック</string>
+
+    <!-- task sharing dialog: share with Twitter -->
+    <string name="actfm_EPA_twitter">ツィッター</string>
+
+    <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
+
+    <!-- task sharing dialog: edit people settings saved -->
+
+    <!-- task sharing dialog: invalid email (%s => email) -->
+    <string name="actfm_EPA_invalid_email">無効なEメール: %s</string>
+
+    <!-- task sharing dialog: tag not found (%s => tag) -->
+
+    <!-- task sharing login prompt -->
+    <string name="actfm_EPA_login_to_share">You need to be logged in to Astrid.com to share tasks!
+    </string>
+
+    <string name="actfm_EPA_login_button">ログイン</string>
+
+    <string name="actfm_EPA_dont_share_button">共有しない</string>
+
+    <string name="actfm_EPA_add_person_to_list_title">割り当てられたタスク</string>
+
+    <string name="actfm_EPA_add_person_to_list">%1$s is not shared on this list. Would you like to
+        add %2$s to this list?
+    </string>
+
+    <string name="actfm_EPA_add_person_to_list_ok">リストに追加する</string>
+
+    <string name="actfm_EPA_add_person_to_list_cancel">追加しないで</string>
+
+    <string name="actfm_list_owner">(owner)</string>
+
+    <!-- ========================================= sharing login activity == -->
+
+    <!-- share login: Title -->
+    <string name="actfm_ALA_title">Asteroid.comにようこそ！</string>
+
+    <!-- share login: Sharing Description -->
+    <string name="actfm_ALA_body">Astrid.com lets you access your tasks online,
+        share, and delegate with others.
+    </string>
+
+    <!-- share login: Sharing Login FB Prompt -->
+    <string name="actfm_ALA_fb_login">フェイスブックと繋がる</string>
+
+    <!-- share login: Sharing Login GG Prompt -->
+    <string name="actfm_ALA_gg_login">Googleと接続する</string>
+
+    <!-- share login: Quickly log in as <%s -> email> -->
+    <string name="actfm_quick_login">Sign in: %s</string>
+
+    <!-- share login: Reject quick login -->
+    <string name="actfm_quick_login_reject">Not %s?</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_firstname_label">名</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_lastname_label">姓</string>
+
+    <!-- share login: Email -->
+    <string name="actfm_ALA_email_label">Eメール</string>
+
+    <!-- share login: Username / Email -->
+
+    <!-- share login: Password -->
+    <string name="actfm_ALA_password_label">パスワード</string>
+
+    <!-- share login: Sign Up Title -->
+    <string name="actfm_ALA_signup_title">Sign Up</string>
+
+    <!-- share login: Login Title -->
+    <string name="actfm_ALA_login_title">Sign In</string>
+
+    <!-- share login: Google Auth title -->
+    <string name="actfm_GAA_title">使用したいGoogleアカウントを選択してください:</string>
+
+    <!-- share login: OAUTH Login Prompt -->
+    <string name="actfm_OLA_prompt">ログインしてください:</string>
+
+    <!-- Login error: user exists -->
+    <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+
+    <!-- Login error: wrong password -->
+    <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try
+        again.
+    </string>
+
+    <!-- Forgot password link -->
+    <string name="actfm_ALA_forgot_password">Forgot password?</string>
+
+    <!-- Forgot password email prompt -->
+    <string name="actfm_ALA_enter_email">Please enter your email</string>
+
+    <!-- Password reset sent (%s -> email) -->
+    <string name="actfm_ALA_reset_sent">Password reset sent to %s</string>
+
+    <!-- User already exists - first sync may be slow -->
+    <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your
+        patience!
+    </string>
+
+    <!-- User not found -->
+    <string name="actfm_ALA_error_user_not_found">User not found by that email. Try signing up
+        instead!
+    </string>
+
+    <!-- ================================================ Featured Lists -->
+
+    <string name="actfm_feat_list_clone">Copy list</string>
+
+    <string name="actfm_feat_list_suffix">(Copy)</string>
+
+    <string name="actfm_feat_list_cloning">Copying...</string>
+
+    <string name="actfm_feat_list_clone_success">成功！</string>
+
+    <string name="actfm_feat_list_task_clone_success">Task copied</string>
+
+    <string name="actfm_feat_list_clone_empty">No tasks to copy</string>
+
+    <!-- ================================================ Synchronization == -->
+
+    <!-- Indicates the logged in user name. %s -> user\'s name -->
+    <string name="actfm_status_title_logged_in">Logged in as %s</string>
+
+    <!-- Preferences Title: Act.fm -->
+    <string name="actfm_APr_header">Astrid.com</string>
+
+    <string name="actfm_https_title">HTTPS を使う</string>
+    <string name="actfm_https_enabled">HTTPS有効(遅い)</string>
+    <string name="actfm_https_disabled">HTTPS無効(早い)</string>
+
+    <!-- title for notification tray after synchronizing -->
+
+    <!-- text for notification when comments are received -->
+
+    <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid
+        duplicate tasks and other synchronization issues,
+        Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You
+        can still import tasks from Google Tasks from the Google Tasks settings page,
+        or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.
+        Are you sure you want to sync with Astrid.com?
+    </string>
+
+    <!-- account types -->
+    <string name="actfm_account_type">アカウント タイプ</string>
+    <string name="actfm_account_info">Account info</string>
+    <string name="actfm_account_info_summary">Status and options</string>
+    <string name="account_type_title_not_logged_in">Sign up for a free account</string>
+    <string name="account_type_summary_not_logged_in">Access tasks online, share lists and
+        delegate
+    </string>
+
+
+    <string name="actfm_account_premium">プレミアム</string>
+    <string name="actfm_account_basic">Basic</string>
+
+    <string name="actfm_inapp_billing">Upgrade to Premium</string>
+    <string name="actfm_inapp_billing_summary">Attach files, voice backups, premium support &amp;
+        more
+    </string>
+
+    <!-- Sharing -->
+    <string name="share_with_facebook">Like on Facebook</string>
+    <string name="share_with_twitter">Follow on Twitter</string>
+    <string name="share_with_google">Share on Google+</string>
+    <string name="share_speech_bubble">By sharing, you\'ll help others be more productive!</string>
+
+
+    <!-- Sync upgrade messages -->
+    <string name="sync_upgr_both_title">Using Astrid.com + Google without Duplicates</string>
+    <string name="sync_upgr_both_body">Let\'s be honest. Google Tasks is convenient but not as cool
+        as Astrid. To avoid duplicates you can no longer sync with Astrid.com and background sync
+        with Google Tasks at the same time. You can still import your Google Tasks by visiting
+        Settings → Backup &amp; Sync, or downgrade to Google Tasks only sync
+    </string>
+    <string name="sync_upgr_both_btn1">Stick with Astrid</string>
+    <string name="sync_upgr_both_btn2">Downgrade to Google Tasks</string>
+
+    <string name="sync_upgr_gtasks_only_title">Upgrade to Astrid Sync for Free!</string>
+    <string name="sync_upgr_gtasks_only_body">Access your tasks from all your devices and from Gmail
+        with Astrid.com sync. Upgrade to Astrid.com Sync (you can always go back to Google Tasks -
+        but you won\'t want to)!
+    </string>
+    <string name="sync_upgr_gtasks_only_btn1">Upgrade to Astrid Sync</string>
+    <string name="sync_upgr_gtasks_only_btn2">Stick with Google Tasks</string>
+
+    <string name="sync_upgr_neither_title">Free backup &amp; Sync!</string>
+    <string name="sync_upgr_neither_body">Don\'t put your to-dos at risk! New and improved Astrid
+        sync to keep and access your tasks from anywhere.
+    </string>
+    <string name="sync_upgr_neither_btn1">今登録する</string>
+
+    <string name="sync_upgr_logged_out">You have been logged out of Astrid</string>
+
+    <string name="actfm_logout_clear_tasks_title">Clear data?</string>
+    <string name="actfm_logout_clear_tasks_body">Would you like to clear your tasks and lists?
+    </string>
+    <string name="actfm_logout_clear_tasks_yes">Clear data</string>
+    <string name="actfm_logout_clear_tasks_no">Keep data</string>
+
+    <string name="actfm_logged_in_different_user_title">Logging in as different user</string>
+    <string name="actfm_logged_in_different_user_body">Would you like to delete existing phone tasks
+        before syncing?
+    </string>
+    <string name="actfm_logged_in_different_user_keep_data">Keep data</string>
+    <string name="actfm_logged_in_different_user_clear_data">Clear all data</string>
+    <string name="actfm_logged_in_different_user_processing">Processing existing data...</string>
+
+    <string name="actfm_tag_not_authorized_title">Not authorized</string>
+    <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you
+        may have been removed). Would you like to create a new list with the same name?
+    </string>
+    <string name="actfm_tag_not_authorized_new_list">Create new list</string>
+    <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
+
+    <string name="actfm_sync_ongoing">同期中</string>
+
+    <string name="EPr_reset_sync_state">Reset sync</string>
+    <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors
+    </string>
+    <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will
+        be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you
+        wish to continue?
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in timers plug-in -->
+
+    <!-- Task Edit Activity: Container Label -->
+    <string name="alarm_ACS_label">アラーム</string>
+
+    <!-- Task Edit Activity: Add New Alarm -->
+    <string name="alarm_ACS_button">アラームを追加する</string>
+
+    <string-array name="reminders_alarm">
+        <!-- reminders related to alarm -->
+        <item>アラーム</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in backup plug-in -->
+
+    <!-- ================================================= BackupPreferences == -->
+
+    <!-- slide 33c/48d: Backup Preferences Title -->
+    <string name="backup_BPr_header">バックアップ</string>
+
+    <!-- slide 48e/50c: Backup: Status Header -->
+    <string name="backup_BPr_group_status">状況</string>
+
+    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->
+    <string name="backup_status_success">最新: %s</string>
+    <!-- Backup Status: last error failed. Keep it short! -->
+    <string name="backup_status_failed">Last backup failed</string>
+    <!-- Backup Status: error subtitle -->
+    <string name="backup_status_failed_subtitle">（タップでエラーを表示）</string>
+    <!-- slide 48a: Backup Status: never backed up -->
+    <string name="backup_status_never">Never backed up!</string>
+
+    <!-- slide 48f/ 50e: Backup Options Group Label -->
+    <string name="backup_BPr_group_options">オプション</string>
+
+    <!-- slide 48b: Preference: Automatic Backup Title -->
+    <string name="backup_BPr_auto_title">自動的なバックアップ</string>
+    <!-- Preference: Automatic Backup Description (when disabled) -->
+    <string name="backup_BPr_auto_disabled">自動的なバックアップは無効です</string>
+    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
+    <string name="backup_BPr_auto_enabled">バックアップは毎日行われます</string>
+
+    <!-- Preference screen restoring Tasks Help -->
+    <!-- Preference screen Restoring Tasks Help Dialog Text-->
+
+    <string name="backup_BPr_cloud_already_logged_in">You already have cloud backup on Astrid.com!
+    </string>
+
+    <!-- ================================================= BackupActivity == -->
+
+    <!-- slide 48c: backup activity label -->
+    <string name="backup_BAc_label">バックアップ</string>
+
+    <!-- backup activity title -->
+    <string name="backup_BAc_title">バックアップの管理</string>
+
+    <!-- backup activity import button -->
+    <string name="backup_BAc_import">タスクのインポート</string>
+
+    <!-- backup activity export button -->
+    <string name="backup_BAc_export">タスクのエクスポート</string>
+
+    <!-- backup activity cloud (Astrid.com) option -->
+    <string name="backup_BAc_cloud">Click for free cloud backup on Astrid.com</string>
+
+    <!-- ============================================== Importer / Exporter == -->
+
+    <!-- Message displayed when error occurs -->
+    <string name="backup_TXI_error">インポートに失敗</string>
+
+    <string name="export_toast">%1$s を %2$s にバックアップしました。</string>
+
+    <string name="export_toast_no_tasks">エクスポートするタスクがありません</string>
+
+    <!-- Progress Dialog Title for exporting -->
+    <string name="export_progress_title">エクスポート中</string>
+
+    <!-- Backup: Title of Import Summary Dialog -->
+    <string name="import_summary_title">復元の概要</string>
+
+    <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
+    <string name="import_summary_message">ファイル %1$s の %2$s 中、\n\n成功: %3$s\n既に存在: %4$s\n失敗: %5$s\n
+    </string>
+
+    <!-- Progress Dialog Title for importing -->
+    <string name="import_progress_title">インポート中</string>
+
+    <!-- Progress Dialog text for import reading task (%d -> task number)-->
+    <string name="import_progress_read">タスク %d を読み込み中</string>
+
+    <!-- Backup: Dialog when unable to open a file -->
+
+    <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
+    <string name="DLG_error_sdcard">フォルダ %s を開けません</string>
+
+    <!-- Backup: Dialog when unable to open SD card in general -->
+    <string name="DLG_error_sdcard_general">SDカードにアクセスできません</string>
+
+    <!-- Backup: File Selector dialog for import -->
+    <string name="import_file_prompt">復元に使うファイルを選択してください</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- ================================================== AndroidManifest == -->
+
+    <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
+    <string name="app_name">Astridタスク</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="read_permission_label">タスクの読み込み</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="read_permission_desc">タスクの読み込みとフィルタの表示</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="write_permission_label">タスクの読み込み</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="write_permission_desc">タスクの作成、編集</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- question for deleting tasks -->
+    <string name="DLG_delete_this_task_question">このタスクを削除しますか?</string>
+
+    <!-- question for deleting items (%s => item name) -->
+    <string name="DLG_delete_this_item_question">項目 %s を削除しますか?</string>
+
+    <!-- Progress dialog shown when upgrading -->
+    <string name="DLG_upgrading">タスクを更新しています</string>
+
+    <!-- Title for dialog selecting a time (hours and minutes) -->
+    <string name="DLG_hour_minutes">時間 (時:分)</string>
+
+    <!-- Dialog for Astrid having a critical update -->
+    <string name="DLG_please_update">Astrid should to be updated to the latest
+        version in the Android market! Please do that before continuing, or wait a
+        few seconds.
+    </string>
+
+    <!-- Button for going to Market -->
+
+    <!-- Button for accepting EULA -->
+    <string name="DLG_accept">同意する</string>
+
+    <!-- Button for declining EULA -->
+    <string name="DLG_decline">同意しない</string>
+
+    <!-- EULA title -->
+    <string name="DLG_eula_title">Astrid 利用規定</string>
+
+    <!-- Progress Dialog generic text -->
+    <string name="DLG_please_wait">お待ちください</string>
+
+    <!-- Dialog - loading -->
+    <string name="DLG_loading">読み込んでいます・・・</string>
+
+    <!-- Dialog - dismiss -->
+
+    <!-- slide 20d -->
+    <string name="DLG_ok">OK</string>
+    <!-- slide 36g -->
+    <string name="DLG_cancel">取り消す</string>
+
+    <string name="DLG_more">もっと</string>
+
+    <string name="DLG_undo">動作を取り消す</string>
+
+    <string name="DLG_warning">Warning</string>
+
+    <!-- =============================================================== UI == -->
+
+    <!-- Label for DateButtons with no value -->
+    <string name="WID_dateButtonUnset">入力する</string>
+
+    <!-- String formatter for DateButtons ($D => date, $T => time) -->
+
+    <!-- String formatter for Disable button -->
+
+    <!--  ============================================================= notes -->
+
+    <!-- Note Exposer -->
+
+    <!-- Note Exposer / Comments -->
+
+    <!-- EditNoteActivity - no comments -->
+    <string name="ENA_no_comments">No activity yet</string>
+
+    <!-- EditNoteActivity - no username for comment -->
+    <string name="ENA_no_user">Someone</string>
+
+    <!-- EditNoteActivity - refresh comments -->
+    <string name="ENA_refresh_comments">コメントを更新</string>
+
+    <!-- ================================================= TaskListActivity == -->
+
+    <!-- slide 8b: Task List: Displayed instead of list when no items present -->
+    <string name="TLA_no_items">タスクなし</string>
+
+    <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
+    <string name="TLA_no_items_person">%s has no\ntasks shared with you</string>
+
+    <!-- Menu: Adjust Sort and Hidden Task Settings -->
+    <string name="TLA_menu_sort">Sort</string>
+
+    <!-- Menu: Sync Now -->
+    <string name="TLA_menu_sync">Sync Now</string>
+
+    <!-- Menu: Search -->
+    <string name="TLA_menu_search">Search</string>
+
+    <!-- Menu: Tasks -->
+    <string name="TLA_menu_lists">リスト</string>
+
+    <!-- Menu: Friends -->
+    <string name="TLA_menu_friends">人々</string>
+
+    <!-- Menu: Featured Lists -->
+    <string name="TLA_menu_featured_lists">Featured Lists</string>
+
+    <!-- Menu: Suggestions -->
+    <string name="TLA_menu_suggestions">提案</string>
+
+    <!-- Menu: Tutorial -->
+
+    <!-- Menu: Settings -->
+    <string name="TLA_menu_settings">設定</string>
+
+    <!-- slide 30b: Menu: Support -->
+    <string name="TLA_menu_support">サポート</string>
+
+    <!-- Search Label-->
+
+    <!-- Window title for displaying Custom Filter -->
+    <string name="TLA_custom">カスタムフィルタ</string>
+
+    <!-- slide 8d: Quick Add Edit Box Hint-->
+    <string name="TLA_quick_add_hint">タスクを追加する</string>
+
+    <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
+    <string name="TLA_quick_add_hint_assign">Add something for %s</string>
+
+    <!-- Notification Volumne notification-->
+    <string name="TLA_notification_volume_low">Notifications are muted. You won\'t be able to hear
+        Astrid!
+    </string>
+
+    <!-- Notifications disabled warning -->
+    <string name="TLA_notification_disabled">Reminders are disabled! You will not receive any
+        reminders
+    </string>
+
+    <string-array name="TLA_filters">
+        <item>Active</item>
+        <item>Today</item>
+        <item>すぐに</item>
+        <item>遅延</item>
+        <item>完了</item>
+        <item>非表示</item>
+    </string-array>
+
+    <!-- Title for confirmation dialog after quick add markup -->
+    <string name="TLA_quickadd_confirm_title">You said, \"%s\"</string>
+
+    <!-- Text for speech bubble in dialog after quick add markup -->
+    <!-- First string is task title, second is due date, third is priority -->
+    <string name="TLA_quickadd_confirm_speech_bubble">I created a task called \"%1$s\" %2$s at
+        %3$s
+    </string>
+
+    <string name="TLA_quickadd_confirm_speech_bubble_date">for %s</string>
+
+    <string name="TLA_quickadd_confirm_hide_helpers">Don\'t display future confirmations</string>
+
+
+    <!-- Title for alert on new repeating task. %s-> task title -->
+    <string name="TLA_repeat_scheduled_title">New repeating task %s</string>
+
+    <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
+    <string name="TLA_repeat_scheduled_speech_bubble">I\'ll remind you about this %s.</string>
+
+    <string-array name="TLA_priority_strings">
+        <item>最優先</item>
+        <item>優先度高</item>
+        <item>優先度中</item>
+        <item>優先度低</item>
+    </string-array>
+    <!-- slide 22a -->
+    <string name="TLA_all_activity">All Activity</string>
+
+    <!-- ====================================================== TaskAdapter == -->
+
+    <!-- Format string to indicate task is hidden (%s => task name) -->
+    <string name="TAd_hiddenFormat">%s [非表示]</string>
+
+    <!-- Format string to indicate task is deleted (%s => task name) -->
+    <string name="TAd_deletedFormat">%s [削除済]</string>
+
+    <!-- Displayed when adapter is flung (scrolled quickly) -->
+
+    <!-- slide 22b: indicates task was completed. %s => date or time ago -->
+    <string name="TAd_completed">%s\nに完了</string>
+
+    <!-- slide 15a: Action Button: edit task -->
+    <string name="TAd_actionEditTask">編集する</string>
+
+    <!-- Context Item: edit task -->
+    <string name="TAd_contextEditTask">タスクを編集</string>
+
+    <!-- Context Item: copy task -->
+    <string name="TAd_contextCopyTask">タスクをコピー</string>
+
+    <!-- Context Item: delete task -->
+    <string name="TAd_contextDeleteTask">Delete Task</string>
+
+    <!-- Context Item: undelete task -->
+    <string name="TAd_contextUndeleteTask">元に戻す</string>
+
+    <!-- Context Item: purge task -->
+    <string name="TAd_contextPurgeTask">タスクを削除</string>
+
+    <!-- ============================================== SortSelectionDialog == -->
+
+    <!-- slide 23a: Sort Selection: dialog title -->
+    <string name="SSD_title">並び順と表示項目</string>
+
+    <!-- slide 23h:  Hidden: title -->
+    <string name="SSD_hidden_title">非表示のタスク</string>
+
+    <!-- Hidden Task Selection: show completed tasks -->
+    <string name="SSD_completed">完了タスクの表示</string>
+
+    <!-- Hidden Task Selection: show hidden tasks -->
+    <string name="SSD_hidden">非表示タスクの表示</string>
+
+    <!-- Hidden Task Selection: show deleted tasks -->
+    <string name="SSD_deleted">削除済タスクの表示</string>
+
+    <!-- Sort Selection: drag with subtasks -->
+    <string name="SSD_sort_drag">Manual order with subtasks</string>
+
+    <!-- slide 23b: Sort Selection: smart sort -->
+    <string name="SSD_sort_auto">自動</string>
+
+    <!-- slide 23e: Sort Selection: sort by alpha -->
+    <string name="SSD_sort_alpha">タイトル順</string>
+
+    <!-- slide 23c: Sort Selection: sort by due date -->
+    <string name="SSD_sort_due">期限順</string>
+
+    <!-- slide 23d: Sort Selection: sort by importance -->
+    <string name="SSD_sort_importance">By priority</string>
+
+    <!-- slide 23f: Sort Selection: sort by modified date -->
+    <string name="SSD_sort_modified">更新日時順</string>
+
+    <!-- slide 23g: Sort Selection: reverse -->
+    <string name="SSD_sort_reverse">逆順</string>
+
+    <!-- slide 23j: Sort Button: sort temporarily -->
+    <string name="SSD_save_temp">今回のみ</string>
+
+    <!-- slide 23i: Sort Button: sort permanently -->
+    <string name="SSD_save_always">設定の保存</string>
+
+    <!-- =============================================== FilterListActivity == -->
+
+    <!-- Astrid Filter Shortcut -->
+    <string name="FSA_label">List or Filter</string>
+
+    <!-- Filter List Activity Title -->
+
+    <!-- Displayed when loading filters -->
+
+    <!-- Context Menu: Create Shortcut -->
+    <string name="FLA_context_shortcut">ショートカットの作成</string>
+
+    <!-- Menu: Search -->
+
+    <!-- Menu: Help -->
+
+    <!-- slide 28c: Create Shortcut Dialog Title -->
+    <string name="FLA_shortcut_dialog_title">ショートカットを作る</string>
+
+    <!-- Create Shortcut Dialog (asks to name shortcut) -->
+    <string name="FLA_shortcut_dialog">ショートカットの名称</string>
+
+    <!-- Search Hint-->
+    <string name="FLA_search_hint">タスクの検索</string>
+
+    <!-- Search Filter name (%s => query) -->
+    <string name="FLA_search_filter">「%s」の検索結果</string>
+
+    <!-- Toast: created shortcut (%s => label) -->
+    <string name="FLA_toast_onCreateShortcut">ショートカット %s を作成しました</string>
+
+    <!-- Menu: new filter -->
+    <string name="FLA_new_filter">新しいフィルタ</string>
+
+    <!-- slide 10e: Button: new list -->
+    <string name="FLA_new_list">新しいリスト</string>
+
+    <!-- Alert when creating a shortcut without selecting a filter -->
+    <string name="FLA_no_filter_selected">No filter selected! Please select a filter or list.
+    </string>
+
+    <!-- ================================================= TaskEditActivity == -->
+
+    <!-- Title when editing a task (%s => task title) -->
+
+    <!-- Title when creating a new task -->
+
+    <!-- Task title label -->
+
+    <!-- Task when label -->
+    <string name="TEA_when_header_label">いつ</string>
+
+    <!-- Task title hint (displayed when edit box is empty) -->
+    <string name="TEA_title_hint">Task name</string>
+
+    <!-- Task importance label -->
+    <string name="TEA_importance_label">優先順位</string>
+
+    <!-- Task due date hint -->
+    <string name="TEA_deadline_hint">Set due date</string>
+
+    <!-- Task assigned to string (%s -> assigned person name) -->
+    <string name="TEA_assigned_to">Assigned to %s</string>
+
+    <!-- Task urgency specific time checkbox -->
+    <string name="TEA_urgency_specific_time">時刻を設定する</string>
+
+    <!-- Task urgency specific time title when specific time false -->
+    <string name="TEA_urgency_none">なし</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_label">Hide until</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_display">Hide until %s</string>
+
+    <!-- Task hide until toast -->
+    <string name="TEA_hideUntil_message">Task will be hidden until %s</string>
+
+    <!-- Task editing data being loaded label -->
+    <string-array name="TEA_loading">
+        <item>読み込んでいます・・・</item>
+    </string-array>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_note_label">概要</string>
+
+    <!-- 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">所要時間は?</string>
+
+    <!-- Elapsed time label -->
+    <string name="TEA_elapsedDuration_label">既にタスクに費やした時間</string>
+
+    <!-- Menu: Save -->
+    <string name="TEA_menu_save">変更の保存</string>
+
+    <!-- Menu: Don\'t Save -->
+    <string name="TEA_menu_discard">保存しない</string>
+
+    <!-- Menu: Delete Task -->
+    <string name="TEA_menu_delete">タスクを削除</string>
+
+    <!-- Menu: Task comments -->
+    <string name="TEA_menu_refresh_comments">Refresh comments</string>
+
+    <string name="TEA_menu_comments">コメント</string>
+
+    <!-- Toast: task saved with deadline (%s => preposition + time units) -->
+    <string name="TEA_onTaskSave_due">タスクは保存されました: 期限は%s</string>
+
+    <!-- Toast: task saved without deadlines -->
+    <string name="TEA_onTaskSave_notDue">タスクは保存されました</string>
+
+    <!-- Toast: task was not saved -->
+
+    <!-- Toast: task was deleted -->
+
+    <!-- slide 15b: Task edit tab: activity -->
+    <string name="TEA_tab_activity">活動</string>
+
+    <!-- slide 15e:  Task edit tab: more editing settings -->
+    <string name="TEA_tab_more">さらに</string>
+
+    <!-- slide 15d: Task edit tab: web services -->
+    <string name="TEA_tab_web">アイデア</string>
+
+    <string name="TEA_timer_est">Est. %s</string>
+
+    <string name="TEA_timer_elap">Elapsed %s</string>
+
+    <string-array name="TEA_urgency">
+        <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
+        <item>No date</item>
+        <item>指定した日から</item>
+        <item>Today</item>
+        <item>Tomorrow</item>
+        <item>日後</item>
+        <item>来週</item>
+        <item>2週間以内</item>
+        <item>来月</item>
+    </string-array>
+
+    <string name="TEA_no_time">No time</string>
+
+    <string-array name="TEA_hideUntil">
+        <!-- hideUntil: labels for edit page. -->
+        <item>Never</item>
+        <item>期限日</item>
+        <item>Due time</item>
+        <item>Day before due</item>
+        <item>Week before due</item>
+        <item>日時を指定</item>
+    </string-array>
+
+    <!-- Task edit control set descriptors -->
+
+    <!-- slide 9b/35i -->
+    <string name="TEA_control_who">誰</string>
+
+    <!-- slide 9c/ 35a -->
+    <string name="TEA_control_when">いつ</string>
+    <!-- slide 35b -->
+    <string name="TEA_control_more_section">----More Section----</string>
+    <!-- slide 16a/35c -->
+    <string name="TEA_control_importance">優先順位</string>
+    <!-- slide 16b/35d -->
+    <string name="TEA_control_lists">リスト</string>
+    <!-- slide 16c/35e -->
+    <string name="TEA_control_notes">概要</string>
+
+    <string name="TEA_control_files">Files</string>
+
+    <!-- slide 16e / slide 35g-->
+    <string name="TEA_control_reminders">リマインダー</string>
+
+    <!-- slide 16f -->
+    <string name="TEA_control_timer">Timer Controls</string>
+
+    <string name="TEA_control_hidden_section">----Hide Always----</string>
+
+    <string name="hide_until_prompt">Show in my list</string>
+
+    <!-- Add Ons tab when no add-ons found -->
+
+    <!-- Add Ons button -->
+
+    <!-- More row -->
+
+    <!-- slide 15c: Text when no activity to show -->
+    <string name="TEA_no_activity">No activity</string>
+
+    <!-- Text to load more activity -->
+    <string name="TEA_load_more">Load more...</string>
+
+    <!-- When controls dialog -->
+    <string name="TEA_when_dialog_title">When is this due?</string>
+
+
+    <string name="TEA_new_task">新しいタスク</string>
+
+    <string name="WSV_click_to_load">Tap me to search for ways to get this done!</string>
+
+    <string name="WSV_not_online">I can do more when connected to the Internet. Please check your
+        connection.
+    </string>
+
+    <string name="TEA_contact_error">Sorry! We couldn\'t find an email address for the selected
+        contact.
+    </string>
+
+    <!-- ============================================= IntroductionActivity == -->
+
+    <!-- slide 1a: Introduction Window title -->
+
+    <!-- Button to agree to EULA -->
+
+    <!-- Button to disagree with EULA -->
+
+    <!-- ===================================================== MissedCallActivity == -->
+
+    <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
+    <string name="MCA_title">%1$s\ncalled at %2$s</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_return_call">Call now</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_add_task">Call later</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_ignore">無視する</string>
+
+    <!-- Missed call: dialog to ignore all missed calls title -->
+    <string name="MCA_ignore_title">Ignore all missed calls?</string>
+
+    <!-- Missed call: dialog to ignore all missed calls body -->
+    <string name="MCA_ignore_body">You\'ve ignored several missed calls. Should Astrid stop asking
+        you about them?
+    </string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore all button -->
+    <string name="MCA_ignore_all">Ignore all calls</string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
+    <string name="MCA_ignore_this">Ignore this call only</string>
+
+    <!-- Missed call: preference title -->
+    <string name="MCA_missed_calls_pref_title">Field missed calls</string>
+
+    <!-- slide 49c: Missed call: preference description -->
+    <string name="MCA_missed_calls_pref_desc_enabled">Astrid will notify you about missed calls and
+        offer to remind you to call back
+    </string>
+    <string name="MCA_missed_calls_pref_desc_disabled">Astrid will not notify you about missed
+        calls
+    </string>
+
+    <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
+    <string name="MCA_task_title_name">Call %1$s back at %2$s</string>
+
+    <!-- Missed call: task title no name (%s -> number)-->
+    <string name="MCA_task_title_no_name">Call %s back</string>
+
+    <!-- Missed call: schedule dialog title (%s -> name or number)-->
+    <string name="MCA_schedule_dialog_title">Call %s back in...</string>
+
+    <!-- Missed call speech bubble options -->
+    <string-array name="MCA_dialog_speech_options">
+        <item>It must be nice to be so popular!</item>
+        <item>Yay! People like you!</item>
+        <item>Make their day, give \'em a call!</item>
+        <item>Wouldn\'t you be happy if people called you back?</item>
+        <item>You can do it!</item>
+        <item>You can always send a text...</item>
+    </string-array>
+
+
+    <!-- ======================================= Calendar reminder activity == -->
+
+    <!-- Calendar remindeer ignore button -->
+    <string name="CRA_ignore">無視する</string>
+
+    <!-- Calendar event -->
+    <string name="CRA_title">Need a meeting list?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls title -->
+    <string name="CRA_ignore_title">Ignore all calendar events?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls body -->
+    <string name="CRA_ignore_body">You\'ve ignored several calendar events. Should Astrid stop
+        asking you about them?
+    </string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
+    <string name="CRA_ignore_all">Ignore all events</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
+    <string name="CRA_ignore_this">Ignore this event only</string>
+
+    <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
+    <string name="CRA_speech_bubble_start">Looks like %s is starting soon. Want to create a list for
+        action items?
+    </string>
+
+    <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
+    <string name="CRA_speech_bubble_end">Looks like you just finished with %s. Want to create a list
+        for action items?
+    </string>
+
+    <!-- Calendar reminder: create list button -->
+    <string name="CRA_create_list">Create list</string>
+
+    <!-- Calendar reminder: postpone button -->
+    <string name="CRA_postpone">Maybe afterwards</string>
+
+    <!-- Calendar reminder: list exists dialog title -->
+    <string name="CRA_list_exists_title">List already exists</string>
+
+    <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
+    <string name="CRA_list_exists_body">A list named %s already exists. Do you want to use the
+        existing list or create a new one for this event?
+    </string>
+
+    <!-- Calendar reminder: list exists dialog create new button -->
+    <string name="CRA_create_new">Create new</string>
+
+    <!-- Calendar reminder: list exists dialog use existing button -->
+    <string name="CRA_use_existing">Use existing</string>
+
+    <!-- Calendar remindr: created list (%s -> list name) -->
+    <string name="CRA_created_list_dialog">I created a list %s.</string>
+
+    <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
+    <string name="CRA_one_attendee">%s is attending.</string>
+
+    <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
+    <string name="CRA_two_attendees">%1$s and %2$s are attending.</string>
+
+    <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
+    <string name="CRA_many_attendees">%1$s, %2$s, and %3$d others are attending.</string>
+
+    <!-- Calendar reminder: invitation prompt -->
+    <string name="CRA_invitation_prompt">Want to invite them?</string>
+
+    <!-- Calendar reminder: preference title -->
+    <string name="CRA_calendar_reminders_pref_title">Calendar assistant</string>
+
+    <!-- Calendar reminder: pref description disabled -->
+    <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid will not remind you about
+        upcoming calendar events
+    </string>
+
+    <!-- Calendar reminder: pref description enabled -->
+    <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid will remind you about upcoming
+        calendar events and prompt you to prepare for them
+    </string>
+
+    <!-- Calendar reminder: share list title -->
+    <string name="CRA_share_list_title">Share the list?</string>
+
+    <string name="CRA_invite_attendees">Invite attendees</string>
+
+    <string name="CRA_more_options">More options</string>
+
+    <string name="CRA_dont_invite">No thank you</string>
+
+    <!-- Calendar reminder: share list title when no other attendees exist-->
+    <string name="CRA_list_created_title">List created!</string>
+
+    <!-- Calendar reminder: default new list name (%s -> event title) -->
+    <string name="CRA_default_list_name">Action Items: %s</string>
+
+    <!-- ===================================================== HelpActivity == -->
+
+    <!-- Help: Button to get support from our website -->
+
+    <!-- ==================================================== UpdateService == -->
+
+    <!-- Changelog Window Title -->
+    <string name="UpS_changelog_title">Astrid の変更点</string>
+
+    <!-- Updates Window Title -->
+    <string name="UpS_updates_title">最新のAstridニュース</string>
+
+    <!-- Updats No Activity to show for offline users -->
+    <string name="UpS_no_activity_log_in">Log in to see a record of\nyour progress as well
+        as\nactivity on shared lists.
+    </string>
+
+    <!-- ================================================== EditPreferences == -->
+
+    <!-- slide 31g: Preference Window Title -->
+    <string name="EPr_title">Astrid: 設定</string>
+
+    <string name="EPr_share_astrid">Share Astrid</string>
+
+    <string name="EPr_share_astrid_summary">Share about Astrid on your favorite social network
+    </string>
+
+    <!-- slide 46a -->
+    <string name="EPr_deactivated">deactivated</string>
+
+    <!-- slide 30i: Preference Category: Appearance Title -->
+    <string name="EPr_appearance_header">外観</string>
+
+    <!-- Preference Category: Appearance Summary -->
+    <string name="EPr_appearance_summary">Themes, widgets, task rows, edit screen</string>
+
+    <!-- FAQ Preference title -->
+    <string name="EPr_faq_title">FAQ</string>
+
+    <!-- Account status preference (%s -> account type) -->
+    <string name="EPr_account_title">Account: %s</string>
+
+    <!-- Support preferences summary -->
+    <string name="EPr_support_summary">Tutorial, FAQ, about</string>
+
+    <!-- slide 34a: Preference: Task List Font Size Title -->
+    <string name="EPr_fontSize_title">リストの文字サイズ</string>
+
+    <!-- Preference: Filters to show pref screen title -->
+    <string name="EPr_filters_to_show_title">Filters to show</string>
+
+    <!-- slide 32a: Preference: Show confirmation for smart reminders -->
+    <string name="EPr_showSmartConfirmation_title">Show confirmation for smart reminders</string>
+
+    <!-- slide 34g: Preference: Task List Font Size Description -->
+    <string name="EPr_fontSize_desc">メインのリスト画面の文字サイズ</string>
+
+    <!-- Preferemce: Show task edit confirmation toasts -->
+
+    <!-- slide 34c: Preference: Task List Show Notes -->
+    <string name="EPr_showNotes_title">Show description in task</string>
+
+    <!-- Edit screen preference category -->
+    <string name="EPr_edit_screen_options">Edit screen options</string>
+
+    <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
+    <string name="EPr_beastMode_title">Edit screen order</string>
+
+    <string name="EPr_beastMode_shortcut">Customize</string>
+
+    <string name="EPr_time_increment">5 minute increments</string>
+
+    <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
 
-    
-    <!-- Resources for built-in timers plug-in -->
-    
-    <!-- Task Edit Activity: Container Label -->
-    <string name="alarm_ACS_label">アラーム</string>
-    
-    <!-- Task Edit Activity: Add New Alarm -->
-    <string name="alarm_ACS_button">アラームを追加する</string>
-    
-    <string-array name="reminders_alarm">
-      <!-- reminders related to alarm -->
-      <item>アラーム</item>
+    <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
+
+    <!-- slide 35h -->
+    <string name="EPr_beastMode_desc">Customize the layout of the task edit screen</string>
+    <!-- slide 35j -->
+    <string name="EPr_beastMode_reset">Reset to defaults</string>
+
+    <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on
+        each row
+    </string>
+
+    <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
+    <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit
+        screen
+    </string>
+    <!-- Preference: Task List Show Notes Description (enabled) -->
+    <string name="EPr_showNotes_desc_enabled">Description will always be displayed</string>
+
+    <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
+    <string name="EPr_compressTaskRows_title">Compact task row</string>
+    <!-- slide 34j -->
+    <string name="EPr_compressTaskRows_desc">Compress task rows to fit title</string>
+
+    <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
+    <!-- slide 34k-->
+
+    <!-- slide 34b: Preferences: Wrap task titles to two lines -->
+    <string name="EPr_fullTask_title">Show full task title</string>
+    <string name="EPr_fullTask_desc_enabled">Full task title will be shown</string>
+    <!-- slide 34h -->
+    <string name="EPr_fullTask_desc_disabled">First two lines of task title will be shown</string>
+
+    <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
+    <string name="EPr_ideaAuto_title">Auto-load ideas tab</string>
+    <!-- slide 32c -->
+    <string name="EPr_ideaAuto_desc_enabled">Web searches for ideas tab will be performed when tab
+        is clicked
+    </string>
+    <string name="EPr_ideaAuto_desc_disabled">Web searches for ideas tab will be performed only when
+        manually requested
+    </string>
+
+    <!-- Preferences: task row style -->
+    <string-array name="EPr_task_row_styles">
+        <item>Original</item>
+        <item>Simple</item>
+        <item>Title only</item>
     </string-array>
-    
 
+    <string-array name="EPr_task_row_style_descriptions">
+        <item>Truncate title to two lines with date on right</item>
+        <item>Truncate title to one line with date and lists below</item>
+        <item>Single line title only</item>
+    </string-array>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- task row style title (%s -> style) -->
+    <string name="EPr_task_row_style_title">Row style: %s</string>
 
-    
-  <!-- Resources for built-in backup plug-in -->
-  
-  <!-- ================================================= BackupPreferences == -->
+    <!-- Preference: custom filters enabled -->
+    <string name="EPr_use_filters_title">Use filters</string>
+    <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
 
-    <!-- slide 33c/48d: Backup Preferences Title -->    
-    <string name="backup_BPr_header">バックアップ</string>
+    <!-- Preference: show list members in shared list -->
+    <string name="EPr_show_list_members_title">Show list members in shared lists</string>
 
-    <!-- slide 48e/50c: Backup: Status Header -->    
-    <string name="backup_BPr_group_status">状況</string>
-    
-    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">最新: %s</string>
-    <!-- Backup Status: last error failed. Keep it short! -->    
-    <string name="backup_status_failed">Last backup failed</string>
-    <!-- Backup Status: error subtitle -->    
-    <string name="backup_status_failed_subtitle">（タップでエラーを表示）</string>
-    <!-- slide 48a: Backup Status: never backed up -->    
-    <string name="backup_status_never">Never backed up!</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_simple_input_boxes">Simple text boxes</string>
 
-    <!-- slide 48f/ 50e: Backup Options Group Label -->    
-    <string name="backup_BPr_group_options">オプション</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
 
-    <!-- slide 48b: Preference: Automatic Backup Title -->    
-    <string name="backup_BPr_auto_title">自動的なバックアップ</string>
-    <!-- Preference: Automatic Backup Description (when disabled) -->
-    <string name="backup_BPr_auto_disabled">自動的なバックアップは無効です</string>    
-    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
-    <string name="backup_BPr_auto_enabled">バックアップは毎日行われます</string>
-    
-    <!-- Preference screen restoring Tasks Help -->
-    <!-- Preference screen Restoring Tasks Help Dialog Text-->
-    
-    <string name="backup_BPr_cloud_already_logged_in">You already have cloud backup on Astrid.com!</string>
-  
-  <!-- ================================================= BackupActivity == -->
-
-  <!-- slide 48c: backup activity label -->
-  <string name="backup_BAc_label">バックアップ</string>
-
-  <!-- backup activity title -->
-  <string name="backup_BAc_title">バックアップの管理</string>
-
-  <!-- backup activity import button -->
-  <string name="backup_BAc_import">タスクのインポート</string>
-
-  <!-- backup activity export button -->
-  <string name="backup_BAc_export">タスクのエクスポート</string>
-  
-  <!-- backup activity cloud (Astrid.com) option -->
-  <string name="backup_BAc_cloud">Click for free cloud backup on Astrid.com</string>
-    
-  <!-- ============================================== Importer / Exporter == -->
-  
-  <!-- Message displayed when error occurs -->
-  <string name="backup_TXI_error">インポートに失敗</string>
-    
-  <string name="export_toast">%1$s を %2$s にバックアップしました。</string>
-    
-  <string name="export_toast_no_tasks">エクスポートするタスクがありません</string>
-  
-  <!-- Progress Dialog Title for exporting -->    
-  <string name="export_progress_title">エクスポート中</string>
-  
-  <!-- Backup: Title of Import Summary Dialog -->
-  <string name="import_summary_title">復元の概要</string>
-    
-  <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">ファイル %1$s の %2$s 中、\n\n成功: %3$s\n既に存在: %4$s\n失敗: %5$s\n</string>
-  
-  <!-- Progress Dialog Title for importing -->    
-  <string name="import_progress_title">インポート中</string>
-  
-  <!-- Progress Dialog text for import reading task (%d -> task number)-->    
-  <string name="import_progress_read">タスク %d を読み込み中</string>
-  
-  <!-- Backup: Dialog when unable to open a file -->  
-  
-  <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
-  <string name="DLG_error_sdcard">フォルダ %s を開けません</string>
-  
-  <!-- Backup: Dialog when unable to open SD card in general -->
-  <string name="DLG_error_sdcard_general">SDカードにアクセスできません</string>
-    
-  <!-- Backup: File Selector dialog for import -->
-  <string name="import_file_prompt">復元に使うファイルを選択してください</string>    
-        
+    <!-- Preference: don\'t show plus button until input present -->
+    <string name="EPr_hide_plus_button">Hide plus button</string>
 
+    <!-- Preference: menu items -->
+    <string name="EPr_menu_items">Menu items</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Preference: list view -->
+    <string name="EPr_list_view">List view</string>
 
+    <!-- Preference: task edit comments -->
+    <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
 
-  <!-- ================================================== AndroidManifest == -->
-
-  <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
-  <string name="app_name">Astridタスク</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="read_permission_label">タスクの読み込み</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="read_permission_desc">タスクの読み込みとフィルタの表示</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="write_permission_label">タスクの読み込み</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="write_permission_desc">タスクの作成、編集</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-    
-  <!-- question for deleting tasks -->
-  <string name="DLG_delete_this_task_question">このタスクを削除しますか?</string>
-
-  <!-- question for deleting items (%s => item name) -->
-  <string name="DLG_delete_this_item_question">項目 %s を削除しますか?</string>
-    
-  <!-- Progress dialog shown when upgrading -->
-  <string name="DLG_upgrading">タスクを更新しています</string>
-  
-  <!-- Title for dialog selecting a time (hours and minutes) -->
-  <string name="DLG_hour_minutes">時間 (時:分)</string>
-  
-  <!-- Dialog for Astrid having a critical update -->
-  <string name="DLG_please_update">Astrid should to be updated to the latest
-  version in the Android market! Please do that before continuing, or wait a 
-  few seconds.</string>
-
-  <!-- Button for going to Market -->
-
-  <!-- Button for accepting EULA -->
-  <string name="DLG_accept">同意する</string>
-
-  <!-- Button for declining EULA -->
-  <string name="DLG_decline">同意しない</string>
-
-  <!-- EULA title -->
-  <string name="DLG_eula_title">Astrid 利用規定</string>
-
-  <!-- Progress Dialog generic text -->
-  <string name="DLG_please_wait">お待ちください</string>
-  
-  <!-- Dialog - loading -->
-  <string name="DLG_loading">読み込んでいます・・・</string>
-  
-  <!-- Dialog - dismiss -->
-
-  <!-- slide 20d -->
-  <string name="DLG_ok">OK</string>
-  <!-- slide 36g -->
-  <string name="DLG_cancel">取り消す</string>
-  
-  <string name="DLG_more">もっと</string>
-  
-  <string name="DLG_undo">動作を取り消す</string>
-  
-  <string name="DLG_warning">Warning</string>
-  
-  <!-- =============================================================== UI == -->
-  
-  <!-- Label for DateButtons with no value -->
-  <string name="WID_dateButtonUnset">入力する</string>
-  
-  <!-- String formatter for DateButtons ($D => date, $T => time) -->
-  
-  <!-- String formatter for Disable button -->
-  
-  <!--  ============================================================= notes -->
-  
-  <!-- Note Exposer -->    
-  
-  <!-- Note Exposer / Comments -->    
-  
-  <!-- EditNoteActivity - no comments -->
-  <string name="ENA_no_comments">No activity yet</string>
-    
-  <!-- EditNoteActivity - no username for comment -->
-  <string name="ENA_no_user">Someone</string>
-  
-  <!-- EditNoteActivity - refresh comments -->
-  <string name="ENA_refresh_comments">コメントを更新</string>
-  
-  <!-- ================================================= TaskListActivity == -->
-  
-  <!-- slide 8b: Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">タスクなし</string>
-  
-  <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->    
-  <string name="TLA_no_items_person">%s has no\ntasks shared with you</string>
-  
-  <!-- Menu: Adjust Sort and Hidden Task Settings -->    
-  <string name="TLA_menu_sort">Sort</string>
-  
-  <!-- Menu: Sync Now -->    
-  <string name="TLA_menu_sync">Sync Now</string>
-  
-  <!-- Menu: Search -->
-  <string name="TLA_menu_search">Search</string>
-  
-  <!-- Menu: Tasks -->
-  <string name="TLA_menu_lists">リスト</string>
-
-  <!-- Menu: Friends -->
-  <string name="TLA_menu_friends">人々</string>
-
-  <!-- Menu: Featured Lists -->
-  <string name="TLA_menu_featured_lists">Featured Lists</string>
-
-  <!-- Menu: Suggestions -->
-  <string name="TLA_menu_suggestions">提案</string>
-  
-  <!-- Menu: Tutorial -->
-
-  <!-- Menu: Settings -->    
-  <string name="TLA_menu_settings">設定</string>
-  
-  <!-- slide 30b: Menu: Support -->
-  <string name="TLA_menu_support">サポート</string>
-  
-  <!-- Search Label-->
-  
-  <!-- Window title for displaying Custom Filter -->
-  <string name="TLA_custom">カスタムフィルタ</string>
-  
-  <!-- slide 8d: Quick Add Edit Box Hint-->
-  <string name="TLA_quick_add_hint">タスクを追加する</string>
-  
-  <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
-  <string name="TLA_quick_add_hint_assign">Add something for %s</string>
-  
-  <!-- Notification Volumne notification-->
-  <string name="TLA_notification_volume_low">Notifications are muted. You won\'t be able to hear Astrid!</string>
-  
-  <!-- Notifications disabled warning -->
-  <string name="TLA_notification_disabled">Reminders are disabled! You will not receive any reminders</string>
-  
-  <string-array name="TLA_filters">
-      <item>Active</item>
-      <item>Today</item>
-      <item>すぐに</item>
-      <item>遅延</item>
-      <item>完了</item>
-      <item>非表示</item>      
-  </string-array>
-  
-  <!-- Title for confirmation dialog after quick add markup -->
-  <string name="TLA_quickadd_confirm_title">You said, \"%s\"</string>
-  
-  <!-- Text for speech bubble in dialog after quick add markup -->
-  <!-- First string is task title, second is due date, third is priority -->
-  <string name="TLA_quickadd_confirm_speech_bubble">I created a task called \"%1$s\" %2$s at %3$s</string>
-  
-  <string name="TLA_quickadd_confirm_speech_bubble_date">for %s</string>
-  
-  <string name="TLA_quickadd_confirm_hide_helpers">Don\'t display future confirmations</string>
-  
-  
-  <!-- Title for alert on new repeating task. %s-> task title -->
-  <string name="TLA_repeat_scheduled_title">New repeating task %s</string>
-  
-  <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
-  <string name="TLA_repeat_scheduled_speech_bubble">I\'ll remind you about this %s.</string>
-  
-  <string-array name="TLA_priority_strings">
-      <item>最優先</item>
-      <item>優先度高</item>
-      <item>優先度中</item>
-      <item>優先度低</item>
-  </string-array>
-  <!-- slide 22a -->
-  <string name="TLA_all_activity">All Activity</string>
-  
-  <!-- ====================================================== TaskAdapter == -->
-  
-  <!-- Format string to indicate task is hidden (%s => task name) -->
-  <string name="TAd_hiddenFormat">%s [非表示]</string>
-  
-  <!-- Format string to indicate task is deleted (%s => task name) -->
-  <string name="TAd_deletedFormat">%s [削除済]</string>
-  
-  <!-- Displayed when adapter is flung (scrolled quickly) -->
-  
-  <!-- slide 22b: indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">%s\nに完了</string>
-  
-  <!-- slide 15a: Action Button: edit task -->
-  <string name="TAd_actionEditTask">編集する</string>
-  
-  <!-- Context Item: edit task -->
-  <string name="TAd_contextEditTask">タスクを編集</string>
-
-  <!-- Context Item: copy task -->
-  <string name="TAd_contextCopyTask">タスクをコピー</string>
-
-  <!-- Context Item: delete task -->
-  <string name="TAd_contextDeleteTask">Delete Task</string>
-
-  <!-- Context Item: undelete task -->
-  <string name="TAd_contextUndeleteTask">元に戻す</string>
-
-  <!-- Context Item: purge task -->
-  <string name="TAd_contextPurgeTask">タスクを削除</string>
-  
-  <!-- ============================================== SortSelectionDialog == -->
-  
-  <!-- slide 23a: Sort Selection: dialog title -->    
-  <string name="SSD_title">並び順と表示項目</string>
-  
-  <!-- slide 23h:  Hidden: title -->
-  <string name="SSD_hidden_title">非表示のタスク</string>
-  
-  <!-- Hidden Task Selection: show completed tasks -->    
-  <string name="SSD_completed">完了タスクの表示</string>
-  
-  <!-- Hidden Task Selection: show hidden tasks -->    
-  <string name="SSD_hidden">非表示タスクの表示</string>
-  
-  <!-- Hidden Task Selection: show deleted tasks -->    
-  <string name="SSD_deleted">削除済タスクの表示</string>
-  
-  <!-- Sort Selection: drag with subtasks -->
-  <string name="SSD_sort_drag">Manual order with subtasks</string>
-  
-  <!-- slide 23b: Sort Selection: smart sort -->
-  <string name="SSD_sort_auto">自動</string>
-  
-  <!-- slide 23e: Sort Selection: sort by alpha -->
-  <string name="SSD_sort_alpha">タイトル順</string>
-  
-  <!-- slide 23c: Sort Selection: sort by due date -->
-  <string name="SSD_sort_due">期限順</string>
-  
-  <!-- slide 23d: Sort Selection: sort by importance -->
-  <string name="SSD_sort_importance">By priority</string>
-  
-  <!-- slide 23f: Sort Selection: sort by modified date -->
-  <string name="SSD_sort_modified">更新日時順</string>
-  
-  <!-- slide 23g: Sort Selection: reverse -->
-  <string name="SSD_sort_reverse">逆順</string>
-  
-  <!-- slide 23j: Sort Button: sort temporarily -->
-  <string name="SSD_save_temp">今回のみ</string>
-  
-  <!-- slide 23i: Sort Button: sort permanently -->
-  <string name="SSD_save_always">設定の保存</string>
-  
-  <!-- =============================================== FilterListActivity == -->
-  
-  <!-- Astrid Filter Shortcut -->    
-  <string name="FSA_label">List or Filter</string>
-
-  <!-- Filter List Activity Title -->    
-  
-  <!-- Displayed when loading filters -->    
-  
-  <!-- Context Menu: Create Shortcut -->    
-  <string name="FLA_context_shortcut">ショートカットの作成</string>
-  
-  <!-- Menu: Search -->
-  
-  <!-- Menu: Help -->    
-  
-  <!-- slide 28c: Create Shortcut Dialog Title -->    
-  <string name="FLA_shortcut_dialog_title">ショートカットを作る</string>
-  
-  <!-- Create Shortcut Dialog (asks to name shortcut) -->    
-  <string name="FLA_shortcut_dialog">ショートカットの名称</string>
-  
-  <!-- Search Hint-->
-  <string name="FLA_search_hint">タスクの検索</string>
-  
-  <!-- Search Filter name (%s => query) -->
-  <string name="FLA_search_filter">「%s」の検索結果</string>
-  
-  <!-- Toast: created shortcut (%s => label) -->
-  <string name="FLA_toast_onCreateShortcut">ショートカット %s を作成しました</string>
-  
-  <!-- Menu: new filter -->
-  <string name="FLA_new_filter">新しいフィルタ</string>
-  
-  <!-- slide 10e: Button: new list -->
-  <string name="FLA_new_list">新しいリスト</string>
-  
-  <!-- Alert when creating a shortcut without selecting a filter -->
-  <string name="FLA_no_filter_selected">No filter selected! Please select a filter or list.</string>
-  
-  <!-- ================================================= TaskEditActivity == -->
-  
-  <!-- Title when editing a task (%s => task title) -->
-  
-  <!-- Title when creating a new task -->
-  
-  <!-- Task title label -->
-  
-  <!-- Task when label -->
-  <string name="TEA_when_header_label">いつ</string>
-  
-  <!-- Task title hint (displayed when edit box is empty) -->
-  <string name="TEA_title_hint">Task name</string>
-  
-  <!-- Task importance label -->
-  <string name="TEA_importance_label">優先順位</string>
-  
-  <!-- Task due date hint -->
-  <string name="TEA_deadline_hint">Set due date</string>
-  
-  <!-- Task assigned to string (%s -> assigned person name) -->
-  <string name="TEA_assigned_to">Assigned to %s</string>
-  
-  <!-- Task urgency specific time checkbox -->
-  <string name="TEA_urgency_specific_time">時刻を設定する</string>
-  
-  <!-- Task urgency specific time title when specific time false -->
-  <string name="TEA_urgency_none">なし</string>
-  
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_label">Hide until</string>
-
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_display">Hide until %s</string>
-  
-  <!-- Task hide until toast -->
-  <string name="TEA_hideUntil_message">Task will be hidden until %s</string>
-  
-  <!-- Task editing data being loaded label -->
-  <string-array name="TEA_loading"><item>読み込んでいます・・・</item></string-array>
-  
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_note_label">概要</string>
-
-  <!-- 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">所要時間は?</string>
-  
-  <!-- Elapsed time label -->
-  <string name="TEA_elapsedDuration_label">既にタスクに費やした時間</string>
-
-  <!-- Menu: Save -->    
-  <string name="TEA_menu_save">変更の保存</string>
-  
-  <!-- Menu: Don\'t Save -->
-  <string name="TEA_menu_discard">保存しない</string>
-  
-  <!-- Menu: Delete Task -->
-  <string name="TEA_menu_delete">タスクを削除</string>
-  
-  <!-- Menu: Task comments -->
-  <string name="TEA_menu_refresh_comments">Refresh comments</string>
-
-  <string name="TEA_menu_comments">コメント</string>
-  
-   <!-- Toast: task saved with deadline (%s => preposition + time units) -->
-  <string name="TEA_onTaskSave_due">タスクは保存されました: 期限は%s</string>
-  
-  <!-- Toast: task saved without deadlines -->
-  <string name="TEA_onTaskSave_notDue">タスクは保存されました</string>
-  
-  <!-- Toast: task was not saved -->
-  
-  <!-- Toast: task was deleted -->
-  
-  <!-- slide 15b: Task edit tab: activity -->
-  <string name="TEA_tab_activity">活動</string>
-  
-  <!-- slide 15e:  Task edit tab: more editing settings -->
-  <string name="TEA_tab_more">さらに</string>
-  
-  <!-- slide 15d: Task edit tab: web services -->
-  <string name="TEA_tab_web">アイデア</string>
-  
-  <string name="TEA_timer_est">Est. %s</string>
-
-  <string name="TEA_timer_elap">Elapsed %s</string>
-  
-  <string-array name="TEA_urgency">
-      <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No date</item>
-      <item>指定した日から</item>
-      <item>Today</item>
-      <item>Tomorrow</item>
-      <item>日後</item>
-      <item>来週</item>
-      <item>2週間以内</item>
-      <item>来月</item>
-  </string-array>
-  
-  <string name="TEA_no_time">No time</string>
-      
-  <string-array name="TEA_hideUntil">
-      <!-- hideUntil: labels for edit page. -->
-      <item>Never</item>
-      <item>期限日</item>
-      <item>Due time</item>
-      <item>Day before due</item>
-      <item>Week before due</item>
-      <item>日時を指定</item>
-  </string-array>
-  
-  <!-- Task edit control set descriptors -->
-
-  <!-- slide 9b/35i -->
-  <string name="TEA_control_who">誰</string>
-
-  <!-- slide 9c/ 35a -->
-  <string name="TEA_control_when">いつ</string>
-  <!-- slide 35b -->
-  <string name="TEA_control_more_section">----More Section----</string>
-  <!-- slide 16a/35c -->
-  <string name="TEA_control_importance">優先順位</string>  
-  <!-- slide 16b/35d -->
-  <string name="TEA_control_lists">リスト</string>  
-  <!-- slide 16c/35e -->
-  <string name="TEA_control_notes">概要</string>  
-  
-  <string name="TEA_control_files">Files</string>
-
-  <!-- slide 16e / slide 35g-->
-  <string name="TEA_control_reminders">リマインダー</string>
-
-  <!-- slide 16f -->
-  <string name="TEA_control_timer">Timer Controls</string>
-  
-  <string name="TEA_control_hidden_section">----Hide Always----</string>
-  
-  <string name="hide_until_prompt">Show in my list</string>
-  
-  <!-- Add Ons tab when no add-ons found -->
-  
-  <!-- Add Ons button -->
-  
-  <!-- More row -->
-  
-  <!-- slide 15c: Text when no activity to show -->
-  <string name="TEA_no_activity">No activity</string>
-  
-  <!-- Text to load more activity -->
-  <string name="TEA_load_more">Load more...</string>
-  
-  <!-- When controls dialog -->
-  <string name="TEA_when_dialog_title">When is this due?</string>
-  
-  
-  <string name="TEA_new_task">新しいタスク</string>
-  
-  <string name="WSV_click_to_load">Tap me to search for ways to get this done!</string>
-  
-  <string name="WSV_not_online">I can do more when connected to the Internet. Please check your connection.</string>
-  
-  <string name="TEA_contact_error">Sorry! We couldn\'t find an email address for the selected contact.</string>
-  
-  <!-- ============================================= IntroductionActivity == -->
-  
-  <!-- slide 1a: Introduction Window title -->
-  
-  <!-- Button to agree to EULA -->
-  
-  <!-- Button to disagree with EULA -->
-  
-  <!-- ===================================================== MissedCallActivity == -->
-  
-  <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
-  <string name="MCA_title"> %1$s\ncalled at %2$s</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_return_call">Call now</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_add_task">Call later</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_ignore">無視する</string>
-  
-  <!-- Missed call: dialog to ignore all missed calls title -->
-  <string name="MCA_ignore_title">Ignore all missed calls?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls body -->
-  <string name="MCA_ignore_body">You\'ve ignored several missed calls. Should Astrid stop asking you about them?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore all button -->
-  <string name="MCA_ignore_all">Ignore all calls</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
-  <string name="MCA_ignore_this">Ignore this call only</string>
-
-  <!-- Missed call: preference title -->
-  <string name="MCA_missed_calls_pref_title">Field missed calls</string>
-
-  <!-- slide 49c: Missed call: preference description -->
-  <string name="MCA_missed_calls_pref_desc_enabled">Astrid will notify you about missed calls and offer to remind you to call back</string>
-  <string name="MCA_missed_calls_pref_desc_disabled">Astrid will not notify you about missed calls</string>
-
-  <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
-  <string name="MCA_task_title_name">Call %1$s back at %2$s</string>
-
-  <!-- Missed call: task title no name (%s -> number)-->
-  <string name="MCA_task_title_no_name">Call %s back</string>
-  
-  <!-- Missed call: schedule dialog title (%s -> name or number)-->
-  <string name="MCA_schedule_dialog_title">Call %s back in...</string>
-  
-  <!-- Missed call speech bubble options -->
-  <string-array name="MCA_dialog_speech_options">
-      <item>It must be nice to be so popular!</item>
-      <item>Yay! People like you!</item>
-      <item>Make their day, give \'em a call!</item>
-      <item>Wouldn\'t you be happy if people called you back?</item>
-      <item>You can do it!</item>
-      <item>You can always send a text...</item>
-  </string-array>
-  
-  
-  <!-- ======================================= Calendar reminder activity == -->
-  
-  <!-- Calendar remindeer ignore button -->
-  <string name="CRA_ignore">無視する</string>
-  
-  <!-- Calendar event -->
-  <string name="CRA_title">Need a meeting list?</string>
-  
-  <!-- Calendar reminder: dialog to ignore all missed calls title -->
-  <string name="CRA_ignore_title">Ignore all calendar events?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls body -->
-  <string name="CRA_ignore_body">You\'ve ignored several calendar events. Should Astrid stop asking you about them?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
-  <string name="CRA_ignore_all">Ignore all events</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
-  <string name="CRA_ignore_this">Ignore this event only</string>
-  
-  <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
-  <string name="CRA_speech_bubble_start">Looks like %s is starting soon. Want to create a list for action items?</string>
-
-  <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
-  <string name="CRA_speech_bubble_end">Looks like you just finished with %s. Want to create a list for action items?</string>
-  
-  <!-- Calendar reminder: create list button -->
-  <string name="CRA_create_list">Create list</string>
-
-  <!-- Calendar reminder: postpone button -->
-  <string name="CRA_postpone">Maybe afterwards</string>
-  
-  <!-- Calendar reminder: list exists dialog title -->
-  <string name="CRA_list_exists_title">List already exists</string>
-  
-  <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
-  <string name="CRA_list_exists_body">A list named %s already exists. Do you want to use the existing list or create a new one for this event?</string>
-  
-  <!-- Calendar reminder: list exists dialog create new button -->
-  <string name="CRA_create_new">Create new</string>
-
-  <!-- Calendar reminder: list exists dialog use existing button -->
-  <string name="CRA_use_existing">Use existing</string>
-  
-  <!-- Calendar remindr: created list (%s -> list name) -->
-  <string name="CRA_created_list_dialog">I created a list %s.</string>
-  
-  <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
-  <string name="CRA_one_attendee">%s is attending.</string>
-
-  <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
-  <string name="CRA_two_attendees">%1$s and %2$s are attending.</string>
-
-  <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
-  <string name="CRA_many_attendees">%1$s, %2$s, and %3$d others are attending.</string>
-  
-  <!-- Calendar reminder: invitation prompt -->
-  <string name="CRA_invitation_prompt">Want to invite them?</string>
-  
-  <!-- Calendar reminder: preference title -->
-  <string name="CRA_calendar_reminders_pref_title">Calendar assistant</string>
-
-  <!-- Calendar reminder: pref description disabled -->
-  <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid will not remind you about upcoming calendar events</string>
-
-  <!-- Calendar reminder: pref description enabled -->
-  <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid will remind you about upcoming calendar events and prompt you to prepare for them</string>
-  
-  <!-- Calendar reminder: share list title -->
-  <string name="CRA_share_list_title">Share the list?</string>
-  
-  <string name="CRA_invite_attendees">Invite attendees</string>
-
-  <string name="CRA_more_options">More options</string>
-
-  <string name="CRA_dont_invite">No thank you</string>
-
-  <!-- Calendar reminder: share list title when no other attendees exist-->
-  <string name="CRA_list_created_title">List created!</string>
-  
-  <!-- Calendar reminder: default new list name (%s -> event title) -->
-  <string name="CRA_default_list_name">Action Items: %s</string>
-  
-  <!-- ===================================================== HelpActivity == -->
-  
-  <!-- Help: Button to get support from our website -->
-    
-  <!-- ==================================================== UpdateService == -->
-  
-  <!-- Changelog Window Title -->
-  <string name="UpS_changelog_title">Astrid の変更点</string>
-  
-  <!-- Updates Window Title -->
-  <string name="UpS_updates_title">最新のAstridニュース</string>
-  
-  <!-- Updats No Activity to show for offline users -->
-  <string name="UpS_no_activity_log_in">Log in to see a record of\nyour progress as well as\nactivity on shared lists.</string>
-  
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 31g: Preference Window Title -->
-  <string name="EPr_title">Astrid: 設定</string>
-  
-  <string name="EPr_share_astrid">Share Astrid</string>
-
-  <string name="EPr_share_astrid_summary">Share about Astrid on your favorite social network</string>
-  
-  <!-- slide 46a -->
-  <string name="EPr_deactivated">deactivated</string>
-
-  <!-- slide 30i: Preference Category: Appearance Title -->
-  <string name="EPr_appearance_header">外観</string>
-  
-  <!-- Preference Category: Appearance Summary -->
-  <string name="EPr_appearance_summary">Themes, widgets, task rows, edit screen</string>
-  
-  <!-- FAQ Preference title -->
-  <string name="EPr_faq_title">FAQ</string>
-  
-  <!-- Account status preference (%s -> account type) -->
-  <string name="EPr_account_title">Account: %s</string>
-
-  <!-- Support preferences summary -->
-  <string name="EPr_support_summary">Tutorial, FAQ, about</string>
-  
-  <!-- slide 34a: Preference: Task List Font Size Title -->
-  <string name="EPr_fontSize_title">リストの文字サイズ</string>
-  
-  <!-- Preference: Filters to show pref screen title -->
-  <string name="EPr_filters_to_show_title">Filters to show</string>
-  
-  <!-- slide 32a: Preference: Show confirmation for smart reminders -->
-  <string name="EPr_showSmartConfirmation_title">Show confirmation for smart reminders</string>
-  
-  <!-- slide 34g: Preference: Task List Font Size Description -->                                                                                                                                                  
-  <string name="EPr_fontSize_desc">メインのリスト画面の文字サイズ</string>  
-  
-  <!-- Preferemce: Show task edit confirmation toasts -->
-  
-  <!-- slide 34c: Preference: Task List Show Notes -->
-  <string name="EPr_showNotes_title">Show description in task</string>
-  
-  <!-- Edit screen preference category -->
-  <string name="EPr_edit_screen_options">Edit screen options</string>
-  
-  <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
-  <string name="EPr_beastMode_title">Edit screen order</string>
-  
-  <string name="EPr_beastMode_shortcut">Customize</string>
-  
-  <string name="EPr_time_increment">5 minute increments</string>
-  
-  <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
-  
-  <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
-  
-  <!-- slide 35h -->
-  <string name="EPr_beastMode_desc">Customize the layout of the task edit screen</string>
-  <!-- slide 35j -->
-  <string name="EPr_beastMode_reset">Reset to defaults</string>
-  
-  <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on each row</string>
-      
-  <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit screen</string>  
-  <!-- Preference: Task List Show Notes Description (enabled) -->
-  <string name="EPr_showNotes_desc_enabled">Description will always be displayed</string>
-  
-  <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
-  <string name="EPr_compressTaskRows_title">Compact task row</string>
-  <!-- slide 34j -->
-  <string name="EPr_compressTaskRows_desc">Compress task rows to fit title</string>
-  
-  <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
-  <!-- slide 34k-->
-  
-  <!-- slide 34b: Preferences: Wrap task titles to two lines -->
-  <string name="EPr_fullTask_title">Show full task title</string>
-  <string name="EPr_fullTask_desc_enabled">Full task title will be shown</string>
-  <!-- slide 34h -->
-  <string name="EPr_fullTask_desc_disabled">First two lines of task title will be shown</string>
-  
-  <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
-  <string name="EPr_ideaAuto_title">Auto-load ideas tab</string>
-  <!-- slide 32c -->
-  <string name="EPr_ideaAuto_desc_enabled">Web searches for ideas tab will be performed when tab is clicked</string>
-  <string name="EPr_ideaAuto_desc_disabled">Web searches for ideas tab will be performed only when manually requested</string>
-  
-  <!-- Preferences: task row style -->
-  <string-array name="EPr_task_row_styles">
-      <item>Original</item>
-      <item>Simple</item>
-      <item>Title only</item>
-  </string-array>
-  
-  <string-array name="EPr_task_row_style_descriptions">
-      <item>Truncate title to two lines with date on right</item>
-      <item>Truncate title to one line with date and lists below</item>
-      <item>Single line title only</item>
-  </string-array>
-  
-  <!-- task row style title (%s -> style) -->
-  <string name="EPr_task_row_style_title">Row style: %s</string>
-  
-  <!-- Preference: custom filters enabled -->
-  <string name="EPr_use_filters_title">Use filters</string>
-  <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
-
-  <!-- Preference: show list members in shared list -->
-  <string name="EPr_show_list_members_title">Show list members in shared lists</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_simple_input_boxes">Simple text boxes</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
-
-  <!-- Preference: don\'t show plus button until input present -->
-  <string name="EPr_hide_plus_button">Hide plus button</string>
-
-  <!-- Preference: menu items -->
-  <string name="EPr_menu_items">Menu items</string>
-
-  <!-- Preference: list view -->
-  <string name="EPr_list_view">List view</string>
-
-  <!-- Preference: task edit comments -->
-  <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
-  
-  <!-- slide 30f/ 36f: Preference: Theme -->
-  <string name="EPr_theme_title">Color theme</string>
-  <!-- Preference: Theme Description (%s => value) -->
-  <string name="EPr_theme_desc">現在の設定: %s</string>  
-  <!-- Preference: Theme Description (android 1.6) -->
-  <string name="EPr_theme_desc_unsupported">Setting requires Android 2.0+</string>
-  <!-- slide 32h/ 37b -->
-  <string name="EPr_theme_widget_title">Widget theme</string>
-  
-  <!-- slide 30d/ 34f: Preference screen: all task row settings -->
-  <string name="EPr_taskRowPrefs_title">Task row appearance</string>
-  
-  <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
-  <string name="EPr_use_contact_picker">Use contact picker</string>
-  <!-- slide 49b -->
-  <string name="EPr_use_contact_picker_desc_enabled">The system contact picker option will be displayed in the task assignment window</string>
-  <string name="EPr_use_contact_picker_desc_disabled">The system contact picker option will not be displayed</string>
-
-  <!-- slide 49i: Preferences: Third party addons -->
-  <string name="EPr_third_party_addons">Enable third party add-ons</string>
-  <string name="EPr_third_party_addons_desc_enabled">Third party add-ons will be enabled</string>
-  <!-- slide 49d -->
-  <string name="EPr_third_party_addons_desc_disabled">Third party add-ons will be disabled</string>
-  
-  <!-- Preferences: ideas tab -->
-  <string name="EPr_ideas_tab_enabled">Task ideas</string>
-  <string name="EPr_ideas_tab_description">Get ideas to help you complete tasks</string>
-  
-  <!-- Preferences: calendar event start time -->
-  <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
-  <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
-  <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
-  
-  <string name="EPr_force_phone_layout">Use phone layout</string>
-
-  <string name="EPr_show_featured_lists">Show featured lists</string>
-  
-  <!-- Configurations -->
-  <string name="EPr_configurations_title">Set configuration</string>
-  <string name="EPr_config_default">Default</string>
-  <string name="EPr_config_lite">Astrid Lite</string>
-  
-  <!-- Dialog title when setting preference configuration -->
-  <string name="EPr_config_dialog_title">Set configuration?</string>
-  <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
-  <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
-  
-  <!-- default configuration name for the above dialog -->
-  <string name="EPr_config_dialog_default_id">default</string>
-  
-  <!-- Preference title for showing save and cancel buttons in task edit page -->
-  <string name="EPr_show_save_and_cancel">Show save and cancel </string>
-  
-  
-  <!-- Swipe between lists -->
-  <!-- Preference: swipe between lists performance -->
-  <string name="EPr_swipe_lists_performance_title">Swipe between lists</string>
-  
-  <string-array name="EPr_swipe_lists_performance_mode">
-      <item>No swipe</item>
-      <item>Conserve Memory</item>
-      <item>Normal Performance</item>
-      <item>High Performance</item>
-  </string-array>
-  
-  <string-array name="EPr_swipe_lists_performance_desc">
-  <!-- slide 49a -->
-      <item>Swipe between lists is disabled</item>
-      <item>Slower performance</item>
-      <item>Default setting</item>
-      <item>Uses more system resources</item>
-  </string-array>
-    
-  <string name="swipe_lists_helper_title">Swipe between lists</string>
-  <string name="swipe_lists_helper_header">Swipe left or right to quickly move between lists</string>
-  <string name="swipe_lists_helper_subtitle">Change settings in Settings -> Appearance</string>
-
-  <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
-  
-  <string-array name="EPr_default_reminders_mode">
-      <!-- reminders duration: labels for "Task Defaults" preference item. -->
-      <item>@string/TEA_reminder_mode_once</item>
-      <item>@string/TEA_reminder_mode_five</item>
-      <item>@string/TEA_reminder_mode_nonstop</item>
-  </string-array>
-    
-  <string-array name="EPr_themes">
-    <!-- theme_settings: labels for Theme preference menu -->
-    <!-- slide 36a-->
-    <item>Day - Blue</item>
-    <!-- slide 36b -->
-    <item>Day - Red</item>
-    <!-- slide 36b -->
-    <item>Sky blue</item>
-    <!-- slide 36c -->
-    <item>Night</item>
-    <!-- slide 36d -->
-    <item>Transparent (white text)</item>
-    <!-- slide 36e -->
-    <item>Transparent (Black Text)</item>
-  </string-array>
-  
-  <string-array name="EPr_themes_widget">
-    <!-- slide 32i / 37a-->
-    <item>Same as app</item>
-    <item>Day - Blue</item>
-    <item>Day - Red</item>
-    <item>Sky blue</item>
-    <item>Night</item>
-    <item>Transparent (white text)</item>
-    <item>Transparent (black text)</item>
-    <item>Old Style</item>
-  </string-array>
-  
-  <!-- ========================================== Task Management Settings == -->
-
-  <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
-  <string name="EPr_manage_header">Manage old tasks</string>
-  <!-- slide 47d -->
-  <string name="EPr_manage_delete_completed">Delete completed tasks</string>
-  <string name="EPr_manage_delete_completed_message">Do you really want to delete all your completed tasks?</string>
-  <!-- slide 47a -->
-  <string name="EPr_manage_delete_completed_summary">Deleted tasks can be undeleted one-by-one</string>
-  <string name="EPr_manage_delete_completed_status">Deleted %d tasks!</string>
-  <!-- slide 47e -->
-  <string name="EPr_manage_purge_deleted">Purge deleted tasks</string>
-  <string name="EPr_manage_purge_deleted_message">Do you really want to purge all your deleted tasks?\n\nThese tasks will be gone forever!</string>
-  <string name="EPr_manage_purge_deleted_status">Purged %d tasks!</string>
-  <!-- slide 47b-->
-  <string name="EPr_manage_purge_deleted_summary">Caution! Purged tasks can\'t be recovered without backup file!</string>
-  <!-- slide 47h-->
-  <string name="EPr_manage_clear_all">Clear all data</string>
-  <string name="EPr_manage_clear_all_message">Delete all tasks and settings in Astrid?\n\nWarning: can\'t be undone!</string>
-
-  <!-- slide 47f -->
-  <string name="EPr_manage_delete_completed_gcal">Delete calendar events for completed tasks</string>
-  <string name="EPr_manage_delete_completed_gcal_message">Do you really want to delete all your events for completed tasks?</string>
-  <string name="EPr_manage_delete_completed_gcal_summary"></string>
-  <string name="EPr_manage_delete_completed_gcal_status">Deleted %d calendar events!</string>
-      
-  <!-- slide 47g-->
-  <string name="EPr_manage_delete_all_gcal">Delete all calendar events for tasks</string>
-  <string name="EPr_manage_delete_all_gcal_message">Do you really want to delete all your events for tasks?</string>
-  <string name="EPr_manage_delete_all_gcal_summary"></string>
-  <string name="EPr_manage_delete_all_gcal_status">Deleted %d calendar events!</string>
-      
-  <!-- ==================================================== AddOnActivity == -->
-  
-  <!-- Add Ons Activity Title -->
-  <string name="AOA_title">アドオン</string>
-    
-  <!-- Add-on Activity: author for internal authors  -->
-  <string name="AOA_internal_author">Astrid Team</string>
-    
-  <!-- Add-on Activity: installed add-ons tab -->
-  <string name="AOA_tab_installed">インストール済</string>
-  
-  <!-- Add-on Activity - available add-ons tab -->
-  <string name="AOA_tab_available">追加</string>
-  
-  <!-- Add-on Activity - free add-ons label -->
-  <string name="AOA_free">自由</string>
-  
-  <!-- Add-on Activity - menu item to visit add-on website -->
-  
-  <!-- Add-on Activity - menu item to visit android market -->
-  
-  <!-- Add-on Activity - when list is empty -->
-  <string name="AOA_no_addons">Empty List!</string>
-  
-  <string name="AOA_ppack_title">Power Pack</string>
-  <string name="AOA_ppack_description">Support Astrid and get more productive with the Power Pack. 4x2 and 4x4 widgets and voice integration. Power up today!</string>
-  <string name="AOA_locale_title">Astrid Locale Plugin</string>
-  <string name="AOA_locale_description">Allows Astrid to make use of the Locale application to send you notifications based on filter conditions. Requires Locale.</string>
-  
-  <!-- ====================================================== TasksWidget == -->
-
-  <!-- Widget text when loading tasks -->
-  <string name="TWi_loading">読み込んでいます・・・</string>
-
-  <!-- Widget configuration activity title: select a filter -->
-  <string name="WCA_title">ウィジェットに表示する項目</string>
-  
-  <!-- ======================================================== Waiting on me -->
-
-  <string name="wom_commented">%s commented on your task.</string>
-  <string name="wom_mentioned">%s mentioned you.</string>
-  <string name="wom_assigned">%s assigned this to you.</string>
-  <string name="wom_raised_pri">%s raised the priority.</string>
-  <string name="wom_changed_due">%s changed the due date.</string>
-  <string name="wom_default">%s wants your attention.</string>
-  
-  <string name="wom_dismiss">Dismiss</string>
-  <string name="wom_acknowledge">I\'ve read this</string>
-
-  <!-- ============================================================= About == -->
-  
-  <!-- slide 30h: Title of "About" option in settings -->
-  <string name="p_about">About Astrid</string>
-  
-  <!-- About text (%s => current version)-->
-  <string name="p_about_text">Current version: %s\n\n
-
-Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
-
-  <!-- Title of "Help" option in settings -->
-  <string name="p_help">Support</string>
-  
-  <!-- slide 30c: Title of "Forums" option in settings -->
-  <string name="p_forums">Forums</string>
-  
-  <!-- Title of "Premium" option in settings -->
-  <string name="p_premium">プレミアム</string>
-  
-  <!-- ============================================================= Misc == -->
-  
-  <string name="feedback_positive_title">Rate Astrid?</string>
-
-  <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star rating?</string>
-
-  <string name="feedback_negative_title">Leave feedback?</string>
-
-  <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
-
-  <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback section--it might not be available on your device.</string>
-  
-  <string name="feedback_positive_button">Rate Astrid</string>
-
-  <string name="feedback_negative_button">Leave feedback</string>
-  
-  <string name="feedback_not_now">Not now</string>
-  
-  <string name="feedback_banner_text">How\'s Astrid working for you?</string>
-  
-  <!-- Displayed when task killer found. %s => name of the application -->
-  <string name="task_killer_help">タスクキラー (%s) を使用中です。Astrid が終了しないように、除外リストに登録してください。そうしないと、期限が来たタスクを通知できなくなります。\n</string>
-  
-  <!-- Task killer dialog ok button -->
-  <string name="task_killer_help_ok">I Won\'t Kill Astrid!</string>
-    
-  <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
-  
-  <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
-  <string name="marketplace_description">
-Astrid is the much loved open-source todo list / task manager designed to help 
-you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget and more. 
-  </string>
-  
-  <string name="DB_corrupted_title">Corrupted Database</string>
-  
-  <string name="DB_corrupted_body">
-      Uh oh! It looks like you may have a corrupted database. 
-      If you see this error regularly, we suggest you clear all
-      data (Settings->Sync and backup->Manage old tasks->Clear all data) and restore
-      your tasks from a backup (Settings->Sync and backup->Backup->Import tasks) in Astrid.</string>
-      
-  <string name="market_unavailable">Unfortunately the market is not available for your system.</string>
-  
+    <!-- slide 30f/ 36f: Preference: Theme -->
+    <string name="EPr_theme_title">Color theme</string>
+    <!-- Preference: Theme Description (%s => value) -->
+    <string name="EPr_theme_desc">現在の設定: %s</string>
+    <!-- Preference: Theme Description (android 1.6) -->
+    <string name="EPr_theme_desc_unsupported">Setting requires Android 2.0+</string>
+    <!-- slide 32h/ 37b -->
+    <string name="EPr_theme_widget_title">Widget theme</string>
 
+    <!-- slide 30d/ 34f: Preference screen: all task row settings -->
+    <string name="EPr_taskRowPrefs_title">Task row appearance</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
+    <string name="EPr_use_contact_picker">Use contact picker</string>
+    <!-- slide 49b -->
+    <string name="EPr_use_contact_picker_desc_enabled">The system contact picker option will be
+        displayed in the task assignment window
+    </string>
+    <string name="EPr_use_contact_picker_desc_disabled">The system contact picker option will not be
+        displayed
+    </string>
 
+    <!-- slide 49i: Preferences: Third party addons -->
+    <string name="EPr_third_party_addons">Enable third party add-ons</string>
+    <string name="EPr_third_party_addons_desc_enabled">Third party add-ons will be enabled</string>
+    <!-- slide 49d -->
+    <string name="EPr_third_party_addons_desc_disabled">Third party add-ons will be disabled
+    </string>
 
-  <!-- slide 32g: Preference Category: Defaults Title -->
-  <string name="EPr_defaults_header">タスクのデフォルト設定</string>
-  <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
-  
-  <!-- slide 41f:  Preference: Default Urgency Title -->
-  <string name="EPr_default_urgency_title">期限</string>
-  <!-- Preference: Default Urgency Description (%s => setting) -->
-  <string name="EPr_default_urgency_desc">現在の設定: %s</string>
-  
-  <!-- slide 40a: Preference: Default Importance Title -->
-  <string name="EPr_default_importance_title">Default priority</string>
-  <!-- Preference: Default Importance Description (%s => setting) -->
-  <string name="EPr_default_importance_desc">現在の設定: %s</string>
-  
-  <!-- slide 42e: Preference: Default Hide Until Title -->
-  <string name="EPr_default_hideUntil_title">表示期間</string>
-  <!-- Preference: Default Hide Until Description (%s => setting) -->
-  <string name="EPr_default_hideUntil_desc">現在の設定: %s</string>
-  
-  <!-- slide 43e: Preference: Default Reminders Title -->
-  <string name="EPr_default_reminders_title">標準リマインダー</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_desc">現在の設定: %s</string>
-  
-  <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
-  <string name="EPr_default_addtocalendar_title">Default add to calendar</string>
-  <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
-  <string name="EPr_default_addtocalendar_desc_disabled">New tasks will not create an event in the Google Calendar</string>
-  <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
-  <string name="EPr_default_addtocalendar_desc">New tasks will be in the calendar: \"%s\"</string>
-  
-  <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
-  <string name="EPr_default_reminders_mode_title">Default ring/vibrate type</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_mode_desc">現在の設定: %s</string>
-  
-  <string-array name="EPr_default_importance">
-    <!-- importance: labels for "Task Defaults" preference item. -->
-    <!-- slide 40b -->
-    <item>!!! (Highest)</item>
-    <item>!!</item>
-    <item>!</item>
-    <!-- slide 40c -->
-    <item>o (Lowest)</item>
-  </string-array>
-  
-  <string-array name="EPr_default_urgency">
-    <!-- urgency: labels for "Task Defaults" preference item. -->
-    <!-- slide 41a-->
-    <item>期限なし</item>
-    <!-- slide 41b -->
-    <item>Today</item>
-    <!-- slide 41c-->
-    <item>Tomorrow</item>
-    <!-- slide 41d -->
-    <item>明後日</item>
-    <!-- slide 41e -->
-    <item>来週</item>
-  </string-array>
-  
-  <string-array name="EPr_default_hideUntil">
-    <!-- hideUntil: labels for "Task Defaults" preference item. -->
-    <!-- slide 42a -->
-    <item>常に表示する</item>
-    <!-- slide 42b -->
-    <item>期限の日から</item>
-    <!-- slide 42c -->
-    <item>期限の前日から</item>
-    <!-- slide 42d-->
-    <item>期限の一週間前から</item>
-  </string-array>
-  
-  <string-array name="EPr_default_reminders">
-    <!-- reminders: labels for "Task Defaults" preference item. -->
-    <!-- slide 43a -->
-    <item>期限を通知しない</item>
-    <!-- slide 43b -->
-    <item>At deadline</item>
-    <!-- slide 43c -->
-    <item>When overdue</item>
-    <!-- slide 43d -->
-    <item>At deadline or overdue</item>
-  </string-array>
-  
-  <string-array name="EPr_default_addtocalendar">
-    <!-- addtocalendar: labels for "Task Defaults" preference item. -->
-    <item>@string/EPr_deactivated</item>
-  </string-array>      
+    <!-- Preferences: ideas tab -->
+    <string name="EPr_ideas_tab_enabled">Task ideas</string>
+    <string name="EPr_ideas_tab_description">Get ideas to help you complete tasks</string>
 
+    <!-- Preferences: calendar event start time -->
+    <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
+    <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
+    <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
+
+    <string name="EPr_force_phone_layout">Use phone layout</string>
+
+    <string name="EPr_show_featured_lists">Show featured lists</string>
+
+    <!-- Configurations -->
+    <string name="EPr_configurations_title">Set configuration</string>
+    <string name="EPr_config_default">Default</string>
+    <string name="EPr_config_lite">Astrid Lite</string>
+
+    <!-- Dialog title when setting preference configuration -->
+    <string name="EPr_config_dialog_title">Set configuration?</string>
+    <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
+    <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
+
+    <!-- default configuration name for the above dialog -->
+    <string name="EPr_config_dialog_default_id">default</string>
+
+    <!-- Preference title for showing save and cancel buttons in task edit page -->
+    <string name="EPr_show_save_and_cancel">Show save and cancel</string>
+
+
+    <!-- Swipe between lists -->
+    <!-- Preference: swipe between lists performance -->
+    <string name="EPr_swipe_lists_performance_title">Swipe between lists</string>
+
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>No swipe</item>
+        <item>Conserve Memory</item>
+        <item>Normal Performance</item>
+        <item>High Performance</item>
+    </string-array>
+
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <!-- slide 49a -->
+        <item>Swipe between lists is disabled</item>
+        <item>Slower performance</item>
+        <item>Default setting</item>
+        <item>Uses more system resources</item>
+    </string-array>
+
+    <string name="swipe_lists_helper_title">Swipe between lists</string>
+    <string name="swipe_lists_helper_header">Swipe left or right to quickly move between lists
+    </string>
+    <string name="swipe_lists_helper_subtitle">Change settings in Settings -> Appearance</string>
+
+    <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
+
+    <string-array name="EPr_default_reminders_mode">
+        <!-- reminders duration: labels for "Task Defaults" preference item. -->
+        <item>@string/TEA_reminder_mode_once</item>
+        <item>@string/TEA_reminder_mode_five</item>
+        <item>@string/TEA_reminder_mode_nonstop</item>
+    </string-array>
+
+    <string-array name="EPr_themes">
+        <!-- theme_settings: labels for Theme preference menu -->
+        <!-- slide 36a-->
+        <item>Day - Blue</item>
+        <!-- slide 36b -->
+        <item>Day - Red</item>
+        <!-- slide 36b -->
+        <item>Sky blue</item>
+        <!-- slide 36c -->
+        <item>Night</item>
+        <!-- slide 36d -->
+        <item>Transparent (white text)</item>
+        <!-- slide 36e -->
+        <item>Transparent (Black Text)</item>
+    </string-array>
+
+    <string-array name="EPr_themes_widget">
+        <!-- slide 32i / 37a-->
+        <item>Same as app</item>
+        <item>Day - Blue</item>
+        <item>Day - Red</item>
+        <item>Sky blue</item>
+        <item>Night</item>
+        <item>Transparent (white text)</item>
+        <item>Transparent (black text)</item>
+        <item>Old Style</item>
+    </string-array>
+
+    <!-- ========================================== Task Management Settings == -->
+
+    <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
+    <string name="EPr_manage_header">Manage old tasks</string>
+    <!-- slide 47d -->
+    <string name="EPr_manage_delete_completed">Delete completed tasks</string>
+    <string name="EPr_manage_delete_completed_message">Do you really want to delete all your
+        completed tasks?
+    </string>
+    <!-- slide 47a -->
+    <string name="EPr_manage_delete_completed_summary">Deleted tasks can be undeleted one-by-one
+    </string>
+    <string name="EPr_manage_delete_completed_status">Deleted %d tasks!</string>
+    <!-- slide 47e -->
+    <string name="EPr_manage_purge_deleted">Purge deleted tasks</string>
+    <string name="EPr_manage_purge_deleted_message">Do you really want to purge all your deleted
+        tasks?\n\nThese tasks will be gone forever!
+    </string>
+    <string name="EPr_manage_purge_deleted_status">Purged %d tasks!</string>
+    <!-- slide 47b-->
+    <string name="EPr_manage_purge_deleted_summary">Caution! Purged tasks can\'t be recovered
+        without backup file!
+    </string>
+    <!-- slide 47h-->
+    <string name="EPr_manage_clear_all">Clear all data</string>
+    <string name="EPr_manage_clear_all_message">Delete all tasks and settings in Astrid?\n\nWarning:
+        can\'t be undone!
+    </string>
+
+    <!-- slide 47f -->
+    <string name="EPr_manage_delete_completed_gcal">Delete calendar events for completed tasks
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_message">Do you really want to delete all your
+        events for completed tasks?
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_summary"></string>
+    <string name="EPr_manage_delete_completed_gcal_status">Deleted %d calendar events!</string>
+
+    <!-- slide 47g-->
+    <string name="EPr_manage_delete_all_gcal">Delete all calendar events for tasks</string>
+    <string name="EPr_manage_delete_all_gcal_message">Do you really want to delete all your events
+        for tasks?
+    </string>
+    <string name="EPr_manage_delete_all_gcal_summary"></string>
+    <string name="EPr_manage_delete_all_gcal_status">Deleted %d calendar events!</string>
+
+    <!-- ==================================================== AddOnActivity == -->
+
+    <!-- Add Ons Activity Title -->
+    <string name="AOA_title">アドオン</string>
+
+    <!-- Add-on Activity: author for internal authors  -->
+    <string name="AOA_internal_author">Astrid Team</string>
+
+    <!-- Add-on Activity: installed add-ons tab -->
+    <string name="AOA_tab_installed">インストール済</string>
+
+    <!-- Add-on Activity - available add-ons tab -->
+    <string name="AOA_tab_available">追加</string>
+
+    <!-- Add-on Activity - free add-ons label -->
+    <string name="AOA_free">自由</string>
+
+    <!-- Add-on Activity - menu item to visit add-on website -->
+
+    <!-- Add-on Activity - menu item to visit android market -->
+
+    <!-- Add-on Activity - when list is empty -->
+    <string name="AOA_no_addons">Empty List!</string>
+
+    <string name="AOA_ppack_title">Power Pack</string>
+    <string name="AOA_ppack_description">Support Astrid and get more productive with the Power Pack.
+        4x2 and 4x4 widgets and voice integration. Power up today!
+    </string>
+    <string name="AOA_locale_title">Astrid Locale Plugin</string>
+    <string name="AOA_locale_description">Allows Astrid to make use of the Locale application to
+        send you notifications based on filter conditions. Requires Locale.
+    </string>
+
+    <!-- ====================================================== TasksWidget == -->
+
+    <!-- Widget text when loading tasks -->
+    <string name="TWi_loading">読み込んでいます・・・</string>
+
+    <!-- Widget configuration activity title: select a filter -->
+    <string name="WCA_title">ウィジェットに表示する項目</string>
+
+    <!-- ======================================================== Waiting on me -->
+
+    <string name="wom_commented">%s commented on your task.</string>
+    <string name="wom_mentioned">%s mentioned you.</string>
+    <string name="wom_assigned">%s assigned this to you.</string>
+    <string name="wom_raised_pri">%s raised the priority.</string>
+    <string name="wom_changed_due">%s changed the due date.</string>
+    <string name="wom_default">%s wants your attention.</string>
+
+    <string name="wom_dismiss">Dismiss</string>
+    <string name="wom_acknowledge">I\'ve read this</string>
+
+    <!-- ============================================================= About == -->
+
+    <!-- slide 30h: Title of "About" option in settings -->
+    <string name="p_about">About Astrid</string>
+
+    <!-- About text (%s => current version)-->
+    <string name="p_about_text">Current version: %s\n\n
+
+        Astrid is open-source and proudly maintained by Todoroo, Inc.
+    </string>
+
+    <!-- Title of "Help" option in settings -->
+    <string name="p_help">Support</string>
+
+    <!-- slide 30c: Title of "Forums" option in settings -->
+    <string name="p_forums">Forums</string>
+
+    <!-- Title of "Premium" option in settings -->
+    <string name="p_premium">プレミアム</string>
+
+    <!-- ============================================================= Misc == -->
+
+    <string name="feedback_positive_title">Rate Astrid?</string>
+
+    <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star
+        rating?
+    </string>
+
+    <string name="feedback_negative_title">Leave feedback?</string>
+
+    <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
+
+    <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback
+        section--it might not be available on your device.
+    </string>
+
+    <string name="feedback_positive_button">Rate Astrid</string>
+
+    <string name="feedback_negative_button">Leave feedback</string>
+
+    <string name="feedback_not_now">Not now</string>
+
+    <string name="feedback_banner_text">How\'s Astrid working for you?</string>
+
+    <!-- Displayed when task killer found. %s => name of the application -->
+    <string name="task_killer_help">タスクキラー (%s) を使用中です。Astrid
+        が終了しないように、除外リストに登録してください。そうしないと、期限が来たタスクを通知できなくなります。\n
+    </string>
+
+    <!-- Task killer dialog ok button -->
+    <string name="task_killer_help_ok">I Won\'t Kill Astrid!</string>
+
+    <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
+
+    <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
+    <string name="marketplace_description">
+        Astrid is the much loved open-source todo list / task manager designed to help
+        you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget and more.
+    </string>
+
+    <string name="DB_corrupted_title">Corrupted Database</string>
+
+    <string name="DB_corrupted_body">
+        Uh oh! It looks like you may have a corrupted database.
+        If you see this error regularly, we suggest you clear all
+        data (Settings->Sync and backup->Manage old tasks->Clear all data) and restore
+        your tasks from a backup (Settings->Sync and backup->Backup->Import tasks) in Astrid.
+    </string>
+
+    <string name="market_unavailable">Unfortunately the market is not available for your system.
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 32g: Preference Category: Defaults Title -->
+    <string name="EPr_defaults_header">タスクのデフォルト設定</string>
+    <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
+
+    <!-- slide 41f:  Preference: Default Urgency Title -->
+    <string name="EPr_default_urgency_title">期限</string>
+    <!-- Preference: Default Urgency Description (%s => setting) -->
+    <string name="EPr_default_urgency_desc">現在の設定: %s</string>
+
+    <!-- slide 40a: Preference: Default Importance Title -->
+    <string name="EPr_default_importance_title">Default priority</string>
+    <!-- Preference: Default Importance Description (%s => setting) -->
+    <string name="EPr_default_importance_desc">現在の設定: %s</string>
+
+    <!-- slide 42e: Preference: Default Hide Until Title -->
+    <string name="EPr_default_hideUntil_title">表示期間</string>
+    <!-- Preference: Default Hide Until Description (%s => setting) -->
+    <string name="EPr_default_hideUntil_desc">現在の設定: %s</string>
+
+    <!-- slide 43e: Preference: Default Reminders Title -->
+    <string name="EPr_default_reminders_title">標準リマインダー</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_desc">現在の設定: %s</string>
+
+    <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
+    <string name="EPr_default_addtocalendar_title">Default add to calendar</string>
+    <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
+    <string name="EPr_default_addtocalendar_desc_disabled">New tasks will not create an event in the
+        Google Calendar
+    </string>
+    <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
+    <string name="EPr_default_addtocalendar_desc">New tasks will be in the calendar: \"%s\"</string>
+
+    <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
+    <string name="EPr_default_reminders_mode_title">Default ring/vibrate type</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_mode_desc">現在の設定: %s</string>
+
+    <string-array name="EPr_default_importance">
+        <!-- importance: labels for "Task Defaults" preference item. -->
+        <!-- slide 40b -->
+        <item>!!! (Highest)</item>
+        <item>!!</item>
+        <item>!</item>
+        <!-- slide 40c -->
+        <item>o (Lowest)</item>
+    </string-array>
+
+    <string-array name="EPr_default_urgency">
+        <!-- urgency: labels for "Task Defaults" preference item. -->
+        <!-- slide 41a-->
+        <item>期限なし</item>
+        <!-- slide 41b -->
+        <item>Today</item>
+        <!-- slide 41c-->
+        <item>Tomorrow</item>
+        <!-- slide 41d -->
+        <item>明後日</item>
+        <!-- slide 41e -->
+        <item>来週</item>
+    </string-array>
+
+    <string-array name="EPr_default_hideUntil">
+        <!-- hideUntil: labels for "Task Defaults" preference item. -->
+        <!-- slide 42a -->
+        <item>常に表示する</item>
+        <!-- slide 42b -->
+        <item>期限の日から</item>
+        <!-- slide 42c -->
+        <item>期限の前日から</item>
+        <!-- slide 42d-->
+        <item>期限の一週間前から</item>
+    </string-array>
+
+    <string-array name="EPr_default_reminders">
+        <!-- reminders: labels for "Task Defaults" preference item. -->
+        <!-- slide 43a -->
+        <item>期限を通知しない</item>
+        <!-- slide 43b -->
+        <item>At deadline</item>
+        <!-- slide 43c -->
+        <item>When overdue</item>
+        <!-- slide 43d -->
+        <item>At deadline or overdue</item>
+    </string-array>
+
+    <string-array name="EPr_default_addtocalendar">
+        <!-- addtocalendar: labels for "Task Defaults" preference item. -->
+        <item>@string/EPr_deactivated</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in filter plug-in -->
-    
+
     <!-- ================================================= Filter Exposer == -->
-    
+
     <!-- Active Tasks Filter -->
     <string name="BFE_Active">私のタスク</string>
-    
+
     <!-- Waiting on me filter -->
     <string name="BFE_waiting_on_me">Waiting On Me</string>
-        
+
     <!-- Search Filter -->
-    
+
     <!-- slide 10b: Recently Modified -->
     <string name="BFE_Recent">最近編集したタスク</string>
-    
+
     <!-- slide 10c: I\'ve assigned -->
     <string name="BFE_Assigned">I\'ve Assigned</string>
-    
+
     <!-- Build Your Own Filter -->
-    
+
     <!-- Saved Filters Header -->
-    
+
     <!-- Saved Filters Context Menu: delete -->
     <string name="BFE_Saved_delete">フィルタの削除</string>
 
     <!-- =========================================== CustomFilterActivity == -->
-    
+
     <!-- slide 30d: Build Your Own Filter Activity Title-->
     <string name="CFA_title">カスタムフィルタ</string>
-    
+
     <!-- slide 30e: Filter Name edit box hint (if user types here, filter will be saved) -->
     <string name="CFA_filterName_hint">フィルタの名称</string>
-    
+
     <!-- Filter Name default for copied filters (%s => old filter name) -->
-    
+
     <!-- slide 30a: Filter Starting Universe: all tasks -->
     <string name="CFA_universe_all">進行中のタスク</string>
-    
+
     <!-- Filter Criteria Type: add (at the begging of title of the criteria) -->
     <string name="CFA_type_add">または</string>
-    
+
     <!-- Filter Criteria Type: subtract (at the begging of title of the criteria) -->
     <string name="CFA_type_subtract">除外</string>
-    
+
     <!-- Filter Criteria Type: intersect (at the begging of title of the criteria) -->
     <string name="CFA_type_intersect">かつ</string>
-    
+
     <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
     <string name="CFA_context_chain">%s</string>
-    
+
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">条件の削除</string>
-    
+
     <!-- slide 30b: Filter Screen Help Text -->
     <string name="CFA_help">Long press on items for additional options</string>
-    
+
     <!-- slide 30c: Filter Button: add new -->
     <string name="CFA_button_add">条件の追加</string>
-    
+
     <!-- slide 30f: Filter Button: view without saving -->
     <string name="CFA_button_view">見る</string>
-    
+
     <!-- Filter Button: save & view filter -->
     <string name="CFA_button_save">保存と表示</string>
 
     <!-- =========================================== CustomFilterCriteria == -->
-        
+
     <!-- Criteria: due by X - display text (? -> user input) -->
     <string name="CFC_dueBefore_text">期限: ?</string>
     <!-- Criteria: due by X - name of criteria -->
@@ -1709,329 +1830,348 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
         <item>来週</item>
         <item>来月</item>
     </string-array>
-    
+
     <!-- Criteria: importance - display text (? -> user input)-->
     <string name="CFC_importance_text">Priority at least ?</string>
     <!-- Criteria: importance - name of criteria -->
-    <string name="CFC_importance_name">Priority...</string>        
-    
+    <string name="CFC_importance_name">Priority...</string>
+
     <!-- Criteria: tag - display text (? -> user input) -->
     <string name="CFC_tag_text">タグ: ?</string>
     <!-- Criteria: tag - name of criteria -->
     <string name="CFC_tag_name">タグ</string>
-    
+
     <!-- Criteria: tag_contains - name of criteria -->
     <string name="CFC_tag_contains_name">タグ中の語句</string>
     <!-- Criteria: tag_contains - text (? -> user input) -->
     <string name="CFC_tag_contains_text">タグに ? を含む ?</string>
-    
+
     <!-- Criteria: title_contains - name of criteria -->
     <string name="CFC_title_contains_name">タイトル中の語句</string>
     <!-- Criteria: title_contains - text (? -> user input) -->
     <string name="CFC_title_contains_text">タイトルに ? を含む</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-  
-  <!-- Error message for adding to calendar  -->
-  <string name="gcal_TEA_error">カレンダーへの登録に失敗しました</string>
-
-  <!-- Label for adding task to calendar -->
-
-  <!-- slide 21c: Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">カレンダーに登録</string>
-  
-  <!-- Label when calendar event already exists -->
-  <string name="gcal_TEA_showCalendar_label">カレンダーのイベントを開く</string>
-  
-  <!-- Toast when unable to open calendar event -->
-  
-  <!-- Toast when calendar event updated because task changed -->
-  <string name="gcal_TEA_calendar_updated">カレンダーの項目も更新しました</string>
-  
-  <!-- No calendar label (don\'t add option) -->
-  <string name="gcal_TEA_nocal">追加しないで</string>
-  
-  <string name="gcal_TEA_none_selected">To calendar?</string>
-  
-  <string name="gcal_TEA_has_event">Cal event</string>
-  
-  <!-- ======================================================== Calendars == -->
-  
-  <!-- Calendar event name when task is completed (%s => task title) -->
-  <string name="gcal_completed_title">%s（完了）</string>
-
-  <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
-  <string name="gcal_GCP_default">Default Calendar</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Error message for adding to calendar  -->
+    <string name="gcal_TEA_error">カレンダーへの登録に失敗しました</string>
 
+    <!-- Label for adding task to calendar -->
 
+    <!-- slide 21c: Label for adding task to calendar -->
+    <string name="gcal_TEA_addToCalendar_label">カレンダーに登録</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Label when calendar event already exists -->
+    <string name="gcal_TEA_showCalendar_label">カレンダーのイベントを開く</string>
+
+    <!-- Toast when unable to open calendar event -->
+
+    <!-- Toast when calendar event updated because task changed -->
+    <string name="gcal_TEA_calendar_updated">カレンダーの項目も更新しました</string>
+
+    <!-- No calendar label (don\'t add option) -->
+    <string name="gcal_TEA_nocal">追加しないで</string>
+
+    <string name="gcal_TEA_none_selected">To calendar?</string>
+
+    <string name="gcal_TEA_has_event">Cal event</string>
+
+    <!-- ======================================================== Calendars == -->
+
+    <!-- Calendar event name when task is completed (%s => task title) -->
+    <string name="gcal_completed_title">%s（完了）</string>
+
+    <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
+    <string name="gcal_GCP_default">Default Calendar</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ============================================================= UI == -->
 
     <!-- filters header: GTasks -->
     <string name="gtasks_FEx_header">Google Tasks</string>
-    
+
     <!-- filter category for GTasks lists -->
-    
+
     <!-- filter title for GTasks lists (%s => list name) -->
     <string name="gtasks_FEx_title">Google Tasks: %s</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_creating_list">Creating list...</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_create_list_dialog">New List Name:</string>
-    
+
     <!-- error to show when list creation fails -->
     <string name="gtasks_FEx_create_list_error">Error creating new list</string>
-    
+
     <!-- short help title for Gtasks -->
-    
+
     <string name="CFC_gtasks_list_text">In List: ?</string>
 
     <string name="CFC_gtasks_list_name">In GTasks List...</string>
-    
+
     <!-- Message while clearing completed tasks -->
     <string name="gtasks_GTA_clearing">Clearing completed tasks...</string>
-    
+
     <!-- Label for clear completed menu item -->
     <string name="gtasks_GTA_clear_completed">Clear Completed</string>
-        
+
     <!-- ============================================ GtasksLoginActivity == -->
-    
-    <!-- Activity Title: Gtasks Login -->    
 
-    <!-- Instructions: Gtasks login -->    
-    <string name="gtasks_GLA_body">Please log in to Google Tasks Sync (Beta!). Non-migrated Google Apps
-    accounts are currently unsupported.</string>
-    
+    <!-- Activity Title: Gtasks Login -->
+
+    <!-- Instructions: Gtasks login -->
+    <string name="gtasks_GLA_body">Please log in to Google Tasks Sync (Beta!). Non-migrated Google
+        Apps
+        accounts are currently unsupported.
+    </string>
+
     <string name="gtasks_GLA_noaccounts">No available Google accounts to sync with.</string>
 
-    <!-- Instructions: Gtasks further help -->    
+    <!-- Instructions: Gtasks further help -->
     <string name="gtasks_GLA_further_help">To view your tasks with indentation
-    and order preserved, go to the Filters page and select a Google Tasks list.
-    By default, Astrid uses its own sort settings for tasks.</string>
+        and order preserved, go to the Filters page and select a Google Tasks list.
+        By default, Astrid uses its own sort settings for tasks.
+    </string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
 
-    <!-- E-mail Address Label -->    
+    <!-- E-mail Address Label -->
+
+    <!-- Password Label -->
 
-    <!-- Password Label -->    
-    
     <!--  Authenticating toast -->
     <string name="gtasks_GLA_authenticating">Authenticating...</string>
-    
+
     <!-- Google Apps for Domain checkbox -->
 
-    <!-- Error Message when fields aren\'t filled out -->    
+    <!-- Error Message when fields aren\'t filled out -->
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
+    <string name="gtasks_GLA_errorAuth">Error authenticating! Please check your username and
+        password in your phone\'s account manager
+    </string>
+
+    <!-- Error Message when we receive an IO Exception -->
+    <string name="gtasks_GLA_errorIOAuth">すみません、Googleのサーバとの通信で問題が発生しました。しばらくしてから再度やり直してください。
+    </string>
 
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
-    <string name="gtasks_GLA_errorAuth">Error authenticating! Please check your username and password in your phone\'s account manager</string>
+    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->
+    <string name="gtasks_GLA_errorAuth_captcha">You may have encountered a captcha.
+        Try logging in from the browser, then come back to try again:
+    </string>
 
-    <!-- Error Message when we receive an IO Exception -->    
-    <string name="gtasks_GLA_errorIOAuth">すみません、Googleのサーバとの通信で問題が発生しました。しばらくしてから再度やり直してください。</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->    
-    <string name="gtasks_GLA_errorAuth_captcha">You may have encountered a captcha. 
-    Try logging in from the browser, then come back to try again:</string>
-    
     <!-- ============================================== GtasksPreferences == -->
 
-    <!-- GTasks Preferences Title -->    
+    <!-- GTasks Preferences Title -->
     <string name="gtasks_GPr_header">Google Tasks (ベータ版!)</string>
-    
-    <!-- ================================================ Synchronization == -->    
-    
+
+    <!-- ================================================ Synchronization == -->
+
     <!-- title for notification tray when synchronizing -->
 
     <!-- Error Message when we receive a HTTP 503 error -->
-    <string name="gtasks_error_backend">Google\'s Task API is in beta and has encountered an error. The service may be down, please try again later.</string>
-    
+    <string name="gtasks_error_backend">Google\'s Task API is in beta and has encountered an error.
+        The service may be down, please try again later.
+    </string>
+
     <!-- Error for account not found -->
-    <string name="gtasks_error_accountNotFound">Account %s not found--please log out and log back in from the Google Tasks settings.</string>
-    
+    <string name="gtasks_error_accountNotFound">Account %s not found--please log out and log back in
+        from the Google Tasks settings.
+    </string>
+
     <!-- Error when ping after refreshing token fails -->
-    <string name="gtasks_error_authRefresh">Unable to authenticate with Google Tasks. Please check your account password or try again later.</string>
-    
+    <string name="gtasks_error_authRefresh">Unable to authenticate with Google Tasks. Please check
+        your account password or try again later.
+    </string>
+
     <!-- Error when account manager returns no auth token or throws exception -->
-    <string name="gtasks_error_accountManager">Error in your phone\'s account manager. Please log out and log back in from the Google Tasks settings.</string>
+    <string name="gtasks_error_accountManager">Error in your phone\'s account manager. Please log
+        out and log back in from the Google Tasks settings.
+    </string>
 
     <!-- Error when authorization error happens in background sync -->
-    <string name="gtasks_error_background_sync_auth">Error authenticating in background. Please try initiating a sync while Astrid is running.</string>
-      
+    <string name="gtasks_error_background_sync_auth">Error authenticating in background. Please try
+        initiating a sync while Astrid is running.
+    </string>
+
     <string name="gtasks_import_progress">Importing Google Tasks...</string>
 
-    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you still want to add the task %2$s to it?</string>
+    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you
+        still want to add the task %2$s to it?
+    </string>
 
     <string name="gtasks_import_dlg_title">Google Tasks Import</string>
 
     <string name="gtasks_import_add_task_ok">Add task</string>
 
     <string name="gtasks_import_add_task_cancel">Don\'t add task</string>
-        
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- NEW USER EXPERIENCE -->
-  
-  <!-- help bubbles -->
-  <!-- slide 8c: Shown the first time a user sees the task list activity -->
-  <string name="help_popover_add_task">タスクを1つか2つ追加してスタートする</string>
-
-  <!-- Shown the first time a user adds a task to a list -->  
-  <string name="help_popover_tap_task">Tap task to edit and share</string>
-  
-  <!-- slide 14a: Shown the first time a user sees the list activity -->
-  <string name="help_popover_list_settings">Tap to edit or share this list</string>
-  
-  <!-- slide 26c: Shown the first time a user sees the list settings tab -->
-  <string name="help_popover_collaborators">People you share with can help\nyou build your list or finish tasks</string>
-  
-  <!-- Shown after user adds a task on tablet-->
-  <string name="help_popover_add_lists">Tap to add a list</string>
-  
-  <!-- Shown after a user adds a task on phones -->
-  <string name="help_popover_switch_lists">Tap to add a list or switch between lists</string>
-  
-  
-  
-  <!-- Login activity -->
-  
-  
-  <!-- slide 7b -->
-  <string name="welcome_login_tos_base">By using Astrid you agree to the</string>
-  
-  <string name="welcome_login_tos_link">Terms of Service</string>
-  
-  <!-- slide 7e -->
-  <string name="welcome_login_pw">登録する</string>
-  
-  <string name="welcome_sign_in">ログイン</string>
-
-  <!-- slide 7f -->
-  <string name="welcome_login_later">後で</string>
-  
-  <string name="welcome_login_confirm_later_title">Why not sign in?</string>
-  
-  <string name="welcome_login_confirm_later_ok">I\'ll do it!</string>
-  
-  <string name="welcome_login_confirm_later_cancel">No thanks</string>
-  
-  <string name="welcome_login_confirm_later_dialog">Sign in to get the most out of Astrid! 
-  For free, you get online backup, full synchronization with Astrid.com, the 
-  ability to add tasks via email, and you can even share task lists with friends!</string>
+    <!-- NEW USER EXPERIENCE -->
 
+    <!-- help bubbles -->
+    <!-- slide 8c: Shown the first time a user sees the task list activity -->
+    <string name="help_popover_add_task">タスクを1つか2つ追加してスタートする</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown the first time a user adds a task to a list -->
+    <string name="help_popover_tap_task">Tap task to edit and share</string>
 
+    <!-- slide 14a: Shown the first time a user sees the list activity -->
+    <string name="help_popover_list_settings">Tap to edit or share this list</string>
 
-  <!-- Resources for built-in locale plug-in -->
-
-  <!-- Locale Alert Editing Window Title -->
-  <string name="locale_edit_alerts_title">Astrid Filter Alert</string>
-  
-  <!-- Locale Window Help -->                                                                                                                                            
-  <string name="locale_edit_intro">Astrid will send you a reminder                                                                                                                                             
-      when you have any tasks in the following filter:</string>
-      
-  <!-- Locale Window Filter Picker UI -->                                                                                                                                        
-      
-  <!-- Locale Window Interval Label -->                                                                                                                                        
-  <string name="locale_interval_label">Limit notifications to:</string>        
-      
-  <!-- Locale Window Interval Values -->                                                                                                                                        
-  <string-array name="locale_interval">
-    <item>1時間に一度</item>
-    <item>6時間に一度</item>
-    <item>12時間に一度</item>
-    <item>1日に一度</item>
-    <item>3日に一度</item>
-    <item>1週間に一度</item>
-  </string-array>        
-      
-  <!-- Locale Notification text -->                                                                                                                                        
-  <string name="locale_notification">$FILTER の検索結果: $NUM 件</string>     
-      
-  <!-- Locale Plugin was not found, it is required -->
-  <string name="locale_plugin_required">Astrid Locale plugin をインストールしてください</string>        
-     
+    <!-- slide 26c: Shown the first time a user sees the list settings tab -->
+    <string name="help_popover_collaborators">People you share with can help\nyou build your list or
+        finish tasks
+    </string>
 
+    <!-- Shown after user adds a task on tablet-->
+    <string name="help_popover_add_lists">Tap to add a list</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown after a user adds a task on phones -->
+    <string name="help_popover_switch_lists">Tap to add a list or switch between lists</string>
+
+
+    <!-- Login activity -->
+
+
+    <!-- slide 7b -->
+    <string name="welcome_login_tos_base">By using Astrid you agree to the</string>
+
+    <string name="welcome_login_tos_link">Terms of Service</string>
+
+    <!-- slide 7e -->
+    <string name="welcome_login_pw">登録する</string>
+
+    <string name="welcome_sign_in">ログイン</string>
+
+    <!-- slide 7f -->
+    <string name="welcome_login_later">後で</string>
+
+    <string name="welcome_login_confirm_later_title">Why not sign in?</string>
+
+    <string name="welcome_login_confirm_later_ok">I\'ll do it!</string>
+
+    <string name="welcome_login_confirm_later_cancel">No thanks</string>
+
+    <string name="welcome_login_confirm_later_dialog">Sign in to get the most out of Astrid!
+        For free, you get online backup, full synchronization with Astrid.com, the
+        ability to add tasks via email, and you can even share task lists with friends!
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in locale plug-in -->
+
+    <!-- Locale Alert Editing Window Title -->
+    <string name="locale_edit_alerts_title">Astrid Filter Alert</string>
+
+    <!-- Locale Window Help -->
+    <string name="locale_edit_intro">Astrid will send you a reminder
+        when you have any tasks in the following filter:
+    </string>
+
+    <!-- Locale Window Filter Picker UI -->
+
+    <!-- Locale Window Interval Label -->
+    <string name="locale_interval_label">Limit notifications to:</string>
+
+    <!-- Locale Window Interval Values -->
+    <string-array name="locale_interval">
+        <item>1時間に一度</item>
+        <item>6時間に一度</item>
+        <item>12時間に一度</item>
+        <item>1日に一度</item>
+        <item>3日に一度</item>
+        <item>1週間に一度</item>
+    </string-array>
+
+    <!-- Locale Notification text -->
+    <string name="locale_notification">$FILTER の検索結果: $NUM 件</string>
+
+    <!-- Locale Plugin was not found, it is required -->
+    <string name="locale_plugin_required">Astrid Locale plugin をインストールしてください</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ====================== Plugin Boilerplate ========================= -->
 
-	<!-- filters header: OpenCRX -->
+    <!-- filters header: OpenCRX -->
     <string name="opencrx_FEx_header">OpenCRX</string>
-    
+
     <!-- filter category for OpenCRX ActivityCreators -->
     <string name="opencrx_FEx_dashboard">Workspaces</string>
-    
+
     <!-- filter category for OpenCRX responsible person -->
     <string name="opencrx_FEx_responsible">Assigned To</string>
-    
+
     <!--  OpenCRX assignedTo filter title (%s => assigned contact) -->
     <string name="opencrx_FEx_responsible_title">Assigned To \'%s\'</string>
-    
+
     <!-- detail for showing tasks created by someone else (%s => person name) -->
     <string name="opencrx_PDE_task_from">from %s</string>
-    
+
     <!-- replacement string for task edit "Notes" when using OpenCRX -->
     <string name="opencrx_TEA_notes">Add a Comment</string>
-    
+
     <string name="opencrx_creator_input_hint">Creator</string>
 
     <string name="opencrx_contact_input_hint">Assigned to</string>
     <!-- ==================================================== Preferences == -->
 
-    <!-- Preferences Title: OpenCRX -->    
+    <!-- Preferences Title: OpenCRX -->
     <string name="opencrx_PPr_header">OpenCRX</string>
 
     <!-- creator title for tasks that are not synchronized -->
     <string name="opencrx_no_creator">(Do Not Synchronize)</string>
 
-	<!-- preference title for default creator -->
+    <!-- preference title for default creator -->
     <string name="opencrx_PPr_defaultcreator_title">Default ActivityCreator</string>
 
     <!-- preference description for default creator (%s -> setting) -->
     <string name="opencrx_PPr_defaultcreator_summary">New activities will be created by: %s</string>
 
     <!-- preference description for default dashboard (when set to \'not synchronized\') -->
-    <string name="opencrx_PPr_defaultcreator_summary_none">New activities will not be synchronized by default</string>
-    
+    <string name="opencrx_PPr_defaultcreator_summary_none">New activities will not be synchronized
+        by default
+    </string>
+
     <!--  OpenCRX host and segment group name -->
     <string name="opencrx_group">OpenCRX server</string>
 
@@ -2040,81 +2180,87 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
 
     <!--  dialog title for OpenCRX host -->
     <string name="opencrx_host_dialog_title">OpenCRX host</string>
-    
+
     <!--  example for OpenCRX host -->
-    <string name="opencrx_host_summary">For example: <i>mydomain.com</i></string>
-    
+    <string name="opencrx_host_summary">For example:
+        <i>mydomain.com</i>
+    </string>
+
     <!--  preference description for OpenCRX segment -->
     <string name="opencrx_segment_title">Segment</string>
 
     <!--  dialog title for OpenCRX segment -->
     <string name="opencrx_segment_dialog_title">Synchronized segment</string>
-    
+
     <!--  example for OpenCRX segment -->
-    <string name="opencrx_segment_summary">For example: <i>Standard</i></string>
-    
+    <string name="opencrx_segment_summary">For example:
+        <i>Standard</i>
+    </string>
+
     <!--  default value for OpenCRX segment -->
     <string name="opencrx_segment_default">Standard</string>
-    
+
     <!--  preference description for OpenCRX provider -->
     <string name="opencrx_provider_title">Provider</string>
 
     <!--  dialog title for OpenCRX provider -->
     <string name="opencrx_provider_dialog_title">OpenCRX data provider</string>
-    
+
     <!--  example for OpenCRX provider -->
-    <string name="opencrx_provider_summary">For example: <i>CRX</i></string>
-    
+    <string name="opencrx_provider_summary">For example:
+        <i>CRX</i>
+    </string>
+
     <!--  default value for OpenCRX provider -->
     <string name="opencrx_provider_default">CRX</string>
     <!-- ================================================= Login Activity == -->
 
-    <!-- Activity Title: Opencrx Login -->    
+    <!-- Activity Title: Opencrx Login -->
     <string name="opencrx_PLA_title">Log In to OpenCRX</string>
 
-    <!-- Instructions: Opencrx login -->    
+    <!-- Instructions: Opencrx login -->
     <string name="opencrx_PLA_body">Sign in with your OpenCRX account</string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
     <string name="opencrx_PLA_signIn">サインイン</string>
 
-    <!-- Login Label -->    
+    <!-- Login Label -->
     <string name="opencrx_PLA_login">Login</string>
 
-    <!-- Password Label -->    
+    <!-- Password Label -->
     <string name="opencrx_PLA_password">パスワード</string>
-    
-        <!-- Error Message when fields aren\'t filled out -->    
+
+    <!-- Error Message when fields aren\'t filled out -->
     <string name="opencrx_PLA_errorEmpty">Error: fillout all fields</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
     <string name="opencrx_PLA_errorAuth">Error: login or password incorrect!</string>
 
     <!-- ================================================ Synchronization == -->
-        
+
     <!-- title for notification tray after synchronizing -->
     <string name="opencrx_notification_title">OpenCRX</string>
-    
+
     <!-- text for notification tray when synchronizing -->
     <string name="opencrx_notification_text">%s tasks updated / click for more details</string>
-    
+
     <!-- Error msg when io exception  -->
     <string name="opencrx_ioerror">接続エラー！インターネットに接続できるか確認してください。</string>
 
     <!-- opencrx Login not specified-->
     <string name="opencrx_MLA_email_empty">Login was not specified!</string>
-    
+
     <!-- opencrx password not specified-->
     <string name="opencrx_MLA_password_empty">Password was not specified!</string>
-    
+
     <!-- ================================================ labels for layout-elements == -->
-    
+
     <!-- label for task-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_task_assign_label">Assign this task to this person:</string>
-    
+
     <!-- Spinner-item for unassigned tasks on taskeditactivity -->
     <string name="opencrx_TEA_task_unassigned">&lt;Unassigned&gt;</string>
-    
+
     <!-- label for dashboard-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_creator_assign_label">Assign this task to this creator:</string>
 
@@ -2122,7 +2268,7 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
     <string name="opencrx_TEA_dashboard_default">&lt;Default&gt;</string>
 
     <string name="opencrx_TEA_opencrx_title">OpenCRX Controls</string>
-        
+
     <string name="CFC_opencrx_in_workspace_text">In workspace: ?</string>
 
     <string name="CFC_opencrx_in_workspace_name">In workspace...</string>
@@ -2132,118 +2278,147 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
     <string name="CFC_opencrx_assigned_to_name">Assigned to...</string>
 
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
+    <!-- ================================================== EditPreferences == -->
 
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 32j: Preference Category: Power Pack -->
-  <string name="EPr_powerpack_header">Advanced settings</string>
-  <string name="EPr_powerpack_summary">Missed call reminders, voice input and miscellaneous settings</string>
-  
-  <!-- slide 32e: Preference: Anonymous User Statistics -->
-  <string name="EPr_statistics_title">匿名の使用統計データ</string>
-  <!-- Preference: User Statistics (disabled) -->
-  <string name="EPr_statistics_desc_disabled">使用統計情報は送信されません</string>  
-  <!-- slide 32f: Preference: User Statistics (enabled) -->
-  <string name="EPr_statistics_desc_enabled">送られた使用統計情報は Astrid の改善に使用されます</string>
-      
+    <!-- slide 32j: Preference Category: Power Pack -->
+    <string name="EPr_powerpack_header">Advanced settings</string>
+    <string name="EPr_powerpack_summary">Missed call reminders, voice input and miscellaneous
+        settings
+    </string>
 
+    <!-- slide 32e: Preference: Anonymous User Statistics -->
+    <string name="EPr_statistics_title">匿名の使用統計データ</string>
+    <!-- Preference: User Statistics (disabled) -->
+    <string name="EPr_statistics_desc_disabled">使用統計情報は送信されません</string>
+    <!-- slide 32f: Preference: User Statistics (enabled) -->
+    <string name="EPr_statistics_desc_enabled">送られた使用統計情報は Astrid の改善に使用されます</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
-    <string name="speech_err_network">Network error! Speech recognition requires a network connection to work.</string>
-    <string name="speech_err_no_match">Sorry, I couldn\'t understand that! Please try again.</string>
-    <string name="speech_err_default">Sorry, speech recognition encountered an error. Please try again.</string>
-    
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <string name="speech_err_network">Network error! Speech recognition requires a network
+        connection to work.
+    </string>
+    <string name="speech_err_no_match">Sorry, I couldn\'t understand that! Please try again.
+    </string>
+    <string name="speech_err_default">Sorry, speech recognition encountered an error. Please try
+        again.
+    </string>
+
     <string name="premium_attach_file">Attach a file</string>
     <string name="premium_record_audio">Record a note</string>
     <string name="premium_no_files">No files attached</string>
     <string name="premium_remove_file_confirm">Are you sure? Cannot be undone</string>
-    
+
     <string name="audio_recording_title">Recording Audio</string>
     <string name="audio_stop_recording">Stop Recording</string>
     <string name="audio_speak_now">Speak Now!</string>
     <string name="audio_encoding">Encoding...</string>
     <string name="audio_err_encoding">Error encoding audio</string>
-    <string name="audio_err_playback">Sorry, the system does not support this type of audio file</string>
-    
-    <string name="search_market_audio">No player found to handle that audio type. Would you like to download an audio player from the Android Market?</string>
+    <string name="audio_err_playback">Sorry, the system does not support this type of audio file
+    </string>
+
+    <string name="search_market_audio">No player found to handle that audio type. Would you like to
+        download an audio player from the Android Market?
+    </string>
     <string name="search_market_audio_title">No audio player found</string>
 
-    <string name="search_market_pdf">No PDF reader was found. Would you like to download a PDF reader from the Android Market?</string>
+    <string name="search_market_pdf">No PDF reader was found. Would you like to download a PDF
+        reader from the Android Market?
+    </string>
     <string name="search_market_pdf_title">No PDF reader found</string>
 
-    <string name="search_market_ms">No MS Office reader was found. Would you like to download an MS Office reader from the Android Market?</string>
+    <string name="search_market_ms">No MS Office reader was found. Would you like to download an MS
+        Office reader from the Android Market?
+    </string>
     <string name="search_market_ms_title">No MS Office reader found</string>
-    
-    <string name="file_type_unhandled">Sorry! No application was found to handle this file type.</string>
+
+    <string name="file_type_unhandled">Sorry! No application was found to handle this file type.
+    </string>
     <string name="file_type_unhandled_title">No application found</string>
-    
+
     <string name="file_prefix_image">Image</string>
     <string name="file_prefix_voice">Voice</string>
     <string name="file_browser_up">Up</string>
     <string name="file_browser_title">Choose a file</string>
     <string name="dir_browser_title">Choose a directory</string>
-    <string name="file_browser_err_permissions">Permissions error! Please make sure you have not blocked Astrid from accessing the SD card.</string>
+    <string name="file_browser_err_permissions">Permissions error! Please make sure you have not
+        blocked Astrid from accessing the SD card.
+    </string>
     <string name="file_add_picture">Attach a picture</string>
     <string name="file_add_sdcard">Attach a file from your SD card</string>
     <string name="file_download_title">Download file?</string>
-    <string name="file_download_body">This file has not been downloaded to your SD card. Download now?</string>
+    <string name="file_download_body">This file has not been downloaded to your SD card. Download
+        now?
+    </string>
     <string name="file_download_progress">Downloading...</string>
     <string name="file_err_memory">Image is too large to fit in memory</string>
     <string name="file_err_copy">Error copying file for attachment</string>
     <string name="file_err_download">Error downloading file</string>
-    <string name="file_err_no_directory">Whoops! Looks like the files directory doesn\'t exist. Please choose a directory to save files to in the preferences.</string>
+    <string name="file_err_no_directory">Whoops! Looks like the files directory doesn\'t exist.
+        Please choose a directory to save files to in the preferences.
+    </string>
     <string name="file_err_show">Sorry, the system does not yet support this type of file</string>
-    
+
     <string name="file_dir_dialog_ok">Use this directory</string>
     <string name="file_dir_dialog_default">Reset to default</string>
-    
+
     <string name="p_files_dir">Premium downloads directory</string>
     <!-- Description for file download directory preference. %s -> chosen directory -->
     <string name="p_files_dir_desc">Task attachments saved to: %s</string>
     <string name="p_files_dir_desc_default">Default directory</string>
 
-    
+
     <!-- in app billing -->
     <string name="billing_not_supported_title">Can\'t make purchases</string>
     <string name="billing_not_supported_message">The Market billing
-     service is not available at this time.  You can continue to use this app but you
-     won\'t be able to make purchases.</string>
+        service is not available at this time. You can continue to use this app but you
+        won\'t be able to make purchases.
+    </string>
     <string name="subscriptions_not_supported_title">Can\'t purchase subscriptions</string>
     <string name="subscriptions_not_supported_message">The Market billing
-     service on this device does not support subscriptions at this time. You can subscribe to Astrid Premium at http://astrid.com/premium.</string>
+        service on this device does not support subscriptions at this time. You can subscribe to
+        Astrid Premium at http://astrid.com/premium.
+    </string>
     <string name="cannot_connect_title">Can\'t connect to Market</string>
     <string name="cannot_connect_message">This app cannot connect to Market.
-     Your version of Market may be out of date.
-     You can continue to use this app but you
-     won\'t be able to make purchases.</string>
-    
+        Your version of Market may be out of date.
+        You can continue to use this app but you
+        won\'t be able to make purchases.
+    </string>
+
     <string name="restoring_transactions">Restoring transactions</string>
-    
+
     <string name="subscriptions_learn_more">Learn more</string>
-    
-    <string name="kii_premium_success">Thanks for participating in this offer! Your free month of Astrid Premium is now unlocked.</string>
+
+    <string name="kii_premium_success">Thanks for participating in this offer! Your free month of
+        Astrid Premium is now unlocked.
+    </string>
     <string name="kii_premium_abort">Special offer aborted</string>
     <string name="kii_premium_declined">Special offer declined</string>
-    <string name="kii_premium_error">There was an error processing this offer. Please try again later.</string>
-    
+    <string name="kii_premium_error">There was an error processing this offer. Please try again
+        later.
+    </string>
+
     <string name="premium_offers_title">Special Offer</string>
     <string name="premium_offers_subtitle">Want one month of Astrid Premium for free?</string>
-    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a short video by this sponsor. (They will also require your email address.)</string>
+    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a
+        short video by this sponsor. (They will also require your email address.)
+    </string>
     <string name="premium_offers_start">Get it free!</string>
-    
+
     <string name="premium_billing_title">Astridプレミアム</string>
     <string name="premium_buy_month">1か月</string>
     <string name="premium_buy_year">1年</string>
@@ -2257,729 +2432,758 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
     <string name="premium_speech_bubble_1">Premium will power up your productivity!</string>
     <string name="premium_speech_bubble_2">Order one year and save 25%!</string>
     <string name="premium_already_subscribed">You are already subscribed to Astrid Premium!</string>
-    <string name="premium_login_prompt">You need to have an Astrid.com account in order to subscribe to premium. Please log in or sign up.</string>
+    <string name="premium_login_prompt">You need to have an Astrid.com account in order to subscribe
+        to premium. Please log in or sign up.
+    </string>
     <string name="premium_success">Thanks for subscribing to Astrid Premium!</string>
-    <string name="premium_success_with_server_error">Thanks for subscribing to Astrid Premium! The new features will be unlocked for you on astrid.com soon, and should be available on your phone right away.</string>
-    <string name="premium_verification_error">The premium subscription for this Google Play account is connected to a different user. To link additional emails to your account, visit astrid.com/users/profile</string>
-    <string name="premium_check_for_purchases">Already purchased premium? Click here to check Google Play for purchase history.</string>
+    <string name="premium_success_with_server_error">Thanks for subscribing to Astrid Premium! The
+        new features will be unlocked for you on astrid.com soon, and should be available on your
+        phone right away.
+    </string>
+    <string name="premium_verification_error">The premium subscription for this Google Play account
+        is connected to a different user. To link additional emails to your account, visit
+        astrid.com/users/profile
+    </string>
+    <string name="premium_check_for_purchases">Already purchased premium? Click here to check Google
+        Play for purchase history.
+    </string>
     <string name="premium_checking_for_purchases">Checking for purchases...</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- 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">通知するのは...</string>
-
-  <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">何時がタスクの期限ですか？</string>
-
-  <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">何時タスクが期限切れになりますか？</string>
-
-  <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_randomly">Randomly once</string>
-
-  <!-- Task Edit: Reminder alarm clock label -->  
-  <string name="TEA_reminder_alarm_label">通知音、振動</string>
-
-  <!--  slide 45a: Task Edit: Reminder mode: ring once -->  
-  <string name="TEA_reminder_mode_once">Once</string>
-
-  <!-- slide 45b: Task Edit: Reminder mode: ring five times -->  
-  <string name="TEA_reminder_mode_five">Five times</string>
-
-  <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->  
-  <string name="TEA_reminder_mode_nonstop">Until I dismiss alarm</string>
-  
-  <string name="TEA_reminder_when">when</string>
-  
-  <string name="TEA_reminder_due_short">due</string>
-
-  <string name="TEA_reminder_overdue_short">overdue</string>
-
-  <string name="TEA_reminder_randomly_short">randomly</string>
-
-  <string name="TEA_reminder_display_one">Remind me %s</string>
-  
-  <string name="TEA_reminder_display_multiple">Remind %s</string>
-
-  <string-array name="TEA_reminder_random">
-    <!-- random reminder choices for task edit page. -->
-    <item>an hour</item>
-    <item>a day</item>
-    <item>a week</item>
-    <item>in two weeks</item>
-    <item>a month</item>
-    <item>in two months</item>
-  </string-array>
-  
-  <!-- ==================================================== notifications == -->
-  
-  <!-- Name of filter when viewing a reminder -->
-  <string name="rmd_NoA_filter">お知らせ</string>
-  
-  <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">既に完了しています!</string>
-  
-  <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">スヌーズ</string>
-  
-  <!-- Reminder: Completed Toast -->
-  <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
-  
-  <!-- Prefix for reminder dialog title -->
-  <string name="rmd_NoA_dlg_title">Reminder:</string>
-  
-  <!-- ==================================================== user reengagement == -->
-
-  <!-- Titles for user reengagement notifications -->
-  <string-array name="rmd_reengage_notif_titles">
-    <item>A note from Astrid</item>
-    <!-- %s -> first name -->
-    <item>Memo for %s.</item> 
-    <item>Your Astrid digest</item>
-    <item>Reminders from Astrid</item>
-  </string-array>
-    
-  <string name="rmd_reengage_name_default">あなた</string>
-
-  
-  <string name="rmd_reengage_add_tasks">タスクを追加する</string>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs -->
-  <string-array name="rmd_reengage_dialog_options">
-    <item>Time to shorten your to-do list!</item>
-    <item>Dear sir or madam, some tasks await your inspection!</item>
-    <item>Hi there, could you take a look at these?</item>
-    <item>I\'ve got some tasks with your name on them!</item>
-    <item>A fresh batch of tasks for you today!</item>
-    <item>You look fabulous! Ready to get started?</item>
-    <item>A lovely day for getting some work done, I think!</item>
-  </string-array>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>Don\'t you want to get organized?</item>
-    <item>I\'m Astrid! I\'m here to help you do more!</item>
-    <item>You look busy! Let me take some of those tasks off of your plate.</item>
-    <item>I can help you keep track of all of the details in your life.</item>
-    <item>You\'re serious about getting more done? So am I!</item>
-    <item>Pleasure to make your acquaintance!</item>
-  </string-array>
-  <!-- ============================================= reminder preferences == -->
-  
-  <!-- slide 33d: Reminder Preference Screen Title -->
-  <string name="rmd_EPr_alerts_header">通知の設定</string>
-  <string name="rmd_EPr_alerts_summary">Quiet hours, snooze options, persistence level</string>
-    
-  <!-- Reminder Preference: Reminders Enabled Title -->
-  <string name="rmd_EPr_enabled_title">Reminders enabled?</string>
-  <!-- Reminder Preference Reminders Enabled Description (true) -->
-  <string name="rmd_EPr_enabled_desc_true">Reminders are enabled (this is normal)</string>
-  <!-- Reminder Preference Reminders Enabled Description (false) -->
-  <string name="rmd_EPr_enabled_desc_false">Reminders will never appear on your phone</string>  
-    
-  <!-- Reminder Preference: Quiet Hours Start Title -->
-  <string name="rmd_EPr_quiet_hours_start_title">消音時間の始まり</string>
-  <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">%s 以降、通知音は鳴りません</string>
-  <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
-  <string name="rmd_EPr_quiet_hours_desc_none">消音は無効です</string>
-  
-  <!-- Reminder Preference: Quiet Hours End Title -->
-  <string name="rmd_EPr_quiet_hours_end_title">消音時間の終わり</string>
-  <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_end_desc">Notifications will stop being silent starting at %s</string>
-
-  <!-- Reminder Preference: Default Reminder Title -->
-  <string name="rmd_EPr_rmd_time_title">Default reminder</string>
-  <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
-  <string name="rmd_EPr_rmd_time_desc">Notifications for tasks without due times will appear at %s</string>
-
-  <!-- Reminder Preference: Notification Ringtone Title -->
-  <string name="rmd_EPr_ringtone_title">通知音</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
-  <string name="rmd_EPr_ringtone_desc_custom">カスタム通知音を使用</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
-  <string name="rmd_EPr_ringtone_desc_silent">通知音は無効</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
-  <string name="rmd_EPr_ringtone_desc_default">デフォルトの通知音を使用</string>
-  
-  <!-- Reminder Preference: Notification Persistence Title -->
-  <string name="rmd_EPr_persistent_title">通知の持続</string>
-  <!-- Reminder Preference: Notification Persistence Description (true) -->
-  <string name="rmd_EPr_persistent_desc_true">通知はひとつひとつ削除する必要があります</string>
-  <!-- Reminder Preference: Notification Persistence Description (false) -->
-  <string name="rmd_EPr_persistent_desc_false">通知は\"通知を消去\"ボタンで消えます</string>
-
-  <!-- Reminder Preference: Social Reminders Title -->
-  <string name="rmd_EPr_social_title">Social encouragement</string>
-  <!-- Reminder Preference: Social Reminders Summary (enabled) -->
-  <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for shared tasks</string>
-  <!-- Reminder Preference: Social Reminders Summary (disabled) -->
-  <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you for shared tasks</string>
-  
-  
-  
-  <!-- Reminder Preference: Notification Icon Title -->
-  <!-- Reminder Preference: Notification Icon Description -->
-
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
-  <string name="rmd_EPr_multiple_maxvolume_title">Max volume for multiple-ring reminders</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid will max out the volume for multiple-ring reminders</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid will use the system setting for the volume</string>
-
-  <!-- Reminder Preference: Vibrate Title -->
-  <string name="rmd_EPr_vibrate_title">アラート時に振動する</string>
-  <!-- Reminder Preference: Vibrate Description (true) -->
-  <string name="rmd_EPr_vibrate_desc_true">通知するときに振動します</string>
-  <!-- Reminder Preference: Vibrate Description (false) -->
-  <string name="rmd_EPr_vibrate_desc_false">通知するときに振動しません</string>
-
-  <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">Astridの通知</string>
-  <!-- Reminder Preference: Nagging Description (true) -->
-  <string name="rmd_EPr_nagging_desc_true">通知画面に励ましメッセージを表示します</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_nagging_desc_false">励ましメッセージを表示しません</string>
-
-  <!-- Reminder Preference: Snooze Dialog Title -->  
-  <string name="rmd_EPr_snooze_dialog_title">スヌーズの時刻指定</string>
-  <!-- Reminder Preference: Snooze Dialog Description (true) -->
-  <string name="rmd_EPr_snooze_dialog_desc_true">次のスヌーズ時刻を 時:分 で指定します</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_snooze_dialog_desc_false">次のスヌーズまでの時間間隔を指定します</string>
-  
-  <!-- slide 44g: Reminder Preference: Default Reminders Title -->
-  <string name="rmd_EPr_defaultRemind_title">ランダムな通知</string>
-  <!-- Reminder Preference: Default Reminders Setting (disabled) -->
-  <string name="rmd_EPr_defaultRemind_desc_disabled">新規タスクにランダムな通知を設定しません</string>
-  <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
-  <string name="rmd_EPr_defaultRemind_desc">新規タスクにランダムな通知を設定します:%s</string>
-  
-  <!-- slide 39a: Defaults Title -->
-  
-  <string-array name="EPr_reminder_random">
-    <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
-    <item>無効</item>
-    <!-- slide 44b -->
-    <item>1時間毎</item>
-    <!-- slide 44c -->
-    <item>毎日</item>
-    <!-- slide 44d-->
-    <item>毎週</item>
-    <!-- slide 44e-->
-    <item>一週間おき</item>
-    <!-- slide 44f -->
-    <item>毎月</item>
-    <item>一ヶ月おき</item>
-  </string-array>
-        
-  <string-array name="EPr_quiet_hours_start">
-    <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
-    <item>無効</item>
-    <item>午後8時</item>
-    <item>午後9時</item>
-    <item>午後10時</item>
-    <item>午後11時</item>
-    <item>午後12時</item>
-    <item>午前1時</item>
-    <item>午前2時</item>
-    <item>午前3時</item>
-    <item>午前4時</item>
-    <item>午前5時</item>
-    <item>午前6時</item>
-    <item>午前7時</item>
-    <item>午前8時</item>
-    <item>午前9時</item>
-    <item>午前10時</item>
-    <item>午前11時</item>
-    <item>正午</item>
-    <item>午後1時</item>
-    <item>午後2時</item>
-    <item>午後3時</item>
-    <item>午後4時</item>
-    <item>午後5時</item>
-    <item>午後6時</item>
-    <item>午後7時</item>
-  </string-array>
-  
-  <string-array name="EPr_quiet_hours_end">
-    <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
-    <item>午前9時</item>
-    <item>午前10時</item>
-    <item>午前11時</item>
-    <item>正午</item>
-    <item>午後1時</item>
-    <item>午後2時</item>
-    <item>午後3時</item>
-    <item>午後4時</item>
-    <item>午後5時</item>
-    <item>午後6時</item>
-    <item>午後7時</item>
-    <item>午後8時</item>
-    <item>午後9時</item>
-    <item>午後10時</item>
-    <item>午後11時</item>
-    <item>午後12時</item>
-    <item>午前1時</item>
-    <item>午前2時</item>
-    <item>午前3時</item>
-    <item>午前4時</item>
-    <item>午前5時</item>
-    <item>午前6時</item>
-    <item>午前7時</item>
-    <item>午前8時</item>
-  </string-array>
-  
-  <string-array name="EPr_rmd_time">
-    <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
-    <item>午前9時</item>
-    <item>午前10時</item>
-    <item>午前11時</item>
-    <item>正午</item>
-    <item>午後1時</item>
-    <item>午後2時</item>
-    <item>午後3時</item>
-    <item>午後4時</item>
-    <item>午後5時</item>
-    <item>午後6時</item>
-    <item>午後7時</item>
-    <item>午後8時</item>
-    <item>午後9時</item>
-    <item>午後10時</item>
-    <item>午後11時</item>
-    <item>午後12時</item>
-    <item>午前1時</item>
-    <item>午前2時</item>
-    <item>午前3時</item>
-    <item>午前4時</item>
-    <item>午前5時</item>
-    <item>午前6時</item>
-    <item>午前7時</item>
-    <item>午前8時</item>
-  </string-array>
-  
-  <!-- =============================================== random reminders == -->
-
-  <string name="reminders_social">この人々はあなたを頼りにしています！</string>
-  
-  <string name="reminders_social_one">%s is counting on you!</string>
-  
-  <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
-
-  <string-array name="reminders">
-      <!-- reminders: Make these < 20 chars so the task name is displayed -->
-      <item>やあ、ちょっと時間ある？</item>
-      <item>少しお時間いただけますか？</item>
-      <item>2～3分お時間ありますか？</item>
-      <item>忘れましたか？</item>
-      <item>すいません！</item>
-      <item>何時あなたに少し時間がありますか？</item>
-      <item>あなたの当面の課題に入っています</item>
-      <item>少しお時間ありますか？</item>
-      <item>Astridはここだよ！</item>
-      <item>こんにちは、ちょっと邪魔していい？</item>
-      <item>ちょっとお時間よろしいですか？</item>
-      <item>It\'s a great day to</item>
-  </string-array>
-
-  <string-array name="reminders_due">
-      <!-- reminders related to task due date -->
-      <item>働く時！</item>
-      <item>期限日が到来です</item>
-      <item>始める準備はできてる？</item>
-      <item>あなたは次のことをやるといいました：</item>
-      <item>あなたは開始することになっています。</item>
-      <item>始める時</item>
-      <item>時間ですよ！</item>
-      <item>すいません！～のための時間を</item>
-      <item>手、空いてる? これやらなくちゃ。</item>
-  </string-array>
-
-  <string-array name="reminders_snooze">
-      <!-- reminders related to snooze -->
-      <item>今は怠けちゃダメだよ</item>
-      <item>スヌーズの時間切れです！</item>
-      <item>もう居眠りしないで！</item>
-      <item>今、準備はいいかい？</item>
-      <item>もう先送りしないで！</item>
-  </string-array>
-  
-  <string-array name="reminder_responses">
-      <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
-      <item>あなたに贈り物があります。</item> 
-      <item>これを過去のこととして忘れてしまう準備はできてる？</item>
-      <item>これをやってしまいませんか？</item>
-      <item>それはどうだい？準備はできてるかい？</item>
-      <item>これをする準備はできてる？</item>
-      <item>君はこれを扱えるかい？</item>
-      <item>君も喜ぶと思うよ！これをただ終わらせるだけでいいんだ！</item>
-      <item>終わらせればぜったい気分がいいって！</item>
-      <item>今日はこれをしないんですか？</item>
-      <item>これを終わらせて下さい。私はもううんざりです。</item>
-      <item>これを終えられるかい？そう、君ならできる！</item>
-      <item>あなたは一体これをするつもりなの？</item>
-      <item>あなた自身に自信を持って！さあ行こう！</item>
-      <item>あなたはとても偉い！それをやり遂げましょう！</item>
-      <item>これを終えたらちょっと軽食どう？</item>
-      <item>ただこのタスク1つだけ？たのむよ</item>
-      <item>あなたのToDoリストを短くすべき時</item>
-      <item>あなたは秩序あるチームにいるの？それとも大混乱のチームにいるの？秩序あるチームだよね！さあ行こう！</item>
-      <item>最近あなたはすごいと言いましたっけ？その調子！</item>
-      <item>タスクを1日1つこなし続ければゴチャゴチャがなくなる…。ゴチャゴチャよさようなら！</item>
-      <item>それはどういう風にやるものなの？ ワオ、これはすごい！</item>
-      <item>君の容姿端麗さだけではやっていけないよ。さあ、それに取り掛かろう！</item>
-      <item>こんな仕事にとって素敵な天気ですね？</item>
-      <item>これをやりながらお茶でも1杯どう？</item>
-      <item>If only you had already done this, then you could go outside and play.</item>
-      <item>It\'s time. You can\'t put off the inevitable.</item>
-      <item>君が私を無視するたびに私はずっこける。</item>
-  </string-array>
-
-  <string-array name="postpone_nags">
-      <!-- Astrid\'s nagging when user clicks postpone -->
-      <item>Please tell me it isn\'t true that you\'re a procrastinator!</item>
-      <item>Doesn\'t being lazy get old sometimes?</item>
-      <item>Somewhere, someone is depending on you to finish this!</item>
-      <item>When you said postpone, you really meant \'I\'m doing this\', right?</item>
-      <item>This is the last time you postpone this, right?</item>
-      <item>Just finish this today, I won\'t tell anyone!</item>
-      <item>Why postpone when you can um... not postpone!</item>
-      <item>You\'ll finish this eventually, I presume?</item>
-      <item>I think you\'re really great! How about not putting this off?</item>
-      <item>Will you be able to achieve your goals if you do that?</item>
-      <item>Postpone, postpone, postpone. When will you change!</item>
-      <item>I\'ve had enough with your excuses! Just do it already!</item>
-      <item>Didn\'t you make that excuse last time?</item>
-      <item>I can\'t help you organize your life if you do that...</item>
-  </string-array>
+    <!-- Resources for built-in reminders plug-in -->
 
+    <!-- =============================================== task edit activity == -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder group label -->
+    <string name="TEA_reminders_group_label">Reminder settings</string>
 
+    <!-- Task Edit: Reminder header label -->
+    <string name="TEA_reminder_label">通知するのは...</string>
 
-  <!-- Resources for built-in repeat plug-in -->
-
-  <!-- repeating plugin name -->
-  <string name="repeat_plugin">Repeating Tasks</string>
-  
-  <!-- repeating plugin description -->
-  <string name="repeat_plugin_desc">Allows tasks to repeat</string>
-  
-  <!-- slide 20a: checkbox for turning on/off repeats -->
-  <string name="repeat_enabled">繰り返し</string>
-  
-  <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
-  <string name="repeat_every">Every %d</string>
-  
-  <!-- hint when opening repeat interval -->
-  <string name="repeat_interval_prompt">繰り返し間隔</string>
-  
-  <!-- slide 19b-->
-  <string name="repeat_never">Not repeating</string>
-  <!-- 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>時間</item>
-    <item>分</item>
-    <item>yr</item>
-  </string-array>
-  
-  
-  <string-array name="repeat_interval">
-    <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>日毎</item>
-    <item>週毎</item>
-    <item>か月毎</item>
-    <item>時間毎</item>
-    <item>Minute(s)</item>
-    <item>Year(s)</item>
-  </string-array>
-  
-  <string name="repeat_days">日々</string>
-  <string name="repeat_weekdays">weekdays</string>
-  <string name="repeat_weeks">weeks</string>
-  <string name="repeat_months">months</string>
-  <string name="repeat_years">years</string>
-  <string name="repeat_hours">hours</string>
-  <string name="repeat_minutes">分</string>
-  
-  <string-array name="repeat_until_shortcuts">
-      <item>Forever</item>
-      <item>Specific Day</item>
-      <item>Today</item>
-      <item>Tomorrow</item>
-      <item>(day after)</item>
-      <item>Next Week</item>
-      <item>In Two Weeks</item>
-      <item>Next Month</item>
-  </string-array>
-  
-  <string name="repeat_until_title">Repeat until...</string>
-  
-  <string name="repeat_keep_going">Keep going</string>
-  
-  <string-array name="repeat_type">
-    <!-- slide 20c: repeat type (date to repeat from) -->
-    <item>期限から</item>
-    <!-- slide 20c -->
-    <item>完了日から</item>
-  </string-array>
-  
-  <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
-  <string name="repeat_detail_byday">$I ($D 曜日)</string>
-  
-  <!-- task detail for repeat from due date (%s -> interval) -->
-  <string name="repeat_detail_duedate">%s</string>
-
-  <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
-  <string name="repeat_detail_duedate_until">Every %1$s\nuntil %2$s</string>
-  
-  <!-- task detail for repeat from completion date (%s -> interval) -->
-  <string name="repeat_detail_completion">完了日から %s</string>
-  
-  <!-- text for button when repeating task indefinitely -->
-  <string name="repeat_forever">Repeat forever</string>
-
-  <!-- text for button when repeating task until specified date (%s -> date string) -->
-  <string name="repeat_until">Repeat until %s</string>
-  
-  <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title">Rescheduling task \"%s\"</string>
-
-  <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title_last_time">Completed repeating task \"%s\"</string>
-      
-  <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->  
-  <string name="repeat_rescheduling_dialog_bubble">%1$s I\'ve rescheduled this repeating task from %2$s to %3$s</string>
-  
-  <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
-  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s I\'ve rescheduled this repeating task to %2$s</string>
-  
-  <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
-  <string name="repeat_rescheduling_dialog_bubble_last_time">You had this repeating until %1$s, and now you\'re all done. %2$s</string>
-  
-  <string-array name="repeat_encouragement">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>上出来だ！</item>
-      <item>Wow… I\'m so proud of you!</item>
-      <item>I love when you\'re productive!</item>
-      <item>何かにチェック済みの印を付けるのは気分良くないですか？</item>
-  </string-array>
-
-  <string-array name="repeat_encouragement_last_time">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>上出来だ！</item>
-      <item>I\'m so proud of you!</item>
-      <item>I love when you\'re productive!</item>
-  </string-array>
-  
+    <!-- Task Edit: Reminder @ deadline -->
+    <string name="TEA_reminder_due">何時がタスクの期限ですか？</string>
 
+    <!-- Task Edit: Reminder after deadline -->
+    <string name="TEA_reminder_overdue">何時タスクが期限切れになりますか？</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder at random times (%s => time plural)-->
+    <string name="TEA_reminder_randomly">Randomly once</string>
 
-    
-  <!-- Subtasks Help Introduction -->
-  <string name="subtasks_help_title">Sort and Indent</string>
-  <string name="subtasks_help_1">Tap and hold to move a task</string>
-  <string name="subtasks_help_2">Drag vertically to rearrange</string>
-  <string name="subtasks_help_3">Drag horizontally to indent</string>
-    
+    <!-- Task Edit: Reminder alarm clock label -->
+    <string name="TEA_reminder_alarm_label">通知音、振動</string>
 
+    <!--  slide 45a: Task Edit: Reminder mode: ring once -->
+    <string name="TEA_reminder_mode_once">Once</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 45b: Task Edit: Reminder mode: ring five times -->
+    <string name="TEA_reminder_mode_five">Five times</string>
+
+    <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
+    <string name="TEA_reminder_mode_nonstop">Until I dismiss alarm</string>
+
+    <string name="TEA_reminder_when">when</string>
+
+    <string name="TEA_reminder_due_short">due</string>
+
+    <string name="TEA_reminder_overdue_short">overdue</string>
+
+    <string name="TEA_reminder_randomly_short">randomly</string>
+
+    <string name="TEA_reminder_display_one">Remind me %s</string>
+
+    <string name="TEA_reminder_display_multiple">Remind %s</string>
+
+    <string-array name="TEA_reminder_random">
+        <!-- random reminder choices for task edit page. -->
+        <item>an hour</item>
+        <item>a day</item>
+        <item>a week</item>
+        <item>in two weeks</item>
+        <item>a month</item>
+        <item>in two months</item>
+    </string-array>
+
+    <!-- ==================================================== notifications == -->
+
+    <!-- Name of filter when viewing a reminder -->
+    <string name="rmd_NoA_filter">お知らせ</string>
+
+    <!-- Reminder: Task was already done -->
+    <string name="rmd_NoA_done">既に完了しています!</string>
+
+    <!-- Reminder: Snooze button (remind again later) -->
+    <string name="rmd_NoA_snooze">スヌーズ</string>
+
+    <!-- Reminder: Completed Toast -->
+    <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
+
+    <!-- Prefix for reminder dialog title -->
+    <string name="rmd_NoA_dlg_title">Reminder:</string>
+
+    <!-- ==================================================== user reengagement == -->
+
+    <!-- Titles for user reengagement notifications -->
+    <string-array name="rmd_reengage_notif_titles">
+        <item>A note from Astrid</item>
+        <!-- %s -> first name -->
+        <item>Memo for %s.</item>
+        <item>Your Astrid digest</item>
+        <item>Reminders from Astrid</item>
+    </string-array>
+
+    <string name="rmd_reengage_name_default">あなた</string>
+
+
+    <string name="rmd_reengage_add_tasks">タスクを追加する</string>
+
+    <!-- Speech bubble options for astrid in reengagement notifs -->
+    <string-array name="rmd_reengage_dialog_options">
+        <item>Time to shorten your to-do list!</item>
+        <item>Dear sir or madam, some tasks await your inspection!</item>
+        <item>Hi there, could you take a look at these?</item>
+        <item>I\'ve got some tasks with your name on them!</item>
+        <item>A fresh batch of tasks for you today!</item>
+        <item>You look fabulous! Ready to get started?</item>
+        <item>A lovely day for getting some work done, I think!</item>
+    </string-array>
+
+    <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>Don\'t you want to get organized?</item>
+        <item>I\'m Astrid! I\'m here to help you do more!</item>
+        <item>You look busy! Let me take some of those tasks off of your plate.</item>
+        <item>I can help you keep track of all of the details in your life.</item>
+        <item>You\'re serious about getting more done? So am I!</item>
+        <item>Pleasure to make your acquaintance!</item>
+    </string-array>
+    <!-- ============================================= reminder preferences == -->
+
+    <!-- slide 33d: Reminder Preference Screen Title -->
+    <string name="rmd_EPr_alerts_header">通知の設定</string>
+    <string name="rmd_EPr_alerts_summary">Quiet hours, snooze options, persistence level</string>
+
+    <!-- Reminder Preference: Reminders Enabled Title -->
+    <string name="rmd_EPr_enabled_title">Reminders enabled?</string>
+    <!-- Reminder Preference Reminders Enabled Description (true) -->
+    <string name="rmd_EPr_enabled_desc_true">Reminders are enabled (this is normal)</string>
+    <!-- Reminder Preference Reminders Enabled Description (false) -->
+    <string name="rmd_EPr_enabled_desc_false">Reminders will never appear on your phone</string>
+
+    <!-- Reminder Preference: Quiet Hours Start Title -->
+    <string name="rmd_EPr_quiet_hours_start_title">消音時間の始まり</string>
+    <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_start_desc">%s 以降、通知音は鳴りません</string>
+    <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
+    <string name="rmd_EPr_quiet_hours_desc_none">消音は無効です</string>
+
+    <!-- Reminder Preference: Quiet Hours End Title -->
+    <string name="rmd_EPr_quiet_hours_end_title">消音時間の終わり</string>
+    <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_end_desc">Notifications will stop being silent starting at
+        %s
+    </string>
+
+    <!-- Reminder Preference: Default Reminder Title -->
+    <string name="rmd_EPr_rmd_time_title">Default reminder</string>
+    <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
+    <string name="rmd_EPr_rmd_time_desc">Notifications for tasks without due times will appear at
+        %s
+    </string>
+
+    <!-- Reminder Preference: Notification Ringtone Title -->
+    <string name="rmd_EPr_ringtone_title">通知音</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
+    <string name="rmd_EPr_ringtone_desc_custom">カスタム通知音を使用</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
+    <string name="rmd_EPr_ringtone_desc_silent">通知音は無効</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
+    <string name="rmd_EPr_ringtone_desc_default">デフォルトの通知音を使用</string>
+
+    <!-- Reminder Preference: Notification Persistence Title -->
+    <string name="rmd_EPr_persistent_title">通知の持続</string>
+    <!-- Reminder Preference: Notification Persistence Description (true) -->
+    <string name="rmd_EPr_persistent_desc_true">通知はひとつひとつ削除する必要があります</string>
+    <!-- Reminder Preference: Notification Persistence Description (false) -->
+    <string name="rmd_EPr_persistent_desc_false">通知は\"通知を消去\"ボタンで消えます</string>
+
+    <!-- Reminder Preference: Social Reminders Title -->
+    <string name="rmd_EPr_social_title">Social encouragement</string>
+    <!-- Reminder Preference: Social Reminders Summary (enabled) -->
+    <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for
+        shared tasks
+    </string>
+    <!-- Reminder Preference: Social Reminders Summary (disabled) -->
+    <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you
+        for shared tasks
+    </string>
+
+
+    <!-- Reminder Preference: Notification Icon Title -->
+    <!-- Reminder Preference: Notification Icon Description -->
+
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
+    <string name="rmd_EPr_multiple_maxvolume_title">Max volume for multiple-ring reminders</string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid will max out the volume for
+        multiple-ring reminders
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid will use the system setting for the
+        volume
+    </string>
+
+    <!-- Reminder Preference: Vibrate Title -->
+    <string name="rmd_EPr_vibrate_title">アラート時に振動する</string>
+    <!-- Reminder Preference: Vibrate Description (true) -->
+    <string name="rmd_EPr_vibrate_desc_true">通知するときに振動します</string>
+    <!-- Reminder Preference: Vibrate Description (false) -->
+    <string name="rmd_EPr_vibrate_desc_false">通知するときに振動しません</string>
+
+    <!-- Reminder Preference: Nagging Title -->
+    <string name="rmd_EPr_nagging_title">Astridの通知</string>
+    <!-- Reminder Preference: Nagging Description (true) -->
+    <string name="rmd_EPr_nagging_desc_true">通知画面に励ましメッセージを表示します</string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_nagging_desc_false">励ましメッセージを表示しません</string>
+
+    <!-- Reminder Preference: Snooze Dialog Title -->
+    <string name="rmd_EPr_snooze_dialog_title">スヌーズの時刻指定</string>
+    <!-- Reminder Preference: Snooze Dialog Description (true) -->
+    <string name="rmd_EPr_snooze_dialog_desc_true">次のスヌーズ時刻を 時:分 で指定します</string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_snooze_dialog_desc_false">次のスヌーズまでの時間間隔を指定します</string>
+
+    <!-- slide 44g: Reminder Preference: Default Reminders Title -->
+    <string name="rmd_EPr_defaultRemind_title">ランダムな通知</string>
+    <!-- Reminder Preference: Default Reminders Setting (disabled) -->
+    <string name="rmd_EPr_defaultRemind_desc_disabled">新規タスクにランダムな通知を設定しません</string>
+    <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
+    <string name="rmd_EPr_defaultRemind_desc">新規タスクにランダムな通知を設定します:%s</string>
+
+    <!-- slide 39a: Defaults Title -->
+
+    <string-array name="EPr_reminder_random">
+        <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
+        <item>無効</item>
+        <!-- slide 44b -->
+        <item>1時間毎</item>
+        <!-- slide 44c -->
+        <item>毎日</item>
+        <!-- slide 44d-->
+        <item>毎週</item>
+        <!-- slide 44e-->
+        <item>一週間おき</item>
+        <!-- slide 44f -->
+        <item>毎月</item>
+        <item>一ヶ月おき</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_start">
+        <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
+        <item>無効</item>
+        <item>午後8時</item>
+        <item>午後9時</item>
+        <item>午後10時</item>
+        <item>午後11時</item>
+        <item>午後12時</item>
+        <item>午前1時</item>
+        <item>午前2時</item>
+        <item>午前3時</item>
+        <item>午前4時</item>
+        <item>午前5時</item>
+        <item>午前6時</item>
+        <item>午前7時</item>
+        <item>午前8時</item>
+        <item>午前9時</item>
+        <item>午前10時</item>
+        <item>午前11時</item>
+        <item>正午</item>
+        <item>午後1時</item>
+        <item>午後2時</item>
+        <item>午後3時</item>
+        <item>午後4時</item>
+        <item>午後5時</item>
+        <item>午後6時</item>
+        <item>午後7時</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_end">
+        <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
+        <item>午前9時</item>
+        <item>午前10時</item>
+        <item>午前11時</item>
+        <item>正午</item>
+        <item>午後1時</item>
+        <item>午後2時</item>
+        <item>午後3時</item>
+        <item>午後4時</item>
+        <item>午後5時</item>
+        <item>午後6時</item>
+        <item>午後7時</item>
+        <item>午後8時</item>
+        <item>午後9時</item>
+        <item>午後10時</item>
+        <item>午後11時</item>
+        <item>午後12時</item>
+        <item>午前1時</item>
+        <item>午前2時</item>
+        <item>午前3時</item>
+        <item>午前4時</item>
+        <item>午前5時</item>
+        <item>午前6時</item>
+        <item>午前7時</item>
+        <item>午前8時</item>
+    </string-array>
+
+    <string-array name="EPr_rmd_time">
+        <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
+        <item>午前9時</item>
+        <item>午前10時</item>
+        <item>午前11時</item>
+        <item>正午</item>
+        <item>午後1時</item>
+        <item>午後2時</item>
+        <item>午後3時</item>
+        <item>午後4時</item>
+        <item>午後5時</item>
+        <item>午後6時</item>
+        <item>午後7時</item>
+        <item>午後8時</item>
+        <item>午後9時</item>
+        <item>午後10時</item>
+        <item>午後11時</item>
+        <item>午後12時</item>
+        <item>午前1時</item>
+        <item>午前2時</item>
+        <item>午前3時</item>
+        <item>午前4時</item>
+        <item>午前5時</item>
+        <item>午前6時</item>
+        <item>午前7時</item>
+        <item>午前8時</item>
+    </string-array>
+
+    <!-- =============================================== random reminders == -->
+
+    <string name="reminders_social">この人々はあなたを頼りにしています！</string>
+
+    <string name="reminders_social_one">%s is counting on you!</string>
+
+    <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
+
+    <string-array name="reminders">
+        <!-- reminders: Make these < 20 chars so the task name is displayed -->
+        <item>やあ、ちょっと時間ある？</item>
+        <item>少しお時間いただけますか？</item>
+        <item>2～3分お時間ありますか？</item>
+        <item>忘れましたか？</item>
+        <item>すいません！</item>
+        <item>何時あなたに少し時間がありますか？</item>
+        <item>あなたの当面の課題に入っています</item>
+        <item>少しお時間ありますか？</item>
+        <item>Astridはここだよ！</item>
+        <item>こんにちは、ちょっと邪魔していい？</item>
+        <item>ちょっとお時間よろしいですか？</item>
+        <item>It\'s a great day to</item>
+    </string-array>
+
+    <string-array name="reminders_due">
+        <!-- reminders related to task due date -->
+        <item>働く時！</item>
+        <item>期限日が到来です</item>
+        <item>始める準備はできてる？</item>
+        <item>あなたは次のことをやるといいました：</item>
+        <item>あなたは開始することになっています。</item>
+        <item>始める時</item>
+        <item>時間ですよ！</item>
+        <item>すいません！～のための時間を</item>
+        <item>手、空いてる? これやらなくちゃ。</item>
+    </string-array>
+
+    <string-array name="reminders_snooze">
+        <!-- reminders related to snooze -->
+        <item>今は怠けちゃダメだよ</item>
+        <item>スヌーズの時間切れです！</item>
+        <item>もう居眠りしないで！</item>
+        <item>今、準備はいいかい？</item>
+        <item>もう先送りしないで！</item>
+    </string-array>
+
+    <string-array name="reminder_responses">
+        <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
+        <item>あなたに贈り物があります。</item>
+        <item>これを過去のこととして忘れてしまう準備はできてる？</item>
+        <item>これをやってしまいませんか？</item>
+        <item>それはどうだい？準備はできてるかい？</item>
+        <item>これをする準備はできてる？</item>
+        <item>君はこれを扱えるかい？</item>
+        <item>君も喜ぶと思うよ！これをただ終わらせるだけでいいんだ！</item>
+        <item>終わらせればぜったい気分がいいって！</item>
+        <item>今日はこれをしないんですか？</item>
+        <item>これを終わらせて下さい。私はもううんざりです。</item>
+        <item>これを終えられるかい？そう、君ならできる！</item>
+        <item>あなたは一体これをするつもりなの？</item>
+        <item>あなた自身に自信を持って！さあ行こう！</item>
+        <item>あなたはとても偉い！それをやり遂げましょう！</item>
+        <item>これを終えたらちょっと軽食どう？</item>
+        <item>ただこのタスク1つだけ？たのむよ</item>
+        <item>あなたのToDoリストを短くすべき時</item>
+        <item>あなたは秩序あるチームにいるの？それとも大混乱のチームにいるの？秩序あるチームだよね！さあ行こう！</item>
+        <item>最近あなたはすごいと言いましたっけ？その調子！</item>
+        <item>タスクを1日1つこなし続ければゴチャゴチャがなくなる…。ゴチャゴチャよさようなら！</item>
+        <item>それはどういう風にやるものなの？ ワオ、これはすごい！</item>
+        <item>君の容姿端麗さだけではやっていけないよ。さあ、それに取り掛かろう！</item>
+        <item>こんな仕事にとって素敵な天気ですね？</item>
+        <item>これをやりながらお茶でも1杯どう？</item>
+        <item>If only you had already done this, then you could go outside and play.</item>
+        <item>It\'s time. You can\'t put off the inevitable.</item>
+        <item>君が私を無視するたびに私はずっこける。</item>
+    </string-array>
+
+    <string-array name="postpone_nags">
+        <!-- Astrid\'s nagging when user clicks postpone -->
+        <item>Please tell me it isn\'t true that you\'re a procrastinator!</item>
+        <item>Doesn\'t being lazy get old sometimes?</item>
+        <item>Somewhere, someone is depending on you to finish this!</item>
+        <item>When you said postpone, you really meant \'I\'m doing this\', right?</item>
+        <item>This is the last time you postpone this, right?</item>
+        <item>Just finish this today, I won\'t tell anyone!</item>
+        <item>Why postpone when you can um... not postpone!</item>
+        <item>You\'ll finish this eventually, I presume?</item>
+        <item>I think you\'re really great! How about not putting this off?</item>
+        <item>Will you be able to achieve your goals if you do that?</item>
+        <item>Postpone, postpone, postpone. When will you change!</item>
+        <item>I\'ve had enough with your excuses! Just do it already!</item>
+        <item>Didn\'t you make that excuse last time?</item>
+        <item>I can\'t help you organize your life if you do that...</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in repeat plug-in -->
+
+    <!-- repeating plugin name -->
+    <string name="repeat_plugin">Repeating Tasks</string>
+
+    <!-- repeating plugin description -->
+    <string name="repeat_plugin_desc">Allows tasks to repeat</string>
+
+    <!-- slide 20a: checkbox for turning on/off repeats -->
+    <string name="repeat_enabled">繰り返し</string>
+
+    <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
+    <string name="repeat_every">Every %d</string>
+
+    <!-- hint when opening repeat interval -->
+    <string name="repeat_interval_prompt">繰り返し間隔</string>
+
+    <!-- slide 19b-->
+    <string name="repeat_never">Not repeating</string>
+    <!-- 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>時間</item>
+        <item>分</item>
+        <item>yr</item>
+    </string-array>
+
+
+    <string-array name="repeat_interval">
+        <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>日毎</item>
+        <item>週毎</item>
+        <item>か月毎</item>
+        <item>時間毎</item>
+        <item>Minute(s)</item>
+        <item>Year(s)</item>
+    </string-array>
+
+    <string name="repeat_days">日々</string>
+    <string name="repeat_weekdays">weekdays</string>
+    <string name="repeat_weeks">weeks</string>
+    <string name="repeat_months">months</string>
+    <string name="repeat_years">years</string>
+    <string name="repeat_hours">hours</string>
+    <string name="repeat_minutes">分</string>
+
+    <string-array name="repeat_until_shortcuts">
+        <item>Forever</item>
+        <item>Specific Day</item>
+        <item>Today</item>
+        <item>Tomorrow</item>
+        <item>(day after)</item>
+        <item>Next Week</item>
+        <item>In Two Weeks</item>
+        <item>Next Month</item>
+    </string-array>
+
+    <string name="repeat_until_title">Repeat until...</string>
+
+    <string name="repeat_keep_going">Keep going</string>
+
+    <string-array name="repeat_type">
+        <!-- slide 20c: repeat type (date to repeat from) -->
+        <item>期限から</item>
+        <!-- slide 20c -->
+        <item>完了日から</item>
+    </string-array>
+
+    <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
+    <string name="repeat_detail_byday">$I ($D 曜日)</string>
+
+    <!-- task detail for repeat from due date (%s -> interval) -->
+    <string name="repeat_detail_duedate">%s</string>
+
+    <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
+    <string name="repeat_detail_duedate_until">Every %1$s\nuntil %2$s</string>
+
+    <!-- task detail for repeat from completion date (%s -> interval) -->
+    <string name="repeat_detail_completion">完了日から %s</string>
+
+    <!-- text for button when repeating task indefinitely -->
+    <string name="repeat_forever">Repeat forever</string>
+
+    <!-- text for button when repeating task until specified date (%s -> date string) -->
+    <string name="repeat_until">Repeat until %s</string>
+
+    <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title">Rescheduling task \"%s\"</string>
+
+    <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title_last_time">Completed repeating task \"%s\"
+    </string>
+
+    <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->
+    <string name="repeat_rescheduling_dialog_bubble">%1$s I\'ve rescheduled this repeating task from
+        %2$s to %3$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
+    <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s I\'ve rescheduled this repeating
+        task to %2$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
+    <string name="repeat_rescheduling_dialog_bubble_last_time">You had this repeating until %1$s,
+        and now you\'re all done. %2$s
+    </string>
+
+    <string-array name="repeat_encouragement">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>上出来だ！</item>
+        <item>Wow… I\'m so proud of you!</item>
+        <item>I love when you\'re productive!</item>
+        <item>何かにチェック済みの印を付けるのは気分良くないですか？</item>
+    </string-array>
+
+    <string-array name="repeat_encouragement_last_time">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>上出来だ！</item>
+        <item>I\'m so proud of you!</item>
+        <item>I love when you\'re productive!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Subtasks Help Introduction -->
+    <string name="subtasks_help_title">Sort and Indent</string>
+    <string name="subtasks_help_1">Tap and hold to move a task</string>
+    <string name="subtasks_help_2">Drag vertically to rearrange</string>
+    <string name="subtasks_help_3">Drag horizontally to indent</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-
-  <!-- Tags label -->
-  <string name="TEA_tags_label">リスト</string>
-  
-  <!-- Tags label long version -->
-  <string name="TEA_tags_label_long">Add to lists</string>
- 
-  <!-- Tags hint -->
-  <string name="TEA_tag_hint">New list</string>
-  
-  <!-- Tags dropdown -->
-    
-  <!-- =============================================== Task List Controls == -->
-  
-  <!-- menu item for tags -->
-  
-  <!-- ========================================================== Extras == -->
-  
-  <!-- Context Item: show tag -->
-  
-  <!-- slide 25a: Dialog: new list -->
-  <string name="tag_new_list">新しいリスト</string>
-  
-  <!-- Dialog: list saved -->
-  
-  <!-- Dialog: task created without title -->
-  <string name="tag_no_title_error">Please enter a name for this list first!</string>
-  
-  <!-- ========================================================== Filters == -->
-  
-  <!-- filter button to add tag -->
-  <string name="tag_FEx_add_new">New</string>
-  
-  <!-- filter header for tags -->
-  <string name="tag_FEx_header">リスト</string>
-  
-  <!-- filter header for tags user created -->
-  
-  <!-- filter header for tags, shared with user -->
-  
-  <!-- filter header for tags which have no active tasks -->
-  
-  <!-- slide 10d: filter for untagged tasks -->
-  <string name="tag_FEx_untagged">Uncategorized</string>
-  
-  <!-- slide 27a: %s => tag name -->
-
-  <!-- context menu option to rename a tag -->
-  <string name="tag_cm_rename">Rename List</string>
-
-  <!-- context menu option to delete a tag -->
-  <string name="tag_cm_delete">Delete List</string>
-  
-  <!-- context menu option to leave a shared list -->
-  <string name="tag_cm_leave">Leave List</string>
-
-  <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
-  <string name="DLG_delete_this_tag_question">Delete this list: %s? (No tasks will be deleted.)</string>
-  
-  <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
-  <string name="DLG_leave_this_shared_tag_question">Leave this shared list: %s? (No tasks will be deleted.)</string>
-
-  <!-- Dialog to rename tag -->
-  <string name="DLG_rename_this_tag_header">Rename the list %s to:</string>
-
-  <!-- Toast notification that no changes have been made -->
-  <string name="TEA_no_tags_modified">変更されませんでした</string>
-
-  <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_deleted">List %1$s was deleted, affecting %2$d tasks</string>
-  
-  <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_left">You left shared list %1$s, affecting %2$d tasks</string>
-
-  <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
-  <string name="TEA_tags_renamed">Renamed %1$s with %2$s for %3$d tasks</string>
-  
-  <!-- Tag case migration -->
-  <string name="tag_case_migration_notice">We\'ve noticed that you have some lists that have the same name with different capitalizations. We think you may have intended them to 
-  be the same list, so we\'ve combined the duplicates. Don\'t worry though: the original lists are simply renamed with numbers (e.g. Shopping_1, Shopping_2). If you don\'t want this, you
-  can simply delete the new combined list!</string>
-  
-  <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings:</string>
-  
-  <!-- Header for tag activity -->
-  <string name="tag_updates_title">Activity: %s</string>
-  
-  <!-- Delete button for tag settings -->
-  <string name="tag_delete_button">Delete list</string>
-  
-  <!-- slide 28d: Leave button for tag settings -->
-  <string name="tag_leave_button">Leave this list</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Tags label -->
+    <string name="TEA_tags_label">リスト</string>
 
+    <!-- Tags label long version -->
+    <string name="TEA_tags_label_long">Add to lists</string>
+
+    <!-- Tags hint -->
+    <string name="TEA_tag_hint">New list</string>
+
+    <!-- Tags dropdown -->
+
+    <!-- =============================================== Task List Controls == -->
+
+    <!-- menu item for tags -->
+
+    <!-- ========================================================== Extras == -->
+
+    <!-- Context Item: show tag -->
+
+    <!-- slide 25a: Dialog: new list -->
+    <string name="tag_new_list">新しいリスト</string>
+
+    <!-- Dialog: list saved -->
+
+    <!-- Dialog: task created without title -->
+    <string name="tag_no_title_error">Please enter a name for this list first!</string>
+
+    <!-- ========================================================== Filters == -->
+
+    <!-- filter button to add tag -->
+    <string name="tag_FEx_add_new">New</string>
+
+    <!-- filter header for tags -->
+    <string name="tag_FEx_header">リスト</string>
+
+    <!-- filter header for tags user created -->
+
+    <!-- filter header for tags, shared with user -->
+
+    <!-- filter header for tags which have no active tasks -->
+
+    <!-- slide 10d: filter for untagged tasks -->
+    <string name="tag_FEx_untagged">Uncategorized</string>
+
+    <!-- slide 27a: %s => tag name -->
+
+    <!-- context menu option to rename a tag -->
+    <string name="tag_cm_rename">Rename List</string>
+
+    <!-- context menu option to delete a tag -->
+    <string name="tag_cm_delete">Delete List</string>
+
+    <!-- context menu option to leave a shared list -->
+    <string name="tag_cm_leave">Leave List</string>
+
+    <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
+    <string name="DLG_delete_this_tag_question">Delete this list: %s? (No tasks will be deleted.)
+    </string>
+
+    <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
+    <string name="DLG_leave_this_shared_tag_question">Leave this shared list: %s? (No tasks will be
+        deleted.)
+    </string>
+
+    <!-- Dialog to rename tag -->
+    <string name="DLG_rename_this_tag_header">Rename the list %s to:</string>
+
+    <!-- Toast notification that no changes have been made -->
+    <string name="TEA_no_tags_modified">変更されませんでした</string>
+
+    <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_deleted">List %1$s was deleted, affecting %2$d tasks</string>
+
+    <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_left">You left shared list %1$s, affecting %2$d tasks</string>
+
+    <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
+    <string name="TEA_tags_renamed">Renamed %1$s with %2$s for %3$d tasks</string>
+
+    <!-- Tag case migration -->
+    <string name="tag_case_migration_notice">We\'ve noticed that you have some lists that have the
+        same name with different capitalizations. We think you may have intended them to
+        be the same list, so we\'ve combined the duplicates. Don\'t worry though: the original lists
+        are simply renamed with numbers (e.g. Shopping_1, Shopping_2). If you don\'t want this, you
+        can simply delete the new combined list!
+    </string>
+
+    <!-- Header for tag settings -->
+    <string name="tag_settings_title">Settings:</string>
+
+    <!-- Header for tag activity -->
+    <string name="tag_updates_title">Activity: %s</string>
+
+    <!-- Delete button for tag settings -->
+    <string name="tag_delete_button">Delete list</string>
+
+    <!-- slide 28d: Leave button for tag settings -->
+    <string name="tag_leave_button">Leave this list</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in timers plug-in -->
-    
+
     <!-- Task List: Start Timer button -->
-    
+
     <!-- Task List: Stop Timer button -->
-    
+
     <!-- Android Notification Title (%s => # tasks) -->
     <string name="TPl_notification">Timers Active for %s!</string>
-    
+
     <!-- Filter Header for Timer plugin -->
-    
+
     <!-- Filter for Timed Tasks -->
     <string name="TFE_workingOn">Tasks Being Timed</string>
-    
+
     <!-- Title for TEA -->
     <string name="TEA_timer_controls">Timer</string>
-    
-    
+
+
     <!-- Edit Notes: create comment for when timer is started -->
     <string name="TEA_timer_comment_started">started this task:</string>
-    
+
     <!-- Edit Notes: create comment for when timer is stopped -->
     <string name="TEA_timer_comment_stopped">stopped doing this task:</string>
-    
+
     <!-- Edit Notes: comment to notify how long was spent on task -->
     <string name="TEA_timer_comment_spent">Time spent:</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Update string from activity codes %1$s - user, %2$s - target name, %3$s - message, %4$s - other_user-->
-    
+
     <!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
     Please do not translate this part of the string. -->
-    
+
     <!-- These are still in use -->
     <string name="update_string_default_comment">%1$s commented: %3$s</string>
     <string name="update_string_task_comment">%1$s on $link_task: %3$s</string>
     <string name="update_string_tag_comment">%1$s on %2$s: %3$s</string>
     <string name="update_string_user_self">あなた</string>
-    
+
     <string name="history_yourself">yourself</string>
     <string name="history_you">あなた</string>
     <string name="history_a_deleted_user">(a deleted user)</string>
-    
+
     <string name="history_this_list">このリスト</string>
     <string name="history_this_task">このタスク</string>
     <string name="history_tag_added">added %1$s to %2$s</string>
@@ -3005,9 +3209,12 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
     <string name="history_favorited">favorited %s</string>
     <string name="history_unfavorited">unfavorited %s</string>
     <string name="history_changed_list_picture">change this list\'s picture</string>
-    <string name="history_added_description_characters">added %1$d characters to %2$s description</string>
+    <string name="history_added_description_characters">added %1$d characters to %2$s description
+    </string>
     <string name="history_removed_description">removed %s description</string>
-    <string name="history_removed_description_characters">removed %1$d characters from %2$s description</string>
+    <string name="history_removed_description_characters">removed %1$d characters from %2$s
+        description
+    </string>
     <string name="history_updated_description">updated %s description</string>
     <string name="history_changed_list_owner">changed list owner to %s</string>
     <string name="history_created_this_list">created this list</string>
@@ -3030,195 +3237,221 @@ you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget
     <string name="history_repeat_on">on %s</string>
     <string name="history_repeat_from_completion">after completion</string>
     <string name="history_acknowledged">viewed %s</string>
-    
-    <string name="history_default">changed %1$s to %2$s</string>
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-    
-  <!-- Voice Add Prompt Text -->
-  <string name="voice_create_prompt">Speak to create a task</string>
-  <string name="voice_edit_title_prompt">Speak to set task title</string>
-  <string name="voice_edit_note_prompt">Speak to set task description</string>
-    
-  <!-- Preference: Task List recognition-service is not installed, but available -->
-  <string name="EPr_voiceInputInstall_dlg">Voice-input is not installed.\nDo you want to go to the market and install it?</string>
-  <!-- Preference: Task List recognition-service is not available for this system -->
-  <string name="EPr_voiceInputUnavailable_dlg">Unfortunately voice-input is not available for your system.\nIf possible, please update Android to 2.1 or later.</string>
-  <!-- Preference: Market is not available for this system -->
-  <string name="EPr_marketUnavailable_dlg">Unfortunately the market is not available for your system.\nIf possible, try downloading voice search from another source.</string>
-  <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
-  <string name="EPr_voiceInputEnabled_title">Voice input</string>
-  <!-- slide 38a: Preference: voice button description (true) -->
-  <string name="EPr_voiceInputEnabled_desc_enabled">Voice input button will be displayed in task list page</string>
-  <!-- Preference: voice button description (false) -->
-  <string name="EPr_voiceInputEnabled_desc_disabled">Voice input button will be hidden on task list page</string>
-  <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
-  <string name="EPr_voiceInputCreatesTask_title">Directly create tasks</string>
-  <!-- Preference: Task List Voice-creation description (true) -->
-  <string name="EPr_voiceInputCreatesTask_desc_enabled">Tasks will automatically be created from voice input</string>
-  <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
-  <string name="EPr_voiceInputCreatesTask_desc_disabled">You can edit the task title after voice input finishes</string>
-  <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
-  <string name="EPr_voiceRemindersEnabled_title">Voice reminders</string>
-  <!-- Preference: Voice reminders description (true) -->
-  <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid will speak task names during task reminders</string>
-  <!-- slide 38c: Preference: Voice reminders description (false) -->
-  <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid will sound a ringtone during task reminders</string>    
-  
-  <!-- slide 32d: Preference Category: Voice Title -->
-  <string name="EPr_voice_header">Voice input settings</string>
-    
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-  
-  <!-- slide 30a-->
-  <string name="welcome_setting">チュートリアルを表示する</string>
-  
-  <string name="welcome_title_1">Welcome to Astrid!</string>
-
-  <!-- slide 2a -->
-  <string name="welcome_title_2">リストを作る</string>
-
-  <!-- slide 3a-->
-  <string name="welcome_title_3">Switch between lists</string>
-
-  <!-- slide 4a -->
-  <string name="welcome_title_4">リストをシェアする</string>
-
-  <!-- slide 5a -->
-  <string name="welcome_title_5">タスクを分担する</string>
-
-  <!-- slide 6a -->
-  <string name="welcome_title_6">詳細を提供する</string>
 
-  <!-- slide 7a -->
-  <string name="welcome_title_7">Connect now\nto get started!</string>
-  
-  <string name="welcome_title_7_return">そういうことです！</string>
-  
-  <!-- slide 1b -->
-  <string name="welcome_body_1">The perfect personal to-do list \nthat works great with friends</string>
-
-  <!-- slide 2b-->
-  <string name="welcome_body_2">Great for any list:\nread, watch, buy, visit!</string>
-
-  <!-- slide 3b -->
-  <string name="welcome_body_3">Tap the list title \nto see all your lists</string>
-
-  <!-- slide 4b -->
-  <string name="welcome_body_4">Share lists with \nfriends, housemates,\nor your sweetheart!</string>
-
-  <!-- slide 5b -->
-  <string name="welcome_body_5">誰かなんて気にしないで　\nデザートを持って来ます</string>
+    <string name="history_default">changed %1$s to %2$s</string>
 
-  <!-- slide 6b-->
-  <string name="welcome_body_6">タップしてメモを加える、\nリマインダーを設定する、\nそしてもっと！</string>
-  <string name="welcome_body_7">Login</string>
-  
-  <string name="welcome_body_7_return">Astridをタップして戻る</string>
-  
-  <!-- slide 1c -->
-  <string name="welcome_next">次へ</string>
-  
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Voice Add Prompt Text -->
+    <string name="voice_create_prompt">Speak to create a task</string>
+    <string name="voice_edit_title_prompt">Speak to set task title</string>
+    <string name="voice_edit_note_prompt">Speak to set task description</string>
+
+    <!-- Preference: Task List recognition-service is not installed, but available -->
+    <string name="EPr_voiceInputInstall_dlg">Voice-input is not installed.\nDo you want to go to the
+        market and install it?
+    </string>
+    <!-- Preference: Task List recognition-service is not available for this system -->
+    <string name="EPr_voiceInputUnavailable_dlg">Unfortunately voice-input is not available for your
+        system.\nIf possible, please update Android to 2.1 or later.
+    </string>
+    <!-- Preference: Market is not available for this system -->
+    <string name="EPr_marketUnavailable_dlg">Unfortunately the market is not available for your
+        system.\nIf possible, try downloading voice search from another source.
+    </string>
+    <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
+    <string name="EPr_voiceInputEnabled_title">Voice input</string>
+    <!-- slide 38a: Preference: voice button description (true) -->
+    <string name="EPr_voiceInputEnabled_desc_enabled">Voice input button will be displayed in task
+        list page
+    </string>
+    <!-- Preference: voice button description (false) -->
+    <string name="EPr_voiceInputEnabled_desc_disabled">Voice input button will be hidden on task
+        list page
+    </string>
+    <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
+    <string name="EPr_voiceInputCreatesTask_title">Directly create tasks</string>
+    <!-- Preference: Task List Voice-creation description (true) -->
+    <string name="EPr_voiceInputCreatesTask_desc_enabled">Tasks will automatically be created from
+        voice input
+    </string>
+    <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
+    <string name="EPr_voiceInputCreatesTask_desc_disabled">You can edit the task title after voice
+        input finishes
+    </string>
+    <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
+    <string name="EPr_voiceRemindersEnabled_title">Voice reminders</string>
+    <!-- Preference: Voice reminders description (true) -->
+    <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid will speak task names during task
+        reminders
+    </string>
+    <!-- slide 38c: Preference: Voice reminders description (false) -->
+    <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid will sound a ringtone during task
+        reminders
+    </string>
+
+    <!-- slide 32d: Preference Category: Voice Title -->
+    <string name="EPr_voice_header">Voice input settings</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 30a-->
+    <string name="welcome_setting">チュートリアルを表示する</string>
+
+    <string name="welcome_title_1">Welcome to Astrid!</string>
+
+    <!-- slide 2a -->
+    <string name="welcome_title_2">リストを作る</string>
+
+    <!-- slide 3a-->
+    <string name="welcome_title_3">Switch between lists</string>
+
+    <!-- slide 4a -->
+    <string name="welcome_title_4">リストをシェアする</string>
+
+    <!-- slide 5a -->
+    <string name="welcome_title_5">タスクを分担する</string>
+
+    <!-- slide 6a -->
+    <string name="welcome_title_6">詳細を提供する</string>
+
+    <!-- slide 7a -->
+    <string name="welcome_title_7">Connect now\nto get started!</string>
+
+    <string name="welcome_title_7_return">そういうことです！</string>
+
+    <!-- slide 1b -->
+    <string name="welcome_body_1">The perfect personal to-do list \nthat works great with friends
+    </string>
+
+    <!-- slide 2b-->
+    <string name="welcome_body_2">Great for any list:\nread, watch, buy, visit!</string>
+
+    <!-- slide 3b -->
+    <string name="welcome_body_3">Tap the list title \nto see all your lists</string>
+
+    <!-- slide 4b -->
+    <string name="welcome_body_4">Share lists with \nfriends, housemates,\nor your sweetheart!
+    </string>
+
+    <!-- slide 5b -->
+    <string name="welcome_body_5">誰かなんて気にしないで　\nデザートを持って来ます</string>
+
+    <!-- slide 6b-->
+    <string name="welcome_body_6">タップしてメモを加える、\nリマインダーを設定する、\nそしてもっと！</string>
+    <string name="welcome_body_7">Login</string>
+
+    <string name="welcome_body_7_return">Astridをタップして戻る</string>
+
+    <!-- slide 1c -->
+    <string name="welcome_next">次へ</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <string name="widget_mini">- Astrid Mini -</string>
-    
+
     <!-- Resources for power pack widget -->
-    
+
     <string name="PPW_widget_42_label">Old Astrid 4x2</string>
     <string name="PPW_widget_43_label">Old Astrid 4x3</string>
     <string name="PPW_widget_44_label">Old Astrid 4x4</string>
     <string name="PPW_widget_v11_label">- Astrid -</string>
     <string name="PPW_widget_custom_label">Astrid Custom Launcher Premium</string>
     <string name="PPW_widget_custom_launcherpro_label">Astrid Launcher Pro Premium</string>
-    
+
     <string name="PPW_configure_title">Configure Widget</string>
-    
+
     <string name="PPW_color">Widget color</string>
     <string name="PPW_enable_calendar">Show calendar events</string>
     <string name="PPW_disable_encouragements">Hide encouragements</string>
     <string name="PPW_show_dates">Show due dates</string>
     <string name="PPW_filter">Select Filter</string>
-    
+
     <string name="PPW_due">Due:</string>
     <string name="PPW_past_due">Past Due:</string>
-    
+
     <string name="PPW_old_astrid_notice">このウィジェットを使うためにはAstridのバージョン3.6以降が必要です。</string>
-    
+
     <string-array name="PPW_encouragements">
         <!-- general encouragements -->
-    	<item>Hi there!</item>
-    	<item>Have time to finish something?</item>
-    	<item>Gosh, you are looking suave today!</item>
-    	<item>Do something great today!</item>
-    	<item>Make me proud today!</item>
-    	<item>How are you doing today?</item>
+        <item>Hi there!</item>
+        <item>Have time to finish something?</item>
+        <item>Gosh, you are looking suave today!</item>
+        <item>Do something great today!</item>
+        <item>Make me proud today!</item>
+        <item>How are you doing today?</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_tod">
         <!-- encouragements based on time of day -->
-    	<item>Good morning!</item>
-    	<item>Good afternoon!</item>
-    	<item>Good evening!</item>
-    	<item>Late night?</item>
-    	<item>It\'s early, get something done!</item>
-    	<item>Afternoon tea, perhaps?</item>
-    	<item>Enjoy the evening!</item>
-    	<item>Sleep is good for you, you know!</item>
+        <item>Good morning!</item>
+        <item>Good afternoon!</item>
+        <item>Good evening!</item>
+        <item>Late night?</item>
+        <item>It\'s early, get something done!</item>
+        <item>Afternoon tea, perhaps?</item>
+        <item>Enjoy the evening!</item>
+        <item>Sleep is good for you, you know!</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_completed">
         <!-- encouragements based on tasks completed (%d => completed) -->
-    	<item>You\'ve already completed %d tasks!</item>
-    	<item>Score in life: %d tasks completed</item>
-    	<item>Smile! You\'ve already finished %d tasks!</item>
+        <item>You\'ve already completed %d tasks!</item>
+        <item>Score in life: %d tasks completed</item>
+        <item>Smile! You\'ve already finished %d tasks!</item>
     </string-array>
-  	<string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet! Shall we?</string>
-        
+    <string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet!
+        Shall we?
+    </string>
+
     <string-array name="PPW_colors">
         <item>Black</item>
         <item>White</item>
         <item>Blue</item>
         <item>Translucent</item>
     </string-array>
-    
-    <string name="PPW_widget_dlg_text">This widget is only available to owners of the PowerPack!</string>
+
+    <string name="PPW_widget_dlg_text">This widget is only available to owners of the PowerPack!
+    </string>
     <string name="PPW_widget_dlg_ok">Preview</string>
-    
+
     <string name="PPW_demo_title1">Items on %s will go here</string>
     <string name="PPW_demo_title2">Power Pack includes Premium Widgets...</string>
     <string name="PPW_demo_title3">...voice add and good feelings!</string>
     <string name="PPW_demo_title4">Tap to learn more!</string>
-    
+
     <string name="PPW_info_title">Free Power Pack!</string>
     <string name="PPW_info_signin">Sign in!</string>
     <string name="PPW_info_later">後で</string>
-    <string name="PPW_unlock_howto">Share lists with friends! Unlock the free Power Pack when 3 friends sign up with Astrid.</string>
+    <string name="PPW_unlock_howto">Share lists with friends! Unlock the free Power Pack when 3
+        friends sign up with Astrid.
+    </string>
     <string name="PPW_check_button">Get the Power Pack for free!</string>
     <string name="PPW_check_share_lists">Share lists!</string>
-    <string name="PPW_api_level">Sorry! This widget is only supported on Android 3.0 or higher.</string>
-    
+    <string name="PPW_api_level">Sorry! This widget is only supported on Android 3.0 or higher.
+    </string>
+
     <string name="EPr_widget_enabled_title">Enable/Disable Widgets</string>
-    <string name="PPW_restart_for_enabled_state">You may need to restart your phone for this change to take effect.</string>
+    <string name="PPW_restart_for_enabled_state">You may need to restart your phone for this change
+        to take effect.
+    </string>
 
 </resources>
diff --git a/astrid/res/values-ko/strings.xml b/astrid/res/values-ko/strings.xml
index dbcf371fa..460587be8 100755
--- a/astrid/res/values-ko/strings.xml
+++ b/astrid/res/values-ko/strings.xml
@@ -4,1697 +4,1728 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ================================================== general terms == -->
-
-  <!-- People Editing Activity -->    
-  
-  <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
-  <string name="actfm_person_hint">연락처나 이메일</string>
-  
-  <!-- task sharing dialog: shared with hint -->
-  <string name="actfm_person_or_tag_hint">연락처나 공유목록</string>
-
-  <!-- toast on transmit success -->
-
-  <!-- can\'t rename or delete shared tag message -->
-  
-  <!-- warning before deleting a list you\'re the owner of -->
-  <string name="actfm_tag_operation_owner_delete">당신은 이 공유 목록의 소유자입니다! 이 목록을 삭제하면, 공유한 모든 구성원의 해당 목록을 삭제합니다. 계속하시겠습니까?</string>
-
-  <!-- slide 29a: menu item to take a picture -->
-  <string name="actfm_picture_camera">사진 찍기</string>
-
-  <!-- slide 29b: menu item to select from gallery -->
-  <string name="actfm_picture_gallery">갤러리에서 가져오기</string>
-  
-  <!-- menu item to clear picture selection -->
-  <string name="actfm_picture_clear">사진 제거하기</string>
-
-  <!-- filter list activity: refresh tags -->
-  
-  <!-- Title for prompt after sharing a task -->
-  <string name="actfm_view_task_title">일정을 열람할까요?</string>
-
-  <!-- Text for prompt after sharing a task -->
-  <string name="actfm_view_task_text">%s 님에게 일정을 보냈습니다! 현재 자신의 일정을 보고 있습니다. 당신이 할당한 이 일정과 다른 일정을 보시겠습니까?</string>
-  
-  <!-- Ok button for task view prompt -->
-  <string name="actfm_view_task_ok">할당 일정 보기</string>
-      
-  <!-- Cancel button for task view prompt -->
-  <string name="actfm_view_task_cancel">머무르기</string>
-  
-  <!-- slide 13a: Title for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_title">나의 공유 일정</string>
-  
-  <!-- Empty list for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_empty">미공유 일정</string>
-  
-  <!-- =====================  Friendship connections -->
-  
-  <string name="actfm_friendship_pending">%s 님에게 친구 요청을 보냈습니다!</string>
-
-  <string name="actfm_friendship_blocked">%s 님을 차단했습니다.</string>
-
-  <string name="actfm_friendship_ignored">%s 를 무시했습니다.</string>
-  
-  <string name="actfm_friendship_friends">%s 님과 친구입니다! 관련 일정을 아래에 추가하세요.</string>
-
-  <string name="actfm_friendship_other_pending">%s 님이 친구가 되고 싶어합니다!</string>
-
-  <string name="actfm_friendship_no_status">공개일정을 공유하고 활동내역을 보려면 %s 에 연결하세요!</string>
-
-  <string name="actfm_friendship_connect">친구 추가하기</string>
-
-  <string name="actfm_friendship_accept">승인</string>
-
-  <!-- ================================================== TagViewActivity == -->  
-
-  <!-- Tag View Activity: Add Comment hint -->    
-  <string name="TVA_add_comment">댓글 쓰기...</string>
-
-  <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->    
-  
-  <!-- Tabs for Tag view -->
-  <string-array name="TVA_tabs">
-    <!-- Tab for showing tasks -->
-    <item>일정</item>
-    <!-- Tab for showing comments & updates -->
-    <item>활동 내역</item>
-    <!-- Tab for showing setting -->
-    <item>목록 설정</item>
-  </string-array>
-  
-  <!-- Tag View: filtered by assigned to user (%s => user name) -->
-  <string name="actfm_TVA_filtered_by_assign">%s 님의 일정. 모든 일정을 보려면 누르세요.</string>
-  
-  <!-- Tag View: filter by unassigned tasks -->
-  <string name="actfm_TVA_filter_by_unassigned">미할당 일정. 모든 일정을 보려면 두드리세요.</string>
-
-  <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">비공개: 목록을 편집하거나 공유하려면 누르세요</string>
-
-  <!-- Tag View Menu: refresh -->
-  <string name="actfm_TVA_menu_refresh">새로고침</string>
-
-  <!-- Tag Settings: tag name label -->
-  <string name="actfm_TVA_tag_label">목록</string>
-
-  <!-- Tag Settings: tag owner label -->
-
-  <!-- Tag Settings: tag owner value when there is no owner -->
-
-  <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
-  <string name="actfm_TVA_members_label">공유한 사람</string>
-  
-  <!-- Tag Settings: list collaborators hint -->
-  <string name="actfm_TVA_members_hint">이메일 주소가 있는 사람과 공유하기</string>
-
-  <!-- Tag Settings: tag picture -->
-  <string name="actfm_TVA_tag_picture">목록 사진</string>
-
-  <!-- slide 25c/28b: Tag Settings: silence notifications label -->
-  <string name="actfm_TVA_silence_label">알림 끄기</string>
-  
-  <!-- Tag Settings: list icon label -->
-  
-  <!-- slide 25b/27d: Tag Settings: list description label -->
-  <string name="actfm_TVA_tag_description_label">설명</string>
-  
-  <!-- slide 28a: Tag Settings: list settings label -->
-  <string name="actfm_TVA_tag_settings_label">설정</string>
-
-  <!-- slide 25b: Tag Settings: list description hint -->
-  <string name="actfm_TVA_tag_description_hint">여기에 설명을 입력하세요</string>
-  
-  <!-- slide 25d: Tag Settings: list name hint -->
-  <string name="actfm_TVA_tag_name_hint">목록 이름을 입력하세요</string>
-  
-  <!-- Tag settings: login prompt from share-->
-  <string name="actfm_TVA_login_to_share">목록을 공유하려면 Astrid.com에 로그인해야 합니다! 로그인하거나 비공개 목록으로 만드세요.</string>
-  
-      
-  <!-- ============================================ edit people dialog == -->
-
-  <!-- task sharing dialog: intro -->
-  <string name="actfm_EPA_intro">아스트리드로 쇼핑 목록, 파티 계획 또는 팀 프로젝트를 공유하고 사람들이 일을 마치는 것을 확인하십시오!</string>
-    
-  <!-- task sharing dialog: window title -->
-    
-  <!-- task sharing dialog: save button -->
-  
-  <!-- task sharing dialog: assigned label -->
-  
-  <!-- slide 18a: task sharing dialog: assigned label long version -->
-  <string name="actfm_EPA_assign_label_long">누구의 일인가요?</string>
-  
-  <!-- task sharing dialog: assigned to me -->
-  <string name="actfm_EPA_assign_me">나</string>
-  
-  <!-- task sharing dialog: anyone -->
-  <string name="actfm_EPA_unassigned">미할당</string>
-  
-  <!-- slide 18c: task sharing dialog: choose a contact -->
-  <string name="actfm_EPA_choose_contact">연락처를 선택하세요</string>
-  
-  <!-- task sharing dialog: custom email assignment -->
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_share_with">공유한 사람:</string>
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_collaborators_header">공유하기</string>
-
-      <!-- task sharing dialog: collaborator list name (%s => name of list) -->
-  <string name="actfm_EPA_list">목록: %s</string>
-  
-  <!-- task sharing dialog: assigned hint -->
-  
-  <!-- task sharing dialog: message label text -->
-  <string name="actfm_EPA_message_text">초대 메시지:</string>
-  
-  <!-- task sharing dialog: message body -->
-  <string name="actfm_EPA_message_body">이걸 마칠 수 있게 도와주세요!</string>
-  
-  <!-- task sharing dialog: list members section header -->
-  <string name="actfm_EPA_assign_header_members">목록 구성원</string>
-
-  <!-- task sharing dialog: astrid friends section header -->
-  <string name="actfm_EPA_assign_header_friends">아스트리드 친구들</string>
-
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: share with Facebook -->
-  <string name="actfm_EPA_facebook">페이스북</string>
-  
-  <!-- task sharing dialog: share with Twitter -->
-  <string name="actfm_EPA_twitter">트위터</string>
-
-  <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
-
-  <!-- task sharing dialog: edit people settings saved -->
-
-  <!-- task sharing dialog: invalid email (%s => email) -->
-  <string name="actfm_EPA_invalid_email">무효한 이메일: %s</string>
-
-  <!-- task sharing dialog: tag not found (%s => tag) -->
-  
-  <!-- task sharing login prompt -->
-  <string name="actfm_EPA_login_to_share">일정을 공유하려면 Astrid.com 에 로그인해야 합니다!</string>
-  
-  <string name="actfm_EPA_login_button">로그인</string>
-  
-  <string name="actfm_EPA_dont_share_button">공유하지 않기</string>
-  
-  <string name="actfm_EPA_add_person_to_list_title">할당한 일정</string>
-  
-  <string name="actfm_EPA_add_person_to_list">%1$s 를 이 목록에 공유하지 않았습니다. %2$s 를 이 목록에 추가할까요?</string>
-
-  <string name="actfm_EPA_add_person_to_list_ok">목록에 추가하기</string>
-  
-  <string name="actfm_EPA_add_person_to_list_cancel">추가하지 않기</string>
-  
-  <string name="actfm_list_owner">(소유자)</string>
-  
-  <!-- ========================================= sharing login activity == -->
-
-  <!-- share login: Title -->
-  <string name="actfm_ALA_title">Astrid.com 에 오신 것을 환영합니다!</string>
-
-  <!-- share login: Sharing Description -->
-  <string name="actfm_ALA_body">Astrid.com 은 온라인에서 일정을 관리하고 공유하거나 일정을 위임할 수 있게 해 줍니다.</string>
-
-  <!-- share login: Sharing Login FB Prompt -->
-  <string name="actfm_ALA_fb_login">페이스북에 연결하기</string>
-
-  <!-- share login: Sharing Login GG Prompt -->
-  <string name="actfm_ALA_gg_login">구글에 연결하기</string>
-  
-  <!-- share login: Quickly log in as <%s -> email> -->
-  <string name="actfm_quick_login">로그인: %s</string>
-
-  <!-- share login: Reject quick login -->
-  <string name="actfm_quick_login_reject">%s 가 아닙니까?</string>
-
-  <!-- share login: Name -->
-  <string name="actfm_ALA_firstname_label">이름</string>
-  
-  <!-- share login: Name -->
-  <string name="actfm_ALA_lastname_label">성</string>
-
-  <!-- share login: Email -->
-  <string name="actfm_ALA_email_label">이메일</string>
-
-  <!-- share login: Username / Email -->
-
-  <!-- share login: Password -->
-  <string name="actfm_ALA_password_label">비밀번호</string>
-
-  <!-- share login: Sign Up Title -->
-  <string name="actfm_ALA_signup_title">가입하기</string>
-
-  <!-- share login: Login Title -->
-  <string name="actfm_ALA_login_title">로그인</string>
-
-  <!-- share login: Google Auth title -->
-  <string name="actfm_GAA_title">사용하려는 구글 계정을 선택해 주십시오:</string>
-
-  <!-- share login: OAUTH Login Prompt -->
-  <string name="actfm_OLA_prompt">로그인하세요:</string>
-  
-  <!-- Login error: user exists -->
-  <string name="actfm_ALA_error_user_exists">사용자가 이미 있습니다. 다시 로그인하세요.</string>
-  
-  <!-- Login error: wrong password -->
-  <string name="actfm_ALA_error_wrong_password">비밀번호가 맞지 않습니다. 다시 시도해 주세요.</string>
-  
-  <!-- Forgot password link -->
-  <string name="actfm_ALA_forgot_password">비밀번호 찾기</string>
-  
-  <!-- Forgot password email prompt -->
-  <string name="actfm_ALA_enter_email">이메일을 입력하세요</string>
-  
-  <!-- Password reset sent (%s -> email) -->
-  <string name="actfm_ALA_reset_sent">새 비밀번호를 %s으로 보냈습니다. </string>
-  
-  <!-- User already exists - first sync may be slow -->
-  <string name="actfm_ALA_user_exists_sync_alert">첫 동기화는 시간이 걸립니다--기다려 주셔서 감사합니다!</string>
-  
-  <!-- User not found -->
-  <string name="actfm_ALA_error_user_not_found">해당 이메일로 가입된 사용자가 없습니다. 가입신청 해 보세요!</string>
-  
-  <!-- ================================================ Featured Lists -->
-
-  <string name="actfm_feat_list_clone">목록 복사하기</string>
-  
-  <string name="actfm_feat_list_suffix">(복사)</string>
-
-  <string name="actfm_feat_list_cloning">복사중...</string>
-
-  <string name="actfm_feat_list_clone_success">성공!</string>
-
-  <string name="actfm_feat_list_task_clone_success">일정 복사 완료</string>
-
-  <string name="actfm_feat_list_clone_empty">복사할 일정 없음</string>
-  
-  <!-- ================================================ Synchronization == -->
-      
-  <!-- Indicates the logged in user name. %s -> user\'s name -->
-  <string name="actfm_status_title_logged_in">%s 로 로그인 함</string>    
-      
-  <!-- Preferences Title: Act.fm -->    
-  <string name="actfm_APr_header">Astrid.com</string>
-  
-  <string name="actfm_https_title">HTTPS 사용하기</string>
-  <string name="actfm_https_enabled">HTTPS 사용함 (느림)</string>
-  <string name="actfm_https_disabled">HTTPS 사용안함 (빠름)</string>
-
-  <!-- title for notification tray after synchronizing -->
-  
-  <!-- text for notification when comments are received -->
-    
-  <string name="actfm_dual_sync_warning">당신은 현재 구글 일정과 동기화하고 있습니다. 중복된 일정과 다른 동기화 문제를 피하기 위해, 
-당신이 Astrid.com과 동기화를 시작할 때 구글 일정은 더 이상 동기화되지 않을 것입니다. 
-그러나 구글 일정 설정에서 구글 일정을 여전히 가져올 수 있습니다. 또는 Gmail 의 구글 일정을 아스트리드의 Remind Me 크롬 확장으로 대체할 수 있습니다. 
-Astrid.com 과 동기화하시겠습니까?</string>
-      
-  <!-- account types -->
-  <string name="actfm_account_type">계정 유형</string>
-  <string name="actfm_account_info">계정 정보</string>
-  <string name="actfm_account_info_summary">상태와 설정</string>
-  <string name="account_type_title_not_logged_in">무료 계정에 가입하기</string>
-  <string name="account_type_summary_not_logged_in">온라인에서 일정을 열어보고 목록과 대행자를 공유합니다</string>
-  
-  
-  <string name="actfm_account_premium">프리미엄</string>
-  <string name="actfm_account_basic">기본</string>
-  
-  <string name="actfm_inapp_billing">프리미엄으로 업그레이드하기</string>
-  <string name="actfm_inapp_billing_summary">파일 첨부, 음성 백업, 프리미엄 지원 등</string>
-  
-  <!-- Sharing -->
-  <string name="share_with_facebook">페이스북에 Like 하기</string>
-  <string name="share_with_twitter">\'트위터에 Follow 하기</string>
-  <string name="share_with_google">구글+ 에 공유하기</string>
-  <string name="share_speech_bubble">공유를 통해 다른 사람이 더 생산적인 일을 하도록 도울 수 있습니다!</string>
-  
-  
-  <!-- Sync upgrade messages -->
-  <string name="sync_upgr_both_title">중복 없이 Astrid.com + 구글 이용하기</string>
-  <string name="sync_upgr_both_body">솔직히 구글 일정은 편리하지만 아스트리드만큼은 아닙니다. 중복을 피하기 위해 더이상 Astrid.com 에 동기화하면서 동시에 구글 일정에 백그라운드로 동기화할 수 없습니다. 구글 일정은 설정 →  백업 &amp; 동기화 항목에서 여전히 불러올 수 있습니다. 또는 구글 일정 만 동기화하도록 다운그레이드할 수 있습니다.</string>
-  <string name="sync_upgr_both_btn1">아스트리드와 함께 갑시다</string>
-  <string name="sync_upgr_both_btn2">구글 일정으로 다운그레이드하기</string>
-  
-  <string name="sync_upgr_gtasks_only_title">무료로 아스트리드 동기화로 업그레이드 하세요!</string>
-  <string name="sync_upgr_gtasks_only_body">Astrid.com 동기화로 당신이 가진 모든 기기와 Gmail에서 일정을 사용하세요. Astrid.com 동기화로 업그레이드 하세요 (구글 일정으로 언제든지 돌아갈 수 있지만 안 그럴 겁니다)!</string>
-  <string name="sync_upgr_gtasks_only_btn1">아스트리드 동기화로 업그레이드하기</string>
-  <string name="sync_upgr_gtasks_only_btn2">구글 일정 계속 사용하기</string>
-  
-  <string name="sync_upgr_neither_title">무료 백업 &amp; 동기화!</string>
-  <string name="sync_upgr_neither_body">할일 관리를 위험 속에 두지 마세요! 어디서든지 당신의 일정을 유지하고 이용할 수 있도록 새로워진 아스트리드 동기화가 있습니다.</string>
-  <string name="sync_upgr_neither_btn1">지금 가입하기</string>
-  
-  <string name="sync_upgr_logged_out">아스트리드에서 로그아웃 했습니다</string>
-  
-  <string name="actfm_logout_clear_tasks_title">자료를 삭제할까요?</string>
-  <string name="actfm_logout_clear_tasks_body">당신의 일정과 목록을 삭제할까요?</string>
-  <string name="actfm_logout_clear_tasks_yes">자료 삭제하기</string>
-  <string name="actfm_logout_clear_tasks_no">자료 유지하기</string>
-  
-  <string name="actfm_logged_in_different_user_title">다른 사용자로 로그인하기</string>
-  <string name="actfm_logged_in_different_user_body">동기화 전에 휴대폰의 일정을 삭제할까요?</string>
-  <string name="actfm_logged_in_different_user_keep_data">자료 유지하기</string>
-  <string name="actfm_logged_in_different_user_clear_data">모든 자료 삭제하기</string>
-  <string name="actfm_logged_in_different_user_processing">남아있는 자료를 처리중입니다...</string>
-  
-  <string name="actfm_tag_not_authorized_title">권한이 없습니다</string>
-  <string name="actfm_tag_not_authorized_body">더 이상 목록 %s 를 열람할 수 있는 권한이 없습니다 (권한을 삭제한 것 같습니다). 같은 이름의 새 목록을 생성하시겠습니까?</string>
-  <string name="actfm_tag_not_authorized_new_list">새 목록 만들기</string>
-  <string name="actfm_tag_not_authorized_leave_list">목록 탈퇴하기</string>
-  
-  <string name="actfm_sync_ongoing">동기화 진행 중...</string>
-  
-  <string name="EPr_reset_sync_state">동기화 초기화</string>
-  <string name="EPr_reset_sync_state_summary">동기화 에러를 해결하기 위해 몇가지 로컬 자료를 초기화합니다</string>
-  <string name="EPr_reset_sync_state_detailed">동기화 에러를 해결하기 위해, 다음 동기화 때 당신의 일정과 목록은 Astrid.com 상에 존재하는 미러로 변경될 것입니다. 계속하시겠습니까?</string>
-  
+<resources>
 
+    <!-- ================================================== general terms == -->
 
+    <!-- People Editing Activity -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
+    <string name="actfm_person_hint">연락처나 이메일</string>
+
+    <!-- task sharing dialog: shared with hint -->
+    <string name="actfm_person_or_tag_hint">연락처나 공유목록</string>
+
+    <!-- toast on transmit success -->
+
+    <!-- can\'t rename or delete shared tag message -->
+
+    <!-- warning before deleting a list you\'re the owner of -->
+    <string name="actfm_tag_operation_owner_delete">당신은 이 공유 목록의 소유자입니다! 이 목록을 삭제하면, 공유한 모든 구성원의 해당
+        목록을 삭제합니다. 계속하시겠습니까?
+    </string>
+
+    <!-- slide 29a: menu item to take a picture -->
+    <string name="actfm_picture_camera">사진 찍기</string>
+
+    <!-- slide 29b: menu item to select from gallery -->
+    <string name="actfm_picture_gallery">갤러리에서 가져오기</string>
+
+    <!-- menu item to clear picture selection -->
+    <string name="actfm_picture_clear">사진 제거하기</string>
+
+    <!-- filter list activity: refresh tags -->
+
+    <!-- Title for prompt after sharing a task -->
+    <string name="actfm_view_task_title">일정을 열람할까요?</string>
+
+    <!-- Text for prompt after sharing a task -->
+    <string name="actfm_view_task_text">%s 님에게 일정을 보냈습니다! 현재 자신의 일정을 보고 있습니다. 당신이 할당한 이 일정과 다른 일정을
+        보시겠습니까?
+    </string>
+
+    <!-- Ok button for task view prompt -->
+    <string name="actfm_view_task_ok">할당 일정 보기</string>
+
+    <!-- Cancel button for task view prompt -->
+    <string name="actfm_view_task_cancel">머무르기</string>
+
+    <!-- slide 13a: Title for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_title">나의 공유 일정</string>
+
+    <!-- Empty list for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_empty">미공유 일정</string>
+
+    <!-- =====================  Friendship connections -->
+
+    <string name="actfm_friendship_pending">%s 님에게 친구 요청을 보냈습니다!</string>
+
+    <string name="actfm_friendship_blocked">%s 님을 차단했습니다.</string>
+
+    <string name="actfm_friendship_ignored">%s 를 무시했습니다.</string>
+
+    <string name="actfm_friendship_friends">%s 님과 친구입니다! 관련 일정을 아래에 추가하세요.</string>
+
+    <string name="actfm_friendship_other_pending">%s 님이 친구가 되고 싶어합니다!</string>
+
+    <string name="actfm_friendship_no_status">공개일정을 공유하고 활동내역을 보려면 %s 에 연결하세요!</string>
+
+    <string name="actfm_friendship_connect">친구 추가하기</string>
+
+    <string name="actfm_friendship_accept">승인</string>
+
+    <!-- ================================================== TagViewActivity == -->
+
+    <!-- Tag View Activity: Add Comment hint -->
+    <string name="TVA_add_comment">댓글 쓰기...</string>
+
+    <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->
+
+    <!-- Tabs for Tag view -->
+    <string-array name="TVA_tabs">
+        <!-- Tab for showing tasks -->
+        <item>일정</item>
+        <!-- Tab for showing comments & updates -->
+        <item>활동 내역</item>
+        <!-- Tab for showing setting -->
+        <item>목록 설정</item>
+    </string-array>
+
+    <!-- Tag View: filtered by assigned to user (%s => user name) -->
+    <string name="actfm_TVA_filtered_by_assign">%s 님의 일정. 모든 일정을 보려면 누르세요.</string>
+
+    <!-- Tag View: filter by unassigned tasks -->
+    <string name="actfm_TVA_filter_by_unassigned">미할당 일정. 모든 일정을 보려면 두드리세요.</string>
+
+    <!-- Tag View: list is private, no members -->
+    <string name="actfm_TVA_no_members_alert">비공개: 목록을 편집하거나 공유하려면 누르세요</string>
+
+    <!-- Tag View Menu: refresh -->
+    <string name="actfm_TVA_menu_refresh">새로고침</string>
+
+    <!-- Tag Settings: tag name label -->
+    <string name="actfm_TVA_tag_label">목록</string>
+
+    <!-- Tag Settings: tag owner label -->
+
+    <!-- Tag Settings: tag owner value when there is no owner -->
+
+    <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
+    <string name="actfm_TVA_members_label">공유한 사람</string>
+
+    <!-- Tag Settings: list collaborators hint -->
+    <string name="actfm_TVA_members_hint">이메일 주소가 있는 사람과 공유하기</string>
+
+    <!-- Tag Settings: tag picture -->
+    <string name="actfm_TVA_tag_picture">목록 사진</string>
+
+    <!-- slide 25c/28b: Tag Settings: silence notifications label -->
+    <string name="actfm_TVA_silence_label">알림 끄기</string>
+
+    <!-- Tag Settings: list icon label -->
+
+    <!-- slide 25b/27d: Tag Settings: list description label -->
+    <string name="actfm_TVA_tag_description_label">설명</string>
+
+    <!-- slide 28a: Tag Settings: list settings label -->
+    <string name="actfm_TVA_tag_settings_label">설정</string>
+
+    <!-- slide 25b: Tag Settings: list description hint -->
+    <string name="actfm_TVA_tag_description_hint">여기에 설명을 입력하세요</string>
+
+    <!-- slide 25d: Tag Settings: list name hint -->
+    <string name="actfm_TVA_tag_name_hint">목록 이름을 입력하세요</string>
+
+    <!-- Tag settings: login prompt from share-->
+    <string name="actfm_TVA_login_to_share">목록을 공유하려면 Astrid.com에 로그인해야 합니다! 로그인하거나 비공개 목록으로 만드세요.
+    </string>
+
+
+    <!-- ============================================ edit people dialog == -->
+
+    <!-- task sharing dialog: intro -->
+    <string name="actfm_EPA_intro">아스트리드로 쇼핑 목록, 파티 계획 또는 팀 프로젝트를 공유하고 사람들이 일을 마치는 것을 확인하십시오!
+    </string>
+
+    <!-- task sharing dialog: window title -->
+
+    <!-- task sharing dialog: save button -->
+
+    <!-- task sharing dialog: assigned label -->
+
+    <!-- slide 18a: task sharing dialog: assigned label long version -->
+    <string name="actfm_EPA_assign_label_long">누구의 일인가요?</string>
+
+    <!-- task sharing dialog: assigned to me -->
+    <string name="actfm_EPA_assign_me">나</string>
+
+    <!-- task sharing dialog: anyone -->
+    <string name="actfm_EPA_unassigned">미할당</string>
+
+    <!-- slide 18c: task sharing dialog: choose a contact -->
+    <string name="actfm_EPA_choose_contact">연락처를 선택하세요</string>
+
+    <!-- task sharing dialog: custom email assignment -->
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_share_with">공유한 사람:</string>
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_collaborators_header">공유하기</string>
+
+    <!-- task sharing dialog: collaborator list name (%s => name of list) -->
+    <string name="actfm_EPA_list">목록: %s</string>
+
+    <!-- task sharing dialog: assigned hint -->
+
+    <!-- task sharing dialog: message label text -->
+    <string name="actfm_EPA_message_text">초대 메시지:</string>
+
+    <!-- task sharing dialog: message body -->
+    <string name="actfm_EPA_message_body">이걸 마칠 수 있게 도와주세요!</string>
+
+    <!-- task sharing dialog: list members section header -->
+    <string name="actfm_EPA_assign_header_members">목록 구성원</string>
+
+    <!-- task sharing dialog: astrid friends section header -->
+    <string name="actfm_EPA_assign_header_friends">아스트리드 친구들</string>
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: share with Facebook -->
+    <string name="actfm_EPA_facebook">페이스북</string>
+
+    <!-- task sharing dialog: share with Twitter -->
+    <string name="actfm_EPA_twitter">트위터</string>
+
+    <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
+
+    <!-- task sharing dialog: edit people settings saved -->
+
+    <!-- task sharing dialog: invalid email (%s => email) -->
+    <string name="actfm_EPA_invalid_email">무효한 이메일: %s</string>
+
+    <!-- task sharing dialog: tag not found (%s => tag) -->
+
+    <!-- task sharing login prompt -->
+    <string name="actfm_EPA_login_to_share">일정을 공유하려면 Astrid.com 에 로그인해야 합니다!</string>
+
+    <string name="actfm_EPA_login_button">로그인</string>
+
+    <string name="actfm_EPA_dont_share_button">공유하지 않기</string>
+
+    <string name="actfm_EPA_add_person_to_list_title">할당한 일정</string>
+
+    <string name="actfm_EPA_add_person_to_list">%1$s 를 이 목록에 공유하지 않았습니다. %2$s 를 이 목록에 추가할까요?
+    </string>
+
+    <string name="actfm_EPA_add_person_to_list_ok">목록에 추가하기</string>
+
+    <string name="actfm_EPA_add_person_to_list_cancel">추가하지 않기</string>
+
+    <string name="actfm_list_owner">(소유자)</string>
+
+    <!-- ========================================= sharing login activity == -->
+
+    <!-- share login: Title -->
+    <string name="actfm_ALA_title">Astrid.com 에 오신 것을 환영합니다!</string>
+
+    <!-- share login: Sharing Description -->
+    <string name="actfm_ALA_body">Astrid.com 은 온라인에서 일정을 관리하고 공유하거나 일정을 위임할 수 있게 해 줍니다.</string>
+
+    <!-- share login: Sharing Login FB Prompt -->
+    <string name="actfm_ALA_fb_login">페이스북에 연결하기</string>
+
+    <!-- share login: Sharing Login GG Prompt -->
+    <string name="actfm_ALA_gg_login">구글에 연결하기</string>
+
+    <!-- share login: Quickly log in as <%s -> email> -->
+    <string name="actfm_quick_login">로그인: %s</string>
+
+    <!-- share login: Reject quick login -->
+    <string name="actfm_quick_login_reject">%s 가 아닙니까?</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_firstname_label">이름</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_lastname_label">성</string>
+
+    <!-- share login: Email -->
+    <string name="actfm_ALA_email_label">이메일</string>
+
+    <!-- share login: Username / Email -->
+
+    <!-- share login: Password -->
+    <string name="actfm_ALA_password_label">비밀번호</string>
+
+    <!-- share login: Sign Up Title -->
+    <string name="actfm_ALA_signup_title">가입하기</string>
+
+    <!-- share login: Login Title -->
+    <string name="actfm_ALA_login_title">로그인</string>
+
+    <!-- share login: Google Auth title -->
+    <string name="actfm_GAA_title">사용하려는 구글 계정을 선택해 주십시오:</string>
+
+    <!-- share login: OAUTH Login Prompt -->
+    <string name="actfm_OLA_prompt">로그인하세요:</string>
+
+    <!-- Login error: user exists -->
+    <string name="actfm_ALA_error_user_exists">사용자가 이미 있습니다. 다시 로그인하세요.</string>
+
+    <!-- Login error: wrong password -->
+    <string name="actfm_ALA_error_wrong_password">비밀번호가 맞지 않습니다. 다시 시도해 주세요.</string>
+
+    <!-- Forgot password link -->
+    <string name="actfm_ALA_forgot_password">비밀번호 찾기</string>
+
+    <!-- Forgot password email prompt -->
+    <string name="actfm_ALA_enter_email">이메일을 입력하세요</string>
+
+    <!-- Password reset sent (%s -> email) -->
+    <string name="actfm_ALA_reset_sent">새 비밀번호를 %s으로 보냈습니다.</string>
+
+    <!-- User already exists - first sync may be slow -->
+    <string name="actfm_ALA_user_exists_sync_alert">첫 동기화는 시간이 걸립니다--기다려 주셔서 감사합니다!</string>
+
+    <!-- User not found -->
+    <string name="actfm_ALA_error_user_not_found">해당 이메일로 가입된 사용자가 없습니다. 가입신청 해 보세요!</string>
+
+    <!-- ================================================ Featured Lists -->
+
+    <string name="actfm_feat_list_clone">목록 복사하기</string>
+
+    <string name="actfm_feat_list_suffix">(복사)</string>
+
+    <string name="actfm_feat_list_cloning">복사중...</string>
+
+    <string name="actfm_feat_list_clone_success">성공!</string>
+
+    <string name="actfm_feat_list_task_clone_success">일정 복사 완료</string>
+
+    <string name="actfm_feat_list_clone_empty">복사할 일정 없음</string>
+
+    <!-- ================================================ Synchronization == -->
+
+    <!-- Indicates the logged in user name. %s -> user\'s name -->
+    <string name="actfm_status_title_logged_in">%s 로 로그인 함</string>
+
+    <!-- Preferences Title: Act.fm -->
+    <string name="actfm_APr_header">Astrid.com</string>
+
+    <string name="actfm_https_title">HTTPS 사용하기</string>
+    <string name="actfm_https_enabled">HTTPS 사용함 (느림)</string>
+    <string name="actfm_https_disabled">HTTPS 사용안함 (빠름)</string>
+
+    <!-- title for notification tray after synchronizing -->
+
+    <!-- text for notification when comments are received -->
+
+    <string name="actfm_dual_sync_warning">당신은 현재 구글 일정과 동기화하고 있습니다. 중복된 일정과 다른 동기화 문제를 피하기 위해,
+        당신이 Astrid.com과 동기화를 시작할 때 구글 일정은 더 이상 동기화되지 않을 것입니다.
+        그러나 구글 일정 설정에서 구글 일정을 여전히 가져올 수 있습니다. 또는 Gmail 의 구글 일정을 아스트리드의 Remind Me 크롬 확장으로 대체할 수 있습니다.
+        Astrid.com 과 동기화하시겠습니까?
+    </string>
+
+    <!-- account types -->
+    <string name="actfm_account_type">계정 유형</string>
+    <string name="actfm_account_info">계정 정보</string>
+    <string name="actfm_account_info_summary">상태와 설정</string>
+    <string name="account_type_title_not_logged_in">무료 계정에 가입하기</string>
+    <string name="account_type_summary_not_logged_in">온라인에서 일정을 열어보고 목록과 대행자를 공유합니다</string>
+
+
+    <string name="actfm_account_premium">프리미엄</string>
+    <string name="actfm_account_basic">기본</string>
+
+    <string name="actfm_inapp_billing">프리미엄으로 업그레이드하기</string>
+    <string name="actfm_inapp_billing_summary">파일 첨부, 음성 백업, 프리미엄 지원 등</string>
+
+    <!-- Sharing -->
+    <string name="share_with_facebook">페이스북에 Like 하기</string>
+    <string name="share_with_twitter">\'트위터에 Follow 하기</string>
+    <string name="share_with_google">구글+ 에 공유하기</string>
+    <string name="share_speech_bubble">공유를 통해 다른 사람이 더 생산적인 일을 하도록 도울 수 있습니다!</string>
+
+
+    <!-- Sync upgrade messages -->
+    <string name="sync_upgr_both_title">중복 없이 Astrid.com + 구글 이용하기</string>
+    <string name="sync_upgr_both_body">솔직히 구글 일정은 편리하지만 아스트리드만큼은 아닙니다. 중복을 피하기 위해 더이상 Astrid.com 에
+        동기화하면서 동시에 구글 일정에 백그라운드로 동기화할 수 없습니다. 구글 일정은 설정 → 백업 &amp; 동기화 항목에서 여전히 불러올 수 있습니다. 또는 구글 일정
+        만 동기화하도록 다운그레이드할 수 있습니다.
+    </string>
+    <string name="sync_upgr_both_btn1">아스트리드와 함께 갑시다</string>
+    <string name="sync_upgr_both_btn2">구글 일정으로 다운그레이드하기</string>
+
+    <string name="sync_upgr_gtasks_only_title">무료로 아스트리드 동기화로 업그레이드 하세요!</string>
+    <string name="sync_upgr_gtasks_only_body">Astrid.com 동기화로 당신이 가진 모든 기기와 Gmail에서 일정을 사용하세요.
+        Astrid.com 동기화로 업그레이드 하세요 (구글 일정으로 언제든지 돌아갈 수 있지만 안 그럴 겁니다)!
+    </string>
+    <string name="sync_upgr_gtasks_only_btn1">아스트리드 동기화로 업그레이드하기</string>
+    <string name="sync_upgr_gtasks_only_btn2">구글 일정 계속 사용하기</string>
+
+    <string name="sync_upgr_neither_title">무료 백업 &amp; 동기화!</string>
+    <string name="sync_upgr_neither_body">할일 관리를 위험 속에 두지 마세요! 어디서든지 당신의 일정을 유지하고 이용할 수 있도록 새로워진
+        아스트리드 동기화가 있습니다.
+    </string>
+    <string name="sync_upgr_neither_btn1">지금 가입하기</string>
+
+    <string name="sync_upgr_logged_out">아스트리드에서 로그아웃 했습니다</string>
+
+    <string name="actfm_logout_clear_tasks_title">자료를 삭제할까요?</string>
+    <string name="actfm_logout_clear_tasks_body">당신의 일정과 목록을 삭제할까요?</string>
+    <string name="actfm_logout_clear_tasks_yes">자료 삭제하기</string>
+    <string name="actfm_logout_clear_tasks_no">자료 유지하기</string>
+
+    <string name="actfm_logged_in_different_user_title">다른 사용자로 로그인하기</string>
+    <string name="actfm_logged_in_different_user_body">동기화 전에 휴대폰의 일정을 삭제할까요?</string>
+    <string name="actfm_logged_in_different_user_keep_data">자료 유지하기</string>
+    <string name="actfm_logged_in_different_user_clear_data">모든 자료 삭제하기</string>
+    <string name="actfm_logged_in_different_user_processing">남아있는 자료를 처리중입니다...</string>
+
+    <string name="actfm_tag_not_authorized_title">권한이 없습니다</string>
+    <string name="actfm_tag_not_authorized_body">더 이상 목록 %s 를 열람할 수 있는 권한이 없습니다 (권한을 삭제한 것 같습니다). 같은
+        이름의 새 목록을 생성하시겠습니까?
+    </string>
+    <string name="actfm_tag_not_authorized_new_list">새 목록 만들기</string>
+    <string name="actfm_tag_not_authorized_leave_list">목록 탈퇴하기</string>
+
+    <string name="actfm_sync_ongoing">동기화 진행 중...</string>
+
+    <string name="EPr_reset_sync_state">동기화 초기화</string>
+    <string name="EPr_reset_sync_state_summary">동기화 에러를 해결하기 위해 몇가지 로컬 자료를 초기화합니다</string>
+    <string name="EPr_reset_sync_state_detailed">동기화 에러를 해결하기 위해, 다음 동기화 때 당신의 일정과 목록은 Astrid.com 상에
+        존재하는 미러로 변경될 것입니다. 계속하시겠습니까?
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in timers plug-in -->
+
+    <!-- Task Edit Activity: Container Label -->
+    <string name="alarm_ACS_label">알람</string>
+
+    <!-- Task Edit Activity: Add New Alarm -->
+    <string name="alarm_ACS_button">알람 추가</string>
+
+    <string-array name="reminders_alarm">
+        <!-- reminders related to alarm -->
+        <item>알람!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in backup plug-in -->
+
+    <!-- ================================================= BackupPreferences == -->
+
+    <!-- slide 33c/48d: Backup Preferences Title -->
+    <string name="backup_BPr_header">백업</string>
+
+    <!-- slide 48e/50c: Backup: Status Header -->
+    <string name="backup_BPr_group_status">상태</string>
+
+    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->
+    <string name="backup_status_success">최근 백업:\n%s</string>
+    <!-- Backup Status: last error failed. Keep it short! -->
+    <string name="backup_status_failed">마지막 백업 실패함</string>
+    <!-- Backup Status: error subtitle -->
+    <string name="backup_status_failed_subtitle">(오류 내용을 보려면 누르세요)</string>
+    <!-- slide 48a: Backup Status: never backed up -->
+    <string name="backup_status_never">백업한 적이 없습니다!</string>
+
+    <!-- slide 48f/ 50e: Backup Options Group Label -->
+    <string name="backup_BPr_group_options">설정</string>
+
+    <!-- slide 48b: Preference: Automatic Backup Title -->
+    <string name="backup_BPr_auto_title">자동 백업</string>
+    <!-- Preference: Automatic Backup Description (when disabled) -->
+    <string name="backup_BPr_auto_disabled">자동으로 백업하지 않습니다</string>
+    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
+    <string name="backup_BPr_auto_enabled">매일 백업합니다</string>
+
+    <!-- Preference screen restoring Tasks Help -->
+    <!-- Preference screen Restoring Tasks Help Dialog Text-->
+
+    <string name="backup_BPr_cloud_already_logged_in">Astrid.com에 이미 백업을 완료했습니다!</string>
+
+    <!-- ================================================= BackupActivity == -->
+
+    <!-- slide 48c: backup activity label -->
+    <string name="backup_BAc_label">백업 관리</string>
+
+    <!-- backup activity title -->
+    <string name="backup_BAc_title">백업 관리하기</string>
+
+    <!-- backup activity import button -->
+    <string name="backup_BAc_import">일정 가져오기</string>
+
+    <!-- backup activity export button -->
+    <string name="backup_BAc_export">일정 내보내기</string>
+
+    <!-- backup activity cloud (Astrid.com) option -->
+    <string name="backup_BAc_cloud">Astrid.com 의 무료 클라우드에 백업하려면 클릭하세요</string>
+
+    <!-- ============================================== Importer / Exporter == -->
+
+    <!-- Message displayed when error occurs -->
+    <string name="backup_TXI_error">가져오기 오류</string>
+
+    <string name="export_toast">%1$s 를 %2$s 로 백업함.</string>
+
+    <string name="export_toast_no_tasks">내보낼 일정 없음.</string>
+
+    <!-- Progress Dialog Title for exporting -->
+    <string name="export_progress_title">내보내는 중...</string>
+
+    <!-- Backup: Title of Import Summary Dialog -->
+    <string name="import_summary_title">간편 복원</string>
+
+    <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
+    <string name="import_summary_message">파일 %1$s: %2$s 개의 일정 포함.\n\n
+        %3$s 개 가져오기 성공,\n
+        %4$s 개 이미 존재,\n
+        %5$s 개 에러 발생\n
+    </string>
+
+    <!-- Progress Dialog Title for importing -->
+    <string name="import_progress_title">가져오는 중...</string>
+
+    <!-- Progress Dialog text for import reading task (%d -> task number)-->
+    <string name="import_progress_read">일정 %d 읽는 중...</string>
+
+    <!-- Backup: Dialog when unable to open a file -->
+
+    <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
+    <string name="DLG_error_sdcard">폴더에 접근 불가: %s</string>
+
+    <!-- Backup: Dialog when unable to open SD card in general -->
+    <string name="DLG_error_sdcard_general">SD 카드에 접근할 수 없습니다!</string>
+
+    <!-- Backup: File Selector dialog for import -->
+    <string name="import_file_prompt">복원할 파일을 선택하세요</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- ================================================== AndroidManifest == -->
+
+    <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
+    <string name="app_name">아스트리드 일정</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="read_permission_label">아스트리드 권한</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="read_permission_desc">일정 읽기, 일정 필터 보기</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="write_permission_label">아스트리드 권한</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="write_permission_desc">새 일정 생성하기, 기존 일정 편집하기</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- question for deleting tasks -->
+    <string name="DLG_delete_this_task_question">이 일정을 삭제할까요?</string>
+
+    <!-- question for deleting items (%s => item name) -->
+    <string name="DLG_delete_this_item_question">이 항목을 삭제할까요: %s?</string>
+
+    <!-- Progress dialog shown when upgrading -->
+    <string name="DLG_upgrading">일정 업그레이드 중...</string>
+
+    <!-- Title for dialog selecting a time (hours and minutes) -->
+    <string name="DLG_hour_minutes">시간 (시 : 분)</string>
+
+    <!-- Dialog for Astrid having a critical update -->
+    <string name="DLG_please_update">안드로이드 마켓에서 아스트리드를 최신버전으로
+        업데이트해야 합니다! 계속하기 전에 업데이트하거나
+        잠시 기다려 주세요.
+    </string>
+
+    <!-- Button for going to Market -->
+
+    <!-- Button for accepting EULA -->
+    <string name="DLG_accept">동의합니다</string>
+
+    <!-- Button for declining EULA -->
+    <string name="DLG_decline">거절합니다</string>
+
+    <!-- EULA title -->
+    <string name="DLG_eula_title">Astrid 사용 약관</string>
+
+    <!-- Progress Dialog generic text -->
+    <string name="DLG_please_wait">기다려 주십시오</string>
+
+    <!-- Dialog - loading -->
+    <string name="DLG_loading">불러오는 중...</string>
+
+    <!-- Dialog - dismiss -->
+
+    <!-- slide 20d -->
+    <string name="DLG_ok">확인</string>
+    <!-- slide 36g -->
+    <string name="DLG_cancel">취소</string>
+
+    <string name="DLG_more">더 보기</string>
+
+    <string name="DLG_undo">실행 취소</string>
+
+    <string name="DLG_warning">주의</string>
+
+    <!-- =============================================================== UI == -->
+
+    <!-- Label for DateButtons with no value -->
+    <string name="WID_dateButtonUnset">누르세요</string>
+
+    <!-- String formatter for DateButtons ($D => date, $T => time) -->
+
+    <!-- String formatter for Disable button -->
+
+    <!--  ============================================================= notes -->
+
+    <!-- Note Exposer -->
+
+    <!-- Note Exposer / Comments -->
+
+    <!-- EditNoteActivity - no comments -->
+    <string name="ENA_no_comments">아직 활동내역이 없음</string>
+
+    <!-- EditNoteActivity - no username for comment -->
+    <string name="ENA_no_user">누군가</string>
+
+    <!-- EditNoteActivity - refresh comments -->
+    <string name="ENA_refresh_comments">댓글 새로고침</string>
+
+    <!-- ================================================= TaskListActivity == -->
+
+    <!-- slide 8b: Task List: Displayed instead of list when no items present -->
+    <string name="TLA_no_items">일정이 없네요!\n추가할까요?</string>
+
+    <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
+    <string name="TLA_no_items_person">%s 님은 당신과 공유한 일정이 없습니다</string>
+
+    <!-- Menu: Adjust Sort and Hidden Task Settings -->
+    <string name="TLA_menu_sort">정렬</string>
+
+    <!-- Menu: Sync Now -->
+    <string name="TLA_menu_sync">지금 동기화</string>
+
+    <!-- Menu: Search -->
+    <string name="TLA_menu_search">검색</string>
+
+    <!-- Menu: Tasks -->
+    <string name="TLA_menu_lists">목록</string>
+
+    <!-- Menu: Friends -->
+    <string name="TLA_menu_friends">사람들</string>
+
+    <!-- Menu: Featured Lists -->
+    <string name="TLA_menu_featured_lists">기능 목록</string>
+
+    <!-- Menu: Suggestions -->
+    <string name="TLA_menu_suggestions">제안</string>
+
+    <!-- Menu: Tutorial -->
+
+    <!-- Menu: Settings -->
+    <string name="TLA_menu_settings">설정</string>
+
+    <!-- slide 30b: Menu: Support -->
+    <string name="TLA_menu_support">지원</string>
+
+    <!-- Search Label-->
+
+    <!-- Window title for displaying Custom Filter -->
+    <string name="TLA_custom">사용자 설정</string>
+
+    <!-- slide 8d: Quick Add Edit Box Hint-->
+    <string name="TLA_quick_add_hint">일정 추가하기</string>
+
+    <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
+    <string name="TLA_quick_add_hint_assign">%s 님의 일정 추가하기</string>
+
+    <!-- Notification Volumne notification-->
+    <string name="TLA_notification_volume_low">알림를 껐습니다. 아스트리드 알림 소리를 들을 수 없습니다!</string>
+
+    <!-- Notifications disabled warning -->
+    <string name="TLA_notification_disabled">Astrid 알림을 사용하지 않습니다! 어떤 알림도 받을 수 없을 것입니다.</string>
+
+    <string-array name="TLA_filters">
+        <item>실행중</item>
+        <item>오늘</item>
+        <item>곧</item>
+        <item>지연</item>
+        <item>마침</item>
+        <item>숨김</item>
+    </string-array>
+
+    <!-- Title for confirmation dialog after quick add markup -->
+    <string name="TLA_quickadd_confirm_title">\"%s\" 라고 말했습니다</string>
+
+    <!-- Text for speech bubble in dialog after quick add markup -->
+    <!-- First string is task title, second is due date, third is priority -->
+    <string name="TLA_quickadd_confirm_speech_bubble">기한이 %2$s 인 일정 \"%1$s\" 을 %3$s 에 만들었습니다
+    </string>
+
+    <string name="TLA_quickadd_confirm_speech_bubble_date">%s</string>
+
+    <string name="TLA_quickadd_confirm_hide_helpers">더 이상 확인을 하지 않습니다</string>
+
+
+    <!-- Title for alert on new repeating task. %s-> task title -->
+    <string name="TLA_repeat_scheduled_title">새 반복 일정 %s</string>
+
+    <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
+    <string name="TLA_repeat_scheduled_speech_bubble">이 일정을 %s마다 알려 주겠습니다.</string>
+
+    <string-array name="TLA_priority_strings">
+        <item>최우선 순위</item>
+        <item>높은 순위</item>
+        <item>보통 순위</item>
+        <item>낮은 순위</item>
+    </string-array>
+    <!-- slide 22a -->
+    <string name="TLA_all_activity">모든 활동내역</string>
+
+    <!-- ====================================================== TaskAdapter == -->
+
+    <!-- Format string to indicate task is hidden (%s => task name) -->
+    <string name="TAd_hiddenFormat">%s [숨김]</string>
+
+    <!-- Format string to indicate task is deleted (%s => task name) -->
+    <string name="TAd_deletedFormat">%s [지움]</string>
+
+    <!-- Displayed when adapter is flung (scrolled quickly) -->
+
+    <!-- slide 22b: indicates task was completed. %s => date or time ago -->
+    <string name="TAd_completed">일정 완료\n%s</string>
+
+    <!-- slide 15a: Action Button: edit task -->
+    <string name="TAd_actionEditTask">편집</string>
+
+    <!-- Context Item: edit task -->
+    <string name="TAd_contextEditTask">일정 편집하기</string>
+
+    <!-- Context Item: copy task -->
+    <string name="TAd_contextCopyTask">일정 복사하기</string>
+
+    <!-- Context Item: delete task -->
+    <string name="TAd_contextDeleteTask">일정 지우기</string>
+
+    <!-- Context Item: undelete task -->
+    <string name="TAd_contextUndeleteTask">일정 복구하기</string>
+
+    <!-- Context Item: purge task -->
+    <string name="TAd_contextPurgeTask">일정 비우기</string>
+
+    <!-- ============================================== SortSelectionDialog == -->
+
+    <!-- slide 23a: Sort Selection: dialog title -->
+    <string name="SSD_title">정렬, 하위일정 및 숨김</string>
+
+    <!-- slide 23h:  Hidden: title -->
+    <string name="SSD_hidden_title">숨긴 일정</string>
+
+    <!-- Hidden Task Selection: show completed tasks -->
+    <string name="SSD_completed">완료한 일정 보기</string>
+
+    <!-- Hidden Task Selection: show hidden tasks -->
+    <string name="SSD_hidden">숨긴 일정 보기</string>
+
+    <!-- Hidden Task Selection: show deleted tasks -->
+    <string name="SSD_deleted">지운 일정 보기</string>
+
+    <!-- Sort Selection: drag with subtasks -->
+    <string name="SSD_sort_drag">수동 정렬 (하위일정 포함)</string>
+
+    <!-- slide 23b: Sort Selection: smart sort -->
+    <string name="SSD_sort_auto">Astrid 스마트 정렬</string>
+
+    <!-- slide 23e: Sort Selection: sort by alpha -->
+    <string name="SSD_sort_alpha">제목 순서</string>
+
+    <!-- slide 23c: Sort Selection: sort by due date -->
+    <string name="SSD_sort_due">마감일 순서</string>
+
+    <!-- slide 23d: Sort Selection: sort by importance -->
+    <string name="SSD_sort_importance">우선순위 순서로</string>
+
+    <!-- slide 23f: Sort Selection: sort by modified date -->
+    <string name="SSD_sort_modified">최종 수정일 순서</string>
+
+    <!-- slide 23g: Sort Selection: reverse -->
+    <string name="SSD_sort_reverse">역순 정렬</string>
+
+    <!-- slide 23j: Sort Button: sort temporarily -->
+    <string name="SSD_save_temp">한번 정렬</string>
+
+    <!-- slide 23i: Sort Button: sort permanently -->
+    <string name="SSD_save_always">항상 정렬</string>
+
+    <!-- =============================================== FilterListActivity == -->
+
+    <!-- Astrid Filter Shortcut -->
+    <string name="FSA_label">목록이나 필터</string>
+
+    <!-- Filter List Activity Title -->
+
+    <!-- Displayed when loading filters -->
+
+    <!-- Context Menu: Create Shortcut -->
+    <string name="FLA_context_shortcut">바탕화면에 바로가기 만들기</string>
+
+    <!-- Menu: Search -->
+
+    <!-- Menu: Help -->
+
+    <!-- slide 28c: Create Shortcut Dialog Title -->
+    <string name="FLA_shortcut_dialog_title">바탕화면에 바로가기 만들기</string>
+
+    <!-- Create Shortcut Dialog (asks to name shortcut) -->
+    <string name="FLA_shortcut_dialog">바로가기 이름:</string>
+
+    <!-- Search Hint-->
+    <string name="FLA_search_hint">일정 검색하기</string>
+
+    <!-- Search Filter name (%s => query) -->
+    <string name="FLA_search_filter">\'%s\' 검색 중</string>
+
+    <!-- Toast: created shortcut (%s => label) -->
+    <string name="FLA_toast_onCreateShortcut">바로가기 생성: %s</string>
+
+    <!-- Menu: new filter -->
+    <string name="FLA_new_filter">새 필터</string>
+
+    <!-- slide 10e: Button: new list -->
+    <string name="FLA_new_list">새 목록</string>
+
+    <!-- Alert when creating a shortcut without selecting a filter -->
+    <string name="FLA_no_filter_selected">필터를 선택하지 않았습니다! 필터나 목록을 선택하세요.</string>
+
+    <!-- ================================================= TaskEditActivity == -->
+
+    <!-- Title when editing a task (%s => task title) -->
+
+    <!-- Title when creating a new task -->
+
+    <!-- Task title label -->
+
+    <!-- Task when label -->
+    <string name="TEA_when_header_label">언제</string>
+
+    <!-- Task title hint (displayed when edit box is empty) -->
+    <string name="TEA_title_hint">일정 이름</string>
+
+    <!-- Task importance label -->
+    <string name="TEA_importance_label">우선순위</string>
+
+    <!-- Task due date hint -->
+    <string name="TEA_deadline_hint">마감일 설정</string>
+
+    <!-- Task assigned to string (%s -> assigned person name) -->
+    <string name="TEA_assigned_to">%s 님에게 할당</string>
+
+    <!-- Task urgency specific time checkbox -->
+    <string name="TEA_urgency_specific_time">특정한 시간에?</string>
+
+    <!-- Task urgency specific time title when specific time false -->
+    <string name="TEA_urgency_none">없음</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_label">숨기기 기간:</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_display">%s 까지 숨기기</string>
+
+    <!-- Task hide until toast -->
+    <string name="TEA_hideUntil_message">%s 까지 일정을 숨깁니다</string>
+
+    <!-- Task editing data being loaded label -->
+    <string-array name="TEA_loading">
+        <item>불러오는 중...</item>
+    </string-array>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_note_label">설명</string>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_notes_empty">설명</string>
+
+    <!-- Task note hint -->
+    <string name="TEA_notes_hint">일정 내용을 입력하세요</string>
+
+    <!-- Estimated time label -->
+    <string name="TEA_estimatedDuration_label">일정 완료 예상 시간은?</string>
+
+    <!-- Elapsed time label -->
+    <string name="TEA_elapsedDuration_label">일정에 이미 소모한 시간</string>
+
+    <!-- Menu: Save -->
+    <string name="TEA_menu_save">변경사항 저장</string>
+
+    <!-- Menu: Don\'t Save -->
+    <string name="TEA_menu_discard">저장하지 않음</string>
+
+    <!-- Menu: Delete Task -->
+    <string name="TEA_menu_delete">일정 지우기</string>
+
+    <!-- Menu: Task comments -->
+    <string name="TEA_menu_refresh_comments">댓글 새로고침</string>
+
+    <string name="TEA_menu_comments">댓글</string>
+
+    <!-- Toast: task saved with deadline (%s => preposition + time units) -->
+    <string name="TEA_onTaskSave_due">일정 저장: 마감일 %s</string>
+
+    <!-- Toast: task saved without deadlines -->
+    <string name="TEA_onTaskSave_notDue">일정을 저장했습니다</string>
+
+    <!-- Toast: task was not saved -->
+
+    <!-- Toast: task was deleted -->
+
+    <!-- slide 15b: Task edit tab: activity -->
+    <string name="TEA_tab_activity">활동 내역</string>
+
+    <!-- slide 15e:  Task edit tab: more editing settings -->
+    <string name="TEA_tab_more">세부 사항</string>
+
+    <!-- slide 15d: Task edit tab: web services -->
+    <string name="TEA_tab_web">아이디어</string>
+
+    <string name="TEA_timer_est">동부표준시 %s</string>
+
+    <string name="TEA_timer_elap">경과 시간: %s</string>
+
+    <string-array name="TEA_urgency">
+        <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
+        <item>기한 없음</item>
+        <item>특정한 날짜</item>
+        <item>오늘</item>
+        <item>내일</item>
+        <item>(며칠 후)</item>
+        <item>다음 주</item>
+        <item>2주</item>
+        <item>다음 달</item>
+    </string-array>
+
+    <string name="TEA_no_time">시한 없음</string>
+
+    <string-array name="TEA_hideUntil">
+        <!-- hideUntil: labels for edit page. -->
+        <item>사용안함</item>
+        <item>마감일</item>
+        <item>마감 시간</item>
+        <item>마감 하루 전</item>
+        <item>마감 일주일 전</item>
+        <item>특정한 요일/시간</item>
+    </string-array>
+
+    <!-- Task edit control set descriptors -->
+
+    <!-- slide 9b/35i -->
+    <string name="TEA_control_who">누가</string>
+
+    <!-- slide 9c/ 35a -->
+    <string name="TEA_control_when">언제</string>
+    <!-- slide 35b -->
+    <string name="TEA_control_more_section">----자세히----</string>
+    <!-- slide 16a/35c -->
+    <string name="TEA_control_importance">우선순위</string>
+    <!-- slide 16b/35d -->
+    <string name="TEA_control_lists">목록</string>
+    <!-- slide 16c/35e -->
+    <string name="TEA_control_notes">설명</string>
+
+    <string name="TEA_control_files">파일</string>
+
+    <!-- slide 16e / slide 35g-->
+    <string name="TEA_control_reminders">일정 알림</string>
+
+    <!-- slide 16f -->
+    <string name="TEA_control_timer">타이머 조절</string>
+
+    <string name="TEA_control_hidden_section">----항상 숨김----</string>
+
+    <string name="hide_until_prompt">내 목록에 표시</string>
+
+    <!-- Add Ons tab when no add-ons found -->
+
+    <!-- Add Ons button -->
+
+    <!-- More row -->
+
+    <!-- slide 15c: Text when no activity to show -->
+    <string name="TEA_no_activity">활동내역 없음</string>
+
+    <!-- Text to load more activity -->
+    <string name="TEA_load_more">더 불러오기...</string>
+
+    <!-- When controls dialog -->
+    <string name="TEA_when_dialog_title">마감일이 언제입니까?</string>
+
+
+    <string name="TEA_new_task">새 일정</string>
+
+    <string name="WSV_click_to_load">이걸 완료할 방법을 찾으려면 여기를 누르세요!</string>
+
+    <string name="WSV_not_online">저는 인터넷에 연결되었을 때 더 많은 일을 할 수 있습니다. 인터넷 연결을 확인해 주세요.</string>
+
+    <string name="TEA_contact_error">죄송하지만 선택한 연락처의 이메일 주소를 찾을 수 없습니다.</string>
+
+    <!-- ============================================= IntroductionActivity == -->
+
+    <!-- slide 1a: Introduction Window title -->
+
+    <!-- Button to agree to EULA -->
+
+    <!-- Button to disagree with EULA -->
+
+    <!-- ===================================================== MissedCallActivity == -->
+
+    <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
+    <string name="MCA_title">%1$s\n받은 시간: %2$s</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_return_call">지금 전화하기</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_add_task">나중에 전화하기</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_ignore">무시하기</string>
+
+    <!-- Missed call: dialog to ignore all missed calls title -->
+    <string name="MCA_ignore_title">모든 부재중 전화를 무시할까요?</string>
+
+    <!-- Missed call: dialog to ignore all missed calls body -->
+    <string name="MCA_ignore_body">부재중 전화를 몇 번 무시했습니다. 아스트리드의 부재중 전화 알림을 중지할까요?</string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore all button -->
+    <string name="MCA_ignore_all">모든 전화 무시하기</string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
+    <string name="MCA_ignore_this">이 전화만 무시하기</string>
+
+    <!-- Missed call: preference title -->
+    <string name="MCA_missed_calls_pref_title">부재중 전화 처리</string>
+
+    <!-- slide 49c: Missed call: preference description -->
+    <string name="MCA_missed_calls_pref_desc_enabled">아스트리드는 부재중 전화를 알려주고 회신할 수 있도록 알려줍니다</string>
+    <string name="MCA_missed_calls_pref_desc_disabled">아스트리드는 부재중 전화에 대해서 알리지 않습니다</string>
+
+    <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
+    <string name="MCA_task_title_name">%1$s 님에게 %2$s 에 다시 연락하세요</string>
+
+    <!-- Missed call: task title no name (%s -> number)-->
+    <string name="MCA_task_title_no_name">%s 님에게 다시 연락하세요</string>
+
+    <!-- Missed call: schedule dialog title (%s -> name or number)-->
+    <string name="MCA_schedule_dialog_title">%s 님에게 다시 연락하세요...</string>
+
+    <!-- Missed call speech bubble options -->
+    <string-array name="MCA_dialog_speech_options">
+        <item>그렇게 유명하다니 좋으시겠네요!</item>
+        <item>예이! 바로 당신같은 사람!</item>
+        <item>전화를 해서 기쁨을 줍시다!</item>
+        <item>사람들이 다시 전화를 걸어준다면 행복하지 않겠어요?</item>
+        <item>할 수 있어요!</item>
+        <item>항상 문자를 보낼 수 있잖아요...</item>
+    </string-array>
+
+
+    <!-- ======================================= Calendar reminder activity == -->
+
+    <!-- Calendar remindeer ignore button -->
+    <string name="CRA_ignore">무시하기</string>
+
+    <!-- Calendar event -->
+    <string name="CRA_title">모임 목록이 필요하세요?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls title -->
+    <string name="CRA_ignore_title">모든 달력 이벤트를 무시할까요?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls body -->
+    <string name="CRA_ignore_body">몇몇의 달력 이벤트를 무시했습니다. 아스트리드가 그것을 물어보는 것을 중단할까요?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
+    <string name="CRA_ignore_all">모든 이벤트 무시하기</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
+    <string name="CRA_ignore_this">이 이벤트만 무시하기</string>
+
+    <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
+    <string name="CRA_speech_bubble_start">%s 가 곧 시작될 것 같습니다. 활동 아이템 목록을 만들까요?</string>
+
+    <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
+    <string name="CRA_speech_bubble_end">%s 를 방금 마치신 것 같습니다. 활동 아이템 목록을 만들까요?</string>
+
+    <!-- Calendar reminder: create list button -->
+    <string name="CRA_create_list">목록 만들기</string>
+
+    <!-- Calendar reminder: postpone button -->
+    <string name="CRA_postpone">연기하기</string>
+
+    <!-- Calendar reminder: list exists dialog title -->
+    <string name="CRA_list_exists_title">목록이 이미 있습니다</string>
+
+    <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
+    <string name="CRA_list_exists_body">%s 이름의 목록이 이미 있습니다. 이 이벤트를 위해 새로운 목록을 만들까요?</string>
+
+    <!-- Calendar reminder: list exists dialog create new button -->
+    <string name="CRA_create_new">새 목록 만들기</string>
+
+    <!-- Calendar reminder: list exists dialog use existing button -->
+    <string name="CRA_use_existing">기존 목록 사용</string>
+
+    <!-- Calendar remindr: created list (%s -> list name) -->
+    <string name="CRA_created_list_dialog">%s 목록을 만들었습니다.</string>
+
+    <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
+    <string name="CRA_one_attendee">%s 님이 참석 중입니다.</string>
+
+    <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
+    <string name="CRA_two_attendees">%1$s 님과 %2$s 님이 참석 중입니다.</string>
+
+    <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
+    <string name="CRA_many_attendees">%1$s, %2$s, %3$d 님과 다른 분들이 참석 중입니다.</string>
+
+    <!-- Calendar reminder: invitation prompt -->
+    <string name="CRA_invitation_prompt">초대할까요?</string>
+
+    <!-- Calendar reminder: preference title -->
+    <string name="CRA_calendar_reminders_pref_title">달력 도우미</string>
+
+    <!-- Calendar reminder: pref description disabled -->
+    <string name="CRA_calendar_reminders_pref_desc_disabled">아스트리드는 다가오는 달력 이벤트를 알리지 않을 것입니다.
+    </string>
+
+    <!-- Calendar reminder: pref description enabled -->
+    <string name="CRA_calendar_reminders_pref_desc_enabled">아스트리드는 다가오는 달력 이벤트를 알리고 당신이 준비하도록 할
+        것입니다
+    </string>
+
+    <!-- Calendar reminder: share list title -->
+    <string name="CRA_share_list_title">목록을 공유할까요?</string>
+
+    <string name="CRA_invite_attendees">참석자 초대하기</string>
+
+    <string name="CRA_more_options">추가 설정</string>
+
+    <string name="CRA_dont_invite">아니요 괜찮습니다</string>
+
+    <!-- Calendar reminder: share list title when no other attendees exist-->
+    <string name="CRA_list_created_title">목록을 만들었습니다!</string>
+
+    <!-- Calendar reminder: default new list name (%s -> event title) -->
+    <string name="CRA_default_list_name">활동 아이템: %s</string>
+
+    <!-- ===================================================== HelpActivity == -->
+
+    <!-- Help: Button to get support from our website -->
+
+    <!-- ==================================================== UpdateService == -->
+
+    <!-- Changelog Window Title -->
+    <string name="UpS_changelog_title">Astrid 의 새로운 기능</string>
+
+    <!-- Updates Window Title -->
+    <string name="UpS_updates_title">최신 아스트리드 뉴스</string>
+
+    <!-- Updats No Activity to show for offline users -->
+    <string name="UpS_no_activity_log_in">공유한 목록상의 활동내역과\n자신의 일정 진행 기록을\n보려면 로그인하세요.</string>
+
+    <!-- ================================================== EditPreferences == -->
+
+    <!-- slide 31g: Preference Window Title -->
+    <string name="EPr_title">설정</string>
+
+    <string name="EPr_share_astrid">아스트리드 공유하기</string>
+
+    <string name="EPr_share_astrid_summary">내가 즐겨찾는 소셜 네트워크에 아스트리드를 공유합니다</string>
+
+    <!-- slide 46a -->
+    <string name="EPr_deactivated">비활성화됨</string>
+
+    <!-- slide 30i: Preference Category: Appearance Title -->
+    <string name="EPr_appearance_header">보기 설정</string>
+
+    <!-- Preference Category: Appearance Summary -->
+    <string name="EPr_appearance_summary">테마, 위젯, 일정 표시줄, 화면 편집</string>
+
+    <!-- FAQ Preference title -->
+    <string name="EPr_faq_title">자주 묻는 질문</string>
+
+    <!-- Account status preference (%s -> account type) -->
+    <string name="EPr_account_title">계정: %s</string>
+
+    <!-- Support preferences summary -->
+    <string name="EPr_support_summary">사용 안내, 자주 묻는 질문, 정보</string>
+
+    <!-- slide 34a: Preference: Task List Font Size Title -->
+    <string name="EPr_fontSize_title">일정 목록 크기</string>
+
+    <!-- Preference: Filters to show pref screen title -->
+    <string name="EPr_filters_to_show_title">표시할 필터</string>
+
+    <!-- slide 32a: Preference: Show confirmation for smart reminders -->
+    <string name="EPr_showSmartConfirmation_title">스마트 알림시 확인하기</string>
+
+    <!-- slide 34g: Preference: Task List Font Size Description -->
+    <string name="EPr_fontSize_desc">주 목록 페이지 폰트 크기</string>
+
+    <!-- Preferemce: Show task edit confirmation toasts -->
+
+    <!-- slide 34c: Preference: Task List Show Notes -->
+    <string name="EPr_showNotes_title">일정에 설명 보기</string>
+
+    <!-- Edit screen preference category -->
+    <string name="EPr_edit_screen_options">화면 설정 편집하기</string>
+
+    <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
+    <string name="EPr_beastMode_title">화면 정렬 순서 편집하기</string>
 
-    
-    <!-- Resources for built-in timers plug-in -->
-    
-    <!-- Task Edit Activity: Container Label -->
-    <string name="alarm_ACS_label">알람</string>
-    
-    <!-- Task Edit Activity: Add New Alarm -->
-    <string name="alarm_ACS_button">알람 추가</string>
-    
-    <string-array name="reminders_alarm">
-      <!-- reminders related to alarm -->
-      <item>알람!</item>
+    <string name="EPr_beastMode_shortcut">사용자 정의</string>
+
+    <string name="EPr_time_increment">5분 증가</string>
+
+    <string name="EPr_use_date_shortcuts">날짜를 짧게 사용하기</string>
+
+    <string name="EPr_show_timer_shortcut">타이머 바로가기 보기</string>
+
+    <!-- slide 35h -->
+    <string name="EPr_beastMode_desc">일정 편집화면 레이아웃 설정하기</string>
+    <!-- slide 35j -->
+    <string name="EPr_beastMode_reset">기본값으로 초기화하기</string>
+
+    <string name="EPr_beastMode_hint">각 줄의 왼쪽 손잡이를 끌어서 일정 편집 화면을 사용자 정의하기</string>
+
+    <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
+    <string name="EPr_showNotes_desc_disabled">설명은 일정 편집 화면에서 수정할 수 있습니다.</string>
+    <!-- Preference: Task List Show Notes Description (enabled) -->
+    <string name="EPr_showNotes_desc_enabled">설명을 항상 표시합니다</string>
+
+    <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
+    <string name="EPr_compressTaskRows_title">작은 일정 표시줄</string>
+    <!-- slide 34j -->
+    <string name="EPr_compressTaskRows_desc">일정의 가로줄을 제목에 맞춰 축소하기</string>
+
+    <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
+    <!-- slide 34k-->
+
+    <!-- slide 34b: Preferences: Wrap task titles to two lines -->
+    <string name="EPr_fullTask_title">전체 일정 제목 보기</string>
+    <string name="EPr_fullTask_desc_enabled">전체 일정 제목을 표시합니다</string>
+    <!-- slide 34h -->
+    <string name="EPr_fullTask_desc_disabled">일정 제목의 첫 두 줄을 표시합니다</string>
+
+    <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
+    <string name="EPr_ideaAuto_title">아이디어 탭 자동 불러오기</string>
+    <!-- slide 32c -->
+    <string name="EPr_ideaAuto_desc_enabled">아이디어 탭의 웹 검색은 탭을 클릭했을 때 실행됩니다</string>
+    <string name="EPr_ideaAuto_desc_disabled">아이디어 탭의 웹 검색은 수동으로 요청했을 때만 실행됩니다</string>
+
+    <!-- Preferences: task row style -->
+    <string-array name="EPr_task_row_styles">
+        <item>원래대로</item>
+        <item>간단히</item>
+        <item>제목만</item>
     </string-array>
-    
 
+    <string-array name="EPr_task_row_style_descriptions">
+        <item>제목을 두 줄로 줄이고 날짜를 오른쪽에 출력</item>
+        <item>제목을 한 줄로 줄이고 날짜와 목록을 그 아래에 출력</item>
+        <item>제목을 한줄에만</item>
+    </string-array>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- task row style title (%s -> style) -->
+    <string name="EPr_task_row_style_title">가로줄 스타일: %s</string>
 
-    
-  <!-- Resources for built-in backup plug-in -->
-  
-  <!-- ================================================= BackupPreferences == -->
+    <!-- Preference: custom filters enabled -->
+    <string name="EPr_use_filters_title">필터 사용하기</string>
+    <string name="EPr_use_filters_subtitle">사용자 필터를 만들어 봅시다</string>
 
-    <!-- slide 33c/48d: Backup Preferences Title -->    
-    <string name="backup_BPr_header">백업</string>
+    <!-- Preference: show list members in shared list -->
+    <string name="EPr_show_list_members_title">공유 목록 구성원 보기</string>
 
-    <!-- slide 48e/50c: Backup: Status Header -->    
-    <string name="backup_BPr_group_status">상태</string>
-    
-    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">최근 백업:\n%s</string>
-    <!-- Backup Status: last error failed. Keep it short! -->    
-    <string name="backup_status_failed">마지막 백업 실패함</string>
-    <!-- Backup Status: error subtitle -->    
-    <string name="backup_status_failed_subtitle">(오류 내용을 보려면 누르세요)</string>
-    <!-- slide 48a: Backup Status: never backed up -->    
-    <string name="backup_status_never">백업한 적이 없습니다!</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_simple_input_boxes">간편 텍스트 박스</string>
 
-    <!-- slide 48f/ 50e: Backup Options Group Label -->    
-    <string name="backup_BPr_group_options">설정</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_show_quickadd_controls">고급 빠른추가 조정</string>
 
-    <!-- slide 48b: Preference: Automatic Backup Title -->    
-    <string name="backup_BPr_auto_title">자동 백업</string>
-    <!-- Preference: Automatic Backup Description (when disabled) -->
-    <string name="backup_BPr_auto_disabled">자동으로 백업하지 않습니다</string>    
-    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
-    <string name="backup_BPr_auto_enabled">매일 백업합니다</string>
-    
-    <!-- Preference screen restoring Tasks Help -->
-    <!-- Preference screen Restoring Tasks Help Dialog Text-->
-    
-    <string name="backup_BPr_cloud_already_logged_in">Astrid.com에 이미 백업을 완료했습니다!</string>
-  
-  <!-- ================================================= BackupActivity == -->
-
-  <!-- slide 48c: backup activity label -->
-  <string name="backup_BAc_label">백업 관리</string>
-
-  <!-- backup activity title -->
-  <string name="backup_BAc_title">백업 관리하기</string>
-
-  <!-- backup activity import button -->
-  <string name="backup_BAc_import">일정 가져오기</string>
-
-  <!-- backup activity export button -->
-  <string name="backup_BAc_export">일정 내보내기</string>
-  
-  <!-- backup activity cloud (Astrid.com) option -->
-  <string name="backup_BAc_cloud">Astrid.com 의 무료 클라우드에 백업하려면 클릭하세요</string>
-    
-  <!-- ============================================== Importer / Exporter == -->
-  
-  <!-- Message displayed when error occurs -->
-  <string name="backup_TXI_error">가져오기 오류</string>
-    
-  <string name="export_toast">%1$s 를 %2$s 로 백업함.</string>
-    
-  <string name="export_toast_no_tasks">내보낼 일정 없음.</string>
-  
-  <!-- Progress Dialog Title for exporting -->    
-  <string name="export_progress_title">내보내는 중...</string>
-  
-  <!-- Backup: Title of Import Summary Dialog -->
-  <string name="import_summary_title">간편 복원</string>
-    
-  <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">파일 %1$s: %2$s 개의 일정 포함.\n\n
-%3$s 개 가져오기 성공,\n
-%4$s 개 이미 존재,\n
-%5$s 개 에러 발생\n</string>
-  
-  <!-- Progress Dialog Title for importing -->    
-  <string name="import_progress_title">가져오는 중...</string>
-  
-  <!-- Progress Dialog text for import reading task (%d -> task number)-->    
-  <string name="import_progress_read">일정 %d 읽는 중...</string>
-  
-  <!-- Backup: Dialog when unable to open a file -->  
-  
-  <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
-  <string name="DLG_error_sdcard">폴더에 접근 불가: %s</string>
-  
-  <!-- Backup: Dialog when unable to open SD card in general -->
-  <string name="DLG_error_sdcard_general">SD 카드에 접근할 수 없습니다!</string>
-    
-  <!-- Backup: File Selector dialog for import -->
-  <string name="import_file_prompt">복원할 파일을 선택하세요</string>    
-        
+    <!-- Preference: don\'t show plus button until input present -->
+    <string name="EPr_hide_plus_button">플러스 버튼 감추기</string>
 
+    <!-- Preference: menu items -->
+    <string name="EPr_menu_items">메뉴 항목</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Preference: list view -->
+    <string name="EPr_list_view">목록 보기</string>
 
+    <!-- Preference: task edit comments -->
+    <string name="EPr_show_task_edit_comments">일정 편집에서 댓글 보기</string>
 
-  <!-- ================================================== AndroidManifest == -->
-
-  <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
-  <string name="app_name">아스트리드 일정</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="read_permission_label">아스트리드 권한</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="read_permission_desc">일정 읽기, 일정 필터 보기</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="write_permission_label">아스트리드 권한</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="write_permission_desc">새 일정 생성하기, 기존 일정 편집하기</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-    
-  <!-- question for deleting tasks -->
-  <string name="DLG_delete_this_task_question">이 일정을 삭제할까요?</string>
-
-  <!-- question for deleting items (%s => item name) -->
-  <string name="DLG_delete_this_item_question">이 항목을 삭제할까요: %s?</string>
-    
-  <!-- Progress dialog shown when upgrading -->
-  <string name="DLG_upgrading">일정 업그레이드 중...</string>
-  
-  <!-- Title for dialog selecting a time (hours and minutes) -->
-  <string name="DLG_hour_minutes">시간 (시 : 분)</string>
-  
-  <!-- Dialog for Astrid having a critical update -->
-  <string name="DLG_please_update">안드로이드 마켓에서 아스트리드를 최신버전으로 
-업데이트해야 합니다! 계속하기 전에 업데이트하거나 
-잠시 기다려 주세요.</string>
-
-  <!-- Button for going to Market -->
-
-  <!-- Button for accepting EULA -->
-  <string name="DLG_accept">동의합니다</string>
-
-  <!-- Button for declining EULA -->
-  <string name="DLG_decline">거절합니다</string>
-
-  <!-- EULA title -->
-  <string name="DLG_eula_title">Astrid 사용 약관</string>
-
-  <!-- Progress Dialog generic text -->
-  <string name="DLG_please_wait">기다려 주십시오</string>
-  
-  <!-- Dialog - loading -->
-  <string name="DLG_loading">불러오는 중...</string>
-  
-  <!-- Dialog - dismiss -->
-
-  <!-- slide 20d -->
-  <string name="DLG_ok">확인</string>
-  <!-- slide 36g -->
-  <string name="DLG_cancel">취소</string>
-  
-  <string name="DLG_more">더 보기</string>
-  
-  <string name="DLG_undo">실행 취소</string>
-  
-  <string name="DLG_warning">주의</string>
-  
-  <!-- =============================================================== UI == -->
-  
-  <!-- Label for DateButtons with no value -->
-  <string name="WID_dateButtonUnset">누르세요</string>
-  
-  <!-- String formatter for DateButtons ($D => date, $T => time) -->
-  
-  <!-- String formatter for Disable button -->
-  
-  <!--  ============================================================= notes -->
-  
-  <!-- Note Exposer -->    
-  
-  <!-- Note Exposer / Comments -->    
-  
-  <!-- EditNoteActivity - no comments -->
-  <string name="ENA_no_comments">아직 활동내역이 없음</string>
-    
-  <!-- EditNoteActivity - no username for comment -->
-  <string name="ENA_no_user">누군가</string>
-  
-  <!-- EditNoteActivity - refresh comments -->
-  <string name="ENA_refresh_comments">댓글 새로고침</string>
-  
-  <!-- ================================================= TaskListActivity == -->
-  
-  <!-- slide 8b: Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">일정이 없네요!\n추가할까요?</string>
-  
-  <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->    
-  <string name="TLA_no_items_person">%s 님은 당신과 공유한 일정이 없습니다</string>
-  
-  <!-- Menu: Adjust Sort and Hidden Task Settings -->    
-  <string name="TLA_menu_sort">정렬</string>
-  
-  <!-- Menu: Sync Now -->    
-  <string name="TLA_menu_sync">지금 동기화</string>
-  
-  <!-- Menu: Search -->
-  <string name="TLA_menu_search">검색</string>
-  
-  <!-- Menu: Tasks -->
-  <string name="TLA_menu_lists">목록</string>
-
-  <!-- Menu: Friends -->
-  <string name="TLA_menu_friends">사람들</string>
-
-  <!-- Menu: Featured Lists -->
-  <string name="TLA_menu_featured_lists">기능 목록</string>
-
-  <!-- Menu: Suggestions -->
-  <string name="TLA_menu_suggestions">제안</string>
-  
-  <!-- Menu: Tutorial -->
-
-  <!-- Menu: Settings -->    
-  <string name="TLA_menu_settings">설정</string>
-  
-  <!-- slide 30b: Menu: Support -->
-  <string name="TLA_menu_support">지원</string>
-  
-  <!-- Search Label-->
-  
-  <!-- Window title for displaying Custom Filter -->
-  <string name="TLA_custom">사용자 설정</string>
-  
-  <!-- slide 8d: Quick Add Edit Box Hint-->
-  <string name="TLA_quick_add_hint">일정 추가하기</string>
-  
-  <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
-  <string name="TLA_quick_add_hint_assign">%s 님의 일정 추가하기</string>
-  
-  <!-- Notification Volumne notification-->
-  <string name="TLA_notification_volume_low">알림를 껐습니다. 아스트리드 알림 소리를 들을 수 없습니다!</string>
-  
-  <!-- Notifications disabled warning -->
-  <string name="TLA_notification_disabled">Astrid 알림을 사용하지 않습니다! 어떤 알림도 받을 수 없을 것입니다.</string>
-  
-  <string-array name="TLA_filters">
-      <item>실행중</item>
-      <item>오늘</item>
-      <item>곧</item>
-      <item>지연</item>
-      <item>마침</item>
-      <item>숨김</item>      
-  </string-array>
-  
-  <!-- Title for confirmation dialog after quick add markup -->
-  <string name="TLA_quickadd_confirm_title">\"%s\" 라고 말했습니다</string>
-  
-  <!-- Text for speech bubble in dialog after quick add markup -->
-  <!-- First string is task title, second is due date, third is priority -->
-  <string name="TLA_quickadd_confirm_speech_bubble">기한이 %2$s 인 일정 \"%1$s\" 을 %3$s 에 만들었습니다</string>
-  
-  <string name="TLA_quickadd_confirm_speech_bubble_date">%s</string>
-  
-  <string name="TLA_quickadd_confirm_hide_helpers">더 이상 확인을 하지 않습니다</string>
-  
-  
-  <!-- Title for alert on new repeating task. %s-> task title -->
-  <string name="TLA_repeat_scheduled_title">새 반복 일정 %s</string>
-  
-  <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
-  <string name="TLA_repeat_scheduled_speech_bubble">이 일정을 %s마다 알려 주겠습니다.</string>
-  
-  <string-array name="TLA_priority_strings">
-      <item>최우선 순위</item>
-      <item>높은 순위</item>
-      <item>보통 순위</item>
-      <item>낮은 순위</item>
-  </string-array>
-  <!-- slide 22a -->
-  <string name="TLA_all_activity">모든 활동내역</string>
-  
-  <!-- ====================================================== TaskAdapter == -->
-  
-  <!-- Format string to indicate task is hidden (%s => task name) -->
-  <string name="TAd_hiddenFormat">%s [숨김]</string>
-  
-  <!-- Format string to indicate task is deleted (%s => task name) -->
-  <string name="TAd_deletedFormat">%s [지움]</string>
-  
-  <!-- Displayed when adapter is flung (scrolled quickly) -->
-  
-  <!-- slide 22b: indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">일정 완료\n%s</string>
-  
-  <!-- slide 15a: Action Button: edit task -->
-  <string name="TAd_actionEditTask">편집</string>
-  
-  <!-- Context Item: edit task -->
-  <string name="TAd_contextEditTask">일정 편집하기</string>
-
-  <!-- Context Item: copy task -->
-  <string name="TAd_contextCopyTask">일정 복사하기</string>
-
-  <!-- Context Item: delete task -->
-  <string name="TAd_contextDeleteTask">일정 지우기</string>
-
-  <!-- Context Item: undelete task -->
-  <string name="TAd_contextUndeleteTask">일정 복구하기</string>
-
-  <!-- Context Item: purge task -->
-  <string name="TAd_contextPurgeTask">일정 비우기</string>
-  
-  <!-- ============================================== SortSelectionDialog == -->
-  
-  <!-- slide 23a: Sort Selection: dialog title -->    
-  <string name="SSD_title">정렬, 하위일정 및 숨김</string>
-  
-  <!-- slide 23h:  Hidden: title -->
-  <string name="SSD_hidden_title">숨긴 일정</string>
-  
-  <!-- Hidden Task Selection: show completed tasks -->    
-  <string name="SSD_completed">완료한 일정 보기</string>
-  
-  <!-- Hidden Task Selection: show hidden tasks -->    
-  <string name="SSD_hidden">숨긴 일정 보기</string>
-  
-  <!-- Hidden Task Selection: show deleted tasks -->    
-  <string name="SSD_deleted">지운 일정 보기</string>
-  
-  <!-- Sort Selection: drag with subtasks -->
-  <string name="SSD_sort_drag">수동 정렬 (하위일정 포함)</string>
-  
-  <!-- slide 23b: Sort Selection: smart sort -->
-  <string name="SSD_sort_auto">Astrid 스마트 정렬</string>
-  
-  <!-- slide 23e: Sort Selection: sort by alpha -->
-  <string name="SSD_sort_alpha">제목 순서</string>
-  
-  <!-- slide 23c: Sort Selection: sort by due date -->
-  <string name="SSD_sort_due">마감일 순서</string>
-  
-  <!-- slide 23d: Sort Selection: sort by importance -->
-  <string name="SSD_sort_importance">우선순위 순서로</string>
-  
-  <!-- slide 23f: Sort Selection: sort by modified date -->
-  <string name="SSD_sort_modified">최종 수정일 순서</string>
-  
-  <!-- slide 23g: Sort Selection: reverse -->
-  <string name="SSD_sort_reverse">역순 정렬</string>
-  
-  <!-- slide 23j: Sort Button: sort temporarily -->
-  <string name="SSD_save_temp">한번 정렬</string>
-  
-  <!-- slide 23i: Sort Button: sort permanently -->
-  <string name="SSD_save_always">항상 정렬</string>
-  
-  <!-- =============================================== FilterListActivity == -->
-  
-  <!-- Astrid Filter Shortcut -->    
-  <string name="FSA_label">목록이나 필터</string>
-
-  <!-- Filter List Activity Title -->    
-  
-  <!-- Displayed when loading filters -->    
-  
-  <!-- Context Menu: Create Shortcut -->    
-  <string name="FLA_context_shortcut">바탕화면에 바로가기 만들기</string>
-  
-  <!-- Menu: Search -->
-  
-  <!-- Menu: Help -->    
-  
-  <!-- slide 28c: Create Shortcut Dialog Title -->    
-  <string name="FLA_shortcut_dialog_title">바탕화면에 바로가기 만들기</string>
-  
-  <!-- Create Shortcut Dialog (asks to name shortcut) -->    
-  <string name="FLA_shortcut_dialog">바로가기 이름:</string>
-  
-  <!-- Search Hint-->
-  <string name="FLA_search_hint">일정 검색하기</string>
-  
-  <!-- Search Filter name (%s => query) -->
-  <string name="FLA_search_filter">\'%s\' 검색 중</string>
-  
-  <!-- Toast: created shortcut (%s => label) -->
-  <string name="FLA_toast_onCreateShortcut">바로가기 생성: %s</string>
-  
-  <!-- Menu: new filter -->
-  <string name="FLA_new_filter">새 필터</string>
-  
-  <!-- slide 10e: Button: new list -->
-  <string name="FLA_new_list">새 목록</string>
-  
-  <!-- Alert when creating a shortcut without selecting a filter -->
-  <string name="FLA_no_filter_selected">필터를 선택하지 않았습니다! 필터나 목록을 선택하세요.</string>
-  
-  <!-- ================================================= TaskEditActivity == -->
-  
-  <!-- Title when editing a task (%s => task title) -->
-  
-  <!-- Title when creating a new task -->
-  
-  <!-- Task title label -->
-  
-  <!-- Task when label -->
-  <string name="TEA_when_header_label">언제</string>
-  
-  <!-- Task title hint (displayed when edit box is empty) -->
-  <string name="TEA_title_hint">일정 이름</string>
-  
-  <!-- Task importance label -->
-  <string name="TEA_importance_label">우선순위</string>
-  
-  <!-- Task due date hint -->
-  <string name="TEA_deadline_hint">마감일 설정</string>
-  
-  <!-- Task assigned to string (%s -> assigned person name) -->
-  <string name="TEA_assigned_to">%s 님에게 할당</string>
-  
-  <!-- Task urgency specific time checkbox -->
-  <string name="TEA_urgency_specific_time">특정한 시간에?</string>
-  
-  <!-- Task urgency specific time title when specific time false -->
-  <string name="TEA_urgency_none">없음</string>
-  
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_label">숨기기 기간:</string>
-
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_display">%s 까지 숨기기</string>
-  
-  <!-- Task hide until toast -->
-  <string name="TEA_hideUntil_message">%s 까지 일정을 숨깁니다</string>
-  
-  <!-- Task editing data being loaded label -->
-  <string-array name="TEA_loading"><item>불러오는 중...</item></string-array>
-  
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_note_label">설명</string>
-
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_notes_empty">설명</string>
-  
-  <!-- Task note hint -->
-  <string name="TEA_notes_hint">일정 내용을 입력하세요</string>
-  
-  <!-- Estimated time label -->
-  <string name="TEA_estimatedDuration_label">일정 완료 예상 시간은?</string>
-  
-  <!-- Elapsed time label -->
-  <string name="TEA_elapsedDuration_label">일정에 이미 소모한 시간</string>
-
-  <!-- Menu: Save -->    
-  <string name="TEA_menu_save">변경사항 저장</string>
-  
-  <!-- Menu: Don\'t Save -->
-  <string name="TEA_menu_discard">저장하지 않음</string>
-  
-  <!-- Menu: Delete Task -->
-  <string name="TEA_menu_delete">일정 지우기</string>
-  
-  <!-- Menu: Task comments -->
-  <string name="TEA_menu_refresh_comments">댓글 새로고침</string>
-
-  <string name="TEA_menu_comments">댓글</string>
-  
-   <!-- Toast: task saved with deadline (%s => preposition + time units) -->
-  <string name="TEA_onTaskSave_due">일정 저장: 마감일 %s</string>
-  
-  <!-- Toast: task saved without deadlines -->
-  <string name="TEA_onTaskSave_notDue">일정을 저장했습니다</string>
-  
-  <!-- Toast: task was not saved -->
-  
-  <!-- Toast: task was deleted -->
-  
-  <!-- slide 15b: Task edit tab: activity -->
-  <string name="TEA_tab_activity">활동 내역</string>
-  
-  <!-- slide 15e:  Task edit tab: more editing settings -->
-  <string name="TEA_tab_more">세부 사항</string>
-  
-  <!-- slide 15d: Task edit tab: web services -->
-  <string name="TEA_tab_web">아이디어</string>
-  
-  <string name="TEA_timer_est">동부표준시 %s</string>
-
-  <string name="TEA_timer_elap">경과 시간: %s</string>
-  
-  <string-array name="TEA_urgency">
-      <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
-      <item>기한 없음</item>
-      <item>특정한 날짜</item>
-      <item>오늘</item>
-      <item>내일</item>
-      <item>(며칠 후)</item>
-      <item>다음 주</item>
-      <item>2주</item>
-      <item>다음 달</item>
-  </string-array>
-  
-  <string name="TEA_no_time">시한 없음</string>
-      
-  <string-array name="TEA_hideUntil">
-      <!-- hideUntil: labels for edit page. -->
-      <item>사용안함</item>
-      <item>마감일</item>
-      <item>마감 시간</item>
-      <item>마감 하루 전</item>
-      <item>마감 일주일 전</item>
-      <item>특정한 요일/시간</item>
-  </string-array>
-  
-  <!-- Task edit control set descriptors -->
-
-  <!-- slide 9b/35i -->
-  <string name="TEA_control_who">누가</string>
-
-  <!-- slide 9c/ 35a -->
-  <string name="TEA_control_when">언제</string>
-  <!-- slide 35b -->
-  <string name="TEA_control_more_section">----자세히----</string>
-  <!-- slide 16a/35c -->
-  <string name="TEA_control_importance">우선순위</string>  
-  <!-- slide 16b/35d -->
-  <string name="TEA_control_lists">목록</string>  
-  <!-- slide 16c/35e -->
-  <string name="TEA_control_notes">설명</string>  
-  
-  <string name="TEA_control_files">파일</string>
-
-  <!-- slide 16e / slide 35g-->
-  <string name="TEA_control_reminders">일정 알림</string>
-
-  <!-- slide 16f -->
-  <string name="TEA_control_timer">타이머 조절</string>
-  
-  <string name="TEA_control_hidden_section">----항상 숨김----</string>
-  
-  <string name="hide_until_prompt">내 목록에 표시</string>
-  
-  <!-- Add Ons tab when no add-ons found -->
-  
-  <!-- Add Ons button -->
-  
-  <!-- More row -->
-  
-  <!-- slide 15c: Text when no activity to show -->
-  <string name="TEA_no_activity">활동내역 없음</string>
-  
-  <!-- Text to load more activity -->
-  <string name="TEA_load_more">더 불러오기...</string>
-  
-  <!-- When controls dialog -->
-  <string name="TEA_when_dialog_title">마감일이 언제입니까?</string>
-  
-  
-  <string name="TEA_new_task">새 일정</string>
-  
-  <string name="WSV_click_to_load">이걸 완료할 방법을 찾으려면 여기를 누르세요!</string>
-  
-  <string name="WSV_not_online">저는 인터넷에 연결되었을 때 더 많은 일을 할 수 있습니다. 인터넷 연결을 확인해 주세요.</string>
-  
-  <string name="TEA_contact_error">죄송하지만 선택한 연락처의 이메일 주소를 찾을 수 없습니다.</string>
-  
-  <!-- ============================================= IntroductionActivity == -->
-  
-  <!-- slide 1a: Introduction Window title -->
-  
-  <!-- Button to agree to EULA -->
-  
-  <!-- Button to disagree with EULA -->
-  
-  <!-- ===================================================== MissedCallActivity == -->
-  
-  <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
-  <string name="MCA_title">%1$s\n받은 시간: %2$s</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_return_call">지금 전화하기</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_add_task">나중에 전화하기</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_ignore">무시하기</string>
-  
-  <!-- Missed call: dialog to ignore all missed calls title -->
-  <string name="MCA_ignore_title">모든 부재중 전화를 무시할까요?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls body -->
-  <string name="MCA_ignore_body">부재중 전화를 몇 번 무시했습니다. 아스트리드의 부재중 전화 알림을 중지할까요?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore all button -->
-  <string name="MCA_ignore_all">모든 전화 무시하기</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
-  <string name="MCA_ignore_this">이 전화만 무시하기</string>
-
-  <!-- Missed call: preference title -->
-  <string name="MCA_missed_calls_pref_title">부재중 전화 처리</string>
-
-  <!-- slide 49c: Missed call: preference description -->
-  <string name="MCA_missed_calls_pref_desc_enabled">아스트리드는 부재중 전화를 알려주고 회신할 수 있도록 알려줍니다</string>
-  <string name="MCA_missed_calls_pref_desc_disabled">아스트리드는 부재중 전화에 대해서 알리지 않습니다</string>
-
-  <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
-  <string name="MCA_task_title_name">%1$s 님에게 %2$s 에 다시 연락하세요</string>
-
-  <!-- Missed call: task title no name (%s -> number)-->
-  <string name="MCA_task_title_no_name">%s 님에게 다시 연락하세요</string>
-  
-  <!-- Missed call: schedule dialog title (%s -> name or number)-->
-  <string name="MCA_schedule_dialog_title">%s 님에게 다시 연락하세요...</string>
-  
-  <!-- Missed call speech bubble options -->
-  <string-array name="MCA_dialog_speech_options">
-      <item>그렇게 유명하다니 좋으시겠네요!</item>
-      <item>예이! 바로 당신같은 사람!</item>
-      <item>전화를 해서 기쁨을 줍시다!</item>
-      <item>사람들이 다시 전화를 걸어준다면 행복하지 않겠어요?</item>
-      <item>할 수 있어요!</item>
-      <item>항상 문자를 보낼 수 있잖아요...</item>
-  </string-array>
-  
-  
-  <!-- ======================================= Calendar reminder activity == -->
-  
-  <!-- Calendar remindeer ignore button -->
-  <string name="CRA_ignore">무시하기</string>
-  
-  <!-- Calendar event -->
-  <string name="CRA_title">모임 목록이 필요하세요?</string>
-  
-  <!-- Calendar reminder: dialog to ignore all missed calls title -->
-  <string name="CRA_ignore_title">모든 달력 이벤트를 무시할까요?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls body -->
-  <string name="CRA_ignore_body">몇몇의 달력 이벤트를 무시했습니다. 아스트리드가 그것을 물어보는 것을 중단할까요?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
-  <string name="CRA_ignore_all">모든 이벤트 무시하기</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
-  <string name="CRA_ignore_this">이 이벤트만 무시하기</string>
-  
-  <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
-  <string name="CRA_speech_bubble_start">%s 가 곧 시작될 것 같습니다. 활동 아이템 목록을 만들까요?</string>
-
-  <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
-  <string name="CRA_speech_bubble_end">%s 를 방금 마치신 것 같습니다. 활동 아이템 목록을 만들까요?</string>
-  
-  <!-- Calendar reminder: create list button -->
-  <string name="CRA_create_list">목록 만들기</string>
-
-  <!-- Calendar reminder: postpone button -->
-  <string name="CRA_postpone">연기하기</string>
-  
-  <!-- Calendar reminder: list exists dialog title -->
-  <string name="CRA_list_exists_title">목록이 이미 있습니다</string>
-  
-  <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
-  <string name="CRA_list_exists_body">%s 이름의 목록이 이미 있습니다. 이 이벤트를 위해 새로운 목록을 만들까요?</string>
-  
-  <!-- Calendar reminder: list exists dialog create new button -->
-  <string name="CRA_create_new">새 목록 만들기</string>
-
-  <!-- Calendar reminder: list exists dialog use existing button -->
-  <string name="CRA_use_existing">기존 목록 사용</string>
-  
-  <!-- Calendar remindr: created list (%s -> list name) -->
-  <string name="CRA_created_list_dialog">%s 목록을 만들었습니다.</string>
-  
-  <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
-  <string name="CRA_one_attendee">%s 님이 참석 중입니다.</string>
-
-  <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
-  <string name="CRA_two_attendees">%1$s 님과 %2$s 님이 참석 중입니다.</string>
-
-  <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
-  <string name="CRA_many_attendees">%1$s, %2$s, %3$d 님과 다른 분들이 참석 중입니다.</string>
-  
-  <!-- Calendar reminder: invitation prompt -->
-  <string name="CRA_invitation_prompt">초대할까요?</string>
-  
-  <!-- Calendar reminder: preference title -->
-  <string name="CRA_calendar_reminders_pref_title">달력 도우미</string>
-
-  <!-- Calendar reminder: pref description disabled -->
-  <string name="CRA_calendar_reminders_pref_desc_disabled">아스트리드는 다가오는 달력 이벤트를 알리지 않을 것입니다.</string>
-
-  <!-- Calendar reminder: pref description enabled -->
-  <string name="CRA_calendar_reminders_pref_desc_enabled">아스트리드는 다가오는 달력 이벤트를 알리고 당신이 준비하도록 할 것입니다</string>
-  
-  <!-- Calendar reminder: share list title -->
-  <string name="CRA_share_list_title">목록을 공유할까요?</string>
-  
-  <string name="CRA_invite_attendees">참석자 초대하기</string>
-
-  <string name="CRA_more_options">추가 설정</string>
-
-  <string name="CRA_dont_invite">아니요 괜찮습니다</string>
-
-  <!-- Calendar reminder: share list title when no other attendees exist-->
-  <string name="CRA_list_created_title">목록을 만들었습니다!</string>
-  
-  <!-- Calendar reminder: default new list name (%s -> event title) -->
-  <string name="CRA_default_list_name">활동 아이템: %s</string>
-  
-  <!-- ===================================================== HelpActivity == -->
-  
-  <!-- Help: Button to get support from our website -->
-    
-  <!-- ==================================================== UpdateService == -->
-  
-  <!-- Changelog Window Title -->
-  <string name="UpS_changelog_title">Astrid 의 새로운 기능</string>
-  
-  <!-- Updates Window Title -->
-  <string name="UpS_updates_title">최신 아스트리드 뉴스</string>
-  
-  <!-- Updats No Activity to show for offline users -->
-  <string name="UpS_no_activity_log_in">공유한 목록상의 활동내역과\n자신의 일정 진행 기록을\n보려면 로그인하세요.</string>
-  
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 31g: Preference Window Title -->
-  <string name="EPr_title">설정</string>
-  
-  <string name="EPr_share_astrid">아스트리드 공유하기</string>
-
-  <string name="EPr_share_astrid_summary">내가 즐겨찾는 소셜 네트워크에 아스트리드를 공유합니다</string>
-  
-  <!-- slide 46a -->
-  <string name="EPr_deactivated">비활성화됨</string>
-
-  <!-- slide 30i: Preference Category: Appearance Title -->
-  <string name="EPr_appearance_header">보기 설정</string>
-  
-  <!-- Preference Category: Appearance Summary -->
-  <string name="EPr_appearance_summary">테마, 위젯, 일정 표시줄, 화면 편집</string>
-  
-  <!-- FAQ Preference title -->
-  <string name="EPr_faq_title">자주 묻는 질문</string>
-  
-  <!-- Account status preference (%s -> account type) -->
-  <string name="EPr_account_title">계정: %s</string>
-
-  <!-- Support preferences summary -->
-  <string name="EPr_support_summary">사용 안내, 자주 묻는 질문, 정보</string>
-  
-  <!-- slide 34a: Preference: Task List Font Size Title -->
-  <string name="EPr_fontSize_title">일정 목록 크기</string>
-  
-  <!-- Preference: Filters to show pref screen title -->
-  <string name="EPr_filters_to_show_title">표시할 필터</string>
-  
-  <!-- slide 32a: Preference: Show confirmation for smart reminders -->
-  <string name="EPr_showSmartConfirmation_title">스마트 알림시 확인하기</string>
-  
-  <!-- slide 34g: Preference: Task List Font Size Description -->                                                                                                                                                  
-  <string name="EPr_fontSize_desc">주 목록 페이지 폰트 크기</string>  
-  
-  <!-- Preferemce: Show task edit confirmation toasts -->
-  
-  <!-- slide 34c: Preference: Task List Show Notes -->
-  <string name="EPr_showNotes_title">일정에 설명 보기</string>
-  
-  <!-- Edit screen preference category -->
-  <string name="EPr_edit_screen_options">화면 설정 편집하기</string>
-  
-  <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
-  <string name="EPr_beastMode_title">화면 정렬 순서 편집하기</string>
-  
-  <string name="EPr_beastMode_shortcut">사용자 정의</string>
-  
-  <string name="EPr_time_increment">5분 증가</string>
-  
-  <string name="EPr_use_date_shortcuts">날짜를 짧게 사용하기</string>
-  
-  <string name="EPr_show_timer_shortcut">타이머 바로가기 보기</string>
-  
-  <!-- slide 35h -->
-  <string name="EPr_beastMode_desc">일정 편집화면 레이아웃 설정하기</string>
-  <!-- slide 35j -->
-  <string name="EPr_beastMode_reset">기본값으로 초기화하기</string>
-  
-  <string name="EPr_beastMode_hint">각 줄의 왼쪽 손잡이를 끌어서 일정 편집 화면을 사용자 정의하기</string>
-      
-  <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">설명은 일정 편집 화면에서 수정할 수 있습니다.</string>  
-  <!-- Preference: Task List Show Notes Description (enabled) -->
-  <string name="EPr_showNotes_desc_enabled">설명을 항상 표시합니다</string>
-  
-  <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
-  <string name="EPr_compressTaskRows_title">작은 일정 표시줄</string>
-  <!-- slide 34j -->
-  <string name="EPr_compressTaskRows_desc">일정의 가로줄을 제목에 맞춰 축소하기</string>
-  
-  <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
-  <!-- slide 34k-->
-  
-  <!-- slide 34b: Preferences: Wrap task titles to two lines -->
-  <string name="EPr_fullTask_title">전체 일정 제목 보기</string>
-  <string name="EPr_fullTask_desc_enabled">전체 일정 제목을 표시합니다</string>
-  <!-- slide 34h -->
-  <string name="EPr_fullTask_desc_disabled">일정 제목의 첫 두 줄을 표시합니다</string>
-  
-  <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
-  <string name="EPr_ideaAuto_title">아이디어 탭 자동 불러오기</string>
-  <!-- slide 32c -->
-  <string name="EPr_ideaAuto_desc_enabled">아이디어 탭의 웹 검색은 탭을 클릭했을 때 실행됩니다</string>
-  <string name="EPr_ideaAuto_desc_disabled">아이디어 탭의 웹 검색은 수동으로 요청했을 때만 실행됩니다</string>
-  
-  <!-- Preferences: task row style -->
-  <string-array name="EPr_task_row_styles">
-      <item>원래대로</item>
-      <item>간단히</item>
-      <item>제목만</item>
-  </string-array>
-  
-  <string-array name="EPr_task_row_style_descriptions">
-      <item>제목을 두 줄로 줄이고 날짜를 오른쪽에 출력</item>
-      <item>제목을 한 줄로 줄이고 날짜와 목록을 그 아래에 출력</item>
-      <item>제목을 한줄에만</item>
-  </string-array>
-  
-  <!-- task row style title (%s -> style) -->
-  <string name="EPr_task_row_style_title">가로줄 스타일: %s</string>
-  
-  <!-- Preference: custom filters enabled -->
-  <string name="EPr_use_filters_title">필터 사용하기</string>
-  <string name="EPr_use_filters_subtitle">사용자 필터를 만들어 봅시다</string>
-
-  <!-- Preference: show list members in shared list -->
-  <string name="EPr_show_list_members_title">공유 목록 구성원 보기</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_simple_input_boxes">간편 텍스트 박스</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_show_quickadd_controls">고급 빠른추가 조정</string>
-
-  <!-- Preference: don\'t show plus button until input present -->
-  <string name="EPr_hide_plus_button">플러스 버튼 감추기</string>
-
-  <!-- Preference: menu items -->
-  <string name="EPr_menu_items">메뉴 항목</string>
-
-  <!-- Preference: list view -->
-  <string name="EPr_list_view">목록 보기</string>
-
-  <!-- Preference: task edit comments -->
-  <string name="EPr_show_task_edit_comments">일정 편집에서 댓글 보기</string>
-  
-  <!-- slide 30f/ 36f: Preference: Theme -->
-  <string name="EPr_theme_title">색상 테마</string>
-  <!-- Preference: Theme Description (%s => value) -->
-  <string name="EPr_theme_desc">현재: %s</string>  
-  <!-- Preference: Theme Description (android 1.6) -->
-  <string name="EPr_theme_desc_unsupported">설정은 안드로이드 2.0 이상이 필요합니다</string>
-  <!-- slide 32h/ 37b -->
-  <string name="EPr_theme_widget_title">위젯 테마</string>
-  
-  <!-- slide 30d/ 34f: Preference screen: all task row settings -->
-  <string name="EPr_taskRowPrefs_title">일정 표시줄 보기 설정</string>
-  
-  <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
-  <string name="EPr_use_contact_picker">기기의 연락처 사용하기</string>
-  <!-- slide 49b -->
-  <string name="EPr_use_contact_picker_desc_enabled">기기의 연락처 가져오기 옵션이 일정 할당시에 나타납니다</string>
-  <string name="EPr_use_contact_picker_desc_disabled">기기의 연락처 가져오기 옵션이 나타나지 않습니다</string>
-
-  <!-- slide 49i: Preferences: Third party addons -->
-  <string name="EPr_third_party_addons">외부 확장기능 사용하기</string>
-  <string name="EPr_third_party_addons_desc_enabled">외부 확장기능을 사용합니다</string>
-  <!-- slide 49d -->
-  <string name="EPr_third_party_addons_desc_disabled">외부 확장기능을 사용하지 않습니다</string>
-  
-  <!-- Preferences: ideas tab -->
-  <string name="EPr_ideas_tab_enabled">일정 아이디어</string>
-  <string name="EPr_ideas_tab_description">일정 완료에 도움이 되는 아이디어를 얻습니다.</string>
-  
-  <!-- Preferences: calendar event start time -->
-  <string name="EPr_cal_end_or_start_at_due_time">달력 이벤트 시간</string>
-  <string name="EPr_cal_end_at_due_time">설정한 시간에 달력 이벤트 종료</string>
-  <string name="EPr_cal_start_at_due_time">설정한 시간에 달력 이벤트 시작</string>
-  
-  <string name="EPr_force_phone_layout">스마트폰의 레이아웃 사용하기</string>
-
-  <string name="EPr_show_featured_lists">주요 기능 목록 보기</string>
-  
-  <!-- Configurations -->
-  <string name="EPr_configurations_title">환경 설정하기</string>
-  <string name="EPr_config_default">기본값</string>
-  <string name="EPr_config_lite">아스트리드 라이트</string>
-  
-  <!-- Dialog title when setting preference configuration -->
-  <string name="EPr_config_dialog_title">환경을 설정할까요?</string>
-  <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
-  <string name="EPr_config_dialog_text">설정을 %s 환경으로 초기화할까요?</string>
-  
-  <!-- default configuration name for the above dialog -->
-  <string name="EPr_config_dialog_default_id">기본값</string>
-  
-  <!-- Preference title for showing save and cancel buttons in task edit page -->
-  <string name="EPr_show_save_and_cancel">저장과 취소 보이기</string>
-  
-  
-  <!-- Swipe between lists -->
-  <!-- Preference: swipe between lists performance -->
-  <string name="EPr_swipe_lists_performance_title">목록간 스와이프 이동하기</string>
-  
-  <string-array name="EPr_swipe_lists_performance_mode">
-      <item>스와이프 사용안함</item>
-      <item>메모리 보존하기</item>
-      <item>보통 성능</item>
-      <item>높은 성능</item>
-  </string-array>
-  
-  <string-array name="EPr_swipe_lists_performance_desc">
-  <!-- slide 49a -->
-      <item>목록 간 스와이프 이동 사용안함</item>
-      <item>느린 성능</item>
-      <item>기본 설정</item>
-      <item>더 많은 시스템 자원을 사용</item>
-  </string-array>
-    
-  <string name="swipe_lists_helper_title">목록간 스와이프 이동하기</string>
-  <string name="swipe_lists_helper_header">목록간 빠른 이동하려면 좌우로 스와이프 이동하기</string>
-  <string name="swipe_lists_helper_subtitle">설정에 있는 설정 변경하기 -> 모양</string>
-
-  <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
-  
-  <string-array name="EPr_default_reminders_mode">
-      <!-- reminders duration: labels for "Task Defaults" preference item. -->
-      <item>@string/TEA_reminder_mode_once</item>
-      <item>@string/TEA_reminder_mode_five</item>
-      <item>@string/TEA_reminder_mode_nonstop</item>
-  </string-array>
-    
-  <string-array name="EPr_themes">
-    <!-- theme_settings: labels for Theme preference menu -->
-    <!-- slide 36a-->
-    <item>낮 - 파란색</item>
-    <!-- slide 36b -->
-    <item>낮 - 빨간색</item>
-    <!-- slide 36b -->
-    <item>하늘색</item>
-    <!-- slide 36c -->
-    <item>밤</item>
-    <!-- slide 36d -->
-    <item>투명하게 (흰색 본문)</item>
-    <!-- slide 36e -->
-    <item>투명 (검은색 텍스트)</item>
-  </string-array>
-  
-  <string-array name="EPr_themes_widget">
-    <!-- slide 32i / 37a-->
-    <item>어플과 동일하게</item>
-    <item>낮 - 파란색</item>
-    <item>낮 - 빨간색</item>
-    <item>하늘색</item>
-    <item>밤</item>
-    <item>투명하게 (흰색 본문)</item>
-    <item>투명하게 (검은색 본문)</item>
-    <item>오래된 스타일</item>
-  </string-array>
-  
-  <!-- ========================================== Task Management Settings == -->
-
-  <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
-  <string name="EPr_manage_header">오래된 일정 관리하기</string>
-  <!-- slide 47d -->
-  <string name="EPr_manage_delete_completed">완료한 일정 지우기</string>
-  <string name="EPr_manage_delete_completed_message">완료한 일정을 모두 삭제하시겠습니까?</string>
-  <!-- slide 47a -->
-  <string name="EPr_manage_delete_completed_summary">삭제한 일정은 하나씩 삭제를 취소할 수 있습니다</string>
-  <string name="EPr_manage_delete_completed_status">%d 일정을 삭제했습니다!</string>
-  <!-- slide 47e -->
-  <string name="EPr_manage_purge_deleted">삭제한 일정을 비우기</string>
-  <string name="EPr_manage_purge_deleted_message">삭제한 일정을 모두 비울까요?\n\n비운 일정은 다시 살릴 수 없습니다!</string>
-  <string name="EPr_manage_purge_deleted_status">%d 일정을 비웠습니다!</string>
-  <!-- slide 47b-->
-  <string name="EPr_manage_purge_deleted_summary">주의! 비운 일정은 백업 파일 없이 복구할 수 없습니다!</string>
-  <!-- slide 47h-->
-  <string name="EPr_manage_clear_all">모든 자료 삭제하기</string>
-  <string name="EPr_manage_clear_all_message">아스트리드의 모든 일정과 설정을 삭제할까요?\n\n경고: 되돌릴 수 없음!</string>
-
-  <!-- slide 47f -->
-  <string name="EPr_manage_delete_completed_gcal">완료한 일정의 달력 이벤트를 삭제하기</string>
-  <string name="EPr_manage_delete_completed_gcal_message">완료한 일정의 모든 이벤트를 정말 삭제할까요?</string>
-  <string name="EPr_manage_delete_completed_gcal_summary"></string>
-  <string name="EPr_manage_delete_completed_gcal_status">%d 달력 이벤트를 삭제했습니다!</string>
-      
-  <!-- slide 47g-->
-  <string name="EPr_manage_delete_all_gcal">일정의 모든 달력 이벤트 삭제하기</string>
-  <string name="EPr_manage_delete_all_gcal_message">일정의 모든 이벤트를 정말 삭제할까요?</string>
-  <string name="EPr_manage_delete_all_gcal_summary"></string>
-  <string name="EPr_manage_delete_all_gcal_status">%d 달력 이벤트를 삭제했습니다!</string>
-      
-  <!-- ==================================================== AddOnActivity == -->
-  
-  <!-- Add Ons Activity Title -->
-  <string name="AOA_title">확장기능</string>
-    
-  <!-- Add-on Activity: author for internal authors  -->
-  <string name="AOA_internal_author">아스트리드 팀</string>
-    
-  <!-- Add-on Activity: installed add-ons tab -->
-  <string name="AOA_tab_installed">설치된 항목</string>
-  
-  <!-- Add-on Activity - available add-ons tab -->
-  <string name="AOA_tab_available">추가 가능</string>
-  
-  <!-- Add-on Activity - free add-ons label -->
-  <string name="AOA_free">무료</string>
-  
-  <!-- Add-on Activity - menu item to visit add-on website -->
-  
-  <!-- Add-on Activity - menu item to visit android market -->
-  
-  <!-- Add-on Activity - when list is empty -->
-  <string name="AOA_no_addons">목록이 없습니다!</string>
-  
-  <string name="AOA_ppack_title">Astrid 파워 팩</string>
-  <string name="AOA_ppack_description">아스트리드를 지원하고 파워 팩(4x2, 4x4 위젯, 음성입력)으로 일을 좀 더 효율적으로 하세요. 오늘 사용해 보세요!</string>
-  <string name="AOA_locale_title">아스트리드 위치 플러그인</string>
-  <string name="AOA_locale_description">아스트리드에서 위치 앱을 사용합니다. 위치 앱에서 설정한 필터 조건에 따라 알림을 보내줍니다. 위치 서비스를 사용합니다.</string>
-  
-  <!-- ====================================================== TasksWidget == -->
-
-  <!-- Widget text when loading tasks -->
-  <string name="TWi_loading">로드 중…</string>
-
-  <!-- Widget configuration activity title: select a filter -->
-  <string name="WCA_title">열람할 일정 선택...</string>
-  
-  <!-- ======================================================== Waiting on me -->
-
-  <string name="wom_commented">%s님이 당신의 일정에 댓글을 달았습니다.</string>
-  <string name="wom_mentioned">%s님이 당신을 언급했습니다.</string>
-  <string name="wom_assigned">%s님이 당신에게 이것을 할당했습니다.</string>
-  <string name="wom_raised_pri">%s님이 우선순위를 올렸습니다.</string>
-  <string name="wom_changed_due">%s님이 마감일을 변경했습니다.</string>
-  <string name="wom_default">%s님이 당신의 주의를 원합니다.</string>
-  
-  <string name="wom_dismiss">해제하기</string>
-  <string name="wom_acknowledge">이것을 읽었습니다</string>
-
-  <!-- ============================================================= About == -->
-  
-  <!-- slide 30h: Title of "About" option in settings -->
-  <string name="p_about">아스트리드 정보</string>
-  
-  <!-- About text (%s => current version)-->
-  <string name="p_about_text">현재 버전: %s\n\n
-아스트리드는 오픈소스이며 Todoroo, Inc가 관리하고 있습니다.</string>
-
-  <!-- Title of "Help" option in settings -->
-  <string name="p_help">지원</string>
-  
-  <!-- slide 30c: Title of "Forums" option in settings -->
-  <string name="p_forums">포럼</string>
-  
-  <!-- Title of "Premium" option in settings -->
-  <string name="p_premium">프리미엄</string>
-  
-  <!-- ============================================================= Misc == -->
-  
-  <string name="feedback_positive_title">평가할까요?</string>
-
-  <string name="feedback_positive_body">도움이 되었다니 기쁘네요! 평가를 위해 잠시 시간을 내주실래요?</string>
-
-  <string name="feedback_negative_title">피드백을 남길까요?</string>
-
-  <string name="feedback_negative_body">문제가 있다니 미안합니다</string>
-
-  <string name="feedback_activity_error">마켓의 피드백 부분을 열수가 없습니다--당신의 기기에서 이용할 수 없는 것 같습니다.</string>
-  
-  <string name="feedback_positive_button">아스트리드 평가하기</string>
-
-  <string name="feedback_negative_button">피드백 남기기</string>
-  
-  <string name="feedback_not_now">지금은 안 됨</string>
-  
-  <string name="feedback_banner_text">당신에게 아스트리드는 어땠습니까?</string>
-  
-  <!-- Displayed when task killer found. %s => name of the application -->
-  <string name="task_killer_help">프로세스(%s)를 강제종료할 수 있는 앱을 사용하고 있는 것 같습니다! 
-가능하면 강제종료되지 않도록 제외목록에 포함시켜 주시기바랍니다. 
-강제종료시 일정이 완료되어도 알려줄 수 없습니다.\n</string>
-  
-  <!-- Task killer dialog ok button -->
-  <string name="task_killer_help_ok">아스트리드를 강제로 종료하지 않습니다!</string>
-    
-  <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
-  
-  <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
-  <string name="marketplace_description">아스트리드는 당신의 일정을 도와주는 오픈소스 일정/할일 관리 프로그램입니다. 
-일정의 완료 예정일을 알려 주거나, 태그, 동기화, 위치 플러그인, 위젯 등을 제공합니다.</string>
-  
-  <string name="DB_corrupted_title">손상된 데이터베이스</string>
-  
-  <string name="DB_corrupted_body">데이터베이스가 손상된 것 같습니다. 이 에러 메시지가 주기적으로 나타나면, 
-자료를 모두 지우고 (설정-&gt;동기화 &amp; 백업-&gt;오래된 일정 관리-&gt;모든 자료 삭제) 
-아스트리드의 백업에서 당신의 일정을 복구하시기 바랍니다. 
-(설정-&gt;동기화 &amp; 백업-&gt;백업-&gt;일정 불러오기)</string>
-      
-  <string name="market_unavailable">이 기기에서 마켓을 사용할 수 없습니다.</string>
-  
+    <!-- slide 30f/ 36f: Preference: Theme -->
+    <string name="EPr_theme_title">색상 테마</string>
+    <!-- Preference: Theme Description (%s => value) -->
+    <string name="EPr_theme_desc">현재: %s</string>
+    <!-- Preference: Theme Description (android 1.6) -->
+    <string name="EPr_theme_desc_unsupported">설정은 안드로이드 2.0 이상이 필요합니다</string>
+    <!-- slide 32h/ 37b -->
+    <string name="EPr_theme_widget_title">위젯 테마</string>
 
+    <!-- slide 30d/ 34f: Preference screen: all task row settings -->
+    <string name="EPr_taskRowPrefs_title">일정 표시줄 보기 설정</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
+    <string name="EPr_use_contact_picker">기기의 연락처 사용하기</string>
+    <!-- slide 49b -->
+    <string name="EPr_use_contact_picker_desc_enabled">기기의 연락처 가져오기 옵션이 일정 할당시에 나타납니다</string>
+    <string name="EPr_use_contact_picker_desc_disabled">기기의 연락처 가져오기 옵션이 나타나지 않습니다</string>
 
+    <!-- slide 49i: Preferences: Third party addons -->
+    <string name="EPr_third_party_addons">외부 확장기능 사용하기</string>
+    <string name="EPr_third_party_addons_desc_enabled">외부 확장기능을 사용합니다</string>
+    <!-- slide 49d -->
+    <string name="EPr_third_party_addons_desc_disabled">외부 확장기능을 사용하지 않습니다</string>
 
-  <!-- slide 32g: Preference Category: Defaults Title -->
-  <string name="EPr_defaults_header">새 일정 기본값</string>
-  <string name="EPr_defaults_summary">우선순위, 마감일, 달력에 추가하기</string>
-  
-  <!-- slide 41f:  Preference: Default Urgency Title -->
-  <string name="EPr_default_urgency_title">기본 중요도</string>
-  <!-- Preference: Default Urgency Description (%s => setting) -->
-  <string name="EPr_default_urgency_desc">현재: %s</string>
-  
-  <!-- slide 40a: Preference: Default Importance Title -->
-  <string name="EPr_default_importance_title">기본 우선순위</string>
-  <!-- Preference: Default Importance Description (%s => setting) -->
-  <string name="EPr_default_importance_desc">현재: %s</string>
-  
-  <!-- slide 42e: Preference: Default Hide Until Title -->
-  <string name="EPr_default_hideUntil_title">기본 숨기기 기간:</string>
-  <!-- Preference: Default Hide Until Description (%s => setting) -->
-  <string name="EPr_default_hideUntil_desc">현재: %s</string>
-  
-  <!-- slide 43e: Preference: Default Reminders Title -->
-  <string name="EPr_default_reminders_title">기본 알림</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_desc">현재: %s</string>
-  
-  <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
-  <string name="EPr_default_addtocalendar_title">달력에 추가하기 (기본값)</string>
-  <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
-  <string name="EPr_default_addtocalendar_desc_disabled">새 일정은 구글 달력에 이벤트를 만들지 않을 것입니다</string>
-  <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
-  <string name="EPr_default_addtocalendar_desc">새 일정을 달력에 추가합니다: \"%s\"</string>
-  
-  <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
-  <string name="EPr_default_reminders_mode_title">기본 벨소리/진동 형식</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_mode_desc">현재: %s</string>
-  
-  <string-array name="EPr_default_importance">
-    <!-- importance: labels for "Task Defaults" preference item. -->
-    <!-- slide 40b -->
-    <item>!!! (최우선)</item>
-    <item>!!</item>
-    <item>!</item>
-    <!-- slide 40c -->
-    <item>o (낮음)</item>
-  </string-array>
-  
-  <string-array name="EPr_default_urgency">
-    <!-- urgency: labels for "Task Defaults" preference item. -->
-    <!-- slide 41a-->
-    <item>기한 없음</item>
-    <!-- slide 41b -->
-    <item>오늘</item>
-    <!-- slide 41c-->
-    <item>내일</item>
-    <!-- slide 41d -->
-    <item>모레</item>
-    <!-- slide 41e -->
-    <item>다음 주</item>
-  </string-array>
-  
-  <string-array name="EPr_default_hideUntil">
-    <!-- hideUntil: labels for "Task Defaults" preference item. -->
-    <!-- slide 42a -->
-    <item>숨기지 않기</item>
-    <!-- slide 42b -->
-    <item>일정 마감일입니다</item>
-    <!-- slide 42c -->
-    <item>마감일 하루 전</item>
-    <!-- slide 42d-->
-    <item>마감일 1주일 전</item>
-  </string-array>
-  
-  <string-array name="EPr_default_reminders">
-    <!-- reminders: labels for "Task Defaults" preference item. -->
-    <!-- slide 43a -->
-    <item>기한 알림 없음</item>
-    <!-- slide 43b -->
-    <item>완료일에</item>
-    <!-- slide 43c -->
-    <item>마감일 이후</item>
-    <!-- slide 43d -->
-    <item>마감일이나 그 이후</item>
-  </string-array>
-  
-  <string-array name="EPr_default_addtocalendar">
-    <!-- addtocalendar: labels for "Task Defaults" preference item. -->
-    <item>@string/EPr_deactivated</item>
-  </string-array>      
+    <!-- Preferences: ideas tab -->
+    <string name="EPr_ideas_tab_enabled">일정 아이디어</string>
+    <string name="EPr_ideas_tab_description">일정 완료에 도움이 되는 아이디어를 얻습니다.</string>
 
+    <!-- Preferences: calendar event start time -->
+    <string name="EPr_cal_end_or_start_at_due_time">달력 이벤트 시간</string>
+    <string name="EPr_cal_end_at_due_time">설정한 시간에 달력 이벤트 종료</string>
+    <string name="EPr_cal_start_at_due_time">설정한 시간에 달력 이벤트 시작</string>
+
+    <string name="EPr_force_phone_layout">스마트폰의 레이아웃 사용하기</string>
+
+    <string name="EPr_show_featured_lists">주요 기능 목록 보기</string>
+
+    <!-- Configurations -->
+    <string name="EPr_configurations_title">환경 설정하기</string>
+    <string name="EPr_config_default">기본값</string>
+    <string name="EPr_config_lite">아스트리드 라이트</string>
+
+    <!-- Dialog title when setting preference configuration -->
+    <string name="EPr_config_dialog_title">환경을 설정할까요?</string>
+    <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
+    <string name="EPr_config_dialog_text">설정을 %s 환경으로 초기화할까요?</string>
+
+    <!-- default configuration name for the above dialog -->
+    <string name="EPr_config_dialog_default_id">기본값</string>
+
+    <!-- Preference title for showing save and cancel buttons in task edit page -->
+    <string name="EPr_show_save_and_cancel">저장과 취소 보이기</string>
+
+
+    <!-- Swipe between lists -->
+    <!-- Preference: swipe between lists performance -->
+    <string name="EPr_swipe_lists_performance_title">목록간 스와이프 이동하기</string>
+
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>스와이프 사용안함</item>
+        <item>메모리 보존하기</item>
+        <item>보통 성능</item>
+        <item>높은 성능</item>
+    </string-array>
+
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <!-- slide 49a -->
+        <item>목록 간 스와이프 이동 사용안함</item>
+        <item>느린 성능</item>
+        <item>기본 설정</item>
+        <item>더 많은 시스템 자원을 사용</item>
+    </string-array>
+
+    <string name="swipe_lists_helper_title">목록간 스와이프 이동하기</string>
+    <string name="swipe_lists_helper_header">목록간 빠른 이동하려면 좌우로 스와이프 이동하기</string>
+    <string name="swipe_lists_helper_subtitle">설정에 있는 설정 변경하기 -> 모양</string>
+
+    <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
+
+    <string-array name="EPr_default_reminders_mode">
+        <!-- reminders duration: labels for "Task Defaults" preference item. -->
+        <item>@string/TEA_reminder_mode_once</item>
+        <item>@string/TEA_reminder_mode_five</item>
+        <item>@string/TEA_reminder_mode_nonstop</item>
+    </string-array>
+
+    <string-array name="EPr_themes">
+        <!-- theme_settings: labels for Theme preference menu -->
+        <!-- slide 36a-->
+        <item>낮 - 파란색</item>
+        <!-- slide 36b -->
+        <item>낮 - 빨간색</item>
+        <!-- slide 36b -->
+        <item>하늘색</item>
+        <!-- slide 36c -->
+        <item>밤</item>
+        <!-- slide 36d -->
+        <item>투명하게 (흰색 본문)</item>
+        <!-- slide 36e -->
+        <item>투명 (검은색 텍스트)</item>
+    </string-array>
+
+    <string-array name="EPr_themes_widget">
+        <!-- slide 32i / 37a-->
+        <item>어플과 동일하게</item>
+        <item>낮 - 파란색</item>
+        <item>낮 - 빨간색</item>
+        <item>하늘색</item>
+        <item>밤</item>
+        <item>투명하게 (흰색 본문)</item>
+        <item>투명하게 (검은색 본문)</item>
+        <item>오래된 스타일</item>
+    </string-array>
+
+    <!-- ========================================== Task Management Settings == -->
+
+    <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
+    <string name="EPr_manage_header">오래된 일정 관리하기</string>
+    <!-- slide 47d -->
+    <string name="EPr_manage_delete_completed">완료한 일정 지우기</string>
+    <string name="EPr_manage_delete_completed_message">완료한 일정을 모두 삭제하시겠습니까?</string>
+    <!-- slide 47a -->
+    <string name="EPr_manage_delete_completed_summary">삭제한 일정은 하나씩 삭제를 취소할 수 있습니다</string>
+    <string name="EPr_manage_delete_completed_status">%d 일정을 삭제했습니다!</string>
+    <!-- slide 47e -->
+    <string name="EPr_manage_purge_deleted">삭제한 일정을 비우기</string>
+    <string name="EPr_manage_purge_deleted_message">삭제한 일정을 모두 비울까요?\n\n비운 일정은 다시 살릴 수 없습니다!
+    </string>
+    <string name="EPr_manage_purge_deleted_status">%d 일정을 비웠습니다!</string>
+    <!-- slide 47b-->
+    <string name="EPr_manage_purge_deleted_summary">주의! 비운 일정은 백업 파일 없이 복구할 수 없습니다!</string>
+    <!-- slide 47h-->
+    <string name="EPr_manage_clear_all">모든 자료 삭제하기</string>
+    <string name="EPr_manage_clear_all_message">아스트리드의 모든 일정과 설정을 삭제할까요?\n\n경고: 되돌릴 수 없음!</string>
+
+    <!-- slide 47f -->
+    <string name="EPr_manage_delete_completed_gcal">완료한 일정의 달력 이벤트를 삭제하기</string>
+    <string name="EPr_manage_delete_completed_gcal_message">완료한 일정의 모든 이벤트를 정말 삭제할까요?</string>
+    <string name="EPr_manage_delete_completed_gcal_summary"></string>
+    <string name="EPr_manage_delete_completed_gcal_status">%d 달력 이벤트를 삭제했습니다!</string>
+
+    <!-- slide 47g-->
+    <string name="EPr_manage_delete_all_gcal">일정의 모든 달력 이벤트 삭제하기</string>
+    <string name="EPr_manage_delete_all_gcal_message">일정의 모든 이벤트를 정말 삭제할까요?</string>
+    <string name="EPr_manage_delete_all_gcal_summary"></string>
+    <string name="EPr_manage_delete_all_gcal_status">%d 달력 이벤트를 삭제했습니다!</string>
+
+    <!-- ==================================================== AddOnActivity == -->
+
+    <!-- Add Ons Activity Title -->
+    <string name="AOA_title">확장기능</string>
+
+    <!-- Add-on Activity: author for internal authors  -->
+    <string name="AOA_internal_author">아스트리드 팀</string>
+
+    <!-- Add-on Activity: installed add-ons tab -->
+    <string name="AOA_tab_installed">설치된 항목</string>
+
+    <!-- Add-on Activity - available add-ons tab -->
+    <string name="AOA_tab_available">추가 가능</string>
+
+    <!-- Add-on Activity - free add-ons label -->
+    <string name="AOA_free">무료</string>
+
+    <!-- Add-on Activity - menu item to visit add-on website -->
+
+    <!-- Add-on Activity - menu item to visit android market -->
+
+    <!-- Add-on Activity - when list is empty -->
+    <string name="AOA_no_addons">목록이 없습니다!</string>
+
+    <string name="AOA_ppack_title">Astrid 파워 팩</string>
+    <string name="AOA_ppack_description">아스트리드를 지원하고 파워 팩(4x2, 4x4 위젯, 음성입력)으로 일을 좀 더 효율적으로 하세요. 오늘
+        사용해 보세요!
+    </string>
+    <string name="AOA_locale_title">아스트리드 위치 플러그인</string>
+    <string name="AOA_locale_description">아스트리드에서 위치 앱을 사용합니다. 위치 앱에서 설정한 필터 조건에 따라 알림을 보내줍니다. 위치
+        서비스를 사용합니다.
+    </string>
+
+    <!-- ====================================================== TasksWidget == -->
+
+    <!-- Widget text when loading tasks -->
+    <string name="TWi_loading">로드 중…</string>
+
+    <!-- Widget configuration activity title: select a filter -->
+    <string name="WCA_title">열람할 일정 선택...</string>
+
+    <!-- ======================================================== Waiting on me -->
+
+    <string name="wom_commented">%s님이 당신의 일정에 댓글을 달았습니다.</string>
+    <string name="wom_mentioned">%s님이 당신을 언급했습니다.</string>
+    <string name="wom_assigned">%s님이 당신에게 이것을 할당했습니다.</string>
+    <string name="wom_raised_pri">%s님이 우선순위를 올렸습니다.</string>
+    <string name="wom_changed_due">%s님이 마감일을 변경했습니다.</string>
+    <string name="wom_default">%s님이 당신의 주의를 원합니다.</string>
+
+    <string name="wom_dismiss">해제하기</string>
+    <string name="wom_acknowledge">이것을 읽었습니다</string>
+
+    <!-- ============================================================= About == -->
+
+    <!-- slide 30h: Title of "About" option in settings -->
+    <string name="p_about">아스트리드 정보</string>
+
+    <!-- About text (%s => current version)-->
+    <string name="p_about_text">현재 버전: %s\n\n
+        아스트리드는 오픈소스이며 Todoroo, Inc가 관리하고 있습니다.
+    </string>
+
+    <!-- Title of "Help" option in settings -->
+    <string name="p_help">지원</string>
+
+    <!-- slide 30c: Title of "Forums" option in settings -->
+    <string name="p_forums">포럼</string>
+
+    <!-- Title of "Premium" option in settings -->
+    <string name="p_premium">프리미엄</string>
+
+    <!-- ============================================================= Misc == -->
+
+    <string name="feedback_positive_title">평가할까요?</string>
+
+    <string name="feedback_positive_body">도움이 되었다니 기쁘네요! 평가를 위해 잠시 시간을 내주실래요?</string>
+
+    <string name="feedback_negative_title">피드백을 남길까요?</string>
+
+    <string name="feedback_negative_body">문제가 있다니 미안합니다</string>
+
+    <string name="feedback_activity_error">마켓의 피드백 부분을 열수가 없습니다--당신의 기기에서 이용할 수 없는 것 같습니다.</string>
+
+    <string name="feedback_positive_button">아스트리드 평가하기</string>
+
+    <string name="feedback_negative_button">피드백 남기기</string>
+
+    <string name="feedback_not_now">지금은 안 됨</string>
+
+    <string name="feedback_banner_text">당신에게 아스트리드는 어땠습니까?</string>
+
+    <!-- Displayed when task killer found. %s => name of the application -->
+    <string name="task_killer_help">프로세스(%s)를 강제종료할 수 있는 앱을 사용하고 있는 것 같습니다!
+        가능하면 강제종료되지 않도록 제외목록에 포함시켜 주시기바랍니다.
+        강제종료시 일정이 완료되어도 알려줄 수 없습니다.\n
+    </string>
+
+    <!-- Task killer dialog ok button -->
+    <string name="task_killer_help_ok">아스트리드를 강제로 종료하지 않습니다!</string>
+
+    <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
+
+    <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
+    <string name="marketplace_description">아스트리드는 당신의 일정을 도와주는 오픈소스 일정/할일 관리 프로그램입니다.
+        일정의 완료 예정일을 알려 주거나, 태그, 동기화, 위치 플러그인, 위젯 등을 제공합니다.
+    </string>
+
+    <string name="DB_corrupted_title">손상된 데이터베이스</string>
+
+    <string name="DB_corrupted_body">데이터베이스가 손상된 것 같습니다. 이 에러 메시지가 주기적으로 나타나면,
+        자료를 모두 지우고 (설정-&gt;동기화 &amp; 백업-&gt;오래된 일정 관리-&gt;모든 자료 삭제)
+        아스트리드의 백업에서 당신의 일정을 복구하시기 바랍니다.
+        (설정-&gt;동기화 &amp; 백업-&gt;백업-&gt;일정 불러오기)
+    </string>
+
+    <string name="market_unavailable">이 기기에서 마켓을 사용할 수 없습니다.</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 32g: Preference Category: Defaults Title -->
+    <string name="EPr_defaults_header">새 일정 기본값</string>
+    <string name="EPr_defaults_summary">우선순위, 마감일, 달력에 추가하기</string>
+
+    <!-- slide 41f:  Preference: Default Urgency Title -->
+    <string name="EPr_default_urgency_title">기본 중요도</string>
+    <!-- Preference: Default Urgency Description (%s => setting) -->
+    <string name="EPr_default_urgency_desc">현재: %s</string>
+
+    <!-- slide 40a: Preference: Default Importance Title -->
+    <string name="EPr_default_importance_title">기본 우선순위</string>
+    <!-- Preference: Default Importance Description (%s => setting) -->
+    <string name="EPr_default_importance_desc">현재: %s</string>
+
+    <!-- slide 42e: Preference: Default Hide Until Title -->
+    <string name="EPr_default_hideUntil_title">기본 숨기기 기간:</string>
+    <!-- Preference: Default Hide Until Description (%s => setting) -->
+    <string name="EPr_default_hideUntil_desc">현재: %s</string>
+
+    <!-- slide 43e: Preference: Default Reminders Title -->
+    <string name="EPr_default_reminders_title">기본 알림</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_desc">현재: %s</string>
+
+    <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
+    <string name="EPr_default_addtocalendar_title">달력에 추가하기 (기본값)</string>
+    <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
+    <string name="EPr_default_addtocalendar_desc_disabled">새 일정은 구글 달력에 이벤트를 만들지 않을 것입니다</string>
+    <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
+    <string name="EPr_default_addtocalendar_desc">새 일정을 달력에 추가합니다: \"%s\"</string>
+
+    <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
+    <string name="EPr_default_reminders_mode_title">기본 벨소리/진동 형식</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_mode_desc">현재: %s</string>
+
+    <string-array name="EPr_default_importance">
+        <!-- importance: labels for "Task Defaults" preference item. -->
+        <!-- slide 40b -->
+        <item>!!! (최우선)</item>
+        <item>!!</item>
+        <item>!</item>
+        <!-- slide 40c -->
+        <item>o (낮음)</item>
+    </string-array>
+
+    <string-array name="EPr_default_urgency">
+        <!-- urgency: labels for "Task Defaults" preference item. -->
+        <!-- slide 41a-->
+        <item>기한 없음</item>
+        <!-- slide 41b -->
+        <item>오늘</item>
+        <!-- slide 41c-->
+        <item>내일</item>
+        <!-- slide 41d -->
+        <item>모레</item>
+        <!-- slide 41e -->
+        <item>다음 주</item>
+    </string-array>
+
+    <string-array name="EPr_default_hideUntil">
+        <!-- hideUntil: labels for "Task Defaults" preference item. -->
+        <!-- slide 42a -->
+        <item>숨기지 않기</item>
+        <!-- slide 42b -->
+        <item>일정 마감일입니다</item>
+        <!-- slide 42c -->
+        <item>마감일 하루 전</item>
+        <!-- slide 42d-->
+        <item>마감일 1주일 전</item>
+    </string-array>
+
+    <string-array name="EPr_default_reminders">
+        <!-- reminders: labels for "Task Defaults" preference item. -->
+        <!-- slide 43a -->
+        <item>기한 알림 없음</item>
+        <!-- slide 43b -->
+        <item>완료일에</item>
+        <!-- slide 43c -->
+        <item>마감일 이후</item>
+        <!-- slide 43d -->
+        <item>마감일이나 그 이후</item>
+    </string-array>
+
+    <string-array name="EPr_default_addtocalendar">
+        <!-- addtocalendar: labels for "Task Defaults" preference item. -->
+        <item>@string/EPr_deactivated</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in filter plug-in -->
-    
+
     <!-- ================================================= Filter Exposer == -->
-    
+
     <!-- Active Tasks Filter -->
     <string name="BFE_Active">나의 일정</string>
-    
+
     <!-- Waiting on me filter -->
     <string name="BFE_waiting_on_me">나를 챙겨주는 일정</string>
-        
+
     <!-- Search Filter -->
-    
+
     <!-- slide 10b: Recently Modified -->
     <string name="BFE_Recent">최근에 수정한 일정</string>
-    
+
     <!-- slide 10c: I\'ve assigned -->
     <string name="BFE_Assigned">내가 할당한 일정</string>
-    
+
     <!-- Build Your Own Filter -->
-    
+
     <!-- Saved Filters Header -->
-    
+
     <!-- Saved Filters Context Menu: delete -->
     <string name="BFE_Saved_delete">필터 삭제</string>
 
     <!-- =========================================== CustomFilterActivity == -->
-    
+
     <!-- slide 30d: Build Your Own Filter Activity Title-->
     <string name="CFA_title">사용자 필터</string>
-    
+
     <!-- slide 30e: Filter Name edit box hint (if user types here, filter will be saved) -->
     <string name="CFA_filterName_hint">저장할 필터 이름을 정하세요...</string>
-    
+
     <!-- Filter Name default for copied filters (%s => old filter name) -->
-    
+
     <!-- slide 30a: Filter Starting Universe: all tasks -->
     <string name="CFA_universe_all">실행중인 일정</string>
-    
+
     <!-- Filter Criteria Type: add (at the begging of title of the criteria) -->
     <string name="CFA_type_add">또는</string>
-    
+
     <!-- Filter Criteria Type: subtract (at the begging of title of the criteria) -->
     <string name="CFA_type_subtract">제외</string>
-    
+
     <!-- Filter Criteria Type: intersect (at the begging of title of the criteria) -->
     <string name="CFA_type_intersect">또한</string>
-    
+
     <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
     <string name="CFA_context_chain">%s 은 기준이 있습니다</string>
-    
+
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">가로줄 삭제</string>
-    
+
     <!-- slide 30b: Filter Screen Help Text -->
     <string name="CFA_help">추가로 설정하려면 항목에서 길게 누르기</string>
-    
+
     <!-- slide 30c: Filter Button: add new -->
     <string name="CFA_button_add">기준 추가</string>
-    
+
     <!-- slide 30f: Filter Button: view without saving -->
     <string name="CFA_button_view">보기</string>
-    
+
     <!-- Filter Button: save & view filter -->
     <string name="CFA_button_save">저장 &amp; 보기</string>
 
     <!-- =========================================== CustomFilterCriteria == -->
-        
+
     <!-- Criteria: due by X - display text (? -> user input) -->
     <string name="CFC_dueBefore_text">마감일: ?</string>
     <!-- Criteria: due by X - name of criteria -->
@@ -1709,320 +1740,331 @@ Astrid.com 과 동기화하시겠습니까?</string>
         <item>다음 주</item>
         <item>다음 달</item>
     </string-array>
-    
+
     <!-- Criteria: importance - display text (? -> user input)-->
     <string name="CFC_importance_text">최소 우선순위?</string>
     <!-- Criteria: importance - name of criteria -->
-    <string name="CFC_importance_name">우선순위...</string>        
-    
+    <string name="CFC_importance_name">우선순위...</string>
+
     <!-- Criteria: tag - display text (? -> user input) -->
     <string name="CFC_tag_text">목록: ?</string>
     <!-- Criteria: tag - name of criteria -->
     <string name="CFC_tag_name">목록...</string>
-    
+
     <!-- Criteria: tag_contains - name of criteria -->
     <string name="CFC_tag_contains_name">목록이름이 다음을 포함...</string>
     <!-- Criteria: tag_contains - text (? -> user input) -->
     <string name="CFC_tag_contains_text">목록이름이 다음을 포함: ?</string>
-    
+
     <!-- Criteria: title_contains - name of criteria -->
     <string name="CFC_title_contains_name">제목이 다음을 포함...</string>
     <!-- Criteria: title_contains - text (? -> user input) -->
     <string name="CFC_title_contains_text">제목이 다음을 포함: ?</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-  
-  <!-- Error message for adding to calendar  -->
-  <string name="gcal_TEA_error">달력에 일정 추가 실패!</string>
-
-  <!-- Label for adding task to calendar -->
-
-  <!-- slide 21c: Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">달력에 일정 추가하기</string>
-  
-  <!-- Label when calendar event already exists -->
-  <string name="gcal_TEA_showCalendar_label">달력 이벤트 열기</string>
-  
-  <!-- Toast when unable to open calendar event -->
-  
-  <!-- Toast when calendar event updated because task changed -->
-  <string name="gcal_TEA_calendar_updated">달력 이벤트도 업데이트했습니다!</string>
-  
-  <!-- No calendar label (don\'t add option) -->
-  <string name="gcal_TEA_nocal">추가하지 않기</string>
-  
-  <string name="gcal_TEA_none_selected">달력에?</string>
-  
-  <string name="gcal_TEA_has_event">달력 이벤트</string>
-  
-  <!-- ======================================================== Calendars == -->
-  
-  <!-- Calendar event name when task is completed (%s => task title) -->
-  <string name="gcal_completed_title">%s (완료)</string>
-
-  <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
-  <string name="gcal_GCP_default">기본 달력</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Error message for adding to calendar  -->
+    <string name="gcal_TEA_error">달력에 일정 추가 실패!</string>
 
+    <!-- Label for adding task to calendar -->
 
+    <!-- slide 21c: Label for adding task to calendar -->
+    <string name="gcal_TEA_addToCalendar_label">달력에 일정 추가하기</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Label when calendar event already exists -->
+    <string name="gcal_TEA_showCalendar_label">달력 이벤트 열기</string>
+
+    <!-- Toast when unable to open calendar event -->
+
+    <!-- Toast when calendar event updated because task changed -->
+    <string name="gcal_TEA_calendar_updated">달력 이벤트도 업데이트했습니다!</string>
+
+    <!-- No calendar label (don\'t add option) -->
+    <string name="gcal_TEA_nocal">추가하지 않기</string>
+
+    <string name="gcal_TEA_none_selected">달력에?</string>
+
+    <string name="gcal_TEA_has_event">달력 이벤트</string>
+
+    <!-- ======================================================== Calendars == -->
+
+    <!-- Calendar event name when task is completed (%s => task title) -->
+    <string name="gcal_completed_title">%s (완료)</string>
+
+    <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
+    <string name="gcal_GCP_default">기본 달력</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ============================================================= UI == -->
 
     <!-- filters header: GTasks -->
     <string name="gtasks_FEx_header">구글 일정 (Goodle Tasks)</string>
-    
+
     <!-- filter category for GTasks lists -->
-    
+
     <!-- filter title for GTasks lists (%s => list name) -->
     <string name="gtasks_FEx_title">구글 일정: %s</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_creating_list">목록 만들기...</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_create_list_dialog">새 목록 이름:</string>
-    
+
     <!-- error to show when list creation fails -->
     <string name="gtasks_FEx_create_list_error">새 목록을 만드는 중 에러가 발생했습니다</string>
-    
+
     <!-- short help title for Gtasks -->
-    
+
     <string name="CFC_gtasks_list_text">목록에: ?</string>
 
     <string name="CFC_gtasks_list_name">GTasks 목록에...</string>
-    
+
     <!-- Message while clearing completed tasks -->
     <string name="gtasks_GTA_clearing">완료한 일정을 삭제하는 중...</string>
-    
+
     <!-- Label for clear completed menu item -->
     <string name="gtasks_GTA_clear_completed">삭제 완료</string>
-        
+
     <!-- ============================================ GtasksLoginActivity == -->
-    
-    <!-- Activity Title: Gtasks Login -->    
 
-    <!-- Instructions: Gtasks login -->    
-    <string name="gtasks_GLA_body">구글 일정 동기화(베타)에 로그인하세요. 
-옮기지 않은 구글 앱 계정은 현재 지원하지 않습니다.</string>
-    
+    <!-- Activity Title: Gtasks Login -->
+
+    <!-- Instructions: Gtasks login -->
+    <string name="gtasks_GLA_body">구글 일정 동기화(베타)에 로그인하세요.
+        옮기지 않은 구글 앱 계정은 현재 지원하지 않습니다.
+    </string>
+
     <string name="gtasks_GLA_noaccounts">동기화 가능한 구글 계정이 없음</string>
 
-    <!-- Instructions: Gtasks further help -->    
-    <string name="gtasks_GLA_further_help">일정을 들여쓰고 순서를 유지하면서 보려면, 
-필터 페이지로 이동하여 구글 일정 목록을 선택하세요. 
-기본적으로 아스트리드에는 일정을 정렬하는 설정이 따로 있습니다.</string>
+    <!-- Instructions: Gtasks further help -->
+    <string name="gtasks_GLA_further_help">일정을 들여쓰고 순서를 유지하면서 보려면,
+        필터 페이지로 이동하여 구글 일정 목록을 선택하세요.
+        기본적으로 아스트리드에는 일정을 정렬하는 설정이 따로 있습니다.
+    </string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
 
-    <!-- E-mail Address Label -->    
+    <!-- E-mail Address Label -->
+
+    <!-- Password Label -->
 
-    <!-- Password Label -->    
-    
     <!--  Authenticating toast -->
     <string name="gtasks_GLA_authenticating">인증 중...</string>
-    
+
     <!-- Google Apps for Domain checkbox -->
 
-    <!-- Error Message when fields aren\'t filled out -->    
+    <!-- Error Message when fields aren\'t filled out -->
 
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
     <string name="gtasks_GLA_errorAuth">인증 오류! 휴대폰 계정 관리자의 사용자명과 비밀번호를 확인해 주세요</string>
 
-    <!-- Error Message when we receive an IO Exception -->    
+    <!-- Error Message when we receive an IO Exception -->
     <string name="gtasks_GLA_errorIOAuth">죄송합니다, 구글 서버와 통신하는 데 문제가 있습니다. 잠시 후 다시 시도하세요.</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->    
-    <string name="gtasks_GLA_errorAuth_captcha">"스팸 가입 방지용 문자(captcha)가  나왔으면 브라우저로 로그인하고 다시 시도해 보세요:"</string>
-    
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->
+    <string name="gtasks_GLA_errorAuth_captcha">"스팸 가입 방지용 문자(captcha)가 나왔으면 브라우저로 로그인하고 다시 시도해
+        보세요:"
+    </string>
+
     <!-- ============================================== GtasksPreferences == -->
 
-    <!-- GTasks Preferences Title -->    
+    <!-- GTasks Preferences Title -->
     <string name="gtasks_GPr_header">구글 일정</string>
-    
-    <!-- ================================================ Synchronization == -->    
-    
+
+    <!-- ================================================ Synchronization == -->
+
     <!-- title for notification tray when synchronizing -->
 
     <!-- Error Message when we receive a HTTP 503 error -->
-    <string name="gtasks_error_backend">구글 일정 API는 베타 상태이고 에러가 발생했습니다. 이 서비스는 중단될 수 있으니 나중에 다시 시도하세요.</string>
-    
+    <string name="gtasks_error_backend">구글 일정 API는 베타 상태이고 에러가 발생했습니다. 이 서비스는 중단될 수 있으니 나중에 다시
+        시도하세요.
+    </string>
+
     <!-- Error for account not found -->
-    <string name="gtasks_error_accountNotFound">%s 계정을 찾을 수 없습니다 - 로그아웃하고 구글 일정 설정에서 다시 로그인해 보세요.</string>
-    
+    <string name="gtasks_error_accountNotFound">%s 계정을 찾을 수 없습니다 - 로그아웃하고 구글 일정 설정에서 다시 로그인해 보세요.
+    </string>
+
     <!-- Error when ping after refreshing token fails -->
-    <string name="gtasks_error_authRefresh">구글 일정으로 인증할 수 없습니다. 계정 비밀번호를 확인하거나 나중에 다시 시도해 보세요.</string>
-    
+    <string name="gtasks_error_authRefresh">구글 일정으로 인증할 수 없습니다. 계정 비밀번호를 확인하거나 나중에 다시 시도해 보세요.
+    </string>
+
     <!-- Error when account manager returns no auth token or throws exception -->
-    <string name="gtasks_error_accountManager">휴대폰 계정 관리자에서 에러가 발생했습니다. 로그아웃 후 구글 일정 설정에서 다시 로그인 해 주세요.</string>
+    <string name="gtasks_error_accountManager">휴대폰 계정 관리자에서 에러가 발생했습니다. 로그아웃 후 구글 일정 설정에서 다시 로그인 해
+        주세요.
+    </string>
 
     <!-- Error when authorization error happens in background sync -->
-    <string name="gtasks_error_background_sync_auth">백그라운드에서 인증 에러가 발생했습니다. 아스트리드가 실행중일 때 동기화를 시작해 보세요.</string>
-      
+    <string name="gtasks_error_background_sync_auth">백그라운드에서 인증 에러가 발생했습니다. 아스트리드가 실행중일 때 동기화를 시작해
+        보세요.
+    </string>
+
     <string name="gtasks_import_progress">구글 일정 가져오는 중...</string>
 
-    <string name="gtasks_import_add_to_shared_list">%1$s 목록을 타인과 공유 중입니다! %2$s 일정을 이 목록에 추가할까요?</string>
+    <string name="gtasks_import_add_to_shared_list">%1$s 목록을 타인과 공유 중입니다! %2$s 일정을 이 목록에 추가할까요?
+    </string>
 
     <string name="gtasks_import_dlg_title">구글 일정 가져오기</string>
 
     <string name="gtasks_import_add_task_ok">일정 추가하기</string>
 
     <string name="gtasks_import_add_task_cancel">일정 추가하지 않기</string>
-        
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- NEW USER EXPERIENCE -->
-  
-  <!-- help bubbles -->
-  <!-- slide 8c: Shown the first time a user sees the task list activity -->
-  <string name="help_popover_add_task">일정 추가로 시작하기</string>
-
-  <!-- Shown the first time a user adds a task to a list -->  
-  <string name="help_popover_tap_task">일정을 편집하거나 공유하려면 누르세요</string>
-  
-  <!-- slide 14a: Shown the first time a user sees the list activity -->
-  <string name="help_popover_list_settings">목록을 편집/공유하려면 누르기</string>
-  
-  <!-- slide 26c: Shown the first time a user sees the list settings tab -->
-  <string name="help_popover_collaborators">당신과 일정을 공유하는 사람은\n당신이 일정을 마치거나 목록을\n만드는 것을 도와줄 수 있습니다.</string>
-  
-  <!-- Shown after user adds a task on tablet-->
-  <string name="help_popover_add_lists">목록을 추가하려면 누리기</string>
-  
-  <!-- Shown after a user adds a task on phones -->
-  <string name="help_popover_switch_lists">목록을 추가하거나 목록 간에 전환하려면 누르세요</string>
-  
-  
-  
-  <!-- Login activity -->
-  
-  
-  <!-- slide 7b -->
-  <string name="welcome_login_tos_base">아스트리드 사용시 다음에 동의합니다:</string>
-  
-  <string name="welcome_login_tos_link">서비스 약관</string>
-  
-  <!-- slide 7e -->
-  <string name="welcome_login_pw">가입하기</string>
-  
-  <string name="welcome_sign_in">로그인</string>
-
-  <!-- slide 7f -->
-  <string name="welcome_login_later">나중에</string>
-  
-  <string name="welcome_login_confirm_later_title">로그인하세요!</string>
-  
-  <string name="welcome_login_confirm_later_ok">난 하고 말 꺼야!</string>
-  
-  <string name="welcome_login_confirm_later_cancel">됐거든요</string>
-  
-  <string name="welcome_login_confirm_later_dialog">아스트리드를 잘 사용하기 위해 가입하세요! 
-무료로 온라인 백업, Astrid.com 에 전체 동기화, 이메일로 일정 추가하기 
-그리고 친구들과 일정 목록을 공유할 수 있습니다!</string>
+    <!-- NEW USER EXPERIENCE -->
 
+    <!-- help bubbles -->
+    <!-- slide 8c: Shown the first time a user sees the task list activity -->
+    <string name="help_popover_add_task">일정 추가로 시작하기</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown the first time a user adds a task to a list -->
+    <string name="help_popover_tap_task">일정을 편집하거나 공유하려면 누르세요</string>
 
+    <!-- slide 14a: Shown the first time a user sees the list activity -->
+    <string name="help_popover_list_settings">목록을 편집/공유하려면 누르기</string>
 
-  <!-- Resources for built-in locale plug-in -->
-
-  <!-- Locale Alert Editing Window Title -->
-  <string name="locale_edit_alerts_title">아스트리드 필터 경고</string>
-  
-  <!-- Locale Window Help -->                                                                                                                                            
-  <string name="locale_edit_intro">다음 필터에 맞는 일정이 있을 때 
-아스트리드가 당신에게 알려 드립니다:</string>
-      
-  <!-- Locale Window Filter Picker UI -->                                                                                                                                        
-      
-  <!-- Locale Window Interval Label -->                                                                                                                                        
-  <string name="locale_interval_label">알림을 다음에 한정:</string>        
-      
-  <!-- Locale Window Interval Values -->                                                                                                                                        
-  <string-array name="locale_interval">
-    <item>한 시간마다 한 번</item>
-    <item>여섯 시간마다 한 번</item>
-    <item>열두 시간마다 한 번</item>
-    <item>하루에 한 번</item>
-    <item>3일마다 한 번</item>
-    <item>일주일에 한 번</item>
-  </string-array>        
-      
-  <!-- Locale Notification text -->                                                                                                                                        
-  <string name="locale_notification">$NUM 개의 일정이 일치합니다: $FILTER</string>     
-      
-  <!-- Locale Plugin was not found, it is required -->
-  <string name="locale_plugin_required">아스트리드 위치 플러그인을 설치하세요!</string>        
-     
+    <!-- slide 26c: Shown the first time a user sees the list settings tab -->
+    <string name="help_popover_collaborators">당신과 일정을 공유하는 사람은\n당신이 일정을 마치거나 목록을\n만드는 것을 도와줄 수
+        있습니다.
+    </string>
 
+    <!-- Shown after user adds a task on tablet-->
+    <string name="help_popover_add_lists">목록을 추가하려면 누리기</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown after a user adds a task on phones -->
+    <string name="help_popover_switch_lists">목록을 추가하거나 목록 간에 전환하려면 누르세요</string>
+
+
+    <!-- Login activity -->
+
+
+    <!-- slide 7b -->
+    <string name="welcome_login_tos_base">아스트리드 사용시 다음에 동의합니다:</string>
+
+    <string name="welcome_login_tos_link">서비스 약관</string>
+
+    <!-- slide 7e -->
+    <string name="welcome_login_pw">가입하기</string>
+
+    <string name="welcome_sign_in">로그인</string>
+
+    <!-- slide 7f -->
+    <string name="welcome_login_later">나중에</string>
+
+    <string name="welcome_login_confirm_later_title">로그인하세요!</string>
+
+    <string name="welcome_login_confirm_later_ok">난 하고 말 꺼야!</string>
+
+    <string name="welcome_login_confirm_later_cancel">됐거든요</string>
+
+    <string name="welcome_login_confirm_later_dialog">아스트리드를 잘 사용하기 위해 가입하세요!
+        무료로 온라인 백업, Astrid.com 에 전체 동기화, 이메일로 일정 추가하기
+        그리고 친구들과 일정 목록을 공유할 수 있습니다!
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in locale plug-in -->
+
+    <!-- Locale Alert Editing Window Title -->
+    <string name="locale_edit_alerts_title">아스트리드 필터 경고</string>
+
+    <!-- Locale Window Help -->
+    <string name="locale_edit_intro">다음 필터에 맞는 일정이 있을 때
+        아스트리드가 당신에게 알려 드립니다:
+    </string>
+
+    <!-- Locale Window Filter Picker UI -->
+
+    <!-- Locale Window Interval Label -->
+    <string name="locale_interval_label">알림을 다음에 한정:</string>
+
+    <!-- Locale Window Interval Values -->
+    <string-array name="locale_interval">
+        <item>한 시간마다 한 번</item>
+        <item>여섯 시간마다 한 번</item>
+        <item>열두 시간마다 한 번</item>
+        <item>하루에 한 번</item>
+        <item>3일마다 한 번</item>
+        <item>일주일에 한 번</item>
+    </string-array>
+
+    <!-- Locale Notification text -->
+    <string name="locale_notification">$NUM 개의 일정이 일치합니다: $FILTER</string>
+
+    <!-- Locale Plugin was not found, it is required -->
+    <string name="locale_plugin_required">아스트리드 위치 플러그인을 설치하세요!</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ====================== Plugin Boilerplate ========================= -->
 
-	<!-- filters header: OpenCRX -->
+    <!-- filters header: OpenCRX -->
     <string name="opencrx_FEx_header">OpenCRX (고객관리)</string>
-    
+
     <!-- filter category for OpenCRX ActivityCreators -->
     <string name="opencrx_FEx_dashboard">작업공간</string>
-    
+
     <!-- filter category for OpenCRX responsible person -->
     <string name="opencrx_FEx_responsible">할당된 사람</string>
-    
+
     <!--  OpenCRX assignedTo filter title (%s => assigned contact) -->
     <string name="opencrx_FEx_responsible_title">할당됨: \'%s\'</string>
-    
+
     <!-- detail for showing tasks created by someone else (%s => person name) -->
     <string name="opencrx_PDE_task_from">from %s</string>
-    
+
     <!-- replacement string for task edit "Notes" when using OpenCRX -->
     <string name="opencrx_TEA_notes">댓글 쓰기</string>
-    
+
     <string name="opencrx_creator_input_hint">작성자</string>
 
     <string name="opencrx_contact_input_hint">할당된 사람</string>
     <!-- ==================================================== Preferences == -->
 
-    <!-- Preferences Title: OpenCRX -->    
+    <!-- Preferences Title: OpenCRX -->
     <string name="opencrx_PPr_header">OpenCRX (고객관리)</string>
 
     <!-- creator title for tasks that are not synchronized -->
     <string name="opencrx_no_creator">(싱크 중지)</string>
 
-	<!-- preference title for default creator -->
+    <!-- preference title for default creator -->
     <string name="opencrx_PPr_defaultcreator_title">기본 활동내역 작성자</string>
 
     <!-- preference description for default creator (%s -> setting) -->
@@ -2030,7 +2072,7 @@ Astrid.com 과 동기화하시겠습니까?</string>
 
     <!-- preference description for default dashboard (when set to \'not synchronized\') -->
     <string name="opencrx_PPr_defaultcreator_summary_none">기본적으로 새 활동은 동기화하지 않습니다</string>
-    
+
     <!--  OpenCRX host and segment group name -->
     <string name="opencrx_group">OpenCRX 서버</string>
 
@@ -2039,81 +2081,87 @@ Astrid.com 과 동기화하시겠습니까?</string>
 
     <!--  dialog title for OpenCRX host -->
     <string name="opencrx_host_dialog_title">OpenCRX 호스트</string>
-    
+
     <!--  example for OpenCRX host -->
-    <string name="opencrx_host_summary">예: <i>mydomain.com</i></string>
-    
+    <string name="opencrx_host_summary">예:
+        <i>mydomain.com</i>
+    </string>
+
     <!--  preference description for OpenCRX segment -->
     <string name="opencrx_segment_title">세그먼트</string>
 
     <!--  dialog title for OpenCRX segment -->
     <string name="opencrx_segment_dialog_title">동기화된 세그먼트</string>
-    
+
     <!--  example for OpenCRX segment -->
-    <string name="opencrx_segment_summary">예: <i>표준</i></string>
-    
+    <string name="opencrx_segment_summary">예:
+        <i>표준</i>
+    </string>
+
     <!--  default value for OpenCRX segment -->
     <string name="opencrx_segment_default">표준</string>
-    
+
     <!--  preference description for OpenCRX provider -->
     <string name="opencrx_provider_title">공급자</string>
 
     <!--  dialog title for OpenCRX provider -->
     <string name="opencrx_provider_dialog_title">OpenCRX 자료 공급자</string>
-    
+
     <!--  example for OpenCRX provider -->
-    <string name="opencrx_provider_summary">예: <i>CRX</i></string>
-    
+    <string name="opencrx_provider_summary">예:
+        <i>CRX</i>
+    </string>
+
     <!--  default value for OpenCRX provider -->
     <string name="opencrx_provider_default">CRX</string>
     <!-- ================================================= Login Activity == -->
 
-    <!-- Activity Title: Opencrx Login -->    
+    <!-- Activity Title: Opencrx Login -->
     <string name="opencrx_PLA_title">OpenCRX 에 로그인하기</string>
 
-    <!-- Instructions: Opencrx login -->    
+    <!-- Instructions: Opencrx login -->
     <string name="opencrx_PLA_body">당신의 OpenCRX 계정으로 로그인하세요</string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
     <string name="opencrx_PLA_signIn">로그인</string>
 
-    <!-- Login Label -->    
+    <!-- Login Label -->
     <string name="opencrx_PLA_login">로그인</string>
 
-    <!-- Password Label -->    
+    <!-- Password Label -->
     <string name="opencrx_PLA_password">비밀번호</string>
-    
-        <!-- Error Message when fields aren\'t filled out -->    
+
+    <!-- Error Message when fields aren\'t filled out -->
     <string name="opencrx_PLA_errorEmpty">에러: 모든 항목을 채우세요</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
     <string name="opencrx_PLA_errorAuth">에러: 로그인 아이디나 암호가 맞지 않습니다!</string>
 
     <!-- ================================================ Synchronization == -->
-        
+
     <!-- title for notification tray after synchronizing -->
     <string name="opencrx_notification_title">OpenCRX</string>
-    
+
     <!-- text for notification tray when synchronizing -->
     <string name="opencrx_notification_text">%s 일정 업데이트 완료 / 더 자세한 내용은 클릭</string>
-    
+
     <!-- Error msg when io exception  -->
     <string name="opencrx_ioerror">연결 오류! 인터넷 연결을 확인하세요.</string>
 
     <!-- opencrx Login not specified-->
     <string name="opencrx_MLA_email_empty">로그인 아이디를 입력하세요!</string>
-    
+
     <!-- opencrx password not specified-->
     <string name="opencrx_MLA_password_empty">비밀번호를 입력하세요!</string>
-    
+
     <!-- ================================================ labels for layout-elements == -->
-    
+
     <!-- label for task-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_task_assign_label">이 일정을 다음 사람에게 할당:</string>
-    
+
     <!-- Spinner-item for unassigned tasks on taskeditactivity -->
     <string name="opencrx_TEA_task_unassigned">&lt;할당하지 않음&gt;</string>
-    
+
     <!-- label for dashboard-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_creator_assign_label">이 일정을 다음 생성자에게 할당:</string>
 
@@ -2121,7 +2169,7 @@ Astrid.com 과 동기화하시겠습니까?</string>
     <string name="opencrx_TEA_dashboard_default">&lt;기본값&gt;</string>
 
     <string name="opencrx_TEA_opencrx_title">OpenCRX 조절</string>
-        
+
     <string name="CFC_opencrx_in_workspace_text">작업공간: ?</string>
 
     <string name="CFC_opencrx_in_workspace_name">작업공간에서...</string>
@@ -2131,52 +2179,50 @@ Astrid.com 과 동기화하시겠습니까?</string>
     <string name="CFC_opencrx_assigned_to_name">다음 사람에게 할당됨...</string>
 
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
+    <!-- ================================================== EditPreferences == -->
 
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 32j: Preference Category: Power Pack -->
-  <string name="EPr_powerpack_header">프리미엄과 기타 설정</string>
-  <string name="EPr_powerpack_summary">부재중 전화 알림, 음성 입력과 기타 설정</string>
-  
-  <!-- slide 32e: Preference: Anonymous User Statistics -->
-  <string name="EPr_statistics_title">사용 통계 정보 (익명)</string>
-  <!-- Preference: User Statistics (disabled) -->
-  <string name="EPr_statistics_desc_disabled">사용 정보는 보고하지 않습니다.</string>  
-  <!-- slide 32f: Preference: User Statistics (enabled) -->
-  <string name="EPr_statistics_desc_enabled">익명 사용 자료 전송으로 아스트리드를 더욱 발전시킬 수 있도록 도와주세요.</string>
-      
+    <!-- slide 32j: Preference Category: Power Pack -->
+    <string name="EPr_powerpack_header">프리미엄과 기타 설정</string>
+    <string name="EPr_powerpack_summary">부재중 전화 알림, 음성 입력과 기타 설정</string>
 
+    <!-- slide 32e: Preference: Anonymous User Statistics -->
+    <string name="EPr_statistics_title">사용 통계 정보 (익명)</string>
+    <!-- Preference: User Statistics (disabled) -->
+    <string name="EPr_statistics_desc_disabled">사용 정보는 보고하지 않습니다.</string>
+    <!-- slide 32f: Preference: User Statistics (enabled) -->
+    <string name="EPr_statistics_desc_enabled">익명 사용 자료 전송으로 아스트리드를 더욱 발전시킬 수 있도록 도와주세요.</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <string name="speech_err_network">네트워크 에러! 음성인식이 동작하려면 네트워크 연결이 필요합니다.</string>
     <string name="speech_err_no_match">죄송하지만 알아듣지 못했습니다! 다시 말해 주세요.</string>
     <string name="speech_err_default">죄송하지만 음성 인식에 에러가 발생했습니다. 다시 시도해 주세요.</string>
-    
+
     <string name="premium_attach_file">파일 첨부</string>
     <string name="premium_record_audio">노트 기록</string>
     <string name="premium_no_files">첨부 파일 없음</string>
     <string name="premium_remove_file_confirm">정말입니까? 되돌릴 수 없습니다</string>
-    
+
     <string name="audio_recording_title">오디오 녹음 중</string>
     <string name="audio_stop_recording">녹음 중단</string>
     <string name="audio_speak_now">지금 말하세요!</string>
     <string name="audio_encoding">인코딩...</string>
     <string name="audio_err_encoding">오디오 인코딩 에러</string>
     <string name="audio_err_playback">죄송하지만 기기에서 이 형식의 오디오 파일을 지원하지 않습니다</string>
-    
+
     <string name="search_market_audio">이런 형식의 오디오를 다룰 수 있는 재생기가 없습니다. 안드로이드 마켓에서 다운로드할까요?</string>
     <string name="search_market_audio_title">오디오 재생기 없음</string>
 
@@ -2185,10 +2231,10 @@ Astrid.com 과 동기화하시겠습니까?</string>
 
     <string name="search_market_ms">MS 오피스 리더가 없습니다. 안드로이드 마켓에서 MS 오피스 리더를 다운로드할까요?</string>
     <string name="search_market_ms_title">MS 오피스 리더 없음</string>
-    
+
     <string name="file_type_unhandled">죄송하지만 이 파일 형식을 다룰 수 있는 프로그램이 없습니다.</string>
     <string name="file_type_unhandled_title">프로그램이 없음</string>
-    
+
     <string name="file_prefix_image">이미지</string>
     <string name="file_prefix_voice">음성</string>
     <string name="file_browser_up">위로</string>
@@ -2203,40 +2249,51 @@ Astrid.com 과 동기화하시겠습니까?</string>
     <string name="file_err_memory">이미지가 너무 커서 메모리에 올릴 수 없습니다</string>
     <string name="file_err_copy">첨부용 파일 복사 에러</string>
     <string name="file_err_download">파일 다운로드 에러</string>
-    <string name="file_err_no_directory">맙소사! 이 파일의 디렉토리가 없는 것 같습니다. Astrid 설정에서 파일을 저장할 디렉토리를 선택하세요.</string>
+    <string name="file_err_no_directory">맙소사! 이 파일의 디렉토리가 없는 것 같습니다. Astrid 설정에서 파일을 저장할 디렉토리를
+        선택하세요.
+    </string>
     <string name="file_err_show">죄송하지만 이 기기는 아직 이 파일 형식을 지원하지 않습니다</string>
-    
+
     <string name="file_dir_dialog_ok">이 디렉토리 사용</string>
     <string name="file_dir_dialog_default">기본값으로 초기화</string>
-    
+
     <string name="p_files_dir">프리미엄 다운로드 디렉토리</string>
     <!-- Description for file download directory preference. %s -> chosen directory -->
     <string name="p_files_dir_desc">일정 첨부 파일 저장됨: %s</string>
     <string name="p_files_dir_desc_default">기본 디렉토리</string>
 
-    
+
     <!-- in app billing -->
     <string name="billing_not_supported_title">구매할 수 없습니다.</string>
-    <string name="billing_not_supported_message">현재 마켓의 과금 서비스를 이용할 수 없습니다. 이 앱을 계속해서 사용할 수 있지만 구매할 수 없습니다.</string>
+    <string name="billing_not_supported_message">현재 마켓의 과금 서비스를 이용할 수 없습니다. 이 앱을 계속해서 사용할 수 있지만 구매할
+        수 없습니다.
+    </string>
     <string name="subscriptions_not_supported_title">정기 사용권을 구매할 수 없습니다.</string>
-    <string name="subscriptions_not_supported_message">현재 이 기기에서 마켓의 과금 서비스를 통해 정기 사용권을 구입할 수 없습니다. http://astrid.com/premium 에서 직접 Astrid 프리미엄 이용권을 구매할 수 있습니다.</string>
+    <string name="subscriptions_not_supported_message">현재 이 기기에서 마켓의 과금 서비스를 통해 정기 사용권을 구입할 수 없습니다.
+        http://astrid.com/premium 에서 직접 Astrid 프리미엄 이용권을 구매할 수 있습니다.
+    </string>
     <string name="cannot_connect_title">마켓에 접속할 수 없음</string>
-    <string name="cannot_connect_message">이 앱은 마켓에 접속할 수 없습니다. 이 앱의 버전이 오래된 것 같습니다. 이 앱을 계속해서 사용할 수 있지만 구매할 수는 없을 것입니다.</string>
-    
+    <string name="cannot_connect_message">이 앱은 마켓에 접속할 수 없습니다. 이 앱의 버전이 오래된 것 같습니다. 이 앱을 계속해서 사용할 수
+        있지만 구매할 수는 없을 것입니다.
+    </string>
+
     <string name="restoring_transactions">Restoring transactions</string>
-    
+
     <string name="subscriptions_learn_more">더 알아보기</string>
-    
-    <string name="kii_premium_success">이 제안에 참여해 주셔셔 감사합니다. 아스트리드 프리미엄을 주어진 기간동안 무료로 사용할 수 있습니다.</string>
+
+    <string name="kii_premium_success">이 제안에 참여해 주셔셔 감사합니다. 아스트리드 프리미엄을 주어진 기간동안 무료로 사용할 수 있습니다.
+    </string>
     <string name="kii_premium_abort">특별한 제안을 중단했습니다</string>
     <string name="kii_premium_declined">특별한 제안을 거절했습니다</string>
     <string name="kii_premium_error">이 제안을 처리하는데 문제가 있습니다. 나중에 다시 해 보세요.</string>
-    
+
     <string name="premium_offers_title">특별한 제안</string>
     <string name="premium_offers_subtitle">한 달 동안 아스트리드 프리미엄을 무료로 사용해 보실래요?</string>
-    <string name="premium_offers_detail">한 달 동안 무료로 아스트리드 프리미엄을 사용하려면, 이 스폰서의 짧은 동영상을 보면 됩니다. (당신의 이메일 주소를 항상 필요로 합니다.)</string>
+    <string name="premium_offers_detail">한 달 동안 무료로 아스트리드 프리미엄을 사용하려면, 이 스폰서의 짧은 동영상을 보면 됩니다. (당신의
+        이메일 주소를 항상 필요로 합니다.)
+    </string>
     <string name="premium_offers_start">무료로 얻기!</string>
-    
+
     <string name="premium_billing_title">아스트리드 프리미엄</string>
     <string name="premium_buy_month">1개월</string>
     <string name="premium_buy_year">1년</string>
@@ -2250,730 +2307,735 @@ Astrid.com 과 동기화하시겠습니까?</string>
     <string name="premium_speech_bubble_1">프리미엄은 당신의 생산성을 높여 줄 것입니다!</string>
     <string name="premium_speech_bubble_2">1년 사용권 구매시 25%% 할인!</string>
     <string name="premium_already_subscribed">이미 아스트리드 프리미엄 이용권을 구매하였습니다.</string>
-    <string name="premium_login_prompt">프리미엄 이용권을 구매하려면 Astrid.com 계정이 필요합니다. 로그인하거나 가입해 주세요.</string>
+    <string name="premium_login_prompt">프리미엄 이용권을 구매하려면 Astrid.com 계정이 필요합니다. 로그인하거나 가입해 주세요.
+    </string>
     <string name="premium_success">아스트리드 프리미엄 이용권 구매를 감사드립니다!</string>
-    <string name="premium_success_with_server_error">아스트리드 프리미엄 이용권 구매를 감사드립니다! Astrid.com에서 새로운 기능을 곧 사용할 수 있고, 이 기기에서는 즉시 사용할 수 있습니다.</string>
-    <string name="premium_verification_error">이 구글 플레이 계정으로 구매한 프리미엄 이용권은 다른 사용자에게 연결되어 있습니다. 당신의 계정에 추가적인 이메일을 연결하려면 astrid.com/users/profile 을 방문하세요.</string>
-    <string name="premium_check_for_purchases">프리미엄을 이미 구매하셨나요? 구글 플레이에서 구매 내역을 확인하려면 여기를 클릭하세요</string>
+    <string name="premium_success_with_server_error">아스트리드 프리미엄 이용권 구매를 감사드립니다! Astrid.com에서 새로운 기능을
+        곧 사용할 수 있고, 이 기기에서는 즉시 사용할 수 있습니다.
+    </string>
+    <string name="premium_verification_error">이 구글 플레이 계정으로 구매한 프리미엄 이용권은 다른 사용자에게 연결되어 있습니다. 당신의
+        계정에 추가적인 이메일을 연결하려면 astrid.com/users/profile 을 방문하세요.
+    </string>
+    <string name="premium_check_for_purchases">프리미엄을 이미 구매하셨나요? 구글 플레이에서 구매 내역을 확인하려면 여기를 클릭하세요
+    </string>
     <string name="premium_checking_for_purchases">구매 확인 중...</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- Resources for built-in reminders plug-in -->
-    
-  <!-- =============================================== task edit activity == -->
-
-  <!-- Task Edit: Reminder group label -->  
-  <string name="TEA_reminders_group_label">알림 설정</string>
-
-  <!-- Task Edit: Reminder header label -->  
-  <string name="TEA_reminder_label">알려주세요:</string>
-
-  <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">일정 마감일에</string>
-
-  <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">일정 마감일이 지났을 때</string>
-
-  <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_randomly">무작위로 한 번</string>
-
-  <!-- Task Edit: Reminder alarm clock label -->  
-  <string name="TEA_reminder_alarm_label">소리/진동 선택:</string>
-
-  <!--  slide 45a: Task Edit: Reminder mode: ring once -->  
-  <string name="TEA_reminder_mode_once">한 번</string>
-
-  <!-- slide 45b: Task Edit: Reminder mode: ring five times -->  
-  <string name="TEA_reminder_mode_five">다섯 번</string>
-
-  <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->  
-  <string name="TEA_reminder_mode_nonstop">알람을 직접 끌 때까지</string>
-  
-  <string name="TEA_reminder_when">언제</string>
-  
-  <string name="TEA_reminder_due_short">마감</string>
-
-  <string name="TEA_reminder_overdue_short">기한 초과</string>
-
-  <string name="TEA_reminder_randomly_short">임의로</string>
-
-  <string name="TEA_reminder_display_one">%s를 알려주세요</string>
-  
-  <string name="TEA_reminder_display_multiple">%s 알리기</string>
-
-  <string-array name="TEA_reminder_random">
-    <!-- random reminder choices for task edit page. -->
-    <item>한 시간</item>
-    <item>하루</item>
-    <item>일주일</item>
-    <item>2주일</item>
-    <item>한달</item>
-    <item>두달</item>
-  </string-array>
-  
-  <!-- ==================================================== notifications == -->
-  
-  <!-- Name of filter when viewing a reminder -->
-  <string name="rmd_NoA_filter">알림!</string>
-  
-  <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">완료</string>
-  
-  <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">알림 잠시 미루기</string>
-  
-  <!-- Reminder: Completed Toast -->
-  <string name="rmd_NoA_completed_toast">완료를 축하합니다!</string>
-  
-  <!-- Prefix for reminder dialog title -->
-  <string name="rmd_NoA_dlg_title">알림:</string>
-  
-  <!-- ==================================================== user reengagement == -->
-
-  <!-- Titles for user reengagement notifications -->
-  <string-array name="rmd_reengage_notif_titles">
-    <item>아스트리드 노트</item>
-    <!-- %s -> first name -->
-    <item>%s 의 메모.</item> 
-    <item>당신의 아스트리드 요약</item>
-    <item>아스트리드 알림</item>
-  </string-array>
-    
-  <string name="rmd_reengage_name_default">당신</string>
-
-  
-  <string name="rmd_reengage_add_tasks">일정 추가하기</string>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs -->
-  <string-array name="rmd_reengage_dialog_options">
-    <item>당신의 할일 목록을 줄일 시간이에요!</item>
-    <item>친애하는 당신, 몇가지 일정이 당신의 손길을 기다려요!</item>
-    <item>안녕, 이것 좀 봐줄 수 있을까?</item>
-    <item>거기 네 이름으로 된 일정이 좀 있어!</item>
-    <item>오늘 너를 위해 새로운 일정 목록이 있어!</item>
-    <item>너 끝내준다! 시작할 준비 됐지?</item>
-    <item>내가 생각하기에 일을 마치기에 좋은 날인 듯!</item>
-  </string-array>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>조직적이고 싶지 않니?</item>
-    <item>나 아스트리드! 네 일을 돕기 위해 내가 여기 있노라!</item>
-    <item>너 바뻐 보인다! 니 일정 중 몇 가지는 내가 처리해 줄께.</item>
-    <item>나는 네 삶의 모든 세부 사항의 기록을 유지할 수 있도록 도울 수 있어.</item>
-    <item>일을 더 확실히 마치고 싶지? 나도 그래!</item>
-    <item>너를 알게 되서 기쁘다!</item>
-  </string-array>
-  <!-- ============================================= reminder preferences == -->
-  
-  <!-- slide 33d: Reminder Preference Screen Title -->
-  <string name="rmd_EPr_alerts_header">알림 설정</string>
-  <string name="rmd_EPr_alerts_summary">알람 꺼짐 시간, 스누즈 설정, 알람 지속 레벨</string>
-    
-  <!-- Reminder Preference: Reminders Enabled Title -->
-  <string name="rmd_EPr_enabled_title">알림을 사용할까요?</string>
-  <!-- Reminder Preference Reminders Enabled Description (true) -->
-  <string name="rmd_EPr_enabled_desc_true">Astrid 알림을 사용합니다 (이것이 보통)</string>
-  <!-- Reminder Preference Reminders Enabled Description (false) -->
-  <string name="rmd_EPr_enabled_desc_false">Astrid 알림을 사용하지 않습니다</string>  
-    
-  <!-- Reminder Preference: Quiet Hours Start Title -->
-  <string name="rmd_EPr_quiet_hours_start_title">알림 꺼짐 시작 시간</string>
-  <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">%s 후에는 알림을 끕니다. (진동은 알람 설정의 진동 설정을 따릅니다)</string>
-  <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
-  <string name="rmd_EPr_quiet_hours_desc_none">알림 꺼짐을 사용하지 않습니다</string>
-  
-  <!-- Reminder Preference: Quiet Hours End Title -->
-  <string name="rmd_EPr_quiet_hours_end_title">알림 꺼짐 종료 시간</string>
-  <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_end_desc">%s 부터 알림 기능이 켜집니다</string>
-
-  <!-- Reminder Preference: Default Reminder Title -->
-  <string name="rmd_EPr_rmd_time_title">기본 알림 설정</string>
-  <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
-  <string name="rmd_EPr_rmd_time_desc">마감일이 없는 일정 알림은 %s 에 나타날 것입니다.</string>
-
-  <!-- Reminder Preference: Notification Ringtone Title -->
-  <string name="rmd_EPr_ringtone_title">알림 벨소리</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
-  <string name="rmd_EPr_ringtone_desc_custom">사용자 벨소리가 설정되었습니다</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
-  <string name="rmd_EPr_ringtone_desc_silent">벨소리가 나지 않도록 설정되었습니다</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
-  <string name="rmd_EPr_ringtone_desc_default">기본 벨소리가 사용됩니다</string>
-  
-  <!-- Reminder Preference: Notification Persistence Title -->
-  <string name="rmd_EPr_persistent_title">알림 지속 시간</string>
-  <!-- Reminder Preference: Notification Persistence Description (true) -->
-  <string name="rmd_EPr_persistent_desc_true">알림은 반드시 개별적으로 봐야 지워집니다.</string>
-  <!-- Reminder Preference: Notification Persistence Description (false) -->
-  <string name="rmd_EPr_persistent_desc_false">\"모두 지우기\" 버튼으로 알림을 일괄삭제합니다.</string>
-
-  <!-- Reminder Preference: Social Reminders Title -->
-  <string name="rmd_EPr_social_title">친절한 격려</string>
-  <!-- Reminder Preference: Social Reminders Summary (enabled) -->
-  <string name="rmd_EPr_social_summary_enabled">공유 일정에서 당신을 의지하고 있는 사람을 알려 줍니다.</string>
-  <!-- Reminder Preference: Social Reminders Summary (disabled) -->
-  <string name="rmd_EPr_social_summary_disabled">공유 일정에서 당신을 의지하고 있는 사람을 알려 주지 않습니다.</string>
-  
-  
-  
-  <!-- Reminder Preference: Notification Icon Title -->
-  <!-- Reminder Preference: Notification Icon Description -->
-
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
-  <string name="rmd_EPr_multiple_maxvolume_title">다중-링 알림의 최대 볼륨</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_true">아스트리드는 다중-링 알림을 최대 볼륨으로 출력합니다</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_false">아스트리드에서 소리 크기는 시스템 설정을 따릅니다.</string>
-
-  <!-- Reminder Preference: Vibrate Title -->
-  <string name="rmd_EPr_vibrate_title">알림시 진동</string>
-  <!-- Reminder Preference: Vibrate Description (true) -->
-  <string name="rmd_EPr_vibrate_desc_true">알림시 진동합니다.</string>
-  <!-- Reminder Preference: Vibrate Description (false) -->
-  <string name="rmd_EPr_vibrate_desc_false">알림시 진동하지 않습니다.</string>
-
-  <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">아스트리드 격려 문구</string>
-  <!-- Reminder Preference: Nagging Description (true) -->
-  <string name="rmd_EPr_nagging_desc_true">아스트리드에서 알림시에 격려 문구를 보여줍니다</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_nagging_desc_false">아스트리드에서 어떤 격려 문구도 보여주지 않습니다</string>
-
-  <!-- Reminder Preference: Snooze Dialog Title -->  
-  <string name="rmd_EPr_snooze_dialog_title">알림 지연 HH:MM</string>
-  <!-- Reminder Preference: Snooze Dialog Description (true) -->
-  <string name="rmd_EPr_snooze_dialog_desc_true">새 지연 시간을 선택하여 알림 연기 (HH:MM)</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_snooze_dialog_desc_false">미룰 날짜/시간을 선택하여 알림 연기</string>
-  
-  <!-- slide 44g: Reminder Preference: Default Reminders Title -->
-  <string name="rmd_EPr_defaultRemind_title">랜덤 알림</string>
-  <!-- Reminder Preference: Default Reminders Setting (disabled) -->
-  <string name="rmd_EPr_defaultRemind_desc_disabled">새 일정은 무작위로 알리지 않습니다</string>
-  <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
-  <string name="rmd_EPr_defaultRemind_desc">새 일정을 무작위로 알려 줍니다: %s</string>
-  
-  <!-- slide 39a: Defaults Title -->
-  
-  <string-array name="EPr_reminder_random">
-    <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
-    <item>사용안함</item>
-    <!-- slide 44b -->
-    <item>매시간</item>
-    <!-- slide 44c -->
-    <item>매일</item>
-    <!-- slide 44d-->
-    <item>매주</item>
-    <!-- slide 44e-->
-    <item>격주로</item>
-    <!-- slide 44f -->
-    <item>매달</item>
-    <item>격월로</item>
-  </string-array>
-        
-  <string-array name="EPr_quiet_hours_start">
-    <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
-    <item>사용안함</item>
-    <item>오후 8시</item>
-    <item>오후 9시</item>
-    <item>오후 10시</item>
-    <item>오후 11시</item>
-    <item>오후 12시</item>
-    <item>오전 1시</item>
-    <item>오전 2시</item>
-    <item>오전 3시</item>
-    <item>오전 4시</item>
-    <item>오전 5시</item>
-    <item>오전 6시</item>
-    <item>오전 7시</item>
-    <item>오전 8시</item>
-    <item>오전 9시</item>
-    <item>오전 10시</item>
-    <item>오전 11시</item>
-    <item>오후 12시</item>
-    <item>오후 1시</item>
-    <item>오후 2시</item>
-    <item>오후 3시</item>
-    <item>오후 4시</item>
-    <item>오후 5시</item>
-    <item>오후 6시</item>
-    <item>오후 7시</item>
-  </string-array>
-  
-  <string-array name="EPr_quiet_hours_end">
-    <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
-    <item>오전 9시</item>
-    <item>오전 10시</item>
-    <item>오전 11시</item>
-    <item>오후 12시</item>
-    <item>오후 1시</item>
-    <item>오후 2시</item>
-    <item>오후 3시</item>
-    <item>오후 4시</item>
-    <item>오후 5시</item>
-    <item>오후 6시</item>
-    <item>오후 7시</item>
-    <item>오후 8시</item>
-    <item>오후 9시</item>
-    <item>오후 10시</item>
-    <item>오후 11시</item>
-    <item>오후 12시</item>
-    <item>오전 1시</item>
-    <item>오전 2시</item>
-    <item>오전 3시</item>
-    <item>오전 4시</item>
-    <item>오전 5시</item>
-    <item>오전 6시</item>
-    <item>오전 7시</item>
-    <item>오전 8시</item>
-  </string-array>
-  
-  <string-array name="EPr_rmd_time">
-    <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
-    <item>오전 9시</item>
-    <item>오전 10시</item>
-    <item>오전 11시</item>
-    <item>오후 12시</item>
-    <item>오후 1시</item>
-    <item>오후 2시</item>
-    <item>오후 3시</item>
-    <item>오후 4시</item>
-    <item>오후 5시</item>
-    <item>오후 6시</item>
-    <item>오후 7시</item>
-    <item>오후 8시</item>
-    <item>오후 9시</item>
-    <item>오후 10시</item>
-    <item>오후 11시</item>
-    <item>오후 12시</item>
-    <item>오전 1시</item>
-    <item>오전 2시</item>
-    <item>오전 3시</item>
-    <item>오전 4시</item>
-    <item>오전 5시</item>
-    <item>오전 6시</item>
-    <item>오전 7시</item>
-    <item>오전 8시</item>
-  </string-array>
-  
-  <!-- =============================================== random reminders == -->
-
-  <string name="reminders_social">이 사람들은 당신만 믿고 있어!</string>
-  
-  <string name="reminders_social_one">%s님이 당신을 의지하고 있습니다!</string>
-  
-  <string name="reminders_social_multiple">%1$s, %2$s 님 등이 당신을 의지하고 있습니다!</string>
-
-  <string-array name="reminders">
-      <!-- reminders: Make these < 20 chars so the task name is displayed -->
-      <item>거기 안녕! 시간 좀 있어?</item>
-      <item>잠깐 볼 수 있을까?</item>
-      <item>잠깐 시간 좀 낼 수 있을까?</item>
-      <item>잊어 버렸어?</item>
-      <item>잠깐만!</item>
-      <item>시간 있을 때:</item>
-      <item>당신의 일정:</item>
-      <item>시간 여유 있어?</item>
-      <item>아스트리드가 여기 있소이다!</item>
-      <item>안녕! 좀 귀찮게 굴어도 될까?</item>
-      <item>시간 좀 낼 수 있어?</item>
-      <item>일하기 좋은 날:</item>
-  </string-array>
-
-  <string-array name="reminders_due">
-      <!-- reminders related to task due date -->
-      <item>일할 시간이야!</item>
-      <item>마감일이에요!</item>
-      <item>시작할 준비 됐어?</item>
-      <item>이걸 하겠다고 했잖아:</item>
-      <item>이미 시작했어야지:</item>
-      <item>시작할 시간:</item>
-      <item>시간이 되었네!</item>
-      <item>잠깐만! 이제 일할 시간이야:</item>
-      <item>한가해? 좀 하라구:</item>
-  </string-array>
-
-  <string-array name="reminders_snooze">
-      <!-- reminders related to snooze -->
-      <item>지금 게으름은 안돼!</item>
-      <item>낮잠 시간 끝났어요!</item>
-      <item>낮잠은 그만 자!</item>
-      <item>이제 준비됐겠지?</item>
-      <item>더 이상 미루지 말라구!</item>
-  </string-array>
-  
-  <string-array name="reminder_responses">
-      <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
-      <item>네가 할 일이 있어!</item> 
-      <item>이거 끝내버릴 준비 됐어?</item>
-      <item>왜 이 일을 끝내버리지 않는 거지?</item>
-      <item>이건 어때? 준~비됐나?</item>
-      <item>이거 할 준비 됐지?</item>
-      <item>이거 할 수 있겠어?</item>
-      <item>이걸 끝내면 행복해 질 수 있어!</item>
-      <item>이걸 마치면 기분이 좋아질 거야! 날 믿어!</item>
-      <item>이거 오늘 하기로 하지 않았어?</item>
-      <item>제발 이거 좀 마쳐라, 질리지도 않아!</item>
-      <item>이걸 끝낼 수 있겠어? 넌 할 수 있을 거라고 믿어!</item>
-      <item>이거 아주 안할꺼야?</item>
-      <item>자신감을 가져봐. 해보자구!</item>
-      <item>네가 정말 자랑스러워! 이걸 끝내버리자구!</item>
-      <item>이걸 끝내고 약간의 간식 어때?</item>
-      <item>제발 이거 하나만요, 응?</item>
-      <item>할 일 목록를 줄일 시간이거든!</item>
-      <item>너는 팀에서 어떻게 할꺼야? 손발을 잘 맞춰 보라구! 해보자!</item>
-      <item>너 최근에 끝내준다고 말했었나? 좋아, 계속하라구!</item>
-      <item>하루에 하나의 일정으로 어수선함은 그만… 뒤죽박죽은 이제 안녕!</item>
-      <item>어떻게 하고 있어? 와, 정말 인상적인네!</item>
-      <item>잘난 얼굴만 가지고는 할 수 없어. 덤벼들라구!</item>
-      <item>이런 일하기 좋은 날씨야, 그렇지?</item>
-      <item>이 일 하면서 차 한 잔 어때?</item>
-      <item>이 일을 마치기만 하면, 나가서 놀 수 있어.</item>
-      <item>시간이 됐네. 불가피한 일은 미룰 수 없는 거야.</item>
-      <item>네가 나를 무시할 때마다 내 속이 썩어간다.</item>
-  </string-array>
-
-  <string-array name="postpone_nags">
-      <!-- Astrid\'s nagging when user clicks postpone -->
-      <item>네가 할일을 미루는 사람이라는 게 사실이 아니라고 말해줘!</item>
-      <item>나이가 들어가는 것은 게으를 수가 없잖아?</item>
-      <item>어딘가에서 누군가가 네가 이 일을 마치길 기다리고 있다구!</item>
-      <item>네가 미룬다고 말했지만, 사실은 이걸 하고 있다는 거지, 맞지?</item>
-      <item>이게 마지막으로 미루는 거지? 응?</item>
-      <item>이걸 오늘 마치면, 더 이상 얘기 안할께!</item>
-      <item>할수 있을 때 왜 미루니.. 제발 미루지 마!</item>
-      <item>결국에는 이거 다 할거지? 맞지?</item>
-      <item>넌 정말 대단하다고 생각해! 이거 미루지 않는 게 어때?</item>
-      <item>그렇게 하면 네 목표를 이룰 수 있겠어?</item>
-      <item>미루고, 미루고, 또 미루고, 언제 바뀔래!</item>
-      <item>변명은 충분히 들었어! 벌써 다 했어야지!</item>
-      <item>지난번에도 그렇게 변명하지 않았니?</item>
-      <item>그렇게 하면 네가 네 삶을 계획하고 준비하는 걸 도와줄 수가 없어...</item>
-  </string-array>
+    <!-- Resources for built-in reminders plug-in -->
 
+    <!-- =============================================== task edit activity == -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder group label -->
+    <string name="TEA_reminders_group_label">알림 설정</string>
 
+    <!-- Task Edit: Reminder header label -->
+    <string name="TEA_reminder_label">알려주세요:</string>
 
-  <!-- Resources for built-in repeat plug-in -->
-
-  <!-- repeating plugin name -->
-  <string name="repeat_plugin">일정 반복하기</string>
-  
-  <!-- repeating plugin description -->
-  <string name="repeat_plugin_desc">일정 반복 허락</string>
-  
-  <!-- slide 20a: checkbox for turning on/off repeats -->
-  <string name="repeat_enabled">반복 설정</string>
-  
-  <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
-  <string name="repeat_every">매 %d</string>
-  
-  <!-- hint when opening repeat interval -->
-  <string name="repeat_interval_prompt">반복 주기</string>
-  
-  <!-- slide 19b-->
-  <string name="repeat_never">반복하지 않기</string>
-  <!-- slide 20f-->
-  <string name="repeat_dont">반복하지 않기</string>
-      
-  <string-array name="repeat_interval_short">
-    <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>일</item>
-    <item>주</item>
-    <item>월</item>
-    <item>시간</item>
-    <item>분</item>
-    <item>년</item>
-  </string-array>
-  
-  
-  <string-array name="repeat_interval">
-    <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>일마다</item>
-    <item>주마다</item>
-    <item>월마다</item>
-    <item>시마다</item>
-    <item>분마다</item>
-    <item>년마다</item>
-  </string-array>
-  
-  <string name="repeat_days">일</string>
-  <string name="repeat_weekdays">주중</string>
-  <string name="repeat_weeks">주</string>
-  <string name="repeat_months">달</string>
-  <string name="repeat_years">년</string>
-  <string name="repeat_hours">시</string>
-  <string name="repeat_minutes">분</string>
-  
-  <string-array name="repeat_until_shortcuts">
-      <item>영원히</item>
-      <item>특정일</item>
-      <item>오늘</item>
-      <item>내일</item>
-      <item>(며칠 후)</item>
-      <item>다음 주</item>
-      <item>2주에</item>
-      <item>다음 달</item>
-  </string-array>
-  
-  <string name="repeat_until_title">다음까지 반복하기...</string>
-  
-  <string name="repeat_keep_going">계속하기</string>
-  
-  <string-array name="repeat_type">
-    <!-- slide 20c: repeat type (date to repeat from) -->
-    <item>마감일로부터</item>
-    <!-- slide 20c -->
-    <item>완료일로부터</item>
-  </string-array>
-  
-  <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
-  <string name="repeat_detail_byday">$I on $D</string>
-  
-  <!-- task detail for repeat from due date (%s -> interval) -->
-  <string name="repeat_detail_duedate">매 %s</string>
-
-  <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
-  <string name="repeat_detail_duedate_until">매 %1$s 마다\n%2$s 까지</string>
-  
-  <!-- task detail for repeat from completion date (%s -> interval) -->
-  <string name="repeat_detail_completion">완료 후 %s</string>
-  
-  <!-- text for button when repeating task indefinitely -->
-  <string name="repeat_forever">영원히 반복하기</string>
-
-  <!-- text for button when repeating task until specified date (%s -> date string) -->
-  <string name="repeat_until">%s 까지 반복</string>
-  
-  <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title">\"%s\" 일정 변경하기</string>
-
-  <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title_last_time">반복 일정 \"%s\" 을 완료했습니다</string>
-      
-  <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->  
-  <string name="repeat_rescheduling_dialog_bubble">%1$s 이 반복 일정을 %2$s 에서 %3$s 로 변경했습니다</string>
-  
-  <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
-  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s 이 반복 일정을 %2$s 로 변경했습니다</string>
-  
-  <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
-  <string name="repeat_rescheduling_dialog_bubble_last_time">이 반복 일정은 %1$s 까지였는데 지금 다 끝냈습니다. %2$s</string>
-  
-  <string-array name="repeat_encouragement">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>잘했어!</item>
-      <item>와... 네가 정말 자랑스러워!</item>
-      <item>네가 결실을 맺는 것이 좋아!</item>
-      <item>무언가 완료 체크를 하면 기분이 좋지 않니?</item>
-  </string-array>
-
-  <string-array name="repeat_encouragement_last_time">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>훌륭해!</item>
-      <item>네가 자랑스럽다!</item>
-      <item>네가 열매를 많이 맺으면 나는 기뻐!</item>
-  </string-array>
-  
+    <!-- Task Edit: Reminder @ deadline -->
+    <string name="TEA_reminder_due">일정 마감일에</string>
 
+    <!-- Task Edit: Reminder after deadline -->
+    <string name="TEA_reminder_overdue">일정 마감일이 지났을 때</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder at random times (%s => time plural)-->
+    <string name="TEA_reminder_randomly">무작위로 한 번</string>
 
-    
-  <!-- Subtasks Help Introduction -->
-  <string name="subtasks_help_title">Astrid에서 정렬하고 들여쓰기</string>
-  <string name="subtasks_help_1">일정을 옮기려면 길게 누릅니다</string>
-  <string name="subtasks_help_2">재배열하려면 수직으로 드래그합니다</string>
-  <string name="subtasks_help_3">들여쓰기하려면 수평으로 드래그합니다</string>
-    
+    <!-- Task Edit: Reminder alarm clock label -->
+    <string name="TEA_reminder_alarm_label">소리/진동 선택:</string>
 
+    <!--  slide 45a: Task Edit: Reminder mode: ring once -->
+    <string name="TEA_reminder_mode_once">한 번</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 45b: Task Edit: Reminder mode: ring five times -->
+    <string name="TEA_reminder_mode_five">다섯 번</string>
+
+    <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
+    <string name="TEA_reminder_mode_nonstop">알람을 직접 끌 때까지</string>
+
+    <string name="TEA_reminder_when">언제</string>
+
+    <string name="TEA_reminder_due_short">마감</string>
+
+    <string name="TEA_reminder_overdue_short">기한 초과</string>
+
+    <string name="TEA_reminder_randomly_short">임의로</string>
+
+    <string name="TEA_reminder_display_one">%s를 알려주세요</string>
+
+    <string name="TEA_reminder_display_multiple">%s 알리기</string>
+
+    <string-array name="TEA_reminder_random">
+        <!-- random reminder choices for task edit page. -->
+        <item>한 시간</item>
+        <item>하루</item>
+        <item>일주일</item>
+        <item>2주일</item>
+        <item>한달</item>
+        <item>두달</item>
+    </string-array>
+
+    <!-- ==================================================== notifications == -->
+
+    <!-- Name of filter when viewing a reminder -->
+    <string name="rmd_NoA_filter">알림!</string>
+
+    <!-- Reminder: Task was already done -->
+    <string name="rmd_NoA_done">완료</string>
+
+    <!-- Reminder: Snooze button (remind again later) -->
+    <string name="rmd_NoA_snooze">알림 잠시 미루기</string>
+
+    <!-- Reminder: Completed Toast -->
+    <string name="rmd_NoA_completed_toast">완료를 축하합니다!</string>
+
+    <!-- Prefix for reminder dialog title -->
+    <string name="rmd_NoA_dlg_title">알림:</string>
+
+    <!-- ==================================================== user reengagement == -->
+
+    <!-- Titles for user reengagement notifications -->
+    <string-array name="rmd_reengage_notif_titles">
+        <item>아스트리드 노트</item>
+        <!-- %s -> first name -->
+        <item>%s 의 메모.</item>
+        <item>당신의 아스트리드 요약</item>
+        <item>아스트리드 알림</item>
+    </string-array>
+
+    <string name="rmd_reengage_name_default">당신</string>
+
+
+    <string name="rmd_reengage_add_tasks">일정 추가하기</string>
+
+    <!-- Speech bubble options for astrid in reengagement notifs -->
+    <string-array name="rmd_reengage_dialog_options">
+        <item>당신의 할일 목록을 줄일 시간이에요!</item>
+        <item>친애하는 당신, 몇가지 일정이 당신의 손길을 기다려요!</item>
+        <item>안녕, 이것 좀 봐줄 수 있을까?</item>
+        <item>거기 네 이름으로 된 일정이 좀 있어!</item>
+        <item>오늘 너를 위해 새로운 일정 목록이 있어!</item>
+        <item>너 끝내준다! 시작할 준비 됐지?</item>
+        <item>내가 생각하기에 일을 마치기에 좋은 날인 듯!</item>
+    </string-array>
+
+    <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>조직적이고 싶지 않니?</item>
+        <item>나 아스트리드! 네 일을 돕기 위해 내가 여기 있노라!</item>
+        <item>너 바뻐 보인다! 니 일정 중 몇 가지는 내가 처리해 줄께.</item>
+        <item>나는 네 삶의 모든 세부 사항의 기록을 유지할 수 있도록 도울 수 있어.</item>
+        <item>일을 더 확실히 마치고 싶지? 나도 그래!</item>
+        <item>너를 알게 되서 기쁘다!</item>
+    </string-array>
+    <!-- ============================================= reminder preferences == -->
+
+    <!-- slide 33d: Reminder Preference Screen Title -->
+    <string name="rmd_EPr_alerts_header">알림 설정</string>
+    <string name="rmd_EPr_alerts_summary">알람 꺼짐 시간, 스누즈 설정, 알람 지속 레벨</string>
+
+    <!-- Reminder Preference: Reminders Enabled Title -->
+    <string name="rmd_EPr_enabled_title">알림을 사용할까요?</string>
+    <!-- Reminder Preference Reminders Enabled Description (true) -->
+    <string name="rmd_EPr_enabled_desc_true">Astrid 알림을 사용합니다 (이것이 보통)</string>
+    <!-- Reminder Preference Reminders Enabled Description (false) -->
+    <string name="rmd_EPr_enabled_desc_false">Astrid 알림을 사용하지 않습니다</string>
+
+    <!-- Reminder Preference: Quiet Hours Start Title -->
+    <string name="rmd_EPr_quiet_hours_start_title">알림 꺼짐 시작 시간</string>
+    <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_start_desc">%s 후에는 알림을 끕니다. (진동은 알람 설정의 진동 설정을 따릅니다)</string>
+    <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
+    <string name="rmd_EPr_quiet_hours_desc_none">알림 꺼짐을 사용하지 않습니다</string>
+
+    <!-- Reminder Preference: Quiet Hours End Title -->
+    <string name="rmd_EPr_quiet_hours_end_title">알림 꺼짐 종료 시간</string>
+    <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_end_desc">%s 부터 알림 기능이 켜집니다</string>
+
+    <!-- Reminder Preference: Default Reminder Title -->
+    <string name="rmd_EPr_rmd_time_title">기본 알림 설정</string>
+    <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
+    <string name="rmd_EPr_rmd_time_desc">마감일이 없는 일정 알림은 %s 에 나타날 것입니다.</string>
+
+    <!-- Reminder Preference: Notification Ringtone Title -->
+    <string name="rmd_EPr_ringtone_title">알림 벨소리</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
+    <string name="rmd_EPr_ringtone_desc_custom">사용자 벨소리가 설정되었습니다</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
+    <string name="rmd_EPr_ringtone_desc_silent">벨소리가 나지 않도록 설정되었습니다</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
+    <string name="rmd_EPr_ringtone_desc_default">기본 벨소리가 사용됩니다</string>
+
+    <!-- Reminder Preference: Notification Persistence Title -->
+    <string name="rmd_EPr_persistent_title">알림 지속 시간</string>
+    <!-- Reminder Preference: Notification Persistence Description (true) -->
+    <string name="rmd_EPr_persistent_desc_true">알림은 반드시 개별적으로 봐야 지워집니다.</string>
+    <!-- Reminder Preference: Notification Persistence Description (false) -->
+    <string name="rmd_EPr_persistent_desc_false">\"모두 지우기\" 버튼으로 알림을 일괄삭제합니다.</string>
+
+    <!-- Reminder Preference: Social Reminders Title -->
+    <string name="rmd_EPr_social_title">친절한 격려</string>
+    <!-- Reminder Preference: Social Reminders Summary (enabled) -->
+    <string name="rmd_EPr_social_summary_enabled">공유 일정에서 당신을 의지하고 있는 사람을 알려 줍니다.</string>
+    <!-- Reminder Preference: Social Reminders Summary (disabled) -->
+    <string name="rmd_EPr_social_summary_disabled">공유 일정에서 당신을 의지하고 있는 사람을 알려 주지 않습니다.</string>
+
+
+    <!-- Reminder Preference: Notification Icon Title -->
+    <!-- Reminder Preference: Notification Icon Description -->
+
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
+    <string name="rmd_EPr_multiple_maxvolume_title">다중-링 알림의 최대 볼륨</string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_true">아스트리드는 다중-링 알림을 최대 볼륨으로 출력합니다</string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_false">아스트리드에서 소리 크기는 시스템 설정을 따릅니다.</string>
+
+    <!-- Reminder Preference: Vibrate Title -->
+    <string name="rmd_EPr_vibrate_title">알림시 진동</string>
+    <!-- Reminder Preference: Vibrate Description (true) -->
+    <string name="rmd_EPr_vibrate_desc_true">알림시 진동합니다.</string>
+    <!-- Reminder Preference: Vibrate Description (false) -->
+    <string name="rmd_EPr_vibrate_desc_false">알림시 진동하지 않습니다.</string>
+
+    <!-- Reminder Preference: Nagging Title -->
+    <string name="rmd_EPr_nagging_title">아스트리드 격려 문구</string>
+    <!-- Reminder Preference: Nagging Description (true) -->
+    <string name="rmd_EPr_nagging_desc_true">아스트리드에서 알림시에 격려 문구를 보여줍니다</string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_nagging_desc_false">아스트리드에서 어떤 격려 문구도 보여주지 않습니다</string>
+
+    <!-- Reminder Preference: Snooze Dialog Title -->
+    <string name="rmd_EPr_snooze_dialog_title">알림 지연 HH:MM</string>
+    <!-- Reminder Preference: Snooze Dialog Description (true) -->
+    <string name="rmd_EPr_snooze_dialog_desc_true">새 지연 시간을 선택하여 알림 연기 (HH:MM)</string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_snooze_dialog_desc_false">미룰 날짜/시간을 선택하여 알림 연기</string>
+
+    <!-- slide 44g: Reminder Preference: Default Reminders Title -->
+    <string name="rmd_EPr_defaultRemind_title">랜덤 알림</string>
+    <!-- Reminder Preference: Default Reminders Setting (disabled) -->
+    <string name="rmd_EPr_defaultRemind_desc_disabled">새 일정은 무작위로 알리지 않습니다</string>
+    <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
+    <string name="rmd_EPr_defaultRemind_desc">새 일정을 무작위로 알려 줍니다: %s</string>
+
+    <!-- slide 39a: Defaults Title -->
+
+    <string-array name="EPr_reminder_random">
+        <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
+        <item>사용안함</item>
+        <!-- slide 44b -->
+        <item>매시간</item>
+        <!-- slide 44c -->
+        <item>매일</item>
+        <!-- slide 44d-->
+        <item>매주</item>
+        <!-- slide 44e-->
+        <item>격주로</item>
+        <!-- slide 44f -->
+        <item>매달</item>
+        <item>격월로</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_start">
+        <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
+        <item>사용안함</item>
+        <item>오후 8시</item>
+        <item>오후 9시</item>
+        <item>오후 10시</item>
+        <item>오후 11시</item>
+        <item>오후 12시</item>
+        <item>오전 1시</item>
+        <item>오전 2시</item>
+        <item>오전 3시</item>
+        <item>오전 4시</item>
+        <item>오전 5시</item>
+        <item>오전 6시</item>
+        <item>오전 7시</item>
+        <item>오전 8시</item>
+        <item>오전 9시</item>
+        <item>오전 10시</item>
+        <item>오전 11시</item>
+        <item>오후 12시</item>
+        <item>오후 1시</item>
+        <item>오후 2시</item>
+        <item>오후 3시</item>
+        <item>오후 4시</item>
+        <item>오후 5시</item>
+        <item>오후 6시</item>
+        <item>오후 7시</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_end">
+        <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
+        <item>오전 9시</item>
+        <item>오전 10시</item>
+        <item>오전 11시</item>
+        <item>오후 12시</item>
+        <item>오후 1시</item>
+        <item>오후 2시</item>
+        <item>오후 3시</item>
+        <item>오후 4시</item>
+        <item>오후 5시</item>
+        <item>오후 6시</item>
+        <item>오후 7시</item>
+        <item>오후 8시</item>
+        <item>오후 9시</item>
+        <item>오후 10시</item>
+        <item>오후 11시</item>
+        <item>오후 12시</item>
+        <item>오전 1시</item>
+        <item>오전 2시</item>
+        <item>오전 3시</item>
+        <item>오전 4시</item>
+        <item>오전 5시</item>
+        <item>오전 6시</item>
+        <item>오전 7시</item>
+        <item>오전 8시</item>
+    </string-array>
+
+    <string-array name="EPr_rmd_time">
+        <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
+        <item>오전 9시</item>
+        <item>오전 10시</item>
+        <item>오전 11시</item>
+        <item>오후 12시</item>
+        <item>오후 1시</item>
+        <item>오후 2시</item>
+        <item>오후 3시</item>
+        <item>오후 4시</item>
+        <item>오후 5시</item>
+        <item>오후 6시</item>
+        <item>오후 7시</item>
+        <item>오후 8시</item>
+        <item>오후 9시</item>
+        <item>오후 10시</item>
+        <item>오후 11시</item>
+        <item>오후 12시</item>
+        <item>오전 1시</item>
+        <item>오전 2시</item>
+        <item>오전 3시</item>
+        <item>오전 4시</item>
+        <item>오전 5시</item>
+        <item>오전 6시</item>
+        <item>오전 7시</item>
+        <item>오전 8시</item>
+    </string-array>
+
+    <!-- =============================================== random reminders == -->
+
+    <string name="reminders_social">이 사람들은 당신만 믿고 있어!</string>
+
+    <string name="reminders_social_one">%s님이 당신을 의지하고 있습니다!</string>
+
+    <string name="reminders_social_multiple">%1$s, %2$s 님 등이 당신을 의지하고 있습니다!</string>
+
+    <string-array name="reminders">
+        <!-- reminders: Make these < 20 chars so the task name is displayed -->
+        <item>거기 안녕! 시간 좀 있어?</item>
+        <item>잠깐 볼 수 있을까?</item>
+        <item>잠깐 시간 좀 낼 수 있을까?</item>
+        <item>잊어 버렸어?</item>
+        <item>잠깐만!</item>
+        <item>시간 있을 때:</item>
+        <item>당신의 일정:</item>
+        <item>시간 여유 있어?</item>
+        <item>아스트리드가 여기 있소이다!</item>
+        <item>안녕! 좀 귀찮게 굴어도 될까?</item>
+        <item>시간 좀 낼 수 있어?</item>
+        <item>일하기 좋은 날:</item>
+    </string-array>
+
+    <string-array name="reminders_due">
+        <!-- reminders related to task due date -->
+        <item>일할 시간이야!</item>
+        <item>마감일이에요!</item>
+        <item>시작할 준비 됐어?</item>
+        <item>이걸 하겠다고 했잖아:</item>
+        <item>이미 시작했어야지:</item>
+        <item>시작할 시간:</item>
+        <item>시간이 되었네!</item>
+        <item>잠깐만! 이제 일할 시간이야:</item>
+        <item>한가해? 좀 하라구:</item>
+    </string-array>
+
+    <string-array name="reminders_snooze">
+        <!-- reminders related to snooze -->
+        <item>지금 게으름은 안돼!</item>
+        <item>낮잠 시간 끝났어요!</item>
+        <item>낮잠은 그만 자!</item>
+        <item>이제 준비됐겠지?</item>
+        <item>더 이상 미루지 말라구!</item>
+    </string-array>
+
+    <string-array name="reminder_responses">
+        <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
+        <item>네가 할 일이 있어!</item>
+        <item>이거 끝내버릴 준비 됐어?</item>
+        <item>왜 이 일을 끝내버리지 않는 거지?</item>
+        <item>이건 어때? 준~비됐나?</item>
+        <item>이거 할 준비 됐지?</item>
+        <item>이거 할 수 있겠어?</item>
+        <item>이걸 끝내면 행복해 질 수 있어!</item>
+        <item>이걸 마치면 기분이 좋아질 거야! 날 믿어!</item>
+        <item>이거 오늘 하기로 하지 않았어?</item>
+        <item>제발 이거 좀 마쳐라, 질리지도 않아!</item>
+        <item>이걸 끝낼 수 있겠어? 넌 할 수 있을 거라고 믿어!</item>
+        <item>이거 아주 안할꺼야?</item>
+        <item>자신감을 가져봐. 해보자구!</item>
+        <item>네가 정말 자랑스러워! 이걸 끝내버리자구!</item>
+        <item>이걸 끝내고 약간의 간식 어때?</item>
+        <item>제발 이거 하나만요, 응?</item>
+        <item>할 일 목록를 줄일 시간이거든!</item>
+        <item>너는 팀에서 어떻게 할꺼야? 손발을 잘 맞춰 보라구! 해보자!</item>
+        <item>너 최근에 끝내준다고 말했었나? 좋아, 계속하라구!</item>
+        <item>하루에 하나의 일정으로 어수선함은 그만… 뒤죽박죽은 이제 안녕!</item>
+        <item>어떻게 하고 있어? 와, 정말 인상적인네!</item>
+        <item>잘난 얼굴만 가지고는 할 수 없어. 덤벼들라구!</item>
+        <item>이런 일하기 좋은 날씨야, 그렇지?</item>
+        <item>이 일 하면서 차 한 잔 어때?</item>
+        <item>이 일을 마치기만 하면, 나가서 놀 수 있어.</item>
+        <item>시간이 됐네. 불가피한 일은 미룰 수 없는 거야.</item>
+        <item>네가 나를 무시할 때마다 내 속이 썩어간다.</item>
+    </string-array>
+
+    <string-array name="postpone_nags">
+        <!-- Astrid\'s nagging when user clicks postpone -->
+        <item>네가 할일을 미루는 사람이라는 게 사실이 아니라고 말해줘!</item>
+        <item>나이가 들어가는 것은 게으를 수가 없잖아?</item>
+        <item>어딘가에서 누군가가 네가 이 일을 마치길 기다리고 있다구!</item>
+        <item>네가 미룬다고 말했지만, 사실은 이걸 하고 있다는 거지, 맞지?</item>
+        <item>이게 마지막으로 미루는 거지? 응?</item>
+        <item>이걸 오늘 마치면, 더 이상 얘기 안할께!</item>
+        <item>할수 있을 때 왜 미루니.. 제발 미루지 마!</item>
+        <item>결국에는 이거 다 할거지? 맞지?</item>
+        <item>넌 정말 대단하다고 생각해! 이거 미루지 않는 게 어때?</item>
+        <item>그렇게 하면 네 목표를 이룰 수 있겠어?</item>
+        <item>미루고, 미루고, 또 미루고, 언제 바뀔래!</item>
+        <item>변명은 충분히 들었어! 벌써 다 했어야지!</item>
+        <item>지난번에도 그렇게 변명하지 않았니?</item>
+        <item>그렇게 하면 네가 네 삶을 계획하고 준비하는 걸 도와줄 수가 없어...</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in repeat plug-in -->
+
+    <!-- repeating plugin name -->
+    <string name="repeat_plugin">일정 반복하기</string>
+
+    <!-- repeating plugin description -->
+    <string name="repeat_plugin_desc">일정 반복 허락</string>
+
+    <!-- slide 20a: checkbox for turning on/off repeats -->
+    <string name="repeat_enabled">반복 설정</string>
+
+    <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
+    <string name="repeat_every">매 %d</string>
+
+    <!-- hint when opening repeat interval -->
+    <string name="repeat_interval_prompt">반복 주기</string>
+
+    <!-- slide 19b-->
+    <string name="repeat_never">반복하지 않기</string>
+    <!-- slide 20f-->
+    <string name="repeat_dont">반복하지 않기</string>
+
+    <string-array name="repeat_interval_short">
+        <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>일</item>
+        <item>주</item>
+        <item>월</item>
+        <item>시간</item>
+        <item>분</item>
+        <item>년</item>
+    </string-array>
+
+
+    <string-array name="repeat_interval">
+        <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>일마다</item>
+        <item>주마다</item>
+        <item>월마다</item>
+        <item>시마다</item>
+        <item>분마다</item>
+        <item>년마다</item>
+    </string-array>
+
+    <string name="repeat_days">일</string>
+    <string name="repeat_weekdays">주중</string>
+    <string name="repeat_weeks">주</string>
+    <string name="repeat_months">달</string>
+    <string name="repeat_years">년</string>
+    <string name="repeat_hours">시</string>
+    <string name="repeat_minutes">분</string>
+
+    <string-array name="repeat_until_shortcuts">
+        <item>영원히</item>
+        <item>특정일</item>
+        <item>오늘</item>
+        <item>내일</item>
+        <item>(며칠 후)</item>
+        <item>다음 주</item>
+        <item>2주에</item>
+        <item>다음 달</item>
+    </string-array>
+
+    <string name="repeat_until_title">다음까지 반복하기...</string>
+
+    <string name="repeat_keep_going">계속하기</string>
+
+    <string-array name="repeat_type">
+        <!-- slide 20c: repeat type (date to repeat from) -->
+        <item>마감일로부터</item>
+        <!-- slide 20c -->
+        <item>완료일로부터</item>
+    </string-array>
+
+    <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
+    <string name="repeat_detail_byday">$I on $D</string>
+
+    <!-- task detail for repeat from due date (%s -> interval) -->
+    <string name="repeat_detail_duedate">매 %s</string>
+
+    <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
+    <string name="repeat_detail_duedate_until">매 %1$s 마다\n%2$s 까지</string>
+
+    <!-- task detail for repeat from completion date (%s -> interval) -->
+    <string name="repeat_detail_completion">완료 후 %s</string>
+
+    <!-- text for button when repeating task indefinitely -->
+    <string name="repeat_forever">영원히 반복하기</string>
+
+    <!-- text for button when repeating task until specified date (%s -> date string) -->
+    <string name="repeat_until">%s 까지 반복</string>
+
+    <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title">\"%s\" 일정 변경하기</string>
+
+    <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title_last_time">반복 일정 \"%s\" 을 완료했습니다</string>
+
+    <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->
+    <string name="repeat_rescheduling_dialog_bubble">%1$s 이 반복 일정을 %2$s 에서 %3$s 로 변경했습니다</string>
+
+    <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
+    <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s 이 반복 일정을 %2$s 로 변경했습니다</string>
+
+    <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
+    <string name="repeat_rescheduling_dialog_bubble_last_time">이 반복 일정은 %1$s 까지였는데 지금 다 끝냈습니다.
+        %2$s
+    </string>
+
+    <string-array name="repeat_encouragement">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>잘했어!</item>
+        <item>와... 네가 정말 자랑스러워!</item>
+        <item>네가 결실을 맺는 것이 좋아!</item>
+        <item>무언가 완료 체크를 하면 기분이 좋지 않니?</item>
+    </string-array>
+
+    <string-array name="repeat_encouragement_last_time">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>훌륭해!</item>
+        <item>네가 자랑스럽다!</item>
+        <item>네가 열매를 많이 맺으면 나는 기뻐!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Subtasks Help Introduction -->
+    <string name="subtasks_help_title">Astrid에서 정렬하고 들여쓰기</string>
+    <string name="subtasks_help_1">일정을 옮기려면 길게 누릅니다</string>
+    <string name="subtasks_help_2">재배열하려면 수직으로 드래그합니다</string>
+    <string name="subtasks_help_3">들여쓰기하려면 수평으로 드래그합니다</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-
-  <!-- Tags label -->
-  <string name="TEA_tags_label">목록</string>
-  
-  <!-- Tags label long version -->
-  <string name="TEA_tags_label_long">목록에 추가하기</string>
- 
-  <!-- Tags hint -->
-  <string name="TEA_tag_hint">새 목록</string>
-  
-  <!-- Tags dropdown -->
-    
-  <!-- =============================================== Task List Controls == -->
-  
-  <!-- menu item for tags -->
-  
-  <!-- ========================================================== Extras == -->
-  
-  <!-- Context Item: show tag -->
-  
-  <!-- slide 25a: Dialog: new list -->
-  <string name="tag_new_list">새 목록</string>
-  
-  <!-- Dialog: list saved -->
-  
-  <!-- Dialog: task created without title -->
-  <string name="tag_no_title_error">이 목록의 이름을 먼저 입력하세요!</string>
-  
-  <!-- ========================================================== Filters == -->
-  
-  <!-- filter button to add tag -->
-  <string name="tag_FEx_add_new">새로 만들기</string>
-  
-  <!-- filter header for tags -->
-  <string name="tag_FEx_header">목록</string>
-  
-  <!-- filter header for tags user created -->
-  
-  <!-- filter header for tags, shared with user -->
-  
-  <!-- filter header for tags which have no active tasks -->
-  
-  <!-- slide 10d: filter for untagged tasks -->
-  <string name="tag_FEx_untagged">미분류 일정</string>
-  
-  <!-- slide 27a: %s => tag name -->
-
-  <!-- context menu option to rename a tag -->
-  <string name="tag_cm_rename">목록 이름 바꾸기</string>
-
-  <!-- context menu option to delete a tag -->
-  <string name="tag_cm_delete">목록 지우기</string>
-  
-  <!-- context menu option to leave a shared list -->
-  <string name="tag_cm_leave">목록 탈퇴하기</string>
-
-  <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
-  <string name="DLG_delete_this_tag_question">이 목록을 삭제할까요: %s? (일정은 삭제 안됨)</string>
-  
-  <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
-  <string name="DLG_leave_this_shared_tag_question">이 공유 목록을 탈퇴할까요: %s? (일정은 삭제 안됨)</string>
-
-  <!-- Dialog to rename tag -->
-  <string name="DLG_rename_this_tag_header">목록 %s 의 이름을 바꾸기:</string>
-
-  <!-- Toast notification that no changes have been made -->
-  <string name="TEA_no_tags_modified">변경 사항이 없습니다</string>
-
-  <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_deleted">삭제한 목록 %1$s 은 %2$d 일정에 영향을 미칩니다</string>
-  
-  <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_left">탈퇴한 공유 목록 %1$s 은 %2$d 일정에 영향을 미칩니다</string>
-
-  <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
-  <string name="TEA_tags_renamed">%3$d 일정의 %1$s 의 이름을 %2$s 로 변경했습니다</string>
-  
-  <!-- Tag case migration -->
-  <string name="tag_case_migration_notice">다른 대문자로 된 같은 이름의 목록이 있는 것을 알려 드립니다. 일부로 이름을 같게 해서 그 중복된 목록을 합치려고 하신 것 같은데 걱정 마십시오: 목록 원본은 숫자를 붙여서 이름을 변경합니다 (예: Shopping_1, Shopping_2). 이것을 원치 않으시면 새로 결합된 목록을 간단히 삭제할 수 있습니다.</string>
-  
-  <!-- Header for tag settings -->
-  <string name="tag_settings_title">목록 설정</string>
-  
-  <!-- Header for tag activity -->
-  <string name="tag_updates_title">활동내역: %s</string>
-  
-  <!-- Delete button for tag settings -->
-  <string name="tag_delete_button">목록 삭제하기</string>
-  
-  <!-- slide 28d: Leave button for tag settings -->
-  <string name="tag_leave_button">이 목록 탈퇴하기</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Tags label -->
+    <string name="TEA_tags_label">목록</string>
 
+    <!-- Tags label long version -->
+    <string name="TEA_tags_label_long">목록에 추가하기</string>
+
+    <!-- Tags hint -->
+    <string name="TEA_tag_hint">새 목록</string>
+
+    <!-- Tags dropdown -->
+
+    <!-- =============================================== Task List Controls == -->
+
+    <!-- menu item for tags -->
+
+    <!-- ========================================================== Extras == -->
+
+    <!-- Context Item: show tag -->
+
+    <!-- slide 25a: Dialog: new list -->
+    <string name="tag_new_list">새 목록</string>
+
+    <!-- Dialog: list saved -->
+
+    <!-- Dialog: task created without title -->
+    <string name="tag_no_title_error">이 목록의 이름을 먼저 입력하세요!</string>
+
+    <!-- ========================================================== Filters == -->
+
+    <!-- filter button to add tag -->
+    <string name="tag_FEx_add_new">새로 만들기</string>
+
+    <!-- filter header for tags -->
+    <string name="tag_FEx_header">목록</string>
+
+    <!-- filter header for tags user created -->
+
+    <!-- filter header for tags, shared with user -->
+
+    <!-- filter header for tags which have no active tasks -->
+
+    <!-- slide 10d: filter for untagged tasks -->
+    <string name="tag_FEx_untagged">미분류 일정</string>
+
+    <!-- slide 27a: %s => tag name -->
+
+    <!-- context menu option to rename a tag -->
+    <string name="tag_cm_rename">목록 이름 바꾸기</string>
+
+    <!-- context menu option to delete a tag -->
+    <string name="tag_cm_delete">목록 지우기</string>
+
+    <!-- context menu option to leave a shared list -->
+    <string name="tag_cm_leave">목록 탈퇴하기</string>
+
+    <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
+    <string name="DLG_delete_this_tag_question">이 목록을 삭제할까요: %s? (일정은 삭제 안됨)</string>
+
+    <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
+    <string name="DLG_leave_this_shared_tag_question">이 공유 목록을 탈퇴할까요: %s? (일정은 삭제 안됨)</string>
+
+    <!-- Dialog to rename tag -->
+    <string name="DLG_rename_this_tag_header">목록 %s 의 이름을 바꾸기:</string>
+
+    <!-- Toast notification that no changes have been made -->
+    <string name="TEA_no_tags_modified">변경 사항이 없습니다</string>
+
+    <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_deleted">삭제한 목록 %1$s 은 %2$d 일정에 영향을 미칩니다</string>
+
+    <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_left">탈퇴한 공유 목록 %1$s 은 %2$d 일정에 영향을 미칩니다</string>
+
+    <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
+    <string name="TEA_tags_renamed">%3$d 일정의 %1$s 의 이름을 %2$s 로 변경했습니다</string>
+
+    <!-- Tag case migration -->
+    <string name="tag_case_migration_notice">다른 대문자로 된 같은 이름의 목록이 있는 것을 알려 드립니다. 일부로 이름을 같게 해서 그 중복된
+        목록을 합치려고 하신 것 같은데 걱정 마십시오: 목록 원본은 숫자를 붙여서 이름을 변경합니다 (예: Shopping_1, Shopping_2). 이것을 원치 않으시면
+        새로 결합된 목록을 간단히 삭제할 수 있습니다.
+    </string>
+
+    <!-- Header for tag settings -->
+    <string name="tag_settings_title">목록 설정</string>
+
+    <!-- Header for tag activity -->
+    <string name="tag_updates_title">활동내역: %s</string>
+
+    <!-- Delete button for tag settings -->
+    <string name="tag_delete_button">목록 삭제하기</string>
+
+    <!-- slide 28d: Leave button for tag settings -->
+    <string name="tag_leave_button">이 목록 탈퇴하기</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in timers plug-in -->
-    
+
     <!-- Task List: Start Timer button -->
-    
+
     <!-- Task List: Stop Timer button -->
-    
+
     <!-- Android Notification Title (%s => # tasks) -->
     <string name="TPl_notification">%s 동안 타이머 작동함!</string>
-    
+
     <!-- Filter Header for Timer plugin -->
-    
+
     <!-- Filter for Timed Tasks -->
     <string name="TFE_workingOn">기한이 정해진 일정</string>
-    
+
     <!-- Title for TEA -->
     <string name="TEA_timer_controls">타이머</string>
-    
-    
+
+
     <!-- Edit Notes: create comment for when timer is started -->
     <string name="TEA_timer_comment_started">이 일정 시작:</string>
-    
+
     <!-- Edit Notes: create comment for when timer is stopped -->
     <string name="TEA_timer_comment_stopped">이 일정 중지:</string>
-    
+
     <!-- Edit Notes: comment to notify how long was spent on task -->
     <string name="TEA_timer_comment_spent">소요 시간:</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Update string from activity codes %1$s - user, %2$s - target name, %3$s - message, %4$s - other_user-->
-    
+
     <!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
     Please do not translate this part of the string. -->
-    
+
     <!-- These are still in use -->
     <string name="update_string_default_comment">%1$s의 댓글: %3$s</string>
     <string name="update_string_task_comment">$link_task 의 %1$s: %3$s</string>
     <string name="update_string_tag_comment">%2$s의 %1$s: %3$s</string>
     <string name="update_string_user_self">당신</string>
-    
+
     <string name="history_yourself">스스로</string>
     <string name="history_you">당신</string>
     <string name="history_a_deleted_user">(삭제한 사용자)</string>
-    
+
     <string name="history_this_list">이 목록</string>
     <string name="history_this_task">이 일정</string>
-    <string name="history_tag_added"> %1$s 를 %2$s 에 추가함</string>
+    <string name="history_tag_added">%1$s 를 %2$s 에 추가함</string>
     <string name="history_tag_removed">%1$s 을 %2$s 에서 제거함</string>
     <string name="history_attach_added">%1$s 을 %2$s 에 첨부함</string>
     <string name="history_attach_removed">%1$s 을 %2$s 에서 제거함</string>
@@ -3000,18 +3062,18 @@ Astrid.com 과 동기화하시겠습니까?</string>
     <string name="history_removed_description">%s 설명을 삭제했습니다</string>
     <string name="history_removed_description_characters">%1$d 문자를 %2$s 설명에서 삭제했습니다</string>
     <string name="history_updated_description">%s 설명을 업데이트 했습니다</string>
-    <string name="history_changed_list_owner">목록 소유자를  %s 로 변경했습니다</string>
+    <string name="history_changed_list_owner">목록 소유자를 %s 로 변경했습니다</string>
     <string name="history_created_this_list">이 목록을 만들었습니다</string>
     <string name="history_unassigned">미할당 %s</string>
     <string name="history_claimed">%s 를 요구했습니다</string>
     <string name="history_assigned_to">%1$s 를 %2$s 로 할당함</string>
     <string name="history_created_for">%2$s 에 대해 %1$s 을 만들었습니다</string>
     <string name="history_created">%s 를 만들었습니다</string>
-    <string name="history_changed_due_date"> %1$s 마감일 변경: %2$s -> %3$s</string>
-    <string name="history_set_due_date"> %1$s 마감일 설정: %2$s</string>
+    <string name="history_changed_due_date">%1$s 마감일 변경: %2$s -> %3$s</string>
+    <string name="history_set_due_date">%1$s 마감일 설정: %2$s</string>
     <string name="history_removed_due_date">%s 마감일을 삭제했습니다</string>
     <string name="history_completed_repeating_task">%1$s 를 완료했습니다 (이제 %2$s 까지)</string>
-    <string name="history_added_user"> %1$s 를 %2$s 에 추가했습니다</string>
+    <string name="history_added_user">%1$s 를 %2$s 에 추가했습니다</string>
     <string name="history_removed_user">%1$s 를 %2$s 에서 삭제했습니다</string>
     <string name="history_changed_repeat">%1$s 반복을 %2$s 으로 변경했습니다</string>
     <string name="history_removed_repeat">%s 반복을 삭제했습니다</string>
@@ -3021,187 +3083,189 @@ Astrid.com 과 동기화하시겠습니까?</string>
     <string name="history_repeat_on">: %s</string>
     <string name="history_repeat_from_completion">완료 후</string>
     <string name="history_acknowledged">%s 를 열람했습니다</string>
-    
+
     <string name="history_default">%1$s 를 %2$s 로 변경했습니다</string>
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-    
-  <!-- Voice Add Prompt Text -->
-  <string name="voice_create_prompt">일정을 만들려면 말하세요</string>
-  <string name="voice_edit_title_prompt">일정 제목을 말하세요</string>
-  <string name="voice_edit_note_prompt">일정의 내용을 말하세요</string>
-    
-  <!-- Preference: Task List recognition-service is not installed, but available -->
-  <string name="EPr_voiceInputInstall_dlg">음성입력이 설치되어 있지 않습니다. 마켓에 가서 지금 설치할까요?</string>
-  <!-- Preference: Task List recognition-service is not available for this system -->
-  <string name="EPr_voiceInputUnavailable_dlg">당신의 기기에서 음성입력을 사용할 수 없습니다. 안드로이드 2.1 이상으로 업데이트하세요.</string>
-  <!-- Preference: Market is not available for this system -->
-  <string name="EPr_marketUnavailable_dlg">이 시스템에서 아직 마켓을 사용할 수 없습니다. 다른 곳에서 음성 검색을 다운로드하세요.</string>
-  <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
-  <string name="EPr_voiceInputEnabled_title">음성 입력</string>
-  <!-- slide 38a: Preference: voice button description (true) -->
-  <string name="EPr_voiceInputEnabled_desc_enabled">일정 목록 페이지에 음성 입력 버튼을 출력합니다</string>
-  <!-- Preference: voice button description (false) -->
-  <string name="EPr_voiceInputEnabled_desc_disabled">일정 목록 페이지에서 음성 입력 버튼을 숨깁니다</string>
-  <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
-  <string name="EPr_voiceInputCreatesTask_title">일정을 직접 만들기</string>
-  <!-- Preference: Task List Voice-creation description (true) -->
-  <string name="EPr_voiceInputCreatesTask_desc_enabled">음성 입력으로 일정을 자동으로 만듭니다</string>
-  <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
-  <string name="EPr_voiceInputCreatesTask_desc_disabled">음성 입력이 끝난 후에 일정 제목을 편집할 수 있습니다</string>
-  <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
-  <string name="EPr_voiceRemindersEnabled_title">음성 알림</string>
-  <!-- Preference: Voice reminders description (true) -->
-  <string name="EPr_voiceRemindersEnabled_desc_enabled">일정 알림기간 동안 일정 이름을 직접 말해 줍니다</string>
-  <!-- slide 38c: Preference: Voice reminders description (false) -->
-  <string name="EPr_voiceRemindersEnabled_desc_disabled">일정 알림기간 동안 벨소리를 울려줍니다</string>    
-  
-  <!-- slide 32d: Preference Category: Voice Title -->
-  <string name="EPr_voice_header">음성 입력 설정</string>
-    
 
+    <!-- Voice Add Prompt Text -->
+    <string name="voice_create_prompt">일정을 만들려면 말하세요</string>
+    <string name="voice_edit_title_prompt">일정 제목을 말하세요</string>
+    <string name="voice_edit_note_prompt">일정의 내용을 말하세요</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Preference: Task List recognition-service is not installed, but available -->
+    <string name="EPr_voiceInputInstall_dlg">음성입력이 설치되어 있지 않습니다. 마켓에 가서 지금 설치할까요?</string>
+    <!-- Preference: Task List recognition-service is not available for this system -->
+    <string name="EPr_voiceInputUnavailable_dlg">당신의 기기에서 음성입력을 사용할 수 없습니다. 안드로이드 2.1 이상으로
+        업데이트하세요.
+    </string>
+    <!-- Preference: Market is not available for this system -->
+    <string name="EPr_marketUnavailable_dlg">이 시스템에서 아직 마켓을 사용할 수 없습니다. 다른 곳에서 음성 검색을 다운로드하세요.
+    </string>
+    <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
+    <string name="EPr_voiceInputEnabled_title">음성 입력</string>
+    <!-- slide 38a: Preference: voice button description (true) -->
+    <string name="EPr_voiceInputEnabled_desc_enabled">일정 목록 페이지에 음성 입력 버튼을 출력합니다</string>
+    <!-- Preference: voice button description (false) -->
+    <string name="EPr_voiceInputEnabled_desc_disabled">일정 목록 페이지에서 음성 입력 버튼을 숨깁니다</string>
+    <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
+    <string name="EPr_voiceInputCreatesTask_title">일정을 직접 만들기</string>
+    <!-- Preference: Task List Voice-creation description (true) -->
+    <string name="EPr_voiceInputCreatesTask_desc_enabled">음성 입력으로 일정을 자동으로 만듭니다</string>
+    <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
+    <string name="EPr_voiceInputCreatesTask_desc_disabled">음성 입력이 끝난 후에 일정 제목을 편집할 수 있습니다</string>
+    <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
+    <string name="EPr_voiceRemindersEnabled_title">음성 알림</string>
+    <!-- Preference: Voice reminders description (true) -->
+    <string name="EPr_voiceRemindersEnabled_desc_enabled">일정 알림기간 동안 일정 이름을 직접 말해 줍니다</string>
+    <!-- slide 38c: Preference: Voice reminders description (false) -->
+    <string name="EPr_voiceRemindersEnabled_desc_disabled">일정 알림기간 동안 벨소리를 울려줍니다</string>
 
-  
-  <!-- slide 30a-->
-  <string name="welcome_setting">사용 지침 보기</string>
-  
-  <string name="welcome_title_1">아스트리드 사용을 환영합니다!</string>
+    <!-- slide 32d: Preference Category: Voice Title -->
+    <string name="EPr_voice_header">음성 입력 설정</string>
 
-  <!-- slide 2a -->
-  <string name="welcome_title_2">목록 만들기</string>
 
-  <!-- slide 3a-->
-  <string name="welcome_title_3">목록 간 전환</string>
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-  <!-- slide 4a -->
-  <string name="welcome_title_4">목록 공유하기</string>
 
-  <!-- slide 5a -->
-  <string name="welcome_title_5">일정 분배하기</string>
+    <!-- slide 30a-->
+    <string name="welcome_setting">사용 지침 보기</string>
 
-  <!-- slide 6a -->
-  <string name="welcome_title_6">상세내용 입력하기</string>
+    <string name="welcome_title_1">아스트리드 사용을 환영합니다!</string>
 
-  <!-- slide 7a -->
-  <string name="welcome_title_7">시작하려면\n지금 접속하세요!</string>
-  
-  <string name="welcome_title_7_return">그거에요!</string>
-  
-  <!-- slide 1b -->
-  <string name="welcome_body_1">친구와 협업 가능한 \n완벽한 개인 비서</string>
+    <!-- slide 2a -->
+    <string name="welcome_title_2">목록 만들기</string>
 
-  <!-- slide 2b-->
-  <string name="welcome_body_2">어떤 목록이든 최고:\n독서, 시청, 구매, 방문!</string>
+    <!-- slide 3a-->
+    <string name="welcome_title_3">목록 간 전환</string>
 
-  <!-- slide 3b -->
-  <string name="welcome_body_3">모든 목록을 보려면 \n목록 제목을 누르세요</string>
+    <!-- slide 4a -->
+    <string name="welcome_title_4">목록 공유하기</string>
 
-  <!-- slide 4b -->
-  <string name="welcome_body_4">목록을 친구, 동료나\n애인과 공유해 보세요!</string>
+    <!-- slide 5a -->
+    <string name="welcome_title_5">일정 분배하기</string>
 
-  <!-- slide 5b -->
-  <string name="welcome_body_5">누구인지 궁금해하지 마세요\n디저트를 가져오세요!</string>
+    <!-- slide 6a -->
+    <string name="welcome_title_6">상세내용 입력하기</string>
 
-  <!-- slide 6b-->
-  <string name="welcome_body_6">설명이나 알림 등을 \n추가하려면 누르세요!</string>
-  <string name="welcome_body_7">로그인</string>
-  
-  <string name="welcome_body_7_return">돌아가려면 아스트리드를 누르세요.</string>
-  
-  <!-- slide 1c -->
-  <string name="welcome_next">다음</string>
-  
+    <!-- slide 7a -->
+    <string name="welcome_title_7">시작하려면\n지금 접속하세요!</string>
 
+    <string name="welcome_title_7_return">그거에요!</string>
+
+    <!-- slide 1b -->
+    <string name="welcome_body_1">친구와 협업 가능한 \n완벽한 개인 비서</string>
+
+    <!-- slide 2b-->
+    <string name="welcome_body_2">어떤 목록이든 최고:\n독서, 시청, 구매, 방문!</string>
+
+    <!-- slide 3b -->
+    <string name="welcome_body_3">모든 목록을 보려면 \n목록 제목을 누르세요</string>
+
+    <!-- slide 4b -->
+    <string name="welcome_body_4">목록을 친구, 동료나\n애인과 공유해 보세요!</string>
+
+    <!-- slide 5b -->
+    <string name="welcome_body_5">누구인지 궁금해하지 마세요\n디저트를 가져오세요!</string>
+
+    <!-- slide 6b-->
+    <string name="welcome_body_6">설명이나 알림 등을 \n추가하려면 누르세요!</string>
+    <string name="welcome_body_7">로그인</string>
+
+    <string name="welcome_body_7_return">돌아가려면 아스트리드를 누르세요.</string>
+
+    <!-- slide 1c -->
+    <string name="welcome_next">다음</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <string name="widget_mini">- Astrid Mini -</string>
-    
+
     <!-- Resources for power pack widget -->
-    
+
     <string name="PPW_widget_42_label">Old Astrid 4x2</string>
     <string name="PPW_widget_43_label">Old Astrid 4x3</string>
     <string name="PPW_widget_44_label">Old Astrid 4x4</string>
     <string name="PPW_widget_v11_label">- Astrid -</string>
     <string name="PPW_widget_custom_label">아스트리드 사용자 런처 프리미엄</string>
     <string name="PPW_widget_custom_launcherpro_label">아스트리드 런쳐 프로 프리미엄</string>
-    
+
     <string name="PPW_configure_title">위젯 설정하기</string>
-    
+
     <string name="PPW_color">위젯 색상</string>
     <string name="PPW_enable_calendar">달력 이벤트 보여주기</string>
     <string name="PPW_disable_encouragements">격려문구 숨기기</string>
     <string name="PPW_show_dates">완료 예정일 보기</string>
     <string name="PPW_filter">필터 선택하기</string>
-    
+
     <string name="PPW_due">마감일:</string>
     <string name="PPW_past_due">이전 마감일:</string>
-    
-    <string name="PPW_old_astrid_notice">이 위젯을 사용하려면 최소한 
-3.6 이상의 아스트리드가 필요합니다!</string>
-    
+
+    <string name="PPW_old_astrid_notice">이 위젯을 사용하려면 최소한
+        3.6 이상의 아스트리드가 필요합니다!
+    </string>
+
     <string-array name="PPW_encouragements">
         <!-- general encouragements -->
-    	<item>안녕!</item>
-    	<item>무언가 마무리할 시간이 있어?</item>
-    	<item>이야, 오늘 너 정말 멋져 보인다!</item>
-    	<item>오늘 뭔가 끝내주는 걸 해보자구!</item>
-    	<item>오늘 나를 자랑스럽게 해 다오!</item>
-    	<item>오늘은 어때?</item>
+        <item>안녕!</item>
+        <item>무언가 마무리할 시간이 있어?</item>
+        <item>이야, 오늘 너 정말 멋져 보인다!</item>
+        <item>오늘 뭔가 끝내주는 걸 해보자구!</item>
+        <item>오늘 나를 자랑스럽게 해 다오!</item>
+        <item>오늘은 어때?</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_tod">
         <!-- encouragements based on time of day -->
-    	<item>좋은 아침!</item>
-    	<item>좋은 오후!</item>
-    	<item>좋은 저녁!</item>
-    	<item>밤 늦게?</item>
-    	<item>아직 이르지만, 일을 끝내버리자구!</item>
-    	<item>오후의 차 한잔, 어때?</item>
-    	<item>저녁을 즐기라구!</item>
-    	<item>알겠지만 잠은 건강에 좋은 거야!</item>
+        <item>좋은 아침!</item>
+        <item>좋은 오후!</item>
+        <item>좋은 저녁!</item>
+        <item>밤 늦게?</item>
+        <item>아직 이르지만, 일을 끝내버리자구!</item>
+        <item>오후의 차 한잔, 어때?</item>
+        <item>저녁을 즐기라구!</item>
+        <item>알겠지만 잠은 건강에 좋은 거야!</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_completed">
         <!-- encouragements based on tasks completed (%d => completed) -->
-    	<item>벌써 %d 일정을 마쳤구나!</item>
-    	<item>생활 점수: %d 일정을 마쳤습니다</item>
-    	<item>웃어봐! 이미 %d 일정을 마쳤으니까!</item>
+        <item>벌써 %d 일정을 마쳤구나!</item>
+        <item>생활 점수: %d 일정을 마쳤습니다</item>
+        <item>웃어봐! 이미 %d 일정을 마쳤으니까!</item>
     </string-array>
-  	<string name="PPW_encouragements_none_completed">완료하지 않은 일정이 매우 많습니다! 완료할까요?</string>
-        
+    <string name="PPW_encouragements_none_completed">완료하지 않은 일정이 매우 많습니다! 완료할까요?</string>
+
     <string-array name="PPW_colors">
         <item>검정색</item>
         <item>흰색</item>
         <item>파란색</item>
         <item>반투명</item>
     </string-array>
-    
+
     <string name="PPW_widget_dlg_text">이 위젯은 파워팩 구매자만 사용할 수 있습니다!</string>
     <string name="PPW_widget_dlg_ok">미리보기</string>
-    
+
     <string name="PPW_demo_title1">%s 항목은 여기서 시작합니다</string>
     <string name="PPW_demo_title2">파워팩은 프리미엄 위젯을 포함합니다...</string>
     <string name="PPW_demo_title3">...음성 추가와 좋은 느낌!</string>
     <string name="PPW_demo_title4">더 알고 싶으면 누르세요!</string>
-    
+
     <string name="PPW_info_title">무료 파워팩!</string>
     <string name="PPW_info_signin">로그인 하세요!</string>
     <string name="PPW_info_later">나중에</string>
@@ -3209,7 +3273,7 @@ Astrid.com 과 동기화하시겠습니까?</string>
     <string name="PPW_check_button">무료로 파워팩 얻기!</string>
     <string name="PPW_check_share_lists">공유 목록!</string>
     <string name="PPW_api_level">죄송하지만 이 위젯은 안드로이드 3.0 이상에서만 사용할 수 있습니다.</string>
-    
+
     <string name="EPr_widget_enabled_title">위젯 켜기/끄기</string>
     <string name="PPW_restart_for_enabled_state">이 변경은 스마트폰을 재시작해야 효과가 있습니다.</string>
 
diff --git a/astrid/res/values-nb/strings.xml b/astrid/res/values-nb/strings.xml
index 57257f98c..9628671ad 100644
--- a/astrid/res/values-nb/strings.xml
+++ b/astrid/res/values-nb/strings.xml
@@ -1,629 +1,680 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string-array name="TVA_tabs">
-    <item>Tasks</item>
-    <item>Activity</item>
-    <item>List Settings</item>
-  </string-array>
-  <string name="actfm_ALA_password_label">Passord</string>
-  <string name="alarm_ACS_label">Varsler</string>
-  <string name="alarm_ACS_button">Legg til nytt varsel</string>
-  <string-array name="reminders_alarm">
-    <item>Alarm!</item>
-  </string-array>
-  <string name="backup_BPr_header">Sikkerhetskopier</string>
-  <string name="backup_status_success">Siste: %s</string>
-  <string name="backup_status_failed">Siste sikkerhetskopiering mislyktes</string>
-  <string name="backup_status_failed_subtitle">(klikk for å vise feil)</string>
-  <string name="backup_status_never">Sikkerhetskopi aldri utført!</string>
-  <string name="backup_BPr_group_options">Alternativer</string>
-  <string name="backup_BPr_auto_title">Automatisk sikkerhetskopiering</string>
-  <string name="backup_BPr_auto_disabled">Automatisk sikkerhetskopiering deaktivert</string>
-  <string name="backup_BPr_auto_enabled">Sikkerhetskopiering vil skje daglig</string>
-  <string name="backup_BAc_title">Håndter sikkerhetskopiene dine</string>
-  <string name="backup_BAc_import">Importer oppgaver</string>
-  <string name="backup_BAc_export">Eksporter oppgaver</string>
-  <string name="backup_TXI_error">Importfeil</string>
-  <string name="export_toast">Backup ferdig %1$s av %2$s.</string>
-  <string name="export_toast_no_tasks">Ingen oppgaver å eksportere</string>
-  <string name="export_progress_title">Eksporterer...</string>
-  <string name="import_summary_title">Gjennopprettingssammendrag</string>
-  <string name="import_summary_message">Filen %1$s inneholder %2$s.\n\n %3$s importert,\n %4$s eksisterer allerede\n %5$s inneholdt feil\n</string>
-  <string name="import_progress_title">Importerer...</string>
-  <string name="import_progress_read">Leser oppgave %d...</string>
-  <string name="DLG_error_sdcard">Får ikke tilgang til mappen: %s</string>
-  <string name="DLG_error_sdcard_general">Ditt SD-kort er ikke tilgjengelig!</string>
-  <string name="import_file_prompt">Velg fil å gjenopprette</string>
-  <string name="app_name">Astrid Oppgaver</string>
-  <string name="read_permission_label">Astrid Tillatelse</string>
-  <string name="read_permission_desc">les oppgaver, vis oppgavefiltre</string>
-  <string name="write_permission_label">Astrid Tillatelse</string>
-  <string name="write_permission_desc">opprett nye oppgaver, rediger eksisterende oppgaver</string>
-  <string name="DLG_delete_this_task_question">Slett denne oppgaven?</string>
-  <string name="DLG_delete_this_item_question">Slett følgende: %s?</string>
-  <string name="DLG_upgrading">Oppgraderer oppgavene dine...</string>
-  <string name="DLG_hour_minutes">Tid (timer : minutter)</string>
-  <string name="DLG_please_update">Astrid bør oppdateres til siste versjon i Android Marked! Vennligst gjør det før du fortsetter, eller vent noen sekunder.</string>
-  <string name="DLG_accept">Jeg godkjenner</string>
-  <string name="DLG_decline">Jeg godkjenner ikke</string>
-  <string name="DLG_eula_title">Astrid Brukervilkår</string>
-  <string name="DLG_loading">Laster ...</string>
-  <string name="WID_dateButtonUnset">Klikk for å sette</string>
-  <string name="TLA_menu_sort">Sorter &amp; Skjult</string>
-  <string name="TLA_menu_settings">Innstillinger</string>
-  <string name="TLA_custom">Egendefinert</string>
-  <string-array name="TLA_filters">
-    <item>Active</item>
-    <item>I dag</item>
-    <item>Soon</item>
-    <item>Late</item>
-    <item>Utført</item>
-    <item>Hidden</item>
-  </string-array>
-  <string-array name="TLA_priority_strings">
-    <item>highest priority</item>
-    <item>high priority</item>
-    <item>medium priority</item>
-    <item>low priority</item>
-  </string-array>
-  <string name="TAd_hiddenFormat">%s [skjult]</string>
-  <string name="TAd_deletedFormat">%s [slettet]</string>
-  <string name="TAd_actionEditTask">Rediger</string>
-  <string name="TAd_contextEditTask">Rediger oppgave</string>
-  <string name="TAd_contextUndeleteTask">Gjenopprett slettet oppgave</string>
-  <string name="TAd_contextPurgeTask">Rens ut oppgave</string>
-  <string name="SSD_title">Sortering og skjulte oppgaver</string>
-  <string name="SSD_completed">Vis fullførte oppgaver</string>
-  <string name="SSD_hidden">Vis skjulte oppgaver</string>
-  <string name="SSD_deleted">Vis slettede oppgaver</string>
-  <string name="SSD_sort_auto">Astrid intelligent sortering</string>
-  <string name="SSD_sort_alpha">Etter tittel</string>
-  <string name="SSD_sort_due">Etter forfallsdato</string>
-  <string name="SSD_sort_importance">Etter viktighet</string>
-  <string name="SSD_sort_modified">Etter siste endring</string>
-  <string name="SSD_sort_reverse">Omvendt sortering</string>
-  <string name="SSD_save_temp">Kun en gang</string>
-  <string name="SSD_save_always">Alltid</string>
-  <string name="FLA_context_shortcut">Lag snarvei på skrivebordet</string>
-  <string name="FLA_shortcut_dialog_title">Create Shortcut</string>
-  <string name="FLA_shortcut_dialog">Snarveiens navn:</string>
-  <string name="FLA_search_hint">Søk etter oppgaver</string>
-  <string name="FLA_search_filter">Matcher \'%s\'</string>
-  <string name="FLA_toast_onCreateShortcut">Snarvei opprettet: %s</string>
-  <string name="TEA_title_hint">Oppgavesammendrag</string>
-  <string name="TEA_importance_label">Viktighet</string>
-  <string name="TEA_urgency_specific_time">Ved bestemt tid?</string>
-  <string-array name="TEA_loading">
-    <item>Laster ...</item>
-  </string-array>
-  <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>
-  <string name="TEA_menu_discard">Ikke lagre</string>
-  <string name="TEA_menu_delete">Slett oppgave</string>
-  <string name="TEA_onTaskSave_due">Oppgave lagret: forfaller %s</string>
-  <string name="TEA_onTaskSave_notDue">Oppgave lagret</string>
-  <string name="TEA_tab_more">Mer</string>
-  <string-array name="TEA_urgency">
-    <item>Ingen frist</item>
-    <item>Spesifikk dag</item>
-    <item>I dag</item>
-    <item>I morgen</item>
-    <item>(dagen etter)</item>
-    <item>Neste uke</item>
-    <item>In two weeks</item>
-    <item>Neste måned</item>
-  </string-array>
-  <string-array name="TEA_hideUntil">
-    <item>Alltid</item>
-    <item>Due date</item>
-    <item>Due time</item>
-    <item>Dagen før forfall</item>
-    <item>Uke før forfall</item>
-    <item>Spesifikk dag/tidspunkt</item>
-  </string-array>
-  <string name="TEA_control_more_section">----More Section----</string>
-  <string name="TEA_control_importance">Viktighet</string>
-  <string name="TEA_control_lists">Lister</string>
-  <string name="TEA_control_notes">Notater</string>
-  <string-array name="MCA_dialog_speech_options">
-    <item>It must be nice to be so popular!</item>
-    <item>Yay! People like you!</item>
-    <item>Make their day, give \'em a call!</item>
-    <item>Wouldn\'t you be happy if people called you back?</item>
-    <item>You can do it!</item>
-    <item>You can always send a text...</item>
-  </string-array>
-  <string name="UpS_changelog_title">Hva er nytt i Astrid?</string>
-  <string name="UpS_updates_title">Siste nytt om Astrid</string>
-  <string name="EPr_title">Astrid: Innstillinger</string>
-  <string name="EPr_appearance_header">Utseende</string>
-  <string name="EPr_fontSize_title">Tekststørrelse for oppgavelista</string>
-  <string name="EPr_fontSize_desc">Tekststørrelse for hovedlista</string>
-  <string name="EPr_showNotes_title">Vis notater i oppgaven</string>
-  <string name="EPr_showNotes_desc_enabled">Notater vil alltid vises</string>
-  <string name="EPr_theme_desc">For tiden: %s</string>
-  <string-array name="EPr_swipe_lists_performance_mode">
-    <item>No swipe</item>
-    <item>Conserve Memory</item>
-    <item>Normal Performance</item>
-    <item>High Performance</item>
-  </string-array>
-  <string-array name="EPr_swipe_lists_performance_desc">
-    <item>Swipe between lists is disabled</item>
-    <item>Slower performance</item>
-    <item>Default setting</item>
-    <item>Uses more system resources</item>
-  </string-array>
-  <string-array name="EPr_themes">
-    <item>Day - Blue</item>
-    <item>Day - Red</item>
-    <item>Sky blue</item>
-    <item>Night</item>
-    <item>Transparent (White Text)</item>
-    <item>Transparent (Black Text)</item>
-  </string-array>
-  <string-array name="EPr_themes_widget">
-    <item>Same as app</item>
-    <item>Day - Blue</item>
-    <item>Day - Red</item>
-    <item>Sky blue</item>
-    <item>Night</item>
-    <item>Transparent (White Text)</item>
-    <item>Transparent (Black Text)</item>
-    <item>Old Style</item>
-  </string-array>
-  <string name="AOA_title">Astrid: Tillegg</string>
-  <string name="AOA_internal_author">Astrid-teamet</string>
-  <string name="AOA_tab_installed">Installert</string>
-  <string name="AOA_free">Gratis</string>
-  <string name="AOA_no_addons">Tom liste!</string>
-  <string name="TWi_loading">Laster ...</string>
-  <string name="WCA_title">Velg oppgaver å se på</string>
-  <string name="task_killer_help">Det ser ut til at du bruker en app som kan avslutte prosesser (%s)! Hvis du kan, legg Astrid til eksklusjonslista så den ikke blir avsluttet. Ellers vil Astrid kanskje ikke si fra når oppgavene dine forfaller.\n</string>
-  <string name="task_killer_help_ok">Jeg ønsker ikke å avslutte Astrid!</string>
-  <string name="marketplace_description">Astrid er en godt likt åpen-kilde å gjøre/oppgave liste, laget til hjelp for å få oppgaver gjort. Den inneholder påminnelser, tagger, synkronisering, en widget og mer.</string>
-  <string name="EPr_defaults_header">Standardinnstillinger for nye oppgaver</string>
-  <string name="EPr_default_urgency_title">Standardfrist</string>
-  <string name="EPr_default_urgency_desc">For tiden: %s</string>
-  <string name="EPr_default_importance_title">Standardviktighet</string>
-  <string name="EPr_default_importance_desc">For tiden: %s</string>
-  <string name="EPr_default_hideUntil_title">Standard skjul frem til</string>
-  <string name="EPr_default_hideUntil_desc">For tiden: %s</string>
-  <string name="EPr_default_reminders_title">Standardpåminnelser</string>
-  <string name="EPr_default_reminders_desc">For tiden: %s</string>
-  <string name="EPr_default_reminders_mode_desc">For tiden: %s</string>
-  <string-array name="EPr_default_importance">
-    <item>!!! (Highest)</item>
-    <item>!!</item>
-    <item>!</item>
-    <item>o (Lowest)</item>
-  </string-array>
-  <string-array name="EPr_default_urgency">
-    <item>Ingen frist</item>
-    <item>I dag</item>
-    <item>I morgen</item>
-    <item>I overmorgen</item>
-    <item>Neste uke</item>
-  </string-array>
-  <string-array name="EPr_default_hideUntil">
-    <item>Ikke skjul</item>
-    <item>Oppgaven forfaller</item>
-    <item>Dagen før forfall</item>
-    <item>Uke før forfall</item>
-  </string-array>
-  <string-array name="EPr_default_reminders">
-    <item>Ingen varsling ved forfall</item>
-    <item>Ved forfall</item>
-    <item>Etter forfall</item>
-    <item>Ved eller etter forfall</item>
-  </string-array>
-  <string name="BFE_Active">Aktive oppgaver</string>
-  <string name="BFE_Recent">Nylig endret</string>
-  <string name="BFE_Saved_delete">Slett filter</string>
-  <string name="CFA_title">Egendefinert filter</string>
-  <string name="CFA_filterName_hint">Lagre dette filteret ved å gi det et navn...</string>
-  <string name="CFA_universe_all">Aktive oppgaver</string>
-  <string name="CFA_type_add">eller</string>
-  <string name="CFA_type_intersect">også</string>
-  <string name="CFA_context_chain">%s har kriterier</string>
-  <string name="CFA_context_delete">Slett rad</string>
-  <string name="CFA_help">Denne skjermen lar deg lage nye filtre. Legg til kriterier ved hjelp av knappene under. Klikk eller klikk og hold på et kriterium for å gjøre innstillinger og klikk til slutt på \"Vis\"!</string>
-  <string name="CFA_button_add">Legg til kriterium</string>
-  <string name="CFA_button_view">Vis</string>
-  <string name="CFA_button_save">Lagre &amp; vis</string>
-  <string name="CFC_dueBefore_text">Forfaller innen: ?</string>
-  <string name="CFC_dueBefore_name">Forfaller innen...</string>
-  <string-array name="CFC_dueBefore_entries">
-    <item>Ingen forfallsdato</item>
-    <item>I går</item>
-    <item>I dag</item>
-    <item>I morgen</item>
-    <item>I overmorgen</item>
-    <item>Neste uke</item>
-    <item>Neste måned</item>
-  </string-array>
-  <string name="CFC_importance_text">Viktighet minst ?</string>
-  <string name="CFC_importance_name">Viktighet...</string>
-  <string name="CFC_title_contains_name">Tittel inneholder...</string>
-  <string name="CFC_title_contains_text">Tittel inneholder: ?</string>
-  <string name="gcal_TEA_error">Klarte ikke å legge oppgave til kalender!</string>
-  <string name="gcal_TEA_showCalendar_label">Åpne kalenderhendelse</string>
-  <string name="gcal_TEA_calendar_updated">Kalenderhendelsen ble også oppdatert!</string>
-  <string name="gcal_completed_title">%s (fullført)</string>
-  <string name="gcal_GCP_default">Standardkalender</string>
-  <string name="gtasks_GLA_further_help">Å vise oppgaver med innrykk og rekkefølge bevart, gå til Filter siden og velg Google oppgaveliste. Som standard bruker Astrid sine egne innstillinger for oppgaver.</string>
-  <string name="gtasks_GLA_errorAuth_captcha">Du kan ha oppstått en feil. Prøv å logge inn fra nettleseren, så kom tilbake å prøv på nytt:</string>
-  <string name="locale_edit_alerts_title">Astrid filteralarm</string>
-  <string name="locale_edit_intro">Astrid vil gi deg en påminnelse når du har oppgaver i følgende filter:</string>
-  <string name="locale_interval_label">Begrens påminnelser til:</string>
-  <string-array name="locale_interval">
-    <item>en gang i timen</item>
-    <item>hver sjette time</item>
-    <item>hver tolvte time</item>
-    <item>en gang om dagen</item>
-    <item>hver tredje dag</item>
-    <item>en gang i uken</item>
-  </string-array>
-  <string name="locale_notification">Du har $NUM som matcher: $FILTER</string>
-  <string name="locale_plugin_required">Vennligst innstaller Astrid Locale tillegget!</string>
-  <string name="opencrx_FEx_dashboard">Arbeidsområder</string>
-  <string name="opencrx_FEx_responsible">Tildelt</string>
-  <string name="opencrx_FEx_responsible_title">Tildelt til \'%s\'</string>
-  <string name="opencrx_PDE_task_from">fra %s</string>
-  <string name="opencrx_TEA_notes">Legg til kommentar</string>
-  <string name="opencrx_no_creator">(Ikke synkroniser)</string>
-  <string name="opencrx_PLA_signIn">Logg inn</string>
-  <string name="opencrx_PLA_password">Passord</string>
-  <string name="opencrx_notification_text">%s oppdaterte oppgaver / trykk for flere detaljer</string>
-  <string name="opencrx_ioerror">Tilkoblingsfeil! Kontroller tilkoblingen til Internett</string>
-  <string name="opencrx_MLA_password_empty">Passord ble ikke spesifisert!</string>
-  <string name="opencrx_TEA_task_assign_label">Tildel følgende person denne oppgaven:</string>
-  <string name="opencrx_TEA_task_unassigned">&lt;Utildelt&gt;</string>
-  <string name="opencrx_TEA_dashboard_default">&lt;Standard&gt;</string>
-  <string name="CFC_opencrx_in_workspace_text">I arbeidsområde:?</string>
-  <string name="CFC_opencrx_in_workspace_name">I arbeidsområde...</string>
-  <string name="CFC_opencrx_assigned_to_text">Tildelt: ?</string>
-  <string name="CFC_opencrx_assigned_to_name">Tildelt...</string>
-  <string name="EPr_statistics_desc_disabled">Ingen bruksdata vil bli rapportert</string>
-  <string name="EPr_statistics_desc_enabled">Hjelp oss å forbedre Astrid ved å sende anonym bruksdata</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="TEA_reminder_alarm_label">Ringe- og vibrasjonstype:</string>
-  <string name="TEA_reminder_mode_once">Ring én gang</string>
-  <string name="TEA_reminder_mode_nonstop">Ring til jeg slår av alarmen</string>
-  <string-array name="TEA_reminder_random">
-    <item>an hour</item>
-    <item>a day</item>
-    <item>a week</item>
-    <item>in two weeks</item>
-    <item>a month</item>
-    <item>in two months</item>
-  </string-array>
-  <string name="rmd_NoA_filter">Påminnelse!</string>
-  <string name="rmd_NoA_done">Allerede utført!</string>
-  <string name="rmd_NoA_snooze">Slumre</string>
-  <string-array name="rmd_reengage_notif_titles">
-    <item>A note from Astrid</item>
-    <item>Memo for %s.</item>
-    <item>Your Astrid digest</item>
-    <item>Reminders from Astrid</item>
-  </string-array>
-  <string-array name="rmd_reengage_dialog_options">
-    <item>Time to shorten your to-do list!</item>
-    <item>Dear sir or madam, some tasks await your inspection!</item>
-    <item>Hi there, could you take a look at these?</item>
-    <item>I\'ve got some tasks with your name on them!</item>
-    <item>A fresh batch of tasks for you today!</item>
-    <item>You look fabulous! Ready to get started?</item>
-    <item>A lovely day for getting some work done, I think!</item>
-  </string-array>
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>Don\'t you want to get organized?</item>
-    <item>I\'m Astrid! I\'m here to help you do more!</item>
-    <item>You look busy! Let me take some of those tasks off of your plate.</item>
-    <item>I can help you keep track of all of the details in your life.</item>
-    <item>You\'re serious about getting more done? So am I!</item>
-    <item>Pleasure to make your acquaintance!</item>
-  </string-array>
-  <string name="rmd_EPr_alerts_header">Påminnelseinnstillinger</string>
-  <string name="rmd_EPr_quiet_hours_start_title">Stilletimer start</string>
-  <string name="rmd_EPr_quiet_hours_desc_none">Stilletimer er deaktivert</string>
-  <string name="rmd_EPr_quiet_hours_end_title">Stilletimer slutt</string>
-  <string name="rmd_EPr_ringtone_title">Ringetone for påminnelser</string>
-  <string name="rmd_EPr_ringtone_desc_custom">Egendefinert ringetone er satt</string>
-  <string name="rmd_EPr_ringtone_desc_silent">Ringetone satt på Stille</string>
-  <string name="rmd_EPr_ringtone_desc_default">Standardringetone vil bli brukt</string>
-  <string name="rmd_EPr_persistent_title">Påminnelse intensitet</string>
-  <string name="rmd_EPr_persistent_desc_true">Varsler må ses individuelt for å kunne fjernes</string>
-  <string name="rmd_EPr_persistent_desc_false">Varsler kan slettes ved \"Slett alt\"-knappen</string>
-  <string name="rmd_EPr_vibrate_title">Vibrer ved varsel</string>
-  <string name="rmd_EPr_vibrate_desc_true">Astrid vil vibrere ved varsler</string>
-  <string name="rmd_EPr_vibrate_desc_false">Astrid vil ikke vibrere ved varsler</string>
-  <string name="rmd_EPr_nagging_desc_true">Astid vil vise oppmuntringsbeskjeder ved påminnelser</string>
-  <string name="rmd_EPr_snooze_dialog_title">Slumreinnstillinger TT:MM</string>
-  <string name="rmd_EPr_snooze_dialog_desc_true">Slumre ved å velge ny tid (TT:MM)</string>
-  <string name="rmd_EPr_snooze_dialog_desc_false">Slumre ved å velge # dager/timer å slumre</string>
-  <string name="rmd_EPr_defaultRemind_title">Tilfeldige påminnelser</string>
-  <string name="rmd_EPr_defaultRemind_desc_disabled">Nye oppgaver skal ikke påminnes tifeldig</string>
-  <string name="rmd_EPr_defaultRemind_desc">Nye oppgaver påminnes tilfeldig: %s</string>
-  <string-array name="EPr_reminder_random">
-    <item>deaktivert</item>
-    <item>hver time</item>
-    <item>daglig</item>
-    <item>ukentlig</item>
-    <item>hver andre uke</item>
-    <item>månedlig</item>
-    <item>hver annen måned</item>
-  </string-array>
-  <string-array name="EPr_quiet_hours_start">
-    <item>deaktivert</item>
-    <item>kl 20.00</item>
-    <item>kl 21.00</item>
-    <item>kl 22.00</item>
-    <item>kl 23.00</item>
-    <item>kl 00.00</item>
-    <item>kl 01.00</item>
-    <item>kl m02.00</item>
-    <item>kl 03.00</item>
-    <item>kl 04.00</item>
-    <item>kl 05.00</item>
-    <item>kl 06.00</item>
-    <item>kl 07.00</item>
-    <item>kl 08.00</item>
-    <item>kl 09.00</item>
-    <item>kl 10.00</item>
-    <item>kl 11.00</item>
-    <item>kl 12.00</item>
-    <item>kl 13.00</item>
-    <item>kl 14.00</item>
-    <item>kl 15.00</item>
-    <item>kl 16.00</item>
-    <item>kl 17.00</item>
-    <item>kl 18.00</item>
-    <item>kl 19.00</item>
-  </string-array>
-  <string-array name="EPr_quiet_hours_end">
-    <item>kl 09.00</item>
-    <item>kl 10.00</item>
-    <item>kl 11.00</item>
-    <item>kl 12.00</item>
-    <item>kl 13.00</item>
-    <item>kl 14.00</item>
-    <item>kl 15.00</item>
-    <item>kl 16.00</item>
-    <item>kl 17.00</item>
-    <item>kl 18.00</item>
-    <item>kl 19.00</item>
-    <item>kl 20.00</item>
-    <item>kl 21.00</item>
-    <item>kl 22.00</item>
-    <item>kl 23.00</item>
-    <item>kl 00.00</item>
-    <item>kl 01.00</item>
-    <item>kl m02.00</item>
-    <item>kl 03.00</item>
-    <item>kl 04.00</item>
-    <item>kl 05.00</item>
-    <item>kl 06.00</item>
-    <item>kl 07.00</item>
-    <item>kl 08.00</item>
-  </string-array>
-  <string-array name="EPr_rmd_time">
-    <item>kl 09.00</item>
-    <item>kl 10.00</item>
-    <item>kl 11.00</item>
-    <item>kl 12.00</item>
-    <item>kl 13.00</item>
-    <item>kl 14.00</item>
-    <item>kl 15.00</item>
-    <item>kl 16.00</item>
-    <item>kl 17.00</item>
-    <item>kl 18.00</item>
-    <item>kl 19.00</item>
-    <item>kl 20.00</item>
-    <item>kl 21.00</item>
-    <item>kl 22.00</item>
-    <item>kl 23.00</item>
-    <item>kl 00.00</item>
-    <item>kl 01.00</item>
-    <item>kl m02.00</item>
-    <item>kl 03.00</item>
-    <item>kl 04.00</item>
-    <item>kl 05.00</item>
-    <item>kl 06.00</item>
-    <item>kl 07.00</item>
-    <item>kl 08.00</item>
-  </string-array>
-  <string-array name="reminders">
-    <item>Hei! Har du et sekund?</item>
-    <item>Får jeg prate med deg et sekund?</item>
-    <item>Har du et par minutter?</item>
-    <item>Har du glemt?</item>
-    <item>Unnskyld!</item>
-    <item>Når du har et minutt:</item>
-    <item>På din agenda:</item>
-    <item>Ledig et øyeblikk?</item>
-    <item>Astrid her!</item>
-    <item>Hei! Kan jeg forstyrre litt?</item>
-    <item>Ett minutt av din tid?</item>
-    <item>Det er en fin dag å</item>
-  </string-array>
-  <string-array name="reminders_due">
-    <item>På tide å komme i gang!</item>
-    <item>Forfallsdatoen er kommet!</item>
-    <item>Klar å starte?</item>
-    <item>Du sa du ville gjøre:</item>
-    <item>Det er meningen du skal starte:</item>
-    <item>Det er på tide å starte:</item>
-    <item>Det er på tide!</item>
-    <item>Unnskyld! Det er tid for</item>
-    <item>Er du ledig? Det er tid for</item>
-  </string-array>
-  <string-array name="reminders_snooze">
-    <item>Ikke vær så lat!</item>
-    <item>Slumretiden er ferdig!</item>
-    <item>Ikke mer slumring!</item>
-    <item>Er du klar nå da?</item>
-    <item>Ingen flere utsettelser!</item>
-  </string-array>
-  <string-array name="reminder_responses">
-    <item>Jeg har noe for deg!</item>
-    <item>Klar til å legge dette bak deg?</item>
-    <item>Hvorfor får du ikke dette gjort?</item>
-    <item>Nå? Er du klar?</item>
-    <item>Klar til å starte dette?</item>
-    <item>Klarer du dette?</item>
-    <item>Du blir glad! Bare bli ferdig!</item>
-    <item>Jeg lover at du vil føle deg bedre hvis du avslutter dette!</item>
-    <item>Gjør du ikke dette i dag?</item>
-    <item>Kan du ikke bare avslutte oppgaven? Jeg er så lei av den.</item>
-    <item>Klarer du å avslutte oppgaven? Ja, det klarer du!</item>
-    <item>Skal du noensinne gjøre dette?</item>
-    <item>Vær fornøyd med deg selv! Kom igjen!</item>
-    <item>Jeg er så stolt av deg! La oss få det gjort!</item>
-    <item>Litt snacks etter at du har gjort deg ferdig?</item>
-    <item>Bare denne ene oppgaven? Vær så snill?</item>
-    <item>På tide å korte ned på oppgavelista!</item>
-    <item>Are you on Team Order or Team Chaos? Team Order! Let\'s go!</item>
-    <item>Have I mentioned you are awesome recently? Keep it up!</item>
-    <item>A task a day keeps the clutter away... Goodbye clutter!</item>
-    <item>How do you do it? Wow, I\'m impressed!</item>
-    <item>You can\'t just get by on your good looks. Let\'s get to it!</item>
-    <item>Lovely weather for a job like this, isn\'t it?</item>
-    <item>A spot of tea while you work on this?</item>
-    <item>If only you had already done this, then you could go outside and play.</item>
-    <item>It\'s time. You can\'t put off the inevitable.</item>
-    <item>I die a little every time you ignore me.</item>
-  </string-array>
-  <string-array name="postpone_nags">
-    <item>Ikke fortell meg at du er en somlekopp!</item>
-    <item>Blir du ikke lei iblant av å være lat?</item>
-    <item>Et sted er noen avhengig av at du gjør ferdig dette!</item>
-    <item>Når du sa \"utsett\", mente du egentlig \"nå gjør jeg dette\", ikke sant?</item>
-    <item>Dette er siste gang du utsetter oppgaven, ikke sant?</item>
-    <item>Bare gjør det ferdig i dag, jeg skal ikke sladre!</item>
-    <item>Hvorfor utsette når du kan...la være!</item>
-    <item>Jeg antar at du kommer til å avslutte denne oppgaven før eller siden?</item>
-    <item>Jeg synes du er virkelig flink! Hva med å ikke utsette det?</item>
-    <item>Vil du være i stand til å nå dine mål hvis du gjør det?</item>
-    <item>Utsett, utsett, utsett. Når vil du forandre deg!</item>
-    <item>Jeg har hatt nok av unnskyldningene dine! Bare gjør det!</item>
-    <item>Fant du ikke på den unnskyldningen forrige gang?</item>
-    <item>Jeg kan ikke hjelpe deg med å organisere livet ditt hvis du gjør det..</item>
-  </string-array>
-  <string name="repeat_plugin">Gjentagende oppgaver</string>
-  <string name="repeat_plugin_desc">Tillat gjentagende oppgaver</string>
-  <string name="repeat_enabled">Gjentakelser</string>
-  <string name="repeat_every">Hver %d</string>
-  <string name="repeat_interval_prompt">Gjentakelsesintervall</string>
-  <string-array name="repeat_interval_short">
-    <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">
-    <item>Dag(er)</item>
-    <item>Uke(r)</item>
-    <item>Måned(er)</item>
-    <item>Time(r)</item>
-    <item>Minute(s)</item>
-    <item>Year(s)</item>
-  </string-array>
-  <string-array name="repeat_until_shortcuts">
-    <item>Forever</item>
-    <item>Specific Day</item>
-    <item>Today</item>
-    <item>Tomorrow</item>
-    <item>(day after)</item>
-    <item>Next Week</item>
-    <item>In Two Weeks</item>
-    <item>Next Month</item>
-  </string-array>
-  <string-array name="repeat_type">
-    <item>fra forfallsdato</item>
-    <item>fra avslutningsdato</item>
-  </string-array>
-  <string name="repeat_detail_byday">$I på $D</string>
-  <string name="repeat_detail_duedate">Hver %s</string>
-  <string name="repeat_detail_completion">%s etter avslutning</string>
-  <string-array name="repeat_encouragement">
-    <item>Good job!</item>
-    <item>Wow… I\'m so proud of you!</item>
-    <item>I love when you\'re productive!</item>
-    <item>Doesn\'t it feel good to check something off?</item>
-  </string-array>
-  <string-array name="repeat_encouragement_last_time">
-    <item>Good job!</item>
-    <item>I\'m so proud of you!</item>
-    <item>I love when you\'re productive!</item>
-  </string-array>
-  <string name="TEA_tags_label">Lister</string>
-  <string name="tag_FEx_header">Lister</string>
-  <string name="TEA_no_tags_modified">Ingen endringer gjort</string>
-  <string name="tag_settings_title">Settings:</string>
-  <string name="TPl_notification">Tidtaker aktiv for %s!</string>
-  <string name="TFE_workingOn">Oppgaver med tidtaker</string>
-  <string name="voice_create_prompt">Snakk for å skape en oppgave</string>
-  <string name="voice_edit_title_prompt">Snakk for å sette tittelen til oppgaven</string>
-  <string name="voice_edit_note_prompt">Snakk for å sette oppgavenotater</string>
-  <string name="EPr_voiceInputInstall_dlg">Talegjenkjenning er ikke installert.\nVil du gå til Markedet og installere?</string>
-  <string name="EPr_voiceInputUnavailable_dlg">Dessverre er talegjenkjenning ikke tilgjengelig på ditt system.\nHvis mulig, vennligst oppdater til Android 2.1 eller senere.</string>
-  <string name="EPr_marketUnavailable_dlg">Dessverre er Markedet ikke tilgjengelig på ditt system.\nHvis mulig, prøv å laste ned talegjenkjenning fra en annen kilde.</string>
-  <string name="EPr_voiceInputEnabled_title">Taleinndata</string>
-  <string name="EPr_voiceInputEnabled_desc_enabled">Taleinndataknappen vil vises på siden med oppgavelista</string>
-  <string name="EPr_voiceInputEnabled_desc_disabled">Taleinndataknappen vil skjules på siden med oppgavelista</string>
-  <string name="EPr_voiceInputCreatesTask_title">Skap en oppgave direkte</string>
-  <string name="EPr_voiceInputCreatesTask_desc_enabled">Oppgaver vil bli skapt automatisk fra taleinndata</string>
-  <string name="EPr_voiceInputCreatesTask_desc_disabled">Du kan redigere tittelen når innspillingen er klar</string>
-  <string name="EPr_voiceRemindersEnabled_title">Talepåminnelser</string>
-  <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid vil lese opp oppgaver ved påminnelse</string>
-  <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid vil spille en ringetone ved påminnelse</string>
-  <string name="EPr_voice_header">Taleinndatainnstillinger</string>
-  <string name="welcome_title_1">Velkommen til Astrid!</string>
-  <string name="welcome_body_5">and much more!</string>
-  <string name="PPW_configure_title">Konfigurer widget</string>
-  <string name="PPW_color">Fargen til widget</string>
-  <string name="PPW_enable_calendar">Vis kalenderhendelser</string>
-  <string name="PPW_disable_encouragements">Skjul oppmuntringer</string>
-  <string name="PPW_filter">Velg filter</string>
-  <string name="PPW_due">Forfall:</string>
-  <string name="PPW_past_due">Forfalt:</string>
-  <string name="PPW_old_astrid_notice">Du behøver minst versjon 3.6 av Astrid for å bruke denne widget. Beklager!</string>
-  <string-array name="PPW_encouragements">
-    <item>Hei du!</item>
-    <item>Har du tid til å gjøre noe ferdig?</item>
-    <item>Oi, du ser sofistikert ut i dag!</item>
-    <item>Gjør noe fantastisk i dag!</item>
-    <item>Gjør meg stolt i dag!</item>
-    <item>Hvordan står det til i dag?</item>
-  </string-array>
-  <string-array name="PPW_encouragements_tod">
-    <item>God morgen!</item>
-    <item>God ettermiddag!</item>
-    <item>God kveld!</item>
-    <item>Sen kveld?</item>
-    <item>Det er tidlig, få gjort noe!</item>
-    <item>Litt ettermiddagste kanskje?</item>
-    <item>Nyt kvelden!</item>
-    <item>Søvn er bra for deg, vet du!</item>
-  </string-array>
-  <string-array name="PPW_encouragements_completed">
-    <item>Du har allerede avsluttet %d oppgaver!</item>
-    <item>Poeng i livet: %d oppgaver avsluttet</item>
-    <item>Smil! du har allerede avsluttet %d oppgaver!</item>
-  </string-array>
-  <string name="PPW_encouragements_none_completed">Du har ikke gjort ferdig noen oppgaver ennå! Skal vi?</string>
-  <string-array name="PPW_colors">
-    <item>Svart</item>
-    <item>Hvit</item>
-    <item>Blå</item>
-    <item>Gjennomskinnelig</item>
-  </string-array>
+    <string-array name="TVA_tabs">
+        <item>Tasks</item>
+        <item>Activity</item>
+        <item>List Settings</item>
+    </string-array>
+    <string name="actfm_ALA_password_label">Passord</string>
+    <string name="alarm_ACS_label">Varsler</string>
+    <string name="alarm_ACS_button">Legg til nytt varsel</string>
+    <string-array name="reminders_alarm">
+        <item>Alarm!</item>
+    </string-array>
+    <string name="backup_BPr_header">Sikkerhetskopier</string>
+    <string name="backup_status_success">Siste: %s</string>
+    <string name="backup_status_failed">Siste sikkerhetskopiering mislyktes</string>
+    <string name="backup_status_failed_subtitle">(klikk for å vise feil)</string>
+    <string name="backup_status_never">Sikkerhetskopi aldri utført!</string>
+    <string name="backup_BPr_group_options">Alternativer</string>
+    <string name="backup_BPr_auto_title">Automatisk sikkerhetskopiering</string>
+    <string name="backup_BPr_auto_disabled">Automatisk sikkerhetskopiering deaktivert</string>
+    <string name="backup_BPr_auto_enabled">Sikkerhetskopiering vil skje daglig</string>
+    <string name="backup_BAc_title">Håndter sikkerhetskopiene dine</string>
+    <string name="backup_BAc_import">Importer oppgaver</string>
+    <string name="backup_BAc_export">Eksporter oppgaver</string>
+    <string name="backup_TXI_error">Importfeil</string>
+    <string name="export_toast">Backup ferdig %1$s av %2$s.</string>
+    <string name="export_toast_no_tasks">Ingen oppgaver å eksportere</string>
+    <string name="export_progress_title">Eksporterer...</string>
+    <string name="import_summary_title">Gjennopprettingssammendrag</string>
+    <string name="import_summary_message">Filen %1$s inneholder %2$s.\n\n %3$s importert,\n %4$s
+        eksisterer allerede\n %5$s inneholdt feil\n
+    </string>
+    <string name="import_progress_title">Importerer...</string>
+    <string name="import_progress_read">Leser oppgave %d...</string>
+    <string name="DLG_error_sdcard">Får ikke tilgang til mappen: %s</string>
+    <string name="DLG_error_sdcard_general">Ditt SD-kort er ikke tilgjengelig!</string>
+    <string name="import_file_prompt">Velg fil å gjenopprette</string>
+    <string name="app_name">Astrid Oppgaver</string>
+    <string name="read_permission_label">Astrid Tillatelse</string>
+    <string name="read_permission_desc">les oppgaver, vis oppgavefiltre</string>
+    <string name="write_permission_label">Astrid Tillatelse</string>
+    <string name="write_permission_desc">opprett nye oppgaver, rediger eksisterende oppgaver
+    </string>
+    <string name="DLG_delete_this_task_question">Slett denne oppgaven?</string>
+    <string name="DLG_delete_this_item_question">Slett følgende: %s?</string>
+    <string name="DLG_upgrading">Oppgraderer oppgavene dine...</string>
+    <string name="DLG_hour_minutes">Tid (timer : minutter)</string>
+    <string name="DLG_please_update">Astrid bør oppdateres til siste versjon i Android Marked!
+        Vennligst gjør det før du fortsetter, eller vent noen sekunder.
+    </string>
+    <string name="DLG_accept">Jeg godkjenner</string>
+    <string name="DLG_decline">Jeg godkjenner ikke</string>
+    <string name="DLG_eula_title">Astrid Brukervilkår</string>
+    <string name="DLG_loading">Laster ...</string>
+    <string name="WID_dateButtonUnset">Klikk for å sette</string>
+    <string name="TLA_menu_sort">Sorter &amp; Skjult</string>
+    <string name="TLA_menu_settings">Innstillinger</string>
+    <string name="TLA_custom">Egendefinert</string>
+    <string-array name="TLA_filters">
+        <item>Active</item>
+        <item>I dag</item>
+        <item>Soon</item>
+        <item>Late</item>
+        <item>Utført</item>
+        <item>Hidden</item>
+    </string-array>
+    <string-array name="TLA_priority_strings">
+        <item>highest priority</item>
+        <item>high priority</item>
+        <item>medium priority</item>
+        <item>low priority</item>
+    </string-array>
+    <string name="TAd_hiddenFormat">%s [skjult]</string>
+    <string name="TAd_deletedFormat">%s [slettet]</string>
+    <string name="TAd_actionEditTask">Rediger</string>
+    <string name="TAd_contextEditTask">Rediger oppgave</string>
+    <string name="TAd_contextUndeleteTask">Gjenopprett slettet oppgave</string>
+    <string name="TAd_contextPurgeTask">Rens ut oppgave</string>
+    <string name="SSD_title">Sortering og skjulte oppgaver</string>
+    <string name="SSD_completed">Vis fullførte oppgaver</string>
+    <string name="SSD_hidden">Vis skjulte oppgaver</string>
+    <string name="SSD_deleted">Vis slettede oppgaver</string>
+    <string name="SSD_sort_auto">Astrid intelligent sortering</string>
+    <string name="SSD_sort_alpha">Etter tittel</string>
+    <string name="SSD_sort_due">Etter forfallsdato</string>
+    <string name="SSD_sort_importance">Etter viktighet</string>
+    <string name="SSD_sort_modified">Etter siste endring</string>
+    <string name="SSD_sort_reverse">Omvendt sortering</string>
+    <string name="SSD_save_temp">Kun en gang</string>
+    <string name="SSD_save_always">Alltid</string>
+    <string name="FLA_context_shortcut">Lag snarvei på skrivebordet</string>
+    <string name="FLA_shortcut_dialog_title">Create Shortcut</string>
+    <string name="FLA_shortcut_dialog">Snarveiens navn:</string>
+    <string name="FLA_search_hint">Søk etter oppgaver</string>
+    <string name="FLA_search_filter">Matcher \'%s\'</string>
+    <string name="FLA_toast_onCreateShortcut">Snarvei opprettet: %s</string>
+    <string name="TEA_title_hint">Oppgavesammendrag</string>
+    <string name="TEA_importance_label">Viktighet</string>
+    <string name="TEA_urgency_specific_time">Ved bestemt tid?</string>
+    <string-array name="TEA_loading">
+        <item>Laster ...</item>
+    </string-array>
+    <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>
+    <string name="TEA_menu_discard">Ikke lagre</string>
+    <string name="TEA_menu_delete">Slett oppgave</string>
+    <string name="TEA_onTaskSave_due">Oppgave lagret: forfaller %s</string>
+    <string name="TEA_onTaskSave_notDue">Oppgave lagret</string>
+    <string name="TEA_tab_more">Mer</string>
+    <string-array name="TEA_urgency">
+        <item>Ingen frist</item>
+        <item>Spesifikk dag</item>
+        <item>I dag</item>
+        <item>I morgen</item>
+        <item>(dagen etter)</item>
+        <item>Neste uke</item>
+        <item>In two weeks</item>
+        <item>Neste måned</item>
+    </string-array>
+    <string-array name="TEA_hideUntil">
+        <item>Alltid</item>
+        <item>Due date</item>
+        <item>Due time</item>
+        <item>Dagen før forfall</item>
+        <item>Uke før forfall</item>
+        <item>Spesifikk dag/tidspunkt</item>
+    </string-array>
+    <string name="TEA_control_more_section">----More Section----</string>
+    <string name="TEA_control_importance">Viktighet</string>
+    <string name="TEA_control_lists">Lister</string>
+    <string name="TEA_control_notes">Notater</string>
+    <string-array name="MCA_dialog_speech_options">
+        <item>It must be nice to be so popular!</item>
+        <item>Yay! People like you!</item>
+        <item>Make their day, give \'em a call!</item>
+        <item>Wouldn\'t you be happy if people called you back?</item>
+        <item>You can do it!</item>
+        <item>You can always send a text...</item>
+    </string-array>
+    <string name="UpS_changelog_title">Hva er nytt i Astrid?</string>
+    <string name="UpS_updates_title">Siste nytt om Astrid</string>
+    <string name="EPr_title">Astrid: Innstillinger</string>
+    <string name="EPr_appearance_header">Utseende</string>
+    <string name="EPr_fontSize_title">Tekststørrelse for oppgavelista</string>
+    <string name="EPr_fontSize_desc">Tekststørrelse for hovedlista</string>
+    <string name="EPr_showNotes_title">Vis notater i oppgaven</string>
+    <string name="EPr_showNotes_desc_enabled">Notater vil alltid vises</string>
+    <string name="EPr_theme_desc">For tiden: %s</string>
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>No swipe</item>
+        <item>Conserve Memory</item>
+        <item>Normal Performance</item>
+        <item>High Performance</item>
+    </string-array>
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <item>Swipe between lists is disabled</item>
+        <item>Slower performance</item>
+        <item>Default setting</item>
+        <item>Uses more system resources</item>
+    </string-array>
+    <string-array name="EPr_themes">
+        <item>Day - Blue</item>
+        <item>Day - Red</item>
+        <item>Sky blue</item>
+        <item>Night</item>
+        <item>Transparent (White Text)</item>
+        <item>Transparent (Black Text)</item>
+    </string-array>
+    <string-array name="EPr_themes_widget">
+        <item>Same as app</item>
+        <item>Day - Blue</item>
+        <item>Day - Red</item>
+        <item>Sky blue</item>
+        <item>Night</item>
+        <item>Transparent (White Text)</item>
+        <item>Transparent (Black Text)</item>
+        <item>Old Style</item>
+    </string-array>
+    <string name="AOA_title">Astrid: Tillegg</string>
+    <string name="AOA_internal_author">Astrid-teamet</string>
+    <string name="AOA_tab_installed">Installert</string>
+    <string name="AOA_free">Gratis</string>
+    <string name="AOA_no_addons">Tom liste!</string>
+    <string name="TWi_loading">Laster ...</string>
+    <string name="WCA_title">Velg oppgaver å se på</string>
+    <string name="task_killer_help">Det ser ut til at du bruker en app som kan avslutte prosesser
+        (%s)! Hvis du kan, legg Astrid til eksklusjonslista så den ikke blir avsluttet. Ellers vil
+        Astrid kanskje ikke si fra når oppgavene dine forfaller.\n
+    </string>
+    <string name="task_killer_help_ok">Jeg ønsker ikke å avslutte Astrid!</string>
+    <string name="marketplace_description">Astrid er en godt likt åpen-kilde å gjøre/oppgave liste,
+        laget til hjelp for å få oppgaver gjort. Den inneholder påminnelser, tagger, synkronisering,
+        en widget og mer.
+    </string>
+    <string name="EPr_defaults_header">Standardinnstillinger for nye oppgaver</string>
+    <string name="EPr_default_urgency_title">Standardfrist</string>
+    <string name="EPr_default_urgency_desc">For tiden: %s</string>
+    <string name="EPr_default_importance_title">Standardviktighet</string>
+    <string name="EPr_default_importance_desc">For tiden: %s</string>
+    <string name="EPr_default_hideUntil_title">Standard skjul frem til</string>
+    <string name="EPr_default_hideUntil_desc">For tiden: %s</string>
+    <string name="EPr_default_reminders_title">Standardpåminnelser</string>
+    <string name="EPr_default_reminders_desc">For tiden: %s</string>
+    <string name="EPr_default_reminders_mode_desc">For tiden: %s</string>
+    <string-array name="EPr_default_importance">
+        <item>!!! (Highest)</item>
+        <item>!!</item>
+        <item>!</item>
+        <item>o (Lowest)</item>
+    </string-array>
+    <string-array name="EPr_default_urgency">
+        <item>Ingen frist</item>
+        <item>I dag</item>
+        <item>I morgen</item>
+        <item>I overmorgen</item>
+        <item>Neste uke</item>
+    </string-array>
+    <string-array name="EPr_default_hideUntil">
+        <item>Ikke skjul</item>
+        <item>Oppgaven forfaller</item>
+        <item>Dagen før forfall</item>
+        <item>Uke før forfall</item>
+    </string-array>
+    <string-array name="EPr_default_reminders">
+        <item>Ingen varsling ved forfall</item>
+        <item>Ved forfall</item>
+        <item>Etter forfall</item>
+        <item>Ved eller etter forfall</item>
+    </string-array>
+    <string name="BFE_Active">Aktive oppgaver</string>
+    <string name="BFE_Recent">Nylig endret</string>
+    <string name="BFE_Saved_delete">Slett filter</string>
+    <string name="CFA_title">Egendefinert filter</string>
+    <string name="CFA_filterName_hint">Lagre dette filteret ved å gi det et navn...</string>
+    <string name="CFA_universe_all">Aktive oppgaver</string>
+    <string name="CFA_type_add">eller</string>
+    <string name="CFA_type_intersect">også</string>
+    <string name="CFA_context_chain">%s har kriterier</string>
+    <string name="CFA_context_delete">Slett rad</string>
+    <string name="CFA_help">Denne skjermen lar deg lage nye filtre. Legg til kriterier ved hjelp av
+        knappene under. Klikk eller klikk og hold på et kriterium for å gjøre innstillinger og klikk
+        til slutt på \"Vis\"!
+    </string>
+    <string name="CFA_button_add">Legg til kriterium</string>
+    <string name="CFA_button_view">Vis</string>
+    <string name="CFA_button_save">Lagre &amp; vis</string>
+    <string name="CFC_dueBefore_text">Forfaller innen: ?</string>
+    <string name="CFC_dueBefore_name">Forfaller innen...</string>
+    <string-array name="CFC_dueBefore_entries">
+        <item>Ingen forfallsdato</item>
+        <item>I går</item>
+        <item>I dag</item>
+        <item>I morgen</item>
+        <item>I overmorgen</item>
+        <item>Neste uke</item>
+        <item>Neste måned</item>
+    </string-array>
+    <string name="CFC_importance_text">Viktighet minst ?</string>
+    <string name="CFC_importance_name">Viktighet...</string>
+    <string name="CFC_title_contains_name">Tittel inneholder...</string>
+    <string name="CFC_title_contains_text">Tittel inneholder: ?</string>
+    <string name="gcal_TEA_error">Klarte ikke å legge oppgave til kalender!</string>
+    <string name="gcal_TEA_showCalendar_label">Åpne kalenderhendelse</string>
+    <string name="gcal_TEA_calendar_updated">Kalenderhendelsen ble også oppdatert!</string>
+    <string name="gcal_completed_title">%s (fullført)</string>
+    <string name="gcal_GCP_default">Standardkalender</string>
+    <string name="gtasks_GLA_further_help">Å vise oppgaver med innrykk og rekkefølge bevart, gå til
+        Filter siden og velg Google oppgaveliste. Som standard bruker Astrid sine egne innstillinger
+        for oppgaver.
+    </string>
+    <string name="gtasks_GLA_errorAuth_captcha">Du kan ha oppstått en feil. Prøv å logge inn fra
+        nettleseren, så kom tilbake å prøv på nytt:
+    </string>
+    <string name="locale_edit_alerts_title">Astrid filteralarm</string>
+    <string name="locale_edit_intro">Astrid vil gi deg en påminnelse når du har oppgaver i følgende
+        filter:
+    </string>
+    <string name="locale_interval_label">Begrens påminnelser til:</string>
+    <string-array name="locale_interval">
+        <item>en gang i timen</item>
+        <item>hver sjette time</item>
+        <item>hver tolvte time</item>
+        <item>en gang om dagen</item>
+        <item>hver tredje dag</item>
+        <item>en gang i uken</item>
+    </string-array>
+    <string name="locale_notification">Du har $NUM som matcher: $FILTER</string>
+    <string name="locale_plugin_required">Vennligst innstaller Astrid Locale tillegget!</string>
+    <string name="opencrx_FEx_dashboard">Arbeidsområder</string>
+    <string name="opencrx_FEx_responsible">Tildelt</string>
+    <string name="opencrx_FEx_responsible_title">Tildelt til \'%s\'</string>
+    <string name="opencrx_PDE_task_from">fra %s</string>
+    <string name="opencrx_TEA_notes">Legg til kommentar</string>
+    <string name="opencrx_no_creator">(Ikke synkroniser)</string>
+    <string name="opencrx_PLA_signIn">Logg inn</string>
+    <string name="opencrx_PLA_password">Passord</string>
+    <string name="opencrx_notification_text">%s oppdaterte oppgaver / trykk for flere detaljer
+    </string>
+    <string name="opencrx_ioerror">Tilkoblingsfeil! Kontroller tilkoblingen til Internett</string>
+    <string name="opencrx_MLA_password_empty">Passord ble ikke spesifisert!</string>
+    <string name="opencrx_TEA_task_assign_label">Tildel følgende person denne oppgaven:</string>
+    <string name="opencrx_TEA_task_unassigned">&lt;Utildelt&gt;</string>
+    <string name="opencrx_TEA_dashboard_default">&lt;Standard&gt;</string>
+    <string name="CFC_opencrx_in_workspace_text">I arbeidsområde:?</string>
+    <string name="CFC_opencrx_in_workspace_name">I arbeidsområde...</string>
+    <string name="CFC_opencrx_assigned_to_text">Tildelt: ?</string>
+    <string name="CFC_opencrx_assigned_to_name">Tildelt...</string>
+    <string name="EPr_statistics_desc_disabled">Ingen bruksdata vil bli rapportert</string>
+    <string name="EPr_statistics_desc_enabled">Hjelp oss å forbedre Astrid ved å sende anonym
+        bruksdata
+    </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="TEA_reminder_alarm_label">Ringe- og vibrasjonstype:</string>
+    <string name="TEA_reminder_mode_once">Ring én gang</string>
+    <string name="TEA_reminder_mode_nonstop">Ring til jeg slår av alarmen</string>
+    <string-array name="TEA_reminder_random">
+        <item>an hour</item>
+        <item>a day</item>
+        <item>a week</item>
+        <item>in two weeks</item>
+        <item>a month</item>
+        <item>in two months</item>
+    </string-array>
+    <string name="rmd_NoA_filter">Påminnelse!</string>
+    <string name="rmd_NoA_done">Allerede utført!</string>
+    <string name="rmd_NoA_snooze">Slumre</string>
+    <string-array name="rmd_reengage_notif_titles">
+        <item>A note from Astrid</item>
+        <item>Memo for %s.</item>
+        <item>Your Astrid digest</item>
+        <item>Reminders from Astrid</item>
+    </string-array>
+    <string-array name="rmd_reengage_dialog_options">
+        <item>Time to shorten your to-do list!</item>
+        <item>Dear sir or madam, some tasks await your inspection!</item>
+        <item>Hi there, could you take a look at these?</item>
+        <item>I\'ve got some tasks with your name on them!</item>
+        <item>A fresh batch of tasks for you today!</item>
+        <item>You look fabulous! Ready to get started?</item>
+        <item>A lovely day for getting some work done, I think!</item>
+    </string-array>
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>Don\'t you want to get organized?</item>
+        <item>I\'m Astrid! I\'m here to help you do more!</item>
+        <item>You look busy! Let me take some of those tasks off of your plate.</item>
+        <item>I can help you keep track of all of the details in your life.</item>
+        <item>You\'re serious about getting more done? So am I!</item>
+        <item>Pleasure to make your acquaintance!</item>
+    </string-array>
+    <string name="rmd_EPr_alerts_header">Påminnelseinnstillinger</string>
+    <string name="rmd_EPr_quiet_hours_start_title">Stilletimer start</string>
+    <string name="rmd_EPr_quiet_hours_desc_none">Stilletimer er deaktivert</string>
+    <string name="rmd_EPr_quiet_hours_end_title">Stilletimer slutt</string>
+    <string name="rmd_EPr_ringtone_title">Ringetone for påminnelser</string>
+    <string name="rmd_EPr_ringtone_desc_custom">Egendefinert ringetone er satt</string>
+    <string name="rmd_EPr_ringtone_desc_silent">Ringetone satt på Stille</string>
+    <string name="rmd_EPr_ringtone_desc_default">Standardringetone vil bli brukt</string>
+    <string name="rmd_EPr_persistent_title">Påminnelse intensitet</string>
+    <string name="rmd_EPr_persistent_desc_true">Varsler må ses individuelt for å kunne fjernes
+    </string>
+    <string name="rmd_EPr_persistent_desc_false">Varsler kan slettes ved \"Slett alt\"-knappen
+    </string>
+    <string name="rmd_EPr_vibrate_title">Vibrer ved varsel</string>
+    <string name="rmd_EPr_vibrate_desc_true">Astrid vil vibrere ved varsler</string>
+    <string name="rmd_EPr_vibrate_desc_false">Astrid vil ikke vibrere ved varsler</string>
+    <string name="rmd_EPr_nagging_desc_true">Astid vil vise oppmuntringsbeskjeder ved påminnelser
+    </string>
+    <string name="rmd_EPr_snooze_dialog_title">Slumreinnstillinger TT:MM</string>
+    <string name="rmd_EPr_snooze_dialog_desc_true">Slumre ved å velge ny tid (TT:MM)</string>
+    <string name="rmd_EPr_snooze_dialog_desc_false">Slumre ved å velge # dager/timer å slumre
+    </string>
+    <string name="rmd_EPr_defaultRemind_title">Tilfeldige påminnelser</string>
+    <string name="rmd_EPr_defaultRemind_desc_disabled">Nye oppgaver skal ikke påminnes tifeldig
+    </string>
+    <string name="rmd_EPr_defaultRemind_desc">Nye oppgaver påminnes tilfeldig: %s</string>
+    <string-array name="EPr_reminder_random">
+        <item>deaktivert</item>
+        <item>hver time</item>
+        <item>daglig</item>
+        <item>ukentlig</item>
+        <item>hver andre uke</item>
+        <item>månedlig</item>
+        <item>hver annen måned</item>
+    </string-array>
+    <string-array name="EPr_quiet_hours_start">
+        <item>deaktivert</item>
+        <item>kl 20.00</item>
+        <item>kl 21.00</item>
+        <item>kl 22.00</item>
+        <item>kl 23.00</item>
+        <item>kl 00.00</item>
+        <item>kl 01.00</item>
+        <item>kl m02.00</item>
+        <item>kl 03.00</item>
+        <item>kl 04.00</item>
+        <item>kl 05.00</item>
+        <item>kl 06.00</item>
+        <item>kl 07.00</item>
+        <item>kl 08.00</item>
+        <item>kl 09.00</item>
+        <item>kl 10.00</item>
+        <item>kl 11.00</item>
+        <item>kl 12.00</item>
+        <item>kl 13.00</item>
+        <item>kl 14.00</item>
+        <item>kl 15.00</item>
+        <item>kl 16.00</item>
+        <item>kl 17.00</item>
+        <item>kl 18.00</item>
+        <item>kl 19.00</item>
+    </string-array>
+    <string-array name="EPr_quiet_hours_end">
+        <item>kl 09.00</item>
+        <item>kl 10.00</item>
+        <item>kl 11.00</item>
+        <item>kl 12.00</item>
+        <item>kl 13.00</item>
+        <item>kl 14.00</item>
+        <item>kl 15.00</item>
+        <item>kl 16.00</item>
+        <item>kl 17.00</item>
+        <item>kl 18.00</item>
+        <item>kl 19.00</item>
+        <item>kl 20.00</item>
+        <item>kl 21.00</item>
+        <item>kl 22.00</item>
+        <item>kl 23.00</item>
+        <item>kl 00.00</item>
+        <item>kl 01.00</item>
+        <item>kl m02.00</item>
+        <item>kl 03.00</item>
+        <item>kl 04.00</item>
+        <item>kl 05.00</item>
+        <item>kl 06.00</item>
+        <item>kl 07.00</item>
+        <item>kl 08.00</item>
+    </string-array>
+    <string-array name="EPr_rmd_time">
+        <item>kl 09.00</item>
+        <item>kl 10.00</item>
+        <item>kl 11.00</item>
+        <item>kl 12.00</item>
+        <item>kl 13.00</item>
+        <item>kl 14.00</item>
+        <item>kl 15.00</item>
+        <item>kl 16.00</item>
+        <item>kl 17.00</item>
+        <item>kl 18.00</item>
+        <item>kl 19.00</item>
+        <item>kl 20.00</item>
+        <item>kl 21.00</item>
+        <item>kl 22.00</item>
+        <item>kl 23.00</item>
+        <item>kl 00.00</item>
+        <item>kl 01.00</item>
+        <item>kl m02.00</item>
+        <item>kl 03.00</item>
+        <item>kl 04.00</item>
+        <item>kl 05.00</item>
+        <item>kl 06.00</item>
+        <item>kl 07.00</item>
+        <item>kl 08.00</item>
+    </string-array>
+    <string-array name="reminders">
+        <item>Hei! Har du et sekund?</item>
+        <item>Får jeg prate med deg et sekund?</item>
+        <item>Har du et par minutter?</item>
+        <item>Har du glemt?</item>
+        <item>Unnskyld!</item>
+        <item>Når du har et minutt:</item>
+        <item>På din agenda:</item>
+        <item>Ledig et øyeblikk?</item>
+        <item>Astrid her!</item>
+        <item>Hei! Kan jeg forstyrre litt?</item>
+        <item>Ett minutt av din tid?</item>
+        <item>Det er en fin dag å</item>
+    </string-array>
+    <string-array name="reminders_due">
+        <item>På tide å komme i gang!</item>
+        <item>Forfallsdatoen er kommet!</item>
+        <item>Klar å starte?</item>
+        <item>Du sa du ville gjøre:</item>
+        <item>Det er meningen du skal starte:</item>
+        <item>Det er på tide å starte:</item>
+        <item>Det er på tide!</item>
+        <item>Unnskyld! Det er tid for</item>
+        <item>Er du ledig? Det er tid for</item>
+    </string-array>
+    <string-array name="reminders_snooze">
+        <item>Ikke vær så lat!</item>
+        <item>Slumretiden er ferdig!</item>
+        <item>Ikke mer slumring!</item>
+        <item>Er du klar nå da?</item>
+        <item>Ingen flere utsettelser!</item>
+    </string-array>
+    <string-array name="reminder_responses">
+        <item>Jeg har noe for deg!</item>
+        <item>Klar til å legge dette bak deg?</item>
+        <item>Hvorfor får du ikke dette gjort?</item>
+        <item>Nå? Er du klar?</item>
+        <item>Klar til å starte dette?</item>
+        <item>Klarer du dette?</item>
+        <item>Du blir glad! Bare bli ferdig!</item>
+        <item>Jeg lover at du vil føle deg bedre hvis du avslutter dette!</item>
+        <item>Gjør du ikke dette i dag?</item>
+        <item>Kan du ikke bare avslutte oppgaven? Jeg er så lei av den.</item>
+        <item>Klarer du å avslutte oppgaven? Ja, det klarer du!</item>
+        <item>Skal du noensinne gjøre dette?</item>
+        <item>Vær fornøyd med deg selv! Kom igjen!</item>
+        <item>Jeg er så stolt av deg! La oss få det gjort!</item>
+        <item>Litt snacks etter at du har gjort deg ferdig?</item>
+        <item>Bare denne ene oppgaven? Vær så snill?</item>
+        <item>På tide å korte ned på oppgavelista!</item>
+        <item>Are you on Team Order or Team Chaos? Team Order! Let\'s go!</item>
+        <item>Have I mentioned you are awesome recently? Keep it up!</item>
+        <item>A task a day keeps the clutter away... Goodbye clutter!</item>
+        <item>How do you do it? Wow, I\'m impressed!</item>
+        <item>You can\'t just get by on your good looks. Let\'s get to it!</item>
+        <item>Lovely weather for a job like this, isn\'t it?</item>
+        <item>A spot of tea while you work on this?</item>
+        <item>If only you had already done this, then you could go outside and play.</item>
+        <item>It\'s time. You can\'t put off the inevitable.</item>
+        <item>I die a little every time you ignore me.</item>
+    </string-array>
+    <string-array name="postpone_nags">
+        <item>Ikke fortell meg at du er en somlekopp!</item>
+        <item>Blir du ikke lei iblant av å være lat?</item>
+        <item>Et sted er noen avhengig av at du gjør ferdig dette!</item>
+        <item>Når du sa \"utsett\", mente du egentlig \"nå gjør jeg dette\", ikke sant?</item>
+        <item>Dette er siste gang du utsetter oppgaven, ikke sant?</item>
+        <item>Bare gjør det ferdig i dag, jeg skal ikke sladre!</item>
+        <item>Hvorfor utsette når du kan...la være!</item>
+        <item>Jeg antar at du kommer til å avslutte denne oppgaven før eller siden?</item>
+        <item>Jeg synes du er virkelig flink! Hva med å ikke utsette det?</item>
+        <item>Vil du være i stand til å nå dine mål hvis du gjør det?</item>
+        <item>Utsett, utsett, utsett. Når vil du forandre deg!</item>
+        <item>Jeg har hatt nok av unnskyldningene dine! Bare gjør det!</item>
+        <item>Fant du ikke på den unnskyldningen forrige gang?</item>
+        <item>Jeg kan ikke hjelpe deg med å organisere livet ditt hvis du gjør det..</item>
+    </string-array>
+    <string name="repeat_plugin">Gjentagende oppgaver</string>
+    <string name="repeat_plugin_desc">Tillat gjentagende oppgaver</string>
+    <string name="repeat_enabled">Gjentakelser</string>
+    <string name="repeat_every">Hver %d</string>
+    <string name="repeat_interval_prompt">Gjentakelsesintervall</string>
+    <string-array name="repeat_interval_short">
+        <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">
+        <item>Dag(er)</item>
+        <item>Uke(r)</item>
+        <item>Måned(er)</item>
+        <item>Time(r)</item>
+        <item>Minute(s)</item>
+        <item>Year(s)</item>
+    </string-array>
+    <string-array name="repeat_until_shortcuts">
+        <item>Forever</item>
+        <item>Specific Day</item>
+        <item>Today</item>
+        <item>Tomorrow</item>
+        <item>(day after)</item>
+        <item>Next Week</item>
+        <item>In Two Weeks</item>
+        <item>Next Month</item>
+    </string-array>
+    <string-array name="repeat_type">
+        <item>fra forfallsdato</item>
+        <item>fra avslutningsdato</item>
+    </string-array>
+    <string name="repeat_detail_byday">$I på $D</string>
+    <string name="repeat_detail_duedate">Hver %s</string>
+    <string name="repeat_detail_completion">%s etter avslutning</string>
+    <string-array name="repeat_encouragement">
+        <item>Good job!</item>
+        <item>Wow… I\'m so proud of you!</item>
+        <item>I love when you\'re productive!</item>
+        <item>Doesn\'t it feel good to check something off?</item>
+    </string-array>
+    <string-array name="repeat_encouragement_last_time">
+        <item>Good job!</item>
+        <item>I\'m so proud of you!</item>
+        <item>I love when you\'re productive!</item>
+    </string-array>
+    <string name="TEA_tags_label">Lister</string>
+    <string name="tag_FEx_header">Lister</string>
+    <string name="TEA_no_tags_modified">Ingen endringer gjort</string>
+    <string name="tag_settings_title">Settings:</string>
+    <string name="TPl_notification">Tidtaker aktiv for %s!</string>
+    <string name="TFE_workingOn">Oppgaver med tidtaker</string>
+    <string name="voice_create_prompt">Snakk for å skape en oppgave</string>
+    <string name="voice_edit_title_prompt">Snakk for å sette tittelen til oppgaven</string>
+    <string name="voice_edit_note_prompt">Snakk for å sette oppgavenotater</string>
+    <string name="EPr_voiceInputInstall_dlg">Talegjenkjenning er ikke installert.\nVil du gå til
+        Markedet og installere?
+    </string>
+    <string name="EPr_voiceInputUnavailable_dlg">Dessverre er talegjenkjenning ikke tilgjengelig på
+        ditt system.\nHvis mulig, vennligst oppdater til Android 2.1 eller senere.
+    </string>
+    <string name="EPr_marketUnavailable_dlg">Dessverre er Markedet ikke tilgjengelig på ditt
+        system.\nHvis mulig, prøv å laste ned talegjenkjenning fra en annen kilde.
+    </string>
+    <string name="EPr_voiceInputEnabled_title">Taleinndata</string>
+    <string name="EPr_voiceInputEnabled_desc_enabled">Taleinndataknappen vil vises på siden med
+        oppgavelista
+    </string>
+    <string name="EPr_voiceInputEnabled_desc_disabled">Taleinndataknappen vil skjules på siden med
+        oppgavelista
+    </string>
+    <string name="EPr_voiceInputCreatesTask_title">Skap en oppgave direkte</string>
+    <string name="EPr_voiceInputCreatesTask_desc_enabled">Oppgaver vil bli skapt automatisk fra
+        taleinndata
+    </string>
+    <string name="EPr_voiceInputCreatesTask_desc_disabled">Du kan redigere tittelen når
+        innspillingen er klar
+    </string>
+    <string name="EPr_voiceRemindersEnabled_title">Talepåminnelser</string>
+    <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid vil lese opp oppgaver ved
+        påminnelse
+    </string>
+    <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid vil spille en ringetone ved
+        påminnelse
+    </string>
+    <string name="EPr_voice_header">Taleinndatainnstillinger</string>
+    <string name="welcome_title_1">Velkommen til Astrid!</string>
+    <string name="welcome_body_5">and much more!</string>
+    <string name="PPW_configure_title">Konfigurer widget</string>
+    <string name="PPW_color">Fargen til widget</string>
+    <string name="PPW_enable_calendar">Vis kalenderhendelser</string>
+    <string name="PPW_disable_encouragements">Skjul oppmuntringer</string>
+    <string name="PPW_filter">Velg filter</string>
+    <string name="PPW_due">Forfall:</string>
+    <string name="PPW_past_due">Forfalt:</string>
+    <string name="PPW_old_astrid_notice">Du behøver minst versjon 3.6 av Astrid for å bruke denne
+        widget. Beklager!
+    </string>
+    <string-array name="PPW_encouragements">
+        <item>Hei du!</item>
+        <item>Har du tid til å gjøre noe ferdig?</item>
+        <item>Oi, du ser sofistikert ut i dag!</item>
+        <item>Gjør noe fantastisk i dag!</item>
+        <item>Gjør meg stolt i dag!</item>
+        <item>Hvordan står det til i dag?</item>
+    </string-array>
+    <string-array name="PPW_encouragements_tod">
+        <item>God morgen!</item>
+        <item>God ettermiddag!</item>
+        <item>God kveld!</item>
+        <item>Sen kveld?</item>
+        <item>Det er tidlig, få gjort noe!</item>
+        <item>Litt ettermiddagste kanskje?</item>
+        <item>Nyt kvelden!</item>
+        <item>Søvn er bra for deg, vet du!</item>
+    </string-array>
+    <string-array name="PPW_encouragements_completed">
+        <item>Du har allerede avsluttet %d oppgaver!</item>
+        <item>Poeng i livet: %d oppgaver avsluttet</item>
+        <item>Smil! du har allerede avsluttet %d oppgaver!</item>
+    </string-array>
+    <string name="PPW_encouragements_none_completed">Du har ikke gjort ferdig noen oppgaver ennå!
+        Skal vi?
+    </string>
+    <string-array name="PPW_colors">
+        <item>Svart</item>
+        <item>Hvit</item>
+        <item>Blå</item>
+        <item>Gjennomskinnelig</item>
+    </string-array>
 </resources>
diff --git a/astrid/res/values-nl/strings.xml b/astrid/res/values-nl/strings.xml
index 0885b4206..e735af6f8 100755
--- a/astrid/res/values-nl/strings.xml
+++ b/astrid/res/values-nl/strings.xml
@@ -4,1685 +4,1835 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ================================================== general terms == -->
-
-  <!-- People Editing Activity -->    
-  
-  <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
-  <string name="actfm_person_hint">Naam contactpersoon of e-mailadres</string>
-  
-  <!-- task sharing dialog: shared with hint -->
-  <string name="actfm_person_or_tag_hint">Contactpersoon of Gedeelde Lijst</string>
-
-  <!-- toast on transmit success -->
-
-  <!-- can\'t rename or delete shared tag message -->
-  
-  <!-- warning before deleting a list you\'re the owner of -->
-  <string name="actfm_tag_operation_owner_delete">Je bent de eigenaar van deze gedeelde lijst! Als jij de lijst verwijdert, wordt deze verwijderd voor alle leden van de lijst. Weet je zeker dat je verder wilt gaan?</string>
-
-  <!-- slide 29a: menu item to take a picture -->
-  <string name="actfm_picture_camera">Maak een Foto</string>
-
-  <!-- slide 29b: menu item to select from gallery -->
-  <string name="actfm_picture_gallery">Maak een keuze uit de Gallerij</string>
-  
-  <!-- menu item to clear picture selection -->
-  <string name="actfm_picture_clear">Verwijder Foto</string>
-
-  <!-- filter list activity: refresh tags -->
-  
-  <!-- Title for prompt after sharing a task -->
-  <string name="actfm_view_task_title">Taak bekijken?</string>
-
-  <!-- Text for prompt after sharing a task -->
-  <string name="actfm_view_task_text">Taak is naar %s gestuurd! Je bekijkt op dit moment je eigen taken. Wil je deze en andere taken die je hebt toegewezen bekijken?</string>
-  
-  <!-- Ok button for task view prompt -->
-  <string name="actfm_view_task_ok">Bekijk toegewezen taken</string>
-      
-  <!-- Cancel button for task view prompt -->
-  <string name="actfm_view_task_cancel">Blijf Hier</string>
-  
-  <!-- slide 13a: Title for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_title">Mijn Gedeelde Taken</string>
-  
-  <!-- Empty list for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_empty">Geen gedeelde taken</string>
-  
-  <!-- =====================  Friendship connections -->
-  
-  <string name="actfm_friendship_pending">Je hebt %s een uitnodiging gestuurd!</string>
-
-  <string name="actfm_friendship_blocked">Je hebt %s geblokkeerd.</string>
-
-  <string name="actfm_friendship_ignored">Je hebt %s genegeerd</string>
-  
-  <string name="actfm_friendship_friends">Je bent bevriend met %s! Voeg hieronder voor hem/haar een taak toe.</string>
-
-  <string name="actfm_friendship_other_pending">%s wil vrienden met je worden!</string>
-
-  <string name="actfm_friendship_no_status">Verbind met %s om openbare taken te delen en daar de voortgang van te bekijken!</string>
-
-  <string name="actfm_friendship_connect">Vriend toevoegen</string>
-
-  <string name="actfm_friendship_accept">Accepteer</string>
-
-  <!-- ================================================== TagViewActivity == -->  
-
-  <!-- Tag View Activity: Add Comment hint -->    
-  <string name="TVA_add_comment">Voeg een opmerking toe</string>
-
-  <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->    
-  
-  <!-- Tabs for Tag view -->
-  <string-array name="TVA_tabs">
-    <!-- Tab for showing tasks -->
-    <item>Taken</item>
-    <!-- Tab for showing comments & updates -->
-    <item>Activiteit</item>
-    <!-- Tab for showing setting -->
-    <item>Lijst Voorkeuren</item>
-  </string-array>
-  
-  <!-- Tag View: filtered by assigned to user (%s => user name) -->
-  <string name="actfm_TVA_filtered_by_assign">Taken van %s</string>
-  
-  <!-- Tag View: filter by unassigned tasks -->
-  <string name="actfm_TVA_filter_by_unassigned">Nog niet toegewezen taken. Raak aan voor alles.</string>
-
-  <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Privé: raak aan om te veranderen of om de lijst te delen</string>
-
-  <!-- Tag View Menu: refresh -->
-  <string name="actfm_TVA_menu_refresh">Vernieuwen</string>
-
-  <!-- Tag Settings: tag name label -->
-  <string name="actfm_TVA_tag_label">Lijst</string>
-
-  <!-- Tag Settings: tag owner label -->
-
-  <!-- Tag Settings: tag owner value when there is no owner -->
-
-  <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
-  <string name="actfm_TVA_members_label">Gedeeld met:</string>
-  
-  <!-- Tag Settings: list collaborators hint -->
-  <string name="actfm_TVA_members_hint">Deel met iedereen die een e-mailadres heeft</string>
-
-  <!-- Tag Settings: tag picture -->
-  <string name="actfm_TVA_tag_picture">Lijst afbeelding:</string>
-
-  <!-- slide 25c/28b: Tag Settings: silence notifications label -->
-  <string name="actfm_TVA_silence_label">Stille waarschuwingen</string>
-  
-  <!-- Tag Settings: list icon label -->
-  
-  <!-- slide 25b/27d: Tag Settings: list description label -->
-  <string name="actfm_TVA_tag_description_label">Omschrijving</string>
-  
-  <!-- slide 28a: Tag Settings: list settings label -->
-  <string name="actfm_TVA_tag_settings_label">Voorkeuren</string>
-
-  <!-- slide 25b: Tag Settings: list description hint -->
-  <string name="actfm_TVA_tag_description_hint">Type hier een beschrijving</string>
-  
-  <!-- slide 25d: Tag Settings: list name hint -->
-  <string name="actfm_TVA_tag_name_hint">Geef de lijst een naam</string>
-  
-  <!-- Tag settings: login prompt from share-->
-  <string name="actfm_TVA_login_to_share">Je moet bij Astrid.com zijn ingelogd om lijsten te delen! Log alsjeblieft in, of maak dit een privé lijst.</string>
-  
-      
-  <!-- ============================================ edit people dialog == -->
-
-  <!-- task sharing dialog: intro -->
-  <string name="actfm_EPA_intro">Gebruik Astrid om boodschappenlijstjes, feestplanningen of projecten te delen en zie gelijk wanneer mensen hun taken voltooien!</string>
-    
-  <!-- task sharing dialog: window title -->
-    
-  <!-- task sharing dialog: save button -->
-  
-  <!-- task sharing dialog: assigned label -->
-  
-  <!-- slide 18a: task sharing dialog: assigned label long version -->
-  <string name="actfm_EPA_assign_label_long">Wie zou dit moeten doen?</string>
-  
-  <!-- task sharing dialog: assigned to me -->
-  <string name="actfm_EPA_assign_me">Ik</string>
-  
-  <!-- task sharing dialog: anyone -->
-  <string name="actfm_EPA_unassigned">Niet toegewezen</string>
-  
-  <!-- slide 18c: task sharing dialog: choose a contact -->
-  <string name="actfm_EPA_choose_contact">Kies een contactpersoon</string>
-  
-  <!-- task sharing dialog: custom email assignment -->
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_share_with">Deel met:</string>
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_collaborators_header">Delen</string>
-
-      <!-- task sharing dialog: collaborator list name (%s => name of list) -->
-  <string name="actfm_EPA_list">Lijst: %s</string>
-  
-  <!-- task sharing dialog: assigned hint -->
-  
-  <!-- task sharing dialog: message label text -->
-  <string name="actfm_EPA_message_text">Tekst voor uitnodiging:</string>
-  
-  <!-- task sharing dialog: message body -->
-  <string name="actfm_EPA_message_body">Help mij dit gedaan te krijgen!</string>
-  
-  <!-- task sharing dialog: list members section header -->
-  <string name="actfm_EPA_assign_header_members">Leden Lijst</string>
-
-  <!-- task sharing dialog: astrid friends section header -->
-  <string name="actfm_EPA_assign_header_friends">Astrid Vrienden</string>
-
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: share with Facebook -->
-  <string name="actfm_EPA_facebook">Facebook</string>
-  
-  <!-- task sharing dialog: share with Twitter -->
-  <string name="actfm_EPA_twitter">Twitter</string>
-
-  <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
-
-  <!-- task sharing dialog: edit people settings saved -->
-
-  <!-- task sharing dialog: invalid email (%s => email) -->
-  <string name="actfm_EPA_invalid_email">Ongeldig e-mailadres: %s</string>
-
-  <!-- task sharing dialog: tag not found (%s => tag) -->
-  
-  <!-- task sharing login prompt -->
-  <string name="actfm_EPA_login_to_share">Je moet ingelogd zijn op Astrid.com om taken te kunnen delen!</string>
-  
-  <string name="actfm_EPA_login_button">Aanmelden</string>
-  
-  <string name="actfm_EPA_dont_share_button">Niet delen</string>
-  
-  <string name="actfm_EPA_add_person_to_list_title">Taak toegewezen</string>
-  
-  <string name="actfm_EPA_add_person_to_list">%1$s is niet gedeeld binnen deze lijst. Wil je %2$s aan deze lijst toevoegen?</string>
-
-  <string name="actfm_EPA_add_person_to_list_ok">Voeg toe aan lijst</string>
-  
-  <string name="actfm_EPA_add_person_to_list_cancel">Niet toevoegen</string>
-  
-  <string name="actfm_list_owner">(eigenaar)</string>
-  
-  <!-- ========================================= sharing login activity == -->
-
-  <!-- share login: Title -->
-  <string name="actfm_ALA_title">Welkom bij Astrid.com!</string>
-
-  <!-- share login: Sharing Description -->
-  <string name="actfm_ALA_body">Astrid.com geeft je online toegang tot je taken, delen en aan andren toekennen.</string>
-
-  <!-- share login: Sharing Login FB Prompt -->
-  <string name="actfm_ALA_fb_login">Verbind met Facebook</string>
-
-  <!-- share login: Sharing Login GG Prompt -->
-  <string name="actfm_ALA_gg_login">Verbind met Google</string>
-  
-  <!-- share login: Quickly log in as <%s -> email> -->
-  <string name="actfm_quick_login">Inloggen als: %s</string>
-
-  <!-- share login: Reject quick login -->
-  <string name="actfm_quick_login_reject">Niet %s?</string>
-
-  <!-- share login: Name -->
-  <string name="actfm_ALA_firstname_label">Voornaam</string>
-  
-  <!-- share login: Name -->
-  <string name="actfm_ALA_lastname_label">Achternaam</string>
-
-  <!-- share login: Email -->
-  <string name="actfm_ALA_email_label">E-mail</string>
-
-  <!-- share login: Username / Email -->
-
-  <!-- share login: Password -->
-  <string name="actfm_ALA_password_label">Wachtwoord</string>
-
-  <!-- share login: Sign Up Title -->
-  <string name="actfm_ALA_signup_title">Aanmelden</string>
-
-  <!-- share login: Login Title -->
-  <string name="actfm_ALA_login_title">Inloggen</string>
-
-  <!-- share login: Google Auth title -->
-  <string name="actfm_GAA_title">Selecteer de Google account die je wil gebruiken:</string>
-
-  <!-- share login: OAUTH Login Prompt -->
-  <string name="actfm_OLA_prompt">A.u.b. inloggen</string>
-  
-  <!-- Login error: user exists -->
-  <string name="actfm_ALA_error_user_exists">Deze gebruiker bestaat al. A.u.b. inloggen</string>
-  
-  <!-- Login error: wrong password -->
-  <string name="actfm_ALA_error_wrong_password">Sorry, dat wachtwoord was incorrect. Probeer het opnieuw.</string>
-  
-  <!-- Forgot password link -->
-  <string name="actfm_ALA_forgot_password">Wachtwoord vergeten?</string>
-  
-  <!-- Forgot password email prompt -->
-  <string name="actfm_ALA_enter_email">Voer uw e-mailadres in</string>
-  
-  <!-- Password reset sent (%s -> email) -->
-  <string name="actfm_ALA_reset_sent">Link om uw wachtwoord opnieuw aan te maken is verstuurd naar \'%s\'</string>
-  
-  <!-- User already exists - first sync may be slow -->
-  <string name="actfm_ALA_user_exists_sync_alert">De eerste keer synchroniseren zal langer dan normaal duren. Dank je voor je geduld</string>
-  
-  <!-- User not found -->
-  <string name="actfm_ALA_error_user_not_found">Gebruiker is niet gevonden met dat e-mailadres. Meld je dus aan! </string>
-  
-  <!-- ================================================ Featured Lists -->
-
-  <string name="actfm_feat_list_clone">Kopiëer lijst</string>
-  
-  <string name="actfm_feat_list_suffix">(Kopiéer)</string>
-
-  <string name="actfm_feat_list_cloning">Kopiëren ...</string>
-
-  <string name="actfm_feat_list_clone_success">Succes!</string>
-
-  <string name="actfm_feat_list_task_clone_success">Taak gekopiéerd.</string>
-
-  <string name="actfm_feat_list_clone_empty">Geen taken om te kopiéren</string>
-  
-  <!-- ================================================ Synchronization == -->
-      
-  <!-- Indicates the logged in user name. %s -> user\'s name -->
-  <string name="actfm_status_title_logged_in">Status - Ingelogd als %s</string>    
-      
-  <!-- Preferences Title: Act.fm -->    
-  <string name="actfm_APr_header">Astrid.com</string>
-  
-  <string name="actfm_https_title">HTTPS gebruiken</string>
-  <string name="actfm_https_enabled">HTTPS ingeschakeld (langzamer)</string>
-  <string name="actfm_https_disabled">HTTPS uitgeschakeld (sneller)</string>
-
-  <!-- title for notification tray after synchronizing -->
-  
-  <!-- text for notification when comments are received -->
-    
-  <string name="actfm_dual_sync_warning">Je synchroniseert op het moment met Google Taken. Om duplicaat taken en andere synchronisatie problemen te voorkomen,
-zal Google Taken  niet langer synchroniseren als je begint te synchroniseren met Astrid.com. Je kunt nog wel steeds taken importeren van Google Taken via de Google Taken instellingen pagina,
-of Google Taken in Gmail vervangen met Astrid\'s herinner mij Chrome Extensie.
-Weet je zeker dat je wilt synchroniseren met Astrid.com?</string>
-      
-  <!-- account types -->
-  <string name="actfm_account_type">Type account</string>
-  <string name="actfm_account_info">Account gegevens</string>
-  <string name="actfm_account_info_summary">Status en opties</string>
-  <string name="account_type_title_not_logged_in">Meld je aan voor een gratis account</string>
-  <string name="account_type_summary_not_logged_in">Toegang tot online taken, deel lijsten en wijs ze toe</string>
-  
-  
-  <string name="actfm_account_premium">Premium</string>
-  <string name="actfm_account_basic">Basis</string>
-  
-  <string name="actfm_inapp_billing">Upgrade naar Premium</string>
-  <string name="actfm_inapp_billing_summary">Voeg bestanden toe, Stem backup, premium onddrsteuning &amp; meer</string>
-  
-  <!-- Sharing -->
-  <string name="share_with_facebook">Like op Facebook</string>
-  <string name="share_with_twitter">Volg op Twitter</string>
-  <string name="share_with_google">Deel op Google+</string>
-  <string name="share_speech_bubble">Door te delen, help je anderen meer productief te zijn</string>
-  
-  
-  <!-- Sync upgrade messages -->
-  <string name="sync_upgr_both_title">Gebruik Astrid.com + Google zonder duplicaten</string>
-  <string name="sync_upgr_both_body">Laten we eerlijk zijn. Google Taken is gemakkelijk maar niet zo cool als Astrid. Om duplicaten te voorkomen kun je niet langer tegelijkertijd zowel Astrid.com als Google Taken synchroniseren. Je kunt nog wel je Google Taken importeren via Instelllingen → Backup &amp; Sync, of downgraden naar enkel synchronisatie met Google Taken.</string>
-  <string name="sync_upgr_both_btn1">Blijf bij Astrid</string>
-  <string name="sync_upgr_both_btn2">Downgrade naar Google Taken</string>
-  
-  <string name="sync_upgr_gtasks_only_title">Upgrade gratis naar Astrid Sync!</string>
-  <string name="sync_upgr_gtasks_only_body">Toegang tot je taken op al je apparaten en op Gmail met Astrid.com sync. Upgrade naar Astrid.com Sync (je kunt altijd terug naar Google Taken - maar zul je niet willen)!</string>
-  <string name="sync_upgr_gtasks_only_btn1">Upgrade naar Astrid Sync</string>
-  <string name="sync_upgr_gtasks_only_btn2">Blijf bij Google Taken</string>
-  
-  <string name="sync_upgr_neither_title">Gratis backyp &amp; Sync!</string>
-  <string name="sync_upgr_neither_body">Loop geen risico met je to-do\'s! Nieuwe en verbeterde Astrid sync om je taken te bewaren en er overal toegang tot te hebben.</string>
-  <string name="sync_upgr_neither_btn1">Registreer nu</string>
-  
-  <string name="sync_upgr_logged_out">Je bent uitgelogd uit Astrid</string>
-  
-  <string name="actfm_logout_clear_tasks_title">Data wissen?</string>
-  <string name="actfm_logout_clear_tasks_body">Wil je jouw taken en lijsten wissen?</string>
-  <string name="actfm_logout_clear_tasks_yes">Data wissen</string>
-  <string name="actfm_logout_clear_tasks_no">Data behouden</string>
-  
-  <string name="actfm_logged_in_different_user_title">Inloggen als een andere gebruiker</string>
-  <string name="actfm_logged_in_different_user_body">Wil je de bestaande telefoon taken verwijderen voor synchronisatie?</string>
-  <string name="actfm_logged_in_different_user_keep_data">Data behouden</string>
-  <string name="actfm_logged_in_different_user_clear_data">Alle gegevens wissen</string>
-  <string name="actfm_logged_in_different_user_processing">Verwerken van bestaande data</string>
-  
-  <string name="actfm_tag_not_authorized_title">Niet geautoriseerd</string>
-  <string name="actfm_tag_not_authorized_body">Je bent niet langer geautoriseerd om lijst %s te bekijken (wellicht ben je verwijderd). Wil je een nieuwe lijst aanmaken met dezelfde naam?</string>
-  <string name="actfm_tag_not_authorized_new_list">Maak een nieuwe lijst</string>
-  <string name="actfm_tag_not_authorized_leave_list">Verlaat lijst</string>
-  
-  <string name="actfm_sync_ongoing">Synchronisatie bezig...</string>
-  
-  <string name="EPr_reset_sync_state">Reset sync</string>
-  <string name="EPr_reset_sync_state_summary">Reset sommige lokale data om synchronisatie te proberen te herstellen</string>
-  <string name="EPr_reset_sync_state_detailed">De volgende keer dat je synchroniseert, zullen je taken en lijsten veranderen in overeenstemming met de data die aanwezig is Astrid.com, wat synchronisatie fouten kan herstellen. Wil je doorgaan?</string>
-  
+<resources>
 
+    <!-- ================================================== general terms == -->
 
+    <!-- People Editing Activity -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
+    <string name="actfm_person_hint">Naam contactpersoon of e-mailadres</string>
+
+    <!-- task sharing dialog: shared with hint -->
+    <string name="actfm_person_or_tag_hint">Contactpersoon of Gedeelde Lijst</string>
+
+    <!-- toast on transmit success -->
+
+    <!-- can\'t rename or delete shared tag message -->
+
+    <!-- warning before deleting a list you\'re the owner of -->
+    <string name="actfm_tag_operation_owner_delete">Je bent de eigenaar van deze gedeelde lijst! Als
+        jij de lijst verwijdert, wordt deze verwijderd voor alle leden van de lijst. Weet je zeker
+        dat je verder wilt gaan?
+    </string>
+
+    <!-- slide 29a: menu item to take a picture -->
+    <string name="actfm_picture_camera">Maak een Foto</string>
+
+    <!-- slide 29b: menu item to select from gallery -->
+    <string name="actfm_picture_gallery">Maak een keuze uit de Gallerij</string>
+
+    <!-- menu item to clear picture selection -->
+    <string name="actfm_picture_clear">Verwijder Foto</string>
+
+    <!-- filter list activity: refresh tags -->
+
+    <!-- Title for prompt after sharing a task -->
+    <string name="actfm_view_task_title">Taak bekijken?</string>
+
+    <!-- Text for prompt after sharing a task -->
+    <string name="actfm_view_task_text">Taak is naar %s gestuurd! Je bekijkt op dit moment je eigen
+        taken. Wil je deze en andere taken die je hebt toegewezen bekijken?
+    </string>
+
+    <!-- Ok button for task view prompt -->
+    <string name="actfm_view_task_ok">Bekijk toegewezen taken</string>
+
+    <!-- Cancel button for task view prompt -->
+    <string name="actfm_view_task_cancel">Blijf Hier</string>
+
+    <!-- slide 13a: Title for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_title">Mijn Gedeelde Taken</string>
+
+    <!-- Empty list for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_empty">Geen gedeelde taken</string>
+
+    <!-- =====================  Friendship connections -->
+
+    <string name="actfm_friendship_pending">Je hebt %s een uitnodiging gestuurd!</string>
+
+    <string name="actfm_friendship_blocked">Je hebt %s geblokkeerd.</string>
+
+    <string name="actfm_friendship_ignored">Je hebt %s genegeerd</string>
+
+    <string name="actfm_friendship_friends">Je bent bevriend met %s! Voeg hieronder voor hem/haar
+        een taak toe.
+    </string>
+
+    <string name="actfm_friendship_other_pending">%s wil vrienden met je worden!</string>
+
+    <string name="actfm_friendship_no_status">Verbind met %s om openbare taken te delen en daar de
+        voortgang van te bekijken!
+    </string>
+
+    <string name="actfm_friendship_connect">Vriend toevoegen</string>
+
+    <string name="actfm_friendship_accept">Accepteer</string>
+
+    <!-- ================================================== TagViewActivity == -->
+
+    <!-- Tag View Activity: Add Comment hint -->
+    <string name="TVA_add_comment">Voeg een opmerking toe</string>
+
+    <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->
+
+    <!-- Tabs for Tag view -->
+    <string-array name="TVA_tabs">
+        <!-- Tab for showing tasks -->
+        <item>Taken</item>
+        <!-- Tab for showing comments & updates -->
+        <item>Activiteit</item>
+        <!-- Tab for showing setting -->
+        <item>Lijst Voorkeuren</item>
+    </string-array>
+
+    <!-- Tag View: filtered by assigned to user (%s => user name) -->
+    <string name="actfm_TVA_filtered_by_assign">Taken van %s</string>
+
+    <!-- Tag View: filter by unassigned tasks -->
+    <string name="actfm_TVA_filter_by_unassigned">Nog niet toegewezen taken. Raak aan voor alles.
+    </string>
+
+    <!-- Tag View: list is private, no members -->
+    <string name="actfm_TVA_no_members_alert">Privé: raak aan om te veranderen of om de lijst te
+        delen
+    </string>
+
+    <!-- Tag View Menu: refresh -->
+    <string name="actfm_TVA_menu_refresh">Vernieuwen</string>
+
+    <!-- Tag Settings: tag name label -->
+    <string name="actfm_TVA_tag_label">Lijst</string>
+
+    <!-- Tag Settings: tag owner label -->
+
+    <!-- Tag Settings: tag owner value when there is no owner -->
+
+    <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
+    <string name="actfm_TVA_members_label">Gedeeld met:</string>
+
+    <!-- Tag Settings: list collaborators hint -->
+    <string name="actfm_TVA_members_hint">Deel met iedereen die een e-mailadres heeft</string>
+
+    <!-- Tag Settings: tag picture -->
+    <string name="actfm_TVA_tag_picture">Lijst afbeelding:</string>
+
+    <!-- slide 25c/28b: Tag Settings: silence notifications label -->
+    <string name="actfm_TVA_silence_label">Stille waarschuwingen</string>
+
+    <!-- Tag Settings: list icon label -->
+
+    <!-- slide 25b/27d: Tag Settings: list description label -->
+    <string name="actfm_TVA_tag_description_label">Omschrijving</string>
+
+    <!-- slide 28a: Tag Settings: list settings label -->
+    <string name="actfm_TVA_tag_settings_label">Voorkeuren</string>
+
+    <!-- slide 25b: Tag Settings: list description hint -->
+    <string name="actfm_TVA_tag_description_hint">Type hier een beschrijving</string>
+
+    <!-- slide 25d: Tag Settings: list name hint -->
+    <string name="actfm_TVA_tag_name_hint">Geef de lijst een naam</string>
+
+    <!-- Tag settings: login prompt from share-->
+    <string name="actfm_TVA_login_to_share">Je moet bij Astrid.com zijn ingelogd om lijsten te
+        delen! Log alsjeblieft in, of maak dit een privé lijst.
+    </string>
+
+
+    <!-- ============================================ edit people dialog == -->
+
+    <!-- task sharing dialog: intro -->
+    <string name="actfm_EPA_intro">Gebruik Astrid om boodschappenlijstjes, feestplanningen of
+        projecten te delen en zie gelijk wanneer mensen hun taken voltooien!
+    </string>
+
+    <!-- task sharing dialog: window title -->
+
+    <!-- task sharing dialog: save button -->
+
+    <!-- task sharing dialog: assigned label -->
+
+    <!-- slide 18a: task sharing dialog: assigned label long version -->
+    <string name="actfm_EPA_assign_label_long">Wie zou dit moeten doen?</string>
+
+    <!-- task sharing dialog: assigned to me -->
+    <string name="actfm_EPA_assign_me">Ik</string>
+
+    <!-- task sharing dialog: anyone -->
+    <string name="actfm_EPA_unassigned">Niet toegewezen</string>
+
+    <!-- slide 18c: task sharing dialog: choose a contact -->
+    <string name="actfm_EPA_choose_contact">Kies een contactpersoon</string>
+
+    <!-- task sharing dialog: custom email assignment -->
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_share_with">Deel met:</string>
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_collaborators_header">Delen</string>
+
+    <!-- task sharing dialog: collaborator list name (%s => name of list) -->
+    <string name="actfm_EPA_list">Lijst: %s</string>
+
+    <!-- task sharing dialog: assigned hint -->
+
+    <!-- task sharing dialog: message label text -->
+    <string name="actfm_EPA_message_text">Tekst voor uitnodiging:</string>
+
+    <!-- task sharing dialog: message body -->
+    <string name="actfm_EPA_message_body">Help mij dit gedaan te krijgen!</string>
+
+    <!-- task sharing dialog: list members section header -->
+    <string name="actfm_EPA_assign_header_members">Leden Lijst</string>
+
+    <!-- task sharing dialog: astrid friends section header -->
+    <string name="actfm_EPA_assign_header_friends">Astrid Vrienden</string>
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: share with Facebook -->
+    <string name="actfm_EPA_facebook">Facebook</string>
+
+    <!-- task sharing dialog: share with Twitter -->
+    <string name="actfm_EPA_twitter">Twitter</string>
+
+    <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
+
+    <!-- task sharing dialog: edit people settings saved -->
+
+    <!-- task sharing dialog: invalid email (%s => email) -->
+    <string name="actfm_EPA_invalid_email">Ongeldig e-mailadres: %s</string>
+
+    <!-- task sharing dialog: tag not found (%s => tag) -->
+
+    <!-- task sharing login prompt -->
+    <string name="actfm_EPA_login_to_share">Je moet ingelogd zijn op Astrid.com om taken te kunnen
+        delen!
+    </string>
+
+    <string name="actfm_EPA_login_button">Aanmelden</string>
+
+    <string name="actfm_EPA_dont_share_button">Niet delen</string>
+
+    <string name="actfm_EPA_add_person_to_list_title">Taak toegewezen</string>
+
+    <string name="actfm_EPA_add_person_to_list">%1$s is niet gedeeld binnen deze lijst. Wil je %2$s
+        aan deze lijst toevoegen?
+    </string>
+
+    <string name="actfm_EPA_add_person_to_list_ok">Voeg toe aan lijst</string>
+
+    <string name="actfm_EPA_add_person_to_list_cancel">Niet toevoegen</string>
+
+    <string name="actfm_list_owner">(eigenaar)</string>
+
+    <!-- ========================================= sharing login activity == -->
+
+    <!-- share login: Title -->
+    <string name="actfm_ALA_title">Welkom bij Astrid.com!</string>
+
+    <!-- share login: Sharing Description -->
+    <string name="actfm_ALA_body">Astrid.com geeft je online toegang tot je taken, delen en aan
+        andren toekennen.
+    </string>
+
+    <!-- share login: Sharing Login FB Prompt -->
+    <string name="actfm_ALA_fb_login">Verbind met Facebook</string>
+
+    <!-- share login: Sharing Login GG Prompt -->
+    <string name="actfm_ALA_gg_login">Verbind met Google</string>
+
+    <!-- share login: Quickly log in as <%s -> email> -->
+    <string name="actfm_quick_login">Inloggen als: %s</string>
+
+    <!-- share login: Reject quick login -->
+    <string name="actfm_quick_login_reject">Niet %s?</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_firstname_label">Voornaam</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_lastname_label">Achternaam</string>
+
+    <!-- share login: Email -->
+    <string name="actfm_ALA_email_label">E-mail</string>
+
+    <!-- share login: Username / Email -->
+
+    <!-- share login: Password -->
+    <string name="actfm_ALA_password_label">Wachtwoord</string>
+
+    <!-- share login: Sign Up Title -->
+    <string name="actfm_ALA_signup_title">Aanmelden</string>
+
+    <!-- share login: Login Title -->
+    <string name="actfm_ALA_login_title">Inloggen</string>
+
+    <!-- share login: Google Auth title -->
+    <string name="actfm_GAA_title">Selecteer de Google account die je wil gebruiken:</string>
+
+    <!-- share login: OAUTH Login Prompt -->
+    <string name="actfm_OLA_prompt">A.u.b. inloggen</string>
+
+    <!-- Login error: user exists -->
+    <string name="actfm_ALA_error_user_exists">Deze gebruiker bestaat al. A.u.b. inloggen</string>
+
+    <!-- Login error: wrong password -->
+    <string name="actfm_ALA_error_wrong_password">Sorry, dat wachtwoord was incorrect. Probeer het
+        opnieuw.
+    </string>
+
+    <!-- Forgot password link -->
+    <string name="actfm_ALA_forgot_password">Wachtwoord vergeten?</string>
+
+    <!-- Forgot password email prompt -->
+    <string name="actfm_ALA_enter_email">Voer uw e-mailadres in</string>
+
+    <!-- Password reset sent (%s -> email) -->
+    <string name="actfm_ALA_reset_sent">Link om uw wachtwoord opnieuw aan te maken is verstuurd naar
+        \'%s\'
+    </string>
+
+    <!-- User already exists - first sync may be slow -->
+    <string name="actfm_ALA_user_exists_sync_alert">De eerste keer synchroniseren zal langer dan
+        normaal duren. Dank je voor je geduld
+    </string>
+
+    <!-- User not found -->
+    <string name="actfm_ALA_error_user_not_found">Gebruiker is niet gevonden met dat e-mailadres.
+        Meld je dus aan!
+    </string>
+
+    <!-- ================================================ Featured Lists -->
+
+    <string name="actfm_feat_list_clone">Kopiëer lijst</string>
+
+    <string name="actfm_feat_list_suffix">(Kopiéer)</string>
+
+    <string name="actfm_feat_list_cloning">Kopiëren ...</string>
+
+    <string name="actfm_feat_list_clone_success">Succes!</string>
+
+    <string name="actfm_feat_list_task_clone_success">Taak gekopiéerd.</string>
+
+    <string name="actfm_feat_list_clone_empty">Geen taken om te kopiéren</string>
+
+    <!-- ================================================ Synchronization == -->
+
+    <!-- Indicates the logged in user name. %s -> user\'s name -->
+    <string name="actfm_status_title_logged_in">Status - Ingelogd als %s</string>
+
+    <!-- Preferences Title: Act.fm -->
+    <string name="actfm_APr_header">Astrid.com</string>
+
+    <string name="actfm_https_title">HTTPS gebruiken</string>
+    <string name="actfm_https_enabled">HTTPS ingeschakeld (langzamer)</string>
+    <string name="actfm_https_disabled">HTTPS uitgeschakeld (sneller)</string>
+
+    <!-- title for notification tray after synchronizing -->
+
+    <!-- text for notification when comments are received -->
+
+    <string name="actfm_dual_sync_warning">Je synchroniseert op het moment met Google Taken. Om
+        duplicaat taken en andere synchronisatie problemen te voorkomen,
+        zal Google Taken niet langer synchroniseren als je begint te synchroniseren met Astrid.com.
+        Je kunt nog wel steeds taken importeren van Google Taken via de Google Taken instellingen
+        pagina,
+        of Google Taken in Gmail vervangen met Astrid\'s herinner mij Chrome Extensie.
+        Weet je zeker dat je wilt synchroniseren met Astrid.com?
+    </string>
+
+    <!-- account types -->
+    <string name="actfm_account_type">Type account</string>
+    <string name="actfm_account_info">Account gegevens</string>
+    <string name="actfm_account_info_summary">Status en opties</string>
+    <string name="account_type_title_not_logged_in">Meld je aan voor een gratis account</string>
+    <string name="account_type_summary_not_logged_in">Toegang tot online taken, deel lijsten en wijs
+        ze toe
+    </string>
+
+
+    <string name="actfm_account_premium">Premium</string>
+    <string name="actfm_account_basic">Basis</string>
+
+    <string name="actfm_inapp_billing">Upgrade naar Premium</string>
+    <string name="actfm_inapp_billing_summary">Voeg bestanden toe, Stem backup, premium
+        onddrsteuning &amp; meer
+    </string>
+
+    <!-- Sharing -->
+    <string name="share_with_facebook">Like op Facebook</string>
+    <string name="share_with_twitter">Volg op Twitter</string>
+    <string name="share_with_google">Deel op Google+</string>
+    <string name="share_speech_bubble">Door te delen, help je anderen meer productief te zijn
+    </string>
+
+
+    <!-- Sync upgrade messages -->
+    <string name="sync_upgr_both_title">Gebruik Astrid.com + Google zonder duplicaten</string>
+    <string name="sync_upgr_both_body">Laten we eerlijk zijn. Google Taken is gemakkelijk maar niet
+        zo cool als Astrid. Om duplicaten te voorkomen kun je niet langer tegelijkertijd zowel
+        Astrid.com als Google Taken synchroniseren. Je kunt nog wel je Google Taken importeren via
+        Instelllingen → Backup &amp; Sync, of downgraden naar enkel synchronisatie met Google Taken.
+    </string>
+    <string name="sync_upgr_both_btn1">Blijf bij Astrid</string>
+    <string name="sync_upgr_both_btn2">Downgrade naar Google Taken</string>
+
+    <string name="sync_upgr_gtasks_only_title">Upgrade gratis naar Astrid Sync!</string>
+    <string name="sync_upgr_gtasks_only_body">Toegang tot je taken op al je apparaten en op Gmail
+        met Astrid.com sync. Upgrade naar Astrid.com Sync (je kunt altijd terug naar Google Taken -
+        maar zul je niet willen)!
+    </string>
+    <string name="sync_upgr_gtasks_only_btn1">Upgrade naar Astrid Sync</string>
+    <string name="sync_upgr_gtasks_only_btn2">Blijf bij Google Taken</string>
+
+    <string name="sync_upgr_neither_title">Gratis backyp &amp; Sync!</string>
+    <string name="sync_upgr_neither_body">Loop geen risico met je to-do\'s! Nieuwe en verbeterde
+        Astrid sync om je taken te bewaren en er overal toegang tot te hebben.
+    </string>
+    <string name="sync_upgr_neither_btn1">Registreer nu</string>
+
+    <string name="sync_upgr_logged_out">Je bent uitgelogd uit Astrid</string>
+
+    <string name="actfm_logout_clear_tasks_title">Data wissen?</string>
+    <string name="actfm_logout_clear_tasks_body">Wil je jouw taken en lijsten wissen?</string>
+    <string name="actfm_logout_clear_tasks_yes">Data wissen</string>
+    <string name="actfm_logout_clear_tasks_no">Data behouden</string>
+
+    <string name="actfm_logged_in_different_user_title">Inloggen als een andere gebruiker</string>
+    <string name="actfm_logged_in_different_user_body">Wil je de bestaande telefoon taken
+        verwijderen voor synchronisatie?
+    </string>
+    <string name="actfm_logged_in_different_user_keep_data">Data behouden</string>
+    <string name="actfm_logged_in_different_user_clear_data">Alle gegevens wissen</string>
+    <string name="actfm_logged_in_different_user_processing">Verwerken van bestaande data</string>
+
+    <string name="actfm_tag_not_authorized_title">Niet geautoriseerd</string>
+    <string name="actfm_tag_not_authorized_body">Je bent niet langer geautoriseerd om lijst %s te
+        bekijken (wellicht ben je verwijderd). Wil je een nieuwe lijst aanmaken met dezelfde naam?
+    </string>
+    <string name="actfm_tag_not_authorized_new_list">Maak een nieuwe lijst</string>
+    <string name="actfm_tag_not_authorized_leave_list">Verlaat lijst</string>
+
+    <string name="actfm_sync_ongoing">Synchronisatie bezig...</string>
+
+    <string name="EPr_reset_sync_state">Reset sync</string>
+    <string name="EPr_reset_sync_state_summary">Reset sommige lokale data om synchronisatie te
+        proberen te herstellen
+    </string>
+    <string name="EPr_reset_sync_state_detailed">De volgende keer dat je synchroniseert, zullen je
+        taken en lijsten veranderen in overeenstemming met de data die aanwezig is Astrid.com, wat
+        synchronisatie fouten kan herstellen. Wil je doorgaan?
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in timers plug-in -->
+
+    <!-- Task Edit Activity: Container Label -->
+    <string name="alarm_ACS_label">Herinneringen</string>
+
+    <!-- Task Edit Activity: Add New Alarm -->
+    <string name="alarm_ACS_button">Voeg Herinnering toe</string>
+
+    <string-array name="reminders_alarm">
+        <!-- reminders related to alarm -->
+        <item>Voeg Alarm toe</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in backup plug-in -->
+
+    <!-- ================================================= BackupPreferences == -->
+
+    <!-- slide 33c/48d: Backup Preferences Title -->
+    <string name="backup_BPr_header">Back-ups</string>
+
+    <!-- slide 48e/50c: Backup: Status Header -->
+    <string name="backup_BPr_group_status">Status</string>
+
+    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->
+    <string name="backup_status_success">Laatste: back-up\n%s</string>
+    <!-- Backup Status: last error failed. Keep it short! -->
+    <string name="backup_status_failed">Laatste back-up mislukt</string>
+    <!-- Backup Status: error subtitle -->
+    <string name="backup_status_failed_subtitle">(tikken voor foutmelding)</string>
+    <!-- slide 48a: Backup Status: never backed up -->
+    <string name="backup_status_never">Nooit eerder back-up van gemaakt!</string>
+
+    <!-- slide 48f/ 50e: Backup Options Group Label -->
+    <string name="backup_BPr_group_options">Opties</string>
+
+    <!-- slide 48b: Preference: Automatic Backup Title -->
+    <string name="backup_BPr_auto_title">Automatische back-ups</string>
+    <!-- Preference: Automatic Backup Description (when disabled) -->
+    <string name="backup_BPr_auto_disabled">Automatische back-ups uitgeschakeld</string>
+    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
+    <string name="backup_BPr_auto_enabled">Back-up dagelijks uitvoeren</string>
+
+    <!-- Preference screen restoring Tasks Help -->
+    <!-- Preference screen Restoring Tasks Help Dialog Text-->
+
+    <string name="backup_BPr_cloud_already_logged_in">Je hebt al cloud backup op Astrid.com!
+    </string>
+
+    <!-- ================================================= BackupActivity == -->
+
+    <!-- slide 48c: backup activity label -->
+    <string name="backup_BAc_label">Back-ups beheren</string>
+
+    <!-- backup activity title -->
+    <string name="backup_BAc_title">Back-ups beheren</string>
+
+    <!-- backup activity import button -->
+    <string name="backup_BAc_import">Taken importeren</string>
+
+    <!-- backup activity export button -->
+    <string name="backup_BAc_export">Taken exporteren</string>
+
+    <!-- backup activity cloud (Astrid.com) option -->
+    <string name="backup_BAc_cloud">Klik voor gratis cloud backup op Astrid.com</string>
+
+    <!-- ============================================== Importer / Exporter == -->
+
+    <!-- Message displayed when error occurs -->
+    <string name="backup_TXI_error">Importfout</string>
+
+    <string name="export_toast">Back-up gemaakt van %1$s naar %2$s.</string>
+
+    <string name="export_toast_no_tasks">Geen taken om te exporteren</string>
+
+    <!-- Progress Dialog Title for exporting -->
+    <string name="export_progress_title">Exporteren...</string>
+
+    <!-- Backup: Title of Import Summary Dialog -->
+    <string name="import_summary_title">Samenvatting herstellen</string>
+
+    <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
+    <string name="import_summary_message">Bestand %1$s bevat %2$s.\n\n %3$s geïmporteerd,\n %4$s
+        bestaan al\n %5$s hadden fouten\n
+    </string>
+
+    <!-- Progress Dialog Title for importing -->
+    <string name="import_progress_title">Importeren…</string>
+
+    <!-- Progress Dialog text for import reading task (%d -> task number)-->
+    <string name="import_progress_read">Taak %d lezen...</string>
+
+    <!-- Backup: Dialog when unable to open a file -->
+
+    <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
+    <string name="DLG_error_sdcard">Toegang geweigerd tot map: %s</string>
+
+    <!-- Backup: Dialog when unable to open SD card in general -->
+    <string name="DLG_error_sdcard_general">Toegang tot SD-kaart geweigerd!</string>
+
+    <!-- Backup: File Selector dialog for import -->
+    <string name="import_file_prompt">Selecteer een back-up om te herstellen</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- ================================================== AndroidManifest == -->
+
+    <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
+    <string name="app_name">Astrid Taken</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="read_permission_label">Astrid toestemmingen</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="read_permission_desc">taken lezen, taakfilters weergeven</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="write_permission_label">Astrid toestemmingen</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="write_permission_desc">nieuwe taken maken, bestaande wijzigen</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- question for deleting tasks -->
+    <string name="DLG_delete_this_task_question">Taak verwijderen?</string>
+
+    <!-- question for deleting items (%s => item name) -->
+    <string name="DLG_delete_this_item_question">Dit item verwijderen: %s?</string>
+
+    <!-- Progress dialog shown when upgrading -->
+    <string name="DLG_upgrading">Taken bijwerken...</string>
+
+    <!-- Title for dialog selecting a time (hours and minutes) -->
+    <string name="DLG_hour_minutes">Tijd (uren : minuten)</string>
+
+    <!-- Dialog for Astrid having a critical update -->
+    <string name="DLG_please_update">Er is een nieuwe versie van Astrid beschikbaar in de Android
+        Market! Update Astrid voor u verder gaat, of wacht een paar seconden.
+    </string>
+
+    <!-- Button for going to Market -->
+
+    <!-- Button for accepting EULA -->
+    <string name="DLG_accept">Accoord</string>
+
+    <!-- Button for declining EULA -->
+    <string name="DLG_decline">Afwijzen</string>
+
+    <!-- EULA title -->
+    <string name="DLG_eula_title">Astrid Algemene Voorwaarden</string>
+
+    <!-- Progress Dialog generic text -->
+    <string name="DLG_please_wait">Even geduld a.u.b.</string>
+
+    <!-- Dialog - loading -->
+    <string name="DLG_loading">Laden…</string>
+
+    <!-- Dialog - dismiss -->
+
+    <!-- slide 20d -->
+    <string name="DLG_ok">OK</string>
+    <!-- slide 36g -->
+    <string name="DLG_cancel">Annuleren</string>
+
+    <string name="DLG_more">Meer</string>
+
+    <string name="DLG_undo">Ongedaan Maken</string>
+
+    <string name="DLG_warning">Waarschuwing</string>
+
+    <!-- =============================================================== UI == -->
+
+    <!-- Label for DateButtons with no value -->
+    <string name="WID_dateButtonUnset">Klikken om in te stellen</string>
+
+    <!-- String formatter for DateButtons ($D => date, $T => time) -->
+
+    <!-- String formatter for Disable button -->
+
+    <!--  ============================================================= notes -->
+
+    <!-- Note Exposer -->
+
+    <!-- Note Exposer / Comments -->
+
+    <!-- EditNoteActivity - no comments -->
+    <string name="ENA_no_comments">Niets om weer te geven</string>
+
+    <!-- EditNoteActivity - no username for comment -->
+    <string name="ENA_no_user">Iemand</string>
+
+    <!-- EditNoteActivity - refresh comments -->
+    <string name="ENA_refresh_comments">Opmerkingen vernieuwen</string>
+
+    <!-- ================================================= TaskListActivity == -->
+
+    <!-- slide 8b: Task List: Displayed instead of list when no items present -->
+    <string name="TLA_no_items">U hebt geen taken!</string>
+
+    <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
+    <string name="TLA_no_items_person">%s heeft geen\ntaken met je gedeeld</string>
+
+    <!-- Menu: Adjust Sort and Hidden Task Settings -->
+    <string name="TLA_menu_sort">Sorteren</string>
+
+    <!-- Menu: Sync Now -->
+    <string name="TLA_menu_sync">Nu Synchroniseren</string>
+
+    <!-- Menu: Search -->
+    <string name="TLA_menu_search">Zoek</string>
+
+    <!-- Menu: Tasks -->
+    <string name="TLA_menu_lists">Lijsten</string>
+
+    <!-- Menu: Friends -->
+    <string name="TLA_menu_friends">Personen</string>
+
+    <!-- Menu: Featured Lists -->
+    <string name="TLA_menu_featured_lists">Aanbevolen Lijsten</string>
+
+    <!-- Menu: Suggestions -->
+    <string name="TLA_menu_suggestions">Suggesties</string>
+
+    <!-- Menu: Tutorial -->
+
+    <!-- Menu: Settings -->
+    <string name="TLA_menu_settings">Voorkeuren</string>
+
+    <!-- slide 30b: Menu: Support -->
+    <string name="TLA_menu_support">Ondersteuning</string>
+
+    <!-- Search Label-->
+
+    <!-- Window title for displaying Custom Filter -->
+    <string name="TLA_custom">Aangepast</string>
+
+    <!-- slide 8d: Quick Add Edit Box Hint-->
+    <string name="TLA_quick_add_hint">Taak toevoegen</string>
+
+    <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
+    <string name="TLA_quick_add_hint_assign">Voeg iets toe voor %s</string>
+
+    <!-- Notification Volumne notification-->
+    <string name="TLA_notification_volume_low">Meldingsgeluid uitgeschakeld. U kunt Astrid niet
+        horen!
+    </string>
+
+    <!-- Notifications disabled warning -->
+    <string name="TLA_notification_disabled">Astrid herinneringen zijn uitgeschakeld! Je ontvangt
+        geen herinneringen.
+    </string>
+
+    <string-array name="TLA_filters">
+        <item>Actief</item>
+        <item>Vandaag</item>
+        <item>Binnenkort</item>
+        <item>Te Laat</item>
+        <item>Gedaan</item>
+        <item>Verborgen</item>
+    </string-array>
+
+    <!-- Title for confirmation dialog after quick add markup -->
+    <string name="TLA_quickadd_confirm_title">Jij zei, \"%s\"</string>
+
+    <!-- Text for speech bubble in dialog after quick add markup -->
+    <!-- First string is task title, second is due date, third is priority -->
+    <string name="TLA_quickadd_confirm_speech_bubble">Ik heb een taak gemaakt genaamd \"%1$s\" %2$s
+        op %3$s
+    </string>
+
+    <string name="TLA_quickadd_confirm_speech_bubble_date">voor %s</string>
+
+    <string name="TLA_quickadd_confirm_hide_helpers">In de toekomst geen bevestigingen weergeven
+    </string>
+
+
+    <!-- Title for alert on new repeating task. %s-> task title -->
+    <string name="TLA_repeat_scheduled_title">Nieuwe herhalende taak %s</string>
+
+    <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
+    <string name="TLA_repeat_scheduled_speech_bubble">Ik herinner je hier aan %s</string>
+
+    <string-array name="TLA_priority_strings">
+        <item>hoogste prioriteit</item>
+        <item>hoge prioriteit</item>
+        <item>gemiddelde prioriteit</item>
+        <item>lage prioriteit</item>
+    </string-array>
+    <!-- slide 22a -->
+    <string name="TLA_all_activity">Alle Activiteiten</string>
+
+    <!-- ====================================================== TaskAdapter == -->
+
+    <!-- Format string to indicate task is hidden (%s => task name) -->
+    <string name="TAd_hiddenFormat">%s [verborgen]</string>
+
+    <!-- Format string to indicate task is deleted (%s => task name) -->
+    <string name="TAd_deletedFormat">%s [verwijderd]</string>
+
+    <!-- Displayed when adapter is flung (scrolled quickly) -->
+
+    <!-- slide 22b: indicates task was completed. %s => date or time ago -->
+    <string name="TAd_completed">Afgerond\n%s</string>
+
+    <!-- slide 15a: Action Button: edit task -->
+    <string name="TAd_actionEditTask">Bewerken</string>
+
+    <!-- Context Item: edit task -->
+    <string name="TAd_contextEditTask">Taak bewerken</string>
+
+    <!-- Context Item: copy task -->
+    <string name="TAd_contextCopyTask">Taak kopiëren</string>
+
+    <!-- Context Item: delete task -->
+    <string name="TAd_contextDeleteTask">Taak wissen</string>
+
+    <!-- Context Item: undelete task -->
+    <string name="TAd_contextUndeleteTask">Taak herstellen</string>
+
+    <!-- Context Item: purge task -->
+    <string name="TAd_contextPurgeTask">Taak opruimen</string>
+
+    <!-- ============================================== SortSelectionDialog == -->
+
+    <!-- slide 23a: Sort Selection: dialog title -->
+    <string name="SSD_title">Sorteren en verborgen taken</string>
+
+    <!-- slide 23h:  Hidden: title -->
+    <string name="SSD_hidden_title">Verborgen Taken</string>
+
+    <!-- Hidden Task Selection: show completed tasks -->
+    <string name="SSD_completed">Voltooide taken weergeven</string>
+
+    <!-- Hidden Task Selection: show hidden tasks -->
+    <string name="SSD_hidden">Verborgen taken weergeven</string>
+
+    <!-- Hidden Task Selection: show deleted tasks -->
+    <string name="SSD_deleted">Verwijderde taken weergeven</string>
+
+    <!-- Sort Selection: drag with subtasks -->
+    <string name="SSD_sort_drag">Handmatige volgorde met subtaken</string>
+
+    <!-- slide 23b: Sort Selection: smart sort -->
+    <string name="SSD_sort_auto">Astrid Slim Sorteren</string>
+
+    <!-- slide 23e: Sort Selection: sort by alpha -->
+    <string name="SSD_sort_alpha">Op titel</string>
+
+    <!-- slide 23c: Sort Selection: sort by due date -->
+    <string name="SSD_sort_due">Op einddatum</string>
+
+    <!-- slide 23d: Sort Selection: sort by importance -->
+    <string name="SSD_sort_importance">Op prioriteit</string>
+
+    <!-- slide 23f: Sort Selection: sort by modified date -->
+    <string name="SSD_sort_modified">Op datum gewijzigd</string>
+
+    <!-- slide 23g: Sort Selection: reverse -->
+    <string name="SSD_sort_reverse">Omgekeerd sorteren</string>
+
+    <!-- slide 23j: Sort Button: sort temporarily -->
+    <string name="SSD_save_temp">Eenmalig</string>
+
+    <!-- slide 23i: Sort Button: sort permanently -->
+    <string name="SSD_save_always">Altijd</string>
+
+    <!-- =============================================== FilterListActivity == -->
+
+    <!-- Astrid Filter Shortcut -->
+    <string name="FSA_label">Astrid Lijst of Filter</string>
+
+    <!-- Filter List Activity Title -->
+
+    <!-- Displayed when loading filters -->
+
+    <!-- Context Menu: Create Shortcut -->
+    <string name="FLA_context_shortcut">Snelkoppeling op bureaublad maken</string>
+
+    <!-- Menu: Search -->
+
+    <!-- Menu: Help -->
+
+    <!-- slide 28c: Create Shortcut Dialog Title -->
+    <string name="FLA_shortcut_dialog_title">Snelkoppeling maken</string>
+
+    <!-- Create Shortcut Dialog (asks to name shortcut) -->
+    <string name="FLA_shortcut_dialog">Naam snelkoppeling:</string>
+
+    <!-- Search Hint-->
+    <string name="FLA_search_hint">Naar taken zoeken</string>
+
+    <!-- Search Filter name (%s => query) -->
+    <string name="FLA_search_filter">Bevat \'%s\'</string>
+
+    <!-- Toast: created shortcut (%s => label) -->
+    <string name="FLA_toast_onCreateShortcut">Gemaakte snelkoppeling: %s</string>
+
+    <!-- Menu: new filter -->
+    <string name="FLA_new_filter">Nieuw Filter</string>
+
+    <!-- slide 10e: Button: new list -->
+    <string name="FLA_new_list">Nieuwe lijst</string>
+
+    <!-- Alert when creating a shortcut without selecting a filter -->
+    <string name="FLA_no_filter_selected">Geen filter geselecteerd! Selecteer een filter of lijst.
+    </string>
+
+    <!-- ================================================= TaskEditActivity == -->
+
+    <!-- Title when editing a task (%s => task title) -->
+
+    <!-- Title when creating a new task -->
+
+    <!-- Task title label -->
+
+    <!-- Task when label -->
+    <string name="TEA_when_header_label">Wanneer</string>
+
+    <!-- Task title hint (displayed when edit box is empty) -->
+    <string name="TEA_title_hint">Taak naam</string>
+
+    <!-- Task importance label -->
+    <string name="TEA_importance_label">Prioriteit</string>
+
+    <!-- Task due date hint -->
+    <string name="TEA_deadline_hint">Stel de einddatum in</string>
+
+    <!-- Task assigned to string (%s -> assigned person name) -->
+    <string name="TEA_assigned_to">Toegewezen aan %s</string>
+
+    <!-- Task urgency specific time checkbox -->
+    <string name="TEA_urgency_specific_time">Specifieke tijd?</string>
+
+    <!-- Task urgency specific time title when specific time false -->
+    <string name="TEA_urgency_none">Geen</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_label">Verbergen tot</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_display">Verberg tot %s</string>
+
+    <!-- Task hide until toast -->
+    <string name="TEA_hideUntil_message">Taak is verborgen tot %s</string>
+
+    <!-- Task editing data being loaded label -->
+    <string-array name="TEA_loading">
+        <item>Laden…</item>
+    </string-array>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_note_label">Omschrijving</string>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_notes_empty">Omschrijving</string>
+
+    <!-- Task note hint -->
+    <string name="TEA_notes_hint">Voer taakomschrijving in</string>
+
+    <!-- Estimated time label -->
+    <string name="TEA_estimatedDuration_label">Tijdsduur</string>
+
+    <!-- Elapsed time label -->
+    <string name="TEA_elapsedDuration_label">Bestede tijd tot nu toe</string>
+
+    <!-- Menu: Save -->
+    <string name="TEA_menu_save">Wijzigingen opslaan</string>
+
+    <!-- Menu: Don\'t Save -->
+    <string name="TEA_menu_discard">Niet opslaan</string>
+
+    <!-- Menu: Delete Task -->
+    <string name="TEA_menu_delete">Taak verwijderen</string>
+
+    <!-- Menu: Task comments -->
+    <string name="TEA_menu_refresh_comments">Opmerkingen vernieuwen</string>
+
+    <string name="TEA_menu_comments">Opmerkingen</string>
+
+    <!-- Toast: task saved with deadline (%s => preposition + time units) -->
+    <string name="TEA_onTaskSave_due">Taak opgeslagen: eind %s</string>
+
+    <!-- Toast: task saved without deadlines -->
+    <string name="TEA_onTaskSave_notDue">Taak opgeslagen</string>
+
+    <!-- Toast: task was not saved -->
+
+    <!-- Toast: task was deleted -->
+
+    <!-- slide 15b: Task edit tab: activity -->
+    <string name="TEA_tab_activity">Activiteit</string>
+
+    <!-- slide 15e:  Task edit tab: more editing settings -->
+    <string name="TEA_tab_more">Meer</string>
+
+    <!-- slide 15d: Task edit tab: web services -->
+    <string name="TEA_tab_web">Ideeën</string>
+
+    <string name="TEA_timer_est">Gesch. %s</string>
+
+    <string name="TEA_timer_elap">Verstreken %s</string>
+
+    <string-array name="TEA_urgency">
+        <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
+        <item>Geen datum</item>
+        <item>Specifieke dag</item>
+        <item>Vandaag</item>
+        <item>Morgen</item>
+        <item>(volgende dag)</item>
+        <item>Volgende week</item>
+        <item>Binnen 2 weken</item>
+        <item>Volgende maand</item>
+    </string-array>
+
+    <string name="TEA_no_time">Geen tijd</string>
+
+    <string-array name="TEA_hideUntil">
+        <!-- hideUntil: labels for edit page. -->
+        <item>Nooit</item>
+        <item>Einddatum</item>
+        <item>Eindtijd</item>
+        <item>Dag voor einddatum</item>
+        <item>Week voor einddatum</item>
+        <item>Specifieke dag/tijd</item>
+    </string-array>
+
+    <!-- Task edit control set descriptors -->
+
+    <!-- slide 9b/35i -->
+    <string name="TEA_control_who">Wie</string>
+
+    <!-- slide 9c/ 35a -->
+    <string name="TEA_control_when">Wanneer</string>
+    <!-- slide 35b -->
+    <string name="TEA_control_more_section">----More Section----</string>
+    <!-- slide 16a/35c -->
+    <string name="TEA_control_importance">Prioriteit</string>
+    <!-- slide 16b/35d -->
+    <string name="TEA_control_lists">Lijsten</string>
+    <!-- slide 16c/35e -->
+    <string name="TEA_control_notes">Omschrijving</string>
+
+    <string name="TEA_control_files">Bestanden</string>
+
+    <!-- slide 16e / slide 35g-->
+    <string name="TEA_control_reminders">Herinneringen</string>
+
+    <!-- slide 16f -->
+    <string name="TEA_control_timer">Tijd Controlers</string>
+
+    <string name="TEA_control_hidden_section">----Altijd Verbergen----</string>
+
+    <string name="hide_until_prompt">Laat zien in mijn lijst</string>
+
+    <!-- Add Ons tab when no add-ons found -->
+
+    <!-- Add Ons button -->
+
+    <!-- More row -->
+
+    <!-- slide 15c: Text when no activity to show -->
+    <string name="TEA_no_activity">Geen taken</string>
+
+    <!-- Text to load more activity -->
+    <string name="TEA_load_more">Laad meer...</string>
+
+    <!-- When controls dialog -->
+    <string name="TEA_when_dialog_title">Wanneer moet dit gedaan zijn?</string>
+
+
+    <string name="TEA_new_task">Nieuwe Taak</string>
+
+    <string name="WSV_click_to_load">Klik hier om een manier te zoeken om dit af te krijgen!
+    </string>
+
+    <string name="WSV_not_online">Ik kan meer als ik verbonden ben met internet. Controleer je
+        internetverbinding.
+    </string>
+
+    <string name="TEA_contact_error">Sorry! We konden geen e-mailadres vinden voor de geselecteerde
+        contactpersoon.
+    </string>
+
+    <!-- ============================================= IntroductionActivity == -->
+
+    <!-- slide 1a: Introduction Window title -->
+
+    <!-- Button to agree to EULA -->
+
+    <!-- Button to disagree with EULA -->
+
+    <!-- ===================================================== MissedCallActivity == -->
+
+    <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
+    <string name="MCA_title">%1$s\nheeft gebeld (%2$s)</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_return_call">Bel nu</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_add_task">Bel later</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_ignore">Negeren</string>
+
+    <!-- Missed call: dialog to ignore all missed calls title -->
+    <string name="MCA_ignore_title">Negeer alle gemiste oproepen?</string>
+
+    <!-- Missed call: dialog to ignore all missed calls body -->
+    <string name="MCA_ignore_body">Je hebt alle gemiste oproepen genegeerd. Moet Astrid je er niet
+        meer naar vragen?
+    </string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore all button -->
+    <string name="MCA_ignore_all">Negeer alle oproepen</string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
+    <string name="MCA_ignore_this">Negeer alleen deze oproep</string>
+
+    <!-- Missed call: preference title -->
+    <string name="MCA_missed_calls_pref_title">Veld gemiste oproepen</string>
+
+    <!-- slide 49c: Missed call: preference description -->
+    <string name="MCA_missed_calls_pref_desc_enabled">Astrid zal gemiste oproepen laten zien en een
+        herinnering weergeven om terug te bellen
+    </string>
+    <string name="MCA_missed_calls_pref_desc_disabled">Astrid zal gemiste oproepen laten zien
+    </string>
+
+    <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
+    <string name="MCA_task_title_name">Bel %1$s terug op %2$s</string>
+
+    <!-- Missed call: task title no name (%s -> number)-->
+    <string name="MCA_task_title_no_name">Bel %s terug</string>
+
+    <!-- Missed call: schedule dialog title (%s -> name or number)-->
+    <string name="MCA_schedule_dialog_title">Bel %s terug over...</string>
+
+    <!-- Missed call speech bubble options -->
+    <string-array name="MCA_dialog_speech_options">
+        <item>Het zal wel leuk zijn om zo populair te zijn!</item>
+        <item>Joehoe! Mensen houden van je!</item>
+        <item>Maak ze blij, bel ze op!</item>
+        <item>Zou jij niet blij zijn als mensen je terug zouden bellen?</item>
+        <item>Je kan het!</item>
+        <item>Je kan altijd een smsje sturen..</item>
+    </string-array>
+
+
+    <!-- ======================================= Calendar reminder activity == -->
+
+    <!-- Calendar remindeer ignore button -->
+    <string name="CRA_ignore">Negeren</string>
+
+    <!-- Calendar event -->
+    <string name="CRA_title">Heb je een bijeenkomst lijst nodig?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls title -->
+    <string name="CRA_ignore_title">Alle agenda gebeurtenissen negeren?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls body -->
+    <string name="CRA_ignore_body">Je hebt meerdere agenda gebeurtenissen genegeerd. Moet Astrid je
+        er niet meer naar vragen?
+    </string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
+    <string name="CRA_ignore_all">Negeer alle gebeurtenissen.</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
+    <string name="CRA_ignore_this">Negeer alleen deze gebeurtenis.</string>
+
+    <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
+    <string name="CRA_speech_bubble_start">%s begint bijna. Wil je een actiepuntenlijst maken?
+    </string>
+
+    <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
+    <string name="CRA_speech_bubble_end">Ziet eruit alsof je zojuist %s hebt voltooid. Wil je een
+        actiepuntenlijst maken?
+    </string>
+
+    <!-- Calendar reminder: create list button -->
+    <string name="CRA_create_list">Maak een lijst</string>
+
+    <!-- Calendar reminder: postpone button -->
+    <string name="CRA_postpone">Misschien naderhand</string>
+
+    <!-- Calendar reminder: list exists dialog title -->
+    <string name="CRA_list_exists_title">Lijst bestaat al.</string>
+
+    <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
+    <string name="CRA_list_exists_body">Een lijst met de naam %s bestaat al. Wil je de bestaande
+        lijst gebruiken of een nieuwe maken voor deze gebeurtenis?
+    </string>
+
+    <!-- Calendar reminder: list exists dialog create new button -->
+    <string name="CRA_create_new">Maak een nieuwe.</string>
+
+    <!-- Calendar reminder: list exists dialog use existing button -->
+    <string name="CRA_use_existing">Gebruik bestaande</string>
+
+    <!-- Calendar remindr: created list (%s -> list name) -->
+    <string name="CRA_created_list_dialog">Ik heb een %s lijst gemaakt.</string>
+
+    <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
+    <string name="CRA_one_attendee">%s neemt deel</string>
+
+    <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
+    <string name="CRA_two_attendees">%1$s en %2$s nemen deel</string>
+
+    <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
+    <string name="CRA_many_attendees">%1$s, %2$s en %3$d anderen nemen deel</string>
+
+    <!-- Calendar reminder: invitation prompt -->
+    <string name="CRA_invitation_prompt">Wil je hen uitnodigen?</string>
+
+    <!-- Calendar reminder: preference title -->
+    <string name="CRA_calendar_reminders_pref_title">Agenda assistent</string>
+
+    <!-- Calendar reminder: pref description disabled -->
+    <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid herinnert je niet aan aankomende
+        agenda gebeurtenissen
+    </string>
+
+    <!-- Calendar reminder: pref description enabled -->
+    <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid herinnert je aan aankomende
+        agenda gebeurtenissen en fluistert je in je voor te bereiden
+    </string>
+
+    <!-- Calendar reminder: share list title -->
+    <string name="CRA_share_list_title">De lijst delen?</string>
+
+    <string name="CRA_invite_attendees">Nodig aanwezigen uit</string>
+
+    <string name="CRA_more_options">Meer opties</string>
+
+    <string name="CRA_dont_invite">Nee, bedankt</string>
+
+    <!-- Calendar reminder: share list title when no other attendees exist-->
+    <string name="CRA_list_created_title">Lijst gemaakt!</string>
+
+    <!-- Calendar reminder: default new list name (%s -> event title) -->
+    <string name="CRA_default_list_name">Actie-items: %s</string>
+
+    <!-- ===================================================== HelpActivity == -->
+
+    <!-- Help: Button to get support from our website -->
+
+    <!-- ==================================================== UpdateService == -->
+
+    <!-- Changelog Window Title -->
+    <string name="UpS_changelog_title">Nieuw in Astrid</string>
+
+    <!-- Updates Window Title -->
+    <string name="UpS_updates_title">Laatste Astrid nieuws</string>
+
+    <!-- Updats No Activity to show for offline users -->
+    <string name="UpS_no_activity_log_in">Log in om een geschiedenis\nvan je vooruitgang en
+        activiteiten\nop gedeelde lijsten te bekijken.
+    </string>
+
+    <!-- ================================================== EditPreferences == -->
+
+    <!-- slide 31g: Preference Window Title -->
+    <string name="EPr_title">Astrid: Instellingen</string>
+
+    <string name="EPr_share_astrid">Deel Astrid</string>
+
+    <string name="EPr_share_astrid_summary">Deel over Astrid op je favoriete sociale netwerk
+    </string>
+
+    <!-- slide 46a -->
+    <string name="EPr_deactivated">uitgeschakeld</string>
+
+    <!-- slide 30i: Preference Category: Appearance Title -->
+    <string name="EPr_appearance_header">Uiterlijk</string>
+
+    <!-- Preference Category: Appearance Summary -->
+    <string name="EPr_appearance_summary">Thema\'s, widgets, taken, scherm aanpassen</string>
+
+    <!-- FAQ Preference title -->
+    <string name="EPr_faq_title">FAQ (Veelgestelde Vragen)</string>
+
+    <!-- Account status preference (%s -> account type) -->
+    <string name="EPr_account_title">Gebruikersnaam: %s</string>
+
+    <!-- Support preferences summary -->
+    <string name="EPr_support_summary">Handleiding, veelgestelde vragen, over</string>
+
+    <!-- slide 34a: Preference: Task List Font Size Title -->
+    <string name="EPr_fontSize_title">Taaklijst lettertypegrootte</string>
+
+    <!-- Preference: Filters to show pref screen title -->
+    <string name="EPr_filters_to_show_title">Te tonen filters</string>
+
+    <!-- slide 32a: Preference: Show confirmation for smart reminders -->
+    <string name="EPr_showSmartConfirmation_title">Laat bevestiging zien voor slimme herinneringen
+    </string>
+
+    <!-- slide 34g: Preference: Task List Font Size Description -->
+    <string name="EPr_fontSize_desc">Lettertypegrootte takenlijst</string>
+
+    <!-- Preferemce: Show task edit confirmation toasts -->
+
+    <!-- slide 34c: Preference: Task List Show Notes -->
+    <string name="EPr_showNotes_title">Toon omschrijving in taak</string>
+
+    <!-- Edit screen preference category -->
+    <string name="EPr_edit_screen_options">Scherm opties bewerken</string>
+
+    <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
+    <string name="EPr_beastMode_title">Scherm volgorde bewerken</string>
+
+    <string name="EPr_beastMode_shortcut">Aanpassen</string>
+
+    <string name="EPr_time_increment">stappen van 5 minuten</string>
+
+    <string name="EPr_use_date_shortcuts">Gebruik datum snelkoppelingen</string>
+
+    <string name="EPr_show_timer_shortcut">Toon timer snelkoppeling</string>
 
-    
-    <!-- Resources for built-in timers plug-in -->
-    
-    <!-- Task Edit Activity: Container Label -->
-    <string name="alarm_ACS_label">Herinneringen</string>
-    
-    <!-- Task Edit Activity: Add New Alarm -->
-    <string name="alarm_ACS_button">Voeg Herinnering toe</string>
-    
-    <string-array name="reminders_alarm">
-      <!-- reminders related to alarm -->
-      <item>Voeg Alarm toe</item>
+    <!-- slide 35h -->
+    <string name="EPr_beastMode_desc">Pas de layout van het Taak Wijzigingsscherm aan</string>
+    <!-- slide 35j -->
+    <string name="EPr_beastMode_reset">Standaardinstellingen herstellen</string>
+
+    <string name="EPr_beastMode_hint">Pas uw taak bewerken scherm aan door de linker handle van elke
+        rij te verslepen
+    </string>
+
+    <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
+    <string name="EPr_showNotes_desc_disabled">Omschrijving zal toegankelijk zijn vanaf het bewerk
+        taak scherm
+    </string>
+    <!-- Preference: Task List Show Notes Description (enabled) -->
+    <string name="EPr_showNotes_desc_enabled">Omschrijving zal altijd worden getoond</string>
+
+    <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
+    <string name="EPr_compressTaskRows_title">Compacte Taakrij</string>
+    <!-- slide 34j -->
+    <string name="EPr_compressTaskRows_desc">Comprimeer taak rijen zodat de titel past</string>
+
+    <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
+    <!-- slide 34k-->
+
+    <!-- slide 34b: Preferences: Wrap task titles to two lines -->
+    <string name="EPr_fullTask_title">Laat volledige taak titel zien</string>
+    <string name="EPr_fullTask_desc_enabled">Volledige taak titel zal worden weergegeven</string>
+    <!-- slide 34h -->
+    <string name="EPr_fullTask_desc_disabled">Eerste twee lijnen van taak titel zullen worden
+        weergegeven
+    </string>
+
+    <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
+    <string name="EPr_ideaAuto_title">Ideeëntabblad Automatisch Laden</string>
+    <!-- slide 32c -->
+    <string name="EPr_ideaAuto_desc_enabled">Zoekopdrachten voor ideeën tablad zullen worden
+        weergeven wanneer er op de tab is geklikt
+    </string>
+    <string name="EPr_ideaAuto_desc_disabled">Web zoekopdrachten voor Ideeëntabblad worden alleen
+        uitgevoerd als daar handmatig om gevraagd wordt
+    </string>
+
+    <!-- Preferences: task row style -->
+    <string-array name="EPr_task_row_styles">
+        <item>Origineel</item>
+        <item>Simpel</item>
+        <item>Enkel titel</item>
     </string-array>
-    
 
+    <string-array name="EPr_task_row_style_descriptions">
+        <item>Titel afkappen naar twee regels met datum aan rechterkant</item>
+        <item>Titel afkappen tot één regel met datum en onderstaande lijsten</item>
+        <item>Enkele regel enkel titel</item>
+    </string-array>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- task row style title (%s -> style) -->
+    <string name="EPr_task_row_style_title">Regel stijl %s</string>
 
-    
-  <!-- Resources for built-in backup plug-in -->
-  
-  <!-- ================================================= BackupPreferences == -->
+    <!-- Preference: custom filters enabled -->
+    <string name="EPr_use_filters_title">Gebruik filters</string>
+    <string name="EPr_use_filters_subtitle">Laat je eigen filters definieren</string>
 
-    <!-- slide 33c/48d: Backup Preferences Title -->    
-    <string name="backup_BPr_header">Back-ups</string>
+    <!-- Preference: show list members in shared list -->
+    <string name="EPr_show_list_members_title">Toon ledenlijst in gedeelde lijsten</string>
 
-    <!-- slide 48e/50c: Backup: Status Header -->    
-    <string name="backup_BPr_group_status">Status</string>
-    
-    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Laatste: back-up\n%s</string>
-    <!-- Backup Status: last error failed. Keep it short! -->    
-    <string name="backup_status_failed">Laatste back-up mislukt</string>
-    <!-- Backup Status: error subtitle -->    
-    <string name="backup_status_failed_subtitle">(tikken voor foutmelding)</string>
-    <!-- slide 48a: Backup Status: never backed up -->    
-    <string name="backup_status_never">Nooit eerder back-up van gemaakt!</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_simple_input_boxes">Eenvoudige tekst vakken</string>
 
-    <!-- slide 48f/ 50e: Backup Options Group Label -->    
-    <string name="backup_BPr_group_options">Opties</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_show_quickadd_controls">Geavanceerde snel toevoegen controls</string>
 
-    <!-- slide 48b: Preference: Automatic Backup Title -->    
-    <string name="backup_BPr_auto_title">Automatische back-ups</string>
-    <!-- Preference: Automatic Backup Description (when disabled) -->
-    <string name="backup_BPr_auto_disabled">Automatische back-ups uitgeschakeld</string>    
-    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
-    <string name="backup_BPr_auto_enabled">Back-up dagelijks uitvoeren</string>
-    
-    <!-- Preference screen restoring Tasks Help -->
-    <!-- Preference screen Restoring Tasks Help Dialog Text-->
-    
-    <string name="backup_BPr_cloud_already_logged_in">Je hebt al cloud backup op Astrid.com!</string>
-  
-  <!-- ================================================= BackupActivity == -->
-
-  <!-- slide 48c: backup activity label -->
-  <string name="backup_BAc_label">Back-ups beheren</string>
-
-  <!-- backup activity title -->
-  <string name="backup_BAc_title">Back-ups beheren</string>
-
-  <!-- backup activity import button -->
-  <string name="backup_BAc_import">Taken importeren</string>
-
-  <!-- backup activity export button -->
-  <string name="backup_BAc_export">Taken exporteren</string>
-  
-  <!-- backup activity cloud (Astrid.com) option -->
-  <string name="backup_BAc_cloud">Klik voor gratis cloud backup op Astrid.com</string>
-    
-  <!-- ============================================== Importer / Exporter == -->
-  
-  <!-- Message displayed when error occurs -->
-  <string name="backup_TXI_error">Importfout</string>
-    
-  <string name="export_toast">Back-up gemaakt van %1$s naar %2$s.</string>
-    
-  <string name="export_toast_no_tasks">Geen taken om te exporteren</string>
-  
-  <!-- Progress Dialog Title for exporting -->    
-  <string name="export_progress_title">Exporteren...</string>
-  
-  <!-- Backup: Title of Import Summary Dialog -->
-  <string name="import_summary_title">Samenvatting herstellen</string>
-    
-  <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">Bestand %1$s bevat %2$s.\n\n %3$s geïmporteerd,\n %4$s bestaan al\n %5$s hadden fouten\n</string>
-  
-  <!-- Progress Dialog Title for importing -->    
-  <string name="import_progress_title">Importeren…</string>
-  
-  <!-- Progress Dialog text for import reading task (%d -> task number)-->    
-  <string name="import_progress_read">Taak %d lezen...</string>
-  
-  <!-- Backup: Dialog when unable to open a file -->  
-  
-  <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
-  <string name="DLG_error_sdcard">Toegang geweigerd tot map: %s</string>
-  
-  <!-- Backup: Dialog when unable to open SD card in general -->
-  <string name="DLG_error_sdcard_general">Toegang tot SD-kaart geweigerd!</string>
-    
-  <!-- Backup: File Selector dialog for import -->
-  <string name="import_file_prompt">Selecteer een back-up om te herstellen</string>    
-        
+    <!-- Preference: don\'t show plus button until input present -->
+    <string name="EPr_hide_plus_button">Verberg plus knop</string>
 
+    <!-- Preference: menu items -->
+    <string name="EPr_menu_items">Menu items</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Preference: list view -->
+    <string name="EPr_list_view">Lijst weergave</string>
 
+    <!-- Preference: task edit comments -->
+    <string name="EPr_show_task_edit_comments">Toon opmerkingen in taak bewerken</string>
 
-  <!-- ================================================== AndroidManifest == -->
-
-  <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
-  <string name="app_name">Astrid Taken</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="read_permission_label">Astrid toestemmingen</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="read_permission_desc">taken lezen, taakfilters weergeven</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="write_permission_label">Astrid toestemmingen</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="write_permission_desc">nieuwe taken maken, bestaande wijzigen</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-    
-  <!-- question for deleting tasks -->
-  <string name="DLG_delete_this_task_question">Taak verwijderen?</string>
-
-  <!-- question for deleting items (%s => item name) -->
-  <string name="DLG_delete_this_item_question">Dit item verwijderen: %s?</string>
-    
-  <!-- Progress dialog shown when upgrading -->
-  <string name="DLG_upgrading">Taken bijwerken...</string>
-  
-  <!-- Title for dialog selecting a time (hours and minutes) -->
-  <string name="DLG_hour_minutes">Tijd (uren : minuten)</string>
-  
-  <!-- Dialog for Astrid having a critical update -->
-  <string name="DLG_please_update">Er is een nieuwe versie van Astrid beschikbaar in de Android Market! Update Astrid voor u verder gaat, of wacht een paar seconden.</string>
-
-  <!-- Button for going to Market -->
-
-  <!-- Button for accepting EULA -->
-  <string name="DLG_accept">Accoord</string>
-
-  <!-- Button for declining EULA -->
-  <string name="DLG_decline">Afwijzen</string>
-
-  <!-- EULA title -->
-  <string name="DLG_eula_title">Astrid Algemene Voorwaarden</string>
-
-  <!-- Progress Dialog generic text -->
-  <string name="DLG_please_wait">Even geduld a.u.b.</string>
-  
-  <!-- Dialog - loading -->
-  <string name="DLG_loading">Laden…</string>
-  
-  <!-- Dialog - dismiss -->
-
-  <!-- slide 20d -->
-  <string name="DLG_ok">OK</string>
-  <!-- slide 36g -->
-  <string name="DLG_cancel">Annuleren</string>
-  
-  <string name="DLG_more">Meer</string>
-  
-  <string name="DLG_undo">Ongedaan Maken</string>
-  
-  <string name="DLG_warning">Waarschuwing</string>
-  
-  <!-- =============================================================== UI == -->
-  
-  <!-- Label for DateButtons with no value -->
-  <string name="WID_dateButtonUnset">Klikken om in te stellen</string>
-  
-  <!-- String formatter for DateButtons ($D => date, $T => time) -->
-  
-  <!-- String formatter for Disable button -->
-  
-  <!--  ============================================================= notes -->
-  
-  <!-- Note Exposer -->    
-  
-  <!-- Note Exposer / Comments -->    
-  
-  <!-- EditNoteActivity - no comments -->
-  <string name="ENA_no_comments">Niets om weer te geven</string>
-    
-  <!-- EditNoteActivity - no username for comment -->
-  <string name="ENA_no_user">Iemand</string>
-  
-  <!-- EditNoteActivity - refresh comments -->
-  <string name="ENA_refresh_comments">Opmerkingen vernieuwen</string>
-  
-  <!-- ================================================= TaskListActivity == -->
-  
-  <!-- slide 8b: Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">U hebt geen taken!</string>
-  
-  <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->    
-  <string name="TLA_no_items_person">%s heeft geen\ntaken met je gedeeld</string>
-  
-  <!-- Menu: Adjust Sort and Hidden Task Settings -->    
-  <string name="TLA_menu_sort">Sorteren</string>
-  
-  <!-- Menu: Sync Now -->    
-  <string name="TLA_menu_sync">Nu Synchroniseren</string>
-  
-  <!-- Menu: Search -->
-  <string name="TLA_menu_search">Zoek</string>
-  
-  <!-- Menu: Tasks -->
-  <string name="TLA_menu_lists">Lijsten</string>
-
-  <!-- Menu: Friends -->
-  <string name="TLA_menu_friends">Personen</string>
-
-  <!-- Menu: Featured Lists -->
-  <string name="TLA_menu_featured_lists">Aanbevolen Lijsten</string>
-
-  <!-- Menu: Suggestions -->
-  <string name="TLA_menu_suggestions">Suggesties</string>
-  
-  <!-- Menu: Tutorial -->
-
-  <!-- Menu: Settings -->    
-  <string name="TLA_menu_settings">Voorkeuren</string>
-  
-  <!-- slide 30b: Menu: Support -->
-  <string name="TLA_menu_support">Ondersteuning</string>
-  
-  <!-- Search Label-->
-  
-  <!-- Window title for displaying Custom Filter -->
-  <string name="TLA_custom">Aangepast</string>
-  
-  <!-- slide 8d: Quick Add Edit Box Hint-->
-  <string name="TLA_quick_add_hint">Taak toevoegen</string>
-  
-  <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
-  <string name="TLA_quick_add_hint_assign">Voeg iets toe voor %s</string>
-  
-  <!-- Notification Volumne notification-->
-  <string name="TLA_notification_volume_low">Meldingsgeluid uitgeschakeld. U kunt Astrid niet horen!</string>
-  
-  <!-- Notifications disabled warning -->
-  <string name="TLA_notification_disabled">Astrid herinneringen zijn uitgeschakeld! Je ontvangt geen herinneringen.</string>
-  
-  <string-array name="TLA_filters">
-      <item>Actief</item>
-      <item>Vandaag</item>
-      <item>Binnenkort</item>
-      <item>Te Laat</item>
-      <item>Gedaan</item>
-      <item>Verborgen</item>      
-  </string-array>
-  
-  <!-- Title for confirmation dialog after quick add markup -->
-  <string name="TLA_quickadd_confirm_title">Jij zei, \"%s\"</string>
-  
-  <!-- Text for speech bubble in dialog after quick add markup -->
-  <!-- First string is task title, second is due date, third is priority -->
-  <string name="TLA_quickadd_confirm_speech_bubble">Ik heb een taak gemaakt genaamd \"%1$s\" %2$s op %3$s</string>
-  
-  <string name="TLA_quickadd_confirm_speech_bubble_date">voor %s</string>
-  
-  <string name="TLA_quickadd_confirm_hide_helpers">In de toekomst geen bevestigingen weergeven</string>
-  
-  
-  <!-- Title for alert on new repeating task. %s-> task title -->
-  <string name="TLA_repeat_scheduled_title">Nieuwe herhalende taak %s</string>
-  
-  <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
-  <string name="TLA_repeat_scheduled_speech_bubble">Ik herinner je hier aan %s</string>
-  
-  <string-array name="TLA_priority_strings">
-      <item>hoogste prioriteit</item>
-      <item>hoge prioriteit</item>
-      <item>gemiddelde prioriteit</item>
-      <item>lage prioriteit</item>
-  </string-array>
-  <!-- slide 22a -->
-  <string name="TLA_all_activity">Alle Activiteiten</string>
-  
-  <!-- ====================================================== TaskAdapter == -->
-  
-  <!-- Format string to indicate task is hidden (%s => task name) -->
-  <string name="TAd_hiddenFormat">%s [verborgen]</string>
-  
-  <!-- Format string to indicate task is deleted (%s => task name) -->
-  <string name="TAd_deletedFormat">%s [verwijderd]</string>
-  
-  <!-- Displayed when adapter is flung (scrolled quickly) -->
-  
-  <!-- slide 22b: indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Afgerond\n%s</string>
-  
-  <!-- slide 15a: Action Button: edit task -->
-  <string name="TAd_actionEditTask">Bewerken</string>
-  
-  <!-- Context Item: edit task -->
-  <string name="TAd_contextEditTask">Taak bewerken</string>
-
-  <!-- Context Item: copy task -->
-  <string name="TAd_contextCopyTask">Taak kopiëren</string>
-
-  <!-- Context Item: delete task -->
-  <string name="TAd_contextDeleteTask">Taak wissen</string>
-
-  <!-- Context Item: undelete task -->
-  <string name="TAd_contextUndeleteTask">Taak herstellen</string>
-
-  <!-- Context Item: purge task -->
-  <string name="TAd_contextPurgeTask">Taak opruimen</string>
-  
-  <!-- ============================================== SortSelectionDialog == -->
-  
-  <!-- slide 23a: Sort Selection: dialog title -->    
-  <string name="SSD_title">Sorteren en verborgen taken</string>
-  
-  <!-- slide 23h:  Hidden: title -->
-  <string name="SSD_hidden_title">Verborgen Taken</string>
-  
-  <!-- Hidden Task Selection: show completed tasks -->    
-  <string name="SSD_completed">Voltooide taken weergeven</string>
-  
-  <!-- Hidden Task Selection: show hidden tasks -->    
-  <string name="SSD_hidden">Verborgen taken weergeven</string>
-  
-  <!-- Hidden Task Selection: show deleted tasks -->    
-  <string name="SSD_deleted">Verwijderde taken weergeven</string>
-  
-  <!-- Sort Selection: drag with subtasks -->
-  <string name="SSD_sort_drag">Handmatige volgorde met subtaken</string>
-  
-  <!-- slide 23b: Sort Selection: smart sort -->
-  <string name="SSD_sort_auto">Astrid Slim Sorteren</string>
-  
-  <!-- slide 23e: Sort Selection: sort by alpha -->
-  <string name="SSD_sort_alpha">Op titel</string>
-  
-  <!-- slide 23c: Sort Selection: sort by due date -->
-  <string name="SSD_sort_due">Op einddatum</string>
-  
-  <!-- slide 23d: Sort Selection: sort by importance -->
-  <string name="SSD_sort_importance">Op prioriteit</string>
-  
-  <!-- slide 23f: Sort Selection: sort by modified date -->
-  <string name="SSD_sort_modified">Op datum gewijzigd</string>
-  
-  <!-- slide 23g: Sort Selection: reverse -->
-  <string name="SSD_sort_reverse">Omgekeerd sorteren</string>
-  
-  <!-- slide 23j: Sort Button: sort temporarily -->
-  <string name="SSD_save_temp">Eenmalig</string>
-  
-  <!-- slide 23i: Sort Button: sort permanently -->
-  <string name="SSD_save_always">Altijd</string>
-  
-  <!-- =============================================== FilterListActivity == -->
-  
-  <!-- Astrid Filter Shortcut -->    
-  <string name="FSA_label">Astrid Lijst of Filter</string>
-
-  <!-- Filter List Activity Title -->    
-  
-  <!-- Displayed when loading filters -->    
-  
-  <!-- Context Menu: Create Shortcut -->    
-  <string name="FLA_context_shortcut">Snelkoppeling op bureaublad maken</string>
-  
-  <!-- Menu: Search -->
-  
-  <!-- Menu: Help -->    
-  
-  <!-- slide 28c: Create Shortcut Dialog Title -->    
-  <string name="FLA_shortcut_dialog_title">Snelkoppeling maken</string>
-  
-  <!-- Create Shortcut Dialog (asks to name shortcut) -->    
-  <string name="FLA_shortcut_dialog">Naam snelkoppeling:</string>
-  
-  <!-- Search Hint-->
-  <string name="FLA_search_hint">Naar taken zoeken</string>
-  
-  <!-- Search Filter name (%s => query) -->
-  <string name="FLA_search_filter">Bevat \'%s\'</string>
-  
-  <!-- Toast: created shortcut (%s => label) -->
-  <string name="FLA_toast_onCreateShortcut">Gemaakte snelkoppeling: %s</string>
-  
-  <!-- Menu: new filter -->
-  <string name="FLA_new_filter">Nieuw Filter</string>
-  
-  <!-- slide 10e: Button: new list -->
-  <string name="FLA_new_list">Nieuwe lijst</string>
-  
-  <!-- Alert when creating a shortcut without selecting a filter -->
-  <string name="FLA_no_filter_selected">Geen filter geselecteerd! Selecteer een filter of lijst.</string>
-  
-  <!-- ================================================= TaskEditActivity == -->
-  
-  <!-- Title when editing a task (%s => task title) -->
-  
-  <!-- Title when creating a new task -->
-  
-  <!-- Task title label -->
-  
-  <!-- Task when label -->
-  <string name="TEA_when_header_label">Wanneer</string>
-  
-  <!-- Task title hint (displayed when edit box is empty) -->
-  <string name="TEA_title_hint">Taak naam</string>
-  
-  <!-- Task importance label -->
-  <string name="TEA_importance_label">Prioriteit</string>
-  
-  <!-- Task due date hint -->
-  <string name="TEA_deadline_hint">Stel de einddatum in</string>
-  
-  <!-- Task assigned to string (%s -> assigned person name) -->
-  <string name="TEA_assigned_to">Toegewezen aan %s</string>
-  
-  <!-- Task urgency specific time checkbox -->
-  <string name="TEA_urgency_specific_time">Specifieke tijd?</string>
-  
-  <!-- Task urgency specific time title when specific time false -->
-  <string name="TEA_urgency_none">Geen</string>
-  
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_label">Verbergen tot</string>
-
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_display">Verberg tot %s</string>
-  
-  <!-- Task hide until toast -->
-  <string name="TEA_hideUntil_message">Taak is verborgen tot %s</string>
-  
-  <!-- Task editing data being loaded label -->
-  <string-array name="TEA_loading"><item>Laden…</item></string-array>
-  
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_note_label">Omschrijving</string>
-
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_notes_empty">Omschrijving</string>
-  
-  <!-- Task note hint -->
-  <string name="TEA_notes_hint">Voer taakomschrijving in</string>
-  
-  <!-- Estimated time label -->
-  <string name="TEA_estimatedDuration_label">Tijdsduur</string>
-  
-  <!-- Elapsed time label -->
-  <string name="TEA_elapsedDuration_label">Bestede tijd tot nu toe</string>
-
-  <!-- Menu: Save -->    
-  <string name="TEA_menu_save">Wijzigingen opslaan</string>
-  
-  <!-- Menu: Don\'t Save -->
-  <string name="TEA_menu_discard">Niet opslaan</string>
-  
-  <!-- Menu: Delete Task -->
-  <string name="TEA_menu_delete">Taak verwijderen</string>
-  
-  <!-- Menu: Task comments -->
-  <string name="TEA_menu_refresh_comments">Opmerkingen vernieuwen</string>
-
-  <string name="TEA_menu_comments">Opmerkingen</string>
-  
-   <!-- Toast: task saved with deadline (%s => preposition + time units) -->
-  <string name="TEA_onTaskSave_due">Taak opgeslagen: eind %s</string>
-  
-  <!-- Toast: task saved without deadlines -->
-  <string name="TEA_onTaskSave_notDue">Taak opgeslagen</string>
-  
-  <!-- Toast: task was not saved -->
-  
-  <!-- Toast: task was deleted -->
-  
-  <!-- slide 15b: Task edit tab: activity -->
-  <string name="TEA_tab_activity">Activiteit</string>
-  
-  <!-- slide 15e:  Task edit tab: more editing settings -->
-  <string name="TEA_tab_more">Meer</string>
-  
-  <!-- slide 15d: Task edit tab: web services -->
-  <string name="TEA_tab_web">Ideeën</string>
-  
-  <string name="TEA_timer_est">Gesch. %s</string>
-
-  <string name="TEA_timer_elap">Verstreken %s</string>
-  
-  <string-array name="TEA_urgency">
-      <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
-      <item>Geen datum</item>
-      <item>Specifieke dag</item>
-      <item>Vandaag</item>
-      <item>Morgen</item>
-      <item>(volgende dag)</item>
-      <item>Volgende week</item>
-      <item>Binnen 2 weken</item>
-      <item>Volgende maand</item>
-  </string-array>
-  
-  <string name="TEA_no_time">Geen tijd</string>
-      
-  <string-array name="TEA_hideUntil">
-      <!-- hideUntil: labels for edit page. -->
-      <item>Nooit</item>
-      <item>Einddatum </item>
-      <item>Eindtijd</item>
-      <item>Dag voor einddatum</item>
-      <item>Week voor einddatum</item>
-      <item>Specifieke dag/tijd</item>
-  </string-array>
-  
-  <!-- Task edit control set descriptors -->
-
-  <!-- slide 9b/35i -->
-  <string name="TEA_control_who">Wie</string>
-
-  <!-- slide 9c/ 35a -->
-  <string name="TEA_control_when">Wanneer</string>
-  <!-- slide 35b -->
-  <string name="TEA_control_more_section">----More Section----</string>
-  <!-- slide 16a/35c -->
-  <string name="TEA_control_importance">Prioriteit</string>  
-  <!-- slide 16b/35d -->
-  <string name="TEA_control_lists">Lijsten</string>  
-  <!-- slide 16c/35e -->
-  <string name="TEA_control_notes">Omschrijving</string>  
-  
-  <string name="TEA_control_files">Bestanden</string>
-
-  <!-- slide 16e / slide 35g-->
-  <string name="TEA_control_reminders">Herinneringen</string>
-
-  <!-- slide 16f -->
-  <string name="TEA_control_timer">Tijd Controlers</string>
-  
-  <string name="TEA_control_hidden_section">----Altijd Verbergen----</string>
-  
-  <string name="hide_until_prompt">Laat zien in mijn lijst</string>
-  
-  <!-- Add Ons tab when no add-ons found -->
-  
-  <!-- Add Ons button -->
-  
-  <!-- More row -->
-  
-  <!-- slide 15c: Text when no activity to show -->
-  <string name="TEA_no_activity">Geen taken</string>
-  
-  <!-- Text to load more activity -->
-  <string name="TEA_load_more">Laad meer...</string>
-  
-  <!-- When controls dialog -->
-  <string name="TEA_when_dialog_title">Wanneer moet dit gedaan zijn?</string>
-  
-  
-  <string name="TEA_new_task">Nieuwe Taak</string>
-  
-  <string name="WSV_click_to_load">Klik hier om een manier te zoeken om dit af te krijgen!</string>
-  
-  <string name="WSV_not_online">Ik kan meer als ik verbonden ben met internet. Controleer je internetverbinding.</string>
-  
-  <string name="TEA_contact_error">Sorry! We konden geen e-mailadres vinden voor de geselecteerde contactpersoon.</string>
-  
-  <!-- ============================================= IntroductionActivity == -->
-  
-  <!-- slide 1a: Introduction Window title -->
-  
-  <!-- Button to agree to EULA -->
-  
-  <!-- Button to disagree with EULA -->
-  
-  <!-- ===================================================== MissedCallActivity == -->
-  
-  <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
-  <string name="MCA_title">%1$s\nheeft gebeld (%2$s)</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_return_call">Bel nu</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_add_task">Bel later</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_ignore">Negeren</string>
-  
-  <!-- Missed call: dialog to ignore all missed calls title -->
-  <string name="MCA_ignore_title">Negeer alle gemiste oproepen?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls body -->
-  <string name="MCA_ignore_body">Je hebt alle gemiste oproepen genegeerd. Moet Astrid je er niet meer naar vragen?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore all button -->
-  <string name="MCA_ignore_all">Negeer alle oproepen</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
-  <string name="MCA_ignore_this">Negeer alleen deze oproep</string>
-
-  <!-- Missed call: preference title -->
-  <string name="MCA_missed_calls_pref_title">Veld gemiste oproepen</string>
-
-  <!-- slide 49c: Missed call: preference description -->
-  <string name="MCA_missed_calls_pref_desc_enabled">Astrid zal gemiste oproepen laten zien en een herinnering weergeven om terug te bellen</string>
-  <string name="MCA_missed_calls_pref_desc_disabled">Astrid zal gemiste oproepen laten zien</string>
-
-  <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
-  <string name="MCA_task_title_name">Bel %1$s terug op %2$s</string>
-
-  <!-- Missed call: task title no name (%s -> number)-->
-  <string name="MCA_task_title_no_name">Bel %s terug</string>
-  
-  <!-- Missed call: schedule dialog title (%s -> name or number)-->
-  <string name="MCA_schedule_dialog_title">Bel %s terug over...</string>
-  
-  <!-- Missed call speech bubble options -->
-  <string-array name="MCA_dialog_speech_options">
-      <item>Het zal wel leuk zijn om zo populair te zijn!</item>
-      <item>Joehoe! Mensen houden van je!</item>
-      <item>Maak ze blij, bel ze op!</item>
-      <item>Zou jij niet blij zijn als mensen je terug zouden bellen?</item>
-      <item>Je kan het!</item>
-      <item>Je kan altijd een smsje sturen..</item>
-  </string-array>
-  
-  
-  <!-- ======================================= Calendar reminder activity == -->
-  
-  <!-- Calendar remindeer ignore button -->
-  <string name="CRA_ignore">Negeren</string>
-  
-  <!-- Calendar event -->
-  <string name="CRA_title">Heb je een bijeenkomst lijst nodig? </string>
-  
-  <!-- Calendar reminder: dialog to ignore all missed calls title -->
-  <string name="CRA_ignore_title">Alle agenda gebeurtenissen negeren? </string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls body -->
-  <string name="CRA_ignore_body">Je hebt meerdere agenda gebeurtenissen genegeerd. Moet Astrid je er niet meer naar vragen?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
-  <string name="CRA_ignore_all">Negeer alle gebeurtenissen. </string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
-  <string name="CRA_ignore_this">Negeer alleen deze gebeurtenis.</string>
-  
-  <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
-  <string name="CRA_speech_bubble_start">%s begint bijna. Wil je een actiepuntenlijst maken? </string>
-
-  <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
-  <string name="CRA_speech_bubble_end">Ziet eruit alsof je zojuist %s hebt voltooid. Wil je een actiepuntenlijst maken?</string>
-  
-  <!-- Calendar reminder: create list button -->
-  <string name="CRA_create_list">Maak een lijst</string>
-
-  <!-- Calendar reminder: postpone button -->
-  <string name="CRA_postpone">Misschien naderhand</string>
-  
-  <!-- Calendar reminder: list exists dialog title -->
-  <string name="CRA_list_exists_title">Lijst bestaat al. </string>
-  
-  <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
-  <string name="CRA_list_exists_body">Een lijst met de naam %s bestaat al. Wil je de bestaande lijst gebruiken of een nieuwe maken voor deze gebeurtenis?</string>
-  
-  <!-- Calendar reminder: list exists dialog create new button -->
-  <string name="CRA_create_new">Maak een nieuwe. </string>
-
-  <!-- Calendar reminder: list exists dialog use existing button -->
-  <string name="CRA_use_existing">Gebruik bestaande</string>
-  
-  <!-- Calendar remindr: created list (%s -> list name) -->
-  <string name="CRA_created_list_dialog">Ik heb een %s lijst gemaakt.</string>
-  
-  <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
-  <string name="CRA_one_attendee">%s neemt deel</string>
-
-  <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
-  <string name="CRA_two_attendees">%1$s en %2$s nemen deel</string>
-
-  <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
-  <string name="CRA_many_attendees">%1$s, %2$s en %3$d anderen nemen deel</string>
-  
-  <!-- Calendar reminder: invitation prompt -->
-  <string name="CRA_invitation_prompt">Wil je hen uitnodigen?</string>
-  
-  <!-- Calendar reminder: preference title -->
-  <string name="CRA_calendar_reminders_pref_title">Agenda assistent</string>
-
-  <!-- Calendar reminder: pref description disabled -->
-  <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid herinnert je niet aan aankomende agenda gebeurtenissen</string>
-
-  <!-- Calendar reminder: pref description enabled -->
-  <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid herinnert je aan aankomende agenda gebeurtenissen en fluistert je in je voor te bereiden</string>
-  
-  <!-- Calendar reminder: share list title -->
-  <string name="CRA_share_list_title">De lijst delen?</string>
-  
-  <string name="CRA_invite_attendees">Nodig aanwezigen uit</string>
-
-  <string name="CRA_more_options">Meer opties</string>
-
-  <string name="CRA_dont_invite">Nee, bedankt</string>
-
-  <!-- Calendar reminder: share list title when no other attendees exist-->
-  <string name="CRA_list_created_title">Lijst gemaakt!</string>
-  
-  <!-- Calendar reminder: default new list name (%s -> event title) -->
-  <string name="CRA_default_list_name">Actie-items: %s</string>
-  
-  <!-- ===================================================== HelpActivity == -->
-  
-  <!-- Help: Button to get support from our website -->
-    
-  <!-- ==================================================== UpdateService == -->
-  
-  <!-- Changelog Window Title -->
-  <string name="UpS_changelog_title">Nieuw in Astrid</string>
-  
-  <!-- Updates Window Title -->
-  <string name="UpS_updates_title">Laatste Astrid nieuws</string>
-  
-  <!-- Updats No Activity to show for offline users -->
-  <string name="UpS_no_activity_log_in">Log in om een geschiedenis\nvan je vooruitgang en activiteiten\nop gedeelde lijsten te bekijken.</string>
-  
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 31g: Preference Window Title -->
-  <string name="EPr_title">Astrid: Instellingen</string>
-  
-  <string name="EPr_share_astrid">Deel Astrid</string>
-
-  <string name="EPr_share_astrid_summary">Deel over Astrid op je favoriete sociale netwerk</string>
-  
-  <!-- slide 46a -->
-  <string name="EPr_deactivated">uitgeschakeld</string>
-
-  <!-- slide 30i: Preference Category: Appearance Title -->
-  <string name="EPr_appearance_header">Uiterlijk</string>
-  
-  <!-- Preference Category: Appearance Summary -->
-  <string name="EPr_appearance_summary">Thema\'s, widgets, taken, scherm aanpassen</string>
-  
-  <!-- FAQ Preference title -->
-  <string name="EPr_faq_title">FAQ (Veelgestelde Vragen)</string>
-  
-  <!-- Account status preference (%s -> account type) -->
-  <string name="EPr_account_title">Gebruikersnaam: %s</string>
-
-  <!-- Support preferences summary -->
-  <string name="EPr_support_summary">Handleiding, veelgestelde vragen, over</string>
-  
-  <!-- slide 34a: Preference: Task List Font Size Title -->
-  <string name="EPr_fontSize_title">Taaklijst lettertypegrootte</string>
-  
-  <!-- Preference: Filters to show pref screen title -->
-  <string name="EPr_filters_to_show_title">Te tonen filters</string>
-  
-  <!-- slide 32a: Preference: Show confirmation for smart reminders -->
-  <string name="EPr_showSmartConfirmation_title">Laat bevestiging zien voor slimme herinneringen</string>
-  
-  <!-- slide 34g: Preference: Task List Font Size Description -->                                                                                                                                                  
-  <string name="EPr_fontSize_desc">Lettertypegrootte takenlijst</string>  
-  
-  <!-- Preferemce: Show task edit confirmation toasts -->
-  
-  <!-- slide 34c: Preference: Task List Show Notes -->
-  <string name="EPr_showNotes_title">Toon omschrijving in taak</string>
-  
-  <!-- Edit screen preference category -->
-  <string name="EPr_edit_screen_options">Scherm opties bewerken</string>
-  
-  <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
-  <string name="EPr_beastMode_title">Scherm volgorde bewerken</string>
-  
-  <string name="EPr_beastMode_shortcut">Aanpassen</string>
-  
-  <string name="EPr_time_increment">stappen van 5 minuten</string>
-  
-  <string name="EPr_use_date_shortcuts">Gebruik datum snelkoppelingen</string>
-  
-  <string name="EPr_show_timer_shortcut">Toon timer snelkoppeling</string>
-  
-  <!-- slide 35h -->
-  <string name="EPr_beastMode_desc">Pas de layout van het Taak Wijzigingsscherm aan</string>
-  <!-- slide 35j -->
-  <string name="EPr_beastMode_reset">Standaardinstellingen herstellen</string>
-  
-  <string name="EPr_beastMode_hint">Pas uw taak bewerken scherm aan door de linker handle van elke rij te verslepen</string>
-      
-  <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Omschrijving zal toegankelijk zijn vanaf het bewerk taak scherm</string>  
-  <!-- Preference: Task List Show Notes Description (enabled) -->
-  <string name="EPr_showNotes_desc_enabled">Omschrijving zal altijd worden getoond</string>
-  
-  <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
-  <string name="EPr_compressTaskRows_title">Compacte Taakrij</string>
-  <!-- slide 34j -->
-  <string name="EPr_compressTaskRows_desc">Comprimeer taak rijen zodat de titel past</string>
-  
-  <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
-  <!-- slide 34k-->
-  
-  <!-- slide 34b: Preferences: Wrap task titles to two lines -->
-  <string name="EPr_fullTask_title">Laat volledige taak titel zien</string>
-  <string name="EPr_fullTask_desc_enabled">Volledige taak titel zal worden weergegeven</string>
-  <!-- slide 34h -->
-  <string name="EPr_fullTask_desc_disabled">Eerste twee lijnen van taak titel zullen worden weergegeven</string>
-  
-  <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
-  <string name="EPr_ideaAuto_title">Ideeëntabblad Automatisch Laden</string>
-  <!-- slide 32c -->
-  <string name="EPr_ideaAuto_desc_enabled">Zoekopdrachten voor ideeën tablad zullen worden weergeven wanneer er op de tab is geklikt</string>
-  <string name="EPr_ideaAuto_desc_disabled">Web zoekopdrachten voor Ideeëntabblad worden alleen uitgevoerd als daar handmatig om gevraagd wordt</string>
-  
-  <!-- Preferences: task row style -->
-  <string-array name="EPr_task_row_styles">
-      <item>Origineel</item>
-      <item>Simpel</item>
-      <item>Enkel titel</item>
-  </string-array>
-  
-  <string-array name="EPr_task_row_style_descriptions">
-      <item>Titel afkappen naar twee regels met datum aan rechterkant</item>
-      <item>Titel afkappen tot één regel met datum en onderstaande lijsten</item>
-      <item>Enkele regel enkel titel</item>
-  </string-array>
-  
-  <!-- task row style title (%s -> style) -->
-  <string name="EPr_task_row_style_title">Regel stijl %s</string>
-  
-  <!-- Preference: custom filters enabled -->
-  <string name="EPr_use_filters_title">Gebruik filters</string>
-  <string name="EPr_use_filters_subtitle">Laat je eigen filters definieren</string>
-
-  <!-- Preference: show list members in shared list -->
-  <string name="EPr_show_list_members_title">Toon ledenlijst in gedeelde lijsten</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_simple_input_boxes">Eenvoudige tekst vakken</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_show_quickadd_controls">Geavanceerde snel toevoegen controls</string>
-
-  <!-- Preference: don\'t show plus button until input present -->
-  <string name="EPr_hide_plus_button">Verberg plus knop</string>
-
-  <!-- Preference: menu items -->
-  <string name="EPr_menu_items">Menu items</string>
-
-  <!-- Preference: list view -->
-  <string name="EPr_list_view">Lijst weergave</string>
-
-  <!-- Preference: task edit comments -->
-  <string name="EPr_show_task_edit_comments">Toon opmerkingen in taak bewerken</string>
-  
-  <!-- slide 30f/ 36f: Preference: Theme -->
-  <string name="EPr_theme_title">Kleuren Thema</string>
-  <!-- Preference: Theme Description (%s => value) -->
-  <string name="EPr_theme_desc">Nu: %s</string>  
-  <!-- Preference: Theme Description (android 1.6) -->
-  <string name="EPr_theme_desc_unsupported">Instelllingen vereisen Android 2.0+</string>
-  <!-- slide 32h/ 37b -->
-  <string name="EPr_theme_widget_title">Widget Thema</string>
-  
-  <!-- slide 30d/ 34f: Preference screen: all task row settings -->
-  <string name="EPr_taskRowPrefs_title">Taakrij Weergave</string>
-  
-  <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
-  <string name="EPr_use_contact_picker">Gebruik contact kiezer</string>
-  <!-- slide 49b -->
-  <string name="EPr_use_contact_picker_desc_enabled">De systeem contact optie is uitgeschakeld in het taak uitdeel venster</string>
-  <string name="EPr_use_contact_picker_desc_disabled">De systeem contact optie is uitgeschakeld</string>
-
-  <!-- slide 49i: Preferences: Third party addons -->
-  <string name="EPr_third_party_addons">Machtig derde partijen add-ons</string>
-  <string name="EPr_third_party_addons_desc_enabled">Add-ons van derden worden ingeschakeld</string>
-  <!-- slide 49d -->
-  <string name="EPr_third_party_addons_desc_disabled">Add-ons van derden worden uitgeschakeld</string>
-  
-  <!-- Preferences: ideas tab -->
-  <string name="EPr_ideas_tab_enabled">Taak ideeën</string>
-  <string name="EPr_ideas_tab_description">Krijg ideeën om je te helpen taken te voltooien</string>
-  
-  <!-- Preferences: calendar event start time -->
-  <string name="EPr_cal_end_or_start_at_due_time">Agenda item tijd</string>
-  <string name="EPr_cal_end_at_due_time">Agendai tem op tijd afronden</string>
-  <string name="EPr_cal_start_at_due_time">Agenda item op tijd starten</string>
-  
-  <string name="EPr_force_phone_layout">Gebruik telefoon layout</string>
-
-  <string name="EPr_show_featured_lists">Laat aanbevolen lijsten zien</string>
-  
-  <!-- Configurations -->
-  <string name="EPr_configurations_title">Configuratie instellen</string>
-  <string name="EPr_config_default">Standaard</string>
-  <string name="EPr_config_lite">Astrid Lite</string>
-  
-  <!-- Dialog title when setting preference configuration -->
-  <string name="EPr_config_dialog_title">Configuratie instellen?</string>
-  <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
-  <string name="EPr_config_dialog_text">Reset voorkeuren naar de %s configuratie?</string>
-  
-  <!-- default configuration name for the above dialog -->
-  <string name="EPr_config_dialog_default_id">standaard</string>
-  
-  <!-- Preference title for showing save and cancel buttons in task edit page -->
-  <string name="EPr_show_save_and_cancel">Toon opslaan en annuleren</string>
-  
-  
-  <!-- Swipe between lists -->
-  <!-- Preference: swipe between lists performance -->
-  <string name="EPr_swipe_lists_performance_title">Swipe tussen lijsten</string>
-  
-  <string-array name="EPr_swipe_lists_performance_mode">
-      <item>Geen swipe</item>
-      <item>Spaar geheugen</item>
-      <item>Normale snelheid</item>
-      <item>Hoge Prestatie</item>
-  </string-array>
-  
-  <string-array name="EPr_swipe_lists_performance_desc">
-  <!-- slide 49a -->
-      <item>Swipe tussen lijsten is uitgeschakeld</item>
-      <item>Langzamere prestaties</item>
-      <item>Standaardinstelling</item>
-      <item>Gebruikt meer systeemgeheugen</item>
-  </string-array>
-    
-  <string name="swipe_lists_helper_title">Swipe tussen lijsten</string>
-  <string name="swipe_lists_helper_header">Swipe links of rechts om snel lijsten te verplaatsen</string>
-  <string name="swipe_lists_helper_subtitle">Verander instellingen in Instellingen --> Uiterlijk</string>
-
-  <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
-  
-  <string-array name="EPr_default_reminders_mode">
-      <!-- reminders duration: labels for "Task Defaults" preference item. -->
-      <item>@string/TEA_reminder_mode_once</item>
-      <item>@string/TEA_reminder_mode_five</item>
-      <item>@string/TEA_reminder_mode_nonstop</item>
-  </string-array>
-    
-  <string-array name="EPr_themes">
-    <!-- theme_settings: labels for Theme preference menu -->
-    <!-- slide 36a-->
-    <item>Dag - Blauw</item>
-    <!-- slide 36b -->
-    <item>Dag - Rood</item>
-    <!-- slide 36b -->
-    <item>Hemelsblauw</item>
-    <!-- slide 36c -->
-    <item>Nacht</item>
-    <!-- slide 36d -->
-    <item>Transparant (witte tekst)</item>
-    <!-- slide 36e -->
-    <item>Transparant (Zwarte Tekst)</item>
-  </string-array>
-  
-  <string-array name="EPr_themes_widget">
-    <!-- slide 32i / 37a-->
-    <item>Zelfde als app</item>
-    <item>Dag - Blauw</item>
-    <item>Dag - Rood</item>
-    <item>Hemelsblauw</item>
-    <item>Nacht</item>
-    <item>Transparant (witte tekst)</item>
-    <item>Transparant (zwarte tekst)</item>
-    <item>Oude Stijl</item>
-  </string-array>
-  
-  <!-- ========================================== Task Management Settings == -->
-
-  <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
-  <string name="EPr_manage_header">Oude taken beheren</string>
-  <!-- slide 47d -->
-  <string name="EPr_manage_delete_completed">Voltooide taken verwijderen</string>
-  <string name="EPr_manage_delete_completed_message">Alle voltooide taken werkelijk verwijderen?</string>
-  <!-- slide 47a -->
-  <string name="EPr_manage_delete_completed_summary">Verwijderde taken kunnen één-voor-één worden teruggehaald</string>
-  <string name="EPr_manage_delete_completed_status">%d taken verwijderd!</string>
-  <!-- slide 47e -->
-  <string name="EPr_manage_purge_deleted">Verwijderde taken opschonen</string>
-  <string name="EPr_manage_purge_deleted_message">Alle verwijderde taken werkelijk opschonen?\n\nDeze taken zijn dan definitief verwijderd!</string>
-  <string name="EPr_manage_purge_deleted_status">%d verwijderde taken opgeschoond!</string>
-  <!-- slide 47b-->
-  <string name="EPr_manage_purge_deleted_summary">Waarschuwing: Opgeschoonde verwijderde taken kunnen zonder backup-bestand niet worden hersteld!</string>
-  <!-- slide 47h-->
-  <string name="EPr_manage_clear_all">Wis Alle Gegevens</string>
-  <string name="EPr_manage_clear_all_message">Verwijder alle taken en instellingen in Astrid?\n\nWaarschuwing: kan niet ongedaan worden gemaakt!</string>
-
-  <!-- slide 47f -->
-  <string name="EPr_manage_delete_completed_gcal">Verwijder Agenda-items voor Voltooide Taken</string>
-  <string name="EPr_manage_delete_completed_gcal_message">Weet je zeker dat je alle gebeurtenissen voor voltooide taken wil verwijderen?</string>
-  <string name="EPr_manage_delete_completed_gcal_summary"></string>
-  <string name="EPr_manage_delete_completed_gcal_status">%d agenda-items verwijderd!</string>
-      
-  <!-- slide 47g-->
-  <string name="EPr_manage_delete_all_gcal">Verwijder Alle Agenda-items voor Taken</string>
-  <string name="EPr_manage_delete_all_gcal_message">Weet je zeker dat je alle gebeurtenissen voor taken wil verwijderen?</string>
-  <string name="EPr_manage_delete_all_gcal_summary"></string>
-  <string name="EPr_manage_delete_all_gcal_status">%d agenda-items verwijderd!</string>
-      
-  <!-- ==================================================== AddOnActivity == -->
-  
-  <!-- Add Ons Activity Title -->
-  <string name="AOA_title">Astrid: Uitbreidingen</string>
-    
-  <!-- Add-on Activity: author for internal authors  -->
-  <string name="AOA_internal_author">Astrid Team</string>
-    
-  <!-- Add-on Activity: installed add-ons tab -->
-  <string name="AOA_tab_installed">Geïnstalleerd</string>
-  
-  <!-- Add-on Activity - available add-ons tab -->
-  <string name="AOA_tab_available">Beschikbaar</string>
-  
-  <!-- Add-on Activity - free add-ons label -->
-  <string name="AOA_free">Gratis</string>
-  
-  <!-- Add-on Activity - menu item to visit add-on website -->
-  
-  <!-- Add-on Activity - menu item to visit android market -->
-  
-  <!-- Add-on Activity - when list is empty -->
-  <string name="AOA_no_addons">Lijst is leeg!</string>
-  
-  <string name="AOA_ppack_title">Astrid Power Pack</string>
-  <string name="AOA_ppack_description">Steun Astrid en wordt productiever met de Astrid Power Pack. 4x2 en 4x4 widgets en stem integratie. Start vandaag! </string>
-  <string name="AOA_locale_title">Astrid Locale Plugin</string>
-  <string name="AOA_locale_description">Sta toe dat Astrid gebruik maakt van de Locale applicatie om je notificaties te sturen gebaseerd op de filter voorwaarden. Locale vereist.</string>
-  
-  <!-- ====================================================== TasksWidget == -->
-
-  <!-- Widget text when loading tasks -->
-  <string name="TWi_loading">Laden…</string>
-
-  <!-- Widget configuration activity title: select a filter -->
-  <string name="WCA_title">Selecteer weer te geven taken...</string>
-  
-  <!-- ======================================================== Waiting on me -->
-
-  <string name="wom_commented">%s heeft gereageerd op je taak.</string>
-  <string name="wom_mentioned">%s heeft je vermeld.</string>
-  <string name="wom_assigned">%s heeft dit toegewezen aan jou.</string>
-  <string name="wom_raised_pri">%s heeft de prioriteit verhoogd.</string>
-  <string name="wom_changed_due">%s heeft de einddatum veranderd.</string>
-  <string name="wom_default">%s wil je aandacht.</string>
-  
-  <string name="wom_dismiss">Sluit</string>
-  <string name="wom_acknowledge">Ik heb dit gelezen</string>
-
-  <!-- ============================================================= About == -->
-  
-  <!-- slide 30h: Title of "About" option in settings -->
-  <string name="p_about">Over Astrid</string>
-  
-  <!-- About text (%s => current version)-->
-  <string name="p_about_text">Huidige versie: %s\n\n Astrid is open-source en wordt onderhouden door Todoroo, Inc.</string>
-
-  <!-- Title of "Help" option in settings -->
-  <string name="p_help">Ondersteuning</string>
-  
-  <!-- slide 30c: Title of "Forums" option in settings -->
-  <string name="p_forums">Forums</string>
-  
-  <!-- Title of "Premium" option in settings -->
-  <string name="p_premium">Premium</string>
-  
-  <!-- ============================================================= Misc == -->
-  
-  <string name="feedback_positive_title">Beoordeel Astrid?</string>
-
-  <string name="feedback_positive_body">Fijn dat ik kon helpen! Heb je een momentje om ons een 5-ster waardering te geven?</string>
-
-  <string name="feedback_negative_title">Geef feedback?</string>
-
-  <string name="feedback_negative_body">Sorry om te horen dat we problemen hebben</string>
-
-  <string name="feedback_activity_error">Oeps! Het is niet gelukt om de market review sectie te starten--mogelijk is het niet beschikbaar op je apparaat.</string>
-  
-  <string name="feedback_positive_button">Beoordeel Astrid</string>
-
-  <string name="feedback_negative_button">Geef feedback</string>
-  
-  <string name="feedback_not_now">Nu niet</string>
-  
-  <string name="feedback_banner_text">Hoe werkt Astrid voor jou?</string>
-  
-  <!-- Displayed when task killer found. %s => name of the application -->
-  <string name="task_killer_help">U gebruikt waarschijnlijk een applicatie die processen kan afsluiten (%s)! Voeg Astrid indien mogelijk toe aan de lijst met uitgezonderde programma\'s. Als u dit niet doet kan Astrid u niet helpen met taken herinneren!\n</string>
-  
-  <!-- Task killer dialog ok button -->
-  <string name="task_killer_help_ok">Astrid niet afsluiten</string>
-    
-  <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
-  
-  <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
-  <string name="marketplace_description">Astrid is de geliefde open-source Takenbeheerder, ontworpen om je taken gedaan te krijgen. Astrid heeft functies als herinneringen, bundelen van taken, synchronisatie, LBS plug-ins, widgets en nog veel meer!</string>
-  
-  <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 Astrid.</string>
-      
-  <string name="market_unavailable">Helaas is de Android Market niet beschikbaar voor jouw systeem.</string>
-  
+    <!-- slide 30f/ 36f: Preference: Theme -->
+    <string name="EPr_theme_title">Kleuren Thema</string>
+    <!-- Preference: Theme Description (%s => value) -->
+    <string name="EPr_theme_desc">Nu: %s</string>
+    <!-- Preference: Theme Description (android 1.6) -->
+    <string name="EPr_theme_desc_unsupported">Instelllingen vereisen Android 2.0+</string>
+    <!-- slide 32h/ 37b -->
+    <string name="EPr_theme_widget_title">Widget Thema</string>
 
+    <!-- slide 30d/ 34f: Preference screen: all task row settings -->
+    <string name="EPr_taskRowPrefs_title">Taakrij Weergave</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
+    <string name="EPr_use_contact_picker">Gebruik contact kiezer</string>
+    <!-- slide 49b -->
+    <string name="EPr_use_contact_picker_desc_enabled">De systeem contact optie is uitgeschakeld in
+        het taak uitdeel venster
+    </string>
+    <string name="EPr_use_contact_picker_desc_disabled">De systeem contact optie is uitgeschakeld
+    </string>
 
+    <!-- slide 49i: Preferences: Third party addons -->
+    <string name="EPr_third_party_addons">Machtig derde partijen add-ons</string>
+    <string name="EPr_third_party_addons_desc_enabled">Add-ons van derden worden ingeschakeld
+    </string>
+    <!-- slide 49d -->
+    <string name="EPr_third_party_addons_desc_disabled">Add-ons van derden worden uitgeschakeld
+    </string>
 
-  <!-- slide 32g: Preference Category: Defaults Title -->
-  <string name="EPr_defaults_header">Basisinstellingen nieuwe taak</string>
-  <string name="EPr_defaults_summary">Prioriteit, eind datum, toevoegen aan agenda</string>
-  
-  <!-- slide 41f:  Preference: Default Urgency Title -->
-  <string name="EPr_default_urgency_title">Standaard prioriteit</string>
-  <!-- Preference: Default Urgency Description (%s => setting) -->
-  <string name="EPr_default_urgency_desc">Nu: %s</string>
-  
-  <!-- slide 40a: Preference: Default Importance Title -->
-  <string name="EPr_default_importance_title">Standaard prioriteit</string>
-  <!-- Preference: Default Importance Description (%s => setting) -->
-  <string name="EPr_default_importance_desc">Nu: %s</string>
-  
-  <!-- slide 42e: Preference: Default Hide Until Title -->
-  <string name="EPr_default_hideUntil_title">Standaard verbergen tot</string>
-  <!-- Preference: Default Hide Until Description (%s => setting) -->
-  <string name="EPr_default_hideUntil_desc">Nu: %s</string>
-  
-  <!-- slide 43e: Preference: Default Reminders Title -->
-  <string name="EPr_default_reminders_title">Standaard herinneringen</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_desc">Nu: %s</string>
-  
-  <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
-  <string name="EPr_default_addtocalendar_title">Standaar Toevoegen aan Agenda</string>
-  <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
-  <string name="EPr_default_addtocalendar_desc_disabled">Nieuwe taken maken geen gebeurtenis in de Google Agenda</string>
-  <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
-  <string name="EPr_default_addtocalendar_desc">Nieuwe taken worden toegevoegd aan de agenda: \"%s\"</string>
-  
-  <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
-  <string name="EPr_default_reminders_mode_title">Standaard toon/tril type</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_mode_desc">Nu: %s</string>
-  
-  <string-array name="EPr_default_importance">
-    <!-- importance: labels for "Task Defaults" preference item. -->
-    <!-- slide 40b -->
-    <item>!!! (Hoogste)</item>
-    <item>!!</item>
-    <item>!</item>
-    <!-- slide 40c -->
-    <item>o (Laagste)</item>
-  </string-array>
-  
-  <string-array name="EPr_default_urgency">
-    <!-- urgency: labels for "Task Defaults" preference item. -->
-    <!-- slide 41a-->
-    <item>Geen einddatum</item>
-    <!-- slide 41b -->
-    <item>Vandaag</item>
-    <!-- slide 41c-->
-    <item>Morgen</item>
-    <!-- slide 41d -->
-    <item>Overmorgen</item>
-    <!-- slide 41e -->
-    <item>Volgende week</item>
-  </string-array>
-  
-  <string-array name="EPr_default_hideUntil">
-    <!-- hideUntil: labels for "Task Defaults" preference item. -->
-    <!-- slide 42a -->
-    <item>Niet verbergen</item>
-    <!-- slide 42b -->
-    <item>Taak heeft einddatum</item>
-    <!-- slide 42c -->
-    <item>Dag voor einddatum</item>
-    <!-- slide 42d-->
-    <item>Week voor einddatum</item>
-  </string-array>
-  
-  <string-array name="EPr_default_reminders">
-    <!-- reminders: labels for "Task Defaults" preference item. -->
-    <!-- slide 43a -->
-    <item>Herinneringen zonder einddatum</item>
-    <!-- slide 43b -->
-    <item>Op de einddatum</item>
-    <!-- slide 43c -->
-    <item>Na de einddatum</item>
-    <!-- slide 43d -->
-    <item>Op of na de einddatum</item>
-  </string-array>
-  
-  <string-array name="EPr_default_addtocalendar">
-    <!-- addtocalendar: labels for "Task Defaults" preference item. -->
-    <item>@string/EPr_deactivated</item>
-  </string-array>      
+    <!-- Preferences: ideas tab -->
+    <string name="EPr_ideas_tab_enabled">Taak ideeën</string>
+    <string name="EPr_ideas_tab_description">Krijg ideeën om je te helpen taken te voltooien
+    </string>
 
+    <!-- Preferences: calendar event start time -->
+    <string name="EPr_cal_end_or_start_at_due_time">Agenda item tijd</string>
+    <string name="EPr_cal_end_at_due_time">Agendai tem op tijd afronden</string>
+    <string name="EPr_cal_start_at_due_time">Agenda item op tijd starten</string>
+
+    <string name="EPr_force_phone_layout">Gebruik telefoon layout</string>
+
+    <string name="EPr_show_featured_lists">Laat aanbevolen lijsten zien</string>
+
+    <!-- Configurations -->
+    <string name="EPr_configurations_title">Configuratie instellen</string>
+    <string name="EPr_config_default">Standaard</string>
+    <string name="EPr_config_lite">Astrid Lite</string>
+
+    <!-- Dialog title when setting preference configuration -->
+    <string name="EPr_config_dialog_title">Configuratie instellen?</string>
+    <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
+    <string name="EPr_config_dialog_text">Reset voorkeuren naar de %s configuratie?</string>
+
+    <!-- default configuration name for the above dialog -->
+    <string name="EPr_config_dialog_default_id">standaard</string>
+
+    <!-- Preference title for showing save and cancel buttons in task edit page -->
+    <string name="EPr_show_save_and_cancel">Toon opslaan en annuleren</string>
+
+
+    <!-- Swipe between lists -->
+    <!-- Preference: swipe between lists performance -->
+    <string name="EPr_swipe_lists_performance_title">Swipe tussen lijsten</string>
+
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>Geen swipe</item>
+        <item>Spaar geheugen</item>
+        <item>Normale snelheid</item>
+        <item>Hoge Prestatie</item>
+    </string-array>
+
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <!-- slide 49a -->
+        <item>Swipe tussen lijsten is uitgeschakeld</item>
+        <item>Langzamere prestaties</item>
+        <item>Standaardinstelling</item>
+        <item>Gebruikt meer systeemgeheugen</item>
+    </string-array>
+
+    <string name="swipe_lists_helper_title">Swipe tussen lijsten</string>
+    <string name="swipe_lists_helper_header">Swipe links of rechts om snel lijsten te verplaatsen
+    </string>
+    <string name="swipe_lists_helper_subtitle">Verander instellingen in Instellingen --> Uiterlijk
+    </string>
+
+    <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
+
+    <string-array name="EPr_default_reminders_mode">
+        <!-- reminders duration: labels for "Task Defaults" preference item. -->
+        <item>@string/TEA_reminder_mode_once</item>
+        <item>@string/TEA_reminder_mode_five</item>
+        <item>@string/TEA_reminder_mode_nonstop</item>
+    </string-array>
+
+    <string-array name="EPr_themes">
+        <!-- theme_settings: labels for Theme preference menu -->
+        <!-- slide 36a-->
+        <item>Dag - Blauw</item>
+        <!-- slide 36b -->
+        <item>Dag - Rood</item>
+        <!-- slide 36b -->
+        <item>Hemelsblauw</item>
+        <!-- slide 36c -->
+        <item>Nacht</item>
+        <!-- slide 36d -->
+        <item>Transparant (witte tekst)</item>
+        <!-- slide 36e -->
+        <item>Transparant (Zwarte Tekst)</item>
+    </string-array>
+
+    <string-array name="EPr_themes_widget">
+        <!-- slide 32i / 37a-->
+        <item>Zelfde als app</item>
+        <item>Dag - Blauw</item>
+        <item>Dag - Rood</item>
+        <item>Hemelsblauw</item>
+        <item>Nacht</item>
+        <item>Transparant (witte tekst)</item>
+        <item>Transparant (zwarte tekst)</item>
+        <item>Oude Stijl</item>
+    </string-array>
+
+    <!-- ========================================== Task Management Settings == -->
+
+    <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
+    <string name="EPr_manage_header">Oude taken beheren</string>
+    <!-- slide 47d -->
+    <string name="EPr_manage_delete_completed">Voltooide taken verwijderen</string>
+    <string name="EPr_manage_delete_completed_message">Alle voltooide taken werkelijk verwijderen?
+    </string>
+    <!-- slide 47a -->
+    <string name="EPr_manage_delete_completed_summary">Verwijderde taken kunnen één-voor-één worden
+        teruggehaald
+    </string>
+    <string name="EPr_manage_delete_completed_status">%d taken verwijderd!</string>
+    <!-- slide 47e -->
+    <string name="EPr_manage_purge_deleted">Verwijderde taken opschonen</string>
+    <string name="EPr_manage_purge_deleted_message">Alle verwijderde taken werkelijk
+        opschonen?\n\nDeze taken zijn dan definitief verwijderd!
+    </string>
+    <string name="EPr_manage_purge_deleted_status">%d verwijderde taken opgeschoond!</string>
+    <!-- slide 47b-->
+    <string name="EPr_manage_purge_deleted_summary">Waarschuwing: Opgeschoonde verwijderde taken
+        kunnen zonder backup-bestand niet worden hersteld!
+    </string>
+    <!-- slide 47h-->
+    <string name="EPr_manage_clear_all">Wis Alle Gegevens</string>
+    <string name="EPr_manage_clear_all_message">Verwijder alle taken en instellingen in
+        Astrid?\n\nWaarschuwing: kan niet ongedaan worden gemaakt!
+    </string>
+
+    <!-- slide 47f -->
+    <string name="EPr_manage_delete_completed_gcal">Verwijder Agenda-items voor Voltooide Taken
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_message">Weet je zeker dat je alle gebeurtenissen
+        voor voltooide taken wil verwijderen?
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_summary"></string>
+    <string name="EPr_manage_delete_completed_gcal_status">%d agenda-items verwijderd!</string>
+
+    <!-- slide 47g-->
+    <string name="EPr_manage_delete_all_gcal">Verwijder Alle Agenda-items voor Taken</string>
+    <string name="EPr_manage_delete_all_gcal_message">Weet je zeker dat je alle gebeurtenissen voor
+        taken wil verwijderen?
+    </string>
+    <string name="EPr_manage_delete_all_gcal_summary"></string>
+    <string name="EPr_manage_delete_all_gcal_status">%d agenda-items verwijderd!</string>
+
+    <!-- ==================================================== AddOnActivity == -->
+
+    <!-- Add Ons Activity Title -->
+    <string name="AOA_title">Astrid: Uitbreidingen</string>
+
+    <!-- Add-on Activity: author for internal authors  -->
+    <string name="AOA_internal_author">Astrid Team</string>
+
+    <!-- Add-on Activity: installed add-ons tab -->
+    <string name="AOA_tab_installed">Geïnstalleerd</string>
+
+    <!-- Add-on Activity - available add-ons tab -->
+    <string name="AOA_tab_available">Beschikbaar</string>
+
+    <!-- Add-on Activity - free add-ons label -->
+    <string name="AOA_free">Gratis</string>
+
+    <!-- Add-on Activity - menu item to visit add-on website -->
+
+    <!-- Add-on Activity - menu item to visit android market -->
+
+    <!-- Add-on Activity - when list is empty -->
+    <string name="AOA_no_addons">Lijst is leeg!</string>
+
+    <string name="AOA_ppack_title">Astrid Power Pack</string>
+    <string name="AOA_ppack_description">Steun Astrid en wordt productiever met de Astrid Power
+        Pack. 4x2 en 4x4 widgets en stem integratie. Start vandaag!
+    </string>
+    <string name="AOA_locale_title">Astrid Locale Plugin</string>
+    <string name="AOA_locale_description">Sta toe dat Astrid gebruik maakt van de Locale applicatie
+        om je notificaties te sturen gebaseerd op de filter voorwaarden. Locale vereist.
+    </string>
+
+    <!-- ====================================================== TasksWidget == -->
+
+    <!-- Widget text when loading tasks -->
+    <string name="TWi_loading">Laden…</string>
+
+    <!-- Widget configuration activity title: select a filter -->
+    <string name="WCA_title">Selecteer weer te geven taken...</string>
+
+    <!-- ======================================================== Waiting on me -->
+
+    <string name="wom_commented">%s heeft gereageerd op je taak.</string>
+    <string name="wom_mentioned">%s heeft je vermeld.</string>
+    <string name="wom_assigned">%s heeft dit toegewezen aan jou.</string>
+    <string name="wom_raised_pri">%s heeft de prioriteit verhoogd.</string>
+    <string name="wom_changed_due">%s heeft de einddatum veranderd.</string>
+    <string name="wom_default">%s wil je aandacht.</string>
+
+    <string name="wom_dismiss">Sluit</string>
+    <string name="wom_acknowledge">Ik heb dit gelezen</string>
+
+    <!-- ============================================================= About == -->
+
+    <!-- slide 30h: Title of "About" option in settings -->
+    <string name="p_about">Over Astrid</string>
+
+    <!-- About text (%s => current version)-->
+    <string name="p_about_text">Huidige versie: %s\n\n Astrid is open-source en wordt onderhouden
+        door Todoroo, Inc.
+    </string>
+
+    <!-- Title of "Help" option in settings -->
+    <string name="p_help">Ondersteuning</string>
+
+    <!-- slide 30c: Title of "Forums" option in settings -->
+    <string name="p_forums">Forums</string>
+
+    <!-- Title of "Premium" option in settings -->
+    <string name="p_premium">Premium</string>
+
+    <!-- ============================================================= Misc == -->
+
+    <string name="feedback_positive_title">Beoordeel Astrid?</string>
+
+    <string name="feedback_positive_body">Fijn dat ik kon helpen! Heb je een momentje om ons een
+        5-ster waardering te geven?
+    </string>
+
+    <string name="feedback_negative_title">Geef feedback?</string>
+
+    <string name="feedback_negative_body">Sorry om te horen dat we problemen hebben</string>
+
+    <string name="feedback_activity_error">Oeps! Het is niet gelukt om de market review sectie te
+        starten--mogelijk is het niet beschikbaar op je apparaat.
+    </string>
+
+    <string name="feedback_positive_button">Beoordeel Astrid</string>
+
+    <string name="feedback_negative_button">Geef feedback</string>
+
+    <string name="feedback_not_now">Nu niet</string>
+
+    <string name="feedback_banner_text">Hoe werkt Astrid voor jou?</string>
+
+    <!-- Displayed when task killer found. %s => name of the application -->
+    <string name="task_killer_help">U gebruikt waarschijnlijk een applicatie die processen kan
+        afsluiten (%s)! Voeg Astrid indien mogelijk toe aan de lijst met uitgezonderde programma\'s.
+        Als u dit niet doet kan Astrid u niet helpen met taken herinneren!\n
+    </string>
+
+    <!-- Task killer dialog ok button -->
+    <string name="task_killer_help_ok">Astrid niet afsluiten</string>
+
+    <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
+
+    <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
+    <string name="marketplace_description">Astrid is de geliefde open-source Takenbeheerder,
+        ontworpen om je taken gedaan te krijgen. Astrid heeft functies als herinneringen, bundelen
+        van taken, synchronisatie, LBS plug-ins, widgets en nog veel meer!
+    </string>
+
+    <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 Astrid.
+    </string>
+
+    <string name="market_unavailable">Helaas is de Android Market niet beschikbaar voor jouw
+        systeem.
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 32g: Preference Category: Defaults Title -->
+    <string name="EPr_defaults_header">Basisinstellingen nieuwe taak</string>
+    <string name="EPr_defaults_summary">Prioriteit, eind datum, toevoegen aan agenda</string>
+
+    <!-- slide 41f:  Preference: Default Urgency Title -->
+    <string name="EPr_default_urgency_title">Standaard prioriteit</string>
+    <!-- Preference: Default Urgency Description (%s => setting) -->
+    <string name="EPr_default_urgency_desc">Nu: %s</string>
+
+    <!-- slide 40a: Preference: Default Importance Title -->
+    <string name="EPr_default_importance_title">Standaard prioriteit</string>
+    <!-- Preference: Default Importance Description (%s => setting) -->
+    <string name="EPr_default_importance_desc">Nu: %s</string>
+
+    <!-- slide 42e: Preference: Default Hide Until Title -->
+    <string name="EPr_default_hideUntil_title">Standaard verbergen tot</string>
+    <!-- Preference: Default Hide Until Description (%s => setting) -->
+    <string name="EPr_default_hideUntil_desc">Nu: %s</string>
+
+    <!-- slide 43e: Preference: Default Reminders Title -->
+    <string name="EPr_default_reminders_title">Standaard herinneringen</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_desc">Nu: %s</string>
+
+    <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
+    <string name="EPr_default_addtocalendar_title">Standaar Toevoegen aan Agenda</string>
+    <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
+    <string name="EPr_default_addtocalendar_desc_disabled">Nieuwe taken maken geen gebeurtenis in de
+        Google Agenda
+    </string>
+    <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
+    <string name="EPr_default_addtocalendar_desc">Nieuwe taken worden toegevoegd aan de agenda:
+        \"%s\"
+    </string>
+
+    <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
+    <string name="EPr_default_reminders_mode_title">Standaard toon/tril type</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_mode_desc">Nu: %s</string>
+
+    <string-array name="EPr_default_importance">
+        <!-- importance: labels for "Task Defaults" preference item. -->
+        <!-- slide 40b -->
+        <item>!!! (Hoogste)</item>
+        <item>!!</item>
+        <item>!</item>
+        <!-- slide 40c -->
+        <item>o (Laagste)</item>
+    </string-array>
+
+    <string-array name="EPr_default_urgency">
+        <!-- urgency: labels for "Task Defaults" preference item. -->
+        <!-- slide 41a-->
+        <item>Geen einddatum</item>
+        <!-- slide 41b -->
+        <item>Vandaag</item>
+        <!-- slide 41c-->
+        <item>Morgen</item>
+        <!-- slide 41d -->
+        <item>Overmorgen</item>
+        <!-- slide 41e -->
+        <item>Volgende week</item>
+    </string-array>
+
+    <string-array name="EPr_default_hideUntil">
+        <!-- hideUntil: labels for "Task Defaults" preference item. -->
+        <!-- slide 42a -->
+        <item>Niet verbergen</item>
+        <!-- slide 42b -->
+        <item>Taak heeft einddatum</item>
+        <!-- slide 42c -->
+        <item>Dag voor einddatum</item>
+        <!-- slide 42d-->
+        <item>Week voor einddatum</item>
+    </string-array>
+
+    <string-array name="EPr_default_reminders">
+        <!-- reminders: labels for "Task Defaults" preference item. -->
+        <!-- slide 43a -->
+        <item>Herinneringen zonder einddatum</item>
+        <!-- slide 43b -->
+        <item>Op de einddatum</item>
+        <!-- slide 43c -->
+        <item>Na de einddatum</item>
+        <!-- slide 43d -->
+        <item>Op of na de einddatum</item>
+    </string-array>
+
+    <string-array name="EPr_default_addtocalendar">
+        <!-- addtocalendar: labels for "Task Defaults" preference item. -->
+        <item>@string/EPr_deactivated</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in filter plug-in -->
-    
+
     <!-- ================================================= Filter Exposer == -->
-    
+
     <!-- Active Tasks Filter -->
     <string name="BFE_Active">Mijn taken</string>
-    
+
     <!-- Waiting on me filter -->
     <string name="BFE_waiting_on_me">Wacht op mij</string>
-        
+
     <!-- Search Filter -->
-    
+
     <!-- slide 10b: Recently Modified -->
     <string name="BFE_Recent">Onlangs aangepast</string>
-    
+
     <!-- slide 10c: I\'ve assigned -->
     <string name="BFE_Assigned">Ik heb toegekend</string>
-    
+
     <!-- Build Your Own Filter -->
-    
+
     <!-- Saved Filters Header -->
-    
+
     <!-- Saved Filters Context Menu: delete -->
     <string name="BFE_Saved_delete">Filter verwijderen</string>
 
     <!-- =========================================== CustomFilterActivity == -->
-    
+
     <!-- slide 30d: Build Your Own Filter Activity Title-->
     <string name="CFA_title">Aangepast filter</string>
-    
+
     <!-- slide 30e: Filter Name edit box hint (if user types here, filter will be saved) -->
     <string name="CFA_filterName_hint">Naam geven om op te slaan...</string>
-    
+
     <!-- Filter Name default for copied filters (%s => old filter name) -->
-    
+
     <!-- slide 30a: Filter Starting Universe: all tasks -->
     <string name="CFA_universe_all">Actieve taken</string>
-    
+
     <!-- Filter Criteria Type: add (at the begging of title of the criteria) -->
     <string name="CFA_type_add">of</string>
-    
+
     <!-- Filter Criteria Type: subtract (at the begging of title of the criteria) -->
     <string name="CFA_type_subtract">niet</string>
-    
+
     <!-- Filter Criteria Type: intersect (at the begging of title of the criteria) -->
     <string name="CFA_type_intersect">en</string>
-    
+
     <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
     <string name="CFA_context_chain">%s met criteria</string>
-    
+
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">Regel verwijderen</string>
-    
+
     <!-- slide 30b: Filter Screen Help Text -->
     <string name="CFA_help">Lang drukken op items voor extra opties</string>
-    
+
     <!-- slide 30c: Filter Button: add new -->
     <string name="CFA_button_add">Criteria toevoegen</string>
-    
+
     <!-- slide 30f: Filter Button: view without saving -->
     <string name="CFA_button_view">Weergeven</string>
-    
+
     <!-- Filter Button: save & view filter -->
     <string name="CFA_button_save">Bewaren &amp; Weergeven</string>
 
     <!-- =========================================== CustomFilterCriteria == -->
-        
+
     <!-- Criteria: due by X - display text (? -> user input) -->
     <string name="CFC_dueBefore_text">Einddatum: ?</string>
     <!-- Criteria: due by X - name of criteria -->
@@ -1697,322 +1847,353 @@ Weet je zeker dat je wilt synchroniseren met Astrid.com?</string>
         <item>Volgende week</item>
         <item>Volgende maand</item>
     </string-array>
-    
+
     <!-- Criteria: importance - display text (? -> user input)-->
     <string name="CFC_importance_text">Prioriteit ten minste ?</string>
     <!-- Criteria: importance - name of criteria -->
-    <string name="CFC_importance_name">Prioriteit...</string>        
-    
+    <string name="CFC_importance_name">Prioriteit...</string>
+
     <!-- Criteria: tag - display text (? -> user input) -->
     <string name="CFC_tag_text">Lijst: ?</string>
     <!-- Criteria: tag - name of criteria -->
     <string name="CFC_tag_name">Lijst...</string>
-    
+
     <!-- Criteria: tag_contains - name of criteria -->
     <string name="CFC_tag_contains_name">Lijstnaam bevat...</string>
     <!-- Criteria: tag_contains - text (? -> user input) -->
     <string name="CFC_tag_contains_text">Lijstnaam bevat: ?</string>
-    
+
     <!-- Criteria: title_contains - name of criteria -->
     <string name="CFC_title_contains_name">Naam bevat...</string>
     <!-- Criteria: title_contains - text (? -> user input) -->
     <string name="CFC_title_contains_text">Naam bevat: ?</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-  
-  <!-- Error message for adding to calendar  -->
-  <string name="gcal_TEA_error">Fout bij toevoegen taak aan agenda!</string>
-
-  <!-- Label for adding task to calendar -->
-
-  <!-- slide 21c: Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">Toevoegen aan Agenda</string>
-  
-  <!-- Label when calendar event already exists -->
-  <string name="gcal_TEA_showCalendar_label">Gebeurtenis openen</string>
-  
-  <!-- Toast when unable to open calendar event -->
-  
-  <!-- Toast when calendar event updated because task changed -->
-  <string name="gcal_TEA_calendar_updated">Gebeurtenis ook bijgewerkt!</string>
-  
-  <!-- No calendar label (don\'t add option) -->
-  <string name="gcal_TEA_nocal">Niet toevoegen</string>
-  
-  <string name="gcal_TEA_none_selected">Naar agenda?</string>
-  
-  <string name="gcal_TEA_has_event">Agenda-item</string>
-  
-  <!-- ======================================================== Calendars == -->
-  
-  <!-- Calendar event name when task is completed (%s => task title) -->
-  <string name="gcal_completed_title">%s (voltooid)</string>
-
-  <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
-  <string name="gcal_GCP_default">Standaard agenda</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Error message for adding to calendar  -->
+    <string name="gcal_TEA_error">Fout bij toevoegen taak aan agenda!</string>
 
+    <!-- Label for adding task to calendar -->
 
+    <!-- slide 21c: Label for adding task to calendar -->
+    <string name="gcal_TEA_addToCalendar_label">Toevoegen aan Agenda</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Label when calendar event already exists -->
+    <string name="gcal_TEA_showCalendar_label">Gebeurtenis openen</string>
+
+    <!-- Toast when unable to open calendar event -->
+
+    <!-- Toast when calendar event updated because task changed -->
+    <string name="gcal_TEA_calendar_updated">Gebeurtenis ook bijgewerkt!</string>
+
+    <!-- No calendar label (don\'t add option) -->
+    <string name="gcal_TEA_nocal">Niet toevoegen</string>
+
+    <string name="gcal_TEA_none_selected">Naar agenda?</string>
+
+    <string name="gcal_TEA_has_event">Agenda-item</string>
+
+    <!-- ======================================================== Calendars == -->
+
+    <!-- Calendar event name when task is completed (%s => task title) -->
+    <string name="gcal_completed_title">%s (voltooid)</string>
+
+    <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
+    <string name="gcal_GCP_default">Standaard agenda</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ============================================================= UI == -->
 
     <!-- filters header: GTasks -->
     <string name="gtasks_FEx_header">Google Taken</string>
-    
+
     <!-- filter category for GTasks lists -->
-    
+
     <!-- filter title for GTasks lists (%s => list name) -->
     <string name="gtasks_FEx_title">Google Taken: %s</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_creating_list">Lijst wordt gemaakt...</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_create_list_dialog">Naam nieuwe lijst:</string>
-    
+
     <!-- error to show when list creation fails -->
     <string name="gtasks_FEx_create_list_error">Fout bij aanmaken nieuwe lijst</string>
-    
+
     <!-- short help title for Gtasks -->
-    
+
     <string name="CFC_gtasks_list_text">In lijst: ?</string>
 
     <string name="CFC_gtasks_list_name">In GTasks lijst...</string>
-    
+
     <!-- Message while clearing completed tasks -->
     <string name="gtasks_GTA_clearing">Verwijderen voltooide taken...</string>
-    
+
     <!-- Label for clear completed menu item -->
     <string name="gtasks_GTA_clear_completed">Verwijderen Voltooid</string>
-        
+
     <!-- ============================================ GtasksLoginActivity == -->
-    
-    <!-- Activity Title: Gtasks Login -->    
 
-    <!-- Instructions: Gtasks login -->    
-    <string name="gtasks_GLA_body">Aanmelden bij Google Taken is vereist om te synchroniseren. Google Apps voor Domeinen is op dit moment nog niet ondersteund, daar wordt aan gewerkt!</string>
-    
-    <string name="gtasks_GLA_noaccounts">Geen Google account beschikbaar voor synchronisatie</string>
+    <!-- Activity Title: Gtasks Login -->
 
-    <!-- Instructions: Gtasks further help -->    
-    <string name="gtasks_GLA_further_help">Om taken met inspringing en behoud van volgorde weer te geven, gebruik de Filter pagina en selecteer een Google Takenlijst. Astrid gebruikt eigen instellingen om taken te sorteren.</string>
+    <!-- Instructions: Gtasks login -->
+    <string name="gtasks_GLA_body">Aanmelden bij Google Taken is vereist om te synchroniseren.
+        Google Apps voor Domeinen is op dit moment nog niet ondersteund, daar wordt aan gewerkt!
+    </string>
 
-    <!-- Sign In Button -->    
+    <string name="gtasks_GLA_noaccounts">Geen Google account beschikbaar voor synchronisatie
+    </string>
 
-    <!-- E-mail Address Label -->    
+    <!-- Instructions: Gtasks further help -->
+    <string name="gtasks_GLA_further_help">Om taken met inspringing en behoud van volgorde weer te
+        geven, gebruik de Filter pagina en selecteer een Google Takenlijst. Astrid gebruikt eigen
+        instellingen om taken te sorteren.
+    </string>
+
+    <!-- Sign In Button -->
+
+    <!-- E-mail Address Label -->
+
+    <!-- Password Label -->
 
-    <!-- Password Label -->    
-    
     <!--  Authenticating toast -->
     <string name="gtasks_GLA_authenticating">Verifiëren...</string>
-    
+
     <!-- Google Apps for Domain checkbox -->
 
-    <!-- Error Message when fields aren\'t filled out -->    
+    <!-- Error Message when fields aren\'t filled out -->
 
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
-    <string name="gtasks_GLA_errorAuth">Authenticatiefout! Controleer je gebruikersnaam en wachtwoord in de accountinstellingen van je telefoon.</string>
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
+    <string name="gtasks_GLA_errorAuth">Authenticatiefout! Controleer je gebruikersnaam en
+        wachtwoord in de accountinstellingen van je telefoon.
+    </string>
+
+    <!-- Error Message when we receive an IO Exception -->
+    <string name="gtasks_GLA_errorIOAuth">Sorry, we konden geen verbinding maken met de servers van
+        Google. Probeer het later opnieuw.
+    </string>
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->
+    <string name="gtasks_GLA_errorAuth_captcha">Er kan een captcha zijn getoond. Probeer in te
+        loggen via de browser, kom dan terug en probeer het opnieuw:
+    </string>
 
-    <!-- Error Message when we receive an IO Exception -->    
-    <string name="gtasks_GLA_errorIOAuth">Sorry, we konden geen verbinding maken met de servers van Google. Probeer het later opnieuw.</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->    
-    <string name="gtasks_GLA_errorAuth_captcha">Er kan een captcha zijn getoond. Probeer in te loggen via de browser, kom dan terug en probeer het opnieuw:</string>
-    
     <!-- ============================================== GtasksPreferences == -->
 
-    <!-- GTasks Preferences Title -->    
+    <!-- GTasks Preferences Title -->
     <string name="gtasks_GPr_header">Google Taken (Beta!)</string>
-    
-    <!-- ================================================ Synchronization == -->    
-    
+
+    <!-- ================================================ Synchronization == -->
+
     <!-- title for notification tray when synchronizing -->
 
     <!-- Error Message when we receive a HTTP 503 error -->
-    <string name="gtasks_error_backend">De Google Taken API is een beta-versie en is een fout tegengekomen. De service kan tijdelijk uitgeschakeld zijn, probeer het later opnieuw.</string>
-    
+    <string name="gtasks_error_backend">De Google Taken API is een beta-versie en is een fout
+        tegengekomen. De service kan tijdelijk uitgeschakeld zijn, probeer het later opnieuw.
+    </string>
+
     <!-- Error for account not found -->
-    <string name="gtasks_error_accountNotFound">Account %s niet gevonden--probeer opnieuw in te loggen vanuit de instellingen van Google Taken.</string>
-    
+    <string name="gtasks_error_accountNotFound">Account %s niet gevonden--probeer opnieuw in te
+        loggen vanuit de instellingen van Google Taken.
+    </string>
+
     <!-- Error when ping after refreshing token fails -->
-    <string name="gtasks_error_authRefresh">Authenticatieprobleem bij Google Taken. Controleer je wachtwoord of probeer het later opnieuw.</string>
-    
+    <string name="gtasks_error_authRefresh">Authenticatieprobleem bij Google Taken. Controleer je
+        wachtwoord of probeer het later opnieuw.
+    </string>
+
     <!-- Error when account manager returns no auth token or throws exception -->
-    <string name="gtasks_error_accountManager">Error in uw telefoon account manager. Log uit en log opnieuw in vanuit de Google Task instellingen.</string>
+    <string name="gtasks_error_accountManager">Error in uw telefoon account manager. Log uit en log
+        opnieuw in vanuit de Google Task instellingen.
+    </string>
 
     <!-- Error when authorization error happens in background sync -->
-    <string name="gtasks_error_background_sync_auth">Error authenticatie op achtergrond bezig. Probeer alstublieft een synchronisatie te starten wanneer Astrid is gestart.</string>
-      
+    <string name="gtasks_error_background_sync_auth">Error authenticatie op achtergrond bezig.
+        Probeer alstublieft een synchronisatie te starten wanneer Astrid is gestart.
+    </string>
+
     <string name="gtasks_import_progress">Google Taken importeren</string>
 
-    <string name="gtasks_import_add_to_shared_list">De lijst %1$s is gedeeld met anderen! Wil je de taak %2$s nog steeds toevoegen?</string>
+    <string name="gtasks_import_add_to_shared_list">De lijst %1$s is gedeeld met anderen! Wil je de
+        taak %2$s nog steeds toevoegen?
+    </string>
 
     <string name="gtasks_import_dlg_title">Google Taken import</string>
 
     <string name="gtasks_import_add_task_ok">Taak toevoegen</string>
 
     <string name="gtasks_import_add_task_cancel">Taak niet toevoegen</string>
-        
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- NEW USER EXPERIENCE -->
-  
-  <!-- help bubbles -->
-  <!-- slide 8c: Shown the first time a user sees the task list activity -->
-  <string name="help_popover_add_task">Begin met het toevoegen van een paar taken</string>
-
-  <!-- Shown the first time a user adds a task to a list -->  
-  <string name="help_popover_tap_task">Klik op de taak om te wijzigen en delen</string>
-  
-  <!-- slide 14a: Shown the first time a user sees the list activity -->
-  <string name="help_popover_list_settings">Klik om deze lijst te wijzigen en delen</string>
-  
-  <!-- slide 26c: Shown the first time a user sees the list settings tab -->
-  <string name="help_popover_collaborators">Mensen waar je mee deelt kunnen je helpen bij het maken of voltooien van taken</string>
-  
-  <!-- Shown after user adds a task on tablet-->
-  <string name="help_popover_add_lists">Druk om een lijst toe te voegen</string>
-  
-  <!-- Shown after a user adds a task on phones -->
-  <string name="help_popover_switch_lists">Klik om een lijst toe te voegen of een andere lijst te selecteren</string>
-  
-  
-  
-  <!-- Login activity -->
-  
-  
-  <!-- slide 7b -->
-  <string name="welcome_login_tos_base">Door Astrid te gebruiken ga je akkoord met de</string>
-  
-  <string name="welcome_login_tos_link">\"Algemene Voorwaarden\"</string>
-  
-  <!-- slide 7e -->
-  <string name="welcome_login_pw">Registreren</string>
-  
-  <string name="welcome_sign_in">Aanmelden</string>
-
-  <!-- slide 7f -->
-  <string name="welcome_login_later">Later</string>
-  
-  <string name="welcome_login_confirm_later_title">Waarom log je niet in?</string>
-  
-  <string name="welcome_login_confirm_later_ok">Ik doe het!</string>
-  
-  <string name="welcome_login_confirm_later_cancel">Nee, bedankt</string>
-  
-  <string name="welcome_login_confirm_later_dialog">Log in om het meeste uit Astrid te halen! Je krijgt gratis online backup, synchronisatie met Astrid.com, de mogelijkheid om taken toe te voegen via e-mail en lijsten te delen met vrienden!</string>
+    <!-- NEW USER EXPERIENCE -->
 
+    <!-- help bubbles -->
+    <!-- slide 8c: Shown the first time a user sees the task list activity -->
+    <string name="help_popover_add_task">Begin met het toevoegen van een paar taken</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown the first time a user adds a task to a list -->
+    <string name="help_popover_tap_task">Klik op de taak om te wijzigen en delen</string>
 
+    <!-- slide 14a: Shown the first time a user sees the list activity -->
+    <string name="help_popover_list_settings">Klik om deze lijst te wijzigen en delen</string>
 
-  <!-- Resources for built-in locale plug-in -->
-
-  <!-- Locale Alert Editing Window Title -->
-  <string name="locale_edit_alerts_title">Astrid Filter waarschuwing</string>
-  
-  <!-- Locale Window Help -->                                                                                                                                            
-  <string name="locale_edit_intro">Astrid zal waarschuwen als er een taak is met het volgende filter:</string>
-      
-  <!-- Locale Window Filter Picker UI -->                                                                                                                                        
-      
-  <!-- Locale Window Interval Label -->                                                                                                                                        
-  <string name="locale_interval_label">Waarschuwingen beperken tot:</string>        
-      
-  <!-- Locale Window Interval Values -->                                                                                                                                        
-  <string-array name="locale_interval">
-    <item>eens per uur</item>
-    <item>eens per 6 uur</item>
-    <item>eens per 12 uur</item>
-    <item>eens per dag</item>
-    <item>eens per 3 dagen</item>
-    <item>eens per week</item>
-  </string-array>        
-      
-  <!-- Locale Notification text -->                                                                                                                                        
-  <string name="locale_notification">Er zijn $NUM taken voor: $FILTER</string>     
-      
-  <!-- Locale Plugin was not found, it is required -->
-  <string name="locale_plugin_required">Installeer de Astrid Locale plugin aub!</string>        
-     
+    <!-- slide 26c: Shown the first time a user sees the list settings tab -->
+    <string name="help_popover_collaborators">Mensen waar je mee deelt kunnen je helpen bij het
+        maken of voltooien van taken
+    </string>
 
+    <!-- Shown after user adds a task on tablet-->
+    <string name="help_popover_add_lists">Druk om een lijst toe te voegen</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown after a user adds a task on phones -->
+    <string name="help_popover_switch_lists">Klik om een lijst toe te voegen of een andere lijst te
+        selecteren
+    </string>
+
+
+    <!-- Login activity -->
+
+
+    <!-- slide 7b -->
+    <string name="welcome_login_tos_base">Door Astrid te gebruiken ga je akkoord met de</string>
+
+    <string name="welcome_login_tos_link">\"Algemene Voorwaarden\"</string>
+
+    <!-- slide 7e -->
+    <string name="welcome_login_pw">Registreren</string>
+
+    <string name="welcome_sign_in">Aanmelden</string>
+
+    <!-- slide 7f -->
+    <string name="welcome_login_later">Later</string>
+
+    <string name="welcome_login_confirm_later_title">Waarom log je niet in?</string>
+
+    <string name="welcome_login_confirm_later_ok">Ik doe het!</string>
+
+    <string name="welcome_login_confirm_later_cancel">Nee, bedankt</string>
+
+    <string name="welcome_login_confirm_later_dialog">Log in om het meeste uit Astrid te halen! Je
+        krijgt gratis online backup, synchronisatie met Astrid.com, de mogelijkheid om taken toe te
+        voegen via e-mail en lijsten te delen met vrienden!
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in locale plug-in -->
+
+    <!-- Locale Alert Editing Window Title -->
+    <string name="locale_edit_alerts_title">Astrid Filter waarschuwing</string>
+
+    <!-- Locale Window Help -->
+    <string name="locale_edit_intro">Astrid zal waarschuwen als er een taak is met het volgende
+        filter:
+    </string>
+
+    <!-- Locale Window Filter Picker UI -->
+
+    <!-- Locale Window Interval Label -->
+    <string name="locale_interval_label">Waarschuwingen beperken tot:</string>
+
+    <!-- Locale Window Interval Values -->
+    <string-array name="locale_interval">
+        <item>eens per uur</item>
+        <item>eens per 6 uur</item>
+        <item>eens per 12 uur</item>
+        <item>eens per dag</item>
+        <item>eens per 3 dagen</item>
+        <item>eens per week</item>
+    </string-array>
+
+    <!-- Locale Notification text -->
+    <string name="locale_notification">Er zijn $NUM taken voor: $FILTER</string>
+
+    <!-- Locale Plugin was not found, it is required -->
+    <string name="locale_plugin_required">Installeer de Astrid Locale plugin aub!</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ====================== Plugin Boilerplate ========================= -->
 
-	<!-- filters header: OpenCRX -->
+    <!-- filters header: OpenCRX -->
     <string name="opencrx_FEx_header">OpenCRX</string>
-    
+
     <!-- filter category for OpenCRX ActivityCreators -->
     <string name="opencrx_FEx_dashboard">Werkbladen</string>
-    
+
     <!-- filter category for OpenCRX responsible person -->
     <string name="opencrx_FEx_responsible">Toegewezen Aan</string>
-    
+
     <!--  OpenCRX assignedTo filter title (%s => assigned contact) -->
     <string name="opencrx_FEx_responsible_title">Toegewezen Aan \'%s\'</string>
-    
+
     <!-- detail for showing tasks created by someone else (%s => person name) -->
     <string name="opencrx_PDE_task_from">van %s</string>
-    
+
     <!-- replacement string for task edit "Notes" when using OpenCRX -->
     <string name="opencrx_TEA_notes">Commentaar toevoegen</string>
-    
+
     <string name="opencrx_creator_input_hint">Auteur</string>
 
     <string name="opencrx_contact_input_hint">Toegewezen aan</string>
     <!-- ==================================================== Preferences == -->
 
-    <!-- Preferences Title: OpenCRX -->    
+    <!-- Preferences Title: OpenCRX -->
     <string name="opencrx_PPr_header">OpenCRX</string>
 
     <!-- creator title for tasks that are not synchronized -->
     <string name="opencrx_no_creator">(Niet synchroniseren)</string>
 
-	<!-- preference title for default creator -->
+    <!-- preference title for default creator -->
     <string name="opencrx_PPr_defaultcreator_title">Standaard Activiteit aanmaken</string>
 
     <!-- preference description for default creator (%s -> setting) -->
-    <string name="opencrx_PPr_defaultcreator_summary">Nieuwe activiteiten zullen worden aangemaakt door: %s</string>
+    <string name="opencrx_PPr_defaultcreator_summary">Nieuwe activiteiten zullen worden aangemaakt
+        door: %s
+    </string>
 
     <!-- preference description for default dashboard (when set to \'not synchronized\') -->
-    <string name="opencrx_PPr_defaultcreator_summary_none">Nieuwe activiteiten worden standaard niet gesynchroniseerd</string>
-    
+    <string name="opencrx_PPr_defaultcreator_summary_none">Nieuwe activiteiten worden standaard niet
+        gesynchroniseerd
+    </string>
+
     <!--  OpenCRX host and segment group name -->
     <string name="opencrx_group">OpenCRX server</string>
 
@@ -2021,81 +2202,87 @@ Weet je zeker dat je wilt synchroniseren met Astrid.com?</string>
 
     <!--  dialog title for OpenCRX host -->
     <string name="opencrx_host_dialog_title">OpenCRX server</string>
-    
+
     <!--  example for OpenCRX host -->
-    <string name="opencrx_host_summary">"Bijvoorbeeld: "<i>mijndomein.nl</i></string>
-    
+    <string name="opencrx_host_summary">"Bijvoorbeeld: "
+        <i>mijndomein.nl</i>
+    </string>
+
     <!--  preference description for OpenCRX segment -->
     <string name="opencrx_segment_title">Segment</string>
 
     <!--  dialog title for OpenCRX segment -->
     <string name="opencrx_segment_dialog_title">Gesynchroniseerd segment</string>
-    
+
     <!--  example for OpenCRX segment -->
-    <string name="opencrx_segment_summary">"Bijvoorbeeld: "<i>Standaard</i></string>
-    
+    <string name="opencrx_segment_summary">"Bijvoorbeeld: "
+        <i>Standaard</i>
+    </string>
+
     <!--  default value for OpenCRX segment -->
     <string name="opencrx_segment_default">Standaard</string>
-    
+
     <!--  preference description for OpenCRX provider -->
     <string name="opencrx_provider_title">Aanbieder</string>
 
     <!--  dialog title for OpenCRX provider -->
     <string name="opencrx_provider_dialog_title">OpenCRX gegevens aanbieder</string>
-    
+
     <!--  example for OpenCRX provider -->
-    <string name="opencrx_provider_summary">"Bijvoorbeeld: "<i>CRX</i></string>
-    
+    <string name="opencrx_provider_summary">"Bijvoorbeeld: "
+        <i>CRX</i>
+    </string>
+
     <!--  default value for OpenCRX provider -->
     <string name="opencrx_provider_default">CRX</string>
     <!-- ================================================= Login Activity == -->
 
-    <!-- Activity Title: Opencrx Login -->    
+    <!-- Activity Title: Opencrx Login -->
     <string name="opencrx_PLA_title">Aanmelden bij OpenCRX</string>
 
-    <!-- Instructions: Opencrx login -->    
+    <!-- Instructions: Opencrx login -->
     <string name="opencrx_PLA_body">Aanmelden met OpenCRX account</string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
     <string name="opencrx_PLA_signIn">Aanmelden</string>
 
-    <!-- Login Label -->    
+    <!-- Login Label -->
     <string name="opencrx_PLA_login">Aanmelden</string>
 
-    <!-- Password Label -->    
+    <!-- Password Label -->
     <string name="opencrx_PLA_password">Wachtwoord</string>
-    
-        <!-- Error Message when fields aren\'t filled out -->    
+
+    <!-- Error Message when fields aren\'t filled out -->
     <string name="opencrx_PLA_errorEmpty">Fout: niet alle velden zijn ingevuld</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
     <string name="opencrx_PLA_errorAuth">Fout: Onjuiste gebruikersnaam of wachtwoord!</string>
 
     <!-- ================================================ Synchronization == -->
-        
+
     <!-- title for notification tray after synchronizing -->
     <string name="opencrx_notification_title">OpenCRX</string>
-    
+
     <!-- text for notification tray when synchronizing -->
     <string name="opencrx_notification_text">%s taken bijgewerkt / klik voor details</string>
-    
+
     <!-- Error msg when io exception  -->
     <string name="opencrx_ioerror">Verbindingsfout! Controleer de internetverbinding</string>
 
     <!-- opencrx Login not specified-->
     <string name="opencrx_MLA_email_empty">Aanmelding niet gespecificeerd</string>
-    
+
     <!-- opencrx password not specified-->
     <string name="opencrx_MLA_password_empty">Wachtwoord niet ingevoerd!</string>
-    
+
     <!-- ================================================ labels for layout-elements == -->
-    
+
     <!-- label for task-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_task_assign_label">Taak aan deze persoon toewijzen:</string>
-    
+
     <!-- Spinner-item for unassigned tasks on taskeditactivity -->
     <string name="opencrx_TEA_task_unassigned">&lt;Niemand&gt;</string>
-    
+
     <!-- label for dashboard-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_creator_assign_label">Deze taak toewijzen aan deze auteur:</string>
 
@@ -2103,7 +2290,7 @@ Weet je zeker dat je wilt synchroniseren met Astrid.com?</string>
     <string name="opencrx_TEA_dashboard_default">&lt;Standaard&gt;</string>
 
     <string name="opencrx_TEA_opencrx_title">OpenCRX Controls</string>
-        
+
     <string name="CFC_opencrx_in_workspace_text">In Workspace: ?</string>
 
     <string name="CFC_opencrx_in_workspace_name">In Workspace...</string>
@@ -2113,848 +2300,932 @@ Weet je zeker dat je wilt synchroniseren met Astrid.com?</string>
     <string name="CFC_opencrx_assigned_to_name">Toegewezen aan...</string>
 
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
+    <!-- ================================================== EditPreferences == -->
 
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 32j: Preference Category: Power Pack -->
-  <string name="EPr_powerpack_header">Premium en diverse instellingen</string>
-  <string name="EPr_powerpack_summary">Gemiste oproepen herinneringen, spraakinvoer en diverse instellingen</string>
-  
-  <!-- slide 32e: Preference: Anonymous User Statistics -->
-  <string name="EPr_statistics_title">Anonieme statistieken</string>
-  <!-- Preference: User Statistics (disabled) -->
-  <string name="EPr_statistics_desc_disabled">Geen gebruikersgegevens doorgeven</string>  
-  <!-- slide 32f: Preference: User Statistics (enabled) -->
-  <string name="EPr_statistics_desc_enabled">Help ons Astrid nóg beter te maken door anoniem statistieken over uw gebruik met ons te delen</string>
-      
+    <!-- slide 32j: Preference Category: Power Pack -->
+    <string name="EPr_powerpack_header">Premium en diverse instellingen</string>
+    <string name="EPr_powerpack_summary">Gemiste oproepen herinneringen, spraakinvoer en diverse
+        instellingen
+    </string>
 
+    <!-- slide 32e: Preference: Anonymous User Statistics -->
+    <string name="EPr_statistics_title">Anonieme statistieken</string>
+    <!-- Preference: User Statistics (disabled) -->
+    <string name="EPr_statistics_desc_disabled">Geen gebruikersgegevens doorgeven</string>
+    <!-- slide 32f: Preference: User Statistics (enabled) -->
+    <string name="EPr_statistics_desc_enabled">Help ons Astrid nóg beter te maken door anoniem
+        statistieken over uw gebruik met ons te delen
+    </string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
-    <string name="speech_err_network">Netwerkfout! Spraakherkenning heeft een netwerkverbinding nodig.</string>
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <string name="speech_err_network">Netwerkfout! Spraakherkenning heeft een netwerkverbinding
+        nodig.
+    </string>
     <string name="speech_err_no_match">Sorry, ik begrijp je niet! Probeer het opnieuw.</string>
-    <string name="speech_err_default">Sorry, spraakherkenning ondervond een fout. Graag opnieuw proberen.</string>
-    
+    <string name="speech_err_default">Sorry, spraakherkenning ondervond een fout. Graag opnieuw
+        proberen.
+    </string>
+
     <string name="premium_attach_file">Een bestand bijvoegen</string>
     <string name="premium_record_audio">Een notitie opnemen</string>
     <string name="premium_no_files">Geen bestand bijgevoegd</string>
-    <string name="premium_remove_file_confirm">Weet je het zeker? Dit kan niet ongedaan gemaakt worden</string>
-    
+    <string name="premium_remove_file_confirm">Weet je het zeker? Dit kan niet ongedaan gemaakt
+        worden
+    </string>
+
     <string name="audio_recording_title">Bezig met opname</string>
     <string name="audio_stop_recording">Opname stoppen</string>
     <string name="audio_speak_now">Spreek nu!</string>
     <string name="audio_encoding">Bezig met encoderen...</string>
     <string name="audio_err_encoding">Fout bij encoderen audio</string>
-    <string name="audio_err_playback">Sorry, het systeem ondersteunt dit type audio-bestand niet</string>
-    
-    <string name="search_market_audio">Geen mediaspeler gevonden die dit type audio-bestand ondersteunt. Wil je een mediaspeler downloaden via de Android Market?</string>
+    <string name="audio_err_playback">Sorry, het systeem ondersteunt dit type audio-bestand niet
+    </string>
+
+    <string name="search_market_audio">Geen mediaspeler gevonden die dit type audio-bestand
+        ondersteunt. Wil je een mediaspeler downloaden via de Android Market?
+    </string>
     <string name="search_market_audio_title">Geen mediaspeler gevonden</string>
 
-    <string name="search_market_pdf">Geen PDF-lezer gevonden. Wil je een PDF-lezer downloaden via de Android Market?</string>
+    <string name="search_market_pdf">Geen PDF-lezer gevonden. Wil je een PDF-lezer downloaden via de
+        Android Market?
+    </string>
     <string name="search_market_pdf_title">Geen PDF-lezer gevonden.</string>
 
-    <string name="search_market_ms">Geen MS Office-lezer gevonden. Wil je een MS Office-lezer downloaden via de Android Market?</string>
+    <string name="search_market_ms">Geen MS Office-lezer gevonden. Wil je een MS Office-lezer
+        downloaden via de Android Market?
+    </string>
     <string name="search_market_ms_title">Geen MS Office-lezer gevonden</string>
-    
-    <string name="file_type_unhandled">Sorry! Er is geen applicatie gevonden die dit bestandtype ondersteunt.</string>
+
+    <string name="file_type_unhandled">Sorry! Er is geen applicatie gevonden die dit bestandtype
+        ondersteunt.
+    </string>
     <string name="file_type_unhandled_title">Geen applicatie gevonden</string>
-    
+
     <string name="file_prefix_image">Afbeelding</string>
     <string name="file_prefix_voice">Spraak</string>
     <string name="file_browser_up">Omhoog</string>
     <string name="file_browser_title">Bestand kiezen</string>
     <string name="dir_browser_title">Kies een directory</string>
-    <string name="file_browser_err_permissions">Bestandsrechtenfout! Let erop dat Astrid toegang heeft tot de SD-kaart.</string>
+    <string name="file_browser_err_permissions">Bestandsrechtenfout! Let erop dat Astrid toegang
+        heeft tot de SD-kaart.
+    </string>
     <string name="file_add_picture">Afbeelding toevoegen</string>
     <string name="file_add_sdcard">Bestand toevoegen vanaf SD-kaart</string>
     <string name="file_download_title">Bestand downloaden?</string>
-    <string name="file_download_body">Dit bestand bevindt zich nog niet op de SD-kaart. Nu downloaden?</string>
+    <string name="file_download_body">Dit bestand bevindt zich nog niet op de SD-kaart. Nu
+        downloaden?
+    </string>
     <string name="file_download_progress">Bezig met downloaden...</string>
     <string name="file_err_memory">Afbeelding past niet in het geheugen</string>
     <string name="file_err_copy">Fout bij kopiëren toe te voegen bestand</string>
     <string name="file_err_download">Fout bij downloaden bestand</string>
-    <string name="file_err_no_directory">Oeps! Het ziet er naar uit dat de bestanden directory niet bestaat. Kies een directory om bestanden op te slaan in de Astrid Voorkeuren.</string>
+    <string name="file_err_no_directory">Oeps! Het ziet er naar uit dat de bestanden directory niet
+        bestaat. Kies een directory om bestanden op te slaan in de Astrid Voorkeuren.
+    </string>
     <string name="file_err_show">Sorry, het systeem ondersteunt dit bestandstype niet</string>
-    
+
     <string name="file_dir_dialog_ok">Gebruik deze directory.</string>
     <string name="file_dir_dialog_default">Stel opnieuw in naar standaardinstellingen</string>
-    
+
     <string name="p_files_dir">Premium downloads directory</string>
     <!-- Description for file download directory preference. %s -> chosen directory -->
     <string name="p_files_dir_desc">Taak bijlagen opgeslagen op: %s</string>
     <string name="p_files_dir_desc_default">Standaard directory</string>
 
-    
+
     <!-- in app billing -->
     <string name="billing_not_supported_title">Kan geen aankopen doen.</string>
-    <string name="billing_not_supported_message">De Android Market facturering service is momenteel niet beschikbaar. Je kunt doorgaan om deze applicatie te gebruiken maar je kunt geen aankopen doen.</string>
+    <string name="billing_not_supported_message">De Android Market facturering service is momenteel
+        niet beschikbaar. Je kunt doorgaan om deze applicatie te gebruiken maar je kunt geen
+        aankopen doen.
+    </string>
     <string name="subscriptions_not_supported_title">Kan geen abonnementen aanschaffen.</string>
-    <string name="subscriptions_not_supported_message">De Android Market facturering service werkt niet op dit toestel en ondersteunt momenteel geen abonnementen. Je kunt je aanmelden voor Astrid Premium via http://astrid.com/premium</string>
+    <string name="subscriptions_not_supported_message">De Android Market facturering service werkt
+        niet op dit toestel en ondersteunt momenteel geen abonnementen. Je kunt je aanmelden voor
+        Astrid Premium via http://astrid.com/premium
+    </string>
     <string name="cannot_connect_title">Kan geen verbinding maken met Android Market</string>
-    <string name="cannot_connect_message">Deze applicatie kan geen verbinding maken met de Android Market.
-Jouw versie van de Market is wellicht verouderd.
-Je kunt doorgaan met het gebruiken van deze applicatie maar je kunt geen aankopen doen.</string>
-    
+    <string name="cannot_connect_message">Deze applicatie kan geen verbinding maken met de Android
+        Market.
+        Jouw versie van de Market is wellicht verouderd.
+        Je kunt doorgaan met het gebruiken van deze applicatie maar je kunt geen aankopen doen.
+    </string>
+
     <string name="restoring_transactions">Herstelt transacties</string>
-    
+
     <string name="subscriptions_learn_more">Meer informatie</string>
-    
-    <string name="kii_premium_success">Bedankt voor deelname aan deze aanbieding! Je maand gratis Astrid Premium is nu actief.</string>
+
+    <string name="kii_premium_success">Bedankt voor deelname aan deze aanbieding! Je maand gratis
+        Astrid Premium is nu actief.
+    </string>
     <string name="kii_premium_abort">Speciale aanbieding afgebroken</string>
     <string name="kii_premium_declined">Speciale aanbieding afgewezen</string>
-    <string name="kii_premium_error">Er was een fout tijdens het verwerken van deze aanbieding. Probeer het later opnieuw.</string>
-    
+    <string name="kii_premium_error">Er was een fout tijdens het verwerken van deze aanbieding.
+        Probeer het later opnieuw.
+    </string>
+
     <string name="premium_offers_title">Speciale aanbieding</string>
     <string name="premium_offers_subtitle">Wil je één maand gratis Astrid Premium?</string>
-    <string name="premium_offers_detail">Om een maand gratis Astrid Premium te krijgen kun je een korte video bekijken van deze sponsor (Ze zullen je ook vragen om je e-mail adres.)</string>
+    <string name="premium_offers_detail">Om een maand gratis Astrid Premium te krijgen kun je een
+        korte video bekijken van deze sponsor (Ze zullen je ook vragen om je e-mail adres.)
+    </string>
     <string name="premium_offers_start">Krijg het gratis!</string>
-    
+
     <string name="premium_billing_title">Astrid Premium</string>
     <string name="premium_buy_month">1 maand</string>
     <string name="premium_buy_year">1 jaar</string>
     <string name="premium_description_header">Doe meer met Premium!</string>
-    <string name="premium_description_1">Voeg bestanden toe aan to-dos \n(pdfs, doc, ppt...)</string>
+    <string name="premium_description_1">Voeg bestanden toe aan to-dos \n(pdfs, doc, ppt...)
+    </string>
     <string name="premium_description_2">Synchroniseer bestanden met astrid.com</string>
     <string name="premium_description_3">Voeg bestanden toe via e-mail</string>
     <string name="premium_description_4">Bewaar spraaknotities als audiobestanden</string>
     <string name="premium_description_5">Bekijk nieuwe functies</string>
     <string name="premium_description_6">Steun het Astrid Team!</string>
-    <string name="premium_speech_bubble_1">Premium leidt tot een hogere productiviteit! </string>
+    <string name="premium_speech_bubble_1">Premium leidt tot een hogere productiviteit!</string>
     <string name="premium_speech_bubble_2">Bestel voor een jaar en bespaar 25%%!</string>
     <string name="premium_already_subscribed">Je bent al aangemeld voor Astrid Premium!</string>
-    <string name="premium_login_prompt">Je hebt een Astrid.com account nodig om je in te schrijven voor Premium. Log in of registreer je.</string>
+    <string name="premium_login_prompt">Je hebt een Astrid.com account nodig om je in te schrijven
+        voor Premium. Log in of registreer je.
+    </string>
     <string name="premium_success">Bedankt voor het aanmelden voor Astrid Premium!</string>
-    <string name="premium_success_with_server_error">Bedankt voor het aanmelden voor Astrid Premium! De nieuwe functies zullen snel toegankelijk worden voor je op astrid.com en zouden direct beschikbaar moeten zijn op je telefoon. </string>
-    <string name="premium_verification_error">Het premium abonnement voor deze Google Play account is verbonden aan een andere gebruiker. Bezoek astrid.com/users/profile om aanvullende e-mails aan jouw account toe te voegen</string>
-    <string name="premium_check_for_purchases">Al premium aangeschaft? Klik hier om de aankoop historie op Google Play te bekijken.</string>
+    <string name="premium_success_with_server_error">Bedankt voor het aanmelden voor Astrid Premium!
+        De nieuwe functies zullen snel toegankelijk worden voor je op astrid.com en zouden direct
+        beschikbaar moeten zijn op je telefoon.
+    </string>
+    <string name="premium_verification_error">Het premium abonnement voor deze Google Play account
+        is verbonden aan een andere gebruiker. Bezoek astrid.com/users/profile om aanvullende
+        e-mails aan jouw account toe te voegen
+    </string>
+    <string name="premium_check_for_purchases">Al premium aangeschaft? Klik hier om de aankoop
+        historie op Google Play te bekijken.
+    </string>
     <string name="premium_checking_for_purchases">Controleren op aankopen...</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- Resources for built-in reminders plug-in -->
-    
-  <!-- =============================================== task edit activity == -->
-
-  <!-- Task Edit: Reminder group label -->  
-  <string name="TEA_reminders_group_label">Instellingen herinneringen</string>
-
-  <!-- Task Edit: Reminder header label -->  
-  <string name="TEA_reminder_label">Herinneren:</string>
-
-  <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">op einddatum taak</string>
-
-  <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">op of na einddatum taak</string>
-
-  <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_randomly">Willekeurig eenmalig</string>
-
-  <!-- Task Edit: Reminder alarm clock label -->  
-  <string name="TEA_reminder_alarm_label">Geluid/Trillen:</string>
-
-  <!--  slide 45a: Task Edit: Reminder mode: ring once -->  
-  <string name="TEA_reminder_mode_once">Eenmaal</string>
-
-  <!-- slide 45b: Task Edit: Reminder mode: ring five times -->  
-  <string name="TEA_reminder_mode_five">Vijf maal</string>
-
-  <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->  
-  <string name="TEA_reminder_mode_nonstop">Totdat ik het alarm stop</string>
-  
-  <string name="TEA_reminder_when">wanneer</string>
-  
-  <string name="TEA_reminder_due_short">einddatum</string>
-
-  <string name="TEA_reminder_overdue_short">te laat</string>
-
-  <string name="TEA_reminder_randomly_short">willekeurig</string>
-
-  <string name="TEA_reminder_display_one">Herinner me %s</string>
-  
-  <string name="TEA_reminder_display_multiple">Herinner %s</string>
-
-  <string-array name="TEA_reminder_random">
-    <!-- random reminder choices for task edit page. -->
-    <item>een uur</item>
-    <item>een dag</item>
-    <item>een week</item>
-    <item>over twee weken</item>
-    <item>een maand</item>
-    <item>over twee maanden</item>
-  </string-array>
-  
-  <!-- ==================================================== notifications == -->
-  
-  <!-- Name of filter when viewing a reminder -->
-  <string name="rmd_NoA_filter">Herinnering!</string>
-  
-  <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Reeds voltooid!</string>
-  
-  <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Sluimeren...</string>
-  
-  <!-- Reminder: Completed Toast -->
-  <string name="rmd_NoA_completed_toast">Gefeliciteerd met het afronden!</string>
-  
-  <!-- Prefix for reminder dialog title -->
-  <string name="rmd_NoA_dlg_title">Herinnering:</string>
-  
-  <!-- ==================================================== user reengagement == -->
-
-  <!-- Titles for user reengagement notifications -->
-  <string-array name="rmd_reengage_notif_titles">
-    <item>Een bericht van Astrid</item>
-    <!-- %s -> first name -->
-    <item>Bericht voor %s</item> 
-    <item>Your Astrid digest</item>
-    <item>Herinneringen van Astrid</item>
-  </string-array>
-    
-  <string name="rmd_reengage_name_default">jij</string>
-
-  
-  <string name="rmd_reengage_add_tasks">Taak toevoegen</string>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs -->
-  <string-array name="rmd_reengage_dialog_options">
-    <item>Het is tijd om je to-do lijst op te schonen!</item>
-    <item>Sommige taken vereisen jouw aandacht!</item>
-    <item>Hallo, zou je hier naar kunnen kijken?</item>
-    <item>Ik heb een aantal taken met jouw naam erop!</item>
-    <item>Een nieuwe lading taken voor jou om naar te kijken vandaag!</item>
-    <item>Je ziet er fantastisch uit! Klaar om te beginnen?</item>
-    <item>Ik denk dat het een fantastische dag is om wat werk gedaan te krijgen!</item>
-  </string-array>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>Zou je niet georganiseerd willen zijn?</item>
-    <item>Ik ben Astrid! Klaar om je te helpen meer voor elkaar te krijgen!</item>
-    <item>Bezige bij! Laat mij een paar taken van je overnemen.</item>
-    <item>Ik kan je helpen om alle details van je leven in de gaten te houden.</item>
-    <item>Dus jij wil echt meer voor elkaar krijgen? Ik ook!</item>
-    <item>Aangenaam kennis te maken!</item>
-  </string-array>
-  <!-- ============================================= reminder preferences == -->
-  
-  <!-- slide 33d: Reminder Preference Screen Title -->
-  <string name="rmd_EPr_alerts_header">Instellingen herinneringen</string>
-  <string name="rmd_EPr_alerts_summary">Rustige uren, snooze opties, niveau volhouden</string>
-    
-  <!-- Reminder Preference: Reminders Enabled Title -->
-  <string name="rmd_EPr_enabled_title">Herinneringen Ingeschakeld?</string>
-  <!-- Reminder Preference Reminders Enabled Description (true) -->
-  <string name="rmd_EPr_enabled_desc_true">Astrid herinneringen zijn ingeschakeld (dit is normaal)</string>
-  <!-- Reminder Preference Reminders Enabled Description (false) -->
-  <string name="rmd_EPr_enabled_desc_false">Astrid herinneringen zullen nooit weergegeven worden op je telefoon</string>  
-    
-  <!-- Reminder Preference: Quiet Hours Start Title -->
-  <string name="rmd_EPr_quiet_hours_start_title">Rustperiode begint</string>
-  <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">Waarschuwingen geluidloos na %s.\nOpmerking: trillen wordt via onderstaande instellingen ingesteld!</string>
-  <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
-  <string name="rmd_EPr_quiet_hours_desc_none">Rustperiode is uitgeschakeld</string>
-  
-  <!-- Reminder Preference: Quiet Hours End Title -->
-  <string name="rmd_EPr_quiet_hours_end_title">Rustperiode eindigt</string>
-  <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_end_desc">Waarschuwingsgeluid weer geactiveerd om %s</string>
-
-  <!-- Reminder Preference: Default Reminder Title -->
-  <string name="rmd_EPr_rmd_time_title">Standaard herinnering</string>
-  <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
-  <string name="rmd_EPr_rmd_time_desc">Waarschuwingen voor taken zonder eindtijd verschijnen om %s</string>
-
-  <!-- Reminder Preference: Notification Ringtone Title -->
-  <string name="rmd_EPr_ringtone_title">Geluid voor herinneringen</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
-  <string name="rmd_EPr_ringtone_desc_custom">Aangepast geluid ingesteld</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
-  <string name="rmd_EPr_ringtone_desc_silent">Geluid op stil gezet</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
-  <string name="rmd_EPr_ringtone_desc_default">Standaard geluid wordt gebruikt</string>
-  
-  <!-- Reminder Preference: Notification Persistence Title -->
-  <string name="rmd_EPr_persistent_title">Herinneringen aanhouden</string>
-  <!-- Reminder Preference: Notification Persistence Description (true) -->
-  <string name="rmd_EPr_persistent_desc_true">Herinneringen moeten individueel worden gewist</string>
-  <!-- Reminder Preference: Notification Persistence Description (false) -->
-  <string name="rmd_EPr_persistent_desc_false">Herinneringen kunnen met de \"Alles wissen\" knop worden uitgezet</string>
-
-  <!-- Reminder Preference: Social Reminders Title -->
-  <string name="rmd_EPr_social_title">Sociale aanmoediging</string>
-  <!-- Reminder Preference: Social Reminders Summary (enabled) -->
-  <string name="rmd_EPr_social_summary_enabled">Herinneringen zullen je laten zien wie er op je rekent voor gedeelde taken</string>
-  <!-- Reminder Preference: Social Reminders Summary (disabled) -->
-  <string name="rmd_EPr_social_summary_disabled">Herinneringen zullen je niet laten zien wie er op je rekent voor gedeelde taken</string>
-  
-  
-  
-  <!-- Reminder Preference: Notification Icon Title -->
-  <!-- Reminder Preference: Notification Icon Description -->
-
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
-  <string name="rmd_EPr_multiple_maxvolume_title">Max. volume voor multiple-ring herinneringen</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid zal het volume voor multi-ring herinneringen maximaliseren</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid zal de systeem-instellingen voor het volume gebruiken</string>
-
-  <!-- Reminder Preference: Vibrate Title -->
-  <string name="rmd_EPr_vibrate_title">Trillen bij herinnering</string>
-  <!-- Reminder Preference: Vibrate Description (true) -->
-  <string name="rmd_EPr_vibrate_desc_true">Astrid laat telefoon trillen bij herinnering</string>
-  <!-- Reminder Preference: Vibrate Description (false) -->
-  <string name="rmd_EPr_vibrate_desc_false">Astrid laat telefoon niet trillen bij herinnering</string>
-
-  <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">Astrid aanmoedigingen</string>
-  <!-- Reminder Preference: Nagging Description (true) -->
-  <string name="rmd_EPr_nagging_desc_true">Astrid geeft motiverende herinneringen</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_nagging_desc_false">Astrid geeft geen aanmoedigings berichten</string>
-
-  <!-- Reminder Preference: Snooze Dialog Title -->  
-  <string name="rmd_EPr_snooze_dialog_title">Sluimeren dialoog UU:MM</string>
-  <!-- Reminder Preference: Snooze Dialog Description (true) -->
-  <string name="rmd_EPr_snooze_dialog_desc_true">Sluimeren door selecteren nieuwe sluimertijd (UU:MM)</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_snooze_dialog_desc_false">Sluimeren door selecteren aantal dagen/uren sluimertijd</string>
-  
-  <!-- slide 44g: Reminder Preference: Default Reminders Title -->
-  <string name="rmd_EPr_defaultRemind_title">Willekeurige herinneringen</string>
-  <!-- Reminder Preference: Default Reminders Setting (disabled) -->
-  <string name="rmd_EPr_defaultRemind_desc_disabled">Nieuwe taken hebben geen willekeurige herinneringen</string>
-  <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
-  <string name="rmd_EPr_defaultRemind_desc">Nieuwe taken willekeurig herinneren: %s</string>
-  
-  <!-- slide 39a: Defaults Title -->
-  
-  <string-array name="EPr_reminder_random">
-    <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
-    <item>uitgeschakeld</item>
-    <!-- slide 44b -->
-    <item>uurlijks</item>
-    <!-- slide 44c -->
-    <item>dagelijks</item>
-    <!-- slide 44d-->
-    <item>wekelijks</item>
-    <!-- slide 44e-->
-    <item>tweewekelijks</item>
-    <!-- slide 44f -->
-    <item>maandelijks</item>
-    <item>tweemaandelijks</item>
-  </string-array>
-        
-  <string-array name="EPr_quiet_hours_start">
-    <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
-    <item>uitgeschakeld</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>00:00</item>
-    <item>01:00</item>
-    <item>02:00</item>
-    <item>03:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-  </string-array>
-  
-  <string-array name="EPr_quiet_hours_end">
-    <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>00:00</item>
-    <item>01:00</item>
-    <item>02:00</item>
-    <item>03:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-  </string-array>
-  
-  <string-array name="EPr_rmd_time">
-    <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>00:00</item>
-    <item>01:00</item>
-    <item>02:00</item>
-    <item>03:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-  </string-array>
-  
-  <!-- =============================================== random reminders == -->
-
-  <string name="reminders_social">Deze mensen rekenen op je!</string>
-  
-  <string name="reminders_social_one">%s rekent op je!</string>
-  
-  <string name="reminders_social_multiple">%1$s, %2$s, en anderen rekenen op je!</string>
-
-  <string-array name="reminders">
-      <!-- reminders: Make these < 20 chars so the task name is displayed -->
-      <item>Hoi! Mag ik even?</item>
-      <item>Kan ik je even spreken?</item>
-      <item>Heb je een paar minuutjes?</item>
-      <item>Was je dit vergeten?</item>
-      <item>Mag ik even?</item>
-      <item>Luister even...</item>
-      <item>In je agenda:</item>
-      <item>Niets te doen?</item>
-      <item>Hier is Astrid!</item>
-      <item>En dan nog even dit...</item>
-      <item>Mag ik even de aandacht?</item>
-      <item>Dit is het moment om</item>
-  </string-array>
-
-  <string-array name="reminders_due">
-      <!-- reminders related to task due date -->
-      <item>Tijd om te knallen!</item>
-      <item>Einddatum in zicht!</item>
-      <item>Klaar voor de start?</item>
-      <item>Je hebt \'t beloofd:</item>
-      <item>Je zou beginnen met:</item>
-      <item>Start nu:</item>
-      <item>Het is tijd!</item>
-      <item>Sorry hoor! Nu moet</item>
-      <item>Heb je even? Het is tijd voor:</item>
-  </string-array>
-
-  <string-array name="reminders_snooze">
-      <!-- reminders related to snooze -->
-      <item>Niet lui zijn nu!</item>
-      <item>Uitgesluimerd!</item>
-      <item>Sluimertijd is voorbij!</item>
-      <item>Ben je nu eindelijk vrij?</item>
-      <item>Peper in je reet!</item>
-  </string-array>
-  
-  <string-array name="reminder_responses">
-      <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
-      <item>Ik heb iets voor je!</item> 
-      <item>Klaar om af te vinken?</item>
-      <item>Zou je dit niet kunnen doen?</item>
-      <item>Hoe is \'t, ben je er klaar voor?</item>
-      <item>Klaar voor de start?</item>
-      <item>Kun je dit regelen?</item>
-      <item>Eeuwige roem lonkt! Maak dit af!</item>
-      <item>Lege lijsten zijn mooie lijsten...</item>
-      <item>Waarom niet vandaag?</item>
-      <item>Maak het af, ik word er niet goed van!</item>
-      <item>Kan dit af? Natuurlijk!</item>
-      <item>Gaat dit ooit afkomen?</item>
-      <item>Zo gaat \'ie goed! Zet door!</item>
-      <item>Ik ben trots op je! Kom op!</item>
-      <item>Kopje koffie hierna?</item>
-      <item>Aaah, nog eentje dan? Alsjeblieft?</item>
-      <item>Tijd om je te-doen lijst op te schonen!</item>
-      <item>Ben jij op Team Order of Team Chaos? Team Order! Let\'s go!</item>
-      <item>Had ik al gezegd dat je geweldig bent? Ga zo door!</item>
-      <item>Een taak die een dag blijft houd de rommel weg... Tot ziens warhoofd!</item>
-      <item>Hoe doe je het toch? Wow, ik ben onder de indruk!</item>
-      <item>Je komt niet verder met je knappe koppie. Werk aan de winkel!</item>
-      <item>Mooi weer voor dit werk, vind je niet?</item>
-      <item>A spot of tea while you work on this?</item>
-      <item>Als je dit nu al gedaan had kon je nu buiten spelen!</item>
-      <item>Het is tijd. Je kan het niet eeuwig blijven uitstellen.</item>
-      <item>Telkens als je me negeert, sterft een klein stukje van mij.</item>
-  </string-array>
-
-  <string-array name="postpone_nags">
-      <!-- Astrid\'s nagging when user clicks postpone -->
-      <item>Hee, je bent toch geen slakkie!?</item>
-      <item>Ik word zo moe van uitstellen...</item>
-      <item>Maak je onsterfelijk, doe dit!</item>
-      <item>Toen je zei \'Snooze\' bedoelde je dat je er mee bezig was, toch?</item>
-      <item>Dit is de laatste keer dat je dit uitstelt, oké?</item>
-      <item>Pssst, ik wil niks zeggen maar....</item>
-      <item>Waarom uitstellen? Gewoon doen!</item>
-      <item>Straks? Wie zei straks? Nu bedoel je!</item>
-      <item>Ik vind je geweldig! Dit kun je vast ook:</item>
-      <item>Bereik je doel, maak dit af!</item>
-      <item>Van uitstel komt afstel. Wanneer leer je nou eens?</item>
-      <item>Ik heb genoeg van je smoesjes! Doe het nu maar gewoon!</item>
-      <item>Gebruikte je die smoes vorige keer niet al?</item>
-      <item>Ik kan je niet helpen als je me blijft negeren...</item>
-  </string-array>
+    <!-- Resources for built-in reminders plug-in -->
 
+    <!-- =============================================== task edit activity == -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder group label -->
+    <string name="TEA_reminders_group_label">Instellingen herinneringen</string>
 
+    <!-- Task Edit: Reminder header label -->
+    <string name="TEA_reminder_label">Herinneren:</string>
 
-  <!-- Resources for built-in repeat plug-in -->
-
-  <!-- repeating plugin name -->
-  <string name="repeat_plugin">Herhalende taken</string>
-  
-  <!-- repeating plugin description -->
-  <string name="repeat_plugin_desc">Herhalende taken toestaan</string>
-  
-  <!-- slide 20a: checkbox for turning on/off repeats -->
-  <string name="repeat_enabled">Herhalingen</string>
-  
-  <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
-  <string name="repeat_every">Elke %d</string>
-  
-  <!-- hint when opening repeat interval -->
-  <string name="repeat_interval_prompt">Herhaal interval</string>
-  
-  <!-- slide 19b-->
-  <string name="repeat_never">Niet herhalend</string>
-  <!-- slide 20f-->
-  <string name="repeat_dont">Niet herhalen</string>
-      
-  <string-array name="repeat_interval_short">
-    <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
-    <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">
-    <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>Dag(en)</item>
-    <item>week/weken</item>
-    <item>maand(en)</item>
-    <item>uur/uren</item>
-    <item>Minu(u)t(en)</item>
-    <item>Ja(a)r(en)</item>
-  </string-array>
-  
-  <string name="repeat_days">dagen </string>
-  <string name="repeat_weekdays">weekdagen</string>
-  <string name="repeat_weeks">weken</string>
-  <string name="repeat_months">maanden</string>
-  <string name="repeat_years">jaren</string>
-  <string name="repeat_hours">uren</string>
-  <string name="repeat_minutes">minuten</string>
-  
-  <string-array name="repeat_until_shortcuts">
-      <item>Altijd</item>
-      <item>Specifieke dag</item>
-      <item>Vandaag</item>
-      <item>Morgen</item>
-      <item>(volgende dag)</item>
-      <item>Volgende week</item>
-      <item>Binnen twee weken</item>
-      <item>Volgende maand</item>
-  </string-array>
-  
-  <string name="repeat_until_title">Herhalen tot...</string>
-  
-  <string name="repeat_keep_going">Doorlopend</string>
-  
-  <string-array name="repeat_type">
-    <!-- slide 20c: repeat type (date to repeat from) -->
-    <item>vanaf einddatum</item>
-    <!-- slide 20c -->
-    <item>vanaf datum voltooid</item>
-  </string-array>
-  
-  <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
-  <string name="repeat_detail_byday">$I op $D</string>
-  
-  <!-- task detail for repeat from due date (%s -> interval) -->
-  <string name="repeat_detail_duedate">Elke %s</string>
-
-  <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
-  <string name="repeat_detail_duedate_until">Elke %1$s\ntot %2$s</string>
-  
-  <!-- task detail for repeat from completion date (%s -> interval) -->
-  <string name="repeat_detail_completion">%s na voltooing</string>
-  
-  <!-- text for button when repeating task indefinitely -->
-  <string name="repeat_forever">Altijd herhalen</string>
-
-  <!-- text for button when repeating task until specified date (%s -> date string) -->
-  <string name="repeat_until">Herhalen tot %s</string>
-  
-  <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title">Verplaatsen taak \"%s\"</string>
-
-  <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title_last_time">Herhalende taak \"%s\" voltooid</string>
-      
-  <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->  
-  <string name="repeat_rescheduling_dialog_bubble">%1$s Ik heb deze herhalende taak verzet van %2$s naar %3$s</string>
-  
-  <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
-  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s Ik heb deze herhalende taak opnieuw ingepland op %2$s</string>
-  
-  <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
-  <string name="repeat_rescheduling_dialog_bubble_last_time">Deze taak herhaalde zichzelf tot %1$s. Nu ben je klaar. %2$s</string>
-  
-  <string-array name="repeat_encouragement">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>Goed gedaan!</item>
-      <item>Wauw... Ik ben zo trots op je!</item>
-      <item>Ik hou ervan wanneer je productief bent!</item>
-      <item>Geeft het geen goed gevoel om iets af te kunnen vinken?</item>
-  </string-array>
-
-  <string-array name="repeat_encouragement_last_time">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>Goed gedaan!</item>
-      <item>Ik ben zo trots op je!</item>
-      <item>Ik hou ervan wanneer je productief bent!</item>
-  </string-array>
-  
+    <!-- Task Edit: Reminder @ deadline -->
+    <string name="TEA_reminder_due">op einddatum taak</string>
 
+    <!-- Task Edit: Reminder after deadline -->
+    <string name="TEA_reminder_overdue">op of na einddatum taak</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder at random times (%s => time plural)-->
+    <string name="TEA_reminder_randomly">Willekeurig eenmalig</string>
 
-    
-  <!-- Subtasks Help Introduction -->
-  <string name="subtasks_help_title">Sorteren en inspringen in Astrid</string>
-  <string name="subtasks_help_1">Druk en sleep om een taak te verplaatsen</string>
-  <string name="subtasks_help_2">Sleep verticaal om te herschikken</string>
-  <string name="subtasks_help_3">Sleep horizontaal om in te springen</string>
-    
+    <!-- Task Edit: Reminder alarm clock label -->
+    <string name="TEA_reminder_alarm_label">Geluid/Trillen:</string>
 
+    <!--  slide 45a: Task Edit: Reminder mode: ring once -->
+    <string name="TEA_reminder_mode_once">Eenmaal</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 45b: Task Edit: Reminder mode: ring five times -->
+    <string name="TEA_reminder_mode_five">Vijf maal</string>
+
+    <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
+    <string name="TEA_reminder_mode_nonstop">Totdat ik het alarm stop</string>
+
+    <string name="TEA_reminder_when">wanneer</string>
+
+    <string name="TEA_reminder_due_short">einddatum</string>
+
+    <string name="TEA_reminder_overdue_short">te laat</string>
+
+    <string name="TEA_reminder_randomly_short">willekeurig</string>
+
+    <string name="TEA_reminder_display_one">Herinner me %s</string>
+
+    <string name="TEA_reminder_display_multiple">Herinner %s</string>
+
+    <string-array name="TEA_reminder_random">
+        <!-- random reminder choices for task edit page. -->
+        <item>een uur</item>
+        <item>een dag</item>
+        <item>een week</item>
+        <item>over twee weken</item>
+        <item>een maand</item>
+        <item>over twee maanden</item>
+    </string-array>
+
+    <!-- ==================================================== notifications == -->
+
+    <!-- Name of filter when viewing a reminder -->
+    <string name="rmd_NoA_filter">Herinnering!</string>
+
+    <!-- Reminder: Task was already done -->
+    <string name="rmd_NoA_done">Reeds voltooid!</string>
+
+    <!-- Reminder: Snooze button (remind again later) -->
+    <string name="rmd_NoA_snooze">Sluimeren...</string>
+
+    <!-- Reminder: Completed Toast -->
+    <string name="rmd_NoA_completed_toast">Gefeliciteerd met het afronden!</string>
+
+    <!-- Prefix for reminder dialog title -->
+    <string name="rmd_NoA_dlg_title">Herinnering:</string>
+
+    <!-- ==================================================== user reengagement == -->
+
+    <!-- Titles for user reengagement notifications -->
+    <string-array name="rmd_reengage_notif_titles">
+        <item>Een bericht van Astrid</item>
+        <!-- %s -> first name -->
+        <item>Bericht voor %s</item>
+        <item>Your Astrid digest</item>
+        <item>Herinneringen van Astrid</item>
+    </string-array>
+
+    <string name="rmd_reengage_name_default">jij</string>
+
+
+    <string name="rmd_reengage_add_tasks">Taak toevoegen</string>
+
+    <!-- Speech bubble options for astrid in reengagement notifs -->
+    <string-array name="rmd_reengage_dialog_options">
+        <item>Het is tijd om je to-do lijst op te schonen!</item>
+        <item>Sommige taken vereisen jouw aandacht!</item>
+        <item>Hallo, zou je hier naar kunnen kijken?</item>
+        <item>Ik heb een aantal taken met jouw naam erop!</item>
+        <item>Een nieuwe lading taken voor jou om naar te kijken vandaag!</item>
+        <item>Je ziet er fantastisch uit! Klaar om te beginnen?</item>
+        <item>Ik denk dat het een fantastische dag is om wat werk gedaan te krijgen!</item>
+    </string-array>
+
+    <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>Zou je niet georganiseerd willen zijn?</item>
+        <item>Ik ben Astrid! Klaar om je te helpen meer voor elkaar te krijgen!</item>
+        <item>Bezige bij! Laat mij een paar taken van je overnemen.</item>
+        <item>Ik kan je helpen om alle details van je leven in de gaten te houden.</item>
+        <item>Dus jij wil echt meer voor elkaar krijgen? Ik ook!</item>
+        <item>Aangenaam kennis te maken!</item>
+    </string-array>
+    <!-- ============================================= reminder preferences == -->
+
+    <!-- slide 33d: Reminder Preference Screen Title -->
+    <string name="rmd_EPr_alerts_header">Instellingen herinneringen</string>
+    <string name="rmd_EPr_alerts_summary">Rustige uren, snooze opties, niveau volhouden</string>
+
+    <!-- Reminder Preference: Reminders Enabled Title -->
+    <string name="rmd_EPr_enabled_title">Herinneringen Ingeschakeld?</string>
+    <!-- Reminder Preference Reminders Enabled Description (true) -->
+    <string name="rmd_EPr_enabled_desc_true">Astrid herinneringen zijn ingeschakeld (dit is
+        normaal)
+    </string>
+    <!-- Reminder Preference Reminders Enabled Description (false) -->
+    <string name="rmd_EPr_enabled_desc_false">Astrid herinneringen zullen nooit weergegeven worden
+        op je telefoon
+    </string>
+
+    <!-- Reminder Preference: Quiet Hours Start Title -->
+    <string name="rmd_EPr_quiet_hours_start_title">Rustperiode begint</string>
+    <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_start_desc">Waarschuwingen geluidloos na %s.\nOpmerking:
+        trillen wordt via onderstaande instellingen ingesteld!
+    </string>
+    <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
+    <string name="rmd_EPr_quiet_hours_desc_none">Rustperiode is uitgeschakeld</string>
+
+    <!-- Reminder Preference: Quiet Hours End Title -->
+    <string name="rmd_EPr_quiet_hours_end_title">Rustperiode eindigt</string>
+    <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_end_desc">Waarschuwingsgeluid weer geactiveerd om %s</string>
+
+    <!-- Reminder Preference: Default Reminder Title -->
+    <string name="rmd_EPr_rmd_time_title">Standaard herinnering</string>
+    <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
+    <string name="rmd_EPr_rmd_time_desc">Waarschuwingen voor taken zonder eindtijd verschijnen om
+        %s
+    </string>
+
+    <!-- Reminder Preference: Notification Ringtone Title -->
+    <string name="rmd_EPr_ringtone_title">Geluid voor herinneringen</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
+    <string name="rmd_EPr_ringtone_desc_custom">Aangepast geluid ingesteld</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
+    <string name="rmd_EPr_ringtone_desc_silent">Geluid op stil gezet</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
+    <string name="rmd_EPr_ringtone_desc_default">Standaard geluid wordt gebruikt</string>
+
+    <!-- Reminder Preference: Notification Persistence Title -->
+    <string name="rmd_EPr_persistent_title">Herinneringen aanhouden</string>
+    <!-- Reminder Preference: Notification Persistence Description (true) -->
+    <string name="rmd_EPr_persistent_desc_true">Herinneringen moeten individueel worden gewist
+    </string>
+    <!-- Reminder Preference: Notification Persistence Description (false) -->
+    <string name="rmd_EPr_persistent_desc_false">Herinneringen kunnen met de \"Alles wissen\" knop
+        worden uitgezet
+    </string>
+
+    <!-- Reminder Preference: Social Reminders Title -->
+    <string name="rmd_EPr_social_title">Sociale aanmoediging</string>
+    <!-- Reminder Preference: Social Reminders Summary (enabled) -->
+    <string name="rmd_EPr_social_summary_enabled">Herinneringen zullen je laten zien wie er op je
+        rekent voor gedeelde taken
+    </string>
+    <!-- Reminder Preference: Social Reminders Summary (disabled) -->
+    <string name="rmd_EPr_social_summary_disabled">Herinneringen zullen je niet laten zien wie er op
+        je rekent voor gedeelde taken
+    </string>
+
+
+    <!-- Reminder Preference: Notification Icon Title -->
+    <!-- Reminder Preference: Notification Icon Description -->
+
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
+    <string name="rmd_EPr_multiple_maxvolume_title">Max. volume voor multiple-ring herinneringen
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid zal het volume voor multi-ring
+        herinneringen maximaliseren
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid zal de systeem-instellingen voor het
+        volume gebruiken
+    </string>
+
+    <!-- Reminder Preference: Vibrate Title -->
+    <string name="rmd_EPr_vibrate_title">Trillen bij herinnering</string>
+    <!-- Reminder Preference: Vibrate Description (true) -->
+    <string name="rmd_EPr_vibrate_desc_true">Astrid laat telefoon trillen bij herinnering</string>
+    <!-- Reminder Preference: Vibrate Description (false) -->
+    <string name="rmd_EPr_vibrate_desc_false">Astrid laat telefoon niet trillen bij herinnering
+    </string>
+
+    <!-- Reminder Preference: Nagging Title -->
+    <string name="rmd_EPr_nagging_title">Astrid aanmoedigingen</string>
+    <!-- Reminder Preference: Nagging Description (true) -->
+    <string name="rmd_EPr_nagging_desc_true">Astrid geeft motiverende herinneringen</string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_nagging_desc_false">Astrid geeft geen aanmoedigings berichten</string>
+
+    <!-- Reminder Preference: Snooze Dialog Title -->
+    <string name="rmd_EPr_snooze_dialog_title">Sluimeren dialoog UU:MM</string>
+    <!-- Reminder Preference: Snooze Dialog Description (true) -->
+    <string name="rmd_EPr_snooze_dialog_desc_true">Sluimeren door selecteren nieuwe sluimertijd
+        (UU:MM)
+    </string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_snooze_dialog_desc_false">Sluimeren door selecteren aantal dagen/uren
+        sluimertijd
+    </string>
+
+    <!-- slide 44g: Reminder Preference: Default Reminders Title -->
+    <string name="rmd_EPr_defaultRemind_title">Willekeurige herinneringen</string>
+    <!-- Reminder Preference: Default Reminders Setting (disabled) -->
+    <string name="rmd_EPr_defaultRemind_desc_disabled">Nieuwe taken hebben geen willekeurige
+        herinneringen
+    </string>
+    <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
+    <string name="rmd_EPr_defaultRemind_desc">Nieuwe taken willekeurig herinneren: %s</string>
+
+    <!-- slide 39a: Defaults Title -->
+
+    <string-array name="EPr_reminder_random">
+        <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
+        <item>uitgeschakeld</item>
+        <!-- slide 44b -->
+        <item>uurlijks</item>
+        <!-- slide 44c -->
+        <item>dagelijks</item>
+        <!-- slide 44d-->
+        <item>wekelijks</item>
+        <!-- slide 44e-->
+        <item>tweewekelijks</item>
+        <!-- slide 44f -->
+        <item>maandelijks</item>
+        <item>tweemaandelijks</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_start">
+        <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
+        <item>uitgeschakeld</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>00:00</item>
+        <item>01:00</item>
+        <item>02:00</item>
+        <item>03:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_end">
+        <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>00:00</item>
+        <item>01:00</item>
+        <item>02:00</item>
+        <item>03:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+    </string-array>
+
+    <string-array name="EPr_rmd_time">
+        <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>00:00</item>
+        <item>01:00</item>
+        <item>02:00</item>
+        <item>03:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+    </string-array>
+
+    <!-- =============================================== random reminders == -->
+
+    <string name="reminders_social">Deze mensen rekenen op je!</string>
+
+    <string name="reminders_social_one">%s rekent op je!</string>
+
+    <string name="reminders_social_multiple">%1$s, %2$s, en anderen rekenen op je!</string>
+
+    <string-array name="reminders">
+        <!-- reminders: Make these < 20 chars so the task name is displayed -->
+        <item>Hoi! Mag ik even?</item>
+        <item>Kan ik je even spreken?</item>
+        <item>Heb je een paar minuutjes?</item>
+        <item>Was je dit vergeten?</item>
+        <item>Mag ik even?</item>
+        <item>Luister even...</item>
+        <item>In je agenda:</item>
+        <item>Niets te doen?</item>
+        <item>Hier is Astrid!</item>
+        <item>En dan nog even dit...</item>
+        <item>Mag ik even de aandacht?</item>
+        <item>Dit is het moment om</item>
+    </string-array>
+
+    <string-array name="reminders_due">
+        <!-- reminders related to task due date -->
+        <item>Tijd om te knallen!</item>
+        <item>Einddatum in zicht!</item>
+        <item>Klaar voor de start?</item>
+        <item>Je hebt \'t beloofd:</item>
+        <item>Je zou beginnen met:</item>
+        <item>Start nu:</item>
+        <item>Het is tijd!</item>
+        <item>Sorry hoor! Nu moet</item>
+        <item>Heb je even? Het is tijd voor:</item>
+    </string-array>
+
+    <string-array name="reminders_snooze">
+        <!-- reminders related to snooze -->
+        <item>Niet lui zijn nu!</item>
+        <item>Uitgesluimerd!</item>
+        <item>Sluimertijd is voorbij!</item>
+        <item>Ben je nu eindelijk vrij?</item>
+        <item>Peper in je reet!</item>
+    </string-array>
+
+    <string-array name="reminder_responses">
+        <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
+        <item>Ik heb iets voor je!</item>
+        <item>Klaar om af te vinken?</item>
+        <item>Zou je dit niet kunnen doen?</item>
+        <item>Hoe is \'t, ben je er klaar voor?</item>
+        <item>Klaar voor de start?</item>
+        <item>Kun je dit regelen?</item>
+        <item>Eeuwige roem lonkt! Maak dit af!</item>
+        <item>Lege lijsten zijn mooie lijsten...</item>
+        <item>Waarom niet vandaag?</item>
+        <item>Maak het af, ik word er niet goed van!</item>
+        <item>Kan dit af? Natuurlijk!</item>
+        <item>Gaat dit ooit afkomen?</item>
+        <item>Zo gaat \'ie goed! Zet door!</item>
+        <item>Ik ben trots op je! Kom op!</item>
+        <item>Kopje koffie hierna?</item>
+        <item>Aaah, nog eentje dan? Alsjeblieft?</item>
+        <item>Tijd om je te-doen lijst op te schonen!</item>
+        <item>Ben jij op Team Order of Team Chaos? Team Order! Let\'s go!</item>
+        <item>Had ik al gezegd dat je geweldig bent? Ga zo door!</item>
+        <item>Een taak die een dag blijft houd de rommel weg... Tot ziens warhoofd!</item>
+        <item>Hoe doe je het toch? Wow, ik ben onder de indruk!</item>
+        <item>Je komt niet verder met je knappe koppie. Werk aan de winkel!</item>
+        <item>Mooi weer voor dit werk, vind je niet?</item>
+        <item>A spot of tea while you work on this?</item>
+        <item>Als je dit nu al gedaan had kon je nu buiten spelen!</item>
+        <item>Het is tijd. Je kan het niet eeuwig blijven uitstellen.</item>
+        <item>Telkens als je me negeert, sterft een klein stukje van mij.</item>
+    </string-array>
+
+    <string-array name="postpone_nags">
+        <!-- Astrid\'s nagging when user clicks postpone -->
+        <item>Hee, je bent toch geen slakkie!?</item>
+        <item>Ik word zo moe van uitstellen...</item>
+        <item>Maak je onsterfelijk, doe dit!</item>
+        <item>Toen je zei \'Snooze\' bedoelde je dat je er mee bezig was, toch?</item>
+        <item>Dit is de laatste keer dat je dit uitstelt, oké?</item>
+        <item>Pssst, ik wil niks zeggen maar....</item>
+        <item>Waarom uitstellen? Gewoon doen!</item>
+        <item>Straks? Wie zei straks? Nu bedoel je!</item>
+        <item>Ik vind je geweldig! Dit kun je vast ook:</item>
+        <item>Bereik je doel, maak dit af!</item>
+        <item>Van uitstel komt afstel. Wanneer leer je nou eens?</item>
+        <item>Ik heb genoeg van je smoesjes! Doe het nu maar gewoon!</item>
+        <item>Gebruikte je die smoes vorige keer niet al?</item>
+        <item>Ik kan je niet helpen als je me blijft negeren...</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in repeat plug-in -->
+
+    <!-- repeating plugin name -->
+    <string name="repeat_plugin">Herhalende taken</string>
+
+    <!-- repeating plugin description -->
+    <string name="repeat_plugin_desc">Herhalende taken toestaan</string>
+
+    <!-- slide 20a: checkbox for turning on/off repeats -->
+    <string name="repeat_enabled">Herhalingen</string>
+
+    <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
+    <string name="repeat_every">Elke %d</string>
+
+    <!-- hint when opening repeat interval -->
+    <string name="repeat_interval_prompt">Herhaal interval</string>
+
+    <!-- slide 19b-->
+    <string name="repeat_never">Niet herhalend</string>
+    <!-- slide 20f-->
+    <string name="repeat_dont">Niet herhalen</string>
+
+    <string-array name="repeat_interval_short">
+        <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
+        <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">
+        <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>Dag(en)</item>
+        <item>week/weken</item>
+        <item>maand(en)</item>
+        <item>uur/uren</item>
+        <item>Minu(u)t(en)</item>
+        <item>Ja(a)r(en)</item>
+    </string-array>
+
+    <string name="repeat_days">dagen</string>
+    <string name="repeat_weekdays">weekdagen</string>
+    <string name="repeat_weeks">weken</string>
+    <string name="repeat_months">maanden</string>
+    <string name="repeat_years">jaren</string>
+    <string name="repeat_hours">uren</string>
+    <string name="repeat_minutes">minuten</string>
+
+    <string-array name="repeat_until_shortcuts">
+        <item>Altijd</item>
+        <item>Specifieke dag</item>
+        <item>Vandaag</item>
+        <item>Morgen</item>
+        <item>(volgende dag)</item>
+        <item>Volgende week</item>
+        <item>Binnen twee weken</item>
+        <item>Volgende maand</item>
+    </string-array>
+
+    <string name="repeat_until_title">Herhalen tot...</string>
+
+    <string name="repeat_keep_going">Doorlopend</string>
+
+    <string-array name="repeat_type">
+        <!-- slide 20c: repeat type (date to repeat from) -->
+        <item>vanaf einddatum</item>
+        <!-- slide 20c -->
+        <item>vanaf datum voltooid</item>
+    </string-array>
+
+    <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
+    <string name="repeat_detail_byday">$I op $D</string>
+
+    <!-- task detail for repeat from due date (%s -> interval) -->
+    <string name="repeat_detail_duedate">Elke %s</string>
+
+    <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
+    <string name="repeat_detail_duedate_until">Elke %1$s\ntot %2$s</string>
+
+    <!-- task detail for repeat from completion date (%s -> interval) -->
+    <string name="repeat_detail_completion">%s na voltooing</string>
+
+    <!-- text for button when repeating task indefinitely -->
+    <string name="repeat_forever">Altijd herhalen</string>
+
+    <!-- text for button when repeating task until specified date (%s -> date string) -->
+    <string name="repeat_until">Herhalen tot %s</string>
+
+    <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title">Verplaatsen taak \"%s\"</string>
+
+    <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title_last_time">Herhalende taak \"%s\" voltooid
+    </string>
+
+    <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->
+    <string name="repeat_rescheduling_dialog_bubble">%1$s Ik heb deze herhalende taak verzet van
+        %2$s naar %3$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
+    <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s Ik heb deze herhalende taak
+        opnieuw ingepland op %2$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
+    <string name="repeat_rescheduling_dialog_bubble_last_time">Deze taak herhaalde zichzelf tot
+        %1$s. Nu ben je klaar. %2$s
+    </string>
+
+    <string-array name="repeat_encouragement">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>Goed gedaan!</item>
+        <item>Wauw... Ik ben zo trots op je!</item>
+        <item>Ik hou ervan wanneer je productief bent!</item>
+        <item>Geeft het geen goed gevoel om iets af te kunnen vinken?</item>
+    </string-array>
+
+    <string-array name="repeat_encouragement_last_time">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>Goed gedaan!</item>
+        <item>Ik ben zo trots op je!</item>
+        <item>Ik hou ervan wanneer je productief bent!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Subtasks Help Introduction -->
+    <string name="subtasks_help_title">Sorteren en inspringen in Astrid</string>
+    <string name="subtasks_help_1">Druk en sleep om een taak te verplaatsen</string>
+    <string name="subtasks_help_2">Sleep verticaal om te herschikken</string>
+    <string name="subtasks_help_3">Sleep horizontaal om in te springen</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-
-  <!-- Tags label -->
-  <string name="TEA_tags_label">Lijsten</string>
-  
-  <!-- Tags label long version -->
-  <string name="TEA_tags_label_long">Voeg toe aan lijsten</string>
- 
-  <!-- Tags hint -->
-  <string name="TEA_tag_hint">Nieuwe lijst</string>
-  
-  <!-- Tags dropdown -->
-    
-  <!-- =============================================== Task List Controls == -->
-  
-  <!-- menu item for tags -->
-  
-  <!-- ========================================================== Extras == -->
-  
-  <!-- Context Item: show tag -->
-  
-  <!-- slide 25a: Dialog: new list -->
-  <string name="tag_new_list">Nieuwe lijst</string>
-  
-  <!-- Dialog: list saved -->
-  
-  <!-- Dialog: task created without title -->
-  <string name="tag_no_title_error">Voer a.u.b. eerst een naam in voor deze lijst!</string>
-  
-  <!-- ========================================================== Filters == -->
-  
-  <!-- filter button to add tag -->
-  <string name="tag_FEx_add_new">Nieuw</string>
-  
-  <!-- filter header for tags -->
-  <string name="tag_FEx_header">Lijsten</string>
-  
-  <!-- filter header for tags user created -->
-  
-  <!-- filter header for tags, shared with user -->
-  
-  <!-- filter header for tags which have no active tasks -->
-  
-  <!-- slide 10d: filter for untagged tasks -->
-  <string name="tag_FEx_untagged">Niet gecategoriseerd</string>
-  
-  <!-- slide 27a: %s => tag name -->
-
-  <!-- context menu option to rename a tag -->
-  <string name="tag_cm_rename">Lijst hernoemen</string>
-
-  <!-- context menu option to delete a tag -->
-  <string name="tag_cm_delete">Lijst verwijderen</string>
-  
-  <!-- context menu option to leave a shared list -->
-  <string name="tag_cm_leave">Verlaat Lijst</string>
-
-  <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
-  <string name="DLG_delete_this_tag_question">De lijst %s verwijderen? (Taken blijven behouden.)</string>
-  
-  <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
-  <string name="DLG_leave_this_shared_tag_question">Verlaat deze gedeelde lijst: %s? (Er zullen geen taken worden verwijderd.)</string>
-
-  <!-- Dialog to rename tag -->
-  <string name="DLG_rename_this_tag_header">De lijst %s hernoemen naar:</string>
-
-  <!-- Toast notification that no changes have been made -->
-  <string name="TEA_no_tags_modified">Niets gewijzigd</string>
-
-  <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_deleted">De lijst %1$s is verwijderd, van invloed op %2$d taken</string>
-  
-  <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_left">Gedeelde lijst %1$s is verlaten, dit beïnvloed %2$d taken</string>
-
-  <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
-  <string name="TEA_tags_renamed">Taak %1$s hernoemd naar %2$s voor %3$d taken</string>
-  
-  <!-- Tag case migration -->
-  <string name="tag_case_migration_notice">Je had wat lijsten met dezelfde naam maar ander hoofdlettergebruik. We denken dat je steeds dezelfde lijst bedoelde, dus hebben we de duplicaten samengevoegd. Maar maak je geen zorgen: de oorspronkelijke lijsten zijn gewoonweg hernoemd met nummers op het einde (bijv. Boodschapen_1, Boodschappen_2). Als je dit niet wilt, kun je de nieuwe samengevoegde lijst eenvoudigweg verwijderen.</string>
-  
-  <!-- Header for tag settings -->
-  <string name="tag_settings_title">Lijst instellingen</string>
-  
-  <!-- Header for tag activity -->
-  <string name="tag_updates_title">Activiteit: %s</string>
-  
-  <!-- Delete button for tag settings -->
-  <string name="tag_delete_button">Lijst verwijderen</string>
-  
-  <!-- slide 28d: Leave button for tag settings -->
-  <string name="tag_leave_button">Verlaat Deze Lijst</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Tags label -->
+    <string name="TEA_tags_label">Lijsten</string>
 
+    <!-- Tags label long version -->
+    <string name="TEA_tags_label_long">Voeg toe aan lijsten</string>
+
+    <!-- Tags hint -->
+    <string name="TEA_tag_hint">Nieuwe lijst</string>
+
+    <!-- Tags dropdown -->
+
+    <!-- =============================================== Task List Controls == -->
+
+    <!-- menu item for tags -->
+
+    <!-- ========================================================== Extras == -->
+
+    <!-- Context Item: show tag -->
+
+    <!-- slide 25a: Dialog: new list -->
+    <string name="tag_new_list">Nieuwe lijst</string>
+
+    <!-- Dialog: list saved -->
+
+    <!-- Dialog: task created without title -->
+    <string name="tag_no_title_error">Voer a.u.b. eerst een naam in voor deze lijst!</string>
+
+    <!-- ========================================================== Filters == -->
+
+    <!-- filter button to add tag -->
+    <string name="tag_FEx_add_new">Nieuw</string>
+
+    <!-- filter header for tags -->
+    <string name="tag_FEx_header">Lijsten</string>
+
+    <!-- filter header for tags user created -->
+
+    <!-- filter header for tags, shared with user -->
+
+    <!-- filter header for tags which have no active tasks -->
+
+    <!-- slide 10d: filter for untagged tasks -->
+    <string name="tag_FEx_untagged">Niet gecategoriseerd</string>
+
+    <!-- slide 27a: %s => tag name -->
+
+    <!-- context menu option to rename a tag -->
+    <string name="tag_cm_rename">Lijst hernoemen</string>
+
+    <!-- context menu option to delete a tag -->
+    <string name="tag_cm_delete">Lijst verwijderen</string>
+
+    <!-- context menu option to leave a shared list -->
+    <string name="tag_cm_leave">Verlaat Lijst</string>
+
+    <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
+    <string name="DLG_delete_this_tag_question">De lijst %s verwijderen? (Taken blijven behouden.)
+    </string>
+
+    <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
+    <string name="DLG_leave_this_shared_tag_question">Verlaat deze gedeelde lijst: %s? (Er zullen
+        geen taken worden verwijderd.)
+    </string>
+
+    <!-- Dialog to rename tag -->
+    <string name="DLG_rename_this_tag_header">De lijst %s hernoemen naar:</string>
+
+    <!-- Toast notification that no changes have been made -->
+    <string name="TEA_no_tags_modified">Niets gewijzigd</string>
+
+    <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_deleted">De lijst %1$s is verwijderd, van invloed op %2$d taken</string>
+
+    <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_left">Gedeelde lijst %1$s is verlaten, dit beïnvloed %2$d taken</string>
+
+    <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
+    <string name="TEA_tags_renamed">Taak %1$s hernoemd naar %2$s voor %3$d taken</string>
+
+    <!-- Tag case migration -->
+    <string name="tag_case_migration_notice">Je had wat lijsten met dezelfde naam maar ander
+        hoofdlettergebruik. We denken dat je steeds dezelfde lijst bedoelde, dus hebben we de
+        duplicaten samengevoegd. Maar maak je geen zorgen: de oorspronkelijke lijsten zijn gewoonweg
+        hernoemd met nummers op het einde (bijv. Boodschapen_1, Boodschappen_2). Als je dit niet
+        wilt, kun je de nieuwe samengevoegde lijst eenvoudigweg verwijderen.
+    </string>
+
+    <!-- Header for tag settings -->
+    <string name="tag_settings_title">Lijst instellingen</string>
+
+    <!-- Header for tag activity -->
+    <string name="tag_updates_title">Activiteit: %s</string>
+
+    <!-- Delete button for tag settings -->
+    <string name="tag_delete_button">Lijst verwijderen</string>
+
+    <!-- slide 28d: Leave button for tag settings -->
+    <string name="tag_leave_button">Verlaat Deze Lijst</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in timers plug-in -->
-    
+
     <!-- Task List: Start Timer button -->
-    
+
     <!-- Task List: Stop Timer button -->
-    
+
     <!-- Android Notification Title (%s => # tasks) -->
     <string name="TPl_notification">Timers ingeschakeld voor %s!</string>
-    
+
     <!-- Filter Header for Timer plugin -->
-    
+
     <!-- Filter for Timed Tasks -->
     <string name="TFE_workingOn">Taken met timer</string>
-    
+
     <!-- Title for TEA -->
     <string name="TEA_timer_controls">Timer</string>
-    
-    
+
+
     <!-- Edit Notes: create comment for when timer is started -->
     <string name="TEA_timer_comment_started">taak begonnen:</string>
-    
+
     <!-- Edit Notes: create comment for when timer is stopped -->
     <string name="TEA_timer_comment_stopped">taak gestopt:</string>
-    
+
     <!-- Edit Notes: comment to notify how long was spent on task -->
     <string name="TEA_timer_comment_spent">Gebruikte tijd:</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Update string from activity codes %1$s - user, %2$s - target name, %3$s - message, %4$s - other_user-->
-    
+
     <!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
     Please do not translate this part of the string. -->
-    
+
     <!-- These are still in use -->
     <string name="update_string_default_comment">%1$s heeft gereageerd: %3$s</string>
     <string name="update_string_task_comment">%1$s op $link_task: %3$s</string>
     <string name="update_string_tag_comment">%1$s op %2$s: %3$s</string>
     <string name="update_string_user_self">Jij</string>
-    
+
     <string name="history_yourself">jijzelf</string>
     <string name="history_you">jij</string>
     <string name="history_a_deleted_user">(een verwijderde gebruiker)</string>
-    
+
     <string name="history_this_list">deze lijst</string>
     <string name="history_this_task">deze taak</string>
     <string name="history_tag_added">%1$s toegevoegd aan %2$s</string>
@@ -2980,9 +3251,13 @@ Je kunt doorgaan met het gebruiken van deze applicatie maar je kunt geen aankope
     <string name="history_favorited">%s gemarkeerd als favoriet</string>
     <string name="history_unfavorited">%s verwijderd als favoriet</string>
     <string name="history_changed_list_picture">veranderd de afbeelding van deze lijst</string>
-    <string name="history_added_description_characters">%1$d tekens toegevoegd aan de omschrijving van %2$s</string>
+    <string name="history_added_description_characters">%1$d tekens toegevoegd aan de omschrijving
+        van %2$s
+    </string>
     <string name="history_removed_description">omschrijving van %s verwijderd</string>
-    <string name="history_removed_description_characters">%1$d tekens van de omschrijving van %2$s verwijderd</string>
+    <string name="history_removed_description_characters">%1$d tekens van de omschrijving van %2$s
+        verwijderd
+    </string>
     <string name="history_updated_description">omschrijving van %s bijgewerkt</string>
     <string name="history_changed_list_owner">lijst eigenaar van %s bijgewerkt</string>
     <string name="history_created_this_list">deze lijst aangemaakt</string>
@@ -3005,196 +3280,225 @@ Je kunt doorgaan met het gebruiken van deze applicatie maar je kunt geen aankope
     <string name="history_repeat_on">op %s</string>
     <string name="history_repeat_from_completion">na voltooing</string>
     <string name="history_acknowledged">%s bekeken</string>
-    
-    <string name="history_default">%1$s veranderd in %2$s</string>
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-    
-  <!-- Voice Add Prompt Text -->
-  <string name="voice_create_prompt">Spreek om taak te maken</string>
-  <string name="voice_edit_title_prompt">Spreek titel van taak in</string>
-  <string name="voice_edit_note_prompt">Spreek notities van taak in</string>
-    
-  <!-- Preference: Task List recognition-service is not installed, but available -->
-  <string name="EPr_voiceInputInstall_dlg">Spraakmodule niet geïnstalleerd.\nWil je naar de Market gaan en deze installeren?</string>
-  <!-- Preference: Task List recognition-service is not available for this system -->
-  <string name="EPr_voiceInputUnavailable_dlg">Helaas is de spraakmodule niet beschikbaar voor je toestel.\nIndien mogelijk, update je toestelversie van Android naar 2.1 of hoger.</string>
-  <!-- Preference: Market is not available for this system -->
-  <string name="EPr_marketUnavailable_dlg">Helaas is de Android Market niet beschikbaar voor dit toestel.\nIndien mogelijk, probeer Voice Search via een andere bron te downloaden.</string>
-  <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
-  <string name="EPr_voiceInputEnabled_title">Spraakinvoer</string>
-  <!-- slide 38a: Preference: voice button description (true) -->
-  <string name="EPr_voiceInputEnabled_desc_enabled">Spraakinvoer knop weergeven in takenlijst</string>
-  <!-- Preference: voice button description (false) -->
-  <string name="EPr_voiceInputEnabled_desc_disabled">Spraakinvoer knop verbergen in takenlijst</string>
-  <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
-  <string name="EPr_voiceInputCreatesTask_title">Direct taak maken bij inspreken</string>
-  <!-- Preference: Task List Voice-creation description (true) -->
-  <string name="EPr_voiceInputCreatesTask_desc_enabled">Taken worden automatisch gemaakt bij inspreken</string>
-  <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
-  <string name="EPr_voiceInputCreatesTask_desc_disabled">De titel van de taak kan achteraf worden gewijzigd</string>
-  <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
-  <string name="EPr_voiceRemindersEnabled_title">Gesproken herinneringen</string>
-  <!-- Preference: Voice reminders description (true) -->
-  <string name="EPr_voiceRemindersEnabled_desc_enabled">Bij herinneringen zullen de taaknamen uitgesproken worden</string>
-  <!-- slide 38c: Preference: Voice reminders description (false) -->
-  <string name="EPr_voiceRemindersEnabled_desc_disabled">Er wordt een geluid weergegeven bij herinneringen</string>    
-  
-  <!-- slide 32d: Preference Category: Voice Title -->
-  <string name="EPr_voice_header">Spraakinstellingen</string>
-    
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-  
-  <!-- slide 30a-->
-  <string name="welcome_setting">Laat handleiding zien</string>
-  
-  <string name="welcome_title_1">Welkom bij Astrid!</string>
-
-  <!-- slide 2a -->
-  <string name="welcome_title_2">Maak lijsten</string>
-
-  <!-- slide 3a-->
-  <string name="welcome_title_3">Wissel lijsten</string>
-
-  <!-- slide 4a -->
-  <string name="welcome_title_4">Deel lijsten</string>
-
-  <!-- slide 5a -->
-  <string name="welcome_title_5">Verdeel taken</string>
-
-  <!-- slide 6a -->
-  <string name="welcome_title_6">Details verstrekken</string>
 
-  <!-- slide 7a -->
-  <string name="welcome_title_7">Maak nu verbinding\nom te beginnen!</string>
-  
-  <string name="welcome_title_7_return">Dat is het!</string>
-  
-  <!-- slide 1b -->
-  <string name="welcome_body_1">De perfecte persoonlijke to-do lijst \ndie geweldig werkt met vrienden.</string>
-
-  <!-- slide 2b-->
-  <string name="welcome_body_2">Perfect voor elke lijst:\nlezen, kijken, kopen, bezoeken!</string>
-
-  <!-- slide 3b -->
-  <string name="welcome_body_3">Klik op de lijst titel \nom al je lijsten te zien.</string>
-
-  <!-- slide 4b -->
-  <string name="welcome_body_4">Deel lijsten met \nvrienden, huisgenoten,\nof je vriend(in).</string>
-
-  <!-- slide 5b -->
-  <string name="welcome_body_5">and much more!</string>
+    <string name="history_default">%1$s veranderd in %2$s</string>
 
-  <!-- slide 6b-->
-  <string name="welcome_body_6">Klik om notities toe te voegen,\nherinneringen in te stellen,\nen nog veel meer!</string>
-  <string name="welcome_body_7">Aanmelden</string>
-  
-  <string name="welcome_body_7_return">Klik Astrid om terug te gaan.</string>
-  
-  <!-- slide 1c -->
-  <string name="welcome_next">Verder</string>
-  
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Voice Add Prompt Text -->
+    <string name="voice_create_prompt">Spreek om taak te maken</string>
+    <string name="voice_edit_title_prompt">Spreek titel van taak in</string>
+    <string name="voice_edit_note_prompt">Spreek notities van taak in</string>
+
+    <!-- Preference: Task List recognition-service is not installed, but available -->
+    <string name="EPr_voiceInputInstall_dlg">Spraakmodule niet geïnstalleerd.\nWil je naar de Market
+        gaan en deze installeren?
+    </string>
+    <!-- Preference: Task List recognition-service is not available for this system -->
+    <string name="EPr_voiceInputUnavailable_dlg">Helaas is de spraakmodule niet beschikbaar voor je
+        toestel.\nIndien mogelijk, update je toestelversie van Android naar 2.1 of hoger.
+    </string>
+    <!-- Preference: Market is not available for this system -->
+    <string name="EPr_marketUnavailable_dlg">Helaas is de Android Market niet beschikbaar voor dit
+        toestel.\nIndien mogelijk, probeer Voice Search via een andere bron te downloaden.
+    </string>
+    <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
+    <string name="EPr_voiceInputEnabled_title">Spraakinvoer</string>
+    <!-- slide 38a: Preference: voice button description (true) -->
+    <string name="EPr_voiceInputEnabled_desc_enabled">Spraakinvoer knop weergeven in takenlijst
+    </string>
+    <!-- Preference: voice button description (false) -->
+    <string name="EPr_voiceInputEnabled_desc_disabled">Spraakinvoer knop verbergen in takenlijst
+    </string>
+    <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
+    <string name="EPr_voiceInputCreatesTask_title">Direct taak maken bij inspreken</string>
+    <!-- Preference: Task List Voice-creation description (true) -->
+    <string name="EPr_voiceInputCreatesTask_desc_enabled">Taken worden automatisch gemaakt bij
+        inspreken
+    </string>
+    <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
+    <string name="EPr_voiceInputCreatesTask_desc_disabled">De titel van de taak kan achteraf worden
+        gewijzigd
+    </string>
+    <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
+    <string name="EPr_voiceRemindersEnabled_title">Gesproken herinneringen</string>
+    <!-- Preference: Voice reminders description (true) -->
+    <string name="EPr_voiceRemindersEnabled_desc_enabled">Bij herinneringen zullen de taaknamen
+        uitgesproken worden
+    </string>
+    <!-- slide 38c: Preference: Voice reminders description (false) -->
+    <string name="EPr_voiceRemindersEnabled_desc_disabled">Er wordt een geluid weergegeven bij
+        herinneringen
+    </string>
+
+    <!-- slide 32d: Preference Category: Voice Title -->
+    <string name="EPr_voice_header">Spraakinstellingen</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 30a-->
+    <string name="welcome_setting">Laat handleiding zien</string>
+
+    <string name="welcome_title_1">Welkom bij Astrid!</string>
+
+    <!-- slide 2a -->
+    <string name="welcome_title_2">Maak lijsten</string>
+
+    <!-- slide 3a-->
+    <string name="welcome_title_3">Wissel lijsten</string>
+
+    <!-- slide 4a -->
+    <string name="welcome_title_4">Deel lijsten</string>
+
+    <!-- slide 5a -->
+    <string name="welcome_title_5">Verdeel taken</string>
+
+    <!-- slide 6a -->
+    <string name="welcome_title_6">Details verstrekken</string>
+
+    <!-- slide 7a -->
+    <string name="welcome_title_7">Maak nu verbinding\nom te beginnen!</string>
+
+    <string name="welcome_title_7_return">Dat is het!</string>
+
+    <!-- slide 1b -->
+    <string name="welcome_body_1">De perfecte persoonlijke to-do lijst \ndie geweldig werkt met
+        vrienden.
+    </string>
+
+    <!-- slide 2b-->
+    <string name="welcome_body_2">Perfect voor elke lijst:\nlezen, kijken, kopen, bezoeken!</string>
+
+    <!-- slide 3b -->
+    <string name="welcome_body_3">Klik op de lijst titel \nom al je lijsten te zien.</string>
+
+    <!-- slide 4b -->
+    <string name="welcome_body_4">Deel lijsten met \nvrienden, huisgenoten,\nof je vriend(in).
+    </string>
+
+    <!-- slide 5b -->
+    <string name="welcome_body_5">and much more!</string>
+
+    <!-- slide 6b-->
+    <string name="welcome_body_6">Klik om notities toe te voegen,\nherinneringen in te stellen,\nen
+        nog veel meer!
+    </string>
+    <string name="welcome_body_7">Aanmelden</string>
+
+    <string name="welcome_body_7_return">Klik Astrid om terug te gaan.</string>
+
+    <!-- slide 1c -->
+    <string name="welcome_next">Verder</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <string name="widget_mini">- Astrid Mini -</string>
-    
+
     <!-- Resources for power pack widget -->
-    
+
     <string name="PPW_widget_42_label">Old Astrid 4x2</string>
     <string name="PPW_widget_43_label">Old Astrid 4x3</string>
     <string name="PPW_widget_44_label">Old Astrid 4x4</string>
     <string name="PPW_widget_v11_label">- Astrid -</string>
     <string name="PPW_widget_custom_label">Astrid Gepersonaliseerd Startscherm Premium</string>
     <string name="PPW_widget_custom_launcherpro_label">Astrid Startscherm Pro Premium</string>
-    
+
     <string name="PPW_configure_title">Widget instellen</string>
-    
+
     <string name="PPW_color">Widget kleur</string>
     <string name="PPW_enable_calendar">Agenda items weergeven</string>
     <string name="PPW_disable_encouragements">Motiverend commentaar verbergen</string>
     <string name="PPW_show_dates">Toon deadlines</string>
     <string name="PPW_filter">Filter selecteren</string>
-    
+
     <string name="PPW_due">Einddatum:</string>
     <string name="PPW_past_due">Verlopen:</string>
-    
-    <string name="PPW_old_astrid_notice">Sorry! Je hebt tenminste versie 3.6 van 
-Astrid nodig om deze widget te gebruiken.</string>
-    
+
+    <string name="PPW_old_astrid_notice">Sorry! Je hebt tenminste versie 3.6 van
+        Astrid nodig om deze widget te gebruiken.
+    </string>
+
     <string-array name="PPW_encouragements">
         <!-- general encouragements -->
-    	<item>Hee, hallo!</item>
-    	<item>Tijd over?</item>
-    	<item>Goh, je ziet er goed uit vandaag!</item>
-    	<item>Bereik iets moois vandaag!</item>
-    	<item>Maak me blij!</item>
-    	<item>Hoe gaat het met je?</item>
+        <item>Hee, hallo!</item>
+        <item>Tijd over?</item>
+        <item>Goh, je ziet er goed uit vandaag!</item>
+        <item>Bereik iets moois vandaag!</item>
+        <item>Maak me blij!</item>
+        <item>Hoe gaat het met je?</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_tod">
         <!-- encouragements based on time of day -->
-    	<item>Goedemorgen!</item>
-    	<item>Goedemiddag!</item>
-    	<item>Goedenavond!</item>
-    	<item>Laat geworden?</item>
-    	<item>Het is vroeg, krijg iets gedaan!</item>
-    	<item>Kopje thee misschien?</item>
-    	<item>Geniet van de avond!</item>
-    	<item>Slaap is goed voor je!</item>
+        <item>Goedemorgen!</item>
+        <item>Goedemiddag!</item>
+        <item>Goedenavond!</item>
+        <item>Laat geworden?</item>
+        <item>Het is vroeg, krijg iets gedaan!</item>
+        <item>Kopje thee misschien?</item>
+        <item>Geniet van de avond!</item>
+        <item>Slaap is goed voor je!</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_completed">
         <!-- encouragements based on tasks completed (%d => completed) -->
-    	<item>Er zijn al %d taken voltooid!</item>
-    	<item>Totaal: %d taken voltooid</item>
-    	<item>Voel je goed! Je hebt al %d taken af!</item>
+        <item>Er zijn al %d taken voltooid!</item>
+        <item>Totaal: %d taken voltooid</item>
+        <item>Voel je goed! Je hebt al %d taken af!</item>
     </string-array>
-  	<string name="PPW_encouragements_none_completed">Je hebt nog niet veel taken afgerond! Zullen we?</string>
-        
+    <string name="PPW_encouragements_none_completed">Je hebt nog niet veel taken afgerond! Zullen
+        we?
+    </string>
+
     <string-array name="PPW_colors">
         <item>Zwart</item>
         <item>Wit</item>
         <item>Blauw</item>
         <item>Doorzichtig</item>
     </string-array>
-    
-    <string name="PPW_widget_dlg_text">Deze widget is alleen beschikbaar met het Power Pack!</string>
+
+    <string name="PPW_widget_dlg_text">Deze widget is alleen beschikbaar met het Power Pack!
+    </string>
     <string name="PPW_widget_dlg_ok">Voorbeeld</string>
-    
+
     <string name="PPW_demo_title1">Onderdelen over %s gaan hier naartoe</string>
     <string name="PPW_demo_title2">Power Pack heeft Premium Widgets</string>
     <string name="PPW_demo_title3">...geluidsopname toegevoegd en goede gevoelens</string>
     <string name="PPW_demo_title4">Klik voor meer informatie!</string>
-    
+
     <string name="PPW_info_title">Gratis Power Pack!</string>
     <string name="PPW_info_signin">Log in!</string>
     <string name="PPW_info_later">Later</string>
-    <string name="PPW_unlock_howto">Deel lijsten met vrienden! Krijg een gratis Power Pack als 3 vrienden zich aanmelden voor Astrid.</string>
+    <string name="PPW_unlock_howto">Deel lijsten met vrienden! Krijg een gratis Power Pack als 3
+        vrienden zich aanmelden voor Astrid.
+    </string>
     <string name="PPW_check_button">Krijg het Power Pack gratis!</string>
     <string name="PPW_check_share_lists">Deel lijsten!</string>
-    <string name="PPW_api_level">Sorry! Deze widget wordt alleen ondersteund op Android 3.0 of hoger. </string>
-    
+    <string name="PPW_api_level">Sorry! Deze widget wordt alleen ondersteund op Android 3.0 of
+        hoger.
+    </string>
+
     <string name="EPr_widget_enabled_title">Widgets In-/Uitschakelen</string>
-    <string name="PPW_restart_for_enabled_state">Je moet misschien je telefoon opnieuw opstarten voordat deze aanpassing effect heeft.</string>
+    <string name="PPW_restart_for_enabled_state">Je moet misschien je telefoon opnieuw opstarten
+        voordat deze aanpassing effect heeft.
+    </string>
 
 </resources>
diff --git a/astrid/res/values-pl/strings.xml b/astrid/res/values-pl/strings.xml
index d2f817434..e657c0725 100755
--- a/astrid/res/values-pl/strings.xml
+++ b/astrid/res/values-pl/strings.xml
@@ -4,1686 +4,1830 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ================================================== general terms == -->
-
-  <!-- People Editing Activity -->    
-  
-  <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
-  <string name="actfm_person_hint">Kontakt lub email</string>
-  
-  <!-- task sharing dialog: shared with hint -->
-  <string name="actfm_person_or_tag_hint">Kontakt lub Lista Udostępniona</string>
-
-  <!-- toast on transmit success -->
-
-  <!-- can\'t rename or delete shared tag message -->
-  
-  <!-- warning before deleting a list you\'re the owner of -->
-  <string name="actfm_tag_operation_owner_delete">Jesteś właścicielem tej współdzielonej listy! Jeśli ją usuniesz, zostanie ona również usunięta dla wszystkich jej członków. Jesteś pewien, że chcesz to zrobić?</string>
-
-  <!-- slide 29a: menu item to take a picture -->
-  <string name="actfm_picture_camera">Zrób zdjęcie</string>
-
-  <!-- slide 29b: menu item to select from gallery -->
-  <string name="actfm_picture_gallery">Wybierz z galerii</string>
-  
-  <!-- menu item to clear picture selection -->
-  <string name="actfm_picture_clear">Usuń obrazek</string>
-
-  <!-- filter list activity: refresh tags -->
-  
-  <!-- Title for prompt after sharing a task -->
-  <string name="actfm_view_task_title">Pokazać zadanie?</string>
-
-  <!-- Text for prompt after sharing a task -->
-  <string name="actfm_view_task_text">Zadanie zostało wysłane do %s! Aktualnie oglądasz własne zadania. Czy chcesz zobaczyć to i inne zadania które przypisałeś?</string>
-  
-  <!-- Ok button for task view prompt -->
-  <string name="actfm_view_task_ok">Pokaż przypisane</string>
-      
-  <!-- Cancel button for task view prompt -->
-  <string name="actfm_view_task_cancel">Zostań tutaj</string>
-  
-  <!-- slide 13a: Title for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_title">Moje współdzielone zadania</string>
-  
-  <!-- Empty list for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_empty">Brak zadań współdzielonych</string>
-  
-  <!-- =====================  Friendship connections -->
-  
-  <string name="actfm_friendship_pending">Wysłałeś zaproszenie do znajomego: %s!</string>
-
-  <string name="actfm_friendship_blocked">Zablokowałeś %s.</string>
-
-  <string name="actfm_friendship_ignored">Zignorowałeś %s.</string>
-  
-  <string name="actfm_friendship_friends">Ty i %s zostaliście przyjaciółmi! Dodaj poniżej zadania dla niego.</string>
-
-  <string name="actfm_friendship_other_pending">%s chce zostać twoim znajomym!</string>
-
-  <string name="actfm_friendship_no_status">Połącz się z %s aby dzielić się i zobaczyć aktywność publicznych zadań!</string>
-
-  <string name="actfm_friendship_connect">Dodaj znajomego</string>
-
-  <string name="actfm_friendship_accept">Akceptuj</string>
-
-  <!-- ================================================== TagViewActivity == -->  
-
-  <!-- Tag View Activity: Add Comment hint -->    
-  <string name="TVA_add_comment">Dodaj komentarz...</string>
-
-  <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->    
-  
-  <!-- Tabs for Tag view -->
-  <string-array name="TVA_tabs">
-    <!-- Tab for showing tasks -->
-    <item>Zadania</item>
-    <!-- Tab for showing comments & updates -->
-    <item>Aktywność</item>
-    <!-- Tab for showing setting -->
-    <item>Ustawienia listy</item>
-  </string-array>
-  
-  <!-- Tag View: filtered by assigned to user (%s => user name) -->
-  <string name="actfm_TVA_filtered_by_assign">%s zadań. Puknij dla wszystkich.</string>
-  
-  <!-- Tag View: filter by unassigned tasks -->
-  <string name="actfm_TVA_filter_by_unassigned">Nieprzypisane zadania. Puknij dla wszystkich.</string>
-
-  <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Prywatna: puknij by udostępnić/edytować</string>
-
-  <!-- Tag View Menu: refresh -->
-  <string name="actfm_TVA_menu_refresh">Odśwież</string>
-
-  <!-- Tag Settings: tag name label -->
-  <string name="actfm_TVA_tag_label">Lista</string>
-
-  <!-- Tag Settings: tag owner label -->
-
-  <!-- Tag Settings: tag owner value when there is no owner -->
-
-  <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
-  <string name="actfm_TVA_members_label">Współpracownicy:</string>
-  
-  <!-- Tag Settings: list collaborators hint -->
-  <string name="actfm_TVA_members_hint">Współdziel z każdym, kto posiada adres email</string>
-
-  <!-- Tag Settings: tag picture -->
-  <string name="actfm_TVA_tag_picture">Obrazek listy</string>
-
-  <!-- slide 25c/28b: Tag Settings: silence notifications label -->
-  <string name="actfm_TVA_silence_label">Ciche powiadomienia</string>
-  
-  <!-- Tag Settings: list icon label -->
-  
-  <!-- slide 25b/27d: Tag Settings: list description label -->
-  <string name="actfm_TVA_tag_description_label">Opis</string>
-  
-  <!-- slide 28a: Tag Settings: list settings label -->
-  <string name="actfm_TVA_tag_settings_label">Ustawienia</string>
-
-  <!-- slide 25b: Tag Settings: list description hint -->
-  <string name="actfm_TVA_tag_description_hint">Wpisz tutaj jakiś opis</string>
-  
-  <!-- slide 25d: Tag Settings: list name hint -->
-  <string name="actfm_TVA_tag_name_hint">Podaj nazwę listy</string>
-  
-  <!-- Tag settings: login prompt from share-->
-  <string name="actfm_TVA_login_to_share">Musisz być zalogowany do Astrid.com by współdzielić listy! Zaloguj się, proszę, lub uczyń tę listę prywatną.</string>
-  
-      
-  <!-- ============================================ edit people dialog == -->
-
-  <!-- task sharing dialog: intro -->
-  <string name="actfm_EPA_intro">Użyj Astrid by udostępnić listy zakupów, plany imprez, lub projektów i od razu zobaczyć, kiedy inni skończą robotę!</string>
-    
-  <!-- task sharing dialog: window title -->
-    
-  <!-- task sharing dialog: save button -->
-  
-  <!-- task sharing dialog: assigned label -->
-  
-  <!-- slide 18a: task sharing dialog: assigned label long version -->
-  <string name="actfm_EPA_assign_label_long">Kto powinien to zrobić?</string>
-  
-  <!-- task sharing dialog: assigned to me -->
-  <string name="actfm_EPA_assign_me">Ja</string>
-  
-  <!-- task sharing dialog: anyone -->
-  <string name="actfm_EPA_unassigned">Nie przydzielone</string>
-  
-  <!-- slide 18c: task sharing dialog: choose a contact -->
-  <string name="actfm_EPA_choose_contact">Wybierz kontakt</string>
-  
-  <!-- task sharing dialog: custom email assignment -->
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_share_with">Podziel się z:</string>
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_collaborators_header">Współdziel</string>
-
-      <!-- task sharing dialog: collaborator list name (%s => name of list) -->
-  <string name="actfm_EPA_list">Lista: %s</string>
-  
-  <!-- task sharing dialog: assigned hint -->
-  
-  <!-- task sharing dialog: message label text -->
-  <string name="actfm_EPA_message_text">Widomość zaproszenia:</string>
-  
-  <!-- task sharing dialog: message body -->
-  <string name="actfm_EPA_message_body">Pomóż mi to zrobić!</string>
-  
-  <!-- task sharing dialog: list members section header -->
-  <string name="actfm_EPA_assign_header_members">Lista członków</string>
-
-  <!-- task sharing dialog: astrid friends section header -->
-  <string name="actfm_EPA_assign_header_friends">Znajomi z Astrid</string>
-
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: share with Facebook -->
-  <string name="actfm_EPA_facebook">Facebook</string>
-  
-  <!-- task sharing dialog: share with Twitter -->
-  <string name="actfm_EPA_twitter">Twitter</string>
-
-  <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
-
-  <!-- task sharing dialog: edit people settings saved -->
-
-  <!-- task sharing dialog: invalid email (%s => email) -->
-  <string name="actfm_EPA_invalid_email">Nieprawidłowy e-mail: %s</string>
-
-  <!-- task sharing dialog: tag not found (%s => tag) -->
-  
-  <!-- task sharing login prompt -->
-  <string name="actfm_EPA_login_to_share">Musisz się zalogować do Astrid.com aby wszpółdzielić zadania!</string>
-  
-  <string name="actfm_EPA_login_button">Zaloguj się</string>
-  
-  <string name="actfm_EPA_dont_share_button">Nie wszpółdziel</string>
-  
-  <string name="actfm_EPA_add_person_to_list_title">Zadanie przypisane</string>
-  
-  <string name="actfm_EPA_add_person_to_list">%1$s nie jest współdzielony na tej liście. Czy chciałbyś dodać %2$s do tej listy?</string>
-
-  <string name="actfm_EPA_add_person_to_list_ok">Dodaj do listy</string>
-  
-  <string name="actfm_EPA_add_person_to_list_cancel">Nie dodawaj</string>
-  
-  <string name="actfm_list_owner">(właściciel)</string>
-  
-  <!-- ========================================= sharing login activity == -->
-
-  <!-- share login: Title -->
-  <string name="actfm_ALA_title">Witaj w Astrid.com!</string>
-
-  <!-- share login: Sharing Description -->
-  <string name="actfm_ALA_body">Astrid.com umożliwia dostęp do zadań online, udostępniania i przekazywania innym.</string>
-
-  <!-- share login: Sharing Login FB Prompt -->
-  <string name="actfm_ALA_fb_login">Połącz z Facebookiem</string>
-
-  <!-- share login: Sharing Login GG Prompt -->
-  <string name="actfm_ALA_gg_login">Połącz z Google</string>
-  
-  <!-- share login: Quickly log in as <%s -> email> -->
-  <string name="actfm_quick_login">Zaloguj się: %s</string>
-
-  <!-- share login: Reject quick login -->
-  <string name="actfm_quick_login_reject">Nie %s?</string>
-
-  <!-- share login: Name -->
-  <string name="actfm_ALA_firstname_label">Imię</string>
-  
-  <!-- share login: Name -->
-  <string name="actfm_ALA_lastname_label">Nazwisko</string>
-
-  <!-- share login: Email -->
-  <string name="actfm_ALA_email_label">E-mail</string>
-
-  <!-- share login: Username / Email -->
-
-  <!-- share login: Password -->
-  <string name="actfm_ALA_password_label">Hasło</string>
-
-  <!-- share login: Sign Up Title -->
-  <string name="actfm_ALA_signup_title">Rejestracja</string>
-
-  <!-- share login: Login Title -->
-  <string name="actfm_ALA_login_title">Zaloguj się</string>
-
-  <!-- share login: Google Auth title -->
-  <string name="actfm_GAA_title">Wybierz konto Google, którego chcesz użyć:</string>
-
-  <!-- share login: OAUTH Login Prompt -->
-  <string name="actfm_OLA_prompt">Proszę połączyć się z Google:</string>
-  
-  <!-- Login error: user exists -->
-  <string name="actfm_ALA_error_user_exists">Ten użytkownik już istnieje. Zaloguj się.</string>
-  
-  <!-- Login error: wrong password -->
-  <string name="actfm_ALA_error_wrong_password">Niestety hasło jest nieprawidłowe. Spróbuj ponownie</string>
-  
-  <!-- Forgot password link -->
-  <string name="actfm_ALA_forgot_password">Zapomniałeś hasła?</string>
-  
-  <!-- Forgot password email prompt -->
-  <string name="actfm_ALA_enter_email">Podaj swój adres email</string>
-  
-  <!-- Password reset sent (%s -> email) -->
-  <string name="actfm_ALA_reset_sent">Link do zresetowania hasła wysłany do: %s</string>
-  
-  <!-- User already exists - first sync may be slow -->
-  <string name="actfm_ALA_user_exists_sync_alert">Pierwsza synchronizacja może chwilę potrwać - dzięki za cierpliwość!</string>
-  
-  <!-- User not found -->
-  <string name="actfm_ALA_error_user_not_found">Użytkownik nie został znalyziony po adresie email. Spróbuj się zalogować!</string>
-  
-  <!-- ================================================ Featured Lists -->
-
-  <string name="actfm_feat_list_clone">Kopiuj listę</string>
-  
-  <string name="actfm_feat_list_suffix">(Kopiuj)</string>
-
-  <string name="actfm_feat_list_cloning">Kopiowanie...</string>
-
-  <string name="actfm_feat_list_clone_success">Zakończono pomyślnie!</string>
-
-  <string name="actfm_feat_list_task_clone_success">Zadanie skopiowane</string>
-
-  <string name="actfm_feat_list_clone_empty">Brak zadań do skopiowania</string>
-  
-  <!-- ================================================ Synchronization == -->
-      
-  <!-- Indicates the logged in user name. %s -> user\'s name -->
-  <string name="actfm_status_title_logged_in">Status - Zalogowany/-a jako %s</string>    
-      
-  <!-- Preferences Title: Act.fm -->    
-  <string name="actfm_APr_header">Astrid.com</string>
-  
-  <string name="actfm_https_title">Użycie HTTPS</string>
-  <string name="actfm_https_enabled">HTTPS włączone (wolniej)</string>
-  <string name="actfm_https_disabled">HTTPS wyłączone (szybciej)</string>
-
-  <!-- title for notification tray after synchronizing -->
-  
-  <!-- text for notification when comments are received -->
-    
-  <string name="actfm_dual_sync_warning">Aktualnie synchronizujesz z Google Tasks. Aby uniknąć duplikatów oraz innych błędów synchronizacji, Google Tasks nie będzie się już synchronizować gdy zaczniesz synchronizację z Astrid.com. Nadal możesz importować zadania z Google Tasks, ze strony ustawień Google Tasks, lub zamienić Google Tasks w Gmail na rozszerzenie Chrome Astrid Remind Me.
-Jesteś pewien, że chcesz synchronizować z Astrid.com?</string>
-      
-  <!-- account types -->
-  <string name="actfm_account_type">Typ konta</string>
-  <string name="actfm_account_info">Informacje o koncie</string>
-  <string name="actfm_account_info_summary">Status i opcje</string>
-  <string name="account_type_title_not_logged_in">Załóż darmowe konto</string>
-  <string name="account_type_summary_not_logged_in">Miej dostęp online do zadań, współdziel listy i deleguj zadania</string>
-  
-  
-  <string name="actfm_account_premium">Premium</string>
-  <string name="actfm_account_basic">Podstawowe</string>
-  
-  <string name="actfm_inapp_billing">Załóż konto Premium</string>
-  <string name="actfm_inapp_billing_summary">Załączanie plików, głosowe kopie zapasowe, wsparcie premium i więcej</string>
-  
-  <!-- Sharing -->
-  <string name="share_with_facebook">Polub na Facebooku</string>
-  <string name="share_with_twitter">Obserwuj na Twitterze</string>
-  <string name="share_with_google">Udostępnij na Google+</string>
-  <string name="share_speech_bubble">Dzieląc się pomagasz innym być bardziej wydajnymi!</string>
-  
-  
-  <!-- Sync upgrade messages -->
-  <string name="sync_upgr_both_title">Using Astrid.com + Google without Duplicates</string>
-  <string name="sync_upgr_both_body">Bądźmy szczerzy. Zadania Google są poręczne, ale nie takie cool jak Astrid. Aby uniknąć duplikatów nie można już synchronizować się z Astrid.com oraz Zadaniami Google jednocześnie. Wciąż możesz importować swoje Zadania Google przez Ustawienia → Synchronizacja lub przełączyć się na synchronizację tylko z Zadaniami Google</string>
-  <string name="sync_upgr_both_btn1">Zostań z Astrid</string>
-  <string name="sync_upgr_both_btn2">Przełącz na Zadania Google</string>
-  
-  <string name="sync_upgr_gtasks_only_title">Aktualizuj do Astrid Sync za darmo!</string>
-  <string name="sync_upgr_gtasks_only_body">Korzystaj ze swoich zadań ze wszystkich swoich urządzeń oraz z Gmail z sychronizacją do Astrid.com. Uaktualnij do Astrid.com Sync (zawsze możesz wrócić do Google Tasks - ale nie będziesz chciał)!</string>
-  <string name="sync_upgr_gtasks_only_btn1">Aktualizuj do Astrid Sync</string>
-  <string name="sync_upgr_gtasks_only_btn2">Zostań z Zadaniami Google</string>
-  
-  <string name="sync_upgr_neither_title">Darmowa Synchronizacja!</string>
-  <string name="sync_upgr_neither_body">Nie narażaj swoich zadań! Oto nowa, udoskonalona synchronizacja Astrid, aby je zachować i mieć do nich dostęp zewsząd.</string>
-  <string name="sync_upgr_neither_btn1">Zarejestruj się teraz</string>
-  
-  <string name="sync_upgr_logged_out">Zostałeś wylogowany z Astrid</string>
-  
-  <string name="actfm_logout_clear_tasks_title">Usunąć dane?</string>
-  <string name="actfm_logout_clear_tasks_body">Chcesz usunąć wszystkie zadania i listy?</string>
-  <string name="actfm_logout_clear_tasks_yes">Usuń dane</string>
-  <string name="actfm_logout_clear_tasks_no">Zachowaj dane</string>
-  
-  <string name="actfm_logged_in_different_user_title">Logowanie jako inny użytkownik</string>
-  <string name="actfm_logged_in_different_user_body">Usunąć zadania w telefonie przed synchronizacją?</string>
-  <string name="actfm_logged_in_different_user_keep_data">Zachowaj dane</string>
-  <string name="actfm_logged_in_different_user_clear_data">Usuń wszystkie dane</string>
-  <string name="actfm_logged_in_different_user_processing">Przetwarzanie danych...</string>
-  
-  <string name="actfm_tag_not_authorized_title">Nie autoryzowany</string>
-  <string name="actfm_tag_not_authorized_body">Nie masz już uprawnień do wyświetlenia listy %s (mogłeś być usunięty). Czy chcesz stworzyć nową listę o tej samej nazwie?</string>
-  <string name="actfm_tag_not_authorized_new_list">Utwórz nową listę</string>
-  <string name="actfm_tag_not_authorized_leave_list">Opuść Listę</string>
-  
-  <string name="actfm_sync_ongoing">Synchronizacja trwa...</string>
-  
-  <string name="EPr_reset_sync_state">Resetuj synchronizację</string>
-  <string name="EPr_reset_sync_state_summary">Zresetuj lokalne dane aby naprawić błędy sychronizacji</string>
-  <string name="EPr_reset_sync_state_detailed">Podczas następnej synchronizacji Twoje zadania zostaną zamienione na kopię, która znajduje się na Astrid.com, co może pomóc rozwiązać błędy synchronizacji. Czy chcesz kontynuować?</string>
-  
+<resources>
 
+    <!-- ================================================== general terms == -->
 
+    <!-- People Editing Activity -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
+    <string name="actfm_person_hint">Kontakt lub email</string>
+
+    <!-- task sharing dialog: shared with hint -->
+    <string name="actfm_person_or_tag_hint">Kontakt lub Lista Udostępniona</string>
+
+    <!-- toast on transmit success -->
+
+    <!-- can\'t rename or delete shared tag message -->
+
+    <!-- warning before deleting a list you\'re the owner of -->
+    <string name="actfm_tag_operation_owner_delete">Jesteś właścicielem tej współdzielonej listy!
+        Jeśli ją usuniesz, zostanie ona również usunięta dla wszystkich jej członków. Jesteś pewien,
+        że chcesz to zrobić?
+    </string>
+
+    <!-- slide 29a: menu item to take a picture -->
+    <string name="actfm_picture_camera">Zrób zdjęcie</string>
+
+    <!-- slide 29b: menu item to select from gallery -->
+    <string name="actfm_picture_gallery">Wybierz z galerii</string>
+
+    <!-- menu item to clear picture selection -->
+    <string name="actfm_picture_clear">Usuń obrazek</string>
+
+    <!-- filter list activity: refresh tags -->
+
+    <!-- Title for prompt after sharing a task -->
+    <string name="actfm_view_task_title">Pokazać zadanie?</string>
+
+    <!-- Text for prompt after sharing a task -->
+    <string name="actfm_view_task_text">Zadanie zostało wysłane do %s! Aktualnie oglądasz własne
+        zadania. Czy chcesz zobaczyć to i inne zadania które przypisałeś?
+    </string>
+
+    <!-- Ok button for task view prompt -->
+    <string name="actfm_view_task_ok">Pokaż przypisane</string>
+
+    <!-- Cancel button for task view prompt -->
+    <string name="actfm_view_task_cancel">Zostań tutaj</string>
+
+    <!-- slide 13a: Title for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_title">Moje współdzielone zadania</string>
+
+    <!-- Empty list for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_empty">Brak zadań współdzielonych</string>
+
+    <!-- =====================  Friendship connections -->
+
+    <string name="actfm_friendship_pending">Wysłałeś zaproszenie do znajomego: %s!</string>
+
+    <string name="actfm_friendship_blocked">Zablokowałeś %s.</string>
+
+    <string name="actfm_friendship_ignored">Zignorowałeś %s.</string>
+
+    <string name="actfm_friendship_friends">Ty i %s zostaliście przyjaciółmi! Dodaj poniżej zadania
+        dla niego.
+    </string>
+
+    <string name="actfm_friendship_other_pending">%s chce zostać twoim znajomym!</string>
+
+    <string name="actfm_friendship_no_status">Połącz się z %s aby dzielić się i zobaczyć aktywność
+        publicznych zadań!
+    </string>
+
+    <string name="actfm_friendship_connect">Dodaj znajomego</string>
+
+    <string name="actfm_friendship_accept">Akceptuj</string>
+
+    <!-- ================================================== TagViewActivity == -->
+
+    <!-- Tag View Activity: Add Comment hint -->
+    <string name="TVA_add_comment">Dodaj komentarz...</string>
+
+    <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->
+
+    <!-- Tabs for Tag view -->
+    <string-array name="TVA_tabs">
+        <!-- Tab for showing tasks -->
+        <item>Zadania</item>
+        <!-- Tab for showing comments & updates -->
+        <item>Aktywność</item>
+        <!-- Tab for showing setting -->
+        <item>Ustawienia listy</item>
+    </string-array>
+
+    <!-- Tag View: filtered by assigned to user (%s => user name) -->
+    <string name="actfm_TVA_filtered_by_assign">%s zadań. Puknij dla wszystkich.</string>
+
+    <!-- Tag View: filter by unassigned tasks -->
+    <string name="actfm_TVA_filter_by_unassigned">Nieprzypisane zadania. Puknij dla wszystkich.
+    </string>
+
+    <!-- Tag View: list is private, no members -->
+    <string name="actfm_TVA_no_members_alert">Prywatna: puknij by udostępnić/edytować</string>
+
+    <!-- Tag View Menu: refresh -->
+    <string name="actfm_TVA_menu_refresh">Odśwież</string>
+
+    <!-- Tag Settings: tag name label -->
+    <string name="actfm_TVA_tag_label">Lista</string>
+
+    <!-- Tag Settings: tag owner label -->
+
+    <!-- Tag Settings: tag owner value when there is no owner -->
+
+    <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
+    <string name="actfm_TVA_members_label">Współpracownicy:</string>
+
+    <!-- Tag Settings: list collaborators hint -->
+    <string name="actfm_TVA_members_hint">Współdziel z każdym, kto posiada adres email</string>
+
+    <!-- Tag Settings: tag picture -->
+    <string name="actfm_TVA_tag_picture">Obrazek listy</string>
+
+    <!-- slide 25c/28b: Tag Settings: silence notifications label -->
+    <string name="actfm_TVA_silence_label">Ciche powiadomienia</string>
+
+    <!-- Tag Settings: list icon label -->
+
+    <!-- slide 25b/27d: Tag Settings: list description label -->
+    <string name="actfm_TVA_tag_description_label">Opis</string>
+
+    <!-- slide 28a: Tag Settings: list settings label -->
+    <string name="actfm_TVA_tag_settings_label">Ustawienia</string>
+
+    <!-- slide 25b: Tag Settings: list description hint -->
+    <string name="actfm_TVA_tag_description_hint">Wpisz tutaj jakiś opis</string>
+
+    <!-- slide 25d: Tag Settings: list name hint -->
+    <string name="actfm_TVA_tag_name_hint">Podaj nazwę listy</string>
+
+    <!-- Tag settings: login prompt from share-->
+    <string name="actfm_TVA_login_to_share">Musisz być zalogowany do Astrid.com by współdzielić
+        listy! Zaloguj się, proszę, lub uczyń tę listę prywatną.
+    </string>
+
+
+    <!-- ============================================ edit people dialog == -->
+
+    <!-- task sharing dialog: intro -->
+    <string name="actfm_EPA_intro">Użyj Astrid by udostępnić listy zakupów, plany imprez, lub
+        projektów i od razu zobaczyć, kiedy inni skończą robotę!
+    </string>
+
+    <!-- task sharing dialog: window title -->
+
+    <!-- task sharing dialog: save button -->
+
+    <!-- task sharing dialog: assigned label -->
+
+    <!-- slide 18a: task sharing dialog: assigned label long version -->
+    <string name="actfm_EPA_assign_label_long">Kto powinien to zrobić?</string>
+
+    <!-- task sharing dialog: assigned to me -->
+    <string name="actfm_EPA_assign_me">Ja</string>
+
+    <!-- task sharing dialog: anyone -->
+    <string name="actfm_EPA_unassigned">Nie przydzielone</string>
+
+    <!-- slide 18c: task sharing dialog: choose a contact -->
+    <string name="actfm_EPA_choose_contact">Wybierz kontakt</string>
+
+    <!-- task sharing dialog: custom email assignment -->
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_share_with">Podziel się z:</string>
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_collaborators_header">Współdziel</string>
+
+    <!-- task sharing dialog: collaborator list name (%s => name of list) -->
+    <string name="actfm_EPA_list">Lista: %s</string>
+
+    <!-- task sharing dialog: assigned hint -->
+
+    <!-- task sharing dialog: message label text -->
+    <string name="actfm_EPA_message_text">Widomość zaproszenia:</string>
+
+    <!-- task sharing dialog: message body -->
+    <string name="actfm_EPA_message_body">Pomóż mi to zrobić!</string>
+
+    <!-- task sharing dialog: list members section header -->
+    <string name="actfm_EPA_assign_header_members">Lista członków</string>
+
+    <!-- task sharing dialog: astrid friends section header -->
+    <string name="actfm_EPA_assign_header_friends">Znajomi z Astrid</string>
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: share with Facebook -->
+    <string name="actfm_EPA_facebook">Facebook</string>
+
+    <!-- task sharing dialog: share with Twitter -->
+    <string name="actfm_EPA_twitter">Twitter</string>
+
+    <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
+
+    <!-- task sharing dialog: edit people settings saved -->
+
+    <!-- task sharing dialog: invalid email (%s => email) -->
+    <string name="actfm_EPA_invalid_email">Nieprawidłowy e-mail: %s</string>
+
+    <!-- task sharing dialog: tag not found (%s => tag) -->
+
+    <!-- task sharing login prompt -->
+    <string name="actfm_EPA_login_to_share">Musisz się zalogować do Astrid.com aby wszpółdzielić
+        zadania!
+    </string>
+
+    <string name="actfm_EPA_login_button">Zaloguj się</string>
+
+    <string name="actfm_EPA_dont_share_button">Nie wszpółdziel</string>
+
+    <string name="actfm_EPA_add_person_to_list_title">Zadanie przypisane</string>
+
+    <string name="actfm_EPA_add_person_to_list">%1$s nie jest współdzielony na tej liście. Czy
+        chciałbyś dodać %2$s do tej listy?
+    </string>
+
+    <string name="actfm_EPA_add_person_to_list_ok">Dodaj do listy</string>
+
+    <string name="actfm_EPA_add_person_to_list_cancel">Nie dodawaj</string>
+
+    <string name="actfm_list_owner">(właściciel)</string>
+
+    <!-- ========================================= sharing login activity == -->
+
+    <!-- share login: Title -->
+    <string name="actfm_ALA_title">Witaj w Astrid.com!</string>
+
+    <!-- share login: Sharing Description -->
+    <string name="actfm_ALA_body">Astrid.com umożliwia dostęp do zadań online, udostępniania i
+        przekazywania innym.
+    </string>
+
+    <!-- share login: Sharing Login FB Prompt -->
+    <string name="actfm_ALA_fb_login">Połącz z Facebookiem</string>
+
+    <!-- share login: Sharing Login GG Prompt -->
+    <string name="actfm_ALA_gg_login">Połącz z Google</string>
+
+    <!-- share login: Quickly log in as <%s -> email> -->
+    <string name="actfm_quick_login">Zaloguj się: %s</string>
+
+    <!-- share login: Reject quick login -->
+    <string name="actfm_quick_login_reject">Nie %s?</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_firstname_label">Imię</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_lastname_label">Nazwisko</string>
+
+    <!-- share login: Email -->
+    <string name="actfm_ALA_email_label">E-mail</string>
+
+    <!-- share login: Username / Email -->
+
+    <!-- share login: Password -->
+    <string name="actfm_ALA_password_label">Hasło</string>
+
+    <!-- share login: Sign Up Title -->
+    <string name="actfm_ALA_signup_title">Rejestracja</string>
+
+    <!-- share login: Login Title -->
+    <string name="actfm_ALA_login_title">Zaloguj się</string>
+
+    <!-- share login: Google Auth title -->
+    <string name="actfm_GAA_title">Wybierz konto Google, którego chcesz użyć:</string>
+
+    <!-- share login: OAUTH Login Prompt -->
+    <string name="actfm_OLA_prompt">Proszę połączyć się z Google:</string>
+
+    <!-- Login error: user exists -->
+    <string name="actfm_ALA_error_user_exists">Ten użytkownik już istnieje. Zaloguj się.</string>
+
+    <!-- Login error: wrong password -->
+    <string name="actfm_ALA_error_wrong_password">Niestety hasło jest nieprawidłowe. Spróbuj
+        ponownie
+    </string>
+
+    <!-- Forgot password link -->
+    <string name="actfm_ALA_forgot_password">Zapomniałeś hasła?</string>
+
+    <!-- Forgot password email prompt -->
+    <string name="actfm_ALA_enter_email">Podaj swój adres email</string>
+
+    <!-- Password reset sent (%s -> email) -->
+    <string name="actfm_ALA_reset_sent">Link do zresetowania hasła wysłany do: %s</string>
+
+    <!-- User already exists - first sync may be slow -->
+    <string name="actfm_ALA_user_exists_sync_alert">Pierwsza synchronizacja może chwilę potrwać -
+        dzięki za cierpliwość!
+    </string>
+
+    <!-- User not found -->
+    <string name="actfm_ALA_error_user_not_found">Użytkownik nie został znalyziony po adresie email.
+        Spróbuj się zalogować!
+    </string>
+
+    <!-- ================================================ Featured Lists -->
+
+    <string name="actfm_feat_list_clone">Kopiuj listę</string>
+
+    <string name="actfm_feat_list_suffix">(Kopiuj)</string>
+
+    <string name="actfm_feat_list_cloning">Kopiowanie...</string>
+
+    <string name="actfm_feat_list_clone_success">Zakończono pomyślnie!</string>
+
+    <string name="actfm_feat_list_task_clone_success">Zadanie skopiowane</string>
+
+    <string name="actfm_feat_list_clone_empty">Brak zadań do skopiowania</string>
+
+    <!-- ================================================ Synchronization == -->
+
+    <!-- Indicates the logged in user name. %s -> user\'s name -->
+    <string name="actfm_status_title_logged_in">Status - Zalogowany/-a jako %s</string>
+
+    <!-- Preferences Title: Act.fm -->
+    <string name="actfm_APr_header">Astrid.com</string>
+
+    <string name="actfm_https_title">Użycie HTTPS</string>
+    <string name="actfm_https_enabled">HTTPS włączone (wolniej)</string>
+    <string name="actfm_https_disabled">HTTPS wyłączone (szybciej)</string>
+
+    <!-- title for notification tray after synchronizing -->
+
+    <!-- text for notification when comments are received -->
+
+    <string name="actfm_dual_sync_warning">Aktualnie synchronizujesz z Google Tasks. Aby uniknąć
+        duplikatów oraz innych błędów synchronizacji, Google Tasks nie będzie się już synchronizować
+        gdy zaczniesz synchronizację z Astrid.com. Nadal możesz importować zadania z Google Tasks,
+        ze strony ustawień Google Tasks, lub zamienić Google Tasks w Gmail na rozszerzenie Chrome
+        Astrid Remind Me.
+        Jesteś pewien, że chcesz synchronizować z Astrid.com?
+    </string>
+
+    <!-- account types -->
+    <string name="actfm_account_type">Typ konta</string>
+    <string name="actfm_account_info">Informacje o koncie</string>
+    <string name="actfm_account_info_summary">Status i opcje</string>
+    <string name="account_type_title_not_logged_in">Załóż darmowe konto</string>
+    <string name="account_type_summary_not_logged_in">Miej dostęp online do zadań, współdziel listy
+        i deleguj zadania
+    </string>
+
+
+    <string name="actfm_account_premium">Premium</string>
+    <string name="actfm_account_basic">Podstawowe</string>
+
+    <string name="actfm_inapp_billing">Załóż konto Premium</string>
+    <string name="actfm_inapp_billing_summary">Załączanie plików, głosowe kopie zapasowe, wsparcie
+        premium i więcej
+    </string>
+
+    <!-- Sharing -->
+    <string name="share_with_facebook">Polub na Facebooku</string>
+    <string name="share_with_twitter">Obserwuj na Twitterze</string>
+    <string name="share_with_google">Udostępnij na Google+</string>
+    <string name="share_speech_bubble">Dzieląc się pomagasz innym być bardziej wydajnymi!</string>
+
+
+    <!-- Sync upgrade messages -->
+    <string name="sync_upgr_both_title">Using Astrid.com + Google without Duplicates</string>
+    <string name="sync_upgr_both_body">Bądźmy szczerzy. Zadania Google są poręczne, ale nie takie
+        cool jak Astrid. Aby uniknąć duplikatów nie można już synchronizować się z Astrid.com oraz
+        Zadaniami Google jednocześnie. Wciąż możesz importować swoje Zadania Google przez Ustawienia
+        → Synchronizacja lub przełączyć się na synchronizację tylko z Zadaniami Google
+    </string>
+    <string name="sync_upgr_both_btn1">Zostań z Astrid</string>
+    <string name="sync_upgr_both_btn2">Przełącz na Zadania Google</string>
+
+    <string name="sync_upgr_gtasks_only_title">Aktualizuj do Astrid Sync za darmo!</string>
+    <string name="sync_upgr_gtasks_only_body">Korzystaj ze swoich zadań ze wszystkich swoich
+        urządzeń oraz z Gmail z sychronizacją do Astrid.com. Uaktualnij do Astrid.com Sync (zawsze
+        możesz wrócić do Google Tasks - ale nie będziesz chciał)!
+    </string>
+    <string name="sync_upgr_gtasks_only_btn1">Aktualizuj do Astrid Sync</string>
+    <string name="sync_upgr_gtasks_only_btn2">Zostań z Zadaniami Google</string>
+
+    <string name="sync_upgr_neither_title">Darmowa Synchronizacja!</string>
+    <string name="sync_upgr_neither_body">Nie narażaj swoich zadań! Oto nowa, udoskonalona
+        synchronizacja Astrid, aby je zachować i mieć do nich dostęp zewsząd.
+    </string>
+    <string name="sync_upgr_neither_btn1">Zarejestruj się teraz</string>
+
+    <string name="sync_upgr_logged_out">Zostałeś wylogowany z Astrid</string>
+
+    <string name="actfm_logout_clear_tasks_title">Usunąć dane?</string>
+    <string name="actfm_logout_clear_tasks_body">Chcesz usunąć wszystkie zadania i listy?</string>
+    <string name="actfm_logout_clear_tasks_yes">Usuń dane</string>
+    <string name="actfm_logout_clear_tasks_no">Zachowaj dane</string>
+
+    <string name="actfm_logged_in_different_user_title">Logowanie jako inny użytkownik</string>
+    <string name="actfm_logged_in_different_user_body">Usunąć zadania w telefonie przed
+        synchronizacją?
+    </string>
+    <string name="actfm_logged_in_different_user_keep_data">Zachowaj dane</string>
+    <string name="actfm_logged_in_different_user_clear_data">Usuń wszystkie dane</string>
+    <string name="actfm_logged_in_different_user_processing">Przetwarzanie danych...</string>
+
+    <string name="actfm_tag_not_authorized_title">Nie autoryzowany</string>
+    <string name="actfm_tag_not_authorized_body">Nie masz już uprawnień do wyświetlenia listy %s
+        (mogłeś być usunięty). Czy chcesz stworzyć nową listę o tej samej nazwie?
+    </string>
+    <string name="actfm_tag_not_authorized_new_list">Utwórz nową listę</string>
+    <string name="actfm_tag_not_authorized_leave_list">Opuść Listę</string>
+
+    <string name="actfm_sync_ongoing">Synchronizacja trwa...</string>
+
+    <string name="EPr_reset_sync_state">Resetuj synchronizację</string>
+    <string name="EPr_reset_sync_state_summary">Zresetuj lokalne dane aby naprawić błędy
+        sychronizacji
+    </string>
+    <string name="EPr_reset_sync_state_detailed">Podczas następnej synchronizacji Twoje zadania
+        zostaną zamienione na kopię, która znajduje się na Astrid.com, co może pomóc rozwiązać błędy
+        synchronizacji. Czy chcesz kontynuować?
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in timers plug-in -->
+
+    <!-- Task Edit Activity: Container Label -->
+    <string name="alarm_ACS_label">Alarmy</string>
+
+    <!-- Task Edit Activity: Add New Alarm -->
+    <string name="alarm_ACS_button">Dodaj alarm</string>
+
+    <string-array name="reminders_alarm">
+        <!-- reminders related to alarm -->
+        <item>Alarm!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in backup plug-in -->
+
+    <!-- ================================================= BackupPreferences == -->
+
+    <!-- slide 33c/48d: Backup Preferences Title -->
+    <string name="backup_BPr_header">Kopie zapasowe</string>
+
+    <!-- slide 48e/50c: Backup: Status Header -->
+    <string name="backup_BPr_group_status">Stan</string>
+
+    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->
+    <string name="backup_status_success">Ostatnia kopia:\n%s</string>
+    <!-- Backup Status: last error failed. Keep it short! -->
+    <string name="backup_status_failed">Błąd zapisu ostatniej kopii</string>
+    <!-- Backup Status: error subtitle -->
+    <string name="backup_status_failed_subtitle">(puknij, aby zobaczyć błąd)</string>
+    <!-- slide 48a: Backup Status: never backed up -->
+    <string name="backup_status_never">Kopia zapasowa nigdy nie wykonana!</string>
+
+    <!-- slide 48f/ 50e: Backup Options Group Label -->
+    <string name="backup_BPr_group_options">Opcje</string>
+
+    <!-- slide 48b: Preference: Automatic Backup Title -->
+    <string name="backup_BPr_auto_title">Automatyczne kopie zapasowe</string>
+    <!-- Preference: Automatic Backup Description (when disabled) -->
+    <string name="backup_BPr_auto_disabled">Automatyczne kopie zapasowe wyłączone</string>
+    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
+    <string name="backup_BPr_auto_enabled">Kopia zapasowa będzie wykonywana codziennie</string>
+
+    <!-- Preference screen restoring Tasks Help -->
+    <!-- Preference screen Restoring Tasks Help Dialog Text-->
+
+    <string name="backup_BPr_cloud_already_logged_in">Już masz backup w chmurze na Astrid.com!
+    </string>
+
+    <!-- ================================================= BackupActivity == -->
+
+    <!-- slide 48c: backup activity label -->
+    <string name="backup_BAc_label">Zarządzaj kopiami zapasowymi</string>
+
+    <!-- backup activity title -->
+    <string name="backup_BAc_title">Zarządzaj swoimi kopiami zapasowymi</string>
+
+    <!-- backup activity import button -->
+    <string name="backup_BAc_import">Importuj zadania</string>
+
+    <!-- backup activity export button -->
+    <string name="backup_BAc_export">Eksportuj zadania</string>
+
+    <!-- backup activity cloud (Astrid.com) option -->
+    <string name="backup_BAc_cloud">Kliknij tu po backup w chmurze na Astrid.com</string>
+
+    <!-- ============================================== Importer / Exporter == -->
+
+    <!-- Message displayed when error occurs -->
+    <string name="backup_TXI_error">Błąd importu</string>
+
+    <string name="export_toast">Zapisano %1$s do %2$s.</string>
+
+    <string name="export_toast_no_tasks">Brak zadań do eksportowania.</string>
+
+    <!-- Progress Dialog Title for exporting -->
+    <string name="export_progress_title">Eksportowanie...</string>
+
+    <!-- Backup: Title of Import Summary Dialog -->
+    <string name="import_summary_title">Podsumowanie odzyskiwania</string>
+
+    <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
+    <string name="import_summary_message">Plik %1$s zawiera %2$s.\n\n %3$s zaimportowanych,\n %4$s
+        już istnieje\n %5$s zawiera błędy\n
+    </string>
+
+    <!-- Progress Dialog Title for importing -->
+    <string name="import_progress_title">Importowanie...</string>
+
+    <!-- Progress Dialog text for import reading task (%d -> task number)-->
+    <string name="import_progress_read">Czytanie zadania %d...</string>
+
+    <!-- Backup: Dialog when unable to open a file -->
+
+    <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
+    <string name="DLG_error_sdcard">Brak dostępu do folderu: %s</string>
+
+    <!-- Backup: Dialog when unable to open SD card in general -->
+    <string name="DLG_error_sdcard_general">Brak dostępu do Twojej karty SD!</string>
+
+    <!-- Backup: File Selector dialog for import -->
+    <string name="import_file_prompt">Wskaż plik do przywrócenia</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- ================================================== AndroidManifest == -->
+
+    <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
+    <string name="app_name">Zadania Astrid</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="read_permission_label">Uprawnienia Astrid</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="read_permission_desc">odczytuj zadania, pokaż filtr zadań</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="write_permission_label">Zezwolenia Astrid</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="write_permission_desc">twórz nowe zadania, edytuj bieżące zadania</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- question for deleting tasks -->
+    <string name="DLG_delete_this_task_question">Usunąć to zadanie?</string>
+
+    <!-- question for deleting items (%s => item name) -->
+    <string name="DLG_delete_this_item_question">Usunąć element: %s?</string>
+
+    <!-- Progress dialog shown when upgrading -->
+    <string name="DLG_upgrading">Uaktualniam Twoje zadania...</string>
+
+    <!-- Title for dialog selecting a time (hours and minutes) -->
+    <string name="DLG_hour_minutes">Czas (godziny : minuty)</string>
+
+    <!-- Dialog for Astrid having a critical update -->
+    <string name="DLG_please_update">Astrid zostanie zaktualizowany do najnowszej wersji dostępnej w
+        Markecie. Kontynuuj lub zaczekaj kilka sekund.
+    </string>
+
+    <!-- Button for going to Market -->
+
+    <!-- Button for accepting EULA -->
+    <string name="DLG_accept">Zgadzam się</string>
+
+    <!-- Button for declining EULA -->
+    <string name="DLG_decline">Nie zgadzam się</string>
+
+    <!-- EULA title -->
+    <string name="DLG_eula_title">Warunki użytkowania Astrid</string>
+
+    <!-- Progress Dialog generic text -->
+    <string name="DLG_please_wait">Proszę czekać</string>
+
+    <!-- Dialog - loading -->
+    <string name="DLG_loading">Ładowanie...</string>
+
+    <!-- Dialog - dismiss -->
+
+    <!-- slide 20d -->
+    <string name="DLG_ok">OK</string>
+    <!-- slide 36g -->
+    <string name="DLG_cancel">Anuluj</string>
+
+    <string name="DLG_more">Więcej</string>
+
+    <string name="DLG_undo">Cofnij</string>
+
+    <string name="DLG_warning">Ostrzeżenie</string>
+
+    <!-- =============================================================== UI == -->
+
+    <!-- Label for DateButtons with no value -->
+    <string name="WID_dateButtonUnset">Kliknij, aby ustawić</string>
+
+    <!-- String formatter for DateButtons ($D => date, $T => time) -->
+
+    <!-- String formatter for Disable button -->
+
+    <!--  ============================================================= notes -->
+
+    <!-- Note Exposer -->
+
+    <!-- Note Exposer / Comments -->
+
+    <!-- EditNoteActivity - no comments -->
+    <string name="ENA_no_comments">Nic do pokazania</string>
+
+    <!-- EditNoteActivity - no username for comment -->
+    <string name="ENA_no_user">Ktoś</string>
+
+    <!-- EditNoteActivity - refresh comments -->
+    <string name="ENA_refresh_comments">Odśwież komentarze</string>
+
+    <!-- ================================================= TaskListActivity == -->
+
+    <!-- slide 8b: Task List: Displayed instead of list when no items present -->
+    <string name="TLA_no_items">Brak zadań!</string>
+
+    <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
+    <string name="TLA_no_items_person">%s nie posiada \nzadań współdzielonych z Tobą</string>
+
+    <!-- Menu: Adjust Sort and Hidden Task Settings -->
+    <string name="TLA_menu_sort">Sortowanie</string>
+
+    <!-- Menu: Sync Now -->
+    <string name="TLA_menu_sync">Zsynchronizuj</string>
+
+    <!-- Menu: Search -->
+    <string name="TLA_menu_search">Szukaj</string>
+
+    <!-- Menu: Tasks -->
+    <string name="TLA_menu_lists">Listy</string>
+
+    <!-- Menu: Friends -->
+    <string name="TLA_menu_friends">Ludzie</string>
+
+    <!-- Menu: Featured Lists -->
+    <string name="TLA_menu_featured_lists">Wyróżnione listy</string>
+
+    <!-- Menu: Suggestions -->
+    <string name="TLA_menu_suggestions">Sugestie</string>
+
+    <!-- Menu: Tutorial -->
+
+    <!-- Menu: Settings -->
+    <string name="TLA_menu_settings">Ustawienia</string>
+
+    <!-- slide 30b: Menu: Support -->
+    <string name="TLA_menu_support">Wsparcie</string>
+
+    <!-- Search Label-->
+
+    <!-- Window title for displaying Custom Filter -->
+    <string name="TLA_custom">Własny filtr</string>
+
+    <!-- slide 8d: Quick Add Edit Box Hint-->
+    <string name="TLA_quick_add_hint">Dodaj zadanie</string>
+
+    <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
+    <string name="TLA_quick_add_hint_assign">Dodaj coś do %s</string>
+
+    <!-- Notification Volumne notification-->
+    <string name="TLA_notification_volume_low">Powiadomienia są wyciszone. Nie będziesz w stanie
+        usłyszeć Astrid!
+    </string>
+
+    <!-- Notifications disabled warning -->
+    <string name="TLA_notification_disabled">Powiadomienia są wyłączone! Nie otrzymasz żadnych
+        powiadomień
+    </string>
+
+    <string-array name="TLA_filters">
+        <item>Aktywne</item>
+        <item>Dzisiaj</item>
+        <item>Wkrótce</item>
+        <item>Spóźnione</item>
+        <item>Ukończone</item>
+        <item>Ukryte</item>
+    </string-array>
+
+    <!-- Title for confirmation dialog after quick add markup -->
+    <string name="TLA_quickadd_confirm_title">Powiedziałeś, \"%s\"</string>
+
+    <!-- Text for speech bubble in dialog after quick add markup -->
+    <!-- First string is task title, second is due date, third is priority -->
+    <string name="TLA_quickadd_confirm_speech_bubble">Stworzyłem\\-am zadanie o nazwie \"%1$s\" %2$s
+        at %3$s
+    </string>
+
+    <string name="TLA_quickadd_confirm_speech_bubble_date">dla %s</string>
+
+    <string name="TLA_quickadd_confirm_hide_helpers">Nie pokazuj notyfikacji w przyszłości</string>
+
+
+    <!-- Title for alert on new repeating task. %s-> task title -->
+    <string name="TLA_repeat_scheduled_title">Nowe powtarzalne zadanie %s</string>
+
+    <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
+    <string name="TLA_repeat_scheduled_speech_bubble">Przypominam Ci o %s.</string>
+
+    <string-array name="TLA_priority_strings">
+        <item>najwyższy priorytet</item>
+        <item>wysoki priorytet</item>
+        <item>średni priorytet</item>
+        <item>Niski priorytet</item>
+    </string-array>
+    <!-- slide 22a -->
+    <string name="TLA_all_activity">Cała aktywność</string>
+
+    <!-- ====================================================== TaskAdapter == -->
+
+    <!-- Format string to indicate task is hidden (%s => task name) -->
+    <string name="TAd_hiddenFormat">%s [ukryte]</string>
+
+    <!-- Format string to indicate task is deleted (%s => task name) -->
+    <string name="TAd_deletedFormat">%s [usunięte]</string>
+
+    <!-- Displayed when adapter is flung (scrolled quickly) -->
+
+    <!-- slide 22b: indicates task was completed. %s => date or time ago -->
+    <string name="TAd_completed">Ukończono\n%s</string>
+
+    <!-- slide 15a: Action Button: edit task -->
+    <string name="TAd_actionEditTask">Edytuj</string>
+
+    <!-- Context Item: edit task -->
+    <string name="TAd_contextEditTask">Edytuj zadanie</string>
+
+    <!-- Context Item: copy task -->
+    <string name="TAd_contextCopyTask">Kopiuj zadanie</string>
+
+    <!-- Context Item: delete task -->
+    <string name="TAd_contextDeleteTask">Usuń zadanie</string>
+
+    <!-- Context Item: undelete task -->
+    <string name="TAd_contextUndeleteTask">Przywrócone zadanie</string>
+
+    <!-- Context Item: purge task -->
+    <string name="TAd_contextPurgeTask">Trwale usuń zadanie</string>
+
+    <!-- ============================================== SortSelectionDialog == -->
+
+    <!-- slide 23a: Sort Selection: dialog title -->
+    <string name="SSD_title">Ukryte zadania i sortowanie</string>
+
+    <!-- slide 23h:  Hidden: title -->
+    <string name="SSD_hidden_title">Ukryte zadania</string>
+
+    <!-- Hidden Task Selection: show completed tasks -->
+    <string name="SSD_completed">Pokaż ukończone zadania</string>
+
+    <!-- Hidden Task Selection: show hidden tasks -->
+    <string name="SSD_hidden">Pokaż ukryte zadania</string>
+
+    <!-- Hidden Task Selection: show deleted tasks -->
+    <string name="SSD_deleted">Pokaż usunięte zadania</string>
+
+    <!-- Sort Selection: drag with subtasks -->
+    <string name="SSD_sort_drag">Ręczne z podzadaniami</string>
+
+    <!-- slide 23b: Sort Selection: smart sort -->
+    <string name="SSD_sort_auto">Automatyczne</string>
+
+    <!-- slide 23e: Sort Selection: sort by alpha -->
+    <string name="SSD_sort_alpha">Wg. tytułu</string>
+
+    <!-- slide 23c: Sort Selection: sort by due date -->
+    <string name="SSD_sort_due">Wg. daty</string>
+
+    <!-- slide 23d: Sort Selection: sort by importance -->
+    <string name="SSD_sort_importance">Wg priorytetów</string>
+
+    <!-- slide 23f: Sort Selection: sort by modified date -->
+    <string name="SSD_sort_modified">Wg. ostatniej modyfikacji</string>
+
+    <!-- slide 23g: Sort Selection: reverse -->
+    <string name="SSD_sort_reverse">Odwrotna kolejność</string>
+
+    <!-- slide 23j: Sort Button: sort temporarily -->
+    <string name="SSD_save_temp">Tylko teraz</string>
+
+    <!-- slide 23i: Sort Button: sort permanently -->
+    <string name="SSD_save_always">Zawsze</string>
+
+    <!-- =============================================== FilterListActivity == -->
+
+    <!-- Astrid Filter Shortcut -->
+    <string name="FSA_label">Lista Astrid lub filtr</string>
+
+    <!-- Filter List Activity Title -->
+
+    <!-- Displayed when loading filters -->
+
+    <!-- Context Menu: Create Shortcut -->
+    <string name="FLA_context_shortcut">Utwórz skrót na pulpicie</string>
+
+    <!-- Menu: Search -->
+
+    <!-- Menu: Help -->
+
+    <!-- slide 28c: Create Shortcut Dialog Title -->
+    <string name="FLA_shortcut_dialog_title">Utwórz skrót</string>
+
+    <!-- Create Shortcut Dialog (asks to name shortcut) -->
+    <string name="FLA_shortcut_dialog">Nazwa skrótu:</string>
+
+    <!-- Search Hint-->
+    <string name="FLA_search_hint">Szukaj zadań</string>
+
+    <!-- Search Filter name (%s => query) -->
+    <string name="FLA_search_filter">Pasujących do: %s</string>
+
+    <!-- Toast: created shortcut (%s => label) -->
+    <string name="FLA_toast_onCreateShortcut">Utworzono skrót: %s</string>
+
+    <!-- Menu: new filter -->
+    <string name="FLA_new_filter">Nowy filtr</string>
+
+    <!-- slide 10e: Button: new list -->
+    <string name="FLA_new_list">Nowa lista</string>
+
+    <!-- Alert when creating a shortcut without selecting a filter -->
+    <string name="FLA_no_filter_selected">Nie wybraon filtra! Wybierz filtr lub listę.</string>
+
+    <!-- ================================================= TaskEditActivity == -->
+
+    <!-- Title when editing a task (%s => task title) -->
+
+    <!-- Title when creating a new task -->
+
+    <!-- Task title label -->
+
+    <!-- Task when label -->
+    <string name="TEA_when_header_label">Kiedy</string>
+
+    <!-- Task title hint (displayed when edit box is empty) -->
+    <string name="TEA_title_hint">Tytuł zadania</string>
+
+    <!-- Task importance label -->
+    <string name="TEA_importance_label">Priorytet</string>
+
+    <!-- Task due date hint -->
+    <string name="TEA_deadline_hint">Set due date</string>
+
+    <!-- Task assigned to string (%s -> assigned person name) -->
+    <string name="TEA_assigned_to">Assigned to %s</string>
+
+    <!-- Task urgency specific time checkbox -->
+    <string name="TEA_urgency_specific_time">Dokładna godzina?</string>
+
+    <!-- Task urgency specific time title when specific time false -->
+    <string name="TEA_urgency_none">Brak</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_label">Ukrywanie</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_display">Hide until %s</string>
+
+    <!-- Task hide until toast -->
+    <string name="TEA_hideUntil_message">Zadanie będzie ukryte do %s</string>
+
+    <!-- Task editing data being loaded label -->
+    <string-array name="TEA_loading">
+        <item>Ładowanie...</item>
+    </string-array>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_note_label">Opis</string>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_notes_empty">Opis...</string>
+
+    <!-- Task note hint -->
+    <string name="TEA_notes_hint">Podaj opis zadania...</string>
+
+    <!-- Estimated time label -->
+    <string name="TEA_estimatedDuration_label">Jak długo to zajmie?</string>
+
+    <!-- Elapsed time label -->
+    <string name="TEA_elapsedDuration_label">Czas dotychczas spędzony nad tym zadaniem</string>
+
+    <!-- Menu: Save -->
+    <string name="TEA_menu_save">Zapisz zmiany</string>
+
+    <!-- Menu: Don\'t Save -->
+    <string name="TEA_menu_discard">Nie zapisuj</string>
+
+    <!-- Menu: Delete Task -->
+    <string name="TEA_menu_delete">Usuń zadanie</string>
+
+    <!-- Menu: Task comments -->
+    <string name="TEA_menu_refresh_comments">Odśwież komentarze</string>
+
+    <string name="TEA_menu_comments">Komentarze</string>
+
+    <!-- Toast: task saved with deadline (%s => preposition + time units) -->
+    <string name="TEA_onTaskSave_due">Zadanie zapisano: termin do %s</string>
+
+    <!-- Toast: task saved without deadlines -->
+    <string name="TEA_onTaskSave_notDue">Zadanie zapisane</string>
+
+    <!-- Toast: task was not saved -->
+
+    <!-- Toast: task was deleted -->
+
+    <!-- slide 15b: Task edit tab: activity -->
+    <string name="TEA_tab_activity">Aktywność</string>
+
+    <!-- slide 15e:  Task edit tab: more editing settings -->
+    <string name="TEA_tab_more">Więcej</string>
+
+    <!-- slide 15d: Task edit tab: web services -->
+    <string name="TEA_tab_web">Pomysły</string>
+
+    <string name="TEA_timer_est">Est. %s</string>
+
+    <string name="TEA_timer_elap">Elapsed %s</string>
+
+    <string-array name="TEA_urgency">
+        <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
+        <item>Brak daty</item>
+        <item>Konkretny dzień</item>
+        <item>Dzisiaj</item>
+        <item>Jutro</item>
+        <item>(pojutrze)</item>
+        <item>Przyszły tydzień</item>
+        <item>W ciągu dwóch tygodni</item>
+        <item>Następny miesiąc</item>
+    </string-array>
+
+    <string name="TEA_no_time">Bez godziny</string>
+
+    <string-array name="TEA_hideUntil">
+        <!-- hideUntil: labels for edit page. -->
+        <item>Nigdy</item>
+        <item>W terminie</item>
+        <item>Due time</item>
+        <item>Day before due</item>
+        <item>Week before due</item>
+        <item>Konkretny dzień/godzina</item>
+    </string-array>
+
+    <!-- Task edit control set descriptors -->
+
+    <!-- slide 9b/35i -->
+    <string name="TEA_control_who">Kto</string>
+
+    <!-- slide 9c/ 35a -->
+    <string name="TEA_control_when">Kiedy</string>
+    <!-- slide 35b -->
+    <string name="TEA_control_more_section">---Sekcja \"Więcej\"---</string>
+    <!-- slide 16a/35c -->
+    <string name="TEA_control_importance">Priorytet</string>
+    <!-- slide 16b/35d -->
+    <string name="TEA_control_lists">Listy</string>
+    <!-- slide 16c/35e -->
+    <string name="TEA_control_notes">Opis</string>
+
+    <string name="TEA_control_files">Pliki</string>
+
+    <!-- slide 16e / slide 35g-->
+    <string name="TEA_control_reminders">Przypomnienia</string>
+
+    <!-- slide 16f -->
+    <string name="TEA_control_timer">Sterowanie zegara</string>
+
+    <string name="TEA_control_hidden_section">----Zawsze Ukryte----</string>
+
+    <string name="hide_until_prompt">Pokaż na mojej liście</string>
+
+    <!-- Add Ons tab when no add-ons found -->
+
+    <!-- Add Ons button -->
+
+    <!-- More row -->
+
+    <!-- slide 15c: Text when no activity to show -->
+    <string name="TEA_no_activity">Brak wydarzeń</string>
+
+    <!-- Text to load more activity -->
+    <string name="TEA_load_more">Wczytaj więcej...</string>
+
+    <!-- When controls dialog -->
+    <string name="TEA_when_dialog_title">Na kiedy ma być zrobione?</string>
+
+
+    <string name="TEA_new_task">Nowe zadanie</string>
+
+    <string name="WSV_click_to_load">Dotknij mnie, aby sprawdzić jak ukończyć to zadanie!</string>
+
+    <string name="WSV_not_online">Mogę zrobić więcej, posiadając łączność z Internetem. Sprawdź
+        proszę połączenie.
+    </string>
+
+    <string name="TEA_contact_error">Program nie mógł znaleźć adresu email dla zaznaczonego
+        kontaktu.
+    </string>
+
+    <!-- ============================================= IntroductionActivity == -->
+
+    <!-- slide 1a: Introduction Window title -->
+
+    <!-- Button to agree to EULA -->
+
+    <!-- Button to disagree with EULA -->
+
+    <!-- ===================================================== MissedCallActivity == -->
+
+    <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
+    <string name="MCA_title">%1$s\ndzwonił\\-a o %2$s</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_return_call">Zadzwoń teraz</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_add_task">Zadzwoń później</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_ignore">Ignoruj</string>
+
+    <!-- Missed call: dialog to ignore all missed calls title -->
+    <string name="MCA_ignore_title">Zignorować wszystkie nieodebrane połączenia?</string>
+
+    <!-- Missed call: dialog to ignore all missed calls body -->
+    <string name="MCA_ignore_body">Zignorowano kilka nieodebranych połączeń. Czy Astrid ma Cię już
+        więcej o nie nie pytać?
+    </string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore all button -->
+    <string name="MCA_ignore_all">Zignoruj wszystkie połączenia.</string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
+    <string name="MCA_ignore_this">Zignoruj tylko to połączenie.</string>
+
+    <!-- Missed call: preference title -->
+    <string name="MCA_missed_calls_pref_title">Obszar nieodebranych połączeń</string>
+
+    <!-- slide 49c: Missed call: preference description -->
+    <string name="MCA_missed_calls_pref_desc_enabled">Astrid będzie powiadamiał Cię o nieodebranych
+        połączeniach i przypomni Ci o oddzwonieniu.
+    </string>
+    <string name="MCA_missed_calls_pref_desc_disabled">Astrid nie będzie Cię informował o
+        nieodebranych połączeniach.
+    </string>
+
+    <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
+    <string name="MCA_task_title_name">Oddzwoń do %1$s o %2$s</string>
+
+    <!-- Missed call: task title no name (%s -> number)-->
+    <string name="MCA_task_title_no_name">Oddzwoń do %s</string>
+
+    <!-- Missed call: schedule dialog title (%s -> name or number)-->
+    <string name="MCA_schedule_dialog_title">Oddzwoń do %s za...</string>
+
+    <!-- Missed call speech bubble options -->
+    <string-array name="MCA_dialog_speech_options">
+        <item>Musi być fajnie być tak popularnym!</item>
+        <item>Hurra! Ludzie Cię lubią!</item>
+        <item>Umil im dzień, zadzwoń!</item>
+        <item>A Ty byś się nie ucieszył, gdyby ludzie do Ciebie oddzwaniali?</item>
+        <item>Dasz radę!</item>
+        <item>Zawsze możesz odpisać...</item>
+    </string-array>
+
+
+    <!-- ======================================= Calendar reminder activity == -->
+
+    <!-- Calendar remindeer ignore button -->
+    <string name="CRA_ignore">Ignoruj</string>
+
+    <!-- Calendar event -->
+    <string name="CRA_title">Czy potrzebujesz listy spotkań?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls title -->
+    <string name="CRA_ignore_title">Ignorować wszystke wydarzenia w kalendarzu?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls body -->
+    <string name="CRA_ignore_body">Zignorowałeś kilka wydarzeń z kalendarza. Czy Astrid powinien
+        przestać cię o nie pytać?
+    </string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
+    <string name="CRA_ignore_all">Ignoruj wszystkie wydarzenia</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
+    <string name="CRA_ignore_this">Ignoruj tylko to wydarzenie</string>
+
+    <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
+    <string name="CRA_speech_bubble_start">Wygląda na to, że %s niedługo się zaczyna. Czy chcesz
+        stworzyć listę dla wydarzeń aktywnych?
+    </string>
+
+    <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
+    <string name="CRA_speech_bubble_end">Wygląda na to, że ukończyłeś %s. Czy chcesz stworzyć listę
+        dla aktywnych pozycji?
+    </string>
+
+    <!-- Calendar reminder: create list button -->
+    <string name="CRA_create_list">Utwórz listę</string>
+
+    <!-- Calendar reminder: postpone button -->
+    <string name="CRA_postpone">Może później</string>
+
+    <!-- Calendar reminder: list exists dialog title -->
+    <string name="CRA_list_exists_title">Lista już istnieje</string>
+
+    <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
+    <string name="CRA_list_exists_body">Lista o nazwie %s już istnieje. Czy chcesz skorzystać z
+        istniejącej listy, czy stworzyć nową dla tego wydarzenia?
+    </string>
+
+    <!-- Calendar reminder: list exists dialog create new button -->
+    <string name="CRA_create_new">Stwórz nową</string>
+
+    <!-- Calendar reminder: list exists dialog use existing button -->
+    <string name="CRA_use_existing">Użyj istniejącej</string>
+
+    <!-- Calendar remindr: created list (%s -> list name) -->
+    <string name="CRA_created_list_dialog">Stworzyłem listę %s.</string>
+
+    <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
+    <string name="CRA_one_attendee">%s uczestniczy.</string>
+
+    <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
+    <string name="CRA_two_attendees">%1$s i %2$s uczestniczą.</string>
+
+    <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
+    <string name="CRA_many_attendees">%1$s, %2$s i %3$d innych uczestniczy.</string>
+
+    <!-- Calendar reminder: invitation prompt -->
+    <string name="CRA_invitation_prompt">Czy chcesz ich zaprosić?</string>
+
+    <!-- Calendar reminder: preference title -->
+    <string name="CRA_calendar_reminders_pref_title">Asystent kalendarza</string>
+
+    <!-- Calendar reminder: pref description disabled -->
+    <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid nie będzie ci przypominał o
+        nadchodzących wydarzeniach w kalendarzu
+    </string>
+
+    <!-- Calendar reminder: pref description enabled -->
+    <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid będzie przypominał ci o
+        nadchodzących wydarzeniach w kalendarzu oraz będzie nakłaniał do przygotowania się do nich
+    </string>
+
+    <!-- Calendar reminder: share list title -->
+    <string name="CRA_share_list_title">Udostępnić listę?</string>
+
+    <string name="CRA_invite_attendees">Zaproś uczestników</string>
+
+    <string name="CRA_more_options">Więcej opcji</string>
+
+    <string name="CRA_dont_invite">Nie, dziękuję</string>
+
+    <!-- Calendar reminder: share list title when no other attendees exist-->
+    <string name="CRA_list_created_title">Lista utworzona!</string>
+
+    <!-- Calendar reminder: default new list name (%s -> event title) -->
+    <string name="CRA_default_list_name">Wydarzenia aktywne: %s</string>
+
+    <!-- ===================================================== HelpActivity == -->
+
+    <!-- Help: Button to get support from our website -->
+
+    <!-- ==================================================== UpdateService == -->
+
+    <!-- Changelog Window Title -->
+    <string name="UpS_changelog_title">Co nowego w Astrid?</string>
+
+    <!-- Updates Window Title -->
+    <string name="UpS_updates_title">Aktualności Astrid</string>
+
+    <!-- Updats No Activity to show for offline users -->
+    <string name="UpS_no_activity_log_in">Zaloguj się by zobaczyć listę\nTwoich postępów, a
+        także\naktywności na współdzielonej liście.
+    </string>
+
+    <!-- ================================================== EditPreferences == -->
+
+    <!-- slide 31g: Preference Window Title -->
+    <string name="EPr_title">Astrid: Właściwości</string>
+
+    <string name="EPr_share_astrid">Podziel się Astrid</string>
+
+    <string name="EPr_share_astrid_summary">Poinformuj o Astrid poprzez ulubioną sieć
+        społecznościową
+    </string>
+
+    <!-- slide 46a -->
+    <string name="EPr_deactivated">niekatywny</string>
+
+    <!-- slide 30i: Preference Category: Appearance Title -->
+    <string name="EPr_appearance_header">Wygląd</string>
+
+    <!-- Preference Category: Appearance Summary -->
+    <string name="EPr_appearance_summary">Motywy, widżety, zadania w rzędach, edycja wyświetlacza
+    </string>
+
+    <!-- FAQ Preference title -->
+    <string name="EPr_faq_title">Często zadawane pytania: FAQ</string>
+
+    <!-- Account status preference (%s -> account type) -->
+    <string name="EPr_account_title">Konto: %s</string>
+
+    <!-- Support preferences summary -->
+    <string name="EPr_support_summary">Tutorial, FAQ, o aplikacji</string>
+
+    <!-- slide 34a: Preference: Task List Font Size Title -->
+    <string name="EPr_fontSize_title">Rozmiar listy zadań</string>
+
+    <!-- Preference: Filters to show pref screen title -->
+    <string name="EPr_filters_to_show_title">Pokazywane filtry</string>
+
+    <!-- slide 32a: Preference: Show confirmation for smart reminders -->
+    <string name="EPr_showSmartConfirmation_title">Pokaż potwierdzenie dla inteligentnych
+        powiadomień
+    </string>
+
+    <!-- slide 34g: Preference: Task List Font Size Description -->
+    <string name="EPr_fontSize_desc">Rozmiar czcionki głównej listy zadań</string>
+
+    <!-- Preferemce: Show task edit confirmation toasts -->
+
+    <!-- slide 34c: Preference: Task List Show Notes -->
+    <string name="EPr_showNotes_title">Pokazuj opis w zadaniu</string>
+
+    <!-- Edit screen preference category -->
+    <string name="EPr_edit_screen_options">Edytuj ustawienia ekranu</string>
+
+    <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
+    <string name="EPr_beastMode_title">Edytuj kolejność</string>
+
+    <string name="EPr_beastMode_shortcut">Dostosuj</string>
 
-    
-    <!-- Resources for built-in timers plug-in -->
-    
-    <!-- Task Edit Activity: Container Label -->
-    <string name="alarm_ACS_label">Alarmy</string>
-    
-    <!-- Task Edit Activity: Add New Alarm -->
-    <string name="alarm_ACS_button">Dodaj alarm</string>
-    
-    <string-array name="reminders_alarm">
-      <!-- reminders related to alarm -->
-      <item>Alarm!</item>
+    <string name="EPr_time_increment">Krok co 5-minut</string>
+
+    <string name="EPr_use_date_shortcuts">Użyj skrótów dat</string>
+
+    <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
+
+    <!-- slide 35h -->
+    <string name="EPr_beastMode_desc">Dostosuj układ strony edycji zadania</string>
+    <!-- slide 35j -->
+    <string name="EPr_beastMode_reset">Przywróć domyślne</string>
+
+    <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on
+        each row
+    </string>
+
+    <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
+    <string name="EPr_showNotes_desc_disabled">Opis będzie dostępny na ekranie edycji zadania
+    </string>
+    <!-- Preference: Task List Show Notes Description (enabled) -->
+    <string name="EPr_showNotes_desc_enabled">Opis będzie zawsze wyświetlany</string>
+
+    <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
+    <string name="EPr_compressTaskRows_title">Kompaktowy Wiersz Zadań</string>
+    <!-- slide 34j -->
+    <string name="EPr_compressTaskRows_desc">Dopasuj wiersz zadań do długości tytułu</string>
+
+    <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
+    <!-- slide 34k-->
+
+    <!-- slide 34b: Preferences: Wrap task titles to two lines -->
+    <string name="EPr_fullTask_title">Pokaż pełną nazwę zadania</string>
+    <string name="EPr_fullTask_desc_enabled">Pełna nazwa zadania będzie wyświetlana</string>
+    <!-- slide 34h -->
+    <string name="EPr_fullTask_desc_disabled">Pierwsze dwie linie nazwy zadania będą wyświetlane
+    </string>
+
+    <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
+    <string name="EPr_ideaAuto_title">Automatycznie ładowana Zakładka Pomysłów</string>
+    <!-- slide 32c -->
+    <string name="EPr_ideaAuto_desc_enabled">Wyszukiwanie sieciowe w zakładce pomysłów odbędzie się
+        po kliknięciu na zakładkę.
+    </string>
+    <string name="EPr_ideaAuto_desc_disabled">Przeszukiwanie sieci w poszukiwaniu zakładki "pomysły"
+        przeprowadzane będzie tylko po ręcznym zapytaniu
+    </string>
+
+    <!-- Preferences: task row style -->
+    <string-array name="EPr_task_row_styles">
+        <item>Oryginalny</item>
+        <item>Prosty</item>
+        <item>Tylko tytuł</item>
     </string-array>
-    
 
+    <string-array name="EPr_task_row_style_descriptions">
+        <item>Skróć tytuł do dwóch linii z datą na prawo</item>
+        <item>Skróć tytuł do jednej lini z datą i listami poniżej</item>
+        <item>Tytuł tylko w jednej linii</item>
+    </string-array>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- task row style title (%s -> style) -->
+    <string name="EPr_task_row_style_title">Styl wiersza: %s</string>
 
-    
-  <!-- Resources for built-in backup plug-in -->
-  
-  <!-- ================================================= BackupPreferences == -->
+    <!-- Preference: custom filters enabled -->
+    <string name="EPr_use_filters_title">Użyj filtrów</string>
+    <string name="EPr_use_filters_subtitle">Pozwala stworzyć własne filtry</string>
 
-    <!-- slide 33c/48d: Backup Preferences Title -->    
-    <string name="backup_BPr_header">Kopie zapasowe</string>
+    <!-- Preference: show list members in shared list -->
+    <string name="EPr_show_list_members_title">Pokaż członków w listach współdzielonych</string>
 
-    <!-- slide 48e/50c: Backup: Status Header -->    
-    <string name="backup_BPr_group_status">Stan</string>
-    
-    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Ostatnia kopia:\n%s</string>
-    <!-- Backup Status: last error failed. Keep it short! -->    
-    <string name="backup_status_failed">Błąd zapisu ostatniej kopii</string>
-    <!-- Backup Status: error subtitle -->    
-    <string name="backup_status_failed_subtitle">(puknij, aby zobaczyć błąd)</string>
-    <!-- slide 48a: Backup Status: never backed up -->    
-    <string name="backup_status_never">Kopia zapasowa nigdy nie wykonana!</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_simple_input_boxes">Proste pola tekstowe</string>
 
-    <!-- slide 48f/ 50e: Backup Options Group Label -->    
-    <string name="backup_BPr_group_options">Opcje</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_show_quickadd_controls">Zaawansowane kontrolki szybkiego dodawania</string>
 
-    <!-- slide 48b: Preference: Automatic Backup Title -->    
-    <string name="backup_BPr_auto_title">Automatyczne kopie zapasowe</string>
-    <!-- Preference: Automatic Backup Description (when disabled) -->
-    <string name="backup_BPr_auto_disabled">Automatyczne kopie zapasowe wyłączone</string>    
-    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
-    <string name="backup_BPr_auto_enabled">Kopia zapasowa będzie wykonywana codziennie</string>
-    
-    <!-- Preference screen restoring Tasks Help -->
-    <!-- Preference screen Restoring Tasks Help Dialog Text-->
-    
-    <string name="backup_BPr_cloud_already_logged_in">Już masz backup w chmurze na Astrid.com!</string>
-  
-  <!-- ================================================= BackupActivity == -->
-
-  <!-- slide 48c: backup activity label -->
-  <string name="backup_BAc_label">Zarządzaj kopiami zapasowymi</string>
-
-  <!-- backup activity title -->
-  <string name="backup_BAc_title">Zarządzaj swoimi kopiami zapasowymi</string>
-
-  <!-- backup activity import button -->
-  <string name="backup_BAc_import">Importuj zadania</string>
-
-  <!-- backup activity export button -->
-  <string name="backup_BAc_export">Eksportuj zadania</string>
-  
-  <!-- backup activity cloud (Astrid.com) option -->
-  <string name="backup_BAc_cloud">Kliknij tu po backup w chmurze na Astrid.com</string>
-    
-  <!-- ============================================== Importer / Exporter == -->
-  
-  <!-- Message displayed when error occurs -->
-  <string name="backup_TXI_error">Błąd importu</string>
-    
-  <string name="export_toast">Zapisano %1$s do %2$s.</string>
-    
-  <string name="export_toast_no_tasks">Brak zadań do eksportowania.</string>
-  
-  <!-- Progress Dialog Title for exporting -->    
-  <string name="export_progress_title">Eksportowanie...</string>
-  
-  <!-- Backup: Title of Import Summary Dialog -->
-  <string name="import_summary_title">Podsumowanie odzyskiwania</string>
-    
-  <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">Plik %1$s zawiera %2$s.\n\n %3$s zaimportowanych,\n %4$s już istnieje\n %5$s zawiera błędy\n</string>
-  
-  <!-- Progress Dialog Title for importing -->    
-  <string name="import_progress_title">Importowanie...</string>
-  
-  <!-- Progress Dialog text for import reading task (%d -> task number)-->    
-  <string name="import_progress_read">Czytanie zadania %d...</string>
-  
-  <!-- Backup: Dialog when unable to open a file -->  
-  
-  <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
-  <string name="DLG_error_sdcard">Brak dostępu do folderu: %s</string>
-  
-  <!-- Backup: Dialog when unable to open SD card in general -->
-  <string name="DLG_error_sdcard_general">Brak dostępu do Twojej karty SD!</string>
-    
-  <!-- Backup: File Selector dialog for import -->
-  <string name="import_file_prompt">Wskaż plik do przywrócenia</string>    
-        
+    <!-- Preference: don\'t show plus button until input present -->
+    <string name="EPr_hide_plus_button">Hide plus button</string>
 
+    <!-- Preference: menu items -->
+    <string name="EPr_menu_items">Pozycje menu</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Preference: list view -->
+    <string name="EPr_list_view">Widok listy</string>
 
+    <!-- Preference: task edit comments -->
+    <string name="EPr_show_task_edit_comments">Pokaż komentarze w edycji zadania</string>
 
-  <!-- ================================================== AndroidManifest == -->
-
-  <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
-  <string name="app_name">Zadania Astrid</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="read_permission_label">Uprawnienia Astrid</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="read_permission_desc">odczytuj zadania, pokaż filtr zadań</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="write_permission_label">Zezwolenia Astrid</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="write_permission_desc">twórz nowe zadania, edytuj bieżące zadania</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-    
-  <!-- question for deleting tasks -->
-  <string name="DLG_delete_this_task_question">Usunąć to zadanie?</string>
-
-  <!-- question for deleting items (%s => item name) -->
-  <string name="DLG_delete_this_item_question">Usunąć element: %s?</string>
-    
-  <!-- Progress dialog shown when upgrading -->
-  <string name="DLG_upgrading">Uaktualniam Twoje zadania...</string>
-  
-  <!-- Title for dialog selecting a time (hours and minutes) -->
-  <string name="DLG_hour_minutes">Czas (godziny : minuty)</string>
-  
-  <!-- Dialog for Astrid having a critical update -->
-  <string name="DLG_please_update">Astrid zostanie zaktualizowany do najnowszej wersji dostępnej w Markecie. Kontynuuj lub zaczekaj kilka sekund.</string>
-
-  <!-- Button for going to Market -->
-
-  <!-- Button for accepting EULA -->
-  <string name="DLG_accept">Zgadzam się</string>
-
-  <!-- Button for declining EULA -->
-  <string name="DLG_decline">Nie zgadzam się</string>
-
-  <!-- EULA title -->
-  <string name="DLG_eula_title">Warunki użytkowania Astrid</string>
-
-  <!-- Progress Dialog generic text -->
-  <string name="DLG_please_wait">Proszę czekać</string>
-  
-  <!-- Dialog - loading -->
-  <string name="DLG_loading">Ładowanie...</string>
-  
-  <!-- Dialog - dismiss -->
-
-  <!-- slide 20d -->
-  <string name="DLG_ok">OK</string>
-  <!-- slide 36g -->
-  <string name="DLG_cancel">Anuluj</string>
-  
-  <string name="DLG_more">Więcej</string>
-  
-  <string name="DLG_undo">Cofnij</string>
-  
-  <string name="DLG_warning">Ostrzeżenie</string>
-  
-  <!-- =============================================================== UI == -->
-  
-  <!-- Label for DateButtons with no value -->
-  <string name="WID_dateButtonUnset">Kliknij, aby ustawić</string>
-  
-  <!-- String formatter for DateButtons ($D => date, $T => time) -->
-  
-  <!-- String formatter for Disable button -->
-  
-  <!--  ============================================================= notes -->
-  
-  <!-- Note Exposer -->    
-  
-  <!-- Note Exposer / Comments -->    
-  
-  <!-- EditNoteActivity - no comments -->
-  <string name="ENA_no_comments">Nic do pokazania</string>
-    
-  <!-- EditNoteActivity - no username for comment -->
-  <string name="ENA_no_user">Ktoś</string>
-  
-  <!-- EditNoteActivity - refresh comments -->
-  <string name="ENA_refresh_comments">Odśwież komentarze</string>
-  
-  <!-- ================================================= TaskListActivity == -->
-  
-  <!-- slide 8b: Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">Brak zadań!</string>
-  
-  <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->    
-  <string name="TLA_no_items_person">%s nie posiada \nzadań współdzielonych z Tobą</string>
-  
-  <!-- Menu: Adjust Sort and Hidden Task Settings -->    
-  <string name="TLA_menu_sort">Sortowanie</string>
-  
-  <!-- Menu: Sync Now -->    
-  <string name="TLA_menu_sync">Zsynchronizuj</string>
-  
-  <!-- Menu: Search -->
-  <string name="TLA_menu_search">Szukaj</string>
-  
-  <!-- Menu: Tasks -->
-  <string name="TLA_menu_lists">Listy</string>
-
-  <!-- Menu: Friends -->
-  <string name="TLA_menu_friends">Ludzie</string>
-
-  <!-- Menu: Featured Lists -->
-  <string name="TLA_menu_featured_lists">Wyróżnione listy</string>
-
-  <!-- Menu: Suggestions -->
-  <string name="TLA_menu_suggestions">Sugestie</string>
-  
-  <!-- Menu: Tutorial -->
-
-  <!-- Menu: Settings -->    
-  <string name="TLA_menu_settings">Ustawienia</string>
-  
-  <!-- slide 30b: Menu: Support -->
-  <string name="TLA_menu_support">Wsparcie</string>
-  
-  <!-- Search Label-->
-  
-  <!-- Window title for displaying Custom Filter -->
-  <string name="TLA_custom">Własny filtr</string>
-  
-  <!-- slide 8d: Quick Add Edit Box Hint-->
-  <string name="TLA_quick_add_hint">Dodaj zadanie</string>
-  
-  <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
-  <string name="TLA_quick_add_hint_assign">Dodaj coś do %s</string>
-  
-  <!-- Notification Volumne notification-->
-  <string name="TLA_notification_volume_low">Powiadomienia są wyciszone. Nie będziesz w stanie usłyszeć Astrid!</string>
-  
-  <!-- Notifications disabled warning -->
-  <string name="TLA_notification_disabled">Powiadomienia są wyłączone! Nie otrzymasz żadnych powiadomień</string>
-  
-  <string-array name="TLA_filters">
-      <item>Aktywne</item>
-      <item>Dzisiaj</item>
-      <item>Wkrótce</item>
-      <item>Spóźnione</item>
-      <item>Ukończone</item>
-      <item>Ukryte</item>      
-  </string-array>
-  
-  <!-- Title for confirmation dialog after quick add markup -->
-  <string name="TLA_quickadd_confirm_title">Powiedziałeś, \"%s\"</string>
-  
-  <!-- Text for speech bubble in dialog after quick add markup -->
-  <!-- First string is task title, second is due date, third is priority -->
-  <string name="TLA_quickadd_confirm_speech_bubble">Stworzyłem\\-am zadanie o nazwie \"%1$s\" %2$s at %3$s</string>
-  
-  <string name="TLA_quickadd_confirm_speech_bubble_date">dla %s</string>
-  
-  <string name="TLA_quickadd_confirm_hide_helpers">Nie pokazuj notyfikacji w przyszłości</string>
-  
-  
-  <!-- Title for alert on new repeating task. %s-> task title -->
-  <string name="TLA_repeat_scheduled_title">Nowe powtarzalne zadanie %s</string>
-  
-  <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
-  <string name="TLA_repeat_scheduled_speech_bubble">Przypominam Ci o %s.</string>
-  
-  <string-array name="TLA_priority_strings">
-      <item>najwyższy priorytet</item>
-      <item>wysoki priorytet</item>
-      <item>średni priorytet</item>
-      <item>Niski priorytet</item>
-  </string-array>
-  <!-- slide 22a -->
-  <string name="TLA_all_activity">Cała aktywność</string>
-  
-  <!-- ====================================================== TaskAdapter == -->
-  
-  <!-- Format string to indicate task is hidden (%s => task name) -->
-  <string name="TAd_hiddenFormat">%s [ukryte]</string>
-  
-  <!-- Format string to indicate task is deleted (%s => task name) -->
-  <string name="TAd_deletedFormat">%s [usunięte]</string>
-  
-  <!-- Displayed when adapter is flung (scrolled quickly) -->
-  
-  <!-- slide 22b: indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Ukończono\n%s</string>
-  
-  <!-- slide 15a: Action Button: edit task -->
-  <string name="TAd_actionEditTask">Edytuj</string>
-  
-  <!-- Context Item: edit task -->
-  <string name="TAd_contextEditTask">Edytuj zadanie</string>
-
-  <!-- Context Item: copy task -->
-  <string name="TAd_contextCopyTask">Kopiuj zadanie</string>
-
-  <!-- Context Item: delete task -->
-  <string name="TAd_contextDeleteTask">Usuń zadanie</string>
-
-  <!-- Context Item: undelete task -->
-  <string name="TAd_contextUndeleteTask">Przywrócone zadanie</string>
-
-  <!-- Context Item: purge task -->
-  <string name="TAd_contextPurgeTask">Trwale usuń zadanie</string>
-  
-  <!-- ============================================== SortSelectionDialog == -->
-  
-  <!-- slide 23a: Sort Selection: dialog title -->    
-  <string name="SSD_title">Ukryte zadania i sortowanie</string>
-  
-  <!-- slide 23h:  Hidden: title -->
-  <string name="SSD_hidden_title">Ukryte zadania</string>
-  
-  <!-- Hidden Task Selection: show completed tasks -->    
-  <string name="SSD_completed">Pokaż ukończone zadania</string>
-  
-  <!-- Hidden Task Selection: show hidden tasks -->    
-  <string name="SSD_hidden">Pokaż ukryte zadania</string>
-  
-  <!-- Hidden Task Selection: show deleted tasks -->    
-  <string name="SSD_deleted">Pokaż usunięte zadania</string>
-  
-  <!-- Sort Selection: drag with subtasks -->
-  <string name="SSD_sort_drag">Ręczne z podzadaniami</string>
-  
-  <!-- slide 23b: Sort Selection: smart sort -->
-  <string name="SSD_sort_auto">Automatyczne</string>
-  
-  <!-- slide 23e: Sort Selection: sort by alpha -->
-  <string name="SSD_sort_alpha">Wg. tytułu</string>
-  
-  <!-- slide 23c: Sort Selection: sort by due date -->
-  <string name="SSD_sort_due">Wg. daty</string>
-  
-  <!-- slide 23d: Sort Selection: sort by importance -->
-  <string name="SSD_sort_importance">Wg priorytetów</string>
-  
-  <!-- slide 23f: Sort Selection: sort by modified date -->
-  <string name="SSD_sort_modified">Wg. ostatniej modyfikacji</string>
-  
-  <!-- slide 23g: Sort Selection: reverse -->
-  <string name="SSD_sort_reverse">Odwrotna kolejność</string>
-  
-  <!-- slide 23j: Sort Button: sort temporarily -->
-  <string name="SSD_save_temp">Tylko teraz</string>
-  
-  <!-- slide 23i: Sort Button: sort permanently -->
-  <string name="SSD_save_always">Zawsze</string>
-  
-  <!-- =============================================== FilterListActivity == -->
-  
-  <!-- Astrid Filter Shortcut -->    
-  <string name="FSA_label">Lista Astrid lub filtr</string>
-
-  <!-- Filter List Activity Title -->    
-  
-  <!-- Displayed when loading filters -->    
-  
-  <!-- Context Menu: Create Shortcut -->    
-  <string name="FLA_context_shortcut">Utwórz skrót na pulpicie</string>
-  
-  <!-- Menu: Search -->
-  
-  <!-- Menu: Help -->    
-  
-  <!-- slide 28c: Create Shortcut Dialog Title -->    
-  <string name="FLA_shortcut_dialog_title">Utwórz skrót</string>
-  
-  <!-- Create Shortcut Dialog (asks to name shortcut) -->    
-  <string name="FLA_shortcut_dialog">Nazwa skrótu:</string>
-  
-  <!-- Search Hint-->
-  <string name="FLA_search_hint">Szukaj zadań</string>
-  
-  <!-- Search Filter name (%s => query) -->
-  <string name="FLA_search_filter">Pasujących do: %s</string>
-  
-  <!-- Toast: created shortcut (%s => label) -->
-  <string name="FLA_toast_onCreateShortcut">Utworzono skrót: %s</string>
-  
-  <!-- Menu: new filter -->
-  <string name="FLA_new_filter">Nowy filtr</string>
-  
-  <!-- slide 10e: Button: new list -->
-  <string name="FLA_new_list">Nowa lista</string>
-  
-  <!-- Alert when creating a shortcut without selecting a filter -->
-  <string name="FLA_no_filter_selected">Nie wybraon filtra! Wybierz filtr lub listę.</string>
-  
-  <!-- ================================================= TaskEditActivity == -->
-  
-  <!-- Title when editing a task (%s => task title) -->
-  
-  <!-- Title when creating a new task -->
-  
-  <!-- Task title label -->
-  
-  <!-- Task when label -->
-  <string name="TEA_when_header_label">Kiedy</string>
-  
-  <!-- Task title hint (displayed when edit box is empty) -->
-  <string name="TEA_title_hint">Tytuł zadania</string>
-  
-  <!-- Task importance label -->
-  <string name="TEA_importance_label">Priorytet</string>
-  
-  <!-- Task due date hint -->
-  <string name="TEA_deadline_hint">Set due date</string>
-  
-  <!-- Task assigned to string (%s -> assigned person name) -->
-  <string name="TEA_assigned_to">Assigned to %s</string>
-  
-  <!-- Task urgency specific time checkbox -->
-  <string name="TEA_urgency_specific_time">Dokładna godzina?</string>
-  
-  <!-- Task urgency specific time title when specific time false -->
-  <string name="TEA_urgency_none">Brak</string>
-  
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_label">Ukrywanie</string>
-
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_display">Hide until %s</string>
-  
-  <!-- Task hide until toast -->
-  <string name="TEA_hideUntil_message">Zadanie będzie ukryte do %s</string>
-  
-  <!-- Task editing data being loaded label -->
-  <string-array name="TEA_loading"><item>Ładowanie...</item></string-array>
-  
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_note_label">Opis</string>
-
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_notes_empty">Opis...</string>
-  
-  <!-- Task note hint -->
-  <string name="TEA_notes_hint">Podaj opis zadania...</string>
-  
-  <!-- Estimated time label -->
-  <string name="TEA_estimatedDuration_label">Jak długo to zajmie?</string>
-  
-  <!-- Elapsed time label -->
-  <string name="TEA_elapsedDuration_label">Czas dotychczas spędzony nad tym zadaniem</string>
-
-  <!-- Menu: Save -->    
-  <string name="TEA_menu_save">Zapisz zmiany</string>
-  
-  <!-- Menu: Don\'t Save -->
-  <string name="TEA_menu_discard">Nie zapisuj</string>
-  
-  <!-- Menu: Delete Task -->
-  <string name="TEA_menu_delete">Usuń zadanie</string>
-  
-  <!-- Menu: Task comments -->
-  <string name="TEA_menu_refresh_comments">Odśwież komentarze</string>
-
-  <string name="TEA_menu_comments">Komentarze</string>
-  
-   <!-- Toast: task saved with deadline (%s => preposition + time units) -->
-  <string name="TEA_onTaskSave_due">Zadanie zapisano: termin do %s</string>
-  
-  <!-- Toast: task saved without deadlines -->
-  <string name="TEA_onTaskSave_notDue">Zadanie zapisane</string>
-  
-  <!-- Toast: task was not saved -->
-  
-  <!-- Toast: task was deleted -->
-  
-  <!-- slide 15b: Task edit tab: activity -->
-  <string name="TEA_tab_activity">Aktywność</string>
-  
-  <!-- slide 15e:  Task edit tab: more editing settings -->
-  <string name="TEA_tab_more">Więcej</string>
-  
-  <!-- slide 15d: Task edit tab: web services -->
-  <string name="TEA_tab_web">Pomysły</string>
-  
-  <string name="TEA_timer_est">Est. %s</string>
-
-  <string name="TEA_timer_elap">Elapsed %s</string>
-  
-  <string-array name="TEA_urgency">
-      <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
-      <item>Brak daty</item>
-      <item>Konkretny dzień</item>
-      <item>Dzisiaj</item>
-      <item>Jutro</item>
-      <item>(pojutrze)</item>
-      <item>Przyszły tydzień</item>
-      <item>W ciągu dwóch tygodni</item>
-      <item>Następny miesiąc</item>
-  </string-array>
-  
-  <string name="TEA_no_time">Bez godziny</string>
-      
-  <string-array name="TEA_hideUntil">
-      <!-- hideUntil: labels for edit page. -->
-      <item>Nigdy</item>
-      <item>W terminie</item>
-      <item>Due time</item>
-      <item>Day before due</item>
-      <item>Week before due</item>
-      <item>Konkretny dzień/godzina</item>
-  </string-array>
-  
-  <!-- Task edit control set descriptors -->
-
-  <!-- slide 9b/35i -->
-  <string name="TEA_control_who">Kto</string>
-
-  <!-- slide 9c/ 35a -->
-  <string name="TEA_control_when">Kiedy</string>
-  <!-- slide 35b -->
-  <string name="TEA_control_more_section">---Sekcja \"Więcej\"---</string>
-  <!-- slide 16a/35c -->
-  <string name="TEA_control_importance">Priorytet</string>  
-  <!-- slide 16b/35d -->
-  <string name="TEA_control_lists">Listy</string>  
-  <!-- slide 16c/35e -->
-  <string name="TEA_control_notes">Opis</string>  
-  
-  <string name="TEA_control_files">Pliki</string>
-
-  <!-- slide 16e / slide 35g-->
-  <string name="TEA_control_reminders">Przypomnienia</string>
-
-  <!-- slide 16f -->
-  <string name="TEA_control_timer">Sterowanie zegara</string>
-  
-  <string name="TEA_control_hidden_section">----Zawsze Ukryte----</string>
-  
-  <string name="hide_until_prompt">Pokaż na mojej liście</string>
-  
-  <!-- Add Ons tab when no add-ons found -->
-  
-  <!-- Add Ons button -->
-  
-  <!-- More row -->
-  
-  <!-- slide 15c: Text when no activity to show -->
-  <string name="TEA_no_activity">Brak wydarzeń</string>
-  
-  <!-- Text to load more activity -->
-  <string name="TEA_load_more">Wczytaj więcej...</string>
-  
-  <!-- When controls dialog -->
-  <string name="TEA_when_dialog_title">Na kiedy ma być zrobione?</string>
-  
-  
-  <string name="TEA_new_task">Nowe zadanie</string>
-  
-  <string name="WSV_click_to_load">Dotknij mnie, aby sprawdzić jak ukończyć to zadanie!</string>
-  
-  <string name="WSV_not_online">Mogę zrobić więcej, posiadając łączność z Internetem. Sprawdź proszę połączenie.</string>
-  
-  <string name="TEA_contact_error">Program nie mógł znaleźć adresu email dla zaznaczonego kontaktu.</string>
-  
-  <!-- ============================================= IntroductionActivity == -->
-  
-  <!-- slide 1a: Introduction Window title -->
-  
-  <!-- Button to agree to EULA -->
-  
-  <!-- Button to disagree with EULA -->
-  
-  <!-- ===================================================== MissedCallActivity == -->
-  
-  <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
-  <string name="MCA_title">%1$s\ndzwonił\\-a o %2$s</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_return_call">Zadzwoń teraz</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_add_task">Zadzwoń później</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_ignore">Ignoruj</string>
-  
-  <!-- Missed call: dialog to ignore all missed calls title -->
-  <string name="MCA_ignore_title">Zignorować wszystkie nieodebrane połączenia?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls body -->
-  <string name="MCA_ignore_body">Zignorowano kilka nieodebranych połączeń. Czy Astrid ma Cię już więcej o nie nie pytać?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore all button -->
-  <string name="MCA_ignore_all">Zignoruj wszystkie połączenia.</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
-  <string name="MCA_ignore_this">Zignoruj tylko to połączenie.</string>
-
-  <!-- Missed call: preference title -->
-  <string name="MCA_missed_calls_pref_title">Obszar nieodebranych połączeń</string>
-
-  <!-- slide 49c: Missed call: preference description -->
-  <string name="MCA_missed_calls_pref_desc_enabled">Astrid będzie powiadamiał Cię o nieodebranych połączeniach i przypomni Ci o oddzwonieniu.</string>
-  <string name="MCA_missed_calls_pref_desc_disabled">Astrid nie będzie Cię informował o nieodebranych połączeniach.</string>
-
-  <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
-  <string name="MCA_task_title_name">Oddzwoń do %1$s o %2$s</string>
-
-  <!-- Missed call: task title no name (%s -> number)-->
-  <string name="MCA_task_title_no_name">Oddzwoń do %s</string>
-  
-  <!-- Missed call: schedule dialog title (%s -> name or number)-->
-  <string name="MCA_schedule_dialog_title">Oddzwoń do %s za...</string>
-  
-  <!-- Missed call speech bubble options -->
-  <string-array name="MCA_dialog_speech_options">
-      <item>Musi być fajnie być tak popularnym!</item>
-      <item>Hurra! Ludzie Cię lubią!</item>
-      <item>Umil im dzień, zadzwoń!</item>
-      <item>A Ty byś się nie ucieszył, gdyby ludzie do Ciebie oddzwaniali?</item>
-      <item>Dasz radę!</item>
-      <item>Zawsze możesz odpisać...</item>
-  </string-array>
-  
-  
-  <!-- ======================================= Calendar reminder activity == -->
-  
-  <!-- Calendar remindeer ignore button -->
-  <string name="CRA_ignore">Ignoruj</string>
-  
-  <!-- Calendar event -->
-  <string name="CRA_title">Czy potrzebujesz listy spotkań?</string>
-  
-  <!-- Calendar reminder: dialog to ignore all missed calls title -->
-  <string name="CRA_ignore_title">Ignorować wszystke wydarzenia w kalendarzu?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls body -->
-  <string name="CRA_ignore_body">Zignorowałeś kilka wydarzeń z kalendarza. Czy Astrid powinien przestać cię o nie pytać?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
-  <string name="CRA_ignore_all">Ignoruj wszystkie wydarzenia</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
-  <string name="CRA_ignore_this">Ignoruj tylko to wydarzenie</string>
-  
-  <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
-  <string name="CRA_speech_bubble_start">Wygląda na to, że %s niedługo się zaczyna. Czy chcesz stworzyć listę dla wydarzeń aktywnych?</string>
-
-  <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
-  <string name="CRA_speech_bubble_end">Wygląda na to, że ukończyłeś %s. Czy chcesz stworzyć listę dla aktywnych pozycji?</string>
-  
-  <!-- Calendar reminder: create list button -->
-  <string name="CRA_create_list">Utwórz listę</string>
-
-  <!-- Calendar reminder: postpone button -->
-  <string name="CRA_postpone">Może później</string>
-  
-  <!-- Calendar reminder: list exists dialog title -->
-  <string name="CRA_list_exists_title">Lista już istnieje</string>
-  
-  <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
-  <string name="CRA_list_exists_body">Lista o nazwie %s już istnieje. Czy chcesz skorzystać z istniejącej listy, czy stworzyć nową dla tego wydarzenia?</string>
-  
-  <!-- Calendar reminder: list exists dialog create new button -->
-  <string name="CRA_create_new">Stwórz nową</string>
-
-  <!-- Calendar reminder: list exists dialog use existing button -->
-  <string name="CRA_use_existing">Użyj istniejącej</string>
-  
-  <!-- Calendar remindr: created list (%s -> list name) -->
-  <string name="CRA_created_list_dialog">Stworzyłem listę %s.</string>
-  
-  <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
-  <string name="CRA_one_attendee">%s uczestniczy.</string>
-
-  <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
-  <string name="CRA_two_attendees">%1$s i %2$s uczestniczą.</string>
-
-  <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
-  <string name="CRA_many_attendees">%1$s, %2$s i %3$d innych uczestniczy.</string>
-  
-  <!-- Calendar reminder: invitation prompt -->
-  <string name="CRA_invitation_prompt">Czy chcesz ich zaprosić?</string>
-  
-  <!-- Calendar reminder: preference title -->
-  <string name="CRA_calendar_reminders_pref_title">Asystent kalendarza</string>
-
-  <!-- Calendar reminder: pref description disabled -->
-  <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid nie będzie ci przypominał o nadchodzących wydarzeniach w kalendarzu</string>
-
-  <!-- Calendar reminder: pref description enabled -->
-  <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid będzie przypominał ci o nadchodzących wydarzeniach w kalendarzu oraz będzie nakłaniał do przygotowania się do nich</string>
-  
-  <!-- Calendar reminder: share list title -->
-  <string name="CRA_share_list_title">Udostępnić listę?</string>
-  
-  <string name="CRA_invite_attendees">Zaproś uczestników</string>
-
-  <string name="CRA_more_options">Więcej opcji</string>
-
-  <string name="CRA_dont_invite">Nie, dziękuję</string>
-
-  <!-- Calendar reminder: share list title when no other attendees exist-->
-  <string name="CRA_list_created_title">Lista utworzona!</string>
-  
-  <!-- Calendar reminder: default new list name (%s -> event title) -->
-  <string name="CRA_default_list_name">Wydarzenia aktywne: %s</string>
-  
-  <!-- ===================================================== HelpActivity == -->
-  
-  <!-- Help: Button to get support from our website -->
-    
-  <!-- ==================================================== UpdateService == -->
-  
-  <!-- Changelog Window Title -->
-  <string name="UpS_changelog_title">Co nowego w Astrid?</string>
-  
-  <!-- Updates Window Title -->
-  <string name="UpS_updates_title">Aktualności Astrid</string>
-  
-  <!-- Updats No Activity to show for offline users -->
-  <string name="UpS_no_activity_log_in">Zaloguj się by zobaczyć listę\nTwoich postępów, a także\naktywności na współdzielonej liście.</string>
-  
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 31g: Preference Window Title -->
-  <string name="EPr_title">Astrid: Właściwości</string>
-  
-  <string name="EPr_share_astrid">Podziel się Astrid</string>
-
-  <string name="EPr_share_astrid_summary">Poinformuj o Astrid poprzez ulubioną sieć społecznościową</string>
-  
-  <!-- slide 46a -->
-  <string name="EPr_deactivated">niekatywny</string>
-
-  <!-- slide 30i: Preference Category: Appearance Title -->
-  <string name="EPr_appearance_header">Wygląd</string>
-  
-  <!-- Preference Category: Appearance Summary -->
-  <string name="EPr_appearance_summary">Motywy, widżety, zadania w rzędach, edycja wyświetlacza</string>
-  
-  <!-- FAQ Preference title -->
-  <string name="EPr_faq_title">Często zadawane pytania: FAQ</string>
-  
-  <!-- Account status preference (%s -> account type) -->
-  <string name="EPr_account_title">Konto: %s</string>
-
-  <!-- Support preferences summary -->
-  <string name="EPr_support_summary">Tutorial, FAQ, o aplikacji</string>
-  
-  <!-- slide 34a: Preference: Task List Font Size Title -->
-  <string name="EPr_fontSize_title">Rozmiar listy zadań</string>
-  
-  <!-- Preference: Filters to show pref screen title -->
-  <string name="EPr_filters_to_show_title">Pokazywane filtry</string>
-  
-  <!-- slide 32a: Preference: Show confirmation for smart reminders -->
-  <string name="EPr_showSmartConfirmation_title">Pokaż potwierdzenie dla inteligentnych powiadomień</string>
-  
-  <!-- slide 34g: Preference: Task List Font Size Description -->                                                                                                                                                  
-  <string name="EPr_fontSize_desc">Rozmiar czcionki głównej listy zadań</string>  
-  
-  <!-- Preferemce: Show task edit confirmation toasts -->
-  
-  <!-- slide 34c: Preference: Task List Show Notes -->
-  <string name="EPr_showNotes_title">Pokazuj opis w zadaniu</string>
-  
-  <!-- Edit screen preference category -->
-  <string name="EPr_edit_screen_options">Edytuj ustawienia ekranu</string>
-  
-  <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
-  <string name="EPr_beastMode_title">Edytuj kolejność</string>
-  
-  <string name="EPr_beastMode_shortcut">Dostosuj</string>
-  
-  <string name="EPr_time_increment">Krok co 5-minut</string>
-  
-  <string name="EPr_use_date_shortcuts">Użyj skrótów dat</string>
-  
-  <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
-  
-  <!-- slide 35h -->
-  <string name="EPr_beastMode_desc">Dostosuj układ strony edycji zadania</string>
-  <!-- slide 35j -->
-  <string name="EPr_beastMode_reset">Przywróć domyślne</string>
-  
-  <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on each row</string>
-      
-  <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Opis będzie dostępny na ekranie edycji zadania</string>  
-  <!-- Preference: Task List Show Notes Description (enabled) -->
-  <string name="EPr_showNotes_desc_enabled">Opis będzie zawsze wyświetlany</string>
-  
-  <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
-  <string name="EPr_compressTaskRows_title">Kompaktowy Wiersz Zadań</string>
-  <!-- slide 34j -->
-  <string name="EPr_compressTaskRows_desc">Dopasuj wiersz zadań do długości tytułu</string>
-  
-  <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
-  <!-- slide 34k-->
-  
-  <!-- slide 34b: Preferences: Wrap task titles to two lines -->
-  <string name="EPr_fullTask_title">Pokaż pełną nazwę zadania</string>
-  <string name="EPr_fullTask_desc_enabled">Pełna nazwa zadania będzie wyświetlana</string>
-  <!-- slide 34h -->
-  <string name="EPr_fullTask_desc_disabled">Pierwsze dwie linie nazwy zadania będą wyświetlane</string>
-  
-  <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
-  <string name="EPr_ideaAuto_title">Automatycznie ładowana Zakładka Pomysłów</string>
-  <!-- slide 32c -->
-  <string name="EPr_ideaAuto_desc_enabled">Wyszukiwanie sieciowe w zakładce pomysłów odbędzie się po kliknięciu na zakładkę.</string>
-  <string name="EPr_ideaAuto_desc_disabled">Przeszukiwanie sieci w poszukiwaniu zakładki "pomysły" przeprowadzane będzie tylko po ręcznym zapytaniu</string>
-  
-  <!-- Preferences: task row style -->
-  <string-array name="EPr_task_row_styles">
-      <item>Oryginalny</item>
-      <item>Prosty</item>
-      <item>Tylko tytuł</item>
-  </string-array>
-  
-  <string-array name="EPr_task_row_style_descriptions">
-      <item>Skróć tytuł do dwóch linii z datą na prawo</item>
-      <item>Skróć tytuł do jednej lini z datą i listami poniżej</item>
-      <item>Tytuł tylko w jednej linii</item>
-  </string-array>
-  
-  <!-- task row style title (%s -> style) -->
-  <string name="EPr_task_row_style_title">Styl wiersza: %s</string>
-  
-  <!-- Preference: custom filters enabled -->
-  <string name="EPr_use_filters_title">Użyj filtrów</string>
-  <string name="EPr_use_filters_subtitle">Pozwala stworzyć własne filtry</string>
-
-  <!-- Preference: show list members in shared list -->
-  <string name="EPr_show_list_members_title">Pokaż członków w listach współdzielonych</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_simple_input_boxes">Proste pola tekstowe</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_show_quickadd_controls">Zaawansowane kontrolki szybkiego dodawania</string>
-
-  <!-- Preference: don\'t show plus button until input present -->
-  <string name="EPr_hide_plus_button">Hide plus button</string>
-
-  <!-- Preference: menu items -->
-  <string name="EPr_menu_items">Pozycje menu</string>
-
-  <!-- Preference: list view -->
-  <string name="EPr_list_view">Widok listy</string>
-
-  <!-- Preference: task edit comments -->
-  <string name="EPr_show_task_edit_comments">Pokaż komentarze w edycji zadania</string>
-  
-  <!-- slide 30f/ 36f: Preference: Theme -->
-  <string name="EPr_theme_title">Kolorystyka</string>
-  <!-- Preference: Theme Description (%s => value) -->
-  <string name="EPr_theme_desc">Aktualnie: %s</string>  
-  <!-- Preference: Theme Description (android 1.6) -->
-  <string name="EPr_theme_desc_unsupported">Ustawienia wymagaja Androida 2.0+</string>
-  <!-- slide 32h/ 37b -->
-  <string name="EPr_theme_widget_title">Skórka Widgeta</string>
-  
-  <!-- slide 30d/ 34f: Preference screen: all task row settings -->
-  <string name="EPr_taskRowPrefs_title">Wygląd rzędu zadań</string>
-  
-  <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
-  <string name="EPr_use_contact_picker">Użyj wybierania kontaktów</string>
-  <!-- slide 49b -->
-  <string name="EPr_use_contact_picker_desc_enabled">Systemowa opcja wybierania kontaktów pojawi się w okienku przydzielania zadania</string>
-  <string name="EPr_use_contact_picker_desc_disabled">Systemowa opcja wybierania kontaktów nie będzie wyświetlana</string>
-
-  <!-- slide 49i: Preferences: Third party addons -->
-  <string name="EPr_third_party_addons">Włącz obsługę dodatków zewnętrznych</string>
-  <string name="EPr_third_party_addons_desc_enabled">Nieoficjalne add-ony zostaną włączone</string>
-  <!-- slide 49d -->
-  <string name="EPr_third_party_addons_desc_disabled">Nieoficjalne add-ony zostaną wyłączone</string>
-  
-  <!-- Preferences: ideas tab -->
-  <string name="EPr_ideas_tab_enabled">Pomysły na zadania</string>
-  <string name="EPr_ideas_tab_description">Zdobądź pomysły, które pomogą ukończyć zadania</string>
-  
-  <!-- Preferences: calendar event start time -->
-  <string name="EPr_cal_end_or_start_at_due_time">Czas zdarzenia kalendarza</string>
-  <string name="EPr_cal_end_at_due_time">Zakończ zadania kalendarza w ustalonym czasie</string>
-  <string name="EPr_cal_start_at_due_time">Rozpocznij zadania kalendarza w ustalonym czasie</string>
-  
-  <string name="EPr_force_phone_layout">Używaj wyglądu komórkowego</string>
-
-  <string name="EPr_show_featured_lists">Pokaż wyróżnione listy</string>
-  
-  <!-- Configurations -->
-  <string name="EPr_configurations_title">Konfiguruj</string>
-  <string name="EPr_config_default">Domyślny</string>
-  <string name="EPr_config_lite">Astrid Lite</string>
-  
-  <!-- Dialog title when setting preference configuration -->
-  <string name="EPr_config_dialog_title">Ustawić konfigurację?</string>
-  <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
-  <string name="EPr_config_dialog_text">Zresetować ustawienia do konfiguracji %s?</string>
-  
-  <!-- default configuration name for the above dialog -->
-  <string name="EPr_config_dialog_default_id">domyślny</string>
-  
-  <!-- Preference title for showing save and cancel buttons in task edit page -->
-  <string name="EPr_show_save_and_cancel">Pokaż przyciski zapisz i anuluj</string>
-  
-  
-  <!-- Swipe between lists -->
-  <!-- Preference: swipe between lists performance -->
-  <string name="EPr_swipe_lists_performance_title">Przejedź pomiędzy listami</string>
-  
-  <string-array name="EPr_swipe_lists_performance_mode">
-      <item>Bez przeciągania</item>
-      <item>Oszczędzaj pamięć</item>
-      <item>Normalna wydajność</item>
-      <item>Wysoka wydajność</item>
-  </string-array>
-  
-  <string-array name="EPr_swipe_lists_performance_desc">
-  <!-- slide 49a -->
-      <item>Przeciąganie pomiędzy listami jest wyłączone</item>
-      <item>Mniejsza wydajność</item>
-      <item>Ustawienia domyœlne</item>
-      <item>Używa więcej zasobów systemu</item>
-  </string-array>
-    
-  <string name="swipe_lists_helper_title">Przeciągaj pomiędzy listami</string>
-  <string name="swipe_lists_helper_header">Przeciągnij w lewo lub prawo aby szybko przełączyć się między listami</string>
-  <string name="swipe_lists_helper_subtitle">Zmień ustawienia w Ustawienia -&amp;gl; Wygląd</string>
-
-  <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
-  
-  <string-array name="EPr_default_reminders_mode">
-      <!-- reminders duration: labels for "Task Defaults" preference item. -->
-      <item>@string/TEA_reminder_mode_once</item>
-      <item>@string/TEA_reminder_mode_five</item>
-      <item>@string/TEA_reminder_mode_nonstop</item>
-  </string-array>
-    
-  <string-array name="EPr_themes">
-    <!-- theme_settings: labels for Theme preference menu -->
-    <!-- slide 36a-->
-    <item>Dzień - Blue</item>
-    <!-- slide 36b -->
-    <item>Dzień - Red</item>
-    <!-- slide 36b -->
-    <item>Błękit nieba</item>
-    <!-- slide 36c -->
-    <item>Noc</item>
-    <!-- slide 36d -->
-    <item>Przezroczysty (biały tekst)</item>
-    <!-- slide 36e -->
-    <item>Przezroczysty (czarny tekst)</item>
-  </string-array>
-  
-  <string-array name="EPr_themes_widget">
-    <!-- slide 32i / 37a-->
-    <item>Taki jak aplikacji</item>
-    <item>Dzień - Niebieski</item>
-    <item>Dzień - Czerwony</item>
-    <item>Błękit nieba</item>
-    <item>Noc</item>
-    <item>Przezroczysty (biały tekst)</item>
-    <item>Przezroczysty (czarny tekst)</item>
-    <item>Old Style</item>
-  </string-array>
-  
-  <!-- ========================================== Task Management Settings == -->
-
-  <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
-  <string name="EPr_manage_header">Zarządzaj starymi zadaniami</string>
-  <!-- slide 47d -->
-  <string name="EPr_manage_delete_completed">Usuń zakończone zadania</string>
-  <string name="EPr_manage_delete_completed_message">Czy na pewno chcesz usunąć wszystkie zadania wykonane?</string>
-  <!-- slide 47a -->
-  <string name="EPr_manage_delete_completed_summary">Usunięte zadania mogą być cofnięte jeden po drugim</string>
-  <string name="EPr_manage_delete_completed_status">Usunięto %d zadań!</string>
-  <!-- slide 47e -->
-  <string name="EPr_manage_purge_deleted">Skasuj usunięte zadania</string>
-  <string name="EPr_manage_purge_deleted_message">Czy na pewno chcesz, aby oczyścić wszystkie usunięte zadania?\n\n Te zadania znikną na zawsze!</string>
-  <string name="EPr_manage_purge_deleted_status">Oczyszczone %d zadań!</string>
-  <!-- slide 47b-->
-  <string name="EPr_manage_purge_deleted_summary">Uwaga! Oczyszczone zadania nie mogą być odzyskane bez pliku kopii zapasowej!</string>
-  <!-- slide 47h-->
-  <string name="EPr_manage_clear_all">Usuń wszystkie dane</string>
-  <string name="EPr_manage_clear_all_message">Usunąć z Astrid wszystkie zadania i ustawienia?\n\nUwaga: tego nie da się cofnąć!</string>
-
-  <!-- slide 47f -->
-  <string name="EPr_manage_delete_completed_gcal">Usuń wydarzenia kalendarza dla zakończonych zadań</string>
-  <string name="EPr_manage_delete_completed_gcal_message">Na pewno chcesz usunąć wszystkie wydarzenia dla zakończonych zadań?</string>
-  <string name="EPr_manage_delete_completed_gcal_summary"></string>
-  <string name="EPr_manage_delete_completed_gcal_status">Usunięto %d wydarzeń kalendarza!</string>
-      
-  <!-- slide 47g-->
-  <string name="EPr_manage_delete_all_gcal">Usuń wszystkie zdarzenia kalendarza dla zadań</string>
-  <string name="EPr_manage_delete_all_gcal_message">Na pewno chcesz usunąć wszystkie wydarzenia dla zadań?</string>
-  <string name="EPr_manage_delete_all_gcal_summary"></string>
-  <string name="EPr_manage_delete_all_gcal_status">Usunięto %d wydarzeń kalendarza!</string>
-      
-  <!-- ==================================================== AddOnActivity == -->
-  
-  <!-- Add Ons Activity Title -->
-  <string name="AOA_title">Astrid: Dodatki</string>
-    
-  <!-- Add-on Activity: author for internal authors  -->
-  <string name="AOA_internal_author">Zespół Astrid</string>
-    
-  <!-- Add-on Activity: installed add-ons tab -->
-  <string name="AOA_tab_installed">Zainstalowane</string>
-  
-  <!-- Add-on Activity - available add-ons tab -->
-  <string name="AOA_tab_available">Dostępne</string>
-  
-  <!-- Add-on Activity - free add-ons label -->
-  <string name="AOA_free">Darmowe</string>
-  
-  <!-- Add-on Activity - menu item to visit add-on website -->
-  
-  <!-- Add-on Activity - menu item to visit android market -->
-  
-  <!-- Add-on Activity - when list is empty -->
-  <string name="AOA_no_addons">Pusta Lista!</string>
-  
-  <string name="AOA_ppack_title">Astrid Power Pack</string>
-  <string name="AOA_ppack_description">Wspieraj Astrid i stań się bardziej produktywny z Astrid Power Pack. Widżety 4x2 i 4x4 oraz integracja z głosem. Ulepsz go dzisiaj!</string>
-  <string name="AOA_locale_title">Wtyczka do obsługi języków w Astrid</string>
-  <string name="AOA_locale_description">Umożliwia Astrid wykorzystanie aplikacji obsługującej języki, by wysyłać ci powiadomienia oparte o filtry. Wymaga wtyczki Locale.</string>
-  
-  <!-- ====================================================== TasksWidget == -->
-
-  <!-- Widget text when loading tasks -->
-  <string name="TWi_loading">Ładowanie...</string>
-
-  <!-- Widget configuration activity title: select a filter -->
-  <string name="WCA_title">Wybierz zadania do wyświetlenia</string>
-  
-  <!-- ======================================================== Waiting on me -->
-
-  <string name="wom_commented">%s commented on your task.</string>
-  <string name="wom_mentioned">%s mentioned you.</string>
-  <string name="wom_assigned">%s assigned this to you.</string>
-  <string name="wom_raised_pri">%s raised the priority.</string>
-  <string name="wom_changed_due">%s changed the due date.</string>
-  <string name="wom_default">%s wants your attention.</string>
-  
-  <string name="wom_dismiss">Odwołaj</string>
-  <string name="wom_acknowledge">I\'ve read this</string>
-
-  <!-- ============================================================= About == -->
-  
-  <!-- slide 30h: Title of "About" option in settings -->
-  <string name="p_about">O Astrid</string>
-  
-  <!-- About text (%s => current version)-->
-  <string name="p_about_text">Bieżąca wersja: %s\n\n Astrid ma otwarte źródła i jest zarządzana z dumą przez Todoroo, Inc.</string>
-
-  <!-- Title of "Help" option in settings -->
-  <string name="p_help">Wsparcie</string>
-  
-  <!-- slide 30c: Title of "Forums" option in settings -->
-  <string name="p_forums">Społeczność</string>
-  
-  <!-- Title of "Premium" option in settings -->
-  <string name="p_premium">Premium</string>
-  
-  <!-- ============================================================= Misc == -->
-  
-  <string name="feedback_positive_title">Ocenić Astrid?</string>
-
-  <string name="feedback_positive_body">Cieszę się, że mogłem pomóc! Masz chwilę aby pomóc nam pięciogwiazdkową oceną?</string>
-
-  <string name="feedback_negative_title">Leave feedback?</string>
-
-  <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
-
-  <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback section--it might not be available on your device.</string>
-  
-  <string name="feedback_positive_button">Rate Astrid</string>
-
-  <string name="feedback_negative_button">Leave feedback</string>
-  
-  <string name="feedback_not_now">Nie teraz</string>
-  
-  <string name="feedback_banner_text">How\'s Astrid working for you?</string>
-  
-  <!-- Displayed when task killer found. %s => name of the application -->
-  <string name="task_killer_help">Wygląda na to, że używasz aplikacji, która zabija procesy (%s)! Jeśli możesz, dodaj Astrid do listy wyjątków. Nieaktywny program Astrid nie będzie Ci przypominać o zadaniach do wykonania.\n</string>
-  
-  <!-- Task killer dialog ok button -->
-  <string name="task_killer_help_ok">Nie zabiję Astrid!</string>
-    
-  <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
-  
-  <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
-  <string name="marketplace_description">Astrid jest program na licencji open-source. Pomaga Ci organizować zadania i wykonywać je na czas. Zawiera przypomnienia, etykiety, synchronizację, lokalne dodatki, widgety i dużo więcej.</string>
-  
-  <string name="DB_corrupted_title">Uszkodzona baza danych</string>
-  
-  <string name="DB_corrupted_body">O jej! Wygląda na to, że możeć mieć uszkodzoną bazę danych.
-Jeśli widzisz ten błąd często, sugerujemy wyczyszczenie 
-wszystkich danych (Settings->Sync and backup->Manage old tasks->Clear all data)
-i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup->Import tasks) Astrid.</string>
-      
-  <string name="market_unavailable">Niestety sklep nie jest dostępny dla twojego systemu.</string>
-  
+    <!-- slide 30f/ 36f: Preference: Theme -->
+    <string name="EPr_theme_title">Kolorystyka</string>
+    <!-- Preference: Theme Description (%s => value) -->
+    <string name="EPr_theme_desc">Aktualnie: %s</string>
+    <!-- Preference: Theme Description (android 1.6) -->
+    <string name="EPr_theme_desc_unsupported">Ustawienia wymagaja Androida 2.0+</string>
+    <!-- slide 32h/ 37b -->
+    <string name="EPr_theme_widget_title">Skórka Widgeta</string>
 
+    <!-- slide 30d/ 34f: Preference screen: all task row settings -->
+    <string name="EPr_taskRowPrefs_title">Wygląd rzędu zadań</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
+    <string name="EPr_use_contact_picker">Użyj wybierania kontaktów</string>
+    <!-- slide 49b -->
+    <string name="EPr_use_contact_picker_desc_enabled">Systemowa opcja wybierania kontaktów pojawi
+        się w okienku przydzielania zadania
+    </string>
+    <string name="EPr_use_contact_picker_desc_disabled">Systemowa opcja wybierania kontaktów nie
+        będzie wyświetlana
+    </string>
 
+    <!-- slide 49i: Preferences: Third party addons -->
+    <string name="EPr_third_party_addons">Włącz obsługę dodatków zewnętrznych</string>
+    <string name="EPr_third_party_addons_desc_enabled">Nieoficjalne add-ony zostaną włączone
+    </string>
+    <!-- slide 49d -->
+    <string name="EPr_third_party_addons_desc_disabled">Nieoficjalne add-ony zostaną wyłączone
+    </string>
 
-  <!-- slide 32g: Preference Category: Defaults Title -->
-  <string name="EPr_defaults_header">Nowe zadanie (domyślnie)</string>
-  <string name="EPr_defaults_summary">Priorytet, określony czas, dodaj do kalendarza</string>
-  
-  <!-- slide 41f:  Preference: Default Urgency Title -->
-  <string name="EPr_default_urgency_title">Termin końcowy (domyślnie)</string>
-  <!-- Preference: Default Urgency Description (%s => setting) -->
-  <string name="EPr_default_urgency_desc">Aktualnie: %s</string>
-  
-  <!-- slide 40a: Preference: Default Importance Title -->
-  <string name="EPr_default_importance_title">Domyślny priorytet</string>
-  <!-- Preference: Default Importance Description (%s => setting) -->
-  <string name="EPr_default_importance_desc">Aktualnie: %s</string>
-  
-  <!-- slide 42e: Preference: Default Hide Until Title -->
-  <string name="EPr_default_hideUntil_title">Ukrywanie zadania (domyślnie)</string>
-  <!-- Preference: Default Hide Until Description (%s => setting) -->
-  <string name="EPr_default_hideUntil_desc">Aktualnie: %s</string>
-  
-  <!-- slide 43e: Preference: Default Reminders Title -->
-  <string name="EPr_default_reminders_title">Przypomnienia (domyślnie)</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_desc">Aktualnie: %s</string>
-  
-  <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
-  <string name="EPr_default_addtocalendar_title">Domyślnie dodawaj do kalendarza</string>
-  <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
-  <string name="EPr_default_addtocalendar_desc_disabled">Nowe zadania nie utworzą wydarzeń w Kalendarzu Google</string>
-  <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
-  <string name="EPr_default_addtocalendar_desc">Nowe zadania będą w kalendarzu: \"%s\"</string>
-  
-  <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
-  <string name="EPr_default_reminders_mode_title">Domyślny dzwonek/wibracja</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_mode_desc">Aktualnie: %s</string>
-  
-  <string-array name="EPr_default_importance">
-    <!-- importance: labels for "Task Defaults" preference item. -->
-    <!-- slide 40b -->
-    <item>!!! (Najwyższy)</item>
-    <item>!!</item>
-    <item>!</item>
-    <!-- slide 40c -->
-    <item>o (Najniższy)</item>
-  </string-array>
-  
-  <string-array name="EPr_default_urgency">
-    <!-- urgency: labels for "Task Defaults" preference item. -->
-    <!-- slide 41a-->
-    <item>Bez nieprzekraczalnego terminu</item>
-    <!-- slide 41b -->
-    <item>Dzisiaj</item>
-    <!-- slide 41c-->
-    <item>Jutro</item>
-    <!-- slide 41d -->
-    <item>Pojutrze</item>
-    <!-- slide 41e -->
-    <item>W przyszłym tygodniu</item>
-  </string-array>
-  
-  <string-array name="EPr_default_hideUntil">
-    <!-- hideUntil: labels for "Task Defaults" preference item. -->
-    <!-- slide 42a -->
-    <item>Nie ukrywaj</item>
-    <!-- slide 42b -->
-    <item>Do terminu zadania</item>
-    <!-- slide 42c -->
-    <item>Do dnia przed terminem</item>
-    <!-- slide 42d-->
-    <item>Do tygodnia przed terminem</item>
-  </string-array>
-  
-  <string-array name="EPr_default_reminders">
-    <!-- reminders: labels for "Task Defaults" preference item. -->
-    <!-- slide 43a -->
-    <item>Brak przypomnień dla terminu nieprzekraczalnego</item>
-    <!-- slide 43b -->
-    <item>W dniu terminu nieprzekraczalnego</item>
-    <!-- slide 43c -->
-    <item>Gdy zaległe</item>
-    <!-- slide 43d -->
-    <item>W nieprzekraczalnym terminie lub gdy zaległe</item>
-  </string-array>
-  
-  <string-array name="EPr_default_addtocalendar">
-    <!-- addtocalendar: labels for "Task Defaults" preference item. -->
-    <item>@string/EPr_deactivated</item>
-  </string-array>      
+    <!-- Preferences: ideas tab -->
+    <string name="EPr_ideas_tab_enabled">Pomysły na zadania</string>
+    <string name="EPr_ideas_tab_description">Zdobądź pomysły, które pomogą ukończyć zadania</string>
 
+    <!-- Preferences: calendar event start time -->
+    <string name="EPr_cal_end_or_start_at_due_time">Czas zdarzenia kalendarza</string>
+    <string name="EPr_cal_end_at_due_time">Zakończ zadania kalendarza w ustalonym czasie</string>
+    <string name="EPr_cal_start_at_due_time">Rozpocznij zadania kalendarza w ustalonym czasie
+    </string>
+
+    <string name="EPr_force_phone_layout">Używaj wyglądu komórkowego</string>
+
+    <string name="EPr_show_featured_lists">Pokaż wyróżnione listy</string>
+
+    <!-- Configurations -->
+    <string name="EPr_configurations_title">Konfiguruj</string>
+    <string name="EPr_config_default">Domyślny</string>
+    <string name="EPr_config_lite">Astrid Lite</string>
+
+    <!-- Dialog title when setting preference configuration -->
+    <string name="EPr_config_dialog_title">Ustawić konfigurację?</string>
+    <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
+    <string name="EPr_config_dialog_text">Zresetować ustawienia do konfiguracji %s?</string>
+
+    <!-- default configuration name for the above dialog -->
+    <string name="EPr_config_dialog_default_id">domyślny</string>
+
+    <!-- Preference title for showing save and cancel buttons in task edit page -->
+    <string name="EPr_show_save_and_cancel">Pokaż przyciski zapisz i anuluj</string>
+
+
+    <!-- Swipe between lists -->
+    <!-- Preference: swipe between lists performance -->
+    <string name="EPr_swipe_lists_performance_title">Przejedź pomiędzy listami</string>
+
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>Bez przeciągania</item>
+        <item>Oszczędzaj pamięć</item>
+        <item>Normalna wydajność</item>
+        <item>Wysoka wydajność</item>
+    </string-array>
+
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <!-- slide 49a -->
+        <item>Przeciąganie pomiędzy listami jest wyłączone</item>
+        <item>Mniejsza wydajność</item>
+        <item>Ustawienia domyœlne</item>
+        <item>Używa więcej zasobów systemu</item>
+    </string-array>
+
+    <string name="swipe_lists_helper_title">Przeciągaj pomiędzy listami</string>
+    <string name="swipe_lists_helper_header">Przeciągnij w lewo lub prawo aby szybko przełączyć się
+        między listami
+    </string>
+    <string name="swipe_lists_helper_subtitle">Zmień ustawienia w Ustawienia -&amp;gl; Wygląd
+    </string>
+
+    <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
+
+    <string-array name="EPr_default_reminders_mode">
+        <!-- reminders duration: labels for "Task Defaults" preference item. -->
+        <item>@string/TEA_reminder_mode_once</item>
+        <item>@string/TEA_reminder_mode_five</item>
+        <item>@string/TEA_reminder_mode_nonstop</item>
+    </string-array>
+
+    <string-array name="EPr_themes">
+        <!-- theme_settings: labels for Theme preference menu -->
+        <!-- slide 36a-->
+        <item>Dzień - Blue</item>
+        <!-- slide 36b -->
+        <item>Dzień - Red</item>
+        <!-- slide 36b -->
+        <item>Błękit nieba</item>
+        <!-- slide 36c -->
+        <item>Noc</item>
+        <!-- slide 36d -->
+        <item>Przezroczysty (biały tekst)</item>
+        <!-- slide 36e -->
+        <item>Przezroczysty (czarny tekst)</item>
+    </string-array>
+
+    <string-array name="EPr_themes_widget">
+        <!-- slide 32i / 37a-->
+        <item>Taki jak aplikacji</item>
+        <item>Dzień - Niebieski</item>
+        <item>Dzień - Czerwony</item>
+        <item>Błękit nieba</item>
+        <item>Noc</item>
+        <item>Przezroczysty (biały tekst)</item>
+        <item>Przezroczysty (czarny tekst)</item>
+        <item>Old Style</item>
+    </string-array>
+
+    <!-- ========================================== Task Management Settings == -->
+
+    <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
+    <string name="EPr_manage_header">Zarządzaj starymi zadaniami</string>
+    <!-- slide 47d -->
+    <string name="EPr_manage_delete_completed">Usuń zakończone zadania</string>
+    <string name="EPr_manage_delete_completed_message">Czy na pewno chcesz usunąć wszystkie zadania
+        wykonane?
+    </string>
+    <!-- slide 47a -->
+    <string name="EPr_manage_delete_completed_summary">Usunięte zadania mogą być cofnięte jeden po
+        drugim
+    </string>
+    <string name="EPr_manage_delete_completed_status">Usunięto %d zadań!</string>
+    <!-- slide 47e -->
+    <string name="EPr_manage_purge_deleted">Skasuj usunięte zadania</string>
+    <string name="EPr_manage_purge_deleted_message">Czy na pewno chcesz, aby oczyścić wszystkie
+        usunięte zadania?\n\n Te zadania znikną na zawsze!
+    </string>
+    <string name="EPr_manage_purge_deleted_status">Oczyszczone %d zadań!</string>
+    <!-- slide 47b-->
+    <string name="EPr_manage_purge_deleted_summary">Uwaga! Oczyszczone zadania nie mogą być
+        odzyskane bez pliku kopii zapasowej!
+    </string>
+    <!-- slide 47h-->
+    <string name="EPr_manage_clear_all">Usuń wszystkie dane</string>
+    <string name="EPr_manage_clear_all_message">Usunąć z Astrid wszystkie zadania i
+        ustawienia?\n\nUwaga: tego nie da się cofnąć!
+    </string>
+
+    <!-- slide 47f -->
+    <string name="EPr_manage_delete_completed_gcal">Usuń wydarzenia kalendarza dla zakończonych
+        zadań
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_message">Na pewno chcesz usunąć wszystkie
+        wydarzenia dla zakończonych zadań?
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_summary"></string>
+    <string name="EPr_manage_delete_completed_gcal_status">Usunięto %d wydarzeń kalendarza!</string>
+
+    <!-- slide 47g-->
+    <string name="EPr_manage_delete_all_gcal">Usuń wszystkie zdarzenia kalendarza dla zadań</string>
+    <string name="EPr_manage_delete_all_gcal_message">Na pewno chcesz usunąć wszystkie wydarzenia
+        dla zadań?
+    </string>
+    <string name="EPr_manage_delete_all_gcal_summary"></string>
+    <string name="EPr_manage_delete_all_gcal_status">Usunięto %d wydarzeń kalendarza!</string>
+
+    <!-- ==================================================== AddOnActivity == -->
+
+    <!-- Add Ons Activity Title -->
+    <string name="AOA_title">Astrid: Dodatki</string>
+
+    <!-- Add-on Activity: author for internal authors  -->
+    <string name="AOA_internal_author">Zespół Astrid</string>
+
+    <!-- Add-on Activity: installed add-ons tab -->
+    <string name="AOA_tab_installed">Zainstalowane</string>
+
+    <!-- Add-on Activity - available add-ons tab -->
+    <string name="AOA_tab_available">Dostępne</string>
+
+    <!-- Add-on Activity - free add-ons label -->
+    <string name="AOA_free">Darmowe</string>
+
+    <!-- Add-on Activity - menu item to visit add-on website -->
+
+    <!-- Add-on Activity - menu item to visit android market -->
+
+    <!-- Add-on Activity - when list is empty -->
+    <string name="AOA_no_addons">Pusta Lista!</string>
+
+    <string name="AOA_ppack_title">Astrid Power Pack</string>
+    <string name="AOA_ppack_description">Wspieraj Astrid i stań się bardziej produktywny z Astrid
+        Power Pack. Widżety 4x2 i 4x4 oraz integracja z głosem. Ulepsz go dzisiaj!
+    </string>
+    <string name="AOA_locale_title">Wtyczka do obsługi języków w Astrid</string>
+    <string name="AOA_locale_description">Umożliwia Astrid wykorzystanie aplikacji obsługującej
+        języki, by wysyłać ci powiadomienia oparte o filtry. Wymaga wtyczki Locale.
+    </string>
+
+    <!-- ====================================================== TasksWidget == -->
+
+    <!-- Widget text when loading tasks -->
+    <string name="TWi_loading">Ładowanie...</string>
+
+    <!-- Widget configuration activity title: select a filter -->
+    <string name="WCA_title">Wybierz zadania do wyświetlenia</string>
+
+    <!-- ======================================================== Waiting on me -->
+
+    <string name="wom_commented">%s commented on your task.</string>
+    <string name="wom_mentioned">%s mentioned you.</string>
+    <string name="wom_assigned">%s assigned this to you.</string>
+    <string name="wom_raised_pri">%s raised the priority.</string>
+    <string name="wom_changed_due">%s changed the due date.</string>
+    <string name="wom_default">%s wants your attention.</string>
+
+    <string name="wom_dismiss">Odwołaj</string>
+    <string name="wom_acknowledge">I\'ve read this</string>
+
+    <!-- ============================================================= About == -->
+
+    <!-- slide 30h: Title of "About" option in settings -->
+    <string name="p_about">O Astrid</string>
+
+    <!-- About text (%s => current version)-->
+    <string name="p_about_text">Bieżąca wersja: %s\n\n Astrid ma otwarte źródła i jest zarządzana z
+        dumą przez Todoroo, Inc.
+    </string>
+
+    <!-- Title of "Help" option in settings -->
+    <string name="p_help">Wsparcie</string>
+
+    <!-- slide 30c: Title of "Forums" option in settings -->
+    <string name="p_forums">Społeczność</string>
+
+    <!-- Title of "Premium" option in settings -->
+    <string name="p_premium">Premium</string>
+
+    <!-- ============================================================= Misc == -->
+
+    <string name="feedback_positive_title">Ocenić Astrid?</string>
+
+    <string name="feedback_positive_body">Cieszę się, że mogłem pomóc! Masz chwilę aby pomóc nam
+        pięciogwiazdkową oceną?
+    </string>
+
+    <string name="feedback_negative_title">Leave feedback?</string>
+
+    <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
+
+    <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback
+        section--it might not be available on your device.
+    </string>
+
+    <string name="feedback_positive_button">Rate Astrid</string>
+
+    <string name="feedback_negative_button">Leave feedback</string>
+
+    <string name="feedback_not_now">Nie teraz</string>
+
+    <string name="feedback_banner_text">How\'s Astrid working for you?</string>
+
+    <!-- Displayed when task killer found. %s => name of the application -->
+    <string name="task_killer_help">Wygląda na to, że używasz aplikacji, która zabija procesy (%s)!
+        Jeśli możesz, dodaj Astrid do listy wyjątków. Nieaktywny program Astrid nie będzie Ci
+        przypominać o zadaniach do wykonania.\n
+    </string>
+
+    <!-- Task killer dialog ok button -->
+    <string name="task_killer_help_ok">Nie zabiję Astrid!</string>
+
+    <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
+
+    <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
+    <string name="marketplace_description">Astrid jest program na licencji open-source. Pomaga Ci
+        organizować zadania i wykonywać je na czas. Zawiera przypomnienia, etykiety, synchronizację,
+        lokalne dodatki, widgety i dużo więcej.
+    </string>
+
+    <string name="DB_corrupted_title">Uszkodzona baza danych</string>
+
+    <string name="DB_corrupted_body">O jej! Wygląda na to, że możeć mieć uszkodzoną bazę danych.
+        Jeśli widzisz ten błąd często, sugerujemy wyczyszczenie
+        wszystkich danych (Settings->Sync and backup->Manage old tasks->Clear all data)
+        i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup->Import tasks)
+        Astrid.
+    </string>
+
+    <string name="market_unavailable">Niestety sklep nie jest dostępny dla twojego systemu.</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 32g: Preference Category: Defaults Title -->
+    <string name="EPr_defaults_header">Nowe zadanie (domyślnie)</string>
+    <string name="EPr_defaults_summary">Priorytet, określony czas, dodaj do kalendarza</string>
+
+    <!-- slide 41f:  Preference: Default Urgency Title -->
+    <string name="EPr_default_urgency_title">Termin końcowy (domyślnie)</string>
+    <!-- Preference: Default Urgency Description (%s => setting) -->
+    <string name="EPr_default_urgency_desc">Aktualnie: %s</string>
+
+    <!-- slide 40a: Preference: Default Importance Title -->
+    <string name="EPr_default_importance_title">Domyślny priorytet</string>
+    <!-- Preference: Default Importance Description (%s => setting) -->
+    <string name="EPr_default_importance_desc">Aktualnie: %s</string>
+
+    <!-- slide 42e: Preference: Default Hide Until Title -->
+    <string name="EPr_default_hideUntil_title">Ukrywanie zadania (domyślnie)</string>
+    <!-- Preference: Default Hide Until Description (%s => setting) -->
+    <string name="EPr_default_hideUntil_desc">Aktualnie: %s</string>
+
+    <!-- slide 43e: Preference: Default Reminders Title -->
+    <string name="EPr_default_reminders_title">Przypomnienia (domyślnie)</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_desc">Aktualnie: %s</string>
+
+    <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
+    <string name="EPr_default_addtocalendar_title">Domyślnie dodawaj do kalendarza</string>
+    <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
+    <string name="EPr_default_addtocalendar_desc_disabled">Nowe zadania nie utworzą wydarzeń w
+        Kalendarzu Google
+    </string>
+    <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
+    <string name="EPr_default_addtocalendar_desc">Nowe zadania będą w kalendarzu: \"%s\"</string>
+
+    <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
+    <string name="EPr_default_reminders_mode_title">Domyślny dzwonek/wibracja</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_mode_desc">Aktualnie: %s</string>
+
+    <string-array name="EPr_default_importance">
+        <!-- importance: labels for "Task Defaults" preference item. -->
+        <!-- slide 40b -->
+        <item>!!! (Najwyższy)</item>
+        <item>!!</item>
+        <item>!</item>
+        <!-- slide 40c -->
+        <item>o (Najniższy)</item>
+    </string-array>
+
+    <string-array name="EPr_default_urgency">
+        <!-- urgency: labels for "Task Defaults" preference item. -->
+        <!-- slide 41a-->
+        <item>Bez nieprzekraczalnego terminu</item>
+        <!-- slide 41b -->
+        <item>Dzisiaj</item>
+        <!-- slide 41c-->
+        <item>Jutro</item>
+        <!-- slide 41d -->
+        <item>Pojutrze</item>
+        <!-- slide 41e -->
+        <item>W przyszłym tygodniu</item>
+    </string-array>
+
+    <string-array name="EPr_default_hideUntil">
+        <!-- hideUntil: labels for "Task Defaults" preference item. -->
+        <!-- slide 42a -->
+        <item>Nie ukrywaj</item>
+        <!-- slide 42b -->
+        <item>Do terminu zadania</item>
+        <!-- slide 42c -->
+        <item>Do dnia przed terminem</item>
+        <!-- slide 42d-->
+        <item>Do tygodnia przed terminem</item>
+    </string-array>
+
+    <string-array name="EPr_default_reminders">
+        <!-- reminders: labels for "Task Defaults" preference item. -->
+        <!-- slide 43a -->
+        <item>Brak przypomnień dla terminu nieprzekraczalnego</item>
+        <!-- slide 43b -->
+        <item>W dniu terminu nieprzekraczalnego</item>
+        <!-- slide 43c -->
+        <item>Gdy zaległe</item>
+        <!-- slide 43d -->
+        <item>W nieprzekraczalnym terminie lub gdy zaległe</item>
+    </string-array>
+
+    <string-array name="EPr_default_addtocalendar">
+        <!-- addtocalendar: labels for "Task Defaults" preference item. -->
+        <item>@string/EPr_deactivated</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in filter plug-in -->
-    
+
     <!-- ================================================= Filter Exposer == -->
-    
+
     <!-- Active Tasks Filter -->
     <string name="BFE_Active">Moje zadania</string>
-    
+
     <!-- Waiting on me filter -->
     <string name="BFE_waiting_on_me">Waiting On Me</string>
-        
+
     <!-- Search Filter -->
-    
+
     <!-- slide 10b: Recently Modified -->
     <string name="BFE_Recent">Niedawno zmodyfikowane</string>
-    
+
     <!-- slide 10c: I\'ve assigned -->
     <string name="BFE_Assigned">Przypisałem</string>
-    
+
     <!-- Build Your Own Filter -->
-    
+
     <!-- Saved Filters Header -->
-    
+
     <!-- Saved Filters Context Menu: delete -->
     <string name="BFE_Saved_delete">Usuń filtr</string>
 
     <!-- =========================================== CustomFilterActivity == -->
-    
+
     <!-- slide 30d: Build Your Own Filter Activity Title-->
     <string name="CFA_title">Własny filtr</string>
-    
+
     <!-- slide 30e: Filter Name edit box hint (if user types here, filter will be saved) -->
     <string name="CFA_filterName_hint">Nazwij filtr w celu zapisania...</string>
-    
+
     <!-- Filter Name default for copied filters (%s => old filter name) -->
-    
+
     <!-- slide 30a: Filter Starting Universe: all tasks -->
     <string name="CFA_universe_all">Aktywne zadania</string>
-    
+
     <!-- Filter Criteria Type: add (at the begging of title of the criteria) -->
     <string name="CFA_type_add">albo</string>
-    
+
     <!-- Filter Criteria Type: subtract (at the begging of title of the criteria) -->
     <string name="CFA_type_subtract">brak</string>
-    
+
     <!-- Filter Criteria Type: intersect (at the begging of title of the criteria) -->
     <string name="CFA_type_intersect">również</string>
-    
+
     <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
     <string name="CFA_context_chain">%s zawiera kryteria</string>
-    
+
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">Usuń kryterium</string>
-    
+
     <!-- slide 30b: Filter Screen Help Text -->
     <string name="CFA_help">Przytrzymaj dłużej na obiekcie dla dodatkowych opcji</string>
-    
+
     <!-- slide 30c: Filter Button: add new -->
     <string name="CFA_button_add">Dodaj kryterium</string>
-    
+
     <!-- slide 30f: Filter Button: view without saving -->
     <string name="CFA_button_view">Wyświetl</string>
-    
+
     <!-- Filter Button: save & view filter -->
     <string name="CFA_button_save">Zapisz &amp; wyświetl</string>
 
     <!-- =========================================== CustomFilterCriteria == -->
-        
+
     <!-- Criteria: due by X - display text (? -> user input) -->
     <string name="CFC_dueBefore_text">Termin wykonania: ?</string>
     <!-- Criteria: due by X - name of criteria -->
@@ -1698,322 +1842,353 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup->Import
         <item>W przyszłym tygodniu</item>
         <item>Przyszły miesiąc</item>
     </string-array>
-    
+
     <!-- Criteria: importance - display text (? -> user input)-->
     <string name="CFC_importance_text">Priorytet przynajmniej?</string>
     <!-- Criteria: importance - name of criteria -->
-    <string name="CFC_importance_name">Priorytet...</string>        
-    
+    <string name="CFC_importance_name">Priorytet...</string>
+
     <!-- Criteria: tag - display text (? -> user input) -->
     <string name="CFC_tag_text">Lista: ?</string>
     <!-- Criteria: tag - name of criteria -->
     <string name="CFC_tag_name">Lista...</string>
-    
+
     <!-- Criteria: tag_contains - name of criteria -->
     <string name="CFC_tag_contains_name">Nazwa listy zawiera...</string>
     <!-- Criteria: tag_contains - text (? -> user input) -->
     <string name="CFC_tag_contains_text">Nazwa listy zawiera: ?</string>
-    
+
     <!-- Criteria: title_contains - name of criteria -->
     <string name="CFC_title_contains_name">Tytuł zawiera...</string>
     <!-- Criteria: title_contains - text (? -> user input) -->
     <string name="CFC_title_contains_text">Tytuł zawiera: ?</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-  
-  <!-- Error message for adding to calendar  -->
-  <string name="gcal_TEA_error">Błąd podczas dodawania zadania do kalendarza!</string>
-
-  <!-- Label for adding task to calendar -->
-
-  <!-- slide 21c: Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">Dodaj do kalendarza</string>
-  
-  <!-- Label when calendar event already exists -->
-  <string name="gcal_TEA_showCalendar_label">Otwórz zdarzenie kalendarza</string>
-  
-  <!-- Toast when unable to open calendar event -->
-  
-  <!-- Toast when calendar event updated because task changed -->
-  <string name="gcal_TEA_calendar_updated">Zdarzenie kalendarza również uaktualnione!</string>
-  
-  <!-- No calendar label (don\'t add option) -->
-  <string name="gcal_TEA_nocal">Nie dodawaj</string>
-  
-  <string name="gcal_TEA_none_selected">Do kalendarza?</string>
-  
-  <string name="gcal_TEA_has_event">Wydarzenie w kalendarzu</string>
-  
-  <!-- ======================================================== Calendars == -->
-  
-  <!-- Calendar event name when task is completed (%s => task title) -->
-  <string name="gcal_completed_title">%s (ukończono)</string>
-
-  <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
-  <string name="gcal_GCP_default">Domyślny kalendarz</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Error message for adding to calendar  -->
+    <string name="gcal_TEA_error">Błąd podczas dodawania zadania do kalendarza!</string>
 
+    <!-- Label for adding task to calendar -->
 
+    <!-- slide 21c: Label for adding task to calendar -->
+    <string name="gcal_TEA_addToCalendar_label">Dodaj do kalendarza</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Label when calendar event already exists -->
+    <string name="gcal_TEA_showCalendar_label">Otwórz zdarzenie kalendarza</string>
+
+    <!-- Toast when unable to open calendar event -->
+
+    <!-- Toast when calendar event updated because task changed -->
+    <string name="gcal_TEA_calendar_updated">Zdarzenie kalendarza również uaktualnione!</string>
+
+    <!-- No calendar label (don\'t add option) -->
+    <string name="gcal_TEA_nocal">Nie dodawaj</string>
+
+    <string name="gcal_TEA_none_selected">Do kalendarza?</string>
+
+    <string name="gcal_TEA_has_event">Wydarzenie w kalendarzu</string>
+
+    <!-- ======================================================== Calendars == -->
+
+    <!-- Calendar event name when task is completed (%s => task title) -->
+    <string name="gcal_completed_title">%s (ukończono)</string>
+
+    <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
+    <string name="gcal_GCP_default">Domyślny kalendarz</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ============================================================= UI == -->
 
     <!-- filters header: GTasks -->
     <string name="gtasks_FEx_header">Zadania Google</string>
-    
+
     <!-- filter category for GTasks lists -->
-    
+
     <!-- filter title for GTasks lists (%s => list name) -->
     <string name="gtasks_FEx_title">Zadania Google: %s</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_creating_list">Tworzenie listy</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_create_list_dialog">Nowa nazwa listy:</string>
-    
+
     <!-- error to show when list creation fails -->
     <string name="gtasks_FEx_create_list_error">Błąd tworzenia nowej listy</string>
-    
+
     <!-- short help title for Gtasks -->
-    
+
     <string name="CFC_gtasks_list_text">Na liście: ?</string>
 
     <string name="CFC_gtasks_list_name">Na liście GTasks...</string>
-    
+
     <!-- Message while clearing completed tasks -->
     <string name="gtasks_GTA_clearing">Czyszczenie zakończonych zadań...</string>
-    
+
     <!-- Label for clear completed menu item -->
     <string name="gtasks_GTA_clear_completed">Wyczyść zakończone</string>
-        
+
     <!-- ============================================ GtasksLoginActivity == -->
-    
-    <!-- Activity Title: Gtasks Login -->    
 
-    <!-- Instructions: Gtasks login -->    
-    <string name="gtasks_GLA_body">Proszę zalogować się do zadań Google Synch (Beta!). Brak konta migracji Aplikacji Google są obecnie obsługiwane.</string>
-    
+    <!-- Activity Title: Gtasks Login -->
+
+    <!-- Instructions: Gtasks login -->
+    <string name="gtasks_GLA_body">Proszę zalogować się do zadań Google Synch (Beta!). Brak konta
+        migracji Aplikacji Google są obecnie obsługiwane.
+    </string>
+
     <string name="gtasks_GLA_noaccounts">Brak dostępnych kont Google do synchronizacji.</string>
 
-    <!-- Instructions: Gtasks further help -->    
-    <string name="gtasks_GLA_further_help">Aby wyświetlić zadania z wcięciem i zachować porządek, przejdź na stronę Filtry i wybierz listę Google Tasks. Domyślnie Astrid używa własnych ustawień sortowania zadań.</string>
+    <!-- Instructions: Gtasks further help -->
+    <string name="gtasks_GLA_further_help">Aby wyświetlić zadania z wcięciem i zachować porządek,
+        przejdź na stronę Filtry i wybierz listę Google Tasks. Domyślnie Astrid używa własnych
+        ustawień sortowania zadań.
+    </string>
+
+    <!-- Sign In Button -->
 
-    <!-- Sign In Button -->    
+    <!-- E-mail Address Label -->
 
-    <!-- E-mail Address Label -->    
+    <!-- Password Label -->
 
-    <!-- Password Label -->    
-    
     <!--  Authenticating toast -->
     <string name="gtasks_GLA_authenticating">Uwierzytelnianie...</string>
-    
+
     <!-- Google Apps for Domain checkbox -->
 
-    <!-- Error Message when fields aren\'t filled out -->    
+    <!-- Error Message when fields aren\'t filled out -->
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
+    <string name="gtasks_GLA_errorAuth">Błąd uwierzytelnienia! Proszę sprawdzić nazwę użytkownika i
+        hasło w menadżerze kont swojego telefonu.
+    </string>
 
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
-    <string name="gtasks_GLA_errorAuth">Błąd uwierzytelnienia! Proszę sprawdzić nazwę użytkownika i hasło w menadżerze kont swojego telefonu.</string>
+    <!-- Error Message when we receive an IO Exception -->
+    <string name="gtasks_GLA_errorIOAuth">Przepraszamy, mieliśmy problem z porozumieniem się z
+        serwerami Google. Prosimy spróbować ponownie.
+    </string>
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->
+    <string name="gtasks_GLA_errorAuth_captcha">Możesz napotkać captcha. Spróbuj zalogować się z
+        poziomu przeglądarki, a następnie wrócić by spróbować ponownie:
+    </string>
 
-    <!-- Error Message when we receive an IO Exception -->    
-    <string name="gtasks_GLA_errorIOAuth">Przepraszamy, mieliśmy problem z porozumieniem się z serwerami Google. Prosimy spróbować ponownie.</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->    
-    <string name="gtasks_GLA_errorAuth_captcha">Możesz napotkać captcha. Spróbuj zalogować się z poziomu przeglądarki, a następnie wrócić by spróbować ponownie:</string>
-    
     <!-- ============================================== GtasksPreferences == -->
 
-    <!-- GTasks Preferences Title -->    
+    <!-- GTasks Preferences Title -->
     <string name="gtasks_GPr_header">Zadania Google</string>
-    
-    <!-- ================================================ Synchronization == -->    
-    
+
+    <!-- ================================================ Synchronization == -->
+
     <!-- title for notification tray when synchronizing -->
 
     <!-- Error Message when we receive a HTTP 503 error -->
-    <string name="gtasks_error_backend">API Zadań Google jest w fazie beta i napotkano błąd. Serwis może być niedostępny, spróbuj ponownie później.</string>
-    
+    <string name="gtasks_error_backend">API Zadań Google jest w fazie beta i napotkano błąd. Serwis
+        może być niedostępny, spróbuj ponownie później.
+    </string>
+
     <!-- Error for account not found -->
-    <string name="gtasks_error_accountNotFound">Nie znaleziono konta %s --proszę wyloguj się i zaloguj ponownie w ustawieniach Google Zadań.</string>
-    
+    <string name="gtasks_error_accountNotFound">Nie znaleziono konta %s --proszę wyloguj się i
+        zaloguj ponownie w ustawieniach Google Zadań.
+    </string>
+
     <!-- Error when ping after refreshing token fails -->
-    <string name="gtasks_error_authRefresh">Uwierzytelnienie w Google Zadania nieudane. Proszę, sprawdź poprawność swego hasła lub spróbuj ponownie później.</string>
-    
+    <string name="gtasks_error_authRefresh">Uwierzytelnienie w Google Zadania nieudane. Proszę,
+        sprawdź poprawność swego hasła lub spróbuj ponownie później.
+    </string>
+
     <!-- Error when account manager returns no auth token or throws exception -->
-    <string name="gtasks_error_accountManager">Błąd w menadżerze kont Twojego telefonu. Proszę, wyloguj się i zaloguj ponownie w ustawieniach Google Zadań.</string>
+    <string name="gtasks_error_accountManager">Błąd w menadżerze kont Twojego telefonu. Proszę,
+        wyloguj się i zaloguj ponownie w ustawieniach Google Zadań.
+    </string>
 
     <!-- Error when authorization error happens in background sync -->
-    <string name="gtasks_error_background_sync_auth">Błąd uwierzytelniania w tle. Spróbuj zainicjalizować synchronizację, gdy aplikacja Astrid będzie włączone.</string>
-      
+    <string name="gtasks_error_background_sync_auth">Błąd uwierzytelniania w tle. Spróbuj
+        zainicjalizować synchronizację, gdy aplikacja Astrid będzie włączone.
+    </string>
+
     <string name="gtasks_import_progress">Importuję Zadania Google...</string>
 
-    <string name="gtasks_import_add_to_shared_list">Lista %1$s jest współdzielona z innymi! Czy dalej chcesz dodać zadanie %2$s do niej?</string>
+    <string name="gtasks_import_add_to_shared_list">Lista %1$s jest współdzielona z innymi! Czy
+        dalej chcesz dodać zadanie %2$s do niej?
+    </string>
 
     <string name="gtasks_import_dlg_title">Import Zadań Google</string>
 
     <string name="gtasks_import_add_task_ok">Dodaj zadanie</string>
 
     <string name="gtasks_import_add_task_cancel">Nie dodawaj zadania</string>
-        
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- NEW USER EXPERIENCE -->
-  
-  <!-- help bubbles -->
-  <!-- slide 8c: Shown the first time a user sees the task list activity -->
-  <string name="help_popover_add_task">Dodaj zadanie tutaj</string>
-
-  <!-- Shown the first time a user adds a task to a list -->  
-  <string name="help_popover_tap_task">Puknij zadanie by je edytować i udostępnić</string>
-  
-  <!-- slide 14a: Shown the first time a user sees the list activity -->
-  <string name="help_popover_list_settings">Puknij ustawienia listy by udostępnić całą listę</string>
-  
-  <!-- slide 26c: Shown the first time a user sees the list settings tab -->
-  <string name="help_popover_collaborators">Osoby, z którymi się dzielisz mogą pomóc\nCi tworzyć listy i kończyć zadania.</string>
-  
-  <!-- Shown after user adds a task on tablet-->
-  <string name="help_popover_add_lists">Puknij, aby dodać listę</string>
-  
-  <!-- Shown after a user adds a task on phones -->
-  <string name="help_popover_switch_lists">Puknij, aby dodać listę lub się między nimi przełączać</string>
-  
-  
-  
-  <!-- Login activity -->
-  
-  
-  <!-- slide 7b -->
-  <string name="welcome_login_tos_base">Używając Astrid zgadzasz się na</string>
-  
-  <string name="welcome_login_tos_link">Regulamin usługi</string>
-  
-  <!-- slide 7e -->
-  <string name="welcome_login_pw">Zarejestruj się</string>
-  
-  <string name="welcome_sign_in">Zaloguj się</string>
-
-  <!-- slide 7f -->
-  <string name="welcome_login_later">Później</string>
-  
-  <string name="welcome_login_confirm_later_title">Czemu by się nie zalogować?</string>
-  
-  <string name="welcome_login_confirm_later_ok">Zrobię to!</string>
-  
-  <string name="welcome_login_confirm_later_cancel">Nie, dzięki</string>
-  
-  <string name="welcome_login_confirm_later_dialog">Zaloguj się by wyciągnąć z Astrid jeszcze więcej! Za darmo otrzymasz kopię zapasową online, pełną synchronizację z Astrid.com, możliwość dodawania zadań przez e-mail i będziesz mógł dzielić się swoimi listami zadań ze znajomymi!</string>
+    <!-- NEW USER EXPERIENCE -->
 
+    <!-- help bubbles -->
+    <!-- slide 8c: Shown the first time a user sees the task list activity -->
+    <string name="help_popover_add_task">Dodaj zadanie tutaj</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown the first time a user adds a task to a list -->
+    <string name="help_popover_tap_task">Puknij zadanie by je edytować i udostępnić</string>
 
+    <!-- slide 14a: Shown the first time a user sees the list activity -->
+    <string name="help_popover_list_settings">Puknij ustawienia listy by udostępnić całą listę
+    </string>
 
-  <!-- Resources for built-in locale plug-in -->
-
-  <!-- Locale Alert Editing Window Title -->
-  <string name="locale_edit_alerts_title">Filtr powiadomienia Astrid</string>
-  
-  <!-- Locale Window Help -->                                                                                                                                            
-  <string name="locale_edit_intro">Astrid wyśle Ci przypomnienie, gdy dany filtr będzie posiadał zadania:</string>
-      
-  <!-- Locale Window Filter Picker UI -->                                                                                                                                        
-      
-  <!-- Locale Window Interval Label -->                                                                                                                                        
-  <string name="locale_interval_label">Ogranicz powiadomienia do:</string>        
-      
-  <!-- Locale Window Interval Values -->                                                                                                                                        
-  <string-array name="locale_interval">
-    <item>raz na godzinę</item>
-    <item>raz na 6 godzin</item>
-    <item>raz na 12 godzin</item>
-    <item>raz dziennie</item>
-    <item>raz na 3 dni</item>
-    <item>raz w tygodniu</item>
-  </string-array>        
-      
-  <!-- Locale Notification text -->                                                                                                                                        
-  <string name="locale_notification">Masz $NUM pasujących: $FILTER</string>     
-      
-  <!-- Locale Plugin was not found, it is required -->
-  <string name="locale_plugin_required">Zainstaluj dodatek Astrid Locale Plugin</string>        
-     
+    <!-- slide 26c: Shown the first time a user sees the list settings tab -->
+    <string name="help_popover_collaborators">Osoby, z którymi się dzielisz mogą pomóc\nCi tworzyć
+        listy i kończyć zadania.
+    </string>
 
+    <!-- Shown after user adds a task on tablet-->
+    <string name="help_popover_add_lists">Puknij, aby dodać listę</string>
+
+    <!-- Shown after a user adds a task on phones -->
+    <string name="help_popover_switch_lists">Puknij, aby dodać listę lub się między nimi
+        przełączać
+    </string>
+
+
+    <!-- Login activity -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+
+    <!-- slide 7b -->
+    <string name="welcome_login_tos_base">Używając Astrid zgadzasz się na</string>
+
+    <string name="welcome_login_tos_link">Regulamin usługi</string>
+
+    <!-- slide 7e -->
+    <string name="welcome_login_pw">Zarejestruj się</string>
+
+    <string name="welcome_sign_in">Zaloguj się</string>
+
+    <!-- slide 7f -->
+    <string name="welcome_login_later">Później</string>
+
+    <string name="welcome_login_confirm_later_title">Czemu by się nie zalogować?</string>
+
+    <string name="welcome_login_confirm_later_ok">Zrobię to!</string>
+
+    <string name="welcome_login_confirm_later_cancel">Nie, dzięki</string>
+
+    <string name="welcome_login_confirm_later_dialog">Zaloguj się by wyciągnąć z Astrid jeszcze
+        więcej! Za darmo otrzymasz kopię zapasową online, pełną synchronizację z Astrid.com,
+        możliwość dodawania zadań przez e-mail i będziesz mógł dzielić się swoimi listami zadań ze
+        znajomymi!
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in locale plug-in -->
+
+    <!-- Locale Alert Editing Window Title -->
+    <string name="locale_edit_alerts_title">Filtr powiadomienia Astrid</string>
+
+    <!-- Locale Window Help -->
+    <string name="locale_edit_intro">Astrid wyśle Ci przypomnienie, gdy dany filtr będzie posiadał
+        zadania:
+    </string>
+
+    <!-- Locale Window Filter Picker UI -->
+
+    <!-- Locale Window Interval Label -->
+    <string name="locale_interval_label">Ogranicz powiadomienia do:</string>
+
+    <!-- Locale Window Interval Values -->
+    <string-array name="locale_interval">
+        <item>raz na godzinę</item>
+        <item>raz na 6 godzin</item>
+        <item>raz na 12 godzin</item>
+        <item>raz dziennie</item>
+        <item>raz na 3 dni</item>
+        <item>raz w tygodniu</item>
+    </string-array>
+
+    <!-- Locale Notification text -->
+    <string name="locale_notification">Masz $NUM pasujących: $FILTER</string>
+
+    <!-- Locale Plugin was not found, it is required -->
+    <string name="locale_plugin_required">Zainstaluj dodatek Astrid Locale Plugin</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ====================== Plugin Boilerplate ========================= -->
 
-	<!-- filters header: OpenCRX -->
+    <!-- filters header: OpenCRX -->
     <string name="opencrx_FEx_header">OpenCRX</string>
-    
+
     <!-- filter category for OpenCRX ActivityCreators -->
     <string name="opencrx_FEx_dashboard">Obszary robocze</string>
-    
+
     <!-- filter category for OpenCRX responsible person -->
     <string name="opencrx_FEx_responsible">Przypisany do</string>
-    
+
     <!--  OpenCRX assignedTo filter title (%s => assigned contact) -->
     <string name="opencrx_FEx_responsible_title">Przypisany do \'%s\'</string>
-    
+
     <!-- detail for showing tasks created by someone else (%s => person name) -->
     <string name="opencrx_PDE_task_from">od %s</string>
-    
+
     <!-- replacement string for task edit "Notes" when using OpenCRX -->
     <string name="opencrx_TEA_notes">Dodaj komentarz</string>
-    
+
     <string name="opencrx_creator_input_hint">Krator</string>
 
     <string name="opencrx_contact_input_hint">Przypisany do</string>
     <!-- ==================================================== Preferences == -->
 
-    <!-- Preferences Title: OpenCRX -->    
+    <!-- Preferences Title: OpenCRX -->
     <string name="opencrx_PPr_header">OpenCRX</string>
 
     <!-- creator title for tasks that are not synchronized -->
     <string name="opencrx_no_creator">(Nie synchronizuj)</string>
 
-	<!-- preference title for default creator -->
+    <!-- preference title for default creator -->
     <string name="opencrx_PPr_defaultcreator_title">Domyślny kreator działań</string>
 
     <!-- preference description for default creator (%s -> setting) -->
-    <string name="opencrx_PPr_defaultcreator_summary">Nowe działania będą tworzone przez: %s</string>
+    <string name="opencrx_PPr_defaultcreator_summary">Nowe działania będą tworzone przez: %s
+    </string>
 
     <!-- preference description for default dashboard (when set to \'not synchronized\') -->
-    <string name="opencrx_PPr_defaultcreator_summary_none">Nowe działania nie zostaną zsynchronizowane domyślnie</string>
-    
+    <string name="opencrx_PPr_defaultcreator_summary_none">Nowe działania nie zostaną
+        zsynchronizowane domyślnie
+    </string>
+
     <!--  OpenCRX host and segment group name -->
     <string name="opencrx_group">Serwer OpenCRX</string>
 
@@ -2022,81 +2197,89 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup->Import
 
     <!--  dialog title for OpenCRX host -->
     <string name="opencrx_host_dialog_title">Host OpenCRX</string>
-    
+
     <!--  example for OpenCRX host -->
-    <string name="opencrx_host_summary">"Np.: "<i>mojadomena.pl</i></string>
-    
+    <string name="opencrx_host_summary">"Np.: "
+        <i>mojadomena.pl</i>
+    </string>
+
     <!--  preference description for OpenCRX segment -->
     <string name="opencrx_segment_title">Wycinek</string>
 
     <!--  dialog title for OpenCRX segment -->
     <string name="opencrx_segment_dialog_title">Zsynchronizowane segmenty</string>
-    
+
     <!--  example for OpenCRX segment -->
-    <string name="opencrx_segment_summary">"Np: "<i>Standardowy</i></string>
-    
+    <string name="opencrx_segment_summary">"Np: "
+        <i>Standardowy</i>
+    </string>
+
     <!--  default value for OpenCRX segment -->
     <string name="opencrx_segment_default">Standardowy</string>
-    
+
     <!--  preference description for OpenCRX provider -->
     <string name="opencrx_provider_title">Dostawca</string>
 
     <!--  dialog title for OpenCRX provider -->
     <string name="opencrx_provider_dialog_title">Dane OpenCRX dostawcy</string>
-    
+
     <!--  example for OpenCRX provider -->
-    <string name="opencrx_provider_summary">"Np: "<i>CRX</i></string>
-    
+    <string name="opencrx_provider_summary">"Np: "
+        <i>CRX</i>
+    </string>
+
     <!--  default value for OpenCRX provider -->
     <string name="opencrx_provider_default">CRX</string>
     <!-- ================================================= Login Activity == -->
 
-    <!-- Activity Title: Opencrx Login -->    
+    <!-- Activity Title: Opencrx Login -->
     <string name="opencrx_PLA_title">Zalogój do OpenCRX</string>
 
-    <!-- Instructions: Opencrx login -->    
+    <!-- Instructions: Opencrx login -->
     <string name="opencrx_PLA_body">Zaloguj się na konto OpenCRX</string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
     <string name="opencrx_PLA_signIn">Zaloguj się</string>
 
-    <!-- Login Label -->    
+    <!-- Login Label -->
     <string name="opencrx_PLA_login">Zaloguj</string>
 
-    <!-- Password Label -->    
+    <!-- Password Label -->
     <string name="opencrx_PLA_password">Hasło</string>
-    
-        <!-- Error Message when fields aren\'t filled out -->    
+
+    <!-- Error Message when fields aren\'t filled out -->
     <string name="opencrx_PLA_errorEmpty">Błąd: wypełnij wszystkich pola</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
     <string name="opencrx_PLA_errorAuth">Błąd: błedny użytkownik lub hasło</string>
 
     <!-- ================================================ Synchronization == -->
-        
+
     <!-- title for notification tray after synchronizing -->
     <string name="opencrx_notification_title">OpenCRX</string>
-    
+
     <!-- text for notification tray when synchronizing -->
-    <string name="opencrx_notification_text">%s zadań uaktuanionych / kliknij aby uzyskać szczegóły</string>
-    
+    <string name="opencrx_notification_text">%s zadań uaktuanionych / kliknij aby uzyskać
+        szczegóły
+    </string>
+
     <!-- Error msg when io exception  -->
     <string name="opencrx_ioerror">Błąd połączenia! Sprawdź swoje połączenie z Internetem!</string>
 
     <!-- opencrx Login not specified-->
     <string name="opencrx_MLA_email_empty">użytkownik nie został określony!</string>
-    
+
     <!-- opencrx password not specified-->
     <string name="opencrx_MLA_password_empty">Hasło nie zostało wpisane!</string>
-    
+
     <!-- ================================================ labels for layout-elements == -->
-    
+
     <!-- label for task-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_task_assign_label">Przypisz to zadanie do tej osoby:</string>
-    
+
     <!-- Spinner-item for unassigned tasks on taskeditactivity -->
     <string name="opencrx_TEA_task_unassigned">&lt;Nieprzypisane&gt;</string>
-    
+
     <!-- label for dashboard-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_creator_assign_label">Przydzielić to zadanie do tego twórcy:</string>
 
@@ -2104,7 +2287,7 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup->Import
     <string name="opencrx_TEA_dashboard_default">&lt;Domyślny&gt;</string>
 
     <string name="opencrx_TEA_opencrx_title">Kontrolki OpenCRX</string>
-        
+
     <string name="CFC_opencrx_in_workspace_text">W grupie roboczej: ?</string>
 
     <string name="CFC_opencrx_in_workspace_name">W grupie roboczej...</string>
@@ -2114,123 +2297,155 @@ i odzyskanie zadań z kopi zapasowej (Settings->Sync and backup->Backup->Import
     <string name="CFC_opencrx_assigned_to_name">Przypisany do...</string>
 
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
+    <!-- ================================================== EditPreferences == -->
 
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 32j: Preference Category: Power Pack -->
-  <string name="EPr_powerpack_header">Ustawienia Premium i inne</string>
-  <string name="EPr_powerpack_summary">Przypomniania nieodebranych połączeń, polecenia głosowe i inne ustawienia</string>
-  
-  <!-- slide 32e: Preference: Anonymous User Statistics -->
-  <string name="EPr_statistics_title">Anonimowe dane użycia</string>
-  <!-- Preference: User Statistics (disabled) -->
-  <string name="EPr_statistics_desc_disabled">Użycie nie będzie raportowane</string>  
-  <!-- slide 32f: Preference: User Statistics (enabled) -->
-  <string name="EPr_statistics_desc_enabled">Pomóż nam rozwijać Astrid poprzez wysyłanie anonimowych danych użycia.</string>
-      
+    <!-- slide 32j: Preference Category: Power Pack -->
+    <string name="EPr_powerpack_header">Ustawienia Premium i inne</string>
+    <string name="EPr_powerpack_summary">Przypomniania nieodebranych połączeń, polecenia głosowe i
+        inne ustawienia
+    </string>
 
+    <!-- slide 32e: Preference: Anonymous User Statistics -->
+    <string name="EPr_statistics_title">Anonimowe dane użycia</string>
+    <!-- Preference: User Statistics (disabled) -->
+    <string name="EPr_statistics_desc_disabled">Użycie nie będzie raportowane</string>
+    <!-- slide 32f: Preference: User Statistics (enabled) -->
+    <string name="EPr_statistics_desc_enabled">Pomóż nam rozwijać Astrid poprzez wysyłanie
+        anonimowych danych użycia.
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
-    <string name="speech_err_network">Błąd sieci! Rozpoznawanie mowy wymaga połączenia z siecią.</string>
+    <string name="speech_err_network">Błąd sieci! Rozpoznawanie mowy wymaga połączenia z siecią.
+    </string>
     <string name="speech_err_no_match">Przepraszam, nie zrozumiałem! Powtórz, proszę.</string>
-    <string name="speech_err_default">Przepraszamy, rozpoznawanie mowy napotkało na błąd. Proszę spróbować ponownie.</string>
-    
+    <string name="speech_err_default">Przepraszamy, rozpoznawanie mowy napotkało na błąd. Proszę
+        spróbować ponownie.
+    </string>
+
     <string name="premium_attach_file">Dołącz plik</string>
     <string name="premium_record_audio">Nagraj notatkę</string>
     <string name="premium_no_files">Brak załączników</string>
     <string name="premium_remove_file_confirm">Jesteś pewny? Tych zmian nie można odwrócić</string>
-    
+
     <string name="audio_recording_title">Nagrywanie dźwięku</string>
     <string name="audio_stop_recording">Zakończ nagrywanie</string>
     <string name="audio_speak_now">Mów!</string>
     <string name="audio_encoding">Kodowanie...</string>
     <string name="audio_err_encoding">Błąd podczas kodowania dźwięku</string>
-    <string name="audio_err_playback">Przepraszamy, system nie obsługuje tego typu pliku dźwiękowego</string>
-    
-    <string name="search_market_audio">Nie znaleziono odtwarzacza, który byłby w stanie odtworzyć ten plik. Czy chciałbyś pobrać odtwarzacz z Android Market?</string>
+    <string name="audio_err_playback">Przepraszamy, system nie obsługuje tego typu pliku
+        dźwiękowego
+    </string>
+
+    <string name="search_market_audio">Nie znaleziono odtwarzacza, który byłby w stanie odtworzyć
+        ten plik. Czy chciałbyś pobrać odtwarzacz z Android Market?
+    </string>
     <string name="search_market_audio_title">Nie znaleziono odtwarzacza</string>
 
-    <string name="search_market_pdf">Nie znaleziono czytnika PDF. Czy chciałbyć pobrać czytnik z Android Market?</string>
+    <string name="search_market_pdf">Nie znaleziono czytnika PDF. Czy chciałbyć pobrać czytnik z
+        Android Market?
+    </string>
     <string name="search_market_pdf_title">Nie znaleziono czytnika PDF</string>
 
-    <string name="search_market_ms">Nie znaleziono czytnika MS Office. Czy chcesz ściągnąć czytnik z Android Market?</string>
+    <string name="search_market_ms">Nie znaleziono czytnika MS Office. Czy chcesz ściągnąć czytnik z
+        Android Market?
+    </string>
     <string name="search_market_ms_title">Nie znaleziono czytnika MS Office</string>
-    
-    <string name="file_type_unhandled">Przepraszamy! Nie znaleziono aplikacji do obsługi tego typu pliku.</string>
+
+    <string name="file_type_unhandled">Przepraszamy! Nie znaleziono aplikacji do obsługi tego typu
+        pliku.
+    </string>
     <string name="file_type_unhandled_title">Nie znaleziono aplikacji</string>
-    
+
     <string name="file_prefix_image">Grafika</string>
     <string name="file_prefix_voice">Głos</string>
     <string name="file_browser_up">Do góry</string>
     <string name="file_browser_title">Wybierz plik</string>
     <string name="dir_browser_title">Wybierz katalog</string>
-    <string name="file_browser_err_permissions">Błąd dostępu! Proszę upewnić się, że Astrid nie ma zablokowanego dostępu do karty SD.</string>
+    <string name="file_browser_err_permissions">Błąd dostępu! Proszę upewnić się, że Astrid nie ma
+        zablokowanego dostępu do karty SD.
+    </string>
     <string name="file_add_picture">Dodaj obrazek</string>
     <string name="file_add_sdcard">Dodaj plik z karty SD</string>
     <string name="file_download_title">Pobrać plik?</string>
-    <string name="file_download_body">Ten plik nie został pobrany na kartę SD. Chcesz pobrać teraz?</string>
+    <string name="file_download_body">Ten plik nie został pobrany na kartę SD. Chcesz pobrać
+        teraz?
+    </string>
     <string name="file_download_progress">Pobieranie...</string>
     <string name="file_err_memory">Grafika jest zbyt duża; za mało pamięci</string>
     <string name="file_err_copy">Błąd kopiowania pliku do załącznika</string>
     <string name="file_err_download">Błąd przy pobieraniu pliku</string>
-    <string name="file_err_no_directory">Ups! Wygląda na to że katalog plików nie istnieje. Wybierz proszę katalog do zapisu plików w Ustawieniach Astrid</string>
+    <string name="file_err_no_directory">Ups! Wygląda na to że katalog plików nie istnieje. Wybierz
+        proszę katalog do zapisu plików w Ustawieniach Astrid
+    </string>
     <string name="file_err_show">Przepraszamy, system nie obsługuje jeszcze tego typu pliku</string>
-    
+
     <string name="file_dir_dialog_ok">Użycie tego katalogu</string>
     <string name="file_dir_dialog_default">Przywróć ustawienia domyślne</string>
-    
+
     <string name="p_files_dir">Katalog pobranych plików Premium</string>
     <!-- Description for file download directory preference. %s -> chosen directory -->
     <string name="p_files_dir_desc">Załącznik zadania zapisano w: %s</string>
     <string name="p_files_dir_desc_default">Domyślny folder</string>
 
-    
+
     <!-- in app billing -->
     <string name="billing_not_supported_title">Nie można zrealizować zakupu</string>
     <string name="billing_not_supported_message">Usługa rachunków sklepu
-jest w tej chwili niedostępna. Możesz kontynuować używanie aplikacji
-ale nie będziesz mógł dokonywać zakupów.</string>
+        jest w tej chwili niedostępna. Możesz kontynuować używanie aplikacji
+        ale nie będziesz mógł dokonywać zakupów.
+    </string>
     <string name="subscriptions_not_supported_title">Nie można zakupić subskrypcji</string>
     <string name="subscriptions_not_supported_message">Usługa rachunków sklepu
-w tej chwili nie wspiera subskrypcji. Możesz dokonać subskrypcji Astrid Premium na http://astrid.com/premium.</string>
+        w tej chwili nie wspiera subskrypcji. Możesz dokonać subskrypcji Astrid Premium na
+        http://astrid.com/premium.
+    </string>
     <string name="cannot_connect_title">Nie można połączyć z Marketem</string>
     <string name="cannot_connect_message">Ta aplikacja nie może połączyć się ze sklepem.
-Twoja wersja sklepu może być nieaktualna.
-Możesz kontynuować używanie aplikacji
-ale nie będziesz mógł robić zakupów.</string>
-    
+        Twoja wersja sklepu może być nieaktualna.
+        Możesz kontynuować używanie aplikacji
+        ale nie będziesz mógł robić zakupów.
+    </string>
+
     <string name="restoring_transactions">Przywracanie transakcji</string>
-    
+
     <string name="subscriptions_learn_more">Dowiedz się więcej</string>
-    
-    <string name="kii_premium_success">Dziękujemy za udział!  Twój darmowy miesiąc Astrid Premium został odblokowany.</string>
+
+    <string name="kii_premium_success">Dziękujemy za udział! Twój darmowy miesiąc Astrid Premium
+        został odblokowany.
+    </string>
     <string name="kii_premium_abort">Oferta specjalna anulowana</string>
     <string name="kii_premium_declined">Oferta specjalna odrzucona</string>
     <string name="kii_premium_error">Wystąpił błąd przetwarzania. Proszę spróbować później.</string>
-    
+
     <string name="premium_offers_title">Oferta specjalna</string>
-    <string name="premium_offers_subtitle">Chcesz mieć dostęp przez miesiąc do Astrid Premium za darmo?</string>
-    <string name="premium_offers_detail">Aby zdobyć darmowy miesięczny dostęp do Astrid Premium możesz obejrzeć krótki film tego sponsora. (Będzie wymagany również Twój adres email.)</string>
+    <string name="premium_offers_subtitle">Chcesz mieć dostęp przez miesiąc do Astrid Premium za
+        darmo?
+    </string>
+    <string name="premium_offers_detail">Aby zdobyć darmowy miesięczny dostęp do Astrid Premium
+        możesz obejrzeć krótki film tego sponsora. (Będzie wymagany również Twój adres email.)
+    </string>
     <string name="premium_offers_start">Zdobądź za darmo!</string>
-    
+
     <string name="premium_billing_title">Astrid Premium</string>
     <string name="premium_buy_month">1 miesiąc</string>
     <string name="premium_buy_year">1 rok</string>
     <string name="premium_description_header">Zrób więcej z premium!</string>
-    <string name="premium_description_1">Załącz pliki do listy do-zrobienia \n(pdf, doc, ppt...)</string>
+    <string name="premium_description_1">Załącz pliki do listy do-zrobienia \n(pdf, doc, ppt...)
+    </string>
     <string name="premium_description_2">Synchronizuj pliki z astrid.com</string>
     <string name="premium_description_3">Dodaj załączniki przez email</string>
     <string name="premium_description_4">Zapisz notatki głosowe jako pliki audio</string>
@@ -2239,727 +2454,778 @@ ale nie będziesz mógł robić zakupów.</string>
     <string name="premium_speech_bubble_1">Premium poprawi twoją produktywność!</string>
     <string name="premium_speech_bubble_2">Zamów na rok i oszczędź 25%%!</string>
     <string name="premium_already_subscribed">Już jesteś zasubskrybowany do Astrid Premium!</string>
-    <string name="premium_login_prompt">Musić posiadać konto na Astrid.com, aby subsrybować premium. Zaloguj się lub zarejestruj.</string>
+    <string name="premium_login_prompt">Musić posiadać konto na Astrid.com, aby subsrybować premium.
+        Zaloguj się lub zarejestruj.
+    </string>
     <string name="premium_success">Dziękujemy za subrybowanie Astrid Premium!</string>
-    <string name="premium_success_with_server_error">Dziękujemy za subskrybowanie Astrid Premium! Nowe opcje zostaną odblokowane dla ciebie na astrid.com już niedługo i powinny od razu pojawić się na twoim telefonie.</string>
-    <string name="premium_verification_error">Subskrypcja premium dla tego konta Google Play jest połączona z innym użytkownikiem. Aby połączyć dodatkowe adresy email do twojego konta, odwiedź astrid.com/users/profile</string>
-    <string name="premium_check_for_purchases">Już zakupiłeś premium? Kliknij tutaj, by sprawdzić historię zakupów Google Play</string>
+    <string name="premium_success_with_server_error">Dziękujemy za subskrybowanie Astrid Premium!
+        Nowe opcje zostaną odblokowane dla ciebie na astrid.com już niedługo i powinny od razu
+        pojawić się na twoim telefonie.
+    </string>
+    <string name="premium_verification_error">Subskrypcja premium dla tego konta Google Play jest
+        połączona z innym użytkownikiem. Aby połączyć dodatkowe adresy email do twojego konta,
+        odwiedź astrid.com/users/profile
+    </string>
+    <string name="premium_check_for_purchases">Już zakupiłeś premium? Kliknij tutaj, by sprawdzić
+        historię zakupów Google Play
+    </string>
     <string name="premium_checking_for_purchases">Sprawdzanie zakupów...</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- 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">Przypomnij mi:</string>
-
-  <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">W terminie</string>
-
-  <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">Gdy zadanie jest zaległe</string>
-
-  <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_randomly">Losowo raz</string>
-
-  <!-- Task Edit: Reminder alarm clock label -->  
-  <string name="TEA_reminder_alarm_label">Rodzaj dzwonka/wibracji:</string>
-
-  <!--  slide 45a: Task Edit: Reminder mode: ring once -->  
-  <string name="TEA_reminder_mode_once">Pojedynczy</string>
-
-  <!-- slide 45b: Task Edit: Reminder mode: ring five times -->  
-  <string name="TEA_reminder_mode_five">Pięć razy</string>
-
-  <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->  
-  <string name="TEA_reminder_mode_nonstop">Aż odwołam alarm</string>
-  
-  <string name="TEA_reminder_when">kiedy</string>
-  
-  <string name="TEA_reminder_due_short">due</string>
-
-  <string name="TEA_reminder_overdue_short">zaległe</string>
-
-  <string name="TEA_reminder_randomly_short">losowo</string>
-
-  <string name="TEA_reminder_display_one">Remind me %s</string>
-  
-  <string name="TEA_reminder_display_multiple">Remind %s</string>
-
-  <string-array name="TEA_reminder_random">
-    <!-- random reminder choices for task edit page. -->
-    <item>na godzinę</item>
-    <item>dziennie</item>
-    <item>na tydzień</item>
-    <item>na dwa tygodnie</item>
-    <item>na miesiąc</item>
-    <item>na dwa miesiące</item>
-  </string-array>
-  
-  <!-- ==================================================== notifications == -->
-  
-  <!-- Name of filter when viewing a reminder -->
-  <string name="rmd_NoA_filter">Przypomnienie!</string>
-  
-  <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Już wykonano!</string>
-  
-  <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Wstrzymaj...</string>
-  
-  <!-- Reminder: Completed Toast -->
-  <string name="rmd_NoA_completed_toast">Gratuluję ukończenia!</string>
-  
-  <!-- Prefix for reminder dialog title -->
-  <string name="rmd_NoA_dlg_title">Przypomnienie:</string>
-  
-  <!-- ==================================================== user reengagement == -->
-
-  <!-- Titles for user reengagement notifications -->
-  <string-array name="rmd_reengage_notif_titles">
-    <item>A note from Astrid</item>
-    <!-- %s -> first name -->
-    <item>Memo for %s.</item> 
-    <item>Your Astrid digest</item>
-    <item>Przypomnienia z Astrid</item>
-  </string-array>
-    
-  <string name="rmd_reengage_name_default">Ty</string>
-
-  
-  <string name="rmd_reengage_add_tasks">Dodaj zadanie</string>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs -->
-  <string-array name="rmd_reengage_dialog_options">
-    <item>Time to shorten your to-do list!</item>
-    <item>Drogi Panie i Władco, pewne zadania oczekują Twojej uwagi!</item>
-    <item>Siemanko, możesz rzucić na to okiem?</item>
-    <item>Mam parę zadań z Twoim imieniem!</item>
-    <item>Świeża dostawa zadań!</item>
-    <item>Wyglądasz wyśmienicie! Gotowy do roboty?</item>
-    <item>Cudowny dzień, by zająć się pewnymi sprawami!</item>
-  </string-array>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>Nie chcesz się zorganizować?</item>
-    <item>Nazywam się Astrid! Jestem tu, by Ci pomóc zrobić więcej!</item>
-    <item>Wyglądasz na zajętego! Pozwól, że zabiorę trochę tych zadań.</item>
-    <item>Mogę Ci pomóc mieć na uwadze wszystkie szczegóły Twojego życia.</item>
-    <item>Na serio chcesz zrobić coś jeszcze? Ja też!</item>
-    <item>Miło Cię poznać!</item>
-  </string-array>
-  <!-- ============================================= reminder preferences == -->
-  
-  <!-- slide 33d: Reminder Preference Screen Title -->
-  <string name="rmd_EPr_alerts_header">Ustawienia przypomnień</string>
-  <string name="rmd_EPr_alerts_summary">Ciche godziny, opcje drzemki, poziom trwania</string>
-    
-  <!-- Reminder Preference: Reminders Enabled Title -->
-  <string name="rmd_EPr_enabled_title">Przypomnienia włączone?</string>
-  <!-- Reminder Preference Reminders Enabled Description (true) -->
-  <string name="rmd_EPr_enabled_desc_true">Przypomnienia Astrid są włączone (to normalne)</string>
-  <!-- Reminder Preference Reminders Enabled Description (false) -->
-  <string name="rmd_EPr_enabled_desc_false">Przypomnienia Astrid nigdy nie pojawią się na Twoim telefonie</string>  
-    
-  <!-- Reminder Preference: Quiet Hours Start Title -->
-  <string name="rmd_EPr_quiet_hours_start_title">Początek czasu wyciszenia</string>
-  <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">Powiadomienia będą wyciszone po %s.\nUwaga: wibracje są kontrolowane przez ustawienia poniżej!</string>
-  <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
-  <string name="rmd_EPr_quiet_hours_desc_none">Wyciszenie jest nieaktywne</string>
-  
-  <!-- Reminder Preference: Quiet Hours End Title -->
-  <string name="rmd_EPr_quiet_hours_end_title">Koniec czasu wyciszenia</string>
-  <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_end_desc">Powiadomienia przestaną być wyciszonre, począwszy od %s</string>
-
-  <!-- Reminder Preference: Default Reminder Title -->
-  <string name="rmd_EPr_rmd_time_title">Domyślne przypomnienie</string>
-  <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
-  <string name="rmd_EPr_rmd_time_desc">Powiadomienia zadań bez odpowiedniego czasu pojawi się na %s</string>
-
-  <!-- Reminder Preference: Notification Ringtone Title -->
-  <string name="rmd_EPr_ringtone_title">Dźwięk powiadomienia</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
-  <string name="rmd_EPr_ringtone_desc_custom">Własy dzwonek ustawiony</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
-  <string name="rmd_EPr_ringtone_desc_silent">Dzwonek ustawiony na milczenie</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
-  <string name="rmd_EPr_ringtone_desc_default">Zostanie użyty dzwonek domyślny</string>
-  
-  <!-- Reminder Preference: Notification Persistence Title -->
-  <string name="rmd_EPr_persistent_title">Wytrwałość powiadomienia</string>
-  <!-- Reminder Preference: Notification Persistence Description (true) -->
-  <string name="rmd_EPr_persistent_desc_true">Powiadomienia muszą być wyświetlane pojedyńczo aby były wyczyszczone</string>
-  <!-- Reminder Preference: Notification Persistence Description (false) -->
-  <string name="rmd_EPr_persistent_desc_false">Powiadomienia mogą zostać wyczyszczone przyciskiem \"Wyczyść wszystkie\"</string>
-
-  <!-- Reminder Preference: Social Reminders Title -->
-  <string name="rmd_EPr_social_title">Zachęta społeczności</string>
-  <!-- Reminder Preference: Social Reminders Summary (enabled) -->
-  <string name="rmd_EPr_social_summary_enabled">Przypomnienia dla współdzielonych zadań pokażą kto na Ciebie liczy</string>
-  <!-- Reminder Preference: Social Reminders Summary (disabled) -->
-  <string name="rmd_EPr_social_summary_disabled">Przypomnienia dla współdzielonych zadań nie pokażą kto na Ciebie liczy</string>
-  
-  
-  
-  <!-- Reminder Preference: Notification Icon Title -->
-  <!-- Reminder Preference: Notification Icon Description -->
-
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
-  <string name="rmd_EPr_multiple_maxvolume_title">Maksymalna głośność dla wielu dzwonków przypomnień</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid ustawi maksymalną głośność dla wielu dzwonków przypomnień</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid będzie korzystał z systemowego ustawienia głośności</string>
-
-  <!-- Reminder Preference: Vibrate Title -->
-  <string name="rmd_EPr_vibrate_title">Ostrzeżenie wibracyjne</string>
-  <!-- Reminder Preference: Vibrate Description (true) -->
-  <string name="rmd_EPr_vibrate_desc_true">Astrid powiadomi wibracjami podczas wysyłania powiadomienia</string>
-  <!-- Reminder Preference: Vibrate Description (false) -->
-  <string name="rmd_EPr_vibrate_desc_false">Astrid nie będzie powiadamiał wibracjami podczas wysyłania powiadomienia</string>
-
-  <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">Astrid Zachęta</string>
-  <!-- Reminder Preference: Nagging Description (true) -->
-  <string name="rmd_EPr_nagging_desc_true">Astrid pokaże się dla zachęty podczas przypomnienia</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_nagging_desc_false">Astrid nie daje żadnych wiadomości zachęty</string>
-
-  <!-- Reminder Preference: Snooze Dialog Title -->  
-  <string name="rmd_EPr_snooze_dialog_title">Tekst drzemki HH:MM</string>
-  <!-- Reminder Preference: Snooze Dialog Description (true) -->
-  <string name="rmd_EPr_snooze_dialog_desc_true">Uśpij wybierając nową godzinę drzemki (HH:MM)</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_snooze_dialog_desc_false">Uśpij wybierając # dni/godziny uśpienia</string>
-  
-  <!-- slide 44g: Reminder Preference: Default Reminders Title -->
-  <string name="rmd_EPr_defaultRemind_title">Losowe przypomnienia</string>
-  <!-- Reminder Preference: Default Reminders Setting (disabled) -->
-  <string name="rmd_EPr_defaultRemind_desc_disabled">Nowe zadania nie będą miały losowych przypomnień</string>
-  <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
-  <string name="rmd_EPr_defaultRemind_desc">Nowe zadania będą przypominane losowo: %s</string>
-  
-  <!-- slide 39a: Defaults Title -->
-  
-  <string-array name="EPr_reminder_random">
-    <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
-    <item>wyłączone</item>
-    <!-- slide 44b -->
-    <item>co godzinę</item>
-    <!-- slide 44c -->
-    <item>raz dziennie</item>
-    <!-- slide 44d-->
-    <item>raz w tygodniu</item>
-    <!-- slide 44e-->
-    <item>raz na dwa tygodnie</item>
-    <!-- slide 44f -->
-    <item>raz w miesiącu</item>
-    <item>raz na dwa miesiące</item>
-  </string-array>
-        
-  <string-array name="EPr_quiet_hours_start">
-    <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
-    <item>wyłączone</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>24:00</item>
-    <item>01:00</item>
-    <item>02:00</item>
-    <item>03:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-  </string-array>
-  
-  <string-array name="EPr_quiet_hours_end">
-    <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>24:00</item>
-    <item>01:00</item>
-    <item>02:00</item>
-    <item>03:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-  </string-array>
-  
-  <string-array name="EPr_rmd_time">
-    <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>24:00</item>
-    <item>01:00</item>
-    <item>02:00</item>
-    <item>03:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-  </string-array>
-  
-  <!-- =============================================== random reminders == -->
-
-  <string name="reminders_social">Ci ludzie na ciebie liczą!</string>
-  
-  <string name="reminders_social_one">%s is counting on you!</string>
-  
-  <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
-
-  <string-array name="reminders">
-      <!-- reminders: Make these < 20 chars so the task name is displayed -->
-      <item>Cześć! Masz chwilkę?</item>
-      <item>Mogę się z Tobą zobaczyć na chwilę?</item>
-      <item>Masz trochę czasu?</item>
-      <item>Nie pamiętasz?</item>
-      <item>Przepraszam!</item>
-      <item>Gdy znajdziesz trochę czasu:</item>
-      <item>W Twoim terminarzu:</item>
-      <item>Masz chwilę?w</item>
-      <item>Tu Astrid!</item>
-      <item>Cześć! Mogę przeszkodzić?</item>
-      <item>Minuta Twojego czasu?</item>
-      <item>Jest wspaniały dzień na</item>
-  </string-array>
-
-  <string-array name="reminders_due">
-      <!-- reminders related to task due date -->
-      <item>Czas do pracy!</item>
-      <item>Termin zadania się zbliża!</item>
-      <item>Zaczynamy?</item>
-      <item>Taki był Twój zamiar:</item>
-      <item>Powinieneś zacząć:</item>
-      <item>Czas zacząć:</item>
-      <item>Już czas!</item>
-      <item>Przepraszam, ale czas na</item>
-      <item>Macz wolne? Czas na</item>
-  </string-array>
-
-  <string-array name="reminders_snooze">
-      <!-- reminders related to snooze -->
-      <item>Nie leń się!</item>
-      <item>Nadszedł czas drzemki!</item>
-      <item>Koniec drzemania!</item>
-      <item>Jesteś w gotowości?</item>
-      <item>Koniec ciągłego odkładania!</item>
-  </string-array>
-  
-  <string-array name="reminder_responses">
-      <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
-      <item>Mam coś dla Ciebie!</item> 
-      <item>Co powiesz na rzucenie tego w przeszłość?</item>
-      <item>Dlaczego wreszcie tego nie zrobisz?</item>
-      <item>I jak tam? Tygrys gotowy?</item>
-      <item>W gotowości na wykonanie zadania?</item>
-      <item>Poradzisz sobie z tym?</item>
-      <item>Szczęście jest blisko! Tylko to zrób!</item>
-      <item>Obiecuję, że poczujesz się lepiej, gdy to skończysz!</item>
-      <item>Dlaczego nie zrobić tego dziś?</item>
-      <item>Proszę, dokończ to! Mam już tego dość!</item>
-      <item>Możesz to skończyć? TAK, możesz!</item>
-      <item>Zrobisz to kiedyś?</item>
-      <item>Nie ma się czym martwić! Do dzieła!</item>
-      <item>Jestem z Ciebie dumny! Dokończmy to!</item>
-      <item>Może jakaś przekąska, gdy już skończysz?</item>
-      <item>Tylko to jedno zadanie, proszę...</item>
-      <item>Czas skrócić listę rzeczy do zrobienia!</item>
-      <item>Jesteś z drużyny \"Ład\" czy \"Chaos\"? Drużyna \"Ład\"! Do boju!</item>
-      <item>Wspominałem, że ostatnio jesteś niesamowity? Tak trzymaj!</item>
-      <item>A task a day keeps the clutter away... Goodbye clutter!</item>
-      <item>Jak Ty to robisz? Wow, jestem pod wrażeniem!</item>
-      <item>You can\'t just get by on your good looks. Let\'s get to it!</item>
-      <item>Cudowny dzień do takiej pracy, prawda?</item>
-      <item>Filiżankę herbaty?</item>
-      <item>Gdybyś tylko się tym zajął, mógłbyś wyjść na dwór się pobawić.</item>
-      <item>Nadszedł czas. Nie odwleczesz nieuniknionego.</item>
-      <item>Mała część mnie umiera za każdym razem, gdy mnie ignorujesz.</item>
-  </string-array>
-
-  <string-array name="postpone_nags">
-      <!-- Astrid\'s nagging when user clicks postpone -->
-      <item>Proszę powiedz, że to nie prawda, że jesteś takim leniem!</item>
-      <item>Bycie leniem nigdy Ci się nie nudzi?</item>
-      <item>Ktoś, gdzieś liczy na Ciebie, że uporasz sobie z tym zadaniem!</item>
-      <item>Mówiąc \"później\" masz na myśli \"teraz\", prawda?</item>
-      <item>To jest ostatni raz, gdy odkładasz to na później, dobrze?</item>
-      <item>Po prostu skończ to dziś, nikomu nie powiem!</item>
-      <item>Po co odkładać na później kiedy możesz um... nie odkładać!</item>
-      <item>Zakładam, że jest szansa, że skończysz to dziś?</item>
-      <item>Myślę, że jesteś naprawdę cool! A co powiesz na nie odkładanie tego na później?</item>
-      <item>Osiągniesz swoje cele, jeśli to zrobisz?</item>
-      <item>Odkładanie, odkładanie, odkładanie... kiedy Ty się wreszcie zmienisz?!</item>
-      <item>Mam dość Twoich wymówek! Zrób to tu i teraz!</item>
-      <item>Czy wcześniej nie słyszałem tej samej wymówki?</item>
-      <item>Nie pomogę Ci w organizowaniu sobie życia, jeśli to zrobisz...</item>
-  </string-array>
+    <!-- Resources for built-in reminders plug-in -->
 
+    <!-- =============================================== task edit activity == -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder group label -->
+    <string name="TEA_reminders_group_label">Reminder settings</string>
 
+    <!-- Task Edit: Reminder header label -->
+    <string name="TEA_reminder_label">Przypomnij mi:</string>
 
-  <!-- Resources for built-in repeat plug-in -->
-
-  <!-- repeating plugin name -->
-  <string name="repeat_plugin">Powtarzanie zadań</string>
-  
-  <!-- repeating plugin description -->
-  <string name="repeat_plugin_desc">Zewzwól zadaniom na powtarzanie</string>
-  
-  <!-- slide 20a: checkbox for turning on/off repeats -->
-  <string name="repeat_enabled">Powtarza się</string>
-  
-  <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
-  <string name="repeat_every">Co %d</string>
-  
-  <!-- hint when opening repeat interval -->
-  <string name="repeat_interval_prompt">Odstęp powtarzania</string>
-  
-  <!-- slide 19b-->
-  <string name="repeat_never">Not repeating</string>
-  <!-- slide 20f-->
-  <string name="repeat_dont">Nie powtarzaj</string>
-      
-  <string-array name="repeat_interval_short">
-    <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
-    <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">
-    <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>Dzień/Dni</item>
-    <item>Tydzień/Tygodni(e)</item>
-    <item>Miesiąc/Miesiący(e)</item>
-    <item>Godzinę(y)/Godzin</item>
-    <item>Minut(a/y)</item>
-    <item>Year(s)</item>
-  </string-array>
-  
-  <string name="repeat_days">dni</string>
-  <string name="repeat_weekdays">dni robocze</string>
-  <string name="repeat_weeks">tygodnie</string>
-  <string name="repeat_months">miesiące</string>
-  <string name="repeat_years">lata</string>
-  <string name="repeat_hours">godziny</string>
-  <string name="repeat_minutes">minuty</string>
-  
-  <string-array name="repeat_until_shortcuts">
-      <item>Zawsze</item>
-      <item>Konkretny dzień</item>
-      <item>Dzisiaj</item>
-      <item>Jutro</item>
-      <item>(pojutrze)</item>
-      <item>Następny tydzień</item>
-      <item>W ciągu dwóch tygodni</item>
-      <item>Przyszły miesiąc</item>
-  </string-array>
-  
-  <string name="repeat_until_title">Powtarzaj do...</string>
-  
-  <string name="repeat_keep_going">Kontynuuj</string>
-  
-  <string-array name="repeat_type">
-    <!-- slide 20c: repeat type (date to repeat from) -->
-    <item>od planowanego terminu</item>
-    <!-- slide 20c -->
-    <item>od daty ukończenia</item>
-  </string-array>
-  
-  <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
-  <string name="repeat_detail_byday">$I w $D</string>
-  
-  <!-- task detail for repeat from due date (%s -> interval) -->
-  <string name="repeat_detail_duedate">Każdy %s</string>
-
-  <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
-  <string name="repeat_detail_duedate_until">Co %1$s\ndo %2$s</string>
-  
-  <!-- task detail for repeat from completion date (%s -> interval) -->
-  <string name="repeat_detail_completion">%s po ukończeniu</string>
-  
-  <!-- text for button when repeating task indefinitely -->
-  <string name="repeat_forever">Powtarzaj bez końca</string>
-
-  <!-- text for button when repeating task until specified date (%s -> date string) -->
-  <string name="repeat_until">Powtarzaj do %s</string>
-  
-  <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title">Przekładanie zadania \"%s\"</string>
-
-  <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title_last_time">Ukończono powtarzane zadanie \"%s\"</string>
-      
-  <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->  
-  <string name="repeat_rescheduling_dialog_bubble">%1$s Przełożyłem to powtarzalne zadanie z %2$s na %3$s</string>
-  
-  <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
-  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s Przełożyłem to powtarzalne zadanie na %2$s</string>
-  
-  <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
-  <string name="repeat_rescheduling_dialog_bubble_last_time">To było powtarzane do %1$s, a teraz jest już zakończone. %2$s</string>
-  
-  <string-array name="repeat_encouragement">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>Dobra robota!</item>
-      <item>ŁaŁ... Jestem z Ciebie dumny!</item>
-      <item>Uwielbiam, gdy jesteś produktywny/a!</item>
-      <item>Czy odznaczenie wykonanego zadania, to nie jest dobre uczucie?</item>
-  </string-array>
-
-  <string-array name="repeat_encouragement_last_time">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>Dobra robota!</item>
-      <item>Jestem z Ciebie taka dumna!</item>
-      <item>Uwielbiam, gdy jesteś produktywny/a!</item>
-  </string-array>
-  
+    <!-- Task Edit: Reminder @ deadline -->
+    <string name="TEA_reminder_due">W terminie</string>
 
+    <!-- Task Edit: Reminder after deadline -->
+    <string name="TEA_reminder_overdue">Gdy zadanie jest zaległe</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder at random times (%s => time plural)-->
+    <string name="TEA_reminder_randomly">Losowo raz</string>
 
-    
-  <!-- Subtasks Help Introduction -->
-  <string name="subtasks_help_title">Sortowanie i Wcięcie w Astrid</string>
-  <string name="subtasks_help_1">Dotknij i przytrzymaj, by przenieść zadanie</string>
-  <string name="subtasks_help_2">Przenieś w pionie aby przearanżować</string>
-  <string name="subtasks_help_3">Przenieś w poziomie aby zrobić wcięcie</string>
-    
+    <!-- Task Edit: Reminder alarm clock label -->
+    <string name="TEA_reminder_alarm_label">Rodzaj dzwonka/wibracji:</string>
 
+    <!--  slide 45a: Task Edit: Reminder mode: ring once -->
+    <string name="TEA_reminder_mode_once">Pojedynczy</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 45b: Task Edit: Reminder mode: ring five times -->
+    <string name="TEA_reminder_mode_five">Pięć razy</string>
+
+    <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
+    <string name="TEA_reminder_mode_nonstop">Aż odwołam alarm</string>
+
+    <string name="TEA_reminder_when">kiedy</string>
+
+    <string name="TEA_reminder_due_short">due</string>
+
+    <string name="TEA_reminder_overdue_short">zaległe</string>
+
+    <string name="TEA_reminder_randomly_short">losowo</string>
+
+    <string name="TEA_reminder_display_one">Remind me %s</string>
+
+    <string name="TEA_reminder_display_multiple">Remind %s</string>
+
+    <string-array name="TEA_reminder_random">
+        <!-- random reminder choices for task edit page. -->
+        <item>na godzinę</item>
+        <item>dziennie</item>
+        <item>na tydzień</item>
+        <item>na dwa tygodnie</item>
+        <item>na miesiąc</item>
+        <item>na dwa miesiące</item>
+    </string-array>
+
+    <!-- ==================================================== notifications == -->
+
+    <!-- Name of filter when viewing a reminder -->
+    <string name="rmd_NoA_filter">Przypomnienie!</string>
+
+    <!-- Reminder: Task was already done -->
+    <string name="rmd_NoA_done">Już wykonano!</string>
+
+    <!-- Reminder: Snooze button (remind again later) -->
+    <string name="rmd_NoA_snooze">Wstrzymaj...</string>
+
+    <!-- Reminder: Completed Toast -->
+    <string name="rmd_NoA_completed_toast">Gratuluję ukończenia!</string>
+
+    <!-- Prefix for reminder dialog title -->
+    <string name="rmd_NoA_dlg_title">Przypomnienie:</string>
+
+    <!-- ==================================================== user reengagement == -->
+
+    <!-- Titles for user reengagement notifications -->
+    <string-array name="rmd_reengage_notif_titles">
+        <item>A note from Astrid</item>
+        <!-- %s -> first name -->
+        <item>Memo for %s.</item>
+        <item>Your Astrid digest</item>
+        <item>Przypomnienia z Astrid</item>
+    </string-array>
+
+    <string name="rmd_reengage_name_default">Ty</string>
+
+
+    <string name="rmd_reengage_add_tasks">Dodaj zadanie</string>
+
+    <!-- Speech bubble options for astrid in reengagement notifs -->
+    <string-array name="rmd_reengage_dialog_options">
+        <item>Time to shorten your to-do list!</item>
+        <item>Drogi Panie i Władco, pewne zadania oczekują Twojej uwagi!</item>
+        <item>Siemanko, możesz rzucić na to okiem?</item>
+        <item>Mam parę zadań z Twoim imieniem!</item>
+        <item>Świeża dostawa zadań!</item>
+        <item>Wyglądasz wyśmienicie! Gotowy do roboty?</item>
+        <item>Cudowny dzień, by zająć się pewnymi sprawami!</item>
+    </string-array>
+
+    <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>Nie chcesz się zorganizować?</item>
+        <item>Nazywam się Astrid! Jestem tu, by Ci pomóc zrobić więcej!</item>
+        <item>Wyglądasz na zajętego! Pozwól, że zabiorę trochę tych zadań.</item>
+        <item>Mogę Ci pomóc mieć na uwadze wszystkie szczegóły Twojego życia.</item>
+        <item>Na serio chcesz zrobić coś jeszcze? Ja też!</item>
+        <item>Miło Cię poznać!</item>
+    </string-array>
+    <!-- ============================================= reminder preferences == -->
+
+    <!-- slide 33d: Reminder Preference Screen Title -->
+    <string name="rmd_EPr_alerts_header">Ustawienia przypomnień</string>
+    <string name="rmd_EPr_alerts_summary">Ciche godziny, opcje drzemki, poziom trwania</string>
+
+    <!-- Reminder Preference: Reminders Enabled Title -->
+    <string name="rmd_EPr_enabled_title">Przypomnienia włączone?</string>
+    <!-- Reminder Preference Reminders Enabled Description (true) -->
+    <string name="rmd_EPr_enabled_desc_true">Przypomnienia Astrid są włączone (to normalne)</string>
+    <!-- Reminder Preference Reminders Enabled Description (false) -->
+    <string name="rmd_EPr_enabled_desc_false">Przypomnienia Astrid nigdy nie pojawią się na Twoim
+        telefonie
+    </string>
+
+    <!-- Reminder Preference: Quiet Hours Start Title -->
+    <string name="rmd_EPr_quiet_hours_start_title">Początek czasu wyciszenia</string>
+    <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_start_desc">Powiadomienia będą wyciszone po %s.\nUwaga:
+        wibracje są kontrolowane przez ustawienia poniżej!
+    </string>
+    <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
+    <string name="rmd_EPr_quiet_hours_desc_none">Wyciszenie jest nieaktywne</string>
+
+    <!-- Reminder Preference: Quiet Hours End Title -->
+    <string name="rmd_EPr_quiet_hours_end_title">Koniec czasu wyciszenia</string>
+    <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_end_desc">Powiadomienia przestaną być wyciszonre, począwszy od
+        %s
+    </string>
+
+    <!-- Reminder Preference: Default Reminder Title -->
+    <string name="rmd_EPr_rmd_time_title">Domyślne przypomnienie</string>
+    <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
+    <string name="rmd_EPr_rmd_time_desc">Powiadomienia zadań bez odpowiedniego czasu pojawi się na
+        %s
+    </string>
+
+    <!-- Reminder Preference: Notification Ringtone Title -->
+    <string name="rmd_EPr_ringtone_title">Dźwięk powiadomienia</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
+    <string name="rmd_EPr_ringtone_desc_custom">Własy dzwonek ustawiony</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
+    <string name="rmd_EPr_ringtone_desc_silent">Dzwonek ustawiony na milczenie</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
+    <string name="rmd_EPr_ringtone_desc_default">Zostanie użyty dzwonek domyślny</string>
+
+    <!-- Reminder Preference: Notification Persistence Title -->
+    <string name="rmd_EPr_persistent_title">Wytrwałość powiadomienia</string>
+    <!-- Reminder Preference: Notification Persistence Description (true) -->
+    <string name="rmd_EPr_persistent_desc_true">Powiadomienia muszą być wyświetlane pojedyńczo aby
+        były wyczyszczone
+    </string>
+    <!-- Reminder Preference: Notification Persistence Description (false) -->
+    <string name="rmd_EPr_persistent_desc_false">Powiadomienia mogą zostać wyczyszczone przyciskiem
+        \"Wyczyść wszystkie\"
+    </string>
+
+    <!-- Reminder Preference: Social Reminders Title -->
+    <string name="rmd_EPr_social_title">Zachęta społeczności</string>
+    <!-- Reminder Preference: Social Reminders Summary (enabled) -->
+    <string name="rmd_EPr_social_summary_enabled">Przypomnienia dla współdzielonych zadań pokażą kto
+        na Ciebie liczy
+    </string>
+    <!-- Reminder Preference: Social Reminders Summary (disabled) -->
+    <string name="rmd_EPr_social_summary_disabled">Przypomnienia dla współdzielonych zadań nie
+        pokażą kto na Ciebie liczy
+    </string>
+
+
+    <!-- Reminder Preference: Notification Icon Title -->
+    <!-- Reminder Preference: Notification Icon Description -->
+
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
+    <string name="rmd_EPr_multiple_maxvolume_title">Maksymalna głośność dla wielu dzwonków
+        przypomnień
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid ustawi maksymalną głośność dla wielu
+        dzwonków przypomnień
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid będzie korzystał z systemowego
+        ustawienia głośności
+    </string>
+
+    <!-- Reminder Preference: Vibrate Title -->
+    <string name="rmd_EPr_vibrate_title">Ostrzeżenie wibracyjne</string>
+    <!-- Reminder Preference: Vibrate Description (true) -->
+    <string name="rmd_EPr_vibrate_desc_true">Astrid powiadomi wibracjami podczas wysyłania
+        powiadomienia
+    </string>
+    <!-- Reminder Preference: Vibrate Description (false) -->
+    <string name="rmd_EPr_vibrate_desc_false">Astrid nie będzie powiadamiał wibracjami podczas
+        wysyłania powiadomienia
+    </string>
+
+    <!-- Reminder Preference: Nagging Title -->
+    <string name="rmd_EPr_nagging_title">Astrid Zachęta</string>
+    <!-- Reminder Preference: Nagging Description (true) -->
+    <string name="rmd_EPr_nagging_desc_true">Astrid pokaże się dla zachęty podczas przypomnienia
+    </string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_nagging_desc_false">Astrid nie daje żadnych wiadomości zachęty</string>
+
+    <!-- Reminder Preference: Snooze Dialog Title -->
+    <string name="rmd_EPr_snooze_dialog_title">Tekst drzemki HH:MM</string>
+    <!-- Reminder Preference: Snooze Dialog Description (true) -->
+    <string name="rmd_EPr_snooze_dialog_desc_true">Uśpij wybierając nową godzinę drzemki (HH:MM)
+    </string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_snooze_dialog_desc_false">Uśpij wybierając # dni/godziny uśpienia</string>
+
+    <!-- slide 44g: Reminder Preference: Default Reminders Title -->
+    <string name="rmd_EPr_defaultRemind_title">Losowe przypomnienia</string>
+    <!-- Reminder Preference: Default Reminders Setting (disabled) -->
+    <string name="rmd_EPr_defaultRemind_desc_disabled">Nowe zadania nie będą miały losowych
+        przypomnień
+    </string>
+    <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
+    <string name="rmd_EPr_defaultRemind_desc">Nowe zadania będą przypominane losowo: %s</string>
+
+    <!-- slide 39a: Defaults Title -->
+
+    <string-array name="EPr_reminder_random">
+        <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
+        <item>wyłączone</item>
+        <!-- slide 44b -->
+        <item>co godzinę</item>
+        <!-- slide 44c -->
+        <item>raz dziennie</item>
+        <!-- slide 44d-->
+        <item>raz w tygodniu</item>
+        <!-- slide 44e-->
+        <item>raz na dwa tygodnie</item>
+        <!-- slide 44f -->
+        <item>raz w miesiącu</item>
+        <item>raz na dwa miesiące</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_start">
+        <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
+        <item>wyłączone</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>24:00</item>
+        <item>01:00</item>
+        <item>02:00</item>
+        <item>03:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_end">
+        <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>24:00</item>
+        <item>01:00</item>
+        <item>02:00</item>
+        <item>03:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+    </string-array>
+
+    <string-array name="EPr_rmd_time">
+        <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>24:00</item>
+        <item>01:00</item>
+        <item>02:00</item>
+        <item>03:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+    </string-array>
+
+    <!-- =============================================== random reminders == -->
+
+    <string name="reminders_social">Ci ludzie na ciebie liczą!</string>
+
+    <string name="reminders_social_one">%s is counting on you!</string>
+
+    <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
+
+    <string-array name="reminders">
+        <!-- reminders: Make these < 20 chars so the task name is displayed -->
+        <item>Cześć! Masz chwilkę?</item>
+        <item>Mogę się z Tobą zobaczyć na chwilę?</item>
+        <item>Masz trochę czasu?</item>
+        <item>Nie pamiętasz?</item>
+        <item>Przepraszam!</item>
+        <item>Gdy znajdziesz trochę czasu:</item>
+        <item>W Twoim terminarzu:</item>
+        <item>Masz chwilę?w</item>
+        <item>Tu Astrid!</item>
+        <item>Cześć! Mogę przeszkodzić?</item>
+        <item>Minuta Twojego czasu?</item>
+        <item>Jest wspaniały dzień na</item>
+    </string-array>
+
+    <string-array name="reminders_due">
+        <!-- reminders related to task due date -->
+        <item>Czas do pracy!</item>
+        <item>Termin zadania się zbliża!</item>
+        <item>Zaczynamy?</item>
+        <item>Taki był Twój zamiar:</item>
+        <item>Powinieneś zacząć:</item>
+        <item>Czas zacząć:</item>
+        <item>Już czas!</item>
+        <item>Przepraszam, ale czas na</item>
+        <item>Macz wolne? Czas na</item>
+    </string-array>
+
+    <string-array name="reminders_snooze">
+        <!-- reminders related to snooze -->
+        <item>Nie leń się!</item>
+        <item>Nadszedł czas drzemki!</item>
+        <item>Koniec drzemania!</item>
+        <item>Jesteś w gotowości?</item>
+        <item>Koniec ciągłego odkładania!</item>
+    </string-array>
+
+    <string-array name="reminder_responses">
+        <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
+        <item>Mam coś dla Ciebie!</item>
+        <item>Co powiesz na rzucenie tego w przeszłość?</item>
+        <item>Dlaczego wreszcie tego nie zrobisz?</item>
+        <item>I jak tam? Tygrys gotowy?</item>
+        <item>W gotowości na wykonanie zadania?</item>
+        <item>Poradzisz sobie z tym?</item>
+        <item>Szczęście jest blisko! Tylko to zrób!</item>
+        <item>Obiecuję, że poczujesz się lepiej, gdy to skończysz!</item>
+        <item>Dlaczego nie zrobić tego dziś?</item>
+        <item>Proszę, dokończ to! Mam już tego dość!</item>
+        <item>Możesz to skończyć? TAK, możesz!</item>
+        <item>Zrobisz to kiedyś?</item>
+        <item>Nie ma się czym martwić! Do dzieła!</item>
+        <item>Jestem z Ciebie dumny! Dokończmy to!</item>
+        <item>Może jakaś przekąska, gdy już skończysz?</item>
+        <item>Tylko to jedno zadanie, proszę...</item>
+        <item>Czas skrócić listę rzeczy do zrobienia!</item>
+        <item>Jesteś z drużyny \"Ład\" czy \"Chaos\"? Drużyna \"Ład\"! Do boju!</item>
+        <item>Wspominałem, że ostatnio jesteś niesamowity? Tak trzymaj!</item>
+        <item>A task a day keeps the clutter away... Goodbye clutter!</item>
+        <item>Jak Ty to robisz? Wow, jestem pod wrażeniem!</item>
+        <item>You can\'t just get by on your good looks. Let\'s get to it!</item>
+        <item>Cudowny dzień do takiej pracy, prawda?</item>
+        <item>Filiżankę herbaty?</item>
+        <item>Gdybyś tylko się tym zajął, mógłbyś wyjść na dwór się pobawić.</item>
+        <item>Nadszedł czas. Nie odwleczesz nieuniknionego.</item>
+        <item>Mała część mnie umiera za każdym razem, gdy mnie ignorujesz.</item>
+    </string-array>
+
+    <string-array name="postpone_nags">
+        <!-- Astrid\'s nagging when user clicks postpone -->
+        <item>Proszę powiedz, że to nie prawda, że jesteś takim leniem!</item>
+        <item>Bycie leniem nigdy Ci się nie nudzi?</item>
+        <item>Ktoś, gdzieś liczy na Ciebie, że uporasz sobie z tym zadaniem!</item>
+        <item>Mówiąc \"później\" masz na myśli \"teraz\", prawda?</item>
+        <item>To jest ostatni raz, gdy odkładasz to na później, dobrze?</item>
+        <item>Po prostu skończ to dziś, nikomu nie powiem!</item>
+        <item>Po co odkładać na później kiedy możesz um... nie odkładać!</item>
+        <item>Zakładam, że jest szansa, że skończysz to dziś?</item>
+        <item>Myślę, że jesteś naprawdę cool! A co powiesz na nie odkładanie tego na później?</item>
+        <item>Osiągniesz swoje cele, jeśli to zrobisz?</item>
+        <item>Odkładanie, odkładanie, odkładanie... kiedy Ty się wreszcie zmienisz?!</item>
+        <item>Mam dość Twoich wymówek! Zrób to tu i teraz!</item>
+        <item>Czy wcześniej nie słyszałem tej samej wymówki?</item>
+        <item>Nie pomogę Ci w organizowaniu sobie życia, jeśli to zrobisz...</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in repeat plug-in -->
+
+    <!-- repeating plugin name -->
+    <string name="repeat_plugin">Powtarzanie zadań</string>
+
+    <!-- repeating plugin description -->
+    <string name="repeat_plugin_desc">Zewzwól zadaniom na powtarzanie</string>
+
+    <!-- slide 20a: checkbox for turning on/off repeats -->
+    <string name="repeat_enabled">Powtarza się</string>
+
+    <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
+    <string name="repeat_every">Co %d</string>
+
+    <!-- hint when opening repeat interval -->
+    <string name="repeat_interval_prompt">Odstęp powtarzania</string>
+
+    <!-- slide 19b-->
+    <string name="repeat_never">Not repeating</string>
+    <!-- slide 20f-->
+    <string name="repeat_dont">Nie powtarzaj</string>
+
+    <string-array name="repeat_interval_short">
+        <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
+        <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">
+        <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>Dzień/Dni</item>
+        <item>Tydzień/Tygodni(e)</item>
+        <item>Miesiąc/Miesiący(e)</item>
+        <item>Godzinę(y)/Godzin</item>
+        <item>Minut(a/y)</item>
+        <item>Year(s)</item>
+    </string-array>
+
+    <string name="repeat_days">dni</string>
+    <string name="repeat_weekdays">dni robocze</string>
+    <string name="repeat_weeks">tygodnie</string>
+    <string name="repeat_months">miesiące</string>
+    <string name="repeat_years">lata</string>
+    <string name="repeat_hours">godziny</string>
+    <string name="repeat_minutes">minuty</string>
+
+    <string-array name="repeat_until_shortcuts">
+        <item>Zawsze</item>
+        <item>Konkretny dzień</item>
+        <item>Dzisiaj</item>
+        <item>Jutro</item>
+        <item>(pojutrze)</item>
+        <item>Następny tydzień</item>
+        <item>W ciągu dwóch tygodni</item>
+        <item>Przyszły miesiąc</item>
+    </string-array>
+
+    <string name="repeat_until_title">Powtarzaj do...</string>
+
+    <string name="repeat_keep_going">Kontynuuj</string>
+
+    <string-array name="repeat_type">
+        <!-- slide 20c: repeat type (date to repeat from) -->
+        <item>od planowanego terminu</item>
+        <!-- slide 20c -->
+        <item>od daty ukończenia</item>
+    </string-array>
+
+    <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
+    <string name="repeat_detail_byday">$I w $D</string>
+
+    <!-- task detail for repeat from due date (%s -> interval) -->
+    <string name="repeat_detail_duedate">Każdy %s</string>
+
+    <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
+    <string name="repeat_detail_duedate_until">Co %1$s\ndo %2$s</string>
+
+    <!-- task detail for repeat from completion date (%s -> interval) -->
+    <string name="repeat_detail_completion">%s po ukończeniu</string>
+
+    <!-- text for button when repeating task indefinitely -->
+    <string name="repeat_forever">Powtarzaj bez końca</string>
+
+    <!-- text for button when repeating task until specified date (%s -> date string) -->
+    <string name="repeat_until">Powtarzaj do %s</string>
+
+    <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title">Przekładanie zadania \"%s\"</string>
+
+    <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title_last_time">Ukończono powtarzane zadanie \"%s\"
+    </string>
+
+    <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->
+    <string name="repeat_rescheduling_dialog_bubble">%1$s Przełożyłem to powtarzalne zadanie z %2$s
+        na %3$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
+    <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s Przełożyłem to powtarzalne zadanie
+        na %2$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
+    <string name="repeat_rescheduling_dialog_bubble_last_time">To było powtarzane do %1$s, a teraz
+        jest już zakończone. %2$s
+    </string>
+
+    <string-array name="repeat_encouragement">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>Dobra robota!</item>
+        <item>ŁaŁ... Jestem z Ciebie dumny!</item>
+        <item>Uwielbiam, gdy jesteś produktywny/a!</item>
+        <item>Czy odznaczenie wykonanego zadania, to nie jest dobre uczucie?</item>
+    </string-array>
+
+    <string-array name="repeat_encouragement_last_time">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>Dobra robota!</item>
+        <item>Jestem z Ciebie taka dumna!</item>
+        <item>Uwielbiam, gdy jesteś produktywny/a!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Subtasks Help Introduction -->
+    <string name="subtasks_help_title">Sortowanie i Wcięcie w Astrid</string>
+    <string name="subtasks_help_1">Dotknij i przytrzymaj, by przenieść zadanie</string>
+    <string name="subtasks_help_2">Przenieś w pionie aby przearanżować</string>
+    <string name="subtasks_help_3">Przenieś w poziomie aby zrobić wcięcie</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-
-  <!-- Tags label -->
-  <string name="TEA_tags_label">Listy</string>
-  
-  <!-- Tags label long version -->
-  <string name="TEA_tags_label_long">Dodaj do list</string>
- 
-  <!-- Tags hint -->
-  <string name="TEA_tag_hint">Nowa lista</string>
-  
-  <!-- Tags dropdown -->
-    
-  <!-- =============================================== Task List Controls == -->
-  
-  <!-- menu item for tags -->
-  
-  <!-- ========================================================== Extras == -->
-  
-  <!-- Context Item: show tag -->
-  
-  <!-- slide 25a: Dialog: new list -->
-  <string name="tag_new_list">Nowa lista</string>
-  
-  <!-- Dialog: list saved -->
-  
-  <!-- Dialog: task created without title -->
-  <string name="tag_no_title_error">Wpisz nazwę dla tej listy najpierw!</string>
-  
-  <!-- ========================================================== Filters == -->
-  
-  <!-- filter button to add tag -->
-  <string name="tag_FEx_add_new">Nowy</string>
-  
-  <!-- filter header for tags -->
-  <string name="tag_FEx_header">Listy</string>
-  
-  <!-- filter header for tags user created -->
-  
-  <!-- filter header for tags, shared with user -->
-  
-  <!-- filter header for tags which have no active tasks -->
-  
-  <!-- slide 10d: filter for untagged tasks -->
-  <string name="tag_FEx_untagged">Na żadnej liście</string>
-  
-  <!-- slide 27a: %s => tag name -->
-
-  <!-- context menu option to rename a tag -->
-  <string name="tag_cm_rename">Zmień nazwę listy</string>
-
-  <!-- context menu option to delete a tag -->
-  <string name="tag_cm_delete">Usuń listę</string>
-  
-  <!-- context menu option to leave a shared list -->
-  <string name="tag_cm_leave">Opuść Listę</string>
-
-  <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
-  <string name="DLG_delete_this_tag_question">Usuń tą listę: %s? (Bez zadań zostaną usuwane.)</string>
-  
-  <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
-  <string name="DLG_leave_this_shared_tag_question">Opuścić tę współdzieloną listę: %s? (Żadne zadanie nie zostanie usunięte.)</string>
-
-  <!-- Dialog to rename tag -->
-  <string name="DLG_rename_this_tag_header">Zmień nazwę listy %s na:</string>
-
-  <!-- Toast notification that no changes have been made -->
-  <string name="TEA_no_tags_modified">Nie wprowadzono żadnych zmian</string>
-
-  <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_deleted">Lista %1$s została usunięta, mających wpływ na %2$d zadań</string>
-  
-  <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_left">Opuściłeś udostępnioną listę %1$s, która wpływa na %2$d zadania</string>
-
-  <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
-  <string name="TEA_tags_renamed">Zmiana nazwy %1$s z %2$s dla %3$d zadań</string>
-  
-  <!-- Tag case migration -->
-  <string name="tag_case_migration_notice">Zauważyliśmy, że miałeś/aś kilka list o takiej samej nazwie, z różnymi wielkimi literami. Pomyśleliśmy, że założeniem było, by były tym samym, więc je połączyliśmy. Nie martw się jednak; oryginalne listy mają tylko zmienione nazwy z numerami (np. Zakupy_1, Zakupy_2). Jeśli tego sobie nie życzysz, możesz zwyczajnie usunąć nową listę!</string>
-  
-  <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings:</string>
-  
-  <!-- Header for tag activity -->
-  <string name="tag_updates_title">Aktywności: %s</string>
-  
-  <!-- Delete button for tag settings -->
-  <string name="tag_delete_button">Usuń listę</string>
-  
-  <!-- slide 28d: Leave button for tag settings -->
-  <string name="tag_leave_button">Opuść tę listę</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Tags label -->
+    <string name="TEA_tags_label">Listy</string>
 
+    <!-- Tags label long version -->
+    <string name="TEA_tags_label_long">Dodaj do list</string>
+
+    <!-- Tags hint -->
+    <string name="TEA_tag_hint">Nowa lista</string>
+
+    <!-- Tags dropdown -->
+
+    <!-- =============================================== Task List Controls == -->
+
+    <!-- menu item for tags -->
+
+    <!-- ========================================================== Extras == -->
+
+    <!-- Context Item: show tag -->
+
+    <!-- slide 25a: Dialog: new list -->
+    <string name="tag_new_list">Nowa lista</string>
+
+    <!-- Dialog: list saved -->
+
+    <!-- Dialog: task created without title -->
+    <string name="tag_no_title_error">Wpisz nazwę dla tej listy najpierw!</string>
+
+    <!-- ========================================================== Filters == -->
+
+    <!-- filter button to add tag -->
+    <string name="tag_FEx_add_new">Nowy</string>
+
+    <!-- filter header for tags -->
+    <string name="tag_FEx_header">Listy</string>
+
+    <!-- filter header for tags user created -->
+
+    <!-- filter header for tags, shared with user -->
+
+    <!-- filter header for tags which have no active tasks -->
+
+    <!-- slide 10d: filter for untagged tasks -->
+    <string name="tag_FEx_untagged">Na żadnej liście</string>
+
+    <!-- slide 27a: %s => tag name -->
+
+    <!-- context menu option to rename a tag -->
+    <string name="tag_cm_rename">Zmień nazwę listy</string>
+
+    <!-- context menu option to delete a tag -->
+    <string name="tag_cm_delete">Usuń listę</string>
+
+    <!-- context menu option to leave a shared list -->
+    <string name="tag_cm_leave">Opuść Listę</string>
+
+    <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
+    <string name="DLG_delete_this_tag_question">Usuń tą listę: %s? (Bez zadań zostaną usuwane.)
+    </string>
+
+    <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
+    <string name="DLG_leave_this_shared_tag_question">Opuścić tę współdzieloną listę: %s? (Żadne
+        zadanie nie zostanie usunięte.)
+    </string>
+
+    <!-- Dialog to rename tag -->
+    <string name="DLG_rename_this_tag_header">Zmień nazwę listy %s na:</string>
+
+    <!-- Toast notification that no changes have been made -->
+    <string name="TEA_no_tags_modified">Nie wprowadzono żadnych zmian</string>
+
+    <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_deleted">Lista %1$s została usunięta, mających wpływ na %2$d zadań
+    </string>
+
+    <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_left">Opuściłeś udostępnioną listę %1$s, która wpływa na %2$d zadania
+    </string>
+
+    <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
+    <string name="TEA_tags_renamed">Zmiana nazwy %1$s z %2$s dla %3$d zadań</string>
+
+    <!-- Tag case migration -->
+    <string name="tag_case_migration_notice">Zauważyliśmy, że miałeś/aś kilka list o takiej samej
+        nazwie, z różnymi wielkimi literami. Pomyśleliśmy, że założeniem było, by były tym samym,
+        więc je połączyliśmy. Nie martw się jednak; oryginalne listy mają tylko zmienione nazwy z
+        numerami (np. Zakupy_1, Zakupy_2). Jeśli tego sobie nie życzysz, możesz zwyczajnie usunąć
+        nową listę!
+    </string>
+
+    <!-- Header for tag settings -->
+    <string name="tag_settings_title">Settings:</string>
+
+    <!-- Header for tag activity -->
+    <string name="tag_updates_title">Aktywności: %s</string>
+
+    <!-- Delete button for tag settings -->
+    <string name="tag_delete_button">Usuń listę</string>
+
+    <!-- slide 28d: Leave button for tag settings -->
+    <string name="tag_leave_button">Opuść tę listę</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in timers plug-in -->
-    
+
     <!-- Task List: Start Timer button -->
-    
+
     <!-- Task List: Stop Timer button -->
-    
+
     <!-- Android Notification Title (%s => # tasks) -->
     <string name="TPl_notification">Minutnkiki aktywne przez %s!</string>
-    
+
     <!-- Filter Header for Timer plugin -->
-    
+
     <!-- Filter for Timed Tasks -->
     <string name="TFE_workingOn">Zadania zostały spracyzowane czasowo</string>
-    
+
     <!-- Title for TEA -->
     <string name="TEA_timer_controls">Minutnik</string>
-    
-    
+
+
     <!-- Edit Notes: create comment for when timer is started -->
     <string name="TEA_timer_comment_started">rozpoczęto zadanie:</string>
-    
+
     <!-- Edit Notes: create comment for when timer is stopped -->
     <string name="TEA_timer_comment_stopped">zakończono zadanie:</string>
-    
+
     <!-- Edit Notes: comment to notify how long was spent on task -->
     <string name="TEA_timer_comment_spent">Czas spędzony:</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Update string from activity codes %1$s - user, %2$s - target name, %3$s - message, %4$s - other_user-->
-    
+
     <!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
     Please do not translate this part of the string. -->
-    
+
     <!-- These are still in use -->
     <string name="update_string_default_comment">%1$s skomentował: %3$s</string>
     <string name="update_string_task_comment">%1$s on $link_task: %3$s</string>
     <string name="update_string_tag_comment">%1$s on %2$s: %3$s</string>
     <string name="update_string_user_self">Ty</string>
-    
+
     <string name="history_yourself">yourself</string>
     <string name="history_you">Ty</string>
     <string name="history_a_deleted_user">(usunięty użytkownik)</string>
-    
+
     <string name="history_this_list">tej listy</string>
     <string name="history_this_task">to zadanie</string>
     <string name="history_tag_added">dodano %1$s do %2$s</string>
@@ -2985,9 +3251,12 @@ ale nie będziesz mógł robić zakupów.</string>
     <string name="history_favorited">dodano %s do ulubionych</string>
     <string name="history_unfavorited">usunięto %s z ulubionych</string>
     <string name="history_changed_list_picture">Zmień obrazek tej listy</string>
-    <string name="history_added_description_characters">added %1$d characters to %2$s description</string>
+    <string name="history_added_description_characters">added %1$d characters to %2$s description
+    </string>
     <string name="history_removed_description">usunięto opis %s</string>
-    <string name="history_removed_description_characters">removed %1$d characters from %2$s description</string>
+    <string name="history_removed_description_characters">removed %1$d characters from %2$s
+        description
+    </string>
     <string name="history_updated_description">uaktualniono opis %s</string>
     <string name="history_changed_list_owner">zmieniono właściciela listy na %s</string>
     <string name="history_created_this_list">utworzono tę listę</string>
@@ -3010,195 +3279,230 @@ ale nie będziesz mógł robić zakupów.</string>
     <string name="history_repeat_on">on %s</string>
     <string name="history_repeat_from_completion">po ukończeniu</string>
     <string name="history_acknowledged">viewed %s</string>
-    
-    <string name="history_default">zmieniono %1$s na %2$s</string>
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-    
-  <!-- Voice Add Prompt Text -->
-  <string name="voice_create_prompt">Mów by utworzyć zadanie</string>
-  <string name="voice_edit_title_prompt">Mów by ustawić tytuł zadania</string>
-  <string name="voice_edit_note_prompt">Mów by ustawić notatkę zadania</string>
-    
-  <!-- Preference: Task List recognition-service is not installed, but available -->
-  <string name="EPr_voiceInputInstall_dlg">Voice-input nie jest zainstalowany.\nCzy chcesz iść do marketu i zainstalować go?</string>
-  <!-- Preference: Task List recognition-service is not available for this system -->
-  <string name="EPr_voiceInputUnavailable_dlg">Niestety sterowania głosem nie jest dostępne dla systemu.\nJęśli możliwe, zaktualizuj system do Android 2.1 lub nowszego.</string>
-  <!-- Preference: Market is not available for this system -->
-  <string name="EPr_marketUnavailable_dlg">Niestety w market nie jest dostępny dla twojego systemu.\nJęśli możliwe, należy pobrać wyszukiwanie głosowe z innego źródła.</string>
-  <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
-  <string name="EPr_voiceInputEnabled_title">Polecenia głosowe</string>
-  <!-- slide 38a: Preference: voice button description (true) -->
-  <string name="EPr_voiceInputEnabled_desc_enabled">Przycisk poleceń głosowych będzie wyświetlany na stronie listy zadań</string>
-  <!-- Preference: voice button description (false) -->
-  <string name="EPr_voiceInputEnabled_desc_disabled">Przycisk poleceń głosowych będzie ukryty na stronie listy zadań</string>
-  <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
-  <string name="EPr_voiceInputCreatesTask_title">Bezpośrednie tworzenie zadań</string>
-  <!-- Preference: Task List Voice-creation description (true) -->
-  <string name="EPr_voiceInputCreatesTask_desc_enabled">Zadania zostanie automatycznie utworzona z poleceń głosowych</string>
-  <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
-  <string name="EPr_voiceInputCreatesTask_desc_disabled">Można edytować tytuł zadania po zakończeniu wprowadzania głosem</string>
-  <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
-  <string name="EPr_voiceRemindersEnabled_title">Przypomnienia głosowe</string>
-  <!-- Preference: Voice reminders description (true) -->
-  <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid będzie mówił nazwę zadania podczas przypomnienia</string>
-  <!-- slide 38c: Preference: Voice reminders description (false) -->
-  <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid będzie uruchamiał dzwonek podczas przypomnienia zadania</string>    
-  
-  <!-- slide 32d: Preference Category: Voice Title -->
-  <string name="EPr_voice_header">Ustawienia poleceń głosowych</string>
-    
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-  
-  <!-- slide 30a-->
-  <string name="welcome_setting">Pokaż tutorial</string>
-  
-  <string name="welcome_title_1">Witaj w Astrid!</string>
-
-  <!-- slide 2a -->
-  <string name="welcome_title_2">Stwórz listy</string>
-
-  <!-- slide 3a-->
-  <string name="welcome_title_3">Przęłącz między listami</string>
-
-  <!-- slide 4a -->
-  <string name="welcome_title_4">Udostępnij listy</string>
-
-  <!-- slide 5a -->
-  <string name="welcome_title_5">Divvy up tasks</string>
-
-  <!-- slide 6a -->
-  <string name="welcome_title_6">Dodaj szczegóły</string>
 
-  <!-- slide 7a -->
-  <string name="welcome_title_7">Połącz się,\naby zacząć</string>
-  
-  <string name="welcome_title_7_return">To wszystko!</string>
-  
-  <!-- slide 1b -->
-  <string name="welcome_body_1">Doskonała osobista lista do-zrobienia \ndziała wspaniale z przyjaciółmi</string>
-
-  <!-- slide 2b-->
-  <string name="welcome_body_2">Idealne do każdej listy:\nczytaj, oglądaj, kupuj, odwiedź!</string>
-
-  <!-- slide 3b -->
-  <string name="welcome_body_3">Klepnij tytuł listy \by zobaczyć wszystkie twoje listy</string>
-
-  <!-- slide 4b -->
-  <string name="welcome_body_4">Udustępnij listy z\nprzyjaciółmi, lokatorami \nlub swoją sympatią!</string>
-
-  <!-- slide 5b -->
-  <string name="welcome_body_5">and much more!</string>
+    <string name="history_default">zmieniono %1$s na %2$s</string>
 
-  <!-- slide 6b-->
-  <string name="welcome_body_6">Klepnij aby dodać notatki,\nustawić przypomnienia,\ni wiele więcej!</string>
-  <string name="welcome_body_7">Zaloguj</string>
-  
-  <string name="welcome_body_7_return">Klepnij Astrid by wrócić.</string>
-  
-  <!-- slide 1c -->
-  <string name="welcome_next">Dalej</string>
-  
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Voice Add Prompt Text -->
+    <string name="voice_create_prompt">Mów by utworzyć zadanie</string>
+    <string name="voice_edit_title_prompt">Mów by ustawić tytuł zadania</string>
+    <string name="voice_edit_note_prompt">Mów by ustawić notatkę zadania</string>
+
+    <!-- Preference: Task List recognition-service is not installed, but available -->
+    <string name="EPr_voiceInputInstall_dlg">Voice-input nie jest zainstalowany.\nCzy chcesz iść do
+        marketu i zainstalować go?
+    </string>
+    <!-- Preference: Task List recognition-service is not available for this system -->
+    <string name="EPr_voiceInputUnavailable_dlg">Niestety sterowania głosem nie jest dostępne dla
+        systemu.\nJęśli możliwe, zaktualizuj system do Android 2.1 lub nowszego.
+    </string>
+    <!-- Preference: Market is not available for this system -->
+    <string name="EPr_marketUnavailable_dlg">Niestety w market nie jest dostępny dla twojego
+        systemu.\nJęśli możliwe, należy pobrać wyszukiwanie głosowe z innego źródła.
+    </string>
+    <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
+    <string name="EPr_voiceInputEnabled_title">Polecenia głosowe</string>
+    <!-- slide 38a: Preference: voice button description (true) -->
+    <string name="EPr_voiceInputEnabled_desc_enabled">Przycisk poleceń głosowych będzie wyświetlany
+        na stronie listy zadań
+    </string>
+    <!-- Preference: voice button description (false) -->
+    <string name="EPr_voiceInputEnabled_desc_disabled">Przycisk poleceń głosowych będzie ukryty na
+        stronie listy zadań
+    </string>
+    <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
+    <string name="EPr_voiceInputCreatesTask_title">Bezpośrednie tworzenie zadań</string>
+    <!-- Preference: Task List Voice-creation description (true) -->
+    <string name="EPr_voiceInputCreatesTask_desc_enabled">Zadania zostanie automatycznie utworzona z
+        poleceń głosowych
+    </string>
+    <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
+    <string name="EPr_voiceInputCreatesTask_desc_disabled">Można edytować tytuł zadania po
+        zakończeniu wprowadzania głosem
+    </string>
+    <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
+    <string name="EPr_voiceRemindersEnabled_title">Przypomnienia głosowe</string>
+    <!-- Preference: Voice reminders description (true) -->
+    <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid będzie mówił nazwę zadania podczas
+        przypomnienia
+    </string>
+    <!-- slide 38c: Preference: Voice reminders description (false) -->
+    <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid będzie uruchamiał dzwonek podczas
+        przypomnienia zadania
+    </string>
+
+    <!-- slide 32d: Preference Category: Voice Title -->
+    <string name="EPr_voice_header">Ustawienia poleceń głosowych</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 30a-->
+    <string name="welcome_setting">Pokaż tutorial</string>
+
+    <string name="welcome_title_1">Witaj w Astrid!</string>
+
+    <!-- slide 2a -->
+    <string name="welcome_title_2">Stwórz listy</string>
+
+    <!-- slide 3a-->
+    <string name="welcome_title_3">Przęłącz między listami</string>
+
+    <!-- slide 4a -->
+    <string name="welcome_title_4">Udostępnij listy</string>
+
+    <!-- slide 5a -->
+    <string name="welcome_title_5">Divvy up tasks</string>
+
+    <!-- slide 6a -->
+    <string name="welcome_title_6">Dodaj szczegóły</string>
+
+    <!-- slide 7a -->
+    <string name="welcome_title_7">Połącz się,\naby zacząć</string>
+
+    <string name="welcome_title_7_return">To wszystko!</string>
+
+    <!-- slide 1b -->
+    <string name="welcome_body_1">Doskonała osobista lista do-zrobienia \ndziała wspaniale z
+        przyjaciółmi
+    </string>
+
+    <!-- slide 2b-->
+    <string name="welcome_body_2">Idealne do każdej listy:\nczytaj, oglądaj, kupuj, odwiedź!
+    </string>
+
+    <!-- slide 3b -->
+    <string name="welcome_body_3">Klepnij tytuł listy \by zobaczyć wszystkie twoje listy</string>
+
+    <!-- slide 4b -->
+    <string name="welcome_body_4">Udustępnij listy z\nprzyjaciółmi, lokatorami \nlub swoją
+        sympatią!
+    </string>
+
+    <!-- slide 5b -->
+    <string name="welcome_body_5">and much more!</string>
+
+    <!-- slide 6b-->
+    <string name="welcome_body_6">Klepnij aby dodać notatki,\nustawić przypomnienia,\ni wiele
+        więcej!
+    </string>
+    <string name="welcome_body_7">Zaloguj</string>
+
+    <string name="welcome_body_7_return">Klepnij Astrid by wrócić.</string>
+
+    <!-- slide 1c -->
+    <string name="welcome_next">Dalej</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <string name="widget_mini">- Astrid Mini -</string>
-    
+
     <!-- Resources for power pack widget -->
-    
+
     <string name="PPW_widget_42_label">Old Astrid 4x2</string>
     <string name="PPW_widget_43_label">Old Astrid 4x3</string>
     <string name="PPW_widget_44_label">Old Astrid 4x4</string>
     <string name="PPW_widget_v11_label">- Astrid -</string>
     <string name="PPW_widget_custom_label">Astrid Custom Launcher Premium</string>
     <string name="PPW_widget_custom_launcherpro_label">Astrid Launcher Pro Premium</string>
-    
+
     <string name="PPW_configure_title">Konfiguracja widgetu</string>
-    
+
     <string name="PPW_color">Kolor widgetu</string>
     <string name="PPW_enable_calendar">Pokaż wydarzenia z kalendarza</string>
     <string name="PPW_disable_encouragements">Ukryj zachęcające powiadomienia</string>
     <string name="PPW_show_dates">Pokaż terminy</string>
     <string name="PPW_filter">Wybierz filtr</string>
-    
+
     <string name="PPW_due">Termin:</string>
     <string name="PPW_past_due">Poprzedni termin:</string>
-    
-    <string name="PPW_old_astrid_notice">Musisz mieć co najmniej wersję Astrid 3.6 w celu wykorzystania tego widgetu. Przepraszamy!</string>
-    
+
+    <string name="PPW_old_astrid_notice">Musisz mieć co najmniej wersję Astrid 3.6 w celu
+        wykorzystania tego widgetu. Przepraszamy!
+    </string>
+
     <string-array name="PPW_encouragements">
         <!-- general encouragements -->
-    	<item>Cześć!</item>
-    	<item>Masz czas na dokończenie czegoś?</item>
-    	<item>Olaboga! Wyglądasz dziś uprzedzająco grzecznie!</item>
-    	<item>Zrób coś wielkiego dziś!</item>
-    	<item>Zrób mnie dumnym dziś</item>
-    	<item>Jak się czujesz dzisiaj?</item>
+        <item>Cześć!</item>
+        <item>Masz czas na dokończenie czegoś?</item>
+        <item>Olaboga! Wyglądasz dziś uprzedzająco grzecznie!</item>
+        <item>Zrób coś wielkiego dziś!</item>
+        <item>Zrób mnie dumnym dziś</item>
+        <item>Jak się czujesz dzisiaj?</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_tod">
         <!-- encouragements based on time of day -->
-    	<item>Dzień dobry!</item>
-    	<item>Dzień dobry!</item>
-    	<item>Dobry wieczór!</item>
-    	<item>Późnym wieczorem?</item>
-    	<item>Jest wcześnie, coś zrobić!</item>
-    	<item>Popołudniowa herbata, być może?</item>
-    	<item>Ciesz się wieczorem!</item>
-    	<item>Sen jest dobry dla Ciebie, wiesz!</item>
+        <item>Dzień dobry!</item>
+        <item>Dzień dobry!</item>
+        <item>Dobry wieczór!</item>
+        <item>Późnym wieczorem?</item>
+        <item>Jest wcześnie, coś zrobić!</item>
+        <item>Popołudniowa herbata, być może?</item>
+        <item>Ciesz się wieczorem!</item>
+        <item>Sen jest dobry dla Ciebie, wiesz!</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_completed">
         <!-- encouragements based on tasks completed (%d => completed) -->
-    	<item>Masz już ukończonych zadań %d!</item>
-    	<item>Ocena w życiu: %d zadania zakończona</item>
-    	<item>Uśmiechnij się! Masz już zakończonych %d zadania!</item>
+        <item>Masz już ukończonych zadań %d!</item>
+        <item>Ocena w życiu: %d zadania zakończona</item>
+        <item>Uśmiechnij się! Masz już zakończonych %d zadania!</item>
     </string-array>
-  	<string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet! Shall we?</string>
-        
+    <string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet!
+        Shall we?
+    </string>
+
     <string-array name="PPW_colors">
         <item>Czarny</item>
         <item>Biały</item>
         <item>Niebieski</item>
         <item>Przezroczysty</item>
     </string-array>
-    
-    <string name="PPW_widget_dlg_text">Ten widżet jest dostępny wyłącznie dla właścicieli PowerPack!</string>
+
+    <string name="PPW_widget_dlg_text">Ten widżet jest dostępny wyłącznie dla właścicieli
+        PowerPack!
+    </string>
     <string name="PPW_widget_dlg_ok">Podgląd</string>
-    
+
     <string name="PPW_demo_title1">Pozycje z %s pojawią się tutaj</string>
     <string name="PPW_demo_title2">Power Pack zawiera widżety Premium</string>
     <string name="PPW_demo_title3">...dodawanie głosowo i fajne uczucia!</string>
     <string name="PPW_demo_title4">Klepnij by nauczyć się więcej!</string>
-    
+
     <string name="PPW_info_title">Darmowy Power Pack!</string>
     <string name="PPW_info_signin">Zaloguj się!</string>
     <string name="PPW_info_later">Później</string>
-    <string name="PPW_unlock_howto">Udostępniaj listy przyjaciołom! Odblokuj darmowy Power Pack gdy 3 przyjaciół zarejestruje się w Astrid.</string>
+    <string name="PPW_unlock_howto">Udostępniaj listy przyjaciołom! Odblokuj darmowy Power Pack gdy
+        3 przyjaciół zarejestruje się w Astrid.
+    </string>
     <string name="PPW_check_button">Zdobąć Power Pack za darmo!</string>
     <string name="PPW_check_share_lists">Udostępnij listy!</string>
-    <string name="PPW_api_level">Przepraszamy! Ten widżet jest wspierany tylko na Androidzie 3.0 lub wyższym.</string>
-    
+    <string name="PPW_api_level">Przepraszamy! Ten widżet jest wspierany tylko na Androidzie 3.0 lub
+        wyższym.
+    </string>
+
     <string name="EPr_widget_enabled_title">Włącz/Wyłącz Widżety</string>
-    <string name="PPW_restart_for_enabled_state">Zrestartowanie telefonu może być potrzebne by zmiany były widoczne.</string>
+    <string name="PPW_restart_for_enabled_state">Zrestartowanie telefonu może być potrzebne by
+        zmiany były widoczne.
+    </string>
 
 </resources>
diff --git a/astrid/res/values-pt-rBR/strings.xml b/astrid/res/values-pt-rBR/strings.xml
index 42be41e2c..bddccccc3 100755
--- a/astrid/res/values-pt-rBR/strings.xml
+++ b/astrid/res/values-pt-rBR/strings.xml
@@ -4,1685 +4,1837 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ================================================== general terms == -->
-
-  <!-- People Editing Activity -->    
-  
-  <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
-  <string name="actfm_person_hint">Contato ou Email</string>
-  
-  <!-- task sharing dialog: shared with hint -->
-  <string name="actfm_person_or_tag_hint">Contato ou Lista compartilhada</string>
-
-  <!-- toast on transmit success -->
-
-  <!-- can\'t rename or delete shared tag message -->
-  
-  <!-- warning before deleting a list you\'re the owner of -->
-  <string name="actfm_tag_operation_owner_delete">Você é o dono desta lista compartilhada! Se apagá-la, ela também será apagada para todos os membros dela. Tem certeza que quer continuar?</string>
-
-  <!-- slide 29a: menu item to take a picture -->
-  <string name="actfm_picture_camera">Tirar uma foto</string>
-
-  <!-- slide 29b: menu item to select from gallery -->
-  <string name="actfm_picture_gallery">Selecionar da galeria</string>
-  
-  <!-- menu item to clear picture selection -->
-  <string name="actfm_picture_clear">Limpar imagem</string>
-
-  <!-- filter list activity: refresh tags -->
-  
-  <!-- Title for prompt after sharing a task -->
-  <string name="actfm_view_task_title">Ver tarefa?</string>
-
-  <!-- Text for prompt after sharing a task -->
-  <string name="actfm_view_task_text">A tarefa foi enviada para %s! Atualmente está vendo suas próprias tarefas. Quer ver esta e as outras tarefas que você atribuiu?</string>
-  
-  <!-- Ok button for task view prompt -->
-  <string name="actfm_view_task_ok">Ver atribuídas</string>
-      
-  <!-- Cancel button for task view prompt -->
-  <string name="actfm_view_task_cancel">Ficar aqui</string>
-  
-  <!-- slide 13a: Title for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_title">Minhas tarefas compartilhadas</string>
-  
-  <!-- Empty list for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_empty">Sem tarefas compartilhadas</string>
-  
-  <!-- =====================  Friendship connections -->
-  
-  <string name="actfm_friendship_pending">Você enviou um pedido de amizade para %s!</string>
-
-  <string name="actfm_friendship_blocked">Você bloqueou %s.</string>
-
-  <string name="actfm_friendship_ignored">Você ignorou %s.</string>
-  
-  <string name="actfm_friendship_friends">Agora você é amigo de %s pessoas! Adicione tarefas para eles abaixo.</string>
-
-  <string name="actfm_friendship_other_pending">%s deseja ser seu amigo!</string>
-
-  <string name="actfm_friendship_no_status">Conecte-se com  %s para partilhar e ver a actividade em tarefas públicas!</string>
-
-  <string name="actfm_friendship_connect">Adicionar amigo</string>
-
-  <string name="actfm_friendship_accept">Aceitar</string>
-
-  <!-- ================================================== TagViewActivity == -->  
-
-  <!-- Tag View Activity: Add Comment hint -->    
-  <string name="TVA_add_comment">Comentar...</string>
-
-  <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->    
-  
-  <!-- Tabs for Tag view -->
-  <string-array name="TVA_tabs">
-    <!-- Tab for showing tasks -->
-    <item>Tarefas</item>
-    <!-- Tab for showing comments & updates -->
-    <item>Atividades</item>
-    <!-- Tab for showing setting -->
-    <item>Configurações</item>
-  </string-array>
-  
-  <!-- Tag View: filtered by assigned to user (%s => user name) -->
-  <string name="actfm_TVA_filtered_by_assign">Tarefas de %s. Toque para todas.</string>
-  
-  <!-- Tag View: filter by unassigned tasks -->
-  <string name="actfm_TVA_filter_by_unassigned">Tarefas não atribuídas. Toque para todas.</string>
-
-  <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Privada: toque para editar ou compartilhar</string>
-
-  <!-- Tag View Menu: refresh -->
-  <string name="actfm_TVA_menu_refresh">Atualizar</string>
-
-  <!-- Tag Settings: tag name label -->
-  <string name="actfm_TVA_tag_label">Lista</string>
-
-  <!-- Tag Settings: tag owner label -->
-
-  <!-- Tag Settings: tag owner value when there is no owner -->
-
-  <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
-  <string name="actfm_TVA_members_label">Compartilhada com</string>
-  
-  <!-- Tag Settings: list collaborators hint -->
-  <string name="actfm_TVA_members_hint">Compartilhe com qualquer pessoa que tenha um endereço de e-mail</string>
-
-  <!-- Tag Settings: tag picture -->
-  <string name="actfm_TVA_tag_picture">Imagem da lista</string>
-
-  <!-- slide 25c/28b: Tag Settings: silence notifications label -->
-  <string name="actfm_TVA_silence_label">Silenciar notificações</string>
-  
-  <!-- Tag Settings: list icon label -->
-  
-  <!-- slide 25b/27d: Tag Settings: list description label -->
-  <string name="actfm_TVA_tag_description_label">Descrição</string>
-  
-  <!-- slide 28a: Tag Settings: list settings label -->
-  <string name="actfm_TVA_tag_settings_label">Configurações</string>
-
-  <!-- slide 25b: Tag Settings: list description hint -->
-  <string name="actfm_TVA_tag_description_hint">Digite uma descrição aqui</string>
-  
-  <!-- slide 25d: Tag Settings: list name hint -->
-  <string name="actfm_TVA_tag_name_hint">Entre com o nome da lista</string>
-  
-  <!-- Tag settings: login prompt from share-->
-  <string name="actfm_TVA_login_to_share">Você precisa estar autenticado em Astrid.com para compartilhar listas! Autentique-se ou deixa-a como lista privada.</string>
-  
-      
-  <!-- ============================================ edit people dialog == -->
-
-  <!-- task sharing dialog: intro -->
-  <string name="actfm_EPA_intro">Use o Astrid para compartilhar listas de compras, planos para festas, ou projetos em equipe e instantaneamente ver quando as pessoas cumprem suas tarefas!</string>
-    
-  <!-- task sharing dialog: window title -->
-    
-  <!-- task sharing dialog: save button -->
-  
-  <!-- task sharing dialog: assigned label -->
-  
-  <!-- slide 18a: task sharing dialog: assigned label long version -->
-  <string name="actfm_EPA_assign_label_long">Quem deve fazer isso?</string>
-  
-  <!-- task sharing dialog: assigned to me -->
-  <string name="actfm_EPA_assign_me">Eu</string>
-  
-  <!-- task sharing dialog: anyone -->
-  <string name="actfm_EPA_unassigned">Não atribuída</string>
-  
-  <!-- slide 18c: task sharing dialog: choose a contact -->
-  <string name="actfm_EPA_choose_contact">Escolha um contato</string>
-  
-  <!-- task sharing dialog: custom email assignment -->
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_share_with">Compartilhar com:</string>
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_collaborators_header">Compartilhar</string>
-
-      <!-- task sharing dialog: collaborator list name (%s => name of list) -->
-  <string name="actfm_EPA_list">Lista: %s</string>
-  
-  <!-- task sharing dialog: assigned hint -->
-  
-  <!-- task sharing dialog: message label text -->
-  <string name="actfm_EPA_message_text">Mensagem do convite:</string>
-  
-  <!-- task sharing dialog: message body -->
-  <string name="actfm_EPA_message_body">Ajude-me a fazer isso!</string>
-  
-  <!-- task sharing dialog: list members section header -->
-  <string name="actfm_EPA_assign_header_members">Membros da lista</string>
-
-  <!-- task sharing dialog: astrid friends section header -->
-  <string name="actfm_EPA_assign_header_friends">Amigos do Astrid</string>
-
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: share with Facebook -->
-  <string name="actfm_EPA_facebook">Facebook</string>
-  
-  <!-- task sharing dialog: share with Twitter -->
-  <string name="actfm_EPA_twitter">Twitter</string>
-
-  <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
-
-  <!-- task sharing dialog: edit people settings saved -->
-
-  <!-- task sharing dialog: invalid email (%s => email) -->
-  <string name="actfm_EPA_invalid_email">Email inválido: %s</string>
-
-  <!-- task sharing dialog: tag not found (%s => tag) -->
-  
-  <!-- task sharing login prompt -->
-  <string name="actfm_EPA_login_to_share">Você precisa estar logado no Astrid para compartilhar tarefas!</string>
-  
-  <string name="actfm_EPA_login_button">Autenticar</string>
-  
-  <string name="actfm_EPA_dont_share_button">Não compartilhe</string>
-  
-  <string name="actfm_EPA_add_person_to_list_title">Tarefa atribuída.</string>
-  
-  <string name="actfm_EPA_add_person_to_list">%1$s não é partilhado nesta lista. Gostaria de adicionar %2$s nesta lista?</string>
-
-  <string name="actfm_EPA_add_person_to_list_ok">Adicionar para lista</string>
-  
-  <string name="actfm_EPA_add_person_to_list_cancel">Não adicionar</string>
-  
-  <string name="actfm_list_owner">(owner)</string>
-  
-  <!-- ========================================= sharing login activity == -->
-
-  <!-- share login: Title -->
-  <string name="actfm_ALA_title">Bem-vindo ao Astrid.com!</string>
-
-  <!-- share login: Sharing Description -->
-  <string name="actfm_ALA_body">Astrid.com permite que você acesse tarefas online, compartilhe e delegue-as a outros.</string>
-
-  <!-- share login: Sharing Login FB Prompt -->
-  <string name="actfm_ALA_fb_login">Conectar com Facebook</string>
-
-  <!-- share login: Sharing Login GG Prompt -->
-  <string name="actfm_ALA_gg_login">Conectar com Google</string>
-  
-  <!-- share login: Quickly log in as <%s -> email> -->
-  <string name="actfm_quick_login">Entrar: %s</string>
-
-  <!-- share login: Reject quick login -->
-  <string name="actfm_quick_login_reject">É você %s?</string>
-
-  <!-- share login: Name -->
-  <string name="actfm_ALA_firstname_label">Nome</string>
-  
-  <!-- share login: Name -->
-  <string name="actfm_ALA_lastname_label">Sobrenome</string>
-
-  <!-- share login: Email -->
-  <string name="actfm_ALA_email_label">Email</string>
-
-  <!-- share login: Username / Email -->
-
-  <!-- share login: Password -->
-  <string name="actfm_ALA_password_label">Senha</string>
-
-  <!-- share login: Sign Up Title -->
-  <string name="actfm_ALA_signup_title">Cadastre-se</string>
-
-  <!-- share login: Login Title -->
-  <string name="actfm_ALA_login_title">Entrar</string>
-
-  <!-- share login: Google Auth title -->
-  <string name="actfm_GAA_title">Selecione a conta do Google que deseja usar:</string>
-
-  <!-- share login: OAUTH Login Prompt -->
-  <string name="actfm_OLA_prompt">Por favor acesse sua conta:</string>
-  
-  <!-- Login error: user exists -->
-  <string name="actfm_ALA_error_user_exists">User já existe. Por favor, faça antes login.</string>
-  
-  <!-- Login error: wrong password -->
-  <string name="actfm_ALA_error_wrong_password">Desculpe, a password está incorreta. Tente de novo.</string>
-  
-  <!-- Forgot password link -->
-  <string name="actfm_ALA_forgot_password">Esqueceu a senha?</string>
-  
-  <!-- Forgot password email prompt -->
-  <string name="actfm_ALA_enter_email">Por favor digite o seu email</string>
-  
-  <!-- Password reset sent (%s -> email) -->
-  <string name="actfm_ALA_reset_sent">Password nova enviada para %s</string>
-  
-  <!-- User already exists - first sync may be slow -->
-  <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your patience!</string>
-  
-  <!-- User not found -->
-  <string name="actfm_ALA_error_user_not_found">User não encontrado pelo e-mail. Tente antes fazer login!</string>
-  
-  <!-- ================================================ Featured Lists -->
-
-  <string name="actfm_feat_list_clone">Copiar lista</string>
-  
-  <string name="actfm_feat_list_suffix">(Cópia)</string>
-
-  <string name="actfm_feat_list_cloning">Copiando...</string>
-
-  <string name="actfm_feat_list_clone_success">Sucesso!</string>
-
-  <string name="actfm_feat_list_task_clone_success">Tarefa copiada</string>
-
-  <string name="actfm_feat_list_clone_empty">Sem tarefas para copiar</string>
-  
-  <!-- ================================================ Synchronization == -->
-      
-  <!-- Indicates the logged in user name. %s -> user\'s name -->
-  <string name="actfm_status_title_logged_in">Status - Logado como %s</string>    
-      
-  <!-- Preferences Title: Act.fm -->    
-  <string name="actfm_APr_header">Astrid.com</string>
-  
-  <string name="actfm_https_title">Usar HTTPS</string>
-  <string name="actfm_https_enabled">HTTPS habilitado (mais lento)</string>
-  <string name="actfm_https_disabled">HTTPS desabilitado (mais rápido)</string>
-
-  <!-- title for notification tray after synchronizing -->
-  
-  <!-- text for notification when comments are received -->
-    
-  <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, 
-      Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page,
-      or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.  
-      Are you sure you want to sync with Astrid.com?</string>
-      
-  <!-- account types -->
-  <string name="actfm_account_type">Tipo de Conta</string>
-  <string name="actfm_account_info">Informações da conta</string>
-  <string name="actfm_account_info_summary">Status e opções</string>
-  <string name="account_type_title_not_logged_in">Registre-se para uma conta gratuita</string>
-  <string name="account_type_summary_not_logged_in">Acesse tarefas online, compartilhe e delegue listas</string>
-  
-  
-  <string name="actfm_account_premium">Premium</string>
-  <string name="actfm_account_basic">Básico</string>
-  
-  <string name="actfm_inapp_billing">Atualize para Premium</string>
-  <string name="actfm_inapp_billing_summary">Anexe arquivos, backups de voz, suporte premium e mais</string>
-  
-  <!-- Sharing -->
-  <string name="share_with_facebook">Curtir no Facebook</string>
-  <string name="share_with_twitter">Seguir no Twitter</string>
-  <string name="share_with_google">Compartilhar no Google+</string>
-  <string name="share_speech_bubble">Compartilhando, você vai ajudar a outros serem mais produtivos!</string>
-  
-  
-  <!-- Sync upgrade messages -->
-  <string name="sync_upgr_both_title">Usando Astrid.com + Google sem Duplicações</string>
-  <string name="sync_upgr_both_body">Vamos ser honestos. A Tarefas do Google são convenientes, mas não tão legais como as do Astrid. Para evitar duplicações você não pode mais sincronizar com Astrid.com e sincronizar em segundo plano com as Tarefas do Google ao mesmo tempo. Você ainda oide importar as tarefas do Google visitando Configuração → Backup &amp; Sincronização ou desatualizar para só sincronizar com as tarefas do Google</string>
-  <string name="sync_upgr_both_btn1">Stick with Astrid</string>
-  <string name="sync_upgr_both_btn2">Dezatualise para Tarefas do Google</string>
-  
-  <string name="sync_upgr_gtasks_only_title">Upgrade to Astrid Sync for Free!</string>
-  <string name="sync_upgr_gtasks_only_body">Access your tasks from all your devices and from Gmail with Astrid.com sync. Upgrade to Astrid.com Sync (you can always go back to Google Tasks - but you won\'t want to)!</string>
-  <string name="sync_upgr_gtasks_only_btn1">Upgrade to Astrid Sync</string>
-  <string name="sync_upgr_gtasks_only_btn2">Stick with Google Tasks</string>
-  
-  <string name="sync_upgr_neither_title">Free backup &amp; Sync!</string>
-  <string name="sync_upgr_neither_body">Don\'t put your to-dos at risk! New and improved Astrid sync to keep and access your tasks from anywhere.</string>
-  <string name="sync_upgr_neither_btn1">Cadastre-se agora</string>
-  
-  <string name="sync_upgr_logged_out">You have been logged out of Astrid</string>
-  
-  <string name="actfm_logout_clear_tasks_title">Clear data?</string>
-  <string name="actfm_logout_clear_tasks_body">Would you like to clear your tasks and lists?</string>
-  <string name="actfm_logout_clear_tasks_yes">Clear data</string>
-  <string name="actfm_logout_clear_tasks_no">Keep data</string>
-  
-  <string name="actfm_logged_in_different_user_title">Logging in as different user</string>
-  <string name="actfm_logged_in_different_user_body">Would you like to delete existing phone tasks before syncing?</string>
-  <string name="actfm_logged_in_different_user_keep_data">Keep data</string>
-  <string name="actfm_logged_in_different_user_clear_data">Clear all data</string>
-  <string name="actfm_logged_in_different_user_processing">Processing existing data...</string>
-  
-  <string name="actfm_tag_not_authorized_title">Not authorized</string>
-  <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name?</string>
-  <string name="actfm_tag_not_authorized_new_list">Criar nova lista</string>
-  <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
-  
-  <string name="actfm_sync_ongoing">Sincronizando...</string>
-  
-  <string name="EPr_reset_sync_state">Reset sync</string>
-  <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors</string>
-  <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue?</string>
-  
+<resources>
 
+    <!-- ================================================== general terms == -->
 
+    <!-- People Editing Activity -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
+    <string name="actfm_person_hint">Contato ou Email</string>
+
+    <!-- task sharing dialog: shared with hint -->
+    <string name="actfm_person_or_tag_hint">Contato ou Lista compartilhada</string>
+
+    <!-- toast on transmit success -->
+
+    <!-- can\'t rename or delete shared tag message -->
+
+    <!-- warning before deleting a list you\'re the owner of -->
+    <string name="actfm_tag_operation_owner_delete">Você é o dono desta lista compartilhada! Se
+        apagá-la, ela também será apagada para todos os membros dela. Tem certeza que quer
+        continuar?
+    </string>
+
+    <!-- slide 29a: menu item to take a picture -->
+    <string name="actfm_picture_camera">Tirar uma foto</string>
+
+    <!-- slide 29b: menu item to select from gallery -->
+    <string name="actfm_picture_gallery">Selecionar da galeria</string>
+
+    <!-- menu item to clear picture selection -->
+    <string name="actfm_picture_clear">Limpar imagem</string>
+
+    <!-- filter list activity: refresh tags -->
+
+    <!-- Title for prompt after sharing a task -->
+    <string name="actfm_view_task_title">Ver tarefa?</string>
+
+    <!-- Text for prompt after sharing a task -->
+    <string name="actfm_view_task_text">A tarefa foi enviada para %s! Atualmente está vendo suas
+        próprias tarefas. Quer ver esta e as outras tarefas que você atribuiu?
+    </string>
+
+    <!-- Ok button for task view prompt -->
+    <string name="actfm_view_task_ok">Ver atribuídas</string>
+
+    <!-- Cancel button for task view prompt -->
+    <string name="actfm_view_task_cancel">Ficar aqui</string>
+
+    <!-- slide 13a: Title for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_title">Minhas tarefas compartilhadas</string>
+
+    <!-- Empty list for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_empty">Sem tarefas compartilhadas</string>
+
+    <!-- =====================  Friendship connections -->
+
+    <string name="actfm_friendship_pending">Você enviou um pedido de amizade para %s!</string>
+
+    <string name="actfm_friendship_blocked">Você bloqueou %s.</string>
+
+    <string name="actfm_friendship_ignored">Você ignorou %s.</string>
+
+    <string name="actfm_friendship_friends">Agora você é amigo de %s pessoas! Adicione tarefas para
+        eles abaixo.
+    </string>
+
+    <string name="actfm_friendship_other_pending">%s deseja ser seu amigo!</string>
+
+    <string name="actfm_friendship_no_status">Conecte-se com %s para partilhar e ver a actividade em
+        tarefas públicas!
+    </string>
+
+    <string name="actfm_friendship_connect">Adicionar amigo</string>
+
+    <string name="actfm_friendship_accept">Aceitar</string>
+
+    <!-- ================================================== TagViewActivity == -->
+
+    <!-- Tag View Activity: Add Comment hint -->
+    <string name="TVA_add_comment">Comentar...</string>
+
+    <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->
+
+    <!-- Tabs for Tag view -->
+    <string-array name="TVA_tabs">
+        <!-- Tab for showing tasks -->
+        <item>Tarefas</item>
+        <!-- Tab for showing comments & updates -->
+        <item>Atividades</item>
+        <!-- Tab for showing setting -->
+        <item>Configurações</item>
+    </string-array>
+
+    <!-- Tag View: filtered by assigned to user (%s => user name) -->
+    <string name="actfm_TVA_filtered_by_assign">Tarefas de %s. Toque para todas.</string>
+
+    <!-- Tag View: filter by unassigned tasks -->
+    <string name="actfm_TVA_filter_by_unassigned">Tarefas não atribuídas. Toque para todas.</string>
+
+    <!-- Tag View: list is private, no members -->
+    <string name="actfm_TVA_no_members_alert">Privada: toque para editar ou compartilhar</string>
+
+    <!-- Tag View Menu: refresh -->
+    <string name="actfm_TVA_menu_refresh">Atualizar</string>
+
+    <!-- Tag Settings: tag name label -->
+    <string name="actfm_TVA_tag_label">Lista</string>
+
+    <!-- Tag Settings: tag owner label -->
+
+    <!-- Tag Settings: tag owner value when there is no owner -->
+
+    <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
+    <string name="actfm_TVA_members_label">Compartilhada com</string>
+
+    <!-- Tag Settings: list collaborators hint -->
+    <string name="actfm_TVA_members_hint">Compartilhe com qualquer pessoa que tenha um endereço de
+        e-mail
+    </string>
+
+    <!-- Tag Settings: tag picture -->
+    <string name="actfm_TVA_tag_picture">Imagem da lista</string>
+
+    <!-- slide 25c/28b: Tag Settings: silence notifications label -->
+    <string name="actfm_TVA_silence_label">Silenciar notificações</string>
+
+    <!-- Tag Settings: list icon label -->
+
+    <!-- slide 25b/27d: Tag Settings: list description label -->
+    <string name="actfm_TVA_tag_description_label">Descrição</string>
+
+    <!-- slide 28a: Tag Settings: list settings label -->
+    <string name="actfm_TVA_tag_settings_label">Configurações</string>
+
+    <!-- slide 25b: Tag Settings: list description hint -->
+    <string name="actfm_TVA_tag_description_hint">Digite uma descrição aqui</string>
+
+    <!-- slide 25d: Tag Settings: list name hint -->
+    <string name="actfm_TVA_tag_name_hint">Entre com o nome da lista</string>
+
+    <!-- Tag settings: login prompt from share-->
+    <string name="actfm_TVA_login_to_share">Você precisa estar autenticado em Astrid.com para
+        compartilhar listas! Autentique-se ou deixa-a como lista privada.
+    </string>
+
+
+    <!-- ============================================ edit people dialog == -->
+
+    <!-- task sharing dialog: intro -->
+    <string name="actfm_EPA_intro">Use o Astrid para compartilhar listas de compras, planos para
+        festas, ou projetos em equipe e instantaneamente ver quando as pessoas cumprem suas tarefas!
+    </string>
+
+    <!-- task sharing dialog: window title -->
+
+    <!-- task sharing dialog: save button -->
+
+    <!-- task sharing dialog: assigned label -->
+
+    <!-- slide 18a: task sharing dialog: assigned label long version -->
+    <string name="actfm_EPA_assign_label_long">Quem deve fazer isso?</string>
+
+    <!-- task sharing dialog: assigned to me -->
+    <string name="actfm_EPA_assign_me">Eu</string>
+
+    <!-- task sharing dialog: anyone -->
+    <string name="actfm_EPA_unassigned">Não atribuída</string>
+
+    <!-- slide 18c: task sharing dialog: choose a contact -->
+    <string name="actfm_EPA_choose_contact">Escolha um contato</string>
+
+    <!-- task sharing dialog: custom email assignment -->
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_share_with">Compartilhar com:</string>
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_collaborators_header">Compartilhar</string>
+
+    <!-- task sharing dialog: collaborator list name (%s => name of list) -->
+    <string name="actfm_EPA_list">Lista: %s</string>
+
+    <!-- task sharing dialog: assigned hint -->
+
+    <!-- task sharing dialog: message label text -->
+    <string name="actfm_EPA_message_text">Mensagem do convite:</string>
+
+    <!-- task sharing dialog: message body -->
+    <string name="actfm_EPA_message_body">Ajude-me a fazer isso!</string>
+
+    <!-- task sharing dialog: list members section header -->
+    <string name="actfm_EPA_assign_header_members">Membros da lista</string>
+
+    <!-- task sharing dialog: astrid friends section header -->
+    <string name="actfm_EPA_assign_header_friends">Amigos do Astrid</string>
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: share with Facebook -->
+    <string name="actfm_EPA_facebook">Facebook</string>
+
+    <!-- task sharing dialog: share with Twitter -->
+    <string name="actfm_EPA_twitter">Twitter</string>
+
+    <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
+
+    <!-- task sharing dialog: edit people settings saved -->
+
+    <!-- task sharing dialog: invalid email (%s => email) -->
+    <string name="actfm_EPA_invalid_email">Email inválido: %s</string>
+
+    <!-- task sharing dialog: tag not found (%s => tag) -->
+
+    <!-- task sharing login prompt -->
+    <string name="actfm_EPA_login_to_share">Você precisa estar logado no Astrid para compartilhar
+        tarefas!
+    </string>
+
+    <string name="actfm_EPA_login_button">Autenticar</string>
+
+    <string name="actfm_EPA_dont_share_button">Não compartilhe</string>
+
+    <string name="actfm_EPA_add_person_to_list_title">Tarefa atribuída.</string>
+
+    <string name="actfm_EPA_add_person_to_list">%1$s não é partilhado nesta lista. Gostaria de
+        adicionar %2$s nesta lista?
+    </string>
+
+    <string name="actfm_EPA_add_person_to_list_ok">Adicionar para lista</string>
+
+    <string name="actfm_EPA_add_person_to_list_cancel">Não adicionar</string>
+
+    <string name="actfm_list_owner">(owner)</string>
+
+    <!-- ========================================= sharing login activity == -->
+
+    <!-- share login: Title -->
+    <string name="actfm_ALA_title">Bem-vindo ao Astrid.com!</string>
+
+    <!-- share login: Sharing Description -->
+    <string name="actfm_ALA_body">Astrid.com permite que você acesse tarefas online, compartilhe e
+        delegue-as a outros.
+    </string>
+
+    <!-- share login: Sharing Login FB Prompt -->
+    <string name="actfm_ALA_fb_login">Conectar com Facebook</string>
+
+    <!-- share login: Sharing Login GG Prompt -->
+    <string name="actfm_ALA_gg_login">Conectar com Google</string>
+
+    <!-- share login: Quickly log in as <%s -> email> -->
+    <string name="actfm_quick_login">Entrar: %s</string>
+
+    <!-- share login: Reject quick login -->
+    <string name="actfm_quick_login_reject">É você %s?</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_firstname_label">Nome</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_lastname_label">Sobrenome</string>
+
+    <!-- share login: Email -->
+    <string name="actfm_ALA_email_label">Email</string>
+
+    <!-- share login: Username / Email -->
+
+    <!-- share login: Password -->
+    <string name="actfm_ALA_password_label">Senha</string>
+
+    <!-- share login: Sign Up Title -->
+    <string name="actfm_ALA_signup_title">Cadastre-se</string>
+
+    <!-- share login: Login Title -->
+    <string name="actfm_ALA_login_title">Entrar</string>
+
+    <!-- share login: Google Auth title -->
+    <string name="actfm_GAA_title">Selecione a conta do Google que deseja usar:</string>
+
+    <!-- share login: OAUTH Login Prompt -->
+    <string name="actfm_OLA_prompt">Por favor acesse sua conta:</string>
+
+    <!-- Login error: user exists -->
+    <string name="actfm_ALA_error_user_exists">User já existe. Por favor, faça antes login.</string>
+
+    <!-- Login error: wrong password -->
+    <string name="actfm_ALA_error_wrong_password">Desculpe, a password está incorreta. Tente de
+        novo.
+    </string>
+
+    <!-- Forgot password link -->
+    <string name="actfm_ALA_forgot_password">Esqueceu a senha?</string>
+
+    <!-- Forgot password email prompt -->
+    <string name="actfm_ALA_enter_email">Por favor digite o seu email</string>
+
+    <!-- Password reset sent (%s -> email) -->
+    <string name="actfm_ALA_reset_sent">Password nova enviada para %s</string>
+
+    <!-- User already exists - first sync may be slow -->
+    <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your
+        patience!
+    </string>
+
+    <!-- User not found -->
+    <string name="actfm_ALA_error_user_not_found">User não encontrado pelo e-mail. Tente antes fazer
+        login!
+    </string>
+
+    <!-- ================================================ Featured Lists -->
+
+    <string name="actfm_feat_list_clone">Copiar lista</string>
+
+    <string name="actfm_feat_list_suffix">(Cópia)</string>
+
+    <string name="actfm_feat_list_cloning">Copiando...</string>
+
+    <string name="actfm_feat_list_clone_success">Sucesso!</string>
+
+    <string name="actfm_feat_list_task_clone_success">Tarefa copiada</string>
+
+    <string name="actfm_feat_list_clone_empty">Sem tarefas para copiar</string>
+
+    <!-- ================================================ Synchronization == -->
+
+    <!-- Indicates the logged in user name. %s -> user\'s name -->
+    <string name="actfm_status_title_logged_in">Status - Logado como %s</string>
+
+    <!-- Preferences Title: Act.fm -->
+    <string name="actfm_APr_header">Astrid.com</string>
+
+    <string name="actfm_https_title">Usar HTTPS</string>
+    <string name="actfm_https_enabled">HTTPS habilitado (mais lento)</string>
+    <string name="actfm_https_disabled">HTTPS desabilitado (mais rápido)</string>
+
+    <!-- title for notification tray after synchronizing -->
+
+    <!-- text for notification when comments are received -->
+
+    <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid
+        duplicate tasks and other synchronization issues,
+        Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You
+        can still import tasks from Google Tasks from the Google Tasks settings page,
+        or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.
+        Are you sure you want to sync with Astrid.com?
+    </string>
+
+    <!-- account types -->
+    <string name="actfm_account_type">Tipo de Conta</string>
+    <string name="actfm_account_info">Informações da conta</string>
+    <string name="actfm_account_info_summary">Status e opções</string>
+    <string name="account_type_title_not_logged_in">Registre-se para uma conta gratuita</string>
+    <string name="account_type_summary_not_logged_in">Acesse tarefas online, compartilhe e delegue
+        listas
+    </string>
+
+
+    <string name="actfm_account_premium">Premium</string>
+    <string name="actfm_account_basic">Básico</string>
+
+    <string name="actfm_inapp_billing">Atualize para Premium</string>
+    <string name="actfm_inapp_billing_summary">Anexe arquivos, backups de voz, suporte premium e
+        mais
+    </string>
+
+    <!-- Sharing -->
+    <string name="share_with_facebook">Curtir no Facebook</string>
+    <string name="share_with_twitter">Seguir no Twitter</string>
+    <string name="share_with_google">Compartilhar no Google+</string>
+    <string name="share_speech_bubble">Compartilhando, você vai ajudar a outros serem mais
+        produtivos!
+    </string>
+
+
+    <!-- Sync upgrade messages -->
+    <string name="sync_upgr_both_title">Usando Astrid.com + Google sem Duplicações</string>
+    <string name="sync_upgr_both_body">Vamos ser honestos. A Tarefas do Google são convenientes, mas
+        não tão legais como as do Astrid. Para evitar duplicações você não pode mais sincronizar com
+        Astrid.com e sincronizar em segundo plano com as Tarefas do Google ao mesmo tempo. Você
+        ainda oide importar as tarefas do Google visitando Configuração → Backup &amp; Sincronização
+        ou desatualizar para só sincronizar com as tarefas do Google
+    </string>
+    <string name="sync_upgr_both_btn1">Stick with Astrid</string>
+    <string name="sync_upgr_both_btn2">Dezatualise para Tarefas do Google</string>
+
+    <string name="sync_upgr_gtasks_only_title">Upgrade to Astrid Sync for Free!</string>
+    <string name="sync_upgr_gtasks_only_body">Access your tasks from all your devices and from Gmail
+        with Astrid.com sync. Upgrade to Astrid.com Sync (you can always go back to Google Tasks -
+        but you won\'t want to)!
+    </string>
+    <string name="sync_upgr_gtasks_only_btn1">Upgrade to Astrid Sync</string>
+    <string name="sync_upgr_gtasks_only_btn2">Stick with Google Tasks</string>
+
+    <string name="sync_upgr_neither_title">Free backup &amp; Sync!</string>
+    <string name="sync_upgr_neither_body">Don\'t put your to-dos at risk! New and improved Astrid
+        sync to keep and access your tasks from anywhere.
+    </string>
+    <string name="sync_upgr_neither_btn1">Cadastre-se agora</string>
+
+    <string name="sync_upgr_logged_out">You have been logged out of Astrid</string>
+
+    <string name="actfm_logout_clear_tasks_title">Clear data?</string>
+    <string name="actfm_logout_clear_tasks_body">Would you like to clear your tasks and lists?
+    </string>
+    <string name="actfm_logout_clear_tasks_yes">Clear data</string>
+    <string name="actfm_logout_clear_tasks_no">Keep data</string>
+
+    <string name="actfm_logged_in_different_user_title">Logging in as different user</string>
+    <string name="actfm_logged_in_different_user_body">Would you like to delete existing phone tasks
+        before syncing?
+    </string>
+    <string name="actfm_logged_in_different_user_keep_data">Keep data</string>
+    <string name="actfm_logged_in_different_user_clear_data">Clear all data</string>
+    <string name="actfm_logged_in_different_user_processing">Processing existing data...</string>
+
+    <string name="actfm_tag_not_authorized_title">Not authorized</string>
+    <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you
+        may have been removed). Would you like to create a new list with the same name?
+    </string>
+    <string name="actfm_tag_not_authorized_new_list">Criar nova lista</string>
+    <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
+
+    <string name="actfm_sync_ongoing">Sincronizando...</string>
+
+    <string name="EPr_reset_sync_state">Reset sync</string>
+    <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors
+    </string>
+    <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will
+        be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you
+        wish to continue?
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in timers plug-in -->
+
+    <!-- Task Edit Activity: Container Label -->
+    <string name="alarm_ACS_label">Alarmes</string>
+
+    <!-- Task Edit Activity: Add New Alarm -->
+    <string name="alarm_ACS_button">Inserir alarme</string>
+
+    <string-array name="reminders_alarm">
+        <!-- reminders related to alarm -->
+        <item>Alarme!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in backup plug-in -->
+
+    <!-- ================================================= BackupPreferences == -->
+
+    <!-- slide 33c/48d: Backup Preferences Title -->
+    <string name="backup_BPr_header">Backups</string>
+
+    <!-- slide 48e/50c: Backup: Status Header -->
+    <string name="backup_BPr_group_status">Status</string>
+
+    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->
+    <string name="backup_status_success">Backup recente:\n%s</string>
+    <!-- Backup Status: last error failed. Keep it short! -->
+    <string name="backup_status_failed">O último backup falhou</string>
+    <!-- Backup Status: error subtitle -->
+    <string name="backup_status_failed_subtitle">(toque para exibir o erro)</string>
+    <!-- slide 48a: Backup Status: never backed up -->
+    <string name="backup_status_never">O Backup nunca foi executado!</string>
+
+    <!-- slide 48f/ 50e: Backup Options Group Label -->
+    <string name="backup_BPr_group_options">Opções</string>
+
+    <!-- slide 48b: Preference: Automatic Backup Title -->
+    <string name="backup_BPr_auto_title">Backups automáticos</string>
+    <!-- Preference: Automatic Backup Description (when disabled) -->
+    <string name="backup_BPr_auto_disabled">Backups automáticos desativados</string>
+    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
+    <string name="backup_BPr_auto_enabled">O Backup ocorrerá diariamente</string>
+
+    <!-- Preference screen restoring Tasks Help -->
+    <!-- Preference screen Restoring Tasks Help Dialog Text-->
+
+    <string name="backup_BPr_cloud_already_logged_in">Você já possui backup em nuvem no
+        Astrid.com!
+    </string>
+
+    <!-- ================================================= BackupActivity == -->
+
+    <!-- slide 48c: backup activity label -->
+    <string name="backup_BAc_label">Gerenciar backups</string>
+
+    <!-- backup activity title -->
+    <string name="backup_BAc_title">Gerenciar seus backups</string>
+
+    <!-- backup activity import button -->
+    <string name="backup_BAc_import">Importar tarefas</string>
+
+    <!-- backup activity export button -->
+    <string name="backup_BAc_export">Exportar tarefas</string>
+
+    <!-- backup activity cloud (Astrid.com) option -->
+    <string name="backup_BAc_cloud">Clique para obter um backup em nuvem gratuito no Astrid.com
+    </string>
+
+    <!-- ============================================== Importer / Exporter == -->
+
+    <!-- Message displayed when error occurs -->
+    <string name="backup_TXI_error">Erro de importação</string>
+
+    <string name="export_toast">Backups feitos: de %1$s para %2$s.</string>
+
+    <string name="export_toast_no_tasks">Nenhuma tarefa a exportar</string>
+
+    <!-- Progress Dialog Title for exporting -->
+    <string name="export_progress_title">Exportando...</string>
+
+    <!-- Backup: Title of Import Summary Dialog -->
+    <string name="import_summary_title">Sumário da restauração</string>
+
+    <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
+    <string name="import_summary_message">Arquivo %1$s contendo %2$s.\n\n %3$s importada(s),\n %4$s
+        já existia(m)\n %5$s tinha(m) erro(s)\n
+    </string>
+
+    <!-- Progress Dialog Title for importing -->
+    <string name="import_progress_title">Importando...</string>
+
+    <!-- Progress Dialog text for import reading task (%d -> task number)-->
+    <string name="import_progress_read">Lendo tarefa %d...</string>
+
+    <!-- Backup: Dialog when unable to open a file -->
+
+    <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
+    <string name="DLG_error_sdcard">Não foi possível acessar a pasta: %s</string>
+
+    <!-- Backup: Dialog when unable to open SD card in general -->
+    <string name="DLG_error_sdcard_general">Não foi possível acessar seu cartão SD!</string>
+
+    <!-- Backup: File Selector dialog for import -->
+    <string name="import_file_prompt">Selecione um arquivo para ser restaurado</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- ================================================== AndroidManifest == -->
+
+    <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
+    <string name="app_name">Tarefas do Astrid</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="read_permission_label">Permissões do Astrid</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="read_permission_desc">ler tarefas, exibir filtros das tarefas</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="write_permission_label">Permissões do Astrid</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="write_permission_desc">criar novas tarefas, editar tarefas existentes</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- question for deleting tasks -->
+    <string name="DLG_delete_this_task_question">Excluir esta tarefa?</string>
+
+    <!-- question for deleting items (%s => item name) -->
+    <string name="DLG_delete_this_item_question">Excluir este item: %s?</string>
+
+    <!-- Progress dialog shown when upgrading -->
+    <string name="DLG_upgrading">Atualizando suas tarefas...</string>
+
+    <!-- Title for dialog selecting a time (hours and minutes) -->
+    <string name="DLG_hour_minutes">Horário (horas:minutos)</string>
+
+    <!-- Dialog for Astrid having a critical update -->
+    <string name="DLG_please_update">Astrid deve ser atualizado para a versão mais recente no
+        Android market! Por favor faça isso antes de continuar, ou aguarde alguns segundos.
+    </string>
+
+    <!-- Button for going to Market -->
+
+    <!-- Button for accepting EULA -->
+    <string name="DLG_accept">Eu aceito</string>
+
+    <!-- Button for declining EULA -->
+    <string name="DLG_decline">Recusar</string>
+
+    <!-- EULA title -->
+    <string name="DLG_eula_title">Termos de uso do Astrid</string>
+
+    <!-- Progress Dialog generic text -->
+    <string name="DLG_please_wait">Por favor, espere</string>
+
+    <!-- Dialog - loading -->
+    <string name="DLG_loading">Carregando...</string>
+
+    <!-- Dialog - dismiss -->
+
+    <!-- slide 20d -->
+    <string name="DLG_ok">OK</string>
+    <!-- slide 36g -->
+    <string name="DLG_cancel">Cancelar</string>
+
+    <string name="DLG_more">Mais</string>
+
+    <string name="DLG_undo">Desfazer</string>
+
+    <string name="DLG_warning">Atenção</string>
+
+    <!-- =============================================================== UI == -->
+
+    <!-- Label for DateButtons with no value -->
+    <string name="WID_dateButtonUnset">Toque para definir</string>
+
+    <!-- String formatter for DateButtons ($D => date, $T => time) -->
+
+    <!-- String formatter for Disable button -->
+
+    <!--  ============================================================= notes -->
+
+    <!-- Note Exposer -->
+
+    <!-- Note Exposer / Comments -->
+
+    <!-- EditNoteActivity - no comments -->
+    <string name="ENA_no_comments">Nada a exibir</string>
+
+    <!-- EditNoteActivity - no username for comment -->
+    <string name="ENA_no_user">Alguém</string>
+
+    <!-- EditNoteActivity - refresh comments -->
+    <string name="ENA_refresh_comments">Atualizar comentários</string>
+
+    <!-- ================================================= TaskListActivity == -->
+
+    <!-- slide 8b: Task List: Displayed instead of list when no items present -->
+    <string name="TLA_no_items">Você não tem tarefas! \n Deseja inserir alguma?</string>
+
+    <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
+    <string name="TLA_no_items_person">%s não tem</string>
+
+    <!-- Menu: Adjust Sort and Hidden Task Settings -->
+    <string name="TLA_menu_sort">Sort</string>
+
+    <!-- Menu: Sync Now -->
+    <string name="TLA_menu_sync">Sincronizar Agora</string>
+
+    <!-- Menu: Search -->
+    <string name="TLA_menu_search">Buscar</string>
+
+    <!-- Menu: Tasks -->
+    <string name="TLA_menu_lists">Listas</string>
+
+    <!-- Menu: Friends -->
+    <string name="TLA_menu_friends">Pessoas</string>
+
+    <!-- Menu: Featured Lists -->
+    <string name="TLA_menu_featured_lists">Listas em Destaque</string>
+
+    <!-- Menu: Suggestions -->
+    <string name="TLA_menu_suggestions">Sugestões</string>
+
+    <!-- Menu: Tutorial -->
+
+    <!-- Menu: Settings -->
+    <string name="TLA_menu_settings">Configurações</string>
+
+    <!-- slide 30b: Menu: Support -->
+    <string name="TLA_menu_support">Suporte</string>
+
+    <!-- Search Label-->
+
+    <!-- Window title for displaying Custom Filter -->
+    <string name="TLA_custom">Personalizar</string>
+
+    <!-- slide 8d: Quick Add Edit Box Hint-->
+    <string name="TLA_quick_add_hint">Inserir tarefa</string>
+
+    <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
+    <string name="TLA_quick_add_hint_assign">Adicione alguma coisa para %s</string>
+
+    <!-- Notification Volumne notification-->
+    <string name="TLA_notification_volume_low">As notificações estão silenciadas. Você não ouvirá o
+        Astrid!
+    </string>
+
+    <!-- Notifications disabled warning -->
+    <string name="TLA_notification_disabled">Os lembretes estão desligados! Você não receberá nenhum
+        lembrete
+    </string>
+
+    <string-array name="TLA_filters">
+        <item>Ativo</item>
+        <item>Hoje</item>
+        <item>Em breve</item>
+        <item>Atrasado</item>
+        <item>Feito</item>
+        <item>Oculta</item>
+    </string-array>
+
+    <!-- Title for confirmation dialog after quick add markup -->
+    <string name="TLA_quickadd_confirm_title">Você disse, \"%s\"</string>
+
+    <!-- Text for speech bubble in dialog after quick add markup -->
+    <!-- First string is task title, second is due date, third is priority -->
+    <string name="TLA_quickadd_confirm_speech_bubble">Eu criei uma tarefa chamada \"%1$s\" %2$s em
+        %3$s
+    </string>
+
+    <string name="TLA_quickadd_confirm_speech_bubble_date">para %s</string>
+
+    <string name="TLA_quickadd_confirm_hide_helpers">Não mostrar confirmações futuras</string>
+
+
+    <!-- Title for alert on new repeating task. %s-> task title -->
+    <string name="TLA_repeat_scheduled_title">Nova tarefa recorrente %s</string>
+
+    <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
+    <string name="TLA_repeat_scheduled_speech_bubble">Irei te lembrar sobre isto %s.</string>
+
+    <string-array name="TLA_priority_strings">
+        <item>prioridade máxima</item>
+        <item>alta prioridade</item>
+        <item>prioridade média</item>
+        <item>baixa prioridade</item>
+    </string-array>
+    <!-- slide 22a -->
+    <string name="TLA_all_activity">Todas as atividades</string>
+
+    <!-- ====================================================== TaskAdapter == -->
+
+    <!-- Format string to indicate task is hidden (%s => task name) -->
+    <string name="TAd_hiddenFormat">%s [oculta]</string>
+
+    <!-- Format string to indicate task is deleted (%s => task name) -->
+    <string name="TAd_deletedFormat">%s [excluída]</string>
+
+    <!-- Displayed when adapter is flung (scrolled quickly) -->
+
+    <!-- slide 22b: indicates task was completed. %s => date or time ago -->
+    <string name="TAd_completed">Concluída\n%s</string>
+
+    <!-- slide 15a: Action Button: edit task -->
+    <string name="TAd_actionEditTask">Editar</string>
+
+    <!-- Context Item: edit task -->
+    <string name="TAd_contextEditTask">Editar tarefa</string>
+
+    <!-- Context Item: copy task -->
+    <string name="TAd_contextCopyTask">Copiar tarefa</string>
+
+    <!-- Context Item: delete task -->
+    <string name="TAd_contextDeleteTask">Excluir tarefa</string>
+
+    <!-- Context Item: undelete task -->
+    <string name="TAd_contextUndeleteTask">Restaurar tarefa</string>
+
+    <!-- Context Item: purge task -->
+    <string name="TAd_contextPurgeTask">Destruir tarefa</string>
+
+    <!-- ============================================== SortSelectionDialog == -->
+
+    <!-- slide 23a: Sort Selection: dialog title -->
+    <string name="SSD_title">Ordenando e ocultando tarefas</string>
+
+    <!-- slide 23h:  Hidden: title -->
+    <string name="SSD_hidden_title">Tarefas ocultas</string>
+
+    <!-- Hidden Task Selection: show completed tasks -->
+    <string name="SSD_completed">Exibir tarefas terminadas</string>
+
+    <!-- Hidden Task Selection: show hidden tasks -->
+    <string name="SSD_hidden">Exibir tarefas ocultas</string>
+
+    <!-- Hidden Task Selection: show deleted tasks -->
+    <string name="SSD_deleted">Exibir tarefas excluídas</string>
+
+    <!-- Sort Selection: drag with subtasks -->
+    <string name="SSD_sort_drag">Manual order with subtasks</string>
+
+    <!-- slide 23b: Sort Selection: smart sort -->
+    <string name="SSD_sort_auto">Ordenação inteligente Astrid</string>
+
+    <!-- slide 23e: Sort Selection: sort by alpha -->
+    <string name="SSD_sort_alpha">Por título</string>
+
+    <!-- slide 23c: Sort Selection: sort by due date -->
+    <string name="SSD_sort_due">Por data de vencimento</string>
+
+    <!-- slide 23d: Sort Selection: sort by importance -->
+    <string name="SSD_sort_importance">By priority</string>
+
+    <!-- slide 23f: Sort Selection: sort by modified date -->
+    <string name="SSD_sort_modified">Por data de modificação</string>
+
+    <!-- slide 23g: Sort Selection: reverse -->
+    <string name="SSD_sort_reverse">Ordenação reversa</string>
+
+    <!-- slide 23j: Sort Button: sort temporarily -->
+    <string name="SSD_save_temp">Somente uma vez</string>
+
+    <!-- slide 23i: Sort Button: sort permanently -->
+    <string name="SSD_save_always">Sempre</string>
+
+    <!-- =============================================== FilterListActivity == -->
+
+    <!-- Astrid Filter Shortcut -->
+    <string name="FSA_label">Lista ou Filtro Astrid</string>
+
+    <!-- Filter List Activity Title -->
+
+    <!-- Displayed when loading filters -->
+
+    <!-- Context Menu: Create Shortcut -->
+    <string name="FLA_context_shortcut">Criar atalho no desktop</string>
+
+    <!-- Menu: Search -->
+
+    <!-- Menu: Help -->
+
+    <!-- slide 28c: Create Shortcut Dialog Title -->
+    <string name="FLA_shortcut_dialog_title">Criar atalho</string>
+
+    <!-- Create Shortcut Dialog (asks to name shortcut) -->
+    <string name="FLA_shortcut_dialog">Nome do atalho</string>
+
+    <!-- Search Hint-->
+    <string name="FLA_search_hint">Procurar por tarefas</string>
+
+    <!-- Search Filter name (%s => query) -->
+    <string name="FLA_search_filter">Encontradas para \'%s\'</string>
+
+    <!-- Toast: created shortcut (%s => label) -->
+    <string name="FLA_toast_onCreateShortcut">Atalho criado: %s</string>
+
+    <!-- Menu: new filter -->
+    <string name="FLA_new_filter">Novo Filtro</string>
+
+    <!-- slide 10e: Button: new list -->
+    <string name="FLA_new_list">Nova lista</string>
+
+    <!-- Alert when creating a shortcut without selecting a filter -->
+    <string name="FLA_no_filter_selected">Sem filtro selecionado! Selecione um filtro ou lista.
+    </string>
+
+    <!-- ================================================= TaskEditActivity == -->
+
+    <!-- Title when editing a task (%s => task title) -->
+
+    <!-- Title when creating a new task -->
+
+    <!-- Task title label -->
+
+    <!-- Task when label -->
+    <string name="TEA_when_header_label">Quando</string>
+
+    <!-- Task title hint (displayed when edit box is empty) -->
+    <string name="TEA_title_hint">Task name</string>
+
+    <!-- Task importance label -->
+    <string name="TEA_importance_label">Prioridade</string>
+
+    <!-- Task due date hint -->
+    <string name="TEA_deadline_hint">Set due date</string>
+
+    <!-- Task assigned to string (%s -> assigned person name) -->
+    <string name="TEA_assigned_to">Assigned to %s</string>
+
+    <!-- Task urgency specific time checkbox -->
+    <string name="TEA_urgency_specific_time">Num horário específico?</string>
+
+    <!-- Task urgency specific time title when specific time false -->
+    <string name="TEA_urgency_none">Nenhum</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_label">Hide until</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_display">Hide until %s</string>
+
+    <!-- Task hide until toast -->
+    <string name="TEA_hideUntil_message">A Tarefa ficará oculta até %s</string>
+
+    <!-- Task editing data being loaded label -->
+    <string-array name="TEA_loading">
+        <item>Carregando...</item>
+    </string-array>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_note_label">Descrição</string>
+
+    <!-- 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">Quanto tempo isto vai levar?</string>
+
+    <!-- Elapsed time label -->
+    <string name="TEA_elapsedDuration_label">Tempo já gasto na tarefa</string>
+
+    <!-- Menu: Save -->
+    <string name="TEA_menu_save">Salvar alterações</string>
+
+    <!-- Menu: Don\'t Save -->
+    <string name="TEA_menu_discard">Não salvar</string>
+
+    <!-- Menu: Delete Task -->
+    <string name="TEA_menu_delete">Excluir tarefa</string>
+
+    <!-- Menu: Task comments -->
+    <string name="TEA_menu_refresh_comments">Refresh comments</string>
+
+    <string name="TEA_menu_comments">Comentários</string>
+
+    <!-- Toast: task saved with deadline (%s => preposition + time units) -->
+    <string name="TEA_onTaskSave_due">Tarefa salva: vence em %s</string>
+
+    <!-- Toast: task saved without deadlines -->
+    <string name="TEA_onTaskSave_notDue">Tarefa salva</string>
+
+    <!-- Toast: task was not saved -->
+
+    <!-- Toast: task was deleted -->
+
+    <!-- slide 15b: Task edit tab: activity -->
+    <string name="TEA_tab_activity">Atividades</string>
+
+    <!-- slide 15e:  Task edit tab: more editing settings -->
+    <string name="TEA_tab_more">Mais</string>
+
+    <!-- slide 15d: Task edit tab: web services -->
+    <string name="TEA_tab_web">Idéias</string>
+
+    <string name="TEA_timer_est">Est. %s</string>
+
+    <string name="TEA_timer_elap">Elapsed %s</string>
+
+    <string-array name="TEA_urgency">
+        <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
+        <item>No date</item>
+        <item>Dia específico</item>
+        <item>Hoje</item>
+        <item>Amanhã</item>
+        <item>(depois de amanhã)</item>
+        <item>Próxima semana</item>
+        <item>Daqui a duas semanas</item>
+        <item>Próximo mês</item>
+    </string-array>
+
+    <string name="TEA_no_time">Sem horário</string>
+
+    <string-array name="TEA_hideUntil">
+        <!-- hideUntil: labels for edit page. -->
+        <item>Never</item>
+        <item>Data de vencimento</item>
+        <item>Due time</item>
+        <item>Day before due</item>
+        <item>Week before due</item>
+        <item>Dia/Hora específica</item>
+    </string-array>
+
+    <!-- Task edit control set descriptors -->
+
+    <!-- slide 9b/35i -->
+    <string name="TEA_control_who">Quem</string>
+
+    <!-- slide 9c/ 35a -->
+    <string name="TEA_control_when">Quando</string>
+    <!-- slide 35b -->
+    <string name="TEA_control_more_section">----Detalhes----</string>
+    <!-- slide 16a/35c -->
+    <string name="TEA_control_importance">Prioridade</string>
+    <!-- slide 16b/35d -->
+    <string name="TEA_control_lists">Listas</string>
+    <!-- slide 16c/35e -->
+    <string name="TEA_control_notes">Descrição</string>
+
+    <string name="TEA_control_files">Arquivos</string>
+
+    <!-- slide 16e / slide 35g-->
+    <string name="TEA_control_reminders">Lembretes</string>
+
+    <!-- slide 16f -->
+    <string name="TEA_control_timer">Temporizador</string>
+
+    <string name="TEA_control_hidden_section">----Esconder Sempre---</string>
+
+    <string name="hide_until_prompt">Mostrar na minha lista</string>
+
+    <!-- Add Ons tab when no add-ons found -->
+
+    <!-- Add Ons button -->
+
+    <!-- More row -->
+
+    <!-- slide 15c: Text when no activity to show -->
+    <string name="TEA_no_activity">Sem atividade</string>
+
+    <!-- Text to load more activity -->
+    <string name="TEA_load_more">Carregar mais...</string>
+
+    <!-- When controls dialog -->
+    <string name="TEA_when_dialog_title">Quando vence?</string>
+
+
+    <string name="TEA_new_task">Nova Tarefa</string>
+
+    <string name="WSV_click_to_load">Toque para procurar maneiras de terminar isso!</string>
+
+    <string name="WSV_not_online">Posso fazer mais se estiver conectado à internet. Verifique sua
+        conexão
+    </string>
+
+    <string name="TEA_contact_error">Desculpe! Nós não conseguimos achar um endereço de e-mail para
+        o contato selecionado.
+    </string>
+
+    <!-- ============================================= IntroductionActivity == -->
+
+    <!-- slide 1a: Introduction Window title -->
+
+    <!-- Button to agree to EULA -->
+
+    <!-- Button to disagree with EULA -->
+
+    <!-- ===================================================== MissedCallActivity == -->
+
+    <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
+    <string name="MCA_title">%1$s\nligou às %2$s</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_return_call">Ligar agora</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_add_task">Ligar mais tarde</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_ignore">Ignorar</string>
+
+    <!-- Missed call: dialog to ignore all missed calls title -->
+    <string name="MCA_ignore_title">Ignorar todas as chamadas perdidas?</string>
+
+    <!-- Missed call: dialog to ignore all missed calls body -->
+    <string name="MCA_ignore_body">Você ignorou várias chamadas perdidas. Astrid deve para de
+        perguntar sobre elas?
+    </string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore all button -->
+    <string name="MCA_ignore_all">Ignorar todas as chamadas</string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
+    <string name="MCA_ignore_this">Ignorar esta chamada apenas</string>
+
+    <!-- Missed call: preference title -->
+    <string name="MCA_missed_calls_pref_title">Campo chamadas perdidas</string>
+
+    <!-- slide 49c: Missed call: preference description -->
+    <string name="MCA_missed_calls_pref_desc_enabled">Astrid notificará sobre chamadas perdidas e
+        oferecerá para lhe lembrar para ligar de volta
+    </string>
+    <string name="MCA_missed_calls_pref_desc_disabled">Astrid não vai notificá-lo sobre chamadas
+        perdidas
+    </string>
+
+    <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
+    <string name="MCA_task_title_name">Retornar ligação de %1$s às %2$s</string>
+
+    <!-- Missed call: task title no name (%s -> number)-->
+    <string name="MCA_task_title_no_name">Retornar ligação de %s</string>
+
+    <!-- Missed call: schedule dialog title (%s -> name or number)-->
+    <string name="MCA_schedule_dialog_title">Retornar ligação de %s em ...</string>
+
+    <!-- Missed call speech bubble options -->
+    <string-array name="MCA_dialog_speech_options">
+        <item>Deve ser bom ser tão popular!</item>
+        <item>Êba! Gostam de você!</item>
+        <item>Faça o dia deles, dê uma ligada!</item>
+        <item>Você não ficaria feliz se as pessoas ligassem de volta?</item>
+        <item>Você pode fazer!</item>
+        <item>Você pode sempre mandar uma mensagem...</item>
+    </string-array>
+
+
+    <!-- ======================================= Calendar reminder activity == -->
+
+    <!-- Calendar remindeer ignore button -->
+    <string name="CRA_ignore">Ignorar</string>
+
+    <!-- Calendar event -->
+    <string name="CRA_title">Precisa de uma lista de reuniões?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls title -->
+    <string name="CRA_ignore_title">Ignorar todos os eventos do calendário?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls body -->
+    <string name="CRA_ignore_body">Você ignorou vários eventos do calendário. O Astrid deve parar de
+        perguntar sobre eles?
+    </string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
+    <string name="CRA_ignore_all">Ignorar todos os eventos</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
+    <string name="CRA_ignore_this">Ignorar somente este evento</string>
+
+    <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
+    <string name="CRA_speech_bubble_start">Parece que %s está começando em breve. Quer criar uma
+        lista para itens de ação?
+    </string>
+
+    <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
+    <string name="CRA_speech_bubble_end">Parece que você acabou de terminar com %s. Quer criar uma
+        lista para itens de ação?
+    </string>
+
+    <!-- Calendar reminder: create list button -->
+    <string name="CRA_create_list">Criar lista</string>
+
+    <!-- Calendar reminder: postpone button -->
+    <string name="CRA_postpone">Talvez depois</string>
+
+    <!-- Calendar reminder: list exists dialog title -->
+    <string name="CRA_list_exists_title">Lista já existe</string>
+
+    <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
+    <string name="CRA_list_exists_body">Uma lista chamada %s já existe. Você deseja utilizar a lista
+        existente ou criar um nova para este evento?
+    </string>
+
+    <!-- Calendar reminder: list exists dialog create new button -->
+    <string name="CRA_create_new">Criar nova</string>
+
+    <!-- Calendar reminder: list exists dialog use existing button -->
+    <string name="CRA_use_existing">Usar existente</string>
+
+    <!-- Calendar remindr: created list (%s -> list name) -->
+    <string name="CRA_created_list_dialog">Eu criei uma lista %s</string>
+
+    <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
+    <string name="CRA_one_attendee">%s está participando.</string>
+
+    <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
+    <string name="CRA_two_attendees">%1$s e %2$s estão participando.</string>
+
+    <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
+    <string name="CRA_many_attendees">%1$s, %2$s, e %3$d outros estão participando.</string>
+
+    <!-- Calendar reminder: invitation prompt -->
+    <string name="CRA_invitation_prompt">Gostaria de convidá-los?</string>
+
+    <!-- Calendar reminder: preference title -->
+    <string name="CRA_calendar_reminders_pref_title">Assistente de calendário</string>
+
+    <!-- Calendar reminder: pref description disabled -->
+    <string name="CRA_calendar_reminders_pref_desc_disabled">O Astrit não voltará a lembrá-lo sobre
+        eventos futuros do calendário.
+    </string>
+
+    <!-- Calendar reminder: pref description enabled -->
+    <string name="CRA_calendar_reminders_pref_desc_enabled">O Astrid irá lembrá-lo de futuros
+        eventos do calendário e pedir-lhe para se preparar para eles.
+    </string>
+
+    <!-- Calendar reminder: share list title -->
+    <string name="CRA_share_list_title">Compartilhar esta lista?</string>
+
+    <string name="CRA_invite_attendees">Convidar participantes</string>
+
+    <string name="CRA_more_options">Mais opções</string>
+
+    <string name="CRA_dont_invite">Não, obrigado</string>
+
+    <!-- Calendar reminder: share list title when no other attendees exist-->
+    <string name="CRA_list_created_title">Lista criada!</string>
+
+    <!-- Calendar reminder: default new list name (%s -> event title) -->
+    <string name="CRA_default_list_name">Itens de ação: %s</string>
+
+    <!-- ===================================================== HelpActivity == -->
+
+    <!-- Help: Button to get support from our website -->
+
+    <!-- ==================================================== UpdateService == -->
+
+    <!-- Changelog Window Title -->
+    <string name="UpS_changelog_title">O que há de novo no Astrid?</string>
+
+    <!-- Updates Window Title -->
+    <string name="UpS_updates_title">Ultimas novidades no Astrid</string>
+
+    <!-- Updats No Activity to show for offline users -->
+    <string name="UpS_no_activity_log_in">"Conecte-se para ver um registro\ndo seu progresso e
+        também as\natividades nas listas compartilhadas."
+    </string>
+
+    <!-- ================================================== EditPreferences == -->
+
+    <!-- slide 31g: Preference Window Title -->
+    <string name="EPr_title">Astrid: Configurações</string>
+
+    <string name="EPr_share_astrid">Share Astrid</string>
+
+    <string name="EPr_share_astrid_summary">Compartilhe sobre Astrid em sua rede social favorita
+    </string>
+
+    <!-- slide 46a -->
+    <string name="EPr_deactivated">desativado</string>
+
+    <!-- slide 30i: Preference Category: Appearance Title -->
+    <string name="EPr_appearance_header">Aparência</string>
+
+    <!-- Preference Category: Appearance Summary -->
+    <string name="EPr_appearance_summary">Temas, widgets, linhas de tarefas, tela de edição</string>
+
+    <!-- FAQ Preference title -->
+    <string name="EPr_faq_title">FAQ (perguntas mais freqüentes)</string>
+
+    <!-- Account status preference (%s -> account type) -->
+    <string name="EPr_account_title">Conta: %s</string>
+
+    <!-- Support preferences summary -->
+    <string name="EPr_support_summary">Tutorial, FAQ, sobre</string>
+
+    <!-- slide 34a: Preference: Task List Font Size Title -->
+    <string name="EPr_fontSize_title">Tamanho do texto</string>
+
+    <!-- Preference: Filters to show pref screen title -->
+    <string name="EPr_filters_to_show_title">Filters to show</string>
+
+    <!-- slide 32a: Preference: Show confirmation for smart reminders -->
+    <string name="EPr_showSmartConfirmation_title">Mostrar confirmação para lembretes espertos
+    </string>
+
+    <!-- slide 34g: Preference: Task List Font Size Description -->
+    <string name="EPr_fontSize_desc">Tamanho do texto nas listagens</string>
+
+    <!-- Preferemce: Show task edit confirmation toasts -->
+
+    <!-- slide 34c: Preference: Task List Show Notes -->
+    <string name="EPr_showNotes_title">Show description in task</string>
 
-    
-    <!-- Resources for built-in timers plug-in -->
-    
-    <!-- Task Edit Activity: Container Label -->
-    <string name="alarm_ACS_label">Alarmes</string>
-    
-    <!-- Task Edit Activity: Add New Alarm -->
-    <string name="alarm_ACS_button">Inserir alarme</string>
-    
-    <string-array name="reminders_alarm">
-      <!-- reminders related to alarm -->
-      <item>Alarme!</item>
+    <!-- Edit screen preference category -->
+    <string name="EPr_edit_screen_options">Edit screen options</string>
+
+    <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
+    <string name="EPr_beastMode_title">Edit screen order</string>
+
+    <string name="EPr_beastMode_shortcut">Customize</string>
+
+    <string name="EPr_time_increment">5 minute increments</string>
+
+    <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
+
+    <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
+
+    <!-- slide 35h -->
+    <string name="EPr_beastMode_desc">Personalize o layout da tela de edição</string>
+    <!-- slide 35j -->
+    <string name="EPr_beastMode_reset">Restaurar valores padrão</string>
+
+    <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on
+        each row
+    </string>
+
+    <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
+    <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit
+        screen
+    </string>
+    <!-- Preference: Task List Show Notes Description (enabled) -->
+    <string name="EPr_showNotes_desc_enabled">Description will always be displayed</string>
+
+    <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
+    <string name="EPr_compressTaskRows_title">Linhas reduzidas</string>
+    <!-- slide 34j -->
+    <string name="EPr_compressTaskRows_desc">Reduzir espaços para adequar os títulos</string>
+
+    <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
+    <!-- slide 34k-->
+
+    <!-- slide 34b: Preferences: Wrap task titles to two lines -->
+    <string name="EPr_fullTask_title">Exibir título completo</string>
+    <string name="EPr_fullTask_desc_enabled">O título completo será exibido</string>
+    <!-- slide 34h -->
+    <string name="EPr_fullTask_desc_disabled">Somente as primeiras duas linhas serão exibidas
+    </string>
+
+    <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
+    <string name="EPr_ideaAuto_title">Auto-carregar aba de idéias</string>
+    <!-- slide 32c -->
+    <string name="EPr_ideaAuto_desc_enabled">As pesquisas Web serão feitas quando a aba for tocada
+    </string>
+    <string name="EPr_ideaAuto_desc_disabled">As pesquisas Web somente serão feitas quando
+        requisitadas manualmente
+    </string>
+
+    <!-- Preferences: task row style -->
+    <string-array name="EPr_task_row_styles">
+        <item>Original</item>
+        <item>Simple</item>
+        <item>Title only</item>
     </string-array>
-    
 
+    <string-array name="EPr_task_row_style_descriptions">
+        <item>Truncar título para duas linhas com data à direita</item>
+        <item>Truncar título para uma única linha com data e lista abaixo</item>
+        <item>Single line title only</item>
+    </string-array>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- task row style title (%s -> style) -->
+    <string name="EPr_task_row_style_title">Row style: %s</string>
 
-    
-  <!-- Resources for built-in backup plug-in -->
-  
-  <!-- ================================================= BackupPreferences == -->
+    <!-- Preference: custom filters enabled -->
+    <string name="EPr_use_filters_title">Use filters</string>
+    <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
 
-    <!-- slide 33c/48d: Backup Preferences Title -->    
-    <string name="backup_BPr_header">Backups</string>
+    <!-- Preference: show list members in shared list -->
+    <string name="EPr_show_list_members_title">Show list members in shared lists</string>
 
-    <!-- slide 48e/50c: Backup: Status Header -->    
-    <string name="backup_BPr_group_status">Status</string>
-    
-    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Backup recente:\n%s</string>
-    <!-- Backup Status: last error failed. Keep it short! -->    
-    <string name="backup_status_failed">O último backup falhou</string>
-    <!-- Backup Status: error subtitle -->    
-    <string name="backup_status_failed_subtitle">(toque para exibir o erro)</string>
-    <!-- slide 48a: Backup Status: never backed up -->    
-    <string name="backup_status_never">O Backup nunca foi executado!</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_simple_input_boxes">Simple text boxes</string>
 
-    <!-- slide 48f/ 50e: Backup Options Group Label -->    
-    <string name="backup_BPr_group_options">Opções</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
 
-    <!-- slide 48b: Preference: Automatic Backup Title -->    
-    <string name="backup_BPr_auto_title">Backups automáticos</string>
-    <!-- Preference: Automatic Backup Description (when disabled) -->
-    <string name="backup_BPr_auto_disabled">Backups automáticos desativados</string>    
-    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
-    <string name="backup_BPr_auto_enabled">O Backup ocorrerá diariamente</string>
-    
-    <!-- Preference screen restoring Tasks Help -->
-    <!-- Preference screen Restoring Tasks Help Dialog Text-->
-    
-    <string name="backup_BPr_cloud_already_logged_in">Você já possui backup em nuvem no Astrid.com!</string>
-  
-  <!-- ================================================= BackupActivity == -->
-
-  <!-- slide 48c: backup activity label -->
-  <string name="backup_BAc_label">Gerenciar backups</string>
-
-  <!-- backup activity title -->
-  <string name="backup_BAc_title">Gerenciar seus backups</string>
-
-  <!-- backup activity import button -->
-  <string name="backup_BAc_import">Importar tarefas</string>
-
-  <!-- backup activity export button -->
-  <string name="backup_BAc_export">Exportar tarefas</string>
-  
-  <!-- backup activity cloud (Astrid.com) option -->
-  <string name="backup_BAc_cloud">Clique para obter um backup em nuvem gratuito no Astrid.com</string>
-    
-  <!-- ============================================== Importer / Exporter == -->
-  
-  <!-- Message displayed when error occurs -->
-  <string name="backup_TXI_error">Erro de importação</string>
-    
-  <string name="export_toast">Backups feitos: de %1$s para %2$s.</string>
-    
-  <string name="export_toast_no_tasks">Nenhuma tarefa a exportar</string>
-  
-  <!-- Progress Dialog Title for exporting -->    
-  <string name="export_progress_title">Exportando...</string>
-  
-  <!-- Backup: Title of Import Summary Dialog -->
-  <string name="import_summary_title">Sumário da restauração</string>
-    
-  <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">Arquivo %1$s contendo %2$s.\n\n %3$s importada(s),\n %4$s já existia(m)\n %5$s tinha(m) erro(s)\n</string>
-  
-  <!-- Progress Dialog Title for importing -->    
-  <string name="import_progress_title">Importando...</string>
-  
-  <!-- Progress Dialog text for import reading task (%d -> task number)-->    
-  <string name="import_progress_read">Lendo tarefa %d...</string>
-  
-  <!-- Backup: Dialog when unable to open a file -->  
-  
-  <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
-  <string name="DLG_error_sdcard">Não foi possível acessar a pasta: %s</string>
-  
-  <!-- Backup: Dialog when unable to open SD card in general -->
-  <string name="DLG_error_sdcard_general">Não foi possível acessar seu cartão SD!</string>
-    
-  <!-- Backup: File Selector dialog for import -->
-  <string name="import_file_prompt">Selecione um arquivo para ser restaurado</string>    
-        
+    <!-- Preference: don\'t show plus button until input present -->
+    <string name="EPr_hide_plus_button">Hide plus button</string>
 
+    <!-- Preference: menu items -->
+    <string name="EPr_menu_items">Menu items</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Preference: list view -->
+    <string name="EPr_list_view">List view</string>
 
+    <!-- Preference: task edit comments -->
+    <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
 
-  <!-- ================================================== AndroidManifest == -->
-
-  <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
-  <string name="app_name">Tarefas do Astrid</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="read_permission_label">Permissões do Astrid</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="read_permission_desc">ler tarefas, exibir filtros das tarefas</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="write_permission_label">Permissões do Astrid</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="write_permission_desc">criar novas tarefas, editar tarefas existentes</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-    
-  <!-- question for deleting tasks -->
-  <string name="DLG_delete_this_task_question">Excluir esta tarefa?</string>
-
-  <!-- question for deleting items (%s => item name) -->
-  <string name="DLG_delete_this_item_question">Excluir este item: %s?</string>
-    
-  <!-- Progress dialog shown when upgrading -->
-  <string name="DLG_upgrading">Atualizando suas tarefas...</string>
-  
-  <!-- Title for dialog selecting a time (hours and minutes) -->
-  <string name="DLG_hour_minutes">Horário (horas:minutos)</string>
-  
-  <!-- Dialog for Astrid having a critical update -->
-  <string name="DLG_please_update">Astrid deve ser atualizado para a versão mais recente no Android market! Por favor faça isso antes de continuar, ou aguarde alguns segundos.</string>
-
-  <!-- Button for going to Market -->
-
-  <!-- Button for accepting EULA -->
-  <string name="DLG_accept">Eu aceito</string>
-
-  <!-- Button for declining EULA -->
-  <string name="DLG_decline">Recusar</string>
-
-  <!-- EULA title -->
-  <string name="DLG_eula_title">Termos de uso do Astrid</string>
-
-  <!-- Progress Dialog generic text -->
-  <string name="DLG_please_wait">Por favor, espere</string>
-  
-  <!-- Dialog - loading -->
-  <string name="DLG_loading">Carregando...</string>
-  
-  <!-- Dialog - dismiss -->
-
-  <!-- slide 20d -->
-  <string name="DLG_ok">OK</string>
-  <!-- slide 36g -->
-  <string name="DLG_cancel">Cancelar</string>
-  
-  <string name="DLG_more">Mais</string>
-  
-  <string name="DLG_undo">Desfazer</string>
-  
-  <string name="DLG_warning">Atenção</string>
-  
-  <!-- =============================================================== UI == -->
-  
-  <!-- Label for DateButtons with no value -->
-  <string name="WID_dateButtonUnset">Toque para definir</string>
-  
-  <!-- String formatter for DateButtons ($D => date, $T => time) -->
-  
-  <!-- String formatter for Disable button -->
-  
-  <!--  ============================================================= notes -->
-  
-  <!-- Note Exposer -->    
-  
-  <!-- Note Exposer / Comments -->    
-  
-  <!-- EditNoteActivity - no comments -->
-  <string name="ENA_no_comments">Nada a exibir</string>
-    
-  <!-- EditNoteActivity - no username for comment -->
-  <string name="ENA_no_user">Alguém</string>
-  
-  <!-- EditNoteActivity - refresh comments -->
-  <string name="ENA_refresh_comments">Atualizar comentários</string>
-  
-  <!-- ================================================= TaskListActivity == -->
-  
-  <!-- slide 8b: Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">Você não tem tarefas! \n Deseja inserir alguma?</string>
-  
-  <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->    
-  <string name="TLA_no_items_person">%s não tem</string>
-  
-  <!-- Menu: Adjust Sort and Hidden Task Settings -->    
-  <string name="TLA_menu_sort">Sort</string>
-  
-  <!-- Menu: Sync Now -->    
-  <string name="TLA_menu_sync">Sincronizar Agora</string>
-  
-  <!-- Menu: Search -->
-  <string name="TLA_menu_search">Buscar</string>
-  
-  <!-- Menu: Tasks -->
-  <string name="TLA_menu_lists">Listas</string>
-
-  <!-- Menu: Friends -->
-  <string name="TLA_menu_friends">Pessoas</string>
-
-  <!-- Menu: Featured Lists -->
-  <string name="TLA_menu_featured_lists">Listas em Destaque</string>
-
-  <!-- Menu: Suggestions -->
-  <string name="TLA_menu_suggestions">Sugestões</string>
-  
-  <!-- Menu: Tutorial -->
-
-  <!-- Menu: Settings -->    
-  <string name="TLA_menu_settings">Configurações</string>
-  
-  <!-- slide 30b: Menu: Support -->
-  <string name="TLA_menu_support">Suporte</string>
-  
-  <!-- Search Label-->
-  
-  <!-- Window title for displaying Custom Filter -->
-  <string name="TLA_custom">Personalizar</string>
-  
-  <!-- slide 8d: Quick Add Edit Box Hint-->
-  <string name="TLA_quick_add_hint">Inserir tarefa</string>
-  
-  <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
-  <string name="TLA_quick_add_hint_assign">Adicione alguma coisa para %s</string>
-  
-  <!-- Notification Volumne notification-->
-  <string name="TLA_notification_volume_low">As notificações estão silenciadas. Você não ouvirá o Astrid!</string>
-  
-  <!-- Notifications disabled warning -->
-  <string name="TLA_notification_disabled">Os lembretes estão desligados! Você não receberá nenhum lembrete</string>
-  
-  <string-array name="TLA_filters">
-      <item>Ativo</item>
-      <item>Hoje</item>
-      <item>Em breve</item>
-      <item>Atrasado</item>
-      <item>Feito</item>
-      <item>Oculta</item>      
-  </string-array>
-  
-  <!-- Title for confirmation dialog after quick add markup -->
-  <string name="TLA_quickadd_confirm_title">Você disse, \"%s\"</string>
-  
-  <!-- Text for speech bubble in dialog after quick add markup -->
-  <!-- First string is task title, second is due date, third is priority -->
-  <string name="TLA_quickadd_confirm_speech_bubble">Eu criei uma tarefa chamada \"%1$s\" %2$s em %3$s</string>
-  
-  <string name="TLA_quickadd_confirm_speech_bubble_date">para %s</string>
-  
-  <string name="TLA_quickadd_confirm_hide_helpers">Não mostrar confirmações futuras</string>
-  
-  
-  <!-- Title for alert on new repeating task. %s-> task title -->
-  <string name="TLA_repeat_scheduled_title">Nova tarefa recorrente %s</string>
-  
-  <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
-  <string name="TLA_repeat_scheduled_speech_bubble">Irei te lembrar sobre isto %s.</string>
-  
-  <string-array name="TLA_priority_strings">
-      <item>prioridade máxima</item>
-      <item>alta prioridade</item>
-      <item>prioridade média</item>
-      <item>baixa prioridade</item>
-  </string-array>
-  <!-- slide 22a -->
-  <string name="TLA_all_activity">Todas as atividades</string>
-  
-  <!-- ====================================================== TaskAdapter == -->
-  
-  <!-- Format string to indicate task is hidden (%s => task name) -->
-  <string name="TAd_hiddenFormat">%s [oculta]</string>
-  
-  <!-- Format string to indicate task is deleted (%s => task name) -->
-  <string name="TAd_deletedFormat">%s [excluída]</string>
-  
-  <!-- Displayed when adapter is flung (scrolled quickly) -->
-  
-  <!-- slide 22b: indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Concluída\n%s</string>
-  
-  <!-- slide 15a: Action Button: edit task -->
-  <string name="TAd_actionEditTask">Editar</string>
-  
-  <!-- Context Item: edit task -->
-  <string name="TAd_contextEditTask">Editar tarefa</string>
-
-  <!-- Context Item: copy task -->
-  <string name="TAd_contextCopyTask">Copiar tarefa</string>
-
-  <!-- Context Item: delete task -->
-  <string name="TAd_contextDeleteTask">Excluir tarefa</string>
-
-  <!-- Context Item: undelete task -->
-  <string name="TAd_contextUndeleteTask">Restaurar tarefa</string>
-
-  <!-- Context Item: purge task -->
-  <string name="TAd_contextPurgeTask">Destruir tarefa</string>
-  
-  <!-- ============================================== SortSelectionDialog == -->
-  
-  <!-- slide 23a: Sort Selection: dialog title -->    
-  <string name="SSD_title">Ordenando e ocultando tarefas</string>
-  
-  <!-- slide 23h:  Hidden: title -->
-  <string name="SSD_hidden_title">Tarefas ocultas</string>
-  
-  <!-- Hidden Task Selection: show completed tasks -->    
-  <string name="SSD_completed">Exibir tarefas terminadas</string>
-  
-  <!-- Hidden Task Selection: show hidden tasks -->    
-  <string name="SSD_hidden">Exibir tarefas ocultas</string>
-  
-  <!-- Hidden Task Selection: show deleted tasks -->    
-  <string name="SSD_deleted">Exibir tarefas excluídas</string>
-  
-  <!-- Sort Selection: drag with subtasks -->
-  <string name="SSD_sort_drag">Manual order with subtasks</string>
-  
-  <!-- slide 23b: Sort Selection: smart sort -->
-  <string name="SSD_sort_auto">Ordenação inteligente Astrid</string>
-  
-  <!-- slide 23e: Sort Selection: sort by alpha -->
-  <string name="SSD_sort_alpha">Por título</string>
-  
-  <!-- slide 23c: Sort Selection: sort by due date -->
-  <string name="SSD_sort_due">Por data de vencimento</string>
-  
-  <!-- slide 23d: Sort Selection: sort by importance -->
-  <string name="SSD_sort_importance">By priority</string>
-  
-  <!-- slide 23f: Sort Selection: sort by modified date -->
-  <string name="SSD_sort_modified">Por data de modificação</string>
-  
-  <!-- slide 23g: Sort Selection: reverse -->
-  <string name="SSD_sort_reverse">Ordenação reversa</string>
-  
-  <!-- slide 23j: Sort Button: sort temporarily -->
-  <string name="SSD_save_temp">Somente uma vez</string>
-  
-  <!-- slide 23i: Sort Button: sort permanently -->
-  <string name="SSD_save_always">Sempre</string>
-  
-  <!-- =============================================== FilterListActivity == -->
-  
-  <!-- Astrid Filter Shortcut -->    
-  <string name="FSA_label">Lista ou Filtro Astrid</string>
-
-  <!-- Filter List Activity Title -->    
-  
-  <!-- Displayed when loading filters -->    
-  
-  <!-- Context Menu: Create Shortcut -->    
-  <string name="FLA_context_shortcut">Criar atalho no desktop</string>
-  
-  <!-- Menu: Search -->
-  
-  <!-- Menu: Help -->    
-  
-  <!-- slide 28c: Create Shortcut Dialog Title -->    
-  <string name="FLA_shortcut_dialog_title">Criar atalho</string>
-  
-  <!-- Create Shortcut Dialog (asks to name shortcut) -->    
-  <string name="FLA_shortcut_dialog">Nome do atalho</string>
-  
-  <!-- Search Hint-->
-  <string name="FLA_search_hint">Procurar por tarefas</string>
-  
-  <!-- Search Filter name (%s => query) -->
-  <string name="FLA_search_filter">Encontradas para \'%s\'</string>
-  
-  <!-- Toast: created shortcut (%s => label) -->
-  <string name="FLA_toast_onCreateShortcut">Atalho criado: %s</string>
-  
-  <!-- Menu: new filter -->
-  <string name="FLA_new_filter">Novo Filtro</string>
-  
-  <!-- slide 10e: Button: new list -->
-  <string name="FLA_new_list">Nova lista</string>
-  
-  <!-- Alert when creating a shortcut without selecting a filter -->
-  <string name="FLA_no_filter_selected">Sem filtro selecionado! Selecione um filtro ou lista.</string>
-  
-  <!-- ================================================= TaskEditActivity == -->
-  
-  <!-- Title when editing a task (%s => task title) -->
-  
-  <!-- Title when creating a new task -->
-  
-  <!-- Task title label -->
-  
-  <!-- Task when label -->
-  <string name="TEA_when_header_label">Quando</string>
-  
-  <!-- Task title hint (displayed when edit box is empty) -->
-  <string name="TEA_title_hint">Task name</string>
-  
-  <!-- Task importance label -->
-  <string name="TEA_importance_label">Prioridade</string>
-  
-  <!-- Task due date hint -->
-  <string name="TEA_deadline_hint">Set due date</string>
-  
-  <!-- Task assigned to string (%s -> assigned person name) -->
-  <string name="TEA_assigned_to">Assigned to %s</string>
-  
-  <!-- Task urgency specific time checkbox -->
-  <string name="TEA_urgency_specific_time">Num horário específico?</string>
-  
-  <!-- Task urgency specific time title when specific time false -->
-  <string name="TEA_urgency_none">Nenhum</string>
-  
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_label">Hide until</string>
-
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_display">Hide until %s</string>
-  
-  <!-- Task hide until toast -->
-  <string name="TEA_hideUntil_message">A Tarefa ficará oculta até %s</string>
-  
-  <!-- Task editing data being loaded label -->
-  <string-array name="TEA_loading"><item>Carregando...</item></string-array>
-  
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_note_label">Descrição</string>
-
-  <!-- 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">Quanto tempo isto vai levar?</string>
-  
-  <!-- Elapsed time label -->
-  <string name="TEA_elapsedDuration_label">Tempo já gasto na tarefa</string>
-
-  <!-- Menu: Save -->    
-  <string name="TEA_menu_save">Salvar alterações</string>
-  
-  <!-- Menu: Don\'t Save -->
-  <string name="TEA_menu_discard">Não salvar</string>
-  
-  <!-- Menu: Delete Task -->
-  <string name="TEA_menu_delete">Excluir tarefa</string>
-  
-  <!-- Menu: Task comments -->
-  <string name="TEA_menu_refresh_comments">Refresh comments</string>
-
-  <string name="TEA_menu_comments">Comentários</string>
-  
-   <!-- Toast: task saved with deadline (%s => preposition + time units) -->
-  <string name="TEA_onTaskSave_due">Tarefa salva: vence em %s</string>
-  
-  <!-- Toast: task saved without deadlines -->
-  <string name="TEA_onTaskSave_notDue">Tarefa salva</string>
-  
-  <!-- Toast: task was not saved -->
-  
-  <!-- Toast: task was deleted -->
-  
-  <!-- slide 15b: Task edit tab: activity -->
-  <string name="TEA_tab_activity">Atividades</string>
-  
-  <!-- slide 15e:  Task edit tab: more editing settings -->
-  <string name="TEA_tab_more">Mais</string>
-  
-  <!-- slide 15d: Task edit tab: web services -->
-  <string name="TEA_tab_web">Idéias</string>
-  
-  <string name="TEA_timer_est">Est. %s</string>
-
-  <string name="TEA_timer_elap">Elapsed %s</string>
-  
-  <string-array name="TEA_urgency">
-      <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No date</item>
-      <item>Dia específico</item>
-      <item>Hoje</item>
-      <item>Amanhã</item>
-      <item>(depois de amanhã)</item>
-      <item>Próxima semana</item>
-      <item>Daqui a duas semanas</item>
-      <item>Próximo mês</item>
-  </string-array>
-  
-  <string name="TEA_no_time">Sem horário</string>
-      
-  <string-array name="TEA_hideUntil">
-      <!-- hideUntil: labels for edit page. -->
-      <item>Never</item>
-      <item>Data de vencimento</item>
-      <item>Due time</item>
-      <item>Day before due</item>
-      <item>Week before due</item>
-      <item>Dia/Hora específica</item>
-  </string-array>
-  
-  <!-- Task edit control set descriptors -->
-
-  <!-- slide 9b/35i -->
-  <string name="TEA_control_who">Quem</string>
-
-  <!-- slide 9c/ 35a -->
-  <string name="TEA_control_when">Quando</string>
-  <!-- slide 35b -->
-  <string name="TEA_control_more_section">----Detalhes----</string>
-  <!-- slide 16a/35c -->
-  <string name="TEA_control_importance">Prioridade</string>  
-  <!-- slide 16b/35d -->
-  <string name="TEA_control_lists">Listas</string>  
-  <!-- slide 16c/35e -->
-  <string name="TEA_control_notes">Descrição</string>  
-  
-  <string name="TEA_control_files">Arquivos</string>
-
-  <!-- slide 16e / slide 35g-->
-  <string name="TEA_control_reminders">Lembretes</string>
-
-  <!-- slide 16f -->
-  <string name="TEA_control_timer">Temporizador</string>
-  
-  <string name="TEA_control_hidden_section">----Esconder Sempre---</string>
-  
-  <string name="hide_until_prompt">Mostrar na minha lista</string>
-  
-  <!-- Add Ons tab when no add-ons found -->
-  
-  <!-- Add Ons button -->
-  
-  <!-- More row -->
-  
-  <!-- slide 15c: Text when no activity to show -->
-  <string name="TEA_no_activity">Sem atividade</string>
-  
-  <!-- Text to load more activity -->
-  <string name="TEA_load_more">Carregar mais...</string>
-  
-  <!-- When controls dialog -->
-  <string name="TEA_when_dialog_title">Quando vence?</string>
-  
-  
-  <string name="TEA_new_task">Nova Tarefa</string>
-  
-  <string name="WSV_click_to_load">Toque para procurar maneiras de terminar isso!</string>
-  
-  <string name="WSV_not_online">Posso fazer mais se estiver conectado à internet. Verifique sua conexão</string>
-  
-  <string name="TEA_contact_error">Desculpe! Nós não conseguimos achar um endereço de e-mail para o contato selecionado.</string>
-  
-  <!-- ============================================= IntroductionActivity == -->
-  
-  <!-- slide 1a: Introduction Window title -->
-  
-  <!-- Button to agree to EULA -->
-  
-  <!-- Button to disagree with EULA -->
-  
-  <!-- ===================================================== MissedCallActivity == -->
-  
-  <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
-  <string name="MCA_title">%1$s\nligou às %2$s</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_return_call">Ligar agora</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_add_task">Ligar mais tarde</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_ignore">Ignorar</string>
-  
-  <!-- Missed call: dialog to ignore all missed calls title -->
-  <string name="MCA_ignore_title">Ignorar todas as chamadas perdidas?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls body -->
-  <string name="MCA_ignore_body">Você ignorou várias chamadas perdidas. Astrid deve para de perguntar sobre elas?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore all button -->
-  <string name="MCA_ignore_all">Ignorar todas as chamadas</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
-  <string name="MCA_ignore_this">Ignorar esta chamada apenas</string>
-
-  <!-- Missed call: preference title -->
-  <string name="MCA_missed_calls_pref_title">Campo chamadas perdidas</string>
-
-  <!-- slide 49c: Missed call: preference description -->
-  <string name="MCA_missed_calls_pref_desc_enabled">Astrid notificará sobre chamadas perdidas e oferecerá para lhe lembrar para ligar de volta</string>
-  <string name="MCA_missed_calls_pref_desc_disabled">Astrid não vai notificá-lo sobre chamadas perdidas</string>
-
-  <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
-  <string name="MCA_task_title_name">Retornar ligação de %1$s às %2$s</string>
-
-  <!-- Missed call: task title no name (%s -> number)-->
-  <string name="MCA_task_title_no_name">Retornar ligação de %s</string>
-  
-  <!-- Missed call: schedule dialog title (%s -> name or number)-->
-  <string name="MCA_schedule_dialog_title">Retornar ligação de %s em ...</string>
-  
-  <!-- Missed call speech bubble options -->
-  <string-array name="MCA_dialog_speech_options">
-      <item>Deve ser bom ser tão popular!</item>
-      <item>Êba! Gostam de você!</item>
-      <item>Faça o dia deles, dê uma ligada!</item>
-      <item>Você não ficaria feliz se as pessoas ligassem de volta?</item>
-      <item>Você pode fazer!</item>
-      <item>Você pode sempre mandar uma mensagem...</item>
-  </string-array>
-  
-  
-  <!-- ======================================= Calendar reminder activity == -->
-  
-  <!-- Calendar remindeer ignore button -->
-  <string name="CRA_ignore">Ignorar</string>
-  
-  <!-- Calendar event -->
-  <string name="CRA_title">Precisa de uma lista de reuniões?</string>
-  
-  <!-- Calendar reminder: dialog to ignore all missed calls title -->
-  <string name="CRA_ignore_title">Ignorar todos os eventos do calendário?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls body -->
-  <string name="CRA_ignore_body">Você ignorou vários eventos do calendário. O Astrid deve parar de perguntar sobre eles?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
-  <string name="CRA_ignore_all">Ignorar todos os eventos</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
-  <string name="CRA_ignore_this">Ignorar somente este evento</string>
-  
-  <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
-  <string name="CRA_speech_bubble_start">Parece que %s está começando em breve. Quer criar uma lista para itens de ação?</string>
-
-  <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
-  <string name="CRA_speech_bubble_end">Parece que você acabou de terminar com %s. Quer criar uma lista para itens de ação?</string>
-  
-  <!-- Calendar reminder: create list button -->
-  <string name="CRA_create_list">Criar lista</string>
-
-  <!-- Calendar reminder: postpone button -->
-  <string name="CRA_postpone">Talvez depois</string>
-  
-  <!-- Calendar reminder: list exists dialog title -->
-  <string name="CRA_list_exists_title">Lista já existe</string>
-  
-  <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
-  <string name="CRA_list_exists_body">Uma lista chamada %s já existe. Você deseja utilizar a lista existente ou criar um nova para este evento?</string>
-  
-  <!-- Calendar reminder: list exists dialog create new button -->
-  <string name="CRA_create_new">Criar nova</string>
-
-  <!-- Calendar reminder: list exists dialog use existing button -->
-  <string name="CRA_use_existing">Usar existente</string>
-  
-  <!-- Calendar remindr: created list (%s -> list name) -->
-  <string name="CRA_created_list_dialog">Eu criei uma lista %s</string>
-  
-  <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
-  <string name="CRA_one_attendee">%s está participando.</string>
-
-  <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
-  <string name="CRA_two_attendees">%1$s e %2$s  estão participando.</string>
-
-  <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
-  <string name="CRA_many_attendees">%1$s, %2$s, e %3$d outros estão participando.</string>
-  
-  <!-- Calendar reminder: invitation prompt -->
-  <string name="CRA_invitation_prompt">Gostaria de convidá-los?</string>
-  
-  <!-- Calendar reminder: preference title -->
-  <string name="CRA_calendar_reminders_pref_title">Assistente de calendário</string>
-
-  <!-- Calendar reminder: pref description disabled -->
-  <string name="CRA_calendar_reminders_pref_desc_disabled">O Astrit não voltará a lembrá-lo sobre eventos futuros do calendário.</string>
-
-  <!-- Calendar reminder: pref description enabled -->
-  <string name="CRA_calendar_reminders_pref_desc_enabled">O Astrid irá lembrá-lo de futuros eventos do calendário e pedir-lhe para se preparar para eles.</string>
-  
-  <!-- Calendar reminder: share list title -->
-  <string name="CRA_share_list_title">Compartilhar esta lista?</string>
-  
-  <string name="CRA_invite_attendees">Convidar participantes</string>
-
-  <string name="CRA_more_options">Mais opções</string>
-
-  <string name="CRA_dont_invite">Não, obrigado</string>
-
-  <!-- Calendar reminder: share list title when no other attendees exist-->
-  <string name="CRA_list_created_title">Lista criada!</string>
-  
-  <!-- Calendar reminder: default new list name (%s -> event title) -->
-  <string name="CRA_default_list_name">Itens de ação: %s</string>
-  
-  <!-- ===================================================== HelpActivity == -->
-  
-  <!-- Help: Button to get support from our website -->
-    
-  <!-- ==================================================== UpdateService == -->
-  
-  <!-- Changelog Window Title -->
-  <string name="UpS_changelog_title">O que há de novo no Astrid?</string>
-  
-  <!-- Updates Window Title -->
-  <string name="UpS_updates_title">Ultimas novidades no Astrid</string>
-  
-  <!-- Updats No Activity to show for offline users -->
-  <string name="UpS_no_activity_log_in">"Conecte-se para ver um registro\ndo seu progresso  e também as\natividades nas listas compartilhadas."</string>
-  
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 31g: Preference Window Title -->
-  <string name="EPr_title">Astrid: Configurações</string>
-  
-  <string name="EPr_share_astrid">Share Astrid</string>
-
-  <string name="EPr_share_astrid_summary">Compartilhe sobre Astrid em sua rede social favorita</string>
-  
-  <!-- slide 46a -->
-  <string name="EPr_deactivated">desativado</string>
-
-  <!-- slide 30i: Preference Category: Appearance Title -->
-  <string name="EPr_appearance_header">Aparência</string>
-  
-  <!-- Preference Category: Appearance Summary -->
-  <string name="EPr_appearance_summary">Temas, widgets, linhas de tarefas, tela de edição</string>
-  
-  <!-- FAQ Preference title -->
-  <string name="EPr_faq_title">FAQ (perguntas mais freqüentes)</string>
-  
-  <!-- Account status preference (%s -> account type) -->
-  <string name="EPr_account_title">Conta: %s</string>
-
-  <!-- Support preferences summary -->
-  <string name="EPr_support_summary">Tutorial, FAQ, sobre</string>
-  
-  <!-- slide 34a: Preference: Task List Font Size Title -->
-  <string name="EPr_fontSize_title">Tamanho do texto</string>
-  
-  <!-- Preference: Filters to show pref screen title -->
-  <string name="EPr_filters_to_show_title">Filters to show</string>
-  
-  <!-- slide 32a: Preference: Show confirmation for smart reminders -->
-  <string name="EPr_showSmartConfirmation_title">Mostrar confirmação para lembretes espertos</string>
-  
-  <!-- slide 34g: Preference: Task List Font Size Description -->                                                                                                                                                  
-  <string name="EPr_fontSize_desc">Tamanho do texto nas listagens</string>  
-  
-  <!-- Preferemce: Show task edit confirmation toasts -->
-  
-  <!-- slide 34c: Preference: Task List Show Notes -->
-  <string name="EPr_showNotes_title">Show description in task</string>
-  
-  <!-- Edit screen preference category -->
-  <string name="EPr_edit_screen_options">Edit screen options</string>
-  
-  <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
-  <string name="EPr_beastMode_title">Edit screen order</string>
-  
-  <string name="EPr_beastMode_shortcut">Customize</string>
-  
-  <string name="EPr_time_increment">5 minute increments</string>
-  
-  <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
-  
-  <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
-  
-  <!-- slide 35h -->
-  <string name="EPr_beastMode_desc">Personalize o layout da tela de edição</string>
-  <!-- slide 35j -->
-  <string name="EPr_beastMode_reset">Restaurar valores padrão</string>
-  
-  <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on each row</string>
-      
-  <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit screen</string>  
-  <!-- Preference: Task List Show Notes Description (enabled) -->
-  <string name="EPr_showNotes_desc_enabled">Description will always be displayed</string>
-  
-  <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
-  <string name="EPr_compressTaskRows_title">Linhas reduzidas</string>
-  <!-- slide 34j -->
-  <string name="EPr_compressTaskRows_desc">Reduzir espaços para adequar os títulos</string>
-  
-  <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
-  <!-- slide 34k-->
-  
-  <!-- slide 34b: Preferences: Wrap task titles to two lines -->
-  <string name="EPr_fullTask_title">Exibir título completo</string>
-  <string name="EPr_fullTask_desc_enabled">O título completo será exibido</string>
-  <!-- slide 34h -->
-  <string name="EPr_fullTask_desc_disabled">Somente as primeiras duas linhas serão exibidas</string>
-  
-  <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
-  <string name="EPr_ideaAuto_title">Auto-carregar aba de idéias</string>
-  <!-- slide 32c -->
-  <string name="EPr_ideaAuto_desc_enabled">As pesquisas Web serão feitas quando a aba for tocada</string>
-  <string name="EPr_ideaAuto_desc_disabled">As pesquisas Web somente serão feitas quando requisitadas manualmente</string>
-  
-  <!-- Preferences: task row style -->
-  <string-array name="EPr_task_row_styles">
-      <item>Original</item>
-      <item>Simple</item>
-      <item>Title only</item>
-  </string-array>
-  
-  <string-array name="EPr_task_row_style_descriptions">
-      <item>Truncar título para duas linhas com data à direita</item>
-      <item>Truncar título para uma única linha com data e lista abaixo</item>
-      <item>Single line title only</item>
-  </string-array>
-  
-  <!-- task row style title (%s -> style) -->
-  <string name="EPr_task_row_style_title">Row style: %s</string>
-  
-  <!-- Preference: custom filters enabled -->
-  <string name="EPr_use_filters_title">Use filters</string>
-  <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
-
-  <!-- Preference: show list members in shared list -->
-  <string name="EPr_show_list_members_title">Show list members in shared lists</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_simple_input_boxes">Simple text boxes</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
-
-  <!-- Preference: don\'t show plus button until input present -->
-  <string name="EPr_hide_plus_button">Hide plus button</string>
-
-  <!-- Preference: menu items -->
-  <string name="EPr_menu_items">Menu items</string>
-
-  <!-- Preference: list view -->
-  <string name="EPr_list_view">List view</string>
-
-  <!-- Preference: task edit comments -->
-  <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
-  
-  <!-- slide 30f/ 36f: Preference: Theme -->
-  <string name="EPr_theme_title">Tema</string>
-  <!-- Preference: Theme Description (%s => value) -->
-  <string name="EPr_theme_desc">Atualmente: %s</string>  
-  <!-- Preference: Theme Description (android 1.6) -->
-  <string name="EPr_theme_desc_unsupported">Esta opção requer Android 2.0+</string>
-  <!-- slide 32h/ 37b -->
-  <string name="EPr_theme_widget_title">Tema do widget</string>
-  
-  <!-- slide 30d/ 34f: Preference screen: all task row settings -->
-  <string name="EPr_taskRowPrefs_title">Aparência da Tarefa</string>
-  
-  <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
-  <string name="EPr_use_contact_picker">Usar selecionador de contatos</string>
-  <!-- slide 49b -->
-  <string name="EPr_use_contact_picker_desc_enabled">A opção do selecionador de contatos do sistema será exibida na janela de atribuição de tarefas</string>
-  <string name="EPr_use_contact_picker_desc_disabled">A opção do selecionador de contatos do sistema não será exibida</string>
-
-  <!-- slide 49i: Preferences: Third party addons -->
-  <string name="EPr_third_party_addons">Permitir addons de terceiros</string>
-  <string name="EPr_third_party_addons_desc_enabled">Addons de terceiros serão ativados</string>
-  <!-- slide 49d -->
-  <string name="EPr_third_party_addons_desc_disabled">Addons de terceiros serão desativados</string>
-  
-  <!-- Preferences: ideas tab -->
-  <string name="EPr_ideas_tab_enabled">Ideias de tarefas</string>
-  <string name="EPr_ideas_tab_description">Obter ideias para ajudá-lo a completar tarefas</string>
-  
-  <!-- Preferences: calendar event start time -->
-  <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
-  <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
-  <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
-  
-  <string name="EPr_force_phone_layout">Usar layout do telefone</string>
-
-  <string name="EPr_show_featured_lists">Mostrar características</string>
-  
-  <!-- Configurations -->
-  <string name="EPr_configurations_title">Set configuration</string>
-  <string name="EPr_config_default">Default</string>
-  <string name="EPr_config_lite">Astrid Lite</string>
-  
-  <!-- Dialog title when setting preference configuration -->
-  <string name="EPr_config_dialog_title">Set configuration?</string>
-  <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
-  <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
-  
-  <!-- default configuration name for the above dialog -->
-  <string name="EPr_config_dialog_default_id">default</string>
-  
-  <!-- Preference title for showing save and cancel buttons in task edit page -->
-  <string name="EPr_show_save_and_cancel">Show save and cancel </string>
-  
-  
-  <!-- Swipe between lists -->
-  <!-- Preference: swipe between lists performance -->
-  <string name="EPr_swipe_lists_performance_title">Navegar entre as listas</string>
-  
-  <string-array name="EPr_swipe_lists_performance_mode">
-      <item>Não navegar</item>
-      <item>Conservação de memória</item>
-      <item>Performance normal</item>
-      <item>Alta performance</item>
-  </string-array>
-  
-  <string-array name="EPr_swipe_lists_performance_desc">
-  <!-- slide 49a -->
-      <item>Navegação entre listas está desabilitada</item>
-      <item>Baixa performance</item>
-      <item>Configuração padrão</item>
-      <item>Usa mais recursos do sistema</item>
-  </string-array>
-    
-  <string name="swipe_lists_helper_title">Navegar entre as listas</string>
-  <string name="swipe_lists_helper_header">Deslizar para a esquerda ou direita para mover-se rapidamente entre listas</string>
-  <string name="swipe_lists_helper_subtitle">Alterar configurações em Configurações -&gt; Aparência</string>
-
-  <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
-  
-  <string-array name="EPr_default_reminders_mode">
-      <!-- reminders duration: labels for "Task Defaults" preference item. -->
-      <item>@string/TEA_reminder_mode_once</item>
-      <item>@string/TEA_reminder_mode_five</item>
-      <item>@string/TEA_reminder_mode_nonstop</item>
-  </string-array>
-    
-  <string-array name="EPr_themes">
-    <!-- theme_settings: labels for Theme preference menu -->
-    <!-- slide 36a-->
-    <item>Dia - Azul</item>
-    <!-- slide 36b -->
-    <item>Dia - Vermelho</item>
-    <!-- slide 36b -->
-    <item>Sky blue</item>
-    <!-- slide 36c -->
-    <item>Night</item>
-    <!-- slide 36d -->
-    <item>Transparent (white text)</item>
-    <!-- slide 36e -->
-    <item>Transparente (Texto preto)</item>
-  </string-array>
-  
-  <string-array name="EPr_themes_widget">
-    <!-- slide 32i / 37a-->
-    <item>Mesmo que o aplicativo</item>
-    <item>Dia - Azul</item>
-    <item>Dia - Vermelho</item>
-    <item>Sky blue</item>
-    <item>Night</item>
-    <item>Transparent (white text)</item>
-    <item>Transparent (black text)</item>
-    <item>Estilo antigo</item>
-  </string-array>
-  
-  <!-- ========================================== Task Management Settings == -->
-
-  <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
-  <string name="EPr_manage_header">Gerenciar tarefas antigas</string>
-  <!-- slide 47d -->
-  <string name="EPr_manage_delete_completed">Exclui as tarefas concluídas</string>
-  <string name="EPr_manage_delete_completed_message">Você realmente deseja excluir todas as tarefas concluídas?</string>
-  <!-- slide 47a -->
-  <string name="EPr_manage_delete_completed_summary">Tarefas excluídas podem ser recuperados uma a uma</string>
-  <string name="EPr_manage_delete_completed_status">Tarefas %d excluídas!</string>
-  <!-- slide 47e -->
-  <string name="EPr_manage_purge_deleted">Remover tarefas excluídas</string>
-  <string name="EPr_manage_purge_deleted_message">Você realmente deseja remover todas as suas tarefas excluídas?\n\nEstas tarefas serão removidas para sempre!</string>
-  <string name="EPr_manage_purge_deleted_status">Tarefas %d removidas!</string>
-  <!-- slide 47b-->
-  <string name="EPr_manage_purge_deleted_summary">Cuidado! Tarefas removidas não podem ser recuperados sem arquivos de backup!</string>
-  <!-- slide 47h-->
-  <string name="EPr_manage_clear_all">Limpar tudo!</string>
-  <string name="EPr_manage_clear_all_message">Limpar todas as tarefas e configurações do Astrid?\n\nCuidado: não pode ser desfeito!</string>
-
-  <!-- slide 47f -->
-  <string name="EPr_manage_delete_completed_gcal">Apaga eventos do calendário para tarefas concluídas</string>
-  <string name="EPr_manage_delete_completed_gcal_message">Você quer mesmo apagar todos os seus eventos de tarefas concluídas?</string>
-  <string name="EPr_manage_delete_completed_gcal_summary"></string>
-  <string name="EPr_manage_delete_completed_gcal_status">%d eventos de agenda apagados!</string>
-      
-  <!-- slide 47g-->
-  <string name="EPr_manage_delete_all_gcal">Apaga todos os eventos de calendário das tarefas</string>
-  <string name="EPr_manage_delete_all_gcal_message">Você quer mesmo apagar todos os eventos de calendário das tarefas?</string>
-  <string name="EPr_manage_delete_all_gcal_summary"></string>
-  <string name="EPr_manage_delete_all_gcal_status">%d eventos de agenda apagados!</string>
-      
-  <!-- ==================================================== AddOnActivity == -->
-  
-  <!-- Add Ons Activity Title -->
-  <string name="AOA_title">Complementos</string>
-    
-  <!-- Add-on Activity: author for internal authors  -->
-  <string name="AOA_internal_author">Equipe do Astrid</string>
-    
-  <!-- Add-on Activity: installed add-ons tab -->
-  <string name="AOA_tab_installed">Instalado</string>
-  
-  <!-- Add-on Activity - available add-ons tab -->
-  <string name="AOA_tab_available">Disponível</string>
-  
-  <!-- Add-on Activity - free add-ons label -->
-  <string name="AOA_free">Gratuito</string>
-  
-  <!-- Add-on Activity - menu item to visit add-on website -->
-  
-  <!-- Add-on Activity - menu item to visit android market -->
-  
-  <!-- Add-on Activity - when list is empty -->
-  <string name="AOA_no_addons">Lista Vazia!</string>
-  
-  <string name="AOA_ppack_title">Astrid Power Pack</string>
-  <string name="AOA_ppack_description">Apoie o Astrid e obtenha mais produtividade com o Astrid Power Pack. Widgets 4x2 e 4x4 e integração de voz. Ganhe forças hoje!</string>
-  <string name="AOA_locale_title">Plugin do Astrid Locale</string>
-  <string name="AOA_locale_description">Permitir que o Astrid faça uso do aplicativo Locale para mandar notificações a você com base nas condições de filtro. Requer Locale.</string>
-  
-  <!-- ====================================================== TasksWidget == -->
-
-  <!-- Widget text when loading tasks -->
-  <string name="TWi_loading">Carregando...</string>
-
-  <!-- Widget configuration activity title: select a filter -->
-  <string name="WCA_title">Selecionar tarefas para visualização...</string>
-  
-  <!-- ======================================================== Waiting on me -->
-
-  <string name="wom_commented">%s commented on your task.</string>
-  <string name="wom_mentioned">%s mentioned you.</string>
-  <string name="wom_assigned">%s assigned this to you.</string>
-  <string name="wom_raised_pri">%s raised the priority.</string>
-  <string name="wom_changed_due">%s changed the due date.</string>
-  <string name="wom_default">%s wants your attention.</string>
-  
-  <string name="wom_dismiss">Dismiss</string>
-  <string name="wom_acknowledge">I\'ve read this</string>
-
-  <!-- ============================================================= About == -->
-  
-  <!-- slide 30h: Title of "About" option in settings -->
-  <string name="p_about">Sobre Astrid</string>
-  
-  <!-- About text (%s => current version)-->
-  <string name="p_about_text">Versão atual: %s\n\n Astrid é open-source e orgulhosamente mantido pela Todoroo, Inc.</string>
-
-  <!-- Title of "Help" option in settings -->
-  <string name="p_help">Suporte</string>
-  
-  <!-- slide 30c: Title of "Forums" option in settings -->
-  <string name="p_forums">Fóruns</string>
-  
-  <!-- Title of "Premium" option in settings -->
-  <string name="p_premium">Premium</string>
-  
-  <!-- ============================================================= Misc == -->
-  
-  <string name="feedback_positive_title">Rate Astrid?</string>
-
-  <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star rating?</string>
-
-  <string name="feedback_negative_title">Leave feedback?</string>
-
-  <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
-
-  <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback section--it might not be available on your device.</string>
-  
-  <string name="feedback_positive_button">Rate Astrid</string>
-
-  <string name="feedback_negative_button">Leave feedback</string>
-  
-  <string name="feedback_not_now">Not now</string>
-  
-  <string name="feedback_banner_text">How\'s Astrid working for you?</string>
-  
-  <!-- Displayed when task killer found. %s => name of the application -->
-  <string name="task_killer_help">Parece que você está usando um aplicativo que pode eliminar processos (%s)! Se você puder, adicione o Astrid à lista de exclusão para que ele não seja eliminado. Caso contrário, o Astrid pode não avisar para você quando suas tarefas estiverem vencidas.\n</string>
-  
-  <!-- Task killer dialog ok button -->
-  <string name="task_killer_help_ok">Eu não vou excluir o Astrid!</string>
-    
-  <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
-  
-  <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
-  <string name="marketplace_description">Astrid é o aclamado gerenciador de tarefas/lista de afazeres de código aberto feito para lhe ajudar a terminar seu trabalho. Ele contém lembretes, etiquetas, sincronização, plugin local, um widget e mais.</string>
-  
-  <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 Astrid (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>
-  
+    <!-- slide 30f/ 36f: Preference: Theme -->
+    <string name="EPr_theme_title">Tema</string>
+    <!-- Preference: Theme Description (%s => value) -->
+    <string name="EPr_theme_desc">Atualmente: %s</string>
+    <!-- Preference: Theme Description (android 1.6) -->
+    <string name="EPr_theme_desc_unsupported">Esta opção requer Android 2.0+</string>
+    <!-- slide 32h/ 37b -->
+    <string name="EPr_theme_widget_title">Tema do widget</string>
 
+    <!-- slide 30d/ 34f: Preference screen: all task row settings -->
+    <string name="EPr_taskRowPrefs_title">Aparência da Tarefa</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
+    <string name="EPr_use_contact_picker">Usar selecionador de contatos</string>
+    <!-- slide 49b -->
+    <string name="EPr_use_contact_picker_desc_enabled">A opção do selecionador de contatos do
+        sistema será exibida na janela de atribuição de tarefas
+    </string>
+    <string name="EPr_use_contact_picker_desc_disabled">A opção do selecionador de contatos do
+        sistema não será exibida
+    </string>
 
+    <!-- slide 49i: Preferences: Third party addons -->
+    <string name="EPr_third_party_addons">Permitir addons de terceiros</string>
+    <string name="EPr_third_party_addons_desc_enabled">Addons de terceiros serão ativados</string>
+    <!-- slide 49d -->
+    <string name="EPr_third_party_addons_desc_disabled">Addons de terceiros serão desativados
+    </string>
 
-  <!-- slide 32g: Preference Category: Defaults Title -->
-  <string name="EPr_defaults_header">Padrão para novas tarefas</string>
-  <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
-  
-  <!-- slide 41f:  Preference: Default Urgency Title -->
-  <string name="EPr_default_urgency_title">Urgência</string>
-  <!-- Preference: Default Urgency Description (%s => setting) -->
-  <string name="EPr_default_urgency_desc">Atualmente: %s</string>
-  
-  <!-- slide 40a: Preference: Default Importance Title -->
-  <string name="EPr_default_importance_title">Default priority</string>
-  <!-- Preference: Default Importance Description (%s => setting) -->
-  <string name="EPr_default_importance_desc">Atualmente: %s</string>
-  
-  <!-- slide 42e: Preference: Default Hide Until Title -->
-  <string name="EPr_default_hideUntil_title">Ocultar até</string>
-  <!-- Preference: Default Hide Until Description (%s => setting) -->
-  <string name="EPr_default_hideUntil_desc">Atualmente: %s</string>
-  
-  <!-- slide 43e: Preference: Default Reminders Title -->
-  <string name="EPr_default_reminders_title">Lembretes</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_desc">Atualmente: %s</string>
-  
-  <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
-  <string name="EPr_default_addtocalendar_title">Padrão de Inserir no Calendário</string>
-  <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
-  <string name="EPr_default_addtocalendar_desc_disabled">Novas tarefas não serão adicionadas no calendário</string>
-  <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
-  <string name="EPr_default_addtocalendar_desc">Novas tarefas estarão no calendário: \"%s\"</string>
-  
-  <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
-  <string name="EPr_default_reminders_mode_title">Tipo de toque/vibração padrão</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_mode_desc">Atualmente: %s</string>
-  
-  <string-array name="EPr_default_importance">
-    <!-- importance: labels for "Task Defaults" preference item. -->
-    <!-- slide 40b -->
-    <item>!!! (Máxima)</item>
-    <item>!!</item>
-    <item>!</item>
-    <!-- slide 40c -->
-    <item>o (baixa)</item>
-  </string-array>
-  
-  <string-array name="EPr_default_urgency">
-    <!-- urgency: labels for "Task Defaults" preference item. -->
-    <!-- slide 41a-->
-    <item>Sem prazo</item>
-    <!-- slide 41b -->
-    <item>Hoje</item>
-    <!-- slide 41c-->
-    <item>Amanhã</item>
-    <!-- slide 41d -->
-    <item>Depois de amanhã</item>
-    <!-- slide 41e -->
-    <item>Próxima semana</item>
-  </string-array>
-  
-  <string-array name="EPr_default_hideUntil">
-    <!-- hideUntil: labels for "Task Defaults" preference item. -->
-    <!-- slide 42a -->
-    <item>Não ocultar</item>
-    <!-- slide 42b -->
-    <item>O dia do vencimento</item>
-    <!-- slide 42c -->
-    <item>1 dia antes do vencimento</item>
-    <!-- slide 42d-->
-    <item>1 semana antes do vencimento</item>
-  </string-array>
-  
-  <string-array name="EPr_default_reminders">
-    <!-- reminders: labels for "Task Defaults" preference item. -->
-    <!-- slide 43a -->
-    <item>Sem lembretes no vencimento</item>
-    <!-- slide 43b -->
-    <item>No vencimento</item>
-    <!-- slide 43c -->
-    <item>Quando vencida</item>
-    <!-- slide 43d -->
-    <item>No prazo ou vencidas</item>
-  </string-array>
-  
-  <string-array name="EPr_default_addtocalendar">
-    <!-- addtocalendar: labels for "Task Defaults" preference item. -->
-    <item>@string/EPr_deactivated</item>
-  </string-array>      
+    <!-- Preferences: ideas tab -->
+    <string name="EPr_ideas_tab_enabled">Ideias de tarefas</string>
+    <string name="EPr_ideas_tab_description">Obter ideias para ajudá-lo a completar tarefas</string>
 
+    <!-- Preferences: calendar event start time -->
+    <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
+    <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
+    <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
+
+    <string name="EPr_force_phone_layout">Usar layout do telefone</string>
+
+    <string name="EPr_show_featured_lists">Mostrar características</string>
+
+    <!-- Configurations -->
+    <string name="EPr_configurations_title">Set configuration</string>
+    <string name="EPr_config_default">Default</string>
+    <string name="EPr_config_lite">Astrid Lite</string>
+
+    <!-- Dialog title when setting preference configuration -->
+    <string name="EPr_config_dialog_title">Set configuration?</string>
+    <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
+    <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
+
+    <!-- default configuration name for the above dialog -->
+    <string name="EPr_config_dialog_default_id">default</string>
+
+    <!-- Preference title for showing save and cancel buttons in task edit page -->
+    <string name="EPr_show_save_and_cancel">Show save and cancel</string>
+
+
+    <!-- Swipe between lists -->
+    <!-- Preference: swipe between lists performance -->
+    <string name="EPr_swipe_lists_performance_title">Navegar entre as listas</string>
+
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>Não navegar</item>
+        <item>Conservação de memória</item>
+        <item>Performance normal</item>
+        <item>Alta performance</item>
+    </string-array>
+
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <!-- slide 49a -->
+        <item>Navegação entre listas está desabilitada</item>
+        <item>Baixa performance</item>
+        <item>Configuração padrão</item>
+        <item>Usa mais recursos do sistema</item>
+    </string-array>
+
+    <string name="swipe_lists_helper_title">Navegar entre as listas</string>
+    <string name="swipe_lists_helper_header">Deslizar para a esquerda ou direita para mover-se
+        rapidamente entre listas
+    </string>
+    <string name="swipe_lists_helper_subtitle">Alterar configurações em Configurações -&gt;
+        Aparência
+    </string>
+
+    <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
+
+    <string-array name="EPr_default_reminders_mode">
+        <!-- reminders duration: labels for "Task Defaults" preference item. -->
+        <item>@string/TEA_reminder_mode_once</item>
+        <item>@string/TEA_reminder_mode_five</item>
+        <item>@string/TEA_reminder_mode_nonstop</item>
+    </string-array>
+
+    <string-array name="EPr_themes">
+        <!-- theme_settings: labels for Theme preference menu -->
+        <!-- slide 36a-->
+        <item>Dia - Azul</item>
+        <!-- slide 36b -->
+        <item>Dia - Vermelho</item>
+        <!-- slide 36b -->
+        <item>Sky blue</item>
+        <!-- slide 36c -->
+        <item>Night</item>
+        <!-- slide 36d -->
+        <item>Transparent (white text)</item>
+        <!-- slide 36e -->
+        <item>Transparente (Texto preto)</item>
+    </string-array>
+
+    <string-array name="EPr_themes_widget">
+        <!-- slide 32i / 37a-->
+        <item>Mesmo que o aplicativo</item>
+        <item>Dia - Azul</item>
+        <item>Dia - Vermelho</item>
+        <item>Sky blue</item>
+        <item>Night</item>
+        <item>Transparent (white text)</item>
+        <item>Transparent (black text)</item>
+        <item>Estilo antigo</item>
+    </string-array>
+
+    <!-- ========================================== Task Management Settings == -->
+
+    <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
+    <string name="EPr_manage_header">Gerenciar tarefas antigas</string>
+    <!-- slide 47d -->
+    <string name="EPr_manage_delete_completed">Exclui as tarefas concluídas</string>
+    <string name="EPr_manage_delete_completed_message">Você realmente deseja excluir todas as
+        tarefas concluídas?
+    </string>
+    <!-- slide 47a -->
+    <string name="EPr_manage_delete_completed_summary">Tarefas excluídas podem ser recuperados uma a
+        uma
+    </string>
+    <string name="EPr_manage_delete_completed_status">Tarefas %d excluídas!</string>
+    <!-- slide 47e -->
+    <string name="EPr_manage_purge_deleted">Remover tarefas excluídas</string>
+    <string name="EPr_manage_purge_deleted_message">Você realmente deseja remover todas as suas
+        tarefas excluídas?\n\nEstas tarefas serão removidas para sempre!
+    </string>
+    <string name="EPr_manage_purge_deleted_status">Tarefas %d removidas!</string>
+    <!-- slide 47b-->
+    <string name="EPr_manage_purge_deleted_summary">Cuidado! Tarefas removidas não podem ser
+        recuperados sem arquivos de backup!
+    </string>
+    <!-- slide 47h-->
+    <string name="EPr_manage_clear_all">Limpar tudo!</string>
+    <string name="EPr_manage_clear_all_message">Limpar todas as tarefas e configurações do
+        Astrid?\n\nCuidado: não pode ser desfeito!
+    </string>
+
+    <!-- slide 47f -->
+    <string name="EPr_manage_delete_completed_gcal">Apaga eventos do calendário para tarefas
+        concluídas
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_message">Você quer mesmo apagar todos os seus
+        eventos de tarefas concluídas?
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_summary"></string>
+    <string name="EPr_manage_delete_completed_gcal_status">%d eventos de agenda apagados!</string>
+
+    <!-- slide 47g-->
+    <string name="EPr_manage_delete_all_gcal">Apaga todos os eventos de calendário das tarefas
+    </string>
+    <string name="EPr_manage_delete_all_gcal_message">Você quer mesmo apagar todos os eventos de
+        calendário das tarefas?
+    </string>
+    <string name="EPr_manage_delete_all_gcal_summary"></string>
+    <string name="EPr_manage_delete_all_gcal_status">%d eventos de agenda apagados!</string>
+
+    <!-- ==================================================== AddOnActivity == -->
+
+    <!-- Add Ons Activity Title -->
+    <string name="AOA_title">Complementos</string>
+
+    <!-- Add-on Activity: author for internal authors  -->
+    <string name="AOA_internal_author">Equipe do Astrid</string>
+
+    <!-- Add-on Activity: installed add-ons tab -->
+    <string name="AOA_tab_installed">Instalado</string>
+
+    <!-- Add-on Activity - available add-ons tab -->
+    <string name="AOA_tab_available">Disponível</string>
+
+    <!-- Add-on Activity - free add-ons label -->
+    <string name="AOA_free">Gratuito</string>
+
+    <!-- Add-on Activity - menu item to visit add-on website -->
+
+    <!-- Add-on Activity - menu item to visit android market -->
+
+    <!-- Add-on Activity - when list is empty -->
+    <string name="AOA_no_addons">Lista Vazia!</string>
+
+    <string name="AOA_ppack_title">Astrid Power Pack</string>
+    <string name="AOA_ppack_description">Apoie o Astrid e obtenha mais produtividade com o Astrid
+        Power Pack. Widgets 4x2 e 4x4 e integração de voz. Ganhe forças hoje!
+    </string>
+    <string name="AOA_locale_title">Plugin do Astrid Locale</string>
+    <string name="AOA_locale_description">Permitir que o Astrid faça uso do aplicativo Locale para
+        mandar notificações a você com base nas condições de filtro. Requer Locale.
+    </string>
+
+    <!-- ====================================================== TasksWidget == -->
+
+    <!-- Widget text when loading tasks -->
+    <string name="TWi_loading">Carregando...</string>
+
+    <!-- Widget configuration activity title: select a filter -->
+    <string name="WCA_title">Selecionar tarefas para visualização...</string>
+
+    <!-- ======================================================== Waiting on me -->
+
+    <string name="wom_commented">%s commented on your task.</string>
+    <string name="wom_mentioned">%s mentioned you.</string>
+    <string name="wom_assigned">%s assigned this to you.</string>
+    <string name="wom_raised_pri">%s raised the priority.</string>
+    <string name="wom_changed_due">%s changed the due date.</string>
+    <string name="wom_default">%s wants your attention.</string>
+
+    <string name="wom_dismiss">Dismiss</string>
+    <string name="wom_acknowledge">I\'ve read this</string>
+
+    <!-- ============================================================= About == -->
+
+    <!-- slide 30h: Title of "About" option in settings -->
+    <string name="p_about">Sobre Astrid</string>
+
+    <!-- About text (%s => current version)-->
+    <string name="p_about_text">Versão atual: %s\n\n Astrid é open-source e orgulhosamente mantido
+        pela Todoroo, Inc.
+    </string>
+
+    <!-- Title of "Help" option in settings -->
+    <string name="p_help">Suporte</string>
+
+    <!-- slide 30c: Title of "Forums" option in settings -->
+    <string name="p_forums">Fóruns</string>
+
+    <!-- Title of "Premium" option in settings -->
+    <string name="p_premium">Premium</string>
+
+    <!-- ============================================================= Misc == -->
+
+    <string name="feedback_positive_title">Rate Astrid?</string>
+
+    <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star
+        rating?
+    </string>
+
+    <string name="feedback_negative_title">Leave feedback?</string>
+
+    <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
+
+    <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback
+        section--it might not be available on your device.
+    </string>
+
+    <string name="feedback_positive_button">Rate Astrid</string>
+
+    <string name="feedback_negative_button">Leave feedback</string>
+
+    <string name="feedback_not_now">Not now</string>
+
+    <string name="feedback_banner_text">How\'s Astrid working for you?</string>
+
+    <!-- Displayed when task killer found. %s => name of the application -->
+    <string name="task_killer_help">Parece que você está usando um aplicativo que pode eliminar
+        processos (%s)! Se você puder, adicione o Astrid à lista de exclusão para que ele não seja
+        eliminado. Caso contrário, o Astrid pode não avisar para você quando suas tarefas estiverem
+        vencidas.\n
+    </string>
+
+    <!-- Task killer dialog ok button -->
+    <string name="task_killer_help_ok">Eu não vou excluir o Astrid!</string>
+
+    <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
+
+    <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
+    <string name="marketplace_description">Astrid é o aclamado gerenciador de tarefas/lista de
+        afazeres de código aberto feito para lhe ajudar a terminar seu trabalho. Ele contém
+        lembretes, etiquetas, sincronização, plugin local, um widget e mais.
+    </string>
+
+    <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 Astrid (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>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 32g: Preference Category: Defaults Title -->
+    <string name="EPr_defaults_header">Padrão para novas tarefas</string>
+    <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
+
+    <!-- slide 41f:  Preference: Default Urgency Title -->
+    <string name="EPr_default_urgency_title">Urgência</string>
+    <!-- Preference: Default Urgency Description (%s => setting) -->
+    <string name="EPr_default_urgency_desc">Atualmente: %s</string>
+
+    <!-- slide 40a: Preference: Default Importance Title -->
+    <string name="EPr_default_importance_title">Default priority</string>
+    <!-- Preference: Default Importance Description (%s => setting) -->
+    <string name="EPr_default_importance_desc">Atualmente: %s</string>
+
+    <!-- slide 42e: Preference: Default Hide Until Title -->
+    <string name="EPr_default_hideUntil_title">Ocultar até</string>
+    <!-- Preference: Default Hide Until Description (%s => setting) -->
+    <string name="EPr_default_hideUntil_desc">Atualmente: %s</string>
+
+    <!-- slide 43e: Preference: Default Reminders Title -->
+    <string name="EPr_default_reminders_title">Lembretes</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_desc">Atualmente: %s</string>
+
+    <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
+    <string name="EPr_default_addtocalendar_title">Padrão de Inserir no Calendário</string>
+    <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
+    <string name="EPr_default_addtocalendar_desc_disabled">Novas tarefas não serão adicionadas no
+        calendário
+    </string>
+    <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
+    <string name="EPr_default_addtocalendar_desc">Novas tarefas estarão no calendário: \"%s\"
+    </string>
+
+    <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
+    <string name="EPr_default_reminders_mode_title">Tipo de toque/vibração padrão</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_mode_desc">Atualmente: %s</string>
+
+    <string-array name="EPr_default_importance">
+        <!-- importance: labels for "Task Defaults" preference item. -->
+        <!-- slide 40b -->
+        <item>!!! (Máxima)</item>
+        <item>!!</item>
+        <item>!</item>
+        <!-- slide 40c -->
+        <item>o (baixa)</item>
+    </string-array>
+
+    <string-array name="EPr_default_urgency">
+        <!-- urgency: labels for "Task Defaults" preference item. -->
+        <!-- slide 41a-->
+        <item>Sem prazo</item>
+        <!-- slide 41b -->
+        <item>Hoje</item>
+        <!-- slide 41c-->
+        <item>Amanhã</item>
+        <!-- slide 41d -->
+        <item>Depois de amanhã</item>
+        <!-- slide 41e -->
+        <item>Próxima semana</item>
+    </string-array>
+
+    <string-array name="EPr_default_hideUntil">
+        <!-- hideUntil: labels for "Task Defaults" preference item. -->
+        <!-- slide 42a -->
+        <item>Não ocultar</item>
+        <!-- slide 42b -->
+        <item>O dia do vencimento</item>
+        <!-- slide 42c -->
+        <item>1 dia antes do vencimento</item>
+        <!-- slide 42d-->
+        <item>1 semana antes do vencimento</item>
+    </string-array>
+
+    <string-array name="EPr_default_reminders">
+        <!-- reminders: labels for "Task Defaults" preference item. -->
+        <!-- slide 43a -->
+        <item>Sem lembretes no vencimento</item>
+        <!-- slide 43b -->
+        <item>No vencimento</item>
+        <!-- slide 43c -->
+        <item>Quando vencida</item>
+        <!-- slide 43d -->
+        <item>No prazo ou vencidas</item>
+    </string-array>
+
+    <string-array name="EPr_default_addtocalendar">
+        <!-- addtocalendar: labels for "Task Defaults" preference item. -->
+        <item>@string/EPr_deactivated</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in filter plug-in -->
-    
+
     <!-- ================================================= Filter Exposer == -->
-    
+
     <!-- Active Tasks Filter -->
     <string name="BFE_Active">Minhas Tarefas</string>
-    
+
     <!-- Waiting on me filter -->
     <string name="BFE_waiting_on_me">Waiting On Me</string>
-        
+
     <!-- Search Filter -->
-    
+
     <!-- slide 10b: Recently Modified -->
     <string name="BFE_Recent">Modificadas recentemente</string>
-    
+
     <!-- slide 10c: I\'ve assigned -->
     <string name="BFE_Assigned">Atribuídas por mim</string>
-    
+
     <!-- Build Your Own Filter -->
-    
+
     <!-- Saved Filters Header -->
-    
+
     <!-- Saved Filters Context Menu: delete -->
     <string name="BFE_Saved_delete">Excluir Filtro</string>
 
     <!-- =========================================== CustomFilterActivity == -->
-    
+
     <!-- slide 30d: Build Your Own Filter Activity Title-->
     <string name="CFA_title">Filtro Personalizado</string>
-    
+
     <!-- slide 30e: Filter Name edit box hint (if user types here, filter will be saved) -->
     <string name="CFA_filterName_hint">Nome do filtro a salvar...</string>
-    
+
     <!-- Filter Name default for copied filters (%s => old filter name) -->
-    
+
     <!-- slide 30a: Filter Starting Universe: all tasks -->
     <string name="CFA_universe_all">Tarefas ativas</string>
-    
+
     <!-- Filter Criteria Type: add (at the begging of title of the criteria) -->
     <string name="CFA_type_add">OU</string>
-    
+
     <!-- Filter Criteria Type: subtract (at the begging of title of the criteria) -->
     <string name="CFA_type_subtract">NÃO</string>
-    
+
     <!-- Filter Criteria Type: intersect (at the begging of title of the criteria) -->
     <string name="CFA_type_intersect">E TAMBÉM</string>
-    
+
     <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
     <string name="CFA_context_chain">%s tem</string>
-    
+
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">Remover critério</string>
-    
+
     <!-- slide 30b: Filter Screen Help Text -->
     <string name="CFA_help">Long press on items for additional options</string>
-    
+
     <!-- slide 30c: Filter Button: add new -->
     <string name="CFA_button_add">Adicionar critério</string>
-    
+
     <!-- slide 30f: Filter Button: view without saving -->
     <string name="CFA_button_view">Visualizar</string>
-    
+
     <!-- Filter Button: save & view filter -->
     <string name="CFA_button_save">Salvar &amp; Visualizar</string>
 
     <!-- =========================================== CustomFilterCriteria == -->
-        
+
     <!-- Criteria: due by X - display text (? -> user input) -->
     <string name="CFC_dueBefore_text">Vencimento: ?</string>
     <!-- Criteria: due by X - name of criteria -->
@@ -1697,322 +1849,351 @@
         <item>Próxima semana</item>
         <item>Próximo mês</item>
     </string-array>
-    
+
     <!-- Criteria: importance - display text (? -> user input)-->
     <string name="CFC_importance_text">Priority at least ?</string>
     <!-- Criteria: importance - name of criteria -->
-    <string name="CFC_importance_name">Priority...</string>        
-    
+    <string name="CFC_importance_name">Priority...</string>
+
     <!-- Criteria: tag - display text (? -> user input) -->
     <string name="CFC_tag_text">Lista: ?</string>
     <!-- Criteria: tag - name of criteria -->
     <string name="CFC_tag_name">Lista...</string>
-    
+
     <!-- Criteria: tag_contains - name of criteria -->
     <string name="CFC_tag_contains_name">Nome da lista contém...</string>
     <!-- Criteria: tag_contains - text (? -> user input) -->
     <string name="CFC_tag_contains_text">Nome da lista contém: ?</string>
-    
+
     <!-- Criteria: title_contains - name of criteria -->
     <string name="CFC_title_contains_name">Título...</string>
     <!-- Criteria: title_contains - text (? -> user input) -->
     <string name="CFC_title_contains_text">Título contêm: ?</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-  
-  <!-- Error message for adding to calendar  -->
-  <string name="gcal_TEA_error">Erro ao inserir a tarefa no calendário!</string>
-
-  <!-- Label for adding task to calendar -->
-
-  <!-- slide 21c: Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">Inserir no calendário</string>
-  
-  <!-- Label when calendar event already exists -->
-  <string name="gcal_TEA_showCalendar_label">Abrir evento no calendário</string>
-  
-  <!-- Toast when unable to open calendar event -->
-  
-  <!-- Toast when calendar event updated because task changed -->
-  <string name="gcal_TEA_calendar_updated">Evento do calendário também atualizado!</string>
-  
-  <!-- No calendar label (don\'t add option) -->
-  <string name="gcal_TEA_nocal">Não adicionar</string>
-  
-  <string name="gcal_TEA_none_selected">To calendar?</string>
-  
-  <string name="gcal_TEA_has_event">Evento no calendário</string>
-  
-  <!-- ======================================================== Calendars == -->
-  
-  <!-- Calendar event name when task is completed (%s => task title) -->
-  <string name="gcal_completed_title">%s (concluído)</string>
-
-  <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
-  <string name="gcal_GCP_default">Calendário padrão</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Error message for adding to calendar  -->
+    <string name="gcal_TEA_error">Erro ao inserir a tarefa no calendário!</string>
 
+    <!-- Label for adding task to calendar -->
 
+    <!-- slide 21c: Label for adding task to calendar -->
+    <string name="gcal_TEA_addToCalendar_label">Inserir no calendário</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Label when calendar event already exists -->
+    <string name="gcal_TEA_showCalendar_label">Abrir evento no calendário</string>
+
+    <!-- Toast when unable to open calendar event -->
+
+    <!-- Toast when calendar event updated because task changed -->
+    <string name="gcal_TEA_calendar_updated">Evento do calendário também atualizado!</string>
+
+    <!-- No calendar label (don\'t add option) -->
+    <string name="gcal_TEA_nocal">Não adicionar</string>
+
+    <string name="gcal_TEA_none_selected">To calendar?</string>
+
+    <string name="gcal_TEA_has_event">Evento no calendário</string>
+
+    <!-- ======================================================== Calendars == -->
+
+    <!-- Calendar event name when task is completed (%s => task title) -->
+    <string name="gcal_completed_title">%s (concluído)</string>
+
+    <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
+    <string name="gcal_GCP_default">Calendário padrão</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ============================================================= UI == -->
 
     <!-- filters header: GTasks -->
     <string name="gtasks_FEx_header">Tarefas do Google</string>
-    
+
     <!-- filter category for GTasks lists -->
-    
+
     <!-- filter title for GTasks lists (%s => list name) -->
     <string name="gtasks_FEx_title">Tarefas do Google: %s</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_creating_list">Criando lista...</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_create_list_dialog">Nova lista</string>
-    
+
     <!-- error to show when list creation fails -->
     <string name="gtasks_FEx_create_list_error">Erro ao criar nova lista</string>
-    
+
     <!-- short help title for Gtasks -->
-    
+
     <string name="CFC_gtasks_list_text">Na lista: ?</string>
 
     <string name="CFC_gtasks_list_name">No Google Tasks...</string>
-    
+
     <!-- Message while clearing completed tasks -->
     <string name="gtasks_GTA_clearing">Limpando tarefas concluídas...</string>
-    
+
     <!-- Label for clear completed menu item -->
     <string name="gtasks_GTA_clear_completed">Limpeza concluída</string>
-        
+
     <!-- ============================================ GtasksLoginActivity == -->
-    
-    <!-- Activity Title: Gtasks Login -->    
 
-    <!-- Instructions: Gtasks login -->    
-    <string name="gtasks_GLA_body">Faça o login no Google Tasks (Beta!). Não migraram contas do Google Apps pois não são suportadas.</string>
-    
-    <string name="gtasks_GLA_noaccounts">Google não está disponível para sincronização com contas.</string>
+    <!-- Activity Title: Gtasks Login -->
 
-    <!-- Instructions: Gtasks further help -->    
-    <string name="gtasks_GLA_further_help">Para ver suas tarefas com indentação e ordem preservadas, vá para a página de filtros e selecione uma lista do Google Tasks. Por padrão, Astrid usa sua própria configuração de ordem de tarefas.</string>
+    <!-- Instructions: Gtasks login -->
+    <string name="gtasks_GLA_body">Faça o login no Google Tasks (Beta!). Não migraram contas do
+        Google Apps pois não são suportadas.
+    </string>
 
-    <!-- Sign In Button -->    
+    <string name="gtasks_GLA_noaccounts">Google não está disponível para sincronização com contas.
+    </string>
 
-    <!-- E-mail Address Label -->    
+    <!-- Instructions: Gtasks further help -->
+    <string name="gtasks_GLA_further_help">Para ver suas tarefas com indentação e ordem preservadas,
+        vá para a página de filtros e selecione uma lista do Google Tasks. Por padrão, Astrid usa
+        sua própria configuração de ordem de tarefas.
+    </string>
+
+    <!-- Sign In Button -->
+
+    <!-- E-mail Address Label -->
+
+    <!-- Password Label -->
 
-    <!-- Password Label -->    
-    
     <!--  Authenticating toast -->
     <string name="gtasks_GLA_authenticating">Autenticando ...</string>
-    
+
     <!-- Google Apps for Domain checkbox -->
 
-    <!-- Error Message when fields aren\'t filled out -->    
+    <!-- Error Message when fields aren\'t filled out -->
 
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
-    <string name="gtasks_GLA_errorAuth">Falha na autenticação! Verifique o usuário e senha no gerenciado de contas do dispositivo</string>
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
+    <string name="gtasks_GLA_errorAuth">Falha na autenticação! Verifique o usuário e senha no
+        gerenciado de contas do dispositivo
+    </string>
+
+    <!-- Error Message when we receive an IO Exception -->
+    <string name="gtasks_GLA_errorIOAuth">Desculpe-nos, tivemos problemas de comunicação com os
+        servidores do Google. Tente mais tarde.
+    </string>
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->
+    <string name="gtasks_GLA_errorAuth_captcha">Você pode ter encontrado um código de verificação.
+        Tente iniciar sessão pelo navegador, então retorne para tentar novamente:
+    </string>
 
-    <!-- Error Message when we receive an IO Exception -->    
-    <string name="gtasks_GLA_errorIOAuth">Desculpe-nos, tivemos problemas de comunicação com os servidores do Google. Tente mais tarde.</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->    
-    <string name="gtasks_GLA_errorAuth_captcha">Você pode ter encontrado um código de verificação. Tente iniciar sessão pelo navegador, então retorne para tentar novamente:</string>
-    
     <!-- ============================================== GtasksPreferences == -->
 
-    <!-- GTasks Preferences Title -->    
+    <!-- GTasks Preferences Title -->
     <string name="gtasks_GPr_header">Google Tarefas</string>
-    
-    <!-- ================================================ Synchronization == -->    
-    
+
+    <!-- ================================================ Synchronization == -->
+
     <!-- title for notification tray when synchronizing -->
 
     <!-- Error Message when we receive a HTTP 503 error -->
-    <string name="gtasks_error_backend">A API Google\'s Task API está em beta e encontrou um erro. O serviço pode estar inoperante, tente mais tarde.</string>
-    
+    <string name="gtasks_error_backend">A API Google\'s Task API está em beta e encontrou um erro. O
+        serviço pode estar inoperante, tente mais tarde.
+    </string>
+
     <!-- Error for account not found -->
-    <string name="gtasks_error_accountNotFound">Conta %s não encontrada--Desconecte-se e conecte-se novamente pelo painel Google Tasks</string>
-    
+    <string name="gtasks_error_accountNotFound">Conta %s não encontrada--Desconecte-se e conecte-se
+        novamente pelo painel Google Tasks
+    </string>
+
     <!-- Error when ping after refreshing token fails -->
-    <string name="gtasks_error_authRefresh">Incapaz de autenticar no Google Tasks. Verifique seu usuário e senha ou tente novamente.</string>
-    
+    <string name="gtasks_error_authRefresh">Incapaz de autenticar no Google Tasks. Verifique seu
+        usuário e senha ou tente novamente.
+    </string>
+
     <!-- Error when account manager returns no auth token or throws exception -->
-    <string name="gtasks_error_accountManager">Erro no gerenciado de contas do dispositivo. Desconecte-se e conecte-se novamente pelo painel Google Tasks</string>
+    <string name="gtasks_error_accountManager">Erro no gerenciado de contas do dispositivo.
+        Desconecte-se e conecte-se novamente pelo painel Google Tasks
+    </string>
 
     <!-- Error when authorization error happens in background sync -->
-    <string name="gtasks_error_background_sync_auth">Erro ao autenticar em plano de fundo. Por favor tente iniciar a sincronização enquanto o Astrid estiver rodando.</string>
-      
+    <string name="gtasks_error_background_sync_auth">Erro ao autenticar em plano de fundo. Por favor
+        tente iniciar a sincronização enquanto o Astrid estiver rodando.
+    </string>
+
     <string name="gtasks_import_progress">Importing Google Tasks...</string>
 
-    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you still want to add the task %2$s to it?</string>
+    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you
+        still want to add the task %2$s to it?
+    </string>
 
     <string name="gtasks_import_dlg_title">Google Tasks Import</string>
 
     <string name="gtasks_import_add_task_ok">Add task</string>
 
     <string name="gtasks_import_add_task_cancel">Don\'t add task</string>
-        
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- NEW USER EXPERIENCE -->
-  
-  <!-- help bubbles -->
-  <!-- slide 8c: Shown the first time a user sees the task list activity -->
-  <string name="help_popover_add_task">Comece inserindo uma tarefa ou duas</string>
-
-  <!-- Shown the first time a user adds a task to a list -->  
-  <string name="help_popover_tap_task">Toque para editar e compartilhar</string>
-  
-  <!-- slide 14a: Shown the first time a user sees the list activity -->
-  <string name="help_popover_list_settings">Toque para editar e compartilhar esta lista</string>
-  
-  <!-- slide 26c: Shown the first time a user sees the list settings tab -->
-  <string name="help_popover_collaborators">As pessoas com quem compartilha podem ajudá-lo\na construir sua lista ou concluir tarefas</string>
-  
-  <!-- Shown after user adds a task on tablet-->
-  <string name="help_popover_add_lists">Toque para adicionar uma lista</string>
-  
-  <!-- Shown after a user adds a task on phones -->
-  <string name="help_popover_switch_lists">Toque para inserir uma lista ou trocar entre listas</string>
-  
-  
-  
-  <!-- Login activity -->
-  
-  
-  <!-- slide 7b -->
-  <string name="welcome_login_tos_base">Ao usar Astrid você aceita os</string>
-  
-  <string name="welcome_login_tos_link">Termos do serviço</string>
-  
-  <!-- slide 7e -->
-  <string name="welcome_login_pw">Cadastre-se</string>
-  
-  <string name="welcome_sign_in">Autenticar</string>
-
-  <!-- slide 7f -->
-  <string name="welcome_login_later">Depois</string>
-  
-  <string name="welcome_login_confirm_later_title">Porque não se conectar?</string>
-  
-  <string name="welcome_login_confirm_later_ok">Eu farei!</string>
-  
-  <string name="welcome_login_confirm_later_cancel">Não, obrigado</string>
-  
-  <string name="welcome_login_confirm_later_dialog">Conecte-se para obter mais do Astrid! É de graça, você tem backup online, sincronização completa com Astrid.com e possibilidade de adicionar tarefas via email, podendo inclusive compartilhar com seus amigos!</string>
+    <!-- NEW USER EXPERIENCE -->
 
+    <!-- help bubbles -->
+    <!-- slide 8c: Shown the first time a user sees the task list activity -->
+    <string name="help_popover_add_task">Comece inserindo uma tarefa ou duas</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown the first time a user adds a task to a list -->
+    <string name="help_popover_tap_task">Toque para editar e compartilhar</string>
 
+    <!-- slide 14a: Shown the first time a user sees the list activity -->
+    <string name="help_popover_list_settings">Toque para editar e compartilhar esta lista</string>
 
-  <!-- Resources for built-in locale plug-in -->
-
-  <!-- Locale Alert Editing Window Title -->
-  <string name="locale_edit_alerts_title">Filtro de Alerta do Astrid</string>
-  
-  <!-- Locale Window Help -->                                                                                                                                            
-  <string name="locale_edit_intro">Astrid irá envirar um lembrete quando você tiver qualquer tarefa neste filtro:</string>
-      
-  <!-- Locale Window Filter Picker UI -->                                                                                                                                        
-      
-  <!-- Locale Window Interval Label -->                                                                                                                                        
-  <string name="locale_interval_label">Limitar notificações para:</string>        
-      
-  <!-- Locale Window Interval Values -->                                                                                                                                        
-  <string-array name="locale_interval">
-    <item>uma vez por hora</item>
-    <item>uma vez a cada seis horas</item>
-    <item>uma vez a cada doze horas</item>
-    <item>uma vez por dia</item>
-    <item>uma vez a cada três dias</item>
-    <item>uma vez por semana</item>
-  </string-array>        
-      
-  <!-- Locale Notification text -->                                                                                                                                        
-  <string name="locale_notification">Você tem $NUM resultados: $FILTER</string>     
-      
-  <!-- Locale Plugin was not found, it is required -->
-  <string name="locale_plugin_required">Por favor instale o plugin Astrid Locale!</string>        
-     
+    <!-- slide 26c: Shown the first time a user sees the list settings tab -->
+    <string name="help_popover_collaborators">As pessoas com quem compartilha podem ajudá-lo\na
+        construir sua lista ou concluir tarefas
+    </string>
 
+    <!-- Shown after user adds a task on tablet-->
+    <string name="help_popover_add_lists">Toque para adicionar uma lista</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown after a user adds a task on phones -->
+    <string name="help_popover_switch_lists">Toque para inserir uma lista ou trocar entre listas
+    </string>
+
+
+    <!-- Login activity -->
+
+
+    <!-- slide 7b -->
+    <string name="welcome_login_tos_base">Ao usar Astrid você aceita os</string>
+
+    <string name="welcome_login_tos_link">Termos do serviço</string>
+
+    <!-- slide 7e -->
+    <string name="welcome_login_pw">Cadastre-se</string>
+
+    <string name="welcome_sign_in">Autenticar</string>
+
+    <!-- slide 7f -->
+    <string name="welcome_login_later">Depois</string>
+
+    <string name="welcome_login_confirm_later_title">Porque não se conectar?</string>
+
+    <string name="welcome_login_confirm_later_ok">Eu farei!</string>
+
+    <string name="welcome_login_confirm_later_cancel">Não, obrigado</string>
+
+    <string name="welcome_login_confirm_later_dialog">Conecte-se para obter mais do Astrid! É de
+        graça, você tem backup online, sincronização completa com Astrid.com e possibilidade de
+        adicionar tarefas via email, podendo inclusive compartilhar com seus amigos!
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in locale plug-in -->
+
+    <!-- Locale Alert Editing Window Title -->
+    <string name="locale_edit_alerts_title">Filtro de Alerta do Astrid</string>
+
+    <!-- Locale Window Help -->
+    <string name="locale_edit_intro">Astrid irá envirar um lembrete quando você tiver qualquer
+        tarefa neste filtro:
+    </string>
+
+    <!-- Locale Window Filter Picker UI -->
+
+    <!-- Locale Window Interval Label -->
+    <string name="locale_interval_label">Limitar notificações para:</string>
+
+    <!-- Locale Window Interval Values -->
+    <string-array name="locale_interval">
+        <item>uma vez por hora</item>
+        <item>uma vez a cada seis horas</item>
+        <item>uma vez a cada doze horas</item>
+        <item>uma vez por dia</item>
+        <item>uma vez a cada três dias</item>
+        <item>uma vez por semana</item>
+    </string-array>
+
+    <!-- Locale Notification text -->
+    <string name="locale_notification">Você tem $NUM resultados: $FILTER</string>
+
+    <!-- Locale Plugin was not found, it is required -->
+    <string name="locale_plugin_required">Por favor instale o plugin Astrid Locale!</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ====================== Plugin Boilerplate ========================= -->
 
-	<!-- filters header: OpenCRX -->
+    <!-- filters header: OpenCRX -->
     <string name="opencrx_FEx_header">AbrirCRX</string>
-    
+
     <!-- filter category for OpenCRX ActivityCreators -->
     <string name="opencrx_FEx_dashboard">Espaços de trabalho</string>
-    
+
     <!-- filter category for OpenCRX responsible person -->
     <string name="opencrx_FEx_responsible">Atribuído a</string>
-    
+
     <!--  OpenCRX assignedTo filter title (%s => assigned contact) -->
     <string name="opencrx_FEx_responsible_title">Atribuído a \'%s\'</string>
-    
+
     <!-- detail for showing tasks created by someone else (%s => person name) -->
     <string name="opencrx_PDE_task_from">de %s</string>
-    
+
     <!-- replacement string for task edit "Notes" when using OpenCRX -->
     <string name="opencrx_TEA_notes">Inserir comentário</string>
-    
+
     <string name="opencrx_creator_input_hint">Criador</string>
 
     <string name="opencrx_contact_input_hint">Atribuído a</string>
     <!-- ==================================================== Preferences == -->
 
-    <!-- Preferences Title: OpenCRX -->    
+    <!-- Preferences Title: OpenCRX -->
     <string name="opencrx_PPr_header">AbrirCRX</string>
 
     <!-- creator title for tasks that are not synchronized -->
     <string name="opencrx_no_creator">(Não Sincronizar)</string>
 
-	<!-- preference title for default creator -->
+    <!-- preference title for default creator -->
     <string name="opencrx_PPr_defaultcreator_title">Criador de atividades Padrão</string>
 
     <!-- preference description for default creator (%s -> setting) -->
-    <string name="opencrx_PPr_defaultcreator_summary">Novas atividades serão criadas por: %s</string>
+    <string name="opencrx_PPr_defaultcreator_summary">Novas atividades serão criadas por: %s
+    </string>
 
     <!-- preference description for default dashboard (when set to \'not synchronized\') -->
-    <string name="opencrx_PPr_defaultcreator_summary_none">Novas atividades não serão sincronizados por padrão</string>
-    
+    <string name="opencrx_PPr_defaultcreator_summary_none">Novas atividades não serão sincronizados
+        por padrão
+    </string>
+
     <!--  OpenCRX host and segment group name -->
     <string name="opencrx_group">Servidor OpenCRX</string>
 
@@ -2021,81 +2202,88 @@
 
     <!--  dialog title for OpenCRX host -->
     <string name="opencrx_host_dialog_title">Máquina OpenCRX</string>
-    
+
     <!--  example for OpenCRX host -->
-    <string name="opencrx_host_summary">"Por exemplo: "<i>mydomain.com</i></string>
-    
+    <string name="opencrx_host_summary">"Por exemplo: "
+        <i>mydomain.com</i>
+    </string>
+
     <!--  preference description for OpenCRX segment -->
     <string name="opencrx_segment_title">Segmento</string>
 
     <!--  dialog title for OpenCRX segment -->
     <string name="opencrx_segment_dialog_title">Segmento Sincronizado</string>
-    
+
     <!--  example for OpenCRX segment -->
-    <string name="opencrx_segment_summary">"Por exemplo: "<i>Standard</i></string>
-    
+    <string name="opencrx_segment_summary">"Por exemplo: "
+        <i>Standard</i>
+    </string>
+
     <!--  default value for OpenCRX segment -->
     <string name="opencrx_segment_default">Qualidade</string>
-    
+
     <!--  preference description for OpenCRX provider -->
     <string name="opencrx_provider_title">Provedor</string>
 
     <!--  dialog title for OpenCRX provider -->
     <string name="opencrx_provider_dialog_title">Provedor de autenticação do OpenCRX</string>
-    
+
     <!--  example for OpenCRX provider -->
-    <string name="opencrx_provider_summary">"Por exemplo: "<i>CRX</i></string>
-    
+    <string name="opencrx_provider_summary">"Por exemplo: "
+        <i>CRX</i>
+    </string>
+
     <!--  default value for OpenCRX provider -->
     <string name="opencrx_provider_default">CRX</string>
     <!-- ================================================= Login Activity == -->
 
-    <!-- Activity Title: Opencrx Login -->    
+    <!-- Activity Title: Opencrx Login -->
     <string name="opencrx_PLA_title">Login para AbrirCRX</string>
 
-    <!-- Instructions: Opencrx login -->    
+    <!-- Instructions: Opencrx login -->
     <string name="opencrx_PLA_body">Entrar com sua conta OpenCRX</string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
     <string name="opencrx_PLA_signIn">Entrar</string>
 
-    <!-- Login Label -->    
+    <!-- Login Label -->
     <string name="opencrx_PLA_login">Login</string>
 
-    <!-- Password Label -->    
+    <!-- Password Label -->
     <string name="opencrx_PLA_password">Senha</string>
-    
-        <!-- Error Message when fields aren\'t filled out -->    
+
+    <!-- Error Message when fields aren\'t filled out -->
     <string name="opencrx_PLA_errorEmpty">Erro: preencha todos os campos</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
     <string name="opencrx_PLA_errorAuth">Erro: login ou senha incorreto!</string>
 
     <!-- ================================================ Synchronization == -->
-        
+
     <!-- title for notification tray after synchronizing -->
     <string name="opencrx_notification_title">AbrirCRX</string>
-    
+
     <!-- text for notification tray when synchronizing -->
-    <string name="opencrx_notification_text">%s tarefas atualizadas / clique para mais detalhes</string>
-    
+    <string name="opencrx_notification_text">%s tarefas atualizadas / clique para mais detalhes
+    </string>
+
     <!-- Error msg when io exception  -->
     <string name="opencrx_ioerror">Erro na Conexão! Verifique sua conexão com a internet.</string>
 
     <!-- opencrx Login not specified-->
     <string name="opencrx_MLA_email_empty">Login não foi especificado!</string>
-    
+
     <!-- opencrx password not specified-->
     <string name="opencrx_MLA_password_empty">A Senha não foi especificada!</string>
-    
+
     <!-- ================================================ labels for layout-elements == -->
-    
+
     <!-- label for task-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_task_assign_label">Atribuir essa tarefa a esta pessoa:</string>
-    
+
     <!-- Spinner-item for unassigned tasks on taskeditactivity -->
     <string name="opencrx_TEA_task_unassigned">&lt;Não atribuído&gt;</string>
-    
+
     <!-- label for dashboard-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_creator_assign_label">Atribuir essa tarefa a este criador:</string>
 
@@ -2103,7 +2291,7 @@
     <string name="opencrx_TEA_dashboard_default">&lt;Padrão&gt;</string>
 
     <string name="opencrx_TEA_opencrx_title">Controles do OpenCRX</string>
-        
+
     <string name="CFC_opencrx_in_workspace_text">Na área de trabalho: ?</string>
 
     <string name="CFC_opencrx_in_workspace_name">Na área de trabalho...</string>
@@ -2113,112 +2301,151 @@
     <string name="CFC_opencrx_assigned_to_name">Atribuído a ...</string>
 
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
+    <!-- ================================================== EditPreferences == -->
 
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 32j: Preference Category: Power Pack -->
-  <string name="EPr_powerpack_header">Configurações de Premium e misc.</string>
-  <string name="EPr_powerpack_summary">Lembretes de chamadas perdidas, entrada de voz e configurações diversas</string>
-  
-  <!-- slide 32e: Preference: Anonymous User Statistics -->
-  <string name="EPr_statistics_title">Status de uso anônimo</string>
-  <!-- Preference: User Statistics (disabled) -->
-  <string name="EPr_statistics_desc_disabled">Nenhum dado pessoal será enviado</string>  
-  <!-- slide 32f: Preference: User Statistics (enabled) -->
-  <string name="EPr_statistics_desc_enabled">Ajude-nos a melhorar o Astrid nos enviando dados anônimos de uso</string>
-      
+    <!-- slide 32j: Preference Category: Power Pack -->
+    <string name="EPr_powerpack_header">Configurações de Premium e misc.</string>
+    <string name="EPr_powerpack_summary">Lembretes de chamadas perdidas, entrada de voz e
+        configurações diversas
+    </string>
 
+    <!-- slide 32e: Preference: Anonymous User Statistics -->
+    <string name="EPr_statistics_title">Status de uso anônimo</string>
+    <!-- Preference: User Statistics (disabled) -->
+    <string name="EPr_statistics_desc_disabled">Nenhum dado pessoal será enviado</string>
+    <!-- slide 32f: Preference: User Statistics (enabled) -->
+    <string name="EPr_statistics_desc_enabled">Ajude-nos a melhorar o Astrid nos enviando dados
+        anônimos de uso
+    </string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
-    <string name="speech_err_network">Erro de rede! Reconhecimento de fala requer uma conexão com a rede para funcionar.</string>
-    <string name="speech_err_no_match">Desculpe, eu não consegui entender! Por favor tente de novo.</string>
-    <string name="speech_err_default">Desculpa, reconhecimento de fala encontrou um erro. Por favor, tente novamente.</string>
-    
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <string name="speech_err_network">Erro de rede! Reconhecimento de fala requer uma conexão com a
+        rede para funcionar.
+    </string>
+    <string name="speech_err_no_match">Desculpe, eu não consegui entender! Por favor tente de
+        novo.
+    </string>
+    <string name="speech_err_default">Desculpa, reconhecimento de fala encontrou um erro. Por favor,
+        tente novamente.
+    </string>
+
     <string name="premium_attach_file">Anexar um arquivo</string>
     <string name="premium_record_audio">Gravar uma nota</string>
     <string name="premium_no_files">Sem arquivos anexados.</string>
     <string name="premium_remove_file_confirm">Você tem certeza? Não pode ser desfeito</string>
-    
+
     <string name="audio_recording_title">Gravando Áudio</string>
     <string name="audio_stop_recording">Parar Gravação</string>
     <string name="audio_speak_now">Fale Agora!</string>
     <string name="audio_encoding">Codificando...</string>
     <string name="audio_err_encoding">Erro codificando audio</string>
-    <string name="audio_err_playback">Desculpas, o sistema não suporta este tipo de arquivo de áudio</string>
-    
-    <string name="search_market_audio">"Não foi encontrado um reprodutor que manipule este tipo de áudio.  Você gostaria de baixar um reprodutor de áudio no Android Market?"</string>
+    <string name="audio_err_playback">Desculpas, o sistema não suporta este tipo de arquivo de
+        áudio
+    </string>
+
+    <string name="search_market_audio">"Não foi encontrado um reprodutor que manipule este tipo de
+        áudio. Você gostaria de baixar um reprodutor de áudio no Android Market?"
+    </string>
     <string name="search_market_audio_title">Não foi encontrado um reprodutor de áudio</string>
 
-    <string name="search_market_pdf">Nenhum leitor de PDF foi encontrado. Você gostaria de baixar um leitor de PDF no Android Market?</string>
+    <string name="search_market_pdf">Nenhum leitor de PDF foi encontrado. Você gostaria de baixar um
+        leitor de PDF no Android Market?
+    </string>
     <string name="search_market_pdf_title">Nenhum leitor de PDF foi encontrado</string>
 
-    <string name="search_market_ms">Nenhum leitor MS Office foi encontrado. Você gostaria de baixar um leitor MS Office através do Android Market?</string>
+    <string name="search_market_ms">Nenhum leitor MS Office foi encontrado. Você gostaria de baixar
+        um leitor MS Office através do Android Market?
+    </string>
     <string name="search_market_ms_title">Nenhum leitor MS Office encontrado</string>
-    
-    <string name="file_type_unhandled">Desculpa! Nenhuma aplicação para manipular este tipo de arquivo foi encontrada.</string>
+
+    <string name="file_type_unhandled">Desculpa! Nenhuma aplicação para manipular este tipo de
+        arquivo foi encontrada.
+    </string>
     <string name="file_type_unhandled_title">Aplicação não encontrada</string>
-    
+
     <string name="file_prefix_image">Imagem</string>
     <string name="file_prefix_voice">Voz</string>
     <string name="file_browser_up">Subir</string>
     <string name="file_browser_title">Escolha um arquivo</string>
     <string name="dir_browser_title">Escolha um diretório</string>
-    <string name="file_browser_err_permissions">Erro de permissões! Certifique-se de que você não bloqueou o Astrid de acessar o cartão SD.</string>
+    <string name="file_browser_err_permissions">Erro de permissões! Certifique-se de que você não
+        bloqueou o Astrid de acessar o cartão SD.
+    </string>
     <string name="file_add_picture">Anexe uma imagem</string>
     <string name="file_add_sdcard">Anexe um arquivo do seu cartão SD</string>
     <string name="file_download_title">Baixar arquivo?</string>
-    <string name="file_download_body">Este arquivo não foi baixado para seu cartão SD. Baixar agora?</string>
+    <string name="file_download_body">Este arquivo não foi baixado para seu cartão SD. Baixar
+        agora?
+    </string>
     <string name="file_download_progress">Baixando...</string>
     <string name="file_err_memory">A imagem é muito grande para caber na memória</string>
     <string name="file_err_copy">Erro ao copiar o arquivo para o anexo</string>
     <string name="file_err_download">Erro na transferência do arquivo</string>
-    <string name="file_err_no_directory">Ops! Parece que este diretório de arquivos não existe. Por favor escolha um diretório para salvar os arquivos nas preferências do Astrid.</string>
+    <string name="file_err_no_directory">Ops! Parece que este diretório de arquivos não existe. Por
+        favor escolha um diretório para salvar os arquivos nas preferências do Astrid.
+    </string>
     <string name="file_err_show">Desculpa, o sistema ainda não suporta este tipo de arquivo</string>
-    
+
     <string name="file_dir_dialog_ok">Usar este diretório</string>
     <string name="file_dir_dialog_default">Restaurar padrões</string>
-    
+
     <string name="p_files_dir">Diretório de downloads Premium</string>
     <!-- Description for file download directory preference. %s -> chosen directory -->
     <string name="p_files_dir_desc">Anexos da tarefa salvos em: %s</string>
     <string name="p_files_dir_desc_default">Diretório padrão</string>
 
-    
+
     <!-- in app billing -->
     <string name="billing_not_supported_title">Não pode fazer compras</string>
-    <string name="billing_not_supported_message">O serviço de faturamento do Market não está disponível no momento. Você pode continuar usando o aplicativo mas não será capaz de fazer compras.</string>
+    <string name="billing_not_supported_message">O serviço de faturamento do Market não está
+        disponível no momento. Você pode continuar usando o aplicativo mas não será capaz de fazer
+        compras.
+    </string>
     <string name="subscriptions_not_supported_title">Não pode adquirir assinaturas</string>
-    <string name="subscriptions_not_supported_message">O serviço de faturamento do Market neste dispositivo não suporta assinaturas atualmente. Você pode assinar o Astrid Premium em http://astrid.com/premium.</string>
+    <string name="subscriptions_not_supported_message">O serviço de faturamento do Market neste
+        dispositivo não suporta assinaturas atualmente. Você pode assinar o Astrid Premium em
+        http://astrid.com/premium.
+    </string>
     <string name="cannot_connect_title">Não pode se conectar ao Market.</string>
-    <string name="cannot_connect_message">Este aplicativo não pode conectar ao Market. Sua versão do Market deve estar desatualizada. Você pode continuar a usar este aplicativo mas não poderá fazer compras.</string>
-    
+    <string name="cannot_connect_message">Este aplicativo não pode conectar ao Market. Sua versão do
+        Market deve estar desatualizada. Você pode continuar a usar este aplicativo mas não poderá
+        fazer compras.
+    </string>
+
     <string name="restoring_transactions">Restaurando transações.</string>
-    
+
     <string name="subscriptions_learn_more">Aprenda mais</string>
-    
-    <string name="kii_premium_success">Thanks for participating in this offer! Your free month of Astrid Premium is now unlocked.</string>
+
+    <string name="kii_premium_success">Thanks for participating in this offer! Your free month of
+        Astrid Premium is now unlocked.
+    </string>
     <string name="kii_premium_abort">Special offer aborted</string>
     <string name="kii_premium_declined">Special offer declined</string>
-    <string name="kii_premium_error">There was an error processing this offer. Please try again later.</string>
-    
+    <string name="kii_premium_error">There was an error processing this offer. Please try again
+        later.
+    </string>
+
     <string name="premium_offers_title">Special Offer</string>
     <string name="premium_offers_subtitle">Want one month of Astrid Premium for free?</string>
-    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a short video by this sponsor. (They will also require your email address.)</string>
+    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a
+        short video by this sponsor. (They will also require your email address.)
+    </string>
     <string name="premium_offers_start">Get it free!</string>
-    
+
     <string name="premium_billing_title">Astrid Premium</string>
     <string name="premium_buy_month">1 mês</string>
     <string name="premium_buy_year">1 ano</string>
@@ -2232,727 +2459,772 @@
     <string name="premium_speech_bubble_1">Premium vai aumentar sua produtividade!</string>
     <string name="premium_speech_bubble_2">Contrate um ano e tenha 25%% de desconto</string>
     <string name="premium_already_subscribed">Você já se inscreveu para o Astrid Premium!</string>
-    <string name="premium_login_prompt">Você precisa ter uma conta Astrid.com para solicitar a inscrição para o Premium. Por favor, faça o login ou registre-se.</string>
+    <string name="premium_login_prompt">Você precisa ter uma conta Astrid.com para solicitar a
+        inscrição para o Premium. Por favor, faça o login ou registre-se.
+    </string>
     <string name="premium_success">Obrigado por se inscrever no Astrid Premium!</string>
-    <string name="premium_success_with_server_error">Obrigado por assinar o Astrid Premium! Os novos recursos serão desbloqueados para você em astrid.com em breve e devem estar disponíveis em seu telefone imediatamente.</string>
-    <string name="premium_verification_error">A assinatura premium para esta conta Google Play está conectada com um usuário diferente. Para conectar e-mails adicionais em sua conta, visite http://astrid.com/users/profile</string>
-    <string name="premium_check_for_purchases">Já comprou premium? Clique aqui para verificar registo de compras no Google Play.</string>
+    <string name="premium_success_with_server_error">Obrigado por assinar o Astrid Premium! Os novos
+        recursos serão desbloqueados para você em astrid.com em breve e devem estar disponíveis em
+        seu telefone imediatamente.
+    </string>
+    <string name="premium_verification_error">A assinatura premium para esta conta Google Play está
+        conectada com um usuário diferente. Para conectar e-mails adicionais em sua conta, visite
+        http://astrid.com/users/profile
+    </string>
+    <string name="premium_check_for_purchases">Já comprou premium? Clique aqui para verificar
+        registo de compras no Google Play.
+    </string>
     <string name="premium_checking_for_purchases">Verificando compras...</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- 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">Lembre me:</string>
-
-  <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">no dia que a tarefa vencer</string>
-
-  <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">quando a tarefa estiver atrasada</string>
-
-  <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_randomly">Aleatoriamente uma vez</string>
-
-  <!-- Task Edit: Reminder alarm clock label -->  
-  <string name="TEA_reminder_alarm_label">Tipo de toque/vibração:</string>
-
-  <!--  slide 45a: Task Edit: Reminder mode: ring once -->  
-  <string name="TEA_reminder_mode_once">Once</string>
-
-  <!-- slide 45b: Task Edit: Reminder mode: ring five times -->  
-  <string name="TEA_reminder_mode_five">Five times</string>
-
-  <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->  
-  <string name="TEA_reminder_mode_nonstop">Until I dismiss alarm</string>
-  
-  <string name="TEA_reminder_when">when</string>
-  
-  <string name="TEA_reminder_due_short">due</string>
-
-  <string name="TEA_reminder_overdue_short">overdue</string>
-
-  <string name="TEA_reminder_randomly_short">randomly</string>
-
-  <string name="TEA_reminder_display_one">Remind me %s</string>
-  
-  <string name="TEA_reminder_display_multiple">Remind %s</string>
-
-  <string-array name="TEA_reminder_random">
-    <!-- random reminder choices for task edit page. -->
-    <item>por hora</item>
-    <item>por dia</item>
-    <item>por semana</item>
-    <item>a cada duas semanas</item>
-    <item>a cada mês</item>
-    <item>a cada dois meses</item>
-  </string-array>
-  
-  <!-- ==================================================== notifications == -->
-  
-  <!-- Name of filter when viewing a reminder -->
-  <string name="rmd_NoA_filter">Lembrete!</string>
-  
-  <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Concluída</string>
-  
-  <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Adiar</string>
-  
-  <!-- Reminder: Completed Toast -->
-  <string name="rmd_NoA_completed_toast">Parabéns!</string>
-  
-  <!-- Prefix for reminder dialog title -->
-  <string name="rmd_NoA_dlg_title">Lembrete:</string>
-  
-  <!-- ==================================================== user reengagement == -->
-
-  <!-- Titles for user reengagement notifications -->
-  <string-array name="rmd_reengage_notif_titles">
-    <item>Uma nota do Astrid</item>
-    <!-- %s -> first name -->
-    <item>Recado para %s.</item> 
-    <item>Seu resumo no Astrid</item>
-    <item>Lembretes do Astrid</item>
-  </string-array>
-    
-  <string name="rmd_reengage_name_default">você</string>
-
-  
-  <string name="rmd_reengage_add_tasks">Inserir tarefa</string>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs -->
-  <string-array name="rmd_reengage_dialog_options">
-    <item>Hora de diminuir sua lista de tarefas!</item>
-    <item>Prezado sr. ou sra., algumas tarefas aguardam sua inspeção!</item>
-    <item>Olá, você poderia dar uma olhada nissos?</item>
-    <item>Eu achei algumas tarefas com seu nome nelas!</item>
-    <item>Um novo lote de tarefas para você hoje!</item>
-    <item>Você parece fabuloso! Pronto para começar?</item>
-    <item>Um dia amável para concluir alguns trabalhos, eu acho!</item>
-  </string-array>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>Você não quer se organizar?</item>
-    <item>Sou Astrid! Estou aqui para te ajudar a fazer mais!</item>
-    <item>Você parece ocupado! Deixe-me tirar algumas tarefas de seu prato.</item>
-    <item>Eu posso te ajudar a manter o controle sobre todos os detalhes de sua vida.</item>
-    <item>Está falando sério sobre estar fazendo mais? Eu também!</item>
-    <item>Prazer em conhecê-lo!</item>
-  </string-array>
-  <!-- ============================================= reminder preferences == -->
-  
-  <!-- slide 33d: Reminder Preference Screen Title -->
-  <string name="rmd_EPr_alerts_header">Configurações de lembretes</string>
-  <string name="rmd_EPr_alerts_summary">Horas quieto, opções de soneca, nível de persistência</string>
-    
-  <!-- Reminder Preference: Reminders Enabled Title -->
-  <string name="rmd_EPr_enabled_title">Habilitar lembretes?</string>
-  <!-- Reminder Preference Reminders Enabled Description (true) -->
-  <string name="rmd_EPr_enabled_desc_true">Os lembretes Astrid estão habilitados</string>
-  <!-- Reminder Preference Reminders Enabled Description (false) -->
-  <string name="rmd_EPr_enabled_desc_false">Os lembretes nunca aparecerão</string>  
-    
-  <!-- Reminder Preference: Quiet Hours Start Title -->
-  <string name="rmd_EPr_quiet_hours_start_title">Começam as horas calmas</string>
-  <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">Notificações irão silenciar depois de %s.\nNota: vibrações são controladas pelo Vibrate na configuração de alarme.</string>
-  <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
-  <string name="rmd_EPr_quiet_hours_desc_none">Horário de silêncio está desativado</string>
-  
-  <!-- Reminder Preference: Quiet Hours End Title -->
-  <string name="rmd_EPr_quiet_hours_end_title">Fim das horas calmas</string>
-  <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_end_desc">As notificações ficarão normais (sonoras) a partir de %s</string>
-
-  <!-- Reminder Preference: Default Reminder Title -->
-  <string name="rmd_EPr_rmd_time_title">Lembrete padrão</string>
-  <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
-  <string name="rmd_EPr_rmd_time_desc">Notificações de tarefas sem tempo de vencimento vão aparecer em %s</string>
-
-  <!-- Reminder Preference: Notification Ringtone Title -->
-  <string name="rmd_EPr_ringtone_title">Toque de notificação</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
-  <string name="rmd_EPr_ringtone_desc_custom">Toque personalizado foi definido</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
-  <string name="rmd_EPr_ringtone_desc_silent">Campainha definida para silencioso</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
-  <string name="rmd_EPr_ringtone_desc_default">Campainha padrão será utilizada</string>
-  
-  <!-- Reminder Preference: Notification Persistence Title -->
-  <string name="rmd_EPr_persistent_title">Notificação persistente</string>
-  <!-- Reminder Preference: Notification Persistence Description (true) -->
-  <string name="rmd_EPr_persistent_desc_true">Cada notificação precisa ser vista individualmente</string>
-  <!-- Reminder Preference: Notification Persistence Description (false) -->
-  <string name="rmd_EPr_persistent_desc_false">Notificações podem ser eliminadas com o botão \"Eliminar Todas\"</string>
-
-  <!-- Reminder Preference: Social Reminders Title -->
-  <string name="rmd_EPr_social_title">Social encouragement</string>
-  <!-- Reminder Preference: Social Reminders Summary (enabled) -->
-  <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for shared tasks</string>
-  <!-- Reminder Preference: Social Reminders Summary (disabled) -->
-  <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you for shared tasks</string>
-  
-  
-  
-  <!-- Reminder Preference: Notification Icon Title -->
-  <!-- Reminder Preference: Notification Icon Description -->
-
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
-  <string name="rmd_EPr_multiple_maxvolume_title">Volume máximo para lembretes com múltiplos sons</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid irá aumentar o volume para alertas com múltiplos sons</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid usará os ajustes de sistema para o volume</string>
-
-  <!-- Reminder Preference: Vibrate Title -->
-  <string name="rmd_EPr_vibrate_title">Vibração de alerta</string>
-  <!-- Reminder Preference: Vibrate Description (true) -->
-  <string name="rmd_EPr_vibrate_desc_true">Astrid irá vibrar quando enviar notificações</string>
-  <!-- Reminder Preference: Vibrate Description (false) -->
-  <string name="rmd_EPr_vibrate_desc_false">Astrid não irá vibrar quando enviar notificações</string>
-
-  <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">Encorajamento Astrid</string>
-  <!-- Reminder Preference: Nagging Description (true) -->
-  <string name="rmd_EPr_nagging_desc_true">Astrid usará de incentivos nos lembretes</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_nagging_desc_false">Astrid não dará nenhuma mensagem de encorajamento.</string>
-
-  <!-- Reminder Preference: Snooze Dialog Title -->  
-  <string name="rmd_EPr_snooze_dialog_title">Soneca HH:MM</string>
-  <!-- Reminder Preference: Snooze Dialog Description (true) -->
-  <string name="rmd_EPr_snooze_dialog_desc_true">Adiar em horas/minutos</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_snooze_dialog_desc_false">Adiar em # dias/horas</string>
-  
-  <!-- slide 44g: Reminder Preference: Default Reminders Title -->
-  <string name="rmd_EPr_defaultRemind_title">Lembretes aleatórios</string>
-  <!-- Reminder Preference: Default Reminders Setting (disabled) -->
-  <string name="rmd_EPr_defaultRemind_desc_disabled">Novas tarefas não terão lembretes aleatórios</string>
-  <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
-  <string name="rmd_EPr_defaultRemind_desc">Novas tarefas irão lembrar aleatoriamente: %s</string>
-  
-  <!-- slide 39a: Defaults Title -->
-  
-  <string-array name="EPr_reminder_random">
-    <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
-    <item>desabilitado</item>
-    <!-- slide 44b -->
-    <item>de hora em hora</item>
-    <!-- slide 44c -->
-    <item>diariamente</item>
-    <!-- slide 44d-->
-    <item>semanalmente</item>
-    <!-- slide 44e-->
-    <item>a cada duas semanas</item>
-    <!-- slide 44f -->
-    <item>mensalmente</item>
-    <item>a cada dois meses</item>
-  </string-array>
-        
-  <string-array name="EPr_quiet_hours_start">
-    <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
-    <item>desabilitado</item>
-    <item>8 PM</item>
-    <item>9 PM</item>
-    <item>10 PM</item>
-    <item>11 PM</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
-    <item>9 AM</item>
-    <item>10 AM</item>
-    <item>11 AM</item>
-    <item>12 PM</item>
-    <item>1 PM</item>
-    <item>2 PM</item>
-    <item>3 PM</item>
-    <item>4 PM</item>
-    <item>5 PM</item>
-    <item>6 PM</item>
-    <item>7 PM</item>
-  </string-array>
-  
-  <string-array name="EPr_quiet_hours_end">
-    <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
-    <item>9 AM</item>
-    <item>10 AM</item>
-    <item>11 AM</item>
-    <item>12 PM</item>
-    <item>1 PM</item>
-    <item>2 PM</item>
-    <item>3 PM</item>
-    <item>4 PM</item>
-    <item>5 PM</item>
-    <item>6 PM</item>
-    <item>7 PM</item>
-    <item>8 PM</item>
-    <item>9 PM</item>
-    <item>10 PM</item>
-    <item>11 PM</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
-  </string-array>
-  
-  <string-array name="EPr_rmd_time">
-    <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
-    <item>9 AM</item>
-    <item>10 AM</item>
-    <item>11 AM</item>
-    <item>12 PM</item>
-    <item>1 PM</item>
-    <item>2 PM</item>
-    <item>3 PM</item>
-    <item>4 PM</item>
-    <item>5 PM</item>
-    <item>6 PM</item>
-    <item>7 PM</item>
-    <item>8 PM</item>
-    <item>9 PM</item>
-    <item>10 PM</item>
-    <item>11 PM</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
-  </string-array>
-  
-  <!-- =============================================== random reminders == -->
-
-  <string name="reminders_social">Estas pessoas estão a contar consigo!</string>
-  
-  <string name="reminders_social_one">%s is counting on you!</string>
-  
-  <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
-
-  <string-array name="reminders">
-      <!-- reminders: Make these < 20 chars so the task name is displayed -->
-      <item>Olá você! Tem um minuto?</item>
-      <item>Posso vê-lo por um segundo?</item>
-      <item>Tem alguns minutos?</item>
-      <item>Você esqueceu?</item>
-      <item>Dá licença!</item>
-      <item>Quando você tiver um minuto:</item>
-      <item>Na sua agenda:</item>
-      <item>Você está livre?</item>
-      <item>Astrid aqui!</item>
-      <item>Ola! Posso pertubar você?</item>
-      <item>Um minuto do seu tempo?</item>
-      <item>É um bom dia para</item>
-  </string-array>
-
-  <string-array name="reminders_due">
-      <!-- reminders related to task due date -->
-      <item>Hora de trabalhar!</item>
-      <item>O Prazo está acabando</item>
-      <item>Pronto para começar?</item>
-      <item>Você disse que ía fazer:</item>
-      <item>Você devia começar:</item>
-      <item>Hora de começar:</item>
-      <item>É a hora!</item>
-      <item>Licença! Hora de</item>
-      <item>Você está livre? Hora para</item>
-  </string-array>
-
-  <string-array name="reminders_snooze">
-      <!-- reminders related to snooze -->
-      <item>Não seja preguiçoso agora!</item>
-      <item>Acabou a pausa!</item>
-      <item>Não dá pra adiar mais!</item>
-      <item>Agora você está pronto(a)?</item>
-      <item>Pare de adiar!</item>
-  </string-array>
-  
-  <string-array name="reminder_responses">
-      <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
-      <item>Tenho uma coisa para você!</item> 
-      <item>Hora de deixar isso no seu passado?</item>
-      <item>Porque você não deixa isso pronto?</item>
-      <item>E aí? Pronto tigrão,tigreza?</item>
-      <item>Pronto para isso?</item>
-      <item>Você consegue lidar com isso?</item>
-      <item>Você pode ser feliz! É só terminar isso!</item>
-      <item>Se terminar isso se sentirá bem melhor!</item>
-      <item>Você não fará isso hoje?</item>
-      <item>Por favor termine isso, já estou enjoado disso!</item>
-      <item>Você pode terminar isso? Sim, você pode!</item>
-      <item>Algum dia você vai fazer isso?</item>
-      <item>Você vai se sentir bem melhor! Vamos lá!</item>
-      <item>Estou tão orgulhoso de você! Vamos terminar isso!</item>
-      <item>Que tal lanchinho depois que você terminar isso?</item>
-      <item>Só mais essa, ok?</item>
-      <item>Hora de terminar essa tarefa!</item>
-      <item>Você é do time da bagunça ou da limpeza? Limpeza! Vamos!</item>
-      <item>Eu mencionei que você está incrível esses dias? Continue assim!</item>
-      <item>Uma tarefa por dia manda a bagunça embora... Tchau bagunça!</item>
-      <item>Como você fez isso? Nossa, estou impressionado!</item>
-      <item>Você não vai conseguir simplesmente pela sua boa aparência. Vamos lá!</item>
-      <item>Tempo bom para um trabalho como este, você não acha?</item>
-      <item>Vai um cafezinho enquanto você trabalha nisto?</item>
-      <item>Se você terminar isto, pode ir lá fora brincar :-)</item>
-      <item>É agora. Você não pode adiar o inevitável.</item>
-      <item>Eu morro um pouquinho cada vez que você me ignora.</item>
-  </string-array>
-
-  <string-array name="postpone_nags">
-      <!-- Astrid\'s nagging when user clicks postpone -->
-      <item>Não me diga que você vive adiando as coisas!</item>
-      <item>Ser preguiçoso(a) não fica cansativo de vez em quando?</item>
-      <item>Em algum lugar, alguém está dependendo de você para terminar isso!</item>
-      <item>Quando você disse adiar, você realmente quis dizer \'Vou fazer isso agora\', certo?</item>
-      <item>Essa é a última vez que você adia isso, certo?</item>
-      <item>Termina isso hoje, eu não vou contar para ninguém!</item>
-      <item>Porque adiar se você pode, hmm... não adiar!</item>
-      <item>Suponho que vai terminar isso algum dia, certo?</item>
-      <item>Eu acho que você é realmente ótimo! Que tal não deixar isso de lado?</item>
-      <item>Você vai alcançar seus objetivos se você fizer isso?</item>
-      <item>Adiar, adiar, adiar. Quando você vai mudar!</item>
-      <item>Já estou cheio das suas desculpas! Faça isso agora!</item>
-      <item>Você não inventou essa desculpa na última vez?</item>
-      <item>Eu não vou poder ajudar você a organizar a sua vida se você fizer isso...</item>
-  </string-array>
+    <!-- Resources for built-in reminders plug-in -->
 
+    <!-- =============================================== task edit activity == -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder group label -->
+    <string name="TEA_reminders_group_label">Reminder settings</string>
 
+    <!-- Task Edit: Reminder header label -->
+    <string name="TEA_reminder_label">Lembre me:</string>
 
-  <!-- Resources for built-in repeat plug-in -->
-
-  <!-- repeating plugin name -->
-  <string name="repeat_plugin">Tarefas recorrentes</string>
-  
-  <!-- repeating plugin description -->
-  <string name="repeat_plugin_desc">Permitir tarefas recorrentes</string>
-  
-  <!-- slide 20a: checkbox for turning on/off repeats -->
-  <string name="repeat_enabled">Repetir</string>
-  
-  <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
-  <string name="repeat_every">A cada %d</string>
-  
-  <!-- hint when opening repeat interval -->
-  <string name="repeat_interval_prompt">Intervalo de repetição</string>
-  
-  <!-- slide 19b-->
-  <string name="repeat_never">Not repeating</string>
-  <!-- slide 20f-->
-  <string name="repeat_dont">Não repetir</string>
-      
-  <string-array name="repeat_interval_short">
-    <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
-    <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">
-    <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>Dia(s)</item>
-    <item>Semana(s)</item>
-    <item>Mês(es)</item>
-    <item>Hora(s)</item>
-    <item>Minuto(s)</item>
-    <item>Ano(s)</item>
-  </string-array>
-  
-  <string name="repeat_days">dias</string>
-  <string name="repeat_weekdays">weekdays</string>
-  <string name="repeat_weeks">weeks</string>
-  <string name="repeat_months">months</string>
-  <string name="repeat_years">years</string>
-  <string name="repeat_hours">hours</string>
-  <string name="repeat_minutes">minutos</string>
-  
-  <string-array name="repeat_until_shortcuts">
-      <item>Para sempre</item>
-      <item>Dia Específico</item>
-      <item>Hoje</item>
-      <item>Amanhã</item>
-      <item>(depois de amanhã)</item>
-      <item>Próxima semana</item>
-      <item>Em Duas Semanas</item>
-      <item>Próximo mês</item>
-  </string-array>
-  
-  <string name="repeat_until_title">Repetir até...</string>
-  
-  <string name="repeat_keep_going">Continue</string>
-  
-  <string-array name="repeat_type">
-    <!-- slide 20c: repeat type (date to repeat from) -->
-    <item>à partir do dia do prazo final</item>
-    <!-- slide 20c -->
-    <item>à partir do dia de realização</item>
-  </string-array>
-  
-  <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
-  <string name="repeat_detail_byday">$I na $D</string>
-  
-  <!-- task detail for repeat from due date (%s -> interval) -->
-  <string name="repeat_detail_duedate">a cada %s</string>
-
-  <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
-  <string name="repeat_detail_duedate_until">Todo %1$s\naté %2$s</string>
-  
-  <!-- task detail for repeat from completion date (%s -> interval) -->
-  <string name="repeat_detail_completion">%s após a conclusão</string>
-  
-  <!-- text for button when repeating task indefinitely -->
-  <string name="repeat_forever">Repetir para sempre</string>
-
-  <!-- text for button when repeating task until specified date (%s -> date string) -->
-  <string name="repeat_until">Repetir até %s</string>
-  
-  <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title">Reagendando tarefa \"%s\"</string>
-
-  <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title_last_time">Tarefa repetida concluída \"%s\"</string>
-      
-  <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->  
-  <string name="repeat_rescheduling_dialog_bubble">"%1$s,  reagendei esta tarefa recorrente de %2$s para %3$s"</string>
-  
-  <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
-  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s Eu reagendei esta tarefa recorrente para %2$s</string>
-  
-  <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
-  <string name="repeat_rescheduling_dialog_bubble_last_time">Você estava repetindo isto até %1$s e agora você concluíu. %2$s</string>
-  
-  <string-array name="repeat_encouragement">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>Bom trabalho!</item>
-      <item>Oba… Estou orgulhoso de você!</item>
-      <item>Eu adoro quando você é produtivo(a)!</item>
-      <item>Não é bom quando a gente tira um peso da consciência?</item>
-  </string-array>
-
-  <string-array name="repeat_encouragement_last_time">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>Bom trabalho!</item>
-      <item>Estou tão orgulhoso de você!</item>
-      <item>Eu adoro quando você é produtivo(a)!</item>
-  </string-array>
-  
+    <!-- Task Edit: Reminder @ deadline -->
+    <string name="TEA_reminder_due">no dia que a tarefa vencer</string>
 
+    <!-- Task Edit: Reminder after deadline -->
+    <string name="TEA_reminder_overdue">quando a tarefa estiver atrasada</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder at random times (%s => time plural)-->
+    <string name="TEA_reminder_randomly">Aleatoriamente uma vez</string>
 
-    
-  <!-- Subtasks Help Introduction -->
-  <string name="subtasks_help_title">Ordenar e Recuar no Astrid</string>
-  <string name="subtasks_help_1">Toque e segure para mover a tarefa</string>
-  <string name="subtasks_help_2">Arraste verticalmente para reordenar</string>
-  <string name="subtasks_help_3">Arraste verticalmente para recuar</string>
-    
+    <!-- Task Edit: Reminder alarm clock label -->
+    <string name="TEA_reminder_alarm_label">Tipo de toque/vibração:</string>
 
+    <!--  slide 45a: Task Edit: Reminder mode: ring once -->
+    <string name="TEA_reminder_mode_once">Once</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 45b: Task Edit: Reminder mode: ring five times -->
+    <string name="TEA_reminder_mode_five">Five times</string>
+
+    <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
+    <string name="TEA_reminder_mode_nonstop">Until I dismiss alarm</string>
+
+    <string name="TEA_reminder_when">when</string>
+
+    <string name="TEA_reminder_due_short">due</string>
+
+    <string name="TEA_reminder_overdue_short">overdue</string>
+
+    <string name="TEA_reminder_randomly_short">randomly</string>
+
+    <string name="TEA_reminder_display_one">Remind me %s</string>
+
+    <string name="TEA_reminder_display_multiple">Remind %s</string>
+
+    <string-array name="TEA_reminder_random">
+        <!-- random reminder choices for task edit page. -->
+        <item>por hora</item>
+        <item>por dia</item>
+        <item>por semana</item>
+        <item>a cada duas semanas</item>
+        <item>a cada mês</item>
+        <item>a cada dois meses</item>
+    </string-array>
+
+    <!-- ==================================================== notifications == -->
+
+    <!-- Name of filter when viewing a reminder -->
+    <string name="rmd_NoA_filter">Lembrete!</string>
+
+    <!-- Reminder: Task was already done -->
+    <string name="rmd_NoA_done">Concluída</string>
+
+    <!-- Reminder: Snooze button (remind again later) -->
+    <string name="rmd_NoA_snooze">Adiar</string>
+
+    <!-- Reminder: Completed Toast -->
+    <string name="rmd_NoA_completed_toast">Parabéns!</string>
+
+    <!-- Prefix for reminder dialog title -->
+    <string name="rmd_NoA_dlg_title">Lembrete:</string>
+
+    <!-- ==================================================== user reengagement == -->
+
+    <!-- Titles for user reengagement notifications -->
+    <string-array name="rmd_reengage_notif_titles">
+        <item>Uma nota do Astrid</item>
+        <!-- %s -> first name -->
+        <item>Recado para %s.</item>
+        <item>Seu resumo no Astrid</item>
+        <item>Lembretes do Astrid</item>
+    </string-array>
+
+    <string name="rmd_reengage_name_default">você</string>
+
+
+    <string name="rmd_reengage_add_tasks">Inserir tarefa</string>
+
+    <!-- Speech bubble options for astrid in reengagement notifs -->
+    <string-array name="rmd_reengage_dialog_options">
+        <item>Hora de diminuir sua lista de tarefas!</item>
+        <item>Prezado sr. ou sra., algumas tarefas aguardam sua inspeção!</item>
+        <item>Olá, você poderia dar uma olhada nissos?</item>
+        <item>Eu achei algumas tarefas com seu nome nelas!</item>
+        <item>Um novo lote de tarefas para você hoje!</item>
+        <item>Você parece fabuloso! Pronto para começar?</item>
+        <item>Um dia amável para concluir alguns trabalhos, eu acho!</item>
+    </string-array>
+
+    <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>Você não quer se organizar?</item>
+        <item>Sou Astrid! Estou aqui para te ajudar a fazer mais!</item>
+        <item>Você parece ocupado! Deixe-me tirar algumas tarefas de seu prato.</item>
+        <item>Eu posso te ajudar a manter o controle sobre todos os detalhes de sua vida.</item>
+        <item>Está falando sério sobre estar fazendo mais? Eu também!</item>
+        <item>Prazer em conhecê-lo!</item>
+    </string-array>
+    <!-- ============================================= reminder preferences == -->
+
+    <!-- slide 33d: Reminder Preference Screen Title -->
+    <string name="rmd_EPr_alerts_header">Configurações de lembretes</string>
+    <string name="rmd_EPr_alerts_summary">Horas quieto, opções de soneca, nível de persistência
+    </string>
+
+    <!-- Reminder Preference: Reminders Enabled Title -->
+    <string name="rmd_EPr_enabled_title">Habilitar lembretes?</string>
+    <!-- Reminder Preference Reminders Enabled Description (true) -->
+    <string name="rmd_EPr_enabled_desc_true">Os lembretes Astrid estão habilitados</string>
+    <!-- Reminder Preference Reminders Enabled Description (false) -->
+    <string name="rmd_EPr_enabled_desc_false">Os lembretes nunca aparecerão</string>
+
+    <!-- Reminder Preference: Quiet Hours Start Title -->
+    <string name="rmd_EPr_quiet_hours_start_title">Começam as horas calmas</string>
+    <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_start_desc">Notificações irão silenciar depois de %s.\nNota:
+        vibrações são controladas pelo Vibrate na configuração de alarme.
+    </string>
+    <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
+    <string name="rmd_EPr_quiet_hours_desc_none">Horário de silêncio está desativado</string>
+
+    <!-- Reminder Preference: Quiet Hours End Title -->
+    <string name="rmd_EPr_quiet_hours_end_title">Fim das horas calmas</string>
+    <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_end_desc">As notificações ficarão normais (sonoras) a partir
+        de %s
+    </string>
+
+    <!-- Reminder Preference: Default Reminder Title -->
+    <string name="rmd_EPr_rmd_time_title">Lembrete padrão</string>
+    <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
+    <string name="rmd_EPr_rmd_time_desc">Notificações de tarefas sem tempo de vencimento vão
+        aparecer em %s
+    </string>
+
+    <!-- Reminder Preference: Notification Ringtone Title -->
+    <string name="rmd_EPr_ringtone_title">Toque de notificação</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
+    <string name="rmd_EPr_ringtone_desc_custom">Toque personalizado foi definido</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
+    <string name="rmd_EPr_ringtone_desc_silent">Campainha definida para silencioso</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
+    <string name="rmd_EPr_ringtone_desc_default">Campainha padrão será utilizada</string>
+
+    <!-- Reminder Preference: Notification Persistence Title -->
+    <string name="rmd_EPr_persistent_title">Notificação persistente</string>
+    <!-- Reminder Preference: Notification Persistence Description (true) -->
+    <string name="rmd_EPr_persistent_desc_true">Cada notificação precisa ser vista individualmente
+    </string>
+    <!-- Reminder Preference: Notification Persistence Description (false) -->
+    <string name="rmd_EPr_persistent_desc_false">Notificações podem ser eliminadas com o botão
+        \"Eliminar Todas\"
+    </string>
+
+    <!-- Reminder Preference: Social Reminders Title -->
+    <string name="rmd_EPr_social_title">Social encouragement</string>
+    <!-- Reminder Preference: Social Reminders Summary (enabled) -->
+    <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for
+        shared tasks
+    </string>
+    <!-- Reminder Preference: Social Reminders Summary (disabled) -->
+    <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you
+        for shared tasks
+    </string>
+
+
+    <!-- Reminder Preference: Notification Icon Title -->
+    <!-- Reminder Preference: Notification Icon Description -->
+
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
+    <string name="rmd_EPr_multiple_maxvolume_title">Volume máximo para lembretes com múltiplos
+        sons
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid irá aumentar o volume para alertas
+        com múltiplos sons
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid usará os ajustes de sistema para o
+        volume
+    </string>
+
+    <!-- Reminder Preference: Vibrate Title -->
+    <string name="rmd_EPr_vibrate_title">Vibração de alerta</string>
+    <!-- Reminder Preference: Vibrate Description (true) -->
+    <string name="rmd_EPr_vibrate_desc_true">Astrid irá vibrar quando enviar notificações</string>
+    <!-- Reminder Preference: Vibrate Description (false) -->
+    <string name="rmd_EPr_vibrate_desc_false">Astrid não irá vibrar quando enviar notificações
+    </string>
+
+    <!-- Reminder Preference: Nagging Title -->
+    <string name="rmd_EPr_nagging_title">Encorajamento Astrid</string>
+    <!-- Reminder Preference: Nagging Description (true) -->
+    <string name="rmd_EPr_nagging_desc_true">Astrid usará de incentivos nos lembretes</string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_nagging_desc_false">Astrid não dará nenhuma mensagem de encorajamento.
+    </string>
+
+    <!-- Reminder Preference: Snooze Dialog Title -->
+    <string name="rmd_EPr_snooze_dialog_title">Soneca HH:MM</string>
+    <!-- Reminder Preference: Snooze Dialog Description (true) -->
+    <string name="rmd_EPr_snooze_dialog_desc_true">Adiar em horas/minutos</string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_snooze_dialog_desc_false">Adiar em # dias/horas</string>
+
+    <!-- slide 44g: Reminder Preference: Default Reminders Title -->
+    <string name="rmd_EPr_defaultRemind_title">Lembretes aleatórios</string>
+    <!-- Reminder Preference: Default Reminders Setting (disabled) -->
+    <string name="rmd_EPr_defaultRemind_desc_disabled">Novas tarefas não terão lembretes
+        aleatórios
+    </string>
+    <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
+    <string name="rmd_EPr_defaultRemind_desc">Novas tarefas irão lembrar aleatoriamente: %s</string>
+
+    <!-- slide 39a: Defaults Title -->
+
+    <string-array name="EPr_reminder_random">
+        <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
+        <item>desabilitado</item>
+        <!-- slide 44b -->
+        <item>de hora em hora</item>
+        <!-- slide 44c -->
+        <item>diariamente</item>
+        <!-- slide 44d-->
+        <item>semanalmente</item>
+        <!-- slide 44e-->
+        <item>a cada duas semanas</item>
+        <!-- slide 44f -->
+        <item>mensalmente</item>
+        <item>a cada dois meses</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_start">
+        <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
+        <item>desabilitado</item>
+        <item>8 PM</item>
+        <item>9 PM</item>
+        <item>10 PM</item>
+        <item>11 PM</item>
+        <item>12 AM</item>
+        <item>1 AM</item>
+        <item>2 AM</item>
+        <item>3 AM</item>
+        <item>4 AM</item>
+        <item>5 AM</item>
+        <item>6 AM</item>
+        <item>7 AM</item>
+        <item>8 AM</item>
+        <item>9 AM</item>
+        <item>10 AM</item>
+        <item>11 AM</item>
+        <item>12 PM</item>
+        <item>1 PM</item>
+        <item>2 PM</item>
+        <item>3 PM</item>
+        <item>4 PM</item>
+        <item>5 PM</item>
+        <item>6 PM</item>
+        <item>7 PM</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_end">
+        <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
+        <item>9 AM</item>
+        <item>10 AM</item>
+        <item>11 AM</item>
+        <item>12 PM</item>
+        <item>1 PM</item>
+        <item>2 PM</item>
+        <item>3 PM</item>
+        <item>4 PM</item>
+        <item>5 PM</item>
+        <item>6 PM</item>
+        <item>7 PM</item>
+        <item>8 PM</item>
+        <item>9 PM</item>
+        <item>10 PM</item>
+        <item>11 PM</item>
+        <item>12 AM</item>
+        <item>1 AM</item>
+        <item>2 AM</item>
+        <item>3 AM</item>
+        <item>4 AM</item>
+        <item>5 AM</item>
+        <item>6 AM</item>
+        <item>7 AM</item>
+        <item>8 AM</item>
+    </string-array>
+
+    <string-array name="EPr_rmd_time">
+        <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
+        <item>9 AM</item>
+        <item>10 AM</item>
+        <item>11 AM</item>
+        <item>12 PM</item>
+        <item>1 PM</item>
+        <item>2 PM</item>
+        <item>3 PM</item>
+        <item>4 PM</item>
+        <item>5 PM</item>
+        <item>6 PM</item>
+        <item>7 PM</item>
+        <item>8 PM</item>
+        <item>9 PM</item>
+        <item>10 PM</item>
+        <item>11 PM</item>
+        <item>12 AM</item>
+        <item>1 AM</item>
+        <item>2 AM</item>
+        <item>3 AM</item>
+        <item>4 AM</item>
+        <item>5 AM</item>
+        <item>6 AM</item>
+        <item>7 AM</item>
+        <item>8 AM</item>
+    </string-array>
+
+    <!-- =============================================== random reminders == -->
+
+    <string name="reminders_social">Estas pessoas estão a contar consigo!</string>
+
+    <string name="reminders_social_one">%s is counting on you!</string>
+
+    <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
+
+    <string-array name="reminders">
+        <!-- reminders: Make these < 20 chars so the task name is displayed -->
+        <item>Olá você! Tem um minuto?</item>
+        <item>Posso vê-lo por um segundo?</item>
+        <item>Tem alguns minutos?</item>
+        <item>Você esqueceu?</item>
+        <item>Dá licença!</item>
+        <item>Quando você tiver um minuto:</item>
+        <item>Na sua agenda:</item>
+        <item>Você está livre?</item>
+        <item>Astrid aqui!</item>
+        <item>Ola! Posso pertubar você?</item>
+        <item>Um minuto do seu tempo?</item>
+        <item>É um bom dia para</item>
+    </string-array>
+
+    <string-array name="reminders_due">
+        <!-- reminders related to task due date -->
+        <item>Hora de trabalhar!</item>
+        <item>O Prazo está acabando</item>
+        <item>Pronto para começar?</item>
+        <item>Você disse que ía fazer:</item>
+        <item>Você devia começar:</item>
+        <item>Hora de começar:</item>
+        <item>É a hora!</item>
+        <item>Licença! Hora de</item>
+        <item>Você está livre? Hora para</item>
+    </string-array>
+
+    <string-array name="reminders_snooze">
+        <!-- reminders related to snooze -->
+        <item>Não seja preguiçoso agora!</item>
+        <item>Acabou a pausa!</item>
+        <item>Não dá pra adiar mais!</item>
+        <item>Agora você está pronto(a)?</item>
+        <item>Pare de adiar!</item>
+    </string-array>
+
+    <string-array name="reminder_responses">
+        <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
+        <item>Tenho uma coisa para você!</item>
+        <item>Hora de deixar isso no seu passado?</item>
+        <item>Porque você não deixa isso pronto?</item>
+        <item>E aí? Pronto tigrão,tigreza?</item>
+        <item>Pronto para isso?</item>
+        <item>Você consegue lidar com isso?</item>
+        <item>Você pode ser feliz! É só terminar isso!</item>
+        <item>Se terminar isso se sentirá bem melhor!</item>
+        <item>Você não fará isso hoje?</item>
+        <item>Por favor termine isso, já estou enjoado disso!</item>
+        <item>Você pode terminar isso? Sim, você pode!</item>
+        <item>Algum dia você vai fazer isso?</item>
+        <item>Você vai se sentir bem melhor! Vamos lá!</item>
+        <item>Estou tão orgulhoso de você! Vamos terminar isso!</item>
+        <item>Que tal lanchinho depois que você terminar isso?</item>
+        <item>Só mais essa, ok?</item>
+        <item>Hora de terminar essa tarefa!</item>
+        <item>Você é do time da bagunça ou da limpeza? Limpeza! Vamos!</item>
+        <item>Eu mencionei que você está incrível esses dias? Continue assim!</item>
+        <item>Uma tarefa por dia manda a bagunça embora... Tchau bagunça!</item>
+        <item>Como você fez isso? Nossa, estou impressionado!</item>
+        <item>Você não vai conseguir simplesmente pela sua boa aparência. Vamos lá!</item>
+        <item>Tempo bom para um trabalho como este, você não acha?</item>
+        <item>Vai um cafezinho enquanto você trabalha nisto?</item>
+        <item>Se você terminar isto, pode ir lá fora brincar :-)</item>
+        <item>É agora. Você não pode adiar o inevitável.</item>
+        <item>Eu morro um pouquinho cada vez que você me ignora.</item>
+    </string-array>
+
+    <string-array name="postpone_nags">
+        <!-- Astrid\'s nagging when user clicks postpone -->
+        <item>Não me diga que você vive adiando as coisas!</item>
+        <item>Ser preguiçoso(a) não fica cansativo de vez em quando?</item>
+        <item>Em algum lugar, alguém está dependendo de você para terminar isso!</item>
+        <item>Quando você disse adiar, você realmente quis dizer \'Vou fazer isso agora\', certo?
+        </item>
+        <item>Essa é a última vez que você adia isso, certo?</item>
+        <item>Termina isso hoje, eu não vou contar para ninguém!</item>
+        <item>Porque adiar se você pode, hmm... não adiar!</item>
+        <item>Suponho que vai terminar isso algum dia, certo?</item>
+        <item>Eu acho que você é realmente ótimo! Que tal não deixar isso de lado?</item>
+        <item>Você vai alcançar seus objetivos se você fizer isso?</item>
+        <item>Adiar, adiar, adiar. Quando você vai mudar!</item>
+        <item>Já estou cheio das suas desculpas! Faça isso agora!</item>
+        <item>Você não inventou essa desculpa na última vez?</item>
+        <item>Eu não vou poder ajudar você a organizar a sua vida se você fizer isso...</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in repeat plug-in -->
+
+    <!-- repeating plugin name -->
+    <string name="repeat_plugin">Tarefas recorrentes</string>
+
+    <!-- repeating plugin description -->
+    <string name="repeat_plugin_desc">Permitir tarefas recorrentes</string>
+
+    <!-- slide 20a: checkbox for turning on/off repeats -->
+    <string name="repeat_enabled">Repetir</string>
+
+    <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
+    <string name="repeat_every">A cada %d</string>
+
+    <!-- hint when opening repeat interval -->
+    <string name="repeat_interval_prompt">Intervalo de repetição</string>
+
+    <!-- slide 19b-->
+    <string name="repeat_never">Not repeating</string>
+    <!-- slide 20f-->
+    <string name="repeat_dont">Não repetir</string>
+
+    <string-array name="repeat_interval_short">
+        <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
+        <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">
+        <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>Dia(s)</item>
+        <item>Semana(s)</item>
+        <item>Mês(es)</item>
+        <item>Hora(s)</item>
+        <item>Minuto(s)</item>
+        <item>Ano(s)</item>
+    </string-array>
+
+    <string name="repeat_days">dias</string>
+    <string name="repeat_weekdays">weekdays</string>
+    <string name="repeat_weeks">weeks</string>
+    <string name="repeat_months">months</string>
+    <string name="repeat_years">years</string>
+    <string name="repeat_hours">hours</string>
+    <string name="repeat_minutes">minutos</string>
+
+    <string-array name="repeat_until_shortcuts">
+        <item>Para sempre</item>
+        <item>Dia Específico</item>
+        <item>Hoje</item>
+        <item>Amanhã</item>
+        <item>(depois de amanhã)</item>
+        <item>Próxima semana</item>
+        <item>Em Duas Semanas</item>
+        <item>Próximo mês</item>
+    </string-array>
+
+    <string name="repeat_until_title">Repetir até...</string>
+
+    <string name="repeat_keep_going">Continue</string>
+
+    <string-array name="repeat_type">
+        <!-- slide 20c: repeat type (date to repeat from) -->
+        <item>à partir do dia do prazo final</item>
+        <!-- slide 20c -->
+        <item>à partir do dia de realização</item>
+    </string-array>
+
+    <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
+    <string name="repeat_detail_byday">$I na $D</string>
+
+    <!-- task detail for repeat from due date (%s -> interval) -->
+    <string name="repeat_detail_duedate">a cada %s</string>
+
+    <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
+    <string name="repeat_detail_duedate_until">Todo %1$s\naté %2$s</string>
+
+    <!-- task detail for repeat from completion date (%s -> interval) -->
+    <string name="repeat_detail_completion">%s após a conclusão</string>
+
+    <!-- text for button when repeating task indefinitely -->
+    <string name="repeat_forever">Repetir para sempre</string>
+
+    <!-- text for button when repeating task until specified date (%s -> date string) -->
+    <string name="repeat_until">Repetir até %s</string>
+
+    <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title">Reagendando tarefa \"%s\"</string>
+
+    <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title_last_time">Tarefa repetida concluída \"%s\"
+    </string>
+
+    <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->
+    <string name="repeat_rescheduling_dialog_bubble">"%1$s, reagendei esta tarefa recorrente de %2$s
+        para %3$s"
+    </string>
+
+    <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
+    <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s Eu reagendei esta tarefa
+        recorrente para %2$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
+    <string name="repeat_rescheduling_dialog_bubble_last_time">Você estava repetindo isto até %1$s e
+        agora você concluíu. %2$s
+    </string>
+
+    <string-array name="repeat_encouragement">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>Bom trabalho!</item>
+        <item>Oba… Estou orgulhoso de você!</item>
+        <item>Eu adoro quando você é produtivo(a)!</item>
+        <item>Não é bom quando a gente tira um peso da consciência?</item>
+    </string-array>
+
+    <string-array name="repeat_encouragement_last_time">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>Bom trabalho!</item>
+        <item>Estou tão orgulhoso de você!</item>
+        <item>Eu adoro quando você é produtivo(a)!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Subtasks Help Introduction -->
+    <string name="subtasks_help_title">Ordenar e Recuar no Astrid</string>
+    <string name="subtasks_help_1">Toque e segure para mover a tarefa</string>
+    <string name="subtasks_help_2">Arraste verticalmente para reordenar</string>
+    <string name="subtasks_help_3">Arraste verticalmente para recuar</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-
-  <!-- Tags label -->
-  <string name="TEA_tags_label">Listas</string>
-  
-  <!-- Tags label long version -->
-  <string name="TEA_tags_label_long">Add to lists</string>
- 
-  <!-- Tags hint -->
-  <string name="TEA_tag_hint">Nova lista</string>
-  
-  <!-- Tags dropdown -->
-    
-  <!-- =============================================== Task List Controls == -->
-  
-  <!-- menu item for tags -->
-  
-  <!-- ========================================================== Extras == -->
-  
-  <!-- Context Item: show tag -->
-  
-  <!-- slide 25a: Dialog: new list -->
-  <string name="tag_new_list">Nova lista</string>
-  
-  <!-- Dialog: list saved -->
-  
-  <!-- Dialog: task created without title -->
-  <string name="tag_no_title_error">Entre com o nome da lista primeiro!</string>
-  
-  <!-- ========================================================== Filters == -->
-  
-  <!-- filter button to add tag -->
-  <string name="tag_FEx_add_new">Nova</string>
-  
-  <!-- filter header for tags -->
-  <string name="tag_FEx_header">Listas</string>
-  
-  <!-- filter header for tags user created -->
-  
-  <!-- filter header for tags, shared with user -->
-  
-  <!-- filter header for tags which have no active tasks -->
-  
-  <!-- slide 10d: filter for untagged tasks -->
-  <string name="tag_FEx_untagged">Uncategorized</string>
-  
-  <!-- slide 27a: %s => tag name -->
-
-  <!-- context menu option to rename a tag -->
-  <string name="tag_cm_rename">Renomear Lista</string>
-
-  <!-- context menu option to delete a tag -->
-  <string name="tag_cm_delete">Excluir lista</string>
-  
-  <!-- context menu option to leave a shared list -->
-  <string name="tag_cm_leave">Deixar lista</string>
-
-  <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
-  <string name="DLG_delete_this_tag_question">Excluir esta lista: %s? (nenhuma tarefa será excluída)</string>
-  
-  <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
-  <string name="DLG_leave_this_shared_tag_question">Deixar esta lista compartilhada: %s? (Nenhuma tarefa será apagada.)</string>
-
-  <!-- Dialog to rename tag -->
-  <string name="DLG_rename_this_tag_header">Renomear a lista %s para:</string>
-
-  <!-- Toast notification that no changes have been made -->
-  <string name="TEA_no_tags_modified">Nenhuma mudança efetuada</string>
-
-  <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_deleted">A Lista %1$s foi excluída, afetando %2$d tarefas</string>
-  
-  <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_left">Você deixou a lista compartilhada %1$s, afetando %2$d tarefas</string>
-
-  <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
-  <string name="TEA_tags_renamed">A lista %1$s foi renomeada para %2$s com %3$d tarefas</string>
-  
-  <!-- Tag case migration -->
-  <string name="tag_case_migration_notice">Verificamos que você tem listas com nomes similares. Pensamos que são a mesma lista, então nós juntamos as duplicadas. Não se preocupe, as listas originais foram renomeadas com uma numeração (ex. Compras_1, Compras_2). Se você não quiser isto, simplesmente apague a lista unificada!</string>
-  
-  <!-- Header for tag settings -->
-  <string name="tag_settings_title">Lista de Configurações</string>
-  
-  <!-- Header for tag activity -->
-  <string name="tag_updates_title">Atividade: %s</string>
-  
-  <!-- Delete button for tag settings -->
-  <string name="tag_delete_button">Excluir lista</string>
-  
-  <!-- slide 28d: Leave button for tag settings -->
-  <string name="tag_leave_button">Deixar esta lista</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Tags label -->
+    <string name="TEA_tags_label">Listas</string>
 
+    <!-- Tags label long version -->
+    <string name="TEA_tags_label_long">Add to lists</string>
+
+    <!-- Tags hint -->
+    <string name="TEA_tag_hint">Nova lista</string>
+
+    <!-- Tags dropdown -->
+
+    <!-- =============================================== Task List Controls == -->
+
+    <!-- menu item for tags -->
+
+    <!-- ========================================================== Extras == -->
+
+    <!-- Context Item: show tag -->
+
+    <!-- slide 25a: Dialog: new list -->
+    <string name="tag_new_list">Nova lista</string>
+
+    <!-- Dialog: list saved -->
+
+    <!-- Dialog: task created without title -->
+    <string name="tag_no_title_error">Entre com o nome da lista primeiro!</string>
+
+    <!-- ========================================================== Filters == -->
+
+    <!-- filter button to add tag -->
+    <string name="tag_FEx_add_new">Nova</string>
+
+    <!-- filter header for tags -->
+    <string name="tag_FEx_header">Listas</string>
+
+    <!-- filter header for tags user created -->
+
+    <!-- filter header for tags, shared with user -->
+
+    <!-- filter header for tags which have no active tasks -->
+
+    <!-- slide 10d: filter for untagged tasks -->
+    <string name="tag_FEx_untagged">Uncategorized</string>
+
+    <!-- slide 27a: %s => tag name -->
+
+    <!-- context menu option to rename a tag -->
+    <string name="tag_cm_rename">Renomear Lista</string>
+
+    <!-- context menu option to delete a tag -->
+    <string name="tag_cm_delete">Excluir lista</string>
+
+    <!-- context menu option to leave a shared list -->
+    <string name="tag_cm_leave">Deixar lista</string>
+
+    <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
+    <string name="DLG_delete_this_tag_question">Excluir esta lista: %s? (nenhuma tarefa será
+        excluída)
+    </string>
+
+    <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
+    <string name="DLG_leave_this_shared_tag_question">Deixar esta lista compartilhada: %s? (Nenhuma
+        tarefa será apagada.)
+    </string>
+
+    <!-- Dialog to rename tag -->
+    <string name="DLG_rename_this_tag_header">Renomear a lista %s para:</string>
+
+    <!-- Toast notification that no changes have been made -->
+    <string name="TEA_no_tags_modified">Nenhuma mudança efetuada</string>
+
+    <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_deleted">A Lista %1$s foi excluída, afetando %2$d tarefas</string>
+
+    <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_left">Você deixou a lista compartilhada %1$s, afetando %2$d tarefas
+    </string>
+
+    <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
+    <string name="TEA_tags_renamed">A lista %1$s foi renomeada para %2$s com %3$d tarefas</string>
+
+    <!-- Tag case migration -->
+    <string name="tag_case_migration_notice">Verificamos que você tem listas com nomes similares.
+        Pensamos que são a mesma lista, então nós juntamos as duplicadas. Não se preocupe, as listas
+        originais foram renomeadas com uma numeração (ex. Compras_1, Compras_2). Se você não quiser
+        isto, simplesmente apague a lista unificada!
+    </string>
+
+    <!-- Header for tag settings -->
+    <string name="tag_settings_title">Lista de Configurações</string>
+
+    <!-- Header for tag activity -->
+    <string name="tag_updates_title">Atividade: %s</string>
+
+    <!-- Delete button for tag settings -->
+    <string name="tag_delete_button">Excluir lista</string>
+
+    <!-- slide 28d: Leave button for tag settings -->
+    <string name="tag_leave_button">Deixar esta lista</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in timers plug-in -->
-    
+
     <!-- Task List: Start Timer button -->
-    
+
     <!-- Task List: Stop Timer button -->
-    
+
     <!-- Android Notification Title (%s => # tasks) -->
     <string name="TPl_notification">Temporizador ativado para %s!</string>
-    
+
     <!-- Filter Header for Timer plugin -->
-    
+
     <!-- Filter for Timed Tasks -->
     <string name="TFE_workingOn">Tarefas com contagem de tempo</string>
-    
+
     <!-- Title for TEA -->
     <string name="TEA_timer_controls">Timer</string>
-    
-    
+
+
     <!-- Edit Notes: create comment for when timer is started -->
     <string name="TEA_timer_comment_started">iniciou a tarefa</string>
-    
+
     <!-- Edit Notes: create comment for when timer is stopped -->
     <string name="TEA_timer_comment_stopped">parou a tarefa:</string>
-    
+
     <!-- Edit Notes: comment to notify how long was spent on task -->
     <string name="TEA_timer_comment_spent">Tempo gasto:</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Update string from activity codes %1$s - user, %2$s - target name, %3$s - message, %4$s - other_user-->
-    
+
     <!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
     Please do not translate this part of the string. -->
-    
+
     <!-- These are still in use -->
     <string name="update_string_default_comment">%1$s : %3$s</string>
     <string name="update_string_task_comment">%1$s on $link_task: %3$s</string>
     <string name="update_string_tag_comment">%1$s on %2$s: %3$s</string>
     <string name="update_string_user_self">Você</string>
-    
+
     <string name="history_yourself">yourself</string>
     <string name="history_you">você</string>
     <string name="history_a_deleted_user">(a deleted user)</string>
-    
+
     <string name="history_this_list">esta lista</string>
     <string name="history_this_task">esta tarefa</string>
     <string name="history_tag_added">added %1$s to %2$s</string>
@@ -2978,9 +3250,12 @@
     <string name="history_favorited">favorited %s</string>
     <string name="history_unfavorited">unfavorited %s</string>
     <string name="history_changed_list_picture">change this list\'s picture</string>
-    <string name="history_added_description_characters">added %1$d characters to %2$s description</string>
+    <string name="history_added_description_characters">added %1$d characters to %2$s description
+    </string>
     <string name="history_removed_description">removed %s description</string>
-    <string name="history_removed_description_characters">removed %1$d characters from %2$s description</string>
+    <string name="history_removed_description_characters">removed %1$d characters from %2$s
+        description
+    </string>
     <string name="history_updated_description">updated %s description</string>
     <string name="history_changed_list_owner">changed list owner to %s</string>
     <string name="history_created_this_list">created this list</string>
@@ -3003,195 +3278,228 @@
     <string name="history_repeat_on">on %s</string>
     <string name="history_repeat_from_completion">after completion</string>
     <string name="history_acknowledged">viewed %s</string>
-    
-    <string name="history_default">changed %1$s to %2$s</string>
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-    
-  <!-- Voice Add Prompt Text -->
-  <string name="voice_create_prompt">Fale para criar uma tarefa</string>
-  <string name="voice_edit_title_prompt">Fale para completar o título</string>
-  <string name="voice_edit_note_prompt">Fale para completar as notas da tarefa</string>
-    
-  <!-- Preference: Task List recognition-service is not installed, but available -->
-  <string name="EPr_voiceInputInstall_dlg">Entrada por voz não está instalado.\n Você quer ir ao Market instalar?</string>
-  <!-- Preference: Task List recognition-service is not available for this system -->
-  <string name="EPr_voiceInputUnavailable_dlg">Infelizmente a entrada por voz não está disponível no seu sistema.\nSe possível, atualize o Android para 2.1 ou superior</string>
-  <!-- Preference: Market is not available for this system -->
-  <string name="EPr_marketUnavailable_dlg">Infelizmente o Market não está disponível no seu sistema.\nSe possível, tente baixar o Voice Search de outro lugar</string>
-  <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
-  <string name="EPr_voiceInputEnabled_title">Entrada de voz</string>
-  <!-- slide 38a: Preference: voice button description (true) -->
-  <string name="EPr_voiceInputEnabled_desc_enabled">O botão de entrada por voz será mostrado na tela de listagem de tarefas</string>
-  <!-- Preference: voice button description (false) -->
-  <string name="EPr_voiceInputEnabled_desc_disabled">O botão de entrada por voz não será exibido na tela de listagem de tarefas</string>
-  <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
-  <string name="EPr_voiceInputCreatesTask_title">Criar tarefas imediatamente</string>
-  <!-- Preference: Task List Voice-creation description (true) -->
-  <string name="EPr_voiceInputCreatesTask_desc_enabled">Tarefas serão criadas automaticamente pela entrada de voz</string>
-  <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
-  <string name="EPr_voiceInputCreatesTask_desc_disabled">Você pode editar o título da tarefa após a entrada por voz terminar.</string>
-  <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
-  <string name="EPr_voiceRemindersEnabled_title">Lembretes de voz</string>
-  <!-- Preference: Voice reminders description (true) -->
-  <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid irá falar o nome das tarefas durante os lembretes</string>
-  <!-- slide 38c: Preference: Voice reminders description (false) -->
-  <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid irá tocar um som durante o lembrete</string>    
-  
-  <!-- slide 32d: Preference Category: Voice Title -->
-  <string name="EPr_voice_header">Configuração de entrada de voz</string>
-    
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-  
-  <!-- slide 30a-->
-  <string name="welcome_setting">Mostrar tutorial</string>
-  
-  <string name="welcome_title_1">Bem vindo ao Astrid!</string>
-
-  <!-- slide 2a -->
-  <string name="welcome_title_2">Criar listas</string>
-
-  <!-- slide 3a-->
-  <string name="welcome_title_3">Troque entre listas</string>
-
-  <!-- slide 4a -->
-  <string name="welcome_title_4">Compartilhar listas</string>
-
-  <!-- slide 5a -->
-  <string name="welcome_title_5">Dividir tarefas</string>
-
-  <!-- slide 6a -->
-  <string name="welcome_title_6">Adicione detalhes</string>
 
-  <!-- slide 7a -->
-  <string name="welcome_title_7">Conecte-se agora\npara iniciar!</string>
-  
-  <string name="welcome_title_7_return">Pronto!!</string>
-  
-  <!-- slide 1b -->
-  <string name="welcome_body_1">A perfeita lista de tarefas que\nfunciona muito bem com amigos</string>
-
-  <!-- slide 2b-->
-  <string name="welcome_body_2">Ótimo para qualquer lista:\nler, assistir, comprar, visitar!</string>
-
-  <!-- slide 3b -->
-  <string name="welcome_body_3">Toque para adicionar notas,\nconfigurar lembretes,\ne muito mais!</string>
-
-  <!-- slide 4b -->
-  <string name="welcome_body_4">Compartilhe suas listas com \namigos, colegas,\nou seu amor!</string>
-
-  <!-- slide 5b -->
-  <string name="welcome_body_5">Nunca queira saber\nquem está trazendo a sobremesa!</string>
+    <string name="history_default">changed %1$s to %2$s</string>
 
-  <!-- slide 6b-->
-  <string name="welcome_body_6">Toque para inserir notas,\ndefinir lembretes,\ne muito mais!</string>
-  <string name="welcome_body_7">Nome de acesso</string>
-  
-  <string name="welcome_body_7_return">Toque no Astrid para retornar.</string>
-  
-  <!-- slide 1c -->
-  <string name="welcome_next">Próximo</string>
-  
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Voice Add Prompt Text -->
+    <string name="voice_create_prompt">Fale para criar uma tarefa</string>
+    <string name="voice_edit_title_prompt">Fale para completar o título</string>
+    <string name="voice_edit_note_prompt">Fale para completar as notas da tarefa</string>
+
+    <!-- Preference: Task List recognition-service is not installed, but available -->
+    <string name="EPr_voiceInputInstall_dlg">Entrada por voz não está instalado.\n Você quer ir ao
+        Market instalar?
+    </string>
+    <!-- Preference: Task List recognition-service is not available for this system -->
+    <string name="EPr_voiceInputUnavailable_dlg">Infelizmente a entrada por voz não está disponível
+        no seu sistema.\nSe possível, atualize o Android para 2.1 ou superior
+    </string>
+    <!-- Preference: Market is not available for this system -->
+    <string name="EPr_marketUnavailable_dlg">Infelizmente o Market não está disponível no seu
+        sistema.\nSe possível, tente baixar o Voice Search de outro lugar
+    </string>
+    <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
+    <string name="EPr_voiceInputEnabled_title">Entrada de voz</string>
+    <!-- slide 38a: Preference: voice button description (true) -->
+    <string name="EPr_voiceInputEnabled_desc_enabled">O botão de entrada por voz será mostrado na
+        tela de listagem de tarefas
+    </string>
+    <!-- Preference: voice button description (false) -->
+    <string name="EPr_voiceInputEnabled_desc_disabled">O botão de entrada por voz não será exibido
+        na tela de listagem de tarefas
+    </string>
+    <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
+    <string name="EPr_voiceInputCreatesTask_title">Criar tarefas imediatamente</string>
+    <!-- Preference: Task List Voice-creation description (true) -->
+    <string name="EPr_voiceInputCreatesTask_desc_enabled">Tarefas serão criadas automaticamente pela
+        entrada de voz
+    </string>
+    <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
+    <string name="EPr_voiceInputCreatesTask_desc_disabled">Você pode editar o título da tarefa após
+        a entrada por voz terminar.
+    </string>
+    <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
+    <string name="EPr_voiceRemindersEnabled_title">Lembretes de voz</string>
+    <!-- Preference: Voice reminders description (true) -->
+    <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid irá falar o nome das tarefas
+        durante os lembretes
+    </string>
+    <!-- slide 38c: Preference: Voice reminders description (false) -->
+    <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid irá tocar um som durante o
+        lembrete
+    </string>
+
+    <!-- slide 32d: Preference Category: Voice Title -->
+    <string name="EPr_voice_header">Configuração de entrada de voz</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 30a-->
+    <string name="welcome_setting">Mostrar tutorial</string>
+
+    <string name="welcome_title_1">Bem vindo ao Astrid!</string>
+
+    <!-- slide 2a -->
+    <string name="welcome_title_2">Criar listas</string>
+
+    <!-- slide 3a-->
+    <string name="welcome_title_3">Troque entre listas</string>
+
+    <!-- slide 4a -->
+    <string name="welcome_title_4">Compartilhar listas</string>
+
+    <!-- slide 5a -->
+    <string name="welcome_title_5">Dividir tarefas</string>
+
+    <!-- slide 6a -->
+    <string name="welcome_title_6">Adicione detalhes</string>
+
+    <!-- slide 7a -->
+    <string name="welcome_title_7">Conecte-se agora\npara iniciar!</string>
+
+    <string name="welcome_title_7_return">Pronto!!</string>
+
+    <!-- slide 1b -->
+    <string name="welcome_body_1">A perfeita lista de tarefas que\nfunciona muito bem com amigos
+    </string>
+
+    <!-- slide 2b-->
+    <string name="welcome_body_2">Ótimo para qualquer lista:\nler, assistir, comprar, visitar!
+    </string>
+
+    <!-- slide 3b -->
+    <string name="welcome_body_3">Toque para adicionar notas,\nconfigurar lembretes,\ne muito
+        mais!
+    </string>
+
+    <!-- slide 4b -->
+    <string name="welcome_body_4">Compartilhe suas listas com \namigos, colegas,\nou seu amor!
+    </string>
+
+    <!-- slide 5b -->
+    <string name="welcome_body_5">Nunca queira saber\nquem está trazendo a sobremesa!</string>
+
+    <!-- slide 6b-->
+    <string name="welcome_body_6">Toque para inserir notas,\ndefinir lembretes,\ne muito mais!
+    </string>
+    <string name="welcome_body_7">Nome de acesso</string>
+
+    <string name="welcome_body_7_return">Toque no Astrid para retornar.</string>
+
+    <!-- slide 1c -->
+    <string name="welcome_next">Próximo</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <string name="widget_mini">- Astrid Mini -</string>
-    
+
     <!-- Resources for power pack widget -->
-    
+
     <string name="PPW_widget_42_label">Old Astrid 4x2</string>
     <string name="PPW_widget_43_label">Old Astrid 4x3</string>
     <string name="PPW_widget_44_label">Old Astrid 4x4</string>
     <string name="PPW_widget_v11_label">- Astrid -</string>
-    <string name="PPW_widget_custom_label">Inicializador de personalização Premium do Astrid</string>
+    <string name="PPW_widget_custom_label">Inicializador de personalização Premium do Astrid
+    </string>
     <string name="PPW_widget_custom_launcherpro_label">Lançador Pro Premium do Astrid</string>
-    
+
     <string name="PPW_configure_title">Configurar widget</string>
-    
+
     <string name="PPW_color">Cor do widget</string>
     <string name="PPW_enable_calendar">Mostrar eventos do calendário</string>
     <string name="PPW_disable_encouragements">Esconder encorajamentos</string>
     <string name="PPW_show_dates">Mostrar datas de vencimentos</string>
     <string name="PPW_filter">Selecionar filtro</string>
-    
+
     <string name="PPW_due">Vencimento:</string>
     <string name="PPW_past_due">Vencimento:</string>
-    
-    <string name="PPW_old_astrid_notice">Você precisa pelo menos da versão 3.6 do Astrid para usar este widget. Desculpe!</string>
-    
+
+    <string name="PPW_old_astrid_notice">Você precisa pelo menos da versão 3.6 do Astrid para usar
+        este widget. Desculpe!
+    </string>
+
     <string-array name="PPW_encouragements">
         <!-- general encouragements -->
-    	<item>Oi!</item>
-    	<item>Tem um tempinho?</item>
-    	<item>Caramba, você parece confiante hoje!</item>
-    	<item>Faça algo ótimo hoje</item>
-    	<item>Me deixe orgulhoso hoje!</item>
-    	<item>E aí, está tudo bem com você?</item>
+        <item>Oi!</item>
+        <item>Tem um tempinho?</item>
+        <item>Caramba, você parece confiante hoje!</item>
+        <item>Faça algo ótimo hoje</item>
+        <item>Me deixe orgulhoso hoje!</item>
+        <item>E aí, está tudo bem com você?</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_tod">
         <!-- encouragements based on time of day -->
-    	<item>Bom dia!</item>
-    	<item>Boa tarde!</item>
-    	<item>Boa noite!</item>
-    	<item>Tarde da noite?</item>
-    	<item>Aproveite que é de manhã e faça algo!</item>
-    	<item>Que tal um lanche da tarde?</item>
-    	<item>Aproveite a noite</item>
-    	<item>Dormir faz bem, sabia?</item>
+        <item>Bom dia!</item>
+        <item>Boa tarde!</item>
+        <item>Boa noite!</item>
+        <item>Tarde da noite?</item>
+        <item>Aproveite que é de manhã e faça algo!</item>
+        <item>Que tal um lanche da tarde?</item>
+        <item>Aproveite a noite</item>
+        <item>Dormir faz bem, sabia?</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_completed">
         <!-- encouragements based on tasks completed (%d => completed) -->
-    	<item>Você já terminou %d tarefas!</item>
-    	<item>Competência: %d tarefas terminadas</item>
-    	<item>Que ótimo! Você terminou %d tarefas!</item>
+        <item>Você já terminou %d tarefas!</item>
+        <item>Competência: %d tarefas terminadas</item>
+        <item>Que ótimo! Você terminou %d tarefas!</item>
     </string-array>
-  	<string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet! Shall we?</string>
-        
+    <string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet!
+        Shall we?
+    </string>
+
     <string-array name="PPW_colors">
         <item>Preto</item>
         <item>Branco</item>
         <item>Azul</item>
         <item>Translúcido</item>
     </string-array>
-    
-    <string name="PPW_widget_dlg_text">Este widget esta disponível para usuários do PowerPack!</string>
+
+    <string name="PPW_widget_dlg_text">Este widget esta disponível para usuários do PowerPack!
+    </string>
     <string name="PPW_widget_dlg_ok">Prévia</string>
-    
+
     <string name="PPW_demo_title1">Items de %s aparecerão aqui</string>
     <string name="PPW_demo_title2">Power Pack inclui Widgets Premium...</string>
     <string name="PPW_demo_title3">...adição por voz e boas sensações!</string>
     <string name="PPW_demo_title4">Toque para aprender mais!</string>
-    
+
     <string name="PPW_info_title">Power Pack grátis!</string>
     <string name="PPW_info_signin">Entrar!</string>
     <string name="PPW_info_later">Depois</string>
-    <string name="PPW_unlock_howto">Compartilhe listas com amigos e destrave gratuitamente o Power Pack quando 3 amigos assinarem o Astrid.</string>
+    <string name="PPW_unlock_howto">Compartilhe listas com amigos e destrave gratuitamente o Power
+        Pack quando 3 amigos assinarem o Astrid.
+    </string>
     <string name="PPW_check_button">Obtenha o Power Pack de Graça!</string>
     <string name="PPW_check_share_lists">Compartilhar listas!</string>
-    <string name="PPW_api_level">Desculpe! Este widget só é suportado no Android 3.0 ou superiores</string>
-    
+    <string name="PPW_api_level">Desculpe! Este widget só é suportado no Android 3.0 ou superiores
+    </string>
+
     <string name="EPr_widget_enabled_title">Ativar/Desativar Widgets</string>
-    <string name="PPW_restart_for_enabled_state">Você deve reiniciar seu telefone para que as alterações sejam concluídas.</string>
+    <string name="PPW_restart_for_enabled_state">Você deve reiniciar seu telefone para que as
+        alterações sejam concluídas.
+    </string>
 
 </resources>
diff --git a/astrid/res/values-pt/strings.xml b/astrid/res/values-pt/strings.xml
index 7a3f1b74c..92c99125b 100644
--- a/astrid/res/values-pt/strings.xml
+++ b/astrid/res/values-pt/strings.xml
@@ -1,532 +1,546 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="actfm_person_hint">Contacto ou Email</string>
-  <string name="actfm_person_or_tag_hint">Contacto ou Lista Partilhada</string>
-  <string name="actfm_tag_operation_owner_delete">É o dono desta lista partilhada! Se a apagar, será apagada para todos os membros da lista. Tem a certeza que deseja continuar?</string>
-  <string name="actfm_picture_camera">Tirar uma Imagem</string>
-  <string name="actfm_picture_gallery">Seleccionar da Galeria</string>
-  <string name="actfm_picture_clear">Limpar Imagem</string>
-  <string name="actfm_view_task_title">Visualizar Tarefa?</string>
-  <string name="actfm_view_task_text">A tarefa foi enviada para %s! Está a visualizar as suas próprias tarefas. Deseja ver esta e também outras tarefas já atribuídas?</string>
-  <string name="actfm_view_task_ok">Ver atribuídas</string>
-  <string name="actfm_view_task_cancel">Ficar Aqui</string>
-  <string name="actfm_my_shared_tasks_title">Minhas Tarefas Partilhadas</string>
-  <string name="actfm_my_shared_tasks_empty">Sem tarefas partilhadas</string>
-  <string name="TVA_add_comment">Adicionar um comentário...</string>
-  <string-array name="TVA_tabs">
-    <item>Tarefas</item>
-    <item>Actividade</item>
-    <item>Definições da Lista</item>
-  </string-array>
-  <string name="actfm_TVA_menu_refresh">Actualizar</string>
-  <string name="actfm_TVA_tag_label">Lista</string>
-  <string name="actfm_TVA_members_label">Partilhado Com</string>
-  <string name="actfm_TVA_silence_label">Notificações Silienciosas</string>
-  <string name="actfm_TVA_tag_description_label">Descrição</string>
-  <string name="actfm_TVA_tag_settings_label">Definições</string>
-  <string name="actfm_TVA_tag_description_hint">Digita uma descrição aqui</string>
-  <string name="actfm_TVA_tag_name_hint">Introduza o nome da lista</string>
-  <string name="actfm_EPA_unassigned">Não atribuído</string>
-  <string name="actfm_EPA_share_with">Partilhar com:</string>
-  <string name="actfm_EPA_facebook">Facebook</string>
-  <string name="actfm_EPA_twitter">Twitter</string>
-  <string name="alarm_ACS_label">Alarmes</string>
-  <string name="alarm_ACS_button">Adicionar um Alarme</string>
-  <string-array name="reminders_alarm">
-    <item>Alarme!</item>
-  </string-array>
-  <string name="backup_BPr_header">Cópias de segurança</string>
-  <string name="backup_BPr_group_status">Estado</string>
-  <string name="backup_status_success">Ultimo: %s</string>
-  <string name="backup_status_failed">Ultima cópia de segurança falhou.</string>
-  <string name="backup_status_failed_subtitle">(pressione para mostrar o erro)</string>
-  <string name="backup_status_never">Nunca fez uma cópia de segurança!</string>
-  <string name="backup_BPr_group_options">Opções</string>
-  <string name="backup_BPr_auto_title">Cópia de Segurança Automática</string>
-  <string name="backup_BPr_auto_disabled">Cópias de Segurança automáticas desligadas</string>
-  <string name="backup_BPr_auto_enabled">A cópia de segurança irá ocorrer diáriamente</string>
-  <string name="backup_BAc_title">Gerir Cópias de Segurança</string>
-  <string name="backup_BAc_import">Importar Tarefas</string>
-  <string name="backup_BAc_export">Exportar Tarefas</string>
-  <string name="backup_TXI_error">Erro de Importação</string>
-  <string name="export_toast">Cópia de Segurança de %1$s para %2$s</string>
-  <string name="export_toast_no_tasks">Não existem Tarefas para Exportar.</string>
-  <string name="export_progress_title">A exportar...</string>
-  <string name="import_summary_title">Sumário de Restauro</string>
-  <string name="import_summary_message">O ficheiro %1$s continha %2$s.\n\n %3$s importadas,\n %4$s já existiam\n %5$s tinham erros\n</string>
-  <string name="import_progress_title">A importar...</string>
-  <string name="import_progress_read">A ler tarefa %d...</string>
-  <string name="DLG_error_sdcard">Não é possível aceder à pasta: %s</string>
-  <string name="DLG_error_sdcard_general">Não é possível aceder ao seu cartão SD!</string>
-  <string name="import_file_prompt">Seleccione um Ficheiro para Restaurar</string>
-  <string name="app_name">Tarefas Astrid</string>
-  <string name="read_permission_label">Permissões do Astrid</string>
-  <string name="read_permission_desc">ler tarefas, mostrar filtros de tarefas</string>
-  <string name="write_permission_label">Permissões do Astrid</string>
-  <string name="write_permission_desc">criar novas tarefas, editar tarefas existentes</string>
-  <string name="DLG_delete_this_task_question">Remover esta tarefa?</string>
-  <string name="DLG_delete_this_item_question">Apagar este item: %s?</string>
-  <string name="DLG_upgrading">A actualizar as suas tarefas...</string>
-  <string name="DLG_hour_minutes">Tempo (horas : minutos)</string>
-  <string name="DLG_please_update">O Astrid deverá ser actualizado com a ultima versão disponível no Android market! Por favor faça-o antes de continuar, ou espere alguns segundos.</string>
-  <string name="DLG_accept">Eu Aceito</string>
-  <string name="DLG_decline">Eu Recuso</string>
-  <string name="DLG_loading">Carregando...</string>
-  <string name="WID_dateButtonUnset">Pressione para confirmar</string>
-  <string name="TLA_no_items">Sem Tarefas!</string>
-  <string name="TLA_menu_sort">Sort &amp; Hidden</string>
-  <string name="TLA_menu_settings">Definições</string>
-  <string name="TLA_custom">Personalizado</string>
-  <string-array name="TLA_filters">
-    <item>Active</item>
-    <item>Hoje</item>
-    <item>Soon</item>
-    <item>Late</item>
-    <item>Concluído</item>
-    <item>Hidden</item>
-  </string-array>
-  <string-array name="TLA_priority_strings">
-    <item>highest priority</item>
-    <item>high priority</item>
-    <item>medium priority</item>
-    <item>low priority</item>
-  </string-array>
-  <string name="TAd_hiddenFormat">%s [omissa]</string>
-  <string name="TAd_deletedFormat">%s [apagado]</string>
-  <string name="TAd_completed">Terminado\n%s</string>
-  <string name="TAd_actionEditTask">Editar</string>
-  <string name="TAd_contextEditTask">Editar Tarefa</string>
-  <string name="TAd_contextUndeleteTask">Recuperar Tarefa</string>
-  <string name="SSD_title">Sorting and Hidden Tasks</string>
-  <string name="SSD_completed">Mostrar Tarefas Completas</string>
-  <string name="SSD_sort_auto">Ordenação Inteligente Astrid</string>
-  <string name="SSD_sort_alpha">Por Título</string>
-  <string name="SSD_sort_importance">Por Importância</string>
-  <string name="SSD_sort_modified">Por Última Modificação</string>
-  <string name="SSD_sort_reverse">Ordem Inversa</string>
-  <string name="SSD_save_temp">Só Uma Vez</string>
-  <string name="SSD_save_always">Sempre</string>
-  <string name="FLA_context_shortcut">Criar atalho no Ambiente de Trabalho</string>
-  <string name="FLA_shortcut_dialog_title">Criar Atalho</string>
-  <string name="FLA_shortcut_dialog">Nome do atalho:</string>
-  <string name="FLA_search_hint">Procurar Tarefas</string>
-  <string name="FLA_search_filter">Coincidentes \'%s\'</string>
-  <string name="FLA_toast_onCreateShortcut">Atalho Criado: %s</string>
-  <string name="TEA_title_hint">Resumo da Tarefa</string>
-  <string name="TEA_importance_label">Importância</string>
-  <string name="TEA_urgency_specific_time">Numa altura específica</string>
-  <string-array name="TEA_loading">
-    <item>Carregando...</item>
-  </string-array>
-  <string name="TEA_note_label">Notas</string>
-  <string name="TEA_notes_hint">Introduzir notas na tarefa...</string>
-  <string name="TEA_estimatedDuration_label">Quanto tempo irá durar?</string>
-  <string name="TEA_elapsedDuration_label">Tempo já gasto na tarefa</string>
-  <string name="TEA_menu_save">Guardar Alterações</string>
-  <string name="TEA_menu_discard">Não Gravar</string>
-  <string name="TEA_menu_delete">Remover Tarefa</string>
-  <string name="TEA_onTaskSave_notDue">Tarefa Guardada</string>
-  <string name="TEA_tab_more">Mais</string>
-  <string-array name="TEA_urgency">
-    <item>Sem Prazo</item>
-    <item>Dia Específico</item>
-    <item>Hoje</item>
-    <item>Amanhã</item>
-    <item>(dia depois)</item>
-    <item>Próxima Semana</item>
-    <item>In two weeks</item>
-    <item>Next month</item>
-  </string-array>
-  <string-array name="TEA_hideUntil">
-    <item>Sempre</item>
-    <item>Due date</item>
-    <item>Due time</item>
-    <item>Dias antes de expirar</item>
-    <item>Semanas antes de expirar</item>
-    <item>Dia/Hora Específico</item>
-  </string-array>
-  <string name="TEA_control_more_section">----More Section----</string>
-  <string name="TEA_control_importance">Importância</string>
-  <string name="TEA_control_lists">Listas</string>
-  <string name="TEA_control_notes">Notas</string>
-  <string-array name="MCA_dialog_speech_options">
-    <item>It must be nice to be so popular!</item>
-    <item>Yay! People like you!</item>
-    <item>Make their day, give \'em a call!</item>
-    <item>Wouldn\'t you be happy if people called you back?</item>
-    <item>You can do it!</item>
-    <item>You can always send a text...</item>
-  </string-array>
-  <string name="UpS_changelog_title">O que existe de novo no Astrid?</string>
-  <string name="EPr_appearance_header">Aparência</string>
-  <string name="EPr_fontSize_title">Tamanho da Lista de Tarefas</string>
-  <string name="EPr_fontSize_desc">Tamanho de Letra na página principal de listagem</string>
-  <string-array name="EPr_swipe_lists_performance_mode">
-    <item>No swipe</item>
-    <item>Conserve Memory</item>
-    <item>Normal Performance</item>
-    <item>High Performance</item>
-  </string-array>
-  <string-array name="EPr_swipe_lists_performance_desc">
-    <item>Swipe between lists is disabled</item>
-    <item>Slower performance</item>
-    <item>Default setting</item>
-    <item>Uses more system resources</item>
-  </string-array>
-  <string-array name="EPr_themes">
-    <item>Day - Blue</item>
-    <item>Day - Red</item>
-    <item>Sky blue</item>
-    <item>Night</item>
-    <item>Transparent (White Text)</item>
-    <item>Transparent (Black Text)</item>
-  </string-array>
-  <string-array name="EPr_themes_widget">
-    <item>Same as app</item>
-    <item>Day - Blue</item>
-    <item>Day - Red</item>
-    <item>Sky blue</item>
-    <item>Night</item>
-    <item>Transparent (White Text)</item>
-    <item>Transparent (Black Text)</item>
-    <item>Old Style</item>
-  </string-array>
-  <string name="AOA_no_addons">Lista Vazia!</string>
-  <string name="TWi_loading">Carregando...</string>
-  <string name="task_killer_help_ok">Eu Não Irei Matar Astrid!</string>
-  <string name="marketplace_description">Astrid é a lista de tarefas de código fonte aberta altamente aclamada que é simples o suficiente para não lhe atrapalhar, poderosa o suficiente para ajudar Você a fazer as coisas! Etiquetas, Avisos, sincronização com o RememberTheMilk (RTM), plugin de regionalização e mais!</string>
-  <string name="EPr_default_urgency_title">Defeito da Urgência</string>
-  <string-array name="EPr_default_importance">
-    <item>!!! (Highest)</item>
-    <item>!!</item>
-    <item>!</item>
-    <item>o (Lowest)</item>
-  </string-array>
-  <string-array name="EPr_default_urgency">
-    <item>Sem Prazo</item>
-    <item>Hoje</item>
-    <item>Amanhã</item>
-    <item>Day after tomorrow</item>
-    <item>Próxima Semana</item>
-  </string-array>
-  <string-array name="EPr_default_hideUntil">
-    <item>Não Esconder</item>
-    <item>Tarefa já passou o prazo</item>
-    <item>Dias antes de expirar</item>
-    <item>Semanas antes de expirar</item>
-  </string-array>
-  <string-array name="EPr_default_reminders">
-    <item>No deadline reminders</item>
-    <item>At deadline</item>
-    <item>When overdue</item>
-    <item>At deadline or overdue</item>
-  </string-array>
-  <string name="BFE_Active">Tarefas Activas</string>
-  <string name="CFA_universe_all">Tarefas Activas</string>
-  <string name="CFA_type_add">ou</string>
-  <string name="CFA_type_subtract">não</string>
-  <string name="CFA_type_intersect">também</string>
-  <string-array name="CFC_dueBefore_entries">
-    <item>No Due Date</item>
-    <item>Ontem</item>
-    <item>Hoje</item>
-    <item>Amanhã</item>
-    <item>Day After Tomorrow</item>
-    <item>Próxima Semana</item>
-    <item>Next Month</item>
-  </string-array>
-  <string name="CFC_importance_name">Importância...</string>
-  <string name="gcal_TEA_showCalendar_label">Abrir Evento De Calendário</string>
-  <string name="gcal_GCP_default">Calendário Predefinido</string>
-  <string-array name="locale_interval">
-    <item>once an hour</item>
-    <item>once every six hours</item>
-    <item>once every twelve hours</item>
-    <item>once a day</item>
-    <item>once every three days</item>
-    <item>once a week</item>
-  </string-array>
-  <string-array name="TEA_reminder_random">
-    <item>an hour</item>
-    <item>a day</item>
-    <item>a week</item>
-    <item>in two weeks</item>
-    <item>a month</item>
-    <item>in two months</item>
-  </string-array>
-  <string name="rmd_NoA_filter">Lembrete!</string>
-  <string name="rmd_NoA_done">Já Terminada!</string>
-  <string name="rmd_NoA_snooze">Parar...</string>
-  <string-array name="rmd_reengage_notif_titles">
-    <item>A note from Astrid</item>
-    <item>Memo for %s.</item>
-    <item>Your Astrid digest</item>
-    <item>Reminders from Astrid</item>
-  </string-array>
-  <string-array name="rmd_reengage_dialog_options">
-    <item>Time to shorten your to-do list!</item>
-    <item>Dear sir or madam, some tasks await your inspection!</item>
-    <item>Hi there, could you take a look at these?</item>
-    <item>I\'ve got some tasks with your name on them!</item>
-    <item>A fresh batch of tasks for you today!</item>
-    <item>You look fabulous! Ready to get started?</item>
-    <item>A lovely day for getting some work done, I think!</item>
-  </string-array>
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>Don\'t you want to get organized?</item>
-    <item>I\'m Astrid! I\'m here to help you do more!</item>
-    <item>You look busy! Let me take some of those tasks off of your plate.</item>
-    <item>I can help you keep track of all of the details in your life.</item>
-    <item>You\'re serious about getting more done? So am I!</item>
-    <item>Pleasure to make your acquaintance!</item>
-  </string-array>
-  <string name="rmd_EPr_quiet_hours_start_title">Início do Período de Inactividade</string>
-  <string name="rmd_EPr_quiet_hours_end_title">Fim do Período de Inactividade</string>
-  <string name="rmd_EPr_ringtone_title">Toque de Notificação</string>
-  <string name="rmd_EPr_vibrate_title">Vibrar ao Alertar</string>
-  <string-array name="EPr_reminder_random">
-    <item>desactivado</item>
-    <item>de hora em hora</item>
-    <item>diariamente</item>
-    <item>semanalmente</item>
-    <item>bi-weekly</item>
-    <item>mensalmente</item>
-    <item>bi-monthly</item>
-  </string-array>
-  <string-array name="EPr_quiet_hours_start">
-    <item>desactivado</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>02:00</item>
-    <item>02:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18.00</item>
-    <item>19:00</item>
-  </string-array>
-  <string-array name="EPr_quiet_hours_end">
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18.00</item>
-    <item>19:00</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>02:00</item>
-    <item>02:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-  </string-array>
-  <string-array name="EPr_rmd_time">
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18.00</item>
-    <item>19:00</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>02:00</item>
-    <item>02:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-  </string-array>
-  <string-array name="reminders">
-    <item>Olá, tem um segundo?</item>
-    <item>Tem um tempinho?</item>
-    <item>Tem alguns minutos?</item>
-    <item>Será que se esqueceu?</item>
-    <item>Desculpe-me!</item>
-    <item>Quando tiver um minuto:</item>
-    <item>Na sua agenda:</item>
-    <item>Livre por um momento?</item>
-    <item>Astrid aqui!</item>
-    <item>Olá! Posso incomodar?</item>
-    <item>Tem um minuto?</item>
-    <item>É um óptimo dia para</item>
-  </string-array>
-  <string-array name="reminders_due">
-    <item>Time to work!</item>
-    <item>Due date is here!</item>
-    <item>Ready to start?</item>
-    <item>You said you would do:</item>
-    <item>You\'re supposed to start:</item>
-    <item>Time to start:</item>
-    <item>It\'s time!</item>
-    <item>Excuse me! Time for</item>
-    <item>You free? Time to</item>
-  </string-array>
-  <string-array name="reminders_snooze">
-    <item>Don\'t be lazy now!</item>
-    <item>Snooze time is up!</item>
-    <item>No more snoozing!</item>
-    <item>Now are you ready?</item>
-    <item>No more postponing!</item>
-  </string-array>
-  <string-array name="reminder_responses">
-    <item>I\'ve got something for you!</item>
-    <item>Pronto para esquecer isto?</item>
-    <item>Why don\'t you get this done?</item>
-    <item>Que me diz? Ah Leão</item>
-    <item>Pronto pra fazer isto?</item>
-    <item>Você pode resolver isto?</item>
-    <item>Tu podes ser feliz! Apenas termina isto!</item>
-    <item>I promise you\'ll feel better if you finish this!</item>
-    <item>Porque é que não fazes isto hoje?</item>
-    <item>Please finish this, I\'m sick of it!</item>
-    <item>Pode terminar isto? Sim, você pode!</item>
-    <item>Irá alguma vez fazer isto?</item>
-    <item>Feel good about yourself! Let\'s go!</item>
-    <item>Sinta-se bem! Vamos!</item>
-    <item>Um lanche depois que Você terminar isto?</item>
-    <item>Só esta tarefa? Por favor?</item>
-    <item>Está na hora de diminuir sua lista de tarefas!</item>
-    <item>Are you on Team Order or Team Chaos? Team Order! Let\'s go!</item>
-    <item>Have I mentioned you are awesome recently? Keep it up!</item>
-    <item>A task a day keeps the clutter away... Goodbye clutter!</item>
-    <item>How do you do it? Wow, I\'m impressed!</item>
-    <item>You can\'t just get by on your good looks. Let\'s get to it!</item>
-    <item>Lovely weather for a job like this, isn\'t it?</item>
-    <item>A spot of tea while you work on this?</item>
-    <item>If only you had already done this, then you could go outside and play.</item>
-    <item>It\'s time. You can\'t put off the inevitable.</item>
-    <item>I die a little every time you ignore me.</item>
-  </string-array>
-  <string-array name="postpone_nags">
-    <item>Please tell me it isn\'t true that you\'re a procrastinator!</item>
-    <item>Doesn\'t being lazy get old sometimes?</item>
-    <item>Algures, alguém precisa que Você termine isto!</item>
-    <item>When you said postpone, you really meant \'I\'m doing this\', right?</item>
-    <item>É a última vez que irá adiar, certo?</item>
-    <item>Just finish this today, I won\'t tell anyone!</item>
-    <item>Por que adiar quando Você pode mmmh... não adiar</item>
-    <item>You\'ll finish this eventually, I presume?</item>
-    <item>I think you\'re really great! How about not putting this off?</item>
-    <item>Você conseguirá atingir seus objectivos se Você fizer isso?</item>
-    <item>Adiar, adiar, adiar. Quando você irá mudar!</item>
-    <item>I\'ve had enough with your excuses! Just do it already!</item>
-    <item>Didn\'t you make that excuse last time?</item>
-    <item>I can\'t help you organize your life if you do that...</item>
-  </string-array>
-  <string name="repeat_enabled">Repete</string>
-  <string-array name="repeat_interval_short">
-    <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">
-    <item>Dia(s)</item>
-    <item>Semana(s)</item>
-    <item>Mês(es)</item>
-    <item>Hora(s)</item>
-    <item>Minute(s)</item>
-    <item>Year(s)</item>
-  </string-array>
-  <string-array name="repeat_until_shortcuts">
-    <item>Forever</item>
-    <item>Specific Day</item>
-    <item>Today</item>
-    <item>Tomorrow</item>
-    <item>(day after)</item>
-    <item>Next Week</item>
-    <item>In Two Weeks</item>
-    <item>Next Month</item>
-  </string-array>
-  <string-array name="repeat_type">
-    <item>from due date</item>
-    <item>from completion date</item>
-  </string-array>
-  <string-array name="repeat_encouragement">
-    <item>Good job!</item>
-    <item>Wow… I\'m so proud of you!</item>
-    <item>I love when you\'re productive!</item>
-    <item>Doesn\'t it feel good to check something off?</item>
-  </string-array>
-  <string-array name="repeat_encouragement_last_time">
-    <item>Good job!</item>
-    <item>I\'m so proud of you!</item>
-    <item>I love when you\'re productive!</item>
-  </string-array>
-  <string name="TEA_tags_label">Listas</string>
-  <string name="tag_FEx_header">Listas</string>
-  <string name="tag_settings_title">Settings:</string>
-  <string name="welcome_title_1">Bem-vindo ao Astrid!</string>
-  <string name="welcome_body_5">and much more!</string>
-  <string-array name="PPW_encouragements">
-    <item>Hi there!</item>
-    <item>Have time to finish something?</item>
-    <item>Gosh, you are looking suave today!</item>
-    <item>Do something great today!</item>
-    <item>Make me proud today!</item>
-    <item>How are you doing today?</item>
-  </string-array>
-  <string-array name="PPW_encouragements_tod">
-    <item>Good morning!</item>
-    <item>Boa tarde!</item>
-    <item>Good evening!</item>
-    <item>Late night?</item>
-    <item>É cedo, faça alguma coisa!</item>
-    <item>Chá da tarde, talvez?</item>
-    <item>Aproveite a noite!</item>
-    <item>Sleep is good for you, you know!</item>
-  </string-array>
-  <string-array name="PPW_encouragements_completed">
-    <item>You\'ve already completed %d tasks!</item>
-    <item>Score in life: %d tasks completed</item>
-    <item>sorria! Já completou as tarefas do %d</item>
-  </string-array>
-  <string-array name="PPW_colors">
-    <item>Preto</item>
-    <item>Branco</item>
-    <item>Azul</item>
-    <item>Translúcido</item>
-  </string-array>
-  <string name="PPW_widget_dlg_ok">Pré-visualizar</string>
-  <string name="PPW_check_button">Obtenha o Power Pack grátis!</string>
-  <string name="PPW_check_share_lists">Partilhar Listas!</string>
-  <string name="PPW_restart_for_enabled_state">Pode ser necessário reiniciar o telefone para que esta alteração surta efeito</string>
+    <string name="actfm_person_hint">Contacto ou Email</string>
+    <string name="actfm_person_or_tag_hint">Contacto ou Lista Partilhada</string>
+    <string name="actfm_tag_operation_owner_delete">É o dono desta lista partilhada! Se a apagar,
+        será apagada para todos os membros da lista. Tem a certeza que deseja continuar?
+    </string>
+    <string name="actfm_picture_camera">Tirar uma Imagem</string>
+    <string name="actfm_picture_gallery">Seleccionar da Galeria</string>
+    <string name="actfm_picture_clear">Limpar Imagem</string>
+    <string name="actfm_view_task_title">Visualizar Tarefa?</string>
+    <string name="actfm_view_task_text">A tarefa foi enviada para %s! Está a visualizar as suas
+        próprias tarefas. Deseja ver esta e também outras tarefas já atribuídas?
+    </string>
+    <string name="actfm_view_task_ok">Ver atribuídas</string>
+    <string name="actfm_view_task_cancel">Ficar Aqui</string>
+    <string name="actfm_my_shared_tasks_title">Minhas Tarefas Partilhadas</string>
+    <string name="actfm_my_shared_tasks_empty">Sem tarefas partilhadas</string>
+    <string name="TVA_add_comment">Adicionar um comentário...</string>
+    <string-array name="TVA_tabs">
+        <item>Tarefas</item>
+        <item>Actividade</item>
+        <item>Definições da Lista</item>
+    </string-array>
+    <string name="actfm_TVA_menu_refresh">Actualizar</string>
+    <string name="actfm_TVA_tag_label">Lista</string>
+    <string name="actfm_TVA_members_label">Partilhado Com</string>
+    <string name="actfm_TVA_silence_label">Notificações Silienciosas</string>
+    <string name="actfm_TVA_tag_description_label">Descrição</string>
+    <string name="actfm_TVA_tag_settings_label">Definições</string>
+    <string name="actfm_TVA_tag_description_hint">Digita uma descrição aqui</string>
+    <string name="actfm_TVA_tag_name_hint">Introduza o nome da lista</string>
+    <string name="actfm_EPA_unassigned">Não atribuído</string>
+    <string name="actfm_EPA_share_with">Partilhar com:</string>
+    <string name="actfm_EPA_facebook">Facebook</string>
+    <string name="actfm_EPA_twitter">Twitter</string>
+    <string name="alarm_ACS_label">Alarmes</string>
+    <string name="alarm_ACS_button">Adicionar um Alarme</string>
+    <string-array name="reminders_alarm">
+        <item>Alarme!</item>
+    </string-array>
+    <string name="backup_BPr_header">Cópias de segurança</string>
+    <string name="backup_BPr_group_status">Estado</string>
+    <string name="backup_status_success">Ultimo: %s</string>
+    <string name="backup_status_failed">Ultima cópia de segurança falhou.</string>
+    <string name="backup_status_failed_subtitle">(pressione para mostrar o erro)</string>
+    <string name="backup_status_never">Nunca fez uma cópia de segurança!</string>
+    <string name="backup_BPr_group_options">Opções</string>
+    <string name="backup_BPr_auto_title">Cópia de Segurança Automática</string>
+    <string name="backup_BPr_auto_disabled">Cópias de Segurança automáticas desligadas</string>
+    <string name="backup_BPr_auto_enabled">A cópia de segurança irá ocorrer diáriamente</string>
+    <string name="backup_BAc_title">Gerir Cópias de Segurança</string>
+    <string name="backup_BAc_import">Importar Tarefas</string>
+    <string name="backup_BAc_export">Exportar Tarefas</string>
+    <string name="backup_TXI_error">Erro de Importação</string>
+    <string name="export_toast">Cópia de Segurança de %1$s para %2$s</string>
+    <string name="export_toast_no_tasks">Não existem Tarefas para Exportar.</string>
+    <string name="export_progress_title">A exportar...</string>
+    <string name="import_summary_title">Sumário de Restauro</string>
+    <string name="import_summary_message">O ficheiro %1$s continha %2$s.\n\n %3$s importadas,\n %4$s
+        já existiam\n %5$s tinham erros\n
+    </string>
+    <string name="import_progress_title">A importar...</string>
+    <string name="import_progress_read">A ler tarefa %d...</string>
+    <string name="DLG_error_sdcard">Não é possível aceder à pasta: %s</string>
+    <string name="DLG_error_sdcard_general">Não é possível aceder ao seu cartão SD!</string>
+    <string name="import_file_prompt">Seleccione um Ficheiro para Restaurar</string>
+    <string name="app_name">Tarefas Astrid</string>
+    <string name="read_permission_label">Permissões do Astrid</string>
+    <string name="read_permission_desc">ler tarefas, mostrar filtros de tarefas</string>
+    <string name="write_permission_label">Permissões do Astrid</string>
+    <string name="write_permission_desc">criar novas tarefas, editar tarefas existentes</string>
+    <string name="DLG_delete_this_task_question">Remover esta tarefa?</string>
+    <string name="DLG_delete_this_item_question">Apagar este item: %s?</string>
+    <string name="DLG_upgrading">A actualizar as suas tarefas...</string>
+    <string name="DLG_hour_minutes">Tempo (horas : minutos)</string>
+    <string name="DLG_please_update">O Astrid deverá ser actualizado com a ultima versão disponível
+        no Android market! Por favor faça-o antes de continuar, ou espere alguns segundos.
+    </string>
+    <string name="DLG_accept">Eu Aceito</string>
+    <string name="DLG_decline">Eu Recuso</string>
+    <string name="DLG_loading">Carregando...</string>
+    <string name="WID_dateButtonUnset">Pressione para confirmar</string>
+    <string name="TLA_no_items">Sem Tarefas!</string>
+    <string name="TLA_menu_sort">Sort &amp; Hidden</string>
+    <string name="TLA_menu_settings">Definições</string>
+    <string name="TLA_custom">Personalizado</string>
+    <string-array name="TLA_filters">
+        <item>Active</item>
+        <item>Hoje</item>
+        <item>Soon</item>
+        <item>Late</item>
+        <item>Concluído</item>
+        <item>Hidden</item>
+    </string-array>
+    <string-array name="TLA_priority_strings">
+        <item>highest priority</item>
+        <item>high priority</item>
+        <item>medium priority</item>
+        <item>low priority</item>
+    </string-array>
+    <string name="TAd_hiddenFormat">%s [omissa]</string>
+    <string name="TAd_deletedFormat">%s [apagado]</string>
+    <string name="TAd_completed">Terminado\n%s</string>
+    <string name="TAd_actionEditTask">Editar</string>
+    <string name="TAd_contextEditTask">Editar Tarefa</string>
+    <string name="TAd_contextUndeleteTask">Recuperar Tarefa</string>
+    <string name="SSD_title">Sorting and Hidden Tasks</string>
+    <string name="SSD_completed">Mostrar Tarefas Completas</string>
+    <string name="SSD_sort_auto">Ordenação Inteligente Astrid</string>
+    <string name="SSD_sort_alpha">Por Título</string>
+    <string name="SSD_sort_importance">Por Importância</string>
+    <string name="SSD_sort_modified">Por Última Modificação</string>
+    <string name="SSD_sort_reverse">Ordem Inversa</string>
+    <string name="SSD_save_temp">Só Uma Vez</string>
+    <string name="SSD_save_always">Sempre</string>
+    <string name="FLA_context_shortcut">Criar atalho no Ambiente de Trabalho</string>
+    <string name="FLA_shortcut_dialog_title">Criar Atalho</string>
+    <string name="FLA_shortcut_dialog">Nome do atalho:</string>
+    <string name="FLA_search_hint">Procurar Tarefas</string>
+    <string name="FLA_search_filter">Coincidentes \'%s\'</string>
+    <string name="FLA_toast_onCreateShortcut">Atalho Criado: %s</string>
+    <string name="TEA_title_hint">Resumo da Tarefa</string>
+    <string name="TEA_importance_label">Importância</string>
+    <string name="TEA_urgency_specific_time">Numa altura específica</string>
+    <string-array name="TEA_loading">
+        <item>Carregando...</item>
+    </string-array>
+    <string name="TEA_note_label">Notas</string>
+    <string name="TEA_notes_hint">Introduzir notas na tarefa...</string>
+    <string name="TEA_estimatedDuration_label">Quanto tempo irá durar?</string>
+    <string name="TEA_elapsedDuration_label">Tempo já gasto na tarefa</string>
+    <string name="TEA_menu_save">Guardar Alterações</string>
+    <string name="TEA_menu_discard">Não Gravar</string>
+    <string name="TEA_menu_delete">Remover Tarefa</string>
+    <string name="TEA_onTaskSave_notDue">Tarefa Guardada</string>
+    <string name="TEA_tab_more">Mais</string>
+    <string-array name="TEA_urgency">
+        <item>Sem Prazo</item>
+        <item>Dia Específico</item>
+        <item>Hoje</item>
+        <item>Amanhã</item>
+        <item>(dia depois)</item>
+        <item>Próxima Semana</item>
+        <item>In two weeks</item>
+        <item>Next month</item>
+    </string-array>
+    <string-array name="TEA_hideUntil">
+        <item>Sempre</item>
+        <item>Due date</item>
+        <item>Due time</item>
+        <item>Dias antes de expirar</item>
+        <item>Semanas antes de expirar</item>
+        <item>Dia/Hora Específico</item>
+    </string-array>
+    <string name="TEA_control_more_section">----More Section----</string>
+    <string name="TEA_control_importance">Importância</string>
+    <string name="TEA_control_lists">Listas</string>
+    <string name="TEA_control_notes">Notas</string>
+    <string-array name="MCA_dialog_speech_options">
+        <item>It must be nice to be so popular!</item>
+        <item>Yay! People like you!</item>
+        <item>Make their day, give \'em a call!</item>
+        <item>Wouldn\'t you be happy if people called you back?</item>
+        <item>You can do it!</item>
+        <item>You can always send a text...</item>
+    </string-array>
+    <string name="UpS_changelog_title">O que existe de novo no Astrid?</string>
+    <string name="EPr_appearance_header">Aparência</string>
+    <string name="EPr_fontSize_title">Tamanho da Lista de Tarefas</string>
+    <string name="EPr_fontSize_desc">Tamanho de Letra na página principal de listagem</string>
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>No swipe</item>
+        <item>Conserve Memory</item>
+        <item>Normal Performance</item>
+        <item>High Performance</item>
+    </string-array>
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <item>Swipe between lists is disabled</item>
+        <item>Slower performance</item>
+        <item>Default setting</item>
+        <item>Uses more system resources</item>
+    </string-array>
+    <string-array name="EPr_themes">
+        <item>Day - Blue</item>
+        <item>Day - Red</item>
+        <item>Sky blue</item>
+        <item>Night</item>
+        <item>Transparent (White Text)</item>
+        <item>Transparent (Black Text)</item>
+    </string-array>
+    <string-array name="EPr_themes_widget">
+        <item>Same as app</item>
+        <item>Day - Blue</item>
+        <item>Day - Red</item>
+        <item>Sky blue</item>
+        <item>Night</item>
+        <item>Transparent (White Text)</item>
+        <item>Transparent (Black Text)</item>
+        <item>Old Style</item>
+    </string-array>
+    <string name="AOA_no_addons">Lista Vazia!</string>
+    <string name="TWi_loading">Carregando...</string>
+    <string name="task_killer_help_ok">Eu Não Irei Matar Astrid!</string>
+    <string name="marketplace_description">Astrid é a lista de tarefas de código fonte aberta
+        altamente aclamada que é simples o suficiente para não lhe atrapalhar, poderosa o suficiente
+        para ajudar Você a fazer as coisas! Etiquetas, Avisos, sincronização com o RememberTheMilk
+        (RTM), plugin de regionalização e mais!
+    </string>
+    <string name="EPr_default_urgency_title">Defeito da Urgência</string>
+    <string-array name="EPr_default_importance">
+        <item>!!! (Highest)</item>
+        <item>!!</item>
+        <item>!</item>
+        <item>o (Lowest)</item>
+    </string-array>
+    <string-array name="EPr_default_urgency">
+        <item>Sem Prazo</item>
+        <item>Hoje</item>
+        <item>Amanhã</item>
+        <item>Day after tomorrow</item>
+        <item>Próxima Semana</item>
+    </string-array>
+    <string-array name="EPr_default_hideUntil">
+        <item>Não Esconder</item>
+        <item>Tarefa já passou o prazo</item>
+        <item>Dias antes de expirar</item>
+        <item>Semanas antes de expirar</item>
+    </string-array>
+    <string-array name="EPr_default_reminders">
+        <item>No deadline reminders</item>
+        <item>At deadline</item>
+        <item>When overdue</item>
+        <item>At deadline or overdue</item>
+    </string-array>
+    <string name="BFE_Active">Tarefas Activas</string>
+    <string name="CFA_universe_all">Tarefas Activas</string>
+    <string name="CFA_type_add">ou</string>
+    <string name="CFA_type_subtract">não</string>
+    <string name="CFA_type_intersect">também</string>
+    <string-array name="CFC_dueBefore_entries">
+        <item>No Due Date</item>
+        <item>Ontem</item>
+        <item>Hoje</item>
+        <item>Amanhã</item>
+        <item>Day After Tomorrow</item>
+        <item>Próxima Semana</item>
+        <item>Next Month</item>
+    </string-array>
+    <string name="CFC_importance_name">Importância...</string>
+    <string name="gcal_TEA_showCalendar_label">Abrir Evento De Calendário</string>
+    <string name="gcal_GCP_default">Calendário Predefinido</string>
+    <string-array name="locale_interval">
+        <item>once an hour</item>
+        <item>once every six hours</item>
+        <item>once every twelve hours</item>
+        <item>once a day</item>
+        <item>once every three days</item>
+        <item>once a week</item>
+    </string-array>
+    <string-array name="TEA_reminder_random">
+        <item>an hour</item>
+        <item>a day</item>
+        <item>a week</item>
+        <item>in two weeks</item>
+        <item>a month</item>
+        <item>in two months</item>
+    </string-array>
+    <string name="rmd_NoA_filter">Lembrete!</string>
+    <string name="rmd_NoA_done">Já Terminada!</string>
+    <string name="rmd_NoA_snooze">Parar...</string>
+    <string-array name="rmd_reengage_notif_titles">
+        <item>A note from Astrid</item>
+        <item>Memo for %s.</item>
+        <item>Your Astrid digest</item>
+        <item>Reminders from Astrid</item>
+    </string-array>
+    <string-array name="rmd_reengage_dialog_options">
+        <item>Time to shorten your to-do list!</item>
+        <item>Dear sir or madam, some tasks await your inspection!</item>
+        <item>Hi there, could you take a look at these?</item>
+        <item>I\'ve got some tasks with your name on them!</item>
+        <item>A fresh batch of tasks for you today!</item>
+        <item>You look fabulous! Ready to get started?</item>
+        <item>A lovely day for getting some work done, I think!</item>
+    </string-array>
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>Don\'t you want to get organized?</item>
+        <item>I\'m Astrid! I\'m here to help you do more!</item>
+        <item>You look busy! Let me take some of those tasks off of your plate.</item>
+        <item>I can help you keep track of all of the details in your life.</item>
+        <item>You\'re serious about getting more done? So am I!</item>
+        <item>Pleasure to make your acquaintance!</item>
+    </string-array>
+    <string name="rmd_EPr_quiet_hours_start_title">Início do Período de Inactividade</string>
+    <string name="rmd_EPr_quiet_hours_end_title">Fim do Período de Inactividade</string>
+    <string name="rmd_EPr_ringtone_title">Toque de Notificação</string>
+    <string name="rmd_EPr_vibrate_title">Vibrar ao Alertar</string>
+    <string-array name="EPr_reminder_random">
+        <item>desactivado</item>
+        <item>de hora em hora</item>
+        <item>diariamente</item>
+        <item>semanalmente</item>
+        <item>bi-weekly</item>
+        <item>mensalmente</item>
+        <item>bi-monthly</item>
+    </string-array>
+    <string-array name="EPr_quiet_hours_start">
+        <item>desactivado</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>02:00</item>
+        <item>02:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18.00</item>
+        <item>19:00</item>
+    </string-array>
+    <string-array name="EPr_quiet_hours_end">
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18.00</item>
+        <item>19:00</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>02:00</item>
+        <item>02:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+    </string-array>
+    <string-array name="EPr_rmd_time">
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18.00</item>
+        <item>19:00</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>02:00</item>
+        <item>02:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+    </string-array>
+    <string-array name="reminders">
+        <item>Olá, tem um segundo?</item>
+        <item>Tem um tempinho?</item>
+        <item>Tem alguns minutos?</item>
+        <item>Será que se esqueceu?</item>
+        <item>Desculpe-me!</item>
+        <item>Quando tiver um minuto:</item>
+        <item>Na sua agenda:</item>
+        <item>Livre por um momento?</item>
+        <item>Astrid aqui!</item>
+        <item>Olá! Posso incomodar?</item>
+        <item>Tem um minuto?</item>
+        <item>É um óptimo dia para</item>
+    </string-array>
+    <string-array name="reminders_due">
+        <item>Time to work!</item>
+        <item>Due date is here!</item>
+        <item>Ready to start?</item>
+        <item>You said you would do:</item>
+        <item>You\'re supposed to start:</item>
+        <item>Time to start:</item>
+        <item>It\'s time!</item>
+        <item>Excuse me! Time for</item>
+        <item>You free? Time to</item>
+    </string-array>
+    <string-array name="reminders_snooze">
+        <item>Don\'t be lazy now!</item>
+        <item>Snooze time is up!</item>
+        <item>No more snoozing!</item>
+        <item>Now are you ready?</item>
+        <item>No more postponing!</item>
+    </string-array>
+    <string-array name="reminder_responses">
+        <item>I\'ve got something for you!</item>
+        <item>Pronto para esquecer isto?</item>
+        <item>Why don\'t you get this done?</item>
+        <item>Que me diz? Ah Leão</item>
+        <item>Pronto pra fazer isto?</item>
+        <item>Você pode resolver isto?</item>
+        <item>Tu podes ser feliz! Apenas termina isto!</item>
+        <item>I promise you\'ll feel better if you finish this!</item>
+        <item>Porque é que não fazes isto hoje?</item>
+        <item>Please finish this, I\'m sick of it!</item>
+        <item>Pode terminar isto? Sim, você pode!</item>
+        <item>Irá alguma vez fazer isto?</item>
+        <item>Feel good about yourself! Let\'s go!</item>
+        <item>Sinta-se bem! Vamos!</item>
+        <item>Um lanche depois que Você terminar isto?</item>
+        <item>Só esta tarefa? Por favor?</item>
+        <item>Está na hora de diminuir sua lista de tarefas!</item>
+        <item>Are you on Team Order or Team Chaos? Team Order! Let\'s go!</item>
+        <item>Have I mentioned you are awesome recently? Keep it up!</item>
+        <item>A task a day keeps the clutter away... Goodbye clutter!</item>
+        <item>How do you do it? Wow, I\'m impressed!</item>
+        <item>You can\'t just get by on your good looks. Let\'s get to it!</item>
+        <item>Lovely weather for a job like this, isn\'t it?</item>
+        <item>A spot of tea while you work on this?</item>
+        <item>If only you had already done this, then you could go outside and play.</item>
+        <item>It\'s time. You can\'t put off the inevitable.</item>
+        <item>I die a little every time you ignore me.</item>
+    </string-array>
+    <string-array name="postpone_nags">
+        <item>Please tell me it isn\'t true that you\'re a procrastinator!</item>
+        <item>Doesn\'t being lazy get old sometimes?</item>
+        <item>Algures, alguém precisa que Você termine isto!</item>
+        <item>When you said postpone, you really meant \'I\'m doing this\', right?</item>
+        <item>É a última vez que irá adiar, certo?</item>
+        <item>Just finish this today, I won\'t tell anyone!</item>
+        <item>Por que adiar quando Você pode mmmh... não adiar</item>
+        <item>You\'ll finish this eventually, I presume?</item>
+        <item>I think you\'re really great! How about not putting this off?</item>
+        <item>Você conseguirá atingir seus objectivos se Você fizer isso?</item>
+        <item>Adiar, adiar, adiar. Quando você irá mudar!</item>
+        <item>I\'ve had enough with your excuses! Just do it already!</item>
+        <item>Didn\'t you make that excuse last time?</item>
+        <item>I can\'t help you organize your life if you do that...</item>
+    </string-array>
+    <string name="repeat_enabled">Repete</string>
+    <string-array name="repeat_interval_short">
+        <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">
+        <item>Dia(s)</item>
+        <item>Semana(s)</item>
+        <item>Mês(es)</item>
+        <item>Hora(s)</item>
+        <item>Minute(s)</item>
+        <item>Year(s)</item>
+    </string-array>
+    <string-array name="repeat_until_shortcuts">
+        <item>Forever</item>
+        <item>Specific Day</item>
+        <item>Today</item>
+        <item>Tomorrow</item>
+        <item>(day after)</item>
+        <item>Next Week</item>
+        <item>In Two Weeks</item>
+        <item>Next Month</item>
+    </string-array>
+    <string-array name="repeat_type">
+        <item>from due date</item>
+        <item>from completion date</item>
+    </string-array>
+    <string-array name="repeat_encouragement">
+        <item>Good job!</item>
+        <item>Wow… I\'m so proud of you!</item>
+        <item>I love when you\'re productive!</item>
+        <item>Doesn\'t it feel good to check something off?</item>
+    </string-array>
+    <string-array name="repeat_encouragement_last_time">
+        <item>Good job!</item>
+        <item>I\'m so proud of you!</item>
+        <item>I love when you\'re productive!</item>
+    </string-array>
+    <string name="TEA_tags_label">Listas</string>
+    <string name="tag_FEx_header">Listas</string>
+    <string name="tag_settings_title">Settings:</string>
+    <string name="welcome_title_1">Bem-vindo ao Astrid!</string>
+    <string name="welcome_body_5">and much more!</string>
+    <string-array name="PPW_encouragements">
+        <item>Hi there!</item>
+        <item>Have time to finish something?</item>
+        <item>Gosh, you are looking suave today!</item>
+        <item>Do something great today!</item>
+        <item>Make me proud today!</item>
+        <item>How are you doing today?</item>
+    </string-array>
+    <string-array name="PPW_encouragements_tod">
+        <item>Good morning!</item>
+        <item>Boa tarde!</item>
+        <item>Good evening!</item>
+        <item>Late night?</item>
+        <item>É cedo, faça alguma coisa!</item>
+        <item>Chá da tarde, talvez?</item>
+        <item>Aproveite a noite!</item>
+        <item>Sleep is good for you, you know!</item>
+    </string-array>
+    <string-array name="PPW_encouragements_completed">
+        <item>You\'ve already completed %d tasks!</item>
+        <item>Score in life: %d tasks completed</item>
+        <item>sorria! Já completou as tarefas do %d</item>
+    </string-array>
+    <string-array name="PPW_colors">
+        <item>Preto</item>
+        <item>Branco</item>
+        <item>Azul</item>
+        <item>Translúcido</item>
+    </string-array>
+    <string name="PPW_widget_dlg_ok">Pré-visualizar</string>
+    <string name="PPW_check_button">Obtenha o Power Pack grátis!</string>
+    <string name="PPW_check_share_lists">Partilhar Listas!</string>
+    <string name="PPW_restart_for_enabled_state">Pode ser necessário reiniciar o telefone para que
+        esta alteração surta efeito
+    </string>
 </resources>
diff --git a/astrid/res/values-ru/strings-opencrx.xml b/astrid/res/values-ru/strings-opencrx.xml
index 550628e25..c5c3de353 100644
--- a/astrid/res/values-ru/strings-opencrx.xml
+++ b/astrid/res/values-ru/strings-opencrx.xml
@@ -4,46 +4,48 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 
     <!-- ====================== Plugin Boilerplate OpenCRX ========================= -->
 
-	<!-- filters header: Opencrx -->
+    <!-- filters header: Opencrx -->
     <string name="opencrx_FEx_header">OpenCRX</string>
-    
+
     <!-- filter category for opencrx dashboards -->
     <string name="opencrx_FEx_dashboard">Создатели деятельности</string>
-    
+
     <!-- filter category for opencrx responsible person -->
     <string name="opencrx_FEx_responsible">Ответственный</string>
-    
+
     <!--  opencrx dashboard filter title (%s => dashboardname) -->
     <string name="opencrx_FEx_responsible_title">Ответственный \'%s\'</string>
-    
+
     <!-- opencrx detail for showing tasks created by someone else (%s => person name) -->
     <string name="opencrx_PDE_task_from">от %s</string>
-    
+
     <!-- replacement string for task edit "Notes" when using opencrx -->
     <string name="opencrx_TEA_notes">Добавить комментарий</string>
 
     <!-- ==================================================== Preferences == -->
 
-    <!-- Preferences Title: opencrx -->    
+    <!-- Preferences Title: opencrx -->
     <string name="opencrx_PPr_header">OpenCRX</string>
 
     <!-- dashboard title for tasks that are not synchronized opencrx -->
     <string name="opencrx_no_creator">Не синхронизировать</string>
 
-	<!-- preference title for default dashboard opencrx -->
+    <!-- preference title for default dashboard opencrx -->
     <string name="opencrx_PPr_defaultcreator_title">Создатель деятельности по умолчанию</string>
 
     <!-- preference description for default dashboard (%s -> setting) opencrx -->
     <string name="opencrx_PPr_defaultcreator_summary">Добавлять новые задачи в %s</string>
 
     <!-- preference description for default dashboard (when set to 'not synchronized') opencrx -->
-    <string name="opencrx_PPr_defaultcreator_summary_none">Новые задачи не будут синхонизированы по умолчанию</string>
-    
-        <!--  OpenCRX host and segment group name -->
+    <string name="opencrx_PPr_defaultcreator_summary_none">Новые задачи не будут синхонизированы по
+        умолчанию
+    </string>
+
+    <!--  OpenCRX host and segment group name -->
     <string name="opencrx_group">Адрес OpenCRX</string>
 
     <!--  preference description for OpenCRX host -->
@@ -51,85 +53,94 @@
 
     <!--  dialog title for OpenCRX host -->
     <string name="opencrx_host_dialog_title">Адрес OpenCRX</string>
-    
+
     <!--  example for OpenCRX host -->
-    <string name="opencrx_host_summary">Например: <i>mydomain.com/opencrx-rest-CRX</i></string>
-    
+    <string name="opencrx_host_summary">Например:
+        <i>mydomain.com/opencrx-rest-CRX</i>
+    </string>
+
     <!--  preference description for OpenCRX segment -->
     <string name="opencrx_segment_title">Сегмент</string>
 
     <!--  dialog title for OpenCRX segment -->
     <string name="opencrx_segment_dialog_title">Синхронизируемый сегмент</string>
-    
+
     <!--  example for OpenCRX segment -->
-    <string name="opencrx_segment_summary">Например: <i>Standard</i></string>
-    
+    <string name="opencrx_segment_summary">Например:
+        <i>Standard</i>
+    </string>
+
     <!--  default value for OpenCRX segment -->
     <string name="opencrx_segment_default">Standard</string>
-    
+
     <!--  preference description for OpenCRX provider -->
     <string name="opencrx_provider_title">Provider</string>
 
     <!--  dialog title for OpenCRX provider -->
     <string name="opencrx_provider_dialog_title">OpenCRX data provider</string>
-    
+
     <!--  example for OpenCRX provider -->
-    <string name="opencrx_provider_summary">Например: <i>CRX</i></string>
-    
+    <string name="opencrx_provider_summary">Например:
+        <i>CRX</i>
+    </string>
+
     <!--  default value for OpenCRX provider -->
     <string name="opencrx_provider_default">CRX</string>
-    
+
 
     <!-- ================================================= Login Activity == -->
 
-    <!-- Activity Title: OpenCRX Login -->    
+    <!-- Activity Title: OpenCRX Login -->
     <string name="opencrx_PLA_title">Войти в OpenCRX</string>
 
-    <!-- Instructions: OpenCRX login -->    
-    <string name="opencrx_PLA_body">Войдите в OpenCRX, используя существующую учётную запись!</string>
+    <!-- Instructions: OpenCRX login -->
+    <string name="opencrx_PLA_body">Войдите в OpenCRX, используя существующую учётную запись!
+    </string>
 
-    <!-- Sign In Button opencrx -->    
+    <!-- Sign In Button opencrx -->
     <string name="opencrx_PLA_signIn">Войти</string>
 
-    <!-- Login Label OpenCRX -->    
+    <!-- Login Label OpenCRX -->
     <string name="opencrx_PLA_login">Имя пользователя</string>
 
-    <!-- Password Label OpenCRX -->    
+    <!-- Password Label OpenCRX -->
     <string name="opencrx_PLA_password">Пароль</string>
-    
-    <!-- Error Message when fields aren't filled out opencrx -->    
+
+    <!-- Error Message when fields aren't filled out opencrx -->
     <string name="opencrx_PLA_errorEmpty">Ошибка: заполните все поля!</string>
 
-    <!-- Error Message when we receive a HTTP 401 Unauthorized opencrx -->    
+    <!-- Error Message when we receive a HTTP 401 Unauthorized opencrx -->
     <string name="opencrx_PLA_errorAuth">Ошибка: неправильное имя пользователя или пароль!</string>
 
     <!-- ================================================ Synchronization == -->
-        
+
     <!-- title for notification tray after synchronizing opencrx -->
     <string name="opencrx_notification_title">OpenCRX</string>
-    
+
     <!-- text for notification tray when synchronizing opencrx -->
     <string name="opencrx_notification_text">%s задач обновлено / кликните для подробностей</string>
-    
+
     <!-- Error msg when io exception opencrx  -->
     <string name="opencrx_ioerror">Ошибка соединения! Проверьте подключение к интернету.</string>
 
     <!-- Prod Login email not specified opencrx-->
     <string name="opencrx_MLA_email_empty">Не указано имя пользователя!</string>
-    
+
     <!-- Prod Login password not specified opencrx-->
     <string name="opencrx_MLA_password_empty">Не указан пароль!</string>
-    
+
     <!-- ================================================ labels for layout-elements  opencrx== -->
-    
+
     <!-- label for task-assignment spinner on taskeditactivity opencrx -->
     <string name="opencrx_TEA_task_assign_label">Назначить эту задачу этому человеку:</string>
-    
+
     <!-- Spinner-item for unassigned tasks on taskeditactivity opencrx -->
     <string name="opencrx_TEA_task_unassigned">&lt;Без назначения&gt;</string>
-    
+
     <!-- label for dashboard-assignment spinner on taskeditactivity opencrx -->
-    <string name="opencrx_TEA_creator_assign_label">Назначить эту задачу этому создателю деятельности:</string>
+    <string name="opencrx_TEA_creator_assign_label">Назначить эту задачу этому создателю
+        деятельности:
+    </string>
 
     <!-- Spinner-item for default dashboard on taskeditactivity opencrx -->
     <string name="opencrx_TEA_dashboard_default">&lt;По умолчанию&gt;</string>
diff --git a/astrid/res/values-ru/strings.xml b/astrid/res/values-ru/strings.xml
index d628f32ad..f0ea52d1d 100755
--- a/astrid/res/values-ru/strings.xml
+++ b/astrid/res/values-ru/strings.xml
@@ -4,1692 +4,1837 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ================================================== general terms == -->
-
-  <!-- People Editing Activity -->    
-  
-  <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
-  <string name="actfm_person_hint">Контакт или email</string>
-  
-  <!-- task sharing dialog: shared with hint -->
-  <string name="actfm_person_or_tag_hint">Контакт или общий список</string>
-
-  <!-- toast on transmit success -->
-
-  <!-- can\'t rename or delete shared tag message -->
-  
-  <!-- warning before deleting a list you\'re the owner of -->
-  <string name="actfm_tag_operation_owner_delete">Вы владелец этого общего списка! Если вы удалите его, он будет удален для всех участников. Вы уверены, что хотите продолжить?</string>
-
-  <!-- slide 29a: menu item to take a picture -->
-  <string name="actfm_picture_camera">Сделать снимок</string>
-
-  <!-- slide 29b: menu item to select from gallery -->
-  <string name="actfm_picture_gallery">Взять из галереи</string>
-  
-  <!-- menu item to clear picture selection -->
-  <string name="actfm_picture_clear">Убрать изображение</string>
-
-  <!-- filter list activity: refresh tags -->
-  
-  <!-- Title for prompt after sharing a task -->
-  <string name="actfm_view_task_title">Просмотреть задачу?</string>
-
-  <!-- Text for prompt after sharing a task -->
-  <string name="actfm_view_task_text">Задача была отправлена %s! Сейчас вы просматриваете ваши собственные задачи. Хотите просмотреть эту и другие задачи назначенные вам?</string>
-  
-  <!-- Ok button for task view prompt -->
-  <string name="actfm_view_task_ok">Просмотреть назначенные</string>
-      
-  <!-- Cancel button for task view prompt -->
-  <string name="actfm_view_task_cancel">Остаться здесь</string>
-  
-  <!-- slide 13a: Title for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_title">Мои общие задачи</string>
-  
-  <!-- Empty list for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_empty">Нет общих задач</string>
-  
-  <!-- =====================  Friendship connections -->
-  
-  <string name="actfm_friendship_pending">Вы направили запрос дружбы %s!</string>
-
-  <string name="actfm_friendship_blocked">Пользователь %s заблокирован.</string>
-
-  <string name="actfm_friendship_ignored">Вы проигнорировали %s.</string>
-  
-  <string name="actfm_friendship_friends">Вы и %s теперь друзья! Добавить задания для друга можно ниже.</string>
-
-  <string name="actfm_friendship_other_pending">%s хочет добавить вас в друзья.</string>
-
-  <string name="actfm_friendship_no_status">Соединиться с %s чтобы делиться и следить за активностью публичных задач!</string>
-
-  <string name="actfm_friendship_connect">Добавить друга</string>
-
-  <string name="actfm_friendship_accept">Принять</string>
-
-  <!-- ================================================== TagViewActivity == -->  
-
-  <!-- Tag View Activity: Add Comment hint -->    
-  <string name="TVA_add_comment">Добавить комментарий...</string>
-
-  <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->    
-  
-  <!-- Tabs for Tag view -->
-  <string-array name="TVA_tabs">
-    <!-- Tab for showing tasks -->
-    <item>Задачи</item>
-    <!-- Tab for showing comments & updates -->
-    <item>Действия</item>
-    <!-- Tab for showing setting -->
-    <item>Настройки списка</item>
-  </string-array>
-  
-  <!-- Tag View: filtered by assigned to user (%s => user name) -->
-  <string name="actfm_TVA_filtered_by_assign">Задачи %s. Нажмите, чтобы увидеть все.</string>
-  
-  <!-- Tag View: filter by unassigned tasks -->
-  <string name="actfm_TVA_filter_by_unassigned">Неназначенные задачи. Нажмите, чтобы увидеть все.</string>
-
-  <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Приватный: нажмите, чтобы изменить или опубликовать список</string>
-
-  <!-- Tag View Menu: refresh -->
-  <string name="actfm_TVA_menu_refresh">Обновить</string>
-
-  <!-- Tag Settings: tag name label -->
-  <string name="actfm_TVA_tag_label">Список</string>
-
-  <!-- Tag Settings: tag owner label -->
-
-  <!-- Tag Settings: tag owner value when there is no owner -->
-
-  <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
-  <string name="actfm_TVA_members_label">Опубликовано для</string>
-  
-  <!-- Tag Settings: list collaborators hint -->
-  <string name="actfm_TVA_members_hint">Поделись с теми, у кого есть почтовый адрес</string>
-
-  <!-- Tag Settings: tag picture -->
-  <string name="actfm_TVA_tag_picture">Укажите фото:</string>
-
-  <!-- slide 25c/28b: Tag Settings: silence notifications label -->
-  <string name="actfm_TVA_silence_label">Беззвучные уведомления</string>
-  
-  <!-- Tag Settings: list icon label -->
-  
-  <!-- slide 25b/27d: Tag Settings: list description label -->
-  <string name="actfm_TVA_tag_description_label">Описание</string>
-  
-  <!-- slide 28a: Tag Settings: list settings label -->
-  <string name="actfm_TVA_tag_settings_label">Настройки</string>
-
-  <!-- slide 25b: Tag Settings: list description hint -->
-  <string name="actfm_TVA_tag_description_hint">Введите описание здесь</string>
-  
-  <!-- slide 25d: Tag Settings: list name hint -->
-  <string name="actfm_TVA_tag_name_hint">Введите имя списка</string>
-  
-  <!-- Tag settings: login prompt from share-->
-  <string name="actfm_TVA_login_to_share">Для публикации списков необходимо авторизоваться на Astrid.com! Пожалуйста авторизуйтесь или сделайте список персональным.</string>
-  
-      
-  <!-- ============================================ edit people dialog == -->
-
-  <!-- task sharing dialog: intro -->
-  <string name="actfm_EPA_intro">Используйте Astrid для обмена списками покупок, планами или командными проектами и мгновенно следите за тем как люди доводят дела до конца.</string>
-    
-  <!-- task sharing dialog: window title -->
-    
-  <!-- task sharing dialog: save button -->
-  
-  <!-- task sharing dialog: assigned label -->
-  
-  <!-- slide 18a: task sharing dialog: assigned label long version -->
-  <string name="actfm_EPA_assign_label_long">Кто должен выполнить задачу?</string>
-  
-  <!-- task sharing dialog: assigned to me -->
-  <string name="actfm_EPA_assign_me">Мне</string>
-  
-  <!-- task sharing dialog: anyone -->
-  <string name="actfm_EPA_unassigned">Не назначен</string>
-  
-  <!-- slide 18c: task sharing dialog: choose a contact -->
-  <string name="actfm_EPA_choose_contact">Выберите контакт</string>
-  
-  <!-- task sharing dialog: custom email assignment -->
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_share_with">Поделиться с:</string>
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_collaborators_header">Поделиться</string>
-
-      <!-- task sharing dialog: collaborator list name (%s => name of list) -->
-  <string name="actfm_EPA_list">Список: %s</string>
-  
-  <!-- task sharing dialog: assigned hint -->
-  
-  <!-- task sharing dialog: message label text -->
-  <string name="actfm_EPA_message_text">Приглашение:</string>
-  
-  <!-- task sharing dialog: message body -->
-  <string name="actfm_EPA_message_body">Помогите мне выполнить это!</string>
-  
-  <!-- task sharing dialog: list members section header -->
-  <string name="actfm_EPA_assign_header_members">Список участников</string>
-
-  <!-- task sharing dialog: astrid friends section header -->
-  <string name="actfm_EPA_assign_header_friends">Друзья Astrid</string>
-
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: share with Facebook -->
-  <string name="actfm_EPA_facebook">Facebook</string>
-  
-  <!-- task sharing dialog: share with Twitter -->
-  <string name="actfm_EPA_twitter">Twitter</string>
-
-  <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
-
-  <!-- task sharing dialog: edit people settings saved -->
-
-  <!-- task sharing dialog: invalid email (%s => email) -->
-  <string name="actfm_EPA_invalid_email">Неверный адрес электронной почты: %s</string>
-
-  <!-- task sharing dialog: tag not found (%s => tag) -->
-  
-  <!-- task sharing login prompt -->
-  <string name="actfm_EPA_login_to_share">Вам нужно авторизоваться на Astrid.com, чтобы поделиться задачами!</string>
-  
-  <string name="actfm_EPA_login_button">Войти</string>
-  
-  <string name="actfm_EPA_dont_share_button">Не публиковать</string>
-  
-  <string name="actfm_EPA_add_person_to_list_title">Задание назначено</string>
-  
-  <string name="actfm_EPA_add_person_to_list">%1$s не добавлен в этот список. Добавить %2$s в список?</string>
-
-  <string name="actfm_EPA_add_person_to_list_ok">Добавить в список</string>
-  
-  <string name="actfm_EPA_add_person_to_list_cancel">Не добавлять</string>
-  
-  <string name="actfm_list_owner">(владелец)</string>
-  
-  <!-- ========================================= sharing login activity == -->
-
-  <!-- share login: Title -->
-  <string name="actfm_ALA_title">Добро пожаловать на Astrid.com!</string>
-
-  <!-- share login: Sharing Description -->
-  <string name="actfm_ALA_body">Astrid.com позволяет вам получать доступ к своим задачам онлайн, 
-обмениваться ими и поручать их другим.</string>
-
-  <!-- share login: Sharing Login FB Prompt -->
-  <string name="actfm_ALA_fb_login">Подключиться к Facebook</string>
-
-  <!-- share login: Sharing Login GG Prompt -->
-  <string name="actfm_ALA_gg_login">Подключиться к Google</string>
-  
-  <!-- share login: Quickly log in as <%s -> email> -->
-  <string name="actfm_quick_login">Войти: %s</string>
-
-  <!-- share login: Reject quick login -->
-  <string name="actfm_quick_login_reject">Не %s?</string>
-
-  <!-- share login: Name -->
-  <string name="actfm_ALA_firstname_label">Имя</string>
-  
-  <!-- share login: Name -->
-  <string name="actfm_ALA_lastname_label">Фамилия</string>
-
-  <!-- share login: Email -->
-  <string name="actfm_ALA_email_label">Электронная почта</string>
-
-  <!-- share login: Username / Email -->
-
-  <!-- share login: Password -->
-  <string name="actfm_ALA_password_label">Пароль</string>
-
-  <!-- share login: Sign Up Title -->
-  <string name="actfm_ALA_signup_title">Регистрация</string>
-
-  <!-- share login: Login Title -->
-  <string name="actfm_ALA_login_title">Войти</string>
-
-  <!-- share login: Google Auth title -->
-  <string name="actfm_GAA_title">Выберите аккаунт Google, который вы хотите использовать:</string>
-
-  <!-- share login: OAUTH Login Prompt -->
-  <string name="actfm_OLA_prompt">Пожалуйста, войдите:</string>
-  
-  <!-- Login error: user exists -->
-  <string name="actfm_ALA_error_user_exists">Пользователь уже существует. Пожалуйста, войдите.</string>
-  
-  <!-- Login error: wrong password -->
-  <string name="actfm_ALA_error_wrong_password">Извините, неверный пароль. Попробуйте еще раз.</string>
-  
-  <!-- Forgot password link -->
-  <string name="actfm_ALA_forgot_password">Забыли пароль?</string>
-  
-  <!-- Forgot password email prompt -->
-  <string name="actfm_ALA_enter_email">Введите Ваш email</string>
-  
-  <!-- Password reset sent (%s -> email) -->
-  <string name="actfm_ALA_reset_sent">Ссылка для сброса  пароля отправлена на %s</string>
-  
-  <!-- User already exists - first sync may be slow -->
-  <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your patience!</string>
-  
-  <!-- User not found -->
-  <string name="actfm_ALA_error_user_not_found">Пользователь с указанным email не найден. Попробуйте зарегестрироваться!</string>
-  
-  <!-- ================================================ Featured Lists -->
-
-  <string name="actfm_feat_list_clone">Копировать список</string>
-  
-  <string name="actfm_feat_list_suffix">(Копия)</string>
-
-  <string name="actfm_feat_list_cloning">Копирование...</string>
-
-  <string name="actfm_feat_list_clone_success">Завершено успешно!</string>
-
-  <string name="actfm_feat_list_task_clone_success">Задача скопирована</string>
-
-  <string name="actfm_feat_list_clone_empty">Нет задач для копирования</string>
-  
-  <!-- ================================================ Synchronization == -->
-      
-  <!-- Indicates the logged in user name. %s -> user\'s name -->
-  <string name="actfm_status_title_logged_in">Статус - Вошел как %s</string>    
-      
-  <!-- Preferences Title: Act.fm -->    
-  <string name="actfm_APr_header">Astrid.com</string>
-  
-  <string name="actfm_https_title">Использовать HTTPS</string>
-  <string name="actfm_https_enabled">HTTPS включен (медленнее)</string>
-  <string name="actfm_https_disabled">HTTPS отключен (быстрее)</string>
-
-  <!-- title for notification tray after synchronizing -->
-  
-  <!-- text for notification when comments are received -->
-    
-  <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, 
-      Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page,
-      or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.  
-      Are you sure you want to sync with Astrid.com?</string>
-      
-  <!-- account types -->
-  <string name="actfm_account_type">Тип учётной записи</string>
-  <string name="actfm_account_info">Данные учётной записи</string>
-  <string name="actfm_account_info_summary">Статус и опции</string>
-  <string name="account_type_title_not_logged_in">Бесплатная регистрация</string>
-  <string name="account_type_summary_not_logged_in">Доступ к задачам онлайн, делиться списками и делегировать</string>
-  
-  
-  <string name="actfm_account_premium">Премиум</string>
-  <string name="actfm_account_basic">Базовый</string>
-  
-  <string name="actfm_inapp_billing">Перейти на Премиум</string>
-  <string name="actfm_inapp_billing_summary">Прикрепить файлы, голосовые резервные копии, премиальная поддержка и другое</string>
-  
-  <!-- Sharing -->
-  <string name="share_with_facebook">Поддержать на Facebook</string>
-  <string name="share_with_twitter">Подписаться в Twitter\'e</string>
-  <string name="share_with_google">Поделиться в Google+</string>
-  <string name="share_speech_bubble">Поделившись, вы поможете другим быть более продуктивными!</string>
-  
-  
-  <!-- Sync upgrade messages -->
-  <string name="sync_upgr_both_title">Использование Astrid.com + Google без Дубликатов</string>
-  <string name="sync_upgr_both_body">Давайте будем откровенны. Google Tasks удобен, но не так крут как Astrid.  Чтобы предотвратить создание дуликатов, Вам нет больше необходимости синхронизироваться с Astrid.com  и фоном с Google Tasks  в одно и то же время. Вам достаточно импортировать ваши задачи из  Google Tasks в Settings → Backup &amp; Sync, или откатится до синхронизации только с Google Tasks.</string>
-  <string name="sync_upgr_both_btn1">с Astrid</string>
-  <string name="sync_upgr_both_btn2">Откатить до Google Tasks</string>
-  
-  <string name="sync_upgr_gtasks_only_title">Бесплатно обновить до Astrid Sync</string>
-  <string name="sync_upgr_gtasks_only_body">Доступ к Вашим задачам с любого устройства и из Gmail c Astrid.com sync. Обновитесь до Astrid.com Sync  (Вы всегда можете перейти обратно - но вряд ли захитите)!</string>
-  <string name="sync_upgr_gtasks_only_btn1">Обновить до Astrid Sync</string>
-  <string name="sync_upgr_gtasks_only_btn2">Вместе с Google Tasks</string>
-  
-  <string name="sync_upgr_neither_title">Бесплатный бэкап &amp; Sync!</string>
-  <string name="sync_upgr_neither_body">Не рискуйте безопасностью ваших заметок! Используйте новый улучшенный Astrid sync для хранения заметок откуда угодно. </string>
-  <string name="sync_upgr_neither_btn1">OK</string>
-  
-  <string name="sync_upgr_logged_out">Вы вышли из системы</string>
-  
-  <string name="actfm_logout_clear_tasks_title">Очистить данные?</string>
-  <string name="actfm_logout_clear_tasks_body">Вы хотите очистить ваши задачи и списки?</string>
-  <string name="actfm_logout_clear_tasks_yes">Очистить данные</string>
-  <string name="actfm_logout_clear_tasks_no">Сохранить данные</string>
-  
-  <string name="actfm_logged_in_different_user_title">Войти как другой пользователь</string>
-  <string name="actfm_logged_in_different_user_body">Вы хотите удалить существующие телефонные задачи перед синхронизацией?</string>
-  <string name="actfm_logged_in_different_user_keep_data">Сохранить данные</string>
-  <string name="actfm_logged_in_different_user_clear_data">Очистить все данные</string>
-  <string name="actfm_logged_in_different_user_processing">Обработка существующих данных...</string>
-  
-  <string name="actfm_tag_not_authorized_title">Не авторизовано </string>
-  <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name?</string>
-  <string name="actfm_tag_not_authorized_new_list">Создать новый список</string>
-  <string name="actfm_tag_not_authorized_leave_list">Покинуть список</string>
-  
-  <string name="actfm_sync_ongoing">Процесс синхронизации…</string>
-  
-  <string name="EPr_reset_sync_state">Сброс синхронизации</string>
-  <string name="EPr_reset_sync_state_summary">Сбросьте некоторые данные, чтобы разрешить проблему синхронизации</string>
-  <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue?</string>
-  
+<resources>
 
+    <!-- ================================================== general terms == -->
 
+    <!-- People Editing Activity -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
+    <string name="actfm_person_hint">Контакт или email</string>
+
+    <!-- task sharing dialog: shared with hint -->
+    <string name="actfm_person_or_tag_hint">Контакт или общий список</string>
+
+    <!-- toast on transmit success -->
+
+    <!-- can\'t rename or delete shared tag message -->
+
+    <!-- warning before deleting a list you\'re the owner of -->
+    <string name="actfm_tag_operation_owner_delete">Вы владелец этого общего списка! Если вы удалите
+        его, он будет удален для всех участников. Вы уверены, что хотите продолжить?
+    </string>
+
+    <!-- slide 29a: menu item to take a picture -->
+    <string name="actfm_picture_camera">Сделать снимок</string>
+
+    <!-- slide 29b: menu item to select from gallery -->
+    <string name="actfm_picture_gallery">Взять из галереи</string>
+
+    <!-- menu item to clear picture selection -->
+    <string name="actfm_picture_clear">Убрать изображение</string>
+
+    <!-- filter list activity: refresh tags -->
+
+    <!-- Title for prompt after sharing a task -->
+    <string name="actfm_view_task_title">Просмотреть задачу?</string>
+
+    <!-- Text for prompt after sharing a task -->
+    <string name="actfm_view_task_text">Задача была отправлена %s! Сейчас вы просматриваете ваши
+        собственные задачи. Хотите просмотреть эту и другие задачи назначенные вам?
+    </string>
+
+    <!-- Ok button for task view prompt -->
+    <string name="actfm_view_task_ok">Просмотреть назначенные</string>
+
+    <!-- Cancel button for task view prompt -->
+    <string name="actfm_view_task_cancel">Остаться здесь</string>
+
+    <!-- slide 13a: Title for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_title">Мои общие задачи</string>
+
+    <!-- Empty list for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_empty">Нет общих задач</string>
+
+    <!-- =====================  Friendship connections -->
+
+    <string name="actfm_friendship_pending">Вы направили запрос дружбы %s!</string>
+
+    <string name="actfm_friendship_blocked">Пользователь %s заблокирован.</string>
+
+    <string name="actfm_friendship_ignored">Вы проигнорировали %s.</string>
+
+    <string name="actfm_friendship_friends">Вы и %s теперь друзья! Добавить задания для друга можно
+        ниже.
+    </string>
+
+    <string name="actfm_friendship_other_pending">%s хочет добавить вас в друзья.</string>
+
+    <string name="actfm_friendship_no_status">Соединиться с %s чтобы делиться и следить за
+        активностью публичных задач!
+    </string>
+
+    <string name="actfm_friendship_connect">Добавить друга</string>
+
+    <string name="actfm_friendship_accept">Принять</string>
+
+    <!-- ================================================== TagViewActivity == -->
+
+    <!-- Tag View Activity: Add Comment hint -->
+    <string name="TVA_add_comment">Добавить комментарий...</string>
+
+    <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->
+
+    <!-- Tabs for Tag view -->
+    <string-array name="TVA_tabs">
+        <!-- Tab for showing tasks -->
+        <item>Задачи</item>
+        <!-- Tab for showing comments & updates -->
+        <item>Действия</item>
+        <!-- Tab for showing setting -->
+        <item>Настройки списка</item>
+    </string-array>
+
+    <!-- Tag View: filtered by assigned to user (%s => user name) -->
+    <string name="actfm_TVA_filtered_by_assign">Задачи %s. Нажмите, чтобы увидеть все.</string>
+
+    <!-- Tag View: filter by unassigned tasks -->
+    <string name="actfm_TVA_filter_by_unassigned">Неназначенные задачи. Нажмите, чтобы увидеть
+        все.
+    </string>
+
+    <!-- Tag View: list is private, no members -->
+    <string name="actfm_TVA_no_members_alert">Приватный: нажмите, чтобы изменить или опубликовать
+        список
+    </string>
+
+    <!-- Tag View Menu: refresh -->
+    <string name="actfm_TVA_menu_refresh">Обновить</string>
+
+    <!-- Tag Settings: tag name label -->
+    <string name="actfm_TVA_tag_label">Список</string>
+
+    <!-- Tag Settings: tag owner label -->
+
+    <!-- Tag Settings: tag owner value when there is no owner -->
+
+    <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
+    <string name="actfm_TVA_members_label">Опубликовано для</string>
+
+    <!-- Tag Settings: list collaborators hint -->
+    <string name="actfm_TVA_members_hint">Поделись с теми, у кого есть почтовый адрес</string>
+
+    <!-- Tag Settings: tag picture -->
+    <string name="actfm_TVA_tag_picture">Укажите фото:</string>
+
+    <!-- slide 25c/28b: Tag Settings: silence notifications label -->
+    <string name="actfm_TVA_silence_label">Беззвучные уведомления</string>
+
+    <!-- Tag Settings: list icon label -->
+
+    <!-- slide 25b/27d: Tag Settings: list description label -->
+    <string name="actfm_TVA_tag_description_label">Описание</string>
+
+    <!-- slide 28a: Tag Settings: list settings label -->
+    <string name="actfm_TVA_tag_settings_label">Настройки</string>
+
+    <!-- slide 25b: Tag Settings: list description hint -->
+    <string name="actfm_TVA_tag_description_hint">Введите описание здесь</string>
+
+    <!-- slide 25d: Tag Settings: list name hint -->
+    <string name="actfm_TVA_tag_name_hint">Введите имя списка</string>
+
+    <!-- Tag settings: login prompt from share-->
+    <string name="actfm_TVA_login_to_share">Для публикации списков необходимо авторизоваться на
+        Astrid.com! Пожалуйста авторизуйтесь или сделайте список персональным.
+    </string>
+
+
+    <!-- ============================================ edit people dialog == -->
+
+    <!-- task sharing dialog: intro -->
+    <string name="actfm_EPA_intro">Используйте Astrid для обмена списками покупок, планами или
+        командными проектами и мгновенно следите за тем как люди доводят дела до конца.
+    </string>
+
+    <!-- task sharing dialog: window title -->
+
+    <!-- task sharing dialog: save button -->
+
+    <!-- task sharing dialog: assigned label -->
+
+    <!-- slide 18a: task sharing dialog: assigned label long version -->
+    <string name="actfm_EPA_assign_label_long">Кто должен выполнить задачу?</string>
+
+    <!-- task sharing dialog: assigned to me -->
+    <string name="actfm_EPA_assign_me">Мне</string>
+
+    <!-- task sharing dialog: anyone -->
+    <string name="actfm_EPA_unassigned">Не назначен</string>
+
+    <!-- slide 18c: task sharing dialog: choose a contact -->
+    <string name="actfm_EPA_choose_contact">Выберите контакт</string>
+
+    <!-- task sharing dialog: custom email assignment -->
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_share_with">Поделиться с:</string>
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_collaborators_header">Поделиться</string>
+
+    <!-- task sharing dialog: collaborator list name (%s => name of list) -->
+    <string name="actfm_EPA_list">Список: %s</string>
+
+    <!-- task sharing dialog: assigned hint -->
+
+    <!-- task sharing dialog: message label text -->
+    <string name="actfm_EPA_message_text">Приглашение:</string>
+
+    <!-- task sharing dialog: message body -->
+    <string name="actfm_EPA_message_body">Помогите мне выполнить это!</string>
+
+    <!-- task sharing dialog: list members section header -->
+    <string name="actfm_EPA_assign_header_members">Список участников</string>
+
+    <!-- task sharing dialog: astrid friends section header -->
+    <string name="actfm_EPA_assign_header_friends">Друзья Astrid</string>
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: share with Facebook -->
+    <string name="actfm_EPA_facebook">Facebook</string>
+
+    <!-- task sharing dialog: share with Twitter -->
+    <string name="actfm_EPA_twitter">Twitter</string>
+
+    <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
+
+    <!-- task sharing dialog: edit people settings saved -->
+
+    <!-- task sharing dialog: invalid email (%s => email) -->
+    <string name="actfm_EPA_invalid_email">Неверный адрес электронной почты: %s</string>
+
+    <!-- task sharing dialog: tag not found (%s => tag) -->
+
+    <!-- task sharing login prompt -->
+    <string name="actfm_EPA_login_to_share">Вам нужно авторизоваться на Astrid.com, чтобы поделиться
+        задачами!
+    </string>
+
+    <string name="actfm_EPA_login_button">Войти</string>
+
+    <string name="actfm_EPA_dont_share_button">Не публиковать</string>
+
+    <string name="actfm_EPA_add_person_to_list_title">Задание назначено</string>
+
+    <string name="actfm_EPA_add_person_to_list">%1$s не добавлен в этот список. Добавить %2$s в
+        список?
+    </string>
+
+    <string name="actfm_EPA_add_person_to_list_ok">Добавить в список</string>
+
+    <string name="actfm_EPA_add_person_to_list_cancel">Не добавлять</string>
+
+    <string name="actfm_list_owner">(владелец)</string>
+
+    <!-- ========================================= sharing login activity == -->
+
+    <!-- share login: Title -->
+    <string name="actfm_ALA_title">Добро пожаловать на Astrid.com!</string>
+
+    <!-- share login: Sharing Description -->
+    <string name="actfm_ALA_body">Astrid.com позволяет вам получать доступ к своим задачам онлайн,
+        обмениваться ими и поручать их другим.
+    </string>
+
+    <!-- share login: Sharing Login FB Prompt -->
+    <string name="actfm_ALA_fb_login">Подключиться к Facebook</string>
+
+    <!-- share login: Sharing Login GG Prompt -->
+    <string name="actfm_ALA_gg_login">Подключиться к Google</string>
+
+    <!-- share login: Quickly log in as <%s -> email> -->
+    <string name="actfm_quick_login">Войти: %s</string>
+
+    <!-- share login: Reject quick login -->
+    <string name="actfm_quick_login_reject">Не %s?</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_firstname_label">Имя</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_lastname_label">Фамилия</string>
+
+    <!-- share login: Email -->
+    <string name="actfm_ALA_email_label">Электронная почта</string>
+
+    <!-- share login: Username / Email -->
+
+    <!-- share login: Password -->
+    <string name="actfm_ALA_password_label">Пароль</string>
+
+    <!-- share login: Sign Up Title -->
+    <string name="actfm_ALA_signup_title">Регистрация</string>
+
+    <!-- share login: Login Title -->
+    <string name="actfm_ALA_login_title">Войти</string>
+
+    <!-- share login: Google Auth title -->
+    <string name="actfm_GAA_title">Выберите аккаунт Google, который вы хотите использовать:</string>
+
+    <!-- share login: OAUTH Login Prompt -->
+    <string name="actfm_OLA_prompt">Пожалуйста, войдите:</string>
+
+    <!-- Login error: user exists -->
+    <string name="actfm_ALA_error_user_exists">Пользователь уже существует. Пожалуйста, войдите.
+    </string>
+
+    <!-- Login error: wrong password -->
+    <string name="actfm_ALA_error_wrong_password">Извините, неверный пароль. Попробуйте еще раз.
+    </string>
+
+    <!-- Forgot password link -->
+    <string name="actfm_ALA_forgot_password">Забыли пароль?</string>
+
+    <!-- Forgot password email prompt -->
+    <string name="actfm_ALA_enter_email">Введите Ваш email</string>
+
+    <!-- Password reset sent (%s -> email) -->
+    <string name="actfm_ALA_reset_sent">Ссылка для сброса пароля отправлена на %s</string>
+
+    <!-- User already exists - first sync may be slow -->
+    <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your
+        patience!
+    </string>
+
+    <!-- User not found -->
+    <string name="actfm_ALA_error_user_not_found">Пользователь с указанным email не найден.
+        Попробуйте зарегестрироваться!
+    </string>
+
+    <!-- ================================================ Featured Lists -->
+
+    <string name="actfm_feat_list_clone">Копировать список</string>
+
+    <string name="actfm_feat_list_suffix">(Копия)</string>
+
+    <string name="actfm_feat_list_cloning">Копирование...</string>
+
+    <string name="actfm_feat_list_clone_success">Завершено успешно!</string>
+
+    <string name="actfm_feat_list_task_clone_success">Задача скопирована</string>
+
+    <string name="actfm_feat_list_clone_empty">Нет задач для копирования</string>
+
+    <!-- ================================================ Synchronization == -->
+
+    <!-- Indicates the logged in user name. %s -> user\'s name -->
+    <string name="actfm_status_title_logged_in">Статус - Вошел как %s</string>
+
+    <!-- Preferences Title: Act.fm -->
+    <string name="actfm_APr_header">Astrid.com</string>
+
+    <string name="actfm_https_title">Использовать HTTPS</string>
+    <string name="actfm_https_enabled">HTTPS включен (медленнее)</string>
+    <string name="actfm_https_disabled">HTTPS отключен (быстрее)</string>
+
+    <!-- title for notification tray after synchronizing -->
+
+    <!-- text for notification when comments are received -->
+
+    <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid
+        duplicate tasks and other synchronization issues,
+        Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You
+        can still import tasks from Google Tasks from the Google Tasks settings page,
+        or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.
+        Are you sure you want to sync with Astrid.com?
+    </string>
+
+    <!-- account types -->
+    <string name="actfm_account_type">Тип учётной записи</string>
+    <string name="actfm_account_info">Данные учётной записи</string>
+    <string name="actfm_account_info_summary">Статус и опции</string>
+    <string name="account_type_title_not_logged_in">Бесплатная регистрация</string>
+    <string name="account_type_summary_not_logged_in">Доступ к задачам онлайн, делиться списками и
+        делегировать
+    </string>
+
+
+    <string name="actfm_account_premium">Премиум</string>
+    <string name="actfm_account_basic">Базовый</string>
+
+    <string name="actfm_inapp_billing">Перейти на Премиум</string>
+    <string name="actfm_inapp_billing_summary">Прикрепить файлы, голосовые резервные копии,
+        премиальная поддержка и другое
+    </string>
+
+    <!-- Sharing -->
+    <string name="share_with_facebook">Поддержать на Facebook</string>
+    <string name="share_with_twitter">Подписаться в Twitter\'e</string>
+    <string name="share_with_google">Поделиться в Google+</string>
+    <string name="share_speech_bubble">Поделившись, вы поможете другим быть более продуктивными!
+    </string>
+
+
+    <!-- Sync upgrade messages -->
+    <string name="sync_upgr_both_title">Использование Astrid.com + Google без Дубликатов</string>
+    <string name="sync_upgr_both_body">Давайте будем откровенны. Google Tasks удобен, но не так крут
+        как Astrid. Чтобы предотвратить создание дуликатов, Вам нет больше необходимости
+        синхронизироваться с Astrid.com и фоном с Google Tasks в одно и то же время. Вам достаточно
+        импортировать ваши задачи из Google Tasks в Settings → Backup &amp; Sync, или откатится до
+        синхронизации только с Google Tasks.
+    </string>
+    <string name="sync_upgr_both_btn1">с Astrid</string>
+    <string name="sync_upgr_both_btn2">Откатить до Google Tasks</string>
+
+    <string name="sync_upgr_gtasks_only_title">Бесплатно обновить до Astrid Sync</string>
+    <string name="sync_upgr_gtasks_only_body">Доступ к Вашим задачам с любого устройства и из Gmail
+        c Astrid.com sync. Обновитесь до Astrid.com Sync (Вы всегда можете перейти обратно - но вряд
+        ли захитите)!
+    </string>
+    <string name="sync_upgr_gtasks_only_btn1">Обновить до Astrid Sync</string>
+    <string name="sync_upgr_gtasks_only_btn2">Вместе с Google Tasks</string>
+
+    <string name="sync_upgr_neither_title">Бесплатный бэкап &amp; Sync!</string>
+    <string name="sync_upgr_neither_body">Не рискуйте безопасностью ваших заметок! Используйте новый
+        улучшенный Astrid sync для хранения заметок откуда угодно.
+    </string>
+    <string name="sync_upgr_neither_btn1">OK</string>
+
+    <string name="sync_upgr_logged_out">Вы вышли из системы</string>
+
+    <string name="actfm_logout_clear_tasks_title">Очистить данные?</string>
+    <string name="actfm_logout_clear_tasks_body">Вы хотите очистить ваши задачи и списки?</string>
+    <string name="actfm_logout_clear_tasks_yes">Очистить данные</string>
+    <string name="actfm_logout_clear_tasks_no">Сохранить данные</string>
+
+    <string name="actfm_logged_in_different_user_title">Войти как другой пользователь</string>
+    <string name="actfm_logged_in_different_user_body">Вы хотите удалить существующие телефонные
+        задачи перед синхронизацией?
+    </string>
+    <string name="actfm_logged_in_different_user_keep_data">Сохранить данные</string>
+    <string name="actfm_logged_in_different_user_clear_data">Очистить все данные</string>
+    <string name="actfm_logged_in_different_user_processing">Обработка существующих данных...
+    </string>
+
+    <string name="actfm_tag_not_authorized_title">Не авторизовано</string>
+    <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you
+        may have been removed). Would you like to create a new list with the same name?
+    </string>
+    <string name="actfm_tag_not_authorized_new_list">Создать новый список</string>
+    <string name="actfm_tag_not_authorized_leave_list">Покинуть список</string>
+
+    <string name="actfm_sync_ongoing">Процесс синхронизации…</string>
+
+    <string name="EPr_reset_sync_state">Сброс синхронизации</string>
+    <string name="EPr_reset_sync_state_summary">Сбросьте некоторые данные, чтобы разрешить проблему
+        синхронизации
+    </string>
+    <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will
+        be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you
+        wish to continue?
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in timers plug-in -->
+
+    <!-- Task Edit Activity: Container Label -->
+    <string name="alarm_ACS_label">Напоминания</string>
+
+    <!-- Task Edit Activity: Add New Alarm -->
+    <string name="alarm_ACS_button">Добавить напоминание</string>
+
+    <string-array name="reminders_alarm">
+        <!-- reminders related to alarm -->
+        <item>Напоминание!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in backup plug-in -->
+
+    <!-- ================================================= BackupPreferences == -->
+
+    <!-- slide 33c/48d: Backup Preferences Title -->
+    <string name="backup_BPr_header">Резервные копии</string>
+
+    <!-- slide 48e/50c: Backup: Status Header -->
+    <string name="backup_BPr_group_status">Состояние</string>
+
+    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->
+    <string name="backup_status_success">Последняя: %s</string>
+    <!-- Backup Status: last error failed. Keep it short! -->
+    <string name="backup_status_failed">Резервирование не удалось</string>
+    <!-- Backup Status: error subtitle -->
+    <string name="backup_status_failed_subtitle">(нажмите для просмотра ошибки)</string>
+    <!-- slide 48a: Backup Status: never backed up -->
+    <string name="backup_status_never">Резервное копирование ещё не совершалось!</string>
+
+    <!-- slide 48f/ 50e: Backup Options Group Label -->
+    <string name="backup_BPr_group_options">Параметры</string>
+
+    <!-- slide 48b: Preference: Automatic Backup Title -->
+    <string name="backup_BPr_auto_title">Резервное копирование: автоматическое</string>
+    <!-- Preference: Automatic Backup Description (when disabled) -->
+    <string name="backup_BPr_auto_disabled">Резервное копирование: отключено</string>
+    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
+    <string name="backup_BPr_auto_enabled">Резервное копирование будет производиться ежедневно
+    </string>
+
+    <!-- Preference screen restoring Tasks Help -->
+    <!-- Preference screen Restoring Tasks Help Dialog Text-->
+
+    <string name="backup_BPr_cloud_already_logged_in">"У вас уже есть резервная копия в облаке на
+        Astrid.com!"
+    </string>
+
+    <!-- ================================================= BackupActivity == -->
+
+    <!-- slide 48c: backup activity label -->
+    <string name="backup_BAc_label">Диспетчер резервных копий</string>
+
+    <!-- backup activity title -->
+    <string name="backup_BAc_title">Управление резервными копиями</string>
+
+    <!-- backup activity import button -->
+    <string name="backup_BAc_import">Импортировать задачи</string>
+
+    <!-- backup activity export button -->
+    <string name="backup_BAc_export">Экспортировать задачи</string>
+
+    <!-- backup activity cloud (Astrid.com) option -->
+    <string name="backup_BAc_cloud">"Нажмите для бесплатного резервирования в облаке Astrid.com"
+    </string>
+
+    <!-- ============================================== Importer / Exporter == -->
+
+    <!-- Message displayed when error occurs -->
+    <string name="backup_TXI_error">Ошибка импорта</string>
+
+    <string name="export_toast">Восстановлено %1$s в %2$s.</string>
+
+    <string name="export_toast_no_tasks">Нет задач для экспорта.</string>
+
+    <!-- Progress Dialog Title for exporting -->
+    <string name="export_progress_title">Экспортирование…</string>
+
+    <!-- Backup: Title of Import Summary Dialog -->
+    <string name="import_summary_title">Итог восстановления</string>
+
+    <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
+    <string name="import_summary_message">Файл %1$s содержал %2$s.\n\n %3$s импортировано,\n %4$s
+        существовало\n %5$s с ошибками\n
+    </string>
+
+    <!-- Progress Dialog Title for importing -->
+    <string name="import_progress_title">Импортирование…</string>
+
+    <!-- Progress Dialog text for import reading task (%d -> task number)-->
+    <string name="import_progress_read">Чтение задачи %d…</string>
+
+    <!-- Backup: Dialog when unable to open a file -->
+
+    <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
+    <string name="DLG_error_sdcard">Нет доступа к папке:%s</string>
+
+    <!-- Backup: Dialog when unable to open SD card in general -->
+    <string name="DLG_error_sdcard_general">Нет доступа к карте памяти!</string>
+
+    <!-- Backup: File Selector dialog for import -->
+    <string name="import_file_prompt">Выберите файл для восстановления</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- ================================================== AndroidManifest == -->
+
+    <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
+    <string name="app_name">Astrid Tasks</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="read_permission_label">Право Astrid</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="read_permission_desc">чтение и отображение фильтров задач</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="write_permission_label">Право Astrid</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="write_permission_desc">создание новых и редактирование существующих задач</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- question for deleting tasks -->
+    <string name="DLG_delete_this_task_question">Удалить эту задачу?</string>
+
+    <!-- question for deleting items (%s => item name) -->
+    <string name="DLG_delete_this_item_question">Удалить этот элемент: %s?</string>
+
+    <!-- Progress dialog shown when upgrading -->
+    <string name="DLG_upgrading">Обновление ваших задач…</string>
+
+    <!-- Title for dialog selecting a time (hours and minutes) -->
+    <string name="DLG_hour_minutes">Время (час : мин)</string>
+
+    <!-- Dialog for Astrid having a critical update -->
+    <string name="DLG_please_update">Требуется обновить Astrid до
+        самой свежей версии на Android Market! Пожалуйста, обновите перед тем, как идти дальше,
+        или подождите несколько секунд.
+    </string>
+
+    <!-- Button for going to Market -->
+
+    <!-- Button for accepting EULA -->
+    <string name="DLG_accept">Принимаю</string>
+
+    <!-- Button for declining EULA -->
+    <string name="DLG_decline">Отказываюсь</string>
+
+    <!-- EULA title -->
+    <string name="DLG_eula_title">Условия использования Astrid</string>
+
+    <!-- Progress Dialog generic text -->
+    <string name="DLG_please_wait">Подождите, пожалуйста</string>
+
+    <!-- Dialog - loading -->
+    <string name="DLG_loading">Загрузка...</string>
+
+    <!-- Dialog - dismiss -->
+
+    <!-- slide 20d -->
+    <string name="DLG_ok">ОК</string>
+    <!-- slide 36g -->
+    <string name="DLG_cancel">Отмена</string>
+
+    <string name="DLG_more">еще</string>
+
+    <string name="DLG_undo">Отмена</string>
+
+    <string name="DLG_warning">Предупреждение</string>
+
+    <!-- =============================================================== UI == -->
+
+    <!-- Label for DateButtons with no value -->
+    <string name="WID_dateButtonUnset">Нажмите для установки</string>
+
+    <!-- String formatter for DateButtons ($D => date, $T => time) -->
+
+    <!-- String formatter for Disable button -->
+
+    <!--  ============================================================= notes -->
+
+    <!-- Note Exposer -->
+
+    <!-- Note Exposer / Comments -->
+
+    <!-- EditNoteActivity - no comments -->
+    <string name="ENA_no_comments">Нет данных для отображения</string>
+
+    <!-- EditNoteActivity - no username for comment -->
+    <string name="ENA_no_user">Кто-нибудь</string>
+
+    <!-- EditNoteActivity - refresh comments -->
+    <string name="ENA_refresh_comments">Обновить комментарии</string>
+
+    <!-- ================================================= TaskListActivity == -->
+
+    <!-- slide 8b: Task List: Displayed instead of list when no items present -->
+    <string name="TLA_no_items">Нет задач! \n Добавить?</string>
+
+    <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
+    <string name="TLA_no_items_person">%s пока не открыл вам\nсвоих задач</string>
+
+    <!-- Menu: Adjust Sort and Hidden Task Settings -->
+    <string name="TLA_menu_sort">Сортировка</string>
+
+    <!-- Menu: Sync Now -->
+    <string name="TLA_menu_sync">Синхронизация</string>
+
+    <!-- Menu: Search -->
+    <string name="TLA_menu_search">Поиск</string>
+
+    <!-- Menu: Tasks -->
+    <string name="TLA_menu_lists">Списки</string>
+
+    <!-- Menu: Friends -->
+    <string name="TLA_menu_friends">Люди</string>
+
+    <!-- Menu: Featured Lists -->
+    <string name="TLA_menu_featured_lists">Рекомендуемые списки</string>
+
+    <!-- Menu: Suggestions -->
+    <string name="TLA_menu_suggestions">Предложения</string>
+
+    <!-- Menu: Tutorial -->
+
+    <!-- Menu: Settings -->
+    <string name="TLA_menu_settings">Настройки</string>
+
+    <!-- slide 30b: Menu: Support -->
+    <string name="TLA_menu_support">Поддержка</string>
+
+    <!-- Search Label-->
+
+    <!-- Window title for displaying Custom Filter -->
+    <string name="TLA_custom">Другой</string>
+
+    <!-- slide 8d: Quick Add Edit Box Hint-->
+    <string name="TLA_quick_add_hint">Добавить задание</string>
+
+    <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
+    <string name="TLA_quick_add_hint_assign">Добавить что-нибудь для %s</string>
+
+    <!-- Notification Volumne notification-->
+    <string name="TLA_notification_volume_low">Звуковые извещения заглушены. Вы не услышите
+        Astrid!
+    </string>
+
+    <!-- Notifications disabled warning -->
+    <string name="TLA_notification_disabled">Напоминания Astrid отключены! Вы не будете получать
+        никаких напоминаний
+    </string>
+
+    <string-array name="TLA_filters">
+        <item>Активные</item>
+        <item>Сегодня</item>
+        <item>Скоро</item>
+        <item>Просроченные</item>
+        <item>Готово</item>
+        <item>Скрытые</item>
+    </string-array>
+
+    <!-- Title for confirmation dialog after quick add markup -->
+    <string name="TLA_quickadd_confirm_title">Вы сказали, \"%s\"</string>
+
+    <!-- Text for speech bubble in dialog after quick add markup -->
+    <!-- First string is task title, second is due date, third is priority -->
+    <string name="TLA_quickadd_confirm_speech_bubble">Я создал задачу \"%1$s\" %2$s в %3$s</string>
+
+    <string name="TLA_quickadd_confirm_speech_bubble_date">для %s</string>
+
+    <string name="TLA_quickadd_confirm_hide_helpers">Больше не показывать подтверждения</string>
+
+
+    <!-- Title for alert on new repeating task. %s-> task title -->
+    <string name="TLA_repeat_scheduled_title">Новая повторяющаяся задача %s</string>
+
+    <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
+    <string name="TLA_repeat_scheduled_speech_bubble">Я напомню вам об этом %s.</string>
+
+    <string-array name="TLA_priority_strings">
+        <item>наивысший приоритет</item>
+        <item>высокий приоритет</item>
+        <item>средний приоритет</item>
+        <item>низкий приоритет</item>
+    </string-array>
+    <!-- slide 22a -->
+    <string name="TLA_all_activity">Вся активность</string>
+
+    <!-- ====================================================== TaskAdapter == -->
+
+    <!-- Format string to indicate task is hidden (%s => task name) -->
+    <string name="TAd_hiddenFormat">%s [скрыта]</string>
+
+    <!-- Format string to indicate task is deleted (%s => task name) -->
+    <string name="TAd_deletedFormat">%s [удалена]</string>
+
+    <!-- Displayed when adapter is flung (scrolled quickly) -->
+
+    <!-- slide 22b: indicates task was completed. %s => date or time ago -->
+    <string name="TAd_completed">Завершена\n%s</string>
+
+    <!-- slide 15a: Action Button: edit task -->
+    <string name="TAd_actionEditTask">Редактировать</string>
+
+    <!-- Context Item: edit task -->
+    <string name="TAd_contextEditTask">Правка задачи</string>
+
+    <!-- Context Item: copy task -->
+    <string name="TAd_contextCopyTask">Копировать задачу</string>
+
+    <!-- Context Item: delete task -->
+    <string name="TAd_contextDeleteTask">Удалить задачу</string>
+
+    <!-- Context Item: undelete task -->
+    <string name="TAd_contextUndeleteTask">Отменить удаление задачи</string>
+
+    <!-- Context Item: purge task -->
+    <string name="TAd_contextPurgeTask">Очистить задачу</string>
+
+    <!-- ============================================== SortSelectionDialog == -->
+
+    <!-- slide 23a: Sort Selection: dialog title -->
+    <string name="SSD_title">Сортировка и скрытые задачи</string>
+
+    <!-- slide 23h:  Hidden: title -->
+    <string name="SSD_hidden_title">Скрытые задачи</string>
+
+    <!-- Hidden Task Selection: show completed tasks -->
+    <string name="SSD_completed">Показать завершённые задачи</string>
+
+    <!-- Hidden Task Selection: show hidden tasks -->
+    <string name="SSD_hidden">Показать скрытые задачи</string>
+
+    <!-- Hidden Task Selection: show deleted tasks -->
+    <string name="SSD_deleted">Показать удалённые задачи</string>
+
+    <!-- Sort Selection: drag with subtasks -->
+    <string name="SSD_sort_drag">Ручной порядок с подзадачами</string>
+
+    <!-- slide 23b: Sort Selection: smart sort -->
+    <string name="SSD_sort_auto">Умная сортировка Astrid</string>
+
+    <!-- slide 23e: Sort Selection: sort by alpha -->
+    <string name="SSD_sort_alpha">По названию</string>
+
+    <!-- slide 23c: Sort Selection: sort by due date -->
+    <string name="SSD_sort_due">По намеченному сроку</string>
+
+    <!-- slide 23d: Sort Selection: sort by importance -->
+    <string name="SSD_sort_importance">По приоритету</string>
+
+    <!-- slide 23f: Sort Selection: sort by modified date -->
+    <string name="SSD_sort_modified">Последние изменённые</string>
+
+    <!-- slide 23g: Sort Selection: reverse -->
+    <string name="SSD_sort_reverse">В обратном порядке</string>
+
+    <!-- slide 23j: Sort Button: sort temporarily -->
+    <string name="SSD_save_temp">Только один раз</string>
+
+    <!-- slide 23i: Sort Button: sort permanently -->
+    <string name="SSD_save_always">Всегда</string>
+
+    <!-- =============================================== FilterListActivity == -->
+
+    <!-- Astrid Filter Shortcut -->
+    <string name="FSA_label">Список или Фильтр Astrid</string>
+
+    <!-- Filter List Activity Title -->
+
+    <!-- Displayed when loading filters -->
+
+    <!-- Context Menu: Create Shortcut -->
+    <string name="FLA_context_shortcut">Создать ярлык на рабочем столе…</string>
+
+    <!-- Menu: Search -->
+
+    <!-- Menu: Help -->
+
+    <!-- slide 28c: Create Shortcut Dialog Title -->
+    <string name="FLA_shortcut_dialog_title">Создать ярлык</string>
+
+    <!-- Create Shortcut Dialog (asks to name shortcut) -->
+    <string name="FLA_shortcut_dialog">Имя ярлыка:</string>
+
+    <!-- Search Hint-->
+    <string name="FLA_search_hint">Найти задачи</string>
+
+    <!-- Search Filter name (%s => query) -->
+    <string name="FLA_search_filter">Соответствия для \'%s\'</string>
+
+    <!-- Toast: created shortcut (%s => label) -->
+    <string name="FLA_toast_onCreateShortcut">Ярлык %s создан</string>
+
+    <!-- Menu: new filter -->
+    <string name="FLA_new_filter">Новый фильтр</string>
+
+    <!-- slide 10e: Button: new list -->
+    <string name="FLA_new_list">Новый список</string>
+
+    <!-- Alert when creating a shortcut without selecting a filter -->
+    <string name="FLA_no_filter_selected">Фильтры не выбраны! Пожалуйста, выберите фильтр или
+        список
+    </string>
+
+    <!-- ================================================= TaskEditActivity == -->
+
+    <!-- Title when editing a task (%s => task title) -->
+
+    <!-- Title when creating a new task -->
+
+    <!-- Task title label -->
+
+    <!-- Task when label -->
+    <string name="TEA_when_header_label">Когда</string>
+
+    <!-- Task title hint (displayed when edit box is empty) -->
+    <string name="TEA_title_hint">Имя задачи</string>
+
+    <!-- Task importance label -->
+    <string name="TEA_importance_label">Приоритет</string>
+
+    <!-- Task due date hint -->
+    <string name="TEA_deadline_hint">Set due date</string>
+
+    <!-- Task assigned to string (%s -> assigned person name) -->
+    <string name="TEA_assigned_to">Assigned to %s</string>
+
+    <!-- Task urgency specific time checkbox -->
+    <string name="TEA_urgency_specific_time">В указанное время?</string>
+
+    <!-- Task urgency specific time title when specific time false -->
+    <string name="TEA_urgency_none">Пусто</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_label">Скрыть до</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_display">Hide until %s</string>
+
+    <!-- Task hide until toast -->
+    <string name="TEA_hideUntil_message">Задача будет скрыта до %s</string>
+
+    <!-- Task editing data being loaded label -->
+    <string-array name="TEA_loading">
+        <item>Загрузка...</item>
+    </string-array>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_note_label">Описание</string>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_notes_empty">Description...</string>
+
+    <!-- Task note hint -->
+    <string name="TEA_notes_hint">Введите описание задачи...</string>
+
+    <!-- Estimated time label -->
+    <string name="TEA_estimatedDuration_label">Как долго это продлится?</string>
+
+    <!-- Elapsed time label -->
+    <string name="TEA_elapsedDuration_label">Время уже потраченное на задачу</string>
+
+    <!-- Menu: Save -->
+    <string name="TEA_menu_save">Сохранить изменения</string>
+
+    <!-- Menu: Don\'t Save -->
+    <string name="TEA_menu_discard">Не сохранять</string>
+
+    <!-- Menu: Delete Task -->
+    <string name="TEA_menu_delete">Удалить задачу</string>
+
+    <!-- Menu: Task comments -->
+    <string name="TEA_menu_refresh_comments">Обновить комментарии</string>
+
+    <string name="TEA_menu_comments">Комментарии</string>
+
+    <!-- Toast: task saved with deadline (%s => preposition + time units) -->
+    <string name="TEA_onTaskSave_due">Задача сохранена: срок %s</string>
+
+    <!-- Toast: task saved without deadlines -->
+    <string name="TEA_onTaskSave_notDue">Задача сохранена</string>
+
+    <!-- Toast: task was not saved -->
+
+    <!-- Toast: task was deleted -->
+
+    <!-- slide 15b: Task edit tab: activity -->
+    <string name="TEA_tab_activity">Действия</string>
+
+    <!-- slide 15e:  Task edit tab: more editing settings -->
+    <string name="TEA_tab_more">Ещё</string>
+
+    <!-- slide 15d: Task edit tab: web services -->
+    <string name="TEA_tab_web">Идеи</string>
+
+    <string name="TEA_timer_est">Est. %s</string>
+
+    <string name="TEA_timer_elap">Elapsed %s</string>
+
+    <string-array name="TEA_urgency">
+        <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
+        <item>Без даты</item>
+        <item>Конкретный день</item>
+        <item>Сегодня</item>
+        <item>Завтра</item>
+        <item>(день спустя)</item>
+        <item>Следующая неделя</item>
+        <item>В течение пары недель</item>
+        <item>Следующий месяц</item>
+    </string-array>
+
+    <string name="TEA_no_time">Без времени</string>
+
+    <string-array name="TEA_hideUntil">
+        <!-- hideUntil: labels for edit page. -->
+        <item>Никогда</item>
+        <item>Дата выполнения</item>
+        <item>Due time</item>
+        <item>Day before due</item>
+        <item>Week before due</item>
+        <item>Определённый день/время</item>
+    </string-array>
+
+    <!-- Task edit control set descriptors -->
+
+    <!-- slide 9b/35i -->
+    <string name="TEA_control_who">Кто</string>
+
+    <!-- slide 9c/ 35a -->
+    <string name="TEA_control_when">Когда</string>
+    <!-- slide 35b -->
+    <string name="TEA_control_more_section">----More Section----</string>
+    <!-- slide 16a/35c -->
+    <string name="TEA_control_importance">Приоритет</string>
+    <!-- slide 16b/35d -->
+    <string name="TEA_control_lists">Списки</string>
+    <!-- slide 16c/35e -->
+    <string name="TEA_control_notes">Описание</string>
+
+    <string name="TEA_control_files">Файлы</string>
+
+    <!-- slide 16e / slide 35g-->
+    <string name="TEA_control_reminders">Напоминания</string>
+
+    <!-- slide 16f -->
+    <string name="TEA_control_timer">Учет времени</string>
+
+    <string name="TEA_control_hidden_section">Всегда скрывать</string>
+
+    <string name="hide_until_prompt">Показать в моем листе</string>
+
+    <!-- Add Ons tab when no add-ons found -->
+
+    <!-- Add Ons button -->
+
+    <!-- More row -->
+
+    <!-- slide 15c: Text when no activity to show -->
+    <string name="TEA_no_activity">Нет активности</string>
+
+    <!-- Text to load more activity -->
+    <string name="TEA_load_more">Загрузить больше...</string>
+
+    <!-- When controls dialog -->
+    <string name="TEA_when_dialog_title">Когда это должно произойти?</string>
+
+
+    <string name="TEA_new_task">Новое задание</string>
+
+    <string name="WSV_click_to_load">Нажми меня для поиска решений этой задачи!</string>
+
+    <string name="WSV_not_online">Я способен на большее при подключении к Интернету. Пожалуйста,
+        проверьте ваше подключение.
+    </string>
+
+    <string name="TEA_contact_error">Простите, для выбранного контакта отсутствует адрес эл.
+        почты.
+    </string>
+
+    <!-- ============================================= IntroductionActivity == -->
+
+    <!-- slide 1a: Introduction Window title -->
+
+    <!-- Button to agree to EULA -->
+
+    <!-- Button to disagree with EULA -->
+
+    <!-- ===================================================== MissedCallActivity == -->
+
+    <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
+    <string name="MCA_title">%1$s\nзвонил(а) в %2$s</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_return_call">Позвонить сейчас</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_add_task">Позвонить позже</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_ignore">Игнорировать</string>
+
+    <!-- Missed call: dialog to ignore all missed calls title -->
+    <string name="MCA_ignore_title">Игнорировать все пропущенные звонки?</string>
+
+    <!-- Missed call: dialog to ignore all missed calls body -->
+    <string name="MCA_ignore_body">Вы проигнорировали несколько пропущенных звонков. Больше не
+        спрашивать про них?
+    </string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore all button -->
+    <string name="MCA_ignore_all">Игнорировать все звонки</string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
+    <string name="MCA_ignore_this">Игнорировать только этот звонок</string>
+
+    <!-- Missed call: preference title -->
+    <string name="MCA_missed_calls_pref_title">Пропущенные звонки</string>
+
+    <!-- slide 49c: Missed call: preference description -->
+    <string name="MCA_missed_calls_pref_desc_enabled">Astrid будет уведомлять вас о пропущенных
+        звонках и предложит вам перезвонить
+    </string>
+    <string name="MCA_missed_calls_pref_desc_disabled">Astrid не будет уведомлять вас о пропущенных
+        звонках
+    </string>
+
+    <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
+    <string name="MCA_task_title_name">Перезвонить %1$s в %2$s</string>
+
+    <!-- Missed call: task title no name (%s -> number)-->
+    <string name="MCA_task_title_no_name">Перезвонить %s</string>
+
+    <!-- Missed call: schedule dialog title (%s -> name or number)-->
+    <string name="MCA_schedule_dialog_title">Перезвонить %s в...</string>
+
+    <!-- Missed call speech bubble options -->
+    <string-array name="MCA_dialog_speech_options">
+        <item>Должно быть здорово быть популярным!</item>
+        <item>Эй! Ты нравишься людям!</item>
+        <item>Звякни, порадуй человека!</item>
+        <item>Вы не будете рады если бы люди вам перезвонили?</item>
+        <item>Вы можете это сделать!</item>
+        <item>Вы можете всегда отправлять текст...</item>
+    </string-array>
+
+
+    <!-- ======================================= Calendar reminder activity == -->
+
+    <!-- Calendar remindeer ignore button -->
+    <string name="CRA_ignore">Игнорировать</string>
+
+    <!-- Calendar event -->
+    <string name="CRA_title">Необходим список встреч?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls title -->
+    <string name="CRA_ignore_title">Пропустить все события календаря?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls body -->
+    <string name="CRA_ignore_body">Вы пропустили несколько событий календаря. Astrid не следует
+        больше спрашивать Вас о них?
+    </string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
+    <string name="CRA_ignore_all">Пропустить все события</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
+    <string name="CRA_ignore_this">Пропустить только это событие</string>
+
+    <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
+    <string name="CRA_speech_bubble_start">Похоже скоро начнется %s. Хотите создать список для
+        пунктов события?
+    </string>
+
+    <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
+    <string name="CRA_speech_bubble_end">Похоже Вы только что завершили %s. Хотите создать список
+        для пунктов события?
+    </string>
+
+    <!-- Calendar reminder: create list button -->
+    <string name="CRA_create_list">Создать список</string>
+
+    <!-- Calendar reminder: postpone button -->
+    <string name="CRA_postpone">Возможно позднее</string>
+
+    <!-- Calendar reminder: list exists dialog title -->
+    <string name="CRA_list_exists_title">Такой список уже существует</string>
+
+    <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
+    <string name="CRA_list_exists_body">Список с именем %s уже есть. Хотите ли вы использовать
+        имеющийся или создать новый список для этого события?
+    </string>
+
+    <!-- Calendar reminder: list exists dialog create new button -->
+    <string name="CRA_create_new">Создать новый</string>
+
+    <!-- Calendar reminder: list exists dialog use existing button -->
+    <string name="CRA_use_existing">Воспользоваться имеющимся</string>
+
+    <!-- Calendar remindr: created list (%s -> list name) -->
+    <string name="CRA_created_list_dialog">Я создал список %s.</string>
+
+    <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
+    <string name="CRA_one_attendee">%s примет участие.</string>
+
+    <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
+    <string name="CRA_two_attendees">%1$s и %2$s примут участие.</string>
+
+    <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
+    <string name="CRA_many_attendees">%1$s, %2$s, и еще %3$d примут участие.</string>
+
+    <!-- Calendar reminder: invitation prompt -->
+    <string name="CRA_invitation_prompt">Пригласить?</string>
+
+    <!-- Calendar reminder: preference title -->
+    <string name="CRA_calendar_reminders_pref_title">Ассистент календаря</string>
+
+    <!-- Calendar reminder: pref description disabled -->
+    <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid не будет напоминать о
+        предстоящих событиях.
+    </string>
+
+    <!-- Calendar reminder: pref description enabled -->
+    <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid будет напоминать вам о
+        предстоящих событиях в календаре и напомнит вам подготовиться к ним
+    </string>
+
+    <!-- Calendar reminder: share list title -->
+    <string name="CRA_share_list_title">Поделиться этим списком?</string>
+
+    <string name="CRA_invite_attendees">Пригласить участников</string>
+
+    <string name="CRA_more_options">Дополнительные настройки</string>
+
+    <string name="CRA_dont_invite">Нет, спасибо</string>
+
+    <!-- Calendar reminder: share list title when no other attendees exist-->
+    <string name="CRA_list_created_title">Список создан!</string>
+
+    <!-- Calendar reminder: default new list name (%s -> event title) -->
+    <string name="CRA_default_list_name">Пункты события: %s</string>
+
+    <!-- ===================================================== HelpActivity == -->
 
-    
-    <!-- Resources for built-in timers plug-in -->
-    
-    <!-- Task Edit Activity: Container Label -->
-    <string name="alarm_ACS_label">Напоминания</string>
-    
-    <!-- Task Edit Activity: Add New Alarm -->
-    <string name="alarm_ACS_button">Добавить напоминание</string>
-    
-    <string-array name="reminders_alarm">
-      <!-- reminders related to alarm -->
-      <item>Напоминание!</item>
+    <!-- Help: Button to get support from our website -->
+
+    <!-- ==================================================== UpdateService == -->
+
+    <!-- Changelog Window Title -->
+    <string name="UpS_changelog_title">Что нового в Astrid?</string>
+
+    <!-- Updates Window Title -->
+    <string name="UpS_updates_title">Последние новости Astrid</string>
+
+    <!-- Updats No Activity to show for offline users -->
+    <string name="UpS_no_activity_log_in">Войдите, чтобы увидеть\nсвой прогресс и активность\nв
+        опубликованных списках.
+    </string>
+
+    <!-- ================================================== EditPreferences == -->
+
+    <!-- slide 31g: Preference Window Title -->
+    <string name="EPr_title">Astrid: Настройки</string>
+
+    <string name="EPr_share_astrid">Поделиться Astrid</string>
+
+    <string name="EPr_share_astrid_summary">Расскажи про Astrid в любимой социальной сети</string>
+
+    <!-- slide 46a -->
+    <string name="EPr_deactivated">выключен</string>
+
+    <!-- slide 30i: Preference Category: Appearance Title -->
+    <string name="EPr_appearance_header">Интерфейс</string>
+
+    <!-- Preference Category: Appearance Summary -->
+    <string name="EPr_appearance_summary">Темы, виджеты, пункты списка, экран правки</string>
+
+    <!-- FAQ Preference title -->
+    <string name="EPr_faq_title">часто задаваемые вопросы</string>
+
+    <!-- Account status preference (%s -> account type) -->
+    <string name="EPr_account_title">Учётная запись: %s</string>
+
+    <!-- Support preferences summary -->
+    <string name="EPr_support_summary">Учебник, FAQ, О программе</string>
+
+    <!-- slide 34a: Preference: Task List Font Size Title -->
+    <string name="EPr_fontSize_title">Размер списка задач</string>
+
+    <!-- Preference: Filters to show pref screen title -->
+    <string name="EPr_filters_to_show_title">Показать фильтры</string>
+
+    <!-- slide 32a: Preference: Show confirmation for smart reminders -->
+    <string name="EPr_showSmartConfirmation_title">Показывать подтверждения для умных напоминаний
+    </string>
+
+    <!-- slide 34g: Preference: Task List Font Size Description -->
+    <string name="EPr_fontSize_desc">Размер шрифта основного экрана</string>
+
+    <!-- Preferemce: Show task edit confirmation toasts -->
+
+    <!-- slide 34c: Preference: Task List Show Notes -->
+    <string name="EPr_showNotes_title">Показать описание в задаче</string>
+
+    <!-- Edit screen preference category -->
+    <string name="EPr_edit_screen_options">Редактировать настройки экрана</string>
+
+    <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
+    <string name="EPr_beastMode_title">Редактировать порядок экранов</string>
+
+    <string name="EPr_beastMode_shortcut">Настроить</string>
+
+    <string name="EPr_time_increment">Шаг 5 минут</string>
+
+    <string name="EPr_use_date_shortcuts">Использовать ярлыки дат</string>
+
+    <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
+
+    <!-- slide 35h -->
+    <string name="EPr_beastMode_desc">Настроить внешний вид экрана правки задачи</string>
+    <!-- slide 35j -->
+    <string name="EPr_beastMode_reset">Настройки по умолчанию</string>
+
+    <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on
+        each row
+    </string>
+
+    <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
+    <string name="EPr_showNotes_desc_disabled">Описание будет доступно на экране редактирования
+        задачи
+    </string>
+    <!-- Preference: Task List Show Notes Description (enabled) -->
+    <string name="EPr_showNotes_desc_enabled">Всегда показывать описание</string>
+
+    <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
+    <string name="EPr_compressTaskRows_title">Компактные строки задач</string>
+    <!-- slide 34j -->
+    <string name="EPr_compressTaskRows_desc">Сжать строки задач до высоты названий</string>
+
+    <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
+    <!-- slide 34k-->
+
+    <!-- slide 34b: Preferences: Wrap task titles to two lines -->
+    <string name="EPr_fullTask_title">Показывать полное название задачи</string>
+    <string name="EPr_fullTask_desc_enabled">Будет показано полное название задачи</string>
+    <!-- slide 34h -->
+    <string name="EPr_fullTask_desc_disabled">Будут показаны первые две строки названия</string>
+
+    <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
+    <string name="EPr_ideaAuto_title">Автозагрузка закладки Идеи</string>
+    <!-- slide 32c -->
+    <string name="EPr_ideaAuto_desc_enabled">Веб-поиск для закладки Идеи будет выполняться при
+        нажатии на закладку
+    </string>
+    <string name="EPr_ideaAuto_desc_disabled">Веб-поиск для закладки Идеи будет выполняться только
+        при вызове вручную
+    </string>
+
+    <!-- Preferences: task row style -->
+    <string-array name="EPr_task_row_styles">
+        <item>Оригинальный</item>
+        <item>Простой</item>
+        <item>Только заголовки</item>
     </string-array>
-    
 
+    <string-array name="EPr_task_row_style_descriptions">
+        <item>Сократить заголовок до двух строк с указанием даты справа</item>
+        <item>Сократить заголовок до одной строки с указанием даты и списков ниже</item>
+        <item>В одну линию с заголовками</item>
+    </string-array>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- task row style title (%s -> style) -->
+    <string name="EPr_task_row_style_title">Стиль строки: %s</string>
+
+    <!-- Preference: custom filters enabled -->
+    <string name="EPr_use_filters_title">Использовать фильтры
+    </string>
+    <string name="EPr_use_filters_subtitle">Позволяет создавать настраиваемые фильтры</string>
+
+    <!-- Preference: show list members in shared list -->
+    <string name="EPr_show_list_members_title">Отображать список участников в общих списках</string>
+
+    <!-- Preference: simple input box style -->
+    <string name="EPr_simple_input_boxes">Простые текстовые поля</string>
+
+    <!-- Preference: simple input box style -->
+    <string name="EPr_show_quickadd_controls">Расширенные возможности быстрого добавления</string>
+
+    <!-- Preference: don\'t show plus button until input present -->
+    <string name="EPr_hide_plus_button">Hide plus button</string>
+
+    <!-- Preference: menu items -->
+    <string name="EPr_menu_items">Элементы меню</string>
+
+    <!-- Preference: list view -->
+    <string name="EPr_list_view">Списком</string>
+
+    <!-- Preference: task edit comments -->
+    <string name="EPr_show_task_edit_comments">Показывать комментарии в редакторе задачи</string>
+
+    <!-- slide 30f/ 36f: Preference: Theme -->
+    <string name="EPr_theme_title">Цветовая тема</string>
+    <!-- Preference: Theme Description (%s => value) -->
+    <string name="EPr_theme_desc">Текущая: %s</string>
+    <!-- Preference: Theme Description (android 1.6) -->
+    <string name="EPr_theme_desc_unsupported">Настройка требует Android 2.0+</string>
+    <!-- slide 32h/ 37b -->
+    <string name="EPr_theme_widget_title">Тема виджета</string>
+
+    <!-- slide 30d/ 34f: Preference screen: all task row settings -->
+    <string name="EPr_taskRowPrefs_title">Внешний вид задач в списке</string>
+
+    <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
+    <string name="EPr_use_contact_picker">Использовать системный выбор контактов</string>
+    <!-- slide 49b -->
+    <string name="EPr_use_contact_picker_desc_enabled">Опция \"системный выбор контактов\" будет
+        показана в окне назначения задачи
+    </string>
+    <string name="EPr_use_contact_picker_desc_disabled">Опция \"системный выбор контактов\" будет
+        скрыта
+    </string>
+
+    <!-- slide 49i: Preferences: Third party addons -->
+    <string name="EPr_third_party_addons">Разрешить установку сторонних дополнений</string>
+    <string name="EPr_third_party_addons_desc_enabled">Сторонние дополнения будут включены</string>
+    <!-- slide 49d -->
+    <string name="EPr_third_party_addons_desc_disabled">Сторонние дополнения будут отключены
+    </string>
+
+    <!-- Preferences: ideas tab -->
+    <string name="EPr_ideas_tab_enabled">Идеи по задаче</string>
+    <string name="EPr_ideas_tab_description">Взгляните на идеи, которые помогут вам выполнить
+        задачи.
+    </string>
+
+    <!-- Preferences: calendar event start time -->
+    <string name="EPr_cal_end_or_start_at_due_time">Время события в календаре</string>
+    <string name="EPr_cal_end_at_due_time">Завершение события при наступлении срока</string>
+    <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
+
+    <string name="EPr_force_phone_layout">Использовать режим телефона</string>
+
+    <string name="EPr_show_featured_lists">Показывать рекомендуемые списки</string>
+
+    <!-- Configurations -->
+    <string name="EPr_configurations_title">Set configuration</string>
+    <string name="EPr_config_default">По умолчанию</string>
+    <string name="EPr_config_lite">Astrid простая версия</string>
+
+    <!-- Dialog title when setting preference configuration -->
+    <string name="EPr_config_dialog_title">Установить конфигурацию?</string>
+    <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
+    <string name="EPr_config_dialog_text">Сбросить настройки до %s</string>
+
+    <!-- default configuration name for the above dialog -->
+    <string name="EPr_config_dialog_default_id">По умолчанию</string>
+
+    <!-- Preference title for showing save and cancel buttons in task edit page -->
+    <string name="EPr_show_save_and_cancel">Показать сохранить и отменить</string>
+
+
+    <!-- Swipe between lists -->
+    <!-- Preference: swipe between lists performance -->
+    <string name="EPr_swipe_lists_performance_title">Свайп между списками</string>
+
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>Нет свайпа</item>
+        <item>Беречь память</item>
+        <item>Нормальная производительность</item>
+        <item>Высокая производительность</item>
+    </string-array>
+
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <!-- slide 49a -->
+        <item>Свайп между списками выключен</item>
+        <item>Меньшая производительность</item>
+        <item>Настройка по умолчанию</item>
+        <item>Использовать больше системных ресурсов</item>
+    </string-array>
 
-    
-  <!-- Resources for built-in backup plug-in -->
-  
-  <!-- ================================================= BackupPreferences == -->
+    <string name="swipe_lists_helper_title">Свайп между списками</string>
+    <string name="swipe_lists_helper_header">Свайп влево или вправо чтобы быстро переключать
+        списки
+    </string>
+    <string name="swipe_lists_helper_subtitle">Измените настройки в Параметры -&gt; Интерфейс
+    </string>
 
-    <!-- slide 33c/48d: Backup Preferences Title -->    
-    <string name="backup_BPr_header">Резервные копии</string>
+    <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
 
-    <!-- slide 48e/50c: Backup: Status Header -->    
-    <string name="backup_BPr_group_status">Состояние</string>
-    
-    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Последняя: %s</string>
-    <!-- Backup Status: last error failed. Keep it short! -->    
-    <string name="backup_status_failed">Резервирование не удалось</string>
-    <!-- Backup Status: error subtitle -->    
-    <string name="backup_status_failed_subtitle">(нажмите для просмотра ошибки)</string>
-    <!-- slide 48a: Backup Status: never backed up -->    
-    <string name="backup_status_never">Резервное копирование ещё не совершалось!</string>
+    <string-array name="EPr_default_reminders_mode">
+        <!-- reminders duration: labels for "Task Defaults" preference item. -->
+        <item>@string/TEA_reminder_mode_once</item>
+        <item>@string/TEA_reminder_mode_five</item>
+        <item>@string/TEA_reminder_mode_nonstop</item>
+    </string-array>
 
-    <!-- slide 48f/ 50e: Backup Options Group Label -->    
-    <string name="backup_BPr_group_options">Параметры</string>
+    <string-array name="EPr_themes">
+        <!-- theme_settings: labels for Theme preference menu -->
+        <!-- slide 36a-->
+        <item>День - Синий</item>
+        <!-- slide 36b -->
+        <item>День - Красный</item>
+        <!-- slide 36b -->
+        <item>Небесно голубой</item>
+        <!-- slide 36c -->
+        <item>Ночь</item>
+        <!-- slide 36d -->
+        <item>Прозрачный (белый текст)</item>
+        <!-- slide 36e -->
+        <item>Прозрачный (черный текст)</item>
+    </string-array>
 
-    <!-- slide 48b: Preference: Automatic Backup Title -->    
-    <string name="backup_BPr_auto_title">Резервное копирование: автоматическое</string>
-    <!-- Preference: Automatic Backup Description (when disabled) -->
-    <string name="backup_BPr_auto_disabled">Резервное копирование: отключено</string>    
-    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
-    <string name="backup_BPr_auto_enabled">Резервное копирование будет производиться ежедневно</string>
-    
-    <!-- Preference screen restoring Tasks Help -->
-    <!-- Preference screen Restoring Tasks Help Dialog Text-->
-    
-    <string name="backup_BPr_cloud_already_logged_in">"У вас уже есть резервная копия в облаке на  Astrid.com!"</string>
-  
-  <!-- ================================================= BackupActivity == -->
-
-  <!-- slide 48c: backup activity label -->
-  <string name="backup_BAc_label">Диспетчер резервных копий</string>
-
-  <!-- backup activity title -->
-  <string name="backup_BAc_title">Управление резервными копиями</string>
-
-  <!-- backup activity import button -->
-  <string name="backup_BAc_import">Импортировать задачи</string>
-
-  <!-- backup activity export button -->
-  <string name="backup_BAc_export">Экспортировать задачи</string>
-  
-  <!-- backup activity cloud (Astrid.com) option -->
-  <string name="backup_BAc_cloud">"Нажмите для бесплатного резервирования в облаке  Astrid.com"</string>
-    
-  <!-- ============================================== Importer / Exporter == -->
-  
-  <!-- Message displayed when error occurs -->
-  <string name="backup_TXI_error">Ошибка импорта</string>
-    
-  <string name="export_toast">Восстановлено %1$s в %2$s.</string>
-    
-  <string name="export_toast_no_tasks">Нет задач для экспорта.</string>
-  
-  <!-- Progress Dialog Title for exporting -->    
-  <string name="export_progress_title">Экспортирование…</string>
-  
-  <!-- Backup: Title of Import Summary Dialog -->
-  <string name="import_summary_title">Итог восстановления</string>
-    
-  <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">Файл %1$s содержал %2$s.\n\n %3$s импортировано,\n %4$s существовало\n %5$s с ошибками\n</string>
-  
-  <!-- Progress Dialog Title for importing -->    
-  <string name="import_progress_title">Импортирование…</string>
-  
-  <!-- Progress Dialog text for import reading task (%d -> task number)-->    
-  <string name="import_progress_read">Чтение задачи %d…</string>
-  
-  <!-- Backup: Dialog when unable to open a file -->  
-  
-  <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
-  <string name="DLG_error_sdcard">Нет доступа к папке:%s</string>
-  
-  <!-- Backup: Dialog when unable to open SD card in general -->
-  <string name="DLG_error_sdcard_general">Нет доступа к карте памяти!</string>
-    
-  <!-- Backup: File Selector dialog for import -->
-  <string name="import_file_prompt">Выберите файл для восстановления</string>    
-        
+    <string-array name="EPr_themes_widget">
+        <!-- slide 32i / 37a-->
+        <item>Та же что и в приложении</item>
+        <item>День - Синий</item>
+        <item>День - Красный</item>
+        <item>Голубой</item>
+        <item>Ночь</item>
+        <item>Прозрачный (белый текст)</item>
+        <item>Прозрачный (черный текст)</item>
+        <item>Старый стиль</item>
+    </string-array>
 
+    <!-- ========================================== Task Management Settings == -->
+
+    <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
+    <string name="EPr_manage_header">Управление старыми задачами</string>
+    <!-- slide 47d -->
+    <string name="EPr_manage_delete_completed">Удалить завершенные задачи</string>
+    <string name="EPr_manage_delete_completed_message">Вы действительно хотите удалить все
+        завершенные задачи?
+    </string>
+    <!-- slide 47a -->
+    <string name="EPr_manage_delete_completed_summary">Удаленные задачи могут быть восстановлены по
+        одной
+    </string>
+    <string name="EPr_manage_delete_completed_status">Удалено %d задач!</string>
+    <!-- slide 47e -->
+    <string name="EPr_manage_purge_deleted">Очистить удаленные задачи?</string>
+    <string name="EPr_manage_purge_deleted_message">Действительно хотите убрать все удалённые
+        задачи?\n\nЭта операция необратима!
+    </string>
+    <string name="EPr_manage_purge_deleted_status">Убрано %d задач!</string>
+    <!-- slide 47b-->
+    <string name="EPr_manage_purge_deleted_summary">Внимание! Убранные задачи нельзя восстановить
+        без файла резервной копии!
+    </string>
+    <!-- slide 47h-->
+    <string name="EPr_manage_clear_all">Очистить все данные</string>
+    <string name="EPr_manage_clear_all_message">"Удалить все задачи и настройки в
+        Astrid?\n\nВнимание: действие необратимо!"
+    </string>
+
+    <!-- slide 47f -->
+    <string name="EPr_manage_delete_completed_gcal">Удалить календарные события для завершенных
+        задач
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_message">Вы уверены, что хотите удалить все ваши
+        события для завершенных задач?
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_summary"></string>
+    <string name="EPr_manage_delete_completed_gcal_status">Удалено %d календарных событий!</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 47g-->
+    <string name="EPr_manage_delete_all_gcal">Удалить все календарные события для задач</string>
+    <string name="EPr_manage_delete_all_gcal_message">Вы уверены, что хотите удалить все ваши
+        события для задач?
+    </string>
+    <string name="EPr_manage_delete_all_gcal_summary"></string>
+    <string name="EPr_manage_delete_all_gcal_status">Удалено %d календарных событий!</string>
 
+    <!-- ==================================================== AddOnActivity == -->
 
-  <!-- ================================================== AndroidManifest == -->
-
-  <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
-  <string name="app_name">Astrid Tasks</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="read_permission_label">Право Astrid</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="read_permission_desc">чтение и отображение фильтров задач</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="write_permission_label">Право Astrid</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="write_permission_desc">создание новых и редактирование существующих задач</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-    
-  <!-- question for deleting tasks -->
-  <string name="DLG_delete_this_task_question">Удалить эту задачу?</string>
-
-  <!-- question for deleting items (%s => item name) -->
-  <string name="DLG_delete_this_item_question">Удалить этот элемент: %s?</string>
-    
-  <!-- Progress dialog shown when upgrading -->
-  <string name="DLG_upgrading">Обновление ваших задач…</string>
-  
-  <!-- Title for dialog selecting a time (hours and minutes) -->
-  <string name="DLG_hour_minutes">Время (час : мин)</string>
-  
-  <!-- Dialog for Astrid having a critical update -->
-  <string name="DLG_please_update">Требуется обновить Astrid до
-самой свежей версии на Android Market! Пожалуйста, обновите перед тем, как идти дальше, 
-или подождите несколько секунд.</string>
-
-  <!-- Button for going to Market -->
-
-  <!-- Button for accepting EULA -->
-  <string name="DLG_accept">Принимаю</string>
-
-  <!-- Button for declining EULA -->
-  <string name="DLG_decline">Отказываюсь</string>
-
-  <!-- EULA title -->
-  <string name="DLG_eula_title">Условия использования Astrid</string>
-
-  <!-- Progress Dialog generic text -->
-  <string name="DLG_please_wait">Подождите, пожалуйста</string>
-  
-  <!-- Dialog - loading -->
-  <string name="DLG_loading">Загрузка...</string>
-  
-  <!-- Dialog - dismiss -->
-
-  <!-- slide 20d -->
-  <string name="DLG_ok">ОК</string>
-  <!-- slide 36g -->
-  <string name="DLG_cancel">Отмена</string>
-  
-  <string name="DLG_more">еще</string>
-  
-  <string name="DLG_undo">Отмена</string>
-  
-  <string name="DLG_warning">Предупреждение</string>
-  
-  <!-- =============================================================== UI == -->
-  
-  <!-- Label for DateButtons with no value -->
-  <string name="WID_dateButtonUnset">Нажмите для установки</string>
-  
-  <!-- String formatter for DateButtons ($D => date, $T => time) -->
-  
-  <!-- String formatter for Disable button -->
-  
-  <!--  ============================================================= notes -->
-  
-  <!-- Note Exposer -->    
-  
-  <!-- Note Exposer / Comments -->    
-  
-  <!-- EditNoteActivity - no comments -->
-  <string name="ENA_no_comments">Нет данных для отображения</string>
-    
-  <!-- EditNoteActivity - no username for comment -->
-  <string name="ENA_no_user">Кто-нибудь</string>
-  
-  <!-- EditNoteActivity - refresh comments -->
-  <string name="ENA_refresh_comments">Обновить комментарии</string>
-  
-  <!-- ================================================= TaskListActivity == -->
-  
-  <!-- slide 8b: Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">Нет задач! \n Добавить?</string>
-  
-  <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->    
-  <string name="TLA_no_items_person">%s пока не открыл вам\nсвоих задач</string>
-  
-  <!-- Menu: Adjust Sort and Hidden Task Settings -->    
-  <string name="TLA_menu_sort">Сортировка</string>
-  
-  <!-- Menu: Sync Now -->    
-  <string name="TLA_menu_sync">Синхронизация</string>
-  
-  <!-- Menu: Search -->
-  <string name="TLA_menu_search">Поиск</string>
-  
-  <!-- Menu: Tasks -->
-  <string name="TLA_menu_lists">Списки</string>
-
-  <!-- Menu: Friends -->
-  <string name="TLA_menu_friends">Люди</string>
-
-  <!-- Menu: Featured Lists -->
-  <string name="TLA_menu_featured_lists">Рекомендуемые списки</string>
-
-  <!-- Menu: Suggestions -->
-  <string name="TLA_menu_suggestions">Предложения</string>
-  
-  <!-- Menu: Tutorial -->
-
-  <!-- Menu: Settings -->    
-  <string name="TLA_menu_settings">Настройки</string>
-  
-  <!-- slide 30b: Menu: Support -->
-  <string name="TLA_menu_support">Поддержка</string>
-  
-  <!-- Search Label-->
-  
-  <!-- Window title for displaying Custom Filter -->
-  <string name="TLA_custom">Другой</string>
-  
-  <!-- slide 8d: Quick Add Edit Box Hint-->
-  <string name="TLA_quick_add_hint">Добавить задание</string>
-  
-  <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
-  <string name="TLA_quick_add_hint_assign">Добавить что-нибудь для %s</string>
-  
-  <!-- Notification Volumne notification-->
-  <string name="TLA_notification_volume_low">Звуковые извещения заглушены. Вы не услышите Astrid!</string>
-  
-  <!-- Notifications disabled warning -->
-  <string name="TLA_notification_disabled">Напоминания Astrid отключены! Вы не будете получать никаких напоминаний</string>
-  
-  <string-array name="TLA_filters">
-      <item>Активные</item>
-      <item>Сегодня</item>
-      <item>Скоро</item>
-      <item>Просроченные</item>
-      <item>Готово</item>
-      <item>Скрытые</item>      
-  </string-array>
-  
-  <!-- Title for confirmation dialog after quick add markup -->
-  <string name="TLA_quickadd_confirm_title">Вы сказали, \"%s\"</string>
-  
-  <!-- Text for speech bubble in dialog after quick add markup -->
-  <!-- First string is task title, second is due date, third is priority -->
-  <string name="TLA_quickadd_confirm_speech_bubble">Я создал задачу \"%1$s\" %2$s в %3$s</string>
-  
-  <string name="TLA_quickadd_confirm_speech_bubble_date">для %s</string>
-  
-  <string name="TLA_quickadd_confirm_hide_helpers">Больше не показывать подтверждения</string>
-  
-  
-  <!-- Title for alert on new repeating task. %s-> task title -->
-  <string name="TLA_repeat_scheduled_title">Новая повторяющаяся задача %s</string>
-  
-  <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
-  <string name="TLA_repeat_scheduled_speech_bubble">Я напомню вам об этом %s.</string>
-  
-  <string-array name="TLA_priority_strings">
-      <item>наивысший приоритет</item>
-      <item>высокий приоритет</item>
-      <item>средний приоритет</item>
-      <item>низкий приоритет</item>
-  </string-array>
-  <!-- slide 22a -->
-  <string name="TLA_all_activity">Вся активность</string>
-  
-  <!-- ====================================================== TaskAdapter == -->
-  
-  <!-- Format string to indicate task is hidden (%s => task name) -->
-  <string name="TAd_hiddenFormat">%s [скрыта]</string>
-  
-  <!-- Format string to indicate task is deleted (%s => task name) -->
-  <string name="TAd_deletedFormat">%s [удалена]</string>
-  
-  <!-- Displayed when adapter is flung (scrolled quickly) -->
-  
-  <!-- slide 22b: indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Завершена\n%s</string>
-  
-  <!-- slide 15a: Action Button: edit task -->
-  <string name="TAd_actionEditTask">Редактировать</string>
-  
-  <!-- Context Item: edit task -->
-  <string name="TAd_contextEditTask">Правка задачи</string>
-
-  <!-- Context Item: copy task -->
-  <string name="TAd_contextCopyTask">Копировать задачу</string>
-
-  <!-- Context Item: delete task -->
-  <string name="TAd_contextDeleteTask">Удалить задачу</string>
-
-  <!-- Context Item: undelete task -->
-  <string name="TAd_contextUndeleteTask">Отменить удаление задачи</string>
-
-  <!-- Context Item: purge task -->
-  <string name="TAd_contextPurgeTask">Очистить задачу</string>
-  
-  <!-- ============================================== SortSelectionDialog == -->
-  
-  <!-- slide 23a: Sort Selection: dialog title -->    
-  <string name="SSD_title">Сортировка и скрытые задачи</string>
-  
-  <!-- slide 23h:  Hidden: title -->
-  <string name="SSD_hidden_title">Скрытые задачи</string>
-  
-  <!-- Hidden Task Selection: show completed tasks -->    
-  <string name="SSD_completed">Показать завершённые задачи</string>
-  
-  <!-- Hidden Task Selection: show hidden tasks -->    
-  <string name="SSD_hidden">Показать скрытые задачи</string>
-  
-  <!-- Hidden Task Selection: show deleted tasks -->    
-  <string name="SSD_deleted">Показать удалённые задачи</string>
-  
-  <!-- Sort Selection: drag with subtasks -->
-  <string name="SSD_sort_drag">Ручной порядок с подзадачами</string>
-  
-  <!-- slide 23b: Sort Selection: smart sort -->
-  <string name="SSD_sort_auto">Умная сортировка Astrid</string>
-  
-  <!-- slide 23e: Sort Selection: sort by alpha -->
-  <string name="SSD_sort_alpha">По названию</string>
-  
-  <!-- slide 23c: Sort Selection: sort by due date -->
-  <string name="SSD_sort_due">По намеченному сроку</string>
-  
-  <!-- slide 23d: Sort Selection: sort by importance -->
-  <string name="SSD_sort_importance">По приоритету</string>
-  
-  <!-- slide 23f: Sort Selection: sort by modified date -->
-  <string name="SSD_sort_modified">Последние изменённые</string>
-  
-  <!-- slide 23g: Sort Selection: reverse -->
-  <string name="SSD_sort_reverse">В обратном порядке</string>
-  
-  <!-- slide 23j: Sort Button: sort temporarily -->
-  <string name="SSD_save_temp">Только один раз</string>
-  
-  <!-- slide 23i: Sort Button: sort permanently -->
-  <string name="SSD_save_always">Всегда</string>
-  
-  <!-- =============================================== FilterListActivity == -->
-  
-  <!-- Astrid Filter Shortcut -->    
-  <string name="FSA_label">Список или Фильтр Astrid</string>
-
-  <!-- Filter List Activity Title -->    
-  
-  <!-- Displayed when loading filters -->    
-  
-  <!-- Context Menu: Create Shortcut -->    
-  <string name="FLA_context_shortcut">Создать ярлык на рабочем столе…</string>
-  
-  <!-- Menu: Search -->
-  
-  <!-- Menu: Help -->    
-  
-  <!-- slide 28c: Create Shortcut Dialog Title -->    
-  <string name="FLA_shortcut_dialog_title">Создать ярлык</string>
-  
-  <!-- Create Shortcut Dialog (asks to name shortcut) -->    
-  <string name="FLA_shortcut_dialog">Имя ярлыка:</string>
-  
-  <!-- Search Hint-->
-  <string name="FLA_search_hint">Найти задачи</string>
-  
-  <!-- Search Filter name (%s => query) -->
-  <string name="FLA_search_filter">Соответствия для \'%s\'</string>
-  
-  <!-- Toast: created shortcut (%s => label) -->
-  <string name="FLA_toast_onCreateShortcut">Ярлык %s создан</string>
-  
-  <!-- Menu: new filter -->
-  <string name="FLA_new_filter">Новый фильтр</string>
-  
-  <!-- slide 10e: Button: new list -->
-  <string name="FLA_new_list">Новый список</string>
-  
-  <!-- Alert when creating a shortcut without selecting a filter -->
-  <string name="FLA_no_filter_selected">Фильтры не выбраны! Пожалуйста, выберите фильтр или список</string>
-  
-  <!-- ================================================= TaskEditActivity == -->
-  
-  <!-- Title when editing a task (%s => task title) -->
-  
-  <!-- Title when creating a new task -->
-  
-  <!-- Task title label -->
-  
-  <!-- Task when label -->
-  <string name="TEA_when_header_label">Когда</string>
-  
-  <!-- Task title hint (displayed when edit box is empty) -->
-  <string name="TEA_title_hint">Имя задачи</string>
-  
-  <!-- Task importance label -->
-  <string name="TEA_importance_label">Приоритет</string>
-  
-  <!-- Task due date hint -->
-  <string name="TEA_deadline_hint">Set due date</string>
-  
-  <!-- Task assigned to string (%s -> assigned person name) -->
-  <string name="TEA_assigned_to">Assigned to %s</string>
-  
-  <!-- Task urgency specific time checkbox -->
-  <string name="TEA_urgency_specific_time">В указанное время?</string>
-  
-  <!-- Task urgency specific time title when specific time false -->
-  <string name="TEA_urgency_none">Пусто</string>
-  
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_label">Скрыть до</string>
-
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_display">Hide until %s</string>
-  
-  <!-- Task hide until toast -->
-  <string name="TEA_hideUntil_message">Задача будет скрыта до %s</string>
-  
-  <!-- Task editing data being loaded label -->
-  <string-array name="TEA_loading"><item>Загрузка...</item></string-array>
-  
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_note_label">Описание</string>
-
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_notes_empty">Description...</string>
-  
-  <!-- Task note hint -->
-  <string name="TEA_notes_hint">Введите описание задачи...</string>
-  
-  <!-- Estimated time label -->
-  <string name="TEA_estimatedDuration_label">Как долго это продлится?</string>
-  
-  <!-- Elapsed time label -->
-  <string name="TEA_elapsedDuration_label">Время уже потраченное на задачу</string>
-
-  <!-- Menu: Save -->    
-  <string name="TEA_menu_save">Сохранить изменения</string>
-  
-  <!-- Menu: Don\'t Save -->
-  <string name="TEA_menu_discard">Не сохранять</string>
-  
-  <!-- Menu: Delete Task -->
-  <string name="TEA_menu_delete">Удалить задачу</string>
-  
-  <!-- Menu: Task comments -->
-  <string name="TEA_menu_refresh_comments">Обновить комментарии</string>
-
-  <string name="TEA_menu_comments">Комментарии</string>
-  
-   <!-- Toast: task saved with deadline (%s => preposition + time units) -->
-  <string name="TEA_onTaskSave_due">Задача сохранена: срок %s</string>
-  
-  <!-- Toast: task saved without deadlines -->
-  <string name="TEA_onTaskSave_notDue">Задача сохранена</string>
-  
-  <!-- Toast: task was not saved -->
-  
-  <!-- Toast: task was deleted -->
-  
-  <!-- slide 15b: Task edit tab: activity -->
-  <string name="TEA_tab_activity">Действия</string>
-  
-  <!-- slide 15e:  Task edit tab: more editing settings -->
-  <string name="TEA_tab_more">Ещё</string>
-  
-  <!-- slide 15d: Task edit tab: web services -->
-  <string name="TEA_tab_web">Идеи</string>
-  
-  <string name="TEA_timer_est">Est. %s</string>
-
-  <string name="TEA_timer_elap">Elapsed %s</string>
-  
-  <string-array name="TEA_urgency">
-      <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
-      <item>Без даты</item>
-      <item>Конкретный день</item>
-      <item>Сегодня</item>
-      <item>Завтра</item>
-      <item>(день спустя)</item>
-      <item>Следующая неделя</item>
-      <item>В течение пары недель</item>
-      <item>Следующий месяц</item>
-  </string-array>
-  
-  <string name="TEA_no_time">Без времени</string>
-      
-  <string-array name="TEA_hideUntil">
-      <!-- hideUntil: labels for edit page. -->
-      <item>Никогда</item>
-      <item>Дата выполнения</item>
-      <item>Due time</item>
-      <item>Day before due</item>
-      <item>Week before due</item>
-      <item>Определённый день/время</item>
-  </string-array>
-  
-  <!-- Task edit control set descriptors -->
-
-  <!-- slide 9b/35i -->
-  <string name="TEA_control_who">Кто</string>
-
-  <!-- slide 9c/ 35a -->
-  <string name="TEA_control_when">Когда</string>
-  <!-- slide 35b -->
-  <string name="TEA_control_more_section">----More Section----</string>
-  <!-- slide 16a/35c -->
-  <string name="TEA_control_importance">Приоритет</string>  
-  <!-- slide 16b/35d -->
-  <string name="TEA_control_lists">Списки</string>  
-  <!-- slide 16c/35e -->
-  <string name="TEA_control_notes">Описание</string>  
-  
-  <string name="TEA_control_files">Файлы</string>
-
-  <!-- slide 16e / slide 35g-->
-  <string name="TEA_control_reminders">Напоминания</string>
-
-  <!-- slide 16f -->
-  <string name="TEA_control_timer">Учет времени</string>
-  
-  <string name="TEA_control_hidden_section">Всегда скрывать</string>
-  
-  <string name="hide_until_prompt">Показать в моем листе</string>
-  
-  <!-- Add Ons tab when no add-ons found -->
-  
-  <!-- Add Ons button -->
-  
-  <!-- More row -->
-  
-  <!-- slide 15c: Text when no activity to show -->
-  <string name="TEA_no_activity">Нет активности</string>
-  
-  <!-- Text to load more activity -->
-  <string name="TEA_load_more">Загрузить больше...</string>
-  
-  <!-- When controls dialog -->
-  <string name="TEA_when_dialog_title">Когда это должно произойти?</string>
-  
-  
-  <string name="TEA_new_task">Новое задание</string>
-  
-  <string name="WSV_click_to_load">Нажми меня для поиска решений этой задачи!</string>
-  
-  <string name="WSV_not_online">Я способен на большее при подключении к Интернету. Пожалуйста, проверьте ваше подключение.</string>
-  
-  <string name="TEA_contact_error">Простите, для выбранного контакта отсутствует адрес эл. почты.</string>
-  
-  <!-- ============================================= IntroductionActivity == -->
-  
-  <!-- slide 1a: Introduction Window title -->
-  
-  <!-- Button to agree to EULA -->
-  
-  <!-- Button to disagree with EULA -->
-  
-  <!-- ===================================================== MissedCallActivity == -->
-  
-  <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
-  <string name="MCA_title">%1$s\nзвонил(а) в %2$s</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_return_call">Позвонить сейчас</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_add_task">Позвонить позже</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_ignore">Игнорировать</string>
-  
-  <!-- Missed call: dialog to ignore all missed calls title -->
-  <string name="MCA_ignore_title">Игнорировать все пропущенные звонки?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls body -->
-  <string name="MCA_ignore_body">Вы проигнорировали несколько пропущенных звонков. Больше не спрашивать про них?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore all button -->
-  <string name="MCA_ignore_all">Игнорировать все звонки</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
-  <string name="MCA_ignore_this">Игнорировать только этот звонок</string>
-
-  <!-- Missed call: preference title -->
-  <string name="MCA_missed_calls_pref_title">Пропущенные звонки</string>
-
-  <!-- slide 49c: Missed call: preference description -->
-  <string name="MCA_missed_calls_pref_desc_enabled">Astrid будет уведомлять вас о пропущенных звонках и предложит вам перезвонить</string>
-  <string name="MCA_missed_calls_pref_desc_disabled">Astrid не будет уведомлять вас о пропущенных звонках</string>
-
-  <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
-  <string name="MCA_task_title_name">Перезвонить %1$s в %2$s</string>
-
-  <!-- Missed call: task title no name (%s -> number)-->
-  <string name="MCA_task_title_no_name">Перезвонить %s</string>
-  
-  <!-- Missed call: schedule dialog title (%s -> name or number)-->
-  <string name="MCA_schedule_dialog_title">Перезвонить %s в...</string>
-  
-  <!-- Missed call speech bubble options -->
-  <string-array name="MCA_dialog_speech_options">
-      <item>Должно быть здорово быть популярным!</item>
-      <item>Эй! Ты нравишься людям!</item>
-      <item>Звякни, порадуй человека!</item>
-      <item>Вы не будете рады если бы люди вам перезвонили?</item>
-      <item>Вы можете это сделать!</item>
-      <item>Вы можете всегда отправлять текст...</item>
-  </string-array>
-  
-  
-  <!-- ======================================= Calendar reminder activity == -->
-  
-  <!-- Calendar remindeer ignore button -->
-  <string name="CRA_ignore">Игнорировать</string>
-  
-  <!-- Calendar event -->
-  <string name="CRA_title">Необходим список встреч?</string>
-  
-  <!-- Calendar reminder: dialog to ignore all missed calls title -->
-  <string name="CRA_ignore_title">Пропустить все события календаря?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls body -->
-  <string name="CRA_ignore_body">Вы пропустили несколько событий календаря. Astrid не следует больше спрашивать Вас о них?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
-  <string name="CRA_ignore_all">Пропустить все события</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
-  <string name="CRA_ignore_this">Пропустить только это событие</string>
-  
-  <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
-  <string name="CRA_speech_bubble_start">Похоже скоро начнется %s. Хотите создать список для пунктов события?</string>
-
-  <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
-  <string name="CRA_speech_bubble_end">Похоже Вы только что завершили %s. Хотите создать список для пунктов события?</string>
-  
-  <!-- Calendar reminder: create list button -->
-  <string name="CRA_create_list">Создать список</string>
-
-  <!-- Calendar reminder: postpone button -->
-  <string name="CRA_postpone">Возможно позднее</string>
-  
-  <!-- Calendar reminder: list exists dialog title -->
-  <string name="CRA_list_exists_title">Такой список уже существует</string>
-  
-  <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
-  <string name="CRA_list_exists_body">Список с именем %s уже есть. Хотите ли вы использовать имеющийся или создать новый список для этого события?</string>
-  
-  <!-- Calendar reminder: list exists dialog create new button -->
-  <string name="CRA_create_new">Создать новый</string>
-
-  <!-- Calendar reminder: list exists dialog use existing button -->
-  <string name="CRA_use_existing">Воспользоваться имеющимся</string>
-  
-  <!-- Calendar remindr: created list (%s -> list name) -->
-  <string name="CRA_created_list_dialog">Я создал список %s.</string>
-  
-  <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
-  <string name="CRA_one_attendee">%s примет участие.</string>
-
-  <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
-  <string name="CRA_two_attendees">%1$s и %2$s примут участие.</string>
-
-  <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
-  <string name="CRA_many_attendees">%1$s, %2$s, и еще %3$d примут участие.</string>
-  
-  <!-- Calendar reminder: invitation prompt -->
-  <string name="CRA_invitation_prompt">Пригласить?</string>
-  
-  <!-- Calendar reminder: preference title -->
-  <string name="CRA_calendar_reminders_pref_title">Ассистент календаря</string>
-
-  <!-- Calendar reminder: pref description disabled -->
-  <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid не будет напоминать о предстоящих событиях.</string>
-
-  <!-- Calendar reminder: pref description enabled -->
-  <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid будет напоминать вам о предстоящих событиях в календаре и напомнит вам подготовиться к ним</string>
-  
-  <!-- Calendar reminder: share list title -->
-  <string name="CRA_share_list_title">Поделиться этим списком?</string>
-  
-  <string name="CRA_invite_attendees">Пригласить участников</string>
-
-  <string name="CRA_more_options">Дополнительные настройки</string>
-
-  <string name="CRA_dont_invite">Нет, спасибо</string>
-
-  <!-- Calendar reminder: share list title when no other attendees exist-->
-  <string name="CRA_list_created_title">Список создан!</string>
-  
-  <!-- Calendar reminder: default new list name (%s -> event title) -->
-  <string name="CRA_default_list_name">Пункты события: %s</string>
-  
-  <!-- ===================================================== HelpActivity == -->
-  
-  <!-- Help: Button to get support from our website -->
-    
-  <!-- ==================================================== UpdateService == -->
-  
-  <!-- Changelog Window Title -->
-  <string name="UpS_changelog_title">Что нового в Astrid?</string>
-  
-  <!-- Updates Window Title -->
-  <string name="UpS_updates_title">Последние новости Astrid</string>
-  
-  <!-- Updats No Activity to show for offline users -->
-  <string name="UpS_no_activity_log_in">Войдите, чтобы увидеть\nсвой прогресс и активность\nв опубликованных списках.</string>
-  
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 31g: Preference Window Title -->
-  <string name="EPr_title">Astrid: Настройки</string>
-  
-  <string name="EPr_share_astrid">Поделиться Astrid</string>
-
-  <string name="EPr_share_astrid_summary">Расскажи про Astrid в любимой социальной сети</string>
-  
-  <!-- slide 46a -->
-  <string name="EPr_deactivated">выключен</string>
-
-  <!-- slide 30i: Preference Category: Appearance Title -->
-  <string name="EPr_appearance_header">Интерфейс</string>
-  
-  <!-- Preference Category: Appearance Summary -->
-  <string name="EPr_appearance_summary">Темы, виджеты, пункты списка, экран правки</string>
-  
-  <!-- FAQ Preference title -->
-  <string name="EPr_faq_title">часто задаваемые вопросы</string>
-  
-  <!-- Account status preference (%s -> account type) -->
-  <string name="EPr_account_title">Учётная запись: %s</string>
-
-  <!-- Support preferences summary -->
-  <string name="EPr_support_summary">Учебник, FAQ, О программе</string>
-  
-  <!-- slide 34a: Preference: Task List Font Size Title -->
-  <string name="EPr_fontSize_title">Размер списка задач</string>
-  
-  <!-- Preference: Filters to show pref screen title -->
-  <string name="EPr_filters_to_show_title">Показать фильтры</string>
-  
-  <!-- slide 32a: Preference: Show confirmation for smart reminders -->
-  <string name="EPr_showSmartConfirmation_title">Показывать подтверждения для умных напоминаний</string>
-  
-  <!-- slide 34g: Preference: Task List Font Size Description -->                                                                                                                                                  
-  <string name="EPr_fontSize_desc">Размер шрифта основного экрана</string>  
-  
-  <!-- Preferemce: Show task edit confirmation toasts -->
-  
-  <!-- slide 34c: Preference: Task List Show Notes -->
-  <string name="EPr_showNotes_title">Показать описание в задаче</string>
-  
-  <!-- Edit screen preference category -->
-  <string name="EPr_edit_screen_options">Редактировать настройки экрана</string>
-  
-  <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
-  <string name="EPr_beastMode_title">Редактировать порядок экранов</string>
-  
-  <string name="EPr_beastMode_shortcut">Настроить</string>
-  
-  <string name="EPr_time_increment">Шаг 5 минут</string>
-  
-  <string name="EPr_use_date_shortcuts">Использовать ярлыки дат</string>
-  
-  <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
-  
-  <!-- slide 35h -->
-  <string name="EPr_beastMode_desc">Настроить внешний вид экрана правки задачи</string>
-  <!-- slide 35j -->
-  <string name="EPr_beastMode_reset">Настройки по умолчанию</string>
-  
-  <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on each row</string>
-      
-  <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Описание будет доступно на экране редактирования задачи</string>  
-  <!-- Preference: Task List Show Notes Description (enabled) -->
-  <string name="EPr_showNotes_desc_enabled">Всегда показывать описание</string>
-  
-  <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
-  <string name="EPr_compressTaskRows_title">Компактные строки задач</string>
-  <!-- slide 34j -->
-  <string name="EPr_compressTaskRows_desc">Сжать строки задач до высоты названий</string>
-  
-  <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
-  <!-- slide 34k-->
-  
-  <!-- slide 34b: Preferences: Wrap task titles to two lines -->
-  <string name="EPr_fullTask_title">Показывать полное название задачи</string>
-  <string name="EPr_fullTask_desc_enabled">Будет показано полное название задачи</string>
-  <!-- slide 34h -->
-  <string name="EPr_fullTask_desc_disabled">Будут показаны первые две строки названия</string>
-  
-  <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
-  <string name="EPr_ideaAuto_title">Автозагрузка закладки Идеи</string>
-  <!-- slide 32c -->
-  <string name="EPr_ideaAuto_desc_enabled">Веб-поиск для закладки Идеи будет выполняться при нажатии на закладку</string>
-  <string name="EPr_ideaAuto_desc_disabled">Веб-поиск для закладки Идеи будет выполняться только при вызове вручную</string>
-  
-  <!-- Preferences: task row style -->
-  <string-array name="EPr_task_row_styles">
-      <item>Оригинальный</item>
-      <item>Простой</item>
-      <item>Только заголовки</item>
-  </string-array>
-  
-  <string-array name="EPr_task_row_style_descriptions">
-      <item>Сократить заголовок до двух строк с указанием даты справа</item>
-      <item>Сократить заголовок до одной строки с указанием даты и списков ниже</item>
-      <item>В одну линию с заголовками</item>
-  </string-array>
-  
-  <!-- task row style title (%s -> style) -->
-  <string name="EPr_task_row_style_title">Стиль строки: %s</string>
-  
-  <!-- Preference: custom filters enabled -->
-  <string name="EPr_use_filters_title">Использовать фильтры
-</string>
-  <string name="EPr_use_filters_subtitle">Позволяет создавать настраиваемые фильтры</string>
-
-  <!-- Preference: show list members in shared list -->
-  <string name="EPr_show_list_members_title">Отображать список участников в общих списках </string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_simple_input_boxes">Простые текстовые поля</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_show_quickadd_controls">Расширенные возможности быстрого добавления</string>
-
-  <!-- Preference: don\'t show plus button until input present -->
-  <string name="EPr_hide_plus_button">Hide plus button</string>
-
-  <!-- Preference: menu items -->
-  <string name="EPr_menu_items">Элементы меню</string>
-
-  <!-- Preference: list view -->
-  <string name="EPr_list_view">Списком</string>
-
-  <!-- Preference: task edit comments -->
-  <string name="EPr_show_task_edit_comments">Показывать комментарии в редакторе задачи</string>
-  
-  <!-- slide 30f/ 36f: Preference: Theme -->
-  <string name="EPr_theme_title">Цветовая тема</string>
-  <!-- Preference: Theme Description (%s => value) -->
-  <string name="EPr_theme_desc">Текущая: %s</string>  
-  <!-- Preference: Theme Description (android 1.6) -->
-  <string name="EPr_theme_desc_unsupported">Настройка требует Android 2.0+</string>
-  <!-- slide 32h/ 37b -->
-  <string name="EPr_theme_widget_title">Тема виджета</string>
-  
-  <!-- slide 30d/ 34f: Preference screen: all task row settings -->
-  <string name="EPr_taskRowPrefs_title">Внешний вид задач в списке</string>
-  
-  <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
-  <string name="EPr_use_contact_picker">Использовать системный выбор контактов</string>
-  <!-- slide 49b -->
-  <string name="EPr_use_contact_picker_desc_enabled">Опция \"системный выбор контактов\" будет показана в окне назначения задачи</string>
-  <string name="EPr_use_contact_picker_desc_disabled">Опция \"системный выбор контактов\" будет скрыта</string>
-
-  <!-- slide 49i: Preferences: Third party addons -->
-  <string name="EPr_third_party_addons">Разрешить установку сторонних дополнений</string>
-  <string name="EPr_third_party_addons_desc_enabled">Сторонние дополнения будут включены</string>
-  <!-- slide 49d -->
-  <string name="EPr_third_party_addons_desc_disabled">Сторонние дополнения будут отключены</string>
-  
-  <!-- Preferences: ideas tab -->
-  <string name="EPr_ideas_tab_enabled">Идеи по задаче</string>
-  <string name="EPr_ideas_tab_description">Взгляните на идеи, которые помогут вам выполнить задачи.</string>
-  
-  <!-- Preferences: calendar event start time -->
-  <string name="EPr_cal_end_or_start_at_due_time">Время события в календаре</string>
-  <string name="EPr_cal_end_at_due_time">Завершение события при наступлении срока</string>
-  <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
-  
-  <string name="EPr_force_phone_layout">Использовать режим телефона</string>
-
-  <string name="EPr_show_featured_lists">Показывать рекомендуемые списки</string>
-  
-  <!-- Configurations -->
-  <string name="EPr_configurations_title">Set configuration</string>
-  <string name="EPr_config_default">По умолчанию</string>
-  <string name="EPr_config_lite">Astrid простая версия</string>
-  
-  <!-- Dialog title when setting preference configuration -->
-  <string name="EPr_config_dialog_title">Установить конфигурацию?</string>
-  <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
-  <string name="EPr_config_dialog_text">Сбросить настройки до %s</string>
-  
-  <!-- default configuration name for the above dialog -->
-  <string name="EPr_config_dialog_default_id">По умолчанию</string>
-  
-  <!-- Preference title for showing save and cancel buttons in task edit page -->
-  <string name="EPr_show_save_and_cancel">Показать сохранить и отменить</string>
-  
-  
-  <!-- Swipe between lists -->
-  <!-- Preference: swipe between lists performance -->
-  <string name="EPr_swipe_lists_performance_title">Свайп между списками</string>
-  
-  <string-array name="EPr_swipe_lists_performance_mode">
-      <item>Нет свайпа</item>
-      <item>Беречь память</item>
-      <item>Нормальная производительность</item>
-      <item>Высокая производительность</item>
-  </string-array>
-  
-  <string-array name="EPr_swipe_lists_performance_desc">
-  <!-- slide 49a -->
-      <item>Свайп между списками выключен</item>
-      <item>Меньшая производительность</item>
-      <item>Настройка по умолчанию</item>
-      <item>Использовать больше системных ресурсов</item>
-  </string-array>
-    
-  <string name="swipe_lists_helper_title">Свайп между списками</string>
-  <string name="swipe_lists_helper_header">Свайп влево или вправо чтобы быстро переключать списки</string>
-  <string name="swipe_lists_helper_subtitle">Измените настройки в Параметры -&gt; Интерфейс</string>
-
-  <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
-  
-  <string-array name="EPr_default_reminders_mode">
-      <!-- reminders duration: labels for "Task Defaults" preference item. -->
-      <item>@string/TEA_reminder_mode_once</item>
-      <item>@string/TEA_reminder_mode_five</item>
-      <item>@string/TEA_reminder_mode_nonstop</item>
-  </string-array>
-    
-  <string-array name="EPr_themes">
-    <!-- theme_settings: labels for Theme preference menu -->
-    <!-- slide 36a-->
-    <item>День - Синий</item>
-    <!-- slide 36b -->
-    <item>День - Красный</item>
-    <!-- slide 36b -->
-    <item>Небесно голубой</item>
-    <!-- slide 36c -->
-    <item>Ночь</item>
-    <!-- slide 36d -->
-    <item>Прозрачный (белый текст)</item>
-    <!-- slide 36e -->
-    <item>Прозрачный (черный текст)</item>
-  </string-array>
-  
-  <string-array name="EPr_themes_widget">
-    <!-- slide 32i / 37a-->
-    <item>Та же что и в приложении</item>
-    <item>День - Синий</item>
-    <item>День - Красный</item>
-    <item>Голубой</item>
-    <item>Ночь</item>
-    <item>Прозрачный (белый текст)</item>
-    <item>Прозрачный (черный текст)</item>
-    <item>Старый стиль</item>
-  </string-array>
-  
-  <!-- ========================================== Task Management Settings == -->
-
-  <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
-  <string name="EPr_manage_header">Управление старыми задачами</string>
-  <!-- slide 47d -->
-  <string name="EPr_manage_delete_completed">Удалить завершенные задачи</string>
-  <string name="EPr_manage_delete_completed_message">Вы действительно хотите удалить все завершенные задачи?</string>
-  <!-- slide 47a -->
-  <string name="EPr_manage_delete_completed_summary">Удаленные задачи могут быть восстановлены по одной</string>
-  <string name="EPr_manage_delete_completed_status">Удалено %d задач!</string>
-  <!-- slide 47e -->
-  <string name="EPr_manage_purge_deleted">Очистить удаленные задачи?</string>
-  <string name="EPr_manage_purge_deleted_message">Действительно хотите убрать все удалённые задачи?\n\nЭта операция необратима!</string>
-  <string name="EPr_manage_purge_deleted_status">Убрано %d задач!</string>
-  <!-- slide 47b-->
-  <string name="EPr_manage_purge_deleted_summary">Внимание! Убранные задачи нельзя восстановить без файла резервной копии!</string>
-  <!-- slide 47h-->
-  <string name="EPr_manage_clear_all">Очистить все данные</string>
-  <string name="EPr_manage_clear_all_message">"Удалить  все задачи и настройки в Astrid?\n\nВнимание: действие необратимо!"</string>
-
-  <!-- slide 47f -->
-  <string name="EPr_manage_delete_completed_gcal">Удалить календарные события для завершенных задач</string>
-  <string name="EPr_manage_delete_completed_gcal_message">Вы уверены, что хотите удалить все ваши события для завершенных задач?</string>
-  <string name="EPr_manage_delete_completed_gcal_summary"></string>
-  <string name="EPr_manage_delete_completed_gcal_status">Удалено %d календарных событий!</string>
-      
-  <!-- slide 47g-->
-  <string name="EPr_manage_delete_all_gcal">Удалить все календарные события для задач</string>
-  <string name="EPr_manage_delete_all_gcal_message">Вы уверены, что хотите удалить все ваши события для задач?</string>
-  <string name="EPr_manage_delete_all_gcal_summary"></string>
-  <string name="EPr_manage_delete_all_gcal_status">Удалено %d календарных событий!</string>
-      
-  <!-- ==================================================== AddOnActivity == -->
-  
-  <!-- Add Ons Activity Title -->
-  <string name="AOA_title">Дополнения</string>
-    
-  <!-- Add-on Activity: author for internal authors  -->
-  <string name="AOA_internal_author">Команда Astrid</string>
-    
-  <!-- Add-on Activity: installed add-ons tab -->
-  <string name="AOA_tab_installed">Установленные</string>
-  
-  <!-- Add-on Activity - available add-ons tab -->
-  <string name="AOA_tab_available">Доступные</string>
-  
-  <!-- Add-on Activity - free add-ons label -->
-  <string name="AOA_free">Свободен</string>
-  
-  <!-- Add-on Activity - menu item to visit add-on website -->
-  
-  <!-- Add-on Activity - menu item to visit android market -->
-  
-  <!-- Add-on Activity - when list is empty -->
-  <string name="AOA_no_addons">Пустой список!</string>
-  
-  <string name="AOA_ppack_title">Astrid Power Pack</string>
-  <string name="AOA_ppack_description">"Поддержите Astrid  и станьте еще продуктивнее с Astrid Power Pack, 4x2 и 4x4 виджетами и голосовым вводом. Повысь производительность уже сегодня!"</string>
-  <string name="AOA_locale_title">Языковой плагин Astrid</string>
-  <string name="AOA_locale_description">Разрешает Astrid использовать приложение Locale, чтобы посылать вам фильтрованные извещения. Нужно приложение Locale.</string>
-  
-  <!-- ====================================================== TasksWidget == -->
-
-  <!-- Widget text when loading tasks -->
-  <string name="TWi_loading">Загрузка...</string>
-
-  <!-- Widget configuration activity title: select a filter -->
-  <string name="WCA_title">Выберите задачи для просмотра…</string>
-  
-  <!-- ======================================================== Waiting on me -->
-
-  <string name="wom_commented">%s commented on your task.</string>
-  <string name="wom_mentioned">%s mentioned you.</string>
-  <string name="wom_assigned">%s assigned this to you.</string>
-  <string name="wom_raised_pri">%s raised the priority.</string>
-  <string name="wom_changed_due">%s changed the due date.</string>
-  <string name="wom_default">%s wants your attention.</string>
-  
-  <string name="wom_dismiss">Dismiss</string>
-  <string name="wom_acknowledge">I\'ve read this</string>
-
-  <!-- ============================================================= About == -->
-  
-  <!-- slide 30h: Title of "About" option in settings -->
-  <string name="p_about">О Astrid</string>
-  
-  <!-- About text (%s => current version)-->
-  <string name="p_about_text">Текущая версия: %s\n\n Astrid имеет открытый исходный код и с гордостью поддерживается Todoroo, Inc.</string>
-
-  <!-- Title of "Help" option in settings -->
-  <string name="p_help">Поддержка</string>
-  
-  <!-- slide 30c: Title of "Forums" option in settings -->
-  <string name="p_forums">Форумы</string>
-  
-  <!-- Title of "Premium" option in settings -->
-  <string name="p_premium">Премиум</string>
-  
-  <!-- ============================================================= Misc == -->
-  
-  <string name="feedback_positive_title">Rate Astrid?</string>
-
-  <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star rating?</string>
-
-  <string name="feedback_negative_title">Leave feedback?</string>
-
-  <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
-
-  <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback section--it might not be available on your device.</string>
-  
-  <string name="feedback_positive_button">Rate Astrid</string>
-
-  <string name="feedback_negative_button">Leave feedback</string>
-  
-  <string name="feedback_not_now">Not now</string>
-  
-  <string name="feedback_banner_text">How\'s Astrid working for you?</string>
-  
-  <!-- Displayed when task killer found. %s => name of the application -->
-  <string name="task_killer_help">Возможно вы используете менеджер задач (%s). По возможности добавьте Astrid в список исключений иначе возможны сложности с напоминаниями.\n</string>
-  
-  <!-- Task killer dialog ok button -->
-  <string name="task_killer_help_ok">Я не хочу убивать Astrid!</string>
-    
-  <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
-  
-  <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
-  <string name="marketplace_description">Astrid - распространённый список задач с открытым исходным кодом призванный помочь Вам справиться с делами. В нём есть напоминания, метки, синхронизация, плагин Locale, виджет и многое другое.</string>
-  
-  <string name="DB_corrupted_title">Поврежденная база данных</string>
-  
-  <string name="DB_corrupted_body">Упс! Похоже, ваша база данных повреждена.
-Если вы получаете эту ошибку регулярно, рекомендуется стереть
-все данные (Параметры-&gt;Синхронизация-&gt;Управление старыми задачами-&gt;Очистить все данные) и восстановить
-задачи из резервной копии (Параметры-&gt;Синхронизация-&gt;Резервные копии-&gt;Импортировать задачи)</string>
-      
-  <string name="market_unavailable">К сожалению, этот магазин недоступен для вашей системы.</string>
-  
+    <!-- Add Ons Activity Title -->
+    <string name="AOA_title">Дополнения</string>
 
+    <!-- Add-on Activity: author for internal authors  -->
+    <string name="AOA_internal_author">Команда Astrid</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Add-on Activity: installed add-ons tab -->
+    <string name="AOA_tab_installed">Установленные</string>
 
+    <!-- Add-on Activity - available add-ons tab -->
+    <string name="AOA_tab_available">Доступные</string>
 
-  <!-- slide 32g: Preference Category: Defaults Title -->
-  <string name="EPr_defaults_header">Параметры по умолчанию для новых задач</string>
-  <string name="EPr_defaults_summary">Приоритет, срок выполнения, добавить в календарь</string>
-  
-  <!-- slide 41f:  Preference: Default Urgency Title -->
-  <string name="EPr_default_urgency_title">Актуальность по умолчанию</string>
-  <!-- Preference: Default Urgency Description (%s => setting) -->
-  <string name="EPr_default_urgency_desc">Текущая: %s</string>
-  
-  <!-- slide 40a: Preference: Default Importance Title -->
-  <string name="EPr_default_importance_title">Приоритет по умолчанию</string>
-  <!-- Preference: Default Importance Description (%s => setting) -->
-  <string name="EPr_default_importance_desc">Текущая: %s</string>
-  
-  <!-- slide 42e: Preference: Default Hide Until Title -->
-  <string name="EPr_default_hideUntil_title">Срок скрытия по умолчанию</string>
-  <!-- Preference: Default Hide Until Description (%s => setting) -->
-  <string name="EPr_default_hideUntil_desc">Текущая: %s</string>
-  
-  <!-- slide 43e: Preference: Default Reminders Title -->
-  <string name="EPr_default_reminders_title">Напоминания по умолчанию</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_desc">Текущая: %s</string>
-  
-  <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
-  <string name="EPr_default_addtocalendar_title">Добавлять в календарь по умолчанию</string>
-  <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
-  <string name="EPr_default_addtocalendar_desc_disabled">Новые задачи не будут создавать события в Календаре Google</string>
-  <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
-  <string name="EPr_default_addtocalendar_desc">Новые задачи будут в календаре: \"%s\"</string>
-  
-  <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
-  <string name="EPr_default_reminders_mode_title">Тип звонка/вибрации по умолчанию</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_mode_desc">Текущая: %s</string>
-  
-  <string-array name="EPr_default_importance">
-    <!-- importance: labels for "Task Defaults" preference item. -->
-    <!-- slide 40b -->
-    <item>!!! (Наивысшая)</item>
-    <item>!!</item>
-    <item>!</item>
-    <!-- slide 40c -->
-    <item>o (Низшая)</item>
-  </string-array>
-  
-  <string-array name="EPr_default_urgency">
-    <!-- urgency: labels for "Task Defaults" preference item. -->
-    <!-- slide 41a-->
-    <item>Без срока выполнения</item>
-    <!-- slide 41b -->
-    <item>Сегодня</item>
-    <!-- slide 41c-->
-    <item>Завтра</item>
-    <!-- slide 41d -->
-    <item>Через день</item>
-    <!-- slide 41e -->
-    <item>Через неделю</item>
-  </string-array>
-  
-  <string-array name="EPr_default_hideUntil">
-    <!-- hideUntil: labels for "Task Defaults" preference item. -->
-    <!-- slide 42a -->
-    <item>Не скрывать</item>
-    <!-- slide 42b -->
-    <item>Времени начала выполнения</item>
-    <!-- slide 42c -->
-    <item>За день до намеченного срока</item>
-    <!-- slide 42d-->
-    <item>За неделю до намеченного срока</item>
-  </string-array>
-  
-  <string-array name="EPr_default_reminders">
-    <!-- reminders: labels for "Task Defaults" preference item. -->
-    <!-- slide 43a -->
-    <item>Нет напоминаний</item>
-    <!-- slide 43b -->
-    <item>В срок</item>
-    <!-- slide 43c -->
-    <item>Когда просрочена</item>
-    <!-- slide 43d -->
-    <item>Вовремя или просрочена</item>
-  </string-array>
-  
-  <string-array name="EPr_default_addtocalendar">
-    <!-- addtocalendar: labels for "Task Defaults" preference item. -->
-    <item>@string/EPr_deactivated</item>
-  </string-array>      
+    <!-- Add-on Activity - free add-ons label -->
+    <string name="AOA_free">Свободен</string>
 
+    <!-- Add-on Activity - menu item to visit add-on website -->
+
+    <!-- Add-on Activity - menu item to visit android market -->
+
+    <!-- Add-on Activity - when list is empty -->
+    <string name="AOA_no_addons">Пустой список!</string>
+
+    <string name="AOA_ppack_title">Astrid Power Pack</string>
+    <string name="AOA_ppack_description">"Поддержите Astrid и станьте еще продуктивнее с Astrid
+        Power Pack, 4x2 и 4x4 виджетами и голосовым вводом. Повысь производительность уже сегодня!"
+    </string>
+    <string name="AOA_locale_title">Языковой плагин Astrid</string>
+    <string name="AOA_locale_description">Разрешает Astrid использовать приложение Locale, чтобы
+        посылать вам фильтрованные извещения. Нужно приложение Locale.
+    </string>
+
+    <!-- ====================================================== TasksWidget == -->
+
+    <!-- Widget text when loading tasks -->
+    <string name="TWi_loading">Загрузка...</string>
+
+    <!-- Widget configuration activity title: select a filter -->
+    <string name="WCA_title">Выберите задачи для просмотра…</string>
+
+    <!-- ======================================================== Waiting on me -->
+
+    <string name="wom_commented">%s commented on your task.</string>
+    <string name="wom_mentioned">%s mentioned you.</string>
+    <string name="wom_assigned">%s assigned this to you.</string>
+    <string name="wom_raised_pri">%s raised the priority.</string>
+    <string name="wom_changed_due">%s changed the due date.</string>
+    <string name="wom_default">%s wants your attention.</string>
+
+    <string name="wom_dismiss">Dismiss</string>
+    <string name="wom_acknowledge">I\'ve read this</string>
+
+    <!-- ============================================================= About == -->
+
+    <!-- slide 30h: Title of "About" option in settings -->
+    <string name="p_about">О Astrid</string>
+
+    <!-- About text (%s => current version)-->
+    <string name="p_about_text">Текущая версия: %s\n\n Astrid имеет открытый исходный код и с
+        гордостью поддерживается Todoroo, Inc.
+    </string>
+
+    <!-- Title of "Help" option in settings -->
+    <string name="p_help">Поддержка</string>
+
+    <!-- slide 30c: Title of "Forums" option in settings -->
+    <string name="p_forums">Форумы</string>
+
+    <!-- Title of "Premium" option in settings -->
+    <string name="p_premium">Премиум</string>
+
+    <!-- ============================================================= Misc == -->
+
+    <string name="feedback_positive_title">Rate Astrid?</string>
+
+    <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star
+        rating?
+    </string>
+
+    <string name="feedback_negative_title">Leave feedback?</string>
+
+    <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
+
+    <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback
+        section--it might not be available on your device.
+    </string>
+
+    <string name="feedback_positive_button">Rate Astrid</string>
+
+    <string name="feedback_negative_button">Leave feedback</string>
+
+    <string name="feedback_not_now">Not now</string>
+
+    <string name="feedback_banner_text">How\'s Astrid working for you?</string>
+
+    <!-- Displayed when task killer found. %s => name of the application -->
+    <string name="task_killer_help">Возможно вы используете менеджер задач (%s). По возможности
+        добавьте Astrid в список исключений иначе возможны сложности с напоминаниями.\n
+    </string>
+
+    <!-- Task killer dialog ok button -->
+    <string name="task_killer_help_ok">Я не хочу убивать Astrid!</string>
+
+    <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
+
+    <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
+    <string name="marketplace_description">Astrid - распространённый список задач с открытым
+        исходным кодом призванный помочь Вам справиться с делами. В нём есть напоминания, метки,
+        синхронизация, плагин Locale, виджет и многое другое.
+    </string>
+
+    <string name="DB_corrupted_title">Поврежденная база данных</string>
+
+    <string name="DB_corrupted_body">Упс! Похоже, ваша база данных повреждена.
+        Если вы получаете эту ошибку регулярно, рекомендуется стереть
+        все данные (Параметры-&gt;Синхронизация-&gt;Управление старыми задачами-&gt;Очистить все
+        данные) и восстановить
+        задачи из резервной копии (Параметры-&gt;Синхронизация-&gt;Резервные копии-&gt;Импортировать
+        задачи)
+    </string>
+
+    <string name="market_unavailable">К сожалению, этот магазин недоступен для вашей системы.
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 32g: Preference Category: Defaults Title -->
+    <string name="EPr_defaults_header">Параметры по умолчанию для новых задач</string>
+    <string name="EPr_defaults_summary">Приоритет, срок выполнения, добавить в календарь</string>
+
+    <!-- slide 41f:  Preference: Default Urgency Title -->
+    <string name="EPr_default_urgency_title">Актуальность по умолчанию</string>
+    <!-- Preference: Default Urgency Description (%s => setting) -->
+    <string name="EPr_default_urgency_desc">Текущая: %s</string>
+
+    <!-- slide 40a: Preference: Default Importance Title -->
+    <string name="EPr_default_importance_title">Приоритет по умолчанию</string>
+    <!-- Preference: Default Importance Description (%s => setting) -->
+    <string name="EPr_default_importance_desc">Текущая: %s</string>
+
+    <!-- slide 42e: Preference: Default Hide Until Title -->
+    <string name="EPr_default_hideUntil_title">Срок скрытия по умолчанию</string>
+    <!-- Preference: Default Hide Until Description (%s => setting) -->
+    <string name="EPr_default_hideUntil_desc">Текущая: %s</string>
+
+    <!-- slide 43e: Preference: Default Reminders Title -->
+    <string name="EPr_default_reminders_title">Напоминания по умолчанию</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_desc">Текущая: %s</string>
+
+    <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
+    <string name="EPr_default_addtocalendar_title">Добавлять в календарь по умолчанию</string>
+    <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
+    <string name="EPr_default_addtocalendar_desc_disabled">Новые задачи не будут создавать события в
+        Календаре Google
+    </string>
+    <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
+    <string name="EPr_default_addtocalendar_desc">Новые задачи будут в календаре: \"%s\"</string>
+
+    <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
+    <string name="EPr_default_reminders_mode_title">Тип звонка/вибрации по умолчанию</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_mode_desc">Текущая: %s</string>
+
+    <string-array name="EPr_default_importance">
+        <!-- importance: labels for "Task Defaults" preference item. -->
+        <!-- slide 40b -->
+        <item>!!! (Наивысшая)</item>
+        <item>!!</item>
+        <item>!</item>
+        <!-- slide 40c -->
+        <item>o (Низшая)</item>
+    </string-array>
+
+    <string-array name="EPr_default_urgency">
+        <!-- urgency: labels for "Task Defaults" preference item. -->
+        <!-- slide 41a-->
+        <item>Без срока выполнения</item>
+        <!-- slide 41b -->
+        <item>Сегодня</item>
+        <!-- slide 41c-->
+        <item>Завтра</item>
+        <!-- slide 41d -->
+        <item>Через день</item>
+        <!-- slide 41e -->
+        <item>Через неделю</item>
+    </string-array>
+
+    <string-array name="EPr_default_hideUntil">
+        <!-- hideUntil: labels for "Task Defaults" preference item. -->
+        <!-- slide 42a -->
+        <item>Не скрывать</item>
+        <!-- slide 42b -->
+        <item>Времени начала выполнения</item>
+        <!-- slide 42c -->
+        <item>За день до намеченного срока</item>
+        <!-- slide 42d-->
+        <item>За неделю до намеченного срока</item>
+    </string-array>
+
+    <string-array name="EPr_default_reminders">
+        <!-- reminders: labels for "Task Defaults" preference item. -->
+        <!-- slide 43a -->
+        <item>Нет напоминаний</item>
+        <!-- slide 43b -->
+        <item>В срок</item>
+        <!-- slide 43c -->
+        <item>Когда просрочена</item>
+        <!-- slide 43d -->
+        <item>Вовремя или просрочена</item>
+    </string-array>
+
+    <string-array name="EPr_default_addtocalendar">
+        <!-- addtocalendar: labels for "Task Defaults" preference item. -->
+        <item>@string/EPr_deactivated</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in filter plug-in -->
-    
+
     <!-- ================================================= Filter Exposer == -->
-    
+
     <!-- Active Tasks Filter -->
     <string name="BFE_Active">Мои задания</string>
-    
+
     <!-- Waiting on me filter -->
     <string name="BFE_waiting_on_me">Waiting On Me</string>
-        
+
     <!-- Search Filter -->
-    
+
     <!-- slide 10b: Recently Modified -->
     <string name="BFE_Recent">Недавно изменённые</string>
-    
+
     <!-- slide 10c: I\'ve assigned -->
     <string name="BFE_Assigned">Назначенные мной</string>
-    
+
     <!-- Build Your Own Filter -->
-    
+
     <!-- Saved Filters Header -->
-    
+
     <!-- Saved Filters Context Menu: delete -->
     <string name="BFE_Saved_delete">Удалить фильтр</string>
 
     <!-- =========================================== CustomFilterActivity == -->
-    
+
     <!-- slide 30d: Build Your Own Filter Activity Title-->
     <string name="CFA_title">Собственный фильтр</string>
-    
+
     <!-- slide 30e: Filter Name edit box hint (if user types here, filter will be saved) -->
     <string name="CFA_filterName_hint">Задайте имя фильтра для его сохранения…</string>
-    
+
     <!-- Filter Name default for copied filters (%s => old filter name) -->
-    
+
     <!-- slide 30a: Filter Starting Universe: all tasks -->
     <string name="CFA_universe_all">Активные задачи</string>
-    
+
     <!-- Filter Criteria Type: add (at the begging of title of the criteria) -->
     <string name="CFA_type_add">или</string>
-    
+
     <!-- Filter Criteria Type: subtract (at the begging of title of the criteria) -->
     <string name="CFA_type_subtract">не</string>
-    
+
     <!-- Filter Criteria Type: intersect (at the begging of title of the criteria) -->
     <string name="CFA_type_intersect">и</string>
-    
+
     <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
     <string name="CFA_context_chain">%s содержит критерий</string>
-    
+
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">Удалить строку</string>
-    
+
     <!-- slide 30b: Filter Screen Help Text -->
     <string name="CFA_help">Long press on items for additional options</string>
-    
+
     <!-- slide 30c: Filter Button: add new -->
     <string name="CFA_button_add">Добавить критерий</string>
-    
+
     <!-- slide 30f: Filter Button: view without saving -->
     <string name="CFA_button_view">Просмотр</string>
-    
+
     <!-- Filter Button: save & view filter -->
     <string name="CFA_button_save">Сохранить и просмотреть</string>
 
     <!-- =========================================== CustomFilterCriteria == -->
-        
+
     <!-- Criteria: due by X - display text (? -> user input) -->
     <string name="CFC_dueBefore_text">Конечный срок: ?</string>
     <!-- Criteria: due by X - name of criteria -->
@@ -1704,322 +1849,351 @@
         <item>Через неделю</item>
         <item>Через месяц</item>
     </string-array>
-    
+
     <!-- Criteria: importance - display text (? -> user input)-->
     <string name="CFC_importance_text">Приоритет?</string>
     <!-- Criteria: importance - name of criteria -->
-    <string name="CFC_importance_name">Приоритет...</string>        
-    
+    <string name="CFC_importance_name">Приоритет...</string>
+
     <!-- Criteria: tag - display text (? -> user input) -->
     <string name="CFC_tag_text">Список: ?</string>
     <!-- Criteria: tag - name of criteria -->
     <string name="CFC_tag_name">Назовите...</string>
-    
+
     <!-- Criteria: tag_contains - name of criteria -->
     <string name="CFC_tag_contains_name">Название содержит...</string>
     <!-- Criteria: tag_contains - text (? -> user input) -->
     <string name="CFC_tag_contains_text">Название содержит: ?</string>
-    
+
     <!-- Criteria: title_contains - name of criteria -->
     <string name="CFC_title_contains_name">Название содержит...</string>
     <!-- Criteria: title_contains - text (? -> user input) -->
     <string name="CFC_title_contains_text">Название содержит: ?</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-  
-  <!-- Error message for adding to calendar  -->
-  <string name="gcal_TEA_error">Ошибка при добавлении задачи в календарь!</string>
-
-  <!-- Label for adding task to calendar -->
-
-  <!-- slide 21c: Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">Добавить в календарь</string>
-  
-  <!-- Label when calendar event already exists -->
-  <string name="gcal_TEA_showCalendar_label">Открыть календарное событие</string>
-  
-  <!-- Toast when unable to open calendar event -->
-  
-  <!-- Toast when calendar event updated because task changed -->
-  <string name="gcal_TEA_calendar_updated">Календарное событие также обновлено!</string>
-  
-  <!-- No calendar label (don\'t add option) -->
-  <string name="gcal_TEA_nocal">Не добавлять</string>
-  
-  <string name="gcal_TEA_none_selected">В календарь ?</string>
-  
-  <string name="gcal_TEA_has_event">Календарное событие</string>
-  
-  <!-- ======================================================== Calendars == -->
-  
-  <!-- Calendar event name when task is completed (%s => task title) -->
-  <string name="gcal_completed_title">%s (выполнено)</string>
-
-  <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
-  <string name="gcal_GCP_default">Календарь по умолчанию</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Error message for adding to calendar  -->
+    <string name="gcal_TEA_error">Ошибка при добавлении задачи в календарь!</string>
 
+    <!-- Label for adding task to calendar -->
 
+    <!-- slide 21c: Label for adding task to calendar -->
+    <string name="gcal_TEA_addToCalendar_label">Добавить в календарь</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Label when calendar event already exists -->
+    <string name="gcal_TEA_showCalendar_label">Открыть календарное событие</string>
+
+    <!-- Toast when unable to open calendar event -->
+
+    <!-- Toast when calendar event updated because task changed -->
+    <string name="gcal_TEA_calendar_updated">Календарное событие также обновлено!</string>
+
+    <!-- No calendar label (don\'t add option) -->
+    <string name="gcal_TEA_nocal">Не добавлять</string>
+
+    <string name="gcal_TEA_none_selected">В календарь ?</string>
+
+    <string name="gcal_TEA_has_event">Календарное событие</string>
+
+    <!-- ======================================================== Calendars == -->
+
+    <!-- Calendar event name when task is completed (%s => task title) -->
+    <string name="gcal_completed_title">%s (выполнено)</string>
+
+    <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
+    <string name="gcal_GCP_default">Календарь по умолчанию</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ============================================================= UI == -->
 
     <!-- filters header: GTasks -->
     <string name="gtasks_FEx_header">Задачи Google</string>
-    
+
     <!-- filter category for GTasks lists -->
-    
+
     <!-- filter title for GTasks lists (%s => list name) -->
     <string name="gtasks_FEx_title">Задачи Google: %s</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_creating_list">Создание списка...</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_create_list_dialog">Имя нового списка:</string>
-    
+
     <!-- error to show when list creation fails -->
     <string name="gtasks_FEx_create_list_error">Ошибка при создании нового списка</string>
-    
+
     <!-- short help title for Gtasks -->
-    
+
     <string name="CFC_gtasks_list_text">В Списке: ?</string>
 
     <string name="CFC_gtasks_list_name">В GTask Список...</string>
-    
+
     <!-- Message while clearing completed tasks -->
     <string name="gtasks_GTA_clearing">Очистка выполненных задач...</string>
-    
+
     <!-- Label for clear completed menu item -->
     <string name="gtasks_GTA_clear_completed">Очистить завершенные</string>
-        
+
     <!-- ============================================ GtasksLoginActivity == -->
-    
-    <!-- Activity Title: Gtasks Login -->    
 
-    <!-- Instructions: Gtasks login -->    
-    <string name="gtasks_GLA_body">Пожалуйста, войдите в Google Tasks Sync (Beta!). Не переехавшие аккаунты Google Apps в данный момент не поддерживаются.</string>
-    
+    <!-- Activity Title: Gtasks Login -->
+
+    <!-- Instructions: Gtasks login -->
+    <string name="gtasks_GLA_body">Пожалуйста, войдите в Google Tasks Sync (Beta!). Не переехавшие
+        аккаунты Google Apps в данный момент не поддерживаются.
+    </string>
+
     <string name="gtasks_GLA_noaccounts">Нет доступных аккаунтов Google для синхронизации</string>
 
-    <!-- Instructions: Gtasks further help -->    
-    <string name="gtasks_GLA_further_help">Чтобы увидеть задачи с уровнями и порядком, перейдите в Фильтры и выберите список Задачи Google. По умолчанию, Astrid пользуется своими настройками сортировки.</string>
+    <!-- Instructions: Gtasks further help -->
+    <string name="gtasks_GLA_further_help">Чтобы увидеть задачи с уровнями и порядком, перейдите в
+        Фильтры и выберите список Задачи Google. По умолчанию, Astrid пользуется своими настройками
+        сортировки.
+    </string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
 
-    <!-- E-mail Address Label -->    
+    <!-- E-mail Address Label -->
+
+    <!-- Password Label -->
 
-    <!-- Password Label -->    
-    
     <!--  Authenticating toast -->
     <string name="gtasks_GLA_authenticating">Авторизация...</string>
-    
+
     <!-- Google Apps for Domain checkbox -->
 
-    <!-- Error Message when fields aren\'t filled out -->    
+    <!-- Error Message when fields aren\'t filled out -->
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
+    <string name="gtasks_GLA_errorAuth">Ошибка аутентификации! Пожалуйста, проверьте имя
+        пользователя и пароль в меню управления аккаунтами телефона
+    </string>
+
+    <!-- Error Message when we receive an IO Exception -->
+    <string name="gtasks_GLA_errorIOAuth">Извините, проблемы при обращении к серверам Google.
+        Пожалуйста, попробуйте позже.
+    </string>
 
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
-    <string name="gtasks_GLA_errorAuth">Ошибка аутентификации! Пожалуйста, проверьте имя пользователя и пароль в меню управления аккаунтами телефона</string>
+    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->
+    <string name="gtasks_GLA_errorAuth_captcha">Возможно вы столкнулись с каптчей. Попробуйте войти
+        через браузер, затем вернуться и попробовать снова:
+    </string>
 
-    <!-- Error Message when we receive an IO Exception -->    
-    <string name="gtasks_GLA_errorIOAuth">Извините, проблемы при обращении к серверам Google. Пожалуйста, попробуйте позже.</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->    
-    <string name="gtasks_GLA_errorAuth_captcha">Возможно вы столкнулись с каптчей. Попробуйте войти через браузер, затем вернуться и попробовать снова:</string>
-    
     <!-- ============================================== GtasksPreferences == -->
 
-    <!-- GTasks Preferences Title -->    
+    <!-- GTasks Preferences Title -->
     <string name="gtasks_GPr_header">Google Tasks</string>
-    
-    <!-- ================================================ Synchronization == -->    
-    
+
+    <!-- ================================================ Synchronization == -->
+
     <!-- title for notification tray when synchronizing -->
 
     <!-- Error Message when we receive a HTTP 503 error -->
-    <string name="gtasks_error_backend">Google\'s Task API в стадии бета и произошла ошибка. Служба может быть не доступна, пожалуйста, попробуйте позже.</string>
-    
+    <string name="gtasks_error_backend">Google\'s Task API в стадии бета и произошла ошибка. Служба
+        может быть не доступна, пожалуйста, попробуйте позже.
+    </string>
+
     <!-- Error for account not found -->
-    <string name="gtasks_error_accountNotFound">Аккаунт %s не найден--пожалуйста, выйдите и войдите снова через настройки Google Tasks.</string>
-    
+    <string name="gtasks_error_accountNotFound">Аккаунт %s не найден--пожалуйста, выйдите и войдите
+        снова через настройки Google Tasks.
+    </string>
+
     <!-- Error when ping after refreshing token fails -->
-    <string name="gtasks_error_authRefresh">Не удалось пройти аутентификацию в Google Tasks. Пожалуйста, проверьте пароль к учетной записи или попробуйте еще раз позже.</string>
-    
+    <string name="gtasks_error_authRefresh">Не удалось пройти аутентификацию в Google Tasks.
+        Пожалуйста, проверьте пароль к учетной записи или попробуйте еще раз позже.
+    </string>
+
     <!-- Error when account manager returns no auth token or throws exception -->
-    <string name="gtasks_error_accountManager">Ошибка в менеджере аккаунтов вашего телефона, Пожалуйста выйдите и войдите снова в настройках Google Tasks</string>
+    <string name="gtasks_error_accountManager">Ошибка в менеджере аккаунтов вашего телефона,
+        Пожалуйста выйдите и войдите снова в настройках Google Tasks
+    </string>
 
     <!-- Error when authorization error happens in background sync -->
-    <string name="gtasks_error_background_sync_auth">Ошибка фоновой аутентификации. Пожалуйста, попробуйте синхронизироваться, когда Astrid запущен.</string>
-      
+    <string name="gtasks_error_background_sync_auth">Ошибка фоновой аутентификации. Пожалуйста,
+        попробуйте синхронизироваться, когда Astrid запущен.
+    </string>
+
     <string name="gtasks_import_progress">Импорт из Google Tasks</string>
 
-    <string name="gtasks_import_add_to_shared_list">Список %1$s сделан общедоступным! Вы всё ещё хотите добавлять задачи в %2$s?</string>
+    <string name="gtasks_import_add_to_shared_list">Список %1$s сделан общедоступным! Вы всё ещё
+        хотите добавлять задачи в %2$s?
+    </string>
 
     <string name="gtasks_import_dlg_title">Импорт Google задач</string>
 
     <string name="gtasks_import_add_task_ok">Добавить задание</string>
 
     <string name="gtasks_import_add_task_cancel">Не добавляйте задачи</string>
-        
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- NEW USER EXPERIENCE -->
-  
-  <!-- help bubbles -->
-  <!-- slide 8c: Shown the first time a user sees the task list activity -->
-  <string name="help_popover_add_task">Начните с добавления одного или нескольких заданий</string>
-
-  <!-- Shown the first time a user adds a task to a list -->  
-  <string name="help_popover_tap_task">Нажмите на задачу, чтобы изменить или поделиться</string>
-  
-  <!-- slide 14a: Shown the first time a user sees the list activity -->
-  <string name="help_popover_list_settings">Нажмите, чтобы изменить или поделиться списком</string>
-  
-  <!-- slide 26c: Shown the first time a user sees the list settings tab -->
-  <string name="help_popover_collaborators">Люди, с которыми вы делитесь, могут помочь вам в составлении списка и выполнении задач</string>
-  
-  <!-- Shown after user adds a task on tablet-->
-  <string name="help_popover_add_lists">Нажмите, чтобы добавить список</string>
-  
-  <!-- Shown after a user adds a task on phones -->
-  <string name="help_popover_switch_lists">Нажмите, чтобы добавить список или переключиться между списками</string>
-  
-  
-  
-  <!-- Login activity -->
-  
-  
-  <!-- slide 7b -->
-  <string name="welcome_login_tos_base">Используя Astrid, вы согласны с</string>
-  
-  <string name="welcome_login_tos_link">Условия предоставления услуг</string>
-  
-  <!-- slide 7e -->
-  <string name="welcome_login_pw">Зарегистрироваться</string>
-  
-  <string name="welcome_sign_in">Войти</string>
-
-  <!-- slide 7f -->
-  <string name="welcome_login_later">Позже</string>
-  
-  <string name="welcome_login_confirm_later_title">Почему бы не войти?</string>
-  
-  <string name="welcome_login_confirm_later_ok">Я сделаю это!</string>
-  
-  <string name="welcome_login_confirm_later_cancel">Спасибо, не надо</string>
-  
-  <string name="welcome_login_confirm_later_dialog">Войдите, чтобы получить максимум от Astrid! Бесплатно вы получите онлайн резервирование, полную синхронизацию с Astrid.com, возможность добавлять задачи по почте и даже делиться своими списками задач с друзьями!</string>
+    <!-- NEW USER EXPERIENCE -->
 
+    <!-- help bubbles -->
+    <!-- slide 8c: Shown the first time a user sees the task list activity -->
+    <string name="help_popover_add_task">Начните с добавления одного или нескольких заданий</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown the first time a user adds a task to a list -->
+    <string name="help_popover_tap_task">Нажмите на задачу, чтобы изменить или поделиться</string>
 
+    <!-- slide 14a: Shown the first time a user sees the list activity -->
+    <string name="help_popover_list_settings">Нажмите, чтобы изменить или поделиться списком
+    </string>
 
-  <!-- Resources for built-in locale plug-in -->
-
-  <!-- Locale Alert Editing Window Title -->
-  <string name="locale_edit_alerts_title">Предупреждение фильтра Astrid</string>
-  
-  <!-- Locale Window Help -->                                                                                                                                            
-  <string name="locale_edit_intro">Astrid отправит вам напоминание при обнаружении задач по следующим фильтрам:</string>
-      
-  <!-- Locale Window Filter Picker UI -->                                                                                                                                        
-      
-  <!-- Locale Window Interval Label -->                                                                                                                                        
-  <string name="locale_interval_label">Ограничить уведомления до:</string>        
-      
-  <!-- Locale Window Interval Values -->                                                                                                                                        
-  <string-array name="locale_interval">
-    <item>одного в час</item>
-    <item>одного за 6 часов</item>
-    <item>одного за 12 часов</item>
-    <item>одного в день</item>
-    <item>одного в 3 дня</item>
-    <item>одного за неделю</item>
-  </string-array>        
-      
-  <!-- Locale Notification text -->                                                                                                                                        
-  <string name="locale_notification">Число соответствий $FILTER: $NUM</string>     
-      
-  <!-- Locale Plugin was not found, it is required -->
-  <string name="locale_plugin_required">Пожалуйста, установите плагин Astrid Locale!</string>        
-     
+    <!-- slide 26c: Shown the first time a user sees the list settings tab -->
+    <string name="help_popover_collaborators">Люди, с которыми вы делитесь, могут помочь вам в
+        составлении списка и выполнении задач
+    </string>
 
+    <!-- Shown after user adds a task on tablet-->
+    <string name="help_popover_add_lists">Нажмите, чтобы добавить список</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown after a user adds a task on phones -->
+    <string name="help_popover_switch_lists">Нажмите, чтобы добавить список или переключиться между
+        списками
+    </string>
+
+
+    <!-- Login activity -->
+
+
+    <!-- slide 7b -->
+    <string name="welcome_login_tos_base">Используя Astrid, вы согласны с</string>
+
+    <string name="welcome_login_tos_link">Условия предоставления услуг</string>
+
+    <!-- slide 7e -->
+    <string name="welcome_login_pw">Зарегистрироваться</string>
+
+    <string name="welcome_sign_in">Войти</string>
+
+    <!-- slide 7f -->
+    <string name="welcome_login_later">Позже</string>
+
+    <string name="welcome_login_confirm_later_title">Почему бы не войти?</string>
+
+    <string name="welcome_login_confirm_later_ok">Я сделаю это!</string>
+
+    <string name="welcome_login_confirm_later_cancel">Спасибо, не надо</string>
+
+    <string name="welcome_login_confirm_later_dialog">Войдите, чтобы получить максимум от Astrid!
+        Бесплатно вы получите онлайн резервирование, полную синхронизацию с Astrid.com, возможность
+        добавлять задачи по почте и даже делиться своими списками задач с друзьями!
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in locale plug-in -->
+
+    <!-- Locale Alert Editing Window Title -->
+    <string name="locale_edit_alerts_title">Предупреждение фильтра Astrid</string>
+
+    <!-- Locale Window Help -->
+    <string name="locale_edit_intro">Astrid отправит вам напоминание при обнаружении задач по
+        следующим фильтрам:
+    </string>
+
+    <!-- Locale Window Filter Picker UI -->
+
+    <!-- Locale Window Interval Label -->
+    <string name="locale_interval_label">Ограничить уведомления до:</string>
+
+    <!-- Locale Window Interval Values -->
+    <string-array name="locale_interval">
+        <item>одного в час</item>
+        <item>одного за 6 часов</item>
+        <item>одного за 12 часов</item>
+        <item>одного в день</item>
+        <item>одного в 3 дня</item>
+        <item>одного за неделю</item>
+    </string-array>
+
+    <!-- Locale Notification text -->
+    <string name="locale_notification">Число соответствий $FILTER: $NUM</string>
+
+    <!-- Locale Plugin was not found, it is required -->
+    <string name="locale_plugin_required">Пожалуйста, установите плагин Astrid Locale!</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ====================== Plugin Boilerplate ========================= -->
 
-	<!-- filters header: OpenCRX -->
+    <!-- filters header: OpenCRX -->
     <string name="opencrx_FEx_header">OpenCRX</string>
-    
+
     <!-- filter category for OpenCRX ActivityCreators -->
     <string name="opencrx_FEx_dashboard">Рабочие области</string>
-    
+
     <!-- filter category for OpenCRX responsible person -->
     <string name="opencrx_FEx_responsible">Ответственный</string>
-    
+
     <!--  OpenCRX assignedTo filter title (%s => assigned contact) -->
     <string name="opencrx_FEx_responsible_title">Ответственный \'%s\'</string>
-    
+
     <!-- detail for showing tasks created by someone else (%s => person name) -->
     <string name="opencrx_PDE_task_from">от %s</string>
-    
+
     <!-- replacement string for task edit "Notes" when using OpenCRX -->
     <string name="opencrx_TEA_notes">Добавить комментарий</string>
-    
+
     <string name="opencrx_creator_input_hint">Автор</string>
 
     <string name="opencrx_contact_input_hint">Назначено на</string>
     <!-- ==================================================== Preferences == -->
 
-    <!-- Preferences Title: OpenCRX -->    
+    <!-- Preferences Title: OpenCRX -->
     <string name="opencrx_PPr_header">OpenCRX</string>
 
     <!-- creator title for tasks that are not synchronized -->
     <string name="opencrx_no_creator">(Не синхронизировано)</string>
 
-	<!-- preference title for default creator -->
+    <!-- preference title for default creator -->
     <string name="opencrx_PPr_defaultcreator_title">Напоминатель по умолчанию</string>
 
     <!-- preference description for default creator (%s -> setting) -->
     <string name="opencrx_PPr_defaultcreator_summary">Новые активности будут создаты к: %s</string>
 
     <!-- preference description for default dashboard (when set to \'not synchronized\') -->
-    <string name="opencrx_PPr_defaultcreator_summary_none">Новые события не будут синхронизироваться по-умолчанию</string>
-    
+    <string name="opencrx_PPr_defaultcreator_summary_none">Новые события не будут синхронизироваться
+        по-умолчанию
+    </string>
+
     <!--  OpenCRX host and segment group name -->
     <string name="opencrx_group">сервер OpenCRX</string>
 
@@ -2028,81 +2202,87 @@
 
     <!--  dialog title for OpenCRX host -->
     <string name="opencrx_host_dialog_title">хост OpenCRX</string>
-    
+
     <!--  example for OpenCRX host -->
-    <string name="opencrx_host_summary">"Например: "<i>mydomain.com</i></string>
-    
+    <string name="opencrx_host_summary">"Например: "
+        <i>mydomain.com</i>
+    </string>
+
     <!--  preference description for OpenCRX segment -->
     <string name="opencrx_segment_title">Сегмент</string>
 
     <!--  dialog title for OpenCRX segment -->
     <string name="opencrx_segment_dialog_title">Синхронизированный сегмент</string>
-    
+
     <!--  example for OpenCRX segment -->
-    <string name="opencrx_segment_summary">"Для примера: "<i>Standard</i></string>
-    
+    <string name="opencrx_segment_summary">"Для примера: "
+        <i>Standard</i>
+    </string>
+
     <!--  default value for OpenCRX segment -->
     <string name="opencrx_segment_default">Стандарт</string>
-    
+
     <!--  preference description for OpenCRX provider -->
     <string name="opencrx_provider_title">Поставщик</string>
 
     <!--  dialog title for OpenCRX provider -->
     <string name="opencrx_provider_dialog_title">Поставщик данных для openCRX</string>
-    
+
     <!--  example for OpenCRX provider -->
-    <string name="opencrx_provider_summary">"Для примера: "<i>CRX</i></string>
-    
+    <string name="opencrx_provider_summary">"Для примера: "
+        <i>CRX</i>
+    </string>
+
     <!--  default value for OpenCRX provider -->
     <string name="opencrx_provider_default">CRX</string>
     <!-- ================================================= Login Activity == -->
 
-    <!-- Activity Title: Opencrx Login -->    
+    <!-- Activity Title: Opencrx Login -->
     <string name="opencrx_PLA_title">Войдите в openCRX</string>
 
-    <!-- Instructions: Opencrx login -->    
+    <!-- Instructions: Opencrx login -->
     <string name="opencrx_PLA_body">Войдите, используя ваш openCRX аккаунт</string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
     <string name="opencrx_PLA_signIn">Войти</string>
 
-    <!-- Login Label -->    
+    <!-- Login Label -->
     <string name="opencrx_PLA_login">Вход</string>
 
-    <!-- Password Label -->    
+    <!-- Password Label -->
     <string name="opencrx_PLA_password">Пароль</string>
-    
-        <!-- Error Message when fields aren\'t filled out -->    
+
+    <!-- Error Message when fields aren\'t filled out -->
     <string name="opencrx_PLA_errorEmpty">Ошибка: заполните все поля</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
     <string name="opencrx_PLA_errorAuth">Ошибка: неверные имя пользователя или пароль!</string>
 
     <!-- ================================================ Synchronization == -->
-        
+
     <!-- title for notification tray after synchronizing -->
     <string name="opencrx_notification_title">OpenCRX</string>
-    
+
     <!-- text for notification tray when synchronizing -->
     <string name="opencrx_notification_text">%s задач обновлено / кликните для подробностей</string>
-    
+
     <!-- Error msg when io exception  -->
     <string name="opencrx_ioerror">Ошибка соединения! Проверьте подключение к интернету.</string>
 
     <!-- opencrx Login not specified-->
     <string name="opencrx_MLA_email_empty">Имя пользователя не указано!</string>
-    
+
     <!-- opencrx password not specified-->
     <string name="opencrx_MLA_password_empty">Не указан пароль!</string>
-    
+
     <!-- ================================================ labels for layout-elements == -->
-    
+
     <!-- label for task-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_task_assign_label">Назначить эту задачу этому человеку:</string>
-    
+
     <!-- Spinner-item for unassigned tasks on taskeditactivity -->
     <string name="opencrx_TEA_task_unassigned">&lt;Без назначения&gt;</string>
-    
+
     <!-- label for dashboard-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_creator_assign_label">Назначить задачу этому автору:</string>
 
@@ -2110,7 +2290,7 @@
     <string name="opencrx_TEA_dashboard_default">&lt;По умолчанию&gt;</string>
 
     <string name="opencrx_TEA_opencrx_title">Управление openCRX</string>
-        
+
     <string name="CFC_opencrx_in_workspace_text">в среде: ?</string>
 
     <string name="CFC_opencrx_in_workspace_name">в среде...</string>
@@ -2120,115 +2300,148 @@
     <string name="CFC_opencrx_assigned_to_name">Присвоено ...</string>
 
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
+    <!-- ================================================== EditPreferences == -->
 
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 32j: Preference Category: Power Pack -->
-  <string name="EPr_powerpack_header">Премиум и другие настройки</string>
-  <string name="EPr_powerpack_summary">Напоминания о пропущенных звонках, голосовой ввод и другие настройки</string>
-  
-  <!-- slide 32e: Preference: Anonymous User Statistics -->
-  <string name="EPr_statistics_title">Анонимная статистика</string>
-  <!-- Preference: User Statistics (disabled) -->
-  <string name="EPr_statistics_desc_disabled">Данные об использовании не передаются</string>  
-  <!-- slide 32f: Preference: User Statistics (enabled) -->
-  <string name="EPr_statistics_desc_enabled">Помогите нам сделать Astrid лучше, отправляя анонимную статистику использования</string>
-      
+    <!-- slide 32j: Preference Category: Power Pack -->
+    <string name="EPr_powerpack_header">Премиум и другие настройки</string>
+    <string name="EPr_powerpack_summary">Напоминания о пропущенных звонках, голосовой ввод и другие
+        настройки
+    </string>
 
+    <!-- slide 32e: Preference: Anonymous User Statistics -->
+    <string name="EPr_statistics_title">Анонимная статистика</string>
+    <!-- Preference: User Statistics (disabled) -->
+    <string name="EPr_statistics_desc_disabled">Данные об использовании не передаются</string>
+    <!-- slide 32f: Preference: User Statistics (enabled) -->
+    <string name="EPr_statistics_desc_enabled">Помогите нам сделать Astrid лучше, отправляя
+        анонимную статистику использования
+    </string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
-    <string name="speech_err_network">Ошибка подключения! Для голосового распознавания требуется интернет соединение.</string>
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <string name="speech_err_network">Ошибка подключения! Для голосового распознавания требуется
+        интернет соединение.
+    </string>
     <string name="speech_err_no_match">Извините, я не расслышал! Повторите, пожалуйста.</string>
-    <string name="speech_err_default">Извините, ошибка службы голосового распознавания. Попробуйте, еще раз.</string>
-    
+    <string name="speech_err_default">Извините, ошибка службы голосового распознавания. Попробуйте,
+        еще раз.
+    </string>
+
     <string name="premium_attach_file">Прикрепить файл</string>
     <string name="premium_record_audio">Записать заметку</string>
     <string name="premium_no_files">Нет прикреплённых файлов.</string>
     <string name="premium_remove_file_confirm">Вы уверены? Это не может быть отменено.</string>
-    
+
     <string name="audio_recording_title">Запись голоса.</string>
     <string name="audio_stop_recording">Остановить запись</string>
     <string name="audio_speak_now">Говорите!</string>
     <string name="audio_encoding">Кодирование</string>
     <string name="audio_err_encoding">Ошибка кодировки голоса.</string>
-    <string name="audio_err_playback">Извините, система не поддерживает этот тип аудио файла.</string>
-    
-    <string name="search_market_audio">Не найден проигрыватель для этого типа аудио. Хотите скачать его с Google Plus?</string>
+    <string name="audio_err_playback">Извините, система не поддерживает этот тип аудио файла.
+    </string>
+
+    <string name="search_market_audio">Не найден проигрыватель для этого типа аудио. Хотите скачать
+        его с Google Plus?
+    </string>
     <string name="search_market_audio_title">Не найдено проигрывателя.</string>
 
-    <string name="search_market_pdf">Не найдена программа для просмотра PDF файлов. Хотите скачать её с Google Plus?</string>
+    <string name="search_market_pdf">Не найдена программа для просмотра PDF файлов. Хотите скачать
+        её с Google Plus?
+    </string>
     <string name="search_market_pdf_title">Не найдена программа для просмотра PDF файлов.</string>
 
-    <string name="search_market_ms">Не найдена программа для просмотра файлов MS Office. Хотите скачать её с Google Plus?</string>
-    <string name="search_market_ms_title">Не найдена программа для просмотра файлов MS Office.</string>
-    
-    <string name="file_type_unhandled">Извините! Не найдена программа для просмотра файлов этого типа.</string>
-    <string name="file_type_unhandled_title">Не найдена программа для просмотра файлов этого типа.</string>
-    
+    <string name="search_market_ms">Не найдена программа для просмотра файлов MS Office. Хотите
+        скачать её с Google Plus?
+    </string>
+    <string name="search_market_ms_title">Не найдена программа для просмотра файлов MS Office.
+    </string>
+
+    <string name="file_type_unhandled">Извините! Не найдена программа для просмотра файлов этого
+        типа.
+    </string>
+    <string name="file_type_unhandled_title">Не найдена программа для просмотра файлов этого типа.
+    </string>
+
     <string name="file_prefix_image">Изображение</string>
     <string name="file_prefix_voice">Голос</string>
     <string name="file_browser_up">Вверх</string>
     <string name="file_browser_title">Выбрать файл</string>
     <string name="dir_browser_title">Выберите целевой каталог</string>
-    <string name="file_browser_err_permissions">Ошибка доступа! Пожалуйста убедитесь, что вы не заблокировали Astrid для доступа к SD карте.</string>
+    <string name="file_browser_err_permissions">Ошибка доступа! Пожалуйста убедитесь, что вы не
+        заблокировали Astrid для доступа к SD карте.
+    </string>
     <string name="file_add_picture">Прикрепите изображение</string>
     <string name="file_add_sdcard">Прикрепите файл с Вашей SD карточки.</string>
     <string name="file_download_title">Загрузить файл?</string>
-    <string name="file_download_body">Этот файл не был загружен на Вашу SD карточку. Загрузить?</string>
+    <string name="file_download_body">Этот файл не был загружен на Вашу SD карточку. Загрузить?
+    </string>
     <string name="file_download_progress">Загрузка...</string>
     <string name="file_err_memory">Изображение слишком большое, не хватает места в памяти.</string>
     <string name="file_err_copy">Ошибка копирования прикрепляемого файла.</string>
     <string name="file_err_download">Ошибка загрузки файла</string>
-    <string name="file_err_no_directory">Упс! Похоже, папка для хранения файлов не существует. Пожалуйста, укажите папку для хранения файлов в Настройках.</string>
+    <string name="file_err_no_directory">Упс! Похоже, папка для хранения файлов не существует.
+        Пожалуйста, укажите папку для хранения файлов в Настройках.
+    </string>
     <string name="file_err_show">Извините, система не поддерживает этот тип файлов.</string>
-    
+
     <string name="file_dir_dialog_ok">Использовать этот каталог</string>
     <string name="file_dir_dialog_default">Сбросить на значения по умолчанию</string>
-    
+
     <string name="p_files_dir">Папка Премиум-загрузок</string>
     <!-- Description for file download directory preference. %s -> chosen directory -->
     <string name="p_files_dir_desc">Прикрепления к задаче сохранены в: %s</string>
     <string name="p_files_dir_desc_default">Каталог по-умолчанию</string>
 
-    
+
     <!-- in app billing -->
     <string name="billing_not_supported_title">Невозможно совершить покупку</string>
-    <string name="billing_not_supported_message">Биллинг временно недоступен. Вы можете продолжить использовать приложение, но не сможете делать заказы.</string>
+    <string name="billing_not_supported_message">Биллинг временно недоступен. Вы можете продолжить
+        использовать приложение, но не сможете делать заказы.
+    </string>
     <string name="subscriptions_not_supported_title">Не удалось приобрести подписку</string>
-    <string name="subscriptions_not_supported_message">Сервис платежей на этом устройстве не поддерживает подписок</string>
+    <string name="subscriptions_not_supported_message">Сервис платежей на этом устройстве не
+        поддерживает подписок
+    </string>
     <string name="cannot_connect_title">Не удается подключиться к Market</string>
     <string name="cannot_connect_message">Приложение не может соединиться с Market.
-Ваша версия Market можеть быть просрочена.
-Вы можете продолжить использовать приложение, но
-покупки не доступны.</string>
-    
+        Ваша версия Market можеть быть просрочена.
+        Вы можете продолжить использовать приложение, но
+        покупки не доступны.
+    </string>
+
     <string name="restoring_transactions">Идет восстановление транзакций</string>
-    
+
     <string name="subscriptions_learn_more">Узнать больше</string>
-    
-    <string name="kii_premium_success">Спасибо, что приняли предложение ! Ваш бесплатный месяц Astrid Premium разблокирован.</string>
+
+    <string name="kii_premium_success">Спасибо, что приняли предложение ! Ваш бесплатный месяц
+        Astrid Premium разблокирован.
+    </string>
     <string name="kii_premium_abort">Специальное предложение отменено</string>
     <string name="kii_premium_declined">Специальное предложение отклонено</string>
-    <string name="kii_premium_error">Произошла ошибка при обработке. Пожалуйста повторите попытку позже.</string>
-    
+    <string name="kii_premium_error">Произошла ошибка при обработке. Пожалуйста повторите попытку
+        позже.
+    </string>
+
     <string name="premium_offers_title">Специальное предложение</string>
     <string name="premium_offers_subtitle">Хотите один месяц Premium бесплатно?</string>
-    <string name="premium_offers_detail">Чтобы получить бесплатный месяц, вы должны просмотреть видео от спонсора. Ему также потребуется Ваш email.</string>
+    <string name="premium_offers_detail">Чтобы получить бесплатный месяц, вы должны просмотреть
+        видео от спонсора. Ему также потребуется Ваш email.
+    </string>
     <string name="premium_offers_start">Получи бесплатно !</string>
-    
+
     <string name="premium_billing_title">Astrid Премиум</string>
     <string name="premium_buy_month">1 месяц</string>
     <string name="premium_buy_year">1 год</string>
@@ -2242,730 +2455,778 @@
     <string name="premium_speech_bubble_1">Премиум повысит вашу продуктивность!</string>
     <string name="premium_speech_bubble_2">Подпишитесь на год и сэкономьте 25%%!</string>
     <string name="premium_already_subscribed">Вы уже подписаны на Astrid Premium</string>
-    <string name="premium_login_prompt">Чтобы оформить премиум подписку, необходима учетная запись на Astrid.com. Пожалуйста, войдите в свою учетную запись или создайте новую.</string>
+    <string name="premium_login_prompt">Чтобы оформить премиум подписку, необходима учетная запись
+        на Astrid.com. Пожалуйста, войдите в свою учетную запись или создайте новую.
+    </string>
     <string name="premium_success">Спасибо за то, что подписались на Astrid Premium!</string>
-    <string name="premium_success_with_server_error">Спасибо за то, что оформили премиум подписку на Astrid! Новые возможности на astrid.com разблокируются в ближайшее время, на Вашем телефоне они должны быть доступны уже сейчас.</string>
-    <string name="premium_verification_error">Премиум подписка для этой учетной записи Google Play оформлена на другого пользователя. Привязать дополнительный email к своей учетной записи можно здесь: astrid.com/users/profile</string>
-    <string name="premium_check_for_purchases">Уже приобрели Premium? Нажмите здесь для проверки истории покупок в Google Play.</string>
+    <string name="premium_success_with_server_error">Спасибо за то, что оформили премиум подписку на
+        Astrid! Новые возможности на astrid.com разблокируются в ближайшее время, на Вашем телефоне
+        они должны быть доступны уже сейчас.
+    </string>
+    <string name="premium_verification_error">Премиум подписка для этой учетной записи Google Play
+        оформлена на другого пользователя. Привязать дополнительный email к своей учетной записи
+        можно здесь: astrid.com/users/profile
+    </string>
+    <string name="premium_check_for_purchases">Уже приобрели Premium? Нажмите здесь для проверки
+        истории покупок в Google Play.
+    </string>
     <string name="premium_checking_for_purchases">Проверка покупок...</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- 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">Напомнить мне:</string>
-
-  <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">Когда наступит срок выполнения задания</string>
-
-  <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">Когда задание просрочено</string>
-
-  <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_randomly">Случайно один раз</string>
-
-  <!-- Task Edit: Reminder alarm clock label -->  
-  <string name="TEA_reminder_alarm_label">Тип звонка/вибрации</string>
-
-  <!--  slide 45a: Task Edit: Reminder mode: ring once -->  
-  <string name="TEA_reminder_mode_once">раз</string>
-
-  <!-- slide 45b: Task Edit: Reminder mode: ring five times -->  
-  <string name="TEA_reminder_mode_five">Пять раз</string>
-
-  <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->  
-  <string name="TEA_reminder_mode_nonstop">Пока я не отключу сигнал</string>
-  
-  <string name="TEA_reminder_when">when</string>
-  
-  <string name="TEA_reminder_due_short">due</string>
-
-  <string name="TEA_reminder_overdue_short">overdue</string>
-
-  <string name="TEA_reminder_randomly_short">randomly</string>
-
-  <string name="TEA_reminder_display_one">Remind me %s</string>
-  
-  <string name="TEA_reminder_display_multiple">Remind %s</string>
-
-  <string-array name="TEA_reminder_random">
-    <!-- random reminder choices for task edit page. -->
-    <item>час</item>
-    <item>день</item>
-    <item>неделя</item>
-    <item>в две недели</item>
-    <item>месяц</item>
-    <item>в два месяца</item>
-  </string-array>
-  
-  <!-- ==================================================== notifications == -->
-  
-  <!-- Name of filter when viewing a reminder -->
-  <string name="rmd_NoA_filter">Напоминание!</string>
-  
-  <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Уже готово!</string>
-  
-  <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Повтор</string>
-  
-  <!-- Reminder: Completed Toast -->
-  <string name="rmd_NoA_completed_toast">Поздравляем с окончанием!</string>
-  
-  <!-- Prefix for reminder dialog title -->
-  <string name="rmd_NoA_dlg_title">Напоминания:</string>
-  
-  <!-- ==================================================== user reengagement == -->
-
-  <!-- Titles for user reengagement notifications -->
-  <string-array name="rmd_reengage_notif_titles">
-    <item>Заметка из Astrid</item>
-    <!-- %s -> first name -->
-    <item>Напоминание для %s</item> 
-    <item>Обзор задач от Astrid</item>
-    <item>Напоминания от Astrid</item>
-  </string-array>
-    
-  <string name="rmd_reengage_name_default">Вы</string>
-
-  
-  <string name="rmd_reengage_add_tasks">Добавить задание</string>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs -->
-  <string-array name="rmd_reengage_dialog_options">
-    <item>Время сократить Ваш список задач!</item>
-    <item>Дорогой сэр или мадам, некоторые задачи ждут Вашего внимания!</item>
-    <item>Привет, могли бы Вы взглянуть сюда?</item>
-    <item>У меня есть несколько задач на Ваше имя!</item>
-    <item>Свежая пачка задач для Вас на сегодня.</item>
-    <item>Вы выглядите потрясающе! Готовы начать?</item>
-    <item>Прекрасный день, чтобы поработат, я думаю!</item>
-  </string-array>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>Разве вы не хотите навести порядок?</item>
-    <item>Я Astrid! Я здесь, чтобы помочь Вам сделать больше!</item>
-    <item>Вы выглядите занятым. Позвольте убрать некоторые задачи из вашего списка.</item>
-    <item>Я могу помочь Вам следить за всеми деталями Вашей жизни.</item>
-    <item>Вы серьёзно о том что нужно сделать побольше? Ну что, я тоже!</item>
-    <item>Очень приятно с Вами познакомиться!</item>
-  </string-array>
-  <!-- ============================================= reminder preferences == -->
-  
-  <!-- slide 33d: Reminder Preference Screen Title -->
-  <string name="rmd_EPr_alerts_header">Настройки напоминаний</string>
-  <string name="rmd_EPr_alerts_summary">Тихие часы, опции короткого сна, уровень настойчивости</string>
-    
-  <!-- Reminder Preference: Reminders Enabled Title -->
-  <string name="rmd_EPr_enabled_title">Включить напоминания?</string>
-  <!-- Reminder Preference Reminders Enabled Description (true) -->
-  <string name="rmd_EPr_enabled_desc_true">Напоминания Astrid включены (это нормально)</string>
-  <!-- Reminder Preference Reminders Enabled Description (false) -->
-  <string name="rmd_EPr_enabled_desc_false">Напоминания Astrid никогда не появятся на вашем телефоне</string>  
-    
-  <!-- Reminder Preference: Quiet Hours Start Title -->
-  <string name="rmd_EPr_quiet_hours_start_title">Начало тихих часов</string>
-  <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">Уведомления будут беззвучными после %s.\nПримечание: вибрация управляется настройками ниже!</string>
-  <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
-  <string name="rmd_EPr_quiet_hours_desc_none">Тихие часы отключены</string>
-  
-  <!-- Reminder Preference: Quiet Hours End Title -->
-  <string name="rmd_EPr_quiet_hours_end_title">Конец тихих часов</string>
-  <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_end_desc">Уведомления перестануть быть беззвучными начиная с %s.</string>
-
-  <!-- Reminder Preference: Default Reminder Title -->
-  <string name="rmd_EPr_rmd_time_title">Напоминание по умолчанию</string>
-  <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
-  <string name="rmd_EPr_rmd_time_desc">Уведомления для задач без срока выполнения появятся в %s</string>
-
-  <!-- Reminder Preference: Notification Ringtone Title -->
-  <string name="rmd_EPr_ringtone_title">Мелодия напоминания</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
-  <string name="rmd_EPr_ringtone_desc_custom">Собственная мелодия установлена</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
-  <string name="rmd_EPr_ringtone_desc_silent">Мелодия отключена</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
-  <string name="rmd_EPr_ringtone_desc_default">Будет использована мелодия по умолчанию</string>
-  
-  <!-- Reminder Preference: Notification Persistence Title -->
-  <string name="rmd_EPr_persistent_title">Постоянность уведомления</string>
-  <!-- Reminder Preference: Notification Persistence Description (true) -->
-  <string name="rmd_EPr_persistent_desc_true">Каждое уведомление должно быть просмотрено перед очисткой</string>
-  <!-- Reminder Preference: Notification Persistence Description (false) -->
-  <string name="rmd_EPr_persistent_desc_false">Уведомления можно очистить кнопкой \"Очистить все\"</string>
-
-  <!-- Reminder Preference: Social Reminders Title -->
-  <string name="rmd_EPr_social_title">Поддержка от друзей</string>
-  <!-- Reminder Preference: Social Reminders Summary (enabled) -->
-  <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for shared tasks</string>
-  <!-- Reminder Preference: Social Reminders Summary (disabled) -->
-  <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you for shared tasks</string>
-  
-  
-  
-  <!-- Reminder Preference: Notification Icon Title -->
-  <!-- Reminder Preference: Notification Icon Description -->
-
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
-  <string name="rmd_EPr_multiple_maxvolume_title">Максимальная громкость для многоразовых напоминаний</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid будет максимизировать громкость для многоразовых напоминаний</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid будет использовать системные настройки громкости</string>
-
-  <!-- Reminder Preference: Vibrate Title -->
-  <string name="rmd_EPr_vibrate_title">Будильник с вибрацией</string>
-  <!-- Reminder Preference: Vibrate Description (true) -->
-  <string name="rmd_EPr_vibrate_desc_true">Astrid будет вызывать вибрацию при уведомлении</string>
-  <!-- Reminder Preference: Vibrate Description (false) -->
-  <string name="rmd_EPr_vibrate_desc_false">Astrid не будет вызывать вибрацию при уведомлениях</string>
-
-  <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">Ободрения Astrid</string>
-  <!-- Reminder Preference: Nagging Description (true) -->
-  <string name="rmd_EPr_nagging_desc_true">Astrid появится на экране, чтобы подбодрить вас при напоминаниях</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_nagging_desc_false">Astrid не будет показывать приободряющих сообщений</string>
-
-  <!-- Reminder Preference: Snooze Dialog Title -->  
-  <string name="rmd_EPr_snooze_dialog_title">Дремать HH:MM</string>
-  <!-- Reminder Preference: Snooze Dialog Description (true) -->
-  <string name="rmd_EPr_snooze_dialog_desc_true">Дремать введя новое время (HH:MM)</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_snooze_dialog_desc_false">Отложить выбрав # дней/часов</string>
-  
-  <!-- slide 44g: Reminder Preference: Default Reminders Title -->
-  <string name="rmd_EPr_defaultRemind_title">Случайные напоминания</string>
-  <!-- Reminder Preference: Default Reminders Setting (disabled) -->
-  <string name="rmd_EPr_defaultRemind_desc_disabled">У новых задач не будет случайных напоминаний</string>
-  <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
-  <string name="rmd_EPr_defaultRemind_desc">Случайно напоминать о новых задачах %s</string>
-  
-  <!-- slide 39a: Defaults Title -->
-  
-  <string-array name="EPr_reminder_random">
-    <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
-    <item>отключено</item>
-    <!-- slide 44b -->
-    <item>ежечасно</item>
-    <!-- slide 44c -->
-    <item>ежедневно</item>
-    <!-- slide 44d-->
-    <item>еженедельно</item>
-    <!-- slide 44e-->
-    <item>каждые две недели</item>
-    <!-- slide 44f -->
-    <item>ежемесячно</item>
-    <item>каждые два месяца</item>
-  </string-array>
-        
-  <string-array name="EPr_quiet_hours_start">
-    <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
-    <item>отключено</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>00:00</item>
-    <item>01:00</item>
-    <item>02:00</item>
-    <item>03:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-  </string-array>
-  
-  <string-array name="EPr_quiet_hours_end">
-    <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>00:00</item>
-    <item>01:00</item>
-    <item>02:00</item>
-    <item>03:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-  </string-array>
-  
-  <string-array name="EPr_rmd_time">
-    <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>00:00</item>
-    <item>01:00</item>
-    <item>02:00</item>
-    <item>03:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-  </string-array>
-  
-  <!-- =============================================== random reminders == -->
-
-  <string name="reminders_social">Эти люди рассчитывают на Вас!</string>
-  
-  <string name="reminders_social_one">%s is counting on you!</string>
-  
-  <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
-
-  <string-array name="reminders">
-      <!-- reminders: Make these < 20 chars so the task name is displayed -->
-      <item>Привет! Есть минутка?</item>
-      <item>Можно Вас на минутку?</item>
-      <item>Есть несколько минут?</item>
-      <item>Вы не забыли?</item>
-      <item>Прошу внимания!</item>
-      <item>Когда у Вас есть минутка:</item>
-      <item>В списке дел:</item>
-      <item>Свободны на минутку?</item>
-      <item>Astrid здесь!</item>
-      <item>Привет! Можешь отвлечься?</item>
-      <item>Минутку вашего времени?</item>
-      <item>Прекрасный день, чтобы</item>
-  </string-array>
-
-  <string-array name="reminders_due">
-      <!-- reminders related to task due date -->
-      <item>Пора за работу!</item>
-      <item>Наступила дата выполнения!</item>
-      <item>Готовы начать?</item>
-      <item>Вы сказали, что сделаете:</item>
-      <item>Вы должны начать выполнение:</item>
-      <item>Время начать:</item>
-      <item>Время пришло!</item>
-      <item>Прошу внимания! Время для</item>
-      <item>Вы свободны? Пора выполнить</item>
-  </string-array>
-
-  <string-array name="reminders_snooze">
-      <!-- reminders related to snooze -->
-      <item>Не надо лениться!</item>
-      <item>Время повтора!</item>
-      <item>Нельзя больше откладывать!</item>
-      <item>Теперь вы готовы?</item>
-      <item>Нельзя больше откладывать!</item>
-  </string-array>
-  
-  <string-array name="reminder_responses">
-      <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
-      <item>У меня для Вас кое-что есть!</item> 
-      <item>Готовы оставить это в прошлом?</item>
-      <item>Почему бы Вам это не сделать?</item>
-      <item>Как насчет этого? Вы готовы?</item>
-      <item>Готовы это сделать?</item>
-      <item>Вы справитесь с этим?</item>
-      <item>Вы можете быть счастливым! Просто закончите это!</item>
-      <item>Обещаю, вам станет определённо лучше после завершения!</item>
-      <item>Разве Вы не сделаете это сегодня?</item>
-      <item>Пожалуйста, заканчивайте, больше не могу терпеть!</item>
-      <item>Вы можете это закончить? Да, можете!</item>
-      <item>Вы когда-нибудь сделаете это?</item>
-      <item>Почувствуйте себя на высоте! Вперед!</item>
-      <item>Я горжусь Вами! Давайте сделаем это!</item>
-      <item>Желаете перекусить, когда закончите?</item>
-      <item>Только одно задание? Пожалуйста?</item>
-      <item>Время сократить список дел!</item>
-      <item>На чьей Вы стороне - порядка или беспорядка? Порядка! Поехали!</item>
-      <item>Я не говорил, что Вы потрясающе справляетесь? Так держать!</item>
-      <item>Задание в день и никакого беспорядка... Беспорядок, прощай!</item>
-      <item>Как Вам это удается? Я восхищен!</item>
-      <item>Вы не получите это за красивые глазки. Поторопитесь!</item>
-      <item>Прекрасная погода для такой работы, не так ли?</item>
-      <item>Чашку чаю?</item>
-      <item>Только если вы уже сделали это, вы можете пойти на улицу и поиграть.</item>
-      <item>Время пришло. Вы не можете откладывать неизбежное.</item>
-      <item>Я будто умираю каждый раз, когда Вы забываете обо мне.</item>
-  </string-array>
-
-  <string-array name="postpone_nags">
-      <!-- Astrid\'s nagging when user clicks postpone -->
-      <item>Но признайса, ты ведь не любишь откладывать?</item>
-      <item>Даже быть ленивым иногда надоедает!</item>
-      <item>А ведь где-нибудь кто-то надеется, что ты завершишь это!</item>
-      <item>Когда ты выбираешь отложить, ты ведь думаешь \'я сделаю это\', да?</item>
-      <item>Ты ведь больше не будешь откладывать?</item>
-      <item>Просто закончи это сегодня и я никому не скажу!</item>
-      <item>Зачем откладывать, когда ты можешь… мм… не откладывать!</item>
-      <item>Я надеюсь, ты завершишь это когда-нибудь?</item>
-      <item>Я считаю, ты замечателен! Как насчёт не сбавлять темп?</item>
-      <item>Ты сможешь добиться цели, если сделаешь это?</item>
-      <item>Отложить, отложить, отложить… Когда же ты изменишься?</item>
-      <item>С меня достаточно извинений! Просто сделай это!</item>
-      <item>Разве ты за это не извинялся в прошлый раз?</item>
-      <item>Я ничем не смогу помочь, если ты так поступаешь…</item>
-  </string-array>
+    <!-- Resources for built-in reminders plug-in -->
 
+    <!-- =============================================== task edit activity == -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder group label -->
+    <string name="TEA_reminders_group_label">Reminder settings</string>
 
+    <!-- Task Edit: Reminder header label -->
+    <string name="TEA_reminder_label">Напомнить мне:</string>
 
-  <!-- Resources for built-in repeat plug-in -->
-
-  <!-- repeating plugin name -->
-  <string name="repeat_plugin">Повторяющиеся задачи</string>
-  
-  <!-- repeating plugin description -->
-  <string name="repeat_plugin_desc">Позволяет задачам повторяться</string>
-  
-  <!-- slide 20a: checkbox for turning on/off repeats -->
-  <string name="repeat_enabled">Повторения</string>
-  
-  <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
-  <string name="repeat_every">С интервалом в %d</string>
-  
-  <!-- hint when opening repeat interval -->
-  <string name="repeat_interval_prompt">Интервал повтора</string>
-  
-  <!-- slide 19b-->
-  <string name="repeat_never">Not repeating</string>
-  <!-- slide 20f-->
-  <string name="repeat_dont">Не повторять</string>
-      
-  <string-array name="repeat_interval_short">
-    <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>д.</item>
-    <item>нед.</item>
-    <item>мес.</item>
-    <item>ч</item>
-    <item>мин</item>
-    <item>г.</item>
-  </string-array>
-  
-  
-  <string-array name="repeat_interval">
-    <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>День(дней)</item>
-    <item>Неделя(ль)</item>
-    <item>Месяц(ев)</item>
-    <item>Час(ов)</item>
-    <item>Минута(ы)</item>
-    <item>Лет (Года)</item>
-  </string-array>
-  
-  <string name="repeat_days">дни</string>
-  <string name="repeat_weekdays">Дни недели</string>
-  <string name="repeat_weeks">недели</string>
-  <string name="repeat_months">месяцы</string>
-  <string name="repeat_years">годы</string>
-  <string name="repeat_hours">часы</string>
-  <string name="repeat_minutes">минуты</string>
-  
-  <string-array name="repeat_until_shortcuts">
-      <item>Всегда</item>
-      <item>Определённый день</item>
-      <item>Сегодня</item>
-      <item>Завтра</item>
-      <item>(день спустя)</item>
-      <item>На следующей неделе</item>
-      <item>В течении двух недель</item>
-      <item>Следующий месяц</item>
-  </string-array>
-  
-  <string name="repeat_until_title">Повторять пока ...</string>
-  
-  <string name="repeat_keep_going">Продолжайте</string>
-  
-  <string-array name="repeat_type">
-    <!-- slide 20c: repeat type (date to repeat from) -->
-    <item>с намеченного времени</item>
-    <!-- slide 20c -->
-    <item>со времени завершения</item>
-  </string-array>
-  
-  <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
-  <string name="repeat_detail_byday">$I каждый $D</string>
-  
-  <!-- task detail for repeat from due date (%s -> interval) -->
-  <string name="repeat_detail_duedate">С интервалом %s</string>
-
-  <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
-  <string name="repeat_detail_duedate_until">"Каждые  %1$s пока %2$s"</string>
-  
-  <!-- task detail for repeat from completion date (%s -> interval) -->
-  <string name="repeat_detail_completion">%s после завершения</string>
-  
-  <!-- text for button when repeating task indefinitely -->
-  <string name="repeat_forever">Повторять всегда</string>
-
-  <!-- text for button when repeating task until specified date (%s -> date string) -->
-  <string name="repeat_until">Повторять пока %s</string>
-  
-  <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title">Перепланирование задачи \"%s\"</string>
-
-  <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title_last_time">Прекратить повторять задачу \"%s\"</string>
-      
-  <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->  
-  <string name="repeat_rescheduling_dialog_bubble">%1$s я перепланировал эту повторяющуюся задачу с %2$s на %3$s</string>
-  
-  <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
-  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s Я перенес эту повторяющуюся задачу на %2$s</string>
-  
-  <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
-  <string name="repeat_rescheduling_dialog_bubble_last_time">Вы должны были повторять это до %1$s, теперь повторения закончились. %2$s</string>
-  
-  <string-array name="repeat_encouragement">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>Отличная работа!</item>
-      <item>Вау... Я так горжусь тобой!</item>
-      <item>Я люблю когда Вы плодотворны!</item>
-      <item>Разве не здорово отбросить выполненное задание?</item>
-  </string-array>
-
-  <string-array name="repeat_encouragement_last_time">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>Хорошая работа!</item>
-      <item>Я так горжусь Вами!</item>
-      <item>Я люблю когда Вы плодотворны!</item>
-  </string-array>
-  
+    <!-- Task Edit: Reminder @ deadline -->
+    <string name="TEA_reminder_due">Когда наступит срок выполнения задания</string>
 
+    <!-- Task Edit: Reminder after deadline -->
+    <string name="TEA_reminder_overdue">Когда задание просрочено</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder at random times (%s => time plural)-->
+    <string name="TEA_reminder_randomly">Случайно один раз</string>
 
-    
-  <!-- Subtasks Help Introduction -->
-  <string name="subtasks_help_title">Сортировка и отступ в Astrid</string>
-  <string name="subtasks_help_1">Нажмите и удерживайте, чтобы переместить задачу</string>
-  <string name="subtasks_help_2">Перетащите вертикально, чтобы перестроить</string>
-  <string name="subtasks_help_3">Перетащите горизонтально для отступа</string>
-    
+    <!-- Task Edit: Reminder alarm clock label -->
+    <string name="TEA_reminder_alarm_label">Тип звонка/вибрации</string>
 
+    <!--  slide 45a: Task Edit: Reminder mode: ring once -->
+    <string name="TEA_reminder_mode_once">раз</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 45b: Task Edit: Reminder mode: ring five times -->
+    <string name="TEA_reminder_mode_five">Пять раз</string>
+
+    <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
+    <string name="TEA_reminder_mode_nonstop">Пока я не отключу сигнал</string>
+
+    <string name="TEA_reminder_when">when</string>
+
+    <string name="TEA_reminder_due_short">due</string>
+
+    <string name="TEA_reminder_overdue_short">overdue</string>
+
+    <string name="TEA_reminder_randomly_short">randomly</string>
+
+    <string name="TEA_reminder_display_one">Remind me %s</string>
+
+    <string name="TEA_reminder_display_multiple">Remind %s</string>
+
+    <string-array name="TEA_reminder_random">
+        <!-- random reminder choices for task edit page. -->
+        <item>час</item>
+        <item>день</item>
+        <item>неделя</item>
+        <item>в две недели</item>
+        <item>месяц</item>
+        <item>в два месяца</item>
+    </string-array>
+
+    <!-- ==================================================== notifications == -->
+
+    <!-- Name of filter when viewing a reminder -->
+    <string name="rmd_NoA_filter">Напоминание!</string>
+
+    <!-- Reminder: Task was already done -->
+    <string name="rmd_NoA_done">Уже готово!</string>
+
+    <!-- Reminder: Snooze button (remind again later) -->
+    <string name="rmd_NoA_snooze">Повтор</string>
+
+    <!-- Reminder: Completed Toast -->
+    <string name="rmd_NoA_completed_toast">Поздравляем с окончанием!</string>
+
+    <!-- Prefix for reminder dialog title -->
+    <string name="rmd_NoA_dlg_title">Напоминания:</string>
+
+    <!-- ==================================================== user reengagement == -->
+
+    <!-- Titles for user reengagement notifications -->
+    <string-array name="rmd_reengage_notif_titles">
+        <item>Заметка из Astrid</item>
+        <!-- %s -> first name -->
+        <item>Напоминание для %s</item>
+        <item>Обзор задач от Astrid</item>
+        <item>Напоминания от Astrid</item>
+    </string-array>
+
+    <string name="rmd_reengage_name_default">Вы</string>
+
+
+    <string name="rmd_reengage_add_tasks">Добавить задание</string>
+
+    <!-- Speech bubble options for astrid in reengagement notifs -->
+    <string-array name="rmd_reengage_dialog_options">
+        <item>Время сократить Ваш список задач!</item>
+        <item>Дорогой сэр или мадам, некоторые задачи ждут Вашего внимания!</item>
+        <item>Привет, могли бы Вы взглянуть сюда?</item>
+        <item>У меня есть несколько задач на Ваше имя!</item>
+        <item>Свежая пачка задач для Вас на сегодня.</item>
+        <item>Вы выглядите потрясающе! Готовы начать?</item>
+        <item>Прекрасный день, чтобы поработат, я думаю!</item>
+    </string-array>
+
+    <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>Разве вы не хотите навести порядок?</item>
+        <item>Я Astrid! Я здесь, чтобы помочь Вам сделать больше!</item>
+        <item>Вы выглядите занятым. Позвольте убрать некоторые задачи из вашего списка.</item>
+        <item>Я могу помочь Вам следить за всеми деталями Вашей жизни.</item>
+        <item>Вы серьёзно о том что нужно сделать побольше? Ну что, я тоже!</item>
+        <item>Очень приятно с Вами познакомиться!</item>
+    </string-array>
+    <!-- ============================================= reminder preferences == -->
+
+    <!-- slide 33d: Reminder Preference Screen Title -->
+    <string name="rmd_EPr_alerts_header">Настройки напоминаний</string>
+    <string name="rmd_EPr_alerts_summary">Тихие часы, опции короткого сна, уровень настойчивости
+    </string>
+
+    <!-- Reminder Preference: Reminders Enabled Title -->
+    <string name="rmd_EPr_enabled_title">Включить напоминания?</string>
+    <!-- Reminder Preference Reminders Enabled Description (true) -->
+    <string name="rmd_EPr_enabled_desc_true">Напоминания Astrid включены (это нормально)</string>
+    <!-- Reminder Preference Reminders Enabled Description (false) -->
+    <string name="rmd_EPr_enabled_desc_false">Напоминания Astrid никогда не появятся на вашем
+        телефоне
+    </string>
+
+    <!-- Reminder Preference: Quiet Hours Start Title -->
+    <string name="rmd_EPr_quiet_hours_start_title">Начало тихих часов</string>
+    <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_start_desc">Уведомления будут беззвучными после
+        %s.\nПримечание: вибрация управляется настройками ниже!
+    </string>
+    <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
+    <string name="rmd_EPr_quiet_hours_desc_none">Тихие часы отключены</string>
+
+    <!-- Reminder Preference: Quiet Hours End Title -->
+    <string name="rmd_EPr_quiet_hours_end_title">Конец тихих часов</string>
+    <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_end_desc">Уведомления перестануть быть беззвучными начиная с
+        %s.
+    </string>
+
+    <!-- Reminder Preference: Default Reminder Title -->
+    <string name="rmd_EPr_rmd_time_title">Напоминание по умолчанию</string>
+    <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
+    <string name="rmd_EPr_rmd_time_desc">Уведомления для задач без срока выполнения появятся в %s
+    </string>
+
+    <!-- Reminder Preference: Notification Ringtone Title -->
+    <string name="rmd_EPr_ringtone_title">Мелодия напоминания</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
+    <string name="rmd_EPr_ringtone_desc_custom">Собственная мелодия установлена</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
+    <string name="rmd_EPr_ringtone_desc_silent">Мелодия отключена</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
+    <string name="rmd_EPr_ringtone_desc_default">Будет использована мелодия по умолчанию</string>
+
+    <!-- Reminder Preference: Notification Persistence Title -->
+    <string name="rmd_EPr_persistent_title">Постоянность уведомления</string>
+    <!-- Reminder Preference: Notification Persistence Description (true) -->
+    <string name="rmd_EPr_persistent_desc_true">Каждое уведомление должно быть просмотрено перед
+        очисткой
+    </string>
+    <!-- Reminder Preference: Notification Persistence Description (false) -->
+    <string name="rmd_EPr_persistent_desc_false">Уведомления можно очистить кнопкой \"Очистить
+        все\"
+    </string>
+
+    <!-- Reminder Preference: Social Reminders Title -->
+    <string name="rmd_EPr_social_title">Поддержка от друзей</string>
+    <!-- Reminder Preference: Social Reminders Summary (enabled) -->
+    <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for
+        shared tasks
+    </string>
+    <!-- Reminder Preference: Social Reminders Summary (disabled) -->
+    <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you
+        for shared tasks
+    </string>
+
+
+    <!-- Reminder Preference: Notification Icon Title -->
+    <!-- Reminder Preference: Notification Icon Description -->
+
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
+    <string name="rmd_EPr_multiple_maxvolume_title">Максимальная громкость для многоразовых
+        напоминаний
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid будет максимизировать громкость для
+        многоразовых напоминаний
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid будет использовать системные
+        настройки громкости
+    </string>
+
+    <!-- Reminder Preference: Vibrate Title -->
+    <string name="rmd_EPr_vibrate_title">Будильник с вибрацией</string>
+    <!-- Reminder Preference: Vibrate Description (true) -->
+    <string name="rmd_EPr_vibrate_desc_true">Astrid будет вызывать вибрацию при уведомлении</string>
+    <!-- Reminder Preference: Vibrate Description (false) -->
+    <string name="rmd_EPr_vibrate_desc_false">Astrid не будет вызывать вибрацию при уведомлениях
+    </string>
+
+    <!-- Reminder Preference: Nagging Title -->
+    <string name="rmd_EPr_nagging_title">Ободрения Astrid</string>
+    <!-- Reminder Preference: Nagging Description (true) -->
+    <string name="rmd_EPr_nagging_desc_true">Astrid появится на экране, чтобы подбодрить вас при
+        напоминаниях
+    </string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_nagging_desc_false">Astrid не будет показывать приободряющих сообщений
+    </string>
+
+    <!-- Reminder Preference: Snooze Dialog Title -->
+    <string name="rmd_EPr_snooze_dialog_title">Дремать HH:MM</string>
+    <!-- Reminder Preference: Snooze Dialog Description (true) -->
+    <string name="rmd_EPr_snooze_dialog_desc_true">Дремать введя новое время (HH:MM)</string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_snooze_dialog_desc_false">Отложить выбрав # дней/часов</string>
+
+    <!-- slide 44g: Reminder Preference: Default Reminders Title -->
+    <string name="rmd_EPr_defaultRemind_title">Случайные напоминания</string>
+    <!-- Reminder Preference: Default Reminders Setting (disabled) -->
+    <string name="rmd_EPr_defaultRemind_desc_disabled">У новых задач не будет случайных
+        напоминаний
+    </string>
+    <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
+    <string name="rmd_EPr_defaultRemind_desc">Случайно напоминать о новых задачах %s</string>
+
+    <!-- slide 39a: Defaults Title -->
+
+    <string-array name="EPr_reminder_random">
+        <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
+        <item>отключено</item>
+        <!-- slide 44b -->
+        <item>ежечасно</item>
+        <!-- slide 44c -->
+        <item>ежедневно</item>
+        <!-- slide 44d-->
+        <item>еженедельно</item>
+        <!-- slide 44e-->
+        <item>каждые две недели</item>
+        <!-- slide 44f -->
+        <item>ежемесячно</item>
+        <item>каждые два месяца</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_start">
+        <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
+        <item>отключено</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>00:00</item>
+        <item>01:00</item>
+        <item>02:00</item>
+        <item>03:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_end">
+        <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>00:00</item>
+        <item>01:00</item>
+        <item>02:00</item>
+        <item>03:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+    </string-array>
+
+    <string-array name="EPr_rmd_time">
+        <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>00:00</item>
+        <item>01:00</item>
+        <item>02:00</item>
+        <item>03:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+    </string-array>
+
+    <!-- =============================================== random reminders == -->
+
+    <string name="reminders_social">Эти люди рассчитывают на Вас!</string>
+
+    <string name="reminders_social_one">%s is counting on you!</string>
+
+    <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
+
+    <string-array name="reminders">
+        <!-- reminders: Make these < 20 chars so the task name is displayed -->
+        <item>Привет! Есть минутка?</item>
+        <item>Можно Вас на минутку?</item>
+        <item>Есть несколько минут?</item>
+        <item>Вы не забыли?</item>
+        <item>Прошу внимания!</item>
+        <item>Когда у Вас есть минутка:</item>
+        <item>В списке дел:</item>
+        <item>Свободны на минутку?</item>
+        <item>Astrid здесь!</item>
+        <item>Привет! Можешь отвлечься?</item>
+        <item>Минутку вашего времени?</item>
+        <item>Прекрасный день, чтобы</item>
+    </string-array>
+
+    <string-array name="reminders_due">
+        <!-- reminders related to task due date -->
+        <item>Пора за работу!</item>
+        <item>Наступила дата выполнения!</item>
+        <item>Готовы начать?</item>
+        <item>Вы сказали, что сделаете:</item>
+        <item>Вы должны начать выполнение:</item>
+        <item>Время начать:</item>
+        <item>Время пришло!</item>
+        <item>Прошу внимания! Время для</item>
+        <item>Вы свободны? Пора выполнить</item>
+    </string-array>
+
+    <string-array name="reminders_snooze">
+        <!-- reminders related to snooze -->
+        <item>Не надо лениться!</item>
+        <item>Время повтора!</item>
+        <item>Нельзя больше откладывать!</item>
+        <item>Теперь вы готовы?</item>
+        <item>Нельзя больше откладывать!</item>
+    </string-array>
+
+    <string-array name="reminder_responses">
+        <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
+        <item>У меня для Вас кое-что есть!</item>
+        <item>Готовы оставить это в прошлом?</item>
+        <item>Почему бы Вам это не сделать?</item>
+        <item>Как насчет этого? Вы готовы?</item>
+        <item>Готовы это сделать?</item>
+        <item>Вы справитесь с этим?</item>
+        <item>Вы можете быть счастливым! Просто закончите это!</item>
+        <item>Обещаю, вам станет определённо лучше после завершения!</item>
+        <item>Разве Вы не сделаете это сегодня?</item>
+        <item>Пожалуйста, заканчивайте, больше не могу терпеть!</item>
+        <item>Вы можете это закончить? Да, можете!</item>
+        <item>Вы когда-нибудь сделаете это?</item>
+        <item>Почувствуйте себя на высоте! Вперед!</item>
+        <item>Я горжусь Вами! Давайте сделаем это!</item>
+        <item>Желаете перекусить, когда закончите?</item>
+        <item>Только одно задание? Пожалуйста?</item>
+        <item>Время сократить список дел!</item>
+        <item>На чьей Вы стороне - порядка или беспорядка? Порядка! Поехали!</item>
+        <item>Я не говорил, что Вы потрясающе справляетесь? Так держать!</item>
+        <item>Задание в день и никакого беспорядка... Беспорядок, прощай!</item>
+        <item>Как Вам это удается? Я восхищен!</item>
+        <item>Вы не получите это за красивые глазки. Поторопитесь!</item>
+        <item>Прекрасная погода для такой работы, не так ли?</item>
+        <item>Чашку чаю?</item>
+        <item>Только если вы уже сделали это, вы можете пойти на улицу и поиграть.</item>
+        <item>Время пришло. Вы не можете откладывать неизбежное.</item>
+        <item>Я будто умираю каждый раз, когда Вы забываете обо мне.</item>
+    </string-array>
+
+    <string-array name="postpone_nags">
+        <!-- Astrid\'s nagging when user clicks postpone -->
+        <item>Но признайса, ты ведь не любишь откладывать?</item>
+        <item>Даже быть ленивым иногда надоедает!</item>
+        <item>А ведь где-нибудь кто-то надеется, что ты завершишь это!</item>
+        <item>Когда ты выбираешь отложить, ты ведь думаешь \'я сделаю это\', да?</item>
+        <item>Ты ведь больше не будешь откладывать?</item>
+        <item>Просто закончи это сегодня и я никому не скажу!</item>
+        <item>Зачем откладывать, когда ты можешь… мм… не откладывать!</item>
+        <item>Я надеюсь, ты завершишь это когда-нибудь?</item>
+        <item>Я считаю, ты замечателен! Как насчёт не сбавлять темп?</item>
+        <item>Ты сможешь добиться цели, если сделаешь это?</item>
+        <item>Отложить, отложить, отложить… Когда же ты изменишься?</item>
+        <item>С меня достаточно извинений! Просто сделай это!</item>
+        <item>Разве ты за это не извинялся в прошлый раз?</item>
+        <item>Я ничем не смогу помочь, если ты так поступаешь…</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in repeat plug-in -->
+
+    <!-- repeating plugin name -->
+    <string name="repeat_plugin">Повторяющиеся задачи</string>
+
+    <!-- repeating plugin description -->
+    <string name="repeat_plugin_desc">Позволяет задачам повторяться</string>
+
+    <!-- slide 20a: checkbox for turning on/off repeats -->
+    <string name="repeat_enabled">Повторения</string>
+
+    <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
+    <string name="repeat_every">С интервалом в %d</string>
+
+    <!-- hint when opening repeat interval -->
+    <string name="repeat_interval_prompt">Интервал повтора</string>
+
+    <!-- slide 19b-->
+    <string name="repeat_never">Not repeating</string>
+    <!-- slide 20f-->
+    <string name="repeat_dont">Не повторять</string>
+
+    <string-array name="repeat_interval_short">
+        <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>д.</item>
+        <item>нед.</item>
+        <item>мес.</item>
+        <item>ч</item>
+        <item>мин</item>
+        <item>г.</item>
+    </string-array>
+
+
+    <string-array name="repeat_interval">
+        <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>День(дней)</item>
+        <item>Неделя(ль)</item>
+        <item>Месяц(ев)</item>
+        <item>Час(ов)</item>
+        <item>Минута(ы)</item>
+        <item>Лет (Года)</item>
+    </string-array>
+
+    <string name="repeat_days">дни</string>
+    <string name="repeat_weekdays">Дни недели</string>
+    <string name="repeat_weeks">недели</string>
+    <string name="repeat_months">месяцы</string>
+    <string name="repeat_years">годы</string>
+    <string name="repeat_hours">часы</string>
+    <string name="repeat_minutes">минуты</string>
+
+    <string-array name="repeat_until_shortcuts">
+        <item>Всегда</item>
+        <item>Определённый день</item>
+        <item>Сегодня</item>
+        <item>Завтра</item>
+        <item>(день спустя)</item>
+        <item>На следующей неделе</item>
+        <item>В течении двух недель</item>
+        <item>Следующий месяц</item>
+    </string-array>
+
+    <string name="repeat_until_title">Повторять пока ...</string>
+
+    <string name="repeat_keep_going">Продолжайте</string>
+
+    <string-array name="repeat_type">
+        <!-- slide 20c: repeat type (date to repeat from) -->
+        <item>с намеченного времени</item>
+        <!-- slide 20c -->
+        <item>со времени завершения</item>
+    </string-array>
+
+    <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
+    <string name="repeat_detail_byday">$I каждый $D</string>
+
+    <!-- task detail for repeat from due date (%s -> interval) -->
+    <string name="repeat_detail_duedate">С интервалом %s</string>
+
+    <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
+    <string name="repeat_detail_duedate_until">"Каждые %1$s пока %2$s"</string>
+
+    <!-- task detail for repeat from completion date (%s -> interval) -->
+    <string name="repeat_detail_completion">%s после завершения</string>
+
+    <!-- text for button when repeating task indefinitely -->
+    <string name="repeat_forever">Повторять всегда</string>
+
+    <!-- text for button when repeating task until specified date (%s -> date string) -->
+    <string name="repeat_until">Повторять пока %s</string>
+
+    <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title">Перепланирование задачи \"%s\"</string>
+
+    <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title_last_time">Прекратить повторять задачу \"%s\"
+    </string>
+
+    <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->
+    <string name="repeat_rescheduling_dialog_bubble">%1$s я перепланировал эту повторяющуюся задачу
+        с %2$s на %3$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
+    <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s Я перенес эту повторяющуюся задачу
+        на %2$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
+    <string name="repeat_rescheduling_dialog_bubble_last_time">Вы должны были повторять это до %1$s,
+        теперь повторения закончились. %2$s
+    </string>
+
+    <string-array name="repeat_encouragement">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>Отличная работа!</item>
+        <item>Вау... Я так горжусь тобой!</item>
+        <item>Я люблю когда Вы плодотворны!</item>
+        <item>Разве не здорово отбросить выполненное задание?</item>
+    </string-array>
+
+    <string-array name="repeat_encouragement_last_time">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>Хорошая работа!</item>
+        <item>Я так горжусь Вами!</item>
+        <item>Я люблю когда Вы плодотворны!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Subtasks Help Introduction -->
+    <string name="subtasks_help_title">Сортировка и отступ в Astrid</string>
+    <string name="subtasks_help_1">Нажмите и удерживайте, чтобы переместить задачу</string>
+    <string name="subtasks_help_2">Перетащите вертикально, чтобы перестроить</string>
+    <string name="subtasks_help_3">Перетащите горизонтально для отступа</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-
-  <!-- Tags label -->
-  <string name="TEA_tags_label">Списки</string>
-  
-  <!-- Tags label long version -->
-  <string name="TEA_tags_label_long">Добавить в список</string>
- 
-  <!-- Tags hint -->
-  <string name="TEA_tag_hint">Новый список</string>
-  
-  <!-- Tags dropdown -->
-    
-  <!-- =============================================== Task List Controls == -->
-  
-  <!-- menu item for tags -->
-  
-  <!-- ========================================================== Extras == -->
-  
-  <!-- Context Item: show tag -->
-  
-  <!-- slide 25a: Dialog: new list -->
-  <string name="tag_new_list">Новый список</string>
-  
-  <!-- Dialog: list saved -->
-  
-  <!-- Dialog: task created without title -->
-  <string name="tag_no_title_error">Пожалуйста, для начала введите название списка!</string>
-  
-  <!-- ========================================================== Filters == -->
-  
-  <!-- filter button to add tag -->
-  <string name="tag_FEx_add_new">Новый</string>
-  
-  <!-- filter header for tags -->
-  <string name="tag_FEx_header">Списки</string>
-  
-  <!-- filter header for tags user created -->
-  
-  <!-- filter header for tags, shared with user -->
-  
-  <!-- filter header for tags which have no active tasks -->
-  
-  <!-- slide 10d: filter for untagged tasks -->
-  <string name="tag_FEx_untagged">Без категории</string>
-  
-  <!-- slide 27a: %s => tag name -->
-
-  <!-- context menu option to rename a tag -->
-  <string name="tag_cm_rename">Переименовать список</string>
-
-  <!-- context menu option to delete a tag -->
-  <string name="tag_cm_delete">Удалить список</string>
-  
-  <!-- context menu option to leave a shared list -->
-  <string name="tag_cm_leave">Покинуть список</string>
-
-  <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
-  <string name="DLG_delete_this_tag_question">Удалить этот список: %s? (Задачи не будут удалены.)</string>
-  
-  <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
-  <string name="DLG_leave_this_shared_tag_question">Покинуть этот обедоступный список: %s? (Задачи не будут удалены.)</string>
-
-  <!-- Dialog to rename tag -->
-  <string name="DLG_rename_this_tag_header">Переименовать список %s в:</string>
-
-  <!-- Toast notification that no changes have been made -->
-  <string name="TEA_no_tags_modified">Без изменений</string>
-
-  <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_deleted">Список %1$s был удален, затронуло %2$d задач</string>
-  
-  <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_left">Вы покинули обший список %1$s, затронуло %2$d задач</string>
-
-  <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
-  <string name="TEA_tags_renamed">Переименовано %1$s в %2$s для %3$d задач</string>
-  
-  <!-- Tag case migration -->
-  <string name="tag_case_migration_notice">"Мы заметили, что у вас есть списки, которые имеют одинаковое имя с различной капитализации. Мы считаем, что вы, возможно, хотели бы, чтобы они были в  одном списке, поэтому мы объединили дубликаты. Не волнуйтесь:  списки просто переименованы с номерами (например, Shopping_1, Shopping_2). Если вы не хотите этого, вы можете просто удалить новый объединенный список!"</string>
-  
-  <!-- Header for tag settings -->
-  <string name="tag_settings_title">Настройки</string>
-  
-  <!-- Header for tag activity -->
-  <string name="tag_updates_title">Активность: %s</string>
-  
-  <!-- Delete button for tag settings -->
-  <string name="tag_delete_button">Удалить список</string>
-  
-  <!-- slide 28d: Leave button for tag settings -->
-  <string name="tag_leave_button">Не удалять</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Tags label -->
+    <string name="TEA_tags_label">Списки</string>
 
+    <!-- Tags label long version -->
+    <string name="TEA_tags_label_long">Добавить в список</string>
+
+    <!-- Tags hint -->
+    <string name="TEA_tag_hint">Новый список</string>
+
+    <!-- Tags dropdown -->
+
+    <!-- =============================================== Task List Controls == -->
+
+    <!-- menu item for tags -->
+
+    <!-- ========================================================== Extras == -->
+
+    <!-- Context Item: show tag -->
+
+    <!-- slide 25a: Dialog: new list -->
+    <string name="tag_new_list">Новый список</string>
+
+    <!-- Dialog: list saved -->
+
+    <!-- Dialog: task created without title -->
+    <string name="tag_no_title_error">Пожалуйста, для начала введите название списка!</string>
+
+    <!-- ========================================================== Filters == -->
+
+    <!-- filter button to add tag -->
+    <string name="tag_FEx_add_new">Новый</string>
+
+    <!-- filter header for tags -->
+    <string name="tag_FEx_header">Списки</string>
+
+    <!-- filter header for tags user created -->
+
+    <!-- filter header for tags, shared with user -->
+
+    <!-- filter header for tags which have no active tasks -->
+
+    <!-- slide 10d: filter for untagged tasks -->
+    <string name="tag_FEx_untagged">Без категории</string>
+
+    <!-- slide 27a: %s => tag name -->
+
+    <!-- context menu option to rename a tag -->
+    <string name="tag_cm_rename">Переименовать список</string>
+
+    <!-- context menu option to delete a tag -->
+    <string name="tag_cm_delete">Удалить список</string>
+
+    <!-- context menu option to leave a shared list -->
+    <string name="tag_cm_leave">Покинуть список</string>
+
+    <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
+    <string name="DLG_delete_this_tag_question">Удалить этот список: %s? (Задачи не будут
+        удалены.)
+    </string>
+
+    <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
+    <string name="DLG_leave_this_shared_tag_question">Покинуть этот обедоступный список: %s? (Задачи
+        не будут удалены.)
+    </string>
+
+    <!-- Dialog to rename tag -->
+    <string name="DLG_rename_this_tag_header">Переименовать список %s в:</string>
+
+    <!-- Toast notification that no changes have been made -->
+    <string name="TEA_no_tags_modified">Без изменений</string>
+
+    <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_deleted">Список %1$s был удален, затронуло %2$d задач</string>
+
+    <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_left">Вы покинули обший список %1$s, затронуло %2$d задач</string>
+
+    <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
+    <string name="TEA_tags_renamed">Переименовано %1$s в %2$s для %3$d задач</string>
+
+    <!-- Tag case migration -->
+    <string name="tag_case_migration_notice">"Мы заметили, что у вас есть списки, которые имеют
+        одинаковое имя с различной капитализации. Мы считаем, что вы, возможно, хотели бы, чтобы они
+        были в одном списке, поэтому мы объединили дубликаты. Не волнуйтесь: списки просто
+        переименованы с номерами (например, Shopping_1, Shopping_2). Если вы не хотите этого, вы
+        можете просто удалить новый объединенный список!"
+    </string>
+
+    <!-- Header for tag settings -->
+    <string name="tag_settings_title">Настройки</string>
+
+    <!-- Header for tag activity -->
+    <string name="tag_updates_title">Активность: %s</string>
+
+    <!-- Delete button for tag settings -->
+    <string name="tag_delete_button">Удалить список</string>
+
+    <!-- slide 28d: Leave button for tag settings -->
+    <string name="tag_leave_button">Не удалять</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in timers plug-in -->
-    
+
     <!-- Task List: Start Timer button -->
-    
+
     <!-- Task List: Stop Timer button -->
-    
+
     <!-- Android Notification Title (%s => # tasks) -->
     <string name="TPl_notification">Для %s действуют таймеры!</string>
-    
+
     <!-- Filter Header for Timer plugin -->
-    
+
     <!-- Filter for Timed Tasks -->
     <string name="TFE_workingOn">Задачи для замера времени</string>
-    
+
     <!-- Title for TEA -->
     <string name="TEA_timer_controls">Таймер</string>
-    
-    
+
+
     <!-- Edit Notes: create comment for when timer is started -->
     <string name="TEA_timer_comment_started">задача началась:</string>
-    
+
     <!-- Edit Notes: create comment for when timer is stopped -->
     <string name="TEA_timer_comment_stopped">зада завершилась:</string>
-    
+
     <!-- Edit Notes: comment to notify how long was spent on task -->
     <string name="TEA_timer_comment_spent">Времени потрачено:</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Update string from activity codes %1$s - user, %2$s - target name, %3$s - message, %4$s - other_user-->
-    
+
     <!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
     Please do not translate this part of the string. -->
-    
+
     <!-- These are still in use -->
     <string name="update_string_default_comment">%1$s прокомментировал(а): %3$s</string>
     <string name="update_string_task_comment">%1$s on $link_task: %3$s</string>
     <string name="update_string_tag_comment">%1$s on %2$s: %3$s</string>
     <string name="update_string_user_self">Вы</string>
-    
+
     <string name="history_yourself">себя</string>
     <string name="history_you">Вы</string>
     <string name="history_a_deleted_user">(удаленный пользователь)</string>
-    
+
     <string name="history_this_list">этот список</string>
     <string name="history_this_task">это задание</string>
-    <string name="history_tag_added">добавлен %1$s  в  %2$s</string>
+    <string name="history_tag_added">добавлен %1$s в %2$s</string>
     <string name="history_tag_removed">удален %1$s из %2$s</string>
     <string name="history_attach_added">attached %1$s to %2$s</string>
     <string name="history_attach_removed">удален %1$s из %2$s</string>
@@ -2974,7 +3235,7 @@
     <string name="history_undeleted">востановлено %s</string>
     <string name="history_completed">выполнено %s</string>
     <string name="history_uncompleted">не выполнено %s</string>
-    <string name="history_importance_changed">изменил %1$s приоритет с  %2$s на %3$s</string>
+    <string name="history_importance_changed">изменил %1$s приоритет с %2$s на %3$s</string>
     <string name="history_title_changed">changed %1$s title from %2$s to %3$s</string>
     <string name="history_title_set">установил %1$s заголовок %2$s</string>
     <string name="history_name_changed">изменил имя с %1$s на %2$s</string>
@@ -2988,9 +3249,12 @@
     <string name="history_favorited">favorited %s</string>
     <string name="history_unfavorited">unfavorited %s</string>
     <string name="history_changed_list_picture">изменить изображение этого листа</string>
-    <string name="history_added_description_characters">added %1$d characters to %2$s description</string>
+    <string name="history_added_description_characters">added %1$d characters to %2$s description
+    </string>
     <string name="history_removed_description">removed %s description</string>
-    <string name="history_removed_description_characters">removed %1$d characters from %2$s description</string>
+    <string name="history_removed_description_characters">removed %1$d characters from %2$s
+        description
+    </string>
     <string name="history_updated_description">updated %s description</string>
     <string name="history_changed_list_owner">changed list owner to %s</string>
     <string name="history_created_this_list">создал этот список</string>
@@ -3013,195 +3277,229 @@
     <string name="history_repeat_on">on %s</string>
     <string name="history_repeat_from_completion">после завершения</string>
     <string name="history_acknowledged">просмотрен %s</string>
-    
-    <string name="history_default">changed %1$s to %2$s</string>
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-    
-  <!-- Voice Add Prompt Text -->
-  <string name="voice_create_prompt">Говорите чтобы создать задачу</string>
-  <string name="voice_edit_title_prompt">Произнесите название задачи</string>
-  <string name="voice_edit_note_prompt">Произнесите заметки задачи</string>
-    
-  <!-- Preference: Task List recognition-service is not installed, but available -->
-  <string name="EPr_voiceInputInstall_dlg">Голосовой ввод не установлен.\n Хотите перейти на Market и установить?</string>
-  <!-- Preference: Task List recognition-service is not available for this system -->
-  <string name="EPr_voiceInputUnavailable_dlg">К сожалению голосовой ввод недоступен для вашей системы.\n Если возможно, обновитесь до версии 2.1 или выше.</string>
-  <!-- Preference: Market is not available for this system -->
-  <string name="EPr_marketUnavailable_dlg">К сожалению Market не доступен для вашей системы.\nЕсли возможно, установите его из другого источника.</string>
-  <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
-  <string name="EPr_voiceInputEnabled_title">Голосовой ввод</string>
-  <!-- slide 38a: Preference: voice button description (true) -->
-  <string name="EPr_voiceInputEnabled_desc_enabled">Кнопка голосового ввода будет показана на странице списка задач</string>
-  <!-- Preference: voice button description (false) -->
-  <string name="EPr_voiceInputEnabled_desc_disabled">Кнопка голосового ввода будет скрыта со страницы списка задач</string>
-  <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
-  <string name="EPr_voiceInputCreatesTask_title">Прямое создание задач</string>
-  <!-- Preference: Task List Voice-creation description (true) -->
-  <string name="EPr_voiceInputCreatesTask_desc_enabled">Задачи будут автоматически созданы с помощью голосового ввода</string>
-  <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
-  <string name="EPr_voiceInputCreatesTask_desc_disabled">Вы сможете редактировать заголовок после завершения голосового ввода</string>
-  <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
-  <string name="EPr_voiceRemindersEnabled_title">Голосовые напоминания</string>
-  <!-- Preference: Voice reminders description (true) -->
-  <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid должен произносить название задач во время напоминаний</string>
-  <!-- slide 38c: Preference: Voice reminders description (false) -->
-  <string name="EPr_voiceRemindersEnabled_desc_disabled">Оповещение звуком во время напоминания</string>    
-  
-  <!-- slide 32d: Preference Category: Voice Title -->
-  <string name="EPr_voice_header">Параметры голосового ввода</string>
-    
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-  
-  <!-- slide 30a-->
-  <string name="welcome_setting">Показать справку</string>
-  
-  <string name="welcome_title_1">Добро пожаловать в Astrid!</string>
-
-  <!-- slide 2a -->
-  <string name="welcome_title_2">Создать списки</string>
-
-  <!-- slide 3a-->
-  <string name="welcome_title_3">Переходите между списками</string>
-
-  <!-- slide 4a -->
-  <string name="welcome_title_4">Поделиться списками</string>
-
-  <!-- slide 5a -->
-  <string name="welcome_title_5">Распределить задания</string>
-
-  <!-- slide 6a -->
-  <string name="welcome_title_6">Предоставить подробности</string>
 
-  <!-- slide 7a -->
-  <string name="welcome_title_7">Подключиться сейчас\nчтобы начать!</string>
-  
-  <string name="welcome_title_7_return">Вот именно!</string>
-  
-  <!-- slide 1b -->
-  <string name="welcome_body_1">Лучший персональный менеджер задач,\nв нем удобно работать с друзьями</string>
-
-  <!-- slide 2b-->
-  <string name="welcome_body_2">Удобен для любого списка:\nчто почитать, посмотреть, купить, посетить!</string>
-
-  <!-- slide 3b -->
-  <string name="welcome_body_3">Нажми на название списка,\nчтобы увидеть все свои списки</string>
-
-  <!-- slide 4b -->
-  <string name="welcome_body_4">Поделитесь списками с\nдрузьями, соседями\nили любимым человеком!</string>
-
-  <!-- slide 5b -->
-  <string name="welcome_body_5">Никогда не интересовались, кто\nприносит Вам десерт?</string>
+    <string name="history_default">changed %1$s to %2$s</string>
 
-  <!-- slide 6b-->
-  <string name="welcome_body_6">Нажмите чтобы добавить заметки,\nустановить напоминания,\nи многое другое!</string>
-  <string name="welcome_body_7">Вход</string>
-  
-  <string name="welcome_body_7_return">Нажмите Astrid, чтобы вернуться назад.</string>
-  
-  <!-- slide 1c -->
-  <string name="welcome_next">Далее</string>
-  
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Voice Add Prompt Text -->
+    <string name="voice_create_prompt">Говорите чтобы создать задачу</string>
+    <string name="voice_edit_title_prompt">Произнесите название задачи</string>
+    <string name="voice_edit_note_prompt">Произнесите заметки задачи</string>
+
+    <!-- Preference: Task List recognition-service is not installed, but available -->
+    <string name="EPr_voiceInputInstall_dlg">Голосовой ввод не установлен.\n Хотите перейти на
+        Market и установить?
+    </string>
+    <!-- Preference: Task List recognition-service is not available for this system -->
+    <string name="EPr_voiceInputUnavailable_dlg">К сожалению голосовой ввод недоступен для вашей
+        системы.\n Если возможно, обновитесь до версии 2.1 или выше.
+    </string>
+    <!-- Preference: Market is not available for this system -->
+    <string name="EPr_marketUnavailable_dlg">К сожалению Market не доступен для вашей системы.\nЕсли
+        возможно, установите его из другого источника.
+    </string>
+    <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
+    <string name="EPr_voiceInputEnabled_title">Голосовой ввод</string>
+    <!-- slide 38a: Preference: voice button description (true) -->
+    <string name="EPr_voiceInputEnabled_desc_enabled">Кнопка голосового ввода будет показана на
+        странице списка задач
+    </string>
+    <!-- Preference: voice button description (false) -->
+    <string name="EPr_voiceInputEnabled_desc_disabled">Кнопка голосового ввода будет скрыта со
+        страницы списка задач
+    </string>
+    <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
+    <string name="EPr_voiceInputCreatesTask_title">Прямое создание задач</string>
+    <!-- Preference: Task List Voice-creation description (true) -->
+    <string name="EPr_voiceInputCreatesTask_desc_enabled">Задачи будут автоматически созданы с
+        помощью голосового ввода
+    </string>
+    <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
+    <string name="EPr_voiceInputCreatesTask_desc_disabled">Вы сможете редактировать заголовок после
+        завершения голосового ввода
+    </string>
+    <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
+    <string name="EPr_voiceRemindersEnabled_title">Голосовые напоминания</string>
+    <!-- Preference: Voice reminders description (true) -->
+    <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid должен произносить название задач
+        во время напоминаний
+    </string>
+    <!-- slide 38c: Preference: Voice reminders description (false) -->
+    <string name="EPr_voiceRemindersEnabled_desc_disabled">Оповещение звуком во время напоминания
+    </string>
+
+    <!-- slide 32d: Preference Category: Voice Title -->
+    <string name="EPr_voice_header">Параметры голосового ввода</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 30a-->
+    <string name="welcome_setting">Показать справку</string>
+
+    <string name="welcome_title_1">Добро пожаловать в Astrid!</string>
+
+    <!-- slide 2a -->
+    <string name="welcome_title_2">Создать списки</string>
+
+    <!-- slide 3a-->
+    <string name="welcome_title_3">Переходите между списками</string>
+
+    <!-- slide 4a -->
+    <string name="welcome_title_4">Поделиться списками</string>
+
+    <!-- slide 5a -->
+    <string name="welcome_title_5">Распределить задания</string>
+
+    <!-- slide 6a -->
+    <string name="welcome_title_6">Предоставить подробности</string>
+
+    <!-- slide 7a -->
+    <string name="welcome_title_7">Подключиться сейчас\nчтобы начать!</string>
+
+    <string name="welcome_title_7_return">Вот именно!</string>
+
+    <!-- slide 1b -->
+    <string name="welcome_body_1">Лучший персональный менеджер задач,\nв нем удобно работать с
+        друзьями
+    </string>
+
+    <!-- slide 2b-->
+    <string name="welcome_body_2">Удобен для любого списка:\nчто почитать, посмотреть, купить,
+        посетить!
+    </string>
+
+    <!-- slide 3b -->
+    <string name="welcome_body_3">Нажми на название списка,\nчтобы увидеть все свои списки</string>
+
+    <!-- slide 4b -->
+    <string name="welcome_body_4">Поделитесь списками с\nдрузьями, соседями\nили любимым
+        человеком!
+    </string>
+
+    <!-- slide 5b -->
+    <string name="welcome_body_5">Никогда не интересовались, кто\nприносит Вам десерт?</string>
+
+    <!-- slide 6b-->
+    <string name="welcome_body_6">Нажмите чтобы добавить заметки,\nустановить напоминания,\nи многое
+        другое!
+    </string>
+    <string name="welcome_body_7">Вход</string>
+
+    <string name="welcome_body_7_return">Нажмите Astrid, чтобы вернуться назад.</string>
+
+    <!-- slide 1c -->
+    <string name="welcome_next">Далее</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <string name="widget_mini">- Astrid Mini -</string>
-    
+
     <!-- Resources for power pack widget -->
-    
+
     <string name="PPW_widget_42_label">Old Astrid 4x2</string>
     <string name="PPW_widget_43_label">Old Astrid 4x3</string>
     <string name="PPW_widget_44_label">Old Astrid 4x4</string>
     <string name="PPW_widget_v11_label">- Astrid -</string>
     <string name="PPW_widget_custom_label">Astrid Custom Launcher Premium</string>
     <string name="PPW_widget_custom_launcherpro_label">Astrid Launcher Pro Premium</string>
-    
+
     <string name="PPW_configure_title">Настройка виджета</string>
-    
+
     <string name="PPW_color">Цвет виджета</string>
     <string name="PPW_enable_calendar">Показать календарное событие</string>
     <string name="PPW_disable_encouragements">Скрыть поддержку</string>
     <string name="PPW_show_dates">Отображать даты</string>
     <string name="PPW_filter">Выберите фильтр</string>
-    
+
     <string name="PPW_due">Срок:</string>
     <string name="PPW_past_due">Прошлый срок:</string>
-    
-    <string name="PPW_old_astrid_notice">Вам необходим ка минимум Astrid 3.6 чтобы использовать этот виджет. Извините!</string>
-    
+
+    <string name="PPW_old_astrid_notice">Вам необходим ка минимум Astrid 3.6 чтобы использовать этот
+        виджет. Извините!
+    </string>
+
     <string-array name="PPW_encouragements">
         <!-- general encouragements -->
-    	<item>Привет все!</item>
-    	<item>Есть время завершить кое-что?</item>
-    	<item>Черт возьми, ты хорош сегодня!</item>
-    	<item>Сделай что-то великое сегодня!</item>
-    	<item>Я буду гордиться тобой сегодня!</item>
-    	<item>Что ты сделаешь сегодня?</item>
+        <item>Привет все!</item>
+        <item>Есть время завершить кое-что?</item>
+        <item>Черт возьми, ты хорош сегодня!</item>
+        <item>Сделай что-то великое сегодня!</item>
+        <item>Я буду гордиться тобой сегодня!</item>
+        <item>Что ты сделаешь сегодня?</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_tod">
         <!-- encouragements based on time of day -->
-    	<item>Доброе утро!</item>
-    	<item>Добрый день!</item>
-    	<item>Добрый вечер!</item>
-    	<item>Не слишком поздно?</item>
-    	<item>Уже можно что-то выполнить!</item>
-    	<item>Чашечку чаю?</item>
-    	<item>Наслаждайтесь вечером!</item>
-    	<item>Сон полезен вам, вы знаете!</item>
+        <item>Доброе утро!</item>
+        <item>Добрый день!</item>
+        <item>Добрый вечер!</item>
+        <item>Не слишком поздно?</item>
+        <item>Уже можно что-то выполнить!</item>
+        <item>Чашечку чаю?</item>
+        <item>Наслаждайтесь вечером!</item>
+        <item>Сон полезен вам, вы знаете!</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_completed">
         <!-- encouragements based on tasks completed (%d => completed) -->
-    	<item>Вы завершили %d задач(и)!</item>
-    	<item>Текущий счет: %d задач выполнено</item>
-    	<item>Улыбнитесь! Выполнено %d задач(и)!</item>
+        <item>Вы завершили %d задач(и)!</item>
+        <item>Текущий счет: %d задач выполнено</item>
+        <item>Улыбнитесь! Выполнено %d задач(и)!</item>
     </string-array>
-  	<string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet! Shall we?</string>
-        
+    <string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet!
+        Shall we?
+    </string>
+
     <string-array name="PPW_colors">
         <item>Черный</item>
         <item>Белый</item>
         <item>Голубой</item>
         <item>Прозрачный</item>
     </string-array>
-    
-    <string name="PPW_widget_dlg_text">Этот виджет доступен только для владельцев PowerPack!</string>
+
+    <string name="PPW_widget_dlg_text">Этот виджет доступен только для владельцев PowerPack!
+    </string>
     <string name="PPW_widget_dlg_ok">Предпросмотр</string>
-    
+
     <string name="PPW_demo_title1">Записи от %s будут идти здесь</string>
     <string name="PPW_demo_title2">Power Pack включает премиум-виджеты...</string>
     <string name="PPW_demo_title3">... добавьте голосовую заметку и приятных ощущений!</string>
     <string name="PPW_demo_title4">Нажми и узнай больше!</string>
-    
+
     <string name="PPW_info_title">Бесплатный Power Pack!</string>
     <string name="PPW_info_signin">Войди!</string>
     <string name="PPW_info_later">Позже</string>
-    <string name="PPW_unlock_howto">Опубликуй списки для друзей! Получи бесплатный Power Pack когда 3 друга зарегистрируются в Astrid.</string>
+    <string name="PPW_unlock_howto">Опубликуй списки для друзей! Получи бесплатный Power Pack когда
+        3 друга зарегистрируются в Astrid.
+    </string>
     <string name="PPW_check_button">Получи Power Pack бесплатно!</string>
     <string name="PPW_check_share_lists">Опубликовать списки!</string>
-    <string name="PPW_api_level">Извините. Этот виджет поддерживается на версии Android 3.0 и выше.</string>
-    
+    <string name="PPW_api_level">Извините. Этот виджет поддерживается на версии Android 3.0 и
+        выше.
+    </string>
+
     <string name="EPr_widget_enabled_title">Включить/Отключить Виджеты</string>
-    <string name="PPW_restart_for_enabled_state">Возможно Вам придется перезагрузить телефон, чтобы изменение вступило в силу.</string>
+    <string name="PPW_restart_for_enabled_state">Возможно Вам придется перезагрузить телефон, чтобы
+        изменение вступило в силу.
+    </string>
 
 </resources>
diff --git a/astrid/res/values-sv/strings.xml b/astrid/res/values-sv/strings.xml
index 733afcf0d..20bdb667e 100755
--- a/astrid/res/values-sv/strings.xml
+++ b/astrid/res/values-sv/strings.xml
@@ -4,1689 +4,1834 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ================================================== general terms == -->
-
-  <!-- People Editing Activity -->    
-  
-  <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
-  <string name="actfm_person_hint">Kontakt eller e-post</string>
-  
-  <!-- task sharing dialog: shared with hint -->
-  <string name="actfm_person_or_tag_hint">Kontakt eller delad lista</string>
-
-  <!-- toast on transmit success -->
-
-  <!-- can\'t rename or delete shared tag message -->
-  
-  <!-- warning before deleting a list you\'re the owner of -->
-  <string name="actfm_tag_operation_owner_delete">Du är ägare till den här delade listan! Om du tar bort den, tas den bort för alla medlemmar på listan. Är du säker på att du vill fortsätta?</string>
-
-  <!-- slide 29a: menu item to take a picture -->
-  <string name="actfm_picture_camera">Ta en bild</string>
-
-  <!-- slide 29b: menu item to select from gallery -->
-  <string name="actfm_picture_gallery">Välj från galleri</string>
-  
-  <!-- menu item to clear picture selection -->
-  <string name="actfm_picture_clear">Rensa bild</string>
-
-  <!-- filter list activity: refresh tags -->
-  
-  <!-- Title for prompt after sharing a task -->
-  <string name="actfm_view_task_title">Visa uppgift?</string>
-
-  <!-- Text for prompt after sharing a task -->
-  <string name="actfm_view_task_text">Uppgiften skickad till %s! Dina egna uppgifter visas. Vill du visa denna och andra uppgifter du har tilldelat?</string>
-  
-  <!-- Ok button for task view prompt -->
-  <string name="actfm_view_task_ok">Visa tilldelade</string>
-      
-  <!-- Cancel button for task view prompt -->
-  <string name="actfm_view_task_cancel">Stanna här</string>
-  
-  <!-- slide 13a: Title for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_title">Mina delade uppgifter</string>
-  
-  <!-- Empty list for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_empty">Inga delade uppgifter</string>
-  
-  <!-- =====================  Friendship connections -->
-  
-  <string name="actfm_friendship_pending">Du har skickat en vänförfrågan till %s!</string>
-
-  <string name="actfm_friendship_blocked">Du har blockerat %s.</string>
-
-  <string name="actfm_friendship_ignored">Du ingorerar %s.</string>
-  
-  <string name="actfm_friendship_friends">Du är vän med %s! Lägg till uppgifter för dem nedan. </string>
-
-  <string name="actfm_friendship_other_pending">%s vill bli vän med dig!</string>
-
-  <string name="actfm_friendship_no_status">Ta kontakt med %s för att dela och se aktivitet på offentliga uppgifter!</string>
-
-  <string name="actfm_friendship_connect">Lägg till vän</string>
-
-  <string name="actfm_friendship_accept">Godkänn</string>
-
-  <!-- ================================================== TagViewActivity == -->  
-
-  <!-- Tag View Activity: Add Comment hint -->    
-  <string name="TVA_add_comment">Lägg till en kommentar...</string>
-
-  <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->    
-  
-  <!-- Tabs for Tag view -->
-  <string-array name="TVA_tabs">
-    <!-- Tab for showing tasks -->
-    <item>Uppgifter</item>
-    <!-- Tab for showing comments & updates -->
-    <item>Aktivitet</item>
-    <!-- Tab for showing setting -->
-    <item>Listinställningar</item>
-  </string-array>
-  
-  <!-- Tag View: filtered by assigned to user (%s => user name) -->
-  <string name="actfm_TVA_filtered_by_assign">%ss uppgifter. Tryck för att se alla. </string>
-  
-  <!-- Tag View: filter by unassigned tasks -->
-  <string name="actfm_TVA_filter_by_unassigned">Otilldelade uppgifter. Tryck för att se alla. </string>
-
-  <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Privat: tryck för att ändra eller dela lista</string>
-
-  <!-- Tag View Menu: refresh -->
-  <string name="actfm_TVA_menu_refresh">Uppdatera</string>
-
-  <!-- Tag Settings: tag name label -->
-  <string name="actfm_TVA_tag_label">Lista</string>
-
-  <!-- Tag Settings: tag owner label -->
-
-  <!-- Tag Settings: tag owner value when there is no owner -->
-
-  <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
-  <string name="actfm_TVA_members_label">Delad med</string>
-  
-  <!-- Tag Settings: list collaborators hint -->
-  <string name="actfm_TVA_members_hint">Dela med någon som har en e-postadress</string>
-
-  <!-- Tag Settings: tag picture -->
-  <string name="actfm_TVA_tag_picture">Listbild</string>
-
-  <!-- slide 25c/28b: Tag Settings: silence notifications label -->
-  <string name="actfm_TVA_silence_label">Tysta påminelser</string>
-  
-  <!-- Tag Settings: list icon label -->
-  
-  <!-- slide 25b/27d: Tag Settings: list description label -->
-  <string name="actfm_TVA_tag_description_label">Beskrivning</string>
-  
-  <!-- slide 28a: Tag Settings: list settings label -->
-  <string name="actfm_TVA_tag_settings_label">Inställningar</string>
-
-  <!-- slide 25b: Tag Settings: list description hint -->
-  <string name="actfm_TVA_tag_description_hint">Skriv en beskrivning här</string>
-  
-  <!-- slide 25d: Tag Settings: list name hint -->
-  <string name="actfm_TVA_tag_name_hint">Ange listnamn</string>
-  
-  <!-- Tag settings: login prompt from share-->
-  <string name="actfm_TVA_login_to_share">Du måste vara inloggad på Astrid.com för att dela listor! Logga in eller gör listan privat.</string>
-  
-      
-  <!-- ============================================ edit people dialog == -->
-
-  <!-- task sharing dialog: intro -->
-  <string name="actfm_EPA_intro">Använd Astrid för att dela inköpslistor, festplaner eller projekt och se direkt när folk får saker och ting gjort!</string>
-    
-  <!-- task sharing dialog: window title -->
-    
-  <!-- task sharing dialog: save button -->
-  
-  <!-- task sharing dialog: assigned label -->
-  
-  <!-- slide 18a: task sharing dialog: assigned label long version -->
-  <string name="actfm_EPA_assign_label_long">Vem ska göra det här?</string>
-  
-  <!-- task sharing dialog: assigned to me -->
-  <string name="actfm_EPA_assign_me">Tilldelad av mig till</string>
-  
-  <!-- task sharing dialog: anyone -->
-  <string name="actfm_EPA_unassigned">Ej tilldelad</string>
-  
-  <!-- slide 18c: task sharing dialog: choose a contact -->
-  <string name="actfm_EPA_choose_contact">Välj en kontakt</string>
-  
-  <!-- task sharing dialog: custom email assignment -->
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_share_with">Dela med:</string>
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_collaborators_header">Dela</string>
-
-      <!-- task sharing dialog: collaborator list name (%s => name of list) -->
-  <string name="actfm_EPA_list">Lista: %s</string>
-  
-  <!-- task sharing dialog: assigned hint -->
-  
-  <!-- task sharing dialog: message label text -->
-  <string name="actfm_EPA_message_text">Meddelande i inbjudan:</string>
-  
-  <!-- task sharing dialog: message body -->
-  <string name="actfm_EPA_message_body">Hjälp mig få det här gjort!</string>
-  
-  <!-- task sharing dialog: list members section header -->
-  <string name="actfm_EPA_assign_header_members">Listmedlemmar</string>
-
-  <!-- task sharing dialog: astrid friends section header -->
-  <string name="actfm_EPA_assign_header_friends">Astridvänner</string>
-
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: share with Facebook -->
-  <string name="actfm_EPA_facebook">Facebook</string>
-  
-  <!-- task sharing dialog: share with Twitter -->
-  <string name="actfm_EPA_twitter">Twitter</string>
-
-  <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
-
-  <!-- task sharing dialog: edit people settings saved -->
-
-  <!-- task sharing dialog: invalid email (%s => email) -->
-  <string name="actfm_EPA_invalid_email">Felaktig e-postadress: %s</string>
-
-  <!-- task sharing dialog: tag not found (%s => tag) -->
-  
-  <!-- task sharing login prompt -->
-  <string name="actfm_EPA_login_to_share">Du måste vara inloggad på Astrid.com för att dela uppgifter!</string>
-  
-  <string name="actfm_EPA_login_button">Logga in</string>
-  
-  <string name="actfm_EPA_dont_share_button">Dela inte</string>
-  
-  <string name="actfm_EPA_add_person_to_list_title">Uppgift tilldelad</string>
-  
-  <string name="actfm_EPA_add_person_to_list">%1$s är inte delad på denna lista. Vill du lägga till %2$s på denna lista?</string>
-
-  <string name="actfm_EPA_add_person_to_list_ok">Lägg till på lista</string>
-  
-  <string name="actfm_EPA_add_person_to_list_cancel">Lägg inte till</string>
-  
-  <string name="actfm_list_owner">(owner)</string>
-  
-  <!-- ========================================= sharing login activity == -->
-
-  <!-- share login: Title -->
-  <string name="actfm_ALA_title">Välkommen till Astrid.com!</string>
-
-  <!-- share login: Sharing Description -->
-  <string name="actfm_ALA_body">Astrid.com låter dig komma åt dina uppgifter via nätet, dela dem med andra och dela ut dem till andra.</string>
-
-  <!-- share login: Sharing Login FB Prompt -->
-  <string name="actfm_ALA_fb_login">Logga in med Facebook</string>
-
-  <!-- share login: Sharing Login GG Prompt -->
-  <string name="actfm_ALA_gg_login">Logga in med Facebook</string>
-  
-  <!-- share login: Quickly log in as <%s -> email> -->
-  <string name="actfm_quick_login">Logga in: %s</string>
-
-  <!-- share login: Reject quick login -->
-  <string name="actfm_quick_login_reject">Inte %s?</string>
-
-  <!-- share login: Name -->
-  <string name="actfm_ALA_firstname_label">Förnamn</string>
-  
-  <!-- share login: Name -->
-  <string name="actfm_ALA_lastname_label">Efternamn</string>
-
-  <!-- share login: Email -->
-  <string name="actfm_ALA_email_label">E-postadress</string>
-
-  <!-- share login: Username / Email -->
-
-  <!-- share login: Password -->
-  <string name="actfm_ALA_password_label">Lösenord</string>
-
-  <!-- share login: Sign Up Title -->
-  <string name="actfm_ALA_signup_title">Registrera dig</string>
-
-  <!-- share login: Login Title -->
-  <string name="actfm_ALA_login_title">Logga in på Astrid.com</string>
-
-  <!-- share login: Google Auth title -->
-  <string name="actfm_GAA_title">Välj vilket Googlekonto du vill använda:</string>
-
-  <!-- share login: OAUTH Login Prompt -->
-  <string name="actfm_OLA_prompt">Logga in:</string>
-  
-  <!-- Login error: user exists -->
-  <string name="actfm_ALA_error_user_exists">Användaren finns redan - vänligen logga in istället.</string>
-  
-  <!-- Login error: wrong password -->
-  <string name="actfm_ALA_error_wrong_password">Det angivna lösenordet var tyvärr felaktigt. Försök igen.</string>
-  
-  <!-- Forgot password link -->
-  <string name="actfm_ALA_forgot_password">Glömt lösenordet?</string>
-  
-  <!-- Forgot password email prompt -->
-  <string name="actfm_ALA_enter_email">Ange din epostadress</string>
-  
-  <!-- Password reset sent (%s -> email) -->
-  <string name="actfm_ALA_reset_sent">Återställning av lösenordet har skickats till %s</string>
-  
-  <!-- User already exists - first sync may be slow -->
-  <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your patience!</string>
-  
-  <!-- User not found -->
-  <string name="actfm_ALA_error_user_not_found">Det finns ingen användare med den angivna epostadressen. Prova att registrera dig istället!</string>
-  
-  <!-- ================================================ Featured Lists -->
-
-  <string name="actfm_feat_list_clone">Kopiera lista</string>
-  
-  <string name="actfm_feat_list_suffix">(Kopiera)</string>
-
-  <string name="actfm_feat_list_cloning">Kopierar...</string>
-
-  <string name="actfm_feat_list_clone_success">Klart!</string>
-
-  <string name="actfm_feat_list_task_clone_success">Uppgift kopierad</string>
-
-  <string name="actfm_feat_list_clone_empty">Ingen uppgift att kopiera</string>
-  
-  <!-- ================================================ Synchronization == -->
-      
-  <!-- Indicates the logged in user name. %s -> user\'s name -->
-  <string name="actfm_status_title_logged_in">Status - inloggad som %s</string>    
-      
-  <!-- Preferences Title: Act.fm -->    
-  <string name="actfm_APr_header">Astrid.com</string>
-  
-  <string name="actfm_https_title">Använd HTTPS</string>
-  <string name="actfm_https_enabled">HTTPS aktiverat (långsammare)</string>
-  <string name="actfm_https_disabled">HTTPS avaktiverat (snabbare)</string>
-
-  <!-- title for notification tray after synchronizing -->
-  
-  <!-- text for notification when comments are received -->
-    
-  <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, 
-      Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page,
-      or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.  
-      Are you sure you want to sync with Astrid.com?</string>
-      
-  <!-- account types -->
-  <string name="actfm_account_type">Kontotyp</string>
-  <string name="actfm_account_info">Kontoinformation</string>
-  <string name="actfm_account_info_summary">Status och alternativ</string>
-  <string name="account_type_title_not_logged_in">Registrera ett gratis konto</string>
-  <string name="account_type_summary_not_logged_in">Nå dina uppgifter online, dela listor och delegera</string>
-  
-  
-  <string name="actfm_account_premium">Premium</string>
-  <string name="actfm_account_basic">Grundläggande</string>
-  
-  <string name="actfm_inapp_billing">Uppgradera till Premium</string>
-  <string name="actfm_inapp_billing_summary">Bifoga filer, röstbackup, premiumsupport &amp; mer</string>
-  
-  <!-- Sharing -->
-  <string name="share_with_facebook">Gilla på Facebook</string>
-  <string name="share_with_twitter">Följ på Twitter</string>
-  <string name="share_with_google">Dela på Google+</string>
-  <string name="share_speech_bubble">Genom att Dela hjälper du andra att bli mer produktiva!</string>
-  
-  
-  <!-- Sync upgrade messages -->
-  <string name="sync_upgr_both_title">Använda Astrid.com med Google utan dubletter</string>
-  <string name="sync_upgr_both_body">Låt oss vara ärdlig. Google Uppgifter är bekvänt men inte lika häftigt som Astrid. För att undvika dubletter så kan du inte längre synkronisera med Astrid.com och bakgrundssynkronisera med Google Uppgifter samtidigt. Du kan fortfarande importera dina Google Uppgifter genom att besöka Inställningar → Backup &amp; Sync, eller nedgradera till enbart Google Uppgiftersynkronisering</string>
-  <string name="sync_upgr_both_btn1">Behåll Astrid</string>
-  <string name="sync_upgr_both_btn2">Nedgradera till Google Uppgifter</string>
-  
-  <string name="sync_upgr_gtasks_only_title">Uppgradera till Astrid Sync gratis!</string>
-  <string name="sync_upgr_gtasks_only_body">Få tillgång till dina uppgifter från alla dina enheter och från Gmail med Astrid.com Synk. Uppgradera till Astrid.com Synk (Du kan alltid gå tillbaka till Google Uppgifter - men du kommer inte att vilja!)</string>
-  <string name="sync_upgr_gtasks_only_btn1">Uppgradera till Astrid Sync</string>
-  <string name="sync_upgr_gtasks_only_btn2">Behåll Google Uppgifter</string>
-  
-  <string name="sync_upgr_neither_title">Free backup &amp; Sync!</string>
-  <string name="sync_upgr_neither_body">Utsätt inte dina uppgifter för fara! Med nya och förbättrade Astrid sync får du tillgång till dina uppgifter var som helst ifrån.</string>
-  <string name="sync_upgr_neither_btn1">Registrera dig nu</string>
-  
-  <string name="sync_upgr_logged_out">Du har loggats ut från Astrid</string>
-  
-  <string name="actfm_logout_clear_tasks_title">Rensa data?</string>
-  <string name="actfm_logout_clear_tasks_body">Vill du radera dina uppgifter och data?</string>
-  <string name="actfm_logout_clear_tasks_yes">Radera data</string>
-  <string name="actfm_logout_clear_tasks_no">Behåll data</string>
-  
-  <string name="actfm_logged_in_different_user_title">Loggar in som annan användare</string>
-  <string name="actfm_logged_in_different_user_body">Vill du radera nuvarande telefonuppgifter innan synkronisering?</string>
-  <string name="actfm_logged_in_different_user_keep_data">Behåll data</string>
-  <string name="actfm_logged_in_different_user_clear_data">Radera alla data</string>
-  <string name="actfm_logged_in_different_user_processing">Bearbetar nuvarande data</string>
-  
-  <string name="actfm_tag_not_authorized_title">Not authorized</string>
-  <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name?</string>
-  <string name="actfm_tag_not_authorized_new_list">Create new list</string>
-  <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
-  
-  <string name="actfm_sync_ongoing">Synkronisering pågår...</string>
-  
-  <string name="EPr_reset_sync_state">Reset sync</string>
-  <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors</string>
-  <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue?</string>
-  
+<resources>
 
+    <!-- ================================================== general terms == -->
 
+    <!-- People Editing Activity -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
+    <string name="actfm_person_hint">Kontakt eller e-post</string>
+
+    <!-- task sharing dialog: shared with hint -->
+    <string name="actfm_person_or_tag_hint">Kontakt eller delad lista</string>
+
+    <!-- toast on transmit success -->
+
+    <!-- can\'t rename or delete shared tag message -->
+
+    <!-- warning before deleting a list you\'re the owner of -->
+    <string name="actfm_tag_operation_owner_delete">Du är ägare till den här delade listan! Om du
+        tar bort den, tas den bort för alla medlemmar på listan. Är du säker på att du vill
+        fortsätta?
+    </string>
+
+    <!-- slide 29a: menu item to take a picture -->
+    <string name="actfm_picture_camera">Ta en bild</string>
+
+    <!-- slide 29b: menu item to select from gallery -->
+    <string name="actfm_picture_gallery">Välj från galleri</string>
+
+    <!-- menu item to clear picture selection -->
+    <string name="actfm_picture_clear">Rensa bild</string>
+
+    <!-- filter list activity: refresh tags -->
+
+    <!-- Title for prompt after sharing a task -->
+    <string name="actfm_view_task_title">Visa uppgift?</string>
+
+    <!-- Text for prompt after sharing a task -->
+    <string name="actfm_view_task_text">Uppgiften skickad till %s! Dina egna uppgifter visas. Vill
+        du visa denna och andra uppgifter du har tilldelat?
+    </string>
+
+    <!-- Ok button for task view prompt -->
+    <string name="actfm_view_task_ok">Visa tilldelade</string>
+
+    <!-- Cancel button for task view prompt -->
+    <string name="actfm_view_task_cancel">Stanna här</string>
+
+    <!-- slide 13a: Title for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_title">Mina delade uppgifter</string>
+
+    <!-- Empty list for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_empty">Inga delade uppgifter</string>
+
+    <!-- =====================  Friendship connections -->
+
+    <string name="actfm_friendship_pending">Du har skickat en vänförfrågan till %s!</string>
+
+    <string name="actfm_friendship_blocked">Du har blockerat %s.</string>
+
+    <string name="actfm_friendship_ignored">Du ingorerar %s.</string>
+
+    <string name="actfm_friendship_friends">Du är vän med %s! Lägg till uppgifter för dem nedan.
+    </string>
+
+    <string name="actfm_friendship_other_pending">%s vill bli vän med dig!</string>
+
+    <string name="actfm_friendship_no_status">Ta kontakt med %s för att dela och se aktivitet på
+        offentliga uppgifter!
+    </string>
+
+    <string name="actfm_friendship_connect">Lägg till vän</string>
+
+    <string name="actfm_friendship_accept">Godkänn</string>
+
+    <!-- ================================================== TagViewActivity == -->
+
+    <!-- Tag View Activity: Add Comment hint -->
+    <string name="TVA_add_comment">Lägg till en kommentar...</string>
+
+    <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->
+
+    <!-- Tabs for Tag view -->
+    <string-array name="TVA_tabs">
+        <!-- Tab for showing tasks -->
+        <item>Uppgifter</item>
+        <!-- Tab for showing comments & updates -->
+        <item>Aktivitet</item>
+        <!-- Tab for showing setting -->
+        <item>Listinställningar</item>
+    </string-array>
+
+    <!-- Tag View: filtered by assigned to user (%s => user name) -->
+    <string name="actfm_TVA_filtered_by_assign">%ss uppgifter. Tryck för att se alla.</string>
+
+    <!-- Tag View: filter by unassigned tasks -->
+    <string name="actfm_TVA_filter_by_unassigned">Otilldelade uppgifter. Tryck för att se alla.
+    </string>
+
+    <!-- Tag View: list is private, no members -->
+    <string name="actfm_TVA_no_members_alert">Privat: tryck för att ändra eller dela lista</string>
+
+    <!-- Tag View Menu: refresh -->
+    <string name="actfm_TVA_menu_refresh">Uppdatera</string>
+
+    <!-- Tag Settings: tag name label -->
+    <string name="actfm_TVA_tag_label">Lista</string>
+
+    <!-- Tag Settings: tag owner label -->
+
+    <!-- Tag Settings: tag owner value when there is no owner -->
+
+    <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
+    <string name="actfm_TVA_members_label">Delad med</string>
+
+    <!-- Tag Settings: list collaborators hint -->
+    <string name="actfm_TVA_members_hint">Dela med någon som har en e-postadress</string>
+
+    <!-- Tag Settings: tag picture -->
+    <string name="actfm_TVA_tag_picture">Listbild</string>
+
+    <!-- slide 25c/28b: Tag Settings: silence notifications label -->
+    <string name="actfm_TVA_silence_label">Tysta påminelser</string>
+
+    <!-- Tag Settings: list icon label -->
+
+    <!-- slide 25b/27d: Tag Settings: list description label -->
+    <string name="actfm_TVA_tag_description_label">Beskrivning</string>
+
+    <!-- slide 28a: Tag Settings: list settings label -->
+    <string name="actfm_TVA_tag_settings_label">Inställningar</string>
+
+    <!-- slide 25b: Tag Settings: list description hint -->
+    <string name="actfm_TVA_tag_description_hint">Skriv en beskrivning här</string>
+
+    <!-- slide 25d: Tag Settings: list name hint -->
+    <string name="actfm_TVA_tag_name_hint">Ange listnamn</string>
+
+    <!-- Tag settings: login prompt from share-->
+    <string name="actfm_TVA_login_to_share">Du måste vara inloggad på Astrid.com för att dela
+        listor! Logga in eller gör listan privat.
+    </string>
+
+
+    <!-- ============================================ edit people dialog == -->
+
+    <!-- task sharing dialog: intro -->
+    <string name="actfm_EPA_intro">Använd Astrid för att dela inköpslistor, festplaner eller projekt
+        och se direkt när folk får saker och ting gjort!
+    </string>
+
+    <!-- task sharing dialog: window title -->
+
+    <!-- task sharing dialog: save button -->
+
+    <!-- task sharing dialog: assigned label -->
+
+    <!-- slide 18a: task sharing dialog: assigned label long version -->
+    <string name="actfm_EPA_assign_label_long">Vem ska göra det här?</string>
+
+    <!-- task sharing dialog: assigned to me -->
+    <string name="actfm_EPA_assign_me">Tilldelad av mig till</string>
+
+    <!-- task sharing dialog: anyone -->
+    <string name="actfm_EPA_unassigned">Ej tilldelad</string>
+
+    <!-- slide 18c: task sharing dialog: choose a contact -->
+    <string name="actfm_EPA_choose_contact">Välj en kontakt</string>
+
+    <!-- task sharing dialog: custom email assignment -->
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_share_with">Dela med:</string>
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_collaborators_header">Dela</string>
+
+    <!-- task sharing dialog: collaborator list name (%s => name of list) -->
+    <string name="actfm_EPA_list">Lista: %s</string>
+
+    <!-- task sharing dialog: assigned hint -->
+
+    <!-- task sharing dialog: message label text -->
+    <string name="actfm_EPA_message_text">Meddelande i inbjudan:</string>
+
+    <!-- task sharing dialog: message body -->
+    <string name="actfm_EPA_message_body">Hjälp mig få det här gjort!</string>
+
+    <!-- task sharing dialog: list members section header -->
+    <string name="actfm_EPA_assign_header_members">Listmedlemmar</string>
+
+    <!-- task sharing dialog: astrid friends section header -->
+    <string name="actfm_EPA_assign_header_friends">Astridvänner</string>
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: share with Facebook -->
+    <string name="actfm_EPA_facebook">Facebook</string>
+
+    <!-- task sharing dialog: share with Twitter -->
+    <string name="actfm_EPA_twitter">Twitter</string>
+
+    <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
+
+    <!-- task sharing dialog: edit people settings saved -->
+
+    <!-- task sharing dialog: invalid email (%s => email) -->
+    <string name="actfm_EPA_invalid_email">Felaktig e-postadress: %s</string>
+
+    <!-- task sharing dialog: tag not found (%s => tag) -->
+
+    <!-- task sharing login prompt -->
+    <string name="actfm_EPA_login_to_share">Du måste vara inloggad på Astrid.com för att dela
+        uppgifter!
+    </string>
+
+    <string name="actfm_EPA_login_button">Logga in</string>
+
+    <string name="actfm_EPA_dont_share_button">Dela inte</string>
+
+    <string name="actfm_EPA_add_person_to_list_title">Uppgift tilldelad</string>
+
+    <string name="actfm_EPA_add_person_to_list">%1$s är inte delad på denna lista. Vill du lägga
+        till %2$s på denna lista?
+    </string>
+
+    <string name="actfm_EPA_add_person_to_list_ok">Lägg till på lista</string>
+
+    <string name="actfm_EPA_add_person_to_list_cancel">Lägg inte till</string>
+
+    <string name="actfm_list_owner">(owner)</string>
+
+    <!-- ========================================= sharing login activity == -->
+
+    <!-- share login: Title -->
+    <string name="actfm_ALA_title">Välkommen till Astrid.com!</string>
+
+    <!-- share login: Sharing Description -->
+    <string name="actfm_ALA_body">Astrid.com låter dig komma åt dina uppgifter via nätet, dela dem
+        med andra och dela ut dem till andra.
+    </string>
+
+    <!-- share login: Sharing Login FB Prompt -->
+    <string name="actfm_ALA_fb_login">Logga in med Facebook</string>
+
+    <!-- share login: Sharing Login GG Prompt -->
+    <string name="actfm_ALA_gg_login">Logga in med Facebook</string>
+
+    <!-- share login: Quickly log in as <%s -> email> -->
+    <string name="actfm_quick_login">Logga in: %s</string>
+
+    <!-- share login: Reject quick login -->
+    <string name="actfm_quick_login_reject">Inte %s?</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_firstname_label">Förnamn</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_lastname_label">Efternamn</string>
+
+    <!-- share login: Email -->
+    <string name="actfm_ALA_email_label">E-postadress</string>
+
+    <!-- share login: Username / Email -->
+
+    <!-- share login: Password -->
+    <string name="actfm_ALA_password_label">Lösenord</string>
+
+    <!-- share login: Sign Up Title -->
+    <string name="actfm_ALA_signup_title">Registrera dig</string>
+
+    <!-- share login: Login Title -->
+    <string name="actfm_ALA_login_title">Logga in på Astrid.com</string>
+
+    <!-- share login: Google Auth title -->
+    <string name="actfm_GAA_title">Välj vilket Googlekonto du vill använda:</string>
+
+    <!-- share login: OAUTH Login Prompt -->
+    <string name="actfm_OLA_prompt">Logga in:</string>
+
+    <!-- Login error: user exists -->
+    <string name="actfm_ALA_error_user_exists">Användaren finns redan - vänligen logga in
+        istället.
+    </string>
+
+    <!-- Login error: wrong password -->
+    <string name="actfm_ALA_error_wrong_password">Det angivna lösenordet var tyvärr felaktigt.
+        Försök igen.
+    </string>
+
+    <!-- Forgot password link -->
+    <string name="actfm_ALA_forgot_password">Glömt lösenordet?</string>
+
+    <!-- Forgot password email prompt -->
+    <string name="actfm_ALA_enter_email">Ange din epostadress</string>
+
+    <!-- Password reset sent (%s -> email) -->
+    <string name="actfm_ALA_reset_sent">Återställning av lösenordet har skickats till %s</string>
+
+    <!-- User already exists - first sync may be slow -->
+    <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your
+        patience!
+    </string>
+
+    <!-- User not found -->
+    <string name="actfm_ALA_error_user_not_found">Det finns ingen användare med den angivna
+        epostadressen. Prova att registrera dig istället!
+    </string>
+
+    <!-- ================================================ Featured Lists -->
+
+    <string name="actfm_feat_list_clone">Kopiera lista</string>
+
+    <string name="actfm_feat_list_suffix">(Kopiera)</string>
+
+    <string name="actfm_feat_list_cloning">Kopierar...</string>
+
+    <string name="actfm_feat_list_clone_success">Klart!</string>
+
+    <string name="actfm_feat_list_task_clone_success">Uppgift kopierad</string>
+
+    <string name="actfm_feat_list_clone_empty">Ingen uppgift att kopiera</string>
+
+    <!-- ================================================ Synchronization == -->
+
+    <!-- Indicates the logged in user name. %s -> user\'s name -->
+    <string name="actfm_status_title_logged_in">Status - inloggad som %s</string>
+
+    <!-- Preferences Title: Act.fm -->
+    <string name="actfm_APr_header">Astrid.com</string>
+
+    <string name="actfm_https_title">Använd HTTPS</string>
+    <string name="actfm_https_enabled">HTTPS aktiverat (långsammare)</string>
+    <string name="actfm_https_disabled">HTTPS avaktiverat (snabbare)</string>
+
+    <!-- title for notification tray after synchronizing -->
+
+    <!-- text for notification when comments are received -->
+
+    <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid
+        duplicate tasks and other synchronization issues,
+        Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You
+        can still import tasks from Google Tasks from the Google Tasks settings page,
+        or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.
+        Are you sure you want to sync with Astrid.com?
+    </string>
+
+    <!-- account types -->
+    <string name="actfm_account_type">Kontotyp</string>
+    <string name="actfm_account_info">Kontoinformation</string>
+    <string name="actfm_account_info_summary">Status och alternativ</string>
+    <string name="account_type_title_not_logged_in">Registrera ett gratis konto</string>
+    <string name="account_type_summary_not_logged_in">Nå dina uppgifter online, dela listor och
+        delegera
+    </string>
+
+
+    <string name="actfm_account_premium">Premium</string>
+    <string name="actfm_account_basic">Grundläggande</string>
+
+    <string name="actfm_inapp_billing">Uppgradera till Premium</string>
+    <string name="actfm_inapp_billing_summary">Bifoga filer, röstbackup, premiumsupport &amp; mer
+    </string>
+
+    <!-- Sharing -->
+    <string name="share_with_facebook">Gilla på Facebook</string>
+    <string name="share_with_twitter">Följ på Twitter</string>
+    <string name="share_with_google">Dela på Google+</string>
+    <string name="share_speech_bubble">Genom att Dela hjälper du andra att bli mer produktiva!
+    </string>
+
+
+    <!-- Sync upgrade messages -->
+    <string name="sync_upgr_both_title">Använda Astrid.com med Google utan dubletter</string>
+    <string name="sync_upgr_both_body">Låt oss vara ärdlig. Google Uppgifter är bekvänt men inte
+        lika häftigt som Astrid. För att undvika dubletter så kan du inte längre synkronisera med
+        Astrid.com och bakgrundssynkronisera med Google Uppgifter samtidigt. Du kan fortfarande
+        importera dina Google Uppgifter genom att besöka Inställningar → Backup &amp; Sync, eller
+        nedgradera till enbart Google Uppgiftersynkronisering
+    </string>
+    <string name="sync_upgr_both_btn1">Behåll Astrid</string>
+    <string name="sync_upgr_both_btn2">Nedgradera till Google Uppgifter</string>
+
+    <string name="sync_upgr_gtasks_only_title">Uppgradera till Astrid Sync gratis!</string>
+    <string name="sync_upgr_gtasks_only_body">Få tillgång till dina uppgifter från alla dina enheter
+        och från Gmail med Astrid.com Synk. Uppgradera till Astrid.com Synk (Du kan alltid gå
+        tillbaka till Google Uppgifter - men du kommer inte att vilja!)
+    </string>
+    <string name="sync_upgr_gtasks_only_btn1">Uppgradera till Astrid Sync</string>
+    <string name="sync_upgr_gtasks_only_btn2">Behåll Google Uppgifter</string>
+
+    <string name="sync_upgr_neither_title">Free backup &amp; Sync!</string>
+    <string name="sync_upgr_neither_body">Utsätt inte dina uppgifter för fara! Med nya och
+        förbättrade Astrid sync får du tillgång till dina uppgifter var som helst ifrån.
+    </string>
+    <string name="sync_upgr_neither_btn1">Registrera dig nu</string>
+
+    <string name="sync_upgr_logged_out">Du har loggats ut från Astrid</string>
+
+    <string name="actfm_logout_clear_tasks_title">Rensa data?</string>
+    <string name="actfm_logout_clear_tasks_body">Vill du radera dina uppgifter och data?</string>
+    <string name="actfm_logout_clear_tasks_yes">Radera data</string>
+    <string name="actfm_logout_clear_tasks_no">Behåll data</string>
+
+    <string name="actfm_logged_in_different_user_title">Loggar in som annan användare</string>
+    <string name="actfm_logged_in_different_user_body">Vill du radera nuvarande telefonuppgifter
+        innan synkronisering?
+    </string>
+    <string name="actfm_logged_in_different_user_keep_data">Behåll data</string>
+    <string name="actfm_logged_in_different_user_clear_data">Radera alla data</string>
+    <string name="actfm_logged_in_different_user_processing">Bearbetar nuvarande data</string>
+
+    <string name="actfm_tag_not_authorized_title">Not authorized</string>
+    <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you
+        may have been removed). Would you like to create a new list with the same name?
+    </string>
+    <string name="actfm_tag_not_authorized_new_list">Create new list</string>
+    <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
+
+    <string name="actfm_sync_ongoing">Synkronisering pågår...</string>
+
+    <string name="EPr_reset_sync_state">Reset sync</string>
+    <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors
+    </string>
+    <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will
+        be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you
+        wish to continue?
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in timers plug-in -->
+
+    <!-- Task Edit Activity: Container Label -->
+    <string name="alarm_ACS_label">Alarm</string>
+
+    <!-- Task Edit Activity: Add New Alarm -->
+    <string name="alarm_ACS_button">Lägg till ett alarm</string>
+
+    <string-array name="reminders_alarm">
+        <!-- reminders related to alarm -->
+        <item>Alarm!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in backup plug-in -->
+
+    <!-- ================================================= BackupPreferences == -->
+
+    <!-- slide 33c/48d: Backup Preferences Title -->
+    <string name="backup_BPr_header">Säkerhetskopior</string>
+
+    <!-- slide 48e/50c: Backup: Status Header -->
+    <string name="backup_BPr_group_status">Status</string>
+
+    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->
+    <string name="backup_status_success">Senaste: %s</string>
+    <!-- Backup Status: last error failed. Keep it short! -->
+    <string name="backup_status_failed">Senaste säkerhetskopieringen misslyckades</string>
+    <!-- Backup Status: error subtitle -->
+    <string name="backup_status_failed_subtitle">(klicka för att se felet)</string>
+    <!-- slide 48a: Backup Status: never backed up -->
+    <string name="backup_status_never">Aldrig säkerhetskopierat!</string>
+
+    <!-- slide 48f/ 50e: Backup Options Group Label -->
+    <string name="backup_BPr_group_options">Alternativ</string>
+
+    <!-- slide 48b: Preference: Automatic Backup Title -->
+    <string name="backup_BPr_auto_title">Automatisk säkerhetskopiering</string>
+    <!-- Preference: Automatic Backup Description (when disabled) -->
+    <string name="backup_BPr_auto_disabled">Automatisk säkerhetskopiering avaktiverad</string>
+    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
+    <string name="backup_BPr_auto_enabled">Säkerhetskopiering kommer att ske dagligen</string>
+
+    <!-- Preference screen restoring Tasks Help -->
+    <!-- Preference screen Restoring Tasks Help Dialog Text-->
+
+    <string name="backup_BPr_cloud_already_logged_in">Du har redan backup i molnet på Astrid.com!
+    </string>
+
+    <!-- ================================================= BackupActivity == -->
+
+    <!-- slide 48c: backup activity label -->
+    <string name="backup_BAc_label">Hantera säkerhetskopior</string>
+
+    <!-- backup activity title -->
+    <string name="backup_BAc_title">Hantera dina säkerhetskopior</string>
+
+    <!-- backup activity import button -->
+    <string name="backup_BAc_import">Importera uppgifter</string>
+
+    <!-- backup activity export button -->
+    <string name="backup_BAc_export">Exportera uppgifter</string>
+
+    <!-- backup activity cloud (Astrid.com) option -->
+    <string name="backup_BAc_cloud">Klicka för gratis backup i molnet på Astrid.com</string>
+
+    <!-- ============================================== Importer / Exporter == -->
+
+    <!-- Message displayed when error occurs -->
+    <string name="backup_TXI_error">Importfel</string>
+
+    <string name="export_toast">Säkerhetskopierade %1$s till %2$s.</string>
+
+    <string name="export_toast_no_tasks">Inga uppgifter att exportera</string>
+
+    <!-- Progress Dialog Title for exporting -->
+    <string name="export_progress_title">Exporterar...</string>
+
+    <!-- Backup: Title of Import Summary Dialog -->
+    <string name="import_summary_title">Återställningssammanfattning</string>
+
+    <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
+    <string name="import_summary_message">Filen %1$s innehöll %2$s.\n\n %3$s importerade,\n %4$s
+        existerar redan\n %5$s hade fel\n
+    </string>
+
+    <!-- Progress Dialog Title for importing -->
+    <string name="import_progress_title">Importerar...</string>
+
+    <!-- Progress Dialog text for import reading task (%d -> task number)-->
+    <string name="import_progress_read">Läser uppgift %d...</string>
+
+    <!-- Backup: Dialog when unable to open a file -->
+
+    <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
+    <string name="DLG_error_sdcard">Mappåtkomst nekad: %s</string>
+
+    <!-- Backup: Dialog when unable to open SD card in general -->
+    <string name="DLG_error_sdcard_general">SD-kort ej tillgängligt!</string>
+
+    <!-- Backup: File Selector dialog for import -->
+    <string name="import_file_prompt">Välj en fil att återställa</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- ================================================== AndroidManifest == -->
+
+    <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
+    <string name="app_name">Astrid Uppgifter</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="read_permission_label">Astrid Tillstånd</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="read_permission_desc">läs uppgifter, visa uppgiftsfilter</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="write_permission_label">Astrid Tillstånd</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="write_permission_desc">skapa nya uppgifter, redigera existerande uppgifter
+    </string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- question for deleting tasks -->
+    <string name="DLG_delete_this_task_question">Radera denna uppgift?</string>
+
+    <!-- question for deleting items (%s => item name) -->
+    <string name="DLG_delete_this_item_question">Radera följande: %s?</string>
+
+    <!-- Progress dialog shown when upgrading -->
+    <string name="DLG_upgrading">Uppgraderar dina uppgifter...</string>
+
+    <!-- Title for dialog selecting a time (hours and minutes) -->
+    <string name="DLG_hour_minutes">Tid (timmar : minuter)</string>
+
+    <!-- Dialog for Astrid having a critical update -->
+    <string name="DLG_please_update">Astrid bör uppdateras till senaste version i Android Market!
+        Var god gör det innan du fortsätter, eller vänta några sekunder.
+    </string>
+
+    <!-- Button for going to Market -->
+
+    <!-- Button for accepting EULA -->
+    <string name="DLG_accept">Jag godkänner</string>
+
+    <!-- Button for declining EULA -->
+    <string name="DLG_decline">Jag godkänner inte</string>
+
+    <!-- EULA title -->
+    <string name="DLG_eula_title">Astrid Användarvillkor</string>
+
+    <!-- Progress Dialog generic text -->
+    <string name="DLG_please_wait">Vänta</string>
+
+    <!-- Dialog - loading -->
+    <string name="DLG_loading">Laddar...</string>
+
+    <!-- Dialog - dismiss -->
+
+    <!-- slide 20d -->
+    <string name="DLG_ok">OK</string>
+    <!-- slide 36g -->
+    <string name="DLG_cancel">Avbryt</string>
+
+    <string name="DLG_more">Mer</string>
+
+    <string name="DLG_undo">Ångra</string>
+
+    <string name="DLG_warning">Varning</string>
+
+    <!-- =============================================================== UI == -->
+
+    <!-- Label for DateButtons with no value -->
+    <string name="WID_dateButtonUnset">Klicka för att ställa</string>
+
+    <!-- String formatter for DateButtons ($D => date, $T => time) -->
+
+    <!-- String formatter for Disable button -->
+
+    <!--  ============================================================= notes -->
+
+    <!-- Note Exposer -->
+
+    <!-- Note Exposer / Comments -->
+
+    <!-- EditNoteActivity - no comments -->
+    <string name="ENA_no_comments">Ännu ingen aktivitet</string>
+
+    <!-- EditNoteActivity - no username for comment -->
+    <string name="ENA_no_user">Någon</string>
+
+    <!-- EditNoteActivity - refresh comments -->
+    <string name="ENA_refresh_comments">Uppdatera kommentarer</string>
+
+    <!-- ================================================= TaskListActivity == -->
+
+    <!-- slide 8b: Task List: Displayed instead of list when no items present -->
+    <string name="TLA_no_items">Du har inga uppgifter!\n Vill du lägga till någonting?</string>
+
+    <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
+    <string name="TLA_no_items_person">%s delar\ninga uppgifter med dig</string>
+
+    <!-- Menu: Adjust Sort and Hidden Task Settings -->
+    <string name="TLA_menu_sort">Sortera</string>
+
+    <!-- Menu: Sync Now -->
+    <string name="TLA_menu_sync">Synkronisera nu</string>
+
+    <!-- Menu: Search -->
+    <string name="TLA_menu_search">Sök</string>
+
+    <!-- Menu: Tasks -->
+    <string name="TLA_menu_lists">Listor</string>
+
+    <!-- Menu: Friends -->
+    <string name="TLA_menu_friends">Personer</string>
+
+    <!-- Menu: Featured Lists -->
+    <string name="TLA_menu_featured_lists">Visa färdiga listor</string>
+
+    <!-- Menu: Suggestions -->
+    <string name="TLA_menu_suggestions">Förslag</string>
+
+    <!-- Menu: Tutorial -->
+
+    <!-- Menu: Settings -->
+    <string name="TLA_menu_settings">Inställningar</string>
+
+    <!-- slide 30b: Menu: Support -->
+    <string name="TLA_menu_support">Support</string>
+
+    <!-- Search Label-->
+
+    <!-- Window title for displaying Custom Filter -->
+    <string name="TLA_custom">Egendefinierad</string>
+
+    <!-- slide 8d: Quick Add Edit Box Hint-->
+    <string name="TLA_quick_add_hint">Lägg till uppgift</string>
+
+    <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
+    <string name="TLA_quick_add_hint_assign">Lägg till något för %s</string>
+
+    <!-- Notification Volumne notification-->
+    <string name="TLA_notification_volume_low">Påminnelseljudet är avstängt! Du kommer inte att höra
+        Astrid!
+    </string>
+
+    <!-- Notifications disabled warning -->
+    <string name="TLA_notification_disabled">Påminnelserna från Astrid är avstängda! Du kommer inte
+        att få några påminnelser
+    </string>
+
+    <string-array name="TLA_filters">
+        <item>Aktiv</item>
+        <item>Today</item>
+        <item>Snart</item>
+        <item>Sent</item>
+        <item>Klar</item>
+        <item>Dold</item>
+    </string-array>
+
+    <!-- Title for confirmation dialog after quick add markup -->
+    <string name="TLA_quickadd_confirm_title">Du sa: \"%s\"</string>
+
+    <!-- Text for speech bubble in dialog after quick add markup -->
+    <!-- First string is task title, second is due date, third is priority -->
+    <string name="TLA_quickadd_confirm_speech_bubble">Jag skapade en uppgift med namnet \"%1$s\"
+        %2$s med %3$s
+    </string>
+
+    <string name="TLA_quickadd_confirm_speech_bubble_date">för %s</string>
+
+    <string name="TLA_quickadd_confirm_hide_helpers">Visa inte bekräftelser i fortsättningen
+    </string>
+
+
+    <!-- Title for alert on new repeating task. %s-> task title -->
+    <string name="TLA_repeat_scheduled_title">Ny återkommande uppgift %s</string>
+
+    <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
+    <string name="TLA_repeat_scheduled_speech_bubble">Jag kommer att påminna dig om det här %s.
+    </string>
+
+    <string-array name="TLA_priority_strings">
+        <item>högsta prioritet</item>
+        <item>hög prioritet</item>
+        <item>medelhög prioritet</item>
+        <item>låg prioritet</item>
+    </string-array>
+    <!-- slide 22a -->
+    <string name="TLA_all_activity">Alla händelser</string>
+
+    <!-- ====================================================== TaskAdapter == -->
+
+    <!-- Format string to indicate task is hidden (%s => task name) -->
+    <string name="TAd_hiddenFormat">%s [dold]</string>
+
+    <!-- Format string to indicate task is deleted (%s => task name) -->
+    <string name="TAd_deletedFormat">%s [raderad]</string>
+
+    <!-- Displayed when adapter is flung (scrolled quickly) -->
+
+    <!-- slide 22b: indicates task was completed. %s => date or time ago -->
+    <string name="TAd_completed">Avslutad\n%s</string>
+
+    <!-- slide 15a: Action Button: edit task -->
+    <string name="TAd_actionEditTask">Redigera</string>
+
+    <!-- Context Item: edit task -->
+    <string name="TAd_contextEditTask">Redigera uppgift</string>
+
+    <!-- Context Item: copy task -->
+    <string name="TAd_contextCopyTask">Kopiera uppgift</string>
+
+    <!-- Context Item: delete task -->
+    <string name="TAd_contextDeleteTask">Radera uppgift</string>
+
+    <!-- Context Item: undelete task -->
+    <string name="TAd_contextUndeleteTask">Återställ raderad uppgift</string>
+
+    <!-- Context Item: purge task -->
+    <string name="TAd_contextPurgeTask">Rensa uppgift</string>
+
+    <!-- ============================================== SortSelectionDialog == -->
+
+    <!-- slide 23a: Sort Selection: dialog title -->
+    <string name="SSD_title">Sortering och Dolda Uppgifter</string>
+
+    <!-- slide 23h:  Hidden: title -->
+    <string name="SSD_hidden_title">Dolda uppgifter</string>
+
+    <!-- Hidden Task Selection: show completed tasks -->
+    <string name="SSD_completed">Visa avslutade uppgifter</string>
+
+    <!-- Hidden Task Selection: show hidden tasks -->
+    <string name="SSD_hidden">Visa dolda uppgifter</string>
+
+    <!-- Hidden Task Selection: show deleted tasks -->
+    <string name="SSD_deleted">Visa raderade uppgifter</string>
+
+    <!-- Sort Selection: drag with subtasks -->
+    <string name="SSD_sort_drag">Manuell sortering med underuppgifter</string>
+
+    <!-- slide 23b: Sort Selection: smart sort -->
+    <string name="SSD_sort_auto">Astrid intelligent sortering</string>
+
+    <!-- slide 23e: Sort Selection: sort by alpha -->
+    <string name="SSD_sort_alpha">Efter titel</string>
+
+    <!-- slide 23c: Sort Selection: sort by due date -->
+    <string name="SSD_sort_due">Efter förfallodatum</string>
+
+    <!-- slide 23d: Sort Selection: sort by importance -->
+    <string name="SSD_sort_importance">Efter prioritet</string>
+
+    <!-- slide 23f: Sort Selection: sort by modified date -->
+    <string name="SSD_sort_modified">Efter senaste ändringen</string>
+
+    <!-- slide 23g: Sort Selection: reverse -->
+    <string name="SSD_sort_reverse">Omvänd sortering</string>
+
+    <!-- slide 23j: Sort Button: sort temporarily -->
+    <string name="SSD_save_temp">Bara en gång</string>
+
+    <!-- slide 23i: Sort Button: sort permanently -->
+    <string name="SSD_save_always">Alltid</string>
+
+    <!-- =============================================== FilterListActivity == -->
+
+    <!-- Astrid Filter Shortcut -->
+    <string name="FSA_label">Lista eller filter i Astrid</string>
+
+    <!-- Filter List Activity Title -->
+
+    <!-- Displayed when loading filters -->
+
+    <!-- Context Menu: Create Shortcut -->
+    <string name="FLA_context_shortcut">Skapa genväg på skrivbordet</string>
+
+    <!-- Menu: Search -->
+
+    <!-- Menu: Help -->
+
+    <!-- slide 28c: Create Shortcut Dialog Title -->
+    <string name="FLA_shortcut_dialog_title">Skapa genväg</string>
+
+    <!-- Create Shortcut Dialog (asks to name shortcut) -->
+    <string name="FLA_shortcut_dialog">Genvägens namn:</string>
+
+    <!-- Search Hint-->
+    <string name="FLA_search_hint">Sök efter uppgifter</string>
+
+    <!-- Search Filter name (%s => query) -->
+    <string name="FLA_search_filter">Matchar \'%s\'</string>
+
+    <!-- Toast: created shortcut (%s => label) -->
+    <string name="FLA_toast_onCreateShortcut">Skapad genväg: %s</string>
+
+    <!-- Menu: new filter -->
+    <string name="FLA_new_filter">Nytt filter</string>
+
+    <!-- slide 10e: Button: new list -->
+    <string name="FLA_new_list">Ny lista</string>
+
+    <!-- Alert when creating a shortcut without selecting a filter -->
+    <string name="FLA_no_filter_selected">Inget filter valt! Välj ett filter eller en lista.
+    </string>
+
+    <!-- ================================================= TaskEditActivity == -->
+
+    <!-- Title when editing a task (%s => task title) -->
+
+    <!-- Title when creating a new task -->
+
+    <!-- Task title label -->
+
+    <!-- Task when label -->
+    <string name="TEA_when_header_label">När</string>
+
+    <!-- Task title hint (displayed when edit box is empty) -->
+    <string name="TEA_title_hint">Task name</string>
+
+    <!-- Task importance label -->
+    <string name="TEA_importance_label">Prioritet</string>
+
+    <!-- Task due date hint -->
+    <string name="TEA_deadline_hint">Set due date</string>
+
+    <!-- Task assigned to string (%s -> assigned person name) -->
+    <string name="TEA_assigned_to">Assigned to %s</string>
+
+    <!-- Task urgency specific time checkbox -->
+    <string name="TEA_urgency_specific_time">Vid bestämd tid?</string>
+
+    <!-- Task urgency specific time title when specific time false -->
+    <string name="TEA_urgency_none">Ingen</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_label">Dölj tills</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_display">Hide until %s</string>
+
+    <!-- Task hide until toast -->
+    <string name="TEA_hideUntil_message">Uppgiften är dold fram till %s</string>
+
+    <!-- Task editing data being loaded label -->
+    <string-array name="TEA_loading">
+        <item>Laddar...</item>
+    </string-array>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_note_label">Beskrivning</string>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_notes_empty">Description...</string>
+
+    <!-- Task note hint -->
+    <string name="TEA_notes_hint">Ange uppgiftsbeskrivning...</string>
+
+    <!-- Estimated time label -->
+    <string name="TEA_estimatedDuration_label">Hur lång tid kommer det att ta?</string>
+
+    <!-- Elapsed time label -->
+    <string name="TEA_elapsedDuration_label">Tid redan spenderad på uppgiften</string>
+
+    <!-- Menu: Save -->
+    <string name="TEA_menu_save">Spara ändringar</string>
+
+    <!-- Menu: Don\'t Save -->
+    <string name="TEA_menu_discard">Spara inte</string>
+
+    <!-- Menu: Delete Task -->
+    <string name="TEA_menu_delete">Radera uppgift</string>
+
+    <!-- Menu: Task comments -->
+    <string name="TEA_menu_refresh_comments">Uppdatera kommentarer</string>
+
+    <string name="TEA_menu_comments">Kommentarer</string>
+
+    <!-- Toast: task saved with deadline (%s => preposition + time units) -->
+    <string name="TEA_onTaskSave_due">Uppgift sparad: förfaller %s</string>
+
+    <!-- Toast: task saved without deadlines -->
+    <string name="TEA_onTaskSave_notDue">Uppgift sparad</string>
+
+    <!-- Toast: task was not saved -->
+
+    <!-- Toast: task was deleted -->
+
+    <!-- slide 15b: Task edit tab: activity -->
+    <string name="TEA_tab_activity">Aktivitet</string>
+
+    <!-- slide 15e:  Task edit tab: more editing settings -->
+    <string name="TEA_tab_more">Mer</string>
+
+    <!-- slide 15d: Task edit tab: web services -->
+    <string name="TEA_tab_web">Idéer</string>
+
+    <string name="TEA_timer_est">Est. %s</string>
+
+    <string name="TEA_timer_elap">Elapsed %s</string>
+
+    <string-array name="TEA_urgency">
+        <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
+        <item>No date</item>
+        <item>Specifik dag</item>
+        <item>Today</item>
+        <item>Tomorrow</item>
+        <item>(dagen efter)</item>
+        <item>Nästa vecka</item>
+        <item>Om två veckor</item>
+        <item>Nästa månad</item>
+    </string-array>
+
+    <string name="TEA_no_time">Ingen tid</string>
+
+    <string-array name="TEA_hideUntil">
+        <!-- hideUntil: labels for edit page. -->
+        <item>Never</item>
+        <item>Due date</item>
+        <item>Due time</item>
+        <item>Day before due</item>
+        <item>Week before due</item>
+        <item>Specifik dag/tid</item>
+    </string-array>
+
+    <!-- Task edit control set descriptors -->
+
+    <!-- slide 9b/35i -->
+    <string name="TEA_control_who">Vem</string>
+
+    <!-- slide 9c/ 35a -->
+    <string name="TEA_control_when">När</string>
+    <!-- slide 35b -->
+    <string name="TEA_control_more_section">----More Section----</string>
+    <!-- slide 16a/35c -->
+    <string name="TEA_control_importance">Prioritet</string>
+    <!-- slide 16b/35d -->
+    <string name="TEA_control_lists">Listor</string>
+    <!-- slide 16c/35e -->
+    <string name="TEA_control_notes">Beskrivning</string>
+
+    <string name="TEA_control_files">Filer</string>
+
+    <!-- slide 16e / slide 35g-->
+    <string name="TEA_control_reminders">Påminnelser</string>
+
+    <!-- slide 16f -->
+    <string name="TEA_control_timer">Inställningar för tidtagarur</string>
+
+    <string name="TEA_control_hidden_section">----Göm alltid----</string>
+
+    <string name="hide_until_prompt">Visa i min lista</string>
+
+    <!-- Add Ons tab when no add-ons found -->
+
+    <!-- Add Ons button -->
+
+    <!-- More row -->
+
+    <!-- slide 15c: Text when no activity to show -->
+    <string name="TEA_no_activity">Ingen aktivitet att visa.</string>
+
+    <!-- Text to load more activity -->
+    <string name="TEA_load_more">Ladda mer...</string>
+
+    <!-- When controls dialog -->
+    <string name="TEA_when_dialog_title">När ska uppgiften vara slutförd?</string>
+
+
+    <string name="TEA_new_task">Ny uppgift</string>
+
+    <string name="WSV_click_to_load">Klicka på mig för att hitta sätt att få det här gjort!</string>
+
+    <string name="WSV_not_online">Jag kan göra mer när jag är uppkopplad. Kontrollera din
+        internetförbindelse.
+    </string>
+
+    <string name="TEA_contact_error">Tyvärr kunde vi inte hitta en mailadress till den valda
+        kontakten.
+    </string>
+
+    <!-- ============================================= IntroductionActivity == -->
+
+    <!-- slide 1a: Introduction Window title -->
+
+    <!-- Button to agree to EULA -->
+
+    <!-- Button to disagree with EULA -->
+
+    <!-- ===================================================== MissedCallActivity == -->
+
+    <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
+    <string name="MCA_title">%1$s\nringde kl %2$s</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_return_call">Ring nu</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_add_task">Ring senare</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_ignore">Ignorera</string>
+
+    <!-- Missed call: dialog to ignore all missed calls title -->
+    <string name="MCA_ignore_title">Ignorera alla missade samtal?</string>
+
+    <!-- Missed call: dialog to ignore all missed calls body -->
+    <string name="MCA_ignore_body">Du har ignorerat flera missade samtal. Vill du att Astrid slutar
+        fråga dig om dem?
+    </string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore all button -->
+    <string name="MCA_ignore_all">Ignorera alla samtal</string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
+    <string name="MCA_ignore_this">Ignorera endast detta samtal</string>
+
+    <!-- Missed call: preference title -->
+    <string name="MCA_missed_calls_pref_title">Fält missade samtal</string>
+
+    <!-- slide 49c: Missed call: preference description -->
+    <string name="MCA_missed_calls_pref_desc_enabled">Astrid meddelar dig om missade samtal och ger
+        dig möjligheten att få påminnelse om att ringa tillbaka
+    </string>
+    <string name="MCA_missed_calls_pref_desc_disabled">Astrid meddelar dig inte om missade samtal
+    </string>
+
+    <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
+    <string name="MCA_task_title_name">Ring %1$s tillbaka kl %2$s</string>
+
+    <!-- Missed call: task title no name (%s -> number)-->
+    <string name="MCA_task_title_no_name">Ring %s tillbaka</string>
+
+    <!-- Missed call: schedule dialog title (%s -> name or number)-->
+    <string name="MCA_schedule_dialog_title">Ring %s tillbaka om...</string>
+
+    <!-- Missed call speech bubble options -->
+    <string-array name="MCA_dialog_speech_options">
+        <item>Visst är det fint att vara så omtyckt!</item>
+        <item>Hurra! Man tycker om dig!</item>
+        <item>Gör dem glada, ring dem!</item>
+        <item>Skulle inte du bli glad om man ringde tillbaka?</item>
+        <item>Du klarar det!</item>
+        <item>Du kan alltid sända ett sms...</item>
+    </string-array>
+
+
+    <!-- ======================================= Calendar reminder activity == -->
+
+    <!-- Calendar remindeer ignore button -->
+    <string name="CRA_ignore">Ignorera</string>
+
+    <!-- Calendar event -->
+    <string name="CRA_title">Behöver du en lista över möten?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls title -->
+    <string name="CRA_ignore_title">Ignorera alla händelser i kalender?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls body -->
+    <string name="CRA_ignore_body">Du har ignorerat flera kalenderhändelser. Vill du att Astrid
+        slutar fråga dig om dem?
+    </string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
+    <string name="CRA_ignore_all">Ignorera alla händelser</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
+    <string name="CRA_ignore_this">Ignorera endast denna händelse</string>
+
+    <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
+    <string name="CRA_speech_bubble_start">Det verkar som %s börjar snart. Vill du skapa en lista
+        för saker att göra?
+    </string>
+
+    <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
+    <string name="CRA_speech_bubble_end">Det verkar som du just slutfört %s. Vill du skapa en lista
+        för saker att göra?
+    </string>
+
+    <!-- Calendar reminder: create list button -->
+    <string name="CRA_create_list">Skapa lista</string>
+
+    <!-- Calendar reminder: postpone button -->
+    <string name="CRA_postpone">Kanske senare</string>
+
+    <!-- Calendar reminder: list exists dialog title -->
+    <string name="CRA_list_exists_title">Listan finns redan</string>
+
+    <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
+    <string name="CRA_list_exists_body">En lista med namnet %s finns redan. Vill du använda den
+        existerande listan eller skapa en ny för denna händelse?
+    </string>
+
+    <!-- Calendar reminder: list exists dialog create new button -->
+    <string name="CRA_create_new">Skapa ny</string>
+
+    <!-- Calendar reminder: list exists dialog use existing button -->
+    <string name="CRA_use_existing">Använd befintlig</string>
+
+    <!-- Calendar remindr: created list (%s -> list name) -->
+    <string name="CRA_created_list_dialog">Jag skapade listan %s.</string>
+
+    <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
+    <string name="CRA_one_attendee">%s deltar.</string>
+
+    <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
+    <string name="CRA_two_attendees">%1$s och %2$s deltar.</string>
+
+    <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
+    <string name="CRA_many_attendees">%1$s, %2$s och %3$d andra deltar</string>
+
+    <!-- Calendar reminder: invitation prompt -->
+    <string name="CRA_invitation_prompt">Vill du bjuda in dem?</string>
+
+    <!-- Calendar reminder: preference title -->
+    <string name="CRA_calendar_reminders_pref_title">Kalenderassistent</string>
+
+    <!-- Calendar reminder: pref description disabled -->
+    <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid kommer inte att påminna dig om
+        dina kommande kalenderhändelser
+    </string>
+
+    <!-- Calendar reminder: pref description enabled -->
+    <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid kommer att påminna om kommande
+        kalenderhändelser och uppmana dig att förbereda dem
+    </string>
+
+    <!-- Calendar reminder: share list title -->
+    <string name="CRA_share_list_title">Dela denna lista?</string>
+
+    <string name="CRA_invite_attendees">Bjud in deltagare</string>
+
+    <string name="CRA_more_options">Fler alternativ</string>
+
+    <string name="CRA_dont_invite">Nej tack</string>
+
+    <!-- Calendar reminder: share list title when no other attendees exist-->
+    <string name="CRA_list_created_title">Listan skapades!</string>
+
+    <!-- Calendar reminder: default new list name (%s -> event title) -->
+    <string name="CRA_default_list_name">Saker att göra: %s</string>
+
+    <!-- ===================================================== HelpActivity == -->
+
+    <!-- Help: Button to get support from our website -->
 
-    
-    <!-- Resources for built-in timers plug-in -->
-    
-    <!-- Task Edit Activity: Container Label -->
-    <string name="alarm_ACS_label">Alarm</string>
-    
-    <!-- Task Edit Activity: Add New Alarm -->
-    <string name="alarm_ACS_button">Lägg till ett alarm</string>
-    
-    <string-array name="reminders_alarm">
-      <!-- reminders related to alarm -->
-      <item>Alarm!</item>
+    <!-- ==================================================== UpdateService == -->
+
+    <!-- Changelog Window Title -->
+    <string name="UpS_changelog_title">Vad är nytt i Astrid?</string>
+
+    <!-- Updates Window Title -->
+    <string name="UpS_updates_title">Senaste Astrid nyheter</string>
+
+    <!-- Updats No Activity to show for offline users -->
+    <string name="UpS_no_activity_log_in">Logga in för att se hur\ndet går för dig och vad\nsom
+        händer på delade listor.
+    </string>
+
+    <!-- ================================================== EditPreferences == -->
+
+    <!-- slide 31g: Preference Window Title -->
+    <string name="EPr_title">Inställningar</string>
+
+    <string name="EPr_share_astrid">Dela Astrid</string>
+
+    <string name="EPr_share_astrid_summary">Dela på ditt sociala favoritnätverk</string>
+
+    <!-- slide 46a -->
+    <string name="EPr_deactivated">inaktiverad</string>
+
+    <!-- slide 30i: Preference Category: Appearance Title -->
+    <string name="EPr_appearance_header">Utseende</string>
+
+    <!-- Preference Category: Appearance Summary -->
+    <string name="EPr_appearance_summary">Teman, widgets, uppgiftsrader, redigeringsskärmen</string>
+
+    <!-- FAQ Preference title -->
+    <string name="EPr_faq_title">Vanliga frågor och svar</string>
+
+    <!-- Account status preference (%s -> account type) -->
+    <string name="EPr_account_title">Konto: %s</string>
+
+    <!-- Support preferences summary -->
+    <string name="EPr_support_summary">Introduktion, FAQ, om</string>
+
+    <!-- slide 34a: Preference: Task List Font Size Title -->
+    <string name="EPr_fontSize_title">Storlek på uppgiftslista</string>
+
+    <!-- Preference: Filters to show pref screen title -->
+    <string name="EPr_filters_to_show_title">Filter att visa</string>
+
+    <!-- slide 32a: Preference: Show confirmation for smart reminders -->
+    <string name="EPr_showSmartConfirmation_title">Visa bekräftelse vid smarta påminnelser</string>
+
+    <!-- slide 34g: Preference: Task List Font Size Description -->
+    <string name="EPr_fontSize_desc">Textstorlek för huvudlistan</string>
+
+    <!-- Preferemce: Show task edit confirmation toasts -->
+
+    <!-- slide 34c: Preference: Task List Show Notes -->
+    <string name="EPr_showNotes_title">Visa beskrivning i uppgiften</string>
+
+    <!-- Edit screen preference category -->
+    <string name="EPr_edit_screen_options">Ändra skärminställningar</string>
+
+    <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
+    <string name="EPr_beastMode_title">Edit screen order</string>
+
+    <string name="EPr_beastMode_shortcut">Customize</string>
+
+    <string name="EPr_time_increment">5 minute increments</string>
+
+    <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
+
+    <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
+
+    <!-- slide 35h -->
+    <string name="EPr_beastMode_desc">Ställ in layouten för uppgiftsredigeringsrutan</string>
+    <!-- slide 35j -->
+    <string name="EPr_beastMode_reset">Återställ till standardvärden</string>
+
+    <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on
+        each row
+    </string>
+
+    <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
+    <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit
+        screen
+    </string>
+    <!-- Preference: Task List Show Notes Description (enabled) -->
+    <string name="EPr_showNotes_desc_enabled">Description will always be displayed</string>
+
+    <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
+    <string name="EPr_compressTaskRows_title">Kompakt uppgiftsrad</string>
+    <!-- slide 34j -->
+    <string name="EPr_compressTaskRows_desc">Anpassa rader efter uppgiftens titel</string>
+
+    <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
+    <!-- slide 34k-->
+
+    <!-- slide 34b: Preferences: Wrap task titles to two lines -->
+    <string name="EPr_fullTask_title">Visa hela namnet på uppgiften</string>
+    <string name="EPr_fullTask_desc_enabled">Uppgiftens namn kommer att visas i sin helhet</string>
+    <!-- slide 34h -->
+    <string name="EPr_fullTask_desc_disabled">De första två raderna i uppgiftens namn kommer att
+        visas
+    </string>
+
+    <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
+    <string name="EPr_ideaAuto_title">Ladda fliken Idéer automatiskt</string>
+    <!-- slide 32c -->
+    <string name="EPr_ideaAuto_desc_enabled">Webbsökning till fliken Idéer utförs när du klickar på
+        fliken
+    </string>
+    <string name="EPr_ideaAuto_desc_disabled">Webbsökning till fliken Idéer utförs manuellt</string>
+
+    <!-- Preferences: task row style -->
+    <string-array name="EPr_task_row_styles">
+        <item>Original</item>
+        <item>Simple</item>
+        <item>Title only</item>
     </string-array>
-    
 
+    <string-array name="EPr_task_row_style_descriptions">
+        <item>Förkorta titel till två rader med datum till höger</item>
+        <item>Förkorta titel till en rad, med datum och listor nedanför</item>
+        <item>Single line title only</item>
+    </string-array>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- task row style title (%s -> style) -->
+    <string name="EPr_task_row_style_title">Row style: %s</string>
+
+    <!-- Preference: custom filters enabled -->
+    <string name="EPr_use_filters_title">Use filters</string>
+    <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
+
+    <!-- Preference: show list members in shared list -->
+    <string name="EPr_show_list_members_title">Show list members in shared lists</string>
+
+    <!-- Preference: simple input box style -->
+    <string name="EPr_simple_input_boxes">Simple text boxes</string>
+
+    <!-- Preference: simple input box style -->
+    <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
+
+    <!-- Preference: don\'t show plus button until input present -->
+    <string name="EPr_hide_plus_button">Hide plus button</string>
+
+    <!-- Preference: menu items -->
+    <string name="EPr_menu_items">Menu items</string>
+
+    <!-- Preference: list view -->
+    <string name="EPr_list_view">List view</string>
+
+    <!-- Preference: task edit comments -->
+    <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
+
+    <!-- slide 30f/ 36f: Preference: Theme -->
+    <string name="EPr_theme_title">Färgtema</string>
+    <!-- Preference: Theme Description (%s => value) -->
+    <string name="EPr_theme_desc">Aktuellt: %s</string>
+    <!-- Preference: Theme Description (android 1.6) -->
+    <string name="EPr_theme_desc_unsupported">Inställningen kräver Android 2.0 eller senare
+        version
+    </string>
+    <!-- slide 32h/ 37b -->
+    <string name="EPr_theme_widget_title">Widgettema</string>
+
+    <!-- slide 30d/ 34f: Preference screen: all task row settings -->
+    <string name="EPr_taskRowPrefs_title">Utseende på uppgiftsraden</string>
+
+    <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
+    <string name="EPr_use_contact_picker">Använd kontaktväljare</string>
+    <!-- slide 49b -->
+    <string name="EPr_use_contact_picker_desc_enabled">Systemets funktion för att välja kontakter
+        kommer att visas i fönstret för tilldelning av uppgifter
+    </string>
+    <string name="EPr_use_contact_picker_desc_disabled">Systemets funktion för att välja kontakter
+        kommer inte att visas
+    </string>
+
+    <!-- slide 49i: Preferences: Third party addons -->
+    <string name="EPr_third_party_addons">Tillåt tredjepartstillägg</string>
+    <string name="EPr_third_party_addons_desc_enabled">Tredjepartstillägg kommer att tillåtas
+    </string>
+    <!-- slide 49d -->
+    <string name="EPr_third_party_addons_desc_disabled">Tredjepartstillägg kommer att vara
+        avstängda
+    </string>
+
+    <!-- Preferences: ideas tab -->
+    <string name="EPr_ideas_tab_enabled">Uppgiftsförslag</string>
+    <string name="EPr_ideas_tab_description">Få förslag som hjälper dig att slutföra uppgifter
+    </string>
+
+    <!-- Preferences: calendar event start time -->
+    <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
+    <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
+    <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
+
+    <string name="EPr_force_phone_layout">Använd telefonutseende</string>
+
+    <string name="EPr_show_featured_lists">Visa lista över funktioner</string>
+
+    <!-- Configurations -->
+    <string name="EPr_configurations_title">Set configuration</string>
+    <string name="EPr_config_default">Default</string>
+    <string name="EPr_config_lite">Astrid Lite</string>
+
+    <!-- Dialog title when setting preference configuration -->
+    <string name="EPr_config_dialog_title">Set configuration?</string>
+    <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
+    <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
+
+    <!-- default configuration name for the above dialog -->
+    <string name="EPr_config_dialog_default_id">default</string>
+
+    <!-- Preference title for showing save and cancel buttons in task edit page -->
+    <string name="EPr_show_save_and_cancel">Show save and cancel</string>
+
+
+    <!-- Swipe between lists -->
+    <!-- Preference: swipe between lists performance -->
+    <string name="EPr_swipe_lists_performance_title">Svep för att växla mellan listor</string>
+
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>No swipe</item>
+        <item>Spara minne</item>
+        <item>Vanlig prestanda</item>
+        <item>Hög prestanda</item>
+    </string-array>
 
-    
-  <!-- Resources for built-in backup plug-in -->
-  
-  <!-- ================================================= BackupPreferences == -->
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <!-- slide 49a -->
+        <item>Swipe between lists is disabled</item>
+        <item>Trögare prestanda</item>
+        <item>Standardinställning</item>
+        <item>Använder mer systemresurser</item>
+    </string-array>
 
-    <!-- slide 33c/48d: Backup Preferences Title -->    
-    <string name="backup_BPr_header">Säkerhetskopior</string>
+    <string name="swipe_lists_helper_title">Gör en svepande rörelse för att byta lista</string>
+    <string name="swipe_lists_helper_header">Gör en svepande rörelse åt vänster eller höger för att
+        snabbt växla mellan listor
+    </string>
+    <string name="swipe_lists_helper_subtitle">Ändra inställningar i Inställningar -> Utseende
+    </string>
 
-    <!-- slide 48e/50c: Backup: Status Header -->    
-    <string name="backup_BPr_group_status">Status</string>
-    
-    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Senaste: %s</string>
-    <!-- Backup Status: last error failed. Keep it short! -->    
-    <string name="backup_status_failed">Senaste säkerhetskopieringen misslyckades</string>
-    <!-- Backup Status: error subtitle -->    
-    <string name="backup_status_failed_subtitle">(klicka för att se felet)</string>
-    <!-- slide 48a: Backup Status: never backed up -->    
-    <string name="backup_status_never">Aldrig säkerhetskopierat!</string>
+    <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
 
-    <!-- slide 48f/ 50e: Backup Options Group Label -->    
-    <string name="backup_BPr_group_options">Alternativ</string>
+    <string-array name="EPr_default_reminders_mode">
+        <!-- reminders duration: labels for "Task Defaults" preference item. -->
+        <item>@string/TEA_reminder_mode_once</item>
+        <item>@string/TEA_reminder_mode_five</item>
+        <item>@string/TEA_reminder_mode_nonstop</item>
+    </string-array>
 
-    <!-- slide 48b: Preference: Automatic Backup Title -->    
-    <string name="backup_BPr_auto_title">Automatisk säkerhetskopiering</string>
-    <!-- Preference: Automatic Backup Description (when disabled) -->
-    <string name="backup_BPr_auto_disabled">Automatisk säkerhetskopiering avaktiverad</string>    
-    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
-    <string name="backup_BPr_auto_enabled">Säkerhetskopiering kommer att ske dagligen</string>
-    
-    <!-- Preference screen restoring Tasks Help -->
-    <!-- Preference screen Restoring Tasks Help Dialog Text-->
-    
-    <string name="backup_BPr_cloud_already_logged_in">Du har redan backup i molnet på Astrid.com!</string>
-  
-  <!-- ================================================= BackupActivity == -->
-
-  <!-- slide 48c: backup activity label -->
-  <string name="backup_BAc_label">Hantera säkerhetskopior</string>
-
-  <!-- backup activity title -->
-  <string name="backup_BAc_title">Hantera dina säkerhetskopior</string>
-
-  <!-- backup activity import button -->
-  <string name="backup_BAc_import">Importera uppgifter</string>
-
-  <!-- backup activity export button -->
-  <string name="backup_BAc_export">Exportera uppgifter</string>
-  
-  <!-- backup activity cloud (Astrid.com) option -->
-  <string name="backup_BAc_cloud">Klicka för gratis backup i molnet på Astrid.com</string>
-    
-  <!-- ============================================== Importer / Exporter == -->
-  
-  <!-- Message displayed when error occurs -->
-  <string name="backup_TXI_error">Importfel</string>
-    
-  <string name="export_toast">Säkerhetskopierade %1$s till %2$s.</string>
-    
-  <string name="export_toast_no_tasks">Inga uppgifter att exportera</string>
-  
-  <!-- Progress Dialog Title for exporting -->    
-  <string name="export_progress_title">Exporterar...</string>
-  
-  <!-- Backup: Title of Import Summary Dialog -->
-  <string name="import_summary_title">Återställningssammanfattning</string>
-    
-  <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">Filen %1$s innehöll %2$s.\n\n %3$s importerade,\n %4$s existerar redan\n %5$s hade fel\n</string>
-  
-  <!-- Progress Dialog Title for importing -->    
-  <string name="import_progress_title">Importerar...</string>
-  
-  <!-- Progress Dialog text for import reading task (%d -> task number)-->    
-  <string name="import_progress_read">Läser uppgift %d...</string>
-  
-  <!-- Backup: Dialog when unable to open a file -->  
-  
-  <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
-  <string name="DLG_error_sdcard">Mappåtkomst nekad: %s</string>
-  
-  <!-- Backup: Dialog when unable to open SD card in general -->
-  <string name="DLG_error_sdcard_general">SD-kort ej tillgängligt!</string>
-    
-  <!-- Backup: File Selector dialog for import -->
-  <string name="import_file_prompt">Välj en fil att återställa</string>    
-        
+    <string-array name="EPr_themes">
+        <!-- theme_settings: labels for Theme preference menu -->
+        <!-- slide 36a-->
+        <item>Dag - blå</item>
+        <!-- slide 36b -->
+        <item>Dag - röd</item>
+        <!-- slide 36b -->
+        <item>Sky blue</item>
+        <!-- slide 36c -->
+        <item>Night</item>
+        <!-- slide 36d -->
+        <item>Transparent (white text)</item>
+        <!-- slide 36e -->
+        <item>Genomskinlig (svart text)</item>
+    </string-array>
 
+    <string-array name="EPr_themes_widget">
+        <!-- slide 32i / 37a-->
+        <item>Same as app</item>
+        <item>Dag - blå</item>
+        <item>Dag - röd</item>
+        <item>Sky blue</item>
+        <item>Night</item>
+        <item>Transparent (white text)</item>
+        <item>Transparent (black text)</item>
+        <item>Gammalt format</item>
+    </string-array>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- ========================================== Task Management Settings == -->
+
+    <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
+    <string name="EPr_manage_header">Hantera gamla uppgifter</string>
+    <!-- slide 47d -->
+    <string name="EPr_manage_delete_completed">Radera färdiga uppgifter</string>
+    <string name="EPr_manage_delete_completed_message">Vill du verkligen radera alla dina färdiga
+        uppgifter?
+    </string>
+    <!-- slide 47a -->
+    <string name="EPr_manage_delete_completed_summary">Raderade uppgifter kan tas tillbaka en och
+        en
+    </string>
+    <string name="EPr_manage_delete_completed_status">%d uppgifter raderade!</string>
+    <!-- slide 47e -->
+    <string name="EPr_manage_purge_deleted">Rensa bort raderade uppgifter</string>
+    <string name="EPr_manage_purge_deleted_message">Vill du verkligen rensa bort alla dina raderade
+        uppgifter?\n\nDe här uppgifterna kommer att tas bort för alltid!
+    </string>
+    <string name="EPr_manage_purge_deleted_status">%d uppgifter bortrensade!</string>
+    <!-- slide 47b-->
+    <string name="EPr_manage_purge_deleted_summary">Varning! Bortrensade uppgifter kan inte
+        återställas utan en säkerhetskopia!
+    </string>
+    <!-- slide 47h-->
+    <string name="EPr_manage_clear_all">Radera alla data</string>
+    <string name="EPr_manage_clear_all_message">Radera alla uppgifter och inställningar i
+        Astrid?\n\nVarning: denna åtgärd kan inte ångras!
+    </string>
+
+    <!-- slide 47f -->
+    <string name="EPr_manage_delete_completed_gcal">Radera kalenderhändelser för färdiga uppgifter
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_message">Vill du verkligen radera alla händelser
+        i kalendern för uppgifter som är färdiga?
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_summary"></string>
+    <string name="EPr_manage_delete_completed_gcal_status">%d kalenderhändelser raderade!</string>
 
+    <!-- slide 47g-->
+    <string name="EPr_manage_delete_all_gcal">Radera alla kalenderhändelser för uppgifter</string>
+    <string name="EPr_manage_delete_all_gcal_message">Vill du verkligen radera alla dina händelser i
+        kalendern för uppgifter?
+    </string>
+    <string name="EPr_manage_delete_all_gcal_summary"></string>
+    <string name="EPr_manage_delete_all_gcal_status">%d kalenderhändelser raderade!</string>
 
-  <!-- ================================================== AndroidManifest == -->
-
-  <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
-  <string name="app_name">Astrid Uppgifter</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="read_permission_label">Astrid Tillstånd</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="read_permission_desc">läs uppgifter, visa uppgiftsfilter</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="write_permission_label">Astrid Tillstånd</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="write_permission_desc">skapa nya uppgifter, redigera existerande uppgifter</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-    
-  <!-- question for deleting tasks -->
-  <string name="DLG_delete_this_task_question">Radera denna uppgift?</string>
-
-  <!-- question for deleting items (%s => item name) -->
-  <string name="DLG_delete_this_item_question">Radera följande: %s?</string>
-    
-  <!-- Progress dialog shown when upgrading -->
-  <string name="DLG_upgrading">Uppgraderar dina uppgifter...</string>
-  
-  <!-- Title for dialog selecting a time (hours and minutes) -->
-  <string name="DLG_hour_minutes">Tid (timmar : minuter)</string>
-  
-  <!-- Dialog for Astrid having a critical update -->
-  <string name="DLG_please_update">Astrid bör uppdateras till senaste version i Android Market! Var god gör det innan du fortsätter, eller vänta några sekunder.</string>
-
-  <!-- Button for going to Market -->
-
-  <!-- Button for accepting EULA -->
-  <string name="DLG_accept">Jag godkänner</string>
-
-  <!-- Button for declining EULA -->
-  <string name="DLG_decline">Jag godkänner inte</string>
-
-  <!-- EULA title -->
-  <string name="DLG_eula_title">Astrid Användarvillkor</string>
-
-  <!-- Progress Dialog generic text -->
-  <string name="DLG_please_wait">Vänta</string>
-  
-  <!-- Dialog - loading -->
-  <string name="DLG_loading">Laddar...</string>
-  
-  <!-- Dialog - dismiss -->
-
-  <!-- slide 20d -->
-  <string name="DLG_ok">OK</string>
-  <!-- slide 36g -->
-  <string name="DLG_cancel">Avbryt</string>
-  
-  <string name="DLG_more">Mer</string>
-  
-  <string name="DLG_undo">Ångra</string>
-  
-  <string name="DLG_warning">Varning</string>
-  
-  <!-- =============================================================== UI == -->
-  
-  <!-- Label for DateButtons with no value -->
-  <string name="WID_dateButtonUnset">Klicka för att ställa</string>
-  
-  <!-- String formatter for DateButtons ($D => date, $T => time) -->
-  
-  <!-- String formatter for Disable button -->
-  
-  <!--  ============================================================= notes -->
-  
-  <!-- Note Exposer -->    
-  
-  <!-- Note Exposer / Comments -->    
-  
-  <!-- EditNoteActivity - no comments -->
-  <string name="ENA_no_comments">Ännu ingen aktivitet</string>
-    
-  <!-- EditNoteActivity - no username for comment -->
-  <string name="ENA_no_user">Någon</string>
-  
-  <!-- EditNoteActivity - refresh comments -->
-  <string name="ENA_refresh_comments">Uppdatera kommentarer</string>
-  
-  <!-- ================================================= TaskListActivity == -->
-  
-  <!-- slide 8b: Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">Du har inga uppgifter!\n Vill du lägga till någonting?</string>
-  
-  <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->    
-  <string name="TLA_no_items_person">%s delar\ninga uppgifter med dig</string>
-  
-  <!-- Menu: Adjust Sort and Hidden Task Settings -->    
-  <string name="TLA_menu_sort">Sortera</string>
-  
-  <!-- Menu: Sync Now -->    
-  <string name="TLA_menu_sync">Synkronisera nu</string>
-  
-  <!-- Menu: Search -->
-  <string name="TLA_menu_search">Sök</string>
-  
-  <!-- Menu: Tasks -->
-  <string name="TLA_menu_lists">Listor</string>
-
-  <!-- Menu: Friends -->
-  <string name="TLA_menu_friends">Personer</string>
-
-  <!-- Menu: Featured Lists -->
-  <string name="TLA_menu_featured_lists">Visa färdiga listor</string>
-
-  <!-- Menu: Suggestions -->
-  <string name="TLA_menu_suggestions">Förslag</string>
-  
-  <!-- Menu: Tutorial -->
-
-  <!-- Menu: Settings -->    
-  <string name="TLA_menu_settings">Inställningar</string>
-  
-  <!-- slide 30b: Menu: Support -->
-  <string name="TLA_menu_support">Support</string>
-  
-  <!-- Search Label-->
-  
-  <!-- Window title for displaying Custom Filter -->
-  <string name="TLA_custom">Egendefinierad</string>
-  
-  <!-- slide 8d: Quick Add Edit Box Hint-->
-  <string name="TLA_quick_add_hint">Lägg till uppgift</string>
-  
-  <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
-  <string name="TLA_quick_add_hint_assign">Lägg till något för %s</string>
-  
-  <!-- Notification Volumne notification-->
-  <string name="TLA_notification_volume_low">Påminnelseljudet är avstängt! Du kommer inte att höra Astrid!</string>
-  
-  <!-- Notifications disabled warning -->
-  <string name="TLA_notification_disabled">Påminnelserna från Astrid är avstängda! Du kommer inte att få några påminnelser</string>
-  
-  <string-array name="TLA_filters">
-      <item>Aktiv</item>
-      <item>Today</item>
-      <item>Snart</item>
-      <item>Sent</item>
-      <item>Klar</item>
-      <item>Dold</item>      
-  </string-array>
-  
-  <!-- Title for confirmation dialog after quick add markup -->
-  <string name="TLA_quickadd_confirm_title">Du sa: \"%s\"</string>
-  
-  <!-- Text for speech bubble in dialog after quick add markup -->
-  <!-- First string is task title, second is due date, third is priority -->
-  <string name="TLA_quickadd_confirm_speech_bubble">Jag skapade en uppgift med namnet \"%1$s\" %2$s med %3$s</string>
-  
-  <string name="TLA_quickadd_confirm_speech_bubble_date">för %s</string>
-  
-  <string name="TLA_quickadd_confirm_hide_helpers">Visa inte bekräftelser i fortsättningen</string>
-  
-  
-  <!-- Title for alert on new repeating task. %s-> task title -->
-  <string name="TLA_repeat_scheduled_title">Ny återkommande uppgift %s</string>
-  
-  <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
-  <string name="TLA_repeat_scheduled_speech_bubble">Jag kommer att påminna dig om det här %s.</string>
-  
-  <string-array name="TLA_priority_strings">
-      <item>högsta prioritet</item>
-      <item>hög prioritet</item>
-      <item>medelhög prioritet</item>
-      <item>låg prioritet</item>
-  </string-array>
-  <!-- slide 22a -->
-  <string name="TLA_all_activity">Alla händelser</string>
-  
-  <!-- ====================================================== TaskAdapter == -->
-  
-  <!-- Format string to indicate task is hidden (%s => task name) -->
-  <string name="TAd_hiddenFormat">%s [dold]</string>
-  
-  <!-- Format string to indicate task is deleted (%s => task name) -->
-  <string name="TAd_deletedFormat">%s [raderad]</string>
-  
-  <!-- Displayed when adapter is flung (scrolled quickly) -->
-  
-  <!-- slide 22b: indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Avslutad\n%s</string>
-  
-  <!-- slide 15a: Action Button: edit task -->
-  <string name="TAd_actionEditTask">Redigera</string>
-  
-  <!-- Context Item: edit task -->
-  <string name="TAd_contextEditTask">Redigera uppgift</string>
-
-  <!-- Context Item: copy task -->
-  <string name="TAd_contextCopyTask">Kopiera uppgift</string>
-
-  <!-- Context Item: delete task -->
-  <string name="TAd_contextDeleteTask">Radera uppgift</string>
-
-  <!-- Context Item: undelete task -->
-  <string name="TAd_contextUndeleteTask">Återställ raderad uppgift</string>
-
-  <!-- Context Item: purge task -->
-  <string name="TAd_contextPurgeTask">Rensa uppgift</string>
-  
-  <!-- ============================================== SortSelectionDialog == -->
-  
-  <!-- slide 23a: Sort Selection: dialog title -->    
-  <string name="SSD_title">Sortering och Dolda Uppgifter</string>
-  
-  <!-- slide 23h:  Hidden: title -->
-  <string name="SSD_hidden_title">Dolda uppgifter</string>
-  
-  <!-- Hidden Task Selection: show completed tasks -->    
-  <string name="SSD_completed">Visa avslutade uppgifter</string>
-  
-  <!-- Hidden Task Selection: show hidden tasks -->    
-  <string name="SSD_hidden">Visa dolda uppgifter</string>
-  
-  <!-- Hidden Task Selection: show deleted tasks -->    
-  <string name="SSD_deleted">Visa raderade uppgifter</string>
-  
-  <!-- Sort Selection: drag with subtasks -->
-  <string name="SSD_sort_drag">Manuell sortering med underuppgifter</string>
-  
-  <!-- slide 23b: Sort Selection: smart sort -->
-  <string name="SSD_sort_auto">Astrid intelligent sortering</string>
-  
-  <!-- slide 23e: Sort Selection: sort by alpha -->
-  <string name="SSD_sort_alpha">Efter titel</string>
-  
-  <!-- slide 23c: Sort Selection: sort by due date -->
-  <string name="SSD_sort_due">Efter förfallodatum</string>
-  
-  <!-- slide 23d: Sort Selection: sort by importance -->
-  <string name="SSD_sort_importance">Efter prioritet</string>
-  
-  <!-- slide 23f: Sort Selection: sort by modified date -->
-  <string name="SSD_sort_modified">Efter senaste ändringen</string>
-  
-  <!-- slide 23g: Sort Selection: reverse -->
-  <string name="SSD_sort_reverse">Omvänd sortering</string>
-  
-  <!-- slide 23j: Sort Button: sort temporarily -->
-  <string name="SSD_save_temp">Bara en gång</string>
-  
-  <!-- slide 23i: Sort Button: sort permanently -->
-  <string name="SSD_save_always">Alltid</string>
-  
-  <!-- =============================================== FilterListActivity == -->
-  
-  <!-- Astrid Filter Shortcut -->    
-  <string name="FSA_label">Lista eller filter i Astrid</string>
-
-  <!-- Filter List Activity Title -->    
-  
-  <!-- Displayed when loading filters -->    
-  
-  <!-- Context Menu: Create Shortcut -->    
-  <string name="FLA_context_shortcut">Skapa genväg på skrivbordet</string>
-  
-  <!-- Menu: Search -->
-  
-  <!-- Menu: Help -->    
-  
-  <!-- slide 28c: Create Shortcut Dialog Title -->    
-  <string name="FLA_shortcut_dialog_title">Skapa genväg</string>
-  
-  <!-- Create Shortcut Dialog (asks to name shortcut) -->    
-  <string name="FLA_shortcut_dialog">Genvägens namn:</string>
-  
-  <!-- Search Hint-->
-  <string name="FLA_search_hint">Sök efter uppgifter</string>
-  
-  <!-- Search Filter name (%s => query) -->
-  <string name="FLA_search_filter">Matchar \'%s\'</string>
-  
-  <!-- Toast: created shortcut (%s => label) -->
-  <string name="FLA_toast_onCreateShortcut">Skapad genväg: %s</string>
-  
-  <!-- Menu: new filter -->
-  <string name="FLA_new_filter">Nytt filter</string>
-  
-  <!-- slide 10e: Button: new list -->
-  <string name="FLA_new_list">Ny lista</string>
-  
-  <!-- Alert when creating a shortcut without selecting a filter -->
-  <string name="FLA_no_filter_selected">Inget filter valt! Välj ett filter eller en lista.</string>
-  
-  <!-- ================================================= TaskEditActivity == -->
-  
-  <!-- Title when editing a task (%s => task title) -->
-  
-  <!-- Title when creating a new task -->
-  
-  <!-- Task title label -->
-  
-  <!-- Task when label -->
-  <string name="TEA_when_header_label">När</string>
-  
-  <!-- Task title hint (displayed when edit box is empty) -->
-  <string name="TEA_title_hint">Task name</string>
-  
-  <!-- Task importance label -->
-  <string name="TEA_importance_label">Prioritet</string>
-  
-  <!-- Task due date hint -->
-  <string name="TEA_deadline_hint">Set due date</string>
-  
-  <!-- Task assigned to string (%s -> assigned person name) -->
-  <string name="TEA_assigned_to">Assigned to %s</string>
-  
-  <!-- Task urgency specific time checkbox -->
-  <string name="TEA_urgency_specific_time">Vid bestämd tid?</string>
-  
-  <!-- Task urgency specific time title when specific time false -->
-  <string name="TEA_urgency_none">Ingen</string>
-  
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_label">Dölj tills</string>
-
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_display">Hide until %s</string>
-  
-  <!-- Task hide until toast -->
-  <string name="TEA_hideUntil_message">Uppgiften är dold fram till %s</string>
-  
-  <!-- Task editing data being loaded label -->
-  <string-array name="TEA_loading"><item>Laddar...</item></string-array>
-  
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_note_label">Beskrivning</string>
-
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_notes_empty">Description...</string>
-  
-  <!-- Task note hint -->
-  <string name="TEA_notes_hint">Ange uppgiftsbeskrivning...</string>
-  
-  <!-- Estimated time label -->
-  <string name="TEA_estimatedDuration_label">Hur lång tid kommer det att ta?</string>
-  
-  <!-- Elapsed time label -->
-  <string name="TEA_elapsedDuration_label">Tid redan spenderad på uppgiften</string>
-
-  <!-- Menu: Save -->    
-  <string name="TEA_menu_save">Spara ändringar</string>
-  
-  <!-- Menu: Don\'t Save -->
-  <string name="TEA_menu_discard">Spara inte</string>
-  
-  <!-- Menu: Delete Task -->
-  <string name="TEA_menu_delete">Radera uppgift</string>
-  
-  <!-- Menu: Task comments -->
-  <string name="TEA_menu_refresh_comments">Uppdatera kommentarer</string>
-
-  <string name="TEA_menu_comments">Kommentarer</string>
-  
-   <!-- Toast: task saved with deadline (%s => preposition + time units) -->
-  <string name="TEA_onTaskSave_due">Uppgift sparad: förfaller %s</string>
-  
-  <!-- Toast: task saved without deadlines -->
-  <string name="TEA_onTaskSave_notDue">Uppgift sparad</string>
-  
-  <!-- Toast: task was not saved -->
-  
-  <!-- Toast: task was deleted -->
-  
-  <!-- slide 15b: Task edit tab: activity -->
-  <string name="TEA_tab_activity">Aktivitet</string>
-  
-  <!-- slide 15e:  Task edit tab: more editing settings -->
-  <string name="TEA_tab_more">Mer</string>
-  
-  <!-- slide 15d: Task edit tab: web services -->
-  <string name="TEA_tab_web">Idéer</string>
-  
-  <string name="TEA_timer_est">Est. %s</string>
-
-  <string name="TEA_timer_elap">Elapsed %s</string>
-  
-  <string-array name="TEA_urgency">
-      <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No date</item>
-      <item>Specifik dag</item>
-      <item>Today</item>
-      <item>Tomorrow</item>
-      <item>(dagen efter)</item>
-      <item>Nästa vecka</item>
-      <item>Om två veckor</item>
-      <item>Nästa månad</item>
-  </string-array>
-  
-  <string name="TEA_no_time">Ingen tid</string>
-      
-  <string-array name="TEA_hideUntil">
-      <!-- hideUntil: labels for edit page. -->
-      <item>Never</item>
-      <item>Due date</item>
-      <item>Due time</item>
-      <item>Day before due</item>
-      <item>Week before due</item>
-      <item>Specifik dag/tid</item>
-  </string-array>
-  
-  <!-- Task edit control set descriptors -->
-
-  <!-- slide 9b/35i -->
-  <string name="TEA_control_who">Vem</string>
-
-  <!-- slide 9c/ 35a -->
-  <string name="TEA_control_when">När</string>
-  <!-- slide 35b -->
-  <string name="TEA_control_more_section">----More Section----</string>
-  <!-- slide 16a/35c -->
-  <string name="TEA_control_importance">Prioritet</string>  
-  <!-- slide 16b/35d -->
-  <string name="TEA_control_lists">Listor</string>  
-  <!-- slide 16c/35e -->
-  <string name="TEA_control_notes">Beskrivning</string>  
-  
-  <string name="TEA_control_files">Filer</string>
-
-  <!-- slide 16e / slide 35g-->
-  <string name="TEA_control_reminders">Påminnelser</string>
-
-  <!-- slide 16f -->
-  <string name="TEA_control_timer">Inställningar för tidtagarur</string>
-  
-  <string name="TEA_control_hidden_section">----Göm alltid----</string>
-  
-  <string name="hide_until_prompt">Visa i min lista</string>
-  
-  <!-- Add Ons tab when no add-ons found -->
-  
-  <!-- Add Ons button -->
-  
-  <!-- More row -->
-  
-  <!-- slide 15c: Text when no activity to show -->
-  <string name="TEA_no_activity">Ingen aktivitet att visa.</string>
-  
-  <!-- Text to load more activity -->
-  <string name="TEA_load_more">Ladda mer...</string>
-  
-  <!-- When controls dialog -->
-  <string name="TEA_when_dialog_title">När ska uppgiften vara slutförd?</string>
-  
-  
-  <string name="TEA_new_task">Ny uppgift</string>
-  
-  <string name="WSV_click_to_load">Klicka på mig för att hitta sätt att få det här gjort!</string>
-  
-  <string name="WSV_not_online">Jag kan göra mer när jag är uppkopplad. Kontrollera din internetförbindelse.</string>
-  
-  <string name="TEA_contact_error">Tyvärr kunde vi inte hitta en mailadress till den valda kontakten.</string>
-  
-  <!-- ============================================= IntroductionActivity == -->
-  
-  <!-- slide 1a: Introduction Window title -->
-  
-  <!-- Button to agree to EULA -->
-  
-  <!-- Button to disagree with EULA -->
-  
-  <!-- ===================================================== MissedCallActivity == -->
-  
-  <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
-  <string name="MCA_title">%1$s\nringde kl %2$s</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_return_call">Ring nu</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_add_task">Ring senare</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_ignore">Ignorera</string>
-  
-  <!-- Missed call: dialog to ignore all missed calls title -->
-  <string name="MCA_ignore_title">Ignorera alla missade samtal?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls body -->
-  <string name="MCA_ignore_body">Du har ignorerat flera missade samtal. Vill du att Astrid slutar fråga dig om dem?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore all button -->
-  <string name="MCA_ignore_all">Ignorera alla samtal</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
-  <string name="MCA_ignore_this">Ignorera endast detta samtal</string>
-
-  <!-- Missed call: preference title -->
-  <string name="MCA_missed_calls_pref_title">Fält missade samtal</string>
-
-  <!-- slide 49c: Missed call: preference description -->
-  <string name="MCA_missed_calls_pref_desc_enabled">Astrid meddelar dig om missade samtal och ger dig möjligheten att få påminnelse om att ringa tillbaka</string>
-  <string name="MCA_missed_calls_pref_desc_disabled">Astrid meddelar dig inte om missade samtal</string>
-
-  <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
-  <string name="MCA_task_title_name">Ring %1$s tillbaka kl %2$s</string>
-
-  <!-- Missed call: task title no name (%s -> number)-->
-  <string name="MCA_task_title_no_name">Ring %s tillbaka</string>
-  
-  <!-- Missed call: schedule dialog title (%s -> name or number)-->
-  <string name="MCA_schedule_dialog_title">Ring %s tillbaka om...</string>
-  
-  <!-- Missed call speech bubble options -->
-  <string-array name="MCA_dialog_speech_options">
-      <item>Visst är det fint att vara så omtyckt!</item>
-      <item>Hurra! Man tycker om dig!</item>
-      <item>Gör dem glada, ring dem!</item>
-      <item>Skulle inte du bli glad om man ringde tillbaka?</item>
-      <item>Du klarar det!</item>
-      <item>Du kan alltid sända ett sms...</item>
-  </string-array>
-  
-  
-  <!-- ======================================= Calendar reminder activity == -->
-  
-  <!-- Calendar remindeer ignore button -->
-  <string name="CRA_ignore">Ignorera</string>
-  
-  <!-- Calendar event -->
-  <string name="CRA_title">Behöver du en lista över möten?</string>
-  
-  <!-- Calendar reminder: dialog to ignore all missed calls title -->
-  <string name="CRA_ignore_title">Ignorera alla händelser i kalender?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls body -->
-  <string name="CRA_ignore_body">Du har ignorerat flera kalenderhändelser. Vill du att Astrid slutar fråga dig om dem?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
-  <string name="CRA_ignore_all">Ignorera alla händelser</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
-  <string name="CRA_ignore_this">Ignorera endast denna händelse</string>
-  
-  <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
-  <string name="CRA_speech_bubble_start">Det verkar som %s börjar snart. Vill du skapa en lista för saker att göra?</string>
-
-  <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
-  <string name="CRA_speech_bubble_end">Det verkar som du just slutfört %s. Vill du skapa en lista för saker att göra?</string>
-  
-  <!-- Calendar reminder: create list button -->
-  <string name="CRA_create_list">Skapa lista</string>
-
-  <!-- Calendar reminder: postpone button -->
-  <string name="CRA_postpone">Kanske senare</string>
-  
-  <!-- Calendar reminder: list exists dialog title -->
-  <string name="CRA_list_exists_title">Listan finns redan</string>
-  
-  <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
-  <string name="CRA_list_exists_body">En lista med namnet %s finns redan. Vill du använda den existerande listan eller skapa en ny för denna händelse?</string>
-  
-  <!-- Calendar reminder: list exists dialog create new button -->
-  <string name="CRA_create_new">Skapa ny</string>
-
-  <!-- Calendar reminder: list exists dialog use existing button -->
-  <string name="CRA_use_existing">Använd befintlig</string>
-  
-  <!-- Calendar remindr: created list (%s -> list name) -->
-  <string name="CRA_created_list_dialog">Jag skapade listan %s.</string>
-  
-  <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
-  <string name="CRA_one_attendee">%s deltar.</string>
-
-  <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
-  <string name="CRA_two_attendees">%1$s och %2$s deltar.</string>
-
-  <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
-  <string name="CRA_many_attendees">%1$s, %2$s och %3$d andra deltar</string>
-  
-  <!-- Calendar reminder: invitation prompt -->
-  <string name="CRA_invitation_prompt">Vill du bjuda in dem?</string>
-  
-  <!-- Calendar reminder: preference title -->
-  <string name="CRA_calendar_reminders_pref_title">Kalenderassistent</string>
-
-  <!-- Calendar reminder: pref description disabled -->
-  <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid kommer inte att påminna dig om dina kommande kalenderhändelser</string>
-
-  <!-- Calendar reminder: pref description enabled -->
-  <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid kommer att påminna om kommande kalenderhändelser och uppmana dig att förbereda dem</string>
-  
-  <!-- Calendar reminder: share list title -->
-  <string name="CRA_share_list_title">Dela denna lista?</string>
-  
-  <string name="CRA_invite_attendees">Bjud in deltagare</string>
-
-  <string name="CRA_more_options">Fler alternativ</string>
-
-  <string name="CRA_dont_invite">Nej tack</string>
-
-  <!-- Calendar reminder: share list title when no other attendees exist-->
-  <string name="CRA_list_created_title">Listan skapades!</string>
-  
-  <!-- Calendar reminder: default new list name (%s -> event title) -->
-  <string name="CRA_default_list_name">Saker att göra: %s</string>
-  
-  <!-- ===================================================== HelpActivity == -->
-  
-  <!-- Help: Button to get support from our website -->
-    
-  <!-- ==================================================== UpdateService == -->
-  
-  <!-- Changelog Window Title -->
-  <string name="UpS_changelog_title">Vad är nytt i Astrid?</string>
-  
-  <!-- Updates Window Title -->
-  <string name="UpS_updates_title">Senaste Astrid nyheter</string>
-  
-  <!-- Updats No Activity to show for offline users -->
-  <string name="UpS_no_activity_log_in">Logga in för att se hur\ndet går för dig och vad\nsom händer på delade listor.</string>
-  
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 31g: Preference Window Title -->
-  <string name="EPr_title">Inställningar</string>
-  
-  <string name="EPr_share_astrid">Dela Astrid</string>
-
-  <string name="EPr_share_astrid_summary">Dela på ditt sociala favoritnätverk</string>
-  
-  <!-- slide 46a -->
-  <string name="EPr_deactivated">inaktiverad</string>
-
-  <!-- slide 30i: Preference Category: Appearance Title -->
-  <string name="EPr_appearance_header">Utseende</string>
-  
-  <!-- Preference Category: Appearance Summary -->
-  <string name="EPr_appearance_summary">Teman, widgets, uppgiftsrader, redigeringsskärmen</string>
-  
-  <!-- FAQ Preference title -->
-  <string name="EPr_faq_title">Vanliga frågor och svar</string>
-  
-  <!-- Account status preference (%s -> account type) -->
-  <string name="EPr_account_title">Konto: %s</string>
-
-  <!-- Support preferences summary -->
-  <string name="EPr_support_summary">Introduktion, FAQ, om</string>
-  
-  <!-- slide 34a: Preference: Task List Font Size Title -->
-  <string name="EPr_fontSize_title">Storlek på uppgiftslista</string>
-  
-  <!-- Preference: Filters to show pref screen title -->
-  <string name="EPr_filters_to_show_title">Filter att visa</string>
-  
-  <!-- slide 32a: Preference: Show confirmation for smart reminders -->
-  <string name="EPr_showSmartConfirmation_title">Visa bekräftelse vid smarta påminnelser</string>
-  
-  <!-- slide 34g: Preference: Task List Font Size Description -->                                                                                                                                                  
-  <string name="EPr_fontSize_desc">Textstorlek för huvudlistan</string>  
-  
-  <!-- Preferemce: Show task edit confirmation toasts -->
-  
-  <!-- slide 34c: Preference: Task List Show Notes -->
-  <string name="EPr_showNotes_title">Visa beskrivning i uppgiften</string>
-  
-  <!-- Edit screen preference category -->
-  <string name="EPr_edit_screen_options">Ändra skärminställningar</string>
-  
-  <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
-  <string name="EPr_beastMode_title">Edit screen order</string>
-  
-  <string name="EPr_beastMode_shortcut">Customize</string>
-  
-  <string name="EPr_time_increment">5 minute increments</string>
-  
-  <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
-  
-  <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
-  
-  <!-- slide 35h -->
-  <string name="EPr_beastMode_desc">Ställ in layouten för uppgiftsredigeringsrutan</string>
-  <!-- slide 35j -->
-  <string name="EPr_beastMode_reset">Återställ till standardvärden</string>
-  
-  <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on each row</string>
-      
-  <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit screen</string>  
-  <!-- Preference: Task List Show Notes Description (enabled) -->
-  <string name="EPr_showNotes_desc_enabled">Description will always be displayed</string>
-  
-  <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
-  <string name="EPr_compressTaskRows_title">Kompakt uppgiftsrad</string>
-  <!-- slide 34j -->
-  <string name="EPr_compressTaskRows_desc">Anpassa rader efter uppgiftens titel</string>
-  
-  <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
-  <!-- slide 34k-->
-  
-  <!-- slide 34b: Preferences: Wrap task titles to two lines -->
-  <string name="EPr_fullTask_title">Visa hela namnet på uppgiften</string>
-  <string name="EPr_fullTask_desc_enabled">Uppgiftens namn kommer att visas i sin helhet</string>
-  <!-- slide 34h -->
-  <string name="EPr_fullTask_desc_disabled">De första två raderna i uppgiftens namn kommer att visas</string>
-  
-  <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
-  <string name="EPr_ideaAuto_title">Ladda fliken Idéer automatiskt</string>
-  <!-- slide 32c -->
-  <string name="EPr_ideaAuto_desc_enabled">Webbsökning till fliken Idéer utförs när du klickar på fliken</string>
-  <string name="EPr_ideaAuto_desc_disabled">Webbsökning till fliken Idéer utförs manuellt</string>
-  
-  <!-- Preferences: task row style -->
-  <string-array name="EPr_task_row_styles">
-      <item>Original</item>
-      <item>Simple</item>
-      <item>Title only</item>
-  </string-array>
-  
-  <string-array name="EPr_task_row_style_descriptions">
-      <item>Förkorta titel till två rader med datum till höger</item>
-      <item>Förkorta titel till en rad, med datum och listor nedanför</item>
-      <item>Single line title only</item>
-  </string-array>
-  
-  <!-- task row style title (%s -> style) -->
-  <string name="EPr_task_row_style_title">Row style: %s</string>
-  
-  <!-- Preference: custom filters enabled -->
-  <string name="EPr_use_filters_title">Use filters</string>
-  <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
-
-  <!-- Preference: show list members in shared list -->
-  <string name="EPr_show_list_members_title">Show list members in shared lists</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_simple_input_boxes">Simple text boxes</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
-
-  <!-- Preference: don\'t show plus button until input present -->
-  <string name="EPr_hide_plus_button">Hide plus button</string>
-
-  <!-- Preference: menu items -->
-  <string name="EPr_menu_items">Menu items</string>
-
-  <!-- Preference: list view -->
-  <string name="EPr_list_view">List view</string>
-
-  <!-- Preference: task edit comments -->
-  <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
-  
-  <!-- slide 30f/ 36f: Preference: Theme -->
-  <string name="EPr_theme_title">Färgtema</string>
-  <!-- Preference: Theme Description (%s => value) -->
-  <string name="EPr_theme_desc">Aktuellt: %s</string>  
-  <!-- Preference: Theme Description (android 1.6) -->
-  <string name="EPr_theme_desc_unsupported">Inställningen kräver Android 2.0 eller senare version</string>
-  <!-- slide 32h/ 37b -->
-  <string name="EPr_theme_widget_title">Widgettema</string>
-  
-  <!-- slide 30d/ 34f: Preference screen: all task row settings -->
-  <string name="EPr_taskRowPrefs_title">Utseende på uppgiftsraden</string>
-  
-  <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
-  <string name="EPr_use_contact_picker">Använd kontaktväljare</string>
-  <!-- slide 49b -->
-  <string name="EPr_use_contact_picker_desc_enabled">Systemets funktion för att välja kontakter kommer att visas i fönstret för tilldelning av uppgifter</string>
-  <string name="EPr_use_contact_picker_desc_disabled">Systemets funktion för att välja kontakter kommer inte att visas</string>
-
-  <!-- slide 49i: Preferences: Third party addons -->
-  <string name="EPr_third_party_addons">Tillåt tredjepartstillägg</string>
-  <string name="EPr_third_party_addons_desc_enabled">Tredjepartstillägg kommer att tillåtas</string>
-  <!-- slide 49d -->
-  <string name="EPr_third_party_addons_desc_disabled">Tredjepartstillägg kommer att vara avstängda</string>
-  
-  <!-- Preferences: ideas tab -->
-  <string name="EPr_ideas_tab_enabled">Uppgiftsförslag</string>
-  <string name="EPr_ideas_tab_description">Få förslag som hjälper dig att slutföra uppgifter</string>
-  
-  <!-- Preferences: calendar event start time -->
-  <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
-  <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
-  <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
-  
-  <string name="EPr_force_phone_layout">Använd telefonutseende</string>
-
-  <string name="EPr_show_featured_lists">Visa lista över funktioner</string>
-  
-  <!-- Configurations -->
-  <string name="EPr_configurations_title">Set configuration</string>
-  <string name="EPr_config_default">Default</string>
-  <string name="EPr_config_lite">Astrid Lite</string>
-  
-  <!-- Dialog title when setting preference configuration -->
-  <string name="EPr_config_dialog_title">Set configuration?</string>
-  <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
-  <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
-  
-  <!-- default configuration name for the above dialog -->
-  <string name="EPr_config_dialog_default_id">default</string>
-  
-  <!-- Preference title for showing save and cancel buttons in task edit page -->
-  <string name="EPr_show_save_and_cancel">Show save and cancel </string>
-  
-  
-  <!-- Swipe between lists -->
-  <!-- Preference: swipe between lists performance -->
-  <string name="EPr_swipe_lists_performance_title">Svep för att växla mellan listor</string>
-  
-  <string-array name="EPr_swipe_lists_performance_mode">
-      <item>No swipe</item>
-      <item>Spara minne</item>
-      <item>Vanlig prestanda</item>
-      <item>Hög prestanda</item>
-  </string-array>
-  
-  <string-array name="EPr_swipe_lists_performance_desc">
-  <!-- slide 49a -->
-      <item>Swipe between lists is disabled</item>
-      <item>Trögare prestanda</item>
-      <item>Standardinställning</item>
-      <item>Använder mer systemresurser</item>
-  </string-array>
-    
-  <string name="swipe_lists_helper_title">Gör en svepande rörelse för att byta lista</string>
-  <string name="swipe_lists_helper_header">Gör en svepande rörelse åt vänster eller höger för att snabbt växla mellan listor</string>
-  <string name="swipe_lists_helper_subtitle">Ändra inställningar i Inställningar -> Utseende</string>
-
-  <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
-  
-  <string-array name="EPr_default_reminders_mode">
-      <!-- reminders duration: labels for "Task Defaults" preference item. -->
-      <item>@string/TEA_reminder_mode_once</item>
-      <item>@string/TEA_reminder_mode_five</item>
-      <item>@string/TEA_reminder_mode_nonstop</item>
-  </string-array>
-    
-  <string-array name="EPr_themes">
-    <!-- theme_settings: labels for Theme preference menu -->
-    <!-- slide 36a-->
-    <item>Dag - blå</item>
-    <!-- slide 36b -->
-    <item>Dag - röd</item>
-    <!-- slide 36b -->
-    <item>Sky blue</item>
-    <!-- slide 36c -->
-    <item>Night</item>
-    <!-- slide 36d -->
-    <item>Transparent (white text)</item>
-    <!-- slide 36e -->
-    <item>Genomskinlig (svart text)</item>
-  </string-array>
-  
-  <string-array name="EPr_themes_widget">
-    <!-- slide 32i / 37a-->
-    <item>Same as app</item>
-    <item>Dag - blå</item>
-    <item>Dag - röd</item>
-    <item>Sky blue</item>
-    <item>Night</item>
-    <item>Transparent (white text)</item>
-    <item>Transparent (black text)</item>
-    <item>Gammalt format</item>
-  </string-array>
-  
-  <!-- ========================================== Task Management Settings == -->
-
-  <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
-  <string name="EPr_manage_header">Hantera gamla uppgifter</string>
-  <!-- slide 47d -->
-  <string name="EPr_manage_delete_completed">Radera färdiga uppgifter</string>
-  <string name="EPr_manage_delete_completed_message">Vill du verkligen radera alla dina färdiga uppgifter?</string>
-  <!-- slide 47a -->
-  <string name="EPr_manage_delete_completed_summary">Raderade uppgifter kan tas tillbaka en och en</string>
-  <string name="EPr_manage_delete_completed_status">%d uppgifter raderade!</string>
-  <!-- slide 47e -->
-  <string name="EPr_manage_purge_deleted">Rensa bort raderade uppgifter</string>
-  <string name="EPr_manage_purge_deleted_message">Vill du verkligen rensa bort alla dina raderade uppgifter?\n\nDe här uppgifterna kommer att tas bort för alltid!</string>
-  <string name="EPr_manage_purge_deleted_status">%d uppgifter bortrensade!</string>
-  <!-- slide 47b-->
-  <string name="EPr_manage_purge_deleted_summary">Varning! Bortrensade uppgifter kan inte återställas utan en säkerhetskopia!</string>
-  <!-- slide 47h-->
-  <string name="EPr_manage_clear_all">Radera alla data</string>
-  <string name="EPr_manage_clear_all_message">Radera alla uppgifter och inställningar i Astrid?\n\nVarning: denna åtgärd kan inte ångras!</string>
-
-  <!-- slide 47f -->
-  <string name="EPr_manage_delete_completed_gcal">Radera kalenderhändelser för färdiga uppgifter</string>
-  <string name="EPr_manage_delete_completed_gcal_message">Vill du verkligen radera alla händelser i kalendern för uppgifter som är färdiga?</string>
-  <string name="EPr_manage_delete_completed_gcal_summary"></string>
-  <string name="EPr_manage_delete_completed_gcal_status">%d kalenderhändelser raderade!</string>
-      
-  <!-- slide 47g-->
-  <string name="EPr_manage_delete_all_gcal">Radera alla kalenderhändelser för uppgifter</string>
-  <string name="EPr_manage_delete_all_gcal_message">Vill du verkligen radera alla dina händelser i kalendern för uppgifter?</string>
-  <string name="EPr_manage_delete_all_gcal_summary"></string>
-  <string name="EPr_manage_delete_all_gcal_status">%d kalenderhändelser raderade!</string>
-      
-  <!-- ==================================================== AddOnActivity == -->
-  
-  <!-- Add Ons Activity Title -->
-  <string name="AOA_title">Astrid: Tillägg</string>
-    
-  <!-- Add-on Activity: author for internal authors  -->
-  <string name="AOA_internal_author">Astrid-teamet</string>
-    
-  <!-- Add-on Activity: installed add-ons tab -->
-  <string name="AOA_tab_installed">Installerade</string>
-  
-  <!-- Add-on Activity - available add-ons tab -->
-  <string name="AOA_tab_available">Tillgängliga</string>
-  
-  <!-- Add-on Activity - free add-ons label -->
-  <string name="AOA_free">Ledig</string>
-  
-  <!-- Add-on Activity - menu item to visit add-on website -->
-  
-  <!-- Add-on Activity - menu item to visit android market -->
-  
-  <!-- Add-on Activity - when list is empty -->
-  <string name="AOA_no_addons">Tom lista!</string>
-  
-  <string name="AOA_ppack_title">Astrid Power Pack</string>
-  <string name="AOA_ppack_description">Stöd Astrid och bli mer produktiv med Astrid Power Pack. 4x2- och 4x4-widgets och röstintegration. Uppgradera idag!</string>
-  <string name="AOA_locale_title">Tillägget Astrid Locale (lokalt språkstöd)</string>
-  <string name="AOA_locale_description">Låter Astrid använda Locale-applikationen för att skicka anpassade meddelanden. Kräver Locale.</string>
-  
-  <!-- ====================================================== TasksWidget == -->
-
-  <!-- Widget text when loading tasks -->
-  <string name="TWi_loading">Laddar...</string>
-
-  <!-- Widget configuration activity title: select a filter -->
-  <string name="WCA_title">Välj uppgifter att se på...</string>
-  
-  <!-- ======================================================== Waiting on me -->
-
-  <string name="wom_commented">%s commented on your task.</string>
-  <string name="wom_mentioned">%s mentioned you.</string>
-  <string name="wom_assigned">%s assigned this to you.</string>
-  <string name="wom_raised_pri">%s raised the priority.</string>
-  <string name="wom_changed_due">%s changed the due date.</string>
-  <string name="wom_default">%s wants your attention.</string>
-  
-  <string name="wom_dismiss">Dismiss</string>
-  <string name="wom_acknowledge">I\'ve read this</string>
-
-  <!-- ============================================================= About == -->
-  
-  <!-- slide 30h: Title of "About" option in settings -->
-  <string name="p_about">Om Astrid</string>
-  
-  <!-- About text (%s => current version)-->
-  <string name="p_about_text">Aktuell version: %s\n\n Astrid är öppen programvara och underhålls av Todoroo, Inc.</string>
-
-  <!-- Title of "Help" option in settings -->
-  <string name="p_help">Stöd</string>
-  
-  <!-- slide 30c: Title of "Forums" option in settings -->
-  <string name="p_forums">Forum</string>
-  
-  <!-- Title of "Premium" option in settings -->
-  <string name="p_premium">Premium</string>
-  
-  <!-- ============================================================= Misc == -->
-  
-  <string name="feedback_positive_title">Rate Astrid?</string>
-
-  <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star rating?</string>
-
-  <string name="feedback_negative_title">Leave feedback?</string>
-
-  <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
-
-  <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback section--it might not be available on your device.</string>
-  
-  <string name="feedback_positive_button">Rate Astrid</string>
-
-  <string name="feedback_negative_button">Leave feedback</string>
-  
-  <string name="feedback_not_now">Not now</string>
-  
-  <string name="feedback_banner_text">How\'s Astrid working for you?</string>
-  
-  <!-- Displayed when task killer found. %s => name of the application -->
-  <string name="task_killer_help">Det ser ut att du använder en app som kan avsluta processer (%s)! Om du kan, lägg till Astrid i exklusionslistan så att den inte avslutas. Annars kan det hända att Astrid inte meddelar när dina uppgifter förfaller.\n</string>
-  
-  <!-- Task killer dialog ok button -->
-  <string name="task_killer_help_ok">Jag önskar inte avsluta Astrid!</string>
-    
-  <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
-  
-  <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
-  <string name="marketplace_description">Astrid är den mycket älskade Att-göra / Uppgiftshanteraren gjord med öppen källkod, designad för att hjälpa dig få saker gjorda. Den har påminnelser, taggar, synkroniserings, språktillägg, en widget med mera.</string>
-  
-  <string name="DB_corrupted_title">Korrupt databas</string>
-  
-  <string name="DB_corrupted_body">Oj! Det verkar som din databas är skadad.
-Om du ser detta felmeddelande ofta, föreslår vi att du tömmer all data
-(Inställningar->Synkronisering och backup->Hantera gamla uppgifter->Töm all data)
-och återställer dina aktuella uppgifter från en backup
-(Inställningar->Synkronisering och backup->Backup->Viktiga uppgifter) i Astrid.</string>
-      
-  <string name="market_unavailable">Tyvärr är inte denna funktion tillgänglig där du befinner dig.</string>
-  
+    <!-- ==================================================== AddOnActivity == -->
 
+    <!-- Add Ons Activity Title -->
+    <string name="AOA_title">Astrid: Tillägg</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Add-on Activity: author for internal authors  -->
+    <string name="AOA_internal_author">Astrid-teamet</string>
 
+    <!-- Add-on Activity: installed add-ons tab -->
+    <string name="AOA_tab_installed">Installerade</string>
 
-  <!-- slide 32g: Preference Category: Defaults Title -->
-  <string name="EPr_defaults_header">Standardinställningar för nya uppgifter</string>
-  <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
-  
-  <!-- slide 41f:  Preference: Default Urgency Title -->
-  <string name="EPr_default_urgency_title">Standardfrist</string>
-  <!-- Preference: Default Urgency Description (%s => setting) -->
-  <string name="EPr_default_urgency_desc">Aktuellt: %s</string>
-  
-  <!-- slide 40a: Preference: Default Importance Title -->
-  <string name="EPr_default_importance_title">Default priority</string>
-  <!-- Preference: Default Importance Description (%s => setting) -->
-  <string name="EPr_default_importance_desc">Aktuellt: %s</string>
-  
-  <!-- slide 42e: Preference: Default Hide Until Title -->
-  <string name="EPr_default_hideUntil_title">Standard Dölj tills</string>
-  <!-- Preference: Default Hide Until Description (%s => setting) -->
-  <string name="EPr_default_hideUntil_desc">Aktuellt: %s</string>
-  
-  <!-- slide 43e: Preference: Default Reminders Title -->
-  <string name="EPr_default_reminders_title">Standardpåminnelser</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_desc">Aktuellt: %s</string>
-  
-  <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
-  <string name="EPr_default_addtocalendar_title">Standardkalender för att lägga till händelser</string>
-  <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
-  <string name="EPr_default_addtocalendar_desc_disabled">Nya uppgifter skapar inga händelser i Googlekalendern</string>
-  <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
-  <string name="EPr_default_addtocalendar_desc">Nya uppgifter hamnar i kalendern \"%s\"</string>
-  
-  <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
-  <string name="EPr_default_reminders_mode_title">Standardtyp av ringsignal/vibration</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_mode_desc">Aktuellt: %s</string>
-  
-  <string-array name="EPr_default_importance">
-    <!-- importance: labels for "Task Defaults" preference item. -->
-    <!-- slide 40b -->
-    <item>!!! (Högst)</item>
-    <item>!!</item>
-    <item>!</item>
-    <!-- slide 40c -->
-    <item>o (Lägst)</item>
-  </string-array>
-  
-  <string-array name="EPr_default_urgency">
-    <!-- urgency: labels for "Task Defaults" preference item. -->
-    <!-- slide 41a-->
-    <item>Ingen frist</item>
-    <!-- slide 41b -->
-    <item>Today</item>
-    <!-- slide 41c-->
-    <item>Tomorrow</item>
-    <!-- slide 41d -->
-    <item>I övermorgon</item>
-    <!-- slide 41e -->
-    <item>Nästa vecka</item>
-  </string-array>
-  
-  <string-array name="EPr_default_hideUntil">
-    <!-- hideUntil: labels for "Task Defaults" preference item. -->
-    <!-- slide 42a -->
-    <item>Dölj inte</item>
-    <!-- slide 42b -->
-    <item>Uppgiften förfaller</item>
-    <!-- slide 42c -->
-    <item>Dagen före förfall</item>
-    <!-- slide 42d-->
-    <item>Veckan före förfall</item>
-  </string-array>
-  
-  <string-array name="EPr_default_reminders">
-    <!-- reminders: labels for "Task Defaults" preference item. -->
-    <!-- slide 43a -->
-    <item>Inga varsel om förfall</item>
-    <!-- slide 43b -->
-    <item>Vid förfallodagen</item>
-    <!-- slide 43c -->
-    <item>Efter förfallodagen</item>
-    <!-- slide 43d -->
-    <item>Vid eller efter förfallodagen</item>
-  </string-array>
-  
-  <string-array name="EPr_default_addtocalendar">
-    <!-- addtocalendar: labels for "Task Defaults" preference item. -->
-    <item>@string/EPr_deactivated</item>
-  </string-array>      
+    <!-- Add-on Activity - available add-ons tab -->
+    <string name="AOA_tab_available">Tillgängliga</string>
 
+    <!-- Add-on Activity - free add-ons label -->
+    <string name="AOA_free">Ledig</string>
+
+    <!-- Add-on Activity - menu item to visit add-on website -->
+
+    <!-- Add-on Activity - menu item to visit android market -->
+
+    <!-- Add-on Activity - when list is empty -->
+    <string name="AOA_no_addons">Tom lista!</string>
+
+    <string name="AOA_ppack_title">Astrid Power Pack</string>
+    <string name="AOA_ppack_description">Stöd Astrid och bli mer produktiv med Astrid Power Pack.
+        4x2- och 4x4-widgets och röstintegration. Uppgradera idag!
+    </string>
+    <string name="AOA_locale_title">Tillägget Astrid Locale (lokalt språkstöd)</string>
+    <string name="AOA_locale_description">Låter Astrid använda Locale-applikationen för att skicka
+        anpassade meddelanden. Kräver Locale.
+    </string>
+
+    <!-- ====================================================== TasksWidget == -->
+
+    <!-- Widget text when loading tasks -->
+    <string name="TWi_loading">Laddar...</string>
+
+    <!-- Widget configuration activity title: select a filter -->
+    <string name="WCA_title">Välj uppgifter att se på...</string>
+
+    <!-- ======================================================== Waiting on me -->
+
+    <string name="wom_commented">%s commented on your task.</string>
+    <string name="wom_mentioned">%s mentioned you.</string>
+    <string name="wom_assigned">%s assigned this to you.</string>
+    <string name="wom_raised_pri">%s raised the priority.</string>
+    <string name="wom_changed_due">%s changed the due date.</string>
+    <string name="wom_default">%s wants your attention.</string>
+
+    <string name="wom_dismiss">Dismiss</string>
+    <string name="wom_acknowledge">I\'ve read this</string>
+
+    <!-- ============================================================= About == -->
+
+    <!-- slide 30h: Title of "About" option in settings -->
+    <string name="p_about">Om Astrid</string>
+
+    <!-- About text (%s => current version)-->
+    <string name="p_about_text">Aktuell version: %s\n\n Astrid är öppen programvara och underhålls
+        av Todoroo, Inc.
+    </string>
+
+    <!-- Title of "Help" option in settings -->
+    <string name="p_help">Stöd</string>
+
+    <!-- slide 30c: Title of "Forums" option in settings -->
+    <string name="p_forums">Forum</string>
+
+    <!-- Title of "Premium" option in settings -->
+    <string name="p_premium">Premium</string>
+
+    <!-- ============================================================= Misc == -->
+
+    <string name="feedback_positive_title">Rate Astrid?</string>
+
+    <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star
+        rating?
+    </string>
+
+    <string name="feedback_negative_title">Leave feedback?</string>
+
+    <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
+
+    <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback
+        section--it might not be available on your device.
+    </string>
+
+    <string name="feedback_positive_button">Rate Astrid</string>
+
+    <string name="feedback_negative_button">Leave feedback</string>
+
+    <string name="feedback_not_now">Not now</string>
+
+    <string name="feedback_banner_text">How\'s Astrid working for you?</string>
+
+    <!-- Displayed when task killer found. %s => name of the application -->
+    <string name="task_killer_help">Det ser ut att du använder en app som kan avsluta processer
+        (%s)! Om du kan, lägg till Astrid i exklusionslistan så att den inte avslutas. Annars kan
+        det hända att Astrid inte meddelar när dina uppgifter förfaller.\n
+    </string>
+
+    <!-- Task killer dialog ok button -->
+    <string name="task_killer_help_ok">Jag önskar inte avsluta Astrid!</string>
+
+    <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
+
+    <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
+    <string name="marketplace_description">Astrid är den mycket älskade Att-göra /
+        Uppgiftshanteraren gjord med öppen källkod, designad för att hjälpa dig få saker gjorda. Den
+        har påminnelser, taggar, synkroniserings, språktillägg, en widget med mera.
+    </string>
+
+    <string name="DB_corrupted_title">Korrupt databas</string>
+
+    <string name="DB_corrupted_body">Oj! Det verkar som din databas är skadad.
+        Om du ser detta felmeddelande ofta, föreslår vi att du tömmer all data
+        (Inställningar->Synkronisering och backup->Hantera gamla uppgifter->Töm all data)
+        och återställer dina aktuella uppgifter från en backup
+        (Inställningar->Synkronisering och backup->Backup->Viktiga uppgifter) i Astrid.
+    </string>
+
+    <string name="market_unavailable">Tyvärr är inte denna funktion tillgänglig där du befinner
+        dig.
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 32g: Preference Category: Defaults Title -->
+    <string name="EPr_defaults_header">Standardinställningar för nya uppgifter</string>
+    <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
+
+    <!-- slide 41f:  Preference: Default Urgency Title -->
+    <string name="EPr_default_urgency_title">Standardfrist</string>
+    <!-- Preference: Default Urgency Description (%s => setting) -->
+    <string name="EPr_default_urgency_desc">Aktuellt: %s</string>
+
+    <!-- slide 40a: Preference: Default Importance Title -->
+    <string name="EPr_default_importance_title">Default priority</string>
+    <!-- Preference: Default Importance Description (%s => setting) -->
+    <string name="EPr_default_importance_desc">Aktuellt: %s</string>
+
+    <!-- slide 42e: Preference: Default Hide Until Title -->
+    <string name="EPr_default_hideUntil_title">Standard Dölj tills</string>
+    <!-- Preference: Default Hide Until Description (%s => setting) -->
+    <string name="EPr_default_hideUntil_desc">Aktuellt: %s</string>
+
+    <!-- slide 43e: Preference: Default Reminders Title -->
+    <string name="EPr_default_reminders_title">Standardpåminnelser</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_desc">Aktuellt: %s</string>
+
+    <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
+    <string name="EPr_default_addtocalendar_title">Standardkalender för att lägga till händelser
+    </string>
+    <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
+    <string name="EPr_default_addtocalendar_desc_disabled">Nya uppgifter skapar inga händelser i
+        Googlekalendern
+    </string>
+    <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
+    <string name="EPr_default_addtocalendar_desc">Nya uppgifter hamnar i kalendern \"%s\"</string>
+
+    <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
+    <string name="EPr_default_reminders_mode_title">Standardtyp av ringsignal/vibration</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_mode_desc">Aktuellt: %s</string>
+
+    <string-array name="EPr_default_importance">
+        <!-- importance: labels for "Task Defaults" preference item. -->
+        <!-- slide 40b -->
+        <item>!!! (Högst)</item>
+        <item>!!</item>
+        <item>!</item>
+        <!-- slide 40c -->
+        <item>o (Lägst)</item>
+    </string-array>
+
+    <string-array name="EPr_default_urgency">
+        <!-- urgency: labels for "Task Defaults" preference item. -->
+        <!-- slide 41a-->
+        <item>Ingen frist</item>
+        <!-- slide 41b -->
+        <item>Today</item>
+        <!-- slide 41c-->
+        <item>Tomorrow</item>
+        <!-- slide 41d -->
+        <item>I övermorgon</item>
+        <!-- slide 41e -->
+        <item>Nästa vecka</item>
+    </string-array>
+
+    <string-array name="EPr_default_hideUntil">
+        <!-- hideUntil: labels for "Task Defaults" preference item. -->
+        <!-- slide 42a -->
+        <item>Dölj inte</item>
+        <!-- slide 42b -->
+        <item>Uppgiften förfaller</item>
+        <!-- slide 42c -->
+        <item>Dagen före förfall</item>
+        <!-- slide 42d-->
+        <item>Veckan före förfall</item>
+    </string-array>
+
+    <string-array name="EPr_default_reminders">
+        <!-- reminders: labels for "Task Defaults" preference item. -->
+        <!-- slide 43a -->
+        <item>Inga varsel om förfall</item>
+        <!-- slide 43b -->
+        <item>Vid förfallodagen</item>
+        <!-- slide 43c -->
+        <item>Efter förfallodagen</item>
+        <!-- slide 43d -->
+        <item>Vid eller efter förfallodagen</item>
+    </string-array>
+
+    <string-array name="EPr_default_addtocalendar">
+        <!-- addtocalendar: labels for "Task Defaults" preference item. -->
+        <item>@string/EPr_deactivated</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in filter plug-in -->
-    
+
     <!-- ================================================= Filter Exposer == -->
-    
+
     <!-- Active Tasks Filter -->
     <string name="BFE_Active">My Tasks</string>
-    
+
     <!-- Waiting on me filter -->
     <string name="BFE_waiting_on_me">Waiting On Me</string>
-        
+
     <!-- Search Filter -->
-    
+
     <!-- slide 10b: Recently Modified -->
     <string name="BFE_Recent">Nyligen ändrade</string>
-    
+
     <!-- slide 10c: I\'ve assigned -->
     <string name="BFE_Assigned">Jag har delat ut</string>
-    
+
     <!-- Build Your Own Filter -->
-    
+
     <!-- Saved Filters Header -->
-    
+
     <!-- Saved Filters Context Menu: delete -->
     <string name="BFE_Saved_delete">Radera filter</string>
 
     <!-- =========================================== CustomFilterActivity == -->
-    
+
     <!-- slide 30d: Build Your Own Filter Activity Title-->
     <string name="CFA_title">Egendefinierat filter</string>
-    
+
     <!-- slide 30e: Filter Name edit box hint (if user types here, filter will be saved) -->
     <string name="CFA_filterName_hint">Spara detta filter genom att ge det ett namn</string>
-    
+
     <!-- Filter Name default for copied filters (%s => old filter name) -->
-    
+
     <!-- slide 30a: Filter Starting Universe: all tasks -->
     <string name="CFA_universe_all">Aktiva uppgifter</string>
-    
+
     <!-- Filter Criteria Type: add (at the begging of title of the criteria) -->
     <string name="CFA_type_add">eller</string>
-    
+
     <!-- Filter Criteria Type: subtract (at the begging of title of the criteria) -->
     <string name="CFA_type_subtract">inte</string>
-    
+
     <!-- Filter Criteria Type: intersect (at the begging of title of the criteria) -->
     <string name="CFA_type_intersect">också</string>
-    
+
     <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
     <string name="CFA_context_chain">%s har kriterier</string>
-    
+
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">Radera rad</string>
-    
+
     <!-- slide 30b: Filter Screen Help Text -->
     <string name="CFA_help">Long press on items for additional options</string>
-    
+
     <!-- slide 30c: Filter Button: add new -->
     <string name="CFA_button_add">Lägg till kriterium</string>
-    
+
     <!-- slide 30f: Filter Button: view without saving -->
     <string name="CFA_button_view">Visa</string>
-    
+
     <!-- Filter Button: save & view filter -->
     <string name="CFA_button_save">Spara &amp; visa</string>
 
     <!-- =========================================== CustomFilterCriteria == -->
-        
+
     <!-- Criteria: due by X - display text (? -> user input) -->
     <string name="CFC_dueBefore_text">Förfaller innan: ?</string>
     <!-- Criteria: due by X - name of criteria -->
@@ -1701,322 +1846,351 @@ och återställer dina aktuella uppgifter från en backup
         <item>Nästa vecka</item>
         <item>Nästa månad</item>
     </string-array>
-    
+
     <!-- Criteria: importance - display text (? -> user input)-->
     <string name="CFC_importance_text">Priority at least ?</string>
     <!-- Criteria: importance - name of criteria -->
-    <string name="CFC_importance_name">Priority...</string>        
-    
+    <string name="CFC_importance_name">Priority...</string>
+
     <!-- Criteria: tag - display text (? -> user input) -->
     <string name="CFC_tag_text">Lista: ?</string>
     <!-- Criteria: tag - name of criteria -->
     <string name="CFC_tag_name">Lista...</string>
-    
+
     <!-- Criteria: tag_contains - name of criteria -->
     <string name="CFC_tag_contains_name">Namnet på listan innehåller...</string>
     <!-- Criteria: tag_contains - text (? -> user input) -->
     <string name="CFC_tag_contains_text">Namnet på listan innehåller: ?</string>
-    
+
     <!-- Criteria: title_contains - name of criteria -->
     <string name="CFC_title_contains_name">Titeln innehåller...</string>
     <!-- Criteria: title_contains - text (? -> user input) -->
     <string name="CFC_title_contains_text">Titeln innehåller: ?</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-  
-  <!-- Error message for adding to calendar  -->
-  <string name="gcal_TEA_error">Misslyckades med att lägga uppgift till kalender!</string>
-
-  <!-- Label for adding task to calendar -->
-
-  <!-- slide 21c: Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">Skapa kalenderhändelse</string>
-  
-  <!-- Label when calendar event already exists -->
-  <string name="gcal_TEA_showCalendar_label">Öppna kalenderhändelse</string>
-  
-  <!-- Toast when unable to open calendar event -->
-  
-  <!-- Toast when calendar event updated because task changed -->
-  <string name="gcal_TEA_calendar_updated">Kalenderhändelsen uppdaterades också!</string>
-  
-  <!-- No calendar label (don\'t add option) -->
-  <string name="gcal_TEA_nocal">Lägg inte till</string>
-  
-  <string name="gcal_TEA_none_selected">To calendar?</string>
-  
-  <string name="gcal_TEA_has_event">Kalenderhändelse</string>
-  
-  <!-- ======================================================== Calendars == -->
-  
-  <!-- Calendar event name when task is completed (%s => task title) -->
-  <string name="gcal_completed_title">%s (avslutad)</string>
-
-  <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
-  <string name="gcal_GCP_default">Standardkalender</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Error message for adding to calendar  -->
+    <string name="gcal_TEA_error">Misslyckades med att lägga uppgift till kalender!</string>
 
+    <!-- Label for adding task to calendar -->
 
+    <!-- slide 21c: Label for adding task to calendar -->
+    <string name="gcal_TEA_addToCalendar_label">Skapa kalenderhändelse</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Label when calendar event already exists -->
+    <string name="gcal_TEA_showCalendar_label">Öppna kalenderhändelse</string>
+
+    <!-- Toast when unable to open calendar event -->
+
+    <!-- Toast when calendar event updated because task changed -->
+    <string name="gcal_TEA_calendar_updated">Kalenderhändelsen uppdaterades också!</string>
+
+    <!-- No calendar label (don\'t add option) -->
+    <string name="gcal_TEA_nocal">Lägg inte till</string>
+
+    <string name="gcal_TEA_none_selected">To calendar?</string>
+
+    <string name="gcal_TEA_has_event">Kalenderhändelse</string>
+
+    <!-- ======================================================== Calendars == -->
+
+    <!-- Calendar event name when task is completed (%s => task title) -->
+    <string name="gcal_completed_title">%s (avslutad)</string>
+
+    <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
+    <string name="gcal_GCP_default">Standardkalender</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ============================================================= UI == -->
 
     <!-- filters header: GTasks -->
     <string name="gtasks_FEx_header">Google Uppgifter</string>
-    
+
     <!-- filter category for GTasks lists -->
-    
+
     <!-- filter title for GTasks lists (%s => list name) -->
     <string name="gtasks_FEx_title">Google Uppgifter: %s</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_creating_list">Skapar lista...</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_create_list_dialog">Nytt listnamn:</string>
-    
+
     <!-- error to show when list creation fails -->
     <string name="gtasks_FEx_create_list_error">Det gick inte att skapa en ny lista</string>
-    
+
     <!-- short help title for Gtasks -->
-    
+
     <string name="CFC_gtasks_list_text">I listan: ?</string>
 
     <string name="CFC_gtasks_list_name">I lista på Google Uppgifter...</string>
-    
+
     <!-- Message while clearing completed tasks -->
     <string name="gtasks_GTA_clearing">Rensar bort färdiga uppgifter...</string>
-    
+
     <!-- Label for clear completed menu item -->
     <string name="gtasks_GTA_clear_completed">Rensa bort färdiga</string>
-        
+
     <!-- ============================================ GtasksLoginActivity == -->
-    
-    <!-- Activity Title: Gtasks Login -->    
 
-    <!-- Instructions: Gtasks login -->    
-    <string name="gtasks_GLA_body">Vänligen logga in på Google Tasks Sync (Beta!). Google Apps för domäner stöds för närvarande inte, vi arbetar på detta.</string>
-    
-    <string name="gtasks_GLA_noaccounts">Inga tillgängliga Googlekonton att synkronisera med.</string>
+    <!-- Activity Title: Gtasks Login -->
+
+    <!-- Instructions: Gtasks login -->
+    <string name="gtasks_GLA_body">Vänligen logga in på Google Tasks Sync (Beta!). Google Apps för
+        domäner stöds för närvarande inte, vi arbetar på detta.
+    </string>
+
+    <string name="gtasks_GLA_noaccounts">Inga tillgängliga Googlekonton att synkronisera med.
+    </string>
 
-    <!-- Instructions: Gtasks further help -->    
-    <string name="gtasks_GLA_further_help">Om du vill visa dina uppgifter med indrag och ordning bevarad, gå till Filter sidan och välj en lista under Google Tasks. Som standard använder Astrid sin egen sortering för uppgifter.</string>
+    <!-- Instructions: Gtasks further help -->
+    <string name="gtasks_GLA_further_help">Om du vill visa dina uppgifter med indrag och ordning
+        bevarad, gå till Filter sidan och välj en lista under Google Tasks. Som standard använder
+        Astrid sin egen sortering för uppgifter.
+    </string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
 
-    <!-- E-mail Address Label -->    
+    <!-- E-mail Address Label -->
+
+    <!-- Password Label -->
 
-    <!-- Password Label -->    
-    
     <!--  Authenticating toast -->
     <string name="gtasks_GLA_authenticating">Autentiserar...</string>
-    
+
     <!-- Google Apps for Domain checkbox -->
 
-    <!-- Error Message when fields aren\'t filled out -->    
+    <!-- Error Message when fields aren\'t filled out -->
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
+    <string name="gtasks_GLA_errorAuth">Autentisering misslyckad! Kontrollera ditt användarnamn och
+        lösenord i kontoinställningarna i din telefon
+    </string>
+
+    <!-- Error Message when we receive an IO Exception -->
+    <string name="gtasks_GLA_errorIOAuth">Vi hade problem med förbindelsen till Googles servrar.
+        Försök igen senare.
+    </string>
 
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
-    <string name="gtasks_GLA_errorAuth">Autentisering misslyckad! Kontrollera ditt användarnamn och lösenord i kontoinställningarna i din telefon</string>
+    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->
+    <string name="gtasks_GLA_errorAuth_captcha">Du kan ha stött på en captcha. Prova att logga in
+        från webbläsaren, kom sedan tillbaka och försök igen:
+    </string>
 
-    <!-- Error Message when we receive an IO Exception -->    
-    <string name="gtasks_GLA_errorIOAuth">Vi hade problem med förbindelsen till Googles servrar. Försök igen senare.</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->    
-    <string name="gtasks_GLA_errorAuth_captcha">Du kan ha stött på en captcha. Prova att logga in från webbläsaren, kom sedan tillbaka och försök igen:</string>
-    
     <!-- ============================================== GtasksPreferences == -->
 
-    <!-- GTasks Preferences Title -->    
+    <!-- GTasks Preferences Title -->
     <string name="gtasks_GPr_header">Google Uppgifter</string>
-    
-    <!-- ================================================ Synchronization == -->    
-    
+
+    <!-- ================================================ Synchronization == -->
+
     <!-- title for notification tray when synchronizing -->
 
     <!-- Error Message when we receive a HTTP 503 error -->
-    <string name="gtasks_error_backend">Googles API för uppgifter är ännu i betaversion och har råkat ut för ett fel. Kanske är tjänsten otillgänglig för tillfället. Försök igen senare.</string>
-    
+    <string name="gtasks_error_backend">Googles API för uppgifter är ännu i betaversion och har
+        råkat ut för ett fel. Kanske är tjänsten otillgänglig för tillfället. Försök igen senare.
+    </string>
+
     <!-- Error for account not found -->
-    <string name="gtasks_error_accountNotFound">Kontot %s kunde inte hittas. Logga ut och in på nytt i inställningarna för Google Uppgifter.</string>
-    
+    <string name="gtasks_error_accountNotFound">Kontot %s kunde inte hittas. Logga ut och in på nytt
+        i inställningarna för Google Uppgifter.
+    </string>
+
     <!-- Error when ping after refreshing token fails -->
-    <string name="gtasks_error_authRefresh">Kunde inte autentisera med Google Uppgifter. Kontrollera ditt lösenord och försök igen.</string>
-    
+    <string name="gtasks_error_authRefresh">Kunde inte autentisera med Google Uppgifter. Kontrollera
+        ditt lösenord och försök igen.
+    </string>
+
     <!-- Error when account manager returns no auth token or throws exception -->
-    <string name="gtasks_error_accountManager">Fel i din telefons kontohantering. Logga ut och in på nytt i inställningarna för Google Uppgifter.</string>
+    <string name="gtasks_error_accountManager">Fel i din telefons kontohantering. Logga ut och in på
+        nytt i inställningarna för Google Uppgifter.
+    </string>
 
     <!-- Error when authorization error happens in background sync -->
-    <string name="gtasks_error_background_sync_auth">Autentisering i bakgrunden misslyckades. Vänligen försök starta en synkronisering medan Astrid körs.</string>
-      
+    <string name="gtasks_error_background_sync_auth">Autentisering i bakgrunden misslyckades.
+        Vänligen försök starta en synkronisering medan Astrid körs.
+    </string>
+
     <string name="gtasks_import_progress">Importing Google Tasks...</string>
 
-    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you still want to add the task %2$s to it?</string>
+    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you
+        still want to add the task %2$s to it?
+    </string>
 
     <string name="gtasks_import_dlg_title">Google Tasks Import</string>
 
     <string name="gtasks_import_add_task_ok">Add task</string>
 
     <string name="gtasks_import_add_task_cancel">Don\'t add task</string>
-        
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- NEW USER EXPERIENCE -->
-  
-  <!-- help bubbles -->
-  <!-- slide 8c: Shown the first time a user sees the task list activity -->
-  <string name="help_popover_add_task">Börja med att lägga in en eller två uppgifter</string>
-
-  <!-- Shown the first time a user adds a task to a list -->  
-  <string name="help_popover_tap_task">Tryck på en uppgift för att redigera och dela</string>
-  
-  <!-- slide 14a: Shown the first time a user sees the list activity -->
-  <string name="help_popover_list_settings">Tryck för att redigera eller dela den här listan</string>
-  
-  <!-- slide 26c: Shown the first time a user sees the list settings tab -->
-  <string name="help_popover_collaborators">De du delar med kan hjälpa till att bygga upp din lista eller göra färdigt uppgifter</string>
-  
-  <!-- Shown after user adds a task on tablet-->
-  <string name="help_popover_add_lists">Lägg till en lista</string>
-  
-  <!-- Shown after a user adds a task on phones -->
-  <string name="help_popover_switch_lists">Tryck för att lägga till eller byta lista</string>
-  
-  
-  
-  <!-- Login activity -->
-  
-  
-  <!-- slide 7b -->
-  <string name="welcome_login_tos_base">Genom att använda Astrid godkänner du</string>
-  
-  <string name="welcome_login_tos_link">Villkor för användning</string>
-  
-  <!-- slide 7e -->
-  <string name="welcome_login_pw">Registrera dig</string>
-  
-  <string name="welcome_sign_in">Logga in</string>
-
-  <!-- slide 7f -->
-  <string name="welcome_login_later">Senare</string>
-  
-  <string name="welcome_login_confirm_later_title">Om du skulle ta och logga in?</string>
-  
-  <string name="welcome_login_confirm_later_ok">Jag ska göra det!</string>
-  
-  <string name="welcome_login_confirm_later_cancel">Nej tack</string>
-  
-  <string name="welcome_login_confirm_later_dialog">Logga in för att få ut så mycket som möjligt av Astrid! Utan kostnad får du säkerhetskopia via nätet, full synkronisering med Astrid.com, möjlighet att lägga till uppgifter via e-post, och du kan till och med dela uppgiftslistor med vänner!</string>
+    <!-- NEW USER EXPERIENCE -->
 
+    <!-- help bubbles -->
+    <!-- slide 8c: Shown the first time a user sees the task list activity -->
+    <string name="help_popover_add_task">Börja med att lägga in en eller två uppgifter</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown the first time a user adds a task to a list -->
+    <string name="help_popover_tap_task">Tryck på en uppgift för att redigera och dela</string>
 
+    <!-- slide 14a: Shown the first time a user sees the list activity -->
+    <string name="help_popover_list_settings">Tryck för att redigera eller dela den här listan
+    </string>
 
-  <!-- Resources for built-in locale plug-in -->
-
-  <!-- Locale Alert Editing Window Title -->
-  <string name="locale_edit_alerts_title">Astrid filteralarm</string>
-  
-  <!-- Locale Window Help -->                                                                                                                                            
-  <string name="locale_edit_intro">Astrid ger dig en påminnelse när du har uppgifter i följande filter:</string>
-      
-  <!-- Locale Window Filter Picker UI -->                                                                                                                                        
-      
-  <!-- Locale Window Interval Label -->                                                                                                                                        
-  <string name="locale_interval_label">Begränsa påminnelser till:</string>        
-      
-  <!-- Locale Window Interval Values -->                                                                                                                                        
-  <string-array name="locale_interval">
-    <item>en gång i timmen</item>
-    <item>en gång var sjätte timme</item>
-    <item>en gång var tolfte timme</item>
-    <item>en gång om dagen</item>
-    <item>en gång var tredje dag</item>
-    <item>en gång i veckan</item>
-  </string-array>        
-      
-  <!-- Locale Notification text -->                                                                                                                                        
-  <string name="locale_notification">Du har $NUM som matchar: $FILTER</string>     
-      
-  <!-- Locale Plugin was not found, it is required -->
-  <string name="locale_plugin_required">Var god installera Astrid Locale-tillägget</string>        
-     
+    <!-- slide 26c: Shown the first time a user sees the list settings tab -->
+    <string name="help_popover_collaborators">De du delar med kan hjälpa till att bygga upp din
+        lista eller göra färdigt uppgifter
+    </string>
 
+    <!-- Shown after user adds a task on tablet-->
+    <string name="help_popover_add_lists">Lägg till en lista</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown after a user adds a task on phones -->
+    <string name="help_popover_switch_lists">Tryck för att lägga till eller byta lista</string>
+
+
+    <!-- Login activity -->
+
+
+    <!-- slide 7b -->
+    <string name="welcome_login_tos_base">Genom att använda Astrid godkänner du</string>
+
+    <string name="welcome_login_tos_link">Villkor för användning</string>
+
+    <!-- slide 7e -->
+    <string name="welcome_login_pw">Registrera dig</string>
+
+    <string name="welcome_sign_in">Logga in</string>
+
+    <!-- slide 7f -->
+    <string name="welcome_login_later">Senare</string>
+
+    <string name="welcome_login_confirm_later_title">Om du skulle ta och logga in?</string>
+
+    <string name="welcome_login_confirm_later_ok">Jag ska göra det!</string>
+
+    <string name="welcome_login_confirm_later_cancel">Nej tack</string>
+
+    <string name="welcome_login_confirm_later_dialog">Logga in för att få ut så mycket som möjligt
+        av Astrid! Utan kostnad får du säkerhetskopia via nätet, full synkronisering med Astrid.com,
+        möjlighet att lägga till uppgifter via e-post, och du kan till och med dela uppgiftslistor
+        med vänner!
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in locale plug-in -->
+
+    <!-- Locale Alert Editing Window Title -->
+    <string name="locale_edit_alerts_title">Astrid filteralarm</string>
+
+    <!-- Locale Window Help -->
+    <string name="locale_edit_intro">Astrid ger dig en påminnelse när du har uppgifter i följande
+        filter:
+    </string>
+
+    <!-- Locale Window Filter Picker UI -->
+
+    <!-- Locale Window Interval Label -->
+    <string name="locale_interval_label">Begränsa påminnelser till:</string>
+
+    <!-- Locale Window Interval Values -->
+    <string-array name="locale_interval">
+        <item>en gång i timmen</item>
+        <item>en gång var sjätte timme</item>
+        <item>en gång var tolfte timme</item>
+        <item>en gång om dagen</item>
+        <item>en gång var tredje dag</item>
+        <item>en gång i veckan</item>
+    </string-array>
+
+    <!-- Locale Notification text -->
+    <string name="locale_notification">Du har $NUM som matchar: $FILTER</string>
+
+    <!-- Locale Plugin was not found, it is required -->
+    <string name="locale_plugin_required">Var god installera Astrid Locale-tillägget</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ====================== Plugin Boilerplate ========================= -->
 
-	<!-- filters header: OpenCRX -->
+    <!-- filters header: OpenCRX -->
     <string name="opencrx_FEx_header">OpenCRX</string>
-    
+
     <!-- filter category for OpenCRX ActivityCreators -->
     <string name="opencrx_FEx_dashboard">Arbetsytor</string>
-    
+
     <!-- filter category for OpenCRX responsible person -->
     <string name="opencrx_FEx_responsible">Tilldelad</string>
-    
+
     <!--  OpenCRX assignedTo filter title (%s => assigned contact) -->
     <string name="opencrx_FEx_responsible_title">Tilldelad \'%s\'</string>
-    
+
     <!-- detail for showing tasks created by someone else (%s => person name) -->
     <string name="opencrx_PDE_task_from">från %s</string>
-    
+
     <!-- replacement string for task edit "Notes" when using OpenCRX -->
     <string name="opencrx_TEA_notes">Lägg till en kommentar</string>
-    
+
     <string name="opencrx_creator_input_hint">Upphovsman</string>
 
     <string name="opencrx_contact_input_hint">Tilldelad</string>
     <!-- ==================================================== Preferences == -->
 
-    <!-- Preferences Title: OpenCRX -->    
+    <!-- Preferences Title: OpenCRX -->
     <string name="opencrx_PPr_header">OpenCRX</string>
 
     <!-- creator title for tasks that are not synchronized -->
     <string name="opencrx_no_creator">(synkronisera inte)</string>
 
-	<!-- preference title for default creator -->
+    <!-- preference title for default creator -->
     <string name="opencrx_PPr_defaultcreator_title">Default ActivityCreator</string>
 
     <!-- preference description for default creator (%s -> setting) -->
     <string name="opencrx_PPr_defaultcreator_summary">Nya aktiviteter skapas av: %s</string>
 
     <!-- preference description for default dashboard (when set to \'not synchronized\') -->
-    <string name="opencrx_PPr_defaultcreator_summary_none">Nya aktiviteter synkroniseras som standard</string>
-    
+    <string name="opencrx_PPr_defaultcreator_summary_none">Nya aktiviteter synkroniseras som
+        standard
+    </string>
+
     <!--  OpenCRX host and segment group name -->
     <string name="opencrx_group">OpenCRX-server</string>
 
@@ -2025,81 +2199,90 @@ och återställer dina aktuella uppgifter från en backup
 
     <!--  dialog title for OpenCRX host -->
     <string name="opencrx_host_dialog_title">OpenCRX-värd</string>
-    
+
     <!--  example for OpenCRX host -->
-    <string name="opencrx_host_summary">"Till exempel: "<i>mindomän.com</i></string>
-    
+    <string name="opencrx_host_summary">"Till exempel: "
+        <i>mindomän.com</i>
+    </string>
+
     <!--  preference description for OpenCRX segment -->
     <string name="opencrx_segment_title">Segment</string>
 
     <!--  dialog title for OpenCRX segment -->
     <string name="opencrx_segment_dialog_title">Synkroniserat segment</string>
-    
+
     <!--  example for OpenCRX segment -->
-    <string name="opencrx_segment_summary">"Till exempel: "<i>Standard</i></string>
-    
+    <string name="opencrx_segment_summary">"Till exempel: "
+        <i>Standard</i>
+    </string>
+
     <!--  default value for OpenCRX segment -->
     <string name="opencrx_segment_default">Standard</string>
-    
+
     <!--  preference description for OpenCRX provider -->
     <string name="opencrx_provider_title">Leverantör</string>
 
     <!--  dialog title for OpenCRX provider -->
     <string name="opencrx_provider_dialog_title">Leverantör av OpenCRX-data</string>
-    
+
     <!--  example for OpenCRX provider -->
-    <string name="opencrx_provider_summary">"Till exempel: "<i>CRX</i></string>
-    
+    <string name="opencrx_provider_summary">"Till exempel: "
+        <i>CRX</i>
+    </string>
+
     <!--  default value for OpenCRX provider -->
     <string name="opencrx_provider_default">CRX</string>
     <!-- ================================================= Login Activity == -->
 
-    <!-- Activity Title: Opencrx Login -->    
+    <!-- Activity Title: Opencrx Login -->
     <string name="opencrx_PLA_title">Logga in på OpenCRX</string>
 
-    <!-- Instructions: Opencrx login -->    
+    <!-- Instructions: Opencrx login -->
     <string name="opencrx_PLA_body">Logga in på ditt OpenCRX-konto</string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
     <string name="opencrx_PLA_signIn">Logga in</string>
 
-    <!-- Login Label -->    
+    <!-- Login Label -->
     <string name="opencrx_PLA_login">Logga in</string>
 
-    <!-- Password Label -->    
+    <!-- Password Label -->
     <string name="opencrx_PLA_password">Lösenord</string>
-    
-        <!-- Error Message when fields aren\'t filled out -->    
+
+    <!-- Error Message when fields aren\'t filled out -->
     <string name="opencrx_PLA_errorEmpty">Fel: fyll i alla fält</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
     <string name="opencrx_PLA_errorAuth">Fel användarnamn eller lösenord!</string>
 
     <!-- ================================================ Synchronization == -->
-        
+
     <!-- title for notification tray after synchronizing -->
     <string name="opencrx_notification_title">OpenCRX</string>
-    
+
     <!-- text for notification tray when synchronizing -->
-    <string name="opencrx_notification_text">%s uppgifter uppdaterade / klicka för ytterligare detaljer</string>
-    
+    <string name="opencrx_notification_text">%s uppgifter uppdaterade / klicka för ytterligare
+        detaljer
+    </string>
+
     <!-- Error msg when io exception  -->
-    <string name="opencrx_ioerror">Tillkopplingsfel! Kontrollera din tillkoppling till internet.</string>
+    <string name="opencrx_ioerror">Tillkopplingsfel! Kontrollera din tillkoppling till internet.
+    </string>
 
     <!-- opencrx Login not specified-->
     <string name="opencrx_MLA_email_empty">Användarnamn ej angivet!</string>
-    
+
     <!-- opencrx password not specified-->
     <string name="opencrx_MLA_password_empty">Lösenord specificerades inte!</string>
-    
+
     <!-- ================================================ labels for layout-elements == -->
-    
+
     <!-- label for task-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_task_assign_label">Tilldela denna uppgift följande person:</string>
-    
+
     <!-- Spinner-item for unassigned tasks on taskeditactivity -->
     <string name="opencrx_TEA_task_unassigned">&lt;Otilldelad&gt;</string>
-    
+
     <!-- label for dashboard-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_creator_assign_label">Upphovsman som ska tilldelas uppgiften:</string>
 
@@ -2107,7 +2290,7 @@ och återställer dina aktuella uppgifter från en backup
     <string name="opencrx_TEA_dashboard_default">&lt;Standard&gt;</string>
 
     <string name="opencrx_TEA_opencrx_title">OpenCRX-inställningar</string>
-        
+
     <string name="CFC_opencrx_in_workspace_text">I arbetsyta: ?</string>
 
     <string name="CFC_opencrx_in_workspace_name">I arbetsyta...</string>
@@ -2117,120 +2300,152 @@ och återställer dina aktuella uppgifter från en backup
     <string name="CFC_opencrx_assigned_to_name">Tilldelad...</string>
 
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
+    <!-- ================================================== EditPreferences == -->
 
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 32j: Preference Category: Power Pack -->
-  <string name="EPr_powerpack_header">Premium och övriga inställningar</string>
-  <string name="EPr_powerpack_summary">Påminnelser för missade samtal, röstinmatning samt övriga inställningar</string>
-  
-  <!-- slide 32e: Preference: Anonymous User Statistics -->
-  <string name="EPr_statistics_title">Anonym användningsstatistik</string>
-  <!-- Preference: User Statistics (disabled) -->
-  <string name="EPr_statistics_desc_disabled">Inga användningsdata rapporteras</string>  
-  <!-- slide 32f: Preference: User Statistics (enabled) -->
-  <string name="EPr_statistics_desc_enabled">Hjälp oss att förbättra Astrid genom att skicka anonym användningsstatistik</string>
-      
+    <!-- slide 32j: Preference Category: Power Pack -->
+    <string name="EPr_powerpack_header">Premium och övriga inställningar</string>
+    <string name="EPr_powerpack_summary">Påminnelser för missade samtal, röstinmatning samt övriga
+        inställningar
+    </string>
 
+    <!-- slide 32e: Preference: Anonymous User Statistics -->
+    <string name="EPr_statistics_title">Anonym användningsstatistik</string>
+    <!-- Preference: User Statistics (disabled) -->
+    <string name="EPr_statistics_desc_disabled">Inga användningsdata rapporteras</string>
+    <!-- slide 32f: Preference: User Statistics (enabled) -->
+    <string name="EPr_statistics_desc_enabled">Hjälp oss att förbättra Astrid genom att skicka
+        anonym användningsstatistik
+    </string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
-    <string name="speech_err_network">Nätverksfel! Taligenkänning kräver internetaccess för att fungera.</string>
-    <string name="speech_err_no_match">Ursäkta, jag förstod inte det där. Vänligen försök igen.</string>
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <string name="speech_err_network">Nätverksfel! Taligenkänning kräver internetaccess för att
+        fungera.
+    </string>
+    <string name="speech_err_no_match">Ursäkta, jag förstod inte det där. Vänligen försök igen.
+    </string>
     <string name="speech_err_default">Taligenkänning misslyckades. Vänligen försök igen.</string>
-    
+
     <string name="premium_attach_file">Bifoga fil</string>
     <string name="premium_record_audio">Spela in en anteckning</string>
     <string name="premium_no_files">Inga filer bifogade</string>
     <string name="premium_remove_file_confirm">Är du säker? Detta kan inte ångras</string>
-    
+
     <string name="audio_recording_title">Spelar in ljud</string>
     <string name="audio_stop_recording">Avsluta inspelning</string>
     <string name="audio_speak_now">Prata nu!</string>
     <string name="audio_encoding">Omkodar...</string>
     <string name="audio_err_encoding">Omkodning av ljudet misslyckades</string>
     <string name="audio_err_playback">Tyvärr stöds inte detta ljudformat</string>
-    
-    <string name="search_market_audio">Ingen spelare hittades för denna ljudtyp. Skulle du vilja ladda ned en ljudspelare från Google Play?</string>
+
+    <string name="search_market_audio">Ingen spelare hittades för denna ljudtyp. Skulle du vilja
+        ladda ned en ljudspelare från Google Play?
+    </string>
     <string name="search_market_audio_title">Ingen ljudspelare hittades</string>
 
-    <string name="search_market_pdf">Ingen PDF-läsare hittades. Skulle du vilja ladda ned en från Google Play?</string>
+    <string name="search_market_pdf">Ingen PDF-läsare hittades. Skulle du vilja ladda ned en från
+        Google Play?
+    </string>
     <string name="search_market_pdf_title">Ingen PDF-läsare hittades</string>
 
-    <string name="search_market_ms">Ingen MS Office-läsare hittades. Skulle du vilja ladda ned en från Google Play?</string>
+    <string name="search_market_ms">Ingen MS Office-läsare hittades. Skulle du vilja ladda ned en
+        från Google Play?
+    </string>
     <string name="search_market_ms_title">Ingen MS Office-läsare hittades</string>
-    
-    <string name="file_type_unhandled">Tyvärr hittades ingen applikation för att hantera den här filtypen</string>
+
+    <string name="file_type_unhandled">Tyvärr hittades ingen applikation för att hantera den här
+        filtypen
+    </string>
     <string name="file_type_unhandled_title">Ingen passande applikation hittades</string>
-    
+
     <string name="file_prefix_image">Bild</string>
     <string name="file_prefix_voice">Röst</string>
     <string name="file_browser_up">Upp</string>
     <string name="file_browser_title">Välj en fil</string>
     <string name="dir_browser_title">Välj sökväg</string>
-    <string name="file_browser_err_permissions">Behörighets fel! Vänligen kontrollera att du inte blockat Astrid från att komma åt SD-kortet.</string>
+    <string name="file_browser_err_permissions">Behörighets fel! Vänligen kontrollera att du inte
+        blockat Astrid från att komma åt SD-kortet.
+    </string>
     <string name="file_add_picture">Bifoga en bild</string>
     <string name="file_add_sdcard">Bifoga en fil från SD-kortet</string>
     <string name="file_download_title">Ladda ned fil?</string>
-    <string name="file_download_body">Den här filen har inte laddats ned till ditt SD-kort. Ladda ned nu?</string>
+    <string name="file_download_body">Den här filen har inte laddats ned till ditt SD-kort. Ladda
+        ned nu?
+    </string>
     <string name="file_download_progress">Laddar ned...</string>
     <string name="file_err_memory">Bilden är för stor och får inte plats i minnet</string>
     <string name="file_err_copy">Bifoga fil misslyckades: fel vid kopiering</string>
     <string name="file_err_download">Nedladdning av filen misslyckades</string>
-    <string name="file_err_no_directory">Ogiltig sökväg. Vänligen ange en sökväg för att spara filer i Astrids inställningar.</string>
+    <string name="file_err_no_directory">Ogiltig sökväg. Vänligen ange en sökväg för att spara filer
+        i Astrids inställningar.
+    </string>
     <string name="file_err_show">Ledsen, systemet stödjer inte denna filtyp</string>
-    
+
     <string name="file_dir_dialog_ok">Använd denna mapp</string>
     <string name="file_dir_dialog_default">Återställ till standard</string>
-    
+
     <string name="p_files_dir">Mapp för Premium-nedladdningar</string>
     <!-- Description for file download directory preference. %s -> chosen directory -->
     <string name="p_files_dir_desc">Uppgiftens bifogade filer sparades till: %s</string>
     <string name="p_files_dir_desc_default">Standardmapp</string>
 
-    
+
     <!-- in app billing -->
     <string name="billing_not_supported_title">Köp kan inte genomföras</string>
-    <string name="billing_not_supported_message">Betaltjänsten är inte tillgänglig. Du kan fortsätta att använda appen, men du kan inte genomföra köp.</string>
+    <string name="billing_not_supported_message">Betaltjänsten är inte tillgänglig. Du kan fortsätta
+        att använda appen, men du kan inte genomföra köp.
+    </string>
     <string name="subscriptions_not_supported_title">Prenumerationer kan ej köpas</string>
-    <string name="subscriptions_not_supported_message">Betaltjänsten på denna enhet stödjer inte prenumerationer i dagsläget. Du kan starta en prenumeration på Astrid Premium från http://astrid.com/premium</string>
+    <string name="subscriptions_not_supported_message">Betaltjänsten på denna enhet stödjer inte
+        prenumerationer i dagsläget. Du kan starta en prenumeration på Astrid Premium från
+        http://astrid.com/premium
+    </string>
     <string name="cannot_connect_title">Kan inte ansluta till Market</string>
     <string name="cannot_connect_message">Den här applikationen kan inte koppla upp sig mot Market.
-Din version av Market kan var för gammal.
-Du kan fortsätta använda applikationen men 
-kommer inte att kunna utföra köp.</string>
-    
+        Din version av Market kan var för gammal.
+        Du kan fortsätta använda applikationen men
+        kommer inte att kunna utföra köp.
+    </string>
+
     <string name="restoring_transactions">Återställer transaktioner</string>
-    
+
     <string name="subscriptions_learn_more">Lär dig mer</string>
-    
-    <string name="kii_premium_success">Thanks for participating in this offer! Your free month of Astrid Premium is now unlocked.</string>
+
+    <string name="kii_premium_success">Thanks for participating in this offer! Your free month of
+        Astrid Premium is now unlocked.
+    </string>
     <string name="kii_premium_abort">Special offer aborted</string>
     <string name="kii_premium_declined">Special offer declined</string>
-    <string name="kii_premium_error">There was an error processing this offer. Please try again later.</string>
-    
+    <string name="kii_premium_error">There was an error processing this offer. Please try again
+        later.
+    </string>
+
     <string name="premium_offers_title">Special Offer</string>
     <string name="premium_offers_subtitle">Want one month of Astrid Premium for free?</string>
-    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a short video by this sponsor. (They will also require your email address.)</string>
+    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a
+        short video by this sponsor. (They will also require your email address.)
+    </string>
     <string name="premium_offers_start">Get it free!</string>
-    
+
     <string name="premium_billing_title">Astrid Premium</string>
     <string name="premium_buy_month">1 månad</string>
     <string name="premium_buy_year">1 år</string>
     <string name="premium_description_header">Gör mer med premium!</string>
-    <string name="premium_description_1">Koppla filer till dina att-göra \n(pdfs, doc, ppt...)</string>
+    <string name="premium_description_1">Koppla filer till dina att-göra \n(pdfs, doc, ppt...)
+    </string>
     <string name="premium_description_2">Synkroniserar filer med astrid.com</string>
     <string name="premium_description_3">Lägg till bilagor via e-post</string>
     <string name="premium_description_4">Spara röstinspelningar som ljudfiler</string>
@@ -2239,727 +2454,764 @@ kommer inte att kunna utföra köp.</string>
     <string name="premium_speech_bubble_1">Premium kommer att boosta din produktivitet!</string>
     <string name="premium_speech_bubble_2">Beställ för helår och spara 25%!</string>
     <string name="premium_already_subscribed">Du har redan en Astrid Premium prenumeration.</string>
-    <string name="premium_login_prompt">Du behöver ett Astrid.com-konto för att kunna prenumerera på premium. Vänligen logga in för att fortsätta.</string>
+    <string name="premium_login_prompt">Du behöver ett Astrid.com-konto för att kunna prenumerera på
+        premium. Vänligen logga in för att fortsätta.
+    </string>
     <string name="premium_success">Tack för att du prenumererar på Astrid Premium!</string>
-    <string name="premium_success_with_server_error">Tack för att du prenumererar på Astrid Premium! De nya funktionerna på Astrid.com kommer att låsas upp snart och direkt på din telefon.</string>
-    <string name="premium_verification_error">Premium abonemanget för detta Google Play kontot är kopplat till en annan användare. För att länka ytterligare e-postadresser till ditt konto, besök astrid.com/users/profile</string>
-    <string name="premium_check_for_purchases">Redan köpt premium? Klicka här för att kontrollera order historiken på Google Play.</string>
+    <string name="premium_success_with_server_error">Tack för att du prenumererar på Astrid Premium!
+        De nya funktionerna på Astrid.com kommer att låsas upp snart och direkt på din telefon.
+    </string>
+    <string name="premium_verification_error">Premium abonemanget för detta Google Play kontot är
+        kopplat till en annan användare. För att länka ytterligare e-postadresser till ditt konto,
+        besök astrid.com/users/profile
+    </string>
+    <string name="premium_check_for_purchases">Redan köpt premium? Klicka här för att kontrollera
+        order historiken på Google Play.
+    </string>
     <string name="premium_checking_for_purchases">Kontrollerar köp...</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- 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">Påminn mig:</string>
-
-  <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">...när uppgiften förfaller</string>
-
-  <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">...när uppgiften har förfallit</string>
-
-  <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_randomly">En gång slumpmässigt</string>
-
-  <!-- Task Edit: Reminder alarm clock label -->  
-  <string name="TEA_reminder_alarm_label">Ring/Vibrationsinställning:</string>
-
-  <!--  slide 45a: Task Edit: Reminder mode: ring once -->  
-  <string name="TEA_reminder_mode_once">Once</string>
-
-  <!-- slide 45b: Task Edit: Reminder mode: ring five times -->  
-  <string name="TEA_reminder_mode_five">Five times</string>
-
-  <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->  
-  <string name="TEA_reminder_mode_nonstop">Until I dismiss alarm</string>
-  
-  <string name="TEA_reminder_when">when</string>
-  
-  <string name="TEA_reminder_due_short">due</string>
-
-  <string name="TEA_reminder_overdue_short">overdue</string>
-
-  <string name="TEA_reminder_randomly_short">randomly</string>
-
-  <string name="TEA_reminder_display_one">Remind me %s</string>
-  
-  <string name="TEA_reminder_display_multiple">Remind %s</string>
-
-  <string-array name="TEA_reminder_random">
-    <!-- random reminder choices for task edit page. -->
-    <item>en timme</item>
-    <item>ett dygn</item>
-    <item>en vecka</item>
-    <item>två veckor</item>
-    <item>en månad</item>
-    <item>två månader</item>
-  </string-array>
-  
-  <!-- ==================================================== notifications == -->
-  
-  <!-- Name of filter when viewing a reminder -->
-  <string name="rmd_NoA_filter">Påminnelse!</string>
-  
-  <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Redan klar!</string>
-  
-  <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Vänta...</string>
-  
-  <!-- Reminder: Completed Toast -->
-  <string name="rmd_NoA_completed_toast">Grattis till den slutförda uppgiften!</string>
-  
-  <!-- Prefix for reminder dialog title -->
-  <string name="rmd_NoA_dlg_title">Påminnelse:</string>
-  
-  <!-- ==================================================== user reengagement == -->
-
-  <!-- Titles for user reengagement notifications -->
-  <string-array name="rmd_reengage_notif_titles">
-    <item>A note from Astrid</item>
-    <!-- %s -> first name -->
-    <item>Memo for %s.</item> 
-    <item>Your Astrid digest</item>
-    <item>Reminders from Astrid</item>
-  </string-array>
-    
-  <string name="rmd_reengage_name_default">du</string>
-
-  
-  <string name="rmd_reengage_add_tasks">Lägg till uppgift</string>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs -->
-  <string-array name="rmd_reengage_dialog_options">
-    <item>Time to shorten your to-do list!</item>
-    <item>Dear sir or madam, some tasks await your inspection!</item>
-    <item>Hi there, could you take a look at these?</item>
-    <item>I\'ve got some tasks with your name on them!</item>
-    <item>A fresh batch of tasks for you today!</item>
-    <item>You look fabulous! Ready to get started?</item>
-    <item>A lovely day for getting some work done, I think!</item>
-  </string-array>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>Don\'t you want to get organized?</item>
-    <item>I\'m Astrid! I\'m here to help you do more!</item>
-    <item>You look busy! Let me take some of those tasks off of your plate.</item>
-    <item>I can help you keep track of all of the details in your life.</item>
-    <item>You\'re serious about getting more done? So am I!</item>
-    <item>Pleasure to make your acquaintance!</item>
-  </string-array>
-  <!-- ============================================= reminder preferences == -->
-  
-  <!-- slide 33d: Reminder Preference Screen Title -->
-  <string name="rmd_EPr_alerts_header">Påminnelseinställningar</string>
-  <string name="rmd_EPr_alerts_summary">Tysta timmar, snooze alternativ, envishets-nivå</string>
-    
-  <!-- Reminder Preference: Reminders Enabled Title -->
-  <string name="rmd_EPr_enabled_title">Påminnelser valda?</string>
-  <!-- Reminder Preference Reminders Enabled Description (true) -->
-  <string name="rmd_EPr_enabled_desc_true">Påminnelser från Astrid är valda (normalt)</string>
-  <!-- Reminder Preference Reminders Enabled Description (false) -->
-  <string name="rmd_EPr_enabled_desc_false">Påminnelser från Astrid visas inte i telefonen</string>  
-    
-  <!-- Reminder Preference: Quiet Hours Start Title -->
-  <string name="rmd_EPr_quiet_hours_start_title">Tyst period börjar</string>
-  <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">Inga varsel visas efter %s</string>
-  <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
-  <string name="rmd_EPr_quiet_hours_desc_none">Tyst period är inaktiverad</string>
-  
-  <!-- Reminder Preference: Quiet Hours End Title -->
-  <string name="rmd_EPr_quiet_hours_end_title">Tyst period slutar</string>
-  <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_end_desc">Påminnelser är ljudlösa med början %s</string>
-
-  <!-- Reminder Preference: Default Reminder Title -->
-  <string name="rmd_EPr_rmd_time_title">Standardpåminnelse</string>
-  <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
-  <string name="rmd_EPr_rmd_time_desc">Påminnelser om uppgifter utan sluttid visas %s</string>
-
-  <!-- Reminder Preference: Notification Ringtone Title -->
-  <string name="rmd_EPr_ringtone_title">Ringsignal för påminnelser</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
-  <string name="rmd_EPr_ringtone_desc_custom">Egendefinierad ringsignal har ställts in</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
-  <string name="rmd_EPr_ringtone_desc_silent">Ringsignal ställdes till tyst</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
-  <string name="rmd_EPr_ringtone_desc_default">Standardringsignal används</string>
-  
-  <!-- Reminder Preference: Notification Persistence Title -->
-  <string name="rmd_EPr_persistent_title">Varselinställningar</string>
-  <!-- Reminder Preference: Notification Persistence Description (true) -->
-  <string name="rmd_EPr_persistent_desc_true">Varsel måste ses individuellt för att kunna rensas</string>
-  <!-- Reminder Preference: Notification Persistence Description (false) -->
-  <string name="rmd_EPr_persistent_desc_false">Varsel kan rensas med \"Rensa alla\"-knappen</string>
-
-  <!-- Reminder Preference: Social Reminders Title -->
-  <string name="rmd_EPr_social_title">Social encouragement</string>
-  <!-- Reminder Preference: Social Reminders Summary (enabled) -->
-  <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for shared tasks</string>
-  <!-- Reminder Preference: Social Reminders Summary (disabled) -->
-  <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you for shared tasks</string>
-  
-  
-  
-  <!-- Reminder Preference: Notification Icon Title -->
-  <!-- Reminder Preference: Notification Icon Description -->
-
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
-  <string name="rmd_EPr_multiple_maxvolume_title">Maxvolym för flera ringande påminnelser</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid sätter volymen på max för flera ringande påminnelser</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid använder systeminställningen för volym</string>
-
-  <!-- Reminder Preference: Vibrate Title -->
-  <string name="rmd_EPr_vibrate_title">Vibrera vid varsel</string>
-  <!-- Reminder Preference: Vibrate Description (true) -->
-  <string name="rmd_EPr_vibrate_desc_true">Astrid kommer att vibrera vid varsel</string>
-  <!-- Reminder Preference: Vibrate Description (false) -->
-  <string name="rmd_EPr_vibrate_desc_false">Astrid kommer inte att vibrera vid varsel</string>
-
-  <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">Astrid påminnelser</string>
-  <!-- Reminder Preference: Nagging Description (true) -->
-  <string name="rmd_EPr_nagging_desc_true">Astrid kommer att visa uppmuntringsmeddelanden vid påminnelser</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_nagging_desc_false">Astrid kommer inte att visa uppmuntringsmeddelanden</string>
-
-  <!-- Reminder Preference: Snooze Dialog Title -->  
-  <string name="rmd_EPr_snooze_dialog_title">Paustidsinställningar TT:MM</string>
-  <!-- Reminder Preference: Snooze Dialog Description (true) -->
-  <string name="rmd_EPr_snooze_dialog_desc_true">Ställ in paustid genom att välja ny tid (TT:MM)</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_snooze_dialog_desc_false">Ställ in paustid genom att välja # dagar/timmar för pausen</string>
-  
-  <!-- slide 44g: Reminder Preference: Default Reminders Title -->
-  <string name="rmd_EPr_defaultRemind_title">Tillfälliga påminnelser</string>
-  <!-- Reminder Preference: Default Reminders Setting (disabled) -->
-  <string name="rmd_EPr_defaultRemind_desc_disabled">Nya uppgifter påminns inte tillfälligtvis</string>
-  <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
-  <string name="rmd_EPr_defaultRemind_desc">Nya uppgifter påminns tillfälligtvis: %s</string>
-  
-  <!-- slide 39a: Defaults Title -->
-  
-  <string-array name="EPr_reminder_random">
-    <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
-    <item>inaktiverad</item>
-    <!-- slide 44b -->
-    <item>varje timme</item>
-    <!-- slide 44c -->
-    <item>varje dag</item>
-    <!-- slide 44d-->
-    <item>varje vecka</item>
-    <!-- slide 44e-->
-    <item>varannan vecka</item>
-    <!-- slide 44f -->
-    <item>varje månad</item>
-    <item>varannan månad</item>
-  </string-array>
-        
-  <string-array name="EPr_quiet_hours_start">
-    <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
-    <item>inaktiverad</item>
-    <item>kl 20.00</item>
-    <item>kl 21.00</item>
-    <item>kl 22.00</item>
-    <item>kl 23.00</item>
-    <item>kl 00.00</item>
-    <item>kl 01.00</item>
-    <item>kl 02.00</item>
-    <item>kl 03.00</item>
-    <item>kl 04.00</item>
-    <item>kl 05.00</item>
-    <item>kl 06.00</item>
-    <item>kl 07.00</item>
-    <item>kl 08.00</item>
-    <item>kl 09.00</item>
-    <item>kl 10.00</item>
-    <item>kl 11.00</item>
-    <item>kl 12.00</item>
-    <item>kl 13.00</item>
-    <item>kl 14.00</item>
-    <item>kl 15.00</item>
-    <item>kl 16.00</item>
-    <item>kl 17.00</item>
-    <item>kl 18.00</item>
-    <item>kl 19.00</item>
-  </string-array>
-  
-  <string-array name="EPr_quiet_hours_end">
-    <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
-    <item>kl 09.00</item>
-    <item>kl 10.00</item>
-    <item>kl 11.00</item>
-    <item>kl 12.00</item>
-    <item>kl 13.00</item>
-    <item>kl 14.00</item>
-    <item>kl 15.00</item>
-    <item>kl 16.00</item>
-    <item>kl 17.00</item>
-    <item>kl 18.00</item>
-    <item>kl 19.00</item>
-    <item>kl 20.00</item>
-    <item>kl 21.00</item>
-    <item>kl 22.00</item>
-    <item>kl 23.00</item>
-    <item>kl 00.00</item>
-    <item>kl 01.00</item>
-    <item>kl 02.00</item>
-    <item>kl 03.00</item>
-    <item>kl 04.00</item>
-    <item>kl 05.00</item>
-    <item>kl 06.00</item>
-    <item>kl 07.00</item>
-    <item>kl 08.00</item>
-  </string-array>
-  
-  <string-array name="EPr_rmd_time">
-    <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
-    <item>kl 09.00</item>
-    <item>kl 10.00</item>
-    <item>kl 11.00</item>
-    <item>kl 12.00</item>
-    <item>kl 13.00</item>
-    <item>kl 14.00</item>
-    <item>kl 15.00</item>
-    <item>kl 16.00</item>
-    <item>kl 17.00</item>
-    <item>kl 18.00</item>
-    <item>kl 19.00</item>
-    <item>kl 20.00</item>
-    <item>kl 21.00</item>
-    <item>kl 22.00</item>
-    <item>kl 23.00</item>
-    <item>kl 00.00</item>
-    <item>kl 01.00</item>
-    <item>kl 02.00</item>
-    <item>kl 03.00</item>
-    <item>kl 04.00</item>
-    <item>kl 05.00</item>
-    <item>kl 06.00</item>
-    <item>kl 07.00</item>
-    <item>kl 08.00</item>
-  </string-array>
-  
-  <!-- =============================================== random reminders == -->
-
-  <string name="reminders_social">Dessa människor räknar med dig!</string>
-  
-  <string name="reminders_social_one">%s is counting on you!</string>
-  
-  <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
-
-  <string-array name="reminders">
-      <!-- reminders: Make these < 20 chars so the task name is displayed -->
-      <item>Hej! Har du en sekund?</item>
-      <item>Får jag prata med dig en sekund?</item>
-      <item>Har du ett par minuter?</item>
-      <item>Har du glömt?</item>
-      <item>Ursäkta mig!</item>
-      <item>När du har en minut:</item>
-      <item>På din agenda:</item>
-      <item>Ledig ett ögonblick?</item>
-      <item>Astrid här!</item>
-      <item>Hej! Får jag störa dig?</item>
-      <item>En minut av din tid?</item>
-      <item>Det är en fin dag att</item>
-  </string-array>
-
-  <string-array name="reminders_due">
-      <!-- reminders related to task due date -->
-      <item>Dags att arbeta!</item>
-      <item>Förfallodatumet har kommit!</item>
-      <item>Redo att sätta igång?</item>
-      <item>Du sade att du skulle göra:</item>
-      <item>Det är meningen att du ska börja:</item>
-      <item>Dags att börja:</item>
-      <item>Nu är det dags!</item>
-      <item>Ursäkta mig! Det är dags för</item>
-      <item>Är du ledig? Det är dags för</item>
-  </string-array>
-
-  <string-array name="reminders_snooze">
-      <!-- reminders related to snooze -->
-      <item>Var nu inte lat!</item>
-      <item>Paustiden är slut!</item>
-      <item>Ingen paus mer!</item>
-      <item>Är du klar nu då?</item>
-      <item>Skjut inte upp mer!</item>
-  </string-array>
-  
-  <string-array name="reminder_responses">
-      <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
-      <item>Jag har något till dig!</item> 
-      <item>Redo att lägga detta i det förflutna?</item>
-      <item>Varför får du inte detta gjort?</item>
-      <item>Vad sägs? Är du redo?</item>
-      <item>Redo att göra detta?</item>
-      <item>Klarar du detta?</item>
-      <item>Du kan bli lycklig! Avsluta bara detta!</item>
-      <item>Jag lovar att du känner dig bättre om du avslutar detta!</item>
-      <item>Ska du inte göra detta idag?</item>
-      <item>Kan du inte bara avsluta denna uppgift? Jag blir ju led på den!</item>
-      <item>Kan du avsluta detta? Ja, det kan du!</item>
-      <item>Kommer du någonsin att göra detta?</item>
-      <item>Var nöjd med dig själv! Kom igen!</item>
-      <item>Jag är så stolt över dig! Få det gjort!</item>
-      <item>En liten munsbit efter att du avslutat detta?</item>
-      <item>Bara den här uppgiften? Snälla?</item>
-      <item>Dags att korta ned din att-göra-lista!</item>
-      <item>Ingår du i lag Ordning eller i lag Kaos? Lag Ordning! Kom igen!</item>
-      <item>Har jag sagt att du är toppen på sistone? Fortsätt så!</item>
-      <item>Undvik röra - bara att sätta i gång och göra!</item>
-      <item>Hur lyckas du med det här? Jag är verkligen imponerad!</item>
-      <item>Du klarar dig inte enbart med ditt utseende. Sätt i gång!</item>
-      <item>Fint väder för ett jobb som det här, ìnte sant?</item>
-      <item>En skvätt te medan du håller på med det här?</item>
-      <item>Om du bara hade varit klar med det här redan, kunde du ha gått ut och lekt.</item>
-      <item>Det är dags. Du kan inte skjuta upp det ofrånkomliga.</item>
-      <item>Jag dör en smula varje gång du ignorerar mig.</item>
-  </string-array>
-
-  <string-array name="postpone_nags">
-      <!-- Astrid\'s nagging when user clicks postpone -->
-      <item>Snälla, säg mig inte att du är en som förhalar!</item>
-      <item>Blir du inte trött på att vara lat ibland?</item>
-      <item>Någonstans är någon beroende av att du avslutar detta!</item>
-      <item>När du sade \"skjut upp\", så menade du faktiskt \"nu gör jag detta\", eller hur?</item>
-      <item>Det här är sista gången du skjuter upp detta, eller hur?</item>
-      <item>Bara gör det här färdigt idag, jag skvallrar inte!</item>
-      <item>Varför skjuta upp när du kan eh... inte skjuta upp!</item>
-      <item>Förr eller senare avslutar du detta, antar jag?</item>
-      <item>Jag tycker du är verkligen suverän! Vad sägs att du inte skjuter upp detta?</item>
-      <item>Kommer du att kunna uppnå dina mål om du gör sådär?</item>
-      <item>Skjut upp, skjut upp, skjut upp. När ska du förändra dig!</item>
-      <item>Jag har fått nog av dina bortförklaringar! Bara gör det!</item>
-      <item>Kom du inte med den där bortförklaringen förra gången?</item>
-      <item>Jag kan inte hjälpa dig med att organisera ditt liv om du gör det...</item>
-  </string-array>
+    <!-- Resources for built-in reminders plug-in -->
 
+    <!-- =============================================== task edit activity == -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder group label -->
+    <string name="TEA_reminders_group_label">Reminder settings</string>
 
+    <!-- Task Edit: Reminder header label -->
+    <string name="TEA_reminder_label">Påminn mig:</string>
 
-  <!-- Resources for built-in repeat plug-in -->
-
-  <!-- repeating plugin name -->
-  <string name="repeat_plugin">Upprepande uppgifter</string>
-  
-  <!-- repeating plugin description -->
-  <string name="repeat_plugin_desc">Tillåt upprepande uppgifter</string>
-  
-  <!-- slide 20a: checkbox for turning on/off repeats -->
-  <string name="repeat_enabled">Upprepningar</string>
-  
-  <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
-  <string name="repeat_every">Varje %d</string>
-  
-  <!-- hint when opening repeat interval -->
-  <string name="repeat_interval_prompt">Upprepningsintervall</string>
-  
-  <!-- slide 19b-->
-  <string name="repeat_never">Not repeating</string>
-  <!-- slide 20f-->
-  <string name="repeat_dont">Upprepa inte</string>
-      
-  <string-array name="repeat_interval_short">
-    <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
-    <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">
-    <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>Dag(ar)</item>
-    <item>Vecka (veckor)</item>
-    <item>Månad(er)</item>
-    <item>Timme (timmar)</item>
-    <item>Minut(er)</item>
-    <item>År</item>
-  </string-array>
-  
-  <string name="repeat_days">dagar</string>
-  <string name="repeat_weekdays">weekdays</string>
-  <string name="repeat_weeks">weeks</string>
-  <string name="repeat_months">months</string>
-  <string name="repeat_years">years</string>
-  <string name="repeat_hours">hours</string>
-  <string name="repeat_minutes">minutes</string>
-  
-  <string-array name="repeat_until_shortcuts">
-      <item>Forever</item>
-      <item>Specific Day</item>
-      <item>Today</item>
-      <item>Tomorrow</item>
-      <item>(day after)</item>
-      <item>Next Week</item>
-      <item>In Two Weeks</item>
-      <item>Next Month</item>
-  </string-array>
-  
-  <string name="repeat_until_title">Repetera tills...</string>
-  
-  <string name="repeat_keep_going">Fortsätt</string>
-  
-  <string-array name="repeat_type">
-    <!-- slide 20c: repeat type (date to repeat from) -->
-    <item>från förfallodatumet</item>
-    <!-- slide 20c -->
-    <item>från avslutningsdatumet</item>
-  </string-array>
-  
-  <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
-  <string name="repeat_detail_byday">$I på $D</string>
-  
-  <!-- task detail for repeat from due date (%s -> interval) -->
-  <string name="repeat_detail_duedate">Varje %s</string>
-
-  <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
-  <string name="repeat_detail_duedate_until">Varje %1$s\ntill %2$s </string>
-  
-  <!-- task detail for repeat from completion date (%s -> interval) -->
-  <string name="repeat_detail_completion">%s efter avslutning</string>
-  
-  <!-- text for button when repeating task indefinitely -->
-  <string name="repeat_forever">Repetera oändligt</string>
-
-  <!-- text for button when repeating task until specified date (%s -> date string) -->
-  <string name="repeat_until">Repetera till %s</string>
-  
-  <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title">Ändrar tid för uppgiften \"%s\"</string>
-
-  <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title_last_time">Avklarade återkommande uppgift \"%s\"</string>
-      
-  <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->  
-  <string name="repeat_rescheduling_dialog_bubble">%1$s Återkommande uppgift ändrad från %2$s till %3$s</string>
-  
-  <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
-  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s Jag har bokat om den här återkommande uppgiften till %2$s</string>
-  
-  <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
-  <string name="repeat_rescheduling_dialog_bubble_last_time">Du upprepade denna till %1$s, Nu är du helt färdig. %2$s</string>
-  
-  <string-array name="repeat_encouragement">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>Bra jobbat!</item>
-      <item>Häftigt! Jag är så stolt över dig!</item>
-      <item>I love when you\'re productive!</item>
-      <item>Visst känns det skönt att bocka av någonting?</item>
-  </string-array>
-
-  <string-array name="repeat_encouragement_last_time">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>Bra jobbat!</item>
-      <item>I\'m so proud of you!</item>
-      <item>I love when you\'re productive!</item>
-  </string-array>
-  
+    <!-- Task Edit: Reminder @ deadline -->
+    <string name="TEA_reminder_due">...när uppgiften förfaller</string>
 
+    <!-- Task Edit: Reminder after deadline -->
+    <string name="TEA_reminder_overdue">...när uppgiften har förfallit</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder at random times (%s => time plural)-->
+    <string name="TEA_reminder_randomly">En gång slumpmässigt</string>
 
-    
-  <!-- Subtasks Help Introduction -->
-  <string name="subtasks_help_title">Sortera och gör indrag i Astrid</string>
-  <string name="subtasks_help_1">Rör vid och håll kvar fingret för att flytta en uppgift</string>
-  <string name="subtasks_help_2">Dra upp eller ner för att ändra ordningen</string>
-  <string name="subtasks_help_3">Dra åt höger för att göra indrag</string>
-    
+    <!-- Task Edit: Reminder alarm clock label -->
+    <string name="TEA_reminder_alarm_label">Ring/Vibrationsinställning:</string>
 
+    <!--  slide 45a: Task Edit: Reminder mode: ring once -->
+    <string name="TEA_reminder_mode_once">Once</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 45b: Task Edit: Reminder mode: ring five times -->
+    <string name="TEA_reminder_mode_five">Five times</string>
+
+    <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
+    <string name="TEA_reminder_mode_nonstop">Until I dismiss alarm</string>
+
+    <string name="TEA_reminder_when">when</string>
+
+    <string name="TEA_reminder_due_short">due</string>
+
+    <string name="TEA_reminder_overdue_short">overdue</string>
+
+    <string name="TEA_reminder_randomly_short">randomly</string>
+
+    <string name="TEA_reminder_display_one">Remind me %s</string>
+
+    <string name="TEA_reminder_display_multiple">Remind %s</string>
+
+    <string-array name="TEA_reminder_random">
+        <!-- random reminder choices for task edit page. -->
+        <item>en timme</item>
+        <item>ett dygn</item>
+        <item>en vecka</item>
+        <item>två veckor</item>
+        <item>en månad</item>
+        <item>två månader</item>
+    </string-array>
+
+    <!-- ==================================================== notifications == -->
+
+    <!-- Name of filter when viewing a reminder -->
+    <string name="rmd_NoA_filter">Påminnelse!</string>
+
+    <!-- Reminder: Task was already done -->
+    <string name="rmd_NoA_done">Redan klar!</string>
+
+    <!-- Reminder: Snooze button (remind again later) -->
+    <string name="rmd_NoA_snooze">Vänta...</string>
+
+    <!-- Reminder: Completed Toast -->
+    <string name="rmd_NoA_completed_toast">Grattis till den slutförda uppgiften!</string>
+
+    <!-- Prefix for reminder dialog title -->
+    <string name="rmd_NoA_dlg_title">Påminnelse:</string>
+
+    <!-- ==================================================== user reengagement == -->
+
+    <!-- Titles for user reengagement notifications -->
+    <string-array name="rmd_reengage_notif_titles">
+        <item>A note from Astrid</item>
+        <!-- %s -> first name -->
+        <item>Memo for %s.</item>
+        <item>Your Astrid digest</item>
+        <item>Reminders from Astrid</item>
+    </string-array>
+
+    <string name="rmd_reengage_name_default">du</string>
+
+
+    <string name="rmd_reengage_add_tasks">Lägg till uppgift</string>
+
+    <!-- Speech bubble options for astrid in reengagement notifs -->
+    <string-array name="rmd_reengage_dialog_options">
+        <item>Time to shorten your to-do list!</item>
+        <item>Dear sir or madam, some tasks await your inspection!</item>
+        <item>Hi there, could you take a look at these?</item>
+        <item>I\'ve got some tasks with your name on them!</item>
+        <item>A fresh batch of tasks for you today!</item>
+        <item>You look fabulous! Ready to get started?</item>
+        <item>A lovely day for getting some work done, I think!</item>
+    </string-array>
+
+    <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>Don\'t you want to get organized?</item>
+        <item>I\'m Astrid! I\'m here to help you do more!</item>
+        <item>You look busy! Let me take some of those tasks off of your plate.</item>
+        <item>I can help you keep track of all of the details in your life.</item>
+        <item>You\'re serious about getting more done? So am I!</item>
+        <item>Pleasure to make your acquaintance!</item>
+    </string-array>
+    <!-- ============================================= reminder preferences == -->
+
+    <!-- slide 33d: Reminder Preference Screen Title -->
+    <string name="rmd_EPr_alerts_header">Påminnelseinställningar</string>
+    <string name="rmd_EPr_alerts_summary">Tysta timmar, snooze alternativ, envishets-nivå</string>
+
+    <!-- Reminder Preference: Reminders Enabled Title -->
+    <string name="rmd_EPr_enabled_title">Påminnelser valda?</string>
+    <!-- Reminder Preference Reminders Enabled Description (true) -->
+    <string name="rmd_EPr_enabled_desc_true">Påminnelser från Astrid är valda (normalt)</string>
+    <!-- Reminder Preference Reminders Enabled Description (false) -->
+    <string name="rmd_EPr_enabled_desc_false">Påminnelser från Astrid visas inte i telefonen
+    </string>
+
+    <!-- Reminder Preference: Quiet Hours Start Title -->
+    <string name="rmd_EPr_quiet_hours_start_title">Tyst period börjar</string>
+    <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_start_desc">Inga varsel visas efter %s</string>
+    <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
+    <string name="rmd_EPr_quiet_hours_desc_none">Tyst period är inaktiverad</string>
+
+    <!-- Reminder Preference: Quiet Hours End Title -->
+    <string name="rmd_EPr_quiet_hours_end_title">Tyst period slutar</string>
+    <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_end_desc">Påminnelser är ljudlösa med början %s</string>
+
+    <!-- Reminder Preference: Default Reminder Title -->
+    <string name="rmd_EPr_rmd_time_title">Standardpåminnelse</string>
+    <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
+    <string name="rmd_EPr_rmd_time_desc">Påminnelser om uppgifter utan sluttid visas %s</string>
+
+    <!-- Reminder Preference: Notification Ringtone Title -->
+    <string name="rmd_EPr_ringtone_title">Ringsignal för påminnelser</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
+    <string name="rmd_EPr_ringtone_desc_custom">Egendefinierad ringsignal har ställts in</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
+    <string name="rmd_EPr_ringtone_desc_silent">Ringsignal ställdes till tyst</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
+    <string name="rmd_EPr_ringtone_desc_default">Standardringsignal används</string>
+
+    <!-- Reminder Preference: Notification Persistence Title -->
+    <string name="rmd_EPr_persistent_title">Varselinställningar</string>
+    <!-- Reminder Preference: Notification Persistence Description (true) -->
+    <string name="rmd_EPr_persistent_desc_true">Varsel måste ses individuellt för att kunna rensas
+    </string>
+    <!-- Reminder Preference: Notification Persistence Description (false) -->
+    <string name="rmd_EPr_persistent_desc_false">Varsel kan rensas med \"Rensa alla\"-knappen
+    </string>
+
+    <!-- Reminder Preference: Social Reminders Title -->
+    <string name="rmd_EPr_social_title">Social encouragement</string>
+    <!-- Reminder Preference: Social Reminders Summary (enabled) -->
+    <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for
+        shared tasks
+    </string>
+    <!-- Reminder Preference: Social Reminders Summary (disabled) -->
+    <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you
+        for shared tasks
+    </string>
+
+
+    <!-- Reminder Preference: Notification Icon Title -->
+    <!-- Reminder Preference: Notification Icon Description -->
+
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
+    <string name="rmd_EPr_multiple_maxvolume_title">Maxvolym för flera ringande påminnelser</string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid sätter volymen på max för flera
+        ringande påminnelser
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid använder systeminställningen för
+        volym
+    </string>
+
+    <!-- Reminder Preference: Vibrate Title -->
+    <string name="rmd_EPr_vibrate_title">Vibrera vid varsel</string>
+    <!-- Reminder Preference: Vibrate Description (true) -->
+    <string name="rmd_EPr_vibrate_desc_true">Astrid kommer att vibrera vid varsel</string>
+    <!-- Reminder Preference: Vibrate Description (false) -->
+    <string name="rmd_EPr_vibrate_desc_false">Astrid kommer inte att vibrera vid varsel</string>
+
+    <!-- Reminder Preference: Nagging Title -->
+    <string name="rmd_EPr_nagging_title">Astrid påminnelser</string>
+    <!-- Reminder Preference: Nagging Description (true) -->
+    <string name="rmd_EPr_nagging_desc_true">Astrid kommer att visa uppmuntringsmeddelanden vid
+        påminnelser
+    </string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_nagging_desc_false">Astrid kommer inte att visa uppmuntringsmeddelanden
+    </string>
+
+    <!-- Reminder Preference: Snooze Dialog Title -->
+    <string name="rmd_EPr_snooze_dialog_title">Paustidsinställningar TT:MM</string>
+    <!-- Reminder Preference: Snooze Dialog Description (true) -->
+    <string name="rmd_EPr_snooze_dialog_desc_true">Ställ in paustid genom att välja ny tid (TT:MM)
+    </string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_snooze_dialog_desc_false">Ställ in paustid genom att välja # dagar/timmar
+        för pausen
+    </string>
+
+    <!-- slide 44g: Reminder Preference: Default Reminders Title -->
+    <string name="rmd_EPr_defaultRemind_title">Tillfälliga påminnelser</string>
+    <!-- Reminder Preference: Default Reminders Setting (disabled) -->
+    <string name="rmd_EPr_defaultRemind_desc_disabled">Nya uppgifter påminns inte tillfälligtvis
+    </string>
+    <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
+    <string name="rmd_EPr_defaultRemind_desc">Nya uppgifter påminns tillfälligtvis: %s</string>
+
+    <!-- slide 39a: Defaults Title -->
+
+    <string-array name="EPr_reminder_random">
+        <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
+        <item>inaktiverad</item>
+        <!-- slide 44b -->
+        <item>varje timme</item>
+        <!-- slide 44c -->
+        <item>varje dag</item>
+        <!-- slide 44d-->
+        <item>varje vecka</item>
+        <!-- slide 44e-->
+        <item>varannan vecka</item>
+        <!-- slide 44f -->
+        <item>varje månad</item>
+        <item>varannan månad</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_start">
+        <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
+        <item>inaktiverad</item>
+        <item>kl 20.00</item>
+        <item>kl 21.00</item>
+        <item>kl 22.00</item>
+        <item>kl 23.00</item>
+        <item>kl 00.00</item>
+        <item>kl 01.00</item>
+        <item>kl 02.00</item>
+        <item>kl 03.00</item>
+        <item>kl 04.00</item>
+        <item>kl 05.00</item>
+        <item>kl 06.00</item>
+        <item>kl 07.00</item>
+        <item>kl 08.00</item>
+        <item>kl 09.00</item>
+        <item>kl 10.00</item>
+        <item>kl 11.00</item>
+        <item>kl 12.00</item>
+        <item>kl 13.00</item>
+        <item>kl 14.00</item>
+        <item>kl 15.00</item>
+        <item>kl 16.00</item>
+        <item>kl 17.00</item>
+        <item>kl 18.00</item>
+        <item>kl 19.00</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_end">
+        <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
+        <item>kl 09.00</item>
+        <item>kl 10.00</item>
+        <item>kl 11.00</item>
+        <item>kl 12.00</item>
+        <item>kl 13.00</item>
+        <item>kl 14.00</item>
+        <item>kl 15.00</item>
+        <item>kl 16.00</item>
+        <item>kl 17.00</item>
+        <item>kl 18.00</item>
+        <item>kl 19.00</item>
+        <item>kl 20.00</item>
+        <item>kl 21.00</item>
+        <item>kl 22.00</item>
+        <item>kl 23.00</item>
+        <item>kl 00.00</item>
+        <item>kl 01.00</item>
+        <item>kl 02.00</item>
+        <item>kl 03.00</item>
+        <item>kl 04.00</item>
+        <item>kl 05.00</item>
+        <item>kl 06.00</item>
+        <item>kl 07.00</item>
+        <item>kl 08.00</item>
+    </string-array>
+
+    <string-array name="EPr_rmd_time">
+        <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
+        <item>kl 09.00</item>
+        <item>kl 10.00</item>
+        <item>kl 11.00</item>
+        <item>kl 12.00</item>
+        <item>kl 13.00</item>
+        <item>kl 14.00</item>
+        <item>kl 15.00</item>
+        <item>kl 16.00</item>
+        <item>kl 17.00</item>
+        <item>kl 18.00</item>
+        <item>kl 19.00</item>
+        <item>kl 20.00</item>
+        <item>kl 21.00</item>
+        <item>kl 22.00</item>
+        <item>kl 23.00</item>
+        <item>kl 00.00</item>
+        <item>kl 01.00</item>
+        <item>kl 02.00</item>
+        <item>kl 03.00</item>
+        <item>kl 04.00</item>
+        <item>kl 05.00</item>
+        <item>kl 06.00</item>
+        <item>kl 07.00</item>
+        <item>kl 08.00</item>
+    </string-array>
+
+    <!-- =============================================== random reminders == -->
+
+    <string name="reminders_social">Dessa människor räknar med dig!</string>
+
+    <string name="reminders_social_one">%s is counting on you!</string>
+
+    <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
+
+    <string-array name="reminders">
+        <!-- reminders: Make these < 20 chars so the task name is displayed -->
+        <item>Hej! Har du en sekund?</item>
+        <item>Får jag prata med dig en sekund?</item>
+        <item>Har du ett par minuter?</item>
+        <item>Har du glömt?</item>
+        <item>Ursäkta mig!</item>
+        <item>När du har en minut:</item>
+        <item>På din agenda:</item>
+        <item>Ledig ett ögonblick?</item>
+        <item>Astrid här!</item>
+        <item>Hej! Får jag störa dig?</item>
+        <item>En minut av din tid?</item>
+        <item>Det är en fin dag att</item>
+    </string-array>
+
+    <string-array name="reminders_due">
+        <!-- reminders related to task due date -->
+        <item>Dags att arbeta!</item>
+        <item>Förfallodatumet har kommit!</item>
+        <item>Redo att sätta igång?</item>
+        <item>Du sade att du skulle göra:</item>
+        <item>Det är meningen att du ska börja:</item>
+        <item>Dags att börja:</item>
+        <item>Nu är det dags!</item>
+        <item>Ursäkta mig! Det är dags för</item>
+        <item>Är du ledig? Det är dags för</item>
+    </string-array>
+
+    <string-array name="reminders_snooze">
+        <!-- reminders related to snooze -->
+        <item>Var nu inte lat!</item>
+        <item>Paustiden är slut!</item>
+        <item>Ingen paus mer!</item>
+        <item>Är du klar nu då?</item>
+        <item>Skjut inte upp mer!</item>
+    </string-array>
+
+    <string-array name="reminder_responses">
+        <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
+        <item>Jag har något till dig!</item>
+        <item>Redo att lägga detta i det förflutna?</item>
+        <item>Varför får du inte detta gjort?</item>
+        <item>Vad sägs? Är du redo?</item>
+        <item>Redo att göra detta?</item>
+        <item>Klarar du detta?</item>
+        <item>Du kan bli lycklig! Avsluta bara detta!</item>
+        <item>Jag lovar att du känner dig bättre om du avslutar detta!</item>
+        <item>Ska du inte göra detta idag?</item>
+        <item>Kan du inte bara avsluta denna uppgift? Jag blir ju led på den!</item>
+        <item>Kan du avsluta detta? Ja, det kan du!</item>
+        <item>Kommer du någonsin att göra detta?</item>
+        <item>Var nöjd med dig själv! Kom igen!</item>
+        <item>Jag är så stolt över dig! Få det gjort!</item>
+        <item>En liten munsbit efter att du avslutat detta?</item>
+        <item>Bara den här uppgiften? Snälla?</item>
+        <item>Dags att korta ned din att-göra-lista!</item>
+        <item>Ingår du i lag Ordning eller i lag Kaos? Lag Ordning! Kom igen!</item>
+        <item>Har jag sagt att du är toppen på sistone? Fortsätt så!</item>
+        <item>Undvik röra - bara att sätta i gång och göra!</item>
+        <item>Hur lyckas du med det här? Jag är verkligen imponerad!</item>
+        <item>Du klarar dig inte enbart med ditt utseende. Sätt i gång!</item>
+        <item>Fint väder för ett jobb som det här, ìnte sant?</item>
+        <item>En skvätt te medan du håller på med det här?</item>
+        <item>Om du bara hade varit klar med det här redan, kunde du ha gått ut och lekt.</item>
+        <item>Det är dags. Du kan inte skjuta upp det ofrånkomliga.</item>
+        <item>Jag dör en smula varje gång du ignorerar mig.</item>
+    </string-array>
+
+    <string-array name="postpone_nags">
+        <!-- Astrid\'s nagging when user clicks postpone -->
+        <item>Snälla, säg mig inte att du är en som förhalar!</item>
+        <item>Blir du inte trött på att vara lat ibland?</item>
+        <item>Någonstans är någon beroende av att du avslutar detta!</item>
+        <item>När du sade \"skjut upp\", så menade du faktiskt \"nu gör jag detta\", eller hur?
+        </item>
+        <item>Det här är sista gången du skjuter upp detta, eller hur?</item>
+        <item>Bara gör det här färdigt idag, jag skvallrar inte!</item>
+        <item>Varför skjuta upp när du kan eh... inte skjuta upp!</item>
+        <item>Förr eller senare avslutar du detta, antar jag?</item>
+        <item>Jag tycker du är verkligen suverän! Vad sägs att du inte skjuter upp detta?</item>
+        <item>Kommer du att kunna uppnå dina mål om du gör sådär?</item>
+        <item>Skjut upp, skjut upp, skjut upp. När ska du förändra dig!</item>
+        <item>Jag har fått nog av dina bortförklaringar! Bara gör det!</item>
+        <item>Kom du inte med den där bortförklaringen förra gången?</item>
+        <item>Jag kan inte hjälpa dig med att organisera ditt liv om du gör det...</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in repeat plug-in -->
+
+    <!-- repeating plugin name -->
+    <string name="repeat_plugin">Upprepande uppgifter</string>
+
+    <!-- repeating plugin description -->
+    <string name="repeat_plugin_desc">Tillåt upprepande uppgifter</string>
+
+    <!-- slide 20a: checkbox for turning on/off repeats -->
+    <string name="repeat_enabled">Upprepningar</string>
+
+    <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
+    <string name="repeat_every">Varje %d</string>
+
+    <!-- hint when opening repeat interval -->
+    <string name="repeat_interval_prompt">Upprepningsintervall</string>
+
+    <!-- slide 19b-->
+    <string name="repeat_never">Not repeating</string>
+    <!-- slide 20f-->
+    <string name="repeat_dont">Upprepa inte</string>
+
+    <string-array name="repeat_interval_short">
+        <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
+        <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">
+        <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>Dag(ar)</item>
+        <item>Vecka (veckor)</item>
+        <item>Månad(er)</item>
+        <item>Timme (timmar)</item>
+        <item>Minut(er)</item>
+        <item>År</item>
+    </string-array>
+
+    <string name="repeat_days">dagar</string>
+    <string name="repeat_weekdays">weekdays</string>
+    <string name="repeat_weeks">weeks</string>
+    <string name="repeat_months">months</string>
+    <string name="repeat_years">years</string>
+    <string name="repeat_hours">hours</string>
+    <string name="repeat_minutes">minutes</string>
+
+    <string-array name="repeat_until_shortcuts">
+        <item>Forever</item>
+        <item>Specific Day</item>
+        <item>Today</item>
+        <item>Tomorrow</item>
+        <item>(day after)</item>
+        <item>Next Week</item>
+        <item>In Two Weeks</item>
+        <item>Next Month</item>
+    </string-array>
+
+    <string name="repeat_until_title">Repetera tills...</string>
+
+    <string name="repeat_keep_going">Fortsätt</string>
+
+    <string-array name="repeat_type">
+        <!-- slide 20c: repeat type (date to repeat from) -->
+        <item>från förfallodatumet</item>
+        <!-- slide 20c -->
+        <item>från avslutningsdatumet</item>
+    </string-array>
+
+    <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
+    <string name="repeat_detail_byday">$I på $D</string>
+
+    <!-- task detail for repeat from due date (%s -> interval) -->
+    <string name="repeat_detail_duedate">Varje %s</string>
+
+    <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
+    <string name="repeat_detail_duedate_until">Varje %1$s\ntill %2$s</string>
+
+    <!-- task detail for repeat from completion date (%s -> interval) -->
+    <string name="repeat_detail_completion">%s efter avslutning</string>
+
+    <!-- text for button when repeating task indefinitely -->
+    <string name="repeat_forever">Repetera oändligt</string>
+
+    <!-- text for button when repeating task until specified date (%s -> date string) -->
+    <string name="repeat_until">Repetera till %s</string>
+
+    <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title">Ändrar tid för uppgiften \"%s\"</string>
+
+    <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title_last_time">Avklarade återkommande uppgift
+        \"%s\"
+    </string>
+
+    <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->
+    <string name="repeat_rescheduling_dialog_bubble">%1$s Återkommande uppgift ändrad från %2$s till
+        %3$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
+    <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s Jag har bokat om den här
+        återkommande uppgiften till %2$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
+    <string name="repeat_rescheduling_dialog_bubble_last_time">Du upprepade denna till %1$s, Nu är
+        du helt färdig. %2$s
+    </string>
+
+    <string-array name="repeat_encouragement">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>Bra jobbat!</item>
+        <item>Häftigt! Jag är så stolt över dig!</item>
+        <item>I love when you\'re productive!</item>
+        <item>Visst känns det skönt att bocka av någonting?</item>
+    </string-array>
+
+    <string-array name="repeat_encouragement_last_time">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>Bra jobbat!</item>
+        <item>I\'m so proud of you!</item>
+        <item>I love when you\'re productive!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Subtasks Help Introduction -->
+    <string name="subtasks_help_title">Sortera och gör indrag i Astrid</string>
+    <string name="subtasks_help_1">Rör vid och håll kvar fingret för att flytta en uppgift</string>
+    <string name="subtasks_help_2">Dra upp eller ner för att ändra ordningen</string>
+    <string name="subtasks_help_3">Dra åt höger för att göra indrag</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-
-  <!-- Tags label -->
-  <string name="TEA_tags_label">Listor</string>
-  
-  <!-- Tags label long version -->
-  <string name="TEA_tags_label_long">Add to lists</string>
- 
-  <!-- Tags hint -->
-  <string name="TEA_tag_hint">Ny lista</string>
-  
-  <!-- Tags dropdown -->
-    
-  <!-- =============================================== Task List Controls == -->
-  
-  <!-- menu item for tags -->
-  
-  <!-- ========================================================== Extras == -->
-  
-  <!-- Context Item: show tag -->
-  
-  <!-- slide 25a: Dialog: new list -->
-  <string name="tag_new_list">Ny lista</string>
-  
-  <!-- Dialog: list saved -->
-  
-  <!-- Dialog: task created without title -->
-  <string name="tag_no_title_error">Ange först ett namn på listan!</string>
-  
-  <!-- ========================================================== Filters == -->
-  
-  <!-- filter button to add tag -->
-  <string name="tag_FEx_add_new">Ny</string>
-  
-  <!-- filter header for tags -->
-  <string name="tag_FEx_header">Listor</string>
-  
-  <!-- filter header for tags user created -->
-  
-  <!-- filter header for tags, shared with user -->
-  
-  <!-- filter header for tags which have no active tasks -->
-  
-  <!-- slide 10d: filter for untagged tasks -->
-  <string name="tag_FEx_untagged">Uncategorized</string>
-  
-  <!-- slide 27a: %s => tag name -->
-
-  <!-- context menu option to rename a tag -->
-  <string name="tag_cm_rename">Byt namn på listan</string>
-
-  <!-- context menu option to delete a tag -->
-  <string name="tag_cm_delete">Radera listan</string>
-  
-  <!-- context menu option to leave a shared list -->
-  <string name="tag_cm_leave">Lämna listan</string>
-
-  <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
-  <string name="DLG_delete_this_tag_question">Radera listan %s? (Inga uppgifter raderas.)</string>
-  
-  <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
-  <string name="DLG_leave_this_shared_tag_question">Lämna den delade listan %s? (Inga uppgifter raderas.)</string>
-
-  <!-- Dialog to rename tag -->
-  <string name="DLG_rename_this_tag_header">Byt namn på listan %s till:</string>
-
-  <!-- Toast notification that no changes have been made -->
-  <string name="TEA_no_tags_modified">Inga ändringar gjordes</string>
-
-  <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_deleted">Listan %1$s raderad. Det påverkar %2$d uppgifter</string>
-  
-  <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_left">Du lämnade listan %1$s. Det påverkar %2$d uppgifter</string>
-
-  <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
-  <string name="TEA_tags_renamed">Bytte namn på %1$s till %2$s för %3$d uppgifter</string>
-  
-  <!-- Tag case migration -->
-  <string name="tag_case_migration_notice">Vi har märkt att du har några listor som har samma namn men som skiljer sig åt med stora och små bokstäver. Vi tror att du kan ha velat att de skulle vara samma lista, så vi har kombinerat dubbletterna. Var inte orolig, de ursprungliga listorna har fått nya namn med siffror (t.ex. Arbete_1, Arbete_2). Om du inte vill ha det så, kan du bara ta bort den nya kombinerade listan!</string>
-  
-  <!-- Header for tag settings -->
-  <string name="tag_settings_title">Settings:</string>
-  
-  <!-- Header for tag activity -->
-  <string name="tag_updates_title">Aktivitet: %s</string>
-  
-  <!-- Delete button for tag settings -->
-  <string name="tag_delete_button">Radera listan</string>
-  
-  <!-- slide 28d: Leave button for tag settings -->
-  <string name="tag_leave_button">Lämna den här listan</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Tags label -->
+    <string name="TEA_tags_label">Listor</string>
 
+    <!-- Tags label long version -->
+    <string name="TEA_tags_label_long">Add to lists</string>
+
+    <!-- Tags hint -->
+    <string name="TEA_tag_hint">Ny lista</string>
+
+    <!-- Tags dropdown -->
+
+    <!-- =============================================== Task List Controls == -->
+
+    <!-- menu item for tags -->
+
+    <!-- ========================================================== Extras == -->
+
+    <!-- Context Item: show tag -->
+
+    <!-- slide 25a: Dialog: new list -->
+    <string name="tag_new_list">Ny lista</string>
+
+    <!-- Dialog: list saved -->
+
+    <!-- Dialog: task created without title -->
+    <string name="tag_no_title_error">Ange först ett namn på listan!</string>
+
+    <!-- ========================================================== Filters == -->
+
+    <!-- filter button to add tag -->
+    <string name="tag_FEx_add_new">Ny</string>
+
+    <!-- filter header for tags -->
+    <string name="tag_FEx_header">Listor</string>
+
+    <!-- filter header for tags user created -->
+
+    <!-- filter header for tags, shared with user -->
+
+    <!-- filter header for tags which have no active tasks -->
+
+    <!-- slide 10d: filter for untagged tasks -->
+    <string name="tag_FEx_untagged">Uncategorized</string>
+
+    <!-- slide 27a: %s => tag name -->
+
+    <!-- context menu option to rename a tag -->
+    <string name="tag_cm_rename">Byt namn på listan</string>
+
+    <!-- context menu option to delete a tag -->
+    <string name="tag_cm_delete">Radera listan</string>
+
+    <!-- context menu option to leave a shared list -->
+    <string name="tag_cm_leave">Lämna listan</string>
+
+    <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
+    <string name="DLG_delete_this_tag_question">Radera listan %s? (Inga uppgifter raderas.)</string>
+
+    <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
+    <string name="DLG_leave_this_shared_tag_question">Lämna den delade listan %s? (Inga uppgifter
+        raderas.)
+    </string>
+
+    <!-- Dialog to rename tag -->
+    <string name="DLG_rename_this_tag_header">Byt namn på listan %s till:</string>
+
+    <!-- Toast notification that no changes have been made -->
+    <string name="TEA_no_tags_modified">Inga ändringar gjordes</string>
+
+    <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_deleted">Listan %1$s raderad. Det påverkar %2$d uppgifter</string>
+
+    <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_left">Du lämnade listan %1$s. Det påverkar %2$d uppgifter</string>
+
+    <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
+    <string name="TEA_tags_renamed">Bytte namn på %1$s till %2$s för %3$d uppgifter</string>
+
+    <!-- Tag case migration -->
+    <string name="tag_case_migration_notice">Vi har märkt att du har några listor som har samma namn
+        men som skiljer sig åt med stora och små bokstäver. Vi tror att du kan ha velat att de
+        skulle vara samma lista, så vi har kombinerat dubbletterna. Var inte orolig, de ursprungliga
+        listorna har fått nya namn med siffror (t.ex. Arbete_1, Arbete_2). Om du inte vill ha det
+        så, kan du bara ta bort den nya kombinerade listan!
+    </string>
+
+    <!-- Header for tag settings -->
+    <string name="tag_settings_title">Settings:</string>
+
+    <!-- Header for tag activity -->
+    <string name="tag_updates_title">Aktivitet: %s</string>
+
+    <!-- Delete button for tag settings -->
+    <string name="tag_delete_button">Radera listan</string>
+
+    <!-- slide 28d: Leave button for tag settings -->
+    <string name="tag_leave_button">Lämna den här listan</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in timers plug-in -->
-    
+
     <!-- Task List: Start Timer button -->
-    
+
     <!-- Task List: Stop Timer button -->
-    
+
     <!-- Android Notification Title (%s => # tasks) -->
     <string name="TPl_notification">Tidtagarur aktivt för %s!</string>
-    
+
     <!-- Filter Header for Timer plugin -->
-    
+
     <!-- Filter for Timed Tasks -->
     <string name="TFE_workingOn">Uppgifter med tidtagning</string>
-    
+
     <!-- Title for TEA -->
     <string name="TEA_timer_controls">Timer</string>
-    
-    
+
+
     <!-- Edit Notes: create comment for when timer is started -->
     <string name="TEA_timer_comment_started">påbörjade uppgiften:</string>
-    
+
     <!-- Edit Notes: create comment for when timer is stopped -->
     <string name="TEA_timer_comment_stopped">slutade arbeta med uppgiften:</string>
-    
+
     <!-- Edit Notes: comment to notify how long was spent on task -->
     <string name="TEA_timer_comment_spent">Nedlagt tid:</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Update string from activity codes %1$s - user, %2$s - target name, %3$s - message, %4$s - other_user-->
-    
+
     <!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
     Please do not translate this part of the string. -->
-    
+
     <!-- These are still in use -->
     <string name="update_string_default_comment">%1$s kommenterade: %3$s</string>
     <string name="update_string_task_comment">%1$s on $link_task: %3$s</string>
     <string name="update_string_tag_comment">%1$s on %2$s: %3$s</string>
     <string name="update_string_user_self">You</string>
-    
+
     <string name="history_yourself">yourself</string>
     <string name="history_you">you</string>
     <string name="history_a_deleted_user">(a deleted user)</string>
-    
+
     <string name="history_this_list">this list</string>
     <string name="history_this_task">this task</string>
     <string name="history_tag_added">added %1$s to %2$s</string>
@@ -2985,9 +3237,12 @@ kommer inte att kunna utföra köp.</string>
     <string name="history_favorited">favorited %s</string>
     <string name="history_unfavorited">unfavorited %s</string>
     <string name="history_changed_list_picture">change this list\'s picture</string>
-    <string name="history_added_description_characters">added %1$d characters to %2$s description</string>
+    <string name="history_added_description_characters">added %1$d characters to %2$s description
+    </string>
     <string name="history_removed_description">removed %s description</string>
-    <string name="history_removed_description_characters">removed %1$d characters from %2$s description</string>
+    <string name="history_removed_description_characters">removed %1$d characters from %2$s
+        description
+    </string>
     <string name="history_updated_description">updated %s description</string>
     <string name="history_changed_list_owner">changed list owner to %s</string>
     <string name="history_created_this_list">created this list</string>
@@ -3010,195 +3265,226 @@ kommer inte att kunna utföra köp.</string>
     <string name="history_repeat_on">on %s</string>
     <string name="history_repeat_from_completion">after completion</string>
     <string name="history_acknowledged">viewed %s</string>
-    
-    <string name="history_default">changed %1$s to %2$s</string>
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-    
-  <!-- Voice Add Prompt Text -->
-  <string name="voice_create_prompt">Prata för att skapa uppgift</string>
-  <string name="voice_edit_title_prompt">Prata för att sätta uppgiftens titel</string>
-  <string name="voice_edit_note_prompt">Prata för att sätta uppgiftens anteckningar</string>
-    
-  <!-- Preference: Task List recognition-service is not installed, but available -->
-  <string name="EPr_voiceInputInstall_dlg">Röstigenkänning är inte installerad.\nVill du gå till marknaden och installera?</string>
-  <!-- Preference: Task List recognition-service is not available for this system -->
-  <string name="EPr_voiceInputUnavailable_dlg">Tyvärr är inte röstigenkänning tillgänligt på ditt system.\nOm möjligt, uppgradera till Android 2.1 eller senare.</string>
-  <!-- Preference: Market is not available for this system -->
-  <string name="EPr_marketUnavailable_dlg">Tyvärr är inte marknaden tillgänlig för ditt system.\nOm möjligt, försök ladda ner röstigenkänning från en annan källa.</string>
-  <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
-  <string name="EPr_voiceInputEnabled_title">Röstindata</string>
-  <!-- slide 38a: Preference: voice button description (true) -->
-  <string name="EPr_voiceInputEnabled_desc_enabled">Röstindata ikonen kommer att visas på sidan med uppgifter</string>
-  <!-- Preference: voice button description (false) -->
-  <string name="EPr_voiceInputEnabled_desc_disabled">Röstindata ikonen kommer att vara dold på sidan med uppgifter</string>
-  <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
-  <string name="EPr_voiceInputCreatesTask_title">Skapa en uppgift direkt</string>
-  <!-- Preference: Task List Voice-creation description (true) -->
-  <string name="EPr_voiceInputCreatesTask_desc_enabled">Uppgift kommer automatiskt att skapas baserad på röstindatan.</string>
-  <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
-  <string name="EPr_voiceInputCreatesTask_desc_disabled">Du kan redigera titeln när inspelningen är klar.</string>
-  <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
-  <string name="EPr_voiceRemindersEnabled_title">Röstpåminnelser</string>
-  <!-- Preference: Voice reminders description (true) -->
-  <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid läser upp uppgifterna vid påminnelse</string>
-  <!-- slide 38c: Preference: Voice reminders description (false) -->
-  <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid kommer att spela en ringsignal vid påminnelse</string>    
-  
-  <!-- slide 32d: Preference Category: Voice Title -->
-  <string name="EPr_voice_header">Röstindata inställningar</string>
-    
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-  
-  <!-- slide 30a-->
-  <string name="welcome_setting">Visa handledning</string>
-  
-  <string name="welcome_title_1">Välkommen till Astrid!</string>
-
-  <!-- slide 2a -->
-  <string name="welcome_title_2">Göra listor</string>
-
-  <!-- slide 3a-->
-  <string name="welcome_title_3">Byta mellan listor</string>
-
-  <!-- slide 4a -->
-  <string name="welcome_title_4">Dela listor</string>
-
-  <!-- slide 5a -->
-  <string name="welcome_title_5">Dela upp uppgifter</string>
-
-  <!-- slide 6a -->
-  <string name="welcome_title_6">Ange detaljer</string>
 
-  <!-- slide 7a -->
-  <string name="welcome_title_7">Anslut nu\nför att starta!</string>
-  
-  <string name="welcome_title_7_return">Det var det!</string>
-  
-  <!-- slide 1b -->
-  <string name="welcome_body_1">Den perfekta att göra-listan\nsom funkar bra med vänner</string>
-
-  <!-- slide 2b-->
-  <string name="welcome_body_2">Utmärkt för alla listor:\natt läsa, att titta på, att köpa, att besöka</string>
-
-  <!-- slide 3b -->
-  <string name="welcome_body_3">Tryck på listans namn\nför att se alla dina listor</string>
-
-  <!-- slide 4b -->
-  <string name="welcome_body_4">Dela listor med \nkompisarna\neller din älskling!</string>
-
-  <!-- slide 5b -->
-  <string name="welcome_body_5">and much more!</string>
+    <string name="history_default">changed %1$s to %2$s</string>
 
-  <!-- slide 6b-->
-  <string name="welcome_body_6">Klicka för att göra anteckningar,\nställa in påminnelser,\noch mycket annat!</string>
-  <string name="welcome_body_7">Logga in</string>
-  
-  <string name="welcome_body_7_return">Klicka på Astrid för att återvända.</string>
-  
-  <!-- slide 1c -->
-  <string name="welcome_next">Nästa</string>
-  
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Voice Add Prompt Text -->
+    <string name="voice_create_prompt">Prata för att skapa uppgift</string>
+    <string name="voice_edit_title_prompt">Prata för att sätta uppgiftens titel</string>
+    <string name="voice_edit_note_prompt">Prata för att sätta uppgiftens anteckningar</string>
+
+    <!-- Preference: Task List recognition-service is not installed, but available -->
+    <string name="EPr_voiceInputInstall_dlg">Röstigenkänning är inte installerad.\nVill du gå till
+        marknaden och installera?
+    </string>
+    <!-- Preference: Task List recognition-service is not available for this system -->
+    <string name="EPr_voiceInputUnavailable_dlg">Tyvärr är inte röstigenkänning tillgänligt på ditt
+        system.\nOm möjligt, uppgradera till Android 2.1 eller senare.
+    </string>
+    <!-- Preference: Market is not available for this system -->
+    <string name="EPr_marketUnavailable_dlg">Tyvärr är inte marknaden tillgänlig för ditt
+        system.\nOm möjligt, försök ladda ner röstigenkänning från en annan källa.
+    </string>
+    <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
+    <string name="EPr_voiceInputEnabled_title">Röstindata</string>
+    <!-- slide 38a: Preference: voice button description (true) -->
+    <string name="EPr_voiceInputEnabled_desc_enabled">Röstindata ikonen kommer att visas på sidan
+        med uppgifter
+    </string>
+    <!-- Preference: voice button description (false) -->
+    <string name="EPr_voiceInputEnabled_desc_disabled">Röstindata ikonen kommer att vara dold på
+        sidan med uppgifter
+    </string>
+    <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
+    <string name="EPr_voiceInputCreatesTask_title">Skapa en uppgift direkt</string>
+    <!-- Preference: Task List Voice-creation description (true) -->
+    <string name="EPr_voiceInputCreatesTask_desc_enabled">Uppgift kommer automatiskt att skapas
+        baserad på röstindatan.
+    </string>
+    <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
+    <string name="EPr_voiceInputCreatesTask_desc_disabled">Du kan redigera titeln när inspelningen
+        är klar.
+    </string>
+    <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
+    <string name="EPr_voiceRemindersEnabled_title">Röstpåminnelser</string>
+    <!-- Preference: Voice reminders description (true) -->
+    <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid läser upp uppgifterna vid
+        påminnelse
+    </string>
+    <!-- slide 38c: Preference: Voice reminders description (false) -->
+    <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid kommer att spela en ringsignal vid
+        påminnelse
+    </string>
+
+    <!-- slide 32d: Preference Category: Voice Title -->
+    <string name="EPr_voice_header">Röstindata inställningar</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 30a-->
+    <string name="welcome_setting">Visa handledning</string>
+
+    <string name="welcome_title_1">Välkommen till Astrid!</string>
+
+    <!-- slide 2a -->
+    <string name="welcome_title_2">Göra listor</string>
+
+    <!-- slide 3a-->
+    <string name="welcome_title_3">Byta mellan listor</string>
+
+    <!-- slide 4a -->
+    <string name="welcome_title_4">Dela listor</string>
+
+    <!-- slide 5a -->
+    <string name="welcome_title_5">Dela upp uppgifter</string>
+
+    <!-- slide 6a -->
+    <string name="welcome_title_6">Ange detaljer</string>
+
+    <!-- slide 7a -->
+    <string name="welcome_title_7">Anslut nu\nför att starta!</string>
+
+    <string name="welcome_title_7_return">Det var det!</string>
+
+    <!-- slide 1b -->
+    <string name="welcome_body_1">Den perfekta att göra-listan\nsom funkar bra med vänner</string>
+
+    <!-- slide 2b-->
+    <string name="welcome_body_2">Utmärkt för alla listor:\natt läsa, att titta på, att köpa, att
+        besöka
+    </string>
+
+    <!-- slide 3b -->
+    <string name="welcome_body_3">Tryck på listans namn\nför att se alla dina listor</string>
+
+    <!-- slide 4b -->
+    <string name="welcome_body_4">Dela listor med \nkompisarna\neller din älskling!</string>
+
+    <!-- slide 5b -->
+    <string name="welcome_body_5">and much more!</string>
+
+    <!-- slide 6b-->
+    <string name="welcome_body_6">Klicka för att göra anteckningar,\nställa in påminnelser,\noch
+        mycket annat!
+    </string>
+    <string name="welcome_body_7">Logga in</string>
+
+    <string name="welcome_body_7_return">Klicka på Astrid för att återvända.</string>
+
+    <!-- slide 1c -->
+    <string name="welcome_next">Nästa</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <string name="widget_mini">- Astrid Mini -</string>
-    
+
     <!-- Resources for power pack widget -->
-    
+
     <string name="PPW_widget_42_label">Old Astrid 4x2</string>
     <string name="PPW_widget_43_label">Old Astrid 4x3</string>
     <string name="PPW_widget_44_label">Old Astrid 4x4</string>
     <string name="PPW_widget_v11_label">- Astrid -</string>
     <string name="PPW_widget_custom_label">Astrid Konfigurerbara Launcher Premium</string>
-    <string name="PPW_widget_custom_launcherpro_label">Astrid Launcher Professionell Premium</string>
-    
+    <string name="PPW_widget_custom_launcherpro_label">Astrid Launcher Professionell Premium
+    </string>
+
     <string name="PPW_configure_title">Konfigurera widget</string>
-    
+
     <string name="PPW_color">Widgetens färg</string>
     <string name="PPW_enable_calendar">Visa kalenderhändelser</string>
     <string name="PPW_disable_encouragements">Dölj uppmuntringsmeddelanden</string>
     <string name="PPW_show_dates">Visa datum för färdigställande</string>
     <string name="PPW_filter">Välj filter</string>
-    
+
     <string name="PPW_due">Förfaller:</string>
     <string name="PPW_past_due">Har förfallit:</string>
-    
-    <string name="PPW_old_astrid_notice">Du behöver minst version 3.6 av Astrid för att använda denna widget. Tyvärr!</string>
-    
+
+    <string name="PPW_old_astrid_notice">Du behöver minst version 3.6 av Astrid för att använda
+        denna widget. Tyvärr!
+    </string>
+
     <string-array name="PPW_encouragements">
         <!-- general encouragements -->
-    	<item>Tjenixen!</item>
-    	<item>Har du tid att avsluta något?</item>
-    	<item>Oj, vad sofistikerad du ser ut idag!</item>
-    	<item>Gör någonting fantastiskt idag!</item>
-    	<item>Gör mig stolt!</item>
-    	<item>Hur går det för dig idag?</item>
+        <item>Tjenixen!</item>
+        <item>Har du tid att avsluta något?</item>
+        <item>Oj, vad sofistikerad du ser ut idag!</item>
+        <item>Gör någonting fantastiskt idag!</item>
+        <item>Gör mig stolt!</item>
+        <item>Hur går det för dig idag?</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_tod">
         <!-- encouragements based on time of day -->
-    	<item>God morgon!</item>
-    	<item>God eftermiddag</item>
-    	<item>God kväll</item>
-    	<item>Sen kväll?</item>
-    	<item>Det är tidigt, få något gjort!</item>
-    	<item>Lite eftermiddags the kanske?</item>
-    	<item>Njut av kvällen!</item>
-    	<item>Sömn är bra för dig, vettu!</item>
+        <item>God morgon!</item>
+        <item>God eftermiddag</item>
+        <item>God kväll</item>
+        <item>Sen kväll?</item>
+        <item>Det är tidigt, få något gjort!</item>
+        <item>Lite eftermiddags the kanske?</item>
+        <item>Njut av kvällen!</item>
+        <item>Sömn är bra för dig, vettu!</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_completed">
         <!-- encouragements based on tasks completed (%d => completed) -->
-    	<item>Du har redan avklarat %d uppgifter!</item>
-    	<item>Poäng i livet: %d uppgifter avklarade</item>
-    	<item>Le! Du har redan gjort klart %d uppgifter!</item>
+        <item>Du har redan avklarat %d uppgifter!</item>
+        <item>Poäng i livet: %d uppgifter avklarade</item>
+        <item>Le! Du har redan gjort klart %d uppgifter!</item>
     </string-array>
-  	<string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet! Shall we?</string>
-        
+    <string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet!
+        Shall we?
+    </string>
+
     <string-array name="PPW_colors">
         <item>Svart</item>
         <item>Vit</item>
         <item>Blå</item>
         <item>Genomskinlig</item>
     </string-array>
-    
-    <string name="PPW_widget_dlg_text">Widgeten är tillgänglig endast för användare av Astrid Power Pack!</string>
+
+    <string name="PPW_widget_dlg_text">Widgeten är tillgänglig endast för användare av Astrid Power
+        Pack!
+    </string>
     <string name="PPW_widget_dlg_ok">Förhandsgranska</string>
-    
+
     <string name="PPW_demo_title1">Poster på %s hamnar här</string>
     <string name="PPW_demo_title2">I Power Pack ingår premiumwidgetar...</string>
     <string name="PPW_demo_title3">...ljud och härliga känslor!</string>
     <string name="PPW_demo_title4">Tryck för att läsa mer!</string>
-    
+
     <string name="PPW_info_title">Gratis Power Pack!</string>
     <string name="PPW_info_signin">Logga in!</string>
     <string name="PPW_info_later">Senare</string>
-    <string name="PPW_unlock_howto">Dela listor med dina vänner! Gratis Power Pack när tre vänner börjar använda Astrid.</string>
+    <string name="PPW_unlock_howto">Dela listor med dina vänner! Gratis Power Pack när tre vänner
+        börjar använda Astrid.
+    </string>
     <string name="PPW_check_button">Du kan få Power Pack gratis!</string>
     <string name="PPW_check_share_lists">Dela listor!</string>
     <string name="PPW_api_level">Ledsen! Den här widgeten behöver Android 3.0 eller högre.</string>
-    
+
     <string name="EPr_widget_enabled_title">Aktivera/inaktivera widgets</string>
-    <string name="PPW_restart_for_enabled_state">Du kan behöva starta om telefonen för att ändringarna ska gälla</string>
+    <string name="PPW_restart_for_enabled_state">Du kan behöva starta om telefonen för att
+        ändringarna ska gälla
+    </string>
 
 </resources>
diff --git a/astrid/res/values-th/strings.xml b/astrid/res/values-th/strings.xml
index 9b5d90346..f71df582b 100644
--- a/astrid/res/values-th/strings.xml
+++ b/astrid/res/values-th/strings.xml
@@ -1,512 +1,513 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="actfm_picture_camera">ถ่ายภาพ</string>
-  <string name="actfm_picture_gallery">เลือกจากคลังภาพ</string>
-  <string name="actfm_picture_clear">ล้างภาพ</string>
-  <string-array name="TVA_tabs">
-    <item>Tasks</item>
-    <item>Activity</item>
-    <item>List Settings</item>
-  </string-array>
-  <string name="actfm_ALA_password_label">รหัสผ่าน</string>
-  <string-array name="reminders_alarm">
-    <item>แจ้งเตือน!</item>
-  </string-array>
-  <string name="backup_BPr_header">สำรองข้อมูล</string>
-  <string name="backup_BPr_group_status">สถานะ</string>
-  <string name="backup_status_failed_subtitle">(แตะเพื่อแสดงข้อผิดพลาด)</string>
-  <string name="backup_BPr_group_options">ตัวเลือก</string>
-  <string name="backup_BPr_auto_enabled">จะทำการสำรองข้อมูลทุกวัน</string>
-  <string name="export_progress_title">กำลังส่งออก...</string>
-  <string name="import_progress_title">กำลังนำเข้า...</string>
-  <string name="import_progress_read">กำลังอ่านแผนงาน %d...</string>
-  <string name="DLG_error_sdcard">ไม่สามารถเข้าถึงแฟ้ม: %s</string>
-  <string name="DLG_error_sdcard_general">ไม่สามารถเข้าถึง SD Card ได้!</string>
-  <string name="read_permission_desc">อ่านแผนงาน, แสดงตัวกรองแผนงาน</string>
-  <string name="write_permission_desc">สร้างแผนงานใหม่, แก้ไขแผนงานเดิม</string>
-  <string name="DLG_delete_this_task_question">ลบงานนี้?</string>
-  <string name="DLG_delete_this_item_question">ลบรายการนี้: %s?</string>
-  <string name="DLG_hour_minutes">เวลา (ชั่วโมง : นาที)</string>
-  <string name="DLG_accept">ฉันยอมรับ</string>
-  <string name="DLG_decline">ฉันปฏิเสธ</string>
-  <string name="DLG_eula_title">เงื่อนไขการใช้งาน Astrid</string>
-  <string name="DLG_loading">กำลังโหลด...</string>
-  <string name="WID_dateButtonUnset">คลิก เพื่อตั้งค่า</string>
-  <string name="TLA_no_items">ไม่มีแผนงานใดๆ !</string>
-  <string name="TLA_menu_sort">Sort &amp; Hidden</string>
-  <string name="TLA_custom">ปรับแต่ง</string>
-  <string-array name="TLA_filters">
-    <item>Active</item>
-    <item>วันนี้</item>
-    <item>Soon</item>
-    <item>Late</item>
-    <item>เสร็จแล้ว</item>
-    <item>Hidden</item>
-  </string-array>
-  <string-array name="TLA_priority_strings">
-    <item>highest priority</item>
-    <item>high priority</item>
-    <item>medium priority</item>
-    <item>low priority</item>
-  </string-array>
-  <string name="TAd_actionEditTask">แก้ไข</string>
-  <string name="TAd_contextEditTask">แก้ไขงาน</string>
-  <string name="TAd_contextUndeleteTask">แผนงานที่ลบไม่ได้</string>
-  <string name="SSD_title">จัดเรียง และซ่อนแผนงาน</string>
-  <string name="SSD_completed">แสดงแผนงานที่เสร็จแล้ว</string>
-  <string name="SSD_hidden">แสดงแผนงานที่ซ่อนไว้</string>
-  <string name="SSD_deleted">แสดงแผนงานที่ถูกลบ</string>
-  <string name="SSD_sort_auto">จัดเรียงด้วย Astrid Smart</string>
-  <string name="SSD_sort_alpha">ตามชื่อ</string>
-  <string name="SSD_sort_importance">ตามความสำคัญ</string>
-  <string name="SSD_sort_modified">ตามวันที่แก้ไขล่าสุด</string>
-  <string name="SSD_sort_reverse">จัดเรียงย้อนหลัง</string>
-  <string name="SSD_save_temp">ชั่วคราว</string>
-  <string name="SSD_save_always">ตลอดไป</string>
-  <string name="FLA_shortcut_dialog_title">สร้างทางลัด</string>
-  <string name="FLA_shortcut_dialog">ชื่อทางลัด:</string>
-  <string name="FLA_search_hint">ค้นหาแผนงาน</string>
-  <string name="FLA_toast_onCreateShortcut">สร้างทางลัดแล้ว: %s</string>
-  <string name="TEA_title_hint">สรุปแผนงาน</string>
-  <string name="TEA_importance_label">ความสำคัญ</string>
-  <string name="TEA_urgency_specific_time">ณ.เวลาที่ระบุ?</string>
-  <string-array name="TEA_loading">
-    <item>กำลังโหลด...</item>
-  </string-array>
-  <string name="TEA_note_label">บันทึกย่อ</string>
-  <string name="TEA_menu_save">บันทึกการเปลี่ยนแปลง</string>
-  <string name="TEA_menu_discard">ไม่บันทึก</string>
-  <string name="TEA_menu_delete">ลบงาน</string>
-  <string name="TEA_onTaskSave_notDue">งานที่บันทึกไว้</string>
-  <string name="TEA_tab_more">เพิ่มเติม</string>
-  <string-array name="TEA_urgency">
-    <item>ไม่มีเส้นตาย</item>
-    <item>Specific day</item>
-    <item>วันนี้</item>
-    <item>พรุ่งนี้</item>
-    <item>(วันให้หลัง)</item>
-    <item>Next week</item>
-    <item>In two weeks</item>
-    <item>Next month</item>
-  </string-array>
-  <string-array name="TEA_hideUntil">
-    <item>ตลอดไป</item>
-    <item>Due date</item>
-    <item>Due time</item>
-    <item>วันก่อนถึงกำหนด</item>
-    <item>สัปดาห์ก่อนถึงกำหนด</item>
-    <item>ระบุ วัน/เวลา</item>
-  </string-array>
-  <string name="TEA_control_more_section">----More Section----</string>
-  <string name="TEA_control_importance">ความสำคัญ</string>
-  <string name="TEA_control_notes">บันทึกย่อ</string>
-  <string-array name="MCA_dialog_speech_options">
-    <item>It must be nice to be so popular!</item>
-    <item>Yay! People like you!</item>
-    <item>Make their day, give \'em a call!</item>
-    <item>Wouldn\'t you be happy if people called you back?</item>
-    <item>You can do it!</item>
-    <item>You can always send a text...</item>
-  </string-array>
-  <string name="UpS_changelog_title">มีอะไรใหม่ใน Astrid?</string>
-  <string name="UpS_updates_title">ข่าวล่าสุดของ Astrid</string>
-  <string name="EPr_appearance_header">รูปโฉม</string>
-  <string name="EPr_fontSize_desc">ขนาดฟอนต์บนหน้ารายการหลัก</string>
-  <string name="EPr_showNotes_desc_enabled">บันทึกจะแสดงให้เห็นตลอดเวลา</string>
-  <string-array name="EPr_swipe_lists_performance_mode">
-    <item>No swipe</item>
-    <item>Conserve Memory</item>
-    <item>Normal Performance</item>
-    <item>High Performance</item>
-  </string-array>
-  <string-array name="EPr_swipe_lists_performance_desc">
-    <item>Swipe between lists is disabled</item>
-    <item>Slower performance</item>
-    <item>Default setting</item>
-    <item>Uses more system resources</item>
-  </string-array>
-  <string-array name="EPr_themes">
-    <item>Day - Blue</item>
-    <item>Day - Red</item>
-    <item>Sky blue</item>
-    <item>Night</item>
-    <item>Transparent (White Text)</item>
-    <item>Transparent (Black Text)</item>
-  </string-array>
-  <string-array name="EPr_themes_widget">
-    <item>Same as app</item>
-    <item>Day - Blue</item>
-    <item>Day - Red</item>
-    <item>Sky blue</item>
-    <item>Night</item>
-    <item>Transparent (White Text)</item>
-    <item>Transparent (Black Text)</item>
-    <item>Old Style</item>
-  </string-array>
-  <string name="AOA_internal_author">ทีมงาน Astrid</string>
-  <string name="AOA_tab_installed">ติดตั้งแล้ว</string>
-  <string name="AOA_tab_available">พร้อมใช้</string>
-  <string name="AOA_free">ฟรี</string>
-  <string name="TWi_loading">กำลังโหลด...</string>
-  <string name="WCA_title">เลือกแผนงานเพื่อดู...</string>
-  <string-array name="EPr_default_importance">
-    <item>!!! (Highest)</item>
-    <item>!!</item>
-    <item>!</item>
-    <item>o (Lowest)</item>
-  </string-array>
-  <string-array name="EPr_default_urgency">
-    <item>No deadline</item>
-    <item>วันนี้</item>
-    <item>พรุ่งนี้</item>
-    <item>Day after tomorrow</item>
-    <item>Next week</item>
-  </string-array>
-  <string-array name="EPr_default_hideUntil">
-    <item>ไม่ต้องซ่อน</item>
-    <item>ถึงกำหนดแผนงาน</item>
-    <item>วันก่อนถึงกำหนด</item>
-    <item>สัปดาห์ก่อนถึงกำหนด</item>
-  </string-array>
-  <string-array name="EPr_default_reminders">
-    <item>No deadline reminders</item>
-    <item>ถึงเส้นตาย</item>
-    <item>เมื่อพ้นกำหนด</item>
-    <item>เมื่อถึงเส้นตาย หรือพ้นกำหนด</item>
-  </string-array>
-  <string name="BFE_Active">แผนงานตอนนี้</string>
-  <string name="BFE_Recent">เพิ่งถูกแก้ไข</string>
-  <string name="BFE_Saved_delete">ลบตัวกรอง</string>
-  <string name="CFA_title">ตัวกรองที่กำหนดค่าเอง</string>
-  <string name="CFA_filterName_hint">ตั้งชื่อตัวกรองเพื่อบันทึก...</string>
-  <string name="CFA_universe_all">แผนงานตอนนี้</string>
-  <string name="CFA_type_add">หรือ</string>
-  <string name="CFA_type_subtract">ไม่ใช่</string>
-  <string name="CFA_type_intersect">รวมถึง</string>
-  <string name="CFA_context_delete">ลบแถว</string>
-  <string name="CFA_button_add">เพิ่มข้อกำหนด</string>
-  <string name="CFA_button_view">เปิดดู</string>
-  <string name="CFA_button_save">บันทึก &amp; เปิดดู</string>
-  <string-array name="CFC_dueBefore_entries">
-    <item>ไม่กำหนดวัน</item>
-    <item>เมื่อวาน</item>
-    <item>วันนี้</item>
-    <item>พรุ่งนี้</item>
-    <item>วันมะรืนนี้</item>
-    <item>สัปดาห์หน้า</item>
-    <item>เดือนถัดไป</item>
-  </string-array>
-  <string name="CFC_importance_text">มีความสำคัญอย่างน้อย ?</string>
-  <string name="CFC_importance_name">ความสำคัญ...</string>
-  <string name="CFC_title_contains_name">ชื่อที่มีคำว่า...</string>
-  <string name="CFC_title_contains_text">ชื่อที่มีคำว่า: ?</string>
-  <string name="gcal_TEA_showCalendar_label">เปิดเหตุการณ์ปฏิทิน</string>
-  <string name="gcal_completed_title">%s (เสร็จสิ้นแล้ว)</string>
-  <string name="gcal_GCP_default">ปฏิธินตั้งต้น</string>
-  <string name="locale_edit_alerts_title">คำเตือนตัวกรอง Astrid</string>
-  <string name="locale_edit_intro">Astrid จะช่วยเตือนความจำ เมื่อมีแผนงานอยู่เขตตัวกรองดังนี้:</string>
-  <string name="locale_interval_label">จำกัดการแจ้งเตือนไว้ที่:</string>
-  <string-array name="locale_interval">
-    <item>ชั่วโมงละครั้ง</item>
-    <item>ทุกๆ 6 ชั่วโมง</item>
-    <item>ทุกๆ 12 ชั่วโมง</item>
-    <item>วันละครั้ง</item>
-    <item>ทุกๆ 3 วัน</item>
-    <item>สัปดาห์ละครั้ง</item>
-  </string-array>
-  <string name="locale_plugin_required">กรุณาติดตั้ง Astrid Locale plugin!</string>
-  <string name="opencrx_FEx_dashboard">พื้นที่ทำงาน</string>
-  <string name="opencrx_FEx_responsible">มอบหมายให้กับ</string>
-  <string name="opencrx_FEx_responsible_title">มอบหมายให้กับ \'%s\'</string>
-  <string name="opencrx_PDE_task_from">จาก %s</string>
-  <string name="opencrx_TEA_notes">เพิ่มความคิดเห็น</string>
-  <string name="opencrx_PLA_signIn">เข้าสู่ระบบ</string>
-  <string name="opencrx_PLA_password">รหัสผ่าน</string>
-  <string name="opencrx_notification_text">%s แผนงานอัปเดทแล้ว / คลิกเพื่อดูรายละเอียด</string>
-  <string name="opencrx_ioerror">ข้อผิดพลาดในการเชื่อมต่อ! ตรวจดูการเชื่อมต่ออินเตอร์เน็ท</string>
-  <string name="opencrx_MLA_password_empty">ยังไม่ได้ระบุ รหัสผ่าน</string>
-  <string name="opencrx_TEA_task_assign_label">มอบหมายแผนงานนี้ให้กับบุคคลนี้:</string>
-  <string name="opencrx_TEA_task_unassigned">&lt;ยังไม่ถูกมอบหมาย&gt;</string>
-  <string name="opencrx_TEA_dashboard_default">&lt;ค่าตั้งต้น&gt;</string>
-  <string name="CFC_opencrx_in_workspace_text">ในพื้นที่ทำงาน: ?</string>
-  <string name="CFC_opencrx_in_workspace_name">ในพื้นที่ทำงาน...</string>
-  <string name="CFC_opencrx_assigned_to_text">มอบหมายให้: ?</string>
-  <string name="CFC_opencrx_assigned_to_name">มอบหมายให้...</string>
-  <string name="EPr_statistics_desc_disabled">ไม่มีข้อมูลการใช้งานที่จะรายงาน</string>
-  <string-array name="TEA_reminder_random">
-    <item>an hour</item>
-    <item>a day</item>
-    <item>a week</item>
-    <item>in two weeks</item>
-    <item>a month</item>
-    <item>in two months</item>
-  </string-array>
-  <string name="rmd_NoA_filter">เตือนความจำ!</string>
-  <string name="rmd_NoA_done">เสร็จเรียบร้อยแล้ว!</string>
-  <string name="rmd_NoA_snooze">หลับ..</string>
-  <string-array name="rmd_reengage_notif_titles">
-    <item>A note from Astrid</item>
-    <item>Memo for %s.</item>
-    <item>Your Astrid digest</item>
-    <item>Reminders from Astrid</item>
-  </string-array>
-  <string-array name="rmd_reengage_dialog_options">
-    <item>Time to shorten your to-do list!</item>
-    <item>Dear sir or madam, some tasks await your inspection!</item>
-    <item>Hi there, could you take a look at these?</item>
-    <item>I\'ve got some tasks with your name on them!</item>
-    <item>A fresh batch of tasks for you today!</item>
-    <item>You look fabulous! Ready to get started?</item>
-    <item>A lovely day for getting some work done, I think!</item>
-  </string-array>
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>Don\'t you want to get organized?</item>
-    <item>I\'m Astrid! I\'m here to help you do more!</item>
-    <item>You look busy! Let me take some of those tasks off of your plate.</item>
-    <item>I can help you keep track of all of the details in your life.</item>
-    <item>You\'re serious about getting more done? So am I!</item>
-    <item>Pleasure to make your acquaintance!</item>
-  </string-array>
-  <string name="rmd_EPr_ringtone_desc_custom">เสียงเตือนถูกตั้งค่าเองแล้ว</string>
-  <string name="rmd_EPr_ringtone_desc_silent">เสียงเตือนเปลี่ยนเป็นเงียบ</string>
-  <string name="rmd_EPr_ringtone_desc_default">เสียงเตือนตั้งต้นจะถูกใช้</string>
-  <string-array name="EPr_reminder_random">
-    <item>disabled</item>
-    <item>hourly</item>
-    <item>daily</item>
-    <item>weekly</item>
-    <item>bi-weekly</item>
-    <item>monthly</item>
-    <item>bi-monthly</item>
-  </string-array>
-  <string-array name="EPr_quiet_hours_start">
-    <item>disabled</item>
-    <item>8 PM</item>
-    <item>9 PM</item>
-    <item>10 PM</item>
-    <item>11 PM</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
-    <item>9 AM</item>
-    <item>10 AM</item>
-    <item>11 AM</item>
-    <item>12 PM</item>
-    <item>1 PM</item>
-    <item>2 PM</item>
-    <item>3 PM</item>
-    <item>4 PM</item>
-    <item>5 PM</item>
-    <item>6 PM</item>
-    <item>7 PM</item>
-  </string-array>
-  <string-array name="EPr_quiet_hours_end">
-    <item>9 AM</item>
-    <item>10 AM</item>
-    <item>11 AM</item>
-    <item>12 PM</item>
-    <item>1 PM</item>
-    <item>2 PM</item>
-    <item>3 PM</item>
-    <item>4 PM</item>
-    <item>5 PM</item>
-    <item>6 PM</item>
-    <item>7 PM</item>
-    <item>8 PM</item>
-    <item>9 PM</item>
-    <item>10 PM</item>
-    <item>11 PM</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
-  </string-array>
-  <string-array name="EPr_rmd_time">
-    <item>9 AM</item>
-    <item>10 AM</item>
-    <item>11 AM</item>
-    <item>12 PM</item>
-    <item>1 PM</item>
-    <item>2 PM</item>
-    <item>3 PM</item>
-    <item>4 PM</item>
-    <item>5 PM</item>
-    <item>6 PM</item>
-    <item>7 PM</item>
-    <item>8 PM</item>
-    <item>9 PM</item>
-    <item>10 PM</item>
-    <item>11 PM</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
-  </string-array>
-  <string-array name="reminders">
-    <item>Hi there! Have a sec?</item>
-    <item>Can I see you for a sec?</item>
-    <item>Have a few minutes?</item>
-    <item>Did you forget?</item>
-    <item>Excuse me!</item>
-    <item>When you have a minute:</item>
-    <item>On your agenda:</item>
-    <item>Free for a moment?</item>
-    <item>Astrid here!</item>
-    <item>Hi! Can I bug you?</item>
-    <item>A minute of your time?</item>
-    <item>It\'s a great day to</item>
-  </string-array>
-  <string-array name="reminders_due">
-    <item>Time to work!</item>
-    <item>Due date is here!</item>
-    <item>Ready to start?</item>
-    <item>You said you would do:</item>
-    <item>You\'re supposed to start:</item>
-    <item>Time to start:</item>
-    <item>It\'s time!</item>
-    <item>Excuse me! Time for</item>
-    <item>You free? Time to</item>
-  </string-array>
-  <string-array name="reminders_snooze">
-    <item>Don\'t be lazy now!</item>
-    <item>Snooze time is up!</item>
-    <item>No more snoozing!</item>
-    <item>Now are you ready?</item>
-    <item>No more postponing!</item>
-  </string-array>
-  <string-array name="reminder_responses">
-    <item>I\'ve got something for you!</item>
-    <item>Ready to put this in the past?</item>
-    <item>Why don\'t you get this done?</item>
-    <item>How about it? Ready tiger?</item>
-    <item>Ready to do this?</item>
-    <item>Can you handle this?</item>
-    <item>You can be happy! Just finish this!</item>
-    <item>I promise you\'ll feel better if you finish this!</item>
-    <item>Won\'t you do this today?</item>
-    <item>Please finish this, I\'m sick of it!</item>
-    <item>Can you finish this? Yes you can!</item>
-    <item>Are you ever going to do this?</item>
-    <item>Feel good about yourself! Let\'s go!</item>
-    <item>I\'m so proud of you! Lets get it done!</item>
-    <item>A little snack after you finish this?</item>
-    <item>Just this one task? Please?</item>
-    <item>Time to shorten your todo list!</item>
-    <item>Are you on Team Order or Team Chaos? Team Order! Let\'s go!</item>
-    <item>Have I mentioned you are awesome recently? Keep it up!</item>
-    <item>A task a day keeps the clutter away... Goodbye clutter!</item>
-    <item>How do you do it? Wow, I\'m impressed!</item>
-    <item>You can\'t just get by on your good looks. Let\'s get to it!</item>
-    <item>Lovely weather for a job like this, isn\'t it?</item>
-    <item>A spot of tea while you work on this?</item>
-    <item>If only you had already done this, then you could go outside and play.</item>
-    <item>It\'s time. You can\'t put off the inevitable.</item>
-    <item>I die a little every time you ignore me.</item>
-  </string-array>
-  <string-array name="postpone_nags">
-    <item>Please tell me it isn\'t true that you\'re a procrastinator!</item>
-    <item>Doesn\'t being lazy get old sometimes?</item>
-    <item>Somewhere, someone is depending on you to finish this!</item>
-    <item>When you said postpone, you really meant \'I\'m doing this\', right?</item>
-    <item>This is the last time you postpone this, right?</item>
-    <item>Just finish this today, I won\'t tell anyone!</item>
-    <item>Why postpone when you can um... not postpone!</item>
-    <item>You\'ll finish this eventually, I presume?</item>
-    <item>I think you\'re really great! How about not putting this off?</item>
-    <item>Will you be able to achieve your goals if you do that?</item>
-    <item>Postpone, postpone, postpone. When will you change!</item>
-    <item>I\'ve had enough with your excuses! Just do it already!</item>
-    <item>Didn\'t you make that excuse last time?</item>
-    <item>I can\'t help you organize your life if you do that...</item>
-  </string-array>
-  <string name="repeat_enabled">การเกิดซ้ำ</string>
-  <string-array name="repeat_interval_short">
-    <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">
-    <item>วัน</item>
-    <item>สัปดาห์</item>
-    <item>เดือน</item>
-    <item>ชั่วโมง</item>
-    <item>Minute(s)</item>
-    <item>Year(s)</item>
-  </string-array>
-  <string-array name="repeat_until_shortcuts">
-    <item>Forever</item>
-    <item>Specific Day</item>
-    <item>Today</item>
-    <item>Tomorrow</item>
-    <item>(day after)</item>
-    <item>Next Week</item>
-    <item>In Two Weeks</item>
-    <item>Next Month</item>
-  </string-array>
-  <string-array name="repeat_type">
-    <item>from due date</item>
-    <item>from completion date</item>
-  </string-array>
-  <string-array name="repeat_encouragement">
-    <item>Good job!</item>
-    <item>Wow… I\'m so proud of you!</item>
-    <item>I love when you\'re productive!</item>
-    <item>Doesn\'t it feel good to check something off?</item>
-  </string-array>
-  <string-array name="repeat_encouragement_last_time">
-    <item>Good job!</item>
-    <item>I\'m so proud of you!</item>
-    <item>I love when you\'re productive!</item>
-  </string-array>
-  <string name="tag_settings_title">Settings:</string>
-  <string name="welcome_title_1">ยินดีต้อนรับสู่ Astrid!</string>
-  <string name="welcome_body_5">and much more!</string>
-  <string-array name="PPW_encouragements">
-    <item>Hi there!</item>
-    <item>Have time to finish something?</item>
-    <item>Gosh, you are looking suave today!</item>
-    <item>Do something great today!</item>
-    <item>Make me proud today!</item>
-    <item>How are you doing today?</item>
-  </string-array>
-  <string-array name="PPW_encouragements_tod">
-    <item>Good morning!</item>
-    <item>Good afternoon!</item>
-    <item>Good evening!</item>
-    <item>Late night?</item>
-    <item>It\'s early, get something done!</item>
-    <item>Afternoon tea, perhaps?</item>
-    <item>Enjoy the evening!</item>
-    <item>Sleep is good for you, you know!</item>
-  </string-array>
-  <string-array name="PPW_encouragements_completed">
-    <item>You\'ve already completed %d tasks!</item>
-    <item>Score in life: %d tasks completed</item>
-    <item>Smile! You\'ve already finished %d tasks!</item>
-  </string-array>
-  <string-array name="PPW_colors">
-    <item>Black</item>
-    <item>White</item>
-    <item>Blue</item>
-    <item>Translucent</item>
-  </string-array>
+    <string name="actfm_picture_camera">ถ่ายภาพ</string>
+    <string name="actfm_picture_gallery">เลือกจากคลังภาพ</string>
+    <string name="actfm_picture_clear">ล้างภาพ</string>
+    <string-array name="TVA_tabs">
+        <item>Tasks</item>
+        <item>Activity</item>
+        <item>List Settings</item>
+    </string-array>
+    <string name="actfm_ALA_password_label">รหัสผ่าน</string>
+    <string-array name="reminders_alarm">
+        <item>แจ้งเตือน!</item>
+    </string-array>
+    <string name="backup_BPr_header">สำรองข้อมูล</string>
+    <string name="backup_BPr_group_status">สถานะ</string>
+    <string name="backup_status_failed_subtitle">(แตะเพื่อแสดงข้อผิดพลาด)</string>
+    <string name="backup_BPr_group_options">ตัวเลือก</string>
+    <string name="backup_BPr_auto_enabled">จะทำการสำรองข้อมูลทุกวัน</string>
+    <string name="export_progress_title">กำลังส่งออก...</string>
+    <string name="import_progress_title">กำลังนำเข้า...</string>
+    <string name="import_progress_read">กำลังอ่านแผนงาน %d...</string>
+    <string name="DLG_error_sdcard">ไม่สามารถเข้าถึงแฟ้ม: %s</string>
+    <string name="DLG_error_sdcard_general">ไม่สามารถเข้าถึง SD Card ได้!</string>
+    <string name="read_permission_desc">อ่านแผนงาน, แสดงตัวกรองแผนงาน</string>
+    <string name="write_permission_desc">สร้างแผนงานใหม่, แก้ไขแผนงานเดิม</string>
+    <string name="DLG_delete_this_task_question">ลบงานนี้?</string>
+    <string name="DLG_delete_this_item_question">ลบรายการนี้: %s?</string>
+    <string name="DLG_hour_minutes">เวลา (ชั่วโมง : นาที)</string>
+    <string name="DLG_accept">ฉันยอมรับ</string>
+    <string name="DLG_decline">ฉันปฏิเสธ</string>
+    <string name="DLG_eula_title">เงื่อนไขการใช้งาน Astrid</string>
+    <string name="DLG_loading">กำลังโหลด...</string>
+    <string name="WID_dateButtonUnset">คลิก เพื่อตั้งค่า</string>
+    <string name="TLA_no_items">ไม่มีแผนงานใดๆ !</string>
+    <string name="TLA_menu_sort">Sort &amp; Hidden</string>
+    <string name="TLA_custom">ปรับแต่ง</string>
+    <string-array name="TLA_filters">
+        <item>Active</item>
+        <item>วันนี้</item>
+        <item>Soon</item>
+        <item>Late</item>
+        <item>เสร็จแล้ว</item>
+        <item>Hidden</item>
+    </string-array>
+    <string-array name="TLA_priority_strings">
+        <item>highest priority</item>
+        <item>high priority</item>
+        <item>medium priority</item>
+        <item>low priority</item>
+    </string-array>
+    <string name="TAd_actionEditTask">แก้ไข</string>
+    <string name="TAd_contextEditTask">แก้ไขงาน</string>
+    <string name="TAd_contextUndeleteTask">แผนงานที่ลบไม่ได้</string>
+    <string name="SSD_title">จัดเรียง และซ่อนแผนงาน</string>
+    <string name="SSD_completed">แสดงแผนงานที่เสร็จแล้ว</string>
+    <string name="SSD_hidden">แสดงแผนงานที่ซ่อนไว้</string>
+    <string name="SSD_deleted">แสดงแผนงานที่ถูกลบ</string>
+    <string name="SSD_sort_auto">จัดเรียงด้วย Astrid Smart</string>
+    <string name="SSD_sort_alpha">ตามชื่อ</string>
+    <string name="SSD_sort_importance">ตามความสำคัญ</string>
+    <string name="SSD_sort_modified">ตามวันที่แก้ไขล่าสุด</string>
+    <string name="SSD_sort_reverse">จัดเรียงย้อนหลัง</string>
+    <string name="SSD_save_temp">ชั่วคราว</string>
+    <string name="SSD_save_always">ตลอดไป</string>
+    <string name="FLA_shortcut_dialog_title">สร้างทางลัด</string>
+    <string name="FLA_shortcut_dialog">ชื่อทางลัด:</string>
+    <string name="FLA_search_hint">ค้นหาแผนงาน</string>
+    <string name="FLA_toast_onCreateShortcut">สร้างทางลัดแล้ว: %s</string>
+    <string name="TEA_title_hint">สรุปแผนงาน</string>
+    <string name="TEA_importance_label">ความสำคัญ</string>
+    <string name="TEA_urgency_specific_time">ณ.เวลาที่ระบุ?</string>
+    <string-array name="TEA_loading">
+        <item>กำลังโหลด...</item>
+    </string-array>
+    <string name="TEA_note_label">บันทึกย่อ</string>
+    <string name="TEA_menu_save">บันทึกการเปลี่ยนแปลง</string>
+    <string name="TEA_menu_discard">ไม่บันทึก</string>
+    <string name="TEA_menu_delete">ลบงาน</string>
+    <string name="TEA_onTaskSave_notDue">งานที่บันทึกไว้</string>
+    <string name="TEA_tab_more">เพิ่มเติม</string>
+    <string-array name="TEA_urgency">
+        <item>ไม่มีเส้นตาย</item>
+        <item>Specific day</item>
+        <item>วันนี้</item>
+        <item>พรุ่งนี้</item>
+        <item>(วันให้หลัง)</item>
+        <item>Next week</item>
+        <item>In two weeks</item>
+        <item>Next month</item>
+    </string-array>
+    <string-array name="TEA_hideUntil">
+        <item>ตลอดไป</item>
+        <item>Due date</item>
+        <item>Due time</item>
+        <item>วันก่อนถึงกำหนด</item>
+        <item>สัปดาห์ก่อนถึงกำหนด</item>
+        <item>ระบุ วัน/เวลา</item>
+    </string-array>
+    <string name="TEA_control_more_section">----More Section----</string>
+    <string name="TEA_control_importance">ความสำคัญ</string>
+    <string name="TEA_control_notes">บันทึกย่อ</string>
+    <string-array name="MCA_dialog_speech_options">
+        <item>It must be nice to be so popular!</item>
+        <item>Yay! People like you!</item>
+        <item>Make their day, give \'em a call!</item>
+        <item>Wouldn\'t you be happy if people called you back?</item>
+        <item>You can do it!</item>
+        <item>You can always send a text...</item>
+    </string-array>
+    <string name="UpS_changelog_title">มีอะไรใหม่ใน Astrid?</string>
+    <string name="UpS_updates_title">ข่าวล่าสุดของ Astrid</string>
+    <string name="EPr_appearance_header">รูปโฉม</string>
+    <string name="EPr_fontSize_desc">ขนาดฟอนต์บนหน้ารายการหลัก</string>
+    <string name="EPr_showNotes_desc_enabled">บันทึกจะแสดงให้เห็นตลอดเวลา</string>
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>No swipe</item>
+        <item>Conserve Memory</item>
+        <item>Normal Performance</item>
+        <item>High Performance</item>
+    </string-array>
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <item>Swipe between lists is disabled</item>
+        <item>Slower performance</item>
+        <item>Default setting</item>
+        <item>Uses more system resources</item>
+    </string-array>
+    <string-array name="EPr_themes">
+        <item>Day - Blue</item>
+        <item>Day - Red</item>
+        <item>Sky blue</item>
+        <item>Night</item>
+        <item>Transparent (White Text)</item>
+        <item>Transparent (Black Text)</item>
+    </string-array>
+    <string-array name="EPr_themes_widget">
+        <item>Same as app</item>
+        <item>Day - Blue</item>
+        <item>Day - Red</item>
+        <item>Sky blue</item>
+        <item>Night</item>
+        <item>Transparent (White Text)</item>
+        <item>Transparent (Black Text)</item>
+        <item>Old Style</item>
+    </string-array>
+    <string name="AOA_internal_author">ทีมงาน Astrid</string>
+    <string name="AOA_tab_installed">ติดตั้งแล้ว</string>
+    <string name="AOA_tab_available">พร้อมใช้</string>
+    <string name="AOA_free">ฟรี</string>
+    <string name="TWi_loading">กำลังโหลด...</string>
+    <string name="WCA_title">เลือกแผนงานเพื่อดู...</string>
+    <string-array name="EPr_default_importance">
+        <item>!!! (Highest)</item>
+        <item>!!</item>
+        <item>!</item>
+        <item>o (Lowest)</item>
+    </string-array>
+    <string-array name="EPr_default_urgency">
+        <item>No deadline</item>
+        <item>วันนี้</item>
+        <item>พรุ่งนี้</item>
+        <item>Day after tomorrow</item>
+        <item>Next week</item>
+    </string-array>
+    <string-array name="EPr_default_hideUntil">
+        <item>ไม่ต้องซ่อน</item>
+        <item>ถึงกำหนดแผนงาน</item>
+        <item>วันก่อนถึงกำหนด</item>
+        <item>สัปดาห์ก่อนถึงกำหนด</item>
+    </string-array>
+    <string-array name="EPr_default_reminders">
+        <item>No deadline reminders</item>
+        <item>ถึงเส้นตาย</item>
+        <item>เมื่อพ้นกำหนด</item>
+        <item>เมื่อถึงเส้นตาย หรือพ้นกำหนด</item>
+    </string-array>
+    <string name="BFE_Active">แผนงานตอนนี้</string>
+    <string name="BFE_Recent">เพิ่งถูกแก้ไข</string>
+    <string name="BFE_Saved_delete">ลบตัวกรอง</string>
+    <string name="CFA_title">ตัวกรองที่กำหนดค่าเอง</string>
+    <string name="CFA_filterName_hint">ตั้งชื่อตัวกรองเพื่อบันทึก...</string>
+    <string name="CFA_universe_all">แผนงานตอนนี้</string>
+    <string name="CFA_type_add">หรือ</string>
+    <string name="CFA_type_subtract">ไม่ใช่</string>
+    <string name="CFA_type_intersect">รวมถึง</string>
+    <string name="CFA_context_delete">ลบแถว</string>
+    <string name="CFA_button_add">เพิ่มข้อกำหนด</string>
+    <string name="CFA_button_view">เปิดดู</string>
+    <string name="CFA_button_save">บันทึก &amp; เปิดดู</string>
+    <string-array name="CFC_dueBefore_entries">
+        <item>ไม่กำหนดวัน</item>
+        <item>เมื่อวาน</item>
+        <item>วันนี้</item>
+        <item>พรุ่งนี้</item>
+        <item>วันมะรืนนี้</item>
+        <item>สัปดาห์หน้า</item>
+        <item>เดือนถัดไป</item>
+    </string-array>
+    <string name="CFC_importance_text">มีความสำคัญอย่างน้อย ?</string>
+    <string name="CFC_importance_name">ความสำคัญ...</string>
+    <string name="CFC_title_contains_name">ชื่อที่มีคำว่า...</string>
+    <string name="CFC_title_contains_text">ชื่อที่มีคำว่า: ?</string>
+    <string name="gcal_TEA_showCalendar_label">เปิดเหตุการณ์ปฏิทิน</string>
+    <string name="gcal_completed_title">%s (เสร็จสิ้นแล้ว)</string>
+    <string name="gcal_GCP_default">ปฏิธินตั้งต้น</string>
+    <string name="locale_edit_alerts_title">คำเตือนตัวกรอง Astrid</string>
+    <string name="locale_edit_intro">Astrid จะช่วยเตือนความจำ เมื่อมีแผนงานอยู่เขตตัวกรองดังนี้:
+    </string>
+    <string name="locale_interval_label">จำกัดการแจ้งเตือนไว้ที่:</string>
+    <string-array name="locale_interval">
+        <item>ชั่วโมงละครั้ง</item>
+        <item>ทุกๆ 6 ชั่วโมง</item>
+        <item>ทุกๆ 12 ชั่วโมง</item>
+        <item>วันละครั้ง</item>
+        <item>ทุกๆ 3 วัน</item>
+        <item>สัปดาห์ละครั้ง</item>
+    </string-array>
+    <string name="locale_plugin_required">กรุณาติดตั้ง Astrid Locale plugin!</string>
+    <string name="opencrx_FEx_dashboard">พื้นที่ทำงาน</string>
+    <string name="opencrx_FEx_responsible">มอบหมายให้กับ</string>
+    <string name="opencrx_FEx_responsible_title">มอบหมายให้กับ \'%s\'</string>
+    <string name="opencrx_PDE_task_from">จาก %s</string>
+    <string name="opencrx_TEA_notes">เพิ่มความคิดเห็น</string>
+    <string name="opencrx_PLA_signIn">เข้าสู่ระบบ</string>
+    <string name="opencrx_PLA_password">รหัสผ่าน</string>
+    <string name="opencrx_notification_text">%s แผนงานอัปเดทแล้ว / คลิกเพื่อดูรายละเอียด</string>
+    <string name="opencrx_ioerror">ข้อผิดพลาดในการเชื่อมต่อ! ตรวจดูการเชื่อมต่ออินเตอร์เน็ท</string>
+    <string name="opencrx_MLA_password_empty">ยังไม่ได้ระบุ รหัสผ่าน</string>
+    <string name="opencrx_TEA_task_assign_label">มอบหมายแผนงานนี้ให้กับบุคคลนี้:</string>
+    <string name="opencrx_TEA_task_unassigned">&lt;ยังไม่ถูกมอบหมาย&gt;</string>
+    <string name="opencrx_TEA_dashboard_default">&lt;ค่าตั้งต้น&gt;</string>
+    <string name="CFC_opencrx_in_workspace_text">ในพื้นที่ทำงาน: ?</string>
+    <string name="CFC_opencrx_in_workspace_name">ในพื้นที่ทำงาน...</string>
+    <string name="CFC_opencrx_assigned_to_text">มอบหมายให้: ?</string>
+    <string name="CFC_opencrx_assigned_to_name">มอบหมายให้...</string>
+    <string name="EPr_statistics_desc_disabled">ไม่มีข้อมูลการใช้งานที่จะรายงาน</string>
+    <string-array name="TEA_reminder_random">
+        <item>an hour</item>
+        <item>a day</item>
+        <item>a week</item>
+        <item>in two weeks</item>
+        <item>a month</item>
+        <item>in two months</item>
+    </string-array>
+    <string name="rmd_NoA_filter">เตือนความจำ!</string>
+    <string name="rmd_NoA_done">เสร็จเรียบร้อยแล้ว!</string>
+    <string name="rmd_NoA_snooze">หลับ..</string>
+    <string-array name="rmd_reengage_notif_titles">
+        <item>A note from Astrid</item>
+        <item>Memo for %s.</item>
+        <item>Your Astrid digest</item>
+        <item>Reminders from Astrid</item>
+    </string-array>
+    <string-array name="rmd_reengage_dialog_options">
+        <item>Time to shorten your to-do list!</item>
+        <item>Dear sir or madam, some tasks await your inspection!</item>
+        <item>Hi there, could you take a look at these?</item>
+        <item>I\'ve got some tasks with your name on them!</item>
+        <item>A fresh batch of tasks for you today!</item>
+        <item>You look fabulous! Ready to get started?</item>
+        <item>A lovely day for getting some work done, I think!</item>
+    </string-array>
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>Don\'t you want to get organized?</item>
+        <item>I\'m Astrid! I\'m here to help you do more!</item>
+        <item>You look busy! Let me take some of those tasks off of your plate.</item>
+        <item>I can help you keep track of all of the details in your life.</item>
+        <item>You\'re serious about getting more done? So am I!</item>
+        <item>Pleasure to make your acquaintance!</item>
+    </string-array>
+    <string name="rmd_EPr_ringtone_desc_custom">เสียงเตือนถูกตั้งค่าเองแล้ว</string>
+    <string name="rmd_EPr_ringtone_desc_silent">เสียงเตือนเปลี่ยนเป็นเงียบ</string>
+    <string name="rmd_EPr_ringtone_desc_default">เสียงเตือนตั้งต้นจะถูกใช้</string>
+    <string-array name="EPr_reminder_random">
+        <item>disabled</item>
+        <item>hourly</item>
+        <item>daily</item>
+        <item>weekly</item>
+        <item>bi-weekly</item>
+        <item>monthly</item>
+        <item>bi-monthly</item>
+    </string-array>
+    <string-array name="EPr_quiet_hours_start">
+        <item>disabled</item>
+        <item>8 PM</item>
+        <item>9 PM</item>
+        <item>10 PM</item>
+        <item>11 PM</item>
+        <item>12 AM</item>
+        <item>1 AM</item>
+        <item>2 AM</item>
+        <item>3 AM</item>
+        <item>4 AM</item>
+        <item>5 AM</item>
+        <item>6 AM</item>
+        <item>7 AM</item>
+        <item>8 AM</item>
+        <item>9 AM</item>
+        <item>10 AM</item>
+        <item>11 AM</item>
+        <item>12 PM</item>
+        <item>1 PM</item>
+        <item>2 PM</item>
+        <item>3 PM</item>
+        <item>4 PM</item>
+        <item>5 PM</item>
+        <item>6 PM</item>
+        <item>7 PM</item>
+    </string-array>
+    <string-array name="EPr_quiet_hours_end">
+        <item>9 AM</item>
+        <item>10 AM</item>
+        <item>11 AM</item>
+        <item>12 PM</item>
+        <item>1 PM</item>
+        <item>2 PM</item>
+        <item>3 PM</item>
+        <item>4 PM</item>
+        <item>5 PM</item>
+        <item>6 PM</item>
+        <item>7 PM</item>
+        <item>8 PM</item>
+        <item>9 PM</item>
+        <item>10 PM</item>
+        <item>11 PM</item>
+        <item>12 AM</item>
+        <item>1 AM</item>
+        <item>2 AM</item>
+        <item>3 AM</item>
+        <item>4 AM</item>
+        <item>5 AM</item>
+        <item>6 AM</item>
+        <item>7 AM</item>
+        <item>8 AM</item>
+    </string-array>
+    <string-array name="EPr_rmd_time">
+        <item>9 AM</item>
+        <item>10 AM</item>
+        <item>11 AM</item>
+        <item>12 PM</item>
+        <item>1 PM</item>
+        <item>2 PM</item>
+        <item>3 PM</item>
+        <item>4 PM</item>
+        <item>5 PM</item>
+        <item>6 PM</item>
+        <item>7 PM</item>
+        <item>8 PM</item>
+        <item>9 PM</item>
+        <item>10 PM</item>
+        <item>11 PM</item>
+        <item>12 AM</item>
+        <item>1 AM</item>
+        <item>2 AM</item>
+        <item>3 AM</item>
+        <item>4 AM</item>
+        <item>5 AM</item>
+        <item>6 AM</item>
+        <item>7 AM</item>
+        <item>8 AM</item>
+    </string-array>
+    <string-array name="reminders">
+        <item>Hi there! Have a sec?</item>
+        <item>Can I see you for a sec?</item>
+        <item>Have a few minutes?</item>
+        <item>Did you forget?</item>
+        <item>Excuse me!</item>
+        <item>When you have a minute:</item>
+        <item>On your agenda:</item>
+        <item>Free for a moment?</item>
+        <item>Astrid here!</item>
+        <item>Hi! Can I bug you?</item>
+        <item>A minute of your time?</item>
+        <item>It\'s a great day to</item>
+    </string-array>
+    <string-array name="reminders_due">
+        <item>Time to work!</item>
+        <item>Due date is here!</item>
+        <item>Ready to start?</item>
+        <item>You said you would do:</item>
+        <item>You\'re supposed to start:</item>
+        <item>Time to start:</item>
+        <item>It\'s time!</item>
+        <item>Excuse me! Time for</item>
+        <item>You free? Time to</item>
+    </string-array>
+    <string-array name="reminders_snooze">
+        <item>Don\'t be lazy now!</item>
+        <item>Snooze time is up!</item>
+        <item>No more snoozing!</item>
+        <item>Now are you ready?</item>
+        <item>No more postponing!</item>
+    </string-array>
+    <string-array name="reminder_responses">
+        <item>I\'ve got something for you!</item>
+        <item>Ready to put this in the past?</item>
+        <item>Why don\'t you get this done?</item>
+        <item>How about it? Ready tiger?</item>
+        <item>Ready to do this?</item>
+        <item>Can you handle this?</item>
+        <item>You can be happy! Just finish this!</item>
+        <item>I promise you\'ll feel better if you finish this!</item>
+        <item>Won\'t you do this today?</item>
+        <item>Please finish this, I\'m sick of it!</item>
+        <item>Can you finish this? Yes you can!</item>
+        <item>Are you ever going to do this?</item>
+        <item>Feel good about yourself! Let\'s go!</item>
+        <item>I\'m so proud of you! Lets get it done!</item>
+        <item>A little snack after you finish this?</item>
+        <item>Just this one task? Please?</item>
+        <item>Time to shorten your todo list!</item>
+        <item>Are you on Team Order or Team Chaos? Team Order! Let\'s go!</item>
+        <item>Have I mentioned you are awesome recently? Keep it up!</item>
+        <item>A task a day keeps the clutter away... Goodbye clutter!</item>
+        <item>How do you do it? Wow, I\'m impressed!</item>
+        <item>You can\'t just get by on your good looks. Let\'s get to it!</item>
+        <item>Lovely weather for a job like this, isn\'t it?</item>
+        <item>A spot of tea while you work on this?</item>
+        <item>If only you had already done this, then you could go outside and play.</item>
+        <item>It\'s time. You can\'t put off the inevitable.</item>
+        <item>I die a little every time you ignore me.</item>
+    </string-array>
+    <string-array name="postpone_nags">
+        <item>Please tell me it isn\'t true that you\'re a procrastinator!</item>
+        <item>Doesn\'t being lazy get old sometimes?</item>
+        <item>Somewhere, someone is depending on you to finish this!</item>
+        <item>When you said postpone, you really meant \'I\'m doing this\', right?</item>
+        <item>This is the last time you postpone this, right?</item>
+        <item>Just finish this today, I won\'t tell anyone!</item>
+        <item>Why postpone when you can um... not postpone!</item>
+        <item>You\'ll finish this eventually, I presume?</item>
+        <item>I think you\'re really great! How about not putting this off?</item>
+        <item>Will you be able to achieve your goals if you do that?</item>
+        <item>Postpone, postpone, postpone. When will you change!</item>
+        <item>I\'ve had enough with your excuses! Just do it already!</item>
+        <item>Didn\'t you make that excuse last time?</item>
+        <item>I can\'t help you organize your life if you do that...</item>
+    </string-array>
+    <string name="repeat_enabled">การเกิดซ้ำ</string>
+    <string-array name="repeat_interval_short">
+        <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">
+        <item>วัน</item>
+        <item>สัปดาห์</item>
+        <item>เดือน</item>
+        <item>ชั่วโมง</item>
+        <item>Minute(s)</item>
+        <item>Year(s)</item>
+    </string-array>
+    <string-array name="repeat_until_shortcuts">
+        <item>Forever</item>
+        <item>Specific Day</item>
+        <item>Today</item>
+        <item>Tomorrow</item>
+        <item>(day after)</item>
+        <item>Next Week</item>
+        <item>In Two Weeks</item>
+        <item>Next Month</item>
+    </string-array>
+    <string-array name="repeat_type">
+        <item>from due date</item>
+        <item>from completion date</item>
+    </string-array>
+    <string-array name="repeat_encouragement">
+        <item>Good job!</item>
+        <item>Wow… I\'m so proud of you!</item>
+        <item>I love when you\'re productive!</item>
+        <item>Doesn\'t it feel good to check something off?</item>
+    </string-array>
+    <string-array name="repeat_encouragement_last_time">
+        <item>Good job!</item>
+        <item>I\'m so proud of you!</item>
+        <item>I love when you\'re productive!</item>
+    </string-array>
+    <string name="tag_settings_title">Settings:</string>
+    <string name="welcome_title_1">ยินดีต้อนรับสู่ Astrid!</string>
+    <string name="welcome_body_5">and much more!</string>
+    <string-array name="PPW_encouragements">
+        <item>Hi there!</item>
+        <item>Have time to finish something?</item>
+        <item>Gosh, you are looking suave today!</item>
+        <item>Do something great today!</item>
+        <item>Make me proud today!</item>
+        <item>How are you doing today?</item>
+    </string-array>
+    <string-array name="PPW_encouragements_tod">
+        <item>Good morning!</item>
+        <item>Good afternoon!</item>
+        <item>Good evening!</item>
+        <item>Late night?</item>
+        <item>It\'s early, get something done!</item>
+        <item>Afternoon tea, perhaps?</item>
+        <item>Enjoy the evening!</item>
+        <item>Sleep is good for you, you know!</item>
+    </string-array>
+    <string-array name="PPW_encouragements_completed">
+        <item>You\'ve already completed %d tasks!</item>
+        <item>Score in life: %d tasks completed</item>
+        <item>Smile! You\'ve already finished %d tasks!</item>
+    </string-array>
+    <string-array name="PPW_colors">
+        <item>Black</item>
+        <item>White</item>
+        <item>Blue</item>
+        <item>Translucent</item>
+    </string-array>
 </resources>
diff --git a/astrid/res/values-tr/strings.xml b/astrid/res/values-tr/strings.xml
index 9525814ea..471c1294c 100755
--- a/astrid/res/values-tr/strings.xml
+++ b/astrid/res/values-tr/strings.xml
@@ -4,1689 +4,1830 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ================================================== general terms == -->
-
-  <!-- People Editing Activity -->    
-  
-  <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
-  <string name="actfm_person_hint">Kişi veya Email</string>
-  
-  <!-- task sharing dialog: shared with hint -->
-  <string name="actfm_person_or_tag_hint">Kişi ya da Paylaşılan Liste</string>
-
-  <!-- toast on transmit success -->
-
-  <!-- can\'t rename or delete shared tag message -->
-  
-  <!-- warning before deleting a list you\'re the owner of -->
-  <string name="actfm_tag_operation_owner_delete">Bu paylaşılan listenin sahibisiniz. Bunu silerseniz, tüm liste üyeleri için silinecek. Devam etmek istiyor musunuz?</string>
-
-  <!-- slide 29a: menu item to take a picture -->
-  <string name="actfm_picture_camera">Resim Çek</string>
-
-  <!-- slide 29b: menu item to select from gallery -->
-  <string name="actfm_picture_gallery">Galeriden Seç</string>
-  
-  <!-- menu item to clear picture selection -->
-  <string name="actfm_picture_clear">Resmi sil</string>
-
-  <!-- filter list activity: refresh tags -->
-  
-  <!-- Title for prompt after sharing a task -->
-  <string name="actfm_view_task_title">Görevi görüntüle?</string>
-
-  <!-- Text for prompt after sharing a task -->
-  <string name="actfm_view_task_text">Görev gönderildi: %s! Şu anda kendi görevlerinizi görüntülüyorsunuz. Bunu ve diğer atanmış olduğunuz görevleri görmek istiyor musunuz?</string>
-  
-  <!-- Ok button for task view prompt -->
-  <string name="actfm_view_task_ok">Atananları Göster</string>
-      
-  <!-- Cancel button for task view prompt -->
-  <string name="actfm_view_task_cancel">Burada Kal</string>
-  
-  <!-- slide 13a: Title for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_title">Paylaşılan Görevlerim</string>
-  
-  <!-- Empty list for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_empty">Paylaşılmış görev yok</string>
-  
-  <!-- =====================  Friendship connections -->
-  
-  <string name="actfm_friendship_pending">%s kişisine arkadaşlık isteği gönderdiniz!</string>
-
-  <string name="actfm_friendship_blocked">%s engellendi.</string>
-
-  <string name="actfm_friendship_ignored">You\'ve ignored %s.</string>
-  
-  <string name="actfm_friendship_friends">%s ile arkadaşsınız! Aşağıya onlar için görev ekleyin.</string>
-
-  <string name="actfm_friendship_other_pending">%s sizinle arkadaş olmak istiyor!</string>
-
-  <string name="actfm_friendship_no_status">%s ile bağlanarak genel listenizdekileri paylaşabilirsiniz.</string>
-
-  <string name="actfm_friendship_connect">Arkadaş ekle</string>
-
-  <string name="actfm_friendship_accept">Kabul Et</string>
-
-  <!-- ================================================== TagViewActivity == -->  
-
-  <!-- Tag View Activity: Add Comment hint -->    
-  <string name="TVA_add_comment">Yorum Gir</string>
-
-  <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->    
-  
-  <!-- Tabs for Tag view -->
-  <string-array name="TVA_tabs">
-    <!-- Tab for showing tasks -->
-    <item>Görevler</item>
-    <!-- Tab for showing comments & updates -->
-    <item>Etkinlik</item>
-    <!-- Tab for showing setting -->
-    <item>Liste Ayarları</item>
-  </string-array>
-  
-  <!-- Tag View: filtered by assigned to user (%s => user name) -->
-  <string name="actfm_TVA_filtered_by_assign">%s\'e ait görevler. Hepsi için dokunun.</string>
-  
-  <!-- Tag View: filter by unassigned tasks -->
-  <string name="actfm_TVA_filter_by_unassigned">Atanmamış görevler. Tümü için dokunun.</string>
-
-  <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Özel: Paylaşmak veya düzenlemek için dokunun</string>
-
-  <!-- Tag View Menu: refresh -->
-  <string name="actfm_TVA_menu_refresh">Yenile</string>
-
-  <!-- Tag Settings: tag name label -->
-  <string name="actfm_TVA_tag_label">Liste İsmi:</string>
-
-  <!-- Tag Settings: tag owner label -->
-
-  <!-- Tag Settings: tag owner value when there is no owner -->
-
-  <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
-  <string name="actfm_TVA_members_label">Paylaşılanlar:</string>
-  
-  <!-- Tag Settings: list collaborators hint -->
-  <string name="actfm_TVA_members_hint">E-posta adresi olan herhangi biri ile paylaş</string>
-
-  <!-- Tag Settings: tag picture -->
-  <string name="actfm_TVA_tag_picture">Liste Resmi</string>
-
-  <!-- slide 25c/28b: Tag Settings: silence notifications label -->
-  <string name="actfm_TVA_silence_label">Uyarıları Sessizleştir</string>
-  
-  <!-- Tag Settings: list icon label -->
-  
-  <!-- slide 25b/27d: Tag Settings: list description label -->
-  <string name="actfm_TVA_tag_description_label">Açıklama</string>
-  
-  <!-- slide 28a: Tag Settings: list settings label -->
-  <string name="actfm_TVA_tag_settings_label">Ayarlar</string>
-
-  <!-- slide 25b: Tag Settings: list description hint -->
-  <string name="actfm_TVA_tag_description_hint">Bir açıklama yazın</string>
-  
-  <!-- slide 25d: Tag Settings: list name hint -->
-  <string name="actfm_TVA_tag_name_hint">Liste adı girin</string>
-  
-  <!-- Tag settings: login prompt from share-->
-  <string name="actfm_TVA_login_to_share">Liste paylaşmak için Astrid.com\'da oturum açmış olmalısınız! Lütfen oturum açın ya da bunu özel bir liste yapın.</string>
-  
-      
-  <!-- ============================================ edit people dialog == -->
-
-  <!-- task sharing dialog: intro -->
-  <string name="actfm_EPA_intro">Alışveriş listelerinizi, parti planlarınızı ya da ekip projelerinizi paylaşmak için Astrid \'i kullanın ve kimlerin işleri tamamladığını anında görün!</string>
-    
-  <!-- task sharing dialog: window title -->
-    
-  <!-- task sharing dialog: save button -->
-  
-  <!-- task sharing dialog: assigned label -->
-  
-  <!-- slide 18a: task sharing dialog: assigned label long version -->
-  <string name="actfm_EPA_assign_label_long">Bunu kim yapmalı?</string>
-  
-  <!-- task sharing dialog: assigned to me -->
-  <string name="actfm_EPA_assign_me">Ben</string>
-  
-  <!-- task sharing dialog: anyone -->
-  <string name="actfm_EPA_unassigned">Herhangi biri</string>
-  
-  <!-- slide 18c: task sharing dialog: choose a contact -->
-  <string name="actfm_EPA_choose_contact">Bir kişi seç</string>
-  
-  <!-- task sharing dialog: custom email assignment -->
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_share_with">Şununla paylaş:</string>
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_collaborators_header">Share</string>
-
-      <!-- task sharing dialog: collaborator list name (%s => name of list) -->
-  <string name="actfm_EPA_list">Liste: %s</string>
-  
-  <!-- task sharing dialog: assigned hint -->
-  
-  <!-- task sharing dialog: message label text -->
-  <string name="actfm_EPA_message_text">Davet İletisi:</string>
-  
-  <!-- task sharing dialog: message body -->
-  <string name="actfm_EPA_message_body">Bunu bitirmeme yardım et!</string>
-  
-  <!-- task sharing dialog: list members section header -->
-  <string name="actfm_EPA_assign_header_members">Liste Üyeleri</string>
-
-  <!-- task sharing dialog: astrid friends section header -->
-  <string name="actfm_EPA_assign_header_friends">Astrid Arkadaşları</string>
-
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: share with Facebook -->
-  <string name="actfm_EPA_facebook">Facebook</string>
-  
-  <!-- task sharing dialog: share with Twitter -->
-  <string name="actfm_EPA_twitter">Twitter</string>
-
-  <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
-
-  <!-- task sharing dialog: edit people settings saved -->
-
-  <!-- task sharing dialog: invalid email (%s => email) -->
-  <string name="actfm_EPA_invalid_email">Geçersiz Mail: %s</string>
-
-  <!-- task sharing dialog: tag not found (%s => tag) -->
-  
-  <!-- task sharing login prompt -->
-  <string name="actfm_EPA_login_to_share">Görev paylaşabilmek için Astrid.com\'a kayıtlı olmalısınız!</string>
-  
-  <string name="actfm_EPA_login_button">Giriş yap</string>
-  
-  <string name="actfm_EPA_dont_share_button">Paylaşma</string>
-  
-  <string name="actfm_EPA_add_person_to_list_title">Görev atandı</string>
-  
-  <string name="actfm_EPA_add_person_to_list">%1$s bu listede paylaşılmadı. %2$s bu listeye eklensin mi?</string>
-
-  <string name="actfm_EPA_add_person_to_list_ok">Listeye ekle</string>
-  
-  <string name="actfm_EPA_add_person_to_list_cancel">Ekleme</string>
-  
-  <string name="actfm_list_owner">(owner)</string>
-  
-  <!-- ========================================= sharing login activity == -->
-
-  <!-- share login: Title -->
-  <string name="actfm_ALA_title">Astrid.com \'a Hoşgeldiniz!</string>
-
-  <!-- share login: Sharing Description -->
-  <string name="actfm_ALA_body">Astrid.com, görevlerinize çevrimiçi ulaşmanızı, paylaşmanızı ve diğerleriyle görev paylaşımı yapmanızı sağlar.</string>
-
-  <!-- share login: Sharing Login FB Prompt -->
-  <string name="actfm_ALA_fb_login">Facebook ile bağlan</string>
-
-  <!-- share login: Sharing Login GG Prompt -->
-  <string name="actfm_ALA_gg_login">Google ile bağlan</string>
-  
-  <!-- share login: Quickly log in as <%s -> email> -->
-  <string name="actfm_quick_login">Sign in: %s</string>
-
-  <!-- share login: Reject quick login -->
-  <string name="actfm_quick_login_reject">Not %s?</string>
-
-  <!-- share login: Name -->
-  <string name="actfm_ALA_firstname_label">Ad</string>
-  
-  <!-- share login: Name -->
-  <string name="actfm_ALA_lastname_label">Soyad</string>
-
-  <!-- share login: Email -->
-  <string name="actfm_ALA_email_label">E-Posta</string>
-
-  <!-- share login: Username / Email -->
-
-  <!-- share login: Password -->
-  <string name="actfm_ALA_password_label">Parola</string>
-
-  <!-- share login: Sign Up Title -->
-  <string name="actfm_ALA_signup_title">Üye Ol</string>
-
-  <!-- share login: Login Title -->
-  <string name="actfm_ALA_login_title">Oturum Aç</string>
-
-  <!-- share login: Google Auth title -->
-  <string name="actfm_GAA_title">Kullanmak istediğiniz Google hesabını seçin:</string>
-
-  <!-- share login: OAUTH Login Prompt -->
-  <string name="actfm_OLA_prompt">Lütfen oturum açın:</string>
-  
-  <!-- Login error: user exists -->
-  <string name="actfm_ALA_error_user_exists">Kullanıcı zaten mevcut. Bunun yerine lütfen giriş yapın.</string>
-  
-  <!-- Login error: wrong password -->
-  <string name="actfm_ALA_error_wrong_password">Özür dileriz, bu şifre geçersiz. Lütfen tekrar deneyin.</string>
-  
-  <!-- Forgot password link -->
-  <string name="actfm_ALA_forgot_password">Şifrenizi mi unuttunuz?</string>
-  
-  <!-- Forgot password email prompt -->
-  <string name="actfm_ALA_enter_email">Lütfen e-posta adresinizi giriniz</string>
-  
-  <!-- Password reset sent (%s -> email) -->
-  <string name="actfm_ALA_reset_sent">Şifre sıfırlayacı %s\'a gönderildi</string>
-  
-  <!-- User already exists - first sync may be slow -->
-  <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your patience!</string>
-  
-  <!-- User not found -->
-  <string name="actfm_ALA_error_user_not_found">Belirtilen e-posta adresine uyan kullanıcı bulunamadı. Üye olmayı deneyin!</string>
-  
-  <!-- ================================================ Featured Lists -->
-
-  <string name="actfm_feat_list_clone">Listeyi kopyala</string>
-  
-  <string name="actfm_feat_list_suffix">(Kopyala)</string>
-
-  <string name="actfm_feat_list_cloning">Kopyalanıyor...</string>
-
-  <string name="actfm_feat_list_clone_success">Başarılı!</string>
-
-  <string name="actfm_feat_list_task_clone_success">Görev kopyalandı</string>
-
-  <string name="actfm_feat_list_clone_empty">Kopyalanmış görev bulunmuyor</string>
-  
-  <!-- ================================================ Synchronization == -->
-      
-  <!-- Indicates the logged in user name. %s -> user\'s name -->
-  <string name="actfm_status_title_logged_in">Durum - Oturum açıldı: %s</string>    
-      
-  <!-- Preferences Title: Act.fm -->    
-  <string name="actfm_APr_header">Astrid.com</string>
-  
-  <string name="actfm_https_title">HTTPS kullan</string>
-  <string name="actfm_https_enabled">HTTPS etkin (yavaş)</string>
-  <string name="actfm_https_disabled">HTTPS etkin değil (hızlı)</string>
-
-  <!-- title for notification tray after synchronizing -->
-  
-  <!-- text for notification when comments are received -->
-    
-  <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, 
-      Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page,
-      or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.  
-      Are you sure you want to sync with Astrid.com?</string>
-      
-  <!-- account types -->
-  <string name="actfm_account_type">Hesap Türü</string>
-  <string name="actfm_account_info">Hesap Bilgisi</string>
-  <string name="actfm_account_info_summary">Durum ve seçenekler</string>
-  <string name="account_type_title_not_logged_in">Ücretsiz bir hesap için üye ol</string>
-  <string name="account_type_summary_not_logged_in">Görevlerine çevrimiçi ulaş, listelerini paylaş ve atama yap</string>
-  
-  
-  <string name="actfm_account_premium">Premium</string>
-  <string name="actfm_account_basic">Temel</string>
-  
-  <string name="actfm_inapp_billing">Premium\'a Yükselt</string>
-  <string name="actfm_inapp_billing_summary">Dosya ekle, ses yedekleri, premium destek ve fazlası</string>
-  
-  <!-- Sharing -->
-  <string name="share_with_facebook">Facebook\'ta Beğen</string>
-  <string name="share_with_twitter">Twitter ile takip et</string>
-  <string name="share_with_google">Google+ ile paylaş</string>
-  <string name="share_speech_bubble">Paylaşım ile, diğerlerinin daha verimli olmasını sağlarsınız!</string>
-  
-  
-  <!-- Sync upgrade messages -->
-  <string name="sync_upgr_both_title">Using Astrid.com + Google without Duplicates</string>
-  <string name="sync_upgr_both_body">Let\'s be honest. Google Tasks is convenient but not as cool as Astrid. To avoid duplicates you can no longer sync with Astrid.com and background sync with Google Tasks at the same time. You can still import your Google Tasks by visiting Settings → Backup &amp; Sync, or downgrade to Google Tasks only sync</string>
-  <string name="sync_upgr_both_btn1">Stick with Astrid</string>
-  <string name="sync_upgr_both_btn2">Downgrade to Google Tasks</string>
-  
-  <string name="sync_upgr_gtasks_only_title">Upgrade to Astrid Sync for Free!</string>
-  <string name="sync_upgr_gtasks_only_body">Access your tasks from all your devices and from Gmail with Astrid.com sync. Upgrade to Astrid.com Sync (you can always go back to Google Tasks - but you won\'t want to)!</string>
-  <string name="sync_upgr_gtasks_only_btn1">Upgrade to Astrid Sync</string>
-  <string name="sync_upgr_gtasks_only_btn2">Stick with Google Tasks</string>
-  
-  <string name="sync_upgr_neither_title">Free backup &amp; Sync!</string>
-  <string name="sync_upgr_neither_body">Don\'t put your to-dos at risk! New and improved Astrid sync to keep and access your tasks from anywhere.</string>
-  <string name="sync_upgr_neither_btn1">Sign up now</string>
-  
-  <string name="sync_upgr_logged_out">You have been logged out of Astrid</string>
-  
-  <string name="actfm_logout_clear_tasks_title">Clear data?</string>
-  <string name="actfm_logout_clear_tasks_body">Would you like to clear your tasks and lists?</string>
-  <string name="actfm_logout_clear_tasks_yes">Clear data</string>
-  <string name="actfm_logout_clear_tasks_no">Keep data</string>
-  
-  <string name="actfm_logged_in_different_user_title">Logging in as different user</string>
-  <string name="actfm_logged_in_different_user_body">Would you like to delete existing phone tasks before syncing?</string>
-  <string name="actfm_logged_in_different_user_keep_data">Keep data</string>
-  <string name="actfm_logged_in_different_user_clear_data">Clear all data</string>
-  <string name="actfm_logged_in_different_user_processing">Processing existing data...</string>
-  
-  <string name="actfm_tag_not_authorized_title">Not authorized</string>
-  <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name?</string>
-  <string name="actfm_tag_not_authorized_new_list">Create new list</string>
-  <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
-  
-  <string name="actfm_sync_ongoing">Senkronizasyon devam ediyor...</string>
-  
-  <string name="EPr_reset_sync_state">Reset sync</string>
-  <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors</string>
-  <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue?</string>
-  
+<resources>
 
+    <!-- ================================================== general terms == -->
 
+    <!-- People Editing Activity -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
+    <string name="actfm_person_hint">Kişi veya Email</string>
+
+    <!-- task sharing dialog: shared with hint -->
+    <string name="actfm_person_or_tag_hint">Kişi ya da Paylaşılan Liste</string>
+
+    <!-- toast on transmit success -->
+
+    <!-- can\'t rename or delete shared tag message -->
+
+    <!-- warning before deleting a list you\'re the owner of -->
+    <string name="actfm_tag_operation_owner_delete">Bu paylaşılan listenin sahibisiniz. Bunu
+        silerseniz, tüm liste üyeleri için silinecek. Devam etmek istiyor musunuz?
+    </string>
+
+    <!-- slide 29a: menu item to take a picture -->
+    <string name="actfm_picture_camera">Resim Çek</string>
+
+    <!-- slide 29b: menu item to select from gallery -->
+    <string name="actfm_picture_gallery">Galeriden Seç</string>
+
+    <!-- menu item to clear picture selection -->
+    <string name="actfm_picture_clear">Resmi sil</string>
+
+    <!-- filter list activity: refresh tags -->
+
+    <!-- Title for prompt after sharing a task -->
+    <string name="actfm_view_task_title">Görevi görüntüle?</string>
+
+    <!-- Text for prompt after sharing a task -->
+    <string name="actfm_view_task_text">Görev gönderildi: %s! Şu anda kendi görevlerinizi
+        görüntülüyorsunuz. Bunu ve diğer atanmış olduğunuz görevleri görmek istiyor musunuz?
+    </string>
+
+    <!-- Ok button for task view prompt -->
+    <string name="actfm_view_task_ok">Atananları Göster</string>
+
+    <!-- Cancel button for task view prompt -->
+    <string name="actfm_view_task_cancel">Burada Kal</string>
+
+    <!-- slide 13a: Title for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_title">Paylaşılan Görevlerim</string>
+
+    <!-- Empty list for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_empty">Paylaşılmış görev yok</string>
+
+    <!-- =====================  Friendship connections -->
+
+    <string name="actfm_friendship_pending">%s kişisine arkadaşlık isteği gönderdiniz!</string>
+
+    <string name="actfm_friendship_blocked">%s engellendi.</string>
+
+    <string name="actfm_friendship_ignored">You\'ve ignored %s.</string>
+
+    <string name="actfm_friendship_friends">%s ile arkadaşsınız! Aşağıya onlar için görev ekleyin.
+    </string>
+
+    <string name="actfm_friendship_other_pending">%s sizinle arkadaş olmak istiyor!</string>
+
+    <string name="actfm_friendship_no_status">%s ile bağlanarak genel listenizdekileri
+        paylaşabilirsiniz.
+    </string>
+
+    <string name="actfm_friendship_connect">Arkadaş ekle</string>
+
+    <string name="actfm_friendship_accept">Kabul Et</string>
+
+    <!-- ================================================== TagViewActivity == -->
+
+    <!-- Tag View Activity: Add Comment hint -->
+    <string name="TVA_add_comment">Yorum Gir</string>
+
+    <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->
+
+    <!-- Tabs for Tag view -->
+    <string-array name="TVA_tabs">
+        <!-- Tab for showing tasks -->
+        <item>Görevler</item>
+        <!-- Tab for showing comments & updates -->
+        <item>Etkinlik</item>
+        <!-- Tab for showing setting -->
+        <item>Liste Ayarları</item>
+    </string-array>
+
+    <!-- Tag View: filtered by assigned to user (%s => user name) -->
+    <string name="actfm_TVA_filtered_by_assign">%s\'e ait görevler. Hepsi için dokunun.</string>
+
+    <!-- Tag View: filter by unassigned tasks -->
+    <string name="actfm_TVA_filter_by_unassigned">Atanmamış görevler. Tümü için dokunun.</string>
+
+    <!-- Tag View: list is private, no members -->
+    <string name="actfm_TVA_no_members_alert">Özel: Paylaşmak veya düzenlemek için dokunun</string>
+
+    <!-- Tag View Menu: refresh -->
+    <string name="actfm_TVA_menu_refresh">Yenile</string>
+
+    <!-- Tag Settings: tag name label -->
+    <string name="actfm_TVA_tag_label">Liste İsmi:</string>
+
+    <!-- Tag Settings: tag owner label -->
+
+    <!-- Tag Settings: tag owner value when there is no owner -->
+
+    <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
+    <string name="actfm_TVA_members_label">Paylaşılanlar:</string>
+
+    <!-- Tag Settings: list collaborators hint -->
+    <string name="actfm_TVA_members_hint">E-posta adresi olan herhangi biri ile paylaş</string>
+
+    <!-- Tag Settings: tag picture -->
+    <string name="actfm_TVA_tag_picture">Liste Resmi</string>
+
+    <!-- slide 25c/28b: Tag Settings: silence notifications label -->
+    <string name="actfm_TVA_silence_label">Uyarıları Sessizleştir</string>
+
+    <!-- Tag Settings: list icon label -->
+
+    <!-- slide 25b/27d: Tag Settings: list description label -->
+    <string name="actfm_TVA_tag_description_label">Açıklama</string>
+
+    <!-- slide 28a: Tag Settings: list settings label -->
+    <string name="actfm_TVA_tag_settings_label">Ayarlar</string>
+
+    <!-- slide 25b: Tag Settings: list description hint -->
+    <string name="actfm_TVA_tag_description_hint">Bir açıklama yazın</string>
+
+    <!-- slide 25d: Tag Settings: list name hint -->
+    <string name="actfm_TVA_tag_name_hint">Liste adı girin</string>
+
+    <!-- Tag settings: login prompt from share-->
+    <string name="actfm_TVA_login_to_share">Liste paylaşmak için Astrid.com\'da oturum açmış
+        olmalısınız! Lütfen oturum açın ya da bunu özel bir liste yapın.
+    </string>
+
+
+    <!-- ============================================ edit people dialog == -->
+
+    <!-- task sharing dialog: intro -->
+    <string name="actfm_EPA_intro">Alışveriş listelerinizi, parti planlarınızı ya da ekip
+        projelerinizi paylaşmak için Astrid \'i kullanın ve kimlerin işleri tamamladığını anında
+        görün!
+    </string>
+
+    <!-- task sharing dialog: window title -->
+
+    <!-- task sharing dialog: save button -->
+
+    <!-- task sharing dialog: assigned label -->
+
+    <!-- slide 18a: task sharing dialog: assigned label long version -->
+    <string name="actfm_EPA_assign_label_long">Bunu kim yapmalı?</string>
+
+    <!-- task sharing dialog: assigned to me -->
+    <string name="actfm_EPA_assign_me">Ben</string>
+
+    <!-- task sharing dialog: anyone -->
+    <string name="actfm_EPA_unassigned">Herhangi biri</string>
+
+    <!-- slide 18c: task sharing dialog: choose a contact -->
+    <string name="actfm_EPA_choose_contact">Bir kişi seç</string>
+
+    <!-- task sharing dialog: custom email assignment -->
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_share_with">Şununla paylaş:</string>
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_collaborators_header">Share</string>
+
+    <!-- task sharing dialog: collaborator list name (%s => name of list) -->
+    <string name="actfm_EPA_list">Liste: %s</string>
+
+    <!-- task sharing dialog: assigned hint -->
+
+    <!-- task sharing dialog: message label text -->
+    <string name="actfm_EPA_message_text">Davet İletisi:</string>
+
+    <!-- task sharing dialog: message body -->
+    <string name="actfm_EPA_message_body">Bunu bitirmeme yardım et!</string>
+
+    <!-- task sharing dialog: list members section header -->
+    <string name="actfm_EPA_assign_header_members">Liste Üyeleri</string>
+
+    <!-- task sharing dialog: astrid friends section header -->
+    <string name="actfm_EPA_assign_header_friends">Astrid Arkadaşları</string>
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: share with Facebook -->
+    <string name="actfm_EPA_facebook">Facebook</string>
+
+    <!-- task sharing dialog: share with Twitter -->
+    <string name="actfm_EPA_twitter">Twitter</string>
+
+    <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
+
+    <!-- task sharing dialog: edit people settings saved -->
+
+    <!-- task sharing dialog: invalid email (%s => email) -->
+    <string name="actfm_EPA_invalid_email">Geçersiz Mail: %s</string>
+
+    <!-- task sharing dialog: tag not found (%s => tag) -->
+
+    <!-- task sharing login prompt -->
+    <string name="actfm_EPA_login_to_share">Görev paylaşabilmek için Astrid.com\'a kayıtlı
+        olmalısınız!
+    </string>
+
+    <string name="actfm_EPA_login_button">Giriş yap</string>
+
+    <string name="actfm_EPA_dont_share_button">Paylaşma</string>
+
+    <string name="actfm_EPA_add_person_to_list_title">Görev atandı</string>
+
+    <string name="actfm_EPA_add_person_to_list">%1$s bu listede paylaşılmadı. %2$s bu listeye
+        eklensin mi?
+    </string>
+
+    <string name="actfm_EPA_add_person_to_list_ok">Listeye ekle</string>
+
+    <string name="actfm_EPA_add_person_to_list_cancel">Ekleme</string>
+
+    <string name="actfm_list_owner">(owner)</string>
+
+    <!-- ========================================= sharing login activity == -->
+
+    <!-- share login: Title -->
+    <string name="actfm_ALA_title">Astrid.com \'a Hoşgeldiniz!</string>
+
+    <!-- share login: Sharing Description -->
+    <string name="actfm_ALA_body">Astrid.com, görevlerinize çevrimiçi ulaşmanızı, paylaşmanızı ve
+        diğerleriyle görev paylaşımı yapmanızı sağlar.
+    </string>
+
+    <!-- share login: Sharing Login FB Prompt -->
+    <string name="actfm_ALA_fb_login">Facebook ile bağlan</string>
+
+    <!-- share login: Sharing Login GG Prompt -->
+    <string name="actfm_ALA_gg_login">Google ile bağlan</string>
+
+    <!-- share login: Quickly log in as <%s -> email> -->
+    <string name="actfm_quick_login">Sign in: %s</string>
+
+    <!-- share login: Reject quick login -->
+    <string name="actfm_quick_login_reject">Not %s?</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_firstname_label">Ad</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_lastname_label">Soyad</string>
+
+    <!-- share login: Email -->
+    <string name="actfm_ALA_email_label">E-Posta</string>
+
+    <!-- share login: Username / Email -->
+
+    <!-- share login: Password -->
+    <string name="actfm_ALA_password_label">Parola</string>
+
+    <!-- share login: Sign Up Title -->
+    <string name="actfm_ALA_signup_title">Üye Ol</string>
+
+    <!-- share login: Login Title -->
+    <string name="actfm_ALA_login_title">Oturum Aç</string>
+
+    <!-- share login: Google Auth title -->
+    <string name="actfm_GAA_title">Kullanmak istediğiniz Google hesabını seçin:</string>
+
+    <!-- share login: OAUTH Login Prompt -->
+    <string name="actfm_OLA_prompt">Lütfen oturum açın:</string>
+
+    <!-- Login error: user exists -->
+    <string name="actfm_ALA_error_user_exists">Kullanıcı zaten mevcut. Bunun yerine lütfen giriş
+        yapın.
+    </string>
+
+    <!-- Login error: wrong password -->
+    <string name="actfm_ALA_error_wrong_password">Özür dileriz, bu şifre geçersiz. Lütfen tekrar
+        deneyin.
+    </string>
+
+    <!-- Forgot password link -->
+    <string name="actfm_ALA_forgot_password">Şifrenizi mi unuttunuz?</string>
+
+    <!-- Forgot password email prompt -->
+    <string name="actfm_ALA_enter_email">Lütfen e-posta adresinizi giriniz</string>
+
+    <!-- Password reset sent (%s -> email) -->
+    <string name="actfm_ALA_reset_sent">Şifre sıfırlayacı %s\'a gönderildi</string>
+
+    <!-- User already exists - first sync may be slow -->
+    <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your
+        patience!
+    </string>
+
+    <!-- User not found -->
+    <string name="actfm_ALA_error_user_not_found">Belirtilen e-posta adresine uyan kullanıcı
+        bulunamadı. Üye olmayı deneyin!
+    </string>
+
+    <!-- ================================================ Featured Lists -->
+
+    <string name="actfm_feat_list_clone">Listeyi kopyala</string>
+
+    <string name="actfm_feat_list_suffix">(Kopyala)</string>
+
+    <string name="actfm_feat_list_cloning">Kopyalanıyor...</string>
+
+    <string name="actfm_feat_list_clone_success">Başarılı!</string>
+
+    <string name="actfm_feat_list_task_clone_success">Görev kopyalandı</string>
+
+    <string name="actfm_feat_list_clone_empty">Kopyalanmış görev bulunmuyor</string>
+
+    <!-- ================================================ Synchronization == -->
+
+    <!-- Indicates the logged in user name. %s -> user\'s name -->
+    <string name="actfm_status_title_logged_in">Durum - Oturum açıldı: %s</string>
+
+    <!-- Preferences Title: Act.fm -->
+    <string name="actfm_APr_header">Astrid.com</string>
+
+    <string name="actfm_https_title">HTTPS kullan</string>
+    <string name="actfm_https_enabled">HTTPS etkin (yavaş)</string>
+    <string name="actfm_https_disabled">HTTPS etkin değil (hızlı)</string>
+
+    <!-- title for notification tray after synchronizing -->
+
+    <!-- text for notification when comments are received -->
+
+    <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid
+        duplicate tasks and other synchronization issues,
+        Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You
+        can still import tasks from Google Tasks from the Google Tasks settings page,
+        or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.
+        Are you sure you want to sync with Astrid.com?
+    </string>
+
+    <!-- account types -->
+    <string name="actfm_account_type">Hesap Türü</string>
+    <string name="actfm_account_info">Hesap Bilgisi</string>
+    <string name="actfm_account_info_summary">Durum ve seçenekler</string>
+    <string name="account_type_title_not_logged_in">Ücretsiz bir hesap için üye ol</string>
+    <string name="account_type_summary_not_logged_in">Görevlerine çevrimiçi ulaş, listelerini paylaş
+        ve atama yap
+    </string>
+
+
+    <string name="actfm_account_premium">Premium</string>
+    <string name="actfm_account_basic">Temel</string>
+
+    <string name="actfm_inapp_billing">Premium\'a Yükselt</string>
+    <string name="actfm_inapp_billing_summary">Dosya ekle, ses yedekleri, premium destek ve
+        fazlası
+    </string>
+
+    <!-- Sharing -->
+    <string name="share_with_facebook">Facebook\'ta Beğen</string>
+    <string name="share_with_twitter">Twitter ile takip et</string>
+    <string name="share_with_google">Google+ ile paylaş</string>
+    <string name="share_speech_bubble">Paylaşım ile, diğerlerinin daha verimli olmasını
+        sağlarsınız!
+    </string>
+
+
+    <!-- Sync upgrade messages -->
+    <string name="sync_upgr_both_title">Using Astrid.com + Google without Duplicates</string>
+    <string name="sync_upgr_both_body">Let\'s be honest. Google Tasks is convenient but not as cool
+        as Astrid. To avoid duplicates you can no longer sync with Astrid.com and background sync
+        with Google Tasks at the same time. You can still import your Google Tasks by visiting
+        Settings → Backup &amp; Sync, or downgrade to Google Tasks only sync
+    </string>
+    <string name="sync_upgr_both_btn1">Stick with Astrid</string>
+    <string name="sync_upgr_both_btn2">Downgrade to Google Tasks</string>
+
+    <string name="sync_upgr_gtasks_only_title">Upgrade to Astrid Sync for Free!</string>
+    <string name="sync_upgr_gtasks_only_body">Access your tasks from all your devices and from Gmail
+        with Astrid.com sync. Upgrade to Astrid.com Sync (you can always go back to Google Tasks -
+        but you won\'t want to)!
+    </string>
+    <string name="sync_upgr_gtasks_only_btn1">Upgrade to Astrid Sync</string>
+    <string name="sync_upgr_gtasks_only_btn2">Stick with Google Tasks</string>
+
+    <string name="sync_upgr_neither_title">Free backup &amp; Sync!</string>
+    <string name="sync_upgr_neither_body">Don\'t put your to-dos at risk! New and improved Astrid
+        sync to keep and access your tasks from anywhere.
+    </string>
+    <string name="sync_upgr_neither_btn1">Sign up now</string>
+
+    <string name="sync_upgr_logged_out">You have been logged out of Astrid</string>
+
+    <string name="actfm_logout_clear_tasks_title">Clear data?</string>
+    <string name="actfm_logout_clear_tasks_body">Would you like to clear your tasks and lists?
+    </string>
+    <string name="actfm_logout_clear_tasks_yes">Clear data</string>
+    <string name="actfm_logout_clear_tasks_no">Keep data</string>
+
+    <string name="actfm_logged_in_different_user_title">Logging in as different user</string>
+    <string name="actfm_logged_in_different_user_body">Would you like to delete existing phone tasks
+        before syncing?
+    </string>
+    <string name="actfm_logged_in_different_user_keep_data">Keep data</string>
+    <string name="actfm_logged_in_different_user_clear_data">Clear all data</string>
+    <string name="actfm_logged_in_different_user_processing">Processing existing data...</string>
+
+    <string name="actfm_tag_not_authorized_title">Not authorized</string>
+    <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you
+        may have been removed). Would you like to create a new list with the same name?
+    </string>
+    <string name="actfm_tag_not_authorized_new_list">Create new list</string>
+    <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
+
+    <string name="actfm_sync_ongoing">Senkronizasyon devam ediyor...</string>
+
+    <string name="EPr_reset_sync_state">Reset sync</string>
+    <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors
+    </string>
+    <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will
+        be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you
+        wish to continue?
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in timers plug-in -->
+
+    <!-- Task Edit Activity: Container Label -->
+    <string name="alarm_ACS_label">Alarmlar</string>
+
+    <!-- Task Edit Activity: Add New Alarm -->
+    <string name="alarm_ACS_button">Alarm Ekle</string>
+
+    <string-array name="reminders_alarm">
+        <!-- reminders related to alarm -->
+        <item>Alarm!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in backup plug-in -->
+
+    <!-- ================================================= BackupPreferences == -->
+
+    <!-- slide 33c/48d: Backup Preferences Title -->
+    <string name="backup_BPr_header">Yedekler</string>
+
+    <!-- slide 48e/50c: Backup: Status Header -->
+    <string name="backup_BPr_group_status">Durum</string>
+
+    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->
+    <string name="backup_status_success">Son yedek:\n%s</string>
+    <!-- Backup Status: last error failed. Keep it short! -->
+    <string name="backup_status_failed">Son Yedekleme Başarısız</string>
+    <!-- Backup Status: error subtitle -->
+    <string name="backup_status_failed_subtitle">(hatayı görmek için dokunun)</string>
+    <!-- slide 48a: Backup Status: never backed up -->
+    <string name="backup_status_never">Hiç Yedeklenmemiş!</string>
+
+    <!-- slide 48f/ 50e: Backup Options Group Label -->
+    <string name="backup_BPr_group_options">Ayarlar</string>
+
+    <!-- slide 48b: Preference: Automatic Backup Title -->
+    <string name="backup_BPr_auto_title">Kendiliğinden Yedeklemeler</string>
+    <!-- Preference: Automatic Backup Description (when disabled) -->
+    <string name="backup_BPr_auto_disabled">Kendiliğinden Yedekleme Etkisiz</string>
+    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
+    <string name="backup_BPr_auto_enabled">Günlük yedekleme yapılacak</string>
+
+    <!-- Preference screen restoring Tasks Help -->
+    <!-- Preference screen Restoring Tasks Help Dialog Text-->
+
+    <string name="backup_BPr_cloud_already_logged_in">Astrid.com üzerinde zaten bulut yedeklemeniz
+        mevcut!
+    </string>
+
+    <!-- ================================================= BackupActivity == -->
+
+    <!-- slide 48c: backup activity label -->
+    <string name="backup_BAc_label">Yedekleri Yönet</string>
+
+    <!-- backup activity title -->
+    <string name="backup_BAc_title">Yedeklerinizi Yönetin</string>
+
+    <!-- backup activity import button -->
+    <string name="backup_BAc_import">Görevleri İçe Aktar</string>
+
+    <!-- backup activity export button -->
+    <string name="backup_BAc_export">Görevleri Dışa Aktar</string>
+
+    <!-- backup activity cloud (Astrid.com) option -->
+    <string name="backup_BAc_cloud">Astrid.com üzerinde ücretsiz bulut yedeklemenizi yapmak için
+        tıklayın
+    </string>
+
+    <!-- ============================================== Importer / Exporter == -->
+
+    <!-- Message displayed when error occurs -->
+    <string name="backup_TXI_error">İçe Aktarma Hatası</string>
+
+    <string name="export_toast">%1$s şuraya yedeklendi: %2$s.</string>
+
+    <string name="export_toast_no_tasks">Dışa Aktarılacak Görev Yok.</string>
+
+    <!-- Progress Dialog Title for exporting -->
+    <string name="export_progress_title">Dışa Aktarılıyor...</string>
+
+    <!-- Backup: Title of Import Summary Dialog -->
+    <string name="import_summary_title">Geri Alma Özeti</string>
+
+    <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
+    <string name="import_summary_message">%1$s dosyası %2$s dosyasını kapsadı.\n\n %3$s içeri
+        aktarıldı, \n %4$s zaten mevcut\n %5$s hatalar mevcut\n
+    </string>
+
+    <!-- Progress Dialog Title for importing -->
+    <string name="import_progress_title">İçe Aktarılıyor...</string>
+
+    <!-- Progress Dialog text for import reading task (%d -> task number)-->
+    <string name="import_progress_read">%d görev okunuyor..</string>
+
+    <!-- Backup: Dialog when unable to open a file -->
+
+    <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
+    <string name="DLG_error_sdcard">%s dizinine erişilemedi.</string>
+
+    <!-- Backup: Dialog when unable to open SD card in general -->
+    <string name="DLG_error_sdcard_general">Hafıza kartına erişemiyorum!</string>
+
+    <!-- Backup: File Selector dialog for import -->
+    <string name="import_file_prompt">Geri Alınacak Bir Dosya Seçin</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- ================================================== AndroidManifest == -->
+
+    <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
+    <string name="app_name">Astrid Görevleri</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="read_permission_label">Astrid İzni</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="read_permission_desc">görevlere gözat, görev süzgeçlerini görüntüle</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="write_permission_label">Astrid İzni</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="write_permission_desc">yeni görevler oluştur, mevcut görevleri düzenle</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- question for deleting tasks -->
+    <string name="DLG_delete_this_task_question">Bu görev silinsin mi?</string>
+
+    <!-- question for deleting items (%s => item name) -->
+    <string name="DLG_delete_this_item_question">Öğe silinsin mi: %s?</string>
+
+    <!-- Progress dialog shown when upgrading -->
+    <string name="DLG_upgrading">Görevleriniz güncelleniyor...</string>
+
+    <!-- Title for dialog selecting a time (hours and minutes) -->
+    <string name="DLG_hour_minutes">Zaman (saat : dakika)</string>
+
+    <!-- Dialog for Astrid having a critical update -->
+    <string name="DLG_please_update">Astrid Google Play\'deki en son sürüme yükseltilmelidir! Lütfen
+        devam etmeden bunu yapın ya da bir kaç saniye bekleyin.
+    </string>
+
+    <!-- Button for going to Market -->
+
+    <!-- Button for accepting EULA -->
+    <string name="DLG_accept">Kabul Et</string>
+
+    <!-- Button for declining EULA -->
+    <string name="DLG_decline">Reddet</string>
+
+    <!-- EULA title -->
+    <string name="DLG_eula_title">Astrid Kullanım Koşulları</string>
+
+    <!-- Progress Dialog generic text -->
+    <string name="DLG_please_wait">Lütfen Bekleyin</string>
+
+    <!-- Dialog - loading -->
+    <string name="DLG_loading">Yükleniyor...</string>
+
+    <!-- Dialog - dismiss -->
+
+    <!-- slide 20d -->
+    <string name="DLG_ok">Tamam</string>
+    <!-- slide 36g -->
+    <string name="DLG_cancel">Vazgeç</string>
+
+    <string name="DLG_more">Daha Fazla</string>
+
+    <string name="DLG_undo">Geri al</string>
+
+    <string name="DLG_warning">Uyarı</string>
+
+    <!-- =============================================================== UI == -->
+
+    <!-- Label for DateButtons with no value -->
+    <string name="WID_dateButtonUnset">Ayar İçin Dokun</string>
+
+    <!-- String formatter for DateButtons ($D => date, $T => time) -->
+
+    <!-- String formatter for Disable button -->
+
+    <!--  ============================================================= notes -->
+
+    <!-- Note Exposer -->
+
+    <!-- Note Exposer / Comments -->
+
+    <!-- EditNoteActivity - no comments -->
+    <string name="ENA_no_comments">Gösterecek öğe yok</string>
+
+    <!-- EditNoteActivity - no username for comment -->
+    <string name="ENA_no_user">Herhangi biri</string>
+
+    <!-- EditNoteActivity - refresh comments -->
+    <string name="ENA_refresh_comments">Yorumları Yenile</string>
+
+    <!-- ================================================= TaskListActivity == -->
+
+    <!-- slide 8b: Task List: Displayed instead of list when no items present -->
+    <string name="TLA_no_items">Hiç göreviniz yok! \n Bir şeyler eklemek nasıl olur?</string>
+
+    <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
+    <string name="TLA_no_items_person">%s kişisi sizinle\ngörev paylaşmıyor</string>
+
+    <!-- Menu: Adjust Sort and Hidden Task Settings -->
+    <string name="TLA_menu_sort">Sort</string>
+
+    <!-- Menu: Sync Now -->
+    <string name="TLA_menu_sync">Şimdi Eşle</string>
+
+    <!-- Menu: Search -->
+    <string name="TLA_menu_search">Ara</string>
+
+    <!-- Menu: Tasks -->
+    <string name="TLA_menu_lists">Listeler</string>
+
+    <!-- Menu: Friends -->
+    <string name="TLA_menu_friends">Kişiler</string>
+
+    <!-- Menu: Featured Lists -->
+    <string name="TLA_menu_featured_lists">Öne Çıkan Listeler</string>
+
+    <!-- Menu: Suggestions -->
+    <string name="TLA_menu_suggestions">Öneriler</string>
+
+    <!-- Menu: Tutorial -->
+
+    <!-- Menu: Settings -->
+    <string name="TLA_menu_settings">Ayarlar</string>
+
+    <!-- slide 30b: Menu: Support -->
+    <string name="TLA_menu_support">Destek</string>
+
+    <!-- Search Label-->
+
+    <!-- Window title for displaying Custom Filter -->
+    <string name="TLA_custom">Özel</string>
+
+    <!-- slide 8d: Quick Add Edit Box Hint-->
+    <string name="TLA_quick_add_hint">Görev ekle</string>
+
+    <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
+    <string name="TLA_quick_add_hint_assign">%s için bir şey ekle</string>
+
+    <!-- Notification Volumne notification-->
+    <string name="TLA_notification_volume_low">Uyarılar susturuldu. Astrid \'i duyamayacaksın!
+    </string>
+
+    <!-- Notifications disabled warning -->
+    <string name="TLA_notification_disabled">Astrid hatırlatıcıları devre dışı. Hatırlatma
+        almayacaksınız.
+    </string>
+
+    <string-array name="TLA_filters">
+        <item>Etkin</item>
+        <item>Bugün</item>
+        <item>Yakında</item>
+        <item>Daha sonra</item>
+        <item>Yapıldı</item>
+        <item>Gizli</item>
+    </string-array>
+
+    <!-- Title for confirmation dialog after quick add markup -->
+    <string name="TLA_quickadd_confirm_title">Dediniz ki, \"%s\"</string>
+
+    <!-- Text for speech bubble in dialog after quick add markup -->
+    <!-- First string is task title, second is due date, third is priority -->
+    <string name="TLA_quickadd_confirm_speech_bubble">Bir görev oluşturdum; \"%1$s\" tarih; %2$s
+        öncelik; %3$s
+    </string>
+
+    <string name="TLA_quickadd_confirm_speech_bubble_date">%s için</string>
+
+    <string name="TLA_quickadd_confirm_hide_helpers">İleriki doğrulamaları gösterme</string>
+
+
+    <!-- Title for alert on new repeating task. %s-> task title -->
+    <string name="TLA_repeat_scheduled_title">Yinelenen görev: %s</string>
+
+    <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
+    <string name="TLA_repeat_scheduled_speech_bubble">Bunu şu sıklıkta sana hatırlatacağım: %s.
+    </string>
+
+    <string-array name="TLA_priority_strings">
+        <item>en yüksek öncelik</item>
+        <item>yüksek öncelik</item>
+        <item>orta öncelik</item>
+        <item>düşük öncelik</item>
+    </string-array>
+    <!-- slide 22a -->
+    <string name="TLA_all_activity">Tüm Etkinlik</string>
+
+    <!-- ====================================================== TaskAdapter == -->
+
+    <!-- Format string to indicate task is hidden (%s => task name) -->
+    <string name="TAd_hiddenFormat">%s [gizli]</string>
+
+    <!-- Format string to indicate task is deleted (%s => task name) -->
+    <string name="TAd_deletedFormat">%s [silinmiş]</string>
+
+    <!-- Displayed when adapter is flung (scrolled quickly) -->
+
+    <!-- slide 22b: indicates task was completed. %s => date or time ago -->
+    <string name="TAd_completed">Bitti\n%s</string>
+
+    <!-- slide 15a: Action Button: edit task -->
+    <string name="TAd_actionEditTask">Düzenle</string>
+
+    <!-- Context Item: edit task -->
+    <string name="TAd_contextEditTask">Görevi Düzenle</string>
+
+    <!-- Context Item: copy task -->
+    <string name="TAd_contextCopyTask">Görevi Kopyala</string>
+
+    <!-- Context Item: delete task -->
+    <string name="TAd_contextDeleteTask">Görevi Sil</string>
+
+    <!-- Context Item: undelete task -->
+    <string name="TAd_contextUndeleteTask">Görevi Kurtar</string>
+
+    <!-- Context Item: purge task -->
+    <string name="TAd_contextPurgeTask">Görevi Temizle</string>
+
+    <!-- ============================================== SortSelectionDialog == -->
+
+    <!-- slide 23a: Sort Selection: dialog title -->
+    <string name="SSD_title">Sınıflama, Altgörevler ve Gizli</string>
+
+    <!-- slide 23h:  Hidden: title -->
+    <string name="SSD_hidden_title">Gizli Görevler</string>
+
+    <!-- Hidden Task Selection: show completed tasks -->
+    <string name="SSD_completed">Tamamlanan Görevleri Göster</string>
+
+    <!-- Hidden Task Selection: show hidden tasks -->
+    <string name="SSD_hidden">Gizli Görevleri Göster</string>
+
+    <!-- Hidden Task Selection: show deleted tasks -->
+    <string name="SSD_deleted">Silinmiş Görevleri Göster</string>
+
+    <!-- Sort Selection: drag with subtasks -->
+    <string name="SSD_sort_drag">Manual order with subtasks</string>
+
+    <!-- slide 23b: Sort Selection: smart sort -->
+    <string name="SSD_sort_auto">Astrid Akıllı Sıralama</string>
+
+    <!-- slide 23e: Sort Selection: sort by alpha -->
+    <string name="SSD_sort_alpha">Başlığa göre</string>
+
+    <!-- slide 23c: Sort Selection: sort by due date -->
+    <string name="SSD_sort_due">Bitiş Tarihine Göre</string>
+
+    <!-- slide 23d: Sort Selection: sort by importance -->
+    <string name="SSD_sort_importance">By priority</string>
+
+    <!-- slide 23f: Sort Selection: sort by modified date -->
+    <string name="SSD_sort_modified">Son Değiştirme Tarihine Göre</string>
+
+    <!-- slide 23g: Sort Selection: reverse -->
+    <string name="SSD_sort_reverse">Sıralamayı Tersine Çevir</string>
+
+    <!-- slide 23j: Sort Button: sort temporarily -->
+    <string name="SSD_save_temp">Bir Kereye Mahsus</string>
+
+    <!-- slide 23i: Sort Button: sort permanently -->
+    <string name="SSD_save_always">Her zaman</string>
+
+    <!-- =============================================== FilterListActivity == -->
+
+    <!-- Astrid Filter Shortcut -->
+    <string name="FSA_label">Astrid Listesi ya da Süzgeci</string>
+
+    <!-- Filter List Activity Title -->
+
+    <!-- Displayed when loading filters -->
+
+    <!-- Context Menu: Create Shortcut -->
+    <string name="FLA_context_shortcut">Masaüstünde Kısayol Oluştur</string>
+
+    <!-- Menu: Search -->
+
+    <!-- Menu: Help -->
+
+    <!-- slide 28c: Create Shortcut Dialog Title -->
+    <string name="FLA_shortcut_dialog_title">Kısayol Oluştur</string>
+
+    <!-- Create Shortcut Dialog (asks to name shortcut) -->
+    <string name="FLA_shortcut_dialog">Kısayol adı:</string>
+
+    <!-- Search Hint-->
+    <string name="FLA_search_hint">Görevleri ara</string>
+
+    <!-- Search Filter name (%s => query) -->
+    <string name="FLA_search_filter">\'%s\' ile eşleşenler</string>
+
+    <!-- Toast: created shortcut (%s => label) -->
+    <string name="FLA_toast_onCreateShortcut">Oluşturulan Kısayol: %s</string>
+
+    <!-- Menu: new filter -->
+    <string name="FLA_new_filter">Yeni Filtre</string>
+
+    <!-- slide 10e: Button: new list -->
+    <string name="FLA_new_list">Yeni Liste</string>
+
+    <!-- Alert when creating a shortcut without selecting a filter -->
+    <string name="FLA_no_filter_selected">Süzgeç seçilmemiş! Lütfen bir süzgeç ya da liste seçin.
+    </string>
+
+    <!-- ================================================= TaskEditActivity == -->
+
+    <!-- Title when editing a task (%s => task title) -->
+
+    <!-- Title when creating a new task -->
+
+    <!-- Task title label -->
+
+    <!-- Task when label -->
+    <string name="TEA_when_header_label">Ne Zaman</string>
+
+    <!-- Task title hint (displayed when edit box is empty) -->
+    <string name="TEA_title_hint">Task name</string>
+
+    <!-- Task importance label -->
+    <string name="TEA_importance_label">Priority</string>
+
+    <!-- Task due date hint -->
+    <string name="TEA_deadline_hint">Set due date</string>
+
+    <!-- Task assigned to string (%s -> assigned person name) -->
+    <string name="TEA_assigned_to">Assigned to %s</string>
+
+    <!-- Task urgency specific time checkbox -->
+    <string name="TEA_urgency_specific_time">Belirli bir zamanda?</string>
+
+    <!-- Task urgency specific time title when specific time false -->
+    <string name="TEA_urgency_none">Hiçbiri</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_label">Hide until</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_display">Hide until %s</string>
+
+    <!-- Task hide until toast -->
+    <string name="TEA_hideUntil_message">Görev %s\'e kadar gizli kalacak</string>
+
+    <!-- Task editing data being loaded label -->
+    <string-array name="TEA_loading">
+        <item>Yükleniyor...</item>
+    </string-array>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_note_label">Açıklama</string>
+
+    <!-- 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">Ne kadar sürecek?</string>
+
+    <!-- Elapsed time label -->
+    <string name="TEA_elapsedDuration_label">Görev üzerinde çalışılan zaman</string>
+
+    <!-- Menu: Save -->
+    <string name="TEA_menu_save">Değişiklikleri Kaydet</string>
+
+    <!-- Menu: Don\'t Save -->
+    <string name="TEA_menu_discard">Kaydetme</string>
+
+    <!-- Menu: Delete Task -->
+    <string name="TEA_menu_delete">Görevi Sil</string>
+
+    <!-- Menu: Task comments -->
+    <string name="TEA_menu_refresh_comments">Refresh comments</string>
+
+    <string name="TEA_menu_comments">Yorumlar</string>
+
+    <!-- Toast: task saved with deadline (%s => preposition + time units) -->
+    <string name="TEA_onTaskSave_due">Görev Kaydedildi: tarihi %s</string>
+
+    <!-- Toast: task saved without deadlines -->
+    <string name="TEA_onTaskSave_notDue">Görev kaydedildi</string>
+
+    <!-- Toast: task was not saved -->
+
+    <!-- Toast: task was deleted -->
+
+    <!-- slide 15b: Task edit tab: activity -->
+    <string name="TEA_tab_activity">Etkinlik</string>
+
+    <!-- slide 15e:  Task edit tab: more editing settings -->
+    <string name="TEA_tab_more">Ayrıntılar</string>
+
+    <!-- slide 15d: Task edit tab: web services -->
+    <string name="TEA_tab_web">Fikirler</string>
+
+    <string name="TEA_timer_est">Est. %s</string>
+
+    <string name="TEA_timer_elap">Elapsed %s</string>
+
+    <string-array name="TEA_urgency">
+        <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
+        <item>No date</item>
+        <item>Belirli gün</item>
+        <item>Bugün</item>
+        <item>Yarın</item>
+        <item>(ertesi gün)</item>
+        <item>Gelecek hafta</item>
+        <item>İki hafta içinde</item>
+        <item>Gelecek ay</item>
+    </string-array>
+
+    <string name="TEA_no_time">Zaman yok</string>
+
+    <string-array name="TEA_hideUntil">
+        <!-- hideUntil: labels for edit page. -->
+        <item>Never</item>
+        <item>Due date</item>
+        <item>Due time</item>
+        <item>Day before due</item>
+        <item>Week before due</item>
+        <item>Belirli Gün/Zamanda</item>
+    </string-array>
+
+    <!-- Task edit control set descriptors -->
+
+    <!-- slide 9b/35i -->
+    <string name="TEA_control_who">Kim</string>
+
+    <!-- slide 9c/ 35a -->
+    <string name="TEA_control_when">Ne Zaman</string>
+    <!-- slide 35b -->
+    <string name="TEA_control_more_section">----Daha fazla----</string>
+    <!-- slide 16a/35c -->
+    <string name="TEA_control_importance">Priority</string>
+    <!-- slide 16b/35d -->
+    <string name="TEA_control_lists">Listeler</string>
+    <!-- slide 16c/35e -->
+    <string name="TEA_control_notes">Açıklama</string>
+
+    <string name="TEA_control_files">Dosyalar</string>
+
+    <!-- slide 16e / slide 35g-->
+    <string name="TEA_control_reminders">Hatırlatmalar</string>
+
+    <!-- slide 16f -->
+    <string name="TEA_control_timer">Geri Sayım Denetimleri</string>
+
+    <string name="TEA_control_hidden_section">----Her Zaman Gizle----</string>
+
+    <string name="hide_until_prompt">Listemde göster</string>
+
+    <!-- Add Ons tab when no add-ons found -->
+
+    <!-- Add Ons button -->
+
+    <!-- More row -->
+
+    <!-- slide 15c: Text when no activity to show -->
+    <string name="TEA_no_activity">Etkinlik yok</string>
+
+    <!-- Text to load more activity -->
+    <string name="TEA_load_more">Daha yükle...</string>
+
+    <!-- When controls dialog -->
+    <string name="TEA_when_dialog_title">Son zamanı nedir?</string>
+
+
+    <string name="TEA_new_task">Yeni Görev</string>
+
+    <string name="WSV_click_to_load">Bunu yapmanın yollarını bulmak için bana dokunun!</string>
+
+    <string name="WSV_not_online">İnternete bağlanırsam daha fazlasını yapabilirim. Lütfen
+        bağlantınızı denetleyin.
+    </string>
+
+    <string name="TEA_contact_error">Üzgünüz! Seçilmiş kişi için bir e-posta adresi bulunamadı.
+    </string>
+
+    <!-- ============================================= IntroductionActivity == -->
+
+    <!-- slide 1a: Introduction Window title -->
+
+    <!-- Button to agree to EULA -->
+
+    <!-- Button to disagree with EULA -->
+
+    <!-- ===================================================== MissedCallActivity == -->
+
+    <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
+    <string name="MCA_title">%1$s aradı\nzamanı: %2$s</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_return_call">Şimdi ara</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_add_task">Sonra ara</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_ignore">Yoksay</string>
+
+    <!-- Missed call: dialog to ignore all missed calls title -->
+    <string name="MCA_ignore_title">Tüm çağrıları yoksay?</string>
+
+    <!-- Missed call: dialog to ignore all missed calls body -->
+    <string name="MCA_ignore_body">Birkaç çağrıyı yoksaydınız. Astrid bunlar hakkında soru sormayı
+        kessin mi?
+    </string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore all button -->
+    <string name="MCA_ignore_all">Tüm çağrıları yoksay</string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
+    <string name="MCA_ignore_this">Yalnızca bu çağrıyı yoksay</string>
+
+    <!-- Missed call: preference title -->
+    <string name="MCA_missed_calls_pref_title">Cevapsız çağrı alanı</string>
+
+    <!-- slide 49c: Missed call: preference description -->
+    <string name="MCA_missed_calls_pref_desc_enabled">Astrid cevapsız çağrıları size bildirecek ve
+        geri aramanız için hatırlatacak
+    </string>
+    <string name="MCA_missed_calls_pref_desc_disabled">Astrid cevapsız çağrıları size
+        hatırlatmayacak
+    </string>
+
+    <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
+    <string name="MCA_task_title_name">%1$s kişisini geri ara: %2$s</string>
+
+    <!-- Missed call: task title no name (%s -> number)-->
+    <string name="MCA_task_title_no_name">%s kişisini geri ara</string>
+
+    <!-- Missed call: schedule dialog title (%s -> name or number)-->
+    <string name="MCA_schedule_dialog_title">%s kişisini geri ara..</string>
+
+    <!-- Missed call speech bubble options -->
+    <string-array name="MCA_dialog_speech_options">
+        <item>Aranan kişi olmak güzel bir şey!</item>
+        <item>İşte bu! İnsanlar seni seviyor!</item>
+        <item>Ara da sesini duyanların günü şenlensin!</item>
+        <item>İnsanlar seni geri aradığında mutlu olmaz mısın?</item>
+        <item>Yapabilirsin!</item>
+        <item>Her zaman bir ileti gönderebilirsin...</item>
+    </string-array>
+
+
+    <!-- ======================================= Calendar reminder activity == -->
+
+    <!-- Calendar remindeer ignore button -->
+    <string name="CRA_ignore">Yoksay</string>
+
+    <!-- Calendar event -->
+    <string name="CRA_title">Bir toplantı listesine mi ihtiyacınız var?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls title -->
+    <string name="CRA_ignore_title">Tüm takvim etkinlikleri yok sayılsın mı?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls body -->
+    <string name="CRA_ignore_body">Bir kaç tane takvim etkinliğini yok saydınız. Astrid\'in size
+        bunlar hakkında sormayı kesmesini ister misiniz?
+    </string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
+    <string name="CRA_ignore_all">Tüm etkinlikleri yoksay</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
+    <string name="CRA_ignore_this">Sadece bu etkinliği yok say</string>
+
+    <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
+    <string name="CRA_speech_bubble_start">%s çok yakında başlayacak gözüküyor. Bir liste hazırlamak
+        ister misiniz?
+    </string>
+
+    <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
+    <string name="CRA_speech_bubble_end">%s bitmiş gibi gözüküyor. Bir liste hazırlamak ister
+        misiniz?
+    </string>
+
+    <!-- Calendar reminder: create list button -->
+    <string name="CRA_create_list">Liste oluştur</string>
+
+    <!-- Calendar reminder: postpone button -->
+    <string name="CRA_postpone">Belki daha sonra</string>
+
+    <!-- Calendar reminder: list exists dialog title -->
+    <string name="CRA_list_exists_title">Liste zaten bulunuyor</string>
+
+    <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
+    <string name="CRA_list_exists_body">%s isimli bir liste bulunmakta. Var olan listeyi kullanmak
+        mı yoksa yeni bir liste yapmak mı istersiniz?
+    </string>
+
+    <!-- Calendar reminder: list exists dialog create new button -->
+    <string name="CRA_create_new">Yeni oluştur</string>
+
+    <!-- Calendar reminder: list exists dialog use existing button -->
+    <string name="CRA_use_existing">Var olanı kullan</string>
+
+    <!-- Calendar remindr: created list (%s -> list name) -->
+    <string name="CRA_created_list_dialog">%s isimli liste oluşturuldu.</string>
+
+    <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
+    <string name="CRA_one_attendee">%s katılıyor</string>
+
+    <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
+    <string name="CRA_two_attendees">%1$s ve %2$s katılıyorlar</string>
+
+    <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
+    <string name="CRA_many_attendees">%1$s, %2$s, ve %3$d diğerleri katılıyorlar.</string>
+
+    <!-- Calendar reminder: invitation prompt -->
+    <string name="CRA_invitation_prompt">Onları davet etmek ister misin?</string>
+
+    <!-- Calendar reminder: preference title -->
+    <string name="CRA_calendar_reminders_pref_title">Takvim asistanı</string>
+
+    <!-- Calendar reminder: pref description disabled -->
+    <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid, gelecek etkinlikleri
+        hatırlatmayacak.
+    </string>
+
+    <!-- Calendar reminder: pref description enabled -->
+    <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid gelecek takvim etkinliklerini
+        size hatırlatacak ve bu etkinliklere hazırlanmanız için size bilgilendirmede bulunacak.
+    </string>
+
+    <!-- Calendar reminder: share list title -->
+    <string name="CRA_share_list_title">Liste paylaşılsın mı?</string>
+
+    <string name="CRA_invite_attendees">Katılımcıları davet et</string>
+
+    <string name="CRA_more_options">Daha fazla seçenek</string>
+
+    <string name="CRA_dont_invite">Hayır teşekkürler</string>
+
+    <!-- Calendar reminder: share list title when no other attendees exist-->
+    <string name="CRA_list_created_title">Liste oluşturuldu!</string>
+
+    <!-- Calendar reminder: default new list name (%s -> event title) -->
+    <string name="CRA_default_list_name">Action Items: %s</string>
+
+    <!-- ===================================================== HelpActivity == -->
+
+    <!-- Help: Button to get support from our website -->
+
+    <!-- ==================================================== UpdateService == -->
+
+    <!-- Changelog Window Title -->
+    <string name="UpS_changelog_title">Astrid\'te Yenilikler Neler?</string>
+
+    <!-- Updates Window Title -->
+    <string name="UpS_updates_title">En Son Astrid Haberleri</string>
+
+    <!-- Updats No Activity to show for offline users -->
+    <string name="UpS_no_activity_log_in">Paylaşılan listelerdeki etkinlik\nilerlemenizin kaydını
+        görmek\niçin oturum açın.
+    </string>
+
+    <!-- ================================================== EditPreferences == -->
+
+    <!-- slide 31g: Preference Window Title -->
+    <string name="EPr_title">Astrid: Ayarlar</string>
+
+    <string name="EPr_share_astrid">Share Astrid</string>
+
+    <string name="EPr_share_astrid_summary">Beğendiğiniz sosyal ağınızda Astrid\'ten bahsedin
+    </string>
+
+    <!-- slide 46a -->
+    <string name="EPr_deactivated">devre dışı</string>
+
+    <!-- slide 30i: Preference Category: Appearance Title -->
+    <string name="EPr_appearance_header">Görünüm</string>
+
+    <!-- Preference Category: Appearance Summary -->
+    <string name="EPr_appearance_summary">Themes, widgets, task rows, edit screen</string>
+
+    <!-- FAQ Preference title -->
+    <string name="EPr_faq_title">S.S.S.</string>
+
+    <!-- Account status preference (%s -> account type) -->
+    <string name="EPr_account_title">Hesap: %s</string>
+
+    <!-- Support preferences summary -->
+    <string name="EPr_support_summary">Tutorial, FAQ, about</string>
+
+    <!-- slide 34a: Preference: Task List Font Size Title -->
+    <string name="EPr_fontSize_title">Görev Listesi Boyutu</string>
+
+    <!-- Preference: Filters to show pref screen title -->
+    <string name="EPr_filters_to_show_title">Filters to show</string>
+
+    <!-- slide 32a: Preference: Show confirmation for smart reminders -->
+    <string name="EPr_showSmartConfirmation_title">Akıllı hatırlatıcılar için doğrulamayı göster
+    </string>
+
+    <!-- slide 34g: Preference: Task List Font Size Description -->
+    <string name="EPr_fontSize_desc">Ana listedeki yazı boyutu</string>
+
+    <!-- Preferemce: Show task edit confirmation toasts -->
+
+    <!-- slide 34c: Preference: Task List Show Notes -->
+    <string name="EPr_showNotes_title">Show description in task</string>
+
+    <!-- Edit screen preference category -->
+    <string name="EPr_edit_screen_options">Edit screen options</string>
+
+    <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
+    <string name="EPr_beastMode_title">Edit screen order</string>
+
+    <string name="EPr_beastMode_shortcut">Customize</string>
+
+    <string name="EPr_time_increment">5 minute increments</string>
 
-    
-    <!-- Resources for built-in timers plug-in -->
-    
-    <!-- Task Edit Activity: Container Label -->
-    <string name="alarm_ACS_label">Alarmlar</string>
-    
-    <!-- Task Edit Activity: Add New Alarm -->
-    <string name="alarm_ACS_button">Alarm Ekle</string>
-    
-    <string-array name="reminders_alarm">
-      <!-- reminders related to alarm -->
-      <item>Alarm!</item>
+    <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
+
+    <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
+
+    <!-- slide 35h -->
+    <string name="EPr_beastMode_desc">Görev Düzenleme Ekranı yerleşimini özelleştir</string>
+    <!-- slide 35j -->
+    <string name="EPr_beastMode_reset">Varsayılanlara sıfırla</string>
+
+    <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on
+        each row
+    </string>
+
+    <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
+    <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit
+        screen
+    </string>
+    <!-- Preference: Task List Show Notes Description (enabled) -->
+    <string name="EPr_showNotes_desc_enabled">Description will always be displayed</string>
+
+    <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
+    <string name="EPr_compressTaskRows_title">Sıkışık Görev Sırası</string>
+    <!-- slide 34j -->
+    <string name="EPr_compressTaskRows_desc">Başlığın sığması için görev sıralarını sıkıştır
+    </string>
+
+    <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
+    <!-- slide 34k-->
+
+    <!-- slide 34b: Preferences: Wrap task titles to two lines -->
+    <string name="EPr_fullTask_title">Tüm görev başlığını göster</string>
+    <string name="EPr_fullTask_desc_enabled">Tüm görev başlığı gösterilecek</string>
+    <!-- slide 34h -->
+    <string name="EPr_fullTask_desc_disabled">Görev başlığının ilk iki satırı gösterilecek</string>
+
+    <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
+    <string name="EPr_ideaAuto_title">Fikirleri Kendiliğinden-Yükle Sekmesi</string>
+    <!-- slide 32c -->
+    <string name="EPr_ideaAuto_desc_enabled">Fikirler için olan aramalar sekmesi, sekme
+        tıklandığında belirecek
+    </string>
+    <string name="EPr_ideaAuto_desc_disabled">Fikirler için olan aramalar sekmesi, yalnızca
+        kullanıcı isteğiyle belirecek
+    </string>
+
+    <!-- Preferences: task row style -->
+    <string-array name="EPr_task_row_styles">
+        <item>Original</item>
+        <item>Simple</item>
+        <item>Title only</item>
     </string-array>
-    
 
+    <string-array name="EPr_task_row_style_descriptions">
+        <item>Truncate title to two lines with date on right</item>
+        <item>Truncate title to one line with date and lists below</item>
+        <item>Single line title only</item>
+    </string-array>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- task row style title (%s -> style) -->
+    <string name="EPr_task_row_style_title">Row style: %s</string>
 
-    
-  <!-- Resources for built-in backup plug-in -->
-  
-  <!-- ================================================= BackupPreferences == -->
+    <!-- Preference: custom filters enabled -->
+    <string name="EPr_use_filters_title">Use filters</string>
+    <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
 
-    <!-- slide 33c/48d: Backup Preferences Title -->    
-    <string name="backup_BPr_header">Yedekler</string>
+    <!-- Preference: show list members in shared list -->
+    <string name="EPr_show_list_members_title">Show list members in shared lists</string>
 
-    <!-- slide 48e/50c: Backup: Status Header -->    
-    <string name="backup_BPr_group_status">Durum</string>
-    
-    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">Son yedek:\n%s</string>
-    <!-- Backup Status: last error failed. Keep it short! -->    
-    <string name="backup_status_failed">Son Yedekleme Başarısız</string>
-    <!-- Backup Status: error subtitle -->    
-    <string name="backup_status_failed_subtitle">(hatayı görmek için dokunun)</string>
-    <!-- slide 48a: Backup Status: never backed up -->    
-    <string name="backup_status_never">Hiç Yedeklenmemiş!</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_simple_input_boxes">Simple text boxes</string>
 
-    <!-- slide 48f/ 50e: Backup Options Group Label -->    
-    <string name="backup_BPr_group_options">Ayarlar</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
 
-    <!-- slide 48b: Preference: Automatic Backup Title -->    
-    <string name="backup_BPr_auto_title">Kendiliğinden Yedeklemeler</string>
-    <!-- Preference: Automatic Backup Description (when disabled) -->
-    <string name="backup_BPr_auto_disabled">Kendiliğinden Yedekleme Etkisiz</string>    
-    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
-    <string name="backup_BPr_auto_enabled">Günlük yedekleme yapılacak</string>
-    
-    <!-- Preference screen restoring Tasks Help -->
-    <!-- Preference screen Restoring Tasks Help Dialog Text-->
-    
-    <string name="backup_BPr_cloud_already_logged_in">Astrid.com üzerinde zaten bulut yedeklemeniz mevcut!</string>
-  
-  <!-- ================================================= BackupActivity == -->
-
-  <!-- slide 48c: backup activity label -->
-  <string name="backup_BAc_label">Yedekleri Yönet</string>
-
-  <!-- backup activity title -->
-  <string name="backup_BAc_title">Yedeklerinizi Yönetin</string>
-
-  <!-- backup activity import button -->
-  <string name="backup_BAc_import">Görevleri İçe Aktar</string>
-
-  <!-- backup activity export button -->
-  <string name="backup_BAc_export">Görevleri Dışa Aktar</string>
-  
-  <!-- backup activity cloud (Astrid.com) option -->
-  <string name="backup_BAc_cloud">Astrid.com üzerinde ücretsiz bulut yedeklemenizi yapmak için tıklayın</string>
-    
-  <!-- ============================================== Importer / Exporter == -->
-  
-  <!-- Message displayed when error occurs -->
-  <string name="backup_TXI_error">İçe Aktarma Hatası</string>
-    
-  <string name="export_toast">%1$s şuraya yedeklendi: %2$s.</string>
-    
-  <string name="export_toast_no_tasks">Dışa Aktarılacak Görev Yok.</string>
-  
-  <!-- Progress Dialog Title for exporting -->    
-  <string name="export_progress_title">Dışa Aktarılıyor...</string>
-  
-  <!-- Backup: Title of Import Summary Dialog -->
-  <string name="import_summary_title">Geri Alma Özeti</string>
-    
-  <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">%1$s dosyası %2$s dosyasını kapsadı.\n\n %3$s içeri aktarıldı, \n %4$s zaten mevcut\n %5$s hatalar mevcut\n</string>
-  
-  <!-- Progress Dialog Title for importing -->    
-  <string name="import_progress_title">İçe Aktarılıyor...</string>
-  
-  <!-- Progress Dialog text for import reading task (%d -> task number)-->    
-  <string name="import_progress_read">%d görev okunuyor..</string>
-  
-  <!-- Backup: Dialog when unable to open a file -->  
-  
-  <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
-  <string name="DLG_error_sdcard">%s dizinine erişilemedi.</string>
-  
-  <!-- Backup: Dialog when unable to open SD card in general -->
-  <string name="DLG_error_sdcard_general">Hafıza kartına erişemiyorum!</string>
-    
-  <!-- Backup: File Selector dialog for import -->
-  <string name="import_file_prompt">Geri Alınacak Bir Dosya Seçin</string>    
-        
+    <!-- Preference: don\'t show plus button until input present -->
+    <string name="EPr_hide_plus_button">Hide plus button</string>
 
+    <!-- Preference: menu items -->
+    <string name="EPr_menu_items">Menu items</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Preference: list view -->
+    <string name="EPr_list_view">List view</string>
 
+    <!-- Preference: task edit comments -->
+    <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
 
-  <!-- ================================================== AndroidManifest == -->
-
-  <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
-  <string name="app_name">Astrid Görevleri</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="read_permission_label">Astrid İzni</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="read_permission_desc">görevlere gözat, görev süzgeçlerini görüntüle</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="write_permission_label">Astrid İzni</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="write_permission_desc">yeni görevler oluştur, mevcut görevleri düzenle</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-    
-  <!-- question for deleting tasks -->
-  <string name="DLG_delete_this_task_question">Bu görev silinsin mi?</string>
-
-  <!-- question for deleting items (%s => item name) -->
-  <string name="DLG_delete_this_item_question">Öğe silinsin mi: %s?</string>
-    
-  <!-- Progress dialog shown when upgrading -->
-  <string name="DLG_upgrading">Görevleriniz güncelleniyor...</string>
-  
-  <!-- Title for dialog selecting a time (hours and minutes) -->
-  <string name="DLG_hour_minutes">Zaman (saat : dakika)</string>
-  
-  <!-- Dialog for Astrid having a critical update -->
-  <string name="DLG_please_update">Astrid Google Play\'deki en son sürüme yükseltilmelidir! Lütfen devam etmeden bunu yapın ya da bir kaç saniye bekleyin.</string>
-
-  <!-- Button for going to Market -->
-
-  <!-- Button for accepting EULA -->
-  <string name="DLG_accept">Kabul Et</string>
-
-  <!-- Button for declining EULA -->
-  <string name="DLG_decline">Reddet</string>
-
-  <!-- EULA title -->
-  <string name="DLG_eula_title">Astrid Kullanım Koşulları</string>
-
-  <!-- Progress Dialog generic text -->
-  <string name="DLG_please_wait">Lütfen Bekleyin</string>
-  
-  <!-- Dialog - loading -->
-  <string name="DLG_loading">Yükleniyor...</string>
-  
-  <!-- Dialog - dismiss -->
-
-  <!-- slide 20d -->
-  <string name="DLG_ok">Tamam</string>
-  <!-- slide 36g -->
-  <string name="DLG_cancel">Vazgeç</string>
-  
-  <string name="DLG_more">Daha Fazla</string>
-  
-  <string name="DLG_undo">Geri al</string>
-  
-  <string name="DLG_warning">Uyarı</string>
-  
-  <!-- =============================================================== UI == -->
-  
-  <!-- Label for DateButtons with no value -->
-  <string name="WID_dateButtonUnset">Ayar İçin Dokun</string>
-  
-  <!-- String formatter for DateButtons ($D => date, $T => time) -->
-  
-  <!-- String formatter for Disable button -->
-  
-  <!--  ============================================================= notes -->
-  
-  <!-- Note Exposer -->    
-  
-  <!-- Note Exposer / Comments -->    
-  
-  <!-- EditNoteActivity - no comments -->
-  <string name="ENA_no_comments">Gösterecek öğe yok</string>
-    
-  <!-- EditNoteActivity - no username for comment -->
-  <string name="ENA_no_user">Herhangi biri</string>
-  
-  <!-- EditNoteActivity - refresh comments -->
-  <string name="ENA_refresh_comments">Yorumları Yenile</string>
-  
-  <!-- ================================================= TaskListActivity == -->
-  
-  <!-- slide 8b: Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">Hiç göreviniz yok! \n Bir şeyler eklemek nasıl olur?</string>
-  
-  <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->    
-  <string name="TLA_no_items_person">%s kişisi sizinle\ngörev paylaşmıyor</string>
-  
-  <!-- Menu: Adjust Sort and Hidden Task Settings -->    
-  <string name="TLA_menu_sort">Sort</string>
-  
-  <!-- Menu: Sync Now -->    
-  <string name="TLA_menu_sync">Şimdi Eşle</string>
-  
-  <!-- Menu: Search -->
-  <string name="TLA_menu_search">Ara</string>
-  
-  <!-- Menu: Tasks -->
-  <string name="TLA_menu_lists">Listeler</string>
-
-  <!-- Menu: Friends -->
-  <string name="TLA_menu_friends">Kişiler</string>
-
-  <!-- Menu: Featured Lists -->
-  <string name="TLA_menu_featured_lists">Öne Çıkan Listeler</string>
-
-  <!-- Menu: Suggestions -->
-  <string name="TLA_menu_suggestions">Öneriler</string>
-  
-  <!-- Menu: Tutorial -->
-
-  <!-- Menu: Settings -->    
-  <string name="TLA_menu_settings">Ayarlar</string>
-  
-  <!-- slide 30b: Menu: Support -->
-  <string name="TLA_menu_support">Destek</string>
-  
-  <!-- Search Label-->
-  
-  <!-- Window title for displaying Custom Filter -->
-  <string name="TLA_custom">Özel</string>
-  
-  <!-- slide 8d: Quick Add Edit Box Hint-->
-  <string name="TLA_quick_add_hint">Görev ekle</string>
-  
-  <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
-  <string name="TLA_quick_add_hint_assign">%s için bir şey ekle</string>
-  
-  <!-- Notification Volumne notification-->
-  <string name="TLA_notification_volume_low">Uyarılar susturuldu. Astrid \'i duyamayacaksın!</string>
-  
-  <!-- Notifications disabled warning -->
-  <string name="TLA_notification_disabled">Astrid hatırlatıcıları devre dışı. Hatırlatma almayacaksınız.</string>
-  
-  <string-array name="TLA_filters">
-      <item>Etkin</item>
-      <item>Bugün</item>
-      <item>Yakında</item>
-      <item>Daha sonra</item>
-      <item>Yapıldı</item>
-      <item>Gizli</item>      
-  </string-array>
-  
-  <!-- Title for confirmation dialog after quick add markup -->
-  <string name="TLA_quickadd_confirm_title">Dediniz ki, \"%s\"</string>
-  
-  <!-- Text for speech bubble in dialog after quick add markup -->
-  <!-- First string is task title, second is due date, third is priority -->
-  <string name="TLA_quickadd_confirm_speech_bubble">Bir görev oluşturdum; \"%1$s\" tarih; %2$s öncelik; %3$s</string>
-  
-  <string name="TLA_quickadd_confirm_speech_bubble_date">%s için</string>
-  
-  <string name="TLA_quickadd_confirm_hide_helpers">İleriki doğrulamaları gösterme</string>
-  
-  
-  <!-- Title for alert on new repeating task. %s-> task title -->
-  <string name="TLA_repeat_scheduled_title">Yinelenen görev: %s</string>
-  
-  <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
-  <string name="TLA_repeat_scheduled_speech_bubble">Bunu şu sıklıkta sana hatırlatacağım: %s.</string>
-  
-  <string-array name="TLA_priority_strings">
-      <item>en yüksek öncelik</item>
-      <item>yüksek öncelik</item>
-      <item>orta öncelik</item>
-      <item>düşük öncelik</item>
-  </string-array>
-  <!-- slide 22a -->
-  <string name="TLA_all_activity">Tüm Etkinlik</string>
-  
-  <!-- ====================================================== TaskAdapter == -->
-  
-  <!-- Format string to indicate task is hidden (%s => task name) -->
-  <string name="TAd_hiddenFormat">%s [gizli]</string>
-  
-  <!-- Format string to indicate task is deleted (%s => task name) -->
-  <string name="TAd_deletedFormat">%s [silinmiş]</string>
-  
-  <!-- Displayed when adapter is flung (scrolled quickly) -->
-  
-  <!-- slide 22b: indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Bitti\n%s</string>
-  
-  <!-- slide 15a: Action Button: edit task -->
-  <string name="TAd_actionEditTask">Düzenle</string>
-  
-  <!-- Context Item: edit task -->
-  <string name="TAd_contextEditTask">Görevi Düzenle</string>
-
-  <!-- Context Item: copy task -->
-  <string name="TAd_contextCopyTask">Görevi Kopyala</string>
-
-  <!-- Context Item: delete task -->
-  <string name="TAd_contextDeleteTask">Görevi Sil</string>
-
-  <!-- Context Item: undelete task -->
-  <string name="TAd_contextUndeleteTask">Görevi Kurtar</string>
-
-  <!-- Context Item: purge task -->
-  <string name="TAd_contextPurgeTask">Görevi Temizle</string>
-  
-  <!-- ============================================== SortSelectionDialog == -->
-  
-  <!-- slide 23a: Sort Selection: dialog title -->    
-  <string name="SSD_title">Sınıflama, Altgörevler ve Gizli</string>
-  
-  <!-- slide 23h:  Hidden: title -->
-  <string name="SSD_hidden_title">Gizli Görevler</string>
-  
-  <!-- Hidden Task Selection: show completed tasks -->    
-  <string name="SSD_completed">Tamamlanan Görevleri Göster</string>
-  
-  <!-- Hidden Task Selection: show hidden tasks -->    
-  <string name="SSD_hidden">Gizli Görevleri Göster</string>
-  
-  <!-- Hidden Task Selection: show deleted tasks -->    
-  <string name="SSD_deleted">Silinmiş Görevleri Göster</string>
-  
-  <!-- Sort Selection: drag with subtasks -->
-  <string name="SSD_sort_drag">Manual order with subtasks</string>
-  
-  <!-- slide 23b: Sort Selection: smart sort -->
-  <string name="SSD_sort_auto">Astrid Akıllı Sıralama</string>
-  
-  <!-- slide 23e: Sort Selection: sort by alpha -->
-  <string name="SSD_sort_alpha">Başlığa göre</string>
-  
-  <!-- slide 23c: Sort Selection: sort by due date -->
-  <string name="SSD_sort_due">Bitiş Tarihine Göre</string>
-  
-  <!-- slide 23d: Sort Selection: sort by importance -->
-  <string name="SSD_sort_importance">By priority</string>
-  
-  <!-- slide 23f: Sort Selection: sort by modified date -->
-  <string name="SSD_sort_modified">Son Değiştirme Tarihine Göre</string>
-  
-  <!-- slide 23g: Sort Selection: reverse -->
-  <string name="SSD_sort_reverse">Sıralamayı Tersine Çevir</string>
-  
-  <!-- slide 23j: Sort Button: sort temporarily -->
-  <string name="SSD_save_temp">Bir Kereye Mahsus</string>
-  
-  <!-- slide 23i: Sort Button: sort permanently -->
-  <string name="SSD_save_always">Her zaman</string>
-  
-  <!-- =============================================== FilterListActivity == -->
-  
-  <!-- Astrid Filter Shortcut -->    
-  <string name="FSA_label">Astrid Listesi ya da Süzgeci</string>
-
-  <!-- Filter List Activity Title -->    
-  
-  <!-- Displayed when loading filters -->    
-  
-  <!-- Context Menu: Create Shortcut -->    
-  <string name="FLA_context_shortcut">Masaüstünde Kısayol Oluştur</string>
-  
-  <!-- Menu: Search -->
-  
-  <!-- Menu: Help -->    
-  
-  <!-- slide 28c: Create Shortcut Dialog Title -->    
-  <string name="FLA_shortcut_dialog_title">Kısayol Oluştur</string>
-  
-  <!-- Create Shortcut Dialog (asks to name shortcut) -->    
-  <string name="FLA_shortcut_dialog">Kısayol adı:</string>
-  
-  <!-- Search Hint-->
-  <string name="FLA_search_hint">Görevleri ara</string>
-  
-  <!-- Search Filter name (%s => query) -->
-  <string name="FLA_search_filter">\'%s\' ile eşleşenler</string>
-  
-  <!-- Toast: created shortcut (%s => label) -->
-  <string name="FLA_toast_onCreateShortcut">Oluşturulan Kısayol: %s</string>
-  
-  <!-- Menu: new filter -->
-  <string name="FLA_new_filter">Yeni Filtre</string>
-  
-  <!-- slide 10e: Button: new list -->
-  <string name="FLA_new_list">Yeni Liste</string>
-  
-  <!-- Alert when creating a shortcut without selecting a filter -->
-  <string name="FLA_no_filter_selected">Süzgeç seçilmemiş! Lütfen bir süzgeç ya da liste seçin.</string>
-  
-  <!-- ================================================= TaskEditActivity == -->
-  
-  <!-- Title when editing a task (%s => task title) -->
-  
-  <!-- Title when creating a new task -->
-  
-  <!-- Task title label -->
-  
-  <!-- Task when label -->
-  <string name="TEA_when_header_label">Ne Zaman</string>
-  
-  <!-- Task title hint (displayed when edit box is empty) -->
-  <string name="TEA_title_hint">Task name</string>
-  
-  <!-- Task importance label -->
-  <string name="TEA_importance_label">Priority</string>
-  
-  <!-- Task due date hint -->
-  <string name="TEA_deadline_hint">Set due date</string>
-  
-  <!-- Task assigned to string (%s -> assigned person name) -->
-  <string name="TEA_assigned_to">Assigned to %s</string>
-  
-  <!-- Task urgency specific time checkbox -->
-  <string name="TEA_urgency_specific_time">Belirli bir zamanda?</string>
-  
-  <!-- Task urgency specific time title when specific time false -->
-  <string name="TEA_urgency_none">Hiçbiri</string>
-  
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_label">Hide until</string>
-
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_display">Hide until %s</string>
-  
-  <!-- Task hide until toast -->
-  <string name="TEA_hideUntil_message">Görev %s\'e kadar gizli kalacak</string>
-  
-  <!-- Task editing data being loaded label -->
-  <string-array name="TEA_loading"><item>Yükleniyor...</item></string-array>
-  
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_note_label">Açıklama</string>
-
-  <!-- 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">Ne kadar sürecek?</string>
-  
-  <!-- Elapsed time label -->
-  <string name="TEA_elapsedDuration_label">Görev üzerinde çalışılan zaman</string>
-
-  <!-- Menu: Save -->    
-  <string name="TEA_menu_save">Değişiklikleri Kaydet</string>
-  
-  <!-- Menu: Don\'t Save -->
-  <string name="TEA_menu_discard">Kaydetme</string>
-  
-  <!-- Menu: Delete Task -->
-  <string name="TEA_menu_delete">Görevi Sil</string>
-  
-  <!-- Menu: Task comments -->
-  <string name="TEA_menu_refresh_comments">Refresh comments</string>
-
-  <string name="TEA_menu_comments">Yorumlar</string>
-  
-   <!-- Toast: task saved with deadline (%s => preposition + time units) -->
-  <string name="TEA_onTaskSave_due">Görev Kaydedildi: tarihi %s</string>
-  
-  <!-- Toast: task saved without deadlines -->
-  <string name="TEA_onTaskSave_notDue">Görev kaydedildi</string>
-  
-  <!-- Toast: task was not saved -->
-  
-  <!-- Toast: task was deleted -->
-  
-  <!-- slide 15b: Task edit tab: activity -->
-  <string name="TEA_tab_activity">Etkinlik</string>
-  
-  <!-- slide 15e:  Task edit tab: more editing settings -->
-  <string name="TEA_tab_more">Ayrıntılar</string>
-  
-  <!-- slide 15d: Task edit tab: web services -->
-  <string name="TEA_tab_web">Fikirler</string>
-  
-  <string name="TEA_timer_est">Est. %s</string>
-
-  <string name="TEA_timer_elap">Elapsed %s</string>
-  
-  <string-array name="TEA_urgency">
-      <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No date</item>
-      <item>Belirli gün</item>
-      <item>Bugün</item>
-      <item>Yarın</item>
-      <item>(ertesi gün)</item>
-      <item>Gelecek hafta</item>
-      <item>İki hafta içinde</item>
-      <item>Gelecek ay</item>
-  </string-array>
-  
-  <string name="TEA_no_time">Zaman yok</string>
-      
-  <string-array name="TEA_hideUntil">
-      <!-- hideUntil: labels for edit page. -->
-      <item>Never</item>
-      <item>Due date</item>
-      <item>Due time</item>
-      <item>Day before due</item>
-      <item>Week before due</item>
-      <item>Belirli Gün/Zamanda</item>
-  </string-array>
-  
-  <!-- Task edit control set descriptors -->
-
-  <!-- slide 9b/35i -->
-  <string name="TEA_control_who">Kim</string>
-
-  <!-- slide 9c/ 35a -->
-  <string name="TEA_control_when">Ne Zaman</string>
-  <!-- slide 35b -->
-  <string name="TEA_control_more_section">----Daha fazla----</string>
-  <!-- slide 16a/35c -->
-  <string name="TEA_control_importance">Priority</string>  
-  <!-- slide 16b/35d -->
-  <string name="TEA_control_lists">Listeler</string>  
-  <!-- slide 16c/35e -->
-  <string name="TEA_control_notes">Açıklama</string>  
-  
-  <string name="TEA_control_files">Dosyalar</string>
-
-  <!-- slide 16e / slide 35g-->
-  <string name="TEA_control_reminders">Hatırlatmalar</string>
-
-  <!-- slide 16f -->
-  <string name="TEA_control_timer">Geri Sayım Denetimleri</string>
-  
-  <string name="TEA_control_hidden_section">----Her Zaman Gizle----</string>
-  
-  <string name="hide_until_prompt">Listemde göster</string>
-  
-  <!-- Add Ons tab when no add-ons found -->
-  
-  <!-- Add Ons button -->
-  
-  <!-- More row -->
-  
-  <!-- slide 15c: Text when no activity to show -->
-  <string name="TEA_no_activity">Etkinlik yok</string>
-  
-  <!-- Text to load more activity -->
-  <string name="TEA_load_more">Daha yükle...</string>
-  
-  <!-- When controls dialog -->
-  <string name="TEA_when_dialog_title">Son zamanı nedir?</string>
-  
-  
-  <string name="TEA_new_task">Yeni Görev</string>
-  
-  <string name="WSV_click_to_load">Bunu yapmanın yollarını bulmak için bana dokunun!</string>
-  
-  <string name="WSV_not_online">İnternete bağlanırsam daha fazlasını yapabilirim. Lütfen bağlantınızı denetleyin.</string>
-  
-  <string name="TEA_contact_error">Üzgünüz! Seçilmiş kişi için bir e-posta adresi bulunamadı.</string>
-  
-  <!-- ============================================= IntroductionActivity == -->
-  
-  <!-- slide 1a: Introduction Window title -->
-  
-  <!-- Button to agree to EULA -->
-  
-  <!-- Button to disagree with EULA -->
-  
-  <!-- ===================================================== MissedCallActivity == -->
-  
-  <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
-  <string name="MCA_title">%1$s aradı\nzamanı: %2$s</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_return_call">Şimdi ara</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_add_task">Sonra ara</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_ignore">Yoksay</string>
-  
-  <!-- Missed call: dialog to ignore all missed calls title -->
-  <string name="MCA_ignore_title">Tüm çağrıları yoksay?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls body -->
-  <string name="MCA_ignore_body">Birkaç çağrıyı yoksaydınız. Astrid bunlar hakkında soru sormayı kessin mi?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore all button -->
-  <string name="MCA_ignore_all">Tüm çağrıları yoksay</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
-  <string name="MCA_ignore_this">Yalnızca bu çağrıyı yoksay</string>
-
-  <!-- Missed call: preference title -->
-  <string name="MCA_missed_calls_pref_title">Cevapsız çağrı alanı</string>
-
-  <!-- slide 49c: Missed call: preference description -->
-  <string name="MCA_missed_calls_pref_desc_enabled">Astrid cevapsız çağrıları size bildirecek ve geri aramanız için hatırlatacak</string>
-  <string name="MCA_missed_calls_pref_desc_disabled">Astrid cevapsız çağrıları size hatırlatmayacak</string>
-
-  <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
-  <string name="MCA_task_title_name">%1$s kişisini geri ara: %2$s</string>
-
-  <!-- Missed call: task title no name (%s -> number)-->
-  <string name="MCA_task_title_no_name">%s kişisini geri ara</string>
-  
-  <!-- Missed call: schedule dialog title (%s -> name or number)-->
-  <string name="MCA_schedule_dialog_title">%s kişisini geri ara..</string>
-  
-  <!-- Missed call speech bubble options -->
-  <string-array name="MCA_dialog_speech_options">
-      <item>Aranan kişi olmak güzel bir şey!</item>
-      <item>İşte bu! İnsanlar seni seviyor!</item>
-      <item>Ara da sesini duyanların günü şenlensin!</item>
-      <item>İnsanlar seni geri aradığında mutlu olmaz mısın?</item>
-      <item>Yapabilirsin!</item>
-      <item>Her zaman bir ileti gönderebilirsin...</item>
-  </string-array>
-  
-  
-  <!-- ======================================= Calendar reminder activity == -->
-  
-  <!-- Calendar remindeer ignore button -->
-  <string name="CRA_ignore">Yoksay</string>
-  
-  <!-- Calendar event -->
-  <string name="CRA_title">Bir toplantı listesine mi ihtiyacınız var?</string>
-  
-  <!-- Calendar reminder: dialog to ignore all missed calls title -->
-  <string name="CRA_ignore_title">Tüm takvim etkinlikleri yok sayılsın mı?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls body -->
-  <string name="CRA_ignore_body">Bir kaç tane takvim etkinliğini yok saydınız. Astrid\'in size bunlar hakkında sormayı kesmesini ister misiniz?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
-  <string name="CRA_ignore_all">Tüm etkinlikleri yoksay</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
-  <string name="CRA_ignore_this">Sadece bu etkinliği yok say</string>
-  
-  <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
-  <string name="CRA_speech_bubble_start">%s çok yakında başlayacak gözüküyor. Bir liste hazırlamak ister misiniz?</string>
-
-  <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
-  <string name="CRA_speech_bubble_end">%s bitmiş gibi gözüküyor. Bir liste hazırlamak ister misiniz?</string>
-  
-  <!-- Calendar reminder: create list button -->
-  <string name="CRA_create_list">Liste oluştur</string>
-
-  <!-- Calendar reminder: postpone button -->
-  <string name="CRA_postpone">Belki daha sonra</string>
-  
-  <!-- Calendar reminder: list exists dialog title -->
-  <string name="CRA_list_exists_title">Liste zaten bulunuyor</string>
-  
-  <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
-  <string name="CRA_list_exists_body">%s isimli bir liste bulunmakta. Var olan listeyi kullanmak mı yoksa yeni bir liste yapmak mı istersiniz?</string>
-  
-  <!-- Calendar reminder: list exists dialog create new button -->
-  <string name="CRA_create_new">Yeni oluştur</string>
-
-  <!-- Calendar reminder: list exists dialog use existing button -->
-  <string name="CRA_use_existing">Var olanı kullan</string>
-  
-  <!-- Calendar remindr: created list (%s -> list name) -->
-  <string name="CRA_created_list_dialog">%s isimli liste oluşturuldu.</string>
-  
-  <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
-  <string name="CRA_one_attendee">%s katılıyor</string>
-
-  <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
-  <string name="CRA_two_attendees">%1$s ve %2$s katılıyorlar</string>
-
-  <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
-  <string name="CRA_many_attendees">%1$s, %2$s, ve %3$d diğerleri katılıyorlar.</string>
-  
-  <!-- Calendar reminder: invitation prompt -->
-  <string name="CRA_invitation_prompt">Onları davet etmek ister misin?</string>
-  
-  <!-- Calendar reminder: preference title -->
-  <string name="CRA_calendar_reminders_pref_title">Takvim asistanı</string>
-
-  <!-- Calendar reminder: pref description disabled -->
-  <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid, gelecek etkinlikleri hatırlatmayacak.</string>
-
-  <!-- Calendar reminder: pref description enabled -->
-  <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid gelecek takvim etkinliklerini size hatırlatacak ve bu etkinliklere hazırlanmanız için size bilgilendirmede bulunacak. </string>
-  
-  <!-- Calendar reminder: share list title -->
-  <string name="CRA_share_list_title">Liste paylaşılsın mı?</string>
-  
-  <string name="CRA_invite_attendees">Katılımcıları davet et</string>
-
-  <string name="CRA_more_options">Daha fazla seçenek</string>
-
-  <string name="CRA_dont_invite">Hayır teşekkürler</string>
-
-  <!-- Calendar reminder: share list title when no other attendees exist-->
-  <string name="CRA_list_created_title">Liste oluşturuldu!</string>
-  
-  <!-- Calendar reminder: default new list name (%s -> event title) -->
-  <string name="CRA_default_list_name">Action Items: %s</string>
-  
-  <!-- ===================================================== HelpActivity == -->
-  
-  <!-- Help: Button to get support from our website -->
-    
-  <!-- ==================================================== UpdateService == -->
-  
-  <!-- Changelog Window Title -->
-  <string name="UpS_changelog_title">Astrid\'te Yenilikler Neler?</string>
-  
-  <!-- Updates Window Title -->
-  <string name="UpS_updates_title">En Son Astrid Haberleri</string>
-  
-  <!-- Updats No Activity to show for offline users -->
-  <string name="UpS_no_activity_log_in">Paylaşılan listelerdeki etkinlik\nilerlemenizin kaydını görmek\niçin oturum açın.</string>
-  
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 31g: Preference Window Title -->
-  <string name="EPr_title">Astrid: Ayarlar</string>
-  
-  <string name="EPr_share_astrid">Share Astrid</string>
-
-  <string name="EPr_share_astrid_summary">Beğendiğiniz sosyal ağınızda Astrid\'ten bahsedin</string>
-  
-  <!-- slide 46a -->
-  <string name="EPr_deactivated">devre dışı</string>
-
-  <!-- slide 30i: Preference Category: Appearance Title -->
-  <string name="EPr_appearance_header">Görünüm</string>
-  
-  <!-- Preference Category: Appearance Summary -->
-  <string name="EPr_appearance_summary">Themes, widgets, task rows, edit screen</string>
-  
-  <!-- FAQ Preference title -->
-  <string name="EPr_faq_title">S.S.S.</string>
-  
-  <!-- Account status preference (%s -> account type) -->
-  <string name="EPr_account_title">Hesap: %s</string>
-
-  <!-- Support preferences summary -->
-  <string name="EPr_support_summary">Tutorial, FAQ, about</string>
-  
-  <!-- slide 34a: Preference: Task List Font Size Title -->
-  <string name="EPr_fontSize_title">Görev Listesi Boyutu</string>
-  
-  <!-- Preference: Filters to show pref screen title -->
-  <string name="EPr_filters_to_show_title">Filters to show</string>
-  
-  <!-- slide 32a: Preference: Show confirmation for smart reminders -->
-  <string name="EPr_showSmartConfirmation_title">Akıllı hatırlatıcılar için doğrulamayı göster</string>
-  
-  <!-- slide 34g: Preference: Task List Font Size Description -->                                                                                                                                                  
-  <string name="EPr_fontSize_desc">Ana listedeki yazı boyutu</string>  
-  
-  <!-- Preferemce: Show task edit confirmation toasts -->
-  
-  <!-- slide 34c: Preference: Task List Show Notes -->
-  <string name="EPr_showNotes_title">Show description in task</string>
-  
-  <!-- Edit screen preference category -->
-  <string name="EPr_edit_screen_options">Edit screen options</string>
-  
-  <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
-  <string name="EPr_beastMode_title">Edit screen order</string>
-  
-  <string name="EPr_beastMode_shortcut">Customize</string>
-  
-  <string name="EPr_time_increment">5 minute increments</string>
-  
-  <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
-  
-  <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
-  
-  <!-- slide 35h -->
-  <string name="EPr_beastMode_desc">Görev Düzenleme Ekranı yerleşimini özelleştir</string>
-  <!-- slide 35j -->
-  <string name="EPr_beastMode_reset">Varsayılanlara sıfırla</string>
-  
-  <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on each row</string>
-      
-  <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit screen</string>  
-  <!-- Preference: Task List Show Notes Description (enabled) -->
-  <string name="EPr_showNotes_desc_enabled">Description will always be displayed</string>
-  
-  <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
-  <string name="EPr_compressTaskRows_title">Sıkışık Görev Sırası</string>
-  <!-- slide 34j -->
-  <string name="EPr_compressTaskRows_desc">Başlığın sığması için görev sıralarını sıkıştır</string>
-  
-  <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
-  <!-- slide 34k-->
-  
-  <!-- slide 34b: Preferences: Wrap task titles to two lines -->
-  <string name="EPr_fullTask_title">Tüm görev başlığını göster</string>
-  <string name="EPr_fullTask_desc_enabled">Tüm görev başlığı gösterilecek</string>
-  <!-- slide 34h -->
-  <string name="EPr_fullTask_desc_disabled">Görev başlığının ilk iki satırı gösterilecek</string>
-  
-  <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
-  <string name="EPr_ideaAuto_title">Fikirleri Kendiliğinden-Yükle Sekmesi</string>
-  <!-- slide 32c -->
-  <string name="EPr_ideaAuto_desc_enabled">Fikirler için olan aramalar sekmesi, sekme tıklandığında belirecek</string>
-  <string name="EPr_ideaAuto_desc_disabled">Fikirler için olan aramalar sekmesi, yalnızca kullanıcı isteğiyle belirecek</string>
-  
-  <!-- Preferences: task row style -->
-  <string-array name="EPr_task_row_styles">
-      <item>Original</item>
-      <item>Simple</item>
-      <item>Title only</item>
-  </string-array>
-  
-  <string-array name="EPr_task_row_style_descriptions">
-      <item>Truncate title to two lines with date on right</item>
-      <item>Truncate title to one line with date and lists below</item>
-      <item>Single line title only</item>
-  </string-array>
-  
-  <!-- task row style title (%s -> style) -->
-  <string name="EPr_task_row_style_title">Row style: %s</string>
-  
-  <!-- Preference: custom filters enabled -->
-  <string name="EPr_use_filters_title">Use filters</string>
-  <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
-
-  <!-- Preference: show list members in shared list -->
-  <string name="EPr_show_list_members_title">Show list members in shared lists</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_simple_input_boxes">Simple text boxes</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
-
-  <!-- Preference: don\'t show plus button until input present -->
-  <string name="EPr_hide_plus_button">Hide plus button</string>
-
-  <!-- Preference: menu items -->
-  <string name="EPr_menu_items">Menu items</string>
-
-  <!-- Preference: list view -->
-  <string name="EPr_list_view">List view</string>
-
-  <!-- Preference: task edit comments -->
-  <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
-  
-  <!-- slide 30f/ 36f: Preference: Theme -->
-  <string name="EPr_theme_title">Renk Teması</string>
-  <!-- Preference: Theme Description (%s => value) -->
-  <string name="EPr_theme_desc">Geçerli: %s</string>  
-  <!-- Preference: Theme Description (android 1.6) -->
-  <string name="EPr_theme_desc_unsupported">Ayarlar için Android 2.0+ zorunludur.</string>
-  <!-- slide 32h/ 37b -->
-  <string name="EPr_theme_widget_title">Bileşen Teması</string>
-  
-  <!-- slide 30d/ 34f: Preference screen: all task row settings -->
-  <string name="EPr_taskRowPrefs_title">Görev Sırası Görünümü</string>
-  
-  <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
-  <string name="EPr_use_contact_picker">Kişi seçiciyi kullan</string>
-  <!-- slide 49b -->
-  <string name="EPr_use_contact_picker_desc_enabled">Sistemin kişi seçici seçeneği görev atama penceresinde görüntülenecek</string>
-  <string name="EPr_use_contact_picker_desc_disabled">Sistem kişi seçici seçeneği görüntülenmeyecek</string>
-
-  <!-- slide 49i: Preferences: Third party addons -->
-  <string name="EPr_third_party_addons">Üçüncü parti eklentileri etkinleştir</string>
-  <string name="EPr_third_party_addons_desc_enabled">Üçüncü taraf eklentiler etkin olacak</string>
-  <!-- slide 49d -->
-  <string name="EPr_third_party_addons_desc_disabled">Üçüncü taraf eklentiler etkisiz olacak</string>
-  
-  <!-- Preferences: ideas tab -->
-  <string name="EPr_ideas_tab_enabled">Task ideas</string>
-  <string name="EPr_ideas_tab_description">Görevleri tamamlamak için fikir al</string>
-  
-  <!-- Preferences: calendar event start time -->
-  <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
-  <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
-  <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
-  
-  <string name="EPr_force_phone_layout">Telefon yerleşimini kullan</string>
-
-  <string name="EPr_show_featured_lists">Öne çıkan listeleri göster</string>
-  
-  <!-- Configurations -->
-  <string name="EPr_configurations_title">Set configuration</string>
-  <string name="EPr_config_default">Default</string>
-  <string name="EPr_config_lite">Astrid Lite</string>
-  
-  <!-- Dialog title when setting preference configuration -->
-  <string name="EPr_config_dialog_title">Set configuration?</string>
-  <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
-  <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
-  
-  <!-- default configuration name for the above dialog -->
-  <string name="EPr_config_dialog_default_id">default</string>
-  
-  <!-- Preference title for showing save and cancel buttons in task edit page -->
-  <string name="EPr_show_save_and_cancel">Show save and cancel </string>
-  
-  
-  <!-- Swipe between lists -->
-  <!-- Preference: swipe between lists performance -->
-  <string name="EPr_swipe_lists_performance_title">Listeler arası sürükleme</string>
-  
-  <string-array name="EPr_swipe_lists_performance_mode">
-      <item>Sürükleme yok</item>
-      <item>Bellek Koruma</item>
-      <item>Normal Başarım</item>
-      <item>Yüksek Başarım</item>
-  </string-array>
-  
-  <string-array name="EPr_swipe_lists_performance_desc">
-  <!-- slide 49a -->
-      <item>Listeler arası sürükleme etkisiz</item>
-      <item>Düşük başarım</item>
-      <item>Öntanımlı ayar</item>
-      <item>Daha çok sistem kaynağı kullan</item>
-  </string-array>
-    
-  <string name="swipe_lists_helper_title">Listeler arası sürükleme</string>
-  <string name="swipe_lists_helper_header">Listelerde hızlı gezinme için sağa ya da sola kaydır</string>
-  <string name="swipe_lists_helper_subtitle">Ayarlar -&gt; Görünüm içinden ayarları değiştir</string>
-
-  <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
-  
-  <string-array name="EPr_default_reminders_mode">
-      <!-- reminders duration: labels for "Task Defaults" preference item. -->
-      <item>@string/TEA_reminder_mode_once</item>
-      <item>@string/TEA_reminder_mode_five</item>
-      <item>@string/TEA_reminder_mode_nonstop</item>
-  </string-array>
-    
-  <string-array name="EPr_themes">
-    <!-- theme_settings: labels for Theme preference menu -->
-    <!-- slide 36a-->
-    <item>Gündüz - Mavi</item>
-    <!-- slide 36b -->
-    <item>Gündüz - Kırmızı</item>
-    <!-- slide 36b -->
-    <item>Sky blue</item>
-    <!-- slide 36c -->
-    <item>Night</item>
-    <!-- slide 36d -->
-    <item>Transparent (white text)</item>
-    <!-- slide 36e -->
-    <item>Şeffaf (Siyah Metin)</item>
-  </string-array>
-  
-  <string-array name="EPr_themes_widget">
-    <!-- slide 32i / 37a-->
-    <item>Uygulama ile aynı</item>
-    <item>Gündüz - Mavi</item>
-    <item>Gündüz - Kırmızı</item>
-    <item>Sky blue</item>
-    <item>Night</item>
-    <item>Transparent (white text)</item>
-    <item>Transparent (black text)</item>
-    <item>Eski Biçem</item>
-  </string-array>
-  
-  <!-- ========================================== Task Management Settings == -->
-
-  <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
-  <string name="EPr_manage_header">Eski Görevleri Yönet</string>
-  <!-- slide 47d -->
-  <string name="EPr_manage_delete_completed">Tamamlanan Görevleri Sil</string>
-  <string name="EPr_manage_delete_completed_message">Gerçekten tüm tamamlanmış görevleri silmek istiyor musun?</string>
-  <!-- slide 47a -->
-  <string name="EPr_manage_delete_completed_summary">Silinen görevler tek tek yeniden yüklenebilir</string>
-  <string name="EPr_manage_delete_completed_status">%d görev silindi!</string>
-  <!-- slide 47e -->
-  <string name="EPr_manage_purge_deleted">Silinen Görevleri Temizle</string>
-  <string name="EPr_manage_purge_deleted_message">Tüm silinen görevleri temizlemek istediğine emin misin?\n\nBu görevler tamamen silinecek!</string>
-  <string name="EPr_manage_purge_deleted_status">%d görev temizlendi!</string>
-  <!-- slide 47b-->
-  <string name="EPr_manage_purge_deleted_summary">Uyarı! Temizlenen görevler yedek dosyası olmadan kurtarılamaz!</string>
-  <!-- slide 47h-->
-  <string name="EPr_manage_clear_all">Tüm Veriyi Temizle</string>
-  <string name="EPr_manage_clear_all_message">Astrid ayarları ve tüm görevler silinsin mi?\n\nUyarı: geri alınamaz!</string>
-
-  <!-- slide 47f -->
-  <string name="EPr_manage_delete_completed_gcal">Tamamlanan görevler için Takvim olaylarını sil</string>
-  <string name="EPr_manage_delete_completed_gcal_message">Tamamlanmış görevlerden bütün olayları silmek istediğinize emin misiniz?</string>
-  <string name="EPr_manage_delete_completed_gcal_summary"></string>
-  <string name="EPr_manage_delete_completed_gcal_status">%d takvim olayı silindi!</string>
-      
-  <!-- slide 47g-->
-  <string name="EPr_manage_delete_all_gcal">Görevlerdeki Bütün Takvim Olaylarını Sil</string>
-  <string name="EPr_manage_delete_all_gcal_message">Görevlerdeki bütün olayları silmek istediğinize emin misiniz?</string>
-  <string name="EPr_manage_delete_all_gcal_summary"></string>
-  <string name="EPr_manage_delete_all_gcal_status">%d takvim olayı silindi!</string>
-      
-  <!-- ==================================================== AddOnActivity == -->
-  
-  <!-- Add Ons Activity Title -->
-  <string name="AOA_title">Eklentiler</string>
-    
-  <!-- Add-on Activity: author for internal authors  -->
-  <string name="AOA_internal_author">Astrid Takımı</string>
-    
-  <!-- Add-on Activity: installed add-ons tab -->
-  <string name="AOA_tab_installed">Yüklenen</string>
-  
-  <!-- Add-on Activity - available add-ons tab -->
-  <string name="AOA_tab_available">Kullanılabilir</string>
-  
-  <!-- Add-on Activity - free add-ons label -->
-  <string name="AOA_free">Ücretsiz</string>
-  
-  <!-- Add-on Activity - menu item to visit add-on website -->
-  
-  <!-- Add-on Activity - menu item to visit android market -->
-  
-  <!-- Add-on Activity - when list is empty -->
-  <string name="AOA_no_addons">Liste Boş!</string>
-  
-  <string name="AOA_ppack_title">Astrid Power Pack</string>
-  <string name="AOA_ppack_description">Support Astrid and get more productive with the Power Pack. 4x2 and 4x4 widgets and voice integration. Power up today!</string>
-  <string name="AOA_locale_title">Astrid Locale Plugin</string>
-  <string name="AOA_locale_description">Allows Astrid to make use of the Locale application to send you notifications based on filter conditions. Requires Locale.</string>
-  
-  <!-- ====================================================== TasksWidget == -->
-
-  <!-- Widget text when loading tasks -->
-  <string name="TWi_loading">Yükleniyor...</string>
-
-  <!-- Widget configuration activity title: select a filter -->
-  <string name="WCA_title">Görüntülenecek görevi seç...</string>
-  
-  <!-- ======================================================== Waiting on me -->
-
-  <string name="wom_commented">%s commented on your task.</string>
-  <string name="wom_mentioned">%s mentioned you.</string>
-  <string name="wom_assigned">%s assigned this to you.</string>
-  <string name="wom_raised_pri">%s raised the priority.</string>
-  <string name="wom_changed_due">%s changed the due date.</string>
-  <string name="wom_default">%s wants your attention.</string>
-  
-  <string name="wom_dismiss">Dismiss</string>
-  <string name="wom_acknowledge">I\'ve read this</string>
-
-  <!-- ============================================================= About == -->
-  
-  <!-- slide 30h: Title of "About" option in settings -->
-  <string name="p_about">Astrid Hakkında</string>
-  
-  <!-- About text (%s => current version)-->
-  <string name="p_about_text">Güncel versiyon: %s\n\n Astrid açık kaynak kodlu olarak Todoroo, Inc tarafından gururla sürdürülmektedir.</string>
-
-  <!-- Title of "Help" option in settings -->
-  <string name="p_help">Destek</string>
-  
-  <!-- slide 30c: Title of "Forums" option in settings -->
-  <string name="p_forums">Forum</string>
-  
-  <!-- Title of "Premium" option in settings -->
-  <string name="p_premium">Premium</string>
-  
-  <!-- ============================================================= Misc == -->
-  
-  <string name="feedback_positive_title">Rate Astrid?</string>
-
-  <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star rating?</string>
-
-  <string name="feedback_negative_title">Leave feedback?</string>
-
-  <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
-
-  <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback section--it might not be available on your device.</string>
-  
-  <string name="feedback_positive_button">Rate Astrid</string>
-
-  <string name="feedback_negative_button">Leave feedback</string>
-  
-  <string name="feedback_not_now">Not now</string>
-  
-  <string name="feedback_banner_text">How\'s Astrid working for you?</string>
-  
-  <!-- Displayed when task killer found. %s => name of the application -->
-  <string name="task_killer_help">Gönürüyor ki, işlemleri kapatabilen bir uygulama kullanıyorsunuz (%s)! Mümkünse, Astrid\'i programın muafiyet listesine ekleyin ki kapatılamasın. Aksi takdirde, Astrid görevlerin tarihi geldiğinde size bildiremeyebilir.\n</string>
-  
-  <!-- Task killer dialog ok button -->
-  <string name="task_killer_help_ok">Astrid\'i Kapatmayacağım!</string>
-    
-  <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
-  
-  <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
-  <string name="marketplace_description">Astrid çok sevilen, yapacaklarınızı yapmanıza yardım eden açık kaynak kodlu bir hatırlatma / görev yönetimi programıdır. Hatırlatmalar, etiketlemeler, senkronizasyon, Locale eklentisi, widget ve daha fazla özelliğe sahiptir.</string>
-  
-  <string name="DB_corrupted_title">Bozuk Veritabanı</string>
-  
-  <string name="DB_corrupted_body">
-      Uh oh! It looks like you may have a corrupted database. 
-      If you see this error regularly, we suggest you clear all
-      data (Settings->Sync and backup->Manage old tasks->Clear all data) and restore
-      your tasks from a backup (Settings->Sync and backup->Backup->Import tasks) in Astrid.</string>
-      
-  <string name="market_unavailable">Ne yazık ki market sisteminiz için kullanılabilir değil.</string>
-  
+    <!-- slide 30f/ 36f: Preference: Theme -->
+    <string name="EPr_theme_title">Renk Teması</string>
+    <!-- Preference: Theme Description (%s => value) -->
+    <string name="EPr_theme_desc">Geçerli: %s</string>
+    <!-- Preference: Theme Description (android 1.6) -->
+    <string name="EPr_theme_desc_unsupported">Ayarlar için Android 2.0+ zorunludur.</string>
+    <!-- slide 32h/ 37b -->
+    <string name="EPr_theme_widget_title">Bileşen Teması</string>
 
+    <!-- slide 30d/ 34f: Preference screen: all task row settings -->
+    <string name="EPr_taskRowPrefs_title">Görev Sırası Görünümü</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
+    <string name="EPr_use_contact_picker">Kişi seçiciyi kullan</string>
+    <!-- slide 49b -->
+    <string name="EPr_use_contact_picker_desc_enabled">Sistemin kişi seçici seçeneği görev atama
+        penceresinde görüntülenecek
+    </string>
+    <string name="EPr_use_contact_picker_desc_disabled">Sistem kişi seçici seçeneği
+        görüntülenmeyecek
+    </string>
 
+    <!-- slide 49i: Preferences: Third party addons -->
+    <string name="EPr_third_party_addons">Üçüncü parti eklentileri etkinleştir</string>
+    <string name="EPr_third_party_addons_desc_enabled">Üçüncü taraf eklentiler etkin olacak</string>
+    <!-- slide 49d -->
+    <string name="EPr_third_party_addons_desc_disabled">Üçüncü taraf eklentiler etkisiz olacak
+    </string>
 
-  <!-- slide 32g: Preference Category: Defaults Title -->
-  <string name="EPr_defaults_header">Yeni Görev Öntanımlıları</string>
-  <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
-  
-  <!-- slide 41f:  Preference: Default Urgency Title -->
-  <string name="EPr_default_urgency_title">Öntanımlı Aciliyet</string>
-  <!-- Preference: Default Urgency Description (%s => setting) -->
-  <string name="EPr_default_urgency_desc">Geçerli: %s</string>
-  
-  <!-- slide 40a: Preference: Default Importance Title -->
-  <string name="EPr_default_importance_title">Default priority</string>
-  <!-- Preference: Default Importance Description (%s => setting) -->
-  <string name="EPr_default_importance_desc">Geçerli: %s</string>
-  
-  <!-- slide 42e: Preference: Default Hide Until Title -->
-  <string name="EPr_default_hideUntil_title">Öntanımlı Gizlenme</string>
-  <!-- Preference: Default Hide Until Description (%s => setting) -->
-  <string name="EPr_default_hideUntil_desc">Geçerli: %s</string>
-  
-  <!-- slide 43e: Preference: Default Reminders Title -->
-  <string name="EPr_default_reminders_title">Öntanımlı Hatırlatmalar</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_desc">Geçerli: %s</string>
-  
-  <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
-  <string name="EPr_default_addtocalendar_title">Öntanımlı olarak Takvime Ekle</string>
-  <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
-  <string name="EPr_default_addtocalendar_desc_disabled">Yeni görevler Google Takvim\'de yeni bir olay oluşturmayacak</string>
-  <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
-  <string name="EPr_default_addtocalendar_desc">Yeni görevlerin olacağı takvim: \"%s\"</string>
-  
-  <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
-  <string name="EPr_default_reminders_mode_title">Varsayılan Zil/Titreşim tipi</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_mode_desc">Geçerli: %s</string>
-  
-  <string-array name="EPr_default_importance">
-    <!-- importance: labels for "Task Defaults" preference item. -->
-    <!-- slide 40b -->
-    <item>!!! (En yüksek)</item>
-    <item>!!</item>
-    <item>!</item>
-    <!-- slide 40c -->
-    <item>o (En Düşük)</item>
-  </string-array>
-  
-  <string-array name="EPr_default_urgency">
-    <!-- urgency: labels for "Task Defaults" preference item. -->
-    <!-- slide 41a-->
-    <item>Son tarih yok</item>
-    <!-- slide 41b -->
-    <item>Bugün</item>
-    <!-- slide 41c-->
-    <item>Yarın</item>
-    <!-- slide 41d -->
-    <item>Yarından Sonra</item>
-    <!-- slide 41e -->
-    <item>Gelecek Hafta</item>
-  </string-array>
-  
-  <string-array name="EPr_default_hideUntil">
-    <!-- hideUntil: labels for "Task Defaults" preference item. -->
-    <!-- slide 42a -->
-    <item>Gizleme</item>
-    <!-- slide 42b -->
-    <item>Görev günü</item>
-    <!-- slide 42c -->
-    <item>Son günden bir gün önce</item>
-    <!-- slide 42d-->
-    <item>Son günden bir hafta önce</item>
-  </string-array>
-  
-  <string-array name="EPr_default_reminders">
-    <!-- reminders: labels for "Task Defaults" preference item. -->
-    <!-- slide 43a -->
-    <item>Son gün hatırlatması yok</item>
-    <!-- slide 43b -->
-    <item>Son tarihte</item>
-    <!-- slide 43c -->
-    <item>Son tarih aşıldığında</item>
-    <!-- slide 43d -->
-    <item>Son tarihte ya da aşıldığında</item>
-  </string-array>
-  
-  <string-array name="EPr_default_addtocalendar">
-    <!-- addtocalendar: labels for "Task Defaults" preference item. -->
-    <item>@string/EPr_deactivated</item>
-  </string-array>      
+    <!-- Preferences: ideas tab -->
+    <string name="EPr_ideas_tab_enabled">Task ideas</string>
+    <string name="EPr_ideas_tab_description">Görevleri tamamlamak için fikir al</string>
 
+    <!-- Preferences: calendar event start time -->
+    <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
+    <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
+    <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
+
+    <string name="EPr_force_phone_layout">Telefon yerleşimini kullan</string>
+
+    <string name="EPr_show_featured_lists">Öne çıkan listeleri göster</string>
+
+    <!-- Configurations -->
+    <string name="EPr_configurations_title">Set configuration</string>
+    <string name="EPr_config_default">Default</string>
+    <string name="EPr_config_lite">Astrid Lite</string>
+
+    <!-- Dialog title when setting preference configuration -->
+    <string name="EPr_config_dialog_title">Set configuration?</string>
+    <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
+    <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
+
+    <!-- default configuration name for the above dialog -->
+    <string name="EPr_config_dialog_default_id">default</string>
+
+    <!-- Preference title for showing save and cancel buttons in task edit page -->
+    <string name="EPr_show_save_and_cancel">Show save and cancel</string>
+
+
+    <!-- Swipe between lists -->
+    <!-- Preference: swipe between lists performance -->
+    <string name="EPr_swipe_lists_performance_title">Listeler arası sürükleme</string>
+
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>Sürükleme yok</item>
+        <item>Bellek Koruma</item>
+        <item>Normal Başarım</item>
+        <item>Yüksek Başarım</item>
+    </string-array>
+
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <!-- slide 49a -->
+        <item>Listeler arası sürükleme etkisiz</item>
+        <item>Düşük başarım</item>
+        <item>Öntanımlı ayar</item>
+        <item>Daha çok sistem kaynağı kullan</item>
+    </string-array>
+
+    <string name="swipe_lists_helper_title">Listeler arası sürükleme</string>
+    <string name="swipe_lists_helper_header">Listelerde hızlı gezinme için sağa ya da sola kaydır
+    </string>
+    <string name="swipe_lists_helper_subtitle">Ayarlar -&gt; Görünüm içinden ayarları değiştir
+    </string>
+
+    <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
+
+    <string-array name="EPr_default_reminders_mode">
+        <!-- reminders duration: labels for "Task Defaults" preference item. -->
+        <item>@string/TEA_reminder_mode_once</item>
+        <item>@string/TEA_reminder_mode_five</item>
+        <item>@string/TEA_reminder_mode_nonstop</item>
+    </string-array>
+
+    <string-array name="EPr_themes">
+        <!-- theme_settings: labels for Theme preference menu -->
+        <!-- slide 36a-->
+        <item>Gündüz - Mavi</item>
+        <!-- slide 36b -->
+        <item>Gündüz - Kırmızı</item>
+        <!-- slide 36b -->
+        <item>Sky blue</item>
+        <!-- slide 36c -->
+        <item>Night</item>
+        <!-- slide 36d -->
+        <item>Transparent (white text)</item>
+        <!-- slide 36e -->
+        <item>Şeffaf (Siyah Metin)</item>
+    </string-array>
+
+    <string-array name="EPr_themes_widget">
+        <!-- slide 32i / 37a-->
+        <item>Uygulama ile aynı</item>
+        <item>Gündüz - Mavi</item>
+        <item>Gündüz - Kırmızı</item>
+        <item>Sky blue</item>
+        <item>Night</item>
+        <item>Transparent (white text)</item>
+        <item>Transparent (black text)</item>
+        <item>Eski Biçem</item>
+    </string-array>
+
+    <!-- ========================================== Task Management Settings == -->
+
+    <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
+    <string name="EPr_manage_header">Eski Görevleri Yönet</string>
+    <!-- slide 47d -->
+    <string name="EPr_manage_delete_completed">Tamamlanan Görevleri Sil</string>
+    <string name="EPr_manage_delete_completed_message">Gerçekten tüm tamamlanmış görevleri silmek
+        istiyor musun?
+    </string>
+    <!-- slide 47a -->
+    <string name="EPr_manage_delete_completed_summary">Silinen görevler tek tek yeniden
+        yüklenebilir
+    </string>
+    <string name="EPr_manage_delete_completed_status">%d görev silindi!</string>
+    <!-- slide 47e -->
+    <string name="EPr_manage_purge_deleted">Silinen Görevleri Temizle</string>
+    <string name="EPr_manage_purge_deleted_message">Tüm silinen görevleri temizlemek istediğine emin
+        misin?\n\nBu görevler tamamen silinecek!
+    </string>
+    <string name="EPr_manage_purge_deleted_status">%d görev temizlendi!</string>
+    <!-- slide 47b-->
+    <string name="EPr_manage_purge_deleted_summary">Uyarı! Temizlenen görevler yedek dosyası olmadan
+        kurtarılamaz!
+    </string>
+    <!-- slide 47h-->
+    <string name="EPr_manage_clear_all">Tüm Veriyi Temizle</string>
+    <string name="EPr_manage_clear_all_message">Astrid ayarları ve tüm görevler silinsin
+        mi?\n\nUyarı: geri alınamaz!
+    </string>
+
+    <!-- slide 47f -->
+    <string name="EPr_manage_delete_completed_gcal">Tamamlanan görevler için Takvim olaylarını sil
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_message">Tamamlanmış görevlerden bütün olayları
+        silmek istediğinize emin misiniz?
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_summary"></string>
+    <string name="EPr_manage_delete_completed_gcal_status">%d takvim olayı silindi!</string>
+
+    <!-- slide 47g-->
+    <string name="EPr_manage_delete_all_gcal">Görevlerdeki Bütün Takvim Olaylarını Sil</string>
+    <string name="EPr_manage_delete_all_gcal_message">Görevlerdeki bütün olayları silmek
+        istediğinize emin misiniz?
+    </string>
+    <string name="EPr_manage_delete_all_gcal_summary"></string>
+    <string name="EPr_manage_delete_all_gcal_status">%d takvim olayı silindi!</string>
+
+    <!-- ==================================================== AddOnActivity == -->
+
+    <!-- Add Ons Activity Title -->
+    <string name="AOA_title">Eklentiler</string>
+
+    <!-- Add-on Activity: author for internal authors  -->
+    <string name="AOA_internal_author">Astrid Takımı</string>
+
+    <!-- Add-on Activity: installed add-ons tab -->
+    <string name="AOA_tab_installed">Yüklenen</string>
+
+    <!-- Add-on Activity - available add-ons tab -->
+    <string name="AOA_tab_available">Kullanılabilir</string>
+
+    <!-- Add-on Activity - free add-ons label -->
+    <string name="AOA_free">Ücretsiz</string>
+
+    <!-- Add-on Activity - menu item to visit add-on website -->
+
+    <!-- Add-on Activity - menu item to visit android market -->
+
+    <!-- Add-on Activity - when list is empty -->
+    <string name="AOA_no_addons">Liste Boş!</string>
+
+    <string name="AOA_ppack_title">Astrid Power Pack</string>
+    <string name="AOA_ppack_description">Support Astrid and get more productive with the Power Pack.
+        4x2 and 4x4 widgets and voice integration. Power up today!
+    </string>
+    <string name="AOA_locale_title">Astrid Locale Plugin</string>
+    <string name="AOA_locale_description">Allows Astrid to make use of the Locale application to
+        send you notifications based on filter conditions. Requires Locale.
+    </string>
+
+    <!-- ====================================================== TasksWidget == -->
+
+    <!-- Widget text when loading tasks -->
+    <string name="TWi_loading">Yükleniyor...</string>
+
+    <!-- Widget configuration activity title: select a filter -->
+    <string name="WCA_title">Görüntülenecek görevi seç...</string>
+
+    <!-- ======================================================== Waiting on me -->
+
+    <string name="wom_commented">%s commented on your task.</string>
+    <string name="wom_mentioned">%s mentioned you.</string>
+    <string name="wom_assigned">%s assigned this to you.</string>
+    <string name="wom_raised_pri">%s raised the priority.</string>
+    <string name="wom_changed_due">%s changed the due date.</string>
+    <string name="wom_default">%s wants your attention.</string>
+
+    <string name="wom_dismiss">Dismiss</string>
+    <string name="wom_acknowledge">I\'ve read this</string>
+
+    <!-- ============================================================= About == -->
+
+    <!-- slide 30h: Title of "About" option in settings -->
+    <string name="p_about">Astrid Hakkında</string>
+
+    <!-- About text (%s => current version)-->
+    <string name="p_about_text">Güncel versiyon: %s\n\n Astrid açık kaynak kodlu olarak Todoroo, Inc
+        tarafından gururla sürdürülmektedir.
+    </string>
+
+    <!-- Title of "Help" option in settings -->
+    <string name="p_help">Destek</string>
+
+    <!-- slide 30c: Title of "Forums" option in settings -->
+    <string name="p_forums">Forum</string>
+
+    <!-- Title of "Premium" option in settings -->
+    <string name="p_premium">Premium</string>
+
+    <!-- ============================================================= Misc == -->
+
+    <string name="feedback_positive_title">Rate Astrid?</string>
+
+    <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star
+        rating?
+    </string>
+
+    <string name="feedback_negative_title">Leave feedback?</string>
+
+    <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
+
+    <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback
+        section--it might not be available on your device.
+    </string>
+
+    <string name="feedback_positive_button">Rate Astrid</string>
+
+    <string name="feedback_negative_button">Leave feedback</string>
+
+    <string name="feedback_not_now">Not now</string>
+
+    <string name="feedback_banner_text">How\'s Astrid working for you?</string>
+
+    <!-- Displayed when task killer found. %s => name of the application -->
+    <string name="task_killer_help">Gönürüyor ki, işlemleri kapatabilen bir uygulama kullanıyorsunuz
+        (%s)! Mümkünse, Astrid\'i programın muafiyet listesine ekleyin ki kapatılamasın. Aksi
+        takdirde, Astrid görevlerin tarihi geldiğinde size bildiremeyebilir.\n
+    </string>
+
+    <!-- Task killer dialog ok button -->
+    <string name="task_killer_help_ok">Astrid\'i Kapatmayacağım!</string>
+
+    <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
+
+    <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
+    <string name="marketplace_description">Astrid çok sevilen, yapacaklarınızı yapmanıza yardım eden
+        açık kaynak kodlu bir hatırlatma / görev yönetimi programıdır. Hatırlatmalar, etiketlemeler,
+        senkronizasyon, Locale eklentisi, widget ve daha fazla özelliğe sahiptir.
+    </string>
+
+    <string name="DB_corrupted_title">Bozuk Veritabanı</string>
+
+    <string name="DB_corrupted_body">
+        Uh oh! It looks like you may have a corrupted database.
+        If you see this error regularly, we suggest you clear all
+        data (Settings->Sync and backup->Manage old tasks->Clear all data) and restore
+        your tasks from a backup (Settings->Sync and backup->Backup->Import tasks) in Astrid.
+    </string>
+
+    <string name="market_unavailable">Ne yazık ki market sisteminiz için kullanılabilir değil.
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 32g: Preference Category: Defaults Title -->
+    <string name="EPr_defaults_header">Yeni Görev Öntanımlıları</string>
+    <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
+
+    <!-- slide 41f:  Preference: Default Urgency Title -->
+    <string name="EPr_default_urgency_title">Öntanımlı Aciliyet</string>
+    <!-- Preference: Default Urgency Description (%s => setting) -->
+    <string name="EPr_default_urgency_desc">Geçerli: %s</string>
+
+    <!-- slide 40a: Preference: Default Importance Title -->
+    <string name="EPr_default_importance_title">Default priority</string>
+    <!-- Preference: Default Importance Description (%s => setting) -->
+    <string name="EPr_default_importance_desc">Geçerli: %s</string>
+
+    <!-- slide 42e: Preference: Default Hide Until Title -->
+    <string name="EPr_default_hideUntil_title">Öntanımlı Gizlenme</string>
+    <!-- Preference: Default Hide Until Description (%s => setting) -->
+    <string name="EPr_default_hideUntil_desc">Geçerli: %s</string>
+
+    <!-- slide 43e: Preference: Default Reminders Title -->
+    <string name="EPr_default_reminders_title">Öntanımlı Hatırlatmalar</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_desc">Geçerli: %s</string>
+
+    <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
+    <string name="EPr_default_addtocalendar_title">Öntanımlı olarak Takvime Ekle</string>
+    <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
+    <string name="EPr_default_addtocalendar_desc_disabled">Yeni görevler Google Takvim\'de yeni bir
+        olay oluşturmayacak
+    </string>
+    <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
+    <string name="EPr_default_addtocalendar_desc">Yeni görevlerin olacağı takvim: \"%s\"</string>
+
+    <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
+    <string name="EPr_default_reminders_mode_title">Varsayılan Zil/Titreşim tipi</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_mode_desc">Geçerli: %s</string>
+
+    <string-array name="EPr_default_importance">
+        <!-- importance: labels for "Task Defaults" preference item. -->
+        <!-- slide 40b -->
+        <item>!!! (En yüksek)</item>
+        <item>!!</item>
+        <item>!</item>
+        <!-- slide 40c -->
+        <item>o (En Düşük)</item>
+    </string-array>
+
+    <string-array name="EPr_default_urgency">
+        <!-- urgency: labels for "Task Defaults" preference item. -->
+        <!-- slide 41a-->
+        <item>Son tarih yok</item>
+        <!-- slide 41b -->
+        <item>Bugün</item>
+        <!-- slide 41c-->
+        <item>Yarın</item>
+        <!-- slide 41d -->
+        <item>Yarından Sonra</item>
+        <!-- slide 41e -->
+        <item>Gelecek Hafta</item>
+    </string-array>
+
+    <string-array name="EPr_default_hideUntil">
+        <!-- hideUntil: labels for "Task Defaults" preference item. -->
+        <!-- slide 42a -->
+        <item>Gizleme</item>
+        <!-- slide 42b -->
+        <item>Görev günü</item>
+        <!-- slide 42c -->
+        <item>Son günden bir gün önce</item>
+        <!-- slide 42d-->
+        <item>Son günden bir hafta önce</item>
+    </string-array>
+
+    <string-array name="EPr_default_reminders">
+        <!-- reminders: labels for "Task Defaults" preference item. -->
+        <!-- slide 43a -->
+        <item>Son gün hatırlatması yok</item>
+        <!-- slide 43b -->
+        <item>Son tarihte</item>
+        <!-- slide 43c -->
+        <item>Son tarih aşıldığında</item>
+        <!-- slide 43d -->
+        <item>Son tarihte ya da aşıldığında</item>
+    </string-array>
+
+    <string-array name="EPr_default_addtocalendar">
+        <!-- addtocalendar: labels for "Task Defaults" preference item. -->
+        <item>@string/EPr_deactivated</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in filter plug-in -->
-    
+
     <!-- ================================================= Filter Exposer == -->
-    
+
     <!-- Active Tasks Filter -->
     <string name="BFE_Active">My Tasks</string>
-    
+
     <!-- Waiting on me filter -->
     <string name="BFE_waiting_on_me">Waiting On Me</string>
-        
+
     <!-- Search Filter -->
-    
+
     <!-- slide 10b: Recently Modified -->
     <string name="BFE_Recent">Yakında Değiştirilenler</string>
-    
+
     <!-- slide 10c: I\'ve assigned -->
     <string name="BFE_Assigned">Atanmış bulunuyorum</string>
-    
+
     <!-- Build Your Own Filter -->
-    
+
     <!-- Saved Filters Header -->
-    
+
     <!-- Saved Filters Context Menu: delete -->
     <string name="BFE_Saved_delete">Süzgeci Sil</string>
 
     <!-- =========================================== CustomFilterActivity == -->
-    
+
     <!-- slide 30d: Build Your Own Filter Activity Title-->
     <string name="CFA_title">Özel Süzgeç</string>
-    
+
     <!-- slide 30e: Filter Name edit box hint (if user types here, filter will be saved) -->
     <string name="CFA_filterName_hint">Süzgeci kaydetmek için ad yazın...</string>
-    
+
     <!-- Filter Name default for copied filters (%s => old filter name) -->
-    
+
     <!-- slide 30a: Filter Starting Universe: all tasks -->
     <string name="CFA_universe_all">Etkin Görevler</string>
-    
+
     <!-- Filter Criteria Type: add (at the begging of title of the criteria) -->
     <string name="CFA_type_add">ya da</string>
-    
+
     <!-- Filter Criteria Type: subtract (at the begging of title of the criteria) -->
     <string name="CFA_type_subtract">değil</string>
-    
+
     <!-- Filter Criteria Type: intersect (at the begging of title of the criteria) -->
     <string name="CFA_type_intersect">aynı zamanda</string>
-    
+
     <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
     <string name="CFA_context_chain">%s ölçütüne sahip</string>
-    
+
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">Satırı Sil</string>
-    
+
     <!-- slide 30b: Filter Screen Help Text -->
     <string name="CFA_help">Long press on items for additional options</string>
-    
+
     <!-- slide 30c: Filter Button: add new -->
     <string name="CFA_button_add">Ölçüt Ekle</string>
-    
+
     <!-- slide 30f: Filter Button: view without saving -->
     <string name="CFA_button_view">Görüntüle</string>
-    
+
     <!-- Filter Button: save & view filter -->
     <string name="CFA_button_save">Kaydet &amp; Görüntüle</string>
 
     <!-- =========================================== CustomFilterCriteria == -->
-        
+
     <!-- Criteria: due by X - display text (? -> user input) -->
     <string name="CFC_dueBefore_text">Şu tarihte: ?</string>
     <!-- Criteria: due by X - name of criteria -->
@@ -1701,322 +1842,352 @@
         <item>Gelecek Hafta</item>
         <item>Gelecek Ay</item>
     </string-array>
-    
+
     <!-- Criteria: importance - display text (? -> user input)-->
     <string name="CFC_importance_text">Priority at least ?</string>
     <!-- Criteria: importance - name of criteria -->
-    <string name="CFC_importance_name">Priority...</string>        
-    
+    <string name="CFC_importance_name">Priority...</string>
+
     <!-- Criteria: tag - display text (? -> user input) -->
     <string name="CFC_tag_text">Liste:?</string>
     <!-- Criteria: tag - name of criteria -->
     <string name="CFC_tag_name">Liste...</string>
-    
+
     <!-- Criteria: tag_contains - name of criteria -->
     <string name="CFC_tag_contains_name">Liste isminde şu olan:</string>
     <!-- Criteria: tag_contains - text (? -> user input) -->
     <string name="CFC_tag_contains_text">Liste isminde şu olan:?</string>
-    
+
     <!-- Criteria: title_contains - name of criteria -->
     <string name="CFC_title_contains_name">Başlık şunu içersin...</string>
     <!-- Criteria: title_contains - text (? -> user input) -->
     <string name="CFC_title_contains_text">Başlık şunu içersin:?</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-  
-  <!-- Error message for adding to calendar  -->
-  <string name="gcal_TEA_error">Takvime görev eklenmesinde hata!</string>
-
-  <!-- Label for adding task to calendar -->
-
-  <!-- slide 21c: Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">Takvime Ekle</string>
-  
-  <!-- Label when calendar event already exists -->
-  <string name="gcal_TEA_showCalendar_label">Takvim Olayı Aç</string>
-  
-  <!-- Toast when unable to open calendar event -->
-  
-  <!-- Toast when calendar event updated because task changed -->
-  <string name="gcal_TEA_calendar_updated">Takvim olayı da güncellendi!</string>
-  
-  <!-- No calendar label (don\'t add option) -->
-  <string name="gcal_TEA_nocal">Ekleme</string>
-  
-  <string name="gcal_TEA_none_selected">To calendar?</string>
-  
-  <string name="gcal_TEA_has_event">Takvim olayı</string>
-  
-  <!-- ======================================================== Calendars == -->
-  
-  <!-- Calendar event name when task is completed (%s => task title) -->
-  <string name="gcal_completed_title">%s (tamamlandı)</string>
-
-  <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
-  <string name="gcal_GCP_default">Öntanımlı Takvim</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Error message for adding to calendar  -->
+    <string name="gcal_TEA_error">Takvime görev eklenmesinde hata!</string>
 
+    <!-- Label for adding task to calendar -->
 
+    <!-- slide 21c: Label for adding task to calendar -->
+    <string name="gcal_TEA_addToCalendar_label">Takvime Ekle</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Label when calendar event already exists -->
+    <string name="gcal_TEA_showCalendar_label">Takvim Olayı Aç</string>
+
+    <!-- Toast when unable to open calendar event -->
+
+    <!-- Toast when calendar event updated because task changed -->
+    <string name="gcal_TEA_calendar_updated">Takvim olayı da güncellendi!</string>
+
+    <!-- No calendar label (don\'t add option) -->
+    <string name="gcal_TEA_nocal">Ekleme</string>
+
+    <string name="gcal_TEA_none_selected">To calendar?</string>
+
+    <string name="gcal_TEA_has_event">Takvim olayı</string>
+
+    <!-- ======================================================== Calendars == -->
+
+    <!-- Calendar event name when task is completed (%s => task title) -->
+    <string name="gcal_completed_title">%s (tamamlandı)</string>
+
+    <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
+    <string name="gcal_GCP_default">Öntanımlı Takvim</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ============================================================= UI == -->
 
     <!-- filters header: GTasks -->
     <string name="gtasks_FEx_header">Google Görevleri</string>
-    
+
     <!-- filter category for GTasks lists -->
-    
+
     <!-- filter title for GTasks lists (%s => list name) -->
     <string name="gtasks_FEx_title">Google Görevleri: %s</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_creating_list">Liste oluşturuluyor...</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_create_list_dialog">Yeni Liste Adı:</string>
-    
+
     <!-- error to show when list creation fails -->
     <string name="gtasks_FEx_create_list_error">Yeni liste oluşturmada hata</string>
-    
+
     <!-- short help title for Gtasks -->
-    
+
     <string name="CFC_gtasks_list_text">Liste içinde: ?</string>
 
     <string name="CFC_gtasks_list_name">Gtasks Listesi içinde...</string>
-    
+
     <!-- Message while clearing completed tasks -->
     <string name="gtasks_GTA_clearing">Tamamlanan görevler temizleniyor...</string>
-    
+
     <!-- Label for clear completed menu item -->
     <string name="gtasks_GTA_clear_completed">Tamamlanları Temizle</string>
-        
+
     <!-- ============================================ GtasksLoginActivity == -->
-    
-    <!-- Activity Title: Gtasks Login -->    
 
-    <!-- Instructions: Gtasks login -->    
-    <string name="gtasks_GLA_body">Lütfen Google Görevler Eşleştirmesi\'ne (Beta!) giriş yapın. Taşınmamış Google Apps hesapları şu an desteklenmemektedir.</string>
-    
+    <!-- Activity Title: Gtasks Login -->
+
+    <!-- Instructions: Gtasks login -->
+    <string name="gtasks_GLA_body">Lütfen Google Görevler Eşleştirmesi\'ne (Beta!) giriş yapın.
+        Taşınmamış Google Apps hesapları şu an desteklenmemektedir.
+    </string>
+
     <string name="gtasks_GLA_noaccounts">Eşleştirilecek Google hesabı mevcut değil.</string>
 
-    <!-- Instructions: Gtasks further help -->    
-    <string name="gtasks_GLA_further_help">Görevleri, sıralaması korunmuş ve girintili görebilmek için süzgeçler sayfasına gidin ve bir Google Görevler Listesine ekleyin. Öntanımlı olarak, Astrid görevler için kendi sınıflama ayarlarını kullanır.</string>
+    <!-- Instructions: Gtasks further help -->
+    <string name="gtasks_GLA_further_help">Görevleri, sıralaması korunmuş ve girintili görebilmek
+        için süzgeçler sayfasına gidin ve bir Google Görevler Listesine ekleyin. Öntanımlı olarak,
+        Astrid görevler için kendi sınıflama ayarlarını kullanır.
+    </string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
 
-    <!-- E-mail Address Label -->    
+    <!-- E-mail Address Label -->
+
+    <!-- Password Label -->
 
-    <!-- Password Label -->    
-    
     <!--  Authenticating toast -->
     <string name="gtasks_GLA_authenticating">Kimlik doğrulanıyor...</string>
-    
+
     <!-- Google Apps for Domain checkbox -->
 
-    <!-- Error Message when fields aren\'t filled out -->    
+    <!-- Error Message when fields aren\'t filled out -->
 
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
-    <string name="gtasks_GLA_errorAuth">Giriş başarısız! Lütfen kullanıcı ismi ve parolanızı telefondaki hesap yöneticisinden denetleyin</string>
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
+    <string name="gtasks_GLA_errorAuth">Giriş başarısız! Lütfen kullanıcı ismi ve parolanızı
+        telefondaki hesap yöneticisinden denetleyin
+    </string>
+
+    <!-- Error Message when we receive an IO Exception -->
+    <string name="gtasks_GLA_errorIOAuth">Üzgünüm, Google sunucuları ile bağlanmakta sıkıntı
+        yaşıyoruz. Lütfen daha sonra yeniden deneyin.
+    </string>
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->
+    <string name="gtasks_GLA_errorAuth_captcha">Doğrulama (CAPTCHA) ile karşılaşmış olabilirsiniz.
+        İnternet gezgini ile giriş yapıp sonra tekrar buradan deneyin:
+    </string>
 
-    <!-- Error Message when we receive an IO Exception -->    
-    <string name="gtasks_GLA_errorIOAuth">Üzgünüm, Google sunucuları ile bağlanmakta sıkıntı yaşıyoruz. Lütfen daha sonra yeniden deneyin.</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->    
-    <string name="gtasks_GLA_errorAuth_captcha">Doğrulama (CAPTCHA) ile karşılaşmış olabilirsiniz. İnternet gezgini ile giriş yapıp sonra tekrar buradan deneyin:</string>
-    
     <!-- ============================================== GtasksPreferences == -->
 
-    <!-- GTasks Preferences Title -->    
+    <!-- GTasks Preferences Title -->
     <string name="gtasks_GPr_header">Google Görevleri (Beta!)</string>
-    
-    <!-- ================================================ Synchronization == -->    
-    
+
+    <!-- ================================================ Synchronization == -->
+
     <!-- title for notification tray when synchronizing -->
 
     <!-- Error Message when we receive a HTTP 503 error -->
-    <string name="gtasks_error_backend">Google Görev API Beta sürümü bir hata ile karşılaştı. Hizmet çalışmıyor olabilir, lütfen sonra tekrar deneyin.</string>
-    
+    <string name="gtasks_error_backend">Google Görev API Beta sürümü bir hata ile karşılaştı. Hizmet
+        çalışmıyor olabilir, lütfen sonra tekrar deneyin.
+    </string>
+
     <!-- Error for account not found -->
-    <string name="gtasks_error_accountNotFound">%s hesabı bulunamadı--lütfen çıkış yapıp Google Görev ayarlarından tekrar giriş yapın.</string>
-    
+    <string name="gtasks_error_accountNotFound">%s hesabı bulunamadı--lütfen çıkış yapıp Google
+        Görev ayarlarından tekrar giriş yapın.
+    </string>
+
     <!-- Error when ping after refreshing token fails -->
-    <string name="gtasks_error_authRefresh">Google Görevlere giriş başarısız. Lütfen hesap parolanızı kontrol edip tekrar deneyin.</string>
-    
+    <string name="gtasks_error_authRefresh">Google Görevlere giriş başarısız. Lütfen hesap
+        parolanızı kontrol edip tekrar deneyin.
+    </string>
+
     <!-- Error when account manager returns no auth token or throws exception -->
-    <string name="gtasks_error_accountManager">Telefon hesap yöneticisinde hata oluştu. Lütfen çıkış yapıp Google Görevler Ayarlarından tekrar giriş yapın.</string>
+    <string name="gtasks_error_accountManager">Telefon hesap yöneticisinde hata oluştu. Lütfen çıkış
+        yapıp Google Görevler Ayarlarından tekrar giriş yapın.
+    </string>
 
     <!-- Error when authorization error happens in background sync -->
-    <string name="gtasks_error_background_sync_auth">Artalanda kimlik doğrulama hatası. Lütfen Astrid çalışırken bir eşlemeyi sıfırlamayı deneyin.</string>
-      
+    <string name="gtasks_error_background_sync_auth">Artalanda kimlik doğrulama hatası. Lütfen
+        Astrid çalışırken bir eşlemeyi sıfırlamayı deneyin.
+    </string>
+
     <string name="gtasks_import_progress">Importing Google Tasks...</string>
 
-    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you still want to add the task %2$s to it?</string>
+    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you
+        still want to add the task %2$s to it?
+    </string>
 
     <string name="gtasks_import_dlg_title">Google Tasks Import</string>
 
     <string name="gtasks_import_add_task_ok">Add task</string>
 
     <string name="gtasks_import_add_task_cancel">Don\'t add task</string>
-        
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- NEW USER EXPERIENCE -->
-  
-  <!-- help bubbles -->
-  <!-- slide 8c: Shown the first time a user sees the task list activity -->
-  <string name="help_popover_add_task">Birkaç görev ekleyerek işe başlayın</string>
-
-  <!-- Shown the first time a user adds a task to a list -->  
-  <string name="help_popover_tap_task">Değiştirmek veya paylaşmak için göreve dokunun</string>
-  
-  <!-- slide 14a: Shown the first time a user sees the list activity -->
-  <string name="help_popover_list_settings">Değiştirmek veya paylaşmak için listeye dokunun</string>
-  
-  <!-- slide 26c: Shown the first time a user sees the list settings tab -->
-  <string name="help_popover_collaborators">Görevlerinizi paylaştığınız insanlar liste\nyapmanıza ya da iş bitirmeye yardım edebilir</string>
-  
-  <!-- Shown after user adds a task on tablet-->
-  <string name="help_popover_add_lists">Bir listeye eklemek için dokun</string>
-  
-  <!-- Shown after a user adds a task on phones -->
-  <string name="help_popover_switch_lists">Bir liste eklemek için ya da listeyi değiştirmek için dokunun</string>
-  
-  
-  
-  <!-- Login activity -->
-  
-  
-  <!-- slide 7b -->
-  <string name="welcome_login_tos_base">Astridi kullanarak kabul ettiğiniz metin:</string>
-  
-  <string name="welcome_login_tos_link">Kullanım Şartları</string>
-  
-  <!-- slide 7e -->
-  <string name="welcome_login_pw">Sign up</string>
-  
-  <string name="welcome_sign_in">Giriş yap</string>
-
-  <!-- slide 7f -->
-  <string name="welcome_login_later">Sonra</string>
-  
-  <string name="welcome_login_confirm_later_title">Neden giriş yapmıyorsun?</string>
-  
-  <string name="welcome_login_confirm_later_ok">Yapacağım!</string>
-  
-  <string name="welcome_login_confirm_later_cancel">Hayır, teşekkürler</string>
-  
-  <string name="welcome_login_confirm_later_dialog">Astridden mümkün olduğunca faydalanmak için giriş yapın. Ücretsiz olarak çevirimiçi yedekleme, Astrid.com ile senkronizasyon, email ile görev ekleme ve arkadaşlar ile görev listesi paylaşma özelliklerine ulaşın.</string>
+    <!-- NEW USER EXPERIENCE -->
 
+    <!-- help bubbles -->
+    <!-- slide 8c: Shown the first time a user sees the task list activity -->
+    <string name="help_popover_add_task">Birkaç görev ekleyerek işe başlayın</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown the first time a user adds a task to a list -->
+    <string name="help_popover_tap_task">Değiştirmek veya paylaşmak için göreve dokunun</string>
 
+    <!-- slide 14a: Shown the first time a user sees the list activity -->
+    <string name="help_popover_list_settings">Değiştirmek veya paylaşmak için listeye dokunun
+    </string>
 
-  <!-- Resources for built-in locale plug-in -->
-
-  <!-- Locale Alert Editing Window Title -->
-  <string name="locale_edit_alerts_title">Astrid Süzgeç Alarmı</string>
-  
-  <!-- Locale Window Help -->                                                                                                                                            
-  <string name="locale_edit_intro">İlgili süzgeçte herhangi bir görev olduğunda Astrid size hatırlatma gönderecektir.</string>
-      
-  <!-- Locale Window Filter Picker UI -->                                                                                                                                        
-      
-  <!-- Locale Window Interval Label -->                                                                                                                                        
-  <string name="locale_interval_label">Bildirimleri sınırlandır:</string>        
-      
-  <!-- Locale Window Interval Values -->                                                                                                                                        
-  <string-array name="locale_interval">
-    <item>saatte bir</item>
-    <item>altı saatte bir</item>
-    <item>on iki saatte bir</item>
-    <item>günde bir</item>
-    <item>üç günde bir</item>
-    <item>haftada bir</item>
-  </string-array>        
-      
-  <!-- Locale Notification text -->                                                                                                                                        
-  <string name="locale_notification">$FILTER konumunda $NUM var</string>     
-      
-  <!-- Locale Plugin was not found, it is required -->
-  <string name="locale_plugin_required">Lütfen Astrid Locale eklentisini yükleyin!</string>        
-     
+    <!-- slide 26c: Shown the first time a user sees the list settings tab -->
+    <string name="help_popover_collaborators">Görevlerinizi paylaştığınız insanlar liste\nyapmanıza
+        ya da iş bitirmeye yardım edebilir
+    </string>
 
+    <!-- Shown after user adds a task on tablet-->
+    <string name="help_popover_add_lists">Bir listeye eklemek için dokun</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown after a user adds a task on phones -->
+    <string name="help_popover_switch_lists">Bir liste eklemek için ya da listeyi değiştirmek için
+        dokunun
+    </string>
+
+
+    <!-- Login activity -->
+
+
+    <!-- slide 7b -->
+    <string name="welcome_login_tos_base">Astridi kullanarak kabul ettiğiniz metin:</string>
+
+    <string name="welcome_login_tos_link">Kullanım Şartları</string>
+
+    <!-- slide 7e -->
+    <string name="welcome_login_pw">Sign up</string>
+
+    <string name="welcome_sign_in">Giriş yap</string>
+
+    <!-- slide 7f -->
+    <string name="welcome_login_later">Sonra</string>
+
+    <string name="welcome_login_confirm_later_title">Neden giriş yapmıyorsun?</string>
+
+    <string name="welcome_login_confirm_later_ok">Yapacağım!</string>
+
+    <string name="welcome_login_confirm_later_cancel">Hayır, teşekkürler</string>
+
+    <string name="welcome_login_confirm_later_dialog">Astridden mümkün olduğunca faydalanmak için
+        giriş yapın. Ücretsiz olarak çevirimiçi yedekleme, Astrid.com ile senkronizasyon, email ile
+        görev ekleme ve arkadaşlar ile görev listesi paylaşma özelliklerine ulaşın.
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in locale plug-in -->
+
+    <!-- Locale Alert Editing Window Title -->
+    <string name="locale_edit_alerts_title">Astrid Süzgeç Alarmı</string>
+
+    <!-- Locale Window Help -->
+    <string name="locale_edit_intro">İlgili süzgeçte herhangi bir görev olduğunda Astrid size
+        hatırlatma gönderecektir.
+    </string>
+
+    <!-- Locale Window Filter Picker UI -->
+
+    <!-- Locale Window Interval Label -->
+    <string name="locale_interval_label">Bildirimleri sınırlandır:</string>
+
+    <!-- Locale Window Interval Values -->
+    <string-array name="locale_interval">
+        <item>saatte bir</item>
+        <item>altı saatte bir</item>
+        <item>on iki saatte bir</item>
+        <item>günde bir</item>
+        <item>üç günde bir</item>
+        <item>haftada bir</item>
+    </string-array>
+
+    <!-- Locale Notification text -->
+    <string name="locale_notification">$FILTER konumunda $NUM var</string>
+
+    <!-- Locale Plugin was not found, it is required -->
+    <string name="locale_plugin_required">Lütfen Astrid Locale eklentisini yükleyin!</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ====================== Plugin Boilerplate ========================= -->
 
-	<!-- filters header: OpenCRX -->
+    <!-- filters header: OpenCRX -->
     <string name="opencrx_FEx_header">OpenCRX</string>
-    
+
     <!-- filter category for OpenCRX ActivityCreators -->
     <string name="opencrx_FEx_dashboard">Çalışma Alanları</string>
-    
+
     <!-- filter category for OpenCRX responsible person -->
     <string name="opencrx_FEx_responsible">Atanan</string>
-    
+
     <!--  OpenCRX assignedTo filter title (%s => assigned contact) -->
     <string name="opencrx_FEx_responsible_title">Atandı: \'%s\'</string>
-    
+
     <!-- detail for showing tasks created by someone else (%s => person name) -->
     <string name="opencrx_PDE_task_from">%s\'den</string>
-    
+
     <!-- replacement string for task edit "Notes" when using OpenCRX -->
     <string name="opencrx_TEA_notes">Yorum Ekle</string>
-    
+
     <string name="opencrx_creator_input_hint">Oluşturan</string>
 
     <string name="opencrx_contact_input_hint">Atanan:</string>
     <!-- ==================================================== Preferences == -->
 
-    <!-- Preferences Title: OpenCRX -->    
+    <!-- Preferences Title: OpenCRX -->
     <string name="opencrx_PPr_header">OpenCRX</string>
 
     <!-- creator title for tasks that are not synchronized -->
     <string name="opencrx_no_creator">(Eşleştirme Yapma)</string>
 
-	<!-- preference title for default creator -->
+    <!-- preference title for default creator -->
     <string name="opencrx_PPr_defaultcreator_title">Öntanımlı EtkinlikOluşturucu</string>
 
     <!-- preference description for default creator (%s -> setting) -->
-    <string name="opencrx_PPr_defaultcreator_summary">Yeni etkinlikleri oluşturacak kişi: %s</string>
+    <string name="opencrx_PPr_defaultcreator_summary">Yeni etkinlikleri oluşturacak kişi: %s
+    </string>
 
     <!-- preference description for default dashboard (when set to \'not synchronized\') -->
-    <string name="opencrx_PPr_defaultcreator_summary_none">Yeni etkinlikler öntanımlı olarak eşleştirilmeyecek</string>
-    
+    <string name="opencrx_PPr_defaultcreator_summary_none">Yeni etkinlikler öntanımlı olarak
+        eşleştirilmeyecek
+    </string>
+
     <!--  OpenCRX host and segment group name -->
     <string name="opencrx_group">OpenCRX sunucu</string>
 
@@ -2025,81 +2196,88 @@
 
     <!--  dialog title for OpenCRX host -->
     <string name="opencrx_host_dialog_title">OpenCRX sunucusu</string>
-    
+
     <!--  example for OpenCRX host -->
-    <string name="opencrx_host_summary">"Örnek: "<i>mydomain.com</i></string>
-    
+    <string name="opencrx_host_summary">"Örnek: "
+        <i>mydomain.com</i>
+    </string>
+
     <!--  preference description for OpenCRX segment -->
     <string name="opencrx_segment_title">Parça</string>
 
     <!--  dialog title for OpenCRX segment -->
     <string name="opencrx_segment_dialog_title">Eşleştirilen parça</string>
-    
+
     <!--  example for OpenCRX segment -->
-    <string name="opencrx_segment_summary">"Örnek: "<i>Standard</i></string>
-    
+    <string name="opencrx_segment_summary">"Örnek: "
+        <i>Standard</i>
+    </string>
+
     <!--  default value for OpenCRX segment -->
     <string name="opencrx_segment_default">Standart</string>
-    
+
     <!--  preference description for OpenCRX provider -->
     <string name="opencrx_provider_title">Sağlayıcı</string>
 
     <!--  dialog title for OpenCRX provider -->
     <string name="opencrx_provider_dialog_title">OpenCRX veri sağlayıcı</string>
-    
+
     <!--  example for OpenCRX provider -->
-    <string name="opencrx_provider_summary">"Örnek: "<i>CRX</i></string>
-    
+    <string name="opencrx_provider_summary">"Örnek: "
+        <i>CRX</i>
+    </string>
+
     <!--  default value for OpenCRX provider -->
     <string name="opencrx_provider_default">CRX</string>
     <!-- ================================================= Login Activity == -->
 
-    <!-- Activity Title: Opencrx Login -->    
+    <!-- Activity Title: Opencrx Login -->
     <string name="opencrx_PLA_title">OpenCRX\'e bağlan</string>
 
-    <!-- Instructions: Opencrx login -->    
+    <!-- Instructions: Opencrx login -->
     <string name="opencrx_PLA_body">OpenCRX hesabınız ile giriş yapın</string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
     <string name="opencrx_PLA_signIn">Giriş Yap</string>
 
-    <!-- Login Label -->    
+    <!-- Login Label -->
     <string name="opencrx_PLA_login">Oturum Aç</string>
 
-    <!-- Password Label -->    
+    <!-- Password Label -->
     <string name="opencrx_PLA_password">Parola</string>
-    
-        <!-- Error Message when fields aren\'t filled out -->    
+
+    <!-- Error Message when fields aren\'t filled out -->
     <string name="opencrx_PLA_errorEmpty">Hata: Tüm alanları doldurun</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
     <string name="opencrx_PLA_errorAuth">Hata: kullanıcı adı ya da parola geçersiz!</string>
 
     <!-- ================================================ Synchronization == -->
-        
+
     <!-- title for notification tray after synchronizing -->
     <string name="opencrx_notification_title">OpenCRX</string>
-    
+
     <!-- text for notification tray when synchronizing -->
-    <string name="opencrx_notification_text">%s görev güncellendi / daha fazla bilgi için tıklayın</string>
-    
+    <string name="opencrx_notification_text">%s görev güncellendi / daha fazla bilgi için tıklayın
+    </string>
+
     <!-- Error msg when io exception  -->
     <string name="opencrx_ioerror">Bağlantı Hatası! Internet bağlantınızı kontrol edin.</string>
 
     <!-- opencrx Login not specified-->
     <string name="opencrx_MLA_email_empty">Giriş seçimi yapılmadı!</string>
-    
+
     <!-- opencrx password not specified-->
     <string name="opencrx_MLA_password_empty">Parola belirtilmemiş!</string>
-    
+
     <!-- ================================================ labels for layout-elements == -->
-    
+
     <!-- label for task-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_task_assign_label">Bu görevi şu kişiye ata:</string>
-    
+
     <!-- Spinner-item for unassigned tasks on taskeditactivity -->
     <string name="opencrx_TEA_task_unassigned">&lt;Atanmamış&gt;</string>
-    
+
     <!-- label for dashboard-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_creator_assign_label">Bu görevi şu sahibe ata:</string>
 
@@ -2107,7 +2285,7 @@
     <string name="opencrx_TEA_dashboard_default">&lt;Öntanımlı&gt;</string>
 
     <string name="opencrx_TEA_opencrx_title">OpenCRX Ayarları</string>
-        
+
     <string name="CFC_opencrx_in_workspace_text">Çalışma alanında: ?</string>
 
     <string name="CFC_opencrx_in_workspace_name">Çalışma alanında...</string>
@@ -2117,70 +2295,85 @@
     <string name="CFC_opencrx_assigned_to_name">Atandı...</string>
 
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
+    <!-- ================================================== EditPreferences == -->
 
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 32j: Preference Category: Power Pack -->
-  <string name="EPr_powerpack_header">Advanced settings</string>
-  <string name="EPr_powerpack_summary">Çağrı hatırlatıcılar, ses girdileri ve çeşitli ayarlar</string>
-  
-  <!-- slide 32e: Preference: Anonymous User Statistics -->
-  <string name="EPr_statistics_title">Anonim kullanım istatistikleri</string>
-  <!-- Preference: User Statistics (disabled) -->
-  <string name="EPr_statistics_desc_disabled">Kullanım verisi raporlanmadı</string>  
-  <!-- slide 32f: Preference: User Statistics (enabled) -->
-  <string name="EPr_statistics_desc_enabled">Anonim kullanım istatistiklerini göndererek Astrid\'i geliştirmemize yardımcı olun</string>
-      
+    <!-- slide 32j: Preference Category: Power Pack -->
+    <string name="EPr_powerpack_header">Advanced settings</string>
+    <string name="EPr_powerpack_summary">Çağrı hatırlatıcılar, ses girdileri ve çeşitli ayarlar
+    </string>
 
+    <!-- slide 32e: Preference: Anonymous User Statistics -->
+    <string name="EPr_statistics_title">Anonim kullanım istatistikleri</string>
+    <!-- Preference: User Statistics (disabled) -->
+    <string name="EPr_statistics_desc_disabled">Kullanım verisi raporlanmadı</string>
+    <!-- slide 32f: Preference: User Statistics (enabled) -->
+    <string name="EPr_statistics_desc_enabled">Anonim kullanım istatistiklerini göndererek Astrid\'i
+        geliştirmemize yardımcı olun
+    </string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
-    <string name="speech_err_network">Ağ hatası! Konuşmanın tanınması çalışması için bir ağ bağlantısına gerek duyar.</string>
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <string name="speech_err_network">Ağ hatası! Konuşmanın tanınması çalışması için bir ağ
+        bağlantısına gerek duyar.
+    </string>
     <string name="speech_err_no_match">Üzgünüm, bunu anlayamadım! Lütfen yeniden deneyin.</string>
-    <string name="speech_err_default">Üzgünüm, konuşma tanınma işlevi hata verdi. Lütfen yeniden deneyin.</string>
-    
+    <string name="speech_err_default">Üzgünüm, konuşma tanınma işlevi hata verdi. Lütfen yeniden
+        deneyin.
+    </string>
+
     <string name="premium_attach_file">Bir dosya ekle</string>
     <string name="premium_record_audio">Bir not kaydet</string>
     <string name="premium_no_files">Ekli dosya yok</string>
     <string name="premium_remove_file_confirm">Emin misiniz? Geri döndürülemez</string>
-    
+
     <string name="audio_recording_title">Ses Kaydediliyor</string>
     <string name="audio_stop_recording">Kaydı Durdur</string>
     <string name="audio_speak_now">Şimdi Konuşun!</string>
     <string name="audio_encoding">Kodlanıyor...</string>
     <string name="audio_err_encoding">Ses kodlanırken hata</string>
     <string name="audio_err_playback">Üzgünüm, sistem bu ses dosyası biçimini desteklemiyor</string>
-    
-    <string name="search_market_audio">Bu ses türünü çalan bir oynatıcı bulunamadı. Google Play\'den bir ses yürütücüsü indirmek iste misiniz?</string>
+
+    <string name="search_market_audio">Bu ses türünü çalan bir oynatıcı bulunamadı. Google Play\'den
+        bir ses yürütücüsü indirmek iste misiniz?
+    </string>
     <string name="search_market_audio_title">Ses oynatıcı bulunamadı</string>
 
-    <string name="search_market_pdf">PDF okuyucu bulunamadı. Google Play\'den bir PDF okuyucu indirmek iste misiniz?</string>
+    <string name="search_market_pdf">PDF okuyucu bulunamadı. Google Play\'den bir PDF okuyucu
+        indirmek iste misiniz?
+    </string>
     <string name="search_market_pdf_title">PDF okuyucu bulunamadı</string>
 
-    <string name="search_market_ms">MS Office okuyucu bulunamadı. Google Play\'den bir MS Office okuyucu indirmek iste misiniz?</string>
+    <string name="search_market_ms">MS Office okuyucu bulunamadı. Google Play\'den bir MS Office
+        okuyucu indirmek iste misiniz?
+    </string>
     <string name="search_market_ms_title">MS Office okuyucu bulunamadı</string>
-    
-    <string name="file_type_unhandled">Üzgünüm! Bu dosya türünü destekleyen bir uygulama bulunamadı.</string>
+
+    <string name="file_type_unhandled">Üzgünüm! Bu dosya türünü destekleyen bir uygulama
+        bulunamadı.
+    </string>
     <string name="file_type_unhandled_title">Uygulama bulunamadı</string>
-    
+
     <string name="file_prefix_image">Görüntü</string>
     <string name="file_prefix_voice">Ses</string>
     <string name="file_browser_up">Yukarı</string>
     <string name="file_browser_title">Bir dosya seçin</string>
     <string name="dir_browser_title">Bir dizin seçin</string>
-    <string name="file_browser_err_permissions">İzin hatası! Astrid\'in SD kartınıza erişiminin engellenmediğinden emin olun lütfen.</string>
+    <string name="file_browser_err_permissions">İzin hatası! Astrid\'in SD kartınıza erişiminin
+        engellenmediğinden emin olun lütfen.
+    </string>
     <string name="file_add_picture">Bir resim ekle</string>
     <string name="file_add_sdcard">SD kartınızdan bir dosya ekleyin</string>
     <string name="file_download_title">Dosya indir?</string>
@@ -2189,45 +2382,61 @@
     <string name="file_err_memory">Görüntü belleğe kaydedilmek için çok büyük</string>
     <string name="file_err_copy">Dosyanın ek olarak kopyalanmasında hata</string>
     <string name="file_err_download">Dosya indirilirken hata</string>
-    <string name="file_err_no_directory">Hobaa! Dosya dizini yok gibi görünüyor. Lütfen Astrid Tercihleri içinden dosyaların kaydedilmesi için bir dizin seçin.</string>
+    <string name="file_err_no_directory">Hobaa! Dosya dizini yok gibi görünüyor. Lütfen Astrid
+        Tercihleri içinden dosyaların kaydedilmesi için bir dizin seçin.
+    </string>
     <string name="file_err_show">Üzgünüm, sistem henüz bu dosya türünü desteklemiyor</string>
-    
+
     <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="p_files_dir">Premium downloads directory</string>
     <!-- Description for file download directory preference. %s -> chosen directory -->
     <string name="p_files_dir_desc">Görev eklerinin kaydedildiği yer: %s</string>
     <string name="p_files_dir_desc_default">Öntanımlı dizin</string>
 
-    
+
     <!-- in app billing -->
     <string name="billing_not_supported_title">Satınalma yapılamıyor</string>
-    <string name="billing_not_supported_message">Market ödeme hizmeti şu an kullanılamıyor. Uygulamayı kullanmaya devam edebilirsiniz ama satınalma yapamayabilirsiniz.</string>
+    <string name="billing_not_supported_message">Market ödeme hizmeti şu an kullanılamıyor.
+        Uygulamayı kullanmaya devam edebilirsiniz ama satınalma yapamayabilirsiniz.
+    </string>
     <string name="subscriptions_not_supported_title">Abonelikler satın alınamadı</string>
-    <string name="subscriptions_not_supported_message">Market ödeme hizmeti bu aygıt için abonelikleri desteklemiyor. Astrid Premium\'a şu adresten abone olabilirsiniz: http://astrid.com/premium.</string>
+    <string name="subscriptions_not_supported_message">Market ödeme hizmeti bu aygıt için
+        abonelikleri desteklemiyor. Astrid Premium\'a şu adresten abone olabilirsiniz:
+        http://astrid.com/premium.
+    </string>
     <string name="cannot_connect_title">Markete bağlanılamadı</string>
-    <string name="cannot_connect_message">Bu uygulama Market\'e bağlanamıyor. Market sürümünüz güncel olmayabilir. Uygulamayı kullanabilirsiniz ama satınalma işlemi yapamayabilirsiniz.</string>
-    
+    <string name="cannot_connect_message">Bu uygulama Market\'e bağlanamıyor. Market sürümünüz
+        güncel olmayabilir. Uygulamayı kullanabilirsiniz ama satınalma işlemi yapamayabilirsiniz.
+    </string>
+
     <string name="restoring_transactions">İşlemler geri yükleniyor</string>
-    
+
     <string name="subscriptions_learn_more">Daha fazla bilgi</string>
-    
-    <string name="kii_premium_success">Thanks for participating in this offer! Your free month of Astrid Premium is now unlocked.</string>
+
+    <string name="kii_premium_success">Thanks for participating in this offer! Your free month of
+        Astrid Premium is now unlocked.
+    </string>
     <string name="kii_premium_abort">Special offer aborted</string>
     <string name="kii_premium_declined">Special offer declined</string>
-    <string name="kii_premium_error">There was an error processing this offer. Please try again later.</string>
-    
+    <string name="kii_premium_error">There was an error processing this offer. Please try again
+        later.
+    </string>
+
     <string name="premium_offers_title">Special Offer</string>
     <string name="premium_offers_subtitle">Want one month of Astrid Premium for free?</string>
-    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a short video by this sponsor. (They will also require your email address.)</string>
+    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a
+        short video by this sponsor. (They will also require your email address.)
+    </string>
     <string name="premium_offers_start">Get it free!</string>
-    
+
     <string name="premium_billing_title">Astrid Premium</string>
     <string name="premium_buy_month">1 Ay</string>
     <string name="premium_buy_year">1 Yıl</string>
     <string name="premium_description_header">Premium ile daha fazlasını yapın!</string>
-    <string name="premium_description_1">Yapılacaklar listesine dosya ekle \n(pdf, doc, ppt…)</string>
+    <string name="premium_description_1">Yapılacaklar listesine dosya ekle \n(pdf, doc, ppt…)
+    </string>
     <string name="premium_description_2">Astrid.com ile dosyaları eşitle</string>
     <string name="premium_description_3">E-posta ile dosya ekle</string>
     <string name="premium_description_4">Sesli notları ses dosyası olarak kaydet</string>
@@ -2236,727 +2445,771 @@
     <string name="premium_speech_bubble_1">Premium hesap verimliliğinizi arttırır!</string>
     <string name="premium_speech_bubble_2">Bir yıllık satın alın ve %%25 kâr yapın!</string>
     <string name="premium_already_subscribed">Astrid Premium\'a zaten üyesiniz!</string>
-    <string name="premium_login_prompt">Premium üyelik için Astrid.com hesabınız olması gerekiyor. Lütfen üye olun ya da oturum açın.</string>
+    <string name="premium_login_prompt">Premium üyelik için Astrid.com hesabınız olması gerekiyor.
+        Lütfen üye olun ya da oturum açın.
+    </string>
     <string name="premium_success">Astrid Premium üyesi olduğunuz için teşekkür ederiz!</string>
-    <string name="premium_success_with_server_error">Astrid Premium üyesi olduğunuz için teşekkür ederiz! Yeni özelliker sizin için yakında astrid.com\'da açılacak ve hemen telefonunuzda kullanabileceksiniz.</string>
-    <string name="premium_verification_error">Premium üyelik, bu Google Play hesabı için başka bir kullanıcıya bağlı görünüyor. Hesabınıza ek e-postalar için ziyaret edin: astrid.com/users/profile</string>
-    <string name="premium_check_for_purchases">Already purchased premium? Click here to check Google Play for purchase history.</string>
+    <string name="premium_success_with_server_error">Astrid Premium üyesi olduğunuz için teşekkür
+        ederiz! Yeni özelliker sizin için yakında astrid.com\'da açılacak ve hemen telefonunuzda
+        kullanabileceksiniz.
+    </string>
+    <string name="premium_verification_error">Premium üyelik, bu Google Play hesabı için başka bir
+        kullanıcıya bağlı görünüyor. Hesabınıza ek e-postalar için ziyaret edin:
+        astrid.com/users/profile
+    </string>
+    <string name="premium_check_for_purchases">Already purchased premium? Click here to check Google
+        Play for purchase history.
+    </string>
     <string name="premium_checking_for_purchases">Checking for purchases...</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- 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">Bana Hatırlat:</string>
-
-  <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">Görev son tarihinde</string>
-
-  <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">Görev son tarihi aşıldığında</string>
-
-  <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_randomly">Bir kere gelişigüzel</string>
-
-  <!-- Task Edit: Reminder alarm clock label -->  
-  <string name="TEA_reminder_alarm_label">Çalma/Titreme Tipi:</string>
-
-  <!--  slide 45a: Task Edit: Reminder mode: ring once -->  
-  <string name="TEA_reminder_mode_once">Once</string>
-
-  <!-- slide 45b: Task Edit: Reminder mode: ring five times -->  
-  <string name="TEA_reminder_mode_five">Five times</string>
-
-  <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->  
-  <string name="TEA_reminder_mode_nonstop">Until I dismiss alarm</string>
-  
-  <string name="TEA_reminder_when">when</string>
-  
-  <string name="TEA_reminder_due_short">due</string>
-
-  <string name="TEA_reminder_overdue_short">overdue</string>
-
-  <string name="TEA_reminder_randomly_short">randomly</string>
-
-  <string name="TEA_reminder_display_one">Remind me %s</string>
-  
-  <string name="TEA_reminder_display_multiple">Remind %s</string>
-
-  <string-array name="TEA_reminder_random">
-    <!-- random reminder choices for task edit page. -->
-    <item>bir saat</item>
-    <item>bir gün</item>
-    <item>bir hafta</item>
-    <item>iki hafta içinde</item>
-    <item>bir ay</item>
-    <item>iki ay içinde</item>
-  </string-array>
-  
-  <!-- ==================================================== notifications == -->
-  
-  <!-- Name of filter when viewing a reminder -->
-  <string name="rmd_NoA_filter">Hatırlatıcı!</string>
-  
-  <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Tamamlandı</string>
-  
-  <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Ertele</string>
-  
-  <!-- Reminder: Completed Toast -->
-  <string name="rmd_NoA_completed_toast">Bitirdiğin için tebrikler!</string>
-  
-  <!-- Prefix for reminder dialog title -->
-  <string name="rmd_NoA_dlg_title">Hatırlatıcı:</string>
-  
-  <!-- ==================================================== user reengagement == -->
-
-  <!-- Titles for user reengagement notifications -->
-  <string-array name="rmd_reengage_notif_titles">
-    <item>Astrid\'ten bir not</item>
-    <!-- %s -> first name -->
-    <item>Bilgi notu: %s.</item> 
-    <item>Astrid özetiniz</item>
-    <item>Astrid Hatırlatmaları</item>
-  </string-array>
-    
-  <string name="rmd_reengage_name_default">siz</string>
-
-  
-  <string name="rmd_reengage_add_tasks">Görev ekle</string>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs -->
-  <string-array name="rmd_reengage_dialog_options">
-    <item>Yapılacaklar listenizi kısaltmanın tam zamanı!</item>
-    <item>Sevgili iş bitirici, bazı görevler incelemeniz için beklemektedir!</item>
-    <item>Selamlar saygılar, şunlara hızlıca bir göz atabilir misin?</item>
-    <item>Üzerinde adınızın yazdığı bazı görevlerim var!</item>
-    <item>Bugün sizi yeni bir sürü görev bekliyor!</item>
-    <item>Akıl almaz görünüyorsun! Başlamaya hazır mısın?</item>
-    <item>Bazı işleri yola koymak için ne güzel bir gün, bence!</item>
-  </string-array>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>Daha düzenli olmak istemiyor musun?</item>
-    <item>Ben Astrid! Daha çalışkan olman için buradayım!</item>
-    <item>Meşgul görünüyorsun! Görevlerinden bazılarını listenden kaldırmama izin ver.</item>
-    <item>Hayatındaki tüm ayrıntıları izlemene yardımcı olabilirim.</item>
-    <item>İş bitirme konusunda oldukça ciddisin? Ben de!</item>
-    <item>Tanıştığımıza memnun oldum!</item>
-  </string-array>
-  <!-- ============================================= reminder preferences == -->
-  
-  <!-- slide 33d: Reminder Preference Screen Title -->
-  <string name="rmd_EPr_alerts_header">Hatırlatıcı Ayarları</string>
-  <string name="rmd_EPr_alerts_summary">Sessiz saatler, erteleme seçenekleri, süreklilik düzeyi</string>
-    
-  <!-- Reminder Preference: Reminders Enabled Title -->
-  <string name="rmd_EPr_enabled_title">Hatırlatmalar etkin mi?</string>
-  <!-- Reminder Preference Reminders Enabled Description (true) -->
-  <string name="rmd_EPr_enabled_desc_true">Astrid hatırlatmaları etkin. (varsayılan)</string>
-  <!-- Reminder Preference Reminders Enabled Description (false) -->
-  <string name="rmd_EPr_enabled_desc_false">Astrid hatırlatmaları telefonda gözükmeyecek</string>  
-    
-  <!-- Reminder Preference: Quiet Hours Start Title -->
-  <string name="rmd_EPr_quiet_hours_start_title">Sessiz saatlerin başlangıcı</string>
-  <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">%s sonrasında bildirimler sessizleştirilecek.\n Not: titreşimler aşağıdaki ayarla belirlenecek.</string>
-  <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
-  <string name="rmd_EPr_quiet_hours_desc_none">Sessiz saatler kapalı</string>
-  
-  <!-- Reminder Preference: Quiet Hours End Title -->
-  <string name="rmd_EPr_quiet_hours_end_title">Sessiz saatlerin sonu</string>
-  <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_end_desc">Bildirim sesleri %s den itibaren sessiz olmayacak</string>
-
-  <!-- Reminder Preference: Default Reminder Title -->
-  <string name="rmd_EPr_rmd_time_title">Öntanımlı Hatırlatma</string>
-  <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
-  <string name="rmd_EPr_rmd_time_desc">Görev bildirimleri son tarihler olmadan gösterilecek: %s</string>
-
-  <!-- Reminder Preference: Notification Ringtone Title -->
-  <string name="rmd_EPr_ringtone_title">Bildirim Sesi</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
-  <string name="rmd_EPr_ringtone_desc_custom">Özel ses tonu atandı</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
-  <string name="rmd_EPr_ringtone_desc_silent">Sestonu sessiz konumda</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
-  <string name="rmd_EPr_ringtone_desc_default">Varsayılan zil sesi kullanılacak</string>
-  
-  <!-- Reminder Preference: Notification Persistence Title -->
-  <string name="rmd_EPr_persistent_title">Bildirim Sürekliliği</string>
-  <!-- Reminder Preference: Notification Persistence Description (true) -->
-  <string name="rmd_EPr_persistent_desc_true">Bildirimlerin temizlenmesi için tek tek görüntülenmeleri gerekir.</string>
-  <!-- Reminder Preference: Notification Persistence Description (false) -->
-  <string name="rmd_EPr_persistent_desc_false">Bildirimler \"Tümünü Temizle\" düğmesiyle temizlenebilir</string>
-
-  <!-- Reminder Preference: Social Reminders Title -->
-  <string name="rmd_EPr_social_title">Social encouragement</string>
-  <!-- Reminder Preference: Social Reminders Summary (enabled) -->
-  <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for shared tasks</string>
-  <!-- Reminder Preference: Social Reminders Summary (disabled) -->
-  <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you for shared tasks</string>
-  
-  
-  
-  <!-- Reminder Preference: Notification Icon Title -->
-  <!-- Reminder Preference: Notification Icon Description -->
-
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
-  <string name="rmd_EPr_multiple_maxvolume_title">Çoklu çalan hatırlatmalar için en yüksek ses seviyesi</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_true">Çoklu çalan hatırlatmalar için Astrid ses seviyesini en yükseğe çıkaracaktır</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid ses için sistem ayarlarını kullanacak</string>
-
-  <!-- Reminder Preference: Vibrate Title -->
-  <string name="rmd_EPr_vibrate_title">Uyarı esnasında titreşim</string>
-  <!-- Reminder Preference: Vibrate Description (true) -->
-  <string name="rmd_EPr_vibrate_desc_true">Astrid bildirimleri gönderirken titreyecek</string>
-  <!-- Reminder Preference: Vibrate Description (false) -->
-  <string name="rmd_EPr_vibrate_desc_false">Astrid bildirimleri gönderirken titremeyecek</string>
-
-  <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">Astrid Teşvikleri</string>
-  <!-- Reminder Preference: Nagging Description (true) -->
-  <string name="rmd_EPr_nagging_desc_true">Astrid hatırlatmalar sırasında sizi teşvik etmek için görünecektir</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_nagging_desc_false">Astrid teşvik iletileri göstermeyecektir</string>
-
-  <!-- Reminder Preference: Snooze Dialog Title -->  
-  <string name="rmd_EPr_snooze_dialog_title">Erteleme İletisi SS:DD</string>
-  <!-- Reminder Preference: Snooze Dialog Description (true) -->
-  <string name="rmd_EPr_snooze_dialog_desc_true">Yeni erteleme süresi ile ertele (SS:DD)</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_snooze_dialog_desc_false">Ertelemeyi # gün/saat seçerek yap</string>
-  
-  <!-- slide 44g: Reminder Preference: Default Reminders Title -->
-  <string name="rmd_EPr_defaultRemind_title">Rastgele Hatırlatmalar</string>
-  <!-- Reminder Preference: Default Reminders Setting (disabled) -->
-  <string name="rmd_EPr_defaultRemind_desc_disabled">Yeni görev rastgele hatırlatmayacak</string>
-  <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
-  <string name="rmd_EPr_defaultRemind_desc">Yeni görevler rastgele hatırlatacak: %s</string>
-  
-  <!-- slide 39a: Defaults Title -->
-  
-  <string-array name="EPr_reminder_random">
-    <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
-    <item>devre dışı</item>
-    <!-- slide 44b -->
-    <item>saat başı</item>
-    <!-- slide 44c -->
-    <item>her gün</item>
-    <!-- slide 44d-->
-    <item>her hafta</item>
-    <!-- slide 44e-->
-    <item>haftada 2 kez</item>
-    <!-- slide 44f -->
-    <item>ayda bir</item>
-    <item>ayda 2 kez</item>
-  </string-array>
-        
-  <string-array name="EPr_quiet_hours_start">
-    <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
-    <item>devre dışı</item>
-    <item>8 ÖS</item>
-    <item>9 ÖS</item>
-    <item>10 ÖS</item>
-    <item>11 ÖS</item>
-    <item>12 ÖÖ</item>
-    <item>1ÖÖ</item>
-    <item>2 ÖÖ</item>
-    <item>3 ÖÖ</item>
-    <item>4 ÖÖ</item>
-    <item>5 ÖÖ</item>
-    <item>6 ÖÖ</item>
-    <item>7 ÖÖ</item>
-    <item>8 ÖÖ</item>
-    <item>9 ÖÖ</item>
-    <item>10 ÖÖ</item>
-    <item>11 ÖÖ</item>
-    <item>12 ÖS</item>
-    <item>1 ÖS</item>
-    <item>2 ÖS</item>
-    <item>3 ÖS</item>
-    <item>4 ÖS</item>
-    <item>5 ÖS</item>
-    <item>6 ÖS</item>
-    <item>7 ÖS</item>
-  </string-array>
-  
-  <string-array name="EPr_quiet_hours_end">
-    <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
-    <item>9 ÖÖ</item>
-    <item>10 ÖÖ</item>
-    <item>11 ÖÖ</item>
-    <item>12 ÖS</item>
-    <item>1 ÖS</item>
-    <item>2 ÖS</item>
-    <item>3 ÖS</item>
-    <item>4 ÖS</item>
-    <item>5 ÖS</item>
-    <item>6 ÖS</item>
-    <item>7 ÖS</item>
-    <item>8 ÖS</item>
-    <item>9 ÖS</item>
-    <item>10 ÖS</item>
-    <item>11 ÖS</item>
-    <item>12 ÖÖ</item>
-    <item>1ÖÖ</item>
-    <item>2 ÖÖ</item>
-    <item>3 ÖÖ</item>
-    <item>4 ÖÖ</item>
-    <item>5 ÖÖ</item>
-    <item>6 ÖÖ</item>
-    <item>7 ÖÖ</item>
-    <item>8 ÖÖ</item>
-  </string-array>
-  
-  <string-array name="EPr_rmd_time">
-    <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
-    <item>9 ÖÖ</item>
-    <item>10 ÖÖ</item>
-    <item>11 ÖÖ</item>
-    <item>12 ÖS</item>
-    <item>1 ÖS</item>
-    <item>2 ÖS</item>
-    <item>3 ÖS</item>
-    <item>4 ÖS</item>
-    <item>5 ÖS</item>
-    <item>6 ÖS</item>
-    <item>7 ÖS</item>
-    <item>8 ÖS</item>
-    <item>9 ÖS</item>
-    <item>10 ÖS</item>
-    <item>11 ÖS</item>
-    <item>12 ÖÖ</item>
-    <item>1ÖÖ</item>
-    <item>2 ÖÖ</item>
-    <item>3 ÖÖ</item>
-    <item>4 ÖÖ</item>
-    <item>5 ÖÖ</item>
-    <item>6 ÖÖ</item>
-    <item>7 ÖÖ</item>
-    <item>8 ÖÖ</item>
-  </string-array>
-  
-  <!-- =============================================== random reminders == -->
-
-  <string name="reminders_social">These people are counting on you!</string>
-  
-  <string name="reminders_social_one">%s is counting on you!</string>
-  
-  <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
-
-  <string-array name="reminders">
-      <!-- reminders: Make these < 20 chars so the task name is displayed -->
-      <item>Selam! Bir saniyen var mı?</item>
-      <item>Bir saniyeni alabilir miyim?</item>
-      <item>Birkaç dakikan var mı?</item>
-      <item>Ne o, unuttun mu?</item>
-      <item>Pardon!</item>
-      <item>Vakit bulabildiğinde:</item>
-      <item>Ajandanda:</item>
-      <item>Müsait miydin?</item>
-      <item>Konuşan benim, Astrid!</item>
-      <item>Selam! Seni rahatsız edebilir miyim?</item>
-      <item>Bir dakikanı alabilir miyim?</item>
-      <item>Hadi şunu yapalım:</item>
-  </string-array>
-
-  <string-array name="reminders_due">
-      <!-- reminders related to task due date -->
-      <item>Çalışma zamanı!</item>
-      <item>Son tarih geldi!</item>
-      <item>Başlamaya ne dersin?</item>
-      <item>Şunu yapabileceğini söylemiştin:</item>
-      <item>Şuna başlaman lazım:</item>
-      <item>Başlama zamanı:</item>
-      <item>Tam zamanıdır!</item>
-      <item>Afedersin! Şunun tam zamanı:</item>
-      <item>Müsait misin? Şunun tam zamanı:</item>
-  </string-array>
-
-  <string-array name="reminders_snooze">
-      <!-- reminders related to snooze -->
-      <item>Tembellik etme!</item>
-      <item>Erteleme süresi bitti!</item>
-      <item>Yeter artık erteleme!</item>
-      <item>Peki şimdi hazır mısın?</item>
-      <item>Artık ertelemek yok!</item>
-  </string-array>
-  
-  <string-array name="reminder_responses">
-      <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
-      <item>Senin için birşeyim var!</item> 
-      <item>Bunu arkanda bırakmaya hazır mısın?</item>
-      <item>Neden bunu bitirmiyorsun?</item>
-      <item>Ya ne dersin? Haydi aslanım!</item>
-      <item>Hazır mısın?</item>
-      <item>Bunu bir halletsen..</item>
-      <item>Sen de mutlu olabilirsin! Sadece şunu hallediver yeter..</item>
-      <item>Bunu yaptığında kendini daha iyi hissedeceksin!</item>
-      <item>Bugün yapmaz mısın bunu?</item>
-      <item>Sıkıldım, lütfen bitir şunu!</item>
-      <item>Bunu yapabilir misin? Elbette yapabilirsin!</item>
-      <item>Bunu halletmeye niyetin yok mu?</item>
-      <item>Kendini iyi hissedeceksin! Haydi başla!</item>
-      <item>Seninle gurur duyuyorum! Haydi kolları sıva!</item>
-      <item>Şunu halledip bi atıştırsak?</item>
-      <item>Sadece bir bunu yapsan? Lütfen?</item>
-      <item>Listeyi kısaltmanın zamanıdır!</item>
-      <item>Düzen Takımını\'ndan mısın yoksa Kaos Takımı\'ndan mı? Düzen Takımı! Haydi başlayalım!</item>
-      <item>Harika olduğunu en son ne zaman söylemiştim? Böyle devam et!</item>
-      <item>Hergün bir görev, dağınıklığı azaltır. Güle güle dağınıklık!</item>
-      <item>Nasıl gidiyor? Bence harika!</item>
-      <item>Sadece güzel görünmek yetmez. Hadi iş başına!</item>
-      <item>Bu iş için hava fazla güzel değil mi?</item>
-      <item>Bunu yaparken bir çaya ne dersin?</item>
-      <item>Bunu yapmış olsaydın şimdi dışarıda geziyor olabilirdin.</item>
-      <item>Tam zamanı. Kaçınılmaz olayı geciktiremezsin.</item>
-      <item>Beni her görmezden geldiğinde biraz daha ölüyorum.</item>
-  </string-array>
-
-  <string-array name="postpone_nags">
-      <!-- Astrid\'s nagging when user clicks postpone -->
-      <item>Sakın bana iş öteleyen biri olduğunu söyleme!</item>
-      <item>Tembellikten de bazen sıkılmıyor musun?</item>
-      <item>Bir yerde birileri şunu halletmeni bekliyor..</item>
-      <item>Ertelerim derken aslında \"şimdi yapıcam\" demek istedin di mi?</item>
-      <item>Bu son erteleyişin değil mi?</item>
-      <item>Bunu bugün bitirirsen, kimseye söylemem!</item>
-      <item>Bitirmek dururken neden erteleyesin ki?</item>
-      <item>Yok bugün yapıcam yok yarın yapıcam. Hadi?</item>
-      <item>Bence harika gidiyosun. Şimdi yapmaya ne dersin?</item>
-      <item>Öyle yaparsan hedeflerine erişebilecek misin?</item>
-      <item>Sonra, sonra, sonra.. Ne zaman değişeceksin?</item>
-      <item>Bahanelerinden sıkıldım! Yap artık!</item>
-      <item>Son seferinde de bahanen yok muydu?</item>
-      <item>Bunu yapmaya devam edersen hayatını organize edemem</item>
-  </string-array>
+    <!-- Resources for built-in reminders plug-in -->
 
+    <!-- =============================================== task edit activity == -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder group label -->
+    <string name="TEA_reminders_group_label">Reminder settings</string>
 
+    <!-- Task Edit: Reminder header label -->
+    <string name="TEA_reminder_label">Bana Hatırlat:</string>
 
-  <!-- Resources for built-in repeat plug-in -->
-
-  <!-- repeating plugin name -->
-  <string name="repeat_plugin">Tekrarlanan Görevler</string>
-  
-  <!-- repeating plugin description -->
-  <string name="repeat_plugin_desc">Görevlerin tekrarlanmasına izin ver</string>
-  
-  <!-- slide 20a: checkbox for turning on/off repeats -->
-  <string name="repeat_enabled">Tekrarlar</string>
-  
-  <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
-  <string name="repeat_every">Her %d</string>
-  
-  <!-- hint when opening repeat interval -->
-  <string name="repeat_interval_prompt">Yineleme Aralığı</string>
-  
-  <!-- slide 19b-->
-  <string name="repeat_never">Not repeating</string>
-  <!-- slide 20f-->
-  <string name="repeat_dont">Yineleme Yapma</string>
-      
-  <string-array name="repeat_interval_short">
-    <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
-    <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">
-    <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>Gün</item>
-    <item>Hafta</item>
-    <item>Ay</item>
-    <item>Saat</item>
-    <item>Dakika</item>
-    <item>Yıl</item>
-  </string-array>
-  
-  <string name="repeat_days">days</string>
-  <string name="repeat_weekdays">weekdays</string>
-  <string name="repeat_weeks">weeks</string>
-  <string name="repeat_months">months</string>
-  <string name="repeat_years">years</string>
-  <string name="repeat_hours">hours</string>
-  <string name="repeat_minutes">minutes</string>
-  
-  <string-array name="repeat_until_shortcuts">
-      <item>Sürekli</item>
-      <item>Belirli Gün</item>
-      <item>Bugün</item>
-      <item>Yarın</item>
-      <item>(ertesi gün)</item>
-      <item>Gelecek Hafta</item>
-      <item>2 Hafta İçinde</item>
-      <item>Gelecek Ay</item>
-  </string-array>
-  
-  <string name="repeat_until_title">Bu kadar yinele...</string>
-  
-  <string name="repeat_keep_going">Bekleme yapma</string>
-  
-  <string-array name="repeat_type">
-    <!-- slide 20c: repeat type (date to repeat from) -->
-    <item>son tarihten itibaren</item>
-    <!-- slide 20c -->
-    <item>tamamlanma tarihinden itibaren</item>
-  </string-array>
-  
-  <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
-  <string name="repeat_detail_byday">$I gün: $D</string>
-  
-  <!-- task detail for repeat from due date (%s -> interval) -->
-  <string name="repeat_detail_duedate">Her %s</string>
-
-  <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
-  <string name="repeat_detail_duedate_until">Her %1$s\n%2$s \'e kadar</string>
-  
-  <!-- task detail for repeat from completion date (%s -> interval) -->
-  <string name="repeat_detail_completion">Tamamlandıktan sonra %s</string>
-  
-  <!-- text for button when repeating task indefinitely -->
-  <string name="repeat_forever">Sürekli yinele</string>
-
-  <!-- text for button when repeating task until specified date (%s -> date string) -->
-  <string name="repeat_until">%s\'e kadar yinele</string>
-  
-  <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title">Görev zamanı güncelleniyor: \"%s\"</string>
-
-  <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title_last_time">Yinelenen görev bitti: \"%s\"</string>
-      
-  <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->  
-  <string name="repeat_rescheduling_dialog_bubble">%1$s bu yinelenen görev zamanını güncelledim: %2$s &gt;&gt; %3$s</string>
-  
-  <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
-  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s Bu yinelenen görevi yeniden zamanladım: %2$s</string>
-  
-  <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
-  <string name="repeat_rescheduling_dialog_bubble_last_time">Bu yinelemeyi %1$s tarihine kadar alacaksınız, ve şimdi işiniz bitti. %2$s</string>
-  
-  <string-array name="repeat_encouragement">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>İyi iş çıkardın!</item>
-      <item>Vay be... Seninle gurur duyuyorum!</item>
-      <item>Verimli olduğun zaman seni çok seviyorum!</item>
-      <item>İş bitirmek iyi hissettirmiyor mu?</item>
-  </string-array>
-
-  <string-array name="repeat_encouragement_last_time">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>İyi iş çıkardın!</item>
-      <item>Seninle gurur duyuyorum!</item>
-      <item>Verimli olduğun zaman seni çok seviyorum!</item>
-  </string-array>
-  
+    <!-- Task Edit: Reminder @ deadline -->
+    <string name="TEA_reminder_due">Görev son tarihinde</string>
 
+    <!-- Task Edit: Reminder after deadline -->
+    <string name="TEA_reminder_overdue">Görev son tarihi aşıldığında</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder at random times (%s => time plural)-->
+    <string name="TEA_reminder_randomly">Bir kere gelişigüzel</string>
 
-    
-  <!-- Subtasks Help Introduction -->
-  <string name="subtasks_help_title">Astrid\'te Sınıflandırma ve Giritili Yazma</string>
-  <string name="subtasks_help_1">Bir görevi taşımak için dokunup sürükleyin</string>
-  <string name="subtasks_help_2">Yeniden sıralamak için dikine sürükle</string>
-  <string name="subtasks_help_3">Girintili yazmak için yatay sürükle</string>
-    
+    <!-- Task Edit: Reminder alarm clock label -->
+    <string name="TEA_reminder_alarm_label">Çalma/Titreme Tipi:</string>
 
+    <!--  slide 45a: Task Edit: Reminder mode: ring once -->
+    <string name="TEA_reminder_mode_once">Once</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 45b: Task Edit: Reminder mode: ring five times -->
+    <string name="TEA_reminder_mode_five">Five times</string>
+
+    <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
+    <string name="TEA_reminder_mode_nonstop">Until I dismiss alarm</string>
+
+    <string name="TEA_reminder_when">when</string>
+
+    <string name="TEA_reminder_due_short">due</string>
+
+    <string name="TEA_reminder_overdue_short">overdue</string>
+
+    <string name="TEA_reminder_randomly_short">randomly</string>
+
+    <string name="TEA_reminder_display_one">Remind me %s</string>
+
+    <string name="TEA_reminder_display_multiple">Remind %s</string>
+
+    <string-array name="TEA_reminder_random">
+        <!-- random reminder choices for task edit page. -->
+        <item>bir saat</item>
+        <item>bir gün</item>
+        <item>bir hafta</item>
+        <item>iki hafta içinde</item>
+        <item>bir ay</item>
+        <item>iki ay içinde</item>
+    </string-array>
+
+    <!-- ==================================================== notifications == -->
+
+    <!-- Name of filter when viewing a reminder -->
+    <string name="rmd_NoA_filter">Hatırlatıcı!</string>
+
+    <!-- Reminder: Task was already done -->
+    <string name="rmd_NoA_done">Tamamlandı</string>
+
+    <!-- Reminder: Snooze button (remind again later) -->
+    <string name="rmd_NoA_snooze">Ertele</string>
+
+    <!-- Reminder: Completed Toast -->
+    <string name="rmd_NoA_completed_toast">Bitirdiğin için tebrikler!</string>
+
+    <!-- Prefix for reminder dialog title -->
+    <string name="rmd_NoA_dlg_title">Hatırlatıcı:</string>
+
+    <!-- ==================================================== user reengagement == -->
+
+    <!-- Titles for user reengagement notifications -->
+    <string-array name="rmd_reengage_notif_titles">
+        <item>Astrid\'ten bir not</item>
+        <!-- %s -> first name -->
+        <item>Bilgi notu: %s.</item>
+        <item>Astrid özetiniz</item>
+        <item>Astrid Hatırlatmaları</item>
+    </string-array>
+
+    <string name="rmd_reengage_name_default">siz</string>
+
+
+    <string name="rmd_reengage_add_tasks">Görev ekle</string>
+
+    <!-- Speech bubble options for astrid in reengagement notifs -->
+    <string-array name="rmd_reengage_dialog_options">
+        <item>Yapılacaklar listenizi kısaltmanın tam zamanı!</item>
+        <item>Sevgili iş bitirici, bazı görevler incelemeniz için beklemektedir!</item>
+        <item>Selamlar saygılar, şunlara hızlıca bir göz atabilir misin?</item>
+        <item>Üzerinde adınızın yazdığı bazı görevlerim var!</item>
+        <item>Bugün sizi yeni bir sürü görev bekliyor!</item>
+        <item>Akıl almaz görünüyorsun! Başlamaya hazır mısın?</item>
+        <item>Bazı işleri yola koymak için ne güzel bir gün, bence!</item>
+    </string-array>
+
+    <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>Daha düzenli olmak istemiyor musun?</item>
+        <item>Ben Astrid! Daha çalışkan olman için buradayım!</item>
+        <item>Meşgul görünüyorsun! Görevlerinden bazılarını listenden kaldırmama izin ver.</item>
+        <item>Hayatındaki tüm ayrıntıları izlemene yardımcı olabilirim.</item>
+        <item>İş bitirme konusunda oldukça ciddisin? Ben de!</item>
+        <item>Tanıştığımıza memnun oldum!</item>
+    </string-array>
+    <!-- ============================================= reminder preferences == -->
+
+    <!-- slide 33d: Reminder Preference Screen Title -->
+    <string name="rmd_EPr_alerts_header">Hatırlatıcı Ayarları</string>
+    <string name="rmd_EPr_alerts_summary">Sessiz saatler, erteleme seçenekleri, süreklilik düzeyi
+    </string>
+
+    <!-- Reminder Preference: Reminders Enabled Title -->
+    <string name="rmd_EPr_enabled_title">Hatırlatmalar etkin mi?</string>
+    <!-- Reminder Preference Reminders Enabled Description (true) -->
+    <string name="rmd_EPr_enabled_desc_true">Astrid hatırlatmaları etkin. (varsayılan)</string>
+    <!-- Reminder Preference Reminders Enabled Description (false) -->
+    <string name="rmd_EPr_enabled_desc_false">Astrid hatırlatmaları telefonda gözükmeyecek</string>
+
+    <!-- Reminder Preference: Quiet Hours Start Title -->
+    <string name="rmd_EPr_quiet_hours_start_title">Sessiz saatlerin başlangıcı</string>
+    <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_start_desc">%s sonrasında bildirimler sessizleştirilecek.\n
+        Not: titreşimler aşağıdaki ayarla belirlenecek.
+    </string>
+    <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
+    <string name="rmd_EPr_quiet_hours_desc_none">Sessiz saatler kapalı</string>
+
+    <!-- Reminder Preference: Quiet Hours End Title -->
+    <string name="rmd_EPr_quiet_hours_end_title">Sessiz saatlerin sonu</string>
+    <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_end_desc">Bildirim sesleri %s den itibaren sessiz olmayacak
+    </string>
+
+    <!-- Reminder Preference: Default Reminder Title -->
+    <string name="rmd_EPr_rmd_time_title">Öntanımlı Hatırlatma</string>
+    <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
+    <string name="rmd_EPr_rmd_time_desc">Görev bildirimleri son tarihler olmadan gösterilecek: %s
+    </string>
+
+    <!-- Reminder Preference: Notification Ringtone Title -->
+    <string name="rmd_EPr_ringtone_title">Bildirim Sesi</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
+    <string name="rmd_EPr_ringtone_desc_custom">Özel ses tonu atandı</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
+    <string name="rmd_EPr_ringtone_desc_silent">Sestonu sessiz konumda</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
+    <string name="rmd_EPr_ringtone_desc_default">Varsayılan zil sesi kullanılacak</string>
+
+    <!-- Reminder Preference: Notification Persistence Title -->
+    <string name="rmd_EPr_persistent_title">Bildirim Sürekliliği</string>
+    <!-- Reminder Preference: Notification Persistence Description (true) -->
+    <string name="rmd_EPr_persistent_desc_true">Bildirimlerin temizlenmesi için tek tek
+        görüntülenmeleri gerekir.
+    </string>
+    <!-- Reminder Preference: Notification Persistence Description (false) -->
+    <string name="rmd_EPr_persistent_desc_false">Bildirimler \"Tümünü Temizle\" düğmesiyle
+        temizlenebilir
+    </string>
+
+    <!-- Reminder Preference: Social Reminders Title -->
+    <string name="rmd_EPr_social_title">Social encouragement</string>
+    <!-- Reminder Preference: Social Reminders Summary (enabled) -->
+    <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for
+        shared tasks
+    </string>
+    <!-- Reminder Preference: Social Reminders Summary (disabled) -->
+    <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you
+        for shared tasks
+    </string>
+
+
+    <!-- Reminder Preference: Notification Icon Title -->
+    <!-- Reminder Preference: Notification Icon Description -->
+
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
+    <string name="rmd_EPr_multiple_maxvolume_title">Çoklu çalan hatırlatmalar için en yüksek ses
+        seviyesi
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_true">Çoklu çalan hatırlatmalar için Astrid ses
+        seviyesini en yükseğe çıkaracaktır
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid ses için sistem ayarlarını
+        kullanacak
+    </string>
+
+    <!-- Reminder Preference: Vibrate Title -->
+    <string name="rmd_EPr_vibrate_title">Uyarı esnasında titreşim</string>
+    <!-- Reminder Preference: Vibrate Description (true) -->
+    <string name="rmd_EPr_vibrate_desc_true">Astrid bildirimleri gönderirken titreyecek</string>
+    <!-- Reminder Preference: Vibrate Description (false) -->
+    <string name="rmd_EPr_vibrate_desc_false">Astrid bildirimleri gönderirken titremeyecek</string>
+
+    <!-- Reminder Preference: Nagging Title -->
+    <string name="rmd_EPr_nagging_title">Astrid Teşvikleri</string>
+    <!-- Reminder Preference: Nagging Description (true) -->
+    <string name="rmd_EPr_nagging_desc_true">Astrid hatırlatmalar sırasında sizi teşvik etmek için
+        görünecektir
+    </string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_nagging_desc_false">Astrid teşvik iletileri göstermeyecektir</string>
+
+    <!-- Reminder Preference: Snooze Dialog Title -->
+    <string name="rmd_EPr_snooze_dialog_title">Erteleme İletisi SS:DD</string>
+    <!-- Reminder Preference: Snooze Dialog Description (true) -->
+    <string name="rmd_EPr_snooze_dialog_desc_true">Yeni erteleme süresi ile ertele (SS:DD)</string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_snooze_dialog_desc_false">Ertelemeyi # gün/saat seçerek yap</string>
+
+    <!-- slide 44g: Reminder Preference: Default Reminders Title -->
+    <string name="rmd_EPr_defaultRemind_title">Rastgele Hatırlatmalar</string>
+    <!-- Reminder Preference: Default Reminders Setting (disabled) -->
+    <string name="rmd_EPr_defaultRemind_desc_disabled">Yeni görev rastgele hatırlatmayacak</string>
+    <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
+    <string name="rmd_EPr_defaultRemind_desc">Yeni görevler rastgele hatırlatacak: %s</string>
+
+    <!-- slide 39a: Defaults Title -->
+
+    <string-array name="EPr_reminder_random">
+        <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
+        <item>devre dışı</item>
+        <!-- slide 44b -->
+        <item>saat başı</item>
+        <!-- slide 44c -->
+        <item>her gün</item>
+        <!-- slide 44d-->
+        <item>her hafta</item>
+        <!-- slide 44e-->
+        <item>haftada 2 kez</item>
+        <!-- slide 44f -->
+        <item>ayda bir</item>
+        <item>ayda 2 kez</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_start">
+        <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
+        <item>devre dışı</item>
+        <item>8 ÖS</item>
+        <item>9 ÖS</item>
+        <item>10 ÖS</item>
+        <item>11 ÖS</item>
+        <item>12 ÖÖ</item>
+        <item>1ÖÖ</item>
+        <item>2 ÖÖ</item>
+        <item>3 ÖÖ</item>
+        <item>4 ÖÖ</item>
+        <item>5 ÖÖ</item>
+        <item>6 ÖÖ</item>
+        <item>7 ÖÖ</item>
+        <item>8 ÖÖ</item>
+        <item>9 ÖÖ</item>
+        <item>10 ÖÖ</item>
+        <item>11 ÖÖ</item>
+        <item>12 ÖS</item>
+        <item>1 ÖS</item>
+        <item>2 ÖS</item>
+        <item>3 ÖS</item>
+        <item>4 ÖS</item>
+        <item>5 ÖS</item>
+        <item>6 ÖS</item>
+        <item>7 ÖS</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_end">
+        <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
+        <item>9 ÖÖ</item>
+        <item>10 ÖÖ</item>
+        <item>11 ÖÖ</item>
+        <item>12 ÖS</item>
+        <item>1 ÖS</item>
+        <item>2 ÖS</item>
+        <item>3 ÖS</item>
+        <item>4 ÖS</item>
+        <item>5 ÖS</item>
+        <item>6 ÖS</item>
+        <item>7 ÖS</item>
+        <item>8 ÖS</item>
+        <item>9 ÖS</item>
+        <item>10 ÖS</item>
+        <item>11 ÖS</item>
+        <item>12 ÖÖ</item>
+        <item>1ÖÖ</item>
+        <item>2 ÖÖ</item>
+        <item>3 ÖÖ</item>
+        <item>4 ÖÖ</item>
+        <item>5 ÖÖ</item>
+        <item>6 ÖÖ</item>
+        <item>7 ÖÖ</item>
+        <item>8 ÖÖ</item>
+    </string-array>
+
+    <string-array name="EPr_rmd_time">
+        <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
+        <item>9 ÖÖ</item>
+        <item>10 ÖÖ</item>
+        <item>11 ÖÖ</item>
+        <item>12 ÖS</item>
+        <item>1 ÖS</item>
+        <item>2 ÖS</item>
+        <item>3 ÖS</item>
+        <item>4 ÖS</item>
+        <item>5 ÖS</item>
+        <item>6 ÖS</item>
+        <item>7 ÖS</item>
+        <item>8 ÖS</item>
+        <item>9 ÖS</item>
+        <item>10 ÖS</item>
+        <item>11 ÖS</item>
+        <item>12 ÖÖ</item>
+        <item>1ÖÖ</item>
+        <item>2 ÖÖ</item>
+        <item>3 ÖÖ</item>
+        <item>4 ÖÖ</item>
+        <item>5 ÖÖ</item>
+        <item>6 ÖÖ</item>
+        <item>7 ÖÖ</item>
+        <item>8 ÖÖ</item>
+    </string-array>
+
+    <!-- =============================================== random reminders == -->
+
+    <string name="reminders_social">These people are counting on you!</string>
+
+    <string name="reminders_social_one">%s is counting on you!</string>
+
+    <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
+
+    <string-array name="reminders">
+        <!-- reminders: Make these < 20 chars so the task name is displayed -->
+        <item>Selam! Bir saniyen var mı?</item>
+        <item>Bir saniyeni alabilir miyim?</item>
+        <item>Birkaç dakikan var mı?</item>
+        <item>Ne o, unuttun mu?</item>
+        <item>Pardon!</item>
+        <item>Vakit bulabildiğinde:</item>
+        <item>Ajandanda:</item>
+        <item>Müsait miydin?</item>
+        <item>Konuşan benim, Astrid!</item>
+        <item>Selam! Seni rahatsız edebilir miyim?</item>
+        <item>Bir dakikanı alabilir miyim?</item>
+        <item>Hadi şunu yapalım:</item>
+    </string-array>
+
+    <string-array name="reminders_due">
+        <!-- reminders related to task due date -->
+        <item>Çalışma zamanı!</item>
+        <item>Son tarih geldi!</item>
+        <item>Başlamaya ne dersin?</item>
+        <item>Şunu yapabileceğini söylemiştin:</item>
+        <item>Şuna başlaman lazım:</item>
+        <item>Başlama zamanı:</item>
+        <item>Tam zamanıdır!</item>
+        <item>Afedersin! Şunun tam zamanı:</item>
+        <item>Müsait misin? Şunun tam zamanı:</item>
+    </string-array>
+
+    <string-array name="reminders_snooze">
+        <!-- reminders related to snooze -->
+        <item>Tembellik etme!</item>
+        <item>Erteleme süresi bitti!</item>
+        <item>Yeter artık erteleme!</item>
+        <item>Peki şimdi hazır mısın?</item>
+        <item>Artık ertelemek yok!</item>
+    </string-array>
+
+    <string-array name="reminder_responses">
+        <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
+        <item>Senin için birşeyim var!</item>
+        <item>Bunu arkanda bırakmaya hazır mısın?</item>
+        <item>Neden bunu bitirmiyorsun?</item>
+        <item>Ya ne dersin? Haydi aslanım!</item>
+        <item>Hazır mısın?</item>
+        <item>Bunu bir halletsen..</item>
+        <item>Sen de mutlu olabilirsin! Sadece şunu hallediver yeter..</item>
+        <item>Bunu yaptığında kendini daha iyi hissedeceksin!</item>
+        <item>Bugün yapmaz mısın bunu?</item>
+        <item>Sıkıldım, lütfen bitir şunu!</item>
+        <item>Bunu yapabilir misin? Elbette yapabilirsin!</item>
+        <item>Bunu halletmeye niyetin yok mu?</item>
+        <item>Kendini iyi hissedeceksin! Haydi başla!</item>
+        <item>Seninle gurur duyuyorum! Haydi kolları sıva!</item>
+        <item>Şunu halledip bi atıştırsak?</item>
+        <item>Sadece bir bunu yapsan? Lütfen?</item>
+        <item>Listeyi kısaltmanın zamanıdır!</item>
+        <item>Düzen Takımını\'ndan mısın yoksa Kaos Takımı\'ndan mı? Düzen Takımı! Haydi
+            başlayalım!
+        </item>
+        <item>Harika olduğunu en son ne zaman söylemiştim? Böyle devam et!</item>
+        <item>Hergün bir görev, dağınıklığı azaltır. Güle güle dağınıklık!</item>
+        <item>Nasıl gidiyor? Bence harika!</item>
+        <item>Sadece güzel görünmek yetmez. Hadi iş başına!</item>
+        <item>Bu iş için hava fazla güzel değil mi?</item>
+        <item>Bunu yaparken bir çaya ne dersin?</item>
+        <item>Bunu yapmış olsaydın şimdi dışarıda geziyor olabilirdin.</item>
+        <item>Tam zamanı. Kaçınılmaz olayı geciktiremezsin.</item>
+        <item>Beni her görmezden geldiğinde biraz daha ölüyorum.</item>
+    </string-array>
+
+    <string-array name="postpone_nags">
+        <!-- Astrid\'s nagging when user clicks postpone -->
+        <item>Sakın bana iş öteleyen biri olduğunu söyleme!</item>
+        <item>Tembellikten de bazen sıkılmıyor musun?</item>
+        <item>Bir yerde birileri şunu halletmeni bekliyor..</item>
+        <item>Ertelerim derken aslında \"şimdi yapıcam\" demek istedin di mi?</item>
+        <item>Bu son erteleyişin değil mi?</item>
+        <item>Bunu bugün bitirirsen, kimseye söylemem!</item>
+        <item>Bitirmek dururken neden erteleyesin ki?</item>
+        <item>Yok bugün yapıcam yok yarın yapıcam. Hadi?</item>
+        <item>Bence harika gidiyosun. Şimdi yapmaya ne dersin?</item>
+        <item>Öyle yaparsan hedeflerine erişebilecek misin?</item>
+        <item>Sonra, sonra, sonra.. Ne zaman değişeceksin?</item>
+        <item>Bahanelerinden sıkıldım! Yap artık!</item>
+        <item>Son seferinde de bahanen yok muydu?</item>
+        <item>Bunu yapmaya devam edersen hayatını organize edemem</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in repeat plug-in -->
+
+    <!-- repeating plugin name -->
+    <string name="repeat_plugin">Tekrarlanan Görevler</string>
+
+    <!-- repeating plugin description -->
+    <string name="repeat_plugin_desc">Görevlerin tekrarlanmasına izin ver</string>
+
+    <!-- slide 20a: checkbox for turning on/off repeats -->
+    <string name="repeat_enabled">Tekrarlar</string>
+
+    <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
+    <string name="repeat_every">Her %d</string>
+
+    <!-- hint when opening repeat interval -->
+    <string name="repeat_interval_prompt">Yineleme Aralığı</string>
+
+    <!-- slide 19b-->
+    <string name="repeat_never">Not repeating</string>
+    <!-- slide 20f-->
+    <string name="repeat_dont">Yineleme Yapma</string>
+
+    <string-array name="repeat_interval_short">
+        <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
+        <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">
+        <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>Gün</item>
+        <item>Hafta</item>
+        <item>Ay</item>
+        <item>Saat</item>
+        <item>Dakika</item>
+        <item>Yıl</item>
+    </string-array>
+
+    <string name="repeat_days">days</string>
+    <string name="repeat_weekdays">weekdays</string>
+    <string name="repeat_weeks">weeks</string>
+    <string name="repeat_months">months</string>
+    <string name="repeat_years">years</string>
+    <string name="repeat_hours">hours</string>
+    <string name="repeat_minutes">minutes</string>
+
+    <string-array name="repeat_until_shortcuts">
+        <item>Sürekli</item>
+        <item>Belirli Gün</item>
+        <item>Bugün</item>
+        <item>Yarın</item>
+        <item>(ertesi gün)</item>
+        <item>Gelecek Hafta</item>
+        <item>2 Hafta İçinde</item>
+        <item>Gelecek Ay</item>
+    </string-array>
+
+    <string name="repeat_until_title">Bu kadar yinele...</string>
+
+    <string name="repeat_keep_going">Bekleme yapma</string>
+
+    <string-array name="repeat_type">
+        <!-- slide 20c: repeat type (date to repeat from) -->
+        <item>son tarihten itibaren</item>
+        <!-- slide 20c -->
+        <item>tamamlanma tarihinden itibaren</item>
+    </string-array>
+
+    <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
+    <string name="repeat_detail_byday">$I gün: $D</string>
+
+    <!-- task detail for repeat from due date (%s -> interval) -->
+    <string name="repeat_detail_duedate">Her %s</string>
+
+    <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
+    <string name="repeat_detail_duedate_until">Her %1$s\n%2$s \'e kadar</string>
+
+    <!-- task detail for repeat from completion date (%s -> interval) -->
+    <string name="repeat_detail_completion">Tamamlandıktan sonra %s</string>
+
+    <!-- text for button when repeating task indefinitely -->
+    <string name="repeat_forever">Sürekli yinele</string>
+
+    <!-- text for button when repeating task until specified date (%s -> date string) -->
+    <string name="repeat_until">%s\'e kadar yinele</string>
+
+    <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title">Görev zamanı güncelleniyor: \"%s\"</string>
+
+    <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title_last_time">Yinelenen görev bitti: \"%s\"</string>
+
+    <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->
+    <string name="repeat_rescheduling_dialog_bubble">%1$s bu yinelenen görev zamanını güncelledim:
+        %2$s &gt;&gt; %3$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
+    <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s Bu yinelenen görevi yeniden
+        zamanladım: %2$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
+    <string name="repeat_rescheduling_dialog_bubble_last_time">Bu yinelemeyi %1$s tarihine kadar
+        alacaksınız, ve şimdi işiniz bitti. %2$s
+    </string>
+
+    <string-array name="repeat_encouragement">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>İyi iş çıkardın!</item>
+        <item>Vay be... Seninle gurur duyuyorum!</item>
+        <item>Verimli olduğun zaman seni çok seviyorum!</item>
+        <item>İş bitirmek iyi hissettirmiyor mu?</item>
+    </string-array>
+
+    <string-array name="repeat_encouragement_last_time">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>İyi iş çıkardın!</item>
+        <item>Seninle gurur duyuyorum!</item>
+        <item>Verimli olduğun zaman seni çok seviyorum!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Subtasks Help Introduction -->
+    <string name="subtasks_help_title">Astrid\'te Sınıflandırma ve Giritili Yazma</string>
+    <string name="subtasks_help_1">Bir görevi taşımak için dokunup sürükleyin</string>
+    <string name="subtasks_help_2">Yeniden sıralamak için dikine sürükle</string>
+    <string name="subtasks_help_3">Girintili yazmak için yatay sürükle</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-
-  <!-- Tags label -->
-  <string name="TEA_tags_label">Listeler</string>
-  
-  <!-- Tags label long version -->
-  <string name="TEA_tags_label_long">Add to lists</string>
- 
-  <!-- Tags hint -->
-  <string name="TEA_tag_hint">Yeni liste</string>
-  
-  <!-- Tags dropdown -->
-    
-  <!-- =============================================== Task List Controls == -->
-  
-  <!-- menu item for tags -->
-  
-  <!-- ========================================================== Extras == -->
-  
-  <!-- Context Item: show tag -->
-  
-  <!-- slide 25a: Dialog: new list -->
-  <string name="tag_new_list">Yeni Liste</string>
-  
-  <!-- Dialog: list saved -->
-  
-  <!-- Dialog: task created without title -->
-  <string name="tag_no_title_error">Lütfen bu liste için isim girin!</string>
-  
-  <!-- ========================================================== Filters == -->
-  
-  <!-- filter button to add tag -->
-  <string name="tag_FEx_add_new">Yeni</string>
-  
-  <!-- filter header for tags -->
-  <string name="tag_FEx_header">Listeler</string>
-  
-  <!-- filter header for tags user created -->
-  
-  <!-- filter header for tags, shared with user -->
-  
-  <!-- filter header for tags which have no active tasks -->
-  
-  <!-- slide 10d: filter for untagged tasks -->
-  <string name="tag_FEx_untagged">Uncategorized</string>
-  
-  <!-- slide 27a: %s => tag name -->
-
-  <!-- context menu option to rename a tag -->
-  <string name="tag_cm_rename">Listeyi yeniden adlandır</string>
-
-  <!-- context menu option to delete a tag -->
-  <string name="tag_cm_delete">Listeyi Sil</string>
-  
-  <!-- context menu option to leave a shared list -->
-  <string name="tag_cm_leave">Listeden Çık</string>
-
-  <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
-  <string name="DLG_delete_this_tag_question">Bu Listeyi Sil: %s? (Hiçbir görev silinmeyecektir.)</string>
-  
-  <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
-  <string name="DLG_leave_this_shared_tag_question">Bu paylaşılan listeden çık: %s? (Silinen görev olmayacak.)</string>
-
-  <!-- Dialog to rename tag -->
-  <string name="DLG_rename_this_tag_header">%s listesini şu isimle adlandır:</string>
-
-  <!-- Toast notification that no changes have been made -->
-  <string name="TEA_no_tags_modified">Hiç değişiklik yapılmadı</string>
-
-  <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_deleted">%1$s listesi, %2$d görevlerini etkileyecek şekilde silindi</string>
-  
-  <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_left">Paylaşılan %1$s listesinden çıktınız, %2$d görevi etkiliyor</string>
-
-  <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
-  <string name="TEA_tags_renamed">%1$s yeniden %3$d görevleri için %2$s olarak isimlendirildi.</string>
-  
-  <!-- Tag case migration -->
-  <string name="tag_case_migration_notice">Farklı büyük harflere sahip aynı isimli listeler olduğunu farkettik. Belki de aynı isimli olması gerekir diye bunları birleştirdik. Merak etme, orjinallere birşey olmadı, sadece isimleri değişti. (Alışveriş listesi_1,Alışveriş listesi_2 vb) İstediğin bu değilse tek yapman gereken birleşmiş listeyi silmek!</string>
-  
-  <!-- Header for tag settings -->
-  <string name="tag_settings_title">Liste Ayarları:</string>
-  
-  <!-- Header for tag activity -->
-  <string name="tag_updates_title">Etkinlik: %s</string>
-  
-  <!-- Delete button for tag settings -->
-  <string name="tag_delete_button">Listeyi sil</string>
-  
-  <!-- slide 28d: Leave button for tag settings -->
-  <string name="tag_leave_button">Bu listeyi bırak</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Tags label -->
+    <string name="TEA_tags_label">Listeler</string>
 
+    <!-- Tags label long version -->
+    <string name="TEA_tags_label_long">Add to lists</string>
+
+    <!-- Tags hint -->
+    <string name="TEA_tag_hint">Yeni liste</string>
+
+    <!-- Tags dropdown -->
+
+    <!-- =============================================== Task List Controls == -->
+
+    <!-- menu item for tags -->
+
+    <!-- ========================================================== Extras == -->
+
+    <!-- Context Item: show tag -->
+
+    <!-- slide 25a: Dialog: new list -->
+    <string name="tag_new_list">Yeni Liste</string>
+
+    <!-- Dialog: list saved -->
+
+    <!-- Dialog: task created without title -->
+    <string name="tag_no_title_error">Lütfen bu liste için isim girin!</string>
+
+    <!-- ========================================================== Filters == -->
+
+    <!-- filter button to add tag -->
+    <string name="tag_FEx_add_new">Yeni</string>
+
+    <!-- filter header for tags -->
+    <string name="tag_FEx_header">Listeler</string>
+
+    <!-- filter header for tags user created -->
+
+    <!-- filter header for tags, shared with user -->
+
+    <!-- filter header for tags which have no active tasks -->
+
+    <!-- slide 10d: filter for untagged tasks -->
+    <string name="tag_FEx_untagged">Uncategorized</string>
+
+    <!-- slide 27a: %s => tag name -->
+
+    <!-- context menu option to rename a tag -->
+    <string name="tag_cm_rename">Listeyi yeniden adlandır</string>
+
+    <!-- context menu option to delete a tag -->
+    <string name="tag_cm_delete">Listeyi Sil</string>
+
+    <!-- context menu option to leave a shared list -->
+    <string name="tag_cm_leave">Listeden Çık</string>
+
+    <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
+    <string name="DLG_delete_this_tag_question">Bu Listeyi Sil: %s? (Hiçbir görev
+        silinmeyecektir.)
+    </string>
+
+    <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
+    <string name="DLG_leave_this_shared_tag_question">Bu paylaşılan listeden çık: %s? (Silinen görev
+        olmayacak.)
+    </string>
+
+    <!-- Dialog to rename tag -->
+    <string name="DLG_rename_this_tag_header">%s listesini şu isimle adlandır:</string>
+
+    <!-- Toast notification that no changes have been made -->
+    <string name="TEA_no_tags_modified">Hiç değişiklik yapılmadı</string>
+
+    <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_deleted">%1$s listesi, %2$d görevlerini etkileyecek şekilde silindi
+    </string>
+
+    <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_left">Paylaşılan %1$s listesinden çıktınız, %2$d görevi etkiliyor
+    </string>
+
+    <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
+    <string name="TEA_tags_renamed">%1$s yeniden %3$d görevleri için %2$s olarak isimlendirildi.
+    </string>
+
+    <!-- Tag case migration -->
+    <string name="tag_case_migration_notice">Farklı büyük harflere sahip aynı isimli listeler
+        olduğunu farkettik. Belki de aynı isimli olması gerekir diye bunları birleştirdik. Merak
+        etme, orjinallere birşey olmadı, sadece isimleri değişti. (Alışveriş listesi_1,Alışveriş
+        listesi_2 vb) İstediğin bu değilse tek yapman gereken birleşmiş listeyi silmek!
+    </string>
+
+    <!-- Header for tag settings -->
+    <string name="tag_settings_title">Liste Ayarları:</string>
+
+    <!-- Header for tag activity -->
+    <string name="tag_updates_title">Etkinlik: %s</string>
+
+    <!-- Delete button for tag settings -->
+    <string name="tag_delete_button">Listeyi sil</string>
+
+    <!-- slide 28d: Leave button for tag settings -->
+    <string name="tag_leave_button">Bu listeyi bırak</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in timers plug-in -->
-    
+
     <!-- Task List: Start Timer button -->
-    
+
     <!-- Task List: Stop Timer button -->
-    
+
     <!-- Android Notification Title (%s => # tasks) -->
     <string name="TPl_notification">%s için kronometre etkin!</string>
-    
+
     <!-- Filter Header for Timer plugin -->
-    
+
     <!-- Filter for Timed Tasks -->
     <string name="TFE_workingOn">Zaman Ölçümü Olan Görevler</string>
-    
+
     <!-- Title for TEA -->
     <string name="TEA_timer_controls">Timer</string>
-    
-    
+
+
     <!-- Edit Notes: create comment for when timer is started -->
     <string name="TEA_timer_comment_started">başlanan görev:</string>
-    
+
     <!-- Edit Notes: create comment for when timer is stopped -->
     <string name="TEA_timer_comment_stopped">bu görevden vazgeç:</string>
-    
+
     <!-- Edit Notes: comment to notify how long was spent on task -->
     <string name="TEA_timer_comment_spent">Harcanan zaman:</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Update string from activity codes %1$s - user, %2$s - target name, %3$s - message, %4$s - other_user-->
-    
+
     <!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
     Please do not translate this part of the string. -->
-    
+
     <!-- These are still in use -->
     <string name="update_string_default_comment">%1$s şunu yorumladı: %3$s</string>
     <string name="update_string_task_comment">%1$s on $link_task: %3$s</string>
     <string name="update_string_tag_comment">%1$s on %2$s: %3$s</string>
     <string name="update_string_user_self">You</string>
-    
+
     <string name="history_yourself">kendiniz</string>
     <string name="history_you">siz</string>
     <string name="history_a_deleted_user">silinmiş kullanıcı</string>
-    
+
     <string name="history_this_list">bu liste</string>
     <string name="history_this_task">bu görev</string>
     <string name="history_tag_added">added %1$s to %2$s</string>
@@ -2982,9 +3235,12 @@
     <string name="history_favorited">favorited %s</string>
     <string name="history_unfavorited">unfavorited %s</string>
     <string name="history_changed_list_picture">change this list\'s picture</string>
-    <string name="history_added_description_characters">added %1$d characters to %2$s description</string>
+    <string name="history_added_description_characters">added %1$d characters to %2$s description
+    </string>
     <string name="history_removed_description">removed %s description</string>
-    <string name="history_removed_description_characters">removed %1$d characters from %2$s description</string>
+    <string name="history_removed_description_characters">removed %1$d characters from %2$s
+        description
+    </string>
     <string name="history_updated_description">updated %s description</string>
     <string name="history_changed_list_owner">changed list owner to %s</string>
     <string name="history_created_this_list">created this list</string>
@@ -3007,195 +3263,227 @@
     <string name="history_repeat_on">on %s</string>
     <string name="history_repeat_from_completion">after completion</string>
     <string name="history_acknowledged">viewed %s</string>
-    
-    <string name="history_default">changed %1$s to %2$s</string>
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-    
-  <!-- Voice Add Prompt Text -->
-  <string name="voice_create_prompt">Yeni görev için konuş</string>
-  <string name="voice_edit_title_prompt">Görev başlığı için konuş</string>
-  <string name="voice_edit_note_prompt">Görev notları için konuş</string>
-    
-  <!-- Preference: Task List recognition-service is not installed, but available -->
-  <string name="EPr_voiceInputInstall_dlg">Ses-girişi kurulu değil.\nGoogle Play\'e gidip yüklemek ister misin?</string>
-  <!-- Preference: Task List recognition-service is not available for this system -->
-  <string name="EPr_voiceInputUnavailable_dlg">Malesef ses-komutu, işletim sisteminiz için mevcut değil.\nMümkünse sisteminizi Android 2.1 ya da üzerine yükseltin.</string>
-  <!-- Preference: Market is not available for this system -->
-  <string name="EPr_marketUnavailable_dlg">Malesef market işletim sisteminiz için mevcut değil.\nMümkünse sesli aramayı başka bir kaynaktan indirin.</string>
-  <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
-  <string name="EPr_voiceInputEnabled_title">Ses Girişi</string>
-  <!-- slide 38a: Preference: voice button description (true) -->
-  <string name="EPr_voiceInputEnabled_desc_enabled">Ses girişi düğmesi görev listesi sayfasında görüntülenecek</string>
-  <!-- Preference: voice button description (false) -->
-  <string name="EPr_voiceInputEnabled_desc_disabled">Ses girişi düğmesi görev listesinde görünmeyecek</string>
-  <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
-  <string name="EPr_voiceInputCreatesTask_title">Görevleri Doğrudan Oluştur</string>
-  <!-- Preference: Task List Voice-creation description (true) -->
-  <string name="EPr_voiceInputCreatesTask_desc_enabled">Görevler kendiliğinden ses komutu ile oluşturulacak</string>
-  <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
-  <string name="EPr_voiceInputCreatesTask_desc_disabled">Ses komutu bittikten hemen sonra görev başlığını düzenleyebilirsin</string>
-  <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
-  <string name="EPr_voiceRemindersEnabled_title">Sesli Hatırlatmalar</string>
-  <!-- Preference: Voice reminders description (true) -->
-  <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid görev isimlerini görev hatırlatmaları sırasında söyleyecek</string>
-  <!-- slide 38c: Preference: Voice reminders description (false) -->
-  <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid görev hatırlatmaları sırasında zil sesi çalacak</string>    
-  
-  <!-- slide 32d: Preference Category: Voice Title -->
-  <string name="EPr_voice_header">Ses Komutu Ayarları</string>
-    
-
-
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-
-  
-  <!-- slide 30a-->
-  <string name="welcome_setting">Öğreticiyi göster</string>
-  
-  <string name="welcome_title_1">Astrid\'e Hoş geldiniz!</string>
-
-  <!-- slide 2a -->
-  <string name="welcome_title_2">Liste hazırla</string>
-
-  <!-- slide 3a-->
-  <string name="welcome_title_3">Listeler arası geçiş yap</string>
-
-  <!-- slide 4a -->
-  <string name="welcome_title_4">Liste paylaş</string>
-
-  <!-- slide 5a -->
-  <string name="welcome_title_5">Görevleri böl</string>
-
-  <!-- slide 6a -->
-  <string name="welcome_title_6">Detay gir</string>
 
-  <!-- slide 7a -->
-  <string name="welcome_title_7">Başlamak için\nşimdi bağlanın!</string>
-  
-  <string name="welcome_title_7_return">İşte budur!</string>
-  
-  <!-- slide 1b -->
-  <string name="welcome_body_1">Arkadaşlarla kullanımı harika \nkişisel hatırlatma listesi</string>
-
-  <!-- slide 2b-->
-  <string name="welcome_body_2">Her liste için harika:\noku, izle, satın al, ziyaret et!</string>
-
-  <!-- slide 3b -->
-  <string name="welcome_body_3">Listelerinizi görmek için liste başlığına tıklayın</string>
-
-  <!-- slide 4b -->
-  <string name="welcome_body_4">Listeleri\narkadaşlarla, evdekilerle,\nveya sevdiklerinizle paylaşın!</string>
-
-  <!-- slide 5b -->
-  <string name="welcome_body_5">Tatlıyı kim getiriyor diye\ndüşünmenize gerek kalmadı!</string>
+    <string name="history_default">changed %1$s to %2$s</string>
 
-  <!-- slide 6b-->
-  <string name="welcome_body_6">Not eklemek,\nhatırlatma kurmak,\nve daha fazlası için dokunun!</string>
-  <string name="welcome_body_7">Oturum Aç</string>
-  
-  <string name="welcome_body_7_return">Geri dönmek için Astrid\'e dokunun.</string>
-  
-  <!-- slide 1c -->
-  <string name="welcome_next">İleri</string>
-  
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Voice Add Prompt Text -->
+    <string name="voice_create_prompt">Yeni görev için konuş</string>
+    <string name="voice_edit_title_prompt">Görev başlığı için konuş</string>
+    <string name="voice_edit_note_prompt">Görev notları için konuş</string>
+
+    <!-- Preference: Task List recognition-service is not installed, but available -->
+    <string name="EPr_voiceInputInstall_dlg">Ses-girişi kurulu değil.\nGoogle Play\'e gidip yüklemek
+        ister misin?
+    </string>
+    <!-- Preference: Task List recognition-service is not available for this system -->
+    <string name="EPr_voiceInputUnavailable_dlg">Malesef ses-komutu, işletim sisteminiz için mevcut
+        değil.\nMümkünse sisteminizi Android 2.1 ya da üzerine yükseltin.
+    </string>
+    <!-- Preference: Market is not available for this system -->
+    <string name="EPr_marketUnavailable_dlg">Malesef market işletim sisteminiz için mevcut
+        değil.\nMümkünse sesli aramayı başka bir kaynaktan indirin.
+    </string>
+    <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
+    <string name="EPr_voiceInputEnabled_title">Ses Girişi</string>
+    <!-- slide 38a: Preference: voice button description (true) -->
+    <string name="EPr_voiceInputEnabled_desc_enabled">Ses girişi düğmesi görev listesi sayfasında
+        görüntülenecek
+    </string>
+    <!-- Preference: voice button description (false) -->
+    <string name="EPr_voiceInputEnabled_desc_disabled">Ses girişi düğmesi görev listesinde
+        görünmeyecek
+    </string>
+    <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
+    <string name="EPr_voiceInputCreatesTask_title">Görevleri Doğrudan Oluştur</string>
+    <!-- Preference: Task List Voice-creation description (true) -->
+    <string name="EPr_voiceInputCreatesTask_desc_enabled">Görevler kendiliğinden ses komutu ile
+        oluşturulacak
+    </string>
+    <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
+    <string name="EPr_voiceInputCreatesTask_desc_disabled">Ses komutu bittikten hemen sonra görev
+        başlığını düzenleyebilirsin
+    </string>
+    <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
+    <string name="EPr_voiceRemindersEnabled_title">Sesli Hatırlatmalar</string>
+    <!-- Preference: Voice reminders description (true) -->
+    <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid görev isimlerini görev
+        hatırlatmaları sırasında söyleyecek
+    </string>
+    <!-- slide 38c: Preference: Voice reminders description (false) -->
+    <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid görev hatırlatmaları sırasında zil
+        sesi çalacak
+    </string>
+
+    <!-- slide 32d: Preference Category: Voice Title -->
+    <string name="EPr_voice_header">Ses Komutu Ayarları</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 30a-->
+    <string name="welcome_setting">Öğreticiyi göster</string>
+
+    <string name="welcome_title_1">Astrid\'e Hoş geldiniz!</string>
+
+    <!-- slide 2a -->
+    <string name="welcome_title_2">Liste hazırla</string>
+
+    <!-- slide 3a-->
+    <string name="welcome_title_3">Listeler arası geçiş yap</string>
+
+    <!-- slide 4a -->
+    <string name="welcome_title_4">Liste paylaş</string>
+
+    <!-- slide 5a -->
+    <string name="welcome_title_5">Görevleri böl</string>
+
+    <!-- slide 6a -->
+    <string name="welcome_title_6">Detay gir</string>
+
+    <!-- slide 7a -->
+    <string name="welcome_title_7">Başlamak için\nşimdi bağlanın!</string>
+
+    <string name="welcome_title_7_return">İşte budur!</string>
+
+    <!-- slide 1b -->
+    <string name="welcome_body_1">Arkadaşlarla kullanımı harika \nkişisel hatırlatma listesi
+    </string>
+
+    <!-- slide 2b-->
+    <string name="welcome_body_2">Her liste için harika:\noku, izle, satın al, ziyaret et!</string>
+
+    <!-- slide 3b -->
+    <string name="welcome_body_3">Listelerinizi görmek için liste başlığına tıklayın</string>
+
+    <!-- slide 4b -->
+    <string name="welcome_body_4">Listeleri\narkadaşlarla, evdekilerle,\nveya sevdiklerinizle
+        paylaşın!
+    </string>
+
+    <!-- slide 5b -->
+    <string name="welcome_body_5">Tatlıyı kim getiriyor diye\ndüşünmenize gerek kalmadı!</string>
+
+    <!-- slide 6b-->
+    <string name="welcome_body_6">Not eklemek,\nhatırlatma kurmak,\nve daha fazlası için dokunun!
+    </string>
+    <string name="welcome_body_7">Oturum Aç</string>
+
+    <string name="welcome_body_7_return">Geri dönmek için Astrid\'e dokunun.</string>
+
+    <!-- slide 1c -->
+    <string name="welcome_next">İleri</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <string name="widget_mini">- Astrid Mini -</string>
-    
+
     <!-- Resources for power pack widget -->
-    
+
     <string name="PPW_widget_42_label">Old Astrid 4x2</string>
     <string name="PPW_widget_43_label">Old Astrid 4x3</string>
     <string name="PPW_widget_44_label">Old Astrid 4x4</string>
     <string name="PPW_widget_v11_label">- Astrid -</string>
     <string name="PPW_widget_custom_label">Astrid Özel Başlatıcı Premium</string>
     <string name="PPW_widget_custom_launcherpro_label">Astrid Başlatıcı Pro Premium</string>
-    
+
     <string name="PPW_configure_title">Bileşeni Yapılandır</string>
-    
+
     <string name="PPW_color">Bileşen Rengi</string>
     <string name="PPW_enable_calendar">Takvim olaylarını göster</string>
     <string name="PPW_disable_encouragements">Teşvikleri gizle</string>
     <string name="PPW_show_dates">Son tarihleri göster</string>
     <string name="PPW_filter">Süzgeç Seç</string>
-    
+
     <string name="PPW_due">Son:</string>
     <string name="PPW_past_due">Gecikmiş:</string>
-    
-    <string name="PPW_old_astrid_notice">Bu bileşeni kullanmak için Astrid\'in son sürümü olan 3.6\'ya ihtiyacınız var. Üzgünüm!</string>
-    
+
+    <string name="PPW_old_astrid_notice">Bu bileşeni kullanmak için Astrid\'in son sürümü olan
+        3.6\'ya ihtiyacınız var. Üzgünüm!
+    </string>
+
     <string-array name="PPW_encouragements">
         <!-- general encouragements -->
-    	<item>Selamlar!</item>
-    	<item>Bir şeyler bitirmek için vaktin var mı?</item>
-    	<item>Vay canına, bugün kendinden çok emin görünüyorsun!</item>
-    	<item>Bugün kendin için ne yaptın!</item>
-    	<item>Bugün beni gururlandır!</item>
-    	<item>Bugün nasılsın?</item>
+        <item>Selamlar!</item>
+        <item>Bir şeyler bitirmek için vaktin var mı?</item>
+        <item>Vay canına, bugün kendinden çok emin görünüyorsun!</item>
+        <item>Bugün kendin için ne yaptın!</item>
+        <item>Bugün beni gururlandır!</item>
+        <item>Bugün nasılsın?</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_tod">
         <!-- encouragements based on time of day -->
-    	<item>Günaydın!</item>
-    	<item>İyi günler!</item>
-    	<item>İyi akşamlar!</item>
-    	<item>Zor gece?</item>
-    	<item>Hâlâ erken, bir şeyler yapabilirsin!</item>
-    	<item>Öğle çayına ne dersin?</item>
-    	<item>Gecenin tadını çıkar!</item>
-    	<item>Uyku senin için güzel bir şey, biliyorsun!</item>
+        <item>Günaydın!</item>
+        <item>İyi günler!</item>
+        <item>İyi akşamlar!</item>
+        <item>Zor gece?</item>
+        <item>Hâlâ erken, bir şeyler yapabilirsin!</item>
+        <item>Öğle çayına ne dersin?</item>
+        <item>Gecenin tadını çıkar!</item>
+        <item>Uyku senin için güzel bir şey, biliyorsun!</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_completed">
         <!-- encouragements based on tasks completed (%d => completed) -->
-    	<item>Şimdiye kadar %d görev tamamladınız!</item>
-    	<item>Hayatının sayısı: %d görev bitti</item>
-    	<item>Gülümse! Şimdiye kadar %d görev bitti!</item>
+        <item>Şimdiye kadar %d görev tamamladınız!</item>
+        <item>Hayatının sayısı: %d görev bitti</item>
+        <item>Gülümse! Şimdiye kadar %d görev bitti!</item>
     </string-array>
-  	<string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet! Shall we?</string>
-        
+    <string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet!
+        Shall we?
+    </string>
+
     <string-array name="PPW_colors">
         <item>Siyah</item>
         <item>Beyaz</item>
         <item>Mavi</item>
         <item>Yarı saydam</item>
     </string-array>
-    
-    <string name="PPW_widget_dlg_text">Bu bileşen yalnızca PowerPack sahipleri tarafından kullanılabilir!</string>
+
+    <string name="PPW_widget_dlg_text">Bu bileşen yalnızca PowerPack sahipleri tarafından
+        kullanılabilir!
+    </string>
     <string name="PPW_widget_dlg_ok">Önizleme</string>
-    
+
     <string name="PPW_demo_title1">%s üzerindeki öğeler buraya gelecek</string>
     <string name="PPW_demo_title2">Güç Paketi Ücretli Bileşenleri içermektedir...</string>
     <string name="PPW_demo_title3">...ses ekle ve iyi hisset!</string>
     <string name="PPW_demo_title4">Daha çok öğrenmek için dokunun!</string>
-    
+
     <string name="PPW_info_title">Ücretsiz Güç Paketi!</string>
     <string name="PPW_info_signin">Oturum aç!</string>
     <string name="PPW_info_later">Sonra</string>
-    <string name="PPW_unlock_howto">Listeleri arkadaşlarınızla paylaşın! Güç Paketi, 3 arkadaşınız Astrid\'le oturum açtığında ücretsiz olacak.</string>
+    <string name="PPW_unlock_howto">Listeleri arkadaşlarınızla paylaşın! Güç Paketi, 3 arkadaşınız
+        Astrid\'le oturum açtığında ücretsiz olacak.
+    </string>
     <string name="PPW_check_button">Güç Paketi\'ni ücretsiz alın!</string>
     <string name="PPW_check_share_lists">Listeleri paylaş!</string>
-    <string name="PPW_api_level">Üzgünüz! Bu bileşen yalnızca Andorid 3.0 ya da üzerinde çalışıyor.</string>
-    
+    <string name="PPW_api_level">Üzgünüz! Bu bileşen yalnızca Andorid 3.0 ya da üzerinde
+        çalışıyor.
+    </string>
+
     <string name="EPr_widget_enabled_title">Bileşenleri Etkinleştir/Etkisizleştir</string>
-    <string name="PPW_restart_for_enabled_state">Bu değişikliğin etkin olabilmesi için telefonunuzu yeniden başlatmanız gerekebilir.</string>
+    <string name="PPW_restart_for_enabled_state">Bu değişikliğin etkin olabilmesi için telefonunuzu
+        yeniden başlatmanız gerekebilir.
+    </string>
 
 </resources>
diff --git a/astrid/res/values-zh-rCN/strings.xml b/astrid/res/values-zh-rCN/strings.xml
index 2755334b0..dc7a1fa01 100755
--- a/astrid/res/values-zh-rCN/strings.xml
+++ b/astrid/res/values-zh-rCN/strings.xml
@@ -4,1685 +4,1736 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ================================================== general terms == -->
-
-  <!-- People Editing Activity -->    
-  
-  <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
-  <string name="actfm_person_hint">E-mail / 联系人姓名</string>
-  
-  <!-- task sharing dialog: shared with hint -->
-  <string name="actfm_person_or_tag_hint">联系方式或共享列表</string>
-
-  <!-- toast on transmit success -->
-
-  <!-- can\'t rename or delete shared tag message -->
-  
-  <!-- warning before deleting a list you\'re the owner of -->
-  <string name="actfm_tag_operation_owner_delete">你是这个被分享列表的拥有者，如果删除它，其它被分享者将无法访问，确定删除吗？</string>
-
-  <!-- slide 29a: menu item to take a picture -->
-  <string name="actfm_picture_camera">拍照</string>
-
-  <!-- slide 29b: menu item to select from gallery -->
-  <string name="actfm_picture_gallery">从相册中选取</string>
-  
-  <!-- menu item to clear picture selection -->
-  <string name="actfm_picture_clear">取消选择</string>
-
-  <!-- filter list activity: refresh tags -->
-  
-  <!-- Title for prompt after sharing a task -->
-  <string name="actfm_view_task_title">查看任务？</string>
-
-  <!-- Text for prompt after sharing a task -->
-  <string name="actfm_view_task_text">任务已发送给%s！正在查看你所拥有的任务，是否查看其它被指定的任务？</string>
-  
-  <!-- Ok button for task view prompt -->
-  <string name="actfm_view_task_ok">查看被指派的任务</string>
-      
-  <!-- Cancel button for task view prompt -->
-  <string name="actfm_view_task_cancel">保留在此处</string>
-  
-  <!-- slide 13a: Title for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_title">已分享任务</string>
-  
-  <!-- Empty list for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_empty">没有已分享任务</string>
-  
-  <!-- =====================  Friendship connections -->
-  
-  <string name="actfm_friendship_pending">你已经给%s发送了朋友请求！</string>
-
-  <string name="actfm_friendship_blocked">你已经屏蔽了%s</string>
-
-  <string name="actfm_friendship_ignored">You\'ve ignored %s.</string>
-  
-  <string name="actfm_friendship_friends">你和%s已经是朋友了！可以为他们添加任务了</string>
-
-  <string name="actfm_friendship_other_pending">%s想与你成为朋友！</string>
-
-  <string name="actfm_friendship_no_status">与%s连线以分享和查看公开任务的活动</string>
-
-  <string name="actfm_friendship_connect">添加好友</string>
-
-  <string name="actfm_friendship_accept">接受</string>
-
-  <!-- ================================================== TagViewActivity == -->  
-
-  <!-- Tag View Activity: Add Comment hint -->    
-  <string name="TVA_add_comment">添加注释...</string>
-
-  <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->    
-  
-  <!-- Tabs for Tag view -->
-  <string-array name="TVA_tabs">
-    <!-- Tab for showing tasks -->
-    <item>任务</item>
-    <!-- Tab for showing comments & updates -->
-    <item>活动</item>
-    <!-- Tab for showing setting -->
-    <item>列表设置</item>
-  </string-array>
-  
-  <!-- Tag View: filtered by assigned to user (%s => user name) -->
-  <string name="actfm_TVA_filtered_by_assign">%s的任务，点击查看全部</string>
-  
-  <!-- Tag View: filter by unassigned tasks -->
-  <string name="actfm_TVA_filter_by_unassigned">未指定的任务，点击查看全部</string>
-
-  <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">私有状态：点击以编辑或分享</string>
-
-  <!-- Tag View Menu: refresh -->
-  <string name="actfm_TVA_menu_refresh">刷新</string>
-
-  <!-- Tag Settings: tag name label -->
-  <string name="actfm_TVA_tag_label">列表名称：</string>
-
-  <!-- Tag Settings: tag owner label -->
-
-  <!-- Tag Settings: tag owner value when there is no owner -->
-
-  <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
-  <string name="actfm_TVA_members_label">合作者：</string>
-  
-  <!-- Tag Settings: list collaborators hint -->
-  <string name="actfm_TVA_members_hint">通过电子邮件分享</string>
-
-  <!-- Tag Settings: tag picture -->
-  <string name="actfm_TVA_tag_picture">列表图片</string>
-
-  <!-- slide 25c/28b: Tag Settings: silence notifications label -->
-  <string name="actfm_TVA_silence_label">勿扰模式</string>
-  
-  <!-- Tag Settings: list icon label -->
-  
-  <!-- slide 25b/27d: Tag Settings: list description label -->
-  <string name="actfm_TVA_tag_description_label">描述</string>
-  
-  <!-- slide 28a: Tag Settings: list settings label -->
-  <string name="actfm_TVA_tag_settings_label">设置</string>
-
-  <!-- slide 25b: Tag Settings: list description hint -->
-  <string name="actfm_TVA_tag_description_hint">在这里添加描述</string>
-  
-  <!-- slide 25d: Tag Settings: list name hint -->
-  <string name="actfm_TVA_tag_name_hint">添加列表名称</string>
-  
-  <!-- Tag settings: login prompt from share-->
-  <string name="actfm_TVA_login_to_share">你需要登陆来分享列表，请登陆网站或者保持私有</string>
-  
-      
-  <!-- ============================================ edit people dialog == -->
-
-  <!-- task sharing dialog: intro -->
-  <string name="actfm_EPA_intro">使用清单小助理分享您的购物单，聚会和团队项目，就会发现人们可以迅速完成工作！</string>
-    
-  <!-- task sharing dialog: window title -->
-    
-  <!-- task sharing dialog: save button -->
-  
-  <!-- task sharing dialog: assigned label -->
-  
-  <!-- slide 18a: task sharing dialog: assigned label long version -->
-  <string name="actfm_EPA_assign_label_long">需要谁处理？</string>
-  
-  <!-- task sharing dialog: assigned to me -->
-  <string name="actfm_EPA_assign_me">我</string>
-  
-  <!-- task sharing dialog: anyone -->
-  <string name="actfm_EPA_unassigned">未分配</string>
-  
-  <!-- slide 18c: task sharing dialog: choose a contact -->
-  <string name="actfm_EPA_choose_contact">选择联系人</string>
-  
-  <!-- task sharing dialog: custom email assignment -->
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_share_with">共享给：</string>
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_collaborators_header">Share</string>
-
-      <!-- task sharing dialog: collaborator list name (%s => name of list) -->
-  <string name="actfm_EPA_list">列表：%s</string>
-  
-  <!-- task sharing dialog: assigned hint -->
-  
-  <!-- task sharing dialog: message label text -->
-  <string name="actfm_EPA_message_text">邀请信息：</string>
-  
-  <!-- task sharing dialog: message body -->
-  <string name="actfm_EPA_message_body">帮我办好这事！</string>
-  
-  <!-- task sharing dialog: list members section header -->
-  <string name="actfm_EPA_assign_header_members">列表成员</string>
-
-  <!-- task sharing dialog: astrid friends section header -->
-  <string name="actfm_EPA_assign_header_friends">清单小助理好友</string>
-
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: share with Facebook -->
-  <string name="actfm_EPA_facebook">Facebook</string>
-  
-  <!-- task sharing dialog: share with Twitter -->
-  <string name="actfm_EPA_twitter">Twitter</string>
-
-  <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
-
-  <!-- task sharing dialog: edit people settings saved -->
-
-  <!-- task sharing dialog: invalid email (%s => email) -->
-  <string name="actfm_EPA_invalid_email">电子邮箱无效： %s</string>
-
-  <!-- task sharing dialog: tag not found (%s => tag) -->
-  
-  <!-- task sharing login prompt -->
-  <string name="actfm_EPA_login_to_share">你需要登陆来分享任务，请登陆网站或者保持私有。</string>
-  
-  <string name="actfm_EPA_login_button">登录</string>
-  
-  <string name="actfm_EPA_dont_share_button">不要分享</string>
-  
-  <string name="actfm_EPA_add_person_to_list_title">任务已分配</string>
-  
-  <string name="actfm_EPA_add_person_to_list">%1$s is not shared on this list. Would you like to add %2$s to this list?</string>
-
-  <string name="actfm_EPA_add_person_to_list_ok">添加到列表</string>
-  
-  <string name="actfm_EPA_add_person_to_list_cancel">不要添加</string>
-  
-  <string name="actfm_list_owner">(owner)</string>
-  
-  <!-- ========================================= sharing login activity == -->
-
-  <!-- share login: Title -->
-  <string name="actfm_ALA_title">欢迎光临 Astrid.com！</string>
-
-  <!-- share login: Sharing Description -->
-  <string name="actfm_ALA_body">Astrid.com能让您轻松在线访问、共享和委托您的任务。</string>
-
-  <!-- share login: Sharing Login FB Prompt -->
-  <string name="actfm_ALA_fb_login">使用Facebook帐号登录</string>
-
-  <!-- share login: Sharing Login GG Prompt -->
-  <string name="actfm_ALA_gg_login">使用Google帐号登录</string>
-  
-  <!-- share login: Quickly log in as <%s -> email> -->
-  <string name="actfm_quick_login">Sign in: %s</string>
-
-  <!-- share login: Reject quick login -->
-  <string name="actfm_quick_login_reject">Not %s?</string>
-
-  <!-- share login: Name -->
-  <string name="actfm_ALA_firstname_label">名字</string>
-  
-  <!-- share login: Name -->
-  <string name="actfm_ALA_lastname_label">姓氏</string>
-
-  <!-- share login: Email -->
-  <string name="actfm_ALA_email_label">电子邮箱</string>
-
-  <!-- share login: Username / Email -->
-
-  <!-- share login: Password -->
-  <string name="actfm_ALA_password_label">密码</string>
-
-  <!-- share login: Sign Up Title -->
-  <string name="actfm_ALA_signup_title">注册</string>
-
-  <!-- share login: Login Title -->
-  <string name="actfm_ALA_login_title">登录</string>
-
-  <!-- share login: Google Auth title -->
-  <string name="actfm_GAA_title">选择你要使用的Google账户</string>
-
-  <!-- share login: OAUTH Login Prompt -->
-  <string name="actfm_OLA_prompt">连接至 Google：</string>
-  
-  <!-- Login error: user exists -->
-  <string name="actfm_ALA_error_user_exists">用户已经存在，请直接登录。</string>
-  
-  <!-- Login error: wrong password -->
-  <string name="actfm_ALA_error_wrong_password">对不起，密码输入不对，请再试一次。</string>
-  
-  <!-- Forgot password link -->
-  <string name="actfm_ALA_forgot_password">忘记密码？</string>
-  
-  <!-- Forgot password email prompt -->
-  <string name="actfm_ALA_enter_email">请输入你的电子邮箱</string>
-  
-  <!-- Password reset sent (%s -> email) -->
-  <string name="actfm_ALA_reset_sent">密码重设已发送给%s</string>
-  
-  <!-- User already exists - first sync may be slow -->
-  <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your patience!</string>
-  
-  <!-- User not found -->
-  <string name="actfm_ALA_error_user_not_found">User not found by that email. Try signing up instead!</string>
-  
-  <!-- ================================================ Featured Lists -->
-
-  <string name="actfm_feat_list_clone">复制列表</string>
-  
-  <string name="actfm_feat_list_suffix">（复制）</string>
-
-  <string name="actfm_feat_list_cloning">正在复制...</string>
-
-  <string name="actfm_feat_list_clone_success">完成!</string>
-
-  <string name="actfm_feat_list_task_clone_success">任务已复制</string>
-
-  <string name="actfm_feat_list_clone_empty">无任务复制</string>
-  
-  <!-- ================================================ Synchronization == -->
-      
-  <!-- Indicates the logged in user name. %s -> user\'s name -->
-  <string name="actfm_status_title_logged_in">状态——已使用 %s 帐户登录</string>    
-      
-  <!-- Preferences Title: Act.fm -->    
-  <string name="actfm_APr_header">Astrid.com (清单小助理)</string>
-  
-  <string name="actfm_https_title">使用 HTTPS</string>
-  <string name="actfm_https_enabled">开启 HTTPS （较慢）</string>
-  <string name="actfm_https_disabled">关闭 HTTPS （更快）</string>
-
-  <!-- title for notification tray after synchronizing -->
-  
-  <!-- text for notification when comments are received -->
-    
-  <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, 
-      Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page,
-      or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.  
-      Are you sure you want to sync with Astrid.com?</string>
-      
-  <!-- account types -->
-  <string name="actfm_account_type">帐号类型</string>
-  <string name="actfm_account_info">帐号信息</string>
-  <string name="actfm_account_info_summary">状态和选项</string>
-  <string name="account_type_title_not_logged_in">免费注册一个帐号</string>
-  <string name="account_type_summary_not_logged_in">进入在线任务，分享列表和指派任务</string>
-  
-  
-  <string name="actfm_account_premium">高级</string>
-  <string name="actfm_account_basic">一般</string>
-  
-  <string name="actfm_inapp_billing">升级成高级用户</string>
-  <string name="actfm_inapp_billing_summary">附件，语音备份，高级支持和更多</string>
-  
-  <!-- Sharing -->
-  <string name="share_with_facebook">在Facebook赞一个</string>
-  <string name="share_with_twitter">在Twitter关注我们</string>
-  <string name="share_with_google">在Google+分享</string>
-  <string name="share_speech_bubble">通过分享，您将会帮助其他人生活得更加有效率！</string>
-  
-  
-  <!-- Sync upgrade messages -->
-  <string name="sync_upgr_both_title">Using Astrid.com + Google without Duplicates</string>
-  <string name="sync_upgr_both_body">Let\'s be honest. Google Tasks is convenient but not as cool as Astrid. To avoid duplicates you can no longer sync with Astrid.com and background sync with Google Tasks at the same time. You can still import your Google Tasks by visiting Settings → Backup &amp; Sync, or downgrade to Google Tasks only sync</string>
-  <string name="sync_upgr_both_btn1">Stick with Astrid</string>
-  <string name="sync_upgr_both_btn2">Downgrade to Google Tasks</string>
-  
-  <string name="sync_upgr_gtasks_only_title">Upgrade to Astrid Sync for Free!</string>
-  <string name="sync_upgr_gtasks_only_body">Access your tasks from all your devices and from Gmail with Astrid.com sync. Upgrade to Astrid.com Sync (you can always go back to Google Tasks - but you won\'t want to)!</string>
-  <string name="sync_upgr_gtasks_only_btn1">Upgrade to Astrid Sync</string>
-  <string name="sync_upgr_gtasks_only_btn2">Stick with Google Tasks</string>
-  
-  <string name="sync_upgr_neither_title">Free backup &amp; Sync!</string>
-  <string name="sync_upgr_neither_body">Don\'t put your to-dos at risk! New and improved Astrid sync to keep and access your tasks from anywhere.</string>
-  <string name="sync_upgr_neither_btn1">Sign up now</string>
-  
-  <string name="sync_upgr_logged_out">You have been logged out of Astrid</string>
-  
-  <string name="actfm_logout_clear_tasks_title">Clear data?</string>
-  <string name="actfm_logout_clear_tasks_body">Would you like to clear your tasks and lists?</string>
-  <string name="actfm_logout_clear_tasks_yes">Clear data</string>
-  <string name="actfm_logout_clear_tasks_no">Keep data</string>
-  
-  <string name="actfm_logged_in_different_user_title">Logging in as different user</string>
-  <string name="actfm_logged_in_different_user_body">Would you like to delete existing phone tasks before syncing?</string>
-  <string name="actfm_logged_in_different_user_keep_data">Keep data</string>
-  <string name="actfm_logged_in_different_user_clear_data">Clear all data</string>
-  <string name="actfm_logged_in_different_user_processing">Processing existing data...</string>
-  
-  <string name="actfm_tag_not_authorized_title">Not authorized</string>
-  <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name?</string>
-  <string name="actfm_tag_not_authorized_new_list">Create new list</string>
-  <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
-  
-  <string name="actfm_sync_ongoing">同步中...</string>
-  
-  <string name="EPr_reset_sync_state">Reset sync</string>
-  <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors</string>
-  <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue?</string>
-  
+<resources>
 
+    <!-- ================================================== general terms == -->
 
+    <!-- People Editing Activity -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
+    <string name="actfm_person_hint">E-mail / 联系人姓名</string>
+
+    <!-- task sharing dialog: shared with hint -->
+    <string name="actfm_person_or_tag_hint">联系方式或共享列表</string>
+
+    <!-- toast on transmit success -->
+
+    <!-- can\'t rename or delete shared tag message -->
+
+    <!-- warning before deleting a list you\'re the owner of -->
+    <string name="actfm_tag_operation_owner_delete">你是这个被分享列表的拥有者，如果删除它，其它被分享者将无法访问，确定删除吗？</string>
+
+    <!-- slide 29a: menu item to take a picture -->
+    <string name="actfm_picture_camera">拍照</string>
+
+    <!-- slide 29b: menu item to select from gallery -->
+    <string name="actfm_picture_gallery">从相册中选取</string>
+
+    <!-- menu item to clear picture selection -->
+    <string name="actfm_picture_clear">取消选择</string>
+
+    <!-- filter list activity: refresh tags -->
+
+    <!-- Title for prompt after sharing a task -->
+    <string name="actfm_view_task_title">查看任务？</string>
+
+    <!-- Text for prompt after sharing a task -->
+    <string name="actfm_view_task_text">任务已发送给%s！正在查看你所拥有的任务，是否查看其它被指定的任务？</string>
+
+    <!-- Ok button for task view prompt -->
+    <string name="actfm_view_task_ok">查看被指派的任务</string>
+
+    <!-- Cancel button for task view prompt -->
+    <string name="actfm_view_task_cancel">保留在此处</string>
+
+    <!-- slide 13a: Title for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_title">已分享任务</string>
+
+    <!-- Empty list for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_empty">没有已分享任务</string>
+
+    <!-- =====================  Friendship connections -->
+
+    <string name="actfm_friendship_pending">你已经给%s发送了朋友请求！</string>
+
+    <string name="actfm_friendship_blocked">你已经屏蔽了%s</string>
+
+    <string name="actfm_friendship_ignored">You\'ve ignored %s.</string>
+
+    <string name="actfm_friendship_friends">你和%s已经是朋友了！可以为他们添加任务了</string>
+
+    <string name="actfm_friendship_other_pending">%s想与你成为朋友！</string>
+
+    <string name="actfm_friendship_no_status">与%s连线以分享和查看公开任务的活动</string>
+
+    <string name="actfm_friendship_connect">添加好友</string>
+
+    <string name="actfm_friendship_accept">接受</string>
+
+    <!-- ================================================== TagViewActivity == -->
+
+    <!-- Tag View Activity: Add Comment hint -->
+    <string name="TVA_add_comment">添加注释...</string>
+
+    <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->
+
+    <!-- Tabs for Tag view -->
+    <string-array name="TVA_tabs">
+        <!-- Tab for showing tasks -->
+        <item>任务</item>
+        <!-- Tab for showing comments & updates -->
+        <item>活动</item>
+        <!-- Tab for showing setting -->
+        <item>列表设置</item>
+    </string-array>
+
+    <!-- Tag View: filtered by assigned to user (%s => user name) -->
+    <string name="actfm_TVA_filtered_by_assign">%s的任务，点击查看全部</string>
+
+    <!-- Tag View: filter by unassigned tasks -->
+    <string name="actfm_TVA_filter_by_unassigned">未指定的任务，点击查看全部</string>
+
+    <!-- Tag View: list is private, no members -->
+    <string name="actfm_TVA_no_members_alert">私有状态：点击以编辑或分享</string>
+
+    <!-- Tag View Menu: refresh -->
+    <string name="actfm_TVA_menu_refresh">刷新</string>
+
+    <!-- Tag Settings: tag name label -->
+    <string name="actfm_TVA_tag_label">列表名称：</string>
+
+    <!-- Tag Settings: tag owner label -->
+
+    <!-- Tag Settings: tag owner value when there is no owner -->
+
+    <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
+    <string name="actfm_TVA_members_label">合作者：</string>
+
+    <!-- Tag Settings: list collaborators hint -->
+    <string name="actfm_TVA_members_hint">通过电子邮件分享</string>
+
+    <!-- Tag Settings: tag picture -->
+    <string name="actfm_TVA_tag_picture">列表图片</string>
+
+    <!-- slide 25c/28b: Tag Settings: silence notifications label -->
+    <string name="actfm_TVA_silence_label">勿扰模式</string>
+
+    <!-- Tag Settings: list icon label -->
+
+    <!-- slide 25b/27d: Tag Settings: list description label -->
+    <string name="actfm_TVA_tag_description_label">描述</string>
+
+    <!-- slide 28a: Tag Settings: list settings label -->
+    <string name="actfm_TVA_tag_settings_label">设置</string>
+
+    <!-- slide 25b: Tag Settings: list description hint -->
+    <string name="actfm_TVA_tag_description_hint">在这里添加描述</string>
+
+    <!-- slide 25d: Tag Settings: list name hint -->
+    <string name="actfm_TVA_tag_name_hint">添加列表名称</string>
+
+    <!-- Tag settings: login prompt from share-->
+    <string name="actfm_TVA_login_to_share">你需要登陆来分享列表，请登陆网站或者保持私有</string>
+
+
+    <!-- ============================================ edit people dialog == -->
+
+    <!-- task sharing dialog: intro -->
+    <string name="actfm_EPA_intro">使用清单小助理分享您的购物单，聚会和团队项目，就会发现人们可以迅速完成工作！</string>
+
+    <!-- task sharing dialog: window title -->
+
+    <!-- task sharing dialog: save button -->
+
+    <!-- task sharing dialog: assigned label -->
+
+    <!-- slide 18a: task sharing dialog: assigned label long version -->
+    <string name="actfm_EPA_assign_label_long">需要谁处理？</string>
+
+    <!-- task sharing dialog: assigned to me -->
+    <string name="actfm_EPA_assign_me">我</string>
+
+    <!-- task sharing dialog: anyone -->
+    <string name="actfm_EPA_unassigned">未分配</string>
+
+    <!-- slide 18c: task sharing dialog: choose a contact -->
+    <string name="actfm_EPA_choose_contact">选择联系人</string>
+
+    <!-- task sharing dialog: custom email assignment -->
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_share_with">共享给：</string>
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_collaborators_header">Share</string>
+
+    <!-- task sharing dialog: collaborator list name (%s => name of list) -->
+    <string name="actfm_EPA_list">列表：%s</string>
+
+    <!-- task sharing dialog: assigned hint -->
+
+    <!-- task sharing dialog: message label text -->
+    <string name="actfm_EPA_message_text">邀请信息：</string>
+
+    <!-- task sharing dialog: message body -->
+    <string name="actfm_EPA_message_body">帮我办好这事！</string>
+
+    <!-- task sharing dialog: list members section header -->
+    <string name="actfm_EPA_assign_header_members">列表成员</string>
+
+    <!-- task sharing dialog: astrid friends section header -->
+    <string name="actfm_EPA_assign_header_friends">清单小助理好友</string>
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: share with Facebook -->
+    <string name="actfm_EPA_facebook">Facebook</string>
+
+    <!-- task sharing dialog: share with Twitter -->
+    <string name="actfm_EPA_twitter">Twitter</string>
+
+    <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
+
+    <!-- task sharing dialog: edit people settings saved -->
+
+    <!-- task sharing dialog: invalid email (%s => email) -->
+    <string name="actfm_EPA_invalid_email">电子邮箱无效： %s</string>
+
+    <!-- task sharing dialog: tag not found (%s => tag) -->
+
+    <!-- task sharing login prompt -->
+    <string name="actfm_EPA_login_to_share">你需要登陆来分享任务，请登陆网站或者保持私有。</string>
+
+    <string name="actfm_EPA_login_button">登录</string>
+
+    <string name="actfm_EPA_dont_share_button">不要分享</string>
+
+    <string name="actfm_EPA_add_person_to_list_title">任务已分配</string>
+
+    <string name="actfm_EPA_add_person_to_list">%1$s is not shared on this list. Would you like to
+        add %2$s to this list?
+    </string>
+
+    <string name="actfm_EPA_add_person_to_list_ok">添加到列表</string>
+
+    <string name="actfm_EPA_add_person_to_list_cancel">不要添加</string>
+
+    <string name="actfm_list_owner">(owner)</string>
+
+    <!-- ========================================= sharing login activity == -->
+
+    <!-- share login: Title -->
+    <string name="actfm_ALA_title">欢迎光临 Astrid.com！</string>
+
+    <!-- share login: Sharing Description -->
+    <string name="actfm_ALA_body">Astrid.com能让您轻松在线访问、共享和委托您的任务。</string>
+
+    <!-- share login: Sharing Login FB Prompt -->
+    <string name="actfm_ALA_fb_login">使用Facebook帐号登录</string>
+
+    <!-- share login: Sharing Login GG Prompt -->
+    <string name="actfm_ALA_gg_login">使用Google帐号登录</string>
+
+    <!-- share login: Quickly log in as <%s -> email> -->
+    <string name="actfm_quick_login">Sign in: %s</string>
+
+    <!-- share login: Reject quick login -->
+    <string name="actfm_quick_login_reject">Not %s?</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_firstname_label">名字</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_lastname_label">姓氏</string>
+
+    <!-- share login: Email -->
+    <string name="actfm_ALA_email_label">电子邮箱</string>
+
+    <!-- share login: Username / Email -->
+
+    <!-- share login: Password -->
+    <string name="actfm_ALA_password_label">密码</string>
+
+    <!-- share login: Sign Up Title -->
+    <string name="actfm_ALA_signup_title">注册</string>
+
+    <!-- share login: Login Title -->
+    <string name="actfm_ALA_login_title">登录</string>
+
+    <!-- share login: Google Auth title -->
+    <string name="actfm_GAA_title">选择你要使用的Google账户</string>
+
+    <!-- share login: OAUTH Login Prompt -->
+    <string name="actfm_OLA_prompt">连接至 Google：</string>
+
+    <!-- Login error: user exists -->
+    <string name="actfm_ALA_error_user_exists">用户已经存在，请直接登录。</string>
+
+    <!-- Login error: wrong password -->
+    <string name="actfm_ALA_error_wrong_password">对不起，密码输入不对，请再试一次。</string>
+
+    <!-- Forgot password link -->
+    <string name="actfm_ALA_forgot_password">忘记密码？</string>
+
+    <!-- Forgot password email prompt -->
+    <string name="actfm_ALA_enter_email">请输入你的电子邮箱</string>
+
+    <!-- Password reset sent (%s -> email) -->
+    <string name="actfm_ALA_reset_sent">密码重设已发送给%s</string>
+
+    <!-- User already exists - first sync may be slow -->
+    <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your
+        patience!
+    </string>
+
+    <!-- User not found -->
+    <string name="actfm_ALA_error_user_not_found">User not found by that email. Try signing up
+        instead!
+    </string>
+
+    <!-- ================================================ Featured Lists -->
+
+    <string name="actfm_feat_list_clone">复制列表</string>
+
+    <string name="actfm_feat_list_suffix">（复制）</string>
+
+    <string name="actfm_feat_list_cloning">正在复制...</string>
+
+    <string name="actfm_feat_list_clone_success">完成!</string>
+
+    <string name="actfm_feat_list_task_clone_success">任务已复制</string>
+
+    <string name="actfm_feat_list_clone_empty">无任务复制</string>
+
+    <!-- ================================================ Synchronization == -->
+
+    <!-- Indicates the logged in user name. %s -> user\'s name -->
+    <string name="actfm_status_title_logged_in">状态——已使用 %s 帐户登录</string>
+
+    <!-- Preferences Title: Act.fm -->
+    <string name="actfm_APr_header">Astrid.com (清单小助理)</string>
+
+    <string name="actfm_https_title">使用 HTTPS</string>
+    <string name="actfm_https_enabled">开启 HTTPS （较慢）</string>
+    <string name="actfm_https_disabled">关闭 HTTPS （更快）</string>
+
+    <!-- title for notification tray after synchronizing -->
+
+    <!-- text for notification when comments are received -->
+
+    <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid
+        duplicate tasks and other synchronization issues,
+        Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You
+        can still import tasks from Google Tasks from the Google Tasks settings page,
+        or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.
+        Are you sure you want to sync with Astrid.com?
+    </string>
+
+    <!-- account types -->
+    <string name="actfm_account_type">帐号类型</string>
+    <string name="actfm_account_info">帐号信息</string>
+    <string name="actfm_account_info_summary">状态和选项</string>
+    <string name="account_type_title_not_logged_in">免费注册一个帐号</string>
+    <string name="account_type_summary_not_logged_in">进入在线任务，分享列表和指派任务</string>
+
+
+    <string name="actfm_account_premium">高级</string>
+    <string name="actfm_account_basic">一般</string>
+
+    <string name="actfm_inapp_billing">升级成高级用户</string>
+    <string name="actfm_inapp_billing_summary">附件，语音备份，高级支持和更多</string>
+
+    <!-- Sharing -->
+    <string name="share_with_facebook">在Facebook赞一个</string>
+    <string name="share_with_twitter">在Twitter关注我们</string>
+    <string name="share_with_google">在Google+分享</string>
+    <string name="share_speech_bubble">通过分享，您将会帮助其他人生活得更加有效率！</string>
+
+
+    <!-- Sync upgrade messages -->
+    <string name="sync_upgr_both_title">Using Astrid.com + Google without Duplicates</string>
+    <string name="sync_upgr_both_body">Let\'s be honest. Google Tasks is convenient but not as cool
+        as Astrid. To avoid duplicates you can no longer sync with Astrid.com and background sync
+        with Google Tasks at the same time. You can still import your Google Tasks by visiting
+        Settings → Backup &amp; Sync, or downgrade to Google Tasks only sync
+    </string>
+    <string name="sync_upgr_both_btn1">Stick with Astrid</string>
+    <string name="sync_upgr_both_btn2">Downgrade to Google Tasks</string>
+
+    <string name="sync_upgr_gtasks_only_title">Upgrade to Astrid Sync for Free!</string>
+    <string name="sync_upgr_gtasks_only_body">Access your tasks from all your devices and from Gmail
+        with Astrid.com sync. Upgrade to Astrid.com Sync (you can always go back to Google Tasks -
+        but you won\'t want to)!
+    </string>
+    <string name="sync_upgr_gtasks_only_btn1">Upgrade to Astrid Sync</string>
+    <string name="sync_upgr_gtasks_only_btn2">Stick with Google Tasks</string>
+
+    <string name="sync_upgr_neither_title">Free backup &amp; Sync!</string>
+    <string name="sync_upgr_neither_body">Don\'t put your to-dos at risk! New and improved Astrid
+        sync to keep and access your tasks from anywhere.
+    </string>
+    <string name="sync_upgr_neither_btn1">Sign up now</string>
+
+    <string name="sync_upgr_logged_out">You have been logged out of Astrid</string>
+
+    <string name="actfm_logout_clear_tasks_title">Clear data?</string>
+    <string name="actfm_logout_clear_tasks_body">Would you like to clear your tasks and lists?
+    </string>
+    <string name="actfm_logout_clear_tasks_yes">Clear data</string>
+    <string name="actfm_logout_clear_tasks_no">Keep data</string>
+
+    <string name="actfm_logged_in_different_user_title">Logging in as different user</string>
+    <string name="actfm_logged_in_different_user_body">Would you like to delete existing phone tasks
+        before syncing?
+    </string>
+    <string name="actfm_logged_in_different_user_keep_data">Keep data</string>
+    <string name="actfm_logged_in_different_user_clear_data">Clear all data</string>
+    <string name="actfm_logged_in_different_user_processing">Processing existing data...</string>
+
+    <string name="actfm_tag_not_authorized_title">Not authorized</string>
+    <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you
+        may have been removed). Would you like to create a new list with the same name?
+    </string>
+    <string name="actfm_tag_not_authorized_new_list">Create new list</string>
+    <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
+
+    <string name="actfm_sync_ongoing">同步中...</string>
+
+    <string name="EPr_reset_sync_state">Reset sync</string>
+    <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors
+    </string>
+    <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will
+        be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you
+        wish to continue?
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in timers plug-in -->
+
+    <!-- Task Edit Activity: Container Label -->
+    <string name="alarm_ACS_label">闹钟</string>
+
+    <!-- Task Edit Activity: Add New Alarm -->
+    <string name="alarm_ACS_button">添加闹钟</string>
+
+    <string-array name="reminders_alarm">
+        <!-- reminders related to alarm -->
+        <item>闹钟！</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in backup plug-in -->
+
+    <!-- ================================================= BackupPreferences == -->
+
+    <!-- slide 33c/48d: Backup Preferences Title -->
+    <string name="backup_BPr_header">备份</string>
+
+    <!-- slide 48e/50c: Backup: Status Header -->
+    <string name="backup_BPr_group_status">状态</string>
+
+    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->
+    <string name="backup_status_success">最近一次:%s</string>
+    <!-- Backup Status: last error failed. Keep it short! -->
+    <string name="backup_status_failed">上次备份失败</string>
+    <!-- Backup Status: error subtitle -->
+    <string name="backup_status_failed_subtitle">（点击查看错误）</string>
+    <!-- slide 48a: Backup Status: never backed up -->
+    <string name="backup_status_never">从未备份！</string>
+
+    <!-- slide 48f/ 50e: Backup Options Group Label -->
+    <string name="backup_BPr_group_options">选项</string>
+
+    <!-- slide 48b: Preference: Automatic Backup Title -->
+    <string name="backup_BPr_auto_title">自动备份</string>
+    <!-- Preference: Automatic Backup Description (when disabled) -->
+    <string name="backup_BPr_auto_disabled">自动备份已停用</string>
+    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
+    <string name="backup_BPr_auto_enabled">备份每天执行</string>
+
+    <!-- Preference screen restoring Tasks Help -->
+    <!-- Preference screen Restoring Tasks Help Dialog Text-->
+
+    <string name="backup_BPr_cloud_already_logged_in">您已经在Astrid.com上享有云备份</string>
+
+    <!-- ================================================= BackupActivity == -->
+
+    <!-- slide 48c: backup activity label -->
+    <string name="backup_BAc_label">管理备份</string>
+
+    <!-- backup activity title -->
+    <string name="backup_BAc_title">管理您的备份</string>
+
+    <!-- backup activity import button -->
+    <string name="backup_BAc_import">导入任务</string>
+
+    <!-- backup activity export button -->
+    <string name="backup_BAc_export">导出任务</string>
+
+    <!-- backup activity cloud (Astrid.com) option -->
+    <string name="backup_BAc_cloud">访问Astrid.com免费获取云备份</string>
+
+    <!-- ============================================== Importer / Exporter == -->
+
+    <!-- Message displayed when error occurs -->
+    <string name="backup_TXI_error">导入错误</string>
+
+    <string name="export_toast">已将 %1$s 备份至 %2$s。</string>
+
+    <string name="export_toast_no_tasks">没有要导出的任务。</string>
+
+    <!-- Progress Dialog Title for exporting -->
+    <string name="export_progress_title">导出中...</string>
+
+    <!-- Backup: Title of Import Summary Dialog -->
+    <string name="import_summary_title">还原摘要</string>
+
+    <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
+    <string name="import_summary_message">文件 %1$s 包含 %2$s 个任务。\n\n %3$s 个已导入,\n %4$s 个已存在\n %5$s
+        个存在错误\n
+    </string>
+
+    <!-- Progress Dialog Title for importing -->
+    <string name="import_progress_title">导入中...</string>
+
+    <!-- Progress Dialog text for import reading task (%d -> task number)-->
+    <string name="import_progress_read">读取任务 %d...</string>
+
+    <!-- Backup: Dialog when unable to open a file -->
+
+    <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
+    <string name="DLG_error_sdcard">无法开启文件夹：%s</string>
+
+    <!-- Backup: Dialog when unable to open SD card in general -->
+    <string name="DLG_error_sdcard_general">无法访问您的 SD 卡！</string>
+
+    <!-- Backup: File Selector dialog for import -->
+    <string name="import_file_prompt">选取要还原的文件</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- ================================================== AndroidManifest == -->
+
+    <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
+    <string name="app_name">清单小助理</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="read_permission_label">清单小助理权限</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="read_permission_desc">读取任务，显示任务过滤器</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="write_permission_label">清单小助理权限</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="write_permission_desc">创建新任务，修改现有任务</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- question for deleting tasks -->
+    <string name="DLG_delete_this_task_question">确认删除？</string>
+
+    <!-- question for deleting items (%s => item name) -->
+    <string name="DLG_delete_this_item_question">删除此项目：%s？</string>
+
+    <!-- Progress dialog shown when upgrading -->
+    <string name="DLG_upgrading">升级您的任务...</string>
+
+    <!-- Title for dialog selecting a time (hours and minutes) -->
+    <string name="DLG_hour_minutes">时间（小时:分钟）</string>
+
+    <!-- Dialog for Astrid having a critical update -->
+    <string name="DLG_please_update">清单小助理应该要从 Android 市场下载最新版本! 请继续前执行, 或稍等片刻。</string>
+
+    <!-- Button for going to Market -->
+
+    <!-- Button for accepting EULA -->
+    <string name="DLG_accept">接受</string>
+
+    <!-- Button for declining EULA -->
+    <string name="DLG_decline">不接受</string>
+
+    <!-- EULA title -->
+    <string name="DLG_eula_title">清单小助理使用条款</string>
+
+    <!-- Progress Dialog generic text -->
+    <string name="DLG_please_wait">请稍候</string>
+
+    <!-- Dialog - loading -->
+    <string name="DLG_loading">载入中...</string>
+
+    <!-- Dialog - dismiss -->
+
+    <!-- slide 20d -->
+    <string name="DLG_ok">确定(O)</string>
+    <!-- slide 36g -->
+    <string name="DLG_cancel">取消</string>
+
+    <string name="DLG_more">更多</string>
+
+    <string name="DLG_undo">撤消</string>
+
+    <string name="DLG_warning">系统提醒</string>
+
+    <!-- =============================================================== UI == -->
+
+    <!-- Label for DateButtons with no value -->
+    <string name="WID_dateButtonUnset">点选</string>
+
+    <!-- String formatter for DateButtons ($D => date, $T => time) -->
+
+    <!-- String formatter for Disable button -->
+
+    <!--  ============================================================= notes -->
+
+    <!-- Note Exposer -->
+
+    <!-- Note Exposer / Comments -->
+
+    <!-- EditNoteActivity - no comments -->
+    <string name="ENA_no_comments">没有要显示的</string>
+
+    <!-- EditNoteActivity - no username for comment -->
+    <string name="ENA_no_user">某人</string>
+
+    <!-- EditNoteActivity - refresh comments -->
+    <string name="ENA_refresh_comments">刷新留言</string>
+
+    <!-- ================================================= TaskListActivity == -->
+
+    <!-- slide 8b: Task List: Displayed instead of list when no items present -->
+    <string name="TLA_no_items">你没有任务</string>
+
+    <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
+    <string name="TLA_no_items_person">%s 没有 \n与您分享的任务</string>
+
+    <!-- Menu: Adjust Sort and Hidden Task Settings -->
+    <string name="TLA_menu_sort">Sort</string>
+
+    <!-- Menu: Sync Now -->
+    <string name="TLA_menu_sync">立即同步</string>
+
+    <!-- Menu: Search -->
+    <string name="TLA_menu_search">搜索</string>
+
+    <!-- Menu: Tasks -->
+    <string name="TLA_menu_lists">列表</string>
+
+    <!-- Menu: Friends -->
+    <string name="TLA_menu_friends">人物</string>
+
+    <!-- Menu: Featured Lists -->
+    <string name="TLA_menu_featured_lists">特定列表</string>
+
+    <!-- Menu: Suggestions -->
+    <string name="TLA_menu_suggestions">建议</string>
+
+    <!-- Menu: Tutorial -->
+
+    <!-- Menu: Settings -->
+    <string name="TLA_menu_settings">设置</string>
+
+    <!-- slide 30b: Menu: Support -->
+    <string name="TLA_menu_support">支持</string>
+
+    <!-- Search Label-->
+
+    <!-- Window title for displaying Custom Filter -->
+    <string name="TLA_custom">自定义</string>
+
+    <!-- slide 8d: Quick Add Edit Box Hint-->
+    <string name="TLA_quick_add_hint">添加任务</string>
+
+    <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
+    <string name="TLA_quick_add_hint_assign">为 %s 增加任务</string>
+
+    <!-- Notification Volumne notification-->
+    <string name="TLA_notification_volume_low">已静音。你不会再听到了！</string>
+
+    <!-- Notifications disabled warning -->
+    <string name="TLA_notification_disabled">清单小助理提醒功能被关闭，你不会收到任何提醒。</string>
+
+    <string-array name="TLA_filters">
+        <item>激活</item>
+        <item>今天</item>
+        <item>马上</item>
+        <item>延迟</item>
+        <item>完成</item>
+        <item>隐藏</item>
+    </string-array>
+
+    <!-- Title for confirmation dialog after quick add markup -->
+    <string name="TLA_quickadd_confirm_title">你说到：“%s”</string>
+
+    <!-- Text for speech bubble in dialog after quick add markup -->
+    <!-- First string is task title, second is due date, third is priority -->
+    <string name="TLA_quickadd_confirm_speech_bubble">我创建了一项叫做“%1$s”的任务，截止日期为 %2$s，优先级为 %3$s
+    </string>
+
+    <string name="TLA_quickadd_confirm_speech_bubble_date">执行人为 %s</string>
+
+    <string name="TLA_quickadd_confirm_hide_helpers">以后不显示确认</string>
+
+
+    <!-- Title for alert on new repeating task. %s-> task title -->
+    <string name="TLA_repeat_scheduled_title">新的重复任务 %s</string>
+
+    <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
+    <string name="TLA_repeat_scheduled_speech_bubble">我会在 %s 后提醒您这个任务的。</string>
+
+    <string-array name="TLA_priority_strings">
+        <item>最高优先级</item>
+        <item>高优先级</item>
+        <item>中等优先级</item>
+        <item>低优先级</item>
+    </string-array>
+    <!-- slide 22a -->
+    <string name="TLA_all_activity">所有活动</string>
+
+    <!-- ====================================================== TaskAdapter == -->
+
+    <!-- Format string to indicate task is hidden (%s => task name) -->
+    <string name="TAd_hiddenFormat">%s [已隐藏]</string>
+
+    <!-- Format string to indicate task is deleted (%s => task name) -->
+    <string name="TAd_deletedFormat">%s [已删除]</string>
+
+    <!-- Displayed when adapter is flung (scrolled quickly) -->
+
+    <!-- slide 22b: indicates task was completed. %s => date or time ago -->
+    <string name="TAd_completed">完成\n%s 项</string>
+
+    <!-- slide 15a: Action Button: edit task -->
+    <string name="TAd_actionEditTask">编辑</string>
+
+    <!-- Context Item: edit task -->
+    <string name="TAd_contextEditTask">编辑任务</string>
+
+    <!-- Context Item: copy task -->
+    <string name="TAd_contextCopyTask">复制任务</string>
+
+    <!-- Context Item: delete task -->
+    <string name="TAd_contextDeleteTask">删除任务</string>
+
+    <!-- Context Item: undelete task -->
+    <string name="TAd_contextUndeleteTask">未删除任务</string>
+
+    <!-- Context Item: purge task -->
+    <string name="TAd_contextPurgeTask">清除任务</string>
+
+    <!-- ============================================== SortSelectionDialog == -->
+
+    <!-- slide 23a: Sort Selection: dialog title -->
+    <string name="SSD_title">排序和隐藏任务</string>
+
+    <!-- slide 23h:  Hidden: title -->
+    <string name="SSD_hidden_title">隐藏任务</string>
+
+    <!-- Hidden Task Selection: show completed tasks -->
+    <string name="SSD_completed">显示已完成任务</string>
+
+    <!-- Hidden Task Selection: show hidden tasks -->
+    <string name="SSD_hidden">显示隐藏的任务</string>
+
+    <!-- Hidden Task Selection: show deleted tasks -->
+    <string name="SSD_deleted">显示已删除任务</string>
+
+    <!-- Sort Selection: drag with subtasks -->
+    <string name="SSD_sort_drag">Manual order with subtasks</string>
+
+    <!-- slide 23b: Sort Selection: smart sort -->
+    <string name="SSD_sort_auto">清单小助理智能排序</string>
+
+    <!-- slide 23e: Sort Selection: sort by alpha -->
+    <string name="SSD_sort_alpha">按标题</string>
+
+    <!-- slide 23c: Sort Selection: sort by due date -->
+    <string name="SSD_sort_due">按到期日</string>
+
+    <!-- slide 23d: Sort Selection: sort by importance -->
+    <string name="SSD_sort_importance">By priority</string>
+
+    <!-- slide 23f: Sort Selection: sort by modified date -->
+    <string name="SSD_sort_modified">按最后修改</string>
+
+    <!-- slide 23g: Sort Selection: reverse -->
+    <string name="SSD_sort_reverse">反向排序</string>
+
+    <!-- slide 23j: Sort Button: sort temporarily -->
+    <string name="SSD_save_temp">仅一次</string>
+
+    <!-- slide 23i: Sort Button: sort permanently -->
+    <string name="SSD_save_always">总是</string>
+
+    <!-- =============================================== FilterListActivity == -->
+
+    <!-- Astrid Filter Shortcut -->
+    <string name="FSA_label">清单小助理列表或过滤器</string>
+
+    <!-- Filter List Activity Title -->
+
+    <!-- Displayed when loading filters -->
+
+    <!-- Context Menu: Create Shortcut -->
+    <string name="FLA_context_shortcut">在桌面建立快捷方式</string>
+
+    <!-- Menu: Search -->
+
+    <!-- Menu: Help -->
+
+    <!-- slide 28c: Create Shortcut Dialog Title -->
+    <string name="FLA_shortcut_dialog_title">建立快捷方式</string>
+
+    <!-- Create Shortcut Dialog (asks to name shortcut) -->
+    <string name="FLA_shortcut_dialog">快捷方式名称：</string>
+
+    <!-- Search Hint-->
+    <string name="FLA_search_hint">搜索任务</string>
+
+    <!-- Search Filter name (%s => query) -->
+    <string name="FLA_search_filter">比对 \'%s\'</string>
+
+    <!-- Toast: created shortcut (%s => label) -->
+    <string name="FLA_toast_onCreateShortcut">建立快捷方式: %s</string>
+
+    <!-- Menu: new filter -->
+    <string name="FLA_new_filter">新建过滤器</string>
+
+    <!-- slide 10e: Button: new list -->
+    <string name="FLA_new_list">新建列表</string>
+
+    <!-- Alert when creating a shortcut without selecting a filter -->
+    <string name="FLA_no_filter_selected">还没有选定过滤器呢！请选择一个过滤器或列表呗。</string>
+
+    <!-- ================================================= TaskEditActivity == -->
+
+    <!-- Title when editing a task (%s => task title) -->
+
+    <!-- Title when creating a new task -->
+
+    <!-- Task title label -->
+
+    <!-- Task when label -->
+    <string name="TEA_when_header_label">时间</string>
+
+    <!-- Task title hint (displayed when edit box is empty) -->
+    <string name="TEA_title_hint">Task name</string>
+
+    <!-- Task importance label -->
+    <string name="TEA_importance_label">Priority</string>
+
+    <!-- Task due date hint -->
+    <string name="TEA_deadline_hint">Set due date</string>
+
+    <!-- Task assigned to string (%s -> assigned person name) -->
+    <string name="TEA_assigned_to">Assigned to %s</string>
+
+    <!-- Task urgency specific time checkbox -->
+    <string name="TEA_urgency_specific_time">于指定时间？</string>
+
+    <!-- Task urgency specific time title when specific time false -->
+    <string name="TEA_urgency_none">无</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_label">Hide until</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_display">Hide until %s</string>
+
+    <!-- Task hide until toast -->
+    <string name="TEA_hideUntil_message">任务将会被隐藏，直到 %s</string>
+
+    <!-- Task editing data being loaded label -->
+    <string-array name="TEA_loading">
+        <item>载入中...</item>
+    </string-array>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_note_label">描述</string>
+
+    <!-- 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">要花多久时间?</string>
+
+    <!-- Elapsed time label -->
+    <string name="TEA_elapsedDuration_label">已用于任务的时间</string>
+
+    <!-- Menu: Save -->
+    <string name="TEA_menu_save">保存更改</string>
+
+    <!-- Menu: Don\'t Save -->
+    <string name="TEA_menu_discard">不保存</string>
+
+    <!-- Menu: Delete Task -->
+    <string name="TEA_menu_delete">删除任务</string>
+
+    <!-- Menu: Task comments -->
+    <string name="TEA_menu_refresh_comments">Refresh comments</string>
+
+    <string name="TEA_menu_comments">注释</string>
+
+    <!-- Toast: task saved with deadline (%s => preposition + time units) -->
+    <string name="TEA_onTaskSave_due">已设截止日期的任务：按 %s</string>
+
+    <!-- Toast: task saved without deadlines -->
+    <string name="TEA_onTaskSave_notDue">任务已储存</string>
+
+    <!-- Toast: task was not saved -->
+
+    <!-- Toast: task was deleted -->
+
+    <!-- slide 15b: Task edit tab: activity -->
+    <string name="TEA_tab_activity">活动</string>
+
+    <!-- slide 15e:  Task edit tab: more editing settings -->
+    <string name="TEA_tab_more">细节</string>
+
+    <!-- slide 15d: Task edit tab: web services -->
+    <string name="TEA_tab_web">建议</string>
+
+    <string name="TEA_timer_est">Est. %s</string>
+
+    <string name="TEA_timer_elap">Elapsed %s</string>
+
+    <string-array name="TEA_urgency">
+        <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
+        <item>No date</item>
+        <item>指定哪天</item>
+        <item>今天</item>
+        <item>明天</item>
+        <item>（天之后）</item>
+        <item>下周</item>
+        <item>两周之内</item>
+        <item>下个月</item>
+    </string-array>
+
+    <string name="TEA_no_time">没有时间</string>
+
+    <string-array name="TEA_hideUntil">
+        <!-- hideUntil: labels for edit page. -->
+        <item>Never</item>
+        <item>Due date</item>
+        <item>Due time</item>
+        <item>Day before due</item>
+        <item>Week before due</item>
+        <item>指定日期/时间</item>
+    </string-array>
+
+    <!-- Task edit control set descriptors -->
+
+    <!-- slide 9b/35i -->
+    <string name="TEA_control_who">人物</string>
+
+    <!-- slide 9c/ 35a -->
+    <string name="TEA_control_when">时间</string>
+    <!-- slide 35b -->
+    <string name="TEA_control_more_section">----详情----</string>
+    <!-- slide 16a/35c -->
+    <string name="TEA_control_importance">Priority</string>
+    <!-- slide 16b/35d -->
+    <string name="TEA_control_lists">列表</string>
+    <!-- slide 16c/35e -->
+    <string name="TEA_control_notes">描述</string>
+
+    <string name="TEA_control_files">文件</string>
+
+    <!-- slide 16e / slide 35g-->
+    <string name="TEA_control_reminders">提醒</string>
+
+    <!-- slide 16f -->
+    <string name="TEA_control_timer">定时器控件</string>
+
+    <string name="TEA_control_hidden_section">----始终隐藏----</string>
+
+    <string name="hide_until_prompt">在我的列表中显示</string>
+
+    <!-- Add Ons tab when no add-ons found -->
+
+    <!-- Add Ons button -->
+
+    <!-- More row -->
+
+    <!-- slide 15c: Text when no activity to show -->
+    <string name="TEA_no_activity">无活动</string>
+
+    <!-- Text to load more activity -->
+    <string name="TEA_load_more">加载更多……</string>
+
+    <!-- When controls dialog -->
+    <string name="TEA_when_dialog_title">这项活动定在什么时候呀？</string>
+
+
+    <string name="TEA_new_task">新建任务</string>
+
+    <string name="WSV_click_to_load">拍拍我，让我搜索一下完成这项任务的各种方法！</string>
+
+    <string name="WSV_not_online">连上互联网后我可以做更多事情。请检查一下您的网络连接呗。</string>
+
+    <string name="TEA_contact_error">不好意思！我们找不到所选联系人的电子邮件地址喔。</string>
+
+    <!-- ============================================= IntroductionActivity == -->
+
+    <!-- slide 1a: Introduction Window title -->
+
+    <!-- Button to agree to EULA -->
+
+    <!-- Button to disagree with EULA -->
+
+    <!-- ===================================================== MissedCallActivity == -->
+
+    <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
+    <string name="MCA_title">%1$s\n在 %2$s 给您打过电话</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_return_call">现在回电</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_add_task">稍后回电</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_ignore">忽略</string>
+
+    <!-- Missed call: dialog to ignore all missed calls title -->
+    <string name="MCA_ignore_title">忽略所有未接电话吗？</string>
+
+    <!-- Missed call: dialog to ignore all missed calls body -->
+    <string name="MCA_ignore_body">您已经忽略了几个未接电话。对于这些电话，清单小助理是否应该不再询问您呢？</string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore all button -->
+    <string name="MCA_ignore_all">忽略所有来电</string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
+    <string name="MCA_ignore_this">只忽略这个来电</string>
+
+    <!-- Missed call: preference title -->
+    <string name="MCA_missed_calls_pref_title">及时回复未接电话</string>
+
+    <!-- slide 49c: Missed call: preference description -->
+    <string name="MCA_missed_calls_pref_desc_enabled">清单小助理会向您报告未接电话，还会提供回电的提醒</string>
+    <string name="MCA_missed_calls_pref_desc_disabled">清单小助理将不会向您报告未接电话</string>
+
+    <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
+    <string name="MCA_task_title_name">请回电给 %1$s，电话是 %2$s</string>
+
+    <!-- Missed call: task title no name (%s -> number)-->
+    <string name="MCA_task_title_no_name">请回电给 %s</string>
+
+    <!-- Missed call: schedule dialog title (%s -> name or number)-->
+    <string name="MCA_schedule_dialog_title">请给 %s 回个电话过去……</string>
+
+    <!-- Missed call speech bubble options -->
+    <string-array name="MCA_dialog_speech_options">
+        <item>您这么人见人爱、花见花开，感觉肯定棒极了！</item>
+        <item>哇！个个都喜欢您咽！</item>
+        <item>回个电话吧，好让他们高兴一整天！</item>
+        <item>人家给您回电话，您肯定高兴，不是吗？</item>
+        <item>您是可以回电的！</item>
+        <item>无论怎样，您也可以发条短信呀……</item>
+    </string-array>
+
+
+    <!-- ======================================= Calendar reminder activity == -->
+
+    <!-- Calendar remindeer ignore button -->
+    <string name="CRA_ignore">忽略</string>
+
+    <!-- Calendar event -->
+    <string name="CRA_title">需要会议列表？</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls title -->
+    <string name="CRA_ignore_title">忽略所有日历事件？</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls body -->
+    <string name="CRA_ignore_body">您已经忽略了几个日历事件。对于这些事件，清单小助理是否应该不再询问您呢？</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
+    <string name="CRA_ignore_all">忽略所有事件</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
+    <string name="CRA_ignore_this">只忽略该事件</string>
+
+    <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
+    <string name="CRA_speech_bubble_start">Looks like %s is starting soon. Want to create a list for
+        action items?
+    </string>
+
+    <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
+    <string name="CRA_speech_bubble_end">Looks like you just finished with %s. Want to create a list
+        for action items?
+    </string>
+
+    <!-- Calendar reminder: create list button -->
+    <string name="CRA_create_list">创建列表</string>
+
+    <!-- Calendar reminder: postpone button -->
+    <string name="CRA_postpone">也许以后</string>
+
+    <!-- Calendar reminder: list exists dialog title -->
+    <string name="CRA_list_exists_title">列表已存在</string>
+
+    <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
+    <string name="CRA_list_exists_body">A list named %s already exists. Do you want to use the
+        existing list or create a new one for this event?
+    </string>
+
+    <!-- Calendar reminder: list exists dialog create new button -->
+    <string name="CRA_create_new">Create new</string>
+
+    <!-- Calendar reminder: list exists dialog use existing button -->
+    <string name="CRA_use_existing">Use existing</string>
+
+    <!-- Calendar remindr: created list (%s -> list name) -->
+    <string name="CRA_created_list_dialog">I created a list %s.</string>
+
+    <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
+    <string name="CRA_one_attendee">%s is attending.</string>
+
+    <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
+    <string name="CRA_two_attendees">%1$s and %2$s are attending.</string>
+
+    <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
+    <string name="CRA_many_attendees">%1$s, %2$s, and %3$d others are attending.</string>
+
+    <!-- Calendar reminder: invitation prompt -->
+    <string name="CRA_invitation_prompt">Want to invite them?</string>
+
+    <!-- Calendar reminder: preference title -->
+    <string name="CRA_calendar_reminders_pref_title">Calendar assistant</string>
+
+    <!-- Calendar reminder: pref description disabled -->
+    <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid will not remind you about
+        upcoming calendar events
+    </string>
+
+    <!-- Calendar reminder: pref description enabled -->
+    <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid will remind you about upcoming
+        calendar events and prompt you to prepare for them
+    </string>
+
+    <!-- Calendar reminder: share list title -->
+    <string name="CRA_share_list_title">Share the list?</string>
+
+    <string name="CRA_invite_attendees">Invite attendees</string>
+
+    <string name="CRA_more_options">More options</string>
+
+    <string name="CRA_dont_invite">No thank you</string>
+
+    <!-- Calendar reminder: share list title when no other attendees exist-->
+    <string name="CRA_list_created_title">List created!</string>
+
+    <!-- Calendar reminder: default new list name (%s -> event title) -->
+    <string name="CRA_default_list_name">Action Items: %s</string>
+
+    <!-- ===================================================== HelpActivity == -->
+
+    <!-- Help: Button to get support from our website -->
+
+    <!-- ==================================================== UpdateService == -->
+
+    <!-- Changelog Window Title -->
+    <string name="UpS_changelog_title">清单小助理有哪些最新功能？</string>
+
+    <!-- Updates Window Title -->
+    <string name="UpS_updates_title">清单小助理最新消息</string>
+
+    <!-- Updats No Activity to show for offline users -->
+    <string name="UpS_no_activity_log_in">登录查看您的活动进展情况 \n以及在各分享列表上的活动。</string>
+
+    <!-- ================================================== EditPreferences == -->
+
+    <!-- slide 31g: Preference Window Title -->
+    <string name="EPr_title">清单小助理：设置</string>
+
+    <string name="EPr_share_astrid">Share Astrid</string>
+
+    <string name="EPr_share_astrid_summary">在您喜欢的社交网站上分享清单小助理</string>
+
+    <!-- slide 46a -->
+    <string name="EPr_deactivated">禁用</string>
+
+    <!-- slide 30i: Preference Category: Appearance Title -->
+    <string name="EPr_appearance_header">外观</string>
+
+    <!-- Preference Category: Appearance Summary -->
+    <string name="EPr_appearance_summary">主题，小工具，任务栏，编辑屏幕列表</string>
+
+    <!-- FAQ Preference title -->
+    <string name="EPr_faq_title">常见问题</string>
+
+    <!-- Account status preference (%s -> account type) -->
+    <string name="EPr_account_title">帐号：%s</string>
+
+    <!-- Support preferences summary -->
+    <string name="EPr_support_summary">指引，常见问题，关于我们</string>
+
+    <!-- slide 34a: Preference: Task List Font Size Title -->
+    <string name="EPr_fontSize_title">任务列表字体大小</string>
+
+    <!-- Preference: Filters to show pref screen title -->
+    <string name="EPr_filters_to_show_title">Filters to show</string>
+
+    <!-- slide 32a: Preference: Show confirmation for smart reminders -->
+    <string name="EPr_showSmartConfirmation_title">显示智能提示确认消息</string>
+
+    <!-- slide 34g: Preference: Task List Font Size Description -->
+    <string name="EPr_fontSize_desc">主列表页面字体大小</string>
+
+    <!-- Preferemce: Show task edit confirmation toasts -->
+
+    <!-- slide 34c: Preference: Task List Show Notes -->
+    <string name="EPr_showNotes_title">Show description in task</string>
+
+    <!-- Edit screen preference category -->
+    <string name="EPr_edit_screen_options">Edit screen options</string>
 
-    
-    <!-- Resources for built-in timers plug-in -->
-    
-    <!-- Task Edit Activity: Container Label -->
-    <string name="alarm_ACS_label">闹钟</string>
-    
-    <!-- Task Edit Activity: Add New Alarm -->
-    <string name="alarm_ACS_button">添加闹钟</string>
-    
-    <string-array name="reminders_alarm">
-      <!-- reminders related to alarm -->
-      <item>闹钟！</item>
+    <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
+    <string name="EPr_beastMode_title">Edit screen order</string>
+
+    <string name="EPr_beastMode_shortcut">Customize</string>
+
+    <string name="EPr_time_increment">5 minute increments</string>
+
+    <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
+
+    <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
+
+    <!-- slide 35h -->
+    <string name="EPr_beastMode_desc">自定义设定菜单屏幕</string>
+    <!-- slide 35j -->
+    <string name="EPr_beastMode_reset">恢复默认值</string>
+
+    <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on
+        each row
+    </string>
+
+    <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
+    <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit
+        screen
+    </string>
+    <!-- Preference: Task List Show Notes Description (enabled) -->
+    <string name="EPr_showNotes_desc_enabled">Description will always be displayed</string>
+
+    <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
+    <string name="EPr_compressTaskRows_title">压缩任务排列</string>
+    <!-- slide 34j -->
+    <string name="EPr_compressTaskRows_desc">压缩任务行，使它适应标题</string>
+
+    <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
+    <!-- slide 34k-->
+
+    <!-- slide 34b: Preferences: Wrap task titles to two lines -->
+    <string name="EPr_fullTask_title">显示完整的任务标题</string>
+    <string name="EPr_fullTask_desc_enabled">将显示完整的任务标题</string>
+    <!-- slide 34h -->
+    <string name="EPr_fullTask_desc_disabled">将显示任务标题的头两行</string>
+
+    <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
+    <string name="EPr_ideaAuto_title">自动加载意见选项标签</string>
+    <!-- slide 32c -->
+    <string name="EPr_ideaAuto_desc_enabled">点击标签后，网页将会搜索意见选项。</string>
+    <string name="EPr_ideaAuto_desc_disabled">只有手动请求后，网页将会搜索意见选项。</string>
+
+    <!-- Preferences: task row style -->
+    <string-array name="EPr_task_row_styles">
+        <item>Original</item>
+        <item>Simple</item>
+        <item>Title only</item>
     </string-array>
-    
 
+    <string-array name="EPr_task_row_style_descriptions">
+        <item>截取标题至两行，并在右边显示日期</item>
+        <item>截取标题为一行，并在下方显示日期和列表</item>
+        <item>Single line title only</item>
+    </string-array>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- task row style title (%s -> style) -->
+    <string name="EPr_task_row_style_title">Row style: %s</string>
 
-    
-  <!-- Resources for built-in backup plug-in -->
-  
-  <!-- ================================================= BackupPreferences == -->
+    <!-- Preference: custom filters enabled -->
+    <string name="EPr_use_filters_title">Use filters</string>
+    <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
 
-    <!-- slide 33c/48d: Backup Preferences Title -->    
-    <string name="backup_BPr_header">备份</string>
+    <!-- Preference: show list members in shared list -->
+    <string name="EPr_show_list_members_title">Show list members in shared lists</string>
 
-    <!-- slide 48e/50c: Backup: Status Header -->    
-    <string name="backup_BPr_group_status">状态</string>
-    
-    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">最近一次:%s</string>
-    <!-- Backup Status: last error failed. Keep it short! -->    
-    <string name="backup_status_failed">上次备份失败</string>
-    <!-- Backup Status: error subtitle -->    
-    <string name="backup_status_failed_subtitle">（点击查看错误）</string>
-    <!-- slide 48a: Backup Status: never backed up -->    
-    <string name="backup_status_never">从未备份！</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_simple_input_boxes">Simple text boxes</string>
 
-    <!-- slide 48f/ 50e: Backup Options Group Label -->    
-    <string name="backup_BPr_group_options">选项</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
 
-    <!-- slide 48b: Preference: Automatic Backup Title -->    
-    <string name="backup_BPr_auto_title">自动备份</string>
-    <!-- Preference: Automatic Backup Description (when disabled) -->
-    <string name="backup_BPr_auto_disabled">自动备份已停用</string>    
-    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
-    <string name="backup_BPr_auto_enabled">备份每天执行</string>
-    
-    <!-- Preference screen restoring Tasks Help -->
-    <!-- Preference screen Restoring Tasks Help Dialog Text-->
-    
-    <string name="backup_BPr_cloud_already_logged_in">您已经在Astrid.com上享有云备份</string>
-  
-  <!-- ================================================= BackupActivity == -->
-
-  <!-- slide 48c: backup activity label -->
-  <string name="backup_BAc_label">管理备份</string>
-
-  <!-- backup activity title -->
-  <string name="backup_BAc_title">管理您的备份</string>
-
-  <!-- backup activity import button -->
-  <string name="backup_BAc_import">导入任务</string>
-
-  <!-- backup activity export button -->
-  <string name="backup_BAc_export">导出任务</string>
-  
-  <!-- backup activity cloud (Astrid.com) option -->
-  <string name="backup_BAc_cloud">访问Astrid.com免费获取云备份</string>
-    
-  <!-- ============================================== Importer / Exporter == -->
-  
-  <!-- Message displayed when error occurs -->
-  <string name="backup_TXI_error">导入错误</string>
-    
-  <string name="export_toast">已将 %1$s 备份至 %2$s。</string>
-    
-  <string name="export_toast_no_tasks">没有要导出的任务。</string>
-  
-  <!-- Progress Dialog Title for exporting -->    
-  <string name="export_progress_title">导出中...</string>
-  
-  <!-- Backup: Title of Import Summary Dialog -->
-  <string name="import_summary_title">还原摘要</string>
-    
-  <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">文件 %1$s 包含 %2$s 个任务。\n\n %3$s 个已导入,\n %4$s 个已存在\n %5$s 个存在错误\n</string>
-  
-  <!-- Progress Dialog Title for importing -->    
-  <string name="import_progress_title">导入中...</string>
-  
-  <!-- Progress Dialog text for import reading task (%d -> task number)-->    
-  <string name="import_progress_read">读取任务 %d...</string>
-  
-  <!-- Backup: Dialog when unable to open a file -->  
-  
-  <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
-  <string name="DLG_error_sdcard">无法开启文件夹：%s</string>
-  
-  <!-- Backup: Dialog when unable to open SD card in general -->
-  <string name="DLG_error_sdcard_general">无法访问您的 SD 卡！</string>
-    
-  <!-- Backup: File Selector dialog for import -->
-  <string name="import_file_prompt">选取要还原的文件</string>    
-        
+    <!-- Preference: don\'t show plus button until input present -->
+    <string name="EPr_hide_plus_button">Hide plus button</string>
 
+    <!-- Preference: menu items -->
+    <string name="EPr_menu_items">Menu items</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Preference: list view -->
+    <string name="EPr_list_view">List view</string>
 
+    <!-- Preference: task edit comments -->
+    <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
 
-  <!-- ================================================== AndroidManifest == -->
-
-  <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
-  <string name="app_name">清单小助理</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="read_permission_label">清单小助理权限</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="read_permission_desc">读取任务，显示任务过滤器</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="write_permission_label">清单小助理权限</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="write_permission_desc">创建新任务，修改现有任务</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-    
-  <!-- question for deleting tasks -->
-  <string name="DLG_delete_this_task_question">确认删除？</string>
-
-  <!-- question for deleting items (%s => item name) -->
-  <string name="DLG_delete_this_item_question">删除此项目：%s？</string>
-    
-  <!-- Progress dialog shown when upgrading -->
-  <string name="DLG_upgrading">升级您的任务...</string>
-  
-  <!-- Title for dialog selecting a time (hours and minutes) -->
-  <string name="DLG_hour_minutes">时间（小时:分钟）</string>
-  
-  <!-- Dialog for Astrid having a critical update -->
-  <string name="DLG_please_update">清单小助理应该要从 Android 市场下载最新版本! 请继续前执行, 或稍等片刻。</string>
-
-  <!-- Button for going to Market -->
-
-  <!-- Button for accepting EULA -->
-  <string name="DLG_accept">接受</string>
-
-  <!-- Button for declining EULA -->
-  <string name="DLG_decline">不接受</string>
-
-  <!-- EULA title -->
-  <string name="DLG_eula_title">清单小助理使用条款</string>
-
-  <!-- Progress Dialog generic text -->
-  <string name="DLG_please_wait">请稍候</string>
-  
-  <!-- Dialog - loading -->
-  <string name="DLG_loading">载入中...</string>
-  
-  <!-- Dialog - dismiss -->
-
-  <!-- slide 20d -->
-  <string name="DLG_ok">确定(O)</string>
-  <!-- slide 36g -->
-  <string name="DLG_cancel">取消</string>
-  
-  <string name="DLG_more">更多</string>
-  
-  <string name="DLG_undo">撤消</string>
-  
-  <string name="DLG_warning">系统提醒</string>
-  
-  <!-- =============================================================== UI == -->
-  
-  <!-- Label for DateButtons with no value -->
-  <string name="WID_dateButtonUnset">点选</string>
-  
-  <!-- String formatter for DateButtons ($D => date, $T => time) -->
-  
-  <!-- String formatter for Disable button -->
-  
-  <!--  ============================================================= notes -->
-  
-  <!-- Note Exposer -->    
-  
-  <!-- Note Exposer / Comments -->    
-  
-  <!-- EditNoteActivity - no comments -->
-  <string name="ENA_no_comments">没有要显示的</string>
-    
-  <!-- EditNoteActivity - no username for comment -->
-  <string name="ENA_no_user">某人</string>
-  
-  <!-- EditNoteActivity - refresh comments -->
-  <string name="ENA_refresh_comments">刷新留言</string>
-  
-  <!-- ================================================= TaskListActivity == -->
-  
-  <!-- slide 8b: Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">你没有任务</string>
-  
-  <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->    
-  <string name="TLA_no_items_person">%s 没有 \n与您分享的任务</string>
-  
-  <!-- Menu: Adjust Sort and Hidden Task Settings -->    
-  <string name="TLA_menu_sort">Sort</string>
-  
-  <!-- Menu: Sync Now -->    
-  <string name="TLA_menu_sync">立即同步</string>
-  
-  <!-- Menu: Search -->
-  <string name="TLA_menu_search">搜索</string>
-  
-  <!-- Menu: Tasks -->
-  <string name="TLA_menu_lists">列表</string>
-
-  <!-- Menu: Friends -->
-  <string name="TLA_menu_friends">人物</string>
-
-  <!-- Menu: Featured Lists -->
-  <string name="TLA_menu_featured_lists">特定列表</string>
-
-  <!-- Menu: Suggestions -->
-  <string name="TLA_menu_suggestions">建议</string>
-  
-  <!-- Menu: Tutorial -->
-
-  <!-- Menu: Settings -->    
-  <string name="TLA_menu_settings">设置</string>
-  
-  <!-- slide 30b: Menu: Support -->
-  <string name="TLA_menu_support">支持</string>
-  
-  <!-- Search Label-->
-  
-  <!-- Window title for displaying Custom Filter -->
-  <string name="TLA_custom">自定义</string>
-  
-  <!-- slide 8d: Quick Add Edit Box Hint-->
-  <string name="TLA_quick_add_hint">添加任务</string>
-  
-  <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
-  <string name="TLA_quick_add_hint_assign">为 %s 增加任务</string>
-  
-  <!-- Notification Volumne notification-->
-  <string name="TLA_notification_volume_low">已静音。你不会再听到了！</string>
-  
-  <!-- Notifications disabled warning -->
-  <string name="TLA_notification_disabled">清单小助理提醒功能被关闭，你不会收到任何提醒。</string>
-  
-  <string-array name="TLA_filters">
-      <item>激活</item>
-      <item>今天</item>
-      <item>马上</item>
-      <item>延迟</item>
-      <item>完成</item>
-      <item>隐藏</item>      
-  </string-array>
-  
-  <!-- Title for confirmation dialog after quick add markup -->
-  <string name="TLA_quickadd_confirm_title">你说到：“%s”</string>
-  
-  <!-- Text for speech bubble in dialog after quick add markup -->
-  <!-- First string is task title, second is due date, third is priority -->
-  <string name="TLA_quickadd_confirm_speech_bubble">我创建了一项叫做“%1$s”的任务，截止日期为 %2$s，优先级为 %3$s</string>
-  
-  <string name="TLA_quickadd_confirm_speech_bubble_date">执行人为 %s</string>
-  
-  <string name="TLA_quickadd_confirm_hide_helpers">以后不显示确认</string>
-  
-  
-  <!-- Title for alert on new repeating task. %s-> task title -->
-  <string name="TLA_repeat_scheduled_title">新的重复任务 %s</string>
-  
-  <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
-  <string name="TLA_repeat_scheduled_speech_bubble">我会在 %s 后提醒您这个任务的。</string>
-  
-  <string-array name="TLA_priority_strings">
-      <item>最高优先级</item>
-      <item>高优先级</item>
-      <item>中等优先级</item>
-      <item>低优先级</item>
-  </string-array>
-  <!-- slide 22a -->
-  <string name="TLA_all_activity">所有活动</string>
-  
-  <!-- ====================================================== TaskAdapter == -->
-  
-  <!-- Format string to indicate task is hidden (%s => task name) -->
-  <string name="TAd_hiddenFormat">%s [已隐藏]</string>
-  
-  <!-- Format string to indicate task is deleted (%s => task name) -->
-  <string name="TAd_deletedFormat">%s [已删除]</string>
-  
-  <!-- Displayed when adapter is flung (scrolled quickly) -->
-  
-  <!-- slide 22b: indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">完成\n%s 项</string>
-  
-  <!-- slide 15a: Action Button: edit task -->
-  <string name="TAd_actionEditTask">编辑</string>
-  
-  <!-- Context Item: edit task -->
-  <string name="TAd_contextEditTask">编辑任务</string>
-
-  <!-- Context Item: copy task -->
-  <string name="TAd_contextCopyTask">复制任务</string>
-
-  <!-- Context Item: delete task -->
-  <string name="TAd_contextDeleteTask">删除任务</string>
-
-  <!-- Context Item: undelete task -->
-  <string name="TAd_contextUndeleteTask">未删除任务</string>
-
-  <!-- Context Item: purge task -->
-  <string name="TAd_contextPurgeTask">清除任务</string>
-  
-  <!-- ============================================== SortSelectionDialog == -->
-  
-  <!-- slide 23a: Sort Selection: dialog title -->    
-  <string name="SSD_title">排序和隐藏任务</string>
-  
-  <!-- slide 23h:  Hidden: title -->
-  <string name="SSD_hidden_title">隐藏任务</string>
-  
-  <!-- Hidden Task Selection: show completed tasks -->    
-  <string name="SSD_completed">显示已完成任务</string>
-  
-  <!-- Hidden Task Selection: show hidden tasks -->    
-  <string name="SSD_hidden">显示隐藏的任务</string>
-  
-  <!-- Hidden Task Selection: show deleted tasks -->    
-  <string name="SSD_deleted">显示已删除任务</string>
-  
-  <!-- Sort Selection: drag with subtasks -->
-  <string name="SSD_sort_drag">Manual order with subtasks</string>
-  
-  <!-- slide 23b: Sort Selection: smart sort -->
-  <string name="SSD_sort_auto">清单小助理智能排序</string>
-  
-  <!-- slide 23e: Sort Selection: sort by alpha -->
-  <string name="SSD_sort_alpha">按标题</string>
-  
-  <!-- slide 23c: Sort Selection: sort by due date -->
-  <string name="SSD_sort_due">按到期日</string>
-  
-  <!-- slide 23d: Sort Selection: sort by importance -->
-  <string name="SSD_sort_importance">By priority</string>
-  
-  <!-- slide 23f: Sort Selection: sort by modified date -->
-  <string name="SSD_sort_modified">按最后修改</string>
-  
-  <!-- slide 23g: Sort Selection: reverse -->
-  <string name="SSD_sort_reverse">反向排序</string>
-  
-  <!-- slide 23j: Sort Button: sort temporarily -->
-  <string name="SSD_save_temp">仅一次</string>
-  
-  <!-- slide 23i: Sort Button: sort permanently -->
-  <string name="SSD_save_always">总是</string>
-  
-  <!-- =============================================== FilterListActivity == -->
-  
-  <!-- Astrid Filter Shortcut -->    
-  <string name="FSA_label">清单小助理列表或过滤器</string>
-
-  <!-- Filter List Activity Title -->    
-  
-  <!-- Displayed when loading filters -->    
-  
-  <!-- Context Menu: Create Shortcut -->    
-  <string name="FLA_context_shortcut">在桌面建立快捷方式</string>
-  
-  <!-- Menu: Search -->
-  
-  <!-- Menu: Help -->    
-  
-  <!-- slide 28c: Create Shortcut Dialog Title -->    
-  <string name="FLA_shortcut_dialog_title">建立快捷方式</string>
-  
-  <!-- Create Shortcut Dialog (asks to name shortcut) -->    
-  <string name="FLA_shortcut_dialog">快捷方式名称：</string>
-  
-  <!-- Search Hint-->
-  <string name="FLA_search_hint">搜索任务</string>
-  
-  <!-- Search Filter name (%s => query) -->
-  <string name="FLA_search_filter">比对 \'%s\'</string>
-  
-  <!-- Toast: created shortcut (%s => label) -->
-  <string name="FLA_toast_onCreateShortcut">建立快捷方式: %s</string>
-  
-  <!-- Menu: new filter -->
-  <string name="FLA_new_filter">新建过滤器</string>
-  
-  <!-- slide 10e: Button: new list -->
-  <string name="FLA_new_list">新建列表</string>
-  
-  <!-- Alert when creating a shortcut without selecting a filter -->
-  <string name="FLA_no_filter_selected">还没有选定过滤器呢！请选择一个过滤器或列表呗。</string>
-  
-  <!-- ================================================= TaskEditActivity == -->
-  
-  <!-- Title when editing a task (%s => task title) -->
-  
-  <!-- Title when creating a new task -->
-  
-  <!-- Task title label -->
-  
-  <!-- Task when label -->
-  <string name="TEA_when_header_label">时间</string>
-  
-  <!-- Task title hint (displayed when edit box is empty) -->
-  <string name="TEA_title_hint">Task name</string>
-  
-  <!-- Task importance label -->
-  <string name="TEA_importance_label">Priority</string>
-  
-  <!-- Task due date hint -->
-  <string name="TEA_deadline_hint">Set due date</string>
-  
-  <!-- Task assigned to string (%s -> assigned person name) -->
-  <string name="TEA_assigned_to">Assigned to %s</string>
-  
-  <!-- Task urgency specific time checkbox -->
-  <string name="TEA_urgency_specific_time">于指定时间？</string>
-  
-  <!-- Task urgency specific time title when specific time false -->
-  <string name="TEA_urgency_none">无</string>
-  
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_label">Hide until</string>
-
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_display">Hide until %s</string>
-  
-  <!-- Task hide until toast -->
-  <string name="TEA_hideUntil_message">任务将会被隐藏，直到 %s</string>
-  
-  <!-- Task editing data being loaded label -->
-  <string-array name="TEA_loading"><item>载入中...</item></string-array>
-  
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_note_label">描述</string>
-
-  <!-- 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">要花多久时间?</string>
-  
-  <!-- Elapsed time label -->
-  <string name="TEA_elapsedDuration_label">已用于任务的时间</string>
-
-  <!-- Menu: Save -->    
-  <string name="TEA_menu_save">保存更改</string>
-  
-  <!-- Menu: Don\'t Save -->
-  <string name="TEA_menu_discard">不保存</string>
-  
-  <!-- Menu: Delete Task -->
-  <string name="TEA_menu_delete">删除任务</string>
-  
-  <!-- Menu: Task comments -->
-  <string name="TEA_menu_refresh_comments">Refresh comments</string>
-
-  <string name="TEA_menu_comments">注释</string>
-  
-   <!-- Toast: task saved with deadline (%s => preposition + time units) -->
-  <string name="TEA_onTaskSave_due">已设截止日期的任务：按 %s</string>
-  
-  <!-- Toast: task saved without deadlines -->
-  <string name="TEA_onTaskSave_notDue">任务已储存</string>
-  
-  <!-- Toast: task was not saved -->
-  
-  <!-- Toast: task was deleted -->
-  
-  <!-- slide 15b: Task edit tab: activity -->
-  <string name="TEA_tab_activity">活动</string>
-  
-  <!-- slide 15e:  Task edit tab: more editing settings -->
-  <string name="TEA_tab_more">细节</string>
-  
-  <!-- slide 15d: Task edit tab: web services -->
-  <string name="TEA_tab_web">建议</string>
-  
-  <string name="TEA_timer_est">Est. %s</string>
-
-  <string name="TEA_timer_elap">Elapsed %s</string>
-  
-  <string-array name="TEA_urgency">
-      <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No date</item>
-      <item>指定哪天</item>
-      <item>今天</item>
-      <item>明天</item>
-      <item>（天之后）</item>
-      <item>下周</item>
-      <item>两周之内</item>
-      <item>下个月</item>
-  </string-array>
-  
-  <string name="TEA_no_time">没有时间</string>
-      
-  <string-array name="TEA_hideUntil">
-      <!-- hideUntil: labels for edit page. -->
-      <item>Never</item>
-      <item>Due date</item>
-      <item>Due time</item>
-      <item>Day before due</item>
-      <item>Week before due</item>
-      <item>指定日期/时间</item>
-  </string-array>
-  
-  <!-- Task edit control set descriptors -->
-
-  <!-- slide 9b/35i -->
-  <string name="TEA_control_who">人物</string>
-
-  <!-- slide 9c/ 35a -->
-  <string name="TEA_control_when">时间</string>
-  <!-- slide 35b -->
-  <string name="TEA_control_more_section">----详情----</string>
-  <!-- slide 16a/35c -->
-  <string name="TEA_control_importance">Priority</string>  
-  <!-- slide 16b/35d -->
-  <string name="TEA_control_lists">列表</string>  
-  <!-- slide 16c/35e -->
-  <string name="TEA_control_notes">描述</string>  
-  
-  <string name="TEA_control_files">文件</string>
-
-  <!-- slide 16e / slide 35g-->
-  <string name="TEA_control_reminders">提醒</string>
-
-  <!-- slide 16f -->
-  <string name="TEA_control_timer">定时器控件</string>
-  
-  <string name="TEA_control_hidden_section">----始终隐藏----</string>
-  
-  <string name="hide_until_prompt">在我的列表中显示</string>
-  
-  <!-- Add Ons tab when no add-ons found -->
-  
-  <!-- Add Ons button -->
-  
-  <!-- More row -->
-  
-  <!-- slide 15c: Text when no activity to show -->
-  <string name="TEA_no_activity">无活动</string>
-  
-  <!-- Text to load more activity -->
-  <string name="TEA_load_more">加载更多……</string>
-  
-  <!-- When controls dialog -->
-  <string name="TEA_when_dialog_title">这项活动定在什么时候呀？</string>
-  
-  
-  <string name="TEA_new_task">新建任务</string>
-  
-  <string name="WSV_click_to_load">拍拍我，让我搜索一下完成这项任务的各种方法！</string>
-  
-  <string name="WSV_not_online">连上互联网后我可以做更多事情。请检查一下您的网络连接呗。</string>
-  
-  <string name="TEA_contact_error">不好意思！我们找不到所选联系人的电子邮件地址喔。</string>
-  
-  <!-- ============================================= IntroductionActivity == -->
-  
-  <!-- slide 1a: Introduction Window title -->
-  
-  <!-- Button to agree to EULA -->
-  
-  <!-- Button to disagree with EULA -->
-  
-  <!-- ===================================================== MissedCallActivity == -->
-  
-  <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
-  <string name="MCA_title">%1$s\n在 %2$s 给您打过电话</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_return_call">现在回电</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_add_task">稍后回电</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_ignore">忽略</string>
-  
-  <!-- Missed call: dialog to ignore all missed calls title -->
-  <string name="MCA_ignore_title">忽略所有未接电话吗？</string>
-
-  <!-- Missed call: dialog to ignore all missed calls body -->
-  <string name="MCA_ignore_body">您已经忽略了几个未接电话。对于这些电话，清单小助理是否应该不再询问您呢？</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore all button -->
-  <string name="MCA_ignore_all">忽略所有来电</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
-  <string name="MCA_ignore_this">只忽略这个来电</string>
-
-  <!-- Missed call: preference title -->
-  <string name="MCA_missed_calls_pref_title">及时回复未接电话</string>
-
-  <!-- slide 49c: Missed call: preference description -->
-  <string name="MCA_missed_calls_pref_desc_enabled">清单小助理会向您报告未接电话，还会提供回电的提醒</string>
-  <string name="MCA_missed_calls_pref_desc_disabled">清单小助理将不会向您报告未接电话</string>
-
-  <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
-  <string name="MCA_task_title_name">请回电给 %1$s，电话是 %2$s</string>
-
-  <!-- Missed call: task title no name (%s -> number)-->
-  <string name="MCA_task_title_no_name">请回电给 %s</string>
-  
-  <!-- Missed call: schedule dialog title (%s -> name or number)-->
-  <string name="MCA_schedule_dialog_title">请给 %s 回个电话过去……</string>
-  
-  <!-- Missed call speech bubble options -->
-  <string-array name="MCA_dialog_speech_options">
-      <item>您这么人见人爱、花见花开，感觉肯定棒极了！</item>
-      <item>哇！个个都喜欢您咽！</item>
-      <item>回个电话吧，好让他们高兴一整天！</item>
-      <item>人家给您回电话，您肯定高兴，不是吗？</item>
-      <item>您是可以回电的！</item>
-      <item>无论怎样，您也可以发条短信呀……</item>
-  </string-array>
-  
-  
-  <!-- ======================================= Calendar reminder activity == -->
-  
-  <!-- Calendar remindeer ignore button -->
-  <string name="CRA_ignore">忽略</string>
-  
-  <!-- Calendar event -->
-  <string name="CRA_title">需要会议列表？</string>
-  
-  <!-- Calendar reminder: dialog to ignore all missed calls title -->
-  <string name="CRA_ignore_title">忽略所有日历事件？</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls body -->
-  <string name="CRA_ignore_body">您已经忽略了几个日历事件。对于这些事件，清单小助理是否应该不再询问您呢？</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
-  <string name="CRA_ignore_all">忽略所有事件</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
-  <string name="CRA_ignore_this">只忽略该事件</string>
-  
-  <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
-  <string name="CRA_speech_bubble_start">Looks like %s is starting soon. Want to create a list for action items?</string>
-
-  <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
-  <string name="CRA_speech_bubble_end">Looks like you just finished with %s. Want to create a list for action items?</string>
-  
-  <!-- Calendar reminder: create list button -->
-  <string name="CRA_create_list">创建列表</string>
-
-  <!-- Calendar reminder: postpone button -->
-  <string name="CRA_postpone">也许以后</string>
-  
-  <!-- Calendar reminder: list exists dialog title -->
-  <string name="CRA_list_exists_title">列表已存在</string>
-  
-  <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
-  <string name="CRA_list_exists_body">A list named %s already exists. Do you want to use the existing list or create a new one for this event?</string>
-  
-  <!-- Calendar reminder: list exists dialog create new button -->
-  <string name="CRA_create_new">Create new</string>
-
-  <!-- Calendar reminder: list exists dialog use existing button -->
-  <string name="CRA_use_existing">Use existing</string>
-  
-  <!-- Calendar remindr: created list (%s -> list name) -->
-  <string name="CRA_created_list_dialog">I created a list %s.</string>
-  
-  <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
-  <string name="CRA_one_attendee">%s is attending.</string>
-
-  <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
-  <string name="CRA_two_attendees">%1$s and %2$s are attending.</string>
-
-  <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
-  <string name="CRA_many_attendees">%1$s, %2$s, and %3$d others are attending.</string>
-  
-  <!-- Calendar reminder: invitation prompt -->
-  <string name="CRA_invitation_prompt">Want to invite them?</string>
-  
-  <!-- Calendar reminder: preference title -->
-  <string name="CRA_calendar_reminders_pref_title">Calendar assistant</string>
-
-  <!-- Calendar reminder: pref description disabled -->
-  <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid will not remind you about upcoming calendar events</string>
-
-  <!-- Calendar reminder: pref description enabled -->
-  <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid will remind you about upcoming calendar events and prompt you to prepare for them</string>
-  
-  <!-- Calendar reminder: share list title -->
-  <string name="CRA_share_list_title">Share the list?</string>
-  
-  <string name="CRA_invite_attendees">Invite attendees</string>
-
-  <string name="CRA_more_options">More options</string>
-
-  <string name="CRA_dont_invite">No thank you</string>
-
-  <!-- Calendar reminder: share list title when no other attendees exist-->
-  <string name="CRA_list_created_title">List created!</string>
-  
-  <!-- Calendar reminder: default new list name (%s -> event title) -->
-  <string name="CRA_default_list_name">Action Items: %s</string>
-  
-  <!-- ===================================================== HelpActivity == -->
-  
-  <!-- Help: Button to get support from our website -->
-    
-  <!-- ==================================================== UpdateService == -->
-  
-  <!-- Changelog Window Title -->
-  <string name="UpS_changelog_title">清单小助理有哪些最新功能？</string>
-  
-  <!-- Updates Window Title -->
-  <string name="UpS_updates_title">清单小助理最新消息</string>
-  
-  <!-- Updats No Activity to show for offline users -->
-  <string name="UpS_no_activity_log_in">登录查看您的活动进展情况 \n以及在各分享列表上的活动。</string>
-  
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 31g: Preference Window Title -->
-  <string name="EPr_title">清单小助理：设置</string>
-  
-  <string name="EPr_share_astrid">Share Astrid</string>
-
-  <string name="EPr_share_astrid_summary">在您喜欢的社交网站上分享清单小助理</string>
-  
-  <!-- slide 46a -->
-  <string name="EPr_deactivated">禁用</string>
-
-  <!-- slide 30i: Preference Category: Appearance Title -->
-  <string name="EPr_appearance_header">外观</string>
-  
-  <!-- Preference Category: Appearance Summary -->
-  <string name="EPr_appearance_summary">主题，小工具，任务栏，编辑屏幕列表</string>
-  
-  <!-- FAQ Preference title -->
-  <string name="EPr_faq_title">常见问题</string>
-  
-  <!-- Account status preference (%s -> account type) -->
-  <string name="EPr_account_title">帐号：%s</string>
-
-  <!-- Support preferences summary -->
-  <string name="EPr_support_summary">指引，常见问题，关于我们</string>
-  
-  <!-- slide 34a: Preference: Task List Font Size Title -->
-  <string name="EPr_fontSize_title">任务列表字体大小</string>
-  
-  <!-- Preference: Filters to show pref screen title -->
-  <string name="EPr_filters_to_show_title">Filters to show</string>
-  
-  <!-- slide 32a: Preference: Show confirmation for smart reminders -->
-  <string name="EPr_showSmartConfirmation_title">显示智能提示确认消息</string>
-  
-  <!-- slide 34g: Preference: Task List Font Size Description -->                                                                                                                                                  
-  <string name="EPr_fontSize_desc">主列表页面字体大小</string>  
-  
-  <!-- Preferemce: Show task edit confirmation toasts -->
-  
-  <!-- slide 34c: Preference: Task List Show Notes -->
-  <string name="EPr_showNotes_title">Show description in task</string>
-  
-  <!-- Edit screen preference category -->
-  <string name="EPr_edit_screen_options">Edit screen options</string>
-  
-  <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
-  <string name="EPr_beastMode_title">Edit screen order</string>
-  
-  <string name="EPr_beastMode_shortcut">Customize</string>
-  
-  <string name="EPr_time_increment">5 minute increments</string>
-  
-  <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
-  
-  <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
-  
-  <!-- slide 35h -->
-  <string name="EPr_beastMode_desc">自定义设定菜单屏幕</string>
-  <!-- slide 35j -->
-  <string name="EPr_beastMode_reset">恢复默认值</string>
-  
-  <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on each row</string>
-      
-  <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit screen</string>  
-  <!-- Preference: Task List Show Notes Description (enabled) -->
-  <string name="EPr_showNotes_desc_enabled">Description will always be displayed</string>
-  
-  <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
-  <string name="EPr_compressTaskRows_title">压缩任务排列</string>
-  <!-- slide 34j -->
-  <string name="EPr_compressTaskRows_desc">压缩任务行，使它适应标题</string>
-  
-  <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
-  <!-- slide 34k-->
-  
-  <!-- slide 34b: Preferences: Wrap task titles to two lines -->
-  <string name="EPr_fullTask_title">显示完整的任务标题</string>
-  <string name="EPr_fullTask_desc_enabled">将显示完整的任务标题</string>
-  <!-- slide 34h -->
-  <string name="EPr_fullTask_desc_disabled">将显示任务标题的头两行</string>
-  
-  <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
-  <string name="EPr_ideaAuto_title">自动加载意见选项标签</string>
-  <!-- slide 32c -->
-  <string name="EPr_ideaAuto_desc_enabled">点击标签后，网页将会搜索意见选项。</string>
-  <string name="EPr_ideaAuto_desc_disabled">只有手动请求后，网页将会搜索意见选项。</string>
-  
-  <!-- Preferences: task row style -->
-  <string-array name="EPr_task_row_styles">
-      <item>Original</item>
-      <item>Simple</item>
-      <item>Title only</item>
-  </string-array>
-  
-  <string-array name="EPr_task_row_style_descriptions">
-      <item>截取标题至两行，并在右边显示日期</item>
-      <item>截取标题为一行，并在下方显示日期和列表</item>
-      <item>Single line title only</item>
-  </string-array>
-  
-  <!-- task row style title (%s -> style) -->
-  <string name="EPr_task_row_style_title">Row style: %s</string>
-  
-  <!-- Preference: custom filters enabled -->
-  <string name="EPr_use_filters_title">Use filters</string>
-  <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
-
-  <!-- Preference: show list members in shared list -->
-  <string name="EPr_show_list_members_title">Show list members in shared lists</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_simple_input_boxes">Simple text boxes</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
-
-  <!-- Preference: don\'t show plus button until input present -->
-  <string name="EPr_hide_plus_button">Hide plus button</string>
-
-  <!-- Preference: menu items -->
-  <string name="EPr_menu_items">Menu items</string>
-
-  <!-- Preference: list view -->
-  <string name="EPr_list_view">List view</string>
-
-  <!-- Preference: task edit comments -->
-  <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
-  
-  <!-- slide 30f/ 36f: Preference: Theme -->
-  <string name="EPr_theme_title">主题</string>
-  <!-- Preference: Theme Description (%s => value) -->
-  <string name="EPr_theme_desc">当前：%s</string>  
-  <!-- Preference: Theme Description (android 1.6) -->
-  <string name="EPr_theme_desc_unsupported">该设置需要 Android 2.0+</string>
-  <!-- slide 32h/ 37b -->
-  <string name="EPr_theme_widget_title">小工具主题</string>
-  
-  <!-- slide 30d/ 34f: Preference screen: all task row settings -->
-  <string name="EPr_taskRowPrefs_title">任务栏</string>
-  
-  <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
-  <string name="EPr_use_contact_picker">使用联系人选择程序</string>
-  <!-- slide 49b -->
-  <string name="EPr_use_contact_picker_desc_enabled">系统的联系人选择程序选项将在任务布置窗口中显示</string>
-  <string name="EPr_use_contact_picker_desc_disabled">将不会显示系统的联系人选择程序选项</string>
-
-  <!-- slide 49i: Preferences: Third party addons -->
-  <string name="EPr_third_party_addons">允许第三方附加软件</string>
-  <string name="EPr_third_party_addons_desc_enabled">即将启用第三方附加软件</string>
-  <!-- slide 49d -->
-  <string name="EPr_third_party_addons_desc_disabled">即将禁用第三方附加软件</string>
-  
-  <!-- Preferences: ideas tab -->
-  <string name="EPr_ideas_tab_enabled">任务意见</string>
-  <string name="EPr_ideas_tab_description">获取建议来帮助您完成多项任务</string>
-  
-  <!-- Preferences: calendar event start time -->
-  <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
-  <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
-  <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
-  
-  <string name="EPr_force_phone_layout">使用手机布局</string>
-
-  <string name="EPr_show_featured_lists">显示特定列表</string>
-  
-  <!-- Configurations -->
-  <string name="EPr_configurations_title">Set configuration</string>
-  <string name="EPr_config_default">Default</string>
-  <string name="EPr_config_lite">Astrid Lite</string>
-  
-  <!-- Dialog title when setting preference configuration -->
-  <string name="EPr_config_dialog_title">Set configuration?</string>
-  <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
-  <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
-  
-  <!-- default configuration name for the above dialog -->
-  <string name="EPr_config_dialog_default_id">default</string>
-  
-  <!-- Preference title for showing save and cancel buttons in task edit page -->
-  <string name="EPr_show_save_and_cancel">Show save and cancel </string>
-  
-  
-  <!-- Swipe between lists -->
-  <!-- Preference: swipe between lists performance -->
-  <string name="EPr_swipe_lists_performance_title">在列表间滑动</string>
-  
-  <string-array name="EPr_swipe_lists_performance_mode">
-      <item>不使用滑动屏幕</item>
-      <item>节约内存</item>
-      <item>标准性能</item>
-      <item>高效性能</item>
-  </string-array>
-  
-  <string-array name="EPr_swipe_lists_performance_desc">
-  <!-- slide 49a -->
-      <item>滑动屏幕切换列表已被禁用</item>
-      <item>较低速性能</item>
-      <item>默认设置</item>
-      <item>使用更多系统资源</item>
-  </string-array>
-    
-  <string name="swipe_lists_helper_title">在列表间滑动</string>
-  <string name="swipe_lists_helper_header">向左或向右快速滑动来切换列表</string>
-  <string name="swipe_lists_helper_subtitle">在设置-&amp;gt外观中修改选项</string>
-
-  <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
-  
-  <string-array name="EPr_default_reminders_mode">
-      <!-- reminders duration: labels for "Task Defaults" preference item. -->
-      <item>@string/TEA_reminder_mode_once</item>
-      <item>@string/TEA_reminder_mode_five</item>
-      <item>@string/TEA_reminder_mode_nonstop</item>
-  </string-array>
-    
-  <string-array name="EPr_themes">
-    <!-- theme_settings: labels for Theme preference menu -->
-    <!-- slide 36a-->
-    <item>蓝</item>
-    <!-- slide 36b -->
-    <item>红</item>
-    <!-- slide 36b -->
-    <item>Sky blue</item>
-    <!-- slide 36c -->
-    <item>Night</item>
-    <!-- slide 36d -->
-    <item>Transparent (white text)</item>
-    <!-- slide 36e -->
-    <item>透明(黑色文字)</item>
-  </string-array>
-  
-  <string-array name="EPr_themes_widget">
-    <!-- slide 32i / 37a-->
-    <item>与应用相同</item>
-    <item>日间——蓝色</item>
-    <item>日间——红色</item>
-    <item>Sky blue</item>
-    <item>Night</item>
-    <item>Transparent (white text)</item>
-    <item>Transparent (black text)</item>
-    <item>老式风格</item>
-  </string-array>
-  
-  <!-- ========================================== Task Management Settings == -->
-
-  <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
-  <string name="EPr_manage_header">管理旧任务</string>
-  <!-- slide 47d -->
-  <string name="EPr_manage_delete_completed">删除已完成任务</string>
-  <string name="EPr_manage_delete_completed_message">您真的要删除所有已完成任务吗？</string>
-  <!-- slide 47a -->
-  <string name="EPr_manage_delete_completed_summary">已删除任务可以被依次恢复</string>
-  <string name="EPr_manage_delete_completed_status">删除了 %d 个任务！</string>
-  <!-- slide 47e -->
-  <string name="EPr_manage_purge_deleted">清除已删除任务</string>
-  <string name="EPr_manage_purge_deleted_message">您真的要清楚所有已删除任务吗？ \n\n 这些任务将会被彻底永久删除！</string>
-  <string name="EPr_manage_purge_deleted_status">清除了 %d 个任务！</string>
-  <!-- slide 47b-->
-  <string name="EPr_manage_purge_deleted_summary">请注意！若事先没有备份，已清除的任务将无法恢复！</string>
-  <!-- slide 47h-->
-  <string name="EPr_manage_clear_all">清除所有数据</string>
-  <string name="EPr_manage_clear_all_message">要删除清单小助理中所有任务和设置吗？\n\n系统提醒：无法还原的喔！</string>
-
-  <!-- slide 47f -->
-  <string name="EPr_manage_delete_completed_gcal">删除日程表中已完成任务</string>
-  <string name="EPr_manage_delete_completed_gcal_message">您真的想删除您所有的事件中已经完成的任务吗？</string>
-  <string name="EPr_manage_delete_completed_gcal_summary"></string>
-  <string name="EPr_manage_delete_completed_gcal_status">已经删除 %d 个日历事件了！</string>
-      
-  <!-- slide 47g-->
-  <string name="EPr_manage_delete_all_gcal">删除所有日程表</string>
-  <string name="EPr_manage_delete_all_gcal_message">您真的想删除您所有事件中的各项任务吗？</string>
-  <string name="EPr_manage_delete_all_gcal_summary"></string>
-  <string name="EPr_manage_delete_all_gcal_status">已经删除了 %d 个日历事件了！</string>
-      
-  <!-- ==================================================== AddOnActivity == -->
-  
-  <!-- Add Ons Activity Title -->
-  <string name="AOA_title">扩展</string>
-    
-  <!-- Add-on Activity: author for internal authors  -->
-  <string name="AOA_internal_author">清单小助理团队</string>
-    
-  <!-- Add-on Activity: installed add-ons tab -->
-  <string name="AOA_tab_installed">已安装</string>
-  
-  <!-- Add-on Activity - available add-ons tab -->
-  <string name="AOA_tab_available">可用</string>
-  
-  <!-- Add-on Activity - free add-ons label -->
-  <string name="AOA_free">免费</string>
-  
-  <!-- Add-on Activity - menu item to visit add-on website -->
-  
-  <!-- Add-on Activity - menu item to visit android market -->
-  
-  <!-- Add-on Activity - when list is empty -->
-  <string name="AOA_no_addons">空列表！</string>
-  
-  <string name="AOA_ppack_title">Power Pack</string>
-  <string name="AOA_ppack_description">支持清单小助理并在优化工具的帮助下变得更加有效率。提供 4＊2 和4＊4尺寸的小工具和语音支持。让我们给生活加把劲！</string>
-  <string name="AOA_locale_title">清单小助理场所插件</string>
-  <string name="AOA_locale_description">在过滤的条件下，允许清单小助理利用场所应用推送通知。现在就获取场所插件。</string>
-  
-  <!-- ====================================================== TasksWidget == -->
-
-  <!-- Widget text when loading tasks -->
-  <string name="TWi_loading">载入中...</string>
-
-  <!-- Widget configuration activity title: select a filter -->
-  <string name="WCA_title">选择任务以显示...</string>
-  
-  <!-- ======================================================== Waiting on me -->
-
-  <string name="wom_commented">%s commented on your task.</string>
-  <string name="wom_mentioned">%s mentioned you.</string>
-  <string name="wom_assigned">%s assigned this to you.</string>
-  <string name="wom_raised_pri">%s raised the priority.</string>
-  <string name="wom_changed_due">%s changed the due date.</string>
-  <string name="wom_default">%s wants your attention.</string>
-  
-  <string name="wom_dismiss">Dismiss</string>
-  <string name="wom_acknowledge">I\'ve read this</string>
-
-  <!-- ============================================================= About == -->
-  
-  <!-- slide 30h: Title of "About" option in settings -->
-  <string name="p_about">关于清单小助理</string>
-  
-  <!-- About text (%s => current version)-->
-  <string name="p_about_text">当前版本： %s\n\n清单小助理是由 Todoroo, Inc. 维护的开源软件。</string>
-
-  <!-- Title of "Help" option in settings -->
-  <string name="p_help">支持</string>
-  
-  <!-- slide 30c: Title of "Forums" option in settings -->
-  <string name="p_forums">讨论区</string>
-  
-  <!-- Title of "Premium" option in settings -->
-  <string name="p_premium">高级</string>
-  
-  <!-- ============================================================= Misc == -->
-  
-  <string name="feedback_positive_title">Rate Astrid?</string>
-
-  <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star rating?</string>
-
-  <string name="feedback_negative_title">Leave feedback?</string>
-
-  <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
-
-  <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback section--it might not be available on your device.</string>
-  
-  <string name="feedback_positive_button">Rate Astrid</string>
-
-  <string name="feedback_negative_button">Leave feedback</string>
-  
-  <string name="feedback_not_now">Not now</string>
-  
-  <string name="feedback_banner_text">How\'s Astrid working for you?</string>
-  
-  <!-- Displayed when task killer found. %s => name of the application -->
-  <string name="task_killer_help">似乎您正在使用会删除进程的应用程序(%s)！可以的话，请将 清单小助理加入到例外列表避免被杀死。否则 清单小助理可能无法通知您任务已到期。\n</string>
-  
-  <!-- Task killer dialog ok button -->
-  <string name="task_killer_help_ok">我不要中止清单小助理!</string>
-    
-  <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
-  
-  <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
-  <string name="marketplace_description">清单小助理是一款开源并深受人们喜爱的任务/列表管理器，旨在提高您处理事务的效率。清单小助理包含提醒、标签、同步、区域插件、小工具等众多功能。</string>
-  
-  <string name="DB_corrupted_title">数据库已经受损</string>
-  
-  <string name="DB_corrupted_body">啊喔！您有一个毁损的资料库。如果您经常看见这个错误出现，我们建议您清除所有数据（在设置-&gt;同步和备份-&amp;gt；管理旧任务-&gt;清楚所有数据）并在清单小助理备份中重新存入您的任务（设置-&gt;同步和备份-&gt;备份-&gt;导入任务）</string>
-      
-  <string name="market_unavailable">非常抱歉，我们的软件无法在您的系统中成功运行。</string>
-  
+    <!-- slide 30f/ 36f: Preference: Theme -->
+    <string name="EPr_theme_title">主题</string>
+    <!-- Preference: Theme Description (%s => value) -->
+    <string name="EPr_theme_desc">当前：%s</string>
+    <!-- Preference: Theme Description (android 1.6) -->
+    <string name="EPr_theme_desc_unsupported">该设置需要 Android 2.0+</string>
+    <!-- slide 32h/ 37b -->
+    <string name="EPr_theme_widget_title">小工具主题</string>
 
+    <!-- slide 30d/ 34f: Preference screen: all task row settings -->
+    <string name="EPr_taskRowPrefs_title">任务栏</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
+    <string name="EPr_use_contact_picker">使用联系人选择程序</string>
+    <!-- slide 49b -->
+    <string name="EPr_use_contact_picker_desc_enabled">系统的联系人选择程序选项将在任务布置窗口中显示</string>
+    <string name="EPr_use_contact_picker_desc_disabled">将不会显示系统的联系人选择程序选项</string>
 
+    <!-- slide 49i: Preferences: Third party addons -->
+    <string name="EPr_third_party_addons">允许第三方附加软件</string>
+    <string name="EPr_third_party_addons_desc_enabled">即将启用第三方附加软件</string>
+    <!-- slide 49d -->
+    <string name="EPr_third_party_addons_desc_disabled">即将禁用第三方附加软件</string>
 
-  <!-- slide 32g: Preference Category: Defaults Title -->
-  <string name="EPr_defaults_header">新任务默认设置</string>
-  <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
-  
-  <!-- slide 41f:  Preference: Default Urgency Title -->
-  <string name="EPr_default_urgency_title">默认截止期</string>
-  <!-- Preference: Default Urgency Description (%s => setting) -->
-  <string name="EPr_default_urgency_desc">当前：%s</string>
-  
-  <!-- slide 40a: Preference: Default Importance Title -->
-  <string name="EPr_default_importance_title">Default priority</string>
-  <!-- Preference: Default Importance Description (%s => setting) -->
-  <string name="EPr_default_importance_desc">当前：%s</string>
-  
-  <!-- slide 42e: Preference: Default Hide Until Title -->
-  <string name="EPr_default_hideUntil_title">默认隐藏直到</string>
-  <!-- Preference: Default Hide Until Description (%s => setting) -->
-  <string name="EPr_default_hideUntil_desc">当前：%s</string>
-  
-  <!-- slide 43e: Preference: Default Reminders Title -->
-  <string name="EPr_default_reminders_title">默认提醒</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_desc">当前：%s</string>
-  
-  <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
-  <string name="EPr_default_addtocalendar_title">默认添加到日历</string>
-  <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
-  <string name="EPr_default_addtocalendar_desc_disabled">新建任务将不会在 Google 日历中创建事件</string>
-  <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
-  <string name="EPr_default_addtocalendar_desc">新建任务将会在这个日历中：“%s”</string>
-  
-  <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
-  <string name="EPr_default_reminders_mode_title">默认铃声／振动类型</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_mode_desc">当前：%s</string>
-  
-  <string-array name="EPr_default_importance">
-    <!-- importance: labels for "Task Defaults" preference item. -->
-    <!-- slide 40b -->
-    <item>!!!（最高级别）</item>
-    <item>!!</item>
-    <item>!</item>
-    <!-- slide 40c -->
-    <item>o（最低级别）</item>
-  </string-array>
-  
-  <string-array name="EPr_default_urgency">
-    <!-- urgency: labels for "Task Defaults" preference item. -->
-    <!-- slide 41a-->
-    <item>无截止日</item>
-    <!-- slide 41b -->
-    <item>今天</item>
-    <!-- slide 41c-->
-    <item>明天</item>
-    <!-- slide 41d -->
-    <item>后天</item>
-    <!-- slide 41e -->
-    <item>下周</item>
-  </string-array>
-  
-  <string-array name="EPr_default_hideUntil">
-    <!-- hideUntil: labels for "Task Defaults" preference item. -->
-    <!-- slide 42a -->
-    <item>不隐藏</item>
-    <!-- slide 42b -->
-    <item>任务到期</item>
-    <!-- slide 42c -->
-    <item>截止期前一天</item>
-    <!-- slide 42d-->
-    <item>截止期前一周</item>
-  </string-array>
-  
-  <string-array name="EPr_default_reminders">
-    <!-- reminders: labels for "Task Defaults" preference item. -->
-    <!-- slide 43a -->
-    <item>无截止期限提醒</item>
-    <!-- slide 43b -->
-    <item>截止期限时</item>
-    <!-- slide 43c -->
-    <item>过期时</item>
-    <!-- slide 43d -->
-    <item>截止期限或过期时</item>
-  </string-array>
-  
-  <string-array name="EPr_default_addtocalendar">
-    <!-- addtocalendar: labels for "Task Defaults" preference item. -->
-    <item>@string/EPr_deactivated</item>
-  </string-array>      
+    <!-- Preferences: ideas tab -->
+    <string name="EPr_ideas_tab_enabled">任务意见</string>
+    <string name="EPr_ideas_tab_description">获取建议来帮助您完成多项任务</string>
 
+    <!-- Preferences: calendar event start time -->
+    <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
+    <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
+    <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
+
+    <string name="EPr_force_phone_layout">使用手机布局</string>
+
+    <string name="EPr_show_featured_lists">显示特定列表</string>
+
+    <!-- Configurations -->
+    <string name="EPr_configurations_title">Set configuration</string>
+    <string name="EPr_config_default">Default</string>
+    <string name="EPr_config_lite">Astrid Lite</string>
+
+    <!-- Dialog title when setting preference configuration -->
+    <string name="EPr_config_dialog_title">Set configuration?</string>
+    <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
+    <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
+
+    <!-- default configuration name for the above dialog -->
+    <string name="EPr_config_dialog_default_id">default</string>
+
+    <!-- Preference title for showing save and cancel buttons in task edit page -->
+    <string name="EPr_show_save_and_cancel">Show save and cancel</string>
+
+
+    <!-- Swipe between lists -->
+    <!-- Preference: swipe between lists performance -->
+    <string name="EPr_swipe_lists_performance_title">在列表间滑动</string>
+
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>不使用滑动屏幕</item>
+        <item>节约内存</item>
+        <item>标准性能</item>
+        <item>高效性能</item>
+    </string-array>
+
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <!-- slide 49a -->
+        <item>滑动屏幕切换列表已被禁用</item>
+        <item>较低速性能</item>
+        <item>默认设置</item>
+        <item>使用更多系统资源</item>
+    </string-array>
+
+    <string name="swipe_lists_helper_title">在列表间滑动</string>
+    <string name="swipe_lists_helper_header">向左或向右快速滑动来切换列表</string>
+    <string name="swipe_lists_helper_subtitle">在设置-&amp;gt外观中修改选项</string>
+
+    <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
+
+    <string-array name="EPr_default_reminders_mode">
+        <!-- reminders duration: labels for "Task Defaults" preference item. -->
+        <item>@string/TEA_reminder_mode_once</item>
+        <item>@string/TEA_reminder_mode_five</item>
+        <item>@string/TEA_reminder_mode_nonstop</item>
+    </string-array>
+
+    <string-array name="EPr_themes">
+        <!-- theme_settings: labels for Theme preference menu -->
+        <!-- slide 36a-->
+        <item>蓝</item>
+        <!-- slide 36b -->
+        <item>红</item>
+        <!-- slide 36b -->
+        <item>Sky blue</item>
+        <!-- slide 36c -->
+        <item>Night</item>
+        <!-- slide 36d -->
+        <item>Transparent (white text)</item>
+        <!-- slide 36e -->
+        <item>透明(黑色文字)</item>
+    </string-array>
+
+    <string-array name="EPr_themes_widget">
+        <!-- slide 32i / 37a-->
+        <item>与应用相同</item>
+        <item>日间——蓝色</item>
+        <item>日间——红色</item>
+        <item>Sky blue</item>
+        <item>Night</item>
+        <item>Transparent (white text)</item>
+        <item>Transparent (black text)</item>
+        <item>老式风格</item>
+    </string-array>
+
+    <!-- ========================================== Task Management Settings == -->
+
+    <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
+    <string name="EPr_manage_header">管理旧任务</string>
+    <!-- slide 47d -->
+    <string name="EPr_manage_delete_completed">删除已完成任务</string>
+    <string name="EPr_manage_delete_completed_message">您真的要删除所有已完成任务吗？</string>
+    <!-- slide 47a -->
+    <string name="EPr_manage_delete_completed_summary">已删除任务可以被依次恢复</string>
+    <string name="EPr_manage_delete_completed_status">删除了 %d 个任务！</string>
+    <!-- slide 47e -->
+    <string name="EPr_manage_purge_deleted">清除已删除任务</string>
+    <string name="EPr_manage_purge_deleted_message">您真的要清楚所有已删除任务吗？ \n\n 这些任务将会被彻底永久删除！</string>
+    <string name="EPr_manage_purge_deleted_status">清除了 %d 个任务！</string>
+    <!-- slide 47b-->
+    <string name="EPr_manage_purge_deleted_summary">请注意！若事先没有备份，已清除的任务将无法恢复！</string>
+    <!-- slide 47h-->
+    <string name="EPr_manage_clear_all">清除所有数据</string>
+    <string name="EPr_manage_clear_all_message">要删除清单小助理中所有任务和设置吗？\n\n系统提醒：无法还原的喔！</string>
+
+    <!-- slide 47f -->
+    <string name="EPr_manage_delete_completed_gcal">删除日程表中已完成任务</string>
+    <string name="EPr_manage_delete_completed_gcal_message">您真的想删除您所有的事件中已经完成的任务吗？</string>
+    <string name="EPr_manage_delete_completed_gcal_summary"></string>
+    <string name="EPr_manage_delete_completed_gcal_status">已经删除 %d 个日历事件了！</string>
+
+    <!-- slide 47g-->
+    <string name="EPr_manage_delete_all_gcal">删除所有日程表</string>
+    <string name="EPr_manage_delete_all_gcal_message">您真的想删除您所有事件中的各项任务吗？</string>
+    <string name="EPr_manage_delete_all_gcal_summary"></string>
+    <string name="EPr_manage_delete_all_gcal_status">已经删除了 %d 个日历事件了！</string>
+
+    <!-- ==================================================== AddOnActivity == -->
+
+    <!-- Add Ons Activity Title -->
+    <string name="AOA_title">扩展</string>
+
+    <!-- Add-on Activity: author for internal authors  -->
+    <string name="AOA_internal_author">清单小助理团队</string>
+
+    <!-- Add-on Activity: installed add-ons tab -->
+    <string name="AOA_tab_installed">已安装</string>
+
+    <!-- Add-on Activity - available add-ons tab -->
+    <string name="AOA_tab_available">可用</string>
+
+    <!-- Add-on Activity - free add-ons label -->
+    <string name="AOA_free">免费</string>
+
+    <!-- Add-on Activity - menu item to visit add-on website -->
+
+    <!-- Add-on Activity - menu item to visit android market -->
+
+    <!-- Add-on Activity - when list is empty -->
+    <string name="AOA_no_addons">空列表！</string>
+
+    <string name="AOA_ppack_title">Power Pack</string>
+    <string name="AOA_ppack_description">支持清单小助理并在优化工具的帮助下变得更加有效率。提供 4＊2
+        和4＊4尺寸的小工具和语音支持。让我们给生活加把劲！
+    </string>
+    <string name="AOA_locale_title">清单小助理场所插件</string>
+    <string name="AOA_locale_description">在过滤的条件下，允许清单小助理利用场所应用推送通知。现在就获取场所插件。</string>
+
+    <!-- ====================================================== TasksWidget == -->
+
+    <!-- Widget text when loading tasks -->
+    <string name="TWi_loading">载入中...</string>
+
+    <!-- Widget configuration activity title: select a filter -->
+    <string name="WCA_title">选择任务以显示...</string>
+
+    <!-- ======================================================== Waiting on me -->
+
+    <string name="wom_commented">%s commented on your task.</string>
+    <string name="wom_mentioned">%s mentioned you.</string>
+    <string name="wom_assigned">%s assigned this to you.</string>
+    <string name="wom_raised_pri">%s raised the priority.</string>
+    <string name="wom_changed_due">%s changed the due date.</string>
+    <string name="wom_default">%s wants your attention.</string>
+
+    <string name="wom_dismiss">Dismiss</string>
+    <string name="wom_acknowledge">I\'ve read this</string>
+
+    <!-- ============================================================= About == -->
+
+    <!-- slide 30h: Title of "About" option in settings -->
+    <string name="p_about">关于清单小助理</string>
+
+    <!-- About text (%s => current version)-->
+    <string name="p_about_text">当前版本： %s\n\n清单小助理是由 Todoroo, Inc. 维护的开源软件。</string>
+
+    <!-- Title of "Help" option in settings -->
+    <string name="p_help">支持</string>
+
+    <!-- slide 30c: Title of "Forums" option in settings -->
+    <string name="p_forums">讨论区</string>
+
+    <!-- Title of "Premium" option in settings -->
+    <string name="p_premium">高级</string>
+
+    <!-- ============================================================= Misc == -->
+
+    <string name="feedback_positive_title">Rate Astrid?</string>
+
+    <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star
+        rating?
+    </string>
+
+    <string name="feedback_negative_title">Leave feedback?</string>
+
+    <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
+
+    <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback
+        section--it might not be available on your device.
+    </string>
+
+    <string name="feedback_positive_button">Rate Astrid</string>
+
+    <string name="feedback_negative_button">Leave feedback</string>
+
+    <string name="feedback_not_now">Not now</string>
+
+    <string name="feedback_banner_text">How\'s Astrid working for you?</string>
+
+    <!-- Displayed when task killer found. %s => name of the application -->
+    <string name="task_killer_help">似乎您正在使用会删除进程的应用程序(%s)！可以的话，请将 清单小助理加入到例外列表避免被杀死。否则
+        清单小助理可能无法通知您任务已到期。\n
+    </string>
+
+    <!-- Task killer dialog ok button -->
+    <string name="task_killer_help_ok">我不要中止清单小助理!</string>
+
+    <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
+
+    <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
+    <string name="marketplace_description">
+        清单小助理是一款开源并深受人们喜爱的任务/列表管理器，旨在提高您处理事务的效率。清单小助理包含提醒、标签、同步、区域插件、小工具等众多功能。
+    </string>
+
+    <string name="DB_corrupted_title">数据库已经受损</string>
+
+    <string name="DB_corrupted_body">啊喔！您有一个毁损的资料库。如果您经常看见这个错误出现，我们建议您清除所有数据（在设置-&gt;同步和备份-&amp;gt；管理旧任务-&gt;清楚所有数据）并在清单小助理备份中重新存入您的任务（设置-&gt;同步和备份-&gt;备份-&gt;导入任务）</string>
+
+    <string name="market_unavailable">非常抱歉，我们的软件无法在您的系统中成功运行。</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 32g: Preference Category: Defaults Title -->
+    <string name="EPr_defaults_header">新任务默认设置</string>
+    <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
+
+    <!-- slide 41f:  Preference: Default Urgency Title -->
+    <string name="EPr_default_urgency_title">默认截止期</string>
+    <!-- Preference: Default Urgency Description (%s => setting) -->
+    <string name="EPr_default_urgency_desc">当前：%s</string>
+
+    <!-- slide 40a: Preference: Default Importance Title -->
+    <string name="EPr_default_importance_title">Default priority</string>
+    <!-- Preference: Default Importance Description (%s => setting) -->
+    <string name="EPr_default_importance_desc">当前：%s</string>
+
+    <!-- slide 42e: Preference: Default Hide Until Title -->
+    <string name="EPr_default_hideUntil_title">默认隐藏直到</string>
+    <!-- Preference: Default Hide Until Description (%s => setting) -->
+    <string name="EPr_default_hideUntil_desc">当前：%s</string>
+
+    <!-- slide 43e: Preference: Default Reminders Title -->
+    <string name="EPr_default_reminders_title">默认提醒</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_desc">当前：%s</string>
+
+    <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
+    <string name="EPr_default_addtocalendar_title">默认添加到日历</string>
+    <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
+    <string name="EPr_default_addtocalendar_desc_disabled">新建任务将不会在 Google 日历中创建事件</string>
+    <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
+    <string name="EPr_default_addtocalendar_desc">新建任务将会在这个日历中：“%s”</string>
+
+    <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
+    <string name="EPr_default_reminders_mode_title">默认铃声／振动类型</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_mode_desc">当前：%s</string>
+
+    <string-array name="EPr_default_importance">
+        <!-- importance: labels for "Task Defaults" preference item. -->
+        <!-- slide 40b -->
+        <item>!!!（最高级别）</item>
+        <item>!!</item>
+        <item>!</item>
+        <!-- slide 40c -->
+        <item>o（最低级别）</item>
+    </string-array>
+
+    <string-array name="EPr_default_urgency">
+        <!-- urgency: labels for "Task Defaults" preference item. -->
+        <!-- slide 41a-->
+        <item>无截止日</item>
+        <!-- slide 41b -->
+        <item>今天</item>
+        <!-- slide 41c-->
+        <item>明天</item>
+        <!-- slide 41d -->
+        <item>后天</item>
+        <!-- slide 41e -->
+        <item>下周</item>
+    </string-array>
+
+    <string-array name="EPr_default_hideUntil">
+        <!-- hideUntil: labels for "Task Defaults" preference item. -->
+        <!-- slide 42a -->
+        <item>不隐藏</item>
+        <!-- slide 42b -->
+        <item>任务到期</item>
+        <!-- slide 42c -->
+        <item>截止期前一天</item>
+        <!-- slide 42d-->
+        <item>截止期前一周</item>
+    </string-array>
+
+    <string-array name="EPr_default_reminders">
+        <!-- reminders: labels for "Task Defaults" preference item. -->
+        <!-- slide 43a -->
+        <item>无截止期限提醒</item>
+        <!-- slide 43b -->
+        <item>截止期限时</item>
+        <!-- slide 43c -->
+        <item>过期时</item>
+        <!-- slide 43d -->
+        <item>截止期限或过期时</item>
+    </string-array>
+
+    <string-array name="EPr_default_addtocalendar">
+        <!-- addtocalendar: labels for "Task Defaults" preference item. -->
+        <item>@string/EPr_deactivated</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in filter plug-in -->
-    
+
     <!-- ================================================= Filter Exposer == -->
-    
+
     <!-- Active Tasks Filter -->
     <string name="BFE_Active">My Tasks</string>
-    
+
     <!-- Waiting on me filter -->
     <string name="BFE_waiting_on_me">Waiting On Me</string>
-        
+
     <!-- Search Filter -->
-    
+
     <!-- slide 10b: Recently Modified -->
     <string name="BFE_Recent">最近修改过的</string>
-    
+
     <!-- slide 10c: I\'ve assigned -->
     <string name="BFE_Assigned">我已经安排</string>
-    
+
     <!-- Build Your Own Filter -->
-    
+
     <!-- Saved Filters Header -->
-    
+
     <!-- Saved Filters Context Menu: delete -->
     <string name="BFE_Saved_delete">删除筛选</string>
 
     <!-- =========================================== CustomFilterActivity == -->
-    
+
     <!-- slide 30d: Build Your Own Filter Activity Title-->
     <string name="CFA_title">自定义筛选</string>
-    
+
     <!-- slide 30e: Filter Name edit box hint (if user types here, filter will be saved) -->
     <string name="CFA_filterName_hint">命名筛选并保存...</string>
-    
+
     <!-- Filter Name default for copied filters (%s => old filter name) -->
-    
+
     <!-- slide 30a: Filter Starting Universe: all tasks -->
     <string name="CFA_universe_all">进行中的任务</string>
-    
+
     <!-- Filter Criteria Type: add (at the begging of title of the criteria) -->
     <string name="CFA_type_add">或</string>
-    
+
     <!-- Filter Criteria Type: subtract (at the begging of title of the criteria) -->
     <string name="CFA_type_subtract">非</string>
-    
+
     <!-- Filter Criteria Type: intersect (at the begging of title of the criteria) -->
     <string name="CFA_type_intersect">且</string>
-    
+
     <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
     <string name="CFA_context_chain">%s 含条件</string>
-    
+
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">删除列</string>
-    
+
     <!-- slide 30b: Filter Screen Help Text -->
     <string name="CFA_help">Long press on items for additional options</string>
-    
+
     <!-- slide 30c: Filter Button: add new -->
     <string name="CFA_button_add">添加条件</string>
-    
+
     <!-- slide 30f: Filter Button: view without saving -->
     <string name="CFA_button_view">查看</string>
-    
+
     <!-- Filter Button: save & view filter -->
     <string name="CFA_button_save">保存 &amp; 查看</string>
 
     <!-- =========================================== CustomFilterCriteria == -->
-        
+
     <!-- Criteria: due by X - display text (? -> user input) -->
     <string name="CFC_dueBefore_text">期限: ?</string>
     <!-- Criteria: due by X - name of criteria -->
@@ -1697,314 +1748,315 @@
         <item>下周</item>
         <item>下个月</item>
     </string-array>
-    
+
     <!-- Criteria: importance - display text (? -> user input)-->
     <string name="CFC_importance_text">Priority at least ?</string>
     <!-- Criteria: importance - name of criteria -->
-    <string name="CFC_importance_name">Priority...</string>        
-    
+    <string name="CFC_importance_name">Priority...</string>
+
     <!-- Criteria: tag - display text (? -> user input) -->
     <string name="CFC_tag_text">列表：?</string>
     <!-- Criteria: tag - name of criteria -->
     <string name="CFC_tag_name">列表...</string>
-    
+
     <!-- Criteria: tag_contains - name of criteria -->
     <string name="CFC_tag_contains_name">列表名包含...</string>
     <!-- Criteria: tag_contains - text (? -> user input) -->
     <string name="CFC_tag_contains_text">列表名包含：?</string>
-    
+
     <!-- Criteria: title_contains - name of criteria -->
     <string name="CFC_title_contains_name">标题含...</string>
     <!-- Criteria: title_contains - text (? -> user input) -->
     <string name="CFC_title_contains_text">标题含: ?</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-  
-  <!-- Error message for adding to calendar  -->
-  <string name="gcal_TEA_error">添加任务到日历时失败！</string>
-
-  <!-- Label for adding task to calendar -->
-
-  <!-- slide 21c: Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">建立日程表事件</string>
-  
-  <!-- Label when calendar event already exists -->
-  <string name="gcal_TEA_showCalendar_label">打开日程表事件</string>
-  
-  <!-- Toast when unable to open calendar event -->
-  
-  <!-- Toast when calendar event updated because task changed -->
-  <string name="gcal_TEA_calendar_updated">日程表事件也更新了!</string>
-  
-  <!-- No calendar label (don\'t add option) -->
-  <string name="gcal_TEA_nocal">不要添加</string>
-  
-  <string name="gcal_TEA_none_selected">To calendar?</string>
-  
-  <string name="gcal_TEA_has_event">日历事件</string>
-  
-  <!-- ======================================================== Calendars == -->
-  
-  <!-- Calendar event name when task is completed (%s => task title) -->
-  <string name="gcal_completed_title">%s (已完成)</string>
-
-  <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
-  <string name="gcal_GCP_default">默认日程表</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Error message for adding to calendar  -->
+    <string name="gcal_TEA_error">添加任务到日历时失败！</string>
 
+    <!-- Label for adding task to calendar -->
 
+    <!-- slide 21c: Label for adding task to calendar -->
+    <string name="gcal_TEA_addToCalendar_label">建立日程表事件</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Label when calendar event already exists -->
+    <string name="gcal_TEA_showCalendar_label">打开日程表事件</string>
+
+    <!-- Toast when unable to open calendar event -->
+
+    <!-- Toast when calendar event updated because task changed -->
+    <string name="gcal_TEA_calendar_updated">日程表事件也更新了!</string>
+
+    <!-- No calendar label (don\'t add option) -->
+    <string name="gcal_TEA_nocal">不要添加</string>
+
+    <string name="gcal_TEA_none_selected">To calendar?</string>
+
+    <string name="gcal_TEA_has_event">日历事件</string>
+
+    <!-- ======================================================== Calendars == -->
+
+    <!-- Calendar event name when task is completed (%s => task title) -->
+    <string name="gcal_completed_title">%s (已完成)</string>
+
+    <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
+    <string name="gcal_GCP_default">默认日程表</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ============================================================= UI == -->
 
     <!-- filters header: GTasks -->
     <string name="gtasks_FEx_header">Google Tasks</string>
-    
+
     <!-- filter category for GTasks lists -->
-    
+
     <!-- filter title for GTasks lists (%s => list name) -->
     <string name="gtasks_FEx_title">Google Tasks: %s</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_creating_list">正在创建列表……</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_create_list_dialog">新列表名：</string>
-    
+
     <!-- error to show when list creation fails -->
     <string name="gtasks_FEx_create_list_error">创建新列表失败</string>
-    
+
     <!-- short help title for Gtasks -->
-    
+
     <string name="CFC_gtasks_list_text">列表内容: ?</string>
 
     <string name="CFC_gtasks_list_name">在Google任务列表中...</string>
-    
+
     <!-- Message while clearing completed tasks -->
     <string name="gtasks_GTA_clearing">正在清除已完成任务……</string>
-    
+
     <!-- Label for clear completed menu item -->
     <string name="gtasks_GTA_clear_completed">清除已完成项</string>
-        
+
     <!-- ============================================ GtasksLoginActivity == -->
-    
-    <!-- Activity Title: Gtasks Login -->    
 
-    <!-- Instructions: Gtasks login -->    
+    <!-- Activity Title: Gtasks Login -->
+
+    <!-- Instructions: Gtasks login -->
     <string name="gtasks_GLA_body">请登录到谷歌任务同步（Beta!）。目前不支持非迁移的“Google应用服务”帐户。</string>
-    
+
     <string name="gtasks_GLA_noaccounts">没有可用的Google帐户同步。</string>
 
-    <!-- Instructions: Gtasks further help -->    
-    <string name="gtasks_GLA_further_help">预览任务时若想保留缩进和排序，请到“筛选”页面选择 Google Tasks。清单小助理默认采用自有的任务排序设置。</string>
+    <!-- Instructions: Gtasks further help -->
+    <string name="gtasks_GLA_further_help">预览任务时若想保留缩进和排序，请到“筛选”页面选择 Google
+        Tasks。清单小助理默认采用自有的任务排序设置。
+    </string>
+
+    <!-- Sign In Button -->
 
-    <!-- Sign In Button -->    
+    <!-- E-mail Address Label -->
 
-    <!-- E-mail Address Label -->    
+    <!-- Password Label -->
 
-    <!-- Password Label -->    
-    
     <!--  Authenticating toast -->
     <string name="gtasks_GLA_authenticating">正在认证...</string>
-    
+
     <!-- Google Apps for Domain checkbox -->
 
-    <!-- Error Message when fields aren\'t filled out -->    
+    <!-- Error Message when fields aren\'t filled out -->
 
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
     <string name="gtasks_GLA_errorAuth">验证出错！请在您手机的帐户管理器中检查您的用户名和密码</string>
 
-    <!-- Error Message when we receive an IO Exception -->    
+    <!-- Error Message when we receive an IO Exception -->
     <string name="gtasks_GLA_errorIOAuth">对不起，我们在与 Google 服务器通讯时遇到了问题。请稍后再尝试。</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->    
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->
     <string name="gtasks_GLA_errorAuth_captcha">您可能需要输入验证码。尝试从浏览器登陆后再回来重试：</string>
-    
+
     <!-- ============================================== GtasksPreferences == -->
 
-    <!-- GTasks Preferences Title -->    
+    <!-- GTasks Preferences Title -->
     <string name="gtasks_GPr_header">Google Tasks</string>
-    
-    <!-- ================================================ Synchronization == -->    
-    
+
+    <!-- ================================================ Synchronization == -->
+
     <!-- title for notification tray when synchronizing -->
 
     <!-- Error Message when we receive a HTTP 503 error -->
-    <string name="gtasks_error_backend">Google 的工作表应用程序界面正处于测试版阶段，而且遇到了出错。这个服务可能已经停止，请稍后再尝试。</string>
-    
+    <string name="gtasks_error_backend">Google 的工作表应用程序界面正处于测试版阶段，而且遇到了出错。这个服务可能已经停止，请稍后再尝试。
+    </string>
+
     <!-- Error for account not found -->
     <string name="gtasks_error_accountNotFound">找不到帐户 %s——请退出，然后从 Google Tasks设置中重新登录。</string>
-    
+
     <!-- Error when ping after refreshing token fails -->
     <string name="gtasks_error_authRefresh">无法用 Google Tasks验证。请检查您的帐户密码或者稍后再尝试。</string>
-    
+
     <!-- Error when account manager returns no auth token or throws exception -->
     <string name="gtasks_error_accountManager">您手机的帐户管理器出错了。请退出，然后从 Google Tasks设置中重新登录。</string>
 
     <!-- Error when authorization error happens in background sync -->
     <string name="gtasks_error_background_sync_auth">后台验证出错了。请在清单小助理运行时尝试启动同步。</string>
-      
+
     <string name="gtasks_import_progress">Importing Google Tasks...</string>
 
-    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you still want to add the task %2$s to it?</string>
+    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you
+        still want to add the task %2$s to it?
+    </string>
 
     <string name="gtasks_import_dlg_title">Google Tasks Import</string>
 
     <string name="gtasks_import_add_task_ok">Add task</string>
 
     <string name="gtasks_import_add_task_cancel">Don\'t add task</string>
-        
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- NEW USER EXPERIENCE -->
-  
-  <!-- help bubbles -->
-  <!-- slide 8c: Shown the first time a user sees the task list activity -->
-  <string name="help_popover_add_task">添加一两项任务来开始使用</string>
-
-  <!-- Shown the first time a user adds a task to a list -->  
-  <string name="help_popover_tap_task">轻点任务进行编辑和分享</string>
-  
-  <!-- slide 14a: Shown the first time a user sees the list activity -->
-  <string name="help_popover_list_settings">轻点这里进行编辑或者分享这个列表</string>
-  
-  <!-- slide 26c: Shown the first time a user sees the list settings tab -->
-  <string name="help_popover_collaborators">和您分享的人\n能帮助您建立您的列表或者一起完成任务</string>
-  
-  <!-- Shown after user adds a task on tablet-->
-  <string name="help_popover_add_lists">点击标签添加列表</string>
-  
-  <!-- Shown after a user adds a task on phones -->
-  <string name="help_popover_switch_lists">轻点添加一个列表或者在列表间切换</string>
-  
-  
-  
-  <!-- Login activity -->
-  
-  
-  <!-- slide 7b -->
-  <string name="welcome_login_tos_base">您使用清单小助理就表明您同意所有</string>
-  
-  <string name="welcome_login_tos_link">服务条款</string>
-  
-  <!-- slide 7e -->
-  <string name="welcome_login_pw">Sign up</string>
-  
-  <string name="welcome_sign_in">登录</string>
-
-  <!-- slide 7f -->
-  <string name="welcome_login_later">稍后</string>
-  
-  <string name="welcome_login_confirm_later_title">为什么不登录呢？</string>
-  
-  <string name="welcome_login_confirm_later_ok">我会的！</string>
-  
-  <string name="welcome_login_confirm_later_cancel">不了，谢谢</string>
-  
-  <string name="welcome_login_confirm_later_dialog">登录吧，充分利用清单小助理！无需任何费用，您就可以获得在线备份、和 Astrid.com 全面同步、可以通过电子邮件添加任务、而且您甚至可以和朋友们一起分享任务列表呢！</string>
+    <!-- NEW USER EXPERIENCE -->
 
+    <!-- help bubbles -->
+    <!-- slide 8c: Shown the first time a user sees the task list activity -->
+    <string name="help_popover_add_task">添加一两项任务来开始使用</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown the first time a user adds a task to a list -->
+    <string name="help_popover_tap_task">轻点任务进行编辑和分享</string>
 
+    <!-- slide 14a: Shown the first time a user sees the list activity -->
+    <string name="help_popover_list_settings">轻点这里进行编辑或者分享这个列表</string>
 
-  <!-- Resources for built-in locale plug-in -->
-
-  <!-- Locale Alert Editing Window Title -->
-  <string name="locale_edit_alerts_title">清单小助理筛选警示</string>
-  
-  <!-- Locale Window Help -->                                                                                                                                            
-  <string name="locale_edit_intro">当您有任务在筛选内时，清单小助理将送出提醒</string>
-      
-  <!-- Locale Window Filter Picker UI -->                                                                                                                                        
-      
-  <!-- Locale Window Interval Label -->                                                                                                                                        
-  <string name="locale_interval_label">限制提醒：</string>        
-      
-  <!-- Locale Window Interval Values -->                                                                                                                                        
-  <string-array name="locale_interval">
-    <item>每小时一次</item>
-    <item>每六小时一次</item>
-    <item>每十二小时一次</item>
-    <item>每天一次</item>
-    <item>每三天一次</item>
-    <item>每周一次</item>
-  </string-array>        
-      
-  <!-- Locale Notification text -->                                                                                                                                        
-  <string name="locale_notification">您有 $NUM 符合: $FILTER</string>     
-      
-  <!-- Locale Plugin was not found, it is required -->
-  <string name="locale_plugin_required">请安装清单小助理本地插件！</string>        
-     
+    <!-- slide 26c: Shown the first time a user sees the list settings tab -->
+    <string name="help_popover_collaborators">和您分享的人\n能帮助您建立您的列表或者一起完成任务</string>
 
+    <!-- Shown after user adds a task on tablet-->
+    <string name="help_popover_add_lists">点击标签添加列表</string>
+
+    <!-- Shown after a user adds a task on phones -->
+    <string name="help_popover_switch_lists">轻点添加一个列表或者在列表间切换</string>
+
+
+    <!-- Login activity -->
+
+
+    <!-- slide 7b -->
+    <string name="welcome_login_tos_base">您使用清单小助理就表明您同意所有</string>
+
+    <string name="welcome_login_tos_link">服务条款</string>
+
+    <!-- slide 7e -->
+    <string name="welcome_login_pw">Sign up</string>
+
+    <string name="welcome_sign_in">登录</string>
+
+    <!-- slide 7f -->
+    <string name="welcome_login_later">稍后</string>
+
+    <string name="welcome_login_confirm_later_title">为什么不登录呢？</string>
+
+    <string name="welcome_login_confirm_later_ok">我会的！</string>
+
+    <string name="welcome_login_confirm_later_cancel">不了，谢谢</string>
+
+    <string name="welcome_login_confirm_later_dialog">登录吧，充分利用清单小助理！无需任何费用，您就可以获得在线备份、和 Astrid.com
+        全面同步、可以通过电子邮件添加任务、而且您甚至可以和朋友们一起分享任务列表呢！
+    </string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in locale plug-in -->
+
+    <!-- Locale Alert Editing Window Title -->
+    <string name="locale_edit_alerts_title">清单小助理筛选警示</string>
+
+    <!-- Locale Window Help -->
+    <string name="locale_edit_intro">当您有任务在筛选内时，清单小助理将送出提醒</string>
+
+    <!-- Locale Window Filter Picker UI -->
+
+    <!-- Locale Window Interval Label -->
+    <string name="locale_interval_label">限制提醒：</string>
+
+    <!-- Locale Window Interval Values -->
+    <string-array name="locale_interval">
+        <item>每小时一次</item>
+        <item>每六小时一次</item>
+        <item>每十二小时一次</item>
+        <item>每天一次</item>
+        <item>每三天一次</item>
+        <item>每周一次</item>
+    </string-array>
+
+    <!-- Locale Notification text -->
+    <string name="locale_notification">您有 $NUM 符合: $FILTER</string>
+
+    <!-- Locale Plugin was not found, it is required -->
+    <string name="locale_plugin_required">请安装清单小助理本地插件！</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ====================== Plugin Boilerplate ========================= -->
 
-	<!-- filters header: OpenCRX -->
+    <!-- filters header: OpenCRX -->
     <string name="opencrx_FEx_header">打开CRX</string>
-    
+
     <!-- filter category for OpenCRX ActivityCreators -->
     <string name="opencrx_FEx_dashboard">任务区</string>
-    
+
     <!-- filter category for OpenCRX responsible person -->
     <string name="opencrx_FEx_responsible">指派给</string>
-    
+
     <!--  OpenCRX assignedTo filter title (%s => assigned contact) -->
     <string name="opencrx_FEx_responsible_title">指派给 \'%s\'</string>
-    
+
     <!-- detail for showing tasks created by someone else (%s => person name) -->
     <string name="opencrx_PDE_task_from">来自 %s</string>
-    
+
     <!-- replacement string for task edit "Notes" when using OpenCRX -->
     <string name="opencrx_TEA_notes">新增注释</string>
-    
+
     <string name="opencrx_creator_input_hint">创建者</string>
 
     <string name="opencrx_contact_input_hint">指派给</string>
     <!-- ==================================================== Preferences == -->
 
-    <!-- Preferences Title: OpenCRX -->    
+    <!-- Preferences Title: OpenCRX -->
     <string name="opencrx_PPr_header">打开CRX</string>
 
     <!-- creator title for tasks that are not synchronized -->
     <string name="opencrx_no_creator">(不要同步)</string>
 
-	<!-- preference title for default creator -->
+    <!-- preference title for default creator -->
     <string name="opencrx_PPr_defaultcreator_title">默认活动创建者</string>
 
     <!-- preference description for default creator (%s -> setting) -->
@@ -2012,7 +2064,7 @@
 
     <!-- preference description for default dashboard (when set to \'not synchronized\') -->
     <string name="opencrx_PPr_defaultcreator_summary_none">新活动默认不会被同步</string>
-    
+
     <!--  OpenCRX host and segment group name -->
     <string name="opencrx_group">OpenCRX 服务器</string>
 
@@ -2021,81 +2073,89 @@
 
     <!--  dialog title for OpenCRX host -->
     <string name="opencrx_host_dialog_title">OpenCRX 主机</string>
-    
+
     <!--  example for OpenCRX host -->
-    <string name="opencrx_host_summary">"例如 "<i>mydomain.com</i></string>
-    
+    <string name="opencrx_host_summary">"例如 "
+        <i>mydomain.com</i>
+    </string>
+
     <!--  preference description for OpenCRX segment -->
     <string name="opencrx_segment_title">段</string>
 
     <!--  dialog title for OpenCRX segment -->
     <string name="opencrx_segment_dialog_title">同步段</string>
-    
+
     <!--  example for OpenCRX segment -->
-    <string name="opencrx_segment_summary">"例如： "<i>" 标准 "<i/></i></string>
-    
+    <string name="opencrx_segment_summary">"例如： "
+        <i>" 标准 "
+            <i/>
+        </i>
+    </string>
+
     <!--  default value for OpenCRX segment -->
     <string name="opencrx_segment_default">标准值</string>
-    
+
     <!--  preference description for OpenCRX provider -->
     <string name="opencrx_provider_title">提供者</string>
 
     <!--  dialog title for OpenCRX provider -->
     <string name="opencrx_provider_dialog_title">OpenCRX 数据提供者</string>
-    
+
     <!--  example for OpenCRX provider -->
-    <string name="opencrx_provider_summary">"例如 "<i>CRX</i></string>
-    
+    <string name="opencrx_provider_summary">"例如 "
+        <i>CRX</i>
+    </string>
+
     <!--  default value for OpenCRX provider -->
     <string name="opencrx_provider_default">CRX</string>
     <!-- ================================================= Login Activity == -->
 
-    <!-- Activity Title: Opencrx Login -->    
+    <!-- Activity Title: Opencrx Login -->
     <string name="opencrx_PLA_title">登录到 OpenCRX</string>
 
-    <!-- Instructions: Opencrx login -->    
+    <!-- Instructions: Opencrx login -->
     <string name="opencrx_PLA_body">用您的 OpenCRX 帐号登陆</string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
     <string name="opencrx_PLA_signIn">登录</string>
 
-    <!-- Login Label -->    
+    <!-- Login Label -->
     <string name="opencrx_PLA_login">登录</string>
 
-    <!-- Password Label -->    
+    <!-- Password Label -->
     <string name="opencrx_PLA_password">密码</string>
-    
-        <!-- Error Message when fields aren\'t filled out -->    
+
+    <!-- Error Message when fields aren\'t filled out -->
     <string name="opencrx_PLA_errorEmpty">错误：请填充所有字段</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
     <string name="opencrx_PLA_errorAuth">错误：用户名或密码错误！</string>
 
     <!-- ================================================ Synchronization == -->
-        
+
     <!-- title for notification tray after synchronizing -->
     <string name="opencrx_notification_title">打开CRX</string>
-    
+
     <!-- text for notification tray when synchronizing -->
     <string name="opencrx_notification_text">%s 任务已更新/点选检视细节</string>
-    
+
     <!-- Error msg when io exception  -->
     <string name="opencrx_ioerror">连接错误！请检查您的因特网连接。</string>
 
     <!-- opencrx Login not specified-->
     <string name="opencrx_MLA_email_empty">用户名未指定！</string>
-    
+
     <!-- opencrx password not specified-->
     <string name="opencrx_MLA_password_empty">密码未指定！</string>
-    
+
     <!-- ================================================ labels for layout-elements == -->
-    
+
     <!-- label for task-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_task_assign_label">指派任务给此人:</string>
-    
+
     <!-- Spinner-item for unassigned tasks on taskeditactivity -->
     <string name="opencrx_TEA_task_unassigned">&lt;反指派&gt;</string>
-    
+
     <!-- label for dashboard-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_creator_assign_label">指派该任务给此创建者：</string>
 
@@ -2103,7 +2163,7 @@
     <string name="opencrx_TEA_dashboard_default">&lt;默认&gt;</string>
 
     <string name="opencrx_TEA_opencrx_title">打开CRX控制面板</string>
-        
+
     <string name="CFC_opencrx_in_workspace_text">在任务区: ?</string>
 
     <string name="CFC_opencrx_in_workspace_name">在任务区...</string>
@@ -2113,52 +2173,50 @@
     <string name="CFC_opencrx_assigned_to_name">指派给...</string>
 
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
+    <!-- ================================================== EditPreferences == -->
 
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 32j: Preference Category: Power Pack -->
-  <string name="EPr_powerpack_header">高级和其它设置</string>
-  <string name="EPr_powerpack_summary">未接电话提醒，语音输入和其它设置</string>
-  
-  <!-- slide 32e: Preference: Anonymous User Statistics -->
-  <string name="EPr_statistics_title">匿名使用统计</string>
-  <!-- Preference: User Statistics (disabled) -->
-  <string name="EPr_statistics_desc_disabled">不报告使用资料</string>  
-  <!-- slide 32f: Preference: User Statistics (enabled) -->
-  <string name="EPr_statistics_desc_enabled">传送匿名使用资料以协助我们改进清单小助理</string>
-      
+    <!-- slide 32j: Preference Category: Power Pack -->
+    <string name="EPr_powerpack_header">高级和其它设置</string>
+    <string name="EPr_powerpack_summary">未接电话提醒，语音输入和其它设置</string>
 
+    <!-- slide 32e: Preference: Anonymous User Statistics -->
+    <string name="EPr_statistics_title">匿名使用统计</string>
+    <!-- Preference: User Statistics (disabled) -->
+    <string name="EPr_statistics_desc_disabled">不报告使用资料</string>
+    <!-- slide 32f: Preference: User Statistics (enabled) -->
+    <string name="EPr_statistics_desc_enabled">传送匿名使用资料以协助我们改进清单小助理</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <string name="speech_err_network">网络出错！语音识别需要网络连接才能运作。</string>
     <string name="speech_err_no_match">对不起，我听不明白喔！请再说一次吧。</string>
     <string name="speech_err_default">对不起，语音识别遇到出错。请重新再试。</string>
-    
+
     <string name="premium_attach_file">附上一份文件</string>
     <string name="premium_record_audio">录制一条便笺</string>
     <string name="premium_no_files">没有附加文件</string>
     <string name="premium_remove_file_confirm">您确定吗？无法恢复的喔</string>
-    
+
     <string name="audio_recording_title">正在录制音频</string>
     <string name="audio_stop_recording">停止录制</string>
     <string name="audio_speak_now">现在请讲！</string>
     <string name="audio_encoding">正在编码……</string>
     <string name="audio_err_encoding">音频编码出错</string>
     <string name="audio_err_playback">对不起，系统不支持这种类型的音频文件</string>
-    
+
     <string name="search_market_audio">找不到播放器来处理这种音频类型。您想从安卓市场上下载一个音频播放器吗？</string>
     <string name="search_market_audio_title">找不到音频播放器</string>
 
@@ -2167,10 +2225,10 @@
 
     <string name="search_market_ms">找不到微软 Office 阅读器。您想从安卓市场上下载一个微软 Office 阅读器吗？</string>
     <string name="search_market_ms_title">找不到微软 Office</string>
-    
+
     <string name="file_type_unhandled">对不起！找不到应用程序处理这种文件类型。</string>
     <string name="file_type_unhandled_title">找不到应用程序</string>
-    
+
     <string name="file_prefix_image">图片</string>
     <string name="file_prefix_voice">语音</string>
     <string name="file_browser_up">向上</string>
@@ -2187,38 +2245,47 @@
     <string name="file_err_download">下载文件时出错</string>
     <string name="file_err_no_directory">糟糕！这个文件目录似乎并不存在。请在清单小助理设置中选择目录以存放文件。</string>
     <string name="file_err_show">对不起，系统尚未支持这种类型的文件</string>
-    
+
     <string name="file_dir_dialog_ok">使用此目录</string>
     <string name="file_dir_dialog_default">重设为默认值</string>
-    
+
     <string name="p_files_dir">高级下载设置</string>
     <!-- Description for file download directory preference. %s -> chosen directory -->
     <string name="p_files_dir_desc">将任务附件保存至：%s</string>
     <string name="p_files_dir_desc_default">默认目录</string>
 
-    
+
     <!-- in app billing -->
     <string name="billing_not_supported_title">无法完成交易</string>
     <string name="billing_not_supported_message">付款服务暂时无法使用。您能继续使用这个应用软件，但是您无法成功购买。</string>
     <string name="subscriptions_not_supported_title">无法订阅服务。</string>
-    <string name="subscriptions_not_supported_message">此设备上的Market账单服务暂时无法支持购买。 您能在http://astrid.com/premium上购买清单小助理高级版本。</string>
+    <string name="subscriptions_not_supported_message">此设备上的Market账单服务暂时无法支持购买。
+        您能在http://astrid.com/premium上购买清单小助理高级版本。
+    </string>
     <string name="cannot_connect_title">无法连接网上Market</string>
-    <string name="cannot_connect_message">此应用程序无法连接Market。您的Market版本也许过低。您能继续使用此程序，但是您无法成功交易。</string>
-    
+    <string name="cannot_connect_message">此应用程序无法连接Market。您的Market版本也许过低。您能继续使用此程序，但是您无法成功交易。
+    </string>
+
     <string name="restoring_transactions">恢复交易</string>
-    
+
     <string name="subscriptions_learn_more">了解更多</string>
-    
-    <string name="kii_premium_success">Thanks for participating in this offer! Your free month of Astrid Premium is now unlocked.</string>
+
+    <string name="kii_premium_success">Thanks for participating in this offer! Your free month of
+        Astrid Premium is now unlocked.
+    </string>
     <string name="kii_premium_abort">Special offer aborted</string>
     <string name="kii_premium_declined">Special offer declined</string>
-    <string name="kii_premium_error">There was an error processing this offer. Please try again later.</string>
-    
+    <string name="kii_premium_error">There was an error processing this offer. Please try again
+        later.
+    </string>
+
     <string name="premium_offers_title">Special Offer</string>
     <string name="premium_offers_subtitle">Want one month of Astrid Premium for free?</string>
-    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a short video by this sponsor. (They will also require your email address.)</string>
+    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a
+        short video by this sponsor. (They will also require your email address.)
+    </string>
     <string name="premium_offers_start">Get it free!</string>
-    
+
     <string name="premium_billing_title">清单小助理高级版本</string>
     <string name="premium_buy_month">1 个月</string>
     <string name="premium_buy_year">1 年</string>
@@ -2234,725 +2301,734 @@
     <string name="premium_already_subscribed">您已经购买了清单小助理高级版本(Astrid Premium)！</string>
     <string name="premium_login_prompt">为了成功购买高级版本，您需要一个Astrid.com的账户。 请在我们的网站上登录或者注册。</string>
     <string name="premium_success">谢谢购买清单小助理高级版本(Astrid Premium)！</string>
-    <string name="premium_success_with_server_error">Thanks for subscribing to Astrid Premium! The new features will be unlocked for you on astrid.com soon, and should be available on your phone right away.</string>
-    <string name="premium_verification_error">此Google Play 帐户的高级版本正与另一个用户连接。访问astrid.com/users/profile并连接您帐户的另一个电子邮箱。</string>
-    <string name="premium_check_for_purchases">Already purchased premium? Click here to check Google Play for purchase history.</string>
+    <string name="premium_success_with_server_error">Thanks for subscribing to Astrid Premium! The
+        new features will be unlocked for you on astrid.com soon, and should be available on your
+        phone right away.
+    </string>
+    <string name="premium_verification_error">此Google Play
+        帐户的高级版本正与另一个用户连接。访问astrid.com/users/profile并连接您帐户的另一个电子邮箱。
+    </string>
+    <string name="premium_check_for_purchases">Already purchased premium? Click here to check Google
+        Play for purchase history.
+    </string>
     <string name="premium_checking_for_purchases">Checking for purchases...</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- 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">提醒我：</string>
-
-  <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">当任务到期时</string>
-
-  <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">当任务过期时</string>
-
-  <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_randomly">随机一次</string>
-
-  <!-- Task Edit: Reminder alarm clock label -->  
-  <string name="TEA_reminder_alarm_label">铃响/震动类型：</string>
-
-  <!--  slide 45a: Task Edit: Reminder mode: ring once -->  
-  <string name="TEA_reminder_mode_once">Once</string>
-
-  <!-- slide 45b: Task Edit: Reminder mode: ring five times -->  
-  <string name="TEA_reminder_mode_five">Five times</string>
-
-  <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->  
-  <string name="TEA_reminder_mode_nonstop">Until I dismiss alarm</string>
-  
-  <string name="TEA_reminder_when">when</string>
-  
-  <string name="TEA_reminder_due_short">due</string>
-
-  <string name="TEA_reminder_overdue_short">overdue</string>
-
-  <string name="TEA_reminder_randomly_short">randomly</string>
-
-  <string name="TEA_reminder_display_one">Remind me %s</string>
-  
-  <string name="TEA_reminder_display_multiple">Remind %s</string>
-
-  <string-array name="TEA_reminder_random">
-    <!-- random reminder choices for task edit page. -->
-    <item>一个小时</item>
-    <item>一天</item>
-    <item>一个星期</item>
-    <item>两星期内</item>
-    <item>一个月</item>
-    <item>两个月内</item>
-  </string-array>
-  
-  <!-- ==================================================== notifications == -->
-  
-  <!-- Name of filter when viewing a reminder -->
-  <string name="rmd_NoA_filter">提醒！</string>
-  
-  <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">已完成!</string>
-  
-  <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">晚点提醒...</string>
-  
-  <!-- Reminder: Completed Toast -->
-  <string name="rmd_NoA_completed_toast">恭喜，已经完成了！</string>
-  
-  <!-- Prefix for reminder dialog title -->
-  <string name="rmd_NoA_dlg_title">提醒：</string>
-  
-  <!-- ==================================================== user reengagement == -->
-
-  <!-- Titles for user reengagement notifications -->
-  <string-array name="rmd_reengage_notif_titles">
-    <item>清单小助理的提示</item>
-    <!-- %s -> first name -->
-    <item>%s 的备忘录。</item> 
-    <item>您的清单小助理摘要</item>
-    <item>清单小助理的提醒</item>
-  </string-array>
-    
-  <string name="rmd_reengage_name_default">您</string>
-
-  
-  <string name="rmd_reengage_add_tasks">添加任务</string>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs -->
-  <string-array name="rmd_reengage_dialog_options">
-    <item>是时候缩短您的任务清单了！</item>
-    <item>尊敬的先生或女士，有一些任务等待您的检查！</item>
-    <item>嘿，您好，您可不可以看一看这些任务？</item>
-    <item>我有些任务，上面有您的名字喔！</item>
-    <item>您今天的一批新任务！</item>
-    <item>您看起来棒极了！准备好开始了吗？</item>
-    <item>今天不错，是时候搞定一些事儿了，我认为是这样的！</item>
-  </string-array>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>您不想生活变得更加有条理吗？</item>
-    <item>我是清单小助理！我随时帮助您做更多事情！</item>
-    <item>您好像好忙喔！让我来分担一下您的重担里的一些活儿呗。</item>
-    <item>我可以帮您记录您生活中的所有细节。</item>
-    <item>您真的要搞定更多事情吗？我也是啊！</item>
-    <item>好高兴认识您咽！</item>
-  </string-array>
-  <!-- ============================================= reminder preferences == -->
-  
-  <!-- slide 33d: Reminder Preference Screen Title -->
-  <string name="rmd_EPr_alerts_header">提醒设置</string>
-  <string name="rmd_EPr_alerts_summary">勿扰模式，稍候提醒，持续提醒</string>
-    
-  <!-- Reminder Preference: Reminders Enabled Title -->
-  <string name="rmd_EPr_enabled_title">允许提醒？</string>
-  <!-- Reminder Preference Reminders Enabled Description (true) -->
-  <string name="rmd_EPr_enabled_desc_true">清单小助理提示功能已经启用（这是正常的）</string>
-  <!-- Reminder Preference Reminders Enabled Description (false) -->
-  <string name="rmd_EPr_enabled_desc_false">清单小助理清单小助理提示功能将不再显示在您的手机上</string>  
-    
-  <!-- Reminder Preference: Quiet Hours Start Title -->
-  <string name="rmd_EPr_quiet_hours_start_title">静音开始时间</string>
-  <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">%s 后提示将静止。\n注意：震动在下面的选项中控制！</string>
-  <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
-  <string name="rmd_EPr_quiet_hours_desc_none">未设定无声时间</string>
-  
-  <!-- Reminder Preference: Quiet Hours End Title -->
-  <string name="rmd_EPr_quiet_hours_end_title">静音时间结束</string>
-  <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_end_desc">静音时间将在%s后结束</string>
-
-  <!-- Reminder Preference: Default Reminder Title -->
-  <string name="rmd_EPr_rmd_time_title">默认提示</string>
-  <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
-  <string name="rmd_EPr_rmd_time_desc">未设定截止日期任务的通知会于 %s 出现</string>
-
-  <!-- Reminder Preference: Notification Ringtone Title -->
-  <string name="rmd_EPr_ringtone_title">提醒铃声</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
-  <string name="rmd_EPr_ringtone_desc_custom">自定铃声已设定</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
-  <string name="rmd_EPr_ringtone_desc_silent">铃声设定为静音</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
-  <string name="rmd_EPr_ringtone_desc_default">使用默认铃声</string>
-  
-  <!-- Reminder Preference: Notification Persistence Title -->
-  <string name="rmd_EPr_persistent_title">持续提醒</string>
-  <!-- Reminder Preference: Notification Persistence Description (true) -->
-  <string name="rmd_EPr_persistent_desc_true">提醒必须逐个清除</string>
-  <!-- Reminder Preference: Notification Persistence Description (false) -->
-  <string name="rmd_EPr_persistent_desc_false">通知可经由点选“清除全部”清除</string>
-
-  <!-- Reminder Preference: Social Reminders Title -->
-  <string name="rmd_EPr_social_title">Social encouragement</string>
-  <!-- Reminder Preference: Social Reminders Summary (enabled) -->
-  <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for shared tasks</string>
-  <!-- Reminder Preference: Social Reminders Summary (disabled) -->
-  <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you for shared tasks</string>
-  
-  
-  
-  <!-- Reminder Preference: Notification Icon Title -->
-  <!-- Reminder Preference: Notification Icon Description -->
-
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
-  <string name="rmd_EPr_multiple_maxvolume_title">多重提醒最大音量</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_true">清单小助理将会以最大音量进行多重提醒</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_false">清单小助理使用系统音量设置</string>
-
-  <!-- Reminder Preference: Vibrate Title -->
-  <string name="rmd_EPr_vibrate_title">震动提醒</string>
-  <!-- Reminder Preference: Vibrate Description (true) -->
-  <string name="rmd_EPr_vibrate_desc_true">传送通知时会震动</string>
-  <!-- Reminder Preference: Vibrate Description (false) -->
-  <string name="rmd_EPr_vibrate_desc_false">传送通知震动关闭</string>
-
-  <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">清单小助理提醒</string>
-  <!-- Reminder Preference: Nagging Description (true) -->
-  <string name="rmd_EPr_nagging_desc_true">Astrid 提醒时会给你鼓励</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_nagging_desc_false">Astrid 不显示任何鼓励</string>
-
-  <!-- Reminder Preference: Snooze Dialog Title -->  
-  <string name="rmd_EPr_snooze_dialog_title">晚点提醒对话框 小时:分钟</string>
-  <!-- Reminder Preference: Snooze Dialog Description (true) -->
-  <string name="rmd_EPr_snooze_dialog_desc_true">选择晚点提醒的时间 (小时:分钟)</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_snooze_dialog_desc_false">选择几天/小时后再提醒</string>
-  
-  <!-- slide 44g: Reminder Preference: Default Reminders Title -->
-  <string name="rmd_EPr_defaultRemind_title">随机提醒</string>
-  <!-- Reminder Preference: Default Reminders Setting (disabled) -->
-  <string name="rmd_EPr_defaultRemind_desc_disabled">新任务不使用随机提醒</string>
-  <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
-  <string name="rmd_EPr_defaultRemind_desc">任务将随机提醒: %s</string>
-  
-  <!-- slide 39a: Defaults Title -->
-  
-  <string-array name="EPr_reminder_random">
-    <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
-    <item>停用</item>
-    <!-- slide 44b -->
-    <item>每小时</item>
-    <!-- slide 44c -->
-    <item>每天</item>
-    <!-- slide 44d-->
-    <item>每周</item>
-    <!-- slide 44e-->
-    <item>每两周</item>
-    <!-- slide 44f -->
-    <item>每月</item>
-    <item>每两个月</item>
-  </string-array>
-        
-  <string-array name="EPr_quiet_hours_start">
-    <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
-    <item>停用</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>00:00</item>
-    <item>01:00</item>
-    <item>02:00</item>
-    <item>03:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-  </string-array>
-  
-  <string-array name="EPr_quiet_hours_end">
-    <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>00:00</item>
-    <item>01:00</item>
-    <item>02:00</item>
-    <item>03:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-  </string-array>
-  
-  <string-array name="EPr_rmd_time">
-    <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>00:00</item>
-    <item>01:00</item>
-    <item>02:00</item>
-    <item>03:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-  </string-array>
-  
-  <!-- =============================================== random reminders == -->
-
-  <string name="reminders_social">These people are counting on you!</string>
-  
-  <string name="reminders_social_one">%s is counting on you!</string>
-  
-  <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
-
-  <string-array name="reminders">
-      <!-- reminders: Make these < 20 chars so the task name is displayed -->
-      <item>您好！有时间吗？</item>
-      <item>能借用一点时间吗？</item>
-      <item>有几分钟吗？</item>
-      <item>忘了什么吗？</item>
-      <item>不好意思！</item>
-      <item>当您有时间：</item>
-      <item>在您的议程：</item>
-      <item>有空吗？</item>
-      <item>注意一下Astrid!</item>
-      <item>可打扰一下吗？</item>
-      <item>能借一分钟吗？</item>
-      <item>重要的一天要</item>
-  </string-array>
-
-  <string-array name="reminders_due">
-      <!-- reminders related to task due date -->
-      <item>该任务囉!</item>
-      <item>期限快到了！</item>
-      <item>准备好了吗？</item>
-      <item>您说过您将会：</item>
-      <item>您应开始：</item>
-      <item>该开始：</item>
-      <item>时候到了！</item>
-      <item>抱歉！该做</item>
-      <item>有空吗？是时候做</item>
-  </string-array>
-
-  <string-array name="reminders_snooze">
-      <!-- reminders related to snooze -->
-      <item>别想偷懒喔！</item>
-      <item>休息时间过了！</item>
-      <item>别再睡了！</item>
-      <item>现在准备好了吗？</item>
-      <item>不能再推了！</item>
-  </string-array>
-  
-  <string-array name="reminder_responses">
-      <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
-      <item>我有些事想麻烦您！</item> 
-      <item>是时候该让这事成为过去了？</item>
-      <item>为何不将其搞掂？</item>
-      <item>如何?准备好了吗？</item>
-      <item>准备好做这件事了吗？</item>
-      <item>您能处理这件事吗？</item>
-      <item>当您完成时会很高兴的！</item>
-      <item>我保证，完成这件事后您会感觉更棒！</item>
-      <item>您今天不想做这个了？</item>
-      <item>请做完吧，我受不了了！</item>
-      <item>您能完成吗？当然可以！</item>
-      <item>您是否要做这件事？</item>
-      <item>自我感觉很好吧！加油！</item>
-      <item>我以你为荣！让我们完成它吧！</item>
-      <item>完成后来点小奖励如何？</item>
-      <item>就这一件？好吗？</item>
-      <item>是时候清理任务清单了!</item>
-      <item>您所在的队伍是整装待发的还是杂乱无章的？整装待发的！那我们出发吧！</item>
-      <item>我最近不是说过您做得不错吗？坚持啊！</item>
-      <item>一天一件事，天下大乱也不关我的事……再见啦，乱子！</item>
-      <item>您怎么做到的呀？哇，我真佩服了！</item>
-      <item>不管您有多帅多美，您也不能拿来维持生活的。让我们准备做点实事吧！</item>
-      <item>天气不错呀，是时候搞定这种工作了，不是吗？</item>
-      <item>做这件事时是不是想来杯茶呢？</item>
-      <item>要是您已经做完这件事，您就可以到外面玩了。</item>
-      <item>是时候了。要做的事情总是要做的。</item>
-      <item>您每次不理我，我都被折磨得死去活来的。</item>
-  </string-array>
-
-  <string-array name="postpone_nags">
-      <!-- Astrid\'s nagging when user clicks postpone -->
-      <item>别告诉我事实上你是会拖延的人！</item>
-      <item>有时懒散会使人变老！</item>
-      <item>有些人正在哪里等你完成这件事呢！</item>
-      <item>当你说要延期时,是表示你正在做是吗?？</item>
-      <item>这是您最后一次延期对吧？</item>
-      <item>今天完成吧，我不会告诉其他人的！</item>
-      <item>当您能不延期时为什么要延期！</item>
-      <item>您终将会完成的对吗？</item>
-      <item>我觉得您很棒！何不把这完成？</item>
-      <item>您做了会达到您的目标吗？</item>
-      <item>推，推，推。什么时候是个头啊!</item>
-      <item>我受够借口了！快点做吧!</item>
-      <item>上次你用过这借口了吧？</item>
-      <item>假如你这样，我就没法帮你了...</item>
-  </string-array>
+    <!-- Resources for built-in reminders plug-in -->
 
+    <!-- =============================================== task edit activity == -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder group label -->
+    <string name="TEA_reminders_group_label">Reminder settings</string>
 
+    <!-- Task Edit: Reminder header label -->
+    <string name="TEA_reminder_label">提醒我：</string>
 
-  <!-- Resources for built-in repeat plug-in -->
-
-  <!-- repeating plugin name -->
-  <string name="repeat_plugin">重复任务</string>
-  
-  <!-- repeating plugin description -->
-  <string name="repeat_plugin_desc">允许任务重复</string>
-  
-  <!-- slide 20a: checkbox for turning on/off repeats -->
-  <string name="repeat_enabled">重复</string>
-  
-  <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
-  <string name="repeat_every">每 %d</string>
-  
-  <!-- hint when opening repeat interval -->
-  <string name="repeat_interval_prompt">重复间隔</string>
-  
-  <!-- slide 19b-->
-  <string name="repeat_never">Not repeating</string>
-  <!-- slide 20f-->
-  <string name="repeat_dont">不重复</string>
-      
-  <string-array name="repeat_interval_short">
-    <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>日</item>
-    <item>周</item>
-    <item>月</item>
-    <item>时</item>
-    <item>分</item>
-    <item>年</item>
-  </string-array>
-  
-  
-  <string-array name="repeat_interval">
-    <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>日</item>
-    <item>星期</item>
-    <item>月</item>
-    <item>小时</item>
-    <item>分钟</item>
-    <item>年</item>
-  </string-array>
-  
-  <string name="repeat_days">days</string>
-  <string name="repeat_weekdays">weekdays</string>
-  <string name="repeat_weeks">weeks</string>
-  <string name="repeat_months">months</string>
-  <string name="repeat_years">years</string>
-  <string name="repeat_hours">hours</string>
-  <string name="repeat_minutes">minutes</string>
-  
-  <string-array name="repeat_until_shortcuts">
-      <item>永远重复</item>
-      <item>具体的一天</item>
-      <item>今天</item>
-      <item>明天</item>
-      <item>（后天）</item>
-      <item>下星期</item>
-      <item>两星期内</item>
-      <item>下个月</item>
-  </string-array>
-  
-  <string name="repeat_until_title">重复到……</string>
-  
-  <string name="repeat_keep_going">继续下去</string>
-  
-  <string-array name="repeat_type">
-    <!-- slide 20c: repeat type (date to repeat from) -->
-    <item>自到期日</item>
-    <!-- slide 20c -->
-    <item>自完成日</item>
-  </string-array>
-  
-  <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
-  <string name="repeat_detail_byday">$I 的 $D</string>
-  
-  <!-- task detail for repeat from due date (%s -> interval) -->
-  <string name="repeat_detail_duedate">每隔 %s</string>
-
-  <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
-  <string name="repeat_detail_duedate_until">每隔 %1$s\n直到 %2$s</string>
-  
-  <!-- task detail for repeat from completion date (%s -> interval) -->
-  <string name="repeat_detail_completion">完成后 %s</string>
-  
-  <!-- text for button when repeating task indefinitely -->
-  <string name="repeat_forever">永远重复</string>
-
-  <!-- text for button when repeating task until specified date (%s -> date string) -->
-  <string name="repeat_until">重复到 %s</string>
-  
-  <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title">重新安排“%s”这项任务</string>
-
-  <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title_last_time">已经完成“%s”这项重复任务</string>
-      
-  <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->  
-  <string name="repeat_rescheduling_dialog_bubble">%1$s 我已经重新安排了这项重复任务，截止日期由 %2$s 变成 %3$s</string>
-  
-  <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
-  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s 我已经重新安排了这项重复任务，截止日期为 %2$s</string>
-  
-  <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
-  <string name="repeat_rescheduling_dialog_bubble_last_time">您设置了这项任务重复到 %1$s，现在您已经圆满完成。%2$s</string>
-  
-  <string-array name="repeat_encouragement">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>做得好！</item>
-      <item>哇噢... 我真为你骄傲！</item>
-      <item>每次您能做那么多事情的时候，我都爱死您了！</item>
-      <item>勾掉一些任务的时候是不是很爽呀？</item>
-  </string-array>
-
-  <string-array name="repeat_encouragement_last_time">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>做得好！</item>
-      <item>我真为您骄傲啊！</item>
-      <item>每次您能做那么多事情的时候，我都爱死您了！</item>
-  </string-array>
-  
+    <!-- Task Edit: Reminder @ deadline -->
+    <string name="TEA_reminder_due">当任务到期时</string>
 
+    <!-- Task Edit: Reminder after deadline -->
+    <string name="TEA_reminder_overdue">当任务过期时</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder at random times (%s => time plural)-->
+    <string name="TEA_reminder_randomly">随机一次</string>
 
-    
-  <!-- Subtasks Help Introduction -->
-  <string name="subtasks_help_title">在 Astrid 中排序并缩进</string>
-  <string name="subtasks_help_1">轻点并按住一项任务来移动它</string>
-  <string name="subtasks_help_2">上下拖动以重新整理</string>
-  <string name="subtasks_help_3">左右拖动以缩进</string>
-    
+    <!-- Task Edit: Reminder alarm clock label -->
+    <string name="TEA_reminder_alarm_label">铃响/震动类型：</string>
 
+    <!--  slide 45a: Task Edit: Reminder mode: ring once -->
+    <string name="TEA_reminder_mode_once">Once</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 45b: Task Edit: Reminder mode: ring five times -->
+    <string name="TEA_reminder_mode_five">Five times</string>
+
+    <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
+    <string name="TEA_reminder_mode_nonstop">Until I dismiss alarm</string>
+
+    <string name="TEA_reminder_when">when</string>
+
+    <string name="TEA_reminder_due_short">due</string>
+
+    <string name="TEA_reminder_overdue_short">overdue</string>
+
+    <string name="TEA_reminder_randomly_short">randomly</string>
+
+    <string name="TEA_reminder_display_one">Remind me %s</string>
+
+    <string name="TEA_reminder_display_multiple">Remind %s</string>
+
+    <string-array name="TEA_reminder_random">
+        <!-- random reminder choices for task edit page. -->
+        <item>一个小时</item>
+        <item>一天</item>
+        <item>一个星期</item>
+        <item>两星期内</item>
+        <item>一个月</item>
+        <item>两个月内</item>
+    </string-array>
+
+    <!-- ==================================================== notifications == -->
+
+    <!-- Name of filter when viewing a reminder -->
+    <string name="rmd_NoA_filter">提醒！</string>
+
+    <!-- Reminder: Task was already done -->
+    <string name="rmd_NoA_done">已完成!</string>
+
+    <!-- Reminder: Snooze button (remind again later) -->
+    <string name="rmd_NoA_snooze">晚点提醒...</string>
+
+    <!-- Reminder: Completed Toast -->
+    <string name="rmd_NoA_completed_toast">恭喜，已经完成了！</string>
+
+    <!-- Prefix for reminder dialog title -->
+    <string name="rmd_NoA_dlg_title">提醒：</string>
+
+    <!-- ==================================================== user reengagement == -->
+
+    <!-- Titles for user reengagement notifications -->
+    <string-array name="rmd_reengage_notif_titles">
+        <item>清单小助理的提示</item>
+        <!-- %s -> first name -->
+        <item>%s 的备忘录。</item>
+        <item>您的清单小助理摘要</item>
+        <item>清单小助理的提醒</item>
+    </string-array>
+
+    <string name="rmd_reengage_name_default">您</string>
+
+
+    <string name="rmd_reengage_add_tasks">添加任务</string>
+
+    <!-- Speech bubble options for astrid in reengagement notifs -->
+    <string-array name="rmd_reengage_dialog_options">
+        <item>是时候缩短您的任务清单了！</item>
+        <item>尊敬的先生或女士，有一些任务等待您的检查！</item>
+        <item>嘿，您好，您可不可以看一看这些任务？</item>
+        <item>我有些任务，上面有您的名字喔！</item>
+        <item>您今天的一批新任务！</item>
+        <item>您看起来棒极了！准备好开始了吗？</item>
+        <item>今天不错，是时候搞定一些事儿了，我认为是这样的！</item>
+    </string-array>
+
+    <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>您不想生活变得更加有条理吗？</item>
+        <item>我是清单小助理！我随时帮助您做更多事情！</item>
+        <item>您好像好忙喔！让我来分担一下您的重担里的一些活儿呗。</item>
+        <item>我可以帮您记录您生活中的所有细节。</item>
+        <item>您真的要搞定更多事情吗？我也是啊！</item>
+        <item>好高兴认识您咽！</item>
+    </string-array>
+    <!-- ============================================= reminder preferences == -->
+
+    <!-- slide 33d: Reminder Preference Screen Title -->
+    <string name="rmd_EPr_alerts_header">提醒设置</string>
+    <string name="rmd_EPr_alerts_summary">勿扰模式，稍候提醒，持续提醒</string>
+
+    <!-- Reminder Preference: Reminders Enabled Title -->
+    <string name="rmd_EPr_enabled_title">允许提醒？</string>
+    <!-- Reminder Preference Reminders Enabled Description (true) -->
+    <string name="rmd_EPr_enabled_desc_true">清单小助理提示功能已经启用（这是正常的）</string>
+    <!-- Reminder Preference Reminders Enabled Description (false) -->
+    <string name="rmd_EPr_enabled_desc_false">清单小助理清单小助理提示功能将不再显示在您的手机上</string>
+
+    <!-- Reminder Preference: Quiet Hours Start Title -->
+    <string name="rmd_EPr_quiet_hours_start_title">静音开始时间</string>
+    <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_start_desc">%s 后提示将静止。\n注意：震动在下面的选项中控制！</string>
+    <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
+    <string name="rmd_EPr_quiet_hours_desc_none">未设定无声时间</string>
+
+    <!-- Reminder Preference: Quiet Hours End Title -->
+    <string name="rmd_EPr_quiet_hours_end_title">静音时间结束</string>
+    <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_end_desc">静音时间将在%s后结束</string>
+
+    <!-- Reminder Preference: Default Reminder Title -->
+    <string name="rmd_EPr_rmd_time_title">默认提示</string>
+    <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
+    <string name="rmd_EPr_rmd_time_desc">未设定截止日期任务的通知会于 %s 出现</string>
+
+    <!-- Reminder Preference: Notification Ringtone Title -->
+    <string name="rmd_EPr_ringtone_title">提醒铃声</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
+    <string name="rmd_EPr_ringtone_desc_custom">自定铃声已设定</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
+    <string name="rmd_EPr_ringtone_desc_silent">铃声设定为静音</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
+    <string name="rmd_EPr_ringtone_desc_default">使用默认铃声</string>
+
+    <!-- Reminder Preference: Notification Persistence Title -->
+    <string name="rmd_EPr_persistent_title">持续提醒</string>
+    <!-- Reminder Preference: Notification Persistence Description (true) -->
+    <string name="rmd_EPr_persistent_desc_true">提醒必须逐个清除</string>
+    <!-- Reminder Preference: Notification Persistence Description (false) -->
+    <string name="rmd_EPr_persistent_desc_false">通知可经由点选“清除全部”清除</string>
+
+    <!-- Reminder Preference: Social Reminders Title -->
+    <string name="rmd_EPr_social_title">Social encouragement</string>
+    <!-- Reminder Preference: Social Reminders Summary (enabled) -->
+    <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for
+        shared tasks
+    </string>
+    <!-- Reminder Preference: Social Reminders Summary (disabled) -->
+    <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you
+        for shared tasks
+    </string>
+
+
+    <!-- Reminder Preference: Notification Icon Title -->
+    <!-- Reminder Preference: Notification Icon Description -->
+
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
+    <string name="rmd_EPr_multiple_maxvolume_title">多重提醒最大音量</string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_true">清单小助理将会以最大音量进行多重提醒</string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_false">清单小助理使用系统音量设置</string>
+
+    <!-- Reminder Preference: Vibrate Title -->
+    <string name="rmd_EPr_vibrate_title">震动提醒</string>
+    <!-- Reminder Preference: Vibrate Description (true) -->
+    <string name="rmd_EPr_vibrate_desc_true">传送通知时会震动</string>
+    <!-- Reminder Preference: Vibrate Description (false) -->
+    <string name="rmd_EPr_vibrate_desc_false">传送通知震动关闭</string>
+
+    <!-- Reminder Preference: Nagging Title -->
+    <string name="rmd_EPr_nagging_title">清单小助理提醒</string>
+    <!-- Reminder Preference: Nagging Description (true) -->
+    <string name="rmd_EPr_nagging_desc_true">Astrid 提醒时会给你鼓励</string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_nagging_desc_false">Astrid 不显示任何鼓励</string>
+
+    <!-- Reminder Preference: Snooze Dialog Title -->
+    <string name="rmd_EPr_snooze_dialog_title">晚点提醒对话框 小时:分钟</string>
+    <!-- Reminder Preference: Snooze Dialog Description (true) -->
+    <string name="rmd_EPr_snooze_dialog_desc_true">选择晚点提醒的时间 (小时:分钟)</string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_snooze_dialog_desc_false">选择几天/小时后再提醒</string>
+
+    <!-- slide 44g: Reminder Preference: Default Reminders Title -->
+    <string name="rmd_EPr_defaultRemind_title">随机提醒</string>
+    <!-- Reminder Preference: Default Reminders Setting (disabled) -->
+    <string name="rmd_EPr_defaultRemind_desc_disabled">新任务不使用随机提醒</string>
+    <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
+    <string name="rmd_EPr_defaultRemind_desc">任务将随机提醒: %s</string>
+
+    <!-- slide 39a: Defaults Title -->
+
+    <string-array name="EPr_reminder_random">
+        <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
+        <item>停用</item>
+        <!-- slide 44b -->
+        <item>每小时</item>
+        <!-- slide 44c -->
+        <item>每天</item>
+        <!-- slide 44d-->
+        <item>每周</item>
+        <!-- slide 44e-->
+        <item>每两周</item>
+        <!-- slide 44f -->
+        <item>每月</item>
+        <item>每两个月</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_start">
+        <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
+        <item>停用</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>00:00</item>
+        <item>01:00</item>
+        <item>02:00</item>
+        <item>03:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_end">
+        <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>00:00</item>
+        <item>01:00</item>
+        <item>02:00</item>
+        <item>03:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+    </string-array>
+
+    <string-array name="EPr_rmd_time">
+        <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>00:00</item>
+        <item>01:00</item>
+        <item>02:00</item>
+        <item>03:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+    </string-array>
+
+    <!-- =============================================== random reminders == -->
+
+    <string name="reminders_social">These people are counting on you!</string>
+
+    <string name="reminders_social_one">%s is counting on you!</string>
+
+    <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
+
+    <string-array name="reminders">
+        <!-- reminders: Make these < 20 chars so the task name is displayed -->
+        <item>您好！有时间吗？</item>
+        <item>能借用一点时间吗？</item>
+        <item>有几分钟吗？</item>
+        <item>忘了什么吗？</item>
+        <item>不好意思！</item>
+        <item>当您有时间：</item>
+        <item>在您的议程：</item>
+        <item>有空吗？</item>
+        <item>注意一下Astrid!</item>
+        <item>可打扰一下吗？</item>
+        <item>能借一分钟吗？</item>
+        <item>重要的一天要</item>
+    </string-array>
+
+    <string-array name="reminders_due">
+        <!-- reminders related to task due date -->
+        <item>该任务囉!</item>
+        <item>期限快到了！</item>
+        <item>准备好了吗？</item>
+        <item>您说过您将会：</item>
+        <item>您应开始：</item>
+        <item>该开始：</item>
+        <item>时候到了！</item>
+        <item>抱歉！该做</item>
+        <item>有空吗？是时候做</item>
+    </string-array>
+
+    <string-array name="reminders_snooze">
+        <!-- reminders related to snooze -->
+        <item>别想偷懒喔！</item>
+        <item>休息时间过了！</item>
+        <item>别再睡了！</item>
+        <item>现在准备好了吗？</item>
+        <item>不能再推了！</item>
+    </string-array>
+
+    <string-array name="reminder_responses">
+        <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
+        <item>我有些事想麻烦您！</item>
+        <item>是时候该让这事成为过去了？</item>
+        <item>为何不将其搞掂？</item>
+        <item>如何?准备好了吗？</item>
+        <item>准备好做这件事了吗？</item>
+        <item>您能处理这件事吗？</item>
+        <item>当您完成时会很高兴的！</item>
+        <item>我保证，完成这件事后您会感觉更棒！</item>
+        <item>您今天不想做这个了？</item>
+        <item>请做完吧，我受不了了！</item>
+        <item>您能完成吗？当然可以！</item>
+        <item>您是否要做这件事？</item>
+        <item>自我感觉很好吧！加油！</item>
+        <item>我以你为荣！让我们完成它吧！</item>
+        <item>完成后来点小奖励如何？</item>
+        <item>就这一件？好吗？</item>
+        <item>是时候清理任务清单了!</item>
+        <item>您所在的队伍是整装待发的还是杂乱无章的？整装待发的！那我们出发吧！</item>
+        <item>我最近不是说过您做得不错吗？坚持啊！</item>
+        <item>一天一件事，天下大乱也不关我的事……再见啦，乱子！</item>
+        <item>您怎么做到的呀？哇，我真佩服了！</item>
+        <item>不管您有多帅多美，您也不能拿来维持生活的。让我们准备做点实事吧！</item>
+        <item>天气不错呀，是时候搞定这种工作了，不是吗？</item>
+        <item>做这件事时是不是想来杯茶呢？</item>
+        <item>要是您已经做完这件事，您就可以到外面玩了。</item>
+        <item>是时候了。要做的事情总是要做的。</item>
+        <item>您每次不理我，我都被折磨得死去活来的。</item>
+    </string-array>
+
+    <string-array name="postpone_nags">
+        <!-- Astrid\'s nagging when user clicks postpone -->
+        <item>别告诉我事实上你是会拖延的人！</item>
+        <item>有时懒散会使人变老！</item>
+        <item>有些人正在哪里等你完成这件事呢！</item>
+        <item>当你说要延期时,是表示你正在做是吗?？</item>
+        <item>这是您最后一次延期对吧？</item>
+        <item>今天完成吧，我不会告诉其他人的！</item>
+        <item>当您能不延期时为什么要延期！</item>
+        <item>您终将会完成的对吗？</item>
+        <item>我觉得您很棒！何不把这完成？</item>
+        <item>您做了会达到您的目标吗？</item>
+        <item>推，推，推。什么时候是个头啊!</item>
+        <item>我受够借口了！快点做吧!</item>
+        <item>上次你用过这借口了吧？</item>
+        <item>假如你这样，我就没法帮你了...</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in repeat plug-in -->
+
+    <!-- repeating plugin name -->
+    <string name="repeat_plugin">重复任务</string>
+
+    <!-- repeating plugin description -->
+    <string name="repeat_plugin_desc">允许任务重复</string>
+
+    <!-- slide 20a: checkbox for turning on/off repeats -->
+    <string name="repeat_enabled">重复</string>
+
+    <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
+    <string name="repeat_every">每 %d</string>
+
+    <!-- hint when opening repeat interval -->
+    <string name="repeat_interval_prompt">重复间隔</string>
+
+    <!-- slide 19b-->
+    <string name="repeat_never">Not repeating</string>
+    <!-- slide 20f-->
+    <string name="repeat_dont">不重复</string>
+
+    <string-array name="repeat_interval_short">
+        <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>日</item>
+        <item>周</item>
+        <item>月</item>
+        <item>时</item>
+        <item>分</item>
+        <item>年</item>
+    </string-array>
+
+
+    <string-array name="repeat_interval">
+        <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>日</item>
+        <item>星期</item>
+        <item>月</item>
+        <item>小时</item>
+        <item>分钟</item>
+        <item>年</item>
+    </string-array>
+
+    <string name="repeat_days">days</string>
+    <string name="repeat_weekdays">weekdays</string>
+    <string name="repeat_weeks">weeks</string>
+    <string name="repeat_months">months</string>
+    <string name="repeat_years">years</string>
+    <string name="repeat_hours">hours</string>
+    <string name="repeat_minutes">minutes</string>
+
+    <string-array name="repeat_until_shortcuts">
+        <item>永远重复</item>
+        <item>具体的一天</item>
+        <item>今天</item>
+        <item>明天</item>
+        <item>（后天）</item>
+        <item>下星期</item>
+        <item>两星期内</item>
+        <item>下个月</item>
+    </string-array>
+
+    <string name="repeat_until_title">重复到……</string>
+
+    <string name="repeat_keep_going">继续下去</string>
+
+    <string-array name="repeat_type">
+        <!-- slide 20c: repeat type (date to repeat from) -->
+        <item>自到期日</item>
+        <!-- slide 20c -->
+        <item>自完成日</item>
+    </string-array>
+
+    <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
+    <string name="repeat_detail_byday">$I 的 $D</string>
+
+    <!-- task detail for repeat from due date (%s -> interval) -->
+    <string name="repeat_detail_duedate">每隔 %s</string>
+
+    <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
+    <string name="repeat_detail_duedate_until">每隔 %1$s\n直到 %2$s</string>
+
+    <!-- task detail for repeat from completion date (%s -> interval) -->
+    <string name="repeat_detail_completion">完成后 %s</string>
+
+    <!-- text for button when repeating task indefinitely -->
+    <string name="repeat_forever">永远重复</string>
+
+    <!-- text for button when repeating task until specified date (%s -> date string) -->
+    <string name="repeat_until">重复到 %s</string>
+
+    <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title">重新安排“%s”这项任务</string>
+
+    <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title_last_time">已经完成“%s”这项重复任务</string>
+
+    <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->
+    <string name="repeat_rescheduling_dialog_bubble">%1$s 我已经重新安排了这项重复任务，截止日期由 %2$s 变成 %3$s</string>
+
+    <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
+    <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s 我已经重新安排了这项重复任务，截止日期为 %2$s</string>
+
+    <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
+    <string name="repeat_rescheduling_dialog_bubble_last_time">您设置了这项任务重复到 %1$s，现在您已经圆满完成。%2$s
+    </string>
+
+    <string-array name="repeat_encouragement">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>做得好！</item>
+        <item>哇噢... 我真为你骄傲！</item>
+        <item>每次您能做那么多事情的时候，我都爱死您了！</item>
+        <item>勾掉一些任务的时候是不是很爽呀？</item>
+    </string-array>
+
+    <string-array name="repeat_encouragement_last_time">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>做得好！</item>
+        <item>我真为您骄傲啊！</item>
+        <item>每次您能做那么多事情的时候，我都爱死您了！</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Subtasks Help Introduction -->
+    <string name="subtasks_help_title">在 Astrid 中排序并缩进</string>
+    <string name="subtasks_help_1">轻点并按住一项任务来移动它</string>
+    <string name="subtasks_help_2">上下拖动以重新整理</string>
+    <string name="subtasks_help_3">左右拖动以缩进</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-
-  <!-- Tags label -->
-  <string name="TEA_tags_label">列表</string>
-  
-  <!-- Tags label long version -->
-  <string name="TEA_tags_label_long">Add to lists</string>
- 
-  <!-- Tags hint -->
-  <string name="TEA_tag_hint">新建列表</string>
-  
-  <!-- Tags dropdown -->
-    
-  <!-- =============================================== Task List Controls == -->
-  
-  <!-- menu item for tags -->
-  
-  <!-- ========================================================== Extras == -->
-  
-  <!-- Context Item: show tag -->
-  
-  <!-- slide 25a: Dialog: new list -->
-  <string name="tag_new_list">新建列表</string>
-  
-  <!-- Dialog: list saved -->
-  
-  <!-- Dialog: task created without title -->
-  <string name="tag_no_title_error">请先为此列表键入一个名称！</string>
-  
-  <!-- ========================================================== Filters == -->
-  
-  <!-- filter button to add tag -->
-  <string name="tag_FEx_add_new">添加</string>
-  
-  <!-- filter header for tags -->
-  <string name="tag_FEx_header">列表</string>
-  
-  <!-- filter header for tags user created -->
-  
-  <!-- filter header for tags, shared with user -->
-  
-  <!-- filter header for tags which have no active tasks -->
-  
-  <!-- slide 10d: filter for untagged tasks -->
-  <string name="tag_FEx_untagged">Uncategorized</string>
-  
-  <!-- slide 27a: %s => tag name -->
-
-  <!-- context menu option to rename a tag -->
-  <string name="tag_cm_rename">重命名列表</string>
-
-  <!-- context menu option to delete a tag -->
-  <string name="tag_cm_delete">删除列表</string>
-  
-  <!-- context menu option to leave a shared list -->
-  <string name="tag_cm_leave">离开列表</string>
-
-  <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
-  <string name="DLG_delete_this_tag_question">删除列表 %s 吗？(不会删除任务。)</string>
-  
-  <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
-  <string name="DLG_leave_this_shared_tag_question">要离开这份共享列表吗：%s？（不会删除任何任务。）</string>
-
-  <!-- Dialog to rename tag -->
-  <string name="DLG_rename_this_tag_header">重命名列表 %s 为：</string>
-
-  <!-- Toast notification that no changes have been made -->
-  <string name="TEA_no_tags_modified">没有变更</string>
-
-  <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_deleted">列表 %1$s 已删除，影响了 %2$d 项任务</string>
-  
-  <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_left">您离开了共享列表 %1$s，影响到 %2$d 个任务</string>
-
-  <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
-  <string name="TEA_tags_renamed">%3$d 项任务由 %1$s 重命名为 %2$s。</string>
-  
-  <!-- Tag case migration -->
-  <string name="tag_case_migration_notice">我们留意到您有些列表的名称是相同的，只是大写的地方不同而已。我们认为您可能是打算将他们放在同一个列表，所以我们已经合并了这些重名列表。但不用担心：原来的列表仅仅用了数字来重命名（例如 Shopping_1、Shopping_2）。如果您不想这样，您可以直接删除新合并的列表！</string>
-  
-  <!-- Header for tag settings -->
-  <string name="tag_settings_title">设置：</string>
-  
-  <!-- Header for tag activity -->
-  <string name="tag_updates_title">活跃程度：%s</string>
-  
-  <!-- Delete button for tag settings -->
-  <string name="tag_delete_button">删除列表</string>
-  
-  <!-- slide 28d: Leave button for tag settings -->
-  <string name="tag_leave_button">离开这份列表</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Tags label -->
+    <string name="TEA_tags_label">列表</string>
 
+    <!-- Tags label long version -->
+    <string name="TEA_tags_label_long">Add to lists</string>
+
+    <!-- Tags hint -->
+    <string name="TEA_tag_hint">新建列表</string>
+
+    <!-- Tags dropdown -->
+
+    <!-- =============================================== Task List Controls == -->
+
+    <!-- menu item for tags -->
+
+    <!-- ========================================================== Extras == -->
+
+    <!-- Context Item: show tag -->
+
+    <!-- slide 25a: Dialog: new list -->
+    <string name="tag_new_list">新建列表</string>
+
+    <!-- Dialog: list saved -->
+
+    <!-- Dialog: task created without title -->
+    <string name="tag_no_title_error">请先为此列表键入一个名称！</string>
+
+    <!-- ========================================================== Filters == -->
+
+    <!-- filter button to add tag -->
+    <string name="tag_FEx_add_new">添加</string>
+
+    <!-- filter header for tags -->
+    <string name="tag_FEx_header">列表</string>
+
+    <!-- filter header for tags user created -->
+
+    <!-- filter header for tags, shared with user -->
+
+    <!-- filter header for tags which have no active tasks -->
+
+    <!-- slide 10d: filter for untagged tasks -->
+    <string name="tag_FEx_untagged">Uncategorized</string>
+
+    <!-- slide 27a: %s => tag name -->
+
+    <!-- context menu option to rename a tag -->
+    <string name="tag_cm_rename">重命名列表</string>
+
+    <!-- context menu option to delete a tag -->
+    <string name="tag_cm_delete">删除列表</string>
+
+    <!-- context menu option to leave a shared list -->
+    <string name="tag_cm_leave">离开列表</string>
+
+    <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
+    <string name="DLG_delete_this_tag_question">删除列表 %s 吗？(不会删除任务。)</string>
+
+    <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
+    <string name="DLG_leave_this_shared_tag_question">要离开这份共享列表吗：%s？（不会删除任何任务。）</string>
+
+    <!-- Dialog to rename tag -->
+    <string name="DLG_rename_this_tag_header">重命名列表 %s 为：</string>
+
+    <!-- Toast notification that no changes have been made -->
+    <string name="TEA_no_tags_modified">没有变更</string>
+
+    <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_deleted">列表 %1$s 已删除，影响了 %2$d 项任务</string>
+
+    <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_left">您离开了共享列表 %1$s，影响到 %2$d 个任务</string>
+
+    <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
+    <string name="TEA_tags_renamed">%3$d 项任务由 %1$s 重命名为 %2$s。</string>
+
+    <!-- Tag case migration -->
+    <string name="tag_case_migration_notice">
+        我们留意到您有些列表的名称是相同的，只是大写的地方不同而已。我们认为您可能是打算将他们放在同一个列表，所以我们已经合并了这些重名列表。但不用担心：原来的列表仅仅用了数字来重命名（例如
+        Shopping_1、Shopping_2）。如果您不想这样，您可以直接删除新合并的列表！
+    </string>
+
+    <!-- Header for tag settings -->
+    <string name="tag_settings_title">设置：</string>
+
+    <!-- Header for tag activity -->
+    <string name="tag_updates_title">活跃程度：%s</string>
+
+    <!-- Delete button for tag settings -->
+    <string name="tag_delete_button">删除列表</string>
+
+    <!-- slide 28d: Leave button for tag settings -->
+    <string name="tag_leave_button">离开这份列表</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in timers plug-in -->
-    
+
     <!-- Task List: Start Timer button -->
-    
+
     <!-- Task List: Stop Timer button -->
-    
+
     <!-- Android Notification Title (%s => # tasks) -->
     <string name="TPl_notification">秒表启动了 %s！</string>
-    
+
     <!-- Filter Header for Timer plugin -->
-    
+
     <!-- Filter for Timed Tasks -->
     <string name="TFE_workingOn">任务已开始计时</string>
-    
+
     <!-- Title for TEA -->
     <string name="TEA_timer_controls">Timer</string>
-    
-    
+
+
     <!-- Edit Notes: create comment for when timer is started -->
     <string name="TEA_timer_comment_started">已经开始了这项任务：</string>
-    
+
     <!-- Edit Notes: create comment for when timer is stopped -->
     <string name="TEA_timer_comment_stopped">已经停止了这项任务：</string>
-    
+
     <!-- Edit Notes: comment to notify how long was spent on task -->
     <string name="TEA_timer_comment_spent">已经花费时间：</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Update string from activity codes %1$s - user, %2$s - target name, %3$s - message, %4$s - other_user-->
-    
+
     <!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
     Please do not translate this part of the string. -->
-    
+
     <!-- These are still in use -->
     <string name="update_string_default_comment">%1$s 发表道：%3$s</string>
     <string name="update_string_task_comment">%1$s on $link_task: %3$s</string>
     <string name="update_string_tag_comment">%1$s on %2$s: %3$s</string>
     <string name="update_string_user_self">You</string>
-    
+
     <string name="history_yourself">yourself</string>
     <string name="history_you">您</string>
     <string name="history_a_deleted_user">(a deleted user)</string>
-    
+
     <string name="history_this_list">this list</string>
     <string name="history_this_task">this task</string>
     <string name="history_tag_added">added %1$s to %2$s</string>
@@ -2978,9 +3054,12 @@
     <string name="history_favorited">favorited %s</string>
     <string name="history_unfavorited">unfavorited %s</string>
     <string name="history_changed_list_picture">change this list\'s picture</string>
-    <string name="history_added_description_characters">added %1$d characters to %2$s description</string>
+    <string name="history_added_description_characters">added %1$d characters to %2$s description
+    </string>
     <string name="history_removed_description">removed %s description</string>
-    <string name="history_removed_description_characters">removed %1$d characters from %2$s description</string>
+    <string name="history_removed_description_characters">removed %1$d characters from %2$s
+        description
+    </string>
     <string name="history_updated_description">updated %s description</string>
     <string name="history_changed_list_owner">changed list owner to %s</string>
     <string name="history_created_this_list">created this list</string>
@@ -3003,186 +3082,187 @@
     <string name="history_repeat_on">on %s</string>
     <string name="history_repeat_from_completion">after completion</string>
     <string name="history_acknowledged">viewed %s</string>
-    
+
     <string name="history_default">changed %1$s to %2$s</string>
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-    
-  <!-- Voice Add Prompt Text -->
-  <string name="voice_create_prompt">请说话以建立任务</string>
-  <string name="voice_edit_title_prompt">请说话以设定任务主旨</string>
-  <string name="voice_edit_note_prompt">请说话以设定任务备注</string>
-    
-  <!-- Preference: Task List recognition-service is not installed, but available -->
-  <string name="EPr_voiceInputInstall_dlg">语音输入功能尚未安装。\n您要连上市场并安装吗？</string>
-  <!-- Preference: Task List recognition-service is not available for this system -->
-  <string name="EPr_voiceInputUnavailable_dlg">很抱歉语音输入功能不支持您的系统。\n如果可能，请升级至Android 2.1或更新的版本。</string>
-  <!-- Preference: Market is not available for this system -->
-  <string name="EPr_marketUnavailable_dlg">很抱歉您的系统无法使用市场。\n如果可能，请尝试从其他来源下载语音查找功能。</string>
-  <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
-  <string name="EPr_voiceInputEnabled_title">语音输入</string>
-  <!-- slide 38a: Preference: voice button description (true) -->
-  <string name="EPr_voiceInputEnabled_desc_enabled">语音输入按键会在任务清单画面上显示。</string>
-  <!-- Preference: voice button description (false) -->
-  <string name="EPr_voiceInputEnabled_desc_disabled">语音输入按键会在任务清单画面上隐藏。</string>
-  <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
-  <string name="EPr_voiceInputCreatesTask_title">直接建立任务</string>
-  <!-- Preference: Task List Voice-creation description (true) -->
-  <string name="EPr_voiceInputCreatesTask_desc_enabled">任务将会自动从语音输入建立。</string>
-  <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
-  <string name="EPr_voiceInputCreatesTask_desc_disabled">语音输入结束后您可以编辑任务标题。</string>
-  <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
-  <string name="EPr_voiceRemindersEnabled_title">语音提醒</string>
-  <!-- Preference: Voice reminders description (true) -->
-  <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid在任务提醒时会以语音说出任务名称</string>
-  <!-- slide 38c: Preference: Voice reminders description (false) -->
-  <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid在任务提醒时将会播放铃声</string>    
-  
-  <!-- slide 32d: Preference Category: Voice Title -->
-  <string name="EPr_voice_header">语音输入设定</string>
-    
 
+    <!-- Voice Add Prompt Text -->
+    <string name="voice_create_prompt">请说话以建立任务</string>
+    <string name="voice_edit_title_prompt">请说话以设定任务主旨</string>
+    <string name="voice_edit_note_prompt">请说话以设定任务备注</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Preference: Task List recognition-service is not installed, but available -->
+    <string name="EPr_voiceInputInstall_dlg">语音输入功能尚未安装。\n您要连上市场并安装吗？</string>
+    <!-- Preference: Task List recognition-service is not available for this system -->
+    <string name="EPr_voiceInputUnavailable_dlg">很抱歉语音输入功能不支持您的系统。\n如果可能，请升级至Android 2.1或更新的版本。
+    </string>
+    <!-- Preference: Market is not available for this system -->
+    <string name="EPr_marketUnavailable_dlg">很抱歉您的系统无法使用市场。\n如果可能，请尝试从其他来源下载语音查找功能。</string>
+    <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
+    <string name="EPr_voiceInputEnabled_title">语音输入</string>
+    <!-- slide 38a: Preference: voice button description (true) -->
+    <string name="EPr_voiceInputEnabled_desc_enabled">语音输入按键会在任务清单画面上显示。</string>
+    <!-- Preference: voice button description (false) -->
+    <string name="EPr_voiceInputEnabled_desc_disabled">语音输入按键会在任务清单画面上隐藏。</string>
+    <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
+    <string name="EPr_voiceInputCreatesTask_title">直接建立任务</string>
+    <!-- Preference: Task List Voice-creation description (true) -->
+    <string name="EPr_voiceInputCreatesTask_desc_enabled">任务将会自动从语音输入建立。</string>
+    <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
+    <string name="EPr_voiceInputCreatesTask_desc_disabled">语音输入结束后您可以编辑任务标题。</string>
+    <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
+    <string name="EPr_voiceRemindersEnabled_title">语音提醒</string>
+    <!-- Preference: Voice reminders description (true) -->
+    <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid在任务提醒时会以语音说出任务名称</string>
+    <!-- slide 38c: Preference: Voice reminders description (false) -->
+    <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid在任务提醒时将会播放铃声</string>
 
-  
-  <!-- slide 30a-->
-  <string name="welcome_setting">显示教程</string>
-  
-  <string name="welcome_title_1">欢迎使用 Astrid！</string>
+    <!-- slide 32d: Preference Category: Voice Title -->
+    <string name="EPr_voice_header">语音输入设定</string>
 
-  <!-- slide 2a -->
-  <string name="welcome_title_2">创建列表</string>
 
-  <!-- slide 3a-->
-  <string name="welcome_title_3">在列表间切换</string>
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-  <!-- slide 4a -->
-  <string name="welcome_title_4">分享列表</string>
 
-  <!-- slide 5a -->
-  <string name="welcome_title_5">分配任务</string>
+    <!-- slide 30a-->
+    <string name="welcome_setting">显示教程</string>
 
-  <!-- slide 6a -->
-  <string name="welcome_title_6">提供详情</string>
+    <string name="welcome_title_1">欢迎使用 Astrid！</string>
 
-  <!-- slide 7a -->
-  <string name="welcome_title_7">现在就联网 \n开始使用吧！</string>
-  
-  <string name="welcome_title_7_return">搞定！</string>
-  
-  <!-- slide 1b -->
-  <string name="welcome_body_1">完美的个人任务列表\n您可以尽情与朋友互动</string>
+    <!-- slide 2a -->
+    <string name="welcome_title_2">创建列表</string>
 
-  <!-- slide 2b-->
-  <string name="welcome_body_2">任何列表都超牛：\n阅读、观看、购买、访问都是超强的！</string>
+    <!-- slide 3a-->
+    <string name="welcome_title_3">在列表间切换</string>
 
-  <!-- slide 3b -->
-  <string name="welcome_body_3">轻点列表标题 \n查看您所有的列表</string>
+    <!-- slide 4a -->
+    <string name="welcome_title_4">分享列表</string>
 
-  <!-- slide 4b -->
-  <string name="welcome_body_4">和朋友、室友、\n或者亲密的人\n一起分享精彩缤纷的列表吧！</string>
+    <!-- slide 5a -->
+    <string name="welcome_title_5">分配任务</string>
 
-  <!-- slide 5b -->
-  <string name="welcome_body_5">不用猜想谁会 \n带甜点来喔！</string>
+    <!-- slide 6a -->
+    <string name="welcome_title_6">提供详情</string>
 
-  <!-- slide 6b-->
-  <string name="welcome_body_6">轻点即可添加便笺 \n设置提示还有更多功能呢！</string>
-  <string name="welcome_body_7">登陆</string>
-  
-  <string name="welcome_body_7_return">拍拍清单小助理返回。</string>
-  
-  <!-- slide 1c -->
-  <string name="welcome_next">下一步</string>
-  
+    <!-- slide 7a -->
+    <string name="welcome_title_7">现在就联网 \n开始使用吧！</string>
 
+    <string name="welcome_title_7_return">搞定！</string>
+
+    <!-- slide 1b -->
+    <string name="welcome_body_1">完美的个人任务列表\n您可以尽情与朋友互动</string>
+
+    <!-- slide 2b-->
+    <string name="welcome_body_2">任何列表都超牛：\n阅读、观看、购买、访问都是超强的！</string>
+
+    <!-- slide 3b -->
+    <string name="welcome_body_3">轻点列表标题 \n查看您所有的列表</string>
+
+    <!-- slide 4b -->
+    <string name="welcome_body_4">和朋友、室友、\n或者亲密的人\n一起分享精彩缤纷的列表吧！</string>
+
+    <!-- slide 5b -->
+    <string name="welcome_body_5">不用猜想谁会 \n带甜点来喔！</string>
+
+    <!-- slide 6b-->
+    <string name="welcome_body_6">轻点即可添加便笺 \n设置提示还有更多功能呢！</string>
+    <string name="welcome_body_7">登陆</string>
+
+    <string name="welcome_body_7_return">拍拍清单小助理返回。</string>
+
+    <!-- slide 1c -->
+    <string name="welcome_next">下一步</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <string name="widget_mini">- Astrid Mini -</string>
-    
+
     <!-- Resources for power pack widget -->
-    
+
     <string name="PPW_widget_42_label">Old Astrid 4x2</string>
     <string name="PPW_widget_43_label">Old Astrid 4x3</string>
     <string name="PPW_widget_44_label">Old Astrid 4x4</string>
     <string name="PPW_widget_v11_label">- Astrid -</string>
     <string name="PPW_widget_custom_label">清单小助理自定义尊贵版</string>
     <string name="PPW_widget_custom_launcherpro_label">清单小助理专业尊贵版</string>
-    
+
     <string name="PPW_configure_title">配置小工具</string>
-    
+
     <string name="PPW_color">小工具颜色</string>
     <string name="PPW_enable_calendar">显示日历事件</string>
     <string name="PPW_disable_encouragements">隐藏打气助威语</string>
     <string name="PPW_show_dates">显示截止日期</string>
     <string name="PPW_filter">选择过滤器</string>
-    
+
     <string name="PPW_due">到期日：</string>
     <string name="PPW_past_due">逾期未完成：</string>
-    
+
     <string name="PPW_old_astrid_notice">最低限度您也需要清单小助理的 3.6 版本才能使用这个小工具。不好意思！</string>
-    
+
     <string-array name="PPW_encouragements">
         <!-- general encouragements -->
-    	<item>嘿，您好！</item>
-    	<item>有时间搞定一些事儿吗？</item>
-    	<item>天啊，您今天挺温雅的嘛！</item>
-    	<item>今天做点大事儿吧！</item>
-    	<item>今天来让我为您骄傲一下吧！</item>
-    	<item>您今天好吗？</item>
+        <item>嘿，您好！</item>
+        <item>有时间搞定一些事儿吗？</item>
+        <item>天啊，您今天挺温雅的嘛！</item>
+        <item>今天做点大事儿吧！</item>
+        <item>今天来让我为您骄傲一下吧！</item>
+        <item>您今天好吗？</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_tod">
         <!-- encouragements based on time of day -->
-    	<item>早上好！</item>
-    	<item>下午好！</item>
-    	<item>晚上好！</item>
-    	<item>昨晚？</item>
-    	<item>现在很早，来搞定一些事儿吧！</item>
-    	<item>去下午茶，好吗？</item>
-    	<item>好好享受这个夜晚！</item>
-    	<item>睡眠对您是有好处的，知道不！</item>
+        <item>早上好！</item>
+        <item>下午好！</item>
+        <item>晚上好！</item>
+        <item>昨晚？</item>
+        <item>现在很早，来搞定一些事儿吧！</item>
+        <item>去下午茶，好吗？</item>
+        <item>好好享受这个夜晚！</item>
+        <item>睡眠对您是有好处的，知道不！</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_completed">
         <!-- encouragements based on tasks completed (%d => completed) -->
-    	<item>您已经完成了 %d 项任务啦！</item>
-    	<item>生活评分：已经完成了 %d 项任务</item>
-    	<item>笑一笑呗！您已经完成了 %d 项任务啦！</item>
+        <item>您已经完成了 %d 项任务啦！</item>
+        <item>生活评分：已经完成了 %d 项任务</item>
+        <item>笑一笑呗！您已经完成了 %d 项任务啦！</item>
     </string-array>
-  	<string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet! Shall we?</string>
-        
+    <string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet!
+        Shall we?
+    </string>
+
     <string-array name="PPW_colors">
         <item>黑色</item>
         <item>白色</item>
         <item>蓝色</item>
         <item>半透明</item>
     </string-array>
-    
+
     <string name="PPW_widget_dlg_text">这种小工具只提供给 PowerPack 所有者呀！</string>
     <string name="PPW_widget_dlg_ok">预览</string>
-    
+
     <string name="PPW_demo_title1">%s 上的小工具将会放到这里</string>
     <string name="PPW_demo_title2">优化工具（Power Pack） 包含尊贵版小工具（Premium Widgets）……</string>
     <string name="PPW_demo_title3">……语音添加、感觉很棒！</string>
     <string name="PPW_demo_title4">轻点一下，了解更多！</string>
-    
+
     <string name="PPW_info_title">免费的优化工具 （Power Pack）！</string>
     <string name="PPW_info_signin">登录！</string>
     <string name="PPW_info_later">稍后</string>
@@ -3190,7 +3270,7 @@
     <string name="PPW_check_button">来免费获取 优化工具 （Power Pack）吧！</string>
     <string name="PPW_check_share_lists">来分享列表吧！</string>
     <string name="PPW_api_level">对不起！此工具只支持安桌3.0及以上版本。</string>
-    
+
     <string name="EPr_widget_enabled_title">允许／不允许小工具运行</string>
     <string name="PPW_restart_for_enabled_state">您也许需要重启您的手机来支持新设定的运行。</string>
 
diff --git a/astrid/res/values-zh-rTW/strings.xml b/astrid/res/values-zh-rTW/strings.xml
index 7e920d959..96b19c05f 100755
--- a/astrid/res/values-zh-rTW/strings.xml
+++ b/astrid/res/values-zh-rTW/strings.xml
@@ -4,1685 +4,1723 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ================================================== general terms == -->
-
-  <!-- People Editing Activity -->    
-  
-  <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
-  <string name="actfm_person_hint">聯絡人或電郵地址</string>
-  
-  <!-- task sharing dialog: shared with hint -->
-  <string name="actfm_person_or_tag_hint">聯絡人或已分享清單</string>
-
-  <!-- toast on transmit success -->
-
-  <!-- can\'t rename or delete shared tag message -->
-  
-  <!-- warning before deleting a list you\'re the owner of -->
-  <string name="actfm_tag_operation_owner_delete">你是這個被分享列表的擁有者，如果刪除它，其它被分享者將無法訪問，確定刪除嗎？</string>
-
-  <!-- slide 29a: menu item to take a picture -->
-  <string name="actfm_picture_camera">拍下照片</string>
-
-  <!-- slide 29b: menu item to select from gallery -->
-  <string name="actfm_picture_gallery">從圖庫選擇</string>
-  
-  <!-- menu item to clear picture selection -->
-  <string name="actfm_picture_clear">清除圖片</string>
-
-  <!-- filter list activity: refresh tags -->
-  
-  <!-- Title for prompt after sharing a task -->
-  <string name="actfm_view_task_title">檢視工作？</string>
-
-  <!-- Text for prompt after sharing a task -->
-  <string name="actfm_view_task_text">工作已被送到 %s！您目前正在查看自己的任務工作，你要查看你其餘被指派的工作嗎？</string>
-  
-  <!-- Ok button for task view prompt -->
-  <string name="actfm_view_task_ok">查看被指派的工作</string>
-      
-  <!-- Cancel button for task view prompt -->
-  <string name="actfm_view_task_cancel">留下來吧</string>
-  
-  <!-- slide 13a: Title for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_title">已分享任務工作</string>
-  
-  <!-- Empty list for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_empty">未有共享工作</string>
-  
-  <!-- =====================  Friendship connections -->
-  
-  <string name="actfm_friendship_pending">你已經寄了一個好友邀請給%s!</string>
-
-  <string name="actfm_friendship_blocked">你已經封鎖了%s!</string>
-
-  <string name="actfm_friendship_ignored">You\'ve ignored %s.</string>
-  
-  <string name="actfm_friendship_friends">你和%s!成為好友了！快給他們安排些工作吧！</string>
-
-  <string name="actfm_friendship_other_pending">%s!想和你成為好友！</string>
-
-  <string name="actfm_friendship_no_status">和%s!聯繫一下，分享並查看公開任務的活動！</string>
-
-  <string name="actfm_friendship_connect">新增好友</string>
-
-  <string name="actfm_friendship_accept">接受</string>
-
-  <!-- ================================================== TagViewActivity == -->  
-
-  <!-- Tag View Activity: Add Comment hint -->    
-  <string name="TVA_add_comment">添加評論</string>
-
-  <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->    
-  
-  <!-- Tabs for Tag view -->
-  <string-array name="TVA_tabs">
-    <!-- Tab for showing tasks -->
-    <item>工作</item>
-    <!-- Tab for showing comments & updates -->
-    <item>活動</item>
-    <!-- Tab for showing setting -->
-    <item>清單設定</item>
-  </string-array>
-  
-  <!-- Tag View: filtered by assigned to user (%s => user name) -->
-  <string name="actfm_TVA_filtered_by_assign">%s的工作，點擊以檢視所有</string>
-  
-  <!-- Tag View: filter by unassigned tasks -->
-  <string name="actfm_TVA_filter_by_unassigned">未指定的任務工作，點擊查看全部</string>
-
-  <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">點選這裡以編輯或分享此列表</string>
-
-  <!-- Tag View Menu: refresh -->
-  <string name="actfm_TVA_menu_refresh">重新整理</string>
-
-  <!-- Tag Settings: tag name label -->
-  <string name="actfm_TVA_tag_label">列表名稱：</string>
-
-  <!-- Tag Settings: tag owner label -->
-
-  <!-- Tag Settings: tag owner value when there is no owner -->
-
-  <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
-  <string name="actfm_TVA_members_label">合作者：</string>
-  
-  <!-- Tag Settings: list collaborators hint -->
-  <string name="actfm_TVA_members_hint">通過電子郵件分享</string>
-
-  <!-- Tag Settings: tag picture -->
-  <string name="actfm_TVA_tag_picture">清單圖片</string>
-
-  <!-- slide 25c/28b: Tag Settings: silence notifications label -->
-  <string name="actfm_TVA_silence_label">靜音提醒</string>
-  
-  <!-- Tag Settings: list icon label -->
-  
-  <!-- slide 25b/27d: Tag Settings: list description label -->
-  <string name="actfm_TVA_tag_description_label">描述</string>
-  
-  <!-- slide 28a: Tag Settings: list settings label -->
-  <string name="actfm_TVA_tag_settings_label">設定</string>
-
-  <!-- slide 25b: Tag Settings: list description hint -->
-  <string name="actfm_TVA_tag_description_hint">在這裡添加描述</string>
-  
-  <!-- slide 25d: Tag Settings: list name hint -->
-  <string name="actfm_TVA_tag_name_hint">添加列表名稱</string>
-  
-  <!-- Tag settings: login prompt from share-->
-  <string name="actfm_TVA_login_to_share">您需要登錄 Astrid.com 以共享清單！請登錄或把清單列為私密。</string>
-  
-      
-  <!-- ============================================ edit people dialog == -->
-
-  <!-- task sharing dialog: intro -->
-  <string name="actfm_EPA_intro">使用Astrid分享購物清單，派對計劃，或團隊項目。當其他人把事情做完就能立刻看到！</string>
-    
-  <!-- task sharing dialog: window title -->
-    
-  <!-- task sharing dialog: save button -->
-  
-  <!-- task sharing dialog: assigned label -->
-  
-  <!-- slide 18a: task sharing dialog: assigned label long version -->
-  <string name="actfm_EPA_assign_label_long">需要誰處理？</string>
-  
-  <!-- task sharing dialog: assigned to me -->
-  <string name="actfm_EPA_assign_me">我</string>
-  
-  <!-- task sharing dialog: anyone -->
-  <string name="actfm_EPA_unassigned">未分配</string>
-  
-  <!-- slide 18c: task sharing dialog: choose a contact -->
-  <string name="actfm_EPA_choose_contact">選擇聯繫人</string>
-  
-  <!-- task sharing dialog: custom email assignment -->
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_share_with">加入合作者：</string>
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_collaborators_header">Share</string>
-
-      <!-- task sharing dialog: collaborator list name (%s => name of list) -->
-  <string name="actfm_EPA_list">清單：%s</string>
-  
-  <!-- task sharing dialog: assigned hint -->
-  
-  <!-- task sharing dialog: message label text -->
-  <string name="actfm_EPA_message_text">邀請訊息：</string>
-  
-  <!-- task sharing dialog: message body -->
-  <string name="actfm_EPA_message_body">請幫我完成這分工作！</string>
-  
-  <!-- task sharing dialog: list members section header -->
-  <string name="actfm_EPA_assign_header_members">列表成員</string>
-
-  <!-- task sharing dialog: astrid friends section header -->
-  <string name="actfm_EPA_assign_header_friends">Astrid 好友</string>
-
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: share with Facebook -->
-  <string name="actfm_EPA_facebook">Facebook</string>
-  
-  <!-- task sharing dialog: share with Twitter -->
-  <string name="actfm_EPA_twitter">Twitter</string>
-
-  <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
-
-  <!-- task sharing dialog: edit people settings saved -->
-
-  <!-- task sharing dialog: invalid email (%s => email) -->
-  <string name="actfm_EPA_invalid_email">無效的電郵地址：%s</string>
-
-  <!-- task sharing dialog: tag not found (%s => tag) -->
-  
-  <!-- task sharing login prompt -->
-  <string name="actfm_EPA_login_to_share">你需要登陸Astrid.com來分享任務工作，請登陸網站或者保持私有。</string>
-  
-  <string name="actfm_EPA_login_button">登入</string>
-  
-  <string name="actfm_EPA_dont_share_button">不要分享</string>
-  
-  <string name="actfm_EPA_add_person_to_list_title">已被分配的工作</string>
-  
-  <string name="actfm_EPA_add_person_to_list">%1$s is not shared on this list. Would you like to add %2$s to this list?</string>
-
-  <string name="actfm_EPA_add_person_to_list_ok">加至清單</string>
-  
-  <string name="actfm_EPA_add_person_to_list_cancel">不要增加。</string>
-  
-  <string name="actfm_list_owner">(owner)</string>
-  
-  <!-- ========================================= sharing login activity == -->
-
-  <!-- share login: Title -->
-  <string name="actfm_ALA_title">嘿喲！歡迎來到 Astrid.com!</string>
-
-  <!-- share login: Sharing Description -->
-  <string name="actfm_ALA_body">Astrid.com讓你在線上存取你的工作表，與朋友分享或委派工作。</string>
-
-  <!-- share login: Sharing Login FB Prompt -->
-  <string name="actfm_ALA_fb_login">連接到Facebook賬戶</string>
-
-  <!-- share login: Sharing Login GG Prompt -->
-  <string name="actfm_ALA_gg_login">連接到Google賬戶</string>
-  
-  <!-- share login: Quickly log in as <%s -> email> -->
-  <string name="actfm_quick_login">Sign in: %s</string>
-
-  <!-- share login: Reject quick login -->
-  <string name="actfm_quick_login_reject">Not %s?</string>
-
-  <!-- share login: Name -->
-  <string name="actfm_ALA_firstname_label">名字</string>
-  
-  <!-- share login: Name -->
-  <string name="actfm_ALA_lastname_label">姓氏</string>
-
-  <!-- share login: Email -->
-  <string name="actfm_ALA_email_label">電郵地址</string>
-
-  <!-- share login: Username / Email -->
-
-  <!-- share login: Password -->
-  <string name="actfm_ALA_password_label">密碼</string>
-
-  <!-- share login: Sign Up Title -->
-  <string name="actfm_ALA_signup_title">註冊</string>
-
-  <!-- share login: Login Title -->
-  <string name="actfm_ALA_login_title">登錄</string>
-
-  <!-- share login: Google Auth title -->
-  <string name="actfm_GAA_title">選擇您要使用的Google帳戶：</string>
-
-  <!-- share login: OAUTH Login Prompt -->
-  <string name="actfm_OLA_prompt">連接至 Google：</string>
-  
-  <!-- Login error: user exists -->
-  <string name="actfm_ALA_error_user_exists">用戶已經存在，請直接登錄。</string>
-  
-  <!-- Login error: wrong password -->
-  <string name="actfm_ALA_error_wrong_password">對不起，密碼輸入不對，請再試一次。</string>
-  
-  <!-- Forgot password link -->
-  <string name="actfm_ALA_forgot_password">忘記密碼?</string>
-  
-  <!-- Forgot password email prompt -->
-  <string name="actfm_ALA_enter_email">請輸入你的電郵地址</string>
-  
-  <!-- Password reset sent (%s -> email) -->
-  <string name="actfm_ALA_reset_sent">密碼重設郵件已寄出至 %s</string>
-  
-  <!-- User already exists - first sync may be slow -->
-  <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your patience!</string>
-  
-  <!-- User not found -->
-  <string name="actfm_ALA_error_user_not_found">此郵件查無對應使用者。請試試另外註冊。</string>
-  
-  <!-- ================================================ Featured Lists -->
-
-  <string name="actfm_feat_list_clone">複製列表</string>
-  
-  <string name="actfm_feat_list_suffix">（複製）</string>
-
-  <string name="actfm_feat_list_cloning">正在復制...</string>
-
-  <string name="actfm_feat_list_clone_success">完成!</string>
-
-  <string name="actfm_feat_list_task_clone_success">任務工作已復制</string>
-
-  <string name="actfm_feat_list_clone_empty">無任務工作複製</string>
-  
-  <!-- ================================================ Synchronization == -->
-      
-  <!-- Indicates the logged in user name. %s -> user\'s name -->
-  <string name="actfm_status_title_logged_in">狀態——已使用 %s 帳戶登錄</string>    
-      
-  <!-- Preferences Title: Act.fm -->    
-  <string name="actfm_APr_header">Astrid.com （測試版！）</string>
-  
-  <string name="actfm_https_title">使用 HTTPS</string>
-  <string name="actfm_https_enabled">使用 HTTPS (緩慢)</string>
-  <string name="actfm_https_disabled">不使用 HTTPS (較快)</string>
-
-  <!-- title for notification tray after synchronizing -->
-  
-  <!-- text for notification when comments are received -->
-    
-  <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, 
-      Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page,
-      or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.  
-      Are you sure you want to sync with Astrid.com?</string>
-      
-  <!-- account types -->
-  <string name="actfm_account_type">帳號類型</string>
-  <string name="actfm_account_info">帳號信息</string>
-  <string name="actfm_account_info_summary">狀態和選項</string>
-  <string name="account_type_title_not_logged_in">註冊一個免費帳號</string>
-  <string name="account_type_summary_not_logged_in">進入在線任務工作，分享列表和指派任務工作</string>
-  
-  
-  <string name="actfm_account_premium">高級</string>
-  <string name="actfm_account_basic">一般</string>
-  
-  <string name="actfm_inapp_billing">升級成高級用戶</string>
-  <string name="actfm_inapp_billing_summary">附件，語音備份，高級支持和更多</string>
-  
-  <!-- Sharing -->
-  <string name="share_with_facebook">在Facebook贊一個</string>
-  <string name="share_with_twitter">在Twitter關注我們</string>
-  <string name="share_with_google">在Google+分享</string>
-  <string name="share_speech_bubble">通過分享，您將會幫助其他人生活得更加有效率！</string>
-  
-  
-  <!-- Sync upgrade messages -->
-  <string name="sync_upgr_both_title">Using Astrid.com + Google without Duplicates</string>
-  <string name="sync_upgr_both_body">Let\'s be honest. Google Tasks is convenient but not as cool as Astrid. To avoid duplicates you can no longer sync with Astrid.com and background sync with Google Tasks at the same time. You can still import your Google Tasks by visiting Settings → Backup &amp; Sync, or downgrade to Google Tasks only sync</string>
-  <string name="sync_upgr_both_btn1">Stick with Astrid</string>
-  <string name="sync_upgr_both_btn2">Downgrade to Google Tasks</string>
-  
-  <string name="sync_upgr_gtasks_only_title">Upgrade to Astrid Sync for Free!</string>
-  <string name="sync_upgr_gtasks_only_body">Access your tasks from all your devices and from Gmail with Astrid.com sync. Upgrade to Astrid.com Sync (you can always go back to Google Tasks - but you won\'t want to)!</string>
-  <string name="sync_upgr_gtasks_only_btn1">Upgrade to Astrid Sync</string>
-  <string name="sync_upgr_gtasks_only_btn2">Stick with Google Tasks</string>
-  
-  <string name="sync_upgr_neither_title">Free backup &amp; Sync!</string>
-  <string name="sync_upgr_neither_body">Don\'t put your to-dos at risk! New and improved Astrid sync to keep and access your tasks from anywhere.</string>
-  <string name="sync_upgr_neither_btn1">Sign up now</string>
-  
-  <string name="sync_upgr_logged_out">You have been logged out of Astrid</string>
-  
-  <string name="actfm_logout_clear_tasks_title">Clear data?</string>
-  <string name="actfm_logout_clear_tasks_body">Would you like to clear your tasks and lists?</string>
-  <string name="actfm_logout_clear_tasks_yes">Clear data</string>
-  <string name="actfm_logout_clear_tasks_no">Keep data</string>
-  
-  <string name="actfm_logged_in_different_user_title">Logging in as different user</string>
-  <string name="actfm_logged_in_different_user_body">Would you like to delete existing phone tasks before syncing?</string>
-  <string name="actfm_logged_in_different_user_keep_data">Keep data</string>
-  <string name="actfm_logged_in_different_user_clear_data">Clear all data</string>
-  <string name="actfm_logged_in_different_user_processing">Processing existing data...</string>
-  
-  <string name="actfm_tag_not_authorized_title">Not authorized</string>
-  <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name?</string>
-  <string name="actfm_tag_not_authorized_new_list">Create new list</string>
-  <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
-  
-  <string name="actfm_sync_ongoing">同步中...</string>
-  
-  <string name="EPr_reset_sync_state">Reset sync</string>
-  <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors</string>
-  <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue?</string>
-  
+<resources>
 
+    <!-- ================================================== general terms == -->
 
+    <!-- People Editing Activity -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
+    <string name="actfm_person_hint">聯絡人或電郵地址</string>
+
+    <!-- task sharing dialog: shared with hint -->
+    <string name="actfm_person_or_tag_hint">聯絡人或已分享清單</string>
+
+    <!-- toast on transmit success -->
+
+    <!-- can\'t rename or delete shared tag message -->
+
+    <!-- warning before deleting a list you\'re the owner of -->
+    <string name="actfm_tag_operation_owner_delete">你是這個被分享列表的擁有者，如果刪除它，其它被分享者將無法訪問，確定刪除嗎？</string>
+
+    <!-- slide 29a: menu item to take a picture -->
+    <string name="actfm_picture_camera">拍下照片</string>
+
+    <!-- slide 29b: menu item to select from gallery -->
+    <string name="actfm_picture_gallery">從圖庫選擇</string>
+
+    <!-- menu item to clear picture selection -->
+    <string name="actfm_picture_clear">清除圖片</string>
+
+    <!-- filter list activity: refresh tags -->
+
+    <!-- Title for prompt after sharing a task -->
+    <string name="actfm_view_task_title">檢視工作？</string>
+
+    <!-- Text for prompt after sharing a task -->
+    <string name="actfm_view_task_text">工作已被送到 %s！您目前正在查看自己的任務工作，你要查看你其餘被指派的工作嗎？</string>
+
+    <!-- Ok button for task view prompt -->
+    <string name="actfm_view_task_ok">查看被指派的工作</string>
+
+    <!-- Cancel button for task view prompt -->
+    <string name="actfm_view_task_cancel">留下來吧</string>
+
+    <!-- slide 13a: Title for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_title">已分享任務工作</string>
+
+    <!-- Empty list for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_empty">未有共享工作</string>
+
+    <!-- =====================  Friendship connections -->
+
+    <string name="actfm_friendship_pending">你已經寄了一個好友邀請給%s!</string>
+
+    <string name="actfm_friendship_blocked">你已經封鎖了%s!</string>
+
+    <string name="actfm_friendship_ignored">You\'ve ignored %s.</string>
+
+    <string name="actfm_friendship_friends">你和%s!成為好友了！快給他們安排些工作吧！</string>
+
+    <string name="actfm_friendship_other_pending">%s!想和你成為好友！</string>
+
+    <string name="actfm_friendship_no_status">和%s!聯繫一下，分享並查看公開任務的活動！</string>
+
+    <string name="actfm_friendship_connect">新增好友</string>
+
+    <string name="actfm_friendship_accept">接受</string>
+
+    <!-- ================================================== TagViewActivity == -->
+
+    <!-- Tag View Activity: Add Comment hint -->
+    <string name="TVA_add_comment">添加評論</string>
+
+    <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->
+
+    <!-- Tabs for Tag view -->
+    <string-array name="TVA_tabs">
+        <!-- Tab for showing tasks -->
+        <item>工作</item>
+        <!-- Tab for showing comments & updates -->
+        <item>活動</item>
+        <!-- Tab for showing setting -->
+        <item>清單設定</item>
+    </string-array>
+
+    <!-- Tag View: filtered by assigned to user (%s => user name) -->
+    <string name="actfm_TVA_filtered_by_assign">%s的工作，點擊以檢視所有</string>
+
+    <!-- Tag View: filter by unassigned tasks -->
+    <string name="actfm_TVA_filter_by_unassigned">未指定的任務工作，點擊查看全部</string>
+
+    <!-- Tag View: list is private, no members -->
+    <string name="actfm_TVA_no_members_alert">點選這裡以編輯或分享此列表</string>
+
+    <!-- Tag View Menu: refresh -->
+    <string name="actfm_TVA_menu_refresh">重新整理</string>
+
+    <!-- Tag Settings: tag name label -->
+    <string name="actfm_TVA_tag_label">列表名稱：</string>
+
+    <!-- Tag Settings: tag owner label -->
+
+    <!-- Tag Settings: tag owner value when there is no owner -->
+
+    <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
+    <string name="actfm_TVA_members_label">合作者：</string>
+
+    <!-- Tag Settings: list collaborators hint -->
+    <string name="actfm_TVA_members_hint">通過電子郵件分享</string>
+
+    <!-- Tag Settings: tag picture -->
+    <string name="actfm_TVA_tag_picture">清單圖片</string>
+
+    <!-- slide 25c/28b: Tag Settings: silence notifications label -->
+    <string name="actfm_TVA_silence_label">靜音提醒</string>
+
+    <!-- Tag Settings: list icon label -->
+
+    <!-- slide 25b/27d: Tag Settings: list description label -->
+    <string name="actfm_TVA_tag_description_label">描述</string>
+
+    <!-- slide 28a: Tag Settings: list settings label -->
+    <string name="actfm_TVA_tag_settings_label">設定</string>
+
+    <!-- slide 25b: Tag Settings: list description hint -->
+    <string name="actfm_TVA_tag_description_hint">在這裡添加描述</string>
+
+    <!-- slide 25d: Tag Settings: list name hint -->
+    <string name="actfm_TVA_tag_name_hint">添加列表名稱</string>
+
+    <!-- Tag settings: login prompt from share-->
+    <string name="actfm_TVA_login_to_share">您需要登錄 Astrid.com 以共享清單！請登錄或把清單列為私密。</string>
+
+
+    <!-- ============================================ edit people dialog == -->
+
+    <!-- task sharing dialog: intro -->
+    <string name="actfm_EPA_intro">使用Astrid分享購物清單，派對計劃，或團隊項目。當其他人把事情做完就能立刻看到！</string>
+
+    <!-- task sharing dialog: window title -->
+
+    <!-- task sharing dialog: save button -->
+
+    <!-- task sharing dialog: assigned label -->
+
+    <!-- slide 18a: task sharing dialog: assigned label long version -->
+    <string name="actfm_EPA_assign_label_long">需要誰處理？</string>
+
+    <!-- task sharing dialog: assigned to me -->
+    <string name="actfm_EPA_assign_me">我</string>
+
+    <!-- task sharing dialog: anyone -->
+    <string name="actfm_EPA_unassigned">未分配</string>
+
+    <!-- slide 18c: task sharing dialog: choose a contact -->
+    <string name="actfm_EPA_choose_contact">選擇聯繫人</string>
+
+    <!-- task sharing dialog: custom email assignment -->
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_share_with">加入合作者：</string>
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_collaborators_header">Share</string>
+
+    <!-- task sharing dialog: collaborator list name (%s => name of list) -->
+    <string name="actfm_EPA_list">清單：%s</string>
+
+    <!-- task sharing dialog: assigned hint -->
+
+    <!-- task sharing dialog: message label text -->
+    <string name="actfm_EPA_message_text">邀請訊息：</string>
+
+    <!-- task sharing dialog: message body -->
+    <string name="actfm_EPA_message_body">請幫我完成這分工作！</string>
+
+    <!-- task sharing dialog: list members section header -->
+    <string name="actfm_EPA_assign_header_members">列表成員</string>
+
+    <!-- task sharing dialog: astrid friends section header -->
+    <string name="actfm_EPA_assign_header_friends">Astrid 好友</string>
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: share with Facebook -->
+    <string name="actfm_EPA_facebook">Facebook</string>
+
+    <!-- task sharing dialog: share with Twitter -->
+    <string name="actfm_EPA_twitter">Twitter</string>
+
+    <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
+
+    <!-- task sharing dialog: edit people settings saved -->
+
+    <!-- task sharing dialog: invalid email (%s => email) -->
+    <string name="actfm_EPA_invalid_email">無效的電郵地址：%s</string>
+
+    <!-- task sharing dialog: tag not found (%s => tag) -->
+
+    <!-- task sharing login prompt -->
+    <string name="actfm_EPA_login_to_share">你需要登陸Astrid.com來分享任務工作，請登陸網站或者保持私有。</string>
+
+    <string name="actfm_EPA_login_button">登入</string>
+
+    <string name="actfm_EPA_dont_share_button">不要分享</string>
+
+    <string name="actfm_EPA_add_person_to_list_title">已被分配的工作</string>
+
+    <string name="actfm_EPA_add_person_to_list">%1$s is not shared on this list. Would you like to
+        add %2$s to this list?
+    </string>
+
+    <string name="actfm_EPA_add_person_to_list_ok">加至清單</string>
+
+    <string name="actfm_EPA_add_person_to_list_cancel">不要增加。</string>
+
+    <string name="actfm_list_owner">(owner)</string>
+
+    <!-- ========================================= sharing login activity == -->
+
+    <!-- share login: Title -->
+    <string name="actfm_ALA_title">嘿喲！歡迎來到 Astrid.com!</string>
+
+    <!-- share login: Sharing Description -->
+    <string name="actfm_ALA_body">Astrid.com讓你在線上存取你的工作表，與朋友分享或委派工作。</string>
+
+    <!-- share login: Sharing Login FB Prompt -->
+    <string name="actfm_ALA_fb_login">連接到Facebook賬戶</string>
+
+    <!-- share login: Sharing Login GG Prompt -->
+    <string name="actfm_ALA_gg_login">連接到Google賬戶</string>
+
+    <!-- share login: Quickly log in as <%s -> email> -->
+    <string name="actfm_quick_login">Sign in: %s</string>
+
+    <!-- share login: Reject quick login -->
+    <string name="actfm_quick_login_reject">Not %s?</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_firstname_label">名字</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_lastname_label">姓氏</string>
+
+    <!-- share login: Email -->
+    <string name="actfm_ALA_email_label">電郵地址</string>
+
+    <!-- share login: Username / Email -->
+
+    <!-- share login: Password -->
+    <string name="actfm_ALA_password_label">密碼</string>
+
+    <!-- share login: Sign Up Title -->
+    <string name="actfm_ALA_signup_title">註冊</string>
+
+    <!-- share login: Login Title -->
+    <string name="actfm_ALA_login_title">登錄</string>
+
+    <!-- share login: Google Auth title -->
+    <string name="actfm_GAA_title">選擇您要使用的Google帳戶：</string>
+
+    <!-- share login: OAUTH Login Prompt -->
+    <string name="actfm_OLA_prompt">連接至 Google：</string>
+
+    <!-- Login error: user exists -->
+    <string name="actfm_ALA_error_user_exists">用戶已經存在，請直接登錄。</string>
+
+    <!-- Login error: wrong password -->
+    <string name="actfm_ALA_error_wrong_password">對不起，密碼輸入不對，請再試一次。</string>
+
+    <!-- Forgot password link -->
+    <string name="actfm_ALA_forgot_password">忘記密碼?</string>
+
+    <!-- Forgot password email prompt -->
+    <string name="actfm_ALA_enter_email">請輸入你的電郵地址</string>
+
+    <!-- Password reset sent (%s -> email) -->
+    <string name="actfm_ALA_reset_sent">密碼重設郵件已寄出至 %s</string>
+
+    <!-- User already exists - first sync may be slow -->
+    <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your
+        patience!
+    </string>
+
+    <!-- User not found -->
+    <string name="actfm_ALA_error_user_not_found">此郵件查無對應使用者。請試試另外註冊。</string>
+
+    <!-- ================================================ Featured Lists -->
+
+    <string name="actfm_feat_list_clone">複製列表</string>
+
+    <string name="actfm_feat_list_suffix">（複製）</string>
+
+    <string name="actfm_feat_list_cloning">正在復制...</string>
+
+    <string name="actfm_feat_list_clone_success">完成!</string>
+
+    <string name="actfm_feat_list_task_clone_success">任務工作已復制</string>
+
+    <string name="actfm_feat_list_clone_empty">無任務工作複製</string>
+
+    <!-- ================================================ Synchronization == -->
+
+    <!-- Indicates the logged in user name. %s -> user\'s name -->
+    <string name="actfm_status_title_logged_in">狀態——已使用 %s 帳戶登錄</string>
+
+    <!-- Preferences Title: Act.fm -->
+    <string name="actfm_APr_header">Astrid.com （測試版！）</string>
+
+    <string name="actfm_https_title">使用 HTTPS</string>
+    <string name="actfm_https_enabled">使用 HTTPS (緩慢)</string>
+    <string name="actfm_https_disabled">不使用 HTTPS (較快)</string>
+
+    <!-- title for notification tray after synchronizing -->
+
+    <!-- text for notification when comments are received -->
+
+    <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid
+        duplicate tasks and other synchronization issues,
+        Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You
+        can still import tasks from Google Tasks from the Google Tasks settings page,
+        or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.
+        Are you sure you want to sync with Astrid.com?
+    </string>
+
+    <!-- account types -->
+    <string name="actfm_account_type">帳號類型</string>
+    <string name="actfm_account_info">帳號信息</string>
+    <string name="actfm_account_info_summary">狀態和選項</string>
+    <string name="account_type_title_not_logged_in">註冊一個免費帳號</string>
+    <string name="account_type_summary_not_logged_in">進入在線任務工作，分享列表和指派任務工作</string>
+
+
+    <string name="actfm_account_premium">高級</string>
+    <string name="actfm_account_basic">一般</string>
+
+    <string name="actfm_inapp_billing">升級成高級用戶</string>
+    <string name="actfm_inapp_billing_summary">附件，語音備份，高級支持和更多</string>
+
+    <!-- Sharing -->
+    <string name="share_with_facebook">在Facebook贊一個</string>
+    <string name="share_with_twitter">在Twitter關注我們</string>
+    <string name="share_with_google">在Google+分享</string>
+    <string name="share_speech_bubble">通過分享，您將會幫助其他人生活得更加有效率！</string>
+
+
+    <!-- Sync upgrade messages -->
+    <string name="sync_upgr_both_title">Using Astrid.com + Google without Duplicates</string>
+    <string name="sync_upgr_both_body">Let\'s be honest. Google Tasks is convenient but not as cool
+        as Astrid. To avoid duplicates you can no longer sync with Astrid.com and background sync
+        with Google Tasks at the same time. You can still import your Google Tasks by visiting
+        Settings → Backup &amp; Sync, or downgrade to Google Tasks only sync
+    </string>
+    <string name="sync_upgr_both_btn1">Stick with Astrid</string>
+    <string name="sync_upgr_both_btn2">Downgrade to Google Tasks</string>
+
+    <string name="sync_upgr_gtasks_only_title">Upgrade to Astrid Sync for Free!</string>
+    <string name="sync_upgr_gtasks_only_body">Access your tasks from all your devices and from Gmail
+        with Astrid.com sync. Upgrade to Astrid.com Sync (you can always go back to Google Tasks -
+        but you won\'t want to)!
+    </string>
+    <string name="sync_upgr_gtasks_only_btn1">Upgrade to Astrid Sync</string>
+    <string name="sync_upgr_gtasks_only_btn2">Stick with Google Tasks</string>
+
+    <string name="sync_upgr_neither_title">Free backup &amp; Sync!</string>
+    <string name="sync_upgr_neither_body">Don\'t put your to-dos at risk! New and improved Astrid
+        sync to keep and access your tasks from anywhere.
+    </string>
+    <string name="sync_upgr_neither_btn1">Sign up now</string>
+
+    <string name="sync_upgr_logged_out">You have been logged out of Astrid</string>
+
+    <string name="actfm_logout_clear_tasks_title">Clear data?</string>
+    <string name="actfm_logout_clear_tasks_body">Would you like to clear your tasks and lists?
+    </string>
+    <string name="actfm_logout_clear_tasks_yes">Clear data</string>
+    <string name="actfm_logout_clear_tasks_no">Keep data</string>
+
+    <string name="actfm_logged_in_different_user_title">Logging in as different user</string>
+    <string name="actfm_logged_in_different_user_body">Would you like to delete existing phone tasks
+        before syncing?
+    </string>
+    <string name="actfm_logged_in_different_user_keep_data">Keep data</string>
+    <string name="actfm_logged_in_different_user_clear_data">Clear all data</string>
+    <string name="actfm_logged_in_different_user_processing">Processing existing data...</string>
+
+    <string name="actfm_tag_not_authorized_title">Not authorized</string>
+    <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you
+        may have been removed). Would you like to create a new list with the same name?
+    </string>
+    <string name="actfm_tag_not_authorized_new_list">Create new list</string>
+    <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
+
+    <string name="actfm_sync_ongoing">同步中...</string>
+
+    <string name="EPr_reset_sync_state">Reset sync</string>
+    <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors
+    </string>
+    <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will
+        be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you
+        wish to continue?
+    </string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in timers plug-in -->
+
+    <!-- Task Edit Activity: Container Label -->
+    <string name="alarm_ACS_label">警示</string>
+
+    <!-- Task Edit Activity: Add New Alarm -->
+    <string name="alarm_ACS_button">加入警示</string>
+
+    <string-array name="reminders_alarm">
+        <!-- reminders related to alarm -->
+        <item>警示!</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in backup plug-in -->
+
+    <!-- ================================================= BackupPreferences == -->
+
+    <!-- slide 33c/48d: Backup Preferences Title -->
+    <string name="backup_BPr_header">備份</string>
+
+    <!-- slide 48e/50c: Backup: Status Header -->
+    <string name="backup_BPr_group_status">狀態</string>
+
+    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->
+    <string name="backup_status_success">上次備份:\n%s</string>
+    <!-- Backup Status: last error failed. Keep it short! -->
+    <string name="backup_status_failed">上次備份失敗</string>
+    <!-- Backup Status: error subtitle -->
+    <string name="backup_status_failed_subtitle">(點選查看錯誤)</string>
+    <!-- slide 48a: Backup Status: never backed up -->
+    <string name="backup_status_never">從未備份</string>
+
+    <!-- slide 48f/ 50e: Backup Options Group Label -->
+    <string name="backup_BPr_group_options">選項</string>
+
+    <!-- slide 48b: Preference: Automatic Backup Title -->
+    <string name="backup_BPr_auto_title">自動備份</string>
+    <!-- Preference: Automatic Backup Description (when disabled) -->
+    <string name="backup_BPr_auto_disabled">停用自動備份</string>
+    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
+    <string name="backup_BPr_auto_enabled">備份將每天執行</string>
+
+    <!-- Preference screen restoring Tasks Help -->
+    <!-- Preference screen Restoring Tasks Help Dialog Text-->
+
+    <string name="backup_BPr_cloud_already_logged_in">您已經在Astrid.com上享有云備份</string>
+
+    <!-- ================================================= BackupActivity == -->
+
+    <!-- slide 48c: backup activity label -->
+    <string name="backup_BAc_label">管理備份</string>
+
+    <!-- backup activity title -->
+    <string name="backup_BAc_title">管理備份</string>
+
+    <!-- backup activity import button -->
+    <string name="backup_BAc_import">匯入工作</string>
+
+    <!-- backup activity export button -->
+    <string name="backup_BAc_export">匯出工作</string>
+
+    <!-- backup activity cloud (Astrid.com) option -->
+    <string name="backup_BAc_cloud">在Astrid.com點擊免費云備份</string>
+
+    <!-- ============================================== Importer / Exporter == -->
+
+    <!-- Message displayed when error occurs -->
+    <string name="backup_TXI_error">匯入錯誤</string>
+
+    <string name="export_toast">備份 %1$s 至 %2$s.</string>
+
+    <string name="export_toast_no_tasks">沒有工作需匯出</string>
+
+    <!-- Progress Dialog Title for exporting -->
+    <string name="export_progress_title">匯出中...</string>
+
+    <!-- Backup: Title of Import Summary Dialog -->
+    <string name="import_summary_title">還原摘要</string>
+
+    <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
+    <string name="import_summary_message">檔案 %1$s 已包含 %2$s.\n\n %3$s 已匯入,\n %4$s 已存在\n %5$s 有問題\n
+    </string>
+
+    <!-- Progress Dialog Title for importing -->
+    <string name="import_progress_title">匯入中...</string>
+
+    <!-- Progress Dialog text for import reading task (%d -> task number)-->
+    <string name="import_progress_read">讀取工作 %d...</string>
+
+    <!-- Backup: Dialog when unable to open a file -->
+
+    <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
+    <string name="DLG_error_sdcard">無法開啟資料夾: %s</string>
+
+    <!-- Backup: Dialog when unable to open SD card in general -->
+    <string name="DLG_error_sdcard_general">無法存取您的SD卡!</string>
+
+    <!-- Backup: File Selector dialog for import -->
+    <string name="import_file_prompt">選取欲還原的檔案</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- ================================================== AndroidManifest == -->
+
+    <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
+    <string name="app_name">Astrid工作</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="read_permission_label">Astrid 權限</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="read_permission_desc">讀取工作, 顯示工作篩選</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="write_permission_label">Astrid 權限</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="write_permission_desc">建立新工作, 修改現行工作</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- question for deleting tasks -->
+    <string name="DLG_delete_this_task_question">確認刪除?</string>
+
+    <!-- question for deleting items (%s => item name) -->
+    <string name="DLG_delete_this_item_question">刪除此項目: %s?</string>
+
+    <!-- Progress dialog shown when upgrading -->
+    <string name="DLG_upgrading">升級您的工作...</string>
+
+    <!-- Title for dialog selecting a time (hours and minutes) -->
+    <string name="DLG_hour_minutes">時間 (小時:分鐘)</string>
+
+    <!-- Dialog for Astrid having a critical update -->
+    <string name="DLG_please_update">Astrid 應該要從Android 市場下載最新版本! 請繼續前執行, 或稍等片刻。</string>
+
+    <!-- Button for going to Market -->
+
+    <!-- Button for accepting EULA -->
+    <string name="DLG_accept">接受</string>
+
+    <!-- Button for declining EULA -->
+    <string name="DLG_decline">不接受</string>
+
+    <!-- EULA title -->
+    <string name="DLG_eula_title">Astrid 使用條款</string>
+
+    <!-- Progress Dialog generic text -->
+    <string name="DLG_please_wait">請稍候</string>
+
+    <!-- Dialog - loading -->
+    <string name="DLG_loading">載入中...</string>
+
+    <!-- Dialog - dismiss -->
+
+    <!-- slide 20d -->
+    <string name="DLG_ok">確定(O)</string>
+    <!-- slide 36g -->
+    <string name="DLG_cancel">取消</string>
+
+    <string name="DLG_more">更多</string>
+
+    <string name="DLG_undo">撤消</string>
+
+    <string name="DLG_warning">系統提醒</string>
+
+    <!-- =============================================================== UI == -->
+
+    <!-- Label for DateButtons with no value -->
+    <string name="WID_dateButtonUnset">點選</string>
+
+    <!-- String formatter for DateButtons ($D => date, $T => time) -->
+
+    <!-- String formatter for Disable button -->
+
+    <!--  ============================================================= notes -->
+
+    <!-- Note Exposer -->
+
+    <!-- Note Exposer / Comments -->
+
+    <!-- EditNoteActivity - no comments -->
+    <string name="ENA_no_comments">沒有要顯示的</string>
+
+    <!-- EditNoteActivity - no username for comment -->
+    <string name="ENA_no_user">某人</string>
+
+    <!-- EditNoteActivity - refresh comments -->
+    <string name="ENA_refresh_comments">刷新留言</string>
+
+    <!-- ================================================= TaskListActivity == -->
+
+    <!-- slide 8b: Task List: Displayed instead of list when no items present -->
+    <string name="TLA_no_items">無工作!</string>
+
+    <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->
+    <string name="TLA_no_items_person">%s 沒有 \n與您分享的任務工作</string>
+
+    <!-- Menu: Adjust Sort and Hidden Task Settings -->
+    <string name="TLA_menu_sort">Sort</string>
+
+    <!-- Menu: Sync Now -->
+    <string name="TLA_menu_sync">立即同步</string>
+
+    <!-- Menu: Search -->
+    <string name="TLA_menu_search">搜索</string>
+
+    <!-- Menu: Tasks -->
+    <string name="TLA_menu_lists">列表</string>
+
+    <!-- Menu: Friends -->
+    <string name="TLA_menu_friends">朋友</string>
+
+    <!-- Menu: Featured Lists -->
+    <string name="TLA_menu_featured_lists">特定列表</string>
+
+    <!-- Menu: Suggestions -->
+    <string name="TLA_menu_suggestions">建議</string>
+
+    <!-- Menu: Tutorial -->
+
+    <!-- Menu: Settings -->
+    <string name="TLA_menu_settings">設定</string>
+
+    <!-- slide 30b: Menu: Support -->
+    <string name="TLA_menu_support">支持</string>
+
+    <!-- Search Label-->
+
+    <!-- Window title for displaying Custom Filter -->
+    <string name="TLA_custom">自訂</string>
+
+    <!-- slide 8d: Quick Add Edit Box Hint-->
+    <string name="TLA_quick_add_hint">添加任務工作</string>
+
+    <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
+    <string name="TLA_quick_add_hint_assign">為 %s 增加任務工作</string>
+
+    <!-- Notification Volumne notification-->
+    <string name="TLA_notification_volume_low">已靜音。你不會再聽到了！</string>
+
+    <!-- Notifications disabled warning -->
+    <string name="TLA_notification_disabled">Astrid提醒功能被關閉，你不會收到任何提醒。</string>
+
+    <string-array name="TLA_filters">
+        <item>激活</item>
+        <item>今天</item>
+        <item>馬上</item>
+        <item>延遲</item>
+        <item>完成</item>
+        <item>編輯工作</item>
+    </string-array>
+
+    <!-- Title for confirmation dialog after quick add markup -->
+    <string name="TLA_quickadd_confirm_title">你說: \"%s\"</string>
+
+    <!-- Text for speech bubble in dialog after quick add markup -->
+    <!-- First string is task title, second is due date, third is priority -->
+    <string name="TLA_quickadd_confirm_speech_bubble">我建立的「%1$s」%3$s 將於 %2$s 到期</string>
+
+    <string name="TLA_quickadd_confirm_speech_bubble_date">為 %s</string>
+
+    <string name="TLA_quickadd_confirm_hide_helpers">不再詢問確認</string>
+
+
+    <!-- Title for alert on new repeating task. %s-> task title -->
+    <string name="TLA_repeat_scheduled_title">新的重複任務工作 %s</string>
+
+    <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
+    <string name="TLA_repeat_scheduled_speech_bubble">我會在%s 後提醒您這個任務工作的。</string>
+
+    <string-array name="TLA_priority_strings">
+        <item>最優先</item>
+        <item>優先</item>
+        <item>普通</item>
+        <item>低優先權</item>
+    </string-array>
+    <!-- slide 22a -->
+    <string name="TLA_all_activity">所有活動</string>
+
+    <!-- ====================================================== TaskAdapter == -->
+
+    <!-- Format string to indicate task is hidden (%s => task name) -->
+    <string name="TAd_hiddenFormat">%s [隱藏]</string>
+
+    <!-- Format string to indicate task is deleted (%s => task name) -->
+    <string name="TAd_deletedFormat">%s [刪除]</string>
+
+    <!-- Displayed when adapter is flung (scrolled quickly) -->
+
+    <!-- slide 22b: indicates task was completed. %s => date or time ago -->
+    <string name="TAd_completed">%s\n完成</string>
+
+    <!-- slide 15a: Action Button: edit task -->
+    <string name="TAd_actionEditTask">編輯</string>
+
+    <!-- Context Item: edit task -->
+    <string name="TAd_contextEditTask">編輯工作</string>
+
+    <!-- Context Item: copy task -->
+    <string name="TAd_contextCopyTask">複製任務工作</string>
+
+    <!-- Context Item: delete task -->
+    <string name="TAd_contextDeleteTask">刪除任務工作</string>
+
+    <!-- Context Item: undelete task -->
+    <string name="TAd_contextUndeleteTask">還原工作刪除</string>
+
+    <!-- Context Item: purge task -->
+    <string name="TAd_contextPurgeTask">清除工作</string>
+
+    <!-- ============================================== SortSelectionDialog == -->
+
+    <!-- slide 23a: Sort Selection: dialog title -->
+    <string name="SSD_title">排序和隱藏工作</string>
+
+    <!-- slide 23h:  Hidden: title -->
+    <string name="SSD_hidden_title">隱藏任務工作</string>
+
+    <!-- Hidden Task Selection: show completed tasks -->
+    <string name="SSD_completed">顯示已完成工作</string>
+
+    <!-- Hidden Task Selection: show hidden tasks -->
+    <string name="SSD_hidden">顯示隱藏的工作</string>
+
+    <!-- Hidden Task Selection: show deleted tasks -->
+    <string name="SSD_deleted">顯示已刪除工作</string>
+
+    <!-- Sort Selection: drag with subtasks -->
+    <string name="SSD_sort_drag">Manual order with subtasks</string>
+
+    <!-- slide 23b: Sort Selection: smart sort -->
+    <string name="SSD_sort_auto">Astrid智慧排序</string>
+
+    <!-- slide 23e: Sort Selection: sort by alpha -->
+    <string name="SSD_sort_alpha">依主旨</string>
+
+    <!-- slide 23c: Sort Selection: sort by due date -->
+    <string name="SSD_sort_due">依到期日</string>
+
+    <!-- slide 23d: Sort Selection: sort by importance -->
+    <string name="SSD_sort_importance">By priority</string>
+
+    <!-- slide 23f: Sort Selection: sort by modified date -->
+    <string name="SSD_sort_modified">依最後修改</string>
+
+    <!-- slide 23g: Sort Selection: reverse -->
+    <string name="SSD_sort_reverse">反向排序</string>
+
+    <!-- slide 23j: Sort Button: sort temporarily -->
+    <string name="SSD_save_temp">僅一次</string>
+
+    <!-- slide 23i: Sort Button: sort permanently -->
+    <string name="SSD_save_always">總是</string>
+
+    <!-- =============================================== FilterListActivity == -->
+
+    <!-- Astrid Filter Shortcut -->
+    <string name="FSA_label">Astrid 列表或過濾器</string>
+
+    <!-- Filter List Activity Title -->
+
+    <!-- Displayed when loading filters -->
+
+    <!-- Context Menu: Create Shortcut -->
+    <string name="FLA_context_shortcut">在桌面建立捷徑</string>
+
+    <!-- Menu: Search -->
+
+    <!-- Menu: Help -->
+
+    <!-- slide 28c: Create Shortcut Dialog Title -->
+    <string name="FLA_shortcut_dialog_title">建立捷徑</string>
+
+    <!-- Create Shortcut Dialog (asks to name shortcut) -->
+    <string name="FLA_shortcut_dialog">捷徑名稱</string>
+
+    <!-- Search Hint-->
+    <string name="FLA_search_hint">工作搜尋</string>
+
+    <!-- Search Filter name (%s => query) -->
+    <string name="FLA_search_filter">比對 \'%s\'</string>
+
+    <!-- Toast: created shortcut (%s => label) -->
+    <string name="FLA_toast_onCreateShortcut">建立捷徑: %s</string>
+
+    <!-- Menu: new filter -->
+    <string name="FLA_new_filter">新建過濾器</string>
+
+    <!-- slide 10e: Button: new list -->
+    <string name="FLA_new_list">新建列表</string>
+
+    <!-- Alert when creating a shortcut without selecting a filter -->
+    <string name="FLA_no_filter_selected">還沒有選定過濾器呢！請選擇一個過濾器或列表唄。</string>
+
+    <!-- ================================================= TaskEditActivity == -->
+
+    <!-- Title when editing a task (%s => task title) -->
+
+    <!-- Title when creating a new task -->
+
+    <!-- Task title label -->
+
+    <!-- Task when label -->
+    <string name="TEA_when_header_label">時間</string>
+
+    <!-- Task title hint (displayed when edit box is empty) -->
+    <string name="TEA_title_hint">Task name</string>
+
+    <!-- Task importance label -->
+    <string name="TEA_importance_label">Priority</string>
+
+    <!-- Task due date hint -->
+    <string name="TEA_deadline_hint">Set due date</string>
+
+    <!-- Task assigned to string (%s -> assigned person name) -->
+    <string name="TEA_assigned_to">Assigned to %s</string>
+
+    <!-- Task urgency specific time checkbox -->
+    <string name="TEA_urgency_specific_time">指定時間?</string>
+
+    <!-- Task urgency specific time title when specific time false -->
+    <string name="TEA_urgency_none">無</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_label">Hide until</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_display">Hide until %s</string>
+
+    <!-- Task hide until toast -->
+    <string name="TEA_hideUntil_message">任務工作將會被隱藏，直到 %s</string>
+
+    <!-- Task editing data being loaded label -->
+    <string-array name="TEA_loading">
+        <item>載入中...</item>
+    </string-array>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_note_label">描述</string>
+
+    <!-- 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">要花多久時間?</string>
+
+    <!-- Elapsed time label -->
+    <string name="TEA_elapsedDuration_label">已經用掉的時間</string>
+
+    <!-- Menu: Save -->
+    <string name="TEA_menu_save">儲存變更</string>
+
+    <!-- Menu: Don\'t Save -->
+    <string name="TEA_menu_discard">不要儲存</string>
+
+    <!-- Menu: Delete Task -->
+    <string name="TEA_menu_delete">刪除工作</string>
+
+    <!-- Menu: Task comments -->
+    <string name="TEA_menu_refresh_comments">Refresh comments</string>
+
+    <string name="TEA_menu_comments">註釋</string>
+
+    <!-- Toast: task saved with deadline (%s => preposition + time units) -->
+    <string name="TEA_onTaskSave_due">工作已儲存: %s 到期</string>
+
+    <!-- Toast: task saved without deadlines -->
+    <string name="TEA_onTaskSave_notDue">工作已儲存</string>
+
+    <!-- Toast: task was not saved -->
+
+    <!-- Toast: task was deleted -->
+
+    <!-- slide 15b: Task edit tab: activity -->
+    <string name="TEA_tab_activity">活動</string>
+
+    <!-- slide 15e:  Task edit tab: more editing settings -->
+    <string name="TEA_tab_more">更多</string>
+
+    <!-- slide 15d: Task edit tab: web services -->
+    <string name="TEA_tab_web">建議</string>
+
+    <string name="TEA_timer_est">Est. %s</string>
+
+    <string name="TEA_timer_elap">Elapsed %s</string>
+
+    <string-array name="TEA_urgency">
+        <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
+        <item>No date</item>
+        <item>指定哪天</item>
+        <item>今天</item>
+        <item>明天</item>
+        <item>(天之後)</item>
+        <item>下週</item>
+        <item>兩週之內</item>
+        <item>下個月</item>
+    </string-array>
+
+    <string name="TEA_no_time">沒有時間</string>
+
+    <string-array name="TEA_hideUntil">
+        <!-- hideUntil: labels for edit page. -->
+        <item>Never</item>
+        <item>Due date</item>
+        <item>Due time</item>
+        <item>Day before due</item>
+        <item>Week before due</item>
+        <item>指定日期/時間</item>
+    </string-array>
+
+    <!-- Task edit control set descriptors -->
+
+    <!-- slide 9b/35i -->
+    <string name="TEA_control_who">人物</string>
+
+    <!-- slide 9c/ 35a -->
+    <string name="TEA_control_when">時間</string>
+    <!-- slide 35b -->
+    <string name="TEA_control_more_section">----詳情----</string>
+    <!-- slide 16a/35c -->
+    <string name="TEA_control_importance">Priority</string>
+    <!-- slide 16b/35d -->
+    <string name="TEA_control_lists">列表</string>
+    <!-- slide 16c/35e -->
+    <string name="TEA_control_notes">描述</string>
+
+    <string name="TEA_control_files">文件</string>
+
+    <!-- slide 16e / slide 35g-->
+    <string name="TEA_control_reminders">提醒</string>
+
+    <!-- slide 16f -->
+    <string name="TEA_control_timer">定時器控件</string>
+
+    <string name="TEA_control_hidden_section">----始終隱藏----</string>
+
+    <string name="hide_until_prompt">在我的列表中顯示</string>
+
+    <!-- Add Ons tab when no add-ons found -->
+
+    <!-- Add Ons button -->
+
+    <!-- More row -->
+
+    <!-- slide 15c: Text when no activity to show -->
+    <string name="TEA_no_activity">無活動</string>
+
+    <!-- Text to load more activity -->
+    <string name="TEA_load_more">加載更多……</string>
+
+    <!-- When controls dialog -->
+    <string name="TEA_when_dialog_title">這項活動定在什麼時候呀？</string>
+
+
+    <string name="TEA_new_task">新建任務工作</string>
+
+    <string name="WSV_click_to_load">拍拍我，讓我搜索一下完成這項任務工作的各種方法！</string>
+
+    <string name="WSV_not_online">連上互聯網後我可以做更多事情。請檢查一下您的網絡連接唄。</string>
+
+    <string name="TEA_contact_error">不好意思！我們找不到所選聯繫人的電子郵件地址喔。</string>
+
+    <!-- ============================================= IntroductionActivity == -->
+
+    <!-- slide 1a: Introduction Window title -->
+
+    <!-- Button to agree to EULA -->
+
+    <!-- Button to disagree with EULA -->
+
+    <!-- ===================================================== MissedCallActivity == -->
+
+    <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
+    <string name="MCA_title">%1$s\n在 %2$s 給您打過電話</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_return_call">現在回電</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_add_task">稍後回電</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_ignore">忽略</string>
+
+    <!-- Missed call: dialog to ignore all missed calls title -->
+    <string name="MCA_ignore_title">忽略所有未接電話嗎？</string>
+
+    <!-- Missed call: dialog to ignore all missed calls body -->
+    <string name="MCA_ignore_body">您已經忽略了幾個未接電話。對於這些電話，Astrid 是否應該不再詢問您呢？</string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore all button -->
+    <string name="MCA_ignore_all">忽略所有來電</string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
+    <string name="MCA_ignore_this">只忽略這個來電</string>
+
+    <!-- Missed call: preference title -->
+    <string name="MCA_missed_calls_pref_title">及時回复未接電話</string>
+
+    <!-- slide 49c: Missed call: preference description -->
+    <string name="MCA_missed_calls_pref_desc_enabled">Astrid 會向您報告未接電話，還會提供回電的提醒</string>
+    <string name="MCA_missed_calls_pref_desc_disabled">Astrid 將不會向您報告未接電話</string>
+
+    <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
+    <string name="MCA_task_title_name">請回電給 %1$s，電話是 %2$s</string>
+
+    <!-- Missed call: task title no name (%s -> number)-->
+    <string name="MCA_task_title_no_name">請回電給 %s</string>
+
+    <!-- Missed call: schedule dialog title (%s -> name or number)-->
+    <string name="MCA_schedule_dialog_title">請給 %s 回個電話過去……</string>
+
+    <!-- Missed call speech bubble options -->
+    <string-array name="MCA_dialog_speech_options">
+        <item>您這麼人見人愛、花見花開，感覺肯定棒極了！</item>
+        <item>哇！個個都喜歡您咽！</item>
+        <item>回個電話吧，好讓他們高興一整天！</item>
+        <item>人家給您回電話，您肯定高興，不是嗎？</item>
+        <item>您是可以回電的！</item>
+        <item>無論怎樣，您也可以發條短信呀……</item>
+    </string-array>
+
+
+    <!-- ======================================= Calendar reminder activity == -->
+
+    <!-- Calendar remindeer ignore button -->
+    <string name="CRA_ignore">忽略</string>
+
+    <!-- Calendar event -->
+    <string name="CRA_title">需要一個會議列表嗎？</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls title -->
+    <string name="CRA_ignore_title">要忽略所有月曆上的事件嗎？</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls body -->
+    <string name="CRA_ignore_body">您已經忽略了好幾個月曆上的事件， 之後 Astrid 是不是不要再詢問您了呢？</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
+    <string name="CRA_ignore_all">要忽略所有的事件嗎？</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
+    <string name="CRA_ignore_this">只忽略這個事件</string>
+
+    <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
+    <string name="CRA_speech_bubble_start">看來%s很快就會開始進行。您想要為行動事項建立一個新的列表嗎？</string>
+
+    <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
+    <string name="CRA_speech_bubble_end">看來你才剛剛結束%s。您想要為行動事項建立一個新的列表嗎？</string>
+
+    <!-- Calendar reminder: create list button -->
+    <string name="CRA_create_list">新增清單</string>
+
+    <!-- Calendar reminder: postpone button -->
+    <string name="CRA_postpone">也許等下再說吧。</string>
+
+    <!-- Calendar reminder: list exists dialog title -->
+    <string name="CRA_list_exists_title">此列表已經存在</string>
+
+    <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
+    <string name="CRA_list_exists_body">有個叫%s的列表已經存在喔！您希望要用這個已經存在的列表還是為這個事件建立一個新的？</string>
+
+    <!-- Calendar reminder: list exists dialog create new button -->
+    <string name="CRA_create_new">新增</string>
+
+    <!-- Calendar reminder: list exists dialog use existing button -->
+    <string name="CRA_use_existing">就用原來的。</string>
+
+    <!-- Calendar remindr: created list (%s -> list name) -->
+    <string name="CRA_created_list_dialog">我建立了一個列表%s</string>
+
+    <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
+    <string name="CRA_one_attendee">%s會出席</string>
+
+    <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
+    <string name="CRA_two_attendees">%1$s和%2$s會出席</string>
+
+    <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
+    <string name="CRA_many_attendees">%1$s, %2$s, 還有 %3$d 等等其他人會出席</string>
+
+    <!-- Calendar reminder: invitation prompt -->
+    <string name="CRA_invitation_prompt">您想要邀請他們嗎？</string>
+
+    <!-- Calendar reminder: preference title -->
+    <string name="CRA_calendar_reminders_pref_title">月曆小助理</string>
+
+    <!-- Calendar reminder: pref description disabled -->
+    <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid不會提醒您關於月曆上將要到來的事件</string>
+
+    <!-- Calendar reminder: pref description enabled -->
+    <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid會提醒您關於月曆上將要到來的事件，並且會提示您做好準備。
+    </string>
+
+    <!-- Calendar reminder: share list title -->
+    <string name="CRA_share_list_title">分享此列表？</string>
+
+    <string name="CRA_invite_attendees">邀請出席者</string>
+
+    <string name="CRA_more_options">更多選項</string>
+
+    <string name="CRA_dont_invite">不了，謝啦！</string>
+
+    <!-- Calendar reminder: share list title when no other attendees exist-->
+    <string name="CRA_list_created_title">列表建立了！</string>
+
+    <!-- Calendar reminder: default new list name (%s -> event title) -->
+    <string name="CRA_default_list_name">行動事項：%s</string>
+
+    <!-- ===================================================== HelpActivity == -->
+
+    <!-- Help: Button to get support from our website -->
+
+    <!-- ==================================================== UpdateService == -->
+
+    <!-- Changelog Window Title -->
+    <string name="UpS_changelog_title">Astrid 有哪些最新消息?</string>
+
+    <!-- Updates Window Title -->
+    <string name="UpS_updates_title">Astrid 最新消息</string>
+
+    <!-- Updats No Activity to show for offline users -->
+    <string name="UpS_no_activity_log_in">登錄查看記錄 \n看看您的活動的進展情況 \n以及在各分享列表上的活動。</string>
+
+    <!-- ================================================== EditPreferences == -->
+
+    <!-- slide 31g: Preference Window Title -->
+    <string name="EPr_title">Astrid: 偏好</string>
+
+    <string name="EPr_share_astrid">Share Astrid</string>
+
+    <string name="EPr_share_astrid_summary">在您喜歡的社交網站上分享Astrid</string>
+
+    <!-- slide 46a -->
+    <string name="EPr_deactivated">禁用</string>
+
+    <!-- slide 30i: Preference Category: Appearance Title -->
+    <string name="EPr_appearance_header">外觀</string>
+
+    <!-- Preference Category: Appearance Summary -->
+    <string name="EPr_appearance_summary">主題，小工具，任務工作欄，編輯屏幕列表</string>
+
+    <!-- FAQ Preference title -->
+    <string name="EPr_faq_title">常見問題</string>
+
+    <!-- Account status preference (%s -> account type) -->
+    <string name="EPr_account_title">帳號：%s</string>
+
+    <!-- Support preferences summary -->
+    <string name="EPr_support_summary">指引，常見問題，關於我們</string>
+
+    <!-- slide 34a: Preference: Task List Font Size Title -->
+    <string name="EPr_fontSize_title">工作清單大小</string>
+
+    <!-- Preference: Filters to show pref screen title -->
+    <string name="EPr_filters_to_show_title">Filters to show</string>
+
+    <!-- slide 32a: Preference: Show confirmation for smart reminders -->
+    <string name="EPr_showSmartConfirmation_title">在智能提示上顯示確認消息</string>
+
+    <!-- slide 34g: Preference: Task List Font Size Description -->
+    <string name="EPr_fontSize_desc">清單主頁面字型大小</string>
+
+    <!-- Preferemce: Show task edit confirmation toasts -->
+
+    <!-- slide 34c: Preference: Task List Show Notes -->
+    <string name="EPr_showNotes_title">Show description in task</string>
+
+    <!-- Edit screen preference category -->
+    <string name="EPr_edit_screen_options">Edit screen options</string>
 
-    
-    <!-- Resources for built-in timers plug-in -->
-    
-    <!-- Task Edit Activity: Container Label -->
-    <string name="alarm_ACS_label">警示</string>
-    
-    <!-- Task Edit Activity: Add New Alarm -->
-    <string name="alarm_ACS_button">加入警示</string>
-    
-    <string-array name="reminders_alarm">
-      <!-- reminders related to alarm -->
-      <item>警示!</item>
+    <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
+    <string name="EPr_beastMode_title">Edit screen order</string>
+
+    <string name="EPr_beastMode_shortcut">Customize</string>
+
+    <string name="EPr_time_increment">5 minute increments</string>
+
+    <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
+
+    <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
+
+    <!-- slide 35h -->
+    <string name="EPr_beastMode_desc">自定義設定菜單屏幕</string>
+    <!-- slide 35j -->
+    <string name="EPr_beastMode_reset">恢復默認值</string>
+
+    <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on
+        each row
+    </string>
+
+    <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
+    <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit
+        screen
+    </string>
+    <!-- Preference: Task List Show Notes Description (enabled) -->
+    <string name="EPr_showNotes_desc_enabled">Description will always be displayed</string>
+
+    <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
+    <string name="EPr_compressTaskRows_title">壓縮任務工作排列</string>
+    <!-- slide 34j -->
+    <string name="EPr_compressTaskRows_desc">壓縮任務工作行，使它適應標題</string>
+
+    <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
+    <!-- slide 34k-->
+
+    <!-- slide 34b: Preferences: Wrap task titles to two lines -->
+    <string name="EPr_fullTask_title">顯示完整的任務工作標題</string>
+    <string name="EPr_fullTask_desc_enabled">將顯示完整的任務工作標題</string>
+    <!-- slide 34h -->
+    <string name="EPr_fullTask_desc_disabled">將顯示任務工作標題的頭兩行</string>
+
+    <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
+    <string name="EPr_ideaAuto_title">自動加載意見選項標籤</string>
+    <!-- slide 32c -->
+    <string name="EPr_ideaAuto_desc_enabled">點擊標籤後，網頁將會搜索意見選項。</string>
+    <string name="EPr_ideaAuto_desc_disabled">只有手動請求後，網頁將會搜索意見選項。</string>
+
+    <!-- Preferences: task row style -->
+    <string-array name="EPr_task_row_styles">
+        <item>Original</item>
+        <item>Simple</item>
+        <item>Title only</item>
     </string-array>
-    
 
+    <string-array name="EPr_task_row_style_descriptions">
+        <item>截取標題至兩行，並在右邊顯示日期</item>
+        <item>截取標題為一行，並在下方顯示日期和列表</item>
+        <item>Single line title only</item>
+    </string-array>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- task row style title (%s -> style) -->
+    <string name="EPr_task_row_style_title">Row style: %s</string>
 
-    
-  <!-- Resources for built-in backup plug-in -->
-  
-  <!-- ================================================= BackupPreferences == -->
+    <!-- Preference: custom filters enabled -->
+    <string name="EPr_use_filters_title">Use filters</string>
+    <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
 
-    <!-- slide 33c/48d: Backup Preferences Title -->    
-    <string name="backup_BPr_header">備份</string>
+    <!-- Preference: show list members in shared list -->
+    <string name="EPr_show_list_members_title">Show list members in shared lists</string>
 
-    <!-- slide 48e/50c: Backup: Status Header -->    
-    <string name="backup_BPr_group_status">狀態</string>
-    
-    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
-    <string name="backup_status_success">上次備份:\n%s</string>
-    <!-- Backup Status: last error failed. Keep it short! -->    
-    <string name="backup_status_failed">上次備份失敗</string>
-    <!-- Backup Status: error subtitle -->    
-    <string name="backup_status_failed_subtitle">(點選查看錯誤)</string>
-    <!-- slide 48a: Backup Status: never backed up -->    
-    <string name="backup_status_never">從未備份</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_simple_input_boxes">Simple text boxes</string>
 
-    <!-- slide 48f/ 50e: Backup Options Group Label -->    
-    <string name="backup_BPr_group_options">選項</string>
+    <!-- Preference: simple input box style -->
+    <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
 
-    <!-- slide 48b: Preference: Automatic Backup Title -->    
-    <string name="backup_BPr_auto_title">自動備份</string>
-    <!-- Preference: Automatic Backup Description (when disabled) -->
-    <string name="backup_BPr_auto_disabled">停用自動備份</string>    
-    <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
-    <string name="backup_BPr_auto_enabled">備份將每天執行</string>
-    
-    <!-- Preference screen restoring Tasks Help -->
-    <!-- Preference screen Restoring Tasks Help Dialog Text-->
-    
-    <string name="backup_BPr_cloud_already_logged_in">您已經在Astrid.com上享有云備份</string>
-  
-  <!-- ================================================= BackupActivity == -->
-
-  <!-- slide 48c: backup activity label -->
-  <string name="backup_BAc_label">管理備份</string>
-
-  <!-- backup activity title -->
-  <string name="backup_BAc_title">管理備份</string>
-
-  <!-- backup activity import button -->
-  <string name="backup_BAc_import">匯入工作</string>
-
-  <!-- backup activity export button -->
-  <string name="backup_BAc_export">匯出工作</string>
-  
-  <!-- backup activity cloud (Astrid.com) option -->
-  <string name="backup_BAc_cloud">在Astrid.com點擊免費云備份</string>
-    
-  <!-- ============================================== Importer / Exporter == -->
-  
-  <!-- Message displayed when error occurs -->
-  <string name="backup_TXI_error">匯入錯誤</string>
-    
-  <string name="export_toast">備份 %1$s 至 %2$s.</string>
-    
-  <string name="export_toast_no_tasks">沒有工作需匯出</string>
-  
-  <!-- Progress Dialog Title for exporting -->    
-  <string name="export_progress_title">匯出中...</string>
-  
-  <!-- Backup: Title of Import Summary Dialog -->
-  <string name="import_summary_title">還原摘要</string>
-    
-  <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">檔案 %1$s 已包含 %2$s.\n\n %3$s 已匯入,\n %4$s 已存在\n %5$s 有問題\n</string>
-  
-  <!-- Progress Dialog Title for importing -->    
-  <string name="import_progress_title">匯入中...</string>
-  
-  <!-- Progress Dialog text for import reading task (%d -> task number)-->    
-  <string name="import_progress_read">讀取工作 %d...</string>
-  
-  <!-- Backup: Dialog when unable to open a file -->  
-  
-  <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
-  <string name="DLG_error_sdcard">無法開啟資料夾: %s</string>
-  
-  <!-- Backup: Dialog when unable to open SD card in general -->
-  <string name="DLG_error_sdcard_general">無法存取您的SD卡!</string>
-    
-  <!-- Backup: File Selector dialog for import -->
-  <string name="import_file_prompt">選取欲還原的檔案</string>    
-        
+    <!-- Preference: don\'t show plus button until input present -->
+    <string name="EPr_hide_plus_button">Hide plus button</string>
 
+    <!-- Preference: menu items -->
+    <string name="EPr_menu_items">Menu items</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Preference: list view -->
+    <string name="EPr_list_view">List view</string>
 
+    <!-- Preference: task edit comments -->
+    <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
 
-  <!-- ================================================== AndroidManifest == -->
-
-  <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
-  <string name="app_name">Astrid工作</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="read_permission_label">Astrid 權限</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="read_permission_desc">讀取工作, 顯示工作篩選</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="write_permission_label">Astrid 權限</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="write_permission_desc">建立新工作, 修改現行工作</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-    
-  <!-- question for deleting tasks -->
-  <string name="DLG_delete_this_task_question">確認刪除?</string>
-
-  <!-- question for deleting items (%s => item name) -->
-  <string name="DLG_delete_this_item_question">刪除此項目: %s?</string>
-    
-  <!-- Progress dialog shown when upgrading -->
-  <string name="DLG_upgrading">升級您的工作...</string>
-  
-  <!-- Title for dialog selecting a time (hours and minutes) -->
-  <string name="DLG_hour_minutes">時間 (小時:分鐘)</string>
-  
-  <!-- Dialog for Astrid having a critical update -->
-  <string name="DLG_please_update">Astrid 應該要從Android 市場下載最新版本! 請繼續前執行, 或稍等片刻。</string>
-
-  <!-- Button for going to Market -->
-
-  <!-- Button for accepting EULA -->
-  <string name="DLG_accept">接受</string>
-
-  <!-- Button for declining EULA -->
-  <string name="DLG_decline">不接受</string>
-
-  <!-- EULA title -->
-  <string name="DLG_eula_title">Astrid 使用條款</string>
-
-  <!-- Progress Dialog generic text -->
-  <string name="DLG_please_wait">請稍候</string>
-  
-  <!-- Dialog - loading -->
-  <string name="DLG_loading">載入中...</string>
-  
-  <!-- Dialog - dismiss -->
-
-  <!-- slide 20d -->
-  <string name="DLG_ok">確定(O)</string>
-  <!-- slide 36g -->
-  <string name="DLG_cancel">取消</string>
-  
-  <string name="DLG_more">更多</string>
-  
-  <string name="DLG_undo">撤消</string>
-  
-  <string name="DLG_warning">系統提醒</string>
-  
-  <!-- =============================================================== UI == -->
-  
-  <!-- Label for DateButtons with no value -->
-  <string name="WID_dateButtonUnset">點選</string>
-  
-  <!-- String formatter for DateButtons ($D => date, $T => time) -->
-  
-  <!-- String formatter for Disable button -->
-  
-  <!--  ============================================================= notes -->
-  
-  <!-- Note Exposer -->    
-  
-  <!-- Note Exposer / Comments -->    
-  
-  <!-- EditNoteActivity - no comments -->
-  <string name="ENA_no_comments">沒有要顯示的</string>
-    
-  <!-- EditNoteActivity - no username for comment -->
-  <string name="ENA_no_user">某人</string>
-  
-  <!-- EditNoteActivity - refresh comments -->
-  <string name="ENA_refresh_comments">刷新留言</string>
-  
-  <!-- ================================================= TaskListActivity == -->
-  
-  <!-- slide 8b: Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">無工作!</string>
-  
-  <!-- Task List: Displayed instead of list when no items present in people view (%s-> person\'s name) -->    
-  <string name="TLA_no_items_person">%s 沒有 \n與您分享的任務工作</string>
-  
-  <!-- Menu: Adjust Sort and Hidden Task Settings -->    
-  <string name="TLA_menu_sort">Sort</string>
-  
-  <!-- Menu: Sync Now -->    
-  <string name="TLA_menu_sync">立即同步</string>
-  
-  <!-- Menu: Search -->
-  <string name="TLA_menu_search">搜索</string>
-  
-  <!-- Menu: Tasks -->
-  <string name="TLA_menu_lists">列表</string>
-
-  <!-- Menu: Friends -->
-  <string name="TLA_menu_friends">朋友</string>
-
-  <!-- Menu: Featured Lists -->
-  <string name="TLA_menu_featured_lists">特定列表</string>
-
-  <!-- Menu: Suggestions -->
-  <string name="TLA_menu_suggestions">建議</string>
-  
-  <!-- Menu: Tutorial -->
-
-  <!-- Menu: Settings -->    
-  <string name="TLA_menu_settings">設定</string>
-  
-  <!-- slide 30b: Menu: Support -->
-  <string name="TLA_menu_support">支持</string>
-  
-  <!-- Search Label-->
-  
-  <!-- Window title for displaying Custom Filter -->
-  <string name="TLA_custom">自訂</string>
-  
-  <!-- slide 8d: Quick Add Edit Box Hint-->
-  <string name="TLA_quick_add_hint">添加任務工作</string>
-  
-  <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
-  <string name="TLA_quick_add_hint_assign">為 %s 增加任務工作</string>
-  
-  <!-- Notification Volumne notification-->
-  <string name="TLA_notification_volume_low">已靜音。你不會再聽到了！</string>
-  
-  <!-- Notifications disabled warning -->
-  <string name="TLA_notification_disabled">Astrid提醒功能被關閉，你不會收到任何提醒。</string>
-  
-  <string-array name="TLA_filters">
-      <item>激活</item>
-      <item>今天</item>
-      <item>馬上</item>
-      <item>延遲</item>
-      <item>完成</item>
-      <item>編輯工作</item>      
-  </string-array>
-  
-  <!-- Title for confirmation dialog after quick add markup -->
-  <string name="TLA_quickadd_confirm_title">你說: \"%s\"</string>
-  
-  <!-- Text for speech bubble in dialog after quick add markup -->
-  <!-- First string is task title, second is due date, third is priority -->
-  <string name="TLA_quickadd_confirm_speech_bubble">我建立的「%1$s」%3$s 將於 %2$s 到期</string>
-  
-  <string name="TLA_quickadd_confirm_speech_bubble_date">為 %s</string>
-  
-  <string name="TLA_quickadd_confirm_hide_helpers">不再詢問確認</string>
-  
-  
-  <!-- Title for alert on new repeating task. %s-> task title -->
-  <string name="TLA_repeat_scheduled_title">新的重複任務工作 %s</string>
-  
-  <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
-  <string name="TLA_repeat_scheduled_speech_bubble">我會在%s 後提醒您這個任務工作的。</string>
-  
-  <string-array name="TLA_priority_strings">
-      <item>最優先</item>
-      <item>優先</item>
-      <item>普通</item>
-      <item>低優先權</item>
-  </string-array>
-  <!-- slide 22a -->
-  <string name="TLA_all_activity">所有活動</string>
-  
-  <!-- ====================================================== TaskAdapter == -->
-  
-  <!-- Format string to indicate task is hidden (%s => task name) -->
-  <string name="TAd_hiddenFormat">%s [隱藏]</string>
-  
-  <!-- Format string to indicate task is deleted (%s => task name) -->
-  <string name="TAd_deletedFormat">%s [刪除]</string>
-  
-  <!-- Displayed when adapter is flung (scrolled quickly) -->
-  
-  <!-- slide 22b: indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">%s\n完成</string>
-  
-  <!-- slide 15a: Action Button: edit task -->
-  <string name="TAd_actionEditTask">編輯</string>
-  
-  <!-- Context Item: edit task -->
-  <string name="TAd_contextEditTask">編輯工作</string>
-
-  <!-- Context Item: copy task -->
-  <string name="TAd_contextCopyTask">複製任務工作</string>
-
-  <!-- Context Item: delete task -->
-  <string name="TAd_contextDeleteTask">刪除任務工作</string>
-
-  <!-- Context Item: undelete task -->
-  <string name="TAd_contextUndeleteTask">還原工作刪除</string>
-
-  <!-- Context Item: purge task -->
-  <string name="TAd_contextPurgeTask">清除工作</string>
-  
-  <!-- ============================================== SortSelectionDialog == -->
-  
-  <!-- slide 23a: Sort Selection: dialog title -->    
-  <string name="SSD_title">排序和隱藏工作</string>
-  
-  <!-- slide 23h:  Hidden: title -->
-  <string name="SSD_hidden_title">隱藏任務工作</string>
-  
-  <!-- Hidden Task Selection: show completed tasks -->    
-  <string name="SSD_completed">顯示已完成工作</string>
-  
-  <!-- Hidden Task Selection: show hidden tasks -->    
-  <string name="SSD_hidden">顯示隱藏的工作</string>
-  
-  <!-- Hidden Task Selection: show deleted tasks -->    
-  <string name="SSD_deleted">顯示已刪除工作</string>
-  
-  <!-- Sort Selection: drag with subtasks -->
-  <string name="SSD_sort_drag">Manual order with subtasks</string>
-  
-  <!-- slide 23b: Sort Selection: smart sort -->
-  <string name="SSD_sort_auto">Astrid智慧排序</string>
-  
-  <!-- slide 23e: Sort Selection: sort by alpha -->
-  <string name="SSD_sort_alpha">依主旨</string>
-  
-  <!-- slide 23c: Sort Selection: sort by due date -->
-  <string name="SSD_sort_due">依到期日</string>
-  
-  <!-- slide 23d: Sort Selection: sort by importance -->
-  <string name="SSD_sort_importance">By priority</string>
-  
-  <!-- slide 23f: Sort Selection: sort by modified date -->
-  <string name="SSD_sort_modified">依最後修改</string>
-  
-  <!-- slide 23g: Sort Selection: reverse -->
-  <string name="SSD_sort_reverse">反向排序</string>
-  
-  <!-- slide 23j: Sort Button: sort temporarily -->
-  <string name="SSD_save_temp">僅一次</string>
-  
-  <!-- slide 23i: Sort Button: sort permanently -->
-  <string name="SSD_save_always">總是</string>
-  
-  <!-- =============================================== FilterListActivity == -->
-  
-  <!-- Astrid Filter Shortcut -->    
-  <string name="FSA_label">Astrid 列表或過濾器</string>
-
-  <!-- Filter List Activity Title -->    
-  
-  <!-- Displayed when loading filters -->    
-  
-  <!-- Context Menu: Create Shortcut -->    
-  <string name="FLA_context_shortcut">在桌面建立捷徑</string>
-  
-  <!-- Menu: Search -->
-  
-  <!-- Menu: Help -->    
-  
-  <!-- slide 28c: Create Shortcut Dialog Title -->    
-  <string name="FLA_shortcut_dialog_title">建立捷徑</string>
-  
-  <!-- Create Shortcut Dialog (asks to name shortcut) -->    
-  <string name="FLA_shortcut_dialog">捷徑名稱</string>
-  
-  <!-- Search Hint-->
-  <string name="FLA_search_hint">工作搜尋</string>
-  
-  <!-- Search Filter name (%s => query) -->
-  <string name="FLA_search_filter">比對 \'%s\'</string>
-  
-  <!-- Toast: created shortcut (%s => label) -->
-  <string name="FLA_toast_onCreateShortcut">建立捷徑: %s</string>
-  
-  <!-- Menu: new filter -->
-  <string name="FLA_new_filter">新建過濾器</string>
-  
-  <!-- slide 10e: Button: new list -->
-  <string name="FLA_new_list">新建列表</string>
-  
-  <!-- Alert when creating a shortcut without selecting a filter -->
-  <string name="FLA_no_filter_selected">還沒有選定過濾器呢！請選擇一個過濾器或列表唄。</string>
-  
-  <!-- ================================================= TaskEditActivity == -->
-  
-  <!-- Title when editing a task (%s => task title) -->
-  
-  <!-- Title when creating a new task -->
-  
-  <!-- Task title label -->
-  
-  <!-- Task when label -->
-  <string name="TEA_when_header_label">時間</string>
-  
-  <!-- Task title hint (displayed when edit box is empty) -->
-  <string name="TEA_title_hint">Task name</string>
-  
-  <!-- Task importance label -->
-  <string name="TEA_importance_label">Priority</string>
-  
-  <!-- Task due date hint -->
-  <string name="TEA_deadline_hint">Set due date</string>
-  
-  <!-- Task assigned to string (%s -> assigned person name) -->
-  <string name="TEA_assigned_to">Assigned to %s</string>
-  
-  <!-- Task urgency specific time checkbox -->
-  <string name="TEA_urgency_specific_time">指定時間?</string>
-  
-  <!-- Task urgency specific time title when specific time false -->
-  <string name="TEA_urgency_none">無</string>
-  
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_label">Hide until</string>
-
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_display">Hide until %s</string>
-  
-  <!-- Task hide until toast -->
-  <string name="TEA_hideUntil_message">任務工作將會被隱藏，直到 %s</string>
-  
-  <!-- Task editing data being loaded label -->
-  <string-array name="TEA_loading"><item>載入中...</item></string-array>
-  
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_note_label">描述</string>
-
-  <!-- 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">要花多久時間?</string>
-  
-  <!-- Elapsed time label -->
-  <string name="TEA_elapsedDuration_label">已經用掉的時間</string>
-
-  <!-- Menu: Save -->    
-  <string name="TEA_menu_save">儲存變更</string>
-  
-  <!-- Menu: Don\'t Save -->
-  <string name="TEA_menu_discard">不要儲存</string>
-  
-  <!-- Menu: Delete Task -->
-  <string name="TEA_menu_delete">刪除工作</string>
-  
-  <!-- Menu: Task comments -->
-  <string name="TEA_menu_refresh_comments">Refresh comments</string>
-
-  <string name="TEA_menu_comments">註釋</string>
-  
-   <!-- Toast: task saved with deadline (%s => preposition + time units) -->
-  <string name="TEA_onTaskSave_due">工作已儲存: %s 到期</string>
-  
-  <!-- Toast: task saved without deadlines -->
-  <string name="TEA_onTaskSave_notDue">工作已儲存</string>
-  
-  <!-- Toast: task was not saved -->
-  
-  <!-- Toast: task was deleted -->
-  
-  <!-- slide 15b: Task edit tab: activity -->
-  <string name="TEA_tab_activity">活動</string>
-  
-  <!-- slide 15e:  Task edit tab: more editing settings -->
-  <string name="TEA_tab_more">更多</string>
-  
-  <!-- slide 15d: Task edit tab: web services -->
-  <string name="TEA_tab_web">建議</string>
-  
-  <string name="TEA_timer_est">Est. %s</string>
-
-  <string name="TEA_timer_elap">Elapsed %s</string>
-  
-  <string-array name="TEA_urgency">
-      <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No date</item>
-      <item>指定哪天</item>
-      <item>今天</item>
-      <item>明天</item>
-      <item>(天之後)</item>
-      <item>下週</item>
-      <item>兩週之內</item>
-      <item>下個月</item>
-  </string-array>
-  
-  <string name="TEA_no_time">沒有時間</string>
-      
-  <string-array name="TEA_hideUntil">
-      <!-- hideUntil: labels for edit page. -->
-      <item>Never</item>
-      <item>Due date</item>
-      <item>Due time</item>
-      <item>Day before due</item>
-      <item>Week before due</item>
-      <item>指定日期/時間</item>
-  </string-array>
-  
-  <!-- Task edit control set descriptors -->
-
-  <!-- slide 9b/35i -->
-  <string name="TEA_control_who">人物</string>
-
-  <!-- slide 9c/ 35a -->
-  <string name="TEA_control_when">時間</string>
-  <!-- slide 35b -->
-  <string name="TEA_control_more_section">----詳情----</string>
-  <!-- slide 16a/35c -->
-  <string name="TEA_control_importance">Priority</string>  
-  <!-- slide 16b/35d -->
-  <string name="TEA_control_lists">列表</string>  
-  <!-- slide 16c/35e -->
-  <string name="TEA_control_notes">描述</string>  
-  
-  <string name="TEA_control_files">文件</string>
-
-  <!-- slide 16e / slide 35g-->
-  <string name="TEA_control_reminders">提醒</string>
-
-  <!-- slide 16f -->
-  <string name="TEA_control_timer">定時器控件</string>
-  
-  <string name="TEA_control_hidden_section">----始終隱藏----</string>
-  
-  <string name="hide_until_prompt">在我的列表中顯示</string>
-  
-  <!-- Add Ons tab when no add-ons found -->
-  
-  <!-- Add Ons button -->
-  
-  <!-- More row -->
-  
-  <!-- slide 15c: Text when no activity to show -->
-  <string name="TEA_no_activity">無活動</string>
-  
-  <!-- Text to load more activity -->
-  <string name="TEA_load_more">加載更多……</string>
-  
-  <!-- When controls dialog -->
-  <string name="TEA_when_dialog_title">這項活動定在什麼時候呀？</string>
-  
-  
-  <string name="TEA_new_task">新建任務工作</string>
-  
-  <string name="WSV_click_to_load">拍拍我，讓我搜索一下完成這項任務工作的各種方法！</string>
-  
-  <string name="WSV_not_online">連上互聯網後我可以做更多事情。請檢查一下您的網絡連接唄。</string>
-  
-  <string name="TEA_contact_error">不好意思！我們找不到所選聯繫人的電子郵件地址喔。</string>
-  
-  <!-- ============================================= IntroductionActivity == -->
-  
-  <!-- slide 1a: Introduction Window title -->
-  
-  <!-- Button to agree to EULA -->
-  
-  <!-- Button to disagree with EULA -->
-  
-  <!-- ===================================================== MissedCallActivity == -->
-  
-  <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
-  <string name="MCA_title">%1$s\n在 %2$s 給您打過電話</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_return_call">現在回電</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_add_task">稍後回電</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_ignore">忽略</string>
-  
-  <!-- Missed call: dialog to ignore all missed calls title -->
-  <string name="MCA_ignore_title">忽略所有未接電話嗎？</string>
-
-  <!-- Missed call: dialog to ignore all missed calls body -->
-  <string name="MCA_ignore_body">您已經忽略了幾個未接電話。對於這些電話，Astrid 是否應該不再詢問您呢？</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore all button -->
-  <string name="MCA_ignore_all">忽略所有來電</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
-  <string name="MCA_ignore_this">只忽略這個來電</string>
-
-  <!-- Missed call: preference title -->
-  <string name="MCA_missed_calls_pref_title">及時回复未接電話</string>
-
-  <!-- slide 49c: Missed call: preference description -->
-  <string name="MCA_missed_calls_pref_desc_enabled">Astrid 會向您報告未接電話，還會提供回電的提醒</string>
-  <string name="MCA_missed_calls_pref_desc_disabled">Astrid 將不會向您報告未接電話</string>
-
-  <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
-  <string name="MCA_task_title_name">請回電給 %1$s，電話是 %2$s</string>
-
-  <!-- Missed call: task title no name (%s -> number)-->
-  <string name="MCA_task_title_no_name">請回電給 %s</string>
-  
-  <!-- Missed call: schedule dialog title (%s -> name or number)-->
-  <string name="MCA_schedule_dialog_title">請給 %s 回個電話過去……</string>
-  
-  <!-- Missed call speech bubble options -->
-  <string-array name="MCA_dialog_speech_options">
-      <item>您這麼人見人愛、花見花開，感覺肯定棒極了！</item>
-      <item>哇！個個都喜歡您咽！</item>
-      <item>回個電話吧，好讓他們高興一整天！</item>
-      <item>人家給您回電話，您肯定高興，不是嗎？</item>
-      <item>您是可以回電的！</item>
-      <item>無論怎樣，您也可以發條短信呀……</item>
-  </string-array>
-  
-  
-  <!-- ======================================= Calendar reminder activity == -->
-  
-  <!-- Calendar remindeer ignore button -->
-  <string name="CRA_ignore">忽略</string>
-  
-  <!-- Calendar event -->
-  <string name="CRA_title">需要一個會議列表嗎？</string>
-  
-  <!-- Calendar reminder: dialog to ignore all missed calls title -->
-  <string name="CRA_ignore_title">要忽略所有月曆上的事件嗎？</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls body -->
-  <string name="CRA_ignore_body">您已經忽略了好幾個月曆上的事件， 之後 Astrid 是不是不要再詢問您了呢？</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
-  <string name="CRA_ignore_all">要忽略所有的事件嗎？</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
-  <string name="CRA_ignore_this">只忽略這個事件</string>
-  
-  <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
-  <string name="CRA_speech_bubble_start">看來%s很快就會開始進行。您想要為行動事項建立一個新的列表嗎？</string>
-
-  <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
-  <string name="CRA_speech_bubble_end">看來你才剛剛結束%s。您想要為行動事項建立一個新的列表嗎？</string>
-  
-  <!-- Calendar reminder: create list button -->
-  <string name="CRA_create_list">新增清單</string>
-
-  <!-- Calendar reminder: postpone button -->
-  <string name="CRA_postpone">也許等下再說吧。</string>
-  
-  <!-- Calendar reminder: list exists dialog title -->
-  <string name="CRA_list_exists_title">此列表已經存在</string>
-  
-  <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
-  <string name="CRA_list_exists_body">有個叫%s的列表已經存在喔！您希望要用這個已經存在的列表還是為這個事件建立一個新的？</string>
-  
-  <!-- Calendar reminder: list exists dialog create new button -->
-  <string name="CRA_create_new">新增</string>
-
-  <!-- Calendar reminder: list exists dialog use existing button -->
-  <string name="CRA_use_existing">就用原來的。</string>
-  
-  <!-- Calendar remindr: created list (%s -> list name) -->
-  <string name="CRA_created_list_dialog">我建立了一個列表%s</string>
-  
-  <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
-  <string name="CRA_one_attendee">%s會出席</string>
-
-  <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
-  <string name="CRA_two_attendees">%1$s和%2$s會出席</string>
-
-  <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
-  <string name="CRA_many_attendees">%1$s, %2$s, 還有 %3$d 等等其他人會出席</string>
-  
-  <!-- Calendar reminder: invitation prompt -->
-  <string name="CRA_invitation_prompt">您想要邀請他們嗎？</string>
-  
-  <!-- Calendar reminder: preference title -->
-  <string name="CRA_calendar_reminders_pref_title">月曆小助理</string>
-
-  <!-- Calendar reminder: pref description disabled -->
-  <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid不會提醒您關於月曆上將要到來的事件</string>
-
-  <!-- Calendar reminder: pref description enabled -->
-  <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid會提醒您關於月曆上將要到來的事件，並且會提示您做好準備。</string>
-  
-  <!-- Calendar reminder: share list title -->
-  <string name="CRA_share_list_title">分享此列表？</string>
-  
-  <string name="CRA_invite_attendees">邀請出席者</string>
-
-  <string name="CRA_more_options">更多選項</string>
-
-  <string name="CRA_dont_invite">不了，謝啦！</string>
-
-  <!-- Calendar reminder: share list title when no other attendees exist-->
-  <string name="CRA_list_created_title">列表建立了！</string>
-  
-  <!-- Calendar reminder: default new list name (%s -> event title) -->
-  <string name="CRA_default_list_name">行動事項：%s</string>
-  
-  <!-- ===================================================== HelpActivity == -->
-  
-  <!-- Help: Button to get support from our website -->
-    
-  <!-- ==================================================== UpdateService == -->
-  
-  <!-- Changelog Window Title -->
-  <string name="UpS_changelog_title">Astrid 有哪些最新消息?</string>
-  
-  <!-- Updates Window Title -->
-  <string name="UpS_updates_title">Astrid 最新消息</string>
-  
-  <!-- Updats No Activity to show for offline users -->
-  <string name="UpS_no_activity_log_in">登錄查看記錄 \n看看您的活動的進展情況 \n以及在各分享列表上的活動。</string>
-  
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 31g: Preference Window Title -->
-  <string name="EPr_title">Astrid: 偏好</string>
-  
-  <string name="EPr_share_astrid">Share Astrid</string>
-
-  <string name="EPr_share_astrid_summary">在您喜歡的社交網站上分享Astrid</string>
-  
-  <!-- slide 46a -->
-  <string name="EPr_deactivated">禁用</string>
-
-  <!-- slide 30i: Preference Category: Appearance Title -->
-  <string name="EPr_appearance_header">外觀</string>
-  
-  <!-- Preference Category: Appearance Summary -->
-  <string name="EPr_appearance_summary">主題，小工具，任務工作欄，編輯屏幕列表</string>
-  
-  <!-- FAQ Preference title -->
-  <string name="EPr_faq_title">常見問題</string>
-  
-  <!-- Account status preference (%s -> account type) -->
-  <string name="EPr_account_title">帳號：%s</string>
-
-  <!-- Support preferences summary -->
-  <string name="EPr_support_summary">指引，常見問題，關於我們</string>
-  
-  <!-- slide 34a: Preference: Task List Font Size Title -->
-  <string name="EPr_fontSize_title">工作清單大小</string>
-  
-  <!-- Preference: Filters to show pref screen title -->
-  <string name="EPr_filters_to_show_title">Filters to show</string>
-  
-  <!-- slide 32a: Preference: Show confirmation for smart reminders -->
-  <string name="EPr_showSmartConfirmation_title">在智能提示上顯示確認消息</string>
-  
-  <!-- slide 34g: Preference: Task List Font Size Description -->                                                                                                                                                  
-  <string name="EPr_fontSize_desc">清單主頁面字型大小</string>  
-  
-  <!-- Preferemce: Show task edit confirmation toasts -->
-  
-  <!-- slide 34c: Preference: Task List Show Notes -->
-  <string name="EPr_showNotes_title">Show description in task</string>
-  
-  <!-- Edit screen preference category -->
-  <string name="EPr_edit_screen_options">Edit screen options</string>
-  
-  <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
-  <string name="EPr_beastMode_title">Edit screen order</string>
-  
-  <string name="EPr_beastMode_shortcut">Customize</string>
-  
-  <string name="EPr_time_increment">5 minute increments</string>
-  
-  <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
-  
-  <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
-  
-  <!-- slide 35h -->
-  <string name="EPr_beastMode_desc">自定義設定菜單屏幕</string>
-  <!-- slide 35j -->
-  <string name="EPr_beastMode_reset">恢復默認值</string>
-  
-  <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on each row</string>
-      
-  <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit screen</string>  
-  <!-- Preference: Task List Show Notes Description (enabled) -->
-  <string name="EPr_showNotes_desc_enabled">Description will always be displayed</string>
-  
-  <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
-  <string name="EPr_compressTaskRows_title">壓縮任務工作排列</string>
-  <!-- slide 34j -->
-  <string name="EPr_compressTaskRows_desc">壓縮任務工作行，使它適應標題</string>
-  
-  <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
-  <!-- slide 34k-->
-  
-  <!-- slide 34b: Preferences: Wrap task titles to two lines -->
-  <string name="EPr_fullTask_title">顯示完整的任務工作標題</string>
-  <string name="EPr_fullTask_desc_enabled">將顯示完整的任務工作標題</string>
-  <!-- slide 34h -->
-  <string name="EPr_fullTask_desc_disabled">將顯示任務工作標題的頭兩行</string>
-  
-  <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
-  <string name="EPr_ideaAuto_title">自動加載意見選項標籤</string>
-  <!-- slide 32c -->
-  <string name="EPr_ideaAuto_desc_enabled">點擊標籤後，網頁將會搜索意見選項。</string>
-  <string name="EPr_ideaAuto_desc_disabled">只有手動請求後，網頁將會搜索意見選項。</string>
-  
-  <!-- Preferences: task row style -->
-  <string-array name="EPr_task_row_styles">
-      <item>Original</item>
-      <item>Simple</item>
-      <item>Title only</item>
-  </string-array>
-  
-  <string-array name="EPr_task_row_style_descriptions">
-      <item>截取標題至兩行，並在右邊顯示日期</item>
-      <item>截取標題為一行，並在下方顯示日期和列表</item>
-      <item>Single line title only</item>
-  </string-array>
-  
-  <!-- task row style title (%s -> style) -->
-  <string name="EPr_task_row_style_title">Row style: %s</string>
-  
-  <!-- Preference: custom filters enabled -->
-  <string name="EPr_use_filters_title">Use filters</string>
-  <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
-
-  <!-- Preference: show list members in shared list -->
-  <string name="EPr_show_list_members_title">Show list members in shared lists</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_simple_input_boxes">Simple text boxes</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
-
-  <!-- Preference: don\'t show plus button until input present -->
-  <string name="EPr_hide_plus_button">Hide plus button</string>
-
-  <!-- Preference: menu items -->
-  <string name="EPr_menu_items">Menu items</string>
-
-  <!-- Preference: list view -->
-  <string name="EPr_list_view">List view</string>
-
-  <!-- Preference: task edit comments -->
-  <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
-  
-  <!-- slide 30f/ 36f: Preference: Theme -->
-  <string name="EPr_theme_title">主題</string>
-  <!-- Preference: Theme Description (%s => value) -->
-  <string name="EPr_theme_desc">目前設定: %s</string>  
-  <!-- Preference: Theme Description (android 1.6) -->
-  <string name="EPr_theme_desc_unsupported">該設置需要 Android 2.0+</string>
-  <!-- slide 32h/ 37b -->
-  <string name="EPr_theme_widget_title">小工具主題</string>
-  
-  <!-- slide 30d/ 34f: Preference screen: all task row settings -->
-  <string name="EPr_taskRowPrefs_title">任務工作欄</string>
-  
-  <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
-  <string name="EPr_use_contact_picker">使用聯繫人選擇程序</string>
-  <!-- slide 49b -->
-  <string name="EPr_use_contact_picker_desc_enabled">系統的聯繫人選擇程序選項將在任務工作佈置窗口中顯示</string>
-  <string name="EPr_use_contact_picker_desc_disabled">將不會顯示系統的聯繫人選擇程序選項</string>
-
-  <!-- slide 49i: Preferences: Third party addons -->
-  <string name="EPr_third_party_addons">允許第三方加註信息</string>
-  <string name="EPr_third_party_addons_desc_enabled">即將啟用第三方附加軟件</string>
-  <!-- slide 49d -->
-  <string name="EPr_third_party_addons_desc_disabled">即將禁用第三方附加軟件</string>
-  
-  <!-- Preferences: ideas tab -->
-  <string name="EPr_ideas_tab_enabled">任務工作意見</string>
-  <string name="EPr_ideas_tab_description">獲取多個建議，幫助您完成多項任務工作</string>
-  
-  <!-- Preferences: calendar event start time -->
-  <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
-  <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
-  <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
-  
-  <string name="EPr_force_phone_layout">使用手機佈局</string>
-
-  <string name="EPr_show_featured_lists">顯示特定列表</string>
-  
-  <!-- Configurations -->
-  <string name="EPr_configurations_title">Set configuration</string>
-  <string name="EPr_config_default">Default</string>
-  <string name="EPr_config_lite">Astrid Lite</string>
-  
-  <!-- Dialog title when setting preference configuration -->
-  <string name="EPr_config_dialog_title">Set configuration?</string>
-  <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
-  <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
-  
-  <!-- default configuration name for the above dialog -->
-  <string name="EPr_config_dialog_default_id">default</string>
-  
-  <!-- Preference title for showing save and cancel buttons in task edit page -->
-  <string name="EPr_show_save_and_cancel">Show save and cancel </string>
-  
-  
-  <!-- Swipe between lists -->
-  <!-- Preference: swipe between lists performance -->
-  <string name="EPr_swipe_lists_performance_title">在列表間滑動</string>
-  
-  <string-array name="EPr_swipe_lists_performance_mode">
-      <item>不使用滑動屏幕</item>
-      <item>節約內存</item>
-      <item>標準性能</item>
-      <item>高效性能</item>
-  </string-array>
-  
-  <string-array name="EPr_swipe_lists_performance_desc">
-  <!-- slide 49a -->
-      <item>滑動屏幕切換列表已被禁用</item>
-      <item>較低速性能</item>
-      <item>默認設置</item>
-      <item>使用更多系統資源</item>
-  </string-array>
-    
-  <string name="swipe_lists_helper_title">在列表間滑動</string>
-  <string name="swipe_lists_helper_header">在列表間向左或向右快速滑動</string>
-  <string name="swipe_lists_helper_subtitle">在設置-&amp;gt外觀中修改選項</string>
-
-  <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
-  
-  <string-array name="EPr_default_reminders_mode">
-      <!-- reminders duration: labels for "Task Defaults" preference item. -->
-      <item>@string/TEA_reminder_mode_once</item>
-      <item>@string/TEA_reminder_mode_five</item>
-      <item>@string/TEA_reminder_mode_nonstop</item>
-  </string-array>
-    
-  <string-array name="EPr_themes">
-    <!-- theme_settings: labels for Theme preference menu -->
-    <!-- slide 36a-->
-    <item>藍</item>
-    <!-- slide 36b -->
-    <item>紅</item>
-    <!-- slide 36b -->
-    <item>Sky blue</item>
-    <!-- slide 36c -->
-    <item>Night</item>
-    <!-- slide 36d -->
-    <item>Transparent (white text)</item>
-    <!-- slide 36e -->
-    <item>透明(黑色文字)</item>
-  </string-array>
-  
-  <string-array name="EPr_themes_widget">
-    <!-- slide 32i / 37a-->
-    <item>與應用相同</item>
-    <item>日間——藍色</item>
-    <item>日間——紅色</item>
-    <item>Sky blue</item>
-    <item>Night</item>
-    <item>Transparent (white text)</item>
-    <item>Transparent (black text)</item>
-    <item>老式風格</item>
-  </string-array>
-  
-  <!-- ========================================== Task Management Settings == -->
-
-  <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
-  <string name="EPr_manage_header">管理舊任務工作</string>
-  <!-- slide 47d -->
-  <string name="EPr_manage_delete_completed">刪除已完成任務工作</string>
-  <string name="EPr_manage_delete_completed_message">您真的要刪除所有已完成任務工作嗎？</string>
-  <!-- slide 47a -->
-  <string name="EPr_manage_delete_completed_summary">已刪除任務工作可以被依次恢復</string>
-  <string name="EPr_manage_delete_completed_status">刪除了 %d 個任務工作！</string>
-  <!-- slide 47e -->
-  <string name="EPr_manage_purge_deleted">清除已刪除任務工作</string>
-  <string name="EPr_manage_purge_deleted_message">您真的要清楚所有已刪除任務工作嗎？ \n\n 這些任務工作將會被徹底永久刪除！</string>
-  <string name="EPr_manage_purge_deleted_status">清除了 %d 個任務工作！</string>
-  <!-- slide 47b-->
-  <string name="EPr_manage_purge_deleted_summary">請注意！若事先沒有備份，已清除的任務工作將無法恢復！</string>
-  <!-- slide 47h-->
-  <string name="EPr_manage_clear_all">清除所有數據</string>
-  <string name="EPr_manage_clear_all_message">刪除所有Astrid任務和設置\n\n警告：不可復原！</string>
-
-  <!-- slide 47f -->
-  <string name="EPr_manage_delete_completed_gcal">刪除日程表中已完成任務工作</string>
-  <string name="EPr_manage_delete_completed_gcal_message">您真的想刪除您所有的事件中已經完成的任務工作嗎？</string>
-  <string name="EPr_manage_delete_completed_gcal_summary"></string>
-  <string name="EPr_manage_delete_completed_gcal_status">清除%d個日曆事件!</string>
-      
-  <!-- slide 47g-->
-  <string name="EPr_manage_delete_all_gcal">刪除所有日程表</string>
-  <string name="EPr_manage_delete_all_gcal_message">您真的想刪除您所有事件中的各項任務工作嗎？</string>
-  <string name="EPr_manage_delete_all_gcal_summary"></string>
-  <string name="EPr_manage_delete_all_gcal_status">已經刪除了 %d 個日曆事件了！</string>
-      
-  <!-- ==================================================== AddOnActivity == -->
-  
-  <!-- Add Ons Activity Title -->
-  <string name="AOA_title">擴展</string>
-    
-  <!-- Add-on Activity: author for internal authors  -->
-  <string name="AOA_internal_author">Astrid 團隊</string>
-    
-  <!-- Add-on Activity: installed add-ons tab -->
-  <string name="AOA_tab_installed">已安裝</string>
-  
-  <!-- Add-on Activity - available add-ons tab -->
-  <string name="AOA_tab_available">可用</string>
-  
-  <!-- Add-on Activity - free add-ons label -->
-  <string name="AOA_free">免費</string>
-  
-  <!-- Add-on Activity - menu item to visit add-on website -->
-  
-  <!-- Add-on Activity - menu item to visit android market -->
-  
-  <!-- Add-on Activity - when list is empty -->
-  <string name="AOA_no_addons">空的清單!</string>
-  
-  <string name="AOA_ppack_title">Astrid優化工具</string>
-  <string name="AOA_ppack_description">支持Astrid並在Astrid優化工具的幫助下變得更加有效率。提供4＊2 和4＊4尺寸的小工具和語音支持。讓我們更加有效率地生活！</string>
-  <string name="AOA_locale_title">Astrid場所插件</string>
-  <string name="AOA_locale_description">在過濾的條件下，允許Astrid利用場所應用推送通知。現在就買場所插件。</string>
-  
-  <!-- ====================================================== TasksWidget == -->
-
-  <!-- Widget text when loading tasks -->
-  <string name="TWi_loading">載入中...</string>
-
-  <!-- Widget configuration activity title: select a filter -->
-  <string name="WCA_title">選擇工作顯示...</string>
-  
-  <!-- ======================================================== Waiting on me -->
-
-  <string name="wom_commented">%s commented on your task.</string>
-  <string name="wom_mentioned">%s mentioned you.</string>
-  <string name="wom_assigned">%s assigned this to you.</string>
-  <string name="wom_raised_pri">%s raised the priority.</string>
-  <string name="wom_changed_due">%s changed the due date.</string>
-  <string name="wom_default">%s wants your attention.</string>
-  
-  <string name="wom_dismiss">Dismiss</string>
-  <string name="wom_acknowledge">I\'ve read this</string>
-
-  <!-- ============================================================= About == -->
-  
-  <!-- slide 30h: Title of "About" option in settings -->
-  <string name="p_about">關於 Astrid</string>
-  
-  <!-- About text (%s => current version)-->
-  <string name="p_about_text">當前版本： %s\n\n Astrid 是由Todoroo, Inc. 維護的開源軟件。</string>
-
-  <!-- Title of "Help" option in settings -->
-  <string name="p_help">支持</string>
-  
-  <!-- slide 30c: Title of "Forums" option in settings -->
-  <string name="p_forums">討論區</string>
-  
-  <!-- Title of "Premium" option in settings -->
-  <string name="p_premium">高級</string>
-  
-  <!-- ============================================================= Misc == -->
-  
-  <string name="feedback_positive_title">Rate Astrid?</string>
-
-  <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star rating?</string>
-
-  <string name="feedback_negative_title">Leave feedback?</string>
-
-  <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
-
-  <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback section--it might not be available on your device.</string>
-  
-  <string name="feedback_positive_button">Rate Astrid</string>
-
-  <string name="feedback_negative_button">Leave feedback</string>
-  
-  <string name="feedback_not_now">Not now</string>
-  
-  <string name="feedback_banner_text">How\'s Astrid working for you?</string>
-  
-  <!-- Displayed when task killer found. %s => name of the application -->
-  <string name="task_killer_help">似乎您正在使用會刪除進程的應用程序(%s)！可以的話，請將Astrid 加入到例外列表避免被殺死。否則Astrid可能無法通知您任​​務已到期。\n</string>
-  
-  <!-- Task killer dialog ok button -->
-  <string name="task_killer_help_ok">我不會中止 Astrid!</string>
-    
-  <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
-  
-  <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
-  <string name="marketplace_description">Astrid是一款開源並深受人們喜愛的TODO任務工作/列表管理器，旨在提高您處理事務的效率。Astrid包含提醒、標籤、同步、區域插件、小工具等眾多功能。</string>
-  
-  <string name="DB_corrupted_title">數據庫已經受損</string>
-  
-  <string name="DB_corrupted_body">啊喔！您有一個毀損的資料庫。如果您經常看見這個錯誤出現，我們建議您清除所有數據（在設置-&gt;同步和備份-&amp;gt；管理舊任務工作-&gt;清楚所有數據）並在Astrid備份中重新存入您的任務工作（設置-&gt;同步和備份-&gt;備份-&gt;導入任務工作）</string>
-      
-  <string name="market_unavailable">非常抱歉，我們的軟件無法在您的系統中成功運行。</string>
-  
+    <!-- slide 30f/ 36f: Preference: Theme -->
+    <string name="EPr_theme_title">主題</string>
+    <!-- Preference: Theme Description (%s => value) -->
+    <string name="EPr_theme_desc">目前設定: %s</string>
+    <!-- Preference: Theme Description (android 1.6) -->
+    <string name="EPr_theme_desc_unsupported">該設置需要 Android 2.0+</string>
+    <!-- slide 32h/ 37b -->
+    <string name="EPr_theme_widget_title">小工具主題</string>
 
+    <!-- slide 30d/ 34f: Preference screen: all task row settings -->
+    <string name="EPr_taskRowPrefs_title">任務工作欄</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
+    <string name="EPr_use_contact_picker">使用聯繫人選擇程序</string>
+    <!-- slide 49b -->
+    <string name="EPr_use_contact_picker_desc_enabled">系統的聯繫人選擇程序選項將在任務工作佈置窗口中顯示</string>
+    <string name="EPr_use_contact_picker_desc_disabled">將不會顯示系統的聯繫人選擇程序選項</string>
 
+    <!-- slide 49i: Preferences: Third party addons -->
+    <string name="EPr_third_party_addons">允許第三方加註信息</string>
+    <string name="EPr_third_party_addons_desc_enabled">即將啟用第三方附加軟件</string>
+    <!-- slide 49d -->
+    <string name="EPr_third_party_addons_desc_disabled">即將禁用第三方附加軟件</string>
 
-  <!-- slide 32g: Preference Category: Defaults Title -->
-  <string name="EPr_defaults_header">工作預設值</string>
-  <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
-  
-  <!-- slide 41f:  Preference: Default Urgency Title -->
-  <string name="EPr_default_urgency_title">預設嚴重性</string>
-  <!-- Preference: Default Urgency Description (%s => setting) -->
-  <string name="EPr_default_urgency_desc">目前設定: %s</string>
-  
-  <!-- slide 40a: Preference: Default Importance Title -->
-  <string name="EPr_default_importance_title">Default priority</string>
-  <!-- Preference: Default Importance Description (%s => setting) -->
-  <string name="EPr_default_importance_desc">目前設定: %s</string>
-  
-  <!-- slide 42e: Preference: Default Hide Until Title -->
-  <string name="EPr_default_hideUntil_title">預設隱藏直到...</string>
-  <!-- Preference: Default Hide Until Description (%s => setting) -->
-  <string name="EPr_default_hideUntil_desc">目前設定: %s</string>
-  
-  <!-- slide 43e: Preference: Default Reminders Title -->
-  <string name="EPr_default_reminders_title">預設提醒</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_desc">目前設定: %s</string>
-  
-  <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
-  <string name="EPr_default_addtocalendar_title">默認添加到日曆</string>
-  <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
-  <string name="EPr_default_addtocalendar_desc_disabled">新建任務工作將不會在Google 日曆中創建事件</string>
-  <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
-  <string name="EPr_default_addtocalendar_desc">新建任務工作將會在這個日曆中：“%s”</string>
-  
-  <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
-  <string name="EPr_default_reminders_mode_title">默認鈴聲／振動類型</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_mode_desc">目前設定: %s</string>
-  
-  <string-array name="EPr_default_importance">
-    <!-- importance: labels for "Task Defaults" preference item. -->
-    <!-- slide 40b -->
-    <item>!!!（最高級別）</item>
-    <item>!!</item>
-    <item>!</item>
-    <!-- slide 40c -->
-    <item>o（最低級別）</item>
-  </string-array>
-  
-  <string-array name="EPr_default_urgency">
-    <!-- urgency: labels for "Task Defaults" preference item. -->
-    <!-- slide 41a-->
-    <item>無截止日</item>
-    <!-- slide 41b -->
-    <item>今天</item>
-    <!-- slide 41c-->
-    <item>明天</item>
-    <!-- slide 41d -->
-    <item>後天</item>
-    <!-- slide 41e -->
-    <item>下週</item>
-  </string-array>
-  
-  <string-array name="EPr_default_hideUntil">
-    <!-- hideUntil: labels for "Task Defaults" preference item. -->
-    <!-- slide 42a -->
-    <item>不隱藏</item>
-    <!-- slide 42b -->
-    <item>工作到期</item>
-    <!-- slide 42c -->
-    <item>到期前天數</item>
-    <!-- slide 42d-->
-    <item>到期前週數</item>
-  </string-array>
-  
-  <string-array name="EPr_default_reminders">
-    <!-- reminders: labels for "Task Defaults" preference item. -->
-    <!-- slide 43a -->
-    <item>無截止期限提醒</item>
-    <!-- slide 43b -->
-    <item>在截止期限時</item>
-    <!-- slide 43c -->
-    <item>當過期時</item>
-    <!-- slide 43d -->
-    <item>在截止期限或過期時</item>
-  </string-array>
-  
-  <string-array name="EPr_default_addtocalendar">
-    <!-- addtocalendar: labels for "Task Defaults" preference item. -->
-    <item>@string/EPr_deactivated</item>
-  </string-array>      
+    <!-- Preferences: ideas tab -->
+    <string name="EPr_ideas_tab_enabled">任務工作意見</string>
+    <string name="EPr_ideas_tab_description">獲取多個建議，幫助您完成多項任務工作</string>
 
+    <!-- Preferences: calendar event start time -->
+    <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
+    <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
+    <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
+
+    <string name="EPr_force_phone_layout">使用手機佈局</string>
+
+    <string name="EPr_show_featured_lists">顯示特定列表</string>
+
+    <!-- Configurations -->
+    <string name="EPr_configurations_title">Set configuration</string>
+    <string name="EPr_config_default">Default</string>
+    <string name="EPr_config_lite">Astrid Lite</string>
+
+    <!-- Dialog title when setting preference configuration -->
+    <string name="EPr_config_dialog_title">Set configuration?</string>
+    <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
+    <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
+
+    <!-- default configuration name for the above dialog -->
+    <string name="EPr_config_dialog_default_id">default</string>
+
+    <!-- Preference title for showing save and cancel buttons in task edit page -->
+    <string name="EPr_show_save_and_cancel">Show save and cancel</string>
+
+
+    <!-- Swipe between lists -->
+    <!-- Preference: swipe between lists performance -->
+    <string name="EPr_swipe_lists_performance_title">在列表間滑動</string>
+
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>不使用滑動屏幕</item>
+        <item>節約內存</item>
+        <item>標準性能</item>
+        <item>高效性能</item>
+    </string-array>
+
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <!-- slide 49a -->
+        <item>滑動屏幕切換列表已被禁用</item>
+        <item>較低速性能</item>
+        <item>默認設置</item>
+        <item>使用更多系統資源</item>
+    </string-array>
+
+    <string name="swipe_lists_helper_title">在列表間滑動</string>
+    <string name="swipe_lists_helper_header">在列表間向左或向右快速滑動</string>
+    <string name="swipe_lists_helper_subtitle">在設置-&amp;gt外觀中修改選項</string>
+
+    <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
+
+    <string-array name="EPr_default_reminders_mode">
+        <!-- reminders duration: labels for "Task Defaults" preference item. -->
+        <item>@string/TEA_reminder_mode_once</item>
+        <item>@string/TEA_reminder_mode_five</item>
+        <item>@string/TEA_reminder_mode_nonstop</item>
+    </string-array>
+
+    <string-array name="EPr_themes">
+        <!-- theme_settings: labels for Theme preference menu -->
+        <!-- slide 36a-->
+        <item>藍</item>
+        <!-- slide 36b -->
+        <item>紅</item>
+        <!-- slide 36b -->
+        <item>Sky blue</item>
+        <!-- slide 36c -->
+        <item>Night</item>
+        <!-- slide 36d -->
+        <item>Transparent (white text)</item>
+        <!-- slide 36e -->
+        <item>透明(黑色文字)</item>
+    </string-array>
+
+    <string-array name="EPr_themes_widget">
+        <!-- slide 32i / 37a-->
+        <item>與應用相同</item>
+        <item>日間——藍色</item>
+        <item>日間——紅色</item>
+        <item>Sky blue</item>
+        <item>Night</item>
+        <item>Transparent (white text)</item>
+        <item>Transparent (black text)</item>
+        <item>老式風格</item>
+    </string-array>
+
+    <!-- ========================================== Task Management Settings == -->
+
+    <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
+    <string name="EPr_manage_header">管理舊任務工作</string>
+    <!-- slide 47d -->
+    <string name="EPr_manage_delete_completed">刪除已完成任務工作</string>
+    <string name="EPr_manage_delete_completed_message">您真的要刪除所有已完成任務工作嗎？</string>
+    <!-- slide 47a -->
+    <string name="EPr_manage_delete_completed_summary">已刪除任務工作可以被依次恢復</string>
+    <string name="EPr_manage_delete_completed_status">刪除了 %d 個任務工作！</string>
+    <!-- slide 47e -->
+    <string name="EPr_manage_purge_deleted">清除已刪除任務工作</string>
+    <string name="EPr_manage_purge_deleted_message">您真的要清楚所有已刪除任務工作嗎？ \n\n 這些任務工作將會被徹底永久刪除！</string>
+    <string name="EPr_manage_purge_deleted_status">清除了 %d 個任務工作！</string>
+    <!-- slide 47b-->
+    <string name="EPr_manage_purge_deleted_summary">請注意！若事先沒有備份，已清除的任務工作將無法恢復！</string>
+    <!-- slide 47h-->
+    <string name="EPr_manage_clear_all">清除所有數據</string>
+    <string name="EPr_manage_clear_all_message">刪除所有Astrid任務和設置\n\n警告：不可復原！</string>
+
+    <!-- slide 47f -->
+    <string name="EPr_manage_delete_completed_gcal">刪除日程表中已完成任務工作</string>
+    <string name="EPr_manage_delete_completed_gcal_message">您真的想刪除您所有的事件中已經完成的任務工作嗎？</string>
+    <string name="EPr_manage_delete_completed_gcal_summary"></string>
+    <string name="EPr_manage_delete_completed_gcal_status">清除%d個日曆事件!</string>
+
+    <!-- slide 47g-->
+    <string name="EPr_manage_delete_all_gcal">刪除所有日程表</string>
+    <string name="EPr_manage_delete_all_gcal_message">您真的想刪除您所有事件中的各項任務工作嗎？</string>
+    <string name="EPr_manage_delete_all_gcal_summary"></string>
+    <string name="EPr_manage_delete_all_gcal_status">已經刪除了 %d 個日曆事件了！</string>
+
+    <!-- ==================================================== AddOnActivity == -->
+
+    <!-- Add Ons Activity Title -->
+    <string name="AOA_title">擴展</string>
+
+    <!-- Add-on Activity: author for internal authors  -->
+    <string name="AOA_internal_author">Astrid 團隊</string>
+
+    <!-- Add-on Activity: installed add-ons tab -->
+    <string name="AOA_tab_installed">已安裝</string>
+
+    <!-- Add-on Activity - available add-ons tab -->
+    <string name="AOA_tab_available">可用</string>
+
+    <!-- Add-on Activity - free add-ons label -->
+    <string name="AOA_free">免費</string>
+
+    <!-- Add-on Activity - menu item to visit add-on website -->
+
+    <!-- Add-on Activity - menu item to visit android market -->
+
+    <!-- Add-on Activity - when list is empty -->
+    <string name="AOA_no_addons">空的清單!</string>
+
+    <string name="AOA_ppack_title">Astrid優化工具</string>
+    <string name="AOA_ppack_description">支持Astrid並在Astrid優化工具的幫助下變得更加有效率。提供4＊2
+        和4＊4尺寸的小工具和語音支持。讓我們更加有效率地生活！
+    </string>
+    <string name="AOA_locale_title">Astrid場所插件</string>
+    <string name="AOA_locale_description">在過濾的條件下，允許Astrid利用場所應用推送通知。現在就買場所插件。</string>
+
+    <!-- ====================================================== TasksWidget == -->
+
+    <!-- Widget text when loading tasks -->
+    <string name="TWi_loading">載入中...</string>
+
+    <!-- Widget configuration activity title: select a filter -->
+    <string name="WCA_title">選擇工作顯示...</string>
+
+    <!-- ======================================================== Waiting on me -->
+
+    <string name="wom_commented">%s commented on your task.</string>
+    <string name="wom_mentioned">%s mentioned you.</string>
+    <string name="wom_assigned">%s assigned this to you.</string>
+    <string name="wom_raised_pri">%s raised the priority.</string>
+    <string name="wom_changed_due">%s changed the due date.</string>
+    <string name="wom_default">%s wants your attention.</string>
+
+    <string name="wom_dismiss">Dismiss</string>
+    <string name="wom_acknowledge">I\'ve read this</string>
+
+    <!-- ============================================================= About == -->
+
+    <!-- slide 30h: Title of "About" option in settings -->
+    <string name="p_about">關於 Astrid</string>
+
+    <!-- About text (%s => current version)-->
+    <string name="p_about_text">當前版本： %s\n\n Astrid 是由Todoroo, Inc. 維護的開源軟件。</string>
+
+    <!-- Title of "Help" option in settings -->
+    <string name="p_help">支持</string>
+
+    <!-- slide 30c: Title of "Forums" option in settings -->
+    <string name="p_forums">討論區</string>
+
+    <!-- Title of "Premium" option in settings -->
+    <string name="p_premium">高級</string>
+
+    <!-- ============================================================= Misc == -->
+
+    <string name="feedback_positive_title">Rate Astrid?</string>
+
+    <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star
+        rating?
+    </string>
+
+    <string name="feedback_negative_title">Leave feedback?</string>
+
+    <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
+
+    <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback
+        section--it might not be available on your device.
+    </string>
+
+    <string name="feedback_positive_button">Rate Astrid</string>
+
+    <string name="feedback_negative_button">Leave feedback</string>
+
+    <string name="feedback_not_now">Not now</string>
+
+    <string name="feedback_banner_text">How\'s Astrid working for you?</string>
+
+    <!-- Displayed when task killer found. %s => name of the application -->
+    <string name="task_killer_help">似乎您正在使用會刪除進程的應用程序(%s)！可以的話，請將Astrid
+        加入到例外列表避免被殺死。否則Astrid可能無法通知您任​​務已到期。\n
+    </string>
+
+    <!-- Task killer dialog ok button -->
+    <string name="task_killer_help_ok">我不會中止 Astrid!</string>
+
+    <!-- Astrid\'s Android Marketplace title. It never appears in the app itself. -->
+
+    <!-- Astrid\'s Android Marketplace description. It never appears in the app itself. -->
+    <string name="marketplace_description">
+        Astrid是一款開源並深受人們喜愛的TODO任務工作/列表管理器，旨在提高您處理事務的效率。Astrid包含提醒、標籤、同步、區域插件、小工具等眾多功能。
+    </string>
+
+    <string name="DB_corrupted_title">數據庫已經受損</string>
+
+    <string name="DB_corrupted_body">啊喔！您有一個毀損的資料庫。如果您經常看見這個錯誤出現，我們建議您清除所有數據（在設置-&gt;同步和備份-&amp;gt；管理舊任務工作-&gt;清楚所有數據）並在Astrid備份中重新存入您的任務工作（設置-&gt;同步和備份-&gt;備份-&gt;導入任務工作）</string>
+
+    <string name="market_unavailable">非常抱歉，我們的軟件無法在您的系統中成功運行。</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- slide 32g: Preference Category: Defaults Title -->
+    <string name="EPr_defaults_header">工作預設值</string>
+    <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
+
+    <!-- slide 41f:  Preference: Default Urgency Title -->
+    <string name="EPr_default_urgency_title">預設嚴重性</string>
+    <!-- Preference: Default Urgency Description (%s => setting) -->
+    <string name="EPr_default_urgency_desc">目前設定: %s</string>
+
+    <!-- slide 40a: Preference: Default Importance Title -->
+    <string name="EPr_default_importance_title">Default priority</string>
+    <!-- Preference: Default Importance Description (%s => setting) -->
+    <string name="EPr_default_importance_desc">目前設定: %s</string>
+
+    <!-- slide 42e: Preference: Default Hide Until Title -->
+    <string name="EPr_default_hideUntil_title">預設隱藏直到...</string>
+    <!-- Preference: Default Hide Until Description (%s => setting) -->
+    <string name="EPr_default_hideUntil_desc">目前設定: %s</string>
+
+    <!-- slide 43e: Preference: Default Reminders Title -->
+    <string name="EPr_default_reminders_title">預設提醒</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_desc">目前設定: %s</string>
+
+    <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
+    <string name="EPr_default_addtocalendar_title">默認添加到日曆</string>
+    <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
+    <string name="EPr_default_addtocalendar_desc_disabled">新建任務工作將不會在Google 日曆中創建事件</string>
+    <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
+    <string name="EPr_default_addtocalendar_desc">新建任務工作將會在這個日曆中：“%s”</string>
+
+    <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
+    <string name="EPr_default_reminders_mode_title">默認鈴聲／振動類型</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_mode_desc">目前設定: %s</string>
+
+    <string-array name="EPr_default_importance">
+        <!-- importance: labels for "Task Defaults" preference item. -->
+        <!-- slide 40b -->
+        <item>!!!（最高級別）</item>
+        <item>!!</item>
+        <item>!</item>
+        <!-- slide 40c -->
+        <item>o（最低級別）</item>
+    </string-array>
+
+    <string-array name="EPr_default_urgency">
+        <!-- urgency: labels for "Task Defaults" preference item. -->
+        <!-- slide 41a-->
+        <item>無截止日</item>
+        <!-- slide 41b -->
+        <item>今天</item>
+        <!-- slide 41c-->
+        <item>明天</item>
+        <!-- slide 41d -->
+        <item>後天</item>
+        <!-- slide 41e -->
+        <item>下週</item>
+    </string-array>
+
+    <string-array name="EPr_default_hideUntil">
+        <!-- hideUntil: labels for "Task Defaults" preference item. -->
+        <!-- slide 42a -->
+        <item>不隱藏</item>
+        <!-- slide 42b -->
+        <item>工作到期</item>
+        <!-- slide 42c -->
+        <item>到期前天數</item>
+        <!-- slide 42d-->
+        <item>到期前週數</item>
+    </string-array>
+
+    <string-array name="EPr_default_reminders">
+        <!-- reminders: labels for "Task Defaults" preference item. -->
+        <!-- slide 43a -->
+        <item>無截止期限提醒</item>
+        <!-- slide 43b -->
+        <item>在截止期限時</item>
+        <!-- slide 43c -->
+        <item>當過期時</item>
+        <!-- slide 43d -->
+        <item>在截止期限或過期時</item>
+    </string-array>
+
+    <string-array name="EPr_default_addtocalendar">
+        <!-- addtocalendar: labels for "Task Defaults" preference item. -->
+        <item>@string/EPr_deactivated</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in filter plug-in -->
-    
+
     <!-- ================================================= Filter Exposer == -->
-    
+
     <!-- Active Tasks Filter -->
     <string name="BFE_Active">My Tasks</string>
-    
+
     <!-- Waiting on me filter -->
     <string name="BFE_waiting_on_me">Waiting On Me</string>
-        
+
     <!-- Search Filter -->
-    
+
     <!-- slide 10b: Recently Modified -->
     <string name="BFE_Recent">最近修改過</string>
-    
+
     <!-- slide 10c: I\'ve assigned -->
     <string name="BFE_Assigned">我已經安排</string>
-    
+
     <!-- Build Your Own Filter -->
-    
+
     <!-- Saved Filters Header -->
-    
+
     <!-- Saved Filters Context Menu: delete -->
     <string name="BFE_Saved_delete">刪除篩選</string>
 
     <!-- =========================================== CustomFilterActivity == -->
-    
+
     <!-- slide 30d: Build Your Own Filter Activity Title-->
     <string name="CFA_title">自訂篩選</string>
-    
+
     <!-- slide 30e: Filter Name edit box hint (if user types here, filter will be saved) -->
     <string name="CFA_filterName_hint">命名篩選並儲存...</string>
-    
+
     <!-- Filter Name default for copied filters (%s => old filter name) -->
-    
+
     <!-- slide 30a: Filter Starting Universe: all tasks -->
     <string name="CFA_universe_all">進行中的工作</string>
-    
+
     <!-- Filter Criteria Type: add (at the begging of title of the criteria) -->
     <string name="CFA_type_add">或</string>
-    
+
     <!-- Filter Criteria Type: subtract (at the begging of title of the criteria) -->
     <string name="CFA_type_subtract">非</string>
-    
+
     <!-- Filter Criteria Type: intersect (at the begging of title of the criteria) -->
     <string name="CFA_type_intersect">也</string>
-    
+
     <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
     <string name="CFA_context_chain">%s 含條件</string>
-    
+
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">刪除列</string>
-    
+
     <!-- slide 30b: Filter Screen Help Text -->
     <string name="CFA_help">Long press on items for additional options</string>
-    
+
     <!-- slide 30c: Filter Button: add new -->
     <string name="CFA_button_add">加入條件</string>
-    
+
     <!-- slide 30f: Filter Button: view without saving -->
     <string name="CFA_button_view">檢視</string>
-    
+
     <!-- Filter Button: save & view filter -->
     <string name="CFA_button_save">儲存</string>
 
     <!-- =========================================== CustomFilterCriteria == -->
-        
+
     <!-- Criteria: due by X - display text (? -> user input) -->
     <string name="CFC_dueBefore_text">期限: ?</string>
     <!-- Criteria: due by X - name of criteria -->
@@ -1697,314 +1735,315 @@
         <item>下週</item>
         <item>下個月</item>
     </string-array>
-    
+
     <!-- Criteria: importance - display text (? -> user input)-->
     <string name="CFC_importance_text">Priority at least ?</string>
     <!-- Criteria: importance - name of criteria -->
-    <string name="CFC_importance_name">Priority...</string>        
-    
+    <string name="CFC_importance_name">Priority...</string>
+
     <!-- Criteria: tag - display text (? -> user input) -->
     <string name="CFC_tag_text">列表：?</string>
     <!-- Criteria: tag - name of criteria -->
     <string name="CFC_tag_name">列表...</string>
-    
+
     <!-- Criteria: tag_contains - name of criteria -->
     <string name="CFC_tag_contains_name">列表名包含...</string>
     <!-- Criteria: tag_contains - text (? -> user input) -->
     <string name="CFC_tag_contains_text">列表名包含：?</string>
-    
+
     <!-- Criteria: title_contains - name of criteria -->
     <string name="CFC_title_contains_name">主旨含...</string>
     <!-- Criteria: title_contains - text (? -> user input) -->
     <string name="CFC_title_contains_text">主旨含: ?</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-  
-  <!-- Error message for adding to calendar  -->
-  <string name="gcal_TEA_error">工作加入行事曆錯誤</string>
-
-  <!-- Label for adding task to calendar -->
-
-  <!-- slide 21c: Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">建立行事曆事項</string>
-  
-  <!-- Label when calendar event already exists -->
-  <string name="gcal_TEA_showCalendar_label">打開行事曆事項</string>
-  
-  <!-- Toast when unable to open calendar event -->
-  
-  <!-- Toast when calendar event updated because task changed -->
-  <string name="gcal_TEA_calendar_updated">行事曆事件也更新了!</string>
-  
-  <!-- No calendar label (don\'t add option) -->
-  <string name="gcal_TEA_nocal">事件開啟錯誤!</string>
-  
-  <string name="gcal_TEA_none_selected">To calendar?</string>
-  
-  <string name="gcal_TEA_has_event">日曆活動</string>
-  
-  <!-- ======================================================== Calendars == -->
-  
-  <!-- Calendar event name when task is completed (%s => task title) -->
-  <string name="gcal_completed_title">%s （已完成）</string>
-
-  <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
-  <string name="gcal_GCP_default">預設行事曆</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Error message for adding to calendar  -->
+    <string name="gcal_TEA_error">工作加入行事曆錯誤</string>
 
+    <!-- Label for adding task to calendar -->
 
+    <!-- slide 21c: Label for adding task to calendar -->
+    <string name="gcal_TEA_addToCalendar_label">建立行事曆事項</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Label when calendar event already exists -->
+    <string name="gcal_TEA_showCalendar_label">打開行事曆事項</string>
+
+    <!-- Toast when unable to open calendar event -->
+
+    <!-- Toast when calendar event updated because task changed -->
+    <string name="gcal_TEA_calendar_updated">行事曆事件也更新了!</string>
+
+    <!-- No calendar label (don\'t add option) -->
+    <string name="gcal_TEA_nocal">事件開啟錯誤!</string>
+
+    <string name="gcal_TEA_none_selected">To calendar?</string>
+
+    <string name="gcal_TEA_has_event">日曆活動</string>
+
+    <!-- ======================================================== Calendars == -->
+
+    <!-- Calendar event name when task is completed (%s => task title) -->
+    <string name="gcal_completed_title">%s （已完成）</string>
+
+    <!-- System Default Calendar (displayed if we can\'t figure out calendars)  -->
+    <string name="gcal_GCP_default">預設行事曆</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ============================================================= UI == -->
 
     <!-- filters header: GTasks -->
     <string name="gtasks_FEx_header">Google 工作表</string>
-    
+
     <!-- filter category for GTasks lists -->
-    
+
     <!-- filter title for GTasks lists (%s => list name) -->
     <string name="gtasks_FEx_title">Google 工作表：%s</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_creating_list">正在創建列表……</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_create_list_dialog">新列表名：</string>
-    
+
     <!-- error to show when list creation fails -->
     <string name="gtasks_FEx_create_list_error">創建新列表失敗</string>
-    
+
     <!-- short help title for Gtasks -->
-    
+
     <string name="CFC_gtasks_list_text">列表內容: ?</string>
 
     <string name="CFC_gtasks_list_name">在Google任務工作列表中...</string>
-    
+
     <!-- Message while clearing completed tasks -->
     <string name="gtasks_GTA_clearing">正在清除已完成任務工作……</string>
-    
+
     <!-- Label for clear completed menu item -->
     <string name="gtasks_GTA_clear_completed">清除已完成項</string>
-        
+
     <!-- ============================================ GtasksLoginActivity == -->
-    
-    <!-- Activity Title: Gtasks Login -->    
 
-    <!-- Instructions: Gtasks login -->    
+    <!-- Activity Title: Gtasks Login -->
+
+    <!-- Instructions: Gtasks login -->
     <string name="gtasks_GLA_body">請登錄到谷歌任務工作同步（Beta!）。目前不支持非遷移的“Google應用服務”帳戶。</string>
-    
+
     <string name="gtasks_GLA_noaccounts">沒有可用的Google帳戶同步。</string>
 
-    <!-- Instructions: Gtasks further help -->    
-    <string name="gtasks_GLA_further_help">檢視工作時若想保留縮排與排序，請到篩選頁面選擇Google Tasks的工作清單。Astrid預設採用自有的工作排序。</string>
+    <!-- Instructions: Gtasks further help -->
+    <string name="gtasks_GLA_further_help">檢視工作時若想保留縮排與排序，請到篩選頁面選擇Google
+        Tasks的工作清單。Astrid預設採用自有的工作排序。
+    </string>
+
+    <!-- Sign In Button -->
 
-    <!-- Sign In Button -->    
+    <!-- E-mail Address Label -->
 
-    <!-- E-mail Address Label -->    
+    <!-- Password Label -->
 
-    <!-- Password Label -->    
-    
     <!--  Authenticating toast -->
     <string name="gtasks_GLA_authenticating">正在認證...</string>
-    
+
     <!-- Google Apps for Domain checkbox -->
 
-    <!-- Error Message when fields aren\'t filled out -->    
+    <!-- Error Message when fields aren\'t filled out -->
 
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
     <string name="gtasks_GLA_errorAuth">驗證出錯！請在您手機的帳戶管理器中檢查您的用戶名和密碼</string>
 
-    <!-- Error Message when we receive an IO Exception -->    
+    <!-- Error Message when we receive an IO Exception -->
     <string name="gtasks_GLA_errorIOAuth">對不起，我們在與Google 服務器通訊時遇到了問題。請稍後再嘗試。</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->    
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->
     <string name="gtasks_GLA_errorAuth_captcha">您可能需要輸入captcha(驗證碼)。嘗試從瀏覽器登入後再回來重試:</string>
-    
+
     <!-- ============================================== GtasksPreferences == -->
 
-    <!-- GTasks Preferences Title -->    
+    <!-- GTasks Preferences Title -->
     <string name="gtasks_GPr_header">Google Tasks (測試中!)</string>
-    
-    <!-- ================================================ Synchronization == -->    
-    
+
+    <!-- ================================================ Synchronization == -->
+
     <!-- title for notification tray when synchronizing -->
 
     <!-- Error Message when we receive a HTTP 503 error -->
-    <string name="gtasks_error_backend">Google 的工作表應用程序界面正處於測試版階段，而且遇到了出錯。這個服務可能已經停止，請稍後再嘗試。</string>
-    
+    <string name="gtasks_error_backend">Google 的工作表應用程序界面正處於測試版階段，而且遇到了出錯。這個服務可能已經停止，請稍後再嘗試。
+    </string>
+
     <!-- Error for account not found -->
     <string name="gtasks_error_accountNotFound">找不到帳戶%s——請退出，然後從Google 工作表設置中重新登錄。</string>
-    
+
     <!-- Error when ping after refreshing token fails -->
     <string name="gtasks_error_authRefresh">無法用Google 工作表驗證。請檢查您的帳戶密碼或者稍後再嘗試。</string>
-    
+
     <!-- Error when account manager returns no auth token or throws exception -->
     <string name="gtasks_error_accountManager">您手機的帳戶管理器出錯了。請退出，然後從Google 工作表設置中重新登陸。</string>
 
     <!-- Error when authorization error happens in background sync -->
     <string name="gtasks_error_background_sync_auth">後台驗證出錯了。請在Astrid 運行時嘗試啟動同步。</string>
-      
+
     <string name="gtasks_import_progress">Importing Google Tasks...</string>
 
-    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you still want to add the task %2$s to it?</string>
+    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you
+        still want to add the task %2$s to it?
+    </string>
 
     <string name="gtasks_import_dlg_title">Google Tasks Import</string>
 
     <string name="gtasks_import_add_task_ok">Add task</string>
 
     <string name="gtasks_import_add_task_cancel">Don\'t add task</string>
-        
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- NEW USER EXPERIENCE -->
-  
-  <!-- help bubbles -->
-  <!-- slide 8c: Shown the first time a user sees the task list activity -->
-  <string name="help_popover_add_task">添加一兩項任務工作來開始使用</string>
-
-  <!-- Shown the first time a user adds a task to a list -->  
-  <string name="help_popover_tap_task">輕點任務工作進行編輯和分享</string>
-  
-  <!-- slide 14a: Shown the first time a user sees the list activity -->
-  <string name="help_popover_list_settings">輕點這裡進行編輯或者分享這個列表</string>
-  
-  <!-- slide 26c: Shown the first time a user sees the list settings tab -->
-  <string name="help_popover_collaborators">和您分享的人\n能幫助您建立您的列表或者一起完成任務工作</string>
-  
-  <!-- Shown after user adds a task on tablet-->
-  <string name="help_popover_add_lists">點擊標籤添加列表</string>
-  
-  <!-- Shown after a user adds a task on phones -->
-  <string name="help_popover_switch_lists">輕點添加一個列表或者在列表間切換</string>
-  
-  
-  
-  <!-- Login activity -->
-  
-  
-  <!-- slide 7b -->
-  <string name="welcome_login_tos_base">您使用Astrid 就表明您同意所有</string>
-  
-  <string name="welcome_login_tos_link">服務條款</string>
-  
-  <!-- slide 7e -->
-  <string name="welcome_login_pw">Sign up</string>
-  
-  <string name="welcome_sign_in">登入</string>
-
-  <!-- slide 7f -->
-  <string name="welcome_login_later">稍後</string>
-  
-  <string name="welcome_login_confirm_later_title">為什麼不登錄呢？</string>
-  
-  <string name="welcome_login_confirm_later_ok">我會的！</string>
-  
-  <string name="welcome_login_confirm_later_cancel">不了，謝謝</string>
-  
-  <string name="welcome_login_confirm_later_dialog">登錄吧，充分利用Astrid！無需任何費用，您就可以獲得在線備份、和Astrid.com 全面同步、可以通過電子郵件添加任務工作、而且您甚至可以和朋友們一起分享任務工作列表呢！</string>
+    <!-- NEW USER EXPERIENCE -->
 
+    <!-- help bubbles -->
+    <!-- slide 8c: Shown the first time a user sees the task list activity -->
+    <string name="help_popover_add_task">添加一兩項任務工作來開始使用</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Shown the first time a user adds a task to a list -->
+    <string name="help_popover_tap_task">輕點任務工作進行編輯和分享</string>
 
+    <!-- slide 14a: Shown the first time a user sees the list activity -->
+    <string name="help_popover_list_settings">輕點這裡進行編輯或者分享這個列表</string>
 
-  <!-- Resources for built-in locale plug-in -->
-
-  <!-- Locale Alert Editing Window Title -->
-  <string name="locale_edit_alerts_title">Astrid 篩選警示</string>
-  
-  <!-- Locale Window Help -->                                                                                                                                            
-  <string name="locale_edit_intro">當您有工作在篩選內時，Astrid將送出提醒</string>
-      
-  <!-- Locale Window Filter Picker UI -->                                                                                                                                        
-      
-  <!-- Locale Window Interval Label -->                                                                                                                                        
-  <string name="locale_interval_label">限制提醒:</string>        
-      
-  <!-- Locale Window Interval Values -->                                                                                                                                        
-  <string-array name="locale_interval">
-    <item>每小時一次</item>
-    <item>6小時一次</item>
-    <item>20小時一次</item>
-    <item>每天一次</item>
-    <item>3天一次</item>
-    <item>每週一次</item>
-  </string-array>        
-      
-  <!-- Locale Notification text -->                                                                                                                                        
-  <string name="locale_notification">您有 $NUM 符合: $FILTER</string>     
-      
-  <!-- Locale Plugin was not found, it is required -->
-  <string name="locale_plugin_required">請安裝Astrid地區插件</string>        
-     
+    <!-- slide 26c: Shown the first time a user sees the list settings tab -->
+    <string name="help_popover_collaborators">和您分享的人\n能幫助您建立您的列表或者一起完成任務工作</string>
 
+    <!-- Shown after user adds a task on tablet-->
+    <string name="help_popover_add_lists">點擊標籤添加列表</string>
+
+    <!-- Shown after a user adds a task on phones -->
+    <string name="help_popover_switch_lists">輕點添加一個列表或者在列表間切換</string>
+
+
+    <!-- Login activity -->
+
+
+    <!-- slide 7b -->
+    <string name="welcome_login_tos_base">您使用Astrid 就表明您同意所有</string>
+
+    <string name="welcome_login_tos_link">服務條款</string>
+
+    <!-- slide 7e -->
+    <string name="welcome_login_pw">Sign up</string>
+
+    <string name="welcome_sign_in">登入</string>
+
+    <!-- slide 7f -->
+    <string name="welcome_login_later">稍後</string>
+
+    <string name="welcome_login_confirm_later_title">為什麼不登錄呢？</string>
+
+    <string name="welcome_login_confirm_later_ok">我會的！</string>
+
+    <string name="welcome_login_confirm_later_cancel">不了，謝謝</string>
+
+    <string name="welcome_login_confirm_later_dialog">登錄吧，充分利用Astrid！無需任何費用，您就可以獲得在線備份、和Astrid.com
+        全面同步、可以通過電子郵件添加任務工作、而且您甚至可以和朋友們一起分享任務工作列表呢！
+    </string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in locale plug-in -->
+
+    <!-- Locale Alert Editing Window Title -->
+    <string name="locale_edit_alerts_title">Astrid 篩選警示</string>
+
+    <!-- Locale Window Help -->
+    <string name="locale_edit_intro">當您有工作在篩選內時，Astrid將送出提醒</string>
+
+    <!-- Locale Window Filter Picker UI -->
+
+    <!-- Locale Window Interval Label -->
+    <string name="locale_interval_label">限制提醒:</string>
+
+    <!-- Locale Window Interval Values -->
+    <string-array name="locale_interval">
+        <item>每小時一次</item>
+        <item>6小時一次</item>
+        <item>20小時一次</item>
+        <item>每天一次</item>
+        <item>3天一次</item>
+        <item>每週一次</item>
+    </string-array>
+
+    <!-- Locale Notification text -->
+    <string name="locale_notification">您有 $NUM 符合: $FILTER</string>
+
+    <!-- Locale Plugin was not found, it is required -->
+    <string name="locale_plugin_required">請安裝Astrid地區插件</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- ====================== Plugin Boilerplate ========================= -->
 
-	<!-- filters header: OpenCRX -->
+    <!-- filters header: OpenCRX -->
     <string name="opencrx_FEx_header">打開CRX</string>
-    
+
     <!-- filter category for OpenCRX ActivityCreators -->
     <string name="opencrx_FEx_dashboard">工作區</string>
-    
+
     <!-- filter category for OpenCRX responsible person -->
     <string name="opencrx_FEx_responsible">指派給</string>
-    
+
     <!--  OpenCRX assignedTo filter title (%s => assigned contact) -->
     <string name="opencrx_FEx_responsible_title">指派給 \'%s\'</string>
-    
+
     <!-- detail for showing tasks created by someone else (%s => person name) -->
     <string name="opencrx_PDE_task_from">來自 %s</string>
-    
+
     <!-- replacement string for task edit "Notes" when using OpenCRX -->
     <string name="opencrx_TEA_notes">新增註解</string>
-    
+
     <string name="opencrx_creator_input_hint">創建者</string>
 
     <string name="opencrx_contact_input_hint">指派給</string>
     <!-- ==================================================== Preferences == -->
 
-    <!-- Preferences Title: OpenCRX -->    
+    <!-- Preferences Title: OpenCRX -->
     <string name="opencrx_PPr_header">打開CRX</string>
 
     <!-- creator title for tasks that are not synchronized -->
     <string name="opencrx_no_creator">不要同步</string>
 
-	<!-- preference title for default creator -->
+    <!-- preference title for default creator -->
     <string name="opencrx_PPr_defaultcreator_title">默認活動創建者</string>
 
     <!-- preference description for default creator (%s -> setting) -->
@@ -2012,7 +2051,7 @@
 
     <!-- preference description for default dashboard (when set to \'not synchronized\') -->
     <string name="opencrx_PPr_defaultcreator_summary_none">新活動默認不會被同步</string>
-    
+
     <!--  OpenCRX host and segment group name -->
     <string name="opencrx_group">OpenCRX 服務器</string>
 
@@ -2021,81 +2060,87 @@
 
     <!--  dialog title for OpenCRX host -->
     <string name="opencrx_host_dialog_title">OpenCRX 主機</string>
-    
+
     <!--  example for OpenCRX host -->
-    <string name="opencrx_host_summary">"例如 "<i>mydomain.com</i></string>
-    
+    <string name="opencrx_host_summary">"例如 "
+        <i>mydomain.com</i>
+    </string>
+
     <!--  preference description for OpenCRX segment -->
     <string name="opencrx_segment_title">段</string>
 
     <!--  dialog title for OpenCRX segment -->
     <string name="opencrx_segment_dialog_title">同步段</string>
-    
+
     <!--  example for OpenCRX segment -->
-    <string name="opencrx_segment_summary">"例如： "<i>" 標準 "</i></string>
-    
+    <string name="opencrx_segment_summary">"例如： "
+        <i>" 標準 "</i>
+    </string>
+
     <!--  default value for OpenCRX segment -->
     <string name="opencrx_segment_default">標準值</string>
-    
+
     <!--  preference description for OpenCRX provider -->
     <string name="opencrx_provider_title">提供者</string>
 
     <!--  dialog title for OpenCRX provider -->
     <string name="opencrx_provider_dialog_title">OpenCRX 數據提供者</string>
-    
+
     <!--  example for OpenCRX provider -->
-    <string name="opencrx_provider_summary">"例如 "<i>CRX</i></string>
-    
+    <string name="opencrx_provider_summary">"例如 "
+        <i>CRX</i>
+    </string>
+
     <!--  default value for OpenCRX provider -->
     <string name="opencrx_provider_default">CRX</string>
     <!-- ================================================= Login Activity == -->
 
-    <!-- Activity Title: Opencrx Login -->    
+    <!-- Activity Title: Opencrx Login -->
     <string name="opencrx_PLA_title">登錄到 OpenCRX</string>
 
-    <!-- Instructions: Opencrx login -->    
+    <!-- Instructions: Opencrx login -->
     <string name="opencrx_PLA_body">用您的 OpenCRX 帳號登陸</string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
     <string name="opencrx_PLA_signIn">登入</string>
 
-    <!-- Login Label -->    
+    <!-- Login Label -->
     <string name="opencrx_PLA_login">登錄</string>
 
-    <!-- Password Label -->    
+    <!-- Password Label -->
     <string name="opencrx_PLA_password">密碼</string>
-    
-        <!-- Error Message when fields aren\'t filled out -->    
+
+    <!-- Error Message when fields aren\'t filled out -->
     <string name="opencrx_PLA_errorEmpty">錯誤：請填充所有字段</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
     <string name="opencrx_PLA_errorAuth">錯誤：用戶名或密碼錯誤！</string>
 
     <!-- ================================================ Synchronization == -->
-        
+
     <!-- title for notification tray after synchronizing -->
     <string name="opencrx_notification_title">OpenCRX</string>
-    
+
     <!-- text for notification tray when synchronizing -->
     <string name="opencrx_notification_text">%s 工作已更新/點選檢視細節</string>
-    
+
     <!-- Error msg when io exception  -->
     <string name="opencrx_ioerror">連結錯誤! 檢查您的網際網路連線.</string>
 
     <!-- opencrx Login not specified-->
     <string name="opencrx_MLA_email_empty">用戶名未指定！</string>
-    
+
     <!-- opencrx password not specified-->
     <string name="opencrx_MLA_password_empty">密碼未指定!</string>
-    
+
     <!-- ================================================ labels for layout-elements == -->
-    
+
     <!-- label for task-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_task_assign_label">指派工作給此人:</string>
-    
+
     <!-- Spinner-item for unassigned tasks on taskeditactivity -->
     <string name="opencrx_TEA_task_unassigned">反指派</string>
-    
+
     <!-- label for dashboard-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_creator_assign_label">指派該任務工作給此創建者：</string>
 
@@ -2103,7 +2148,7 @@
     <string name="opencrx_TEA_dashboard_default">&lt;默認&gt;</string>
 
     <string name="opencrx_TEA_opencrx_title">打開CRX控制面板</string>
-        
+
     <string name="CFC_opencrx_in_workspace_text">在任務工作區: ?</string>
 
     <string name="CFC_opencrx_in_workspace_name">在任務工作區...</string>
@@ -2113,52 +2158,50 @@
     <string name="CFC_opencrx_assigned_to_name">指派給...</string>
 
 
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
+    <!-- ================================================== EditPreferences == -->
 
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 32j: Preference Category: Power Pack -->
-  <string name="EPr_powerpack_header">高級和其它設置</string>
-  <string name="EPr_powerpack_summary">未接電話提醒，語音輸入和其它設置</string>
-  
-  <!-- slide 32e: Preference: Anonymous User Statistics -->
-  <string name="EPr_statistics_title">匿名使用統計</string>
-  <!-- Preference: User Statistics (disabled) -->
-  <string name="EPr_statistics_desc_disabled">不報告使用資料</string>  
-  <!-- slide 32f: Preference: User Statistics (enabled) -->
-  <string name="EPr_statistics_desc_enabled">傳送匿名使用資料以協助我們改進Astrid</string>
-      
+    <!-- slide 32j: Preference Category: Power Pack -->
+    <string name="EPr_powerpack_header">高級和其它設置</string>
+    <string name="EPr_powerpack_summary">未接電話提醒，語音輸入和其它設置</string>
 
+    <!-- slide 32e: Preference: Anonymous User Statistics -->
+    <string name="EPr_statistics_title">匿名使用統計</string>
+    <!-- Preference: User Statistics (disabled) -->
+    <string name="EPr_statistics_desc_disabled">不報告使用資料</string>
+    <!-- slide 32f: Preference: User Statistics (enabled) -->
+    <string name="EPr_statistics_desc_enabled">傳送匿名使用資料以協助我們改進Astrid</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <string name="speech_err_network">網絡出錯！語音識別需要網絡連接才能運作。</string>
     <string name="speech_err_no_match">對不起，我聽不明白喔！請再說一次吧。</string>
     <string name="speech_err_default">對不起，語音識別遇到出錯。請重新再試。</string>
-    
+
     <string name="premium_attach_file">附上一份文件</string>
     <string name="premium_record_audio">錄製一條便箋</string>
     <string name="premium_no_files">沒有附加文件</string>
     <string name="premium_remove_file_confirm">您確定嗎？無法恢復的喔</string>
-    
+
     <string name="audio_recording_title">正在錄製音頻</string>
     <string name="audio_stop_recording">停止錄製</string>
     <string name="audio_speak_now">現在請講！</string>
     <string name="audio_encoding">正在編碼…</string>
     <string name="audio_err_encoding">音頻編碼出錯</string>
     <string name="audio_err_playback">對不起，系統不支持這種類型的音頻文件</string>
-    
+
     <string name="search_market_audio">找不到播放器來處理這種音頻類型。您想從安卓市場上下載一個音頻播放器嗎？</string>
     <string name="search_market_audio_title">找不到音頻播放器</string>
 
@@ -2167,10 +2210,10 @@
 
     <string name="search_market_ms">找不到微軟Office 閱讀器。您想從安卓市場上下載一個微軟Office 閱讀器嗎？</string>
     <string name="search_market_ms_title">找不到微軟 Office</string>
-    
+
     <string name="file_type_unhandled">對不起！找不到應用程序處理這種文件類型。</string>
     <string name="file_type_unhandled_title">找不到應用程序</string>
-    
+
     <string name="file_prefix_image">圖片</string>
     <string name="file_prefix_voice">語音</string>
     <string name="file_browser_up">向上</string>
@@ -2187,38 +2230,47 @@
     <string name="file_err_download">下載文件時出錯</string>
     <string name="file_err_no_directory">糟糕！這個文件目錄似乎並不存在。請在Astrid 設置中選擇目錄以存放文件。</string>
     <string name="file_err_show">對不起，系統尚未支持這種類型的文件</string>
-    
+
     <string name="file_dir_dialog_ok">使用此目錄</string>
     <string name="file_dir_dialog_default">重設為默認值</string>
-    
+
     <string name="p_files_dir">高級下載設置</string>
     <!-- Description for file download directory preference. %s -> chosen directory -->
     <string name="p_files_dir_desc">將任務工作附件保存至：%s</string>
     <string name="p_files_dir_desc_default">默認目錄</string>
 
-    
+
     <!-- in app billing -->
     <string name="billing_not_supported_title">無法完成交易</string>
     <string name="billing_not_supported_message">付款服務暫時無法使用。您能繼續使用這個應用軟件，但是您無法成功購買。</string>
     <string name="subscriptions_not_supported_title">無法訂閱服務。</string>
-    <string name="subscriptions_not_supported_message">此設備上的Market賬單服務暫時無法支持購買。 您能在http://astrid.com/premium上購買Astrid Premium。</string>
+    <string name="subscriptions_not_supported_message">此設備上的Market賬單服務暫時無法支持購買。
+        您能在http://astrid.com/premium上購買Astrid Premium。
+    </string>
     <string name="cannot_connect_title">無法連接網上Market</string>
-    <string name="cannot_connect_message">此應用程序無法連接Market。您的Market版本也許過低。您能繼續使用此程序，但是您無法成功交易。</string>
-    
+    <string name="cannot_connect_message">此應用程序無法連接Market。您的Market版本也許過低。您能繼續使用此程序，但是您無法成功交易。
+    </string>
+
     <string name="restoring_transactions">恢復交易</string>
-    
+
     <string name="subscriptions_learn_more">了解更多</string>
-    
-    <string name="kii_premium_success">Thanks for participating in this offer! Your free month of Astrid Premium is now unlocked.</string>
+
+    <string name="kii_premium_success">Thanks for participating in this offer! Your free month of
+        Astrid Premium is now unlocked.
+    </string>
     <string name="kii_premium_abort">Special offer aborted</string>
     <string name="kii_premium_declined">Special offer declined</string>
-    <string name="kii_premium_error">There was an error processing this offer. Please try again later.</string>
-    
+    <string name="kii_premium_error">There was an error processing this offer. Please try again
+        later.
+    </string>
+
     <string name="premium_offers_title">Special Offer</string>
     <string name="premium_offers_subtitle">Want one month of Astrid Premium for free?</string>
-    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a short video by this sponsor. (They will also require your email address.)</string>
+    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a
+        short video by this sponsor. (They will also require your email address.)
+    </string>
     <string name="premium_offers_start">Get it free!</string>
-    
+
     <string name="premium_billing_title">Astrid高級版本</string>
     <string name="premium_buy_month">1 個月</string>
     <string name="premium_buy_year">1 年</string>
@@ -2234,725 +2286,731 @@
     <string name="premium_already_subscribed">您已經購買了Astrid Premium！</string>
     <string name="premium_login_prompt">為了成功購買高級版本，您需要一個Astrid.com的賬戶。 請在我們的網站上登錄或者註冊。</string>
     <string name="premium_success">謝謝購買Astrid Premium！</string>
-    <string name="premium_success_with_server_error">謝謝購買Astrid Premium！新的特點將會很快在astrid.com發布，並且在您的手機裡立刻得到更新。</string>
-    <string name="premium_verification_error">此Google Play 帳戶的高級版本正與另一個用戶連接。訪問astrid.com/users/profile並連接您帳戶的另一個電子郵箱。</string>
+    <string name="premium_success_with_server_error">謝謝購買Astrid
+        Premium！新的特點將會很快在astrid.com發布，並且在您的手機裡立刻得到更新。
+    </string>
+    <string name="premium_verification_error">此Google Play
+        帳戶的高級版本正與另一個用戶連接。訪問astrid.com/users/profile並連接您帳戶的另一個電子郵箱。
+    </string>
     <string name="premium_check_for_purchases">您已經購買過尊貴版了嗎？按這裡到Google Play 確認您的購買歷史。</string>
     <string name="premium_checking_for_purchases">Checking for purchases...</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
-  <!-- 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">提醒我：</string>
-
-  <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">當任務工作到期時</string>
-
-  <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">當任務工作過期時</string>
-
-  <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_randomly">隨機一次</string>
-
-  <!-- Task Edit: Reminder alarm clock label -->  
-  <string name="TEA_reminder_alarm_label">鈴響/震動類型：</string>
-
-  <!--  slide 45a: Task Edit: Reminder mode: ring once -->  
-  <string name="TEA_reminder_mode_once">Once</string>
-
-  <!-- slide 45b: Task Edit: Reminder mode: ring five times -->  
-  <string name="TEA_reminder_mode_five">Five times</string>
-
-  <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->  
-  <string name="TEA_reminder_mode_nonstop">Until I dismiss alarm</string>
-  
-  <string name="TEA_reminder_when">when</string>
-  
-  <string name="TEA_reminder_due_short">due</string>
-
-  <string name="TEA_reminder_overdue_short">overdue</string>
-
-  <string name="TEA_reminder_randomly_short">randomly</string>
-
-  <string name="TEA_reminder_display_one">Remind me %s</string>
-  
-  <string name="TEA_reminder_display_multiple">Remind %s</string>
-
-  <string-array name="TEA_reminder_random">
-    <!-- random reminder choices for task edit page. -->
-    <item>一個小時</item>
-    <item>一天</item>
-    <item>一個星期</item>
-    <item>兩星期內</item>
-    <item>一個月</item>
-    <item>兩個月內</item>
-  </string-array>
-  
-  <!-- ==================================================== notifications == -->
-  
-  <!-- Name of filter when viewing a reminder -->
-  <string name="rmd_NoA_filter">提醒！</string>
-  
-  <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">已完成!</string>
-  
-  <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">晚點提醒...</string>
-  
-  <!-- Reminder: Completed Toast -->
-  <string name="rmd_NoA_completed_toast">恭喜，已經完成了！</string>
-  
-  <!-- Prefix for reminder dialog title -->
-  <string name="rmd_NoA_dlg_title">提醒：</string>
-  
-  <!-- ==================================================== user reengagement == -->
-
-  <!-- Titles for user reengagement notifications -->
-  <string-array name="rmd_reengage_notif_titles">
-    <item>Astrid 的提示</item>
-    <!-- %s -> first name -->
-    <item>%s 的備忘錄。</item> 
-    <item>您的 Astrid 摘要</item>
-    <item>Astrid 的提醒</item>
-  </string-array>
-    
-  <string name="rmd_reengage_name_default">您</string>
-
-  
-  <string name="rmd_reengage_add_tasks">添加任務工作</string>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs -->
-  <string-array name="rmd_reengage_dialog_options">
-    <item>是時候縮短您的任務工作清單了！</item>
-    <item>尊敬的先生或女士，有一些任務工作等待您的檢查！</item>
-    <item>嘿，您好，您可不可以看一看這些任務工作？</item>
-    <item>我有些任務工作，上面有您的名字喔！</item>
-    <item>您今天的一批新任務工作！</item>
-    <item>您看起來棒極了！準備好開始了嗎？</item>
-    <item>今天不錯，是時候搞定一些事兒了，我認為是這樣的！</item>
-  </string-array>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>您不想生活變得更加有條理嗎？</item>
-    <item>我是Astrid！我隨時幫助您做更多事情！</item>
-    <item>您好像好忙喔！讓我來分擔一下您的重擔裡的一些活兒唄。</item>
-    <item>我可以幫您記錄您生活中的所有細節。</item>
-    <item>您真的要搞定更多事情嗎？我也是啊！</item>
-    <item>好高興認識您咽！</item>
-  </string-array>
-  <!-- ============================================= reminder preferences == -->
-  
-  <!-- slide 33d: Reminder Preference Screen Title -->
-  <string name="rmd_EPr_alerts_header">提醒設置</string>
-  <string name="rmd_EPr_alerts_summary">勿擾模式，稍候提醒，持續提醒</string>
-    
-  <!-- Reminder Preference: Reminders Enabled Title -->
-  <string name="rmd_EPr_enabled_title">允許提醒？</string>
-  <!-- Reminder Preference Reminders Enabled Description (true) -->
-  <string name="rmd_EPr_enabled_desc_true">Astrid 提示功能已經啟用（這是正常的）</string>
-  <!-- Reminder Preference Reminders Enabled Description (false) -->
-  <string name="rmd_EPr_enabled_desc_false">Astrid 提示功能將不再出現在您的手機裡</string>  
-    
-  <!-- Reminder Preference: Quiet Hours Start Title -->
-  <string name="rmd_EPr_quiet_hours_start_title">無聲開始時間</string>
-  <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">%s 後提示將靜止。\n注意：震動在下面的選項中控制！</string>
-  <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
-  <string name="rmd_EPr_quiet_hours_desc_none">未設定無聲功能</string>
-  
-  <!-- Reminder Preference: Quiet Hours End Title -->
-  <string name="rmd_EPr_quiet_hours_end_title">無聲結束時間</string>
-  <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_end_desc">通知將在 %s</string>
-
-  <!-- Reminder Preference: Default Reminder Title -->
-  <string name="rmd_EPr_rmd_time_title">默認提示</string>
-  <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
-  <string name="rmd_EPr_rmd_time_desc">未設定截止日期任務工作的通知會於%s 出現</string>
-
-  <!-- Reminder Preference: Notification Ringtone Title -->
-  <string name="rmd_EPr_ringtone_title">提醒鈴聲</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
-  <string name="rmd_EPr_ringtone_desc_custom">自定鈴聲已設定</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
-  <string name="rmd_EPr_ringtone_desc_silent">鈴聲設定為靜音</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
-  <string name="rmd_EPr_ringtone_desc_default">使用預設鈴聲</string>
-  
-  <!-- Reminder Preference: Notification Persistence Title -->
-  <string name="rmd_EPr_persistent_title">持續通知</string>
-  <!-- Reminder Preference: Notification Persistence Description (true) -->
-  <string name="rmd_EPr_persistent_desc_true">通知必須個別地清除</string>
-  <!-- Reminder Preference: Notification Persistence Description (false) -->
-  <string name="rmd_EPr_persistent_desc_false">通知可經由點選“清除全部”清除</string>
-
-  <!-- Reminder Preference: Social Reminders Title -->
-  <string name="rmd_EPr_social_title">Social encouragement</string>
-  <!-- Reminder Preference: Social Reminders Summary (enabled) -->
-  <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for shared tasks</string>
-  <!-- Reminder Preference: Social Reminders Summary (disabled) -->
-  <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you for shared tasks</string>
-  
-  
-  
-  <!-- Reminder Preference: Notification Icon Title -->
-  <!-- Reminder Preference: Notification Icon Description -->
-
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
-  <string name="rmd_EPr_multiple_maxvolume_title">多重提醒最大音量</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid將會以最大音量進行多重提醒</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid使用系統音量設置</string>
-
-  <!-- Reminder Preference: Vibrate Title -->
-  <string name="rmd_EPr_vibrate_title">震動提醒</string>
-  <!-- Reminder Preference: Vibrate Description (true) -->
-  <string name="rmd_EPr_vibrate_desc_true">傳送通知時會震動</string>
-  <!-- Reminder Preference: Vibrate Description (false) -->
-  <string name="rmd_EPr_vibrate_desc_false">傳送通知震動關閉</string>
-
-  <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">Astrid 提醒</string>
-  <!-- Reminder Preference: Nagging Description (true) -->
-  <string name="rmd_EPr_nagging_desc_true">Astrid提醒時給鼓勵訊息！！</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_nagging_desc_false">Astrid停止傳送任何鼓勵訊息</string>
-
-  <!-- Reminder Preference: Snooze Dialog Title -->  
-  <string name="rmd_EPr_snooze_dialog_title">晚點提醒對話框 小時:分鐘</string>
-  <!-- Reminder Preference: Snooze Dialog Description (true) -->
-  <string name="rmd_EPr_snooze_dialog_desc_true">選擇晚點提醒的時間(小時:分鐘)</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_snooze_dialog_desc_false">選擇幾天/小時後再提醒</string>
-  
-  <!-- slide 44g: Reminder Preference: Default Reminders Title -->
-  <string name="rmd_EPr_defaultRemind_title">隨機提醒</string>
-  <!-- Reminder Preference: Default Reminders Setting (disabled) -->
-  <string name="rmd_EPr_defaultRemind_desc_disabled">隨機提醒功能關閉</string>
-  <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
-  <string name="rmd_EPr_defaultRemind_desc">工作將隨機提醒: %s</string>
-  
-  <!-- slide 39a: Defaults Title -->
-  
-  <string-array name="EPr_reminder_random">
-    <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
-    <item>停用</item>
-    <!-- slide 44b -->
-    <item>每小時</item>
-    <!-- slide 44c -->
-    <item>每天</item>
-    <!-- slide 44d-->
-    <item>每週</item>
-    <!-- slide 44e-->
-    <item>每2週</item>
-    <!-- slide 44f -->
-    <item>每月</item>
-    <item>每2個月</item>
-  </string-array>
-        
-  <string-array name="EPr_quiet_hours_start">
-    <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
-    <item>停用</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>00:00</item>
-    <item>01:00</item>
-    <item>02:00</item>
-    <item>03:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-  </string-array>
-  
-  <string-array name="EPr_quiet_hours_end">
-    <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>24:00</item>
-    <item>01:00</item>
-    <item>02:00</item>
-    <item>03:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-  </string-array>
-  
-  <string-array name="EPr_rmd_time">
-    <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
-    <item>09:00</item>
-    <item>10:00</item>
-    <item>11:00</item>
-    <item>12:00</item>
-    <item>13:00</item>
-    <item>14:00</item>
-    <item>15:00</item>
-    <item>16:00</item>
-    <item>17:00</item>
-    <item>18:00</item>
-    <item>19:00</item>
-    <item>20:00</item>
-    <item>21:00</item>
-    <item>22:00</item>
-    <item>23:00</item>
-    <item>24:00</item>
-    <item>01:00</item>
-    <item>02:00</item>
-    <item>03:00</item>
-    <item>04:00</item>
-    <item>05:00</item>
-    <item>06:00</item>
-    <item>07:00</item>
-    <item>08:00</item>
-  </string-array>
-  
-  <!-- =============================================== random reminders == -->
-
-  <string name="reminders_social">這些人全靠你了！</string>
-  
-  <string name="reminders_social_one">%s is counting on you!</string>
-  
-  <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
-
-  <string-array name="reminders">
-      <!-- reminders: Make these < 20 chars so the task name is displayed -->
-      <item>你好! 有點時間?</item>
-      <item>能借用一點時間?</item>
-      <item>有幾分鐘?</item>
-      <item>忘了什麼嗎?</item>
-      <item>不好意思!</item>
-      <item>當您有時間:</item>
-      <item>在您的議程:</item>
-      <item>有空嗎?</item>
-      <item>注意一下Astrid!</item>
-      <item>可打擾一下嗎?</item>
-      <item>能借一分鐘?</item>
-      <item>這是重要的一天</item>
-  </string-array>
-
-  <string-array name="reminders_due">
-      <!-- reminders related to task due date -->
-      <item>該工作囉!</item>
-      <item>期限快到了!</item>
-      <item>要開始了?</item>
-      <item>您說過您將會:</item>
-      <item>假設您開始:</item>
-      <item>該開始:</item>
-      <item>時候到了!</item>
-      <item>抱歉! 該做</item>
-      <item>有空?是時候該做</item>
-  </string-array>
-
-  <string-array name="reminders_snooze">
-      <!-- reminders related to snooze -->
-      <item>別想偷懶喔!</item>
-      <item>休息時間過囉!</item>
-      <item>別再睡囉!</item>
-      <item>您現在準備好了?</item>
-      <item>不能再延後了!</item>
-  </string-array>
-  
-  <string-array name="reminder_responses">
-      <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
-      <item>我有些事想麻煩您!</item> 
-      <item>是時候該讓這事成為過去了?</item>
-      <item>為何這事還沒完成?</item>
-      <item>現在狀況如何了?</item>
-      <item>準備執行這件事了嗎?</item>
-      <item>您能處理這件事?</item>
-      <item>當您完成這件事，您會感到愉快!</item>
-      <item>我保證，這事做完您會覺得好過些!</item>
-      <item>您今天還不做?</item>
-      <item>我受夠了!麻煩完成這事!</item>
-      <item>您可完成這事?絕對可以!</item>
-      <item>您曾經開始過執行這件事?</item>
-      <item>來個自我感覺良好吧!</item>
-      <item>我以你為榮! 讓我們完成吧!</item>
-      <item>當您完成，給你的小獎勵如何?</item>
-      <item>只有這件事?別鬧了!</item>
-      <item>是時候清理工作清單了!</item>
-      <item>您所在的隊伍是整裝待發的還是雜亂無章的？整裝待發的！我們出發！</item>
-      <item>我最近不是說過您做得不錯嗎？堅持啊！</item>
-      <item>一天一件事，天下大亂也不關我的事……再見啦，亂子！</item>
-      <item>您怎麼做到的呀？哇，我真佩服了！</item>
-      <item>不管您有多帥多美，您也不能拿來維持生活的。讓我們準備做點實事吧！</item>
-      <item>天氣不錯呀，是時候搞定這種工作了，不是嗎？</item>
-      <item>您做這件事情時是不是想來杯茶呢？</item>
-      <item>要是您已經做完這件事，您就可以到外面玩了。</item>
-      <item>是時候了。要做的事情總是要做的。</item>
-      <item>您每次不理我，我都被折磨得死去活來的。</item>
-  </string-array>
-
-  <string-array name="postpone_nags">
-      <!-- Astrid\'s nagging when user clicks postpone -->
-      <item>別告訴我事實上你是會拖延的人!</item>
-      <item>有時懶散會使人變老!</item>
-      <item>有些人正在哪裡等你完成這件事呢!</item>
-      <item>當你說要延期時,是表示你正在做是嗎?</item>
-      <item>這是您最後一次延期對吧?</item>
-      <item>今天完成我不會告訴任何人!</item>
-      <item>您可以完成時為何需要延期?別延期!</item>
-      <item>我可以假設你有潛力完成?</item>
-      <item>我覺得您很棒!何不把這完成?</item>
-      <item>假如您做了將會達到您的目標?</item>
-      <item>老是延期,何時才會改變?</item>
-      <item>受夠藉口了! 快點做!</item>
-      <item>上次你用過這藉口吧?</item>
-      <item>假如你這樣,我無法協助你...</item>
-  </string-array>
+    <!-- Resources for built-in reminders plug-in -->
 
+    <!-- =============================================== task edit activity == -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder group label -->
+    <string name="TEA_reminders_group_label">Reminder settings</string>
 
+    <!-- Task Edit: Reminder header label -->
+    <string name="TEA_reminder_label">提醒我：</string>
 
-  <!-- Resources for built-in repeat plug-in -->
-
-  <!-- repeating plugin name -->
-  <string name="repeat_plugin">重複工作</string>
-  
-  <!-- repeating plugin description -->
-  <string name="repeat_plugin_desc">允許工作重複</string>
-  
-  <!-- slide 20a: checkbox for turning on/off repeats -->
-  <string name="repeat_enabled">重複</string>
-  
-  <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
-  <string name="repeat_every">每 %d</string>
-  
-  <!-- hint when opening repeat interval -->
-  <string name="repeat_interval_prompt">重複間隔</string>
-  
-  <!-- slide 19b-->
-  <string name="repeat_never">Not repeating</string>
-  <!-- slide 20f-->
-  <string name="repeat_dont">不重複</string>
-      
-  <string-array name="repeat_interval_short">
-    <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>日</item>
-    <item>週</item>
-    <item>月</item>
-    <item>時</item>
-    <item>分</item>
-    <item>年</item>
-  </string-array>
-  
-  
-  <string-array name="repeat_interval">
-    <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>日</item>
-    <item>星期</item>
-    <item>月</item>
-    <item>小時</item>
-    <item>分鐘</item>
-    <item>年</item>
-  </string-array>
-  
-  <string name="repeat_days">days</string>
-  <string name="repeat_weekdays">weekdays</string>
-  <string name="repeat_weeks">weeks</string>
-  <string name="repeat_months">months</string>
-  <string name="repeat_years">years</string>
-  <string name="repeat_hours">hours</string>
-  <string name="repeat_minutes">minutes</string>
-  
-  <string-array name="repeat_until_shortcuts">
-      <item>永遠重複</item>
-      <item>具體的一天</item>
-      <item>今天</item>
-      <item>明天</item>
-      <item>（後天）</item>
-      <item>下星期</item>
-      <item>兩星期內</item>
-      <item>下個月</item>
-  </string-array>
-  
-  <string name="repeat_until_title">重複到……</string>
-  
-  <string name="repeat_keep_going">繼續下去</string>
-  
-  <string-array name="repeat_type">
-    <!-- slide 20c: repeat type (date to repeat from) -->
-    <item>自到期日</item>
-    <!-- slide 20c -->
-    <item>自完成日</item>
-  </string-array>
-  
-  <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
-  <string name="repeat_detail_byday">$I 的 $D</string>
-  
-  <!-- task detail for repeat from due date (%s -> interval) -->
-  <string name="repeat_detail_duedate">每隔 %s</string>
-
-  <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
-  <string name="repeat_detail_duedate_until">每隔 %1$s\n直到 %2$s</string>
-  
-  <!-- task detail for repeat from completion date (%s -> interval) -->
-  <string name="repeat_detail_completion">完成後 %s</string>
-  
-  <!-- text for button when repeating task indefinitely -->
-  <string name="repeat_forever">永遠重複</string>
-
-  <!-- text for button when repeating task until specified date (%s -> date string) -->
-  <string name="repeat_until">重複到 %s</string>
-  
-  <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title">重新安排“%s”這項任務工作</string>
-
-  <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title_last_time">已經完成“%s”這項重複任務工作</string>
-      
-  <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->  
-  <string name="repeat_rescheduling_dialog_bubble">%1$s 我已經重新安排了這項重複任務工作，截止日期由%2$s 變成%3$s</string>
-  
-  <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
-  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s 我已經重新安排了這項重複任務工作，截止日期為%2$s</string>
-  
-  <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
-  <string name="repeat_rescheduling_dialog_bubble_last_time">您設置了這項任務工作重複到%1$s，現在您已經圓滿完成。%2$s</string>
-  
-  <string-array name="repeat_encouragement">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>做得好！</item>
-      <item>哇噢... 我真為你驕傲！</item>
-      <item>每次您能做那麼多事情的時候，我都愛死您了！</item>
-      <item>勾掉一些任務工作的時候是不是很爽呀？</item>
-  </string-array>
-
-  <string-array name="repeat_encouragement_last_time">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>做得好！</item>
-      <item>我真為您驕傲啊！</item>
-      <item>每次您能做那麼多事情的時候，我都愛死您了！</item>
-  </string-array>
-  
+    <!-- Task Edit: Reminder @ deadline -->
+    <string name="TEA_reminder_due">當任務工作到期時</string>
 
+    <!-- Task Edit: Reminder after deadline -->
+    <string name="TEA_reminder_overdue">當任務工作過期時</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Task Edit: Reminder at random times (%s => time plural)-->
+    <string name="TEA_reminder_randomly">隨機一次</string>
 
-    
-  <!-- Subtasks Help Introduction -->
-  <string name="subtasks_help_title">在 Astrid 中排序並縮進</string>
-  <string name="subtasks_help_1">輕點並按住一項任務工作來移動它</string>
-  <string name="subtasks_help_2">垂直拖動以重新整理</string>
-  <string name="subtasks_help_3">水平拖動以縮進</string>
-    
+    <!-- Task Edit: Reminder alarm clock label -->
+    <string name="TEA_reminder_alarm_label">鈴響/震動類型：</string>
 
+    <!--  slide 45a: Task Edit: Reminder mode: ring once -->
+    <string name="TEA_reminder_mode_once">Once</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- slide 45b: Task Edit: Reminder mode: ring five times -->
+    <string name="TEA_reminder_mode_five">Five times</string>
+
+    <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
+    <string name="TEA_reminder_mode_nonstop">Until I dismiss alarm</string>
+
+    <string name="TEA_reminder_when">when</string>
+
+    <string name="TEA_reminder_due_short">due</string>
+
+    <string name="TEA_reminder_overdue_short">overdue</string>
+
+    <string name="TEA_reminder_randomly_short">randomly</string>
+
+    <string name="TEA_reminder_display_one">Remind me %s</string>
+
+    <string name="TEA_reminder_display_multiple">Remind %s</string>
+
+    <string-array name="TEA_reminder_random">
+        <!-- random reminder choices for task edit page. -->
+        <item>一個小時</item>
+        <item>一天</item>
+        <item>一個星期</item>
+        <item>兩星期內</item>
+        <item>一個月</item>
+        <item>兩個月內</item>
+    </string-array>
+
+    <!-- ==================================================== notifications == -->
+
+    <!-- Name of filter when viewing a reminder -->
+    <string name="rmd_NoA_filter">提醒！</string>
+
+    <!-- Reminder: Task was already done -->
+    <string name="rmd_NoA_done">已完成!</string>
+
+    <!-- Reminder: Snooze button (remind again later) -->
+    <string name="rmd_NoA_snooze">晚點提醒...</string>
+
+    <!-- Reminder: Completed Toast -->
+    <string name="rmd_NoA_completed_toast">恭喜，已經完成了！</string>
+
+    <!-- Prefix for reminder dialog title -->
+    <string name="rmd_NoA_dlg_title">提醒：</string>
+
+    <!-- ==================================================== user reengagement == -->
+
+    <!-- Titles for user reengagement notifications -->
+    <string-array name="rmd_reengage_notif_titles">
+        <item>Astrid 的提示</item>
+        <!-- %s -> first name -->
+        <item>%s 的備忘錄。</item>
+        <item>您的 Astrid 摘要</item>
+        <item>Astrid 的提醒</item>
+    </string-array>
+
+    <string name="rmd_reengage_name_default">您</string>
+
+
+    <string name="rmd_reengage_add_tasks">添加任務工作</string>
+
+    <!-- Speech bubble options for astrid in reengagement notifs -->
+    <string-array name="rmd_reengage_dialog_options">
+        <item>是時候縮短您的任務工作清單了！</item>
+        <item>尊敬的先生或女士，有一些任務工作等待您的檢查！</item>
+        <item>嘿，您好，您可不可以看一看這些任務工作？</item>
+        <item>我有些任務工作，上面有您的名字喔！</item>
+        <item>您今天的一批新任務工作！</item>
+        <item>您看起來棒極了！準備好開始了嗎？</item>
+        <item>今天不錯，是時候搞定一些事兒了，我認為是這樣的！</item>
+    </string-array>
+
+    <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>您不想生活變得更加有條理嗎？</item>
+        <item>我是Astrid！我隨時幫助您做更多事情！</item>
+        <item>您好像好忙喔！讓我來分擔一下您的重擔裡的一些活兒唄。</item>
+        <item>我可以幫您記錄您生活中的所有細節。</item>
+        <item>您真的要搞定更多事情嗎？我也是啊！</item>
+        <item>好高興認識您咽！</item>
+    </string-array>
+    <!-- ============================================= reminder preferences == -->
+
+    <!-- slide 33d: Reminder Preference Screen Title -->
+    <string name="rmd_EPr_alerts_header">提醒設置</string>
+    <string name="rmd_EPr_alerts_summary">勿擾模式，稍候提醒，持續提醒</string>
+
+    <!-- Reminder Preference: Reminders Enabled Title -->
+    <string name="rmd_EPr_enabled_title">允許提醒？</string>
+    <!-- Reminder Preference Reminders Enabled Description (true) -->
+    <string name="rmd_EPr_enabled_desc_true">Astrid 提示功能已經啟用（這是正常的）</string>
+    <!-- Reminder Preference Reminders Enabled Description (false) -->
+    <string name="rmd_EPr_enabled_desc_false">Astrid 提示功能將不再出現在您的手機裡</string>
+
+    <!-- Reminder Preference: Quiet Hours Start Title -->
+    <string name="rmd_EPr_quiet_hours_start_title">無聲開始時間</string>
+    <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_start_desc">%s 後提示將靜止。\n注意：震動在下面的選項中控制！</string>
+    <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
+    <string name="rmd_EPr_quiet_hours_desc_none">未設定無聲功能</string>
+
+    <!-- Reminder Preference: Quiet Hours End Title -->
+    <string name="rmd_EPr_quiet_hours_end_title">無聲結束時間</string>
+    <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_end_desc">通知將在 %s</string>
+
+    <!-- Reminder Preference: Default Reminder Title -->
+    <string name="rmd_EPr_rmd_time_title">默認提示</string>
+    <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
+    <string name="rmd_EPr_rmd_time_desc">未設定截止日期任務工作的通知會於%s 出現</string>
+
+    <!-- Reminder Preference: Notification Ringtone Title -->
+    <string name="rmd_EPr_ringtone_title">提醒鈴聲</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
+    <string name="rmd_EPr_ringtone_desc_custom">自定鈴聲已設定</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
+    <string name="rmd_EPr_ringtone_desc_silent">鈴聲設定為靜音</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
+    <string name="rmd_EPr_ringtone_desc_default">使用預設鈴聲</string>
+
+    <!-- Reminder Preference: Notification Persistence Title -->
+    <string name="rmd_EPr_persistent_title">持續通知</string>
+    <!-- Reminder Preference: Notification Persistence Description (true) -->
+    <string name="rmd_EPr_persistent_desc_true">通知必須個別地清除</string>
+    <!-- Reminder Preference: Notification Persistence Description (false) -->
+    <string name="rmd_EPr_persistent_desc_false">通知可經由點選“清除全部”清除</string>
+
+    <!-- Reminder Preference: Social Reminders Title -->
+    <string name="rmd_EPr_social_title">Social encouragement</string>
+    <!-- Reminder Preference: Social Reminders Summary (enabled) -->
+    <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for
+        shared tasks
+    </string>
+    <!-- Reminder Preference: Social Reminders Summary (disabled) -->
+    <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you
+        for shared tasks
+    </string>
+
+
+    <!-- Reminder Preference: Notification Icon Title -->
+    <!-- Reminder Preference: Notification Icon Description -->
+
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
+    <string name="rmd_EPr_multiple_maxvolume_title">多重提醒最大音量</string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid將會以最大音量進行多重提醒</string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid使用系統音量設置</string>
+
+    <!-- Reminder Preference: Vibrate Title -->
+    <string name="rmd_EPr_vibrate_title">震動提醒</string>
+    <!-- Reminder Preference: Vibrate Description (true) -->
+    <string name="rmd_EPr_vibrate_desc_true">傳送通知時會震動</string>
+    <!-- Reminder Preference: Vibrate Description (false) -->
+    <string name="rmd_EPr_vibrate_desc_false">傳送通知震動關閉</string>
+
+    <!-- Reminder Preference: Nagging Title -->
+    <string name="rmd_EPr_nagging_title">Astrid 提醒</string>
+    <!-- Reminder Preference: Nagging Description (true) -->
+    <string name="rmd_EPr_nagging_desc_true">Astrid提醒時給鼓勵訊息！！</string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_nagging_desc_false">Astrid停止傳送任何鼓勵訊息</string>
+
+    <!-- Reminder Preference: Snooze Dialog Title -->
+    <string name="rmd_EPr_snooze_dialog_title">晚點提醒對話框 小時:分鐘</string>
+    <!-- Reminder Preference: Snooze Dialog Description (true) -->
+    <string name="rmd_EPr_snooze_dialog_desc_true">選擇晚點提醒的時間(小時:分鐘)</string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_snooze_dialog_desc_false">選擇幾天/小時後再提醒</string>
+
+    <!-- slide 44g: Reminder Preference: Default Reminders Title -->
+    <string name="rmd_EPr_defaultRemind_title">隨機提醒</string>
+    <!-- Reminder Preference: Default Reminders Setting (disabled) -->
+    <string name="rmd_EPr_defaultRemind_desc_disabled">隨機提醒功能關閉</string>
+    <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
+    <string name="rmd_EPr_defaultRemind_desc">工作將隨機提醒: %s</string>
+
+    <!-- slide 39a: Defaults Title -->
+
+    <string-array name="EPr_reminder_random">
+        <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
+        <item>停用</item>
+        <!-- slide 44b -->
+        <item>每小時</item>
+        <!-- slide 44c -->
+        <item>每天</item>
+        <!-- slide 44d-->
+        <item>每週</item>
+        <!-- slide 44e-->
+        <item>每2週</item>
+        <!-- slide 44f -->
+        <item>每月</item>
+        <item>每2個月</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_start">
+        <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don\'t change the times!. -->
+        <item>停用</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>00:00</item>
+        <item>01:00</item>
+        <item>02:00</item>
+        <item>03:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_end">
+        <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don\'t change the times! -->
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>24:00</item>
+        <item>01:00</item>
+        <item>02:00</item>
+        <item>03:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+    </string-array>
+
+    <string-array name="EPr_rmd_time">
+        <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don\'t change the times! -->
+        <item>09:00</item>
+        <item>10:00</item>
+        <item>11:00</item>
+        <item>12:00</item>
+        <item>13:00</item>
+        <item>14:00</item>
+        <item>15:00</item>
+        <item>16:00</item>
+        <item>17:00</item>
+        <item>18:00</item>
+        <item>19:00</item>
+        <item>20:00</item>
+        <item>21:00</item>
+        <item>22:00</item>
+        <item>23:00</item>
+        <item>24:00</item>
+        <item>01:00</item>
+        <item>02:00</item>
+        <item>03:00</item>
+        <item>04:00</item>
+        <item>05:00</item>
+        <item>06:00</item>
+        <item>07:00</item>
+        <item>08:00</item>
+    </string-array>
+
+    <!-- =============================================== random reminders == -->
+
+    <string name="reminders_social">這些人全靠你了！</string>
+
+    <string name="reminders_social_one">%s is counting on you!</string>
+
+    <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
+
+    <string-array name="reminders">
+        <!-- reminders: Make these < 20 chars so the task name is displayed -->
+        <item>你好! 有點時間?</item>
+        <item>能借用一點時間?</item>
+        <item>有幾分鐘?</item>
+        <item>忘了什麼嗎?</item>
+        <item>不好意思!</item>
+        <item>當您有時間:</item>
+        <item>在您的議程:</item>
+        <item>有空嗎?</item>
+        <item>注意一下Astrid!</item>
+        <item>可打擾一下嗎?</item>
+        <item>能借一分鐘?</item>
+        <item>這是重要的一天</item>
+    </string-array>
+
+    <string-array name="reminders_due">
+        <!-- reminders related to task due date -->
+        <item>該工作囉!</item>
+        <item>期限快到了!</item>
+        <item>要開始了?</item>
+        <item>您說過您將會:</item>
+        <item>假設您開始:</item>
+        <item>該開始:</item>
+        <item>時候到了!</item>
+        <item>抱歉! 該做</item>
+        <item>有空?是時候該做</item>
+    </string-array>
+
+    <string-array name="reminders_snooze">
+        <!-- reminders related to snooze -->
+        <item>別想偷懶喔!</item>
+        <item>休息時間過囉!</item>
+        <item>別再睡囉!</item>
+        <item>您現在準備好了?</item>
+        <item>不能再延後了!</item>
+    </string-array>
+
+    <string-array name="reminder_responses">
+        <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
+        <item>我有些事想麻煩您!</item>
+        <item>是時候該讓這事成為過去了?</item>
+        <item>為何這事還沒完成?</item>
+        <item>現在狀況如何了?</item>
+        <item>準備執行這件事了嗎?</item>
+        <item>您能處理這件事?</item>
+        <item>當您完成這件事，您會感到愉快!</item>
+        <item>我保證，這事做完您會覺得好過些!</item>
+        <item>您今天還不做?</item>
+        <item>我受夠了!麻煩完成這事!</item>
+        <item>您可完成這事?絕對可以!</item>
+        <item>您曾經開始過執行這件事?</item>
+        <item>來個自我感覺良好吧!</item>
+        <item>我以你為榮! 讓我們完成吧!</item>
+        <item>當您完成，給你的小獎勵如何?</item>
+        <item>只有這件事?別鬧了!</item>
+        <item>是時候清理工作清單了!</item>
+        <item>您所在的隊伍是整裝待發的還是雜亂無章的？整裝待發的！我們出發！</item>
+        <item>我最近不是說過您做得不錯嗎？堅持啊！</item>
+        <item>一天一件事，天下大亂也不關我的事……再見啦，亂子！</item>
+        <item>您怎麼做到的呀？哇，我真佩服了！</item>
+        <item>不管您有多帥多美，您也不能拿來維持生活的。讓我們準備做點實事吧！</item>
+        <item>天氣不錯呀，是時候搞定這種工作了，不是嗎？</item>
+        <item>您做這件事情時是不是想來杯茶呢？</item>
+        <item>要是您已經做完這件事，您就可以到外面玩了。</item>
+        <item>是時候了。要做的事情總是要做的。</item>
+        <item>您每次不理我，我都被折磨得死去活來的。</item>
+    </string-array>
+
+    <string-array name="postpone_nags">
+        <!-- Astrid\'s nagging when user clicks postpone -->
+        <item>別告訴我事實上你是會拖延的人!</item>
+        <item>有時懶散會使人變老!</item>
+        <item>有些人正在哪裡等你完成這件事呢!</item>
+        <item>當你說要延期時,是表示你正在做是嗎?</item>
+        <item>這是您最後一次延期對吧?</item>
+        <item>今天完成我不會告訴任何人!</item>
+        <item>您可以完成時為何需要延期?別延期!</item>
+        <item>我可以假設你有潛力完成?</item>
+        <item>我覺得您很棒!何不把這完成?</item>
+        <item>假如您做了將會達到您的目標?</item>
+        <item>老是延期,何時才會改變?</item>
+        <item>受夠藉口了! 快點做!</item>
+        <item>上次你用過這藉口吧?</item>
+        <item>假如你這樣,我無法協助你...</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Resources for built-in repeat plug-in -->
+
+    <!-- repeating plugin name -->
+    <string name="repeat_plugin">重複工作</string>
+
+    <!-- repeating plugin description -->
+    <string name="repeat_plugin_desc">允許工作重複</string>
+
+    <!-- slide 20a: checkbox for turning on/off repeats -->
+    <string name="repeat_enabled">重複</string>
+
+    <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
+    <string name="repeat_every">每 %d</string>
+
+    <!-- hint when opening repeat interval -->
+    <string name="repeat_interval_prompt">重複間隔</string>
+
+    <!-- slide 19b-->
+    <string name="repeat_never">Not repeating</string>
+    <!-- slide 20f-->
+    <string name="repeat_dont">不重複</string>
+
+    <string-array name="repeat_interval_short">
+        <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>日</item>
+        <item>週</item>
+        <item>月</item>
+        <item>時</item>
+        <item>分</item>
+        <item>年</item>
+    </string-array>
+
+
+    <string-array name="repeat_interval">
+        <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
+        <item>日</item>
+        <item>星期</item>
+        <item>月</item>
+        <item>小時</item>
+        <item>分鐘</item>
+        <item>年</item>
+    </string-array>
+
+    <string name="repeat_days">days</string>
+    <string name="repeat_weekdays">weekdays</string>
+    <string name="repeat_weeks">weeks</string>
+    <string name="repeat_months">months</string>
+    <string name="repeat_years">years</string>
+    <string name="repeat_hours">hours</string>
+    <string name="repeat_minutes">minutes</string>
+
+    <string-array name="repeat_until_shortcuts">
+        <item>永遠重複</item>
+        <item>具體的一天</item>
+        <item>今天</item>
+        <item>明天</item>
+        <item>（後天）</item>
+        <item>下星期</item>
+        <item>兩星期內</item>
+        <item>下個月</item>
+    </string-array>
+
+    <string name="repeat_until_title">重複到……</string>
+
+    <string name="repeat_keep_going">繼續下去</string>
+
+    <string-array name="repeat_type">
+        <!-- slide 20c: repeat type (date to repeat from) -->
+        <item>自到期日</item>
+        <!-- slide 20c -->
+        <item>自完成日</item>
+    </string-array>
+
+    <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
+    <string name="repeat_detail_byday">$I 的 $D</string>
+
+    <!-- task detail for repeat from due date (%s -> interval) -->
+    <string name="repeat_detail_duedate">每隔 %s</string>
+
+    <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
+    <string name="repeat_detail_duedate_until">每隔 %1$s\n直到 %2$s</string>
+
+    <!-- task detail for repeat from completion date (%s -> interval) -->
+    <string name="repeat_detail_completion">完成後 %s</string>
+
+    <!-- text for button when repeating task indefinitely -->
+    <string name="repeat_forever">永遠重複</string>
+
+    <!-- text for button when repeating task until specified date (%s -> date string) -->
+    <string name="repeat_until">重複到 %s</string>
+
+    <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title">重新安排“%s”這項任務工作</string>
+
+    <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title_last_time">已經完成“%s”這項重複任務工作</string>
+
+    <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->
+    <string name="repeat_rescheduling_dialog_bubble">%1$s 我已經重新安排了這項重複任務工作，截止日期由%2$s 變成%3$s</string>
+
+    <!-- text for when a repeating task was rescheduled but didn\'t have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
+    <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s 我已經重新安排了這項重複任務工作，截止日期為%2$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
+    <string name="repeat_rescheduling_dialog_bubble_last_time">您設置了這項任務工作重複到%1$s，現在您已經圓滿完成。%2$s
+    </string>
+
+    <string-array name="repeat_encouragement">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>做得好！</item>
+        <item>哇噢... 我真為你驕傲！</item>
+        <item>每次您能做那麼多事情的時候，我都愛死您了！</item>
+        <item>勾掉一些任務工作的時候是不是很爽呀？</item>
+    </string-array>
+
+    <string-array name="repeat_encouragement_last_time">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>做得好！</item>
+        <item>我真為您驕傲啊！</item>
+        <item>每次您能做那麼多事情的時候，我都愛死您了！</item>
+    </string-array>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+
+
+    <!-- Subtasks Help Introduction -->
+    <string name="subtasks_help_title">在 Astrid 中排序並縮進</string>
+    <string name="subtasks_help_1">輕點並按住一項任務工作來移動它</string>
+    <string name="subtasks_help_2">垂直拖動以重新整理</string>
+    <string name="subtasks_help_3">水平拖動以縮進</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-
-  <!-- Tags label -->
-  <string name="TEA_tags_label">列表</string>
-  
-  <!-- Tags label long version -->
-  <string name="TEA_tags_label_long">Add to lists</string>
- 
-  <!-- Tags hint -->
-  <string name="TEA_tag_hint">新建列表</string>
-  
-  <!-- Tags dropdown -->
-    
-  <!-- =============================================== Task List Controls == -->
-  
-  <!-- menu item for tags -->
-  
-  <!-- ========================================================== Extras == -->
-  
-  <!-- Context Item: show tag -->
-  
-  <!-- slide 25a: Dialog: new list -->
-  <string name="tag_new_list">新建列表</string>
-  
-  <!-- Dialog: list saved -->
-  
-  <!-- Dialog: task created without title -->
-  <string name="tag_no_title_error">請先為此列表鍵入一個名稱！</string>
-  
-  <!-- ========================================================== Filters == -->
-  
-  <!-- filter button to add tag -->
-  <string name="tag_FEx_add_new">添加</string>
-  
-  <!-- filter header for tags -->
-  <string name="tag_FEx_header">列表</string>
-  
-  <!-- filter header for tags user created -->
-  
-  <!-- filter header for tags, shared with user -->
-  
-  <!-- filter header for tags which have no active tasks -->
-  
-  <!-- slide 10d: filter for untagged tasks -->
-  <string name="tag_FEx_untagged">Uncategorized</string>
-  
-  <!-- slide 27a: %s => tag name -->
-
-  <!-- context menu option to rename a tag -->
-  <string name="tag_cm_rename">重命名列表</string>
-
-  <!-- context menu option to delete a tag -->
-  <string name="tag_cm_delete">刪除列表</string>
-  
-  <!-- context menu option to leave a shared list -->
-  <string name="tag_cm_leave">離開列表</string>
-
-  <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
-  <string name="DLG_delete_this_tag_question">刪除列表%s 嗎？(不會刪除任務工作。)</string>
-  
-  <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
-  <string name="DLG_leave_this_shared_tag_question">要離開這份共享列表嗎：%s？（不會刪除任何任務工作。）</string>
-
-  <!-- Dialog to rename tag -->
-  <string name="DLG_rename_this_tag_header">重命名列表 %s 為：</string>
-
-  <!-- Toast notification that no changes have been made -->
-  <string name="TEA_no_tags_modified">沒有變更</string>
-
-  <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_deleted">列表%1$s 已刪除，影響了%2$d 項任務工作</string>
-  
-  <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_left">您離開了共享列表%1$s，影響到%2$d 個任務工作</string>
-
-  <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
-  <string name="TEA_tags_renamed">%3$d 項任務工作由%1$s 重命名為%2$s。</string>
-  
-  <!-- Tag case migration -->
-  <string name="tag_case_migration_notice">我們留意到您有些列表的名稱是相同的，只是大寫的地方不同而已。我們認為您可能是打算將他們放在同一個列表，所以我們已經合併了這些重名列表。但不用擔心：原來的列表僅僅用了數字來重命名（例如Shopping_1、Shopping_2）。如果您不想這樣，您可以直接刪除新合併的列表！</string>
-  
-  <!-- Header for tag settings -->
-  <string name="tag_settings_title">設置：</string>
-  
-  <!-- Header for tag activity -->
-  <string name="tag_updates_title">活躍程度：%s</string>
-  
-  <!-- Delete button for tag settings -->
-  <string name="tag_delete_button">刪除列表</string>
-  
-  <!-- slide 28d: Leave button for tag settings -->
-  <string name="tag_leave_button">離開這份列表</string>
+    <!-- =============================================== Task Edit Controls == -->
 
+    <!-- Tags label -->
+    <string name="TEA_tags_label">列表</string>
 
+    <!-- Tags label long version -->
+    <string name="TEA_tags_label_long">Add to lists</string>
+
+    <!-- Tags hint -->
+    <string name="TEA_tag_hint">新建列表</string>
+
+    <!-- Tags dropdown -->
+
+    <!-- =============================================== Task List Controls == -->
+
+    <!-- menu item for tags -->
+
+    <!-- ========================================================== Extras == -->
+
+    <!-- Context Item: show tag -->
+
+    <!-- slide 25a: Dialog: new list -->
+    <string name="tag_new_list">新建列表</string>
+
+    <!-- Dialog: list saved -->
+
+    <!-- Dialog: task created without title -->
+    <string name="tag_no_title_error">請先為此列表鍵入一個名稱！</string>
+
+    <!-- ========================================================== Filters == -->
+
+    <!-- filter button to add tag -->
+    <string name="tag_FEx_add_new">添加</string>
+
+    <!-- filter header for tags -->
+    <string name="tag_FEx_header">列表</string>
+
+    <!-- filter header for tags user created -->
+
+    <!-- filter header for tags, shared with user -->
+
+    <!-- filter header for tags which have no active tasks -->
+
+    <!-- slide 10d: filter for untagged tasks -->
+    <string name="tag_FEx_untagged">Uncategorized</string>
+
+    <!-- slide 27a: %s => tag name -->
+
+    <!-- context menu option to rename a tag -->
+    <string name="tag_cm_rename">重命名列表</string>
+
+    <!-- context menu option to delete a tag -->
+    <string name="tag_cm_delete">刪除列表</string>
+
+    <!-- context menu option to leave a shared list -->
+    <string name="tag_cm_leave">離開列表</string>
+
+    <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
+    <string name="DLG_delete_this_tag_question">刪除列表%s 嗎？(不會刪除任務工作。)</string>
+
+    <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
+    <string name="DLG_leave_this_shared_tag_question">要離開這份共享列表嗎：%s？（不會刪除任何任務工作。）</string>
+
+    <!-- Dialog to rename tag -->
+    <string name="DLG_rename_this_tag_header">重命名列表 %s 為：</string>
+
+    <!-- Toast notification that no changes have been made -->
+    <string name="TEA_no_tags_modified">沒有變更</string>
+
+    <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_deleted">列表%1$s 已刪除，影響了%2$d 項任務工作</string>
+
+    <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_left">您離開了共享列表%1$s，影響到%2$d 個任務工作</string>
+
+    <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
+    <string name="TEA_tags_renamed">%3$d 項任務工作由%1$s 重命名為%2$s。</string>
+
+    <!-- Tag case migration -->
+    <string name="tag_case_migration_notice">
+        我們留意到您有些列表的名稱是相同的，只是大寫的地方不同而已。我們認為您可能是打算將他們放在同一個列表，所以我們已經合併了這些重名列表。但不用擔心：原來的列表僅僅用了數字來重命名（例如Shopping_1、Shopping_2）。如果您不想這樣，您可以直接刪除新合併的列表！
+    </string>
+
+    <!-- Header for tag settings -->
+    <string name="tag_settings_title">設置：</string>
+
+    <!-- Header for tag activity -->
+    <string name="tag_updates_title">活躍程度：%s</string>
+
+    <!-- Delete button for tag settings -->
+    <string name="tag_delete_button">刪除列表</string>
+
+    <!-- slide 28d: Leave button for tag settings -->
+    <string name="tag_leave_button">離開這份列表</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <!-- Resources for built-in timers plug-in -->
-    
+
     <!-- Task List: Start Timer button -->
-    
+
     <!-- Task List: Stop Timer button -->
-    
+
     <!-- Android Notification Title (%s => # tasks) -->
     <string name="TPl_notification">秒錶啟動了 %s！</string>
-    
+
     <!-- Filter Header for Timer plugin -->
-    
+
     <!-- Filter for Timed Tasks -->
     <string name="TFE_workingOn">任務工作已開始計時</string>
-    
+
     <!-- Title for TEA -->
     <string name="TEA_timer_controls">Timer</string>
-    
-    
+
+
     <!-- Edit Notes: create comment for when timer is started -->
     <string name="TEA_timer_comment_started">已經開始了這項任務工作：</string>
-    
+
     <!-- Edit Notes: create comment for when timer is stopped -->
     <string name="TEA_timer_comment_stopped">已經停止了這項任務工作：</string>
-    
+
     <!-- Edit Notes: comment to notify how long was spent on task -->
     <string name="TEA_timer_comment_spent">已經花費時間：</string>
-    
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
 
     <!-- Update string from activity codes %1$s - user, %2$s - target name, %3$s - message, %4$s - other_user-->
-    
+
     <!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
     Please do not translate this part of the string. -->
-    
+
     <!-- These are still in use -->
     <string name="update_string_default_comment">%1$s 發表道：%3$s</string>
     <string name="update_string_task_comment">%1$s on $link_task: %3$s</string>
     <string name="update_string_tag_comment">%1$s on %2$s: %3$s</string>
     <string name="update_string_user_self">You</string>
-    
+
     <string name="history_yourself">yourself</string>
     <string name="history_you">您</string>
     <string name="history_a_deleted_user">(a deleted user)</string>
-    
+
     <string name="history_this_list">this list</string>
     <string name="history_this_task">this task</string>
     <string name="history_tag_added">added %1$s to %2$s</string>
@@ -2978,9 +3036,12 @@
     <string name="history_favorited">favorited %s</string>
     <string name="history_unfavorited">unfavorited %s</string>
     <string name="history_changed_list_picture">change this list\'s picture</string>
-    <string name="history_added_description_characters">added %1$d characters to %2$s description</string>
+    <string name="history_added_description_characters">added %1$d characters to %2$s description
+    </string>
     <string name="history_removed_description">removed %s description</string>
-    <string name="history_removed_description_characters">removed %1$d characters from %2$s description</string>
+    <string name="history_removed_description_characters">removed %1$d characters from %2$s
+        description
+    </string>
     <string name="history_updated_description">updated %s description</string>
     <string name="history_changed_list_owner">changed list owner to %s</string>
     <string name="history_created_this_list">created this list</string>
@@ -3003,186 +3064,187 @@
     <string name="history_repeat_on">on %s</string>
     <string name="history_repeat_from_completion">after completion</string>
     <string name="history_acknowledged">viewed %s</string>
-    
+
     <string name="history_default">changed %1$s to %2$s</string>
 
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-    
-  <!-- Voice Add Prompt Text -->
-  <string name="voice_create_prompt">請說話以建立工作</string>
-  <string name="voice_edit_title_prompt">請說話以設定工作主旨</string>
-  <string name="voice_edit_note_prompt">請說話以設定工作備註</string>
-    
-  <!-- Preference: Task List recognition-service is not installed, but available -->
-  <string name="EPr_voiceInputInstall_dlg">語音輸入功能尚未安裝。您要連上市集並安裝嗎?</string>
-  <!-- Preference: Task List recognition-service is not available for this system -->
-  <string name="EPr_voiceInputUnavailable_dlg">很抱歉語音輸入功能不支援您的系統。\n如果可能，請升級至Android 2.1或更新的版本。</string>
-  <!-- Preference: Market is not available for this system -->
-  <string name="EPr_marketUnavailable_dlg">很抱歉您的系統無法使用市集。\n如果可能，請嘗試從其他來源下載語音搜尋功能。</string>
-  <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
-  <string name="EPr_voiceInputEnabled_title">語音輸入</string>
-  <!-- slide 38a: Preference: voice button description (true) -->
-  <string name="EPr_voiceInputEnabled_desc_enabled">語音輸入按鍵會在工作清單畫面上顯示。</string>
-  <!-- Preference: voice button description (false) -->
-  <string name="EPr_voiceInputEnabled_desc_disabled">語音輸入按鍵會在工作清單畫面上隱藏。</string>
-  <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
-  <string name="EPr_voiceInputCreatesTask_title">直接建立工作</string>
-  <!-- Preference: Task List Voice-creation description (true) -->
-  <string name="EPr_voiceInputCreatesTask_desc_enabled">工作將會自動從語音輸入建立。</string>
-  <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
-  <string name="EPr_voiceInputCreatesTask_desc_disabled">語音輸入結束後您可以編輯工作主旨。</string>
-  <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
-  <string name="EPr_voiceRemindersEnabled_title">語音提醒</string>
-  <!-- Preference: Voice reminders description (true) -->
-  <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid在工作提醒時會以語音說出工作名稱</string>
-  <!-- slide 38c: Preference: Voice reminders description (false) -->
-  <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid在工作提醒時將會播放鈴聲</string>    
-  
-  <!-- slide 32d: Preference Category: Voice Title -->
-  <string name="EPr_voice_header">語音輸入設定</string>
-    
 
+    <!-- Voice Add Prompt Text -->
+    <string name="voice_create_prompt">請說話以建立工作</string>
+    <string name="voice_edit_title_prompt">請說話以設定工作主旨</string>
+    <string name="voice_edit_note_prompt">請說話以設定工作備註</string>
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
+    <!-- Preference: Task List recognition-service is not installed, but available -->
+    <string name="EPr_voiceInputInstall_dlg">語音輸入功能尚未安裝。您要連上市集並安裝嗎?</string>
+    <!-- Preference: Task List recognition-service is not available for this system -->
+    <string name="EPr_voiceInputUnavailable_dlg">很抱歉語音輸入功能不支援您的系統。\n如果可能，請升級至Android 2.1或更新的版本。
+    </string>
+    <!-- Preference: Market is not available for this system -->
+    <string name="EPr_marketUnavailable_dlg">很抱歉您的系統無法使用市集。\n如果可能，請嘗試從其他來源下載語音搜尋功能。</string>
+    <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
+    <string name="EPr_voiceInputEnabled_title">語音輸入</string>
+    <!-- slide 38a: Preference: voice button description (true) -->
+    <string name="EPr_voiceInputEnabled_desc_enabled">語音輸入按鍵會在工作清單畫面上顯示。</string>
+    <!-- Preference: voice button description (false) -->
+    <string name="EPr_voiceInputEnabled_desc_disabled">語音輸入按鍵會在工作清單畫面上隱藏。</string>
+    <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
+    <string name="EPr_voiceInputCreatesTask_title">直接建立工作</string>
+    <!-- Preference: Task List Voice-creation description (true) -->
+    <string name="EPr_voiceInputCreatesTask_desc_enabled">工作將會自動從語音輸入建立。</string>
+    <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
+    <string name="EPr_voiceInputCreatesTask_desc_disabled">語音輸入結束後您可以編輯工作主旨。</string>
+    <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
+    <string name="EPr_voiceRemindersEnabled_title">語音提醒</string>
+    <!-- Preference: Voice reminders description (true) -->
+    <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid在工作提醒時會以語音說出工作名稱</string>
+    <!-- slide 38c: Preference: Voice reminders description (false) -->
+    <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid在工作提醒時將會播放鈴聲</string>
 
-  
-  <!-- slide 30a-->
-  <string name="welcome_setting">顯示教程</string>
-  
-  <string name="welcome_title_1">歡迎使用Astrid!</string>
+    <!-- slide 32d: Preference Category: Voice Title -->
+    <string name="EPr_voice_header">語音輸入設定</string>
 
-  <!-- slide 2a -->
-  <string name="welcome_title_2">創建列表</string>
 
-  <!-- slide 3a-->
-  <string name="welcome_title_3">在列表間切換</string>
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-  <!-- slide 4a -->
-  <string name="welcome_title_4">分享列表</string>
 
-  <!-- slide 5a -->
-  <string name="welcome_title_5">分攤任務工作</string>
+    <!-- slide 30a-->
+    <string name="welcome_setting">顯示教程</string>
 
-  <!-- slide 6a -->
-  <string name="welcome_title_6">提供詳情</string>
+    <string name="welcome_title_1">歡迎使用Astrid!</string>
 
-  <!-- slide 7a -->
-  <string name="welcome_title_7">現在就聯網 \n開始使用吧！</string>
-  
-  <string name="welcome_title_7_return">搞定！</string>
-  
-  <!-- slide 1b -->
-  <string name="welcome_body_1">完美的個人任務工作列表 \n和朋友們互動超級好用</string>
+    <!-- slide 2a -->
+    <string name="welcome_title_2">創建列表</string>
 
-  <!-- slide 2b-->
-  <string name="welcome_body_2">任何列表都超牛：\n閱讀、觀看、購買、訪問都是超強的！</string>
+    <!-- slide 3a-->
+    <string name="welcome_title_3">在列表間切換</string>
 
-  <!-- slide 3b -->
-  <string name="welcome_body_3">輕點列表標題 \n查看您所有的列表</string>
+    <!-- slide 4a -->
+    <string name="welcome_title_4">分享列表</string>
 
-  <!-- slide 4b -->
-  <string name="welcome_body_4">和朋友、室友、\n或者您的愛人 \n分享精彩繽紛的列表吧！</string>
+    <!-- slide 5a -->
+    <string name="welcome_title_5">分攤任務工作</string>
 
-  <!-- slide 5b -->
-  <string name="welcome_body_5">不用猜想誰會 \n帶甜點來喔！</string>
+    <!-- slide 6a -->
+    <string name="welcome_title_6">提供詳情</string>
 
-  <!-- slide 6b-->
-  <string name="welcome_body_6">輕點即可添加便箋 \n設置提示還有更多功能呢！</string>
-  <string name="welcome_body_7">登陸</string>
-  
-  <string name="welcome_body_7_return">拍拍 Astrid 返回。</string>
-  
-  <!-- slide 1c -->
-  <string name="welcome_next">下一步</string>
-  
+    <!-- slide 7a -->
+    <string name="welcome_title_7">現在就聯網 \n開始使用吧！</string>
 
+    <string name="welcome_title_7_return">搞定！</string>
+
+    <!-- slide 1b -->
+    <string name="welcome_body_1">完美的個人任務工作列表 \n和朋友們互動超級好用</string>
+
+    <!-- slide 2b-->
+    <string name="welcome_body_2">任何列表都超牛：\n閱讀、觀看、購買、訪問都是超強的！</string>
+
+    <!-- slide 3b -->
+    <string name="welcome_body_3">輕點列表標題 \n查看您所有的列表</string>
+
+    <!-- slide 4b -->
+    <string name="welcome_body_4">和朋友、室友、\n或者您的愛人 \n分享精彩繽紛的列表吧！</string>
+
+    <!-- slide 5b -->
+    <string name="welcome_body_5">不用猜想誰會 \n帶甜點來喔！</string>
+
+    <!-- slide 6b-->
+    <string name="welcome_body_6">輕點即可添加便箋 \n設置提示還有更多功能呢！</string>
+    <string name="welcome_body_7">登陸</string>
+
+    <string name="welcome_body_7_return">拍拍 Astrid 返回。</string>
+
+    <!-- slide 1c -->
+    <string name="welcome_next">下一步</string>
+
+
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
 
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
 
-    
     <string name="widget_mini">- Astrid Mini -</string>
-    
+
     <!-- Resources for power pack widget -->
-    
+
     <string name="PPW_widget_42_label">Old Astrid 4x2</string>
     <string name="PPW_widget_43_label">Old Astrid 4x3</string>
     <string name="PPW_widget_44_label">Old Astrid 4x4</string>
     <string name="PPW_widget_v11_label">- Astrid -</string>
     <string name="PPW_widget_custom_label">Astrid 自定義高級版本</string>
     <string name="PPW_widget_custom_launcherpro_label">Astrid 專業高級版本</string>
-    
+
     <string name="PPW_configure_title">配置小工具</string>
-    
+
     <string name="PPW_color">小工具顏色</string>
     <string name="PPW_enable_calendar">顯示日曆事件</string>
     <string name="PPW_disable_encouragements">隱藏打氣助威語</string>
     <string name="PPW_show_dates">顯示截止日期</string>
     <string name="PPW_filter">選擇過濾器</string>
-    
+
     <string name="PPW_due">到期日：</string>
     <string name="PPW_past_due">逾期未完成：</string>
-    
+
     <string name="PPW_old_astrid_notice">最低限度您也需要Astrid 的3.6 版本才能使用這個小工具。不好意思！</string>
-    
+
     <string-array name="PPW_encouragements">
         <!-- general encouragements -->
-    	<item>嘿，您好！</item>
-    	<item>有時間搞定一些事兒嗎？</item>
-    	<item>天啊，您今天挺溫雅的嘛！</item>
-    	<item>今天做點大事兒吧！</item>
-    	<item>今天來讓我為您驕傲一下吧！</item>
-    	<item>您今天好嗎？</item>
+        <item>嘿，您好！</item>
+        <item>有時間搞定一些事兒嗎？</item>
+        <item>天啊，您今天挺溫雅的嘛！</item>
+        <item>今天做點大事兒吧！</item>
+        <item>今天來讓我為您驕傲一下吧！</item>
+        <item>您今天好嗎？</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_tod">
         <!-- encouragements based on time of day -->
-    	<item>早上好！</item>
-    	<item>下午好！</item>
-    	<item>晚上好！</item>
-    	<item>昨晚？</item>
-    	<item>現在很早，來搞定一些事兒吧！</item>
-    	<item>去下午茶，好嗎？</item>
-    	<item>好好享受這個夜晚！</item>
-    	<item>睡眠對您是有好處的，知道不！</item>
+        <item>早上好！</item>
+        <item>下午好！</item>
+        <item>晚上好！</item>
+        <item>昨晚？</item>
+        <item>現在很早，來搞定一些事兒吧！</item>
+        <item>去下午茶，好嗎？</item>
+        <item>好好享受這個夜晚！</item>
+        <item>睡眠對您是有好處的，知道不！</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_completed">
         <!-- encouragements based on tasks completed (%d => completed) -->
-    	<item>您已經完成了 %d 項任務工作啦！</item>
-    	<item>生活評分：已經完成了%d 項任務工作</item>
-    	<item>笑一笑唄！您已經完成了%d 項任務工作啦！</item>
+        <item>您已經完成了 %d 項任務工作啦！</item>
+        <item>生活評分：已經完成了%d 項任務工作</item>
+        <item>笑一笑唄！您已經完成了%d 項任務工作啦！</item>
     </string-array>
-  	<string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet! Shall we?</string>
-        
+    <string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet!
+        Shall we?
+    </string>
+
     <string-array name="PPW_colors">
         <item>黑色</item>
         <item>白色</item>
         <item>藍色</item>
         <item>半透明</item>
     </string-array>
-    
+
     <string name="PPW_widget_dlg_text">這種小工具只提供給PowerPack 所有者呀！</string>
     <string name="PPW_widget_dlg_ok">預覽</string>
-    
+
     <string name="PPW_demo_title1">%s 上的小工具將會放到這裡</string>
     <string name="PPW_demo_title2">Power Pack 包含尊貴版小工具（Premium Widgets）……</string>
     <string name="PPW_demo_title3">…語音添加、感覺很棒！</string>
     <string name="PPW_demo_title4">輕點一下，了解更多！</string>
-    
+
     <string name="PPW_info_title">免費的 Power Pack！</string>
     <string name="PPW_info_signin">登錄！</string>
     <string name="PPW_info_later">稍後</string>
@@ -3190,7 +3252,7 @@
     <string name="PPW_check_button">來免費獲取 Power Pack 吧！</string>
     <string name="PPW_check_share_lists">來分享列表吧！</string>
     <string name="PPW_api_level">對不起！此工具只支持安桌3.0及以上版本。</string>
-    
+
     <string name="EPr_widget_enabled_title">允許／不允許小工具運行</string>
     <string name="PPW_restart_for_enabled_state">您也許需要重啟您的手機來支持新設定的運行。</string>
 
diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml
index 5fa1a90ea..77cd22b92 100644
--- a/astrid/res/values/attrs.xml
+++ b/astrid/res/values/attrs.xml
@@ -4,55 +4,55 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 
-  <!-- theme attributes -->
-  <attr name="asContentBackground" format="color"/>
-  <attr name="asEditBackground" format="color"/>
-  <attr name="asEditRowBackground" format="reference"/>
-  <attr name="asWomEditRowBackground" format="reference"/>
-  <attr name="asEditTabBackground" format="reference"/>
-  <attr name="asHeaderBackground" format="reference"/>
-  <attr name="asHeaderButtonBackground" format="reference"/>
-  <attr name="asTextColor" format="color"/>
-  <attr name="asTextColorInverse" format="color"/>
-  <attr name="asDetailsColor" format="color"/>
-  <attr name="asDueDateColor" format="color"/>
-  <attr name="asDueDateOverdueColor" format="color"/>
-  <attr name="asDueDateCompletedColor" format="color"/>
-  <attr name="asFilterHeaderColor" format="color"/>
-  <attr name="asFilterHeaderBackground" format="reference"/>
-  <attr name="asFilterCountColor" format="color"/>
-  <attr name="asMembersHeaderBackground" format="color"/>
-  <attr name="asSeparatorBackground" format="color"/>
-  <attr name="asListDividerColor" format="color"/>
-  
-  <attr name="asThemeTextColor" format="color"/>
-  <attr name="asHeaderTextColor" format="color"/>
-  <attr name="asHeaderTextColorInverse" format="color"/>
-  <attr name="asEditTextBackground" format="reference"/>
-  <attr name="asReadonlyTaskBackground" format="color" />
-  <attr name="asListsDisclosure" format="reference"/>
-  <attr name="asAddButtonImg" format="reference" />
-  <attr name="asMicButtonImg" format="reference" />
-  <attr name="asCommentButtonImg" format="reference" />
-  <attr name="asFilledCommentButtonImg" format="reference" />
-  <attr name="asMainMenu" format="reference" />
-  <attr name="asPeopleMenu" format="reference" />
-  <attr name="asAbBackgroundColor" format="color"/>
-  <attr name="asQuickaddBackgroundColor" format="color" />
-  <attr name="asListPopoverBg" format="reference"/>
-  <attr name="asListArrowUp" format="reference"/>
-  <attr name="asFilterSelectedIcon" format="reference"/>
-  <attr name="asTaskRowSelector" format="reference" />
+    <!-- theme attributes -->
+    <attr name="asContentBackground" format="color"/>
+    <attr name="asEditBackground" format="color"/>
+    <attr name="asEditRowBackground" format="reference"/>
+    <attr name="asWomEditRowBackground" format="reference"/>
+    <attr name="asEditTabBackground" format="reference"/>
+    <attr name="asHeaderBackground" format="reference"/>
+    <attr name="asHeaderButtonBackground" format="reference"/>
+    <attr name="asTextColor" format="color"/>
+    <attr name="asTextColorInverse" format="color"/>
+    <attr name="asDetailsColor" format="color"/>
+    <attr name="asDueDateColor" format="color"/>
+    <attr name="asDueDateOverdueColor" format="color"/>
+    <attr name="asDueDateCompletedColor" format="color"/>
+    <attr name="asFilterHeaderColor" format="color"/>
+    <attr name="asFilterHeaderBackground" format="reference"/>
+    <attr name="asFilterCountColor" format="color"/>
+    <attr name="asMembersHeaderBackground" format="color"/>
+    <attr name="asSeparatorBackground" format="color"/>
+    <attr name="asListDividerColor" format="color"/>
+
+    <attr name="asThemeTextColor" format="color"/>
+    <attr name="asHeaderTextColor" format="color"/>
+    <attr name="asHeaderTextColorInverse" format="color"/>
+    <attr name="asEditTextBackground" format="reference"/>
+    <attr name="asReadonlyTaskBackground" format="color"/>
+    <attr name="asListsDisclosure" format="reference"/>
+    <attr name="asAddButtonImg" format="reference"/>
+    <attr name="asMicButtonImg" format="reference"/>
+    <attr name="asCommentButtonImg" format="reference"/>
+    <attr name="asFilledCommentButtonImg" format="reference"/>
+    <attr name="asMainMenu" format="reference"/>
+    <attr name="asPeopleMenu" format="reference"/>
+    <attr name="asAbBackgroundColor" format="color"/>
+    <attr name="asQuickaddBackgroundColor" format="color"/>
+    <attr name="asListPopoverBg" format="reference"/>
+    <attr name="asListArrowUp" format="reference"/>
+    <attr name="asFilterSelectedIcon" format="reference"/>
+    <attr name="asTaskRowSelector" format="reference"/>
+
+    <declare-styleable name="ContactsAutoComplete">
+        <attr name="allowMultiple" format="boolean"/>
+        <attr name="completeTags" format="boolean"/>
+    </declare-styleable>
+
+    <declare-styleable name="DateAndTimePicker">
+        <attr name="shortcutLabels" format="reference"/>
+    </declare-styleable>
 
-  <declare-styleable name="ContactsAutoComplete">
-    <attr name="allowMultiple" format="boolean"/>
-    <attr name="completeTags" format="boolean"/>
-  </declare-styleable>
-  
-  <declare-styleable name="DateAndTimePicker">
-      <attr name="shortcutLabels" format="reference"/>
-  </declare-styleable>
-    
 </resources>
diff --git a/astrid/res/values/colors.xml b/astrid/res/values/colors.xml
index d1d2cae43..65776c3ec 100644
--- a/astrid/res/values/colors.xml
+++ b/astrid/res/values/colors.xml
@@ -4,19 +4,19 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
     <color name="task_list_overdue">#FFFB6666</color>
     <color name="task_list_normal">#FFFFFFFF</color>
     <color name="task_list_done">#ff777777</color>
-    
+
     <!-- font colors when colored by importance  -->
     <color name="task_list_importance_1">#ffffffff</color>
     <color name="task_list_importance_2">#ffcfcfcf</color>
     <color name="task_list_importance_3">#ffb8b8b8</color>
     <color name="task_list_importance_4">#ffa0a0a0</color>
-    
+
     <color name="task_edit_deadline_gray">#888888</color>
-    
+
     <color name="blue_theme_color">#33b5e5</color>
     <color name="red_theme_color">#d90000</color>
     <color name="dark_blue_theme_color">#1f78b4</color>
@@ -24,7 +24,7 @@
     <color name="tablet_list_selected">#000000</color>
     <color name="reminder_background">#262626</color>
     <color name="task_edit_selected">#385487</color>
-    
+
     <color name="widget_text_color_light">#535353</color>
     <color name="widget_text_color_dark">#ffffff</color>
     <color name="widget_header_light">#dde0e0e0</color>
@@ -36,6 +36,6 @@
     <color name="widget_body_legacy">#fc1c1c1c</color>
     <color name="task_row_bg_dark_pressed">#303030</color>
     <color name="task_row_bg_white_pressed">#dde1eb</color>
-        
+
 </resources>
 
diff --git a/astrid/res/values/cwac_touchlist_attrs.xml b/astrid/res/values/cwac_touchlist_attrs.xml
index cf12cfa95..458077929 100644
--- a/astrid/res/values/cwac_touchlist_attrs.xml
+++ b/astrid/res/values/cwac_touchlist_attrs.xml
@@ -1,20 +1,20 @@
-<resources  xmlns:android="http://schemas.android.com/apk/res/android">
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-	<declare-styleable name="TouchListView">
-		<attr name="normal_height" format="dimension" />
-		<attr name="expanded_height" format="dimension" />
-		<attr name="grabber" format="reference" />
-		<attr name="dragndrop_background" format="color" />
-    <attr name="remove_mode">
-			<enum name="none" value="-1" />
-			<enum name="fling" value="0" />
-			<enum name="slide" value="1" />
-			<enum name="slideRight" value="1" />
-			<enum name="slideLeft" value="2" />
-		</attr>
-	</declare-styleable>
+<resources>
+    <!--
+    ** Copyright (c) 2012 Todoroo Inc
+    **
+    ** See the file "LICENSE" for the full license governing this code.
+    -->
+    <declare-styleable name="TouchListView">
+        <attr name="normal_height" format="dimension"/>
+        <attr name="expanded_height" format="dimension"/>
+        <attr name="grabber" format="reference"/>
+        <attr name="dragndrop_background" format="color"/>
+        <attr name="remove_mode">
+            <enum name="none" value="-1"/>
+            <enum name="fling" value="0"/>
+            <enum name="slide" value="1"/>
+            <enum name="slideRight" value="1"/>
+            <enum name="slideLeft" value="2"/>
+        </attr>
+    </declare-styleable>
 </resources>
diff --git a/astrid/res/values/keys-opencrx.xml b/astrid/res/values/keys-opencrx.xml
index ad9e00891..059209503 100644
--- a/astrid/res/values/keys-opencrx.xml
+++ b/astrid/res/values/keys-opencrx.xml
@@ -3,12 +3,12 @@
   This file contains preference keys and preference list values.
   These should not be translated 
 -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources>
     <string name="opencrx_PPr_interval_key">opencrx_sync_freq</string>
-    <string name="opencrx_PPr_login">opencrx_email</string>    
-    <string name="opencrx_PPr_password">opencrx_password</string>    
+    <string name="opencrx_PPr_login">opencrx_email</string>
+    <string name="opencrx_PPr_password">opencrx_password</string>
     <string name="opencrx_PPr_defaultcreator_key">opencrx_defaultcreator</string>
-    <string name="opencrx_PPr_host_key">opencrx_host</string>    
-    <string name="opencrx_PPr_segment_key">opencrx_segment</string>    
-    <string name="opencrx_PPr_provider_key">opencrx_provider</string>    
+    <string name="opencrx_PPr_host_key">opencrx_host</string>
+    <string name="opencrx_PPr_segment_key">opencrx_segment</string>
+    <string name="opencrx_PPr_provider_key">opencrx_provider</string>
 </resources>
diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index 9ddc4b7a1..64d011ba4 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -3,377 +3,378 @@
   This file contains preference keys and preference list values.
   These should not be translated 
 -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- 
-  <string name="fb_app_id">183862944961271</string>
-    
-  <!-- ======================================================== REMINDERS == -->
-
-  <!-- whether reminders should appear at all -->
-  <string name="p_rmd_enabled">notif_enabled</string>
-  
-  <!-- hour to start quiet hours (inclusive) -->
-  <string name="p_rmd_quietStart">notif_qstart</string>
-  
-  <!-- hour to end quiet hours (non-inclusive) -->
-  <string name="p_rmd_quietEnd">notif_qend</string>
-  
-  <!-- reminder time when task doesn't have a due time (hour of day) -->
-  <string name="p_rmd_time">reminder_time</string>
-  
-  <!-- whether "clear all notifications" clears astrid notifications -->
-  <string name="p_rmd_persistent">notif_annoy</string>
-  
-  <!-- whether to max out the notification reminder volume if reminder has setting "ring multiple" or "ring continuous" -->
-  <string name="p_rmd_maxvolume">notif_maxvol</string>
-  
-  <!-- whether to vibrate phone when reminder fires -->
-  <string name="p_rmd_vibrate">notif_vibrate</string>
-  
-  <!-- ringtone to use for notifications -->
-  <string name="p_rmd_ringtone">notification_ringtone</string>
-  
-  <!-- if tts is used for notifications -->
-  <string name="p_rmd_voice">notification_voice</string>
-  
-  <!-- icon theme for notifications -->
-  <string name="p_rmd_icon">notif_theme</string>
-  
-  <!-- whether astrid nag messages are used -->
-  <string name="p_rmd_nagging">nagging</string>
-  
-  <!-- if true / unset, hh:mm dialog. otherwise, days / hours -->
-  <string name="p_rmd_snooze_dialog">snooze_dialog</string>
-  
-  <!-- default random reminder setting (in hours) -->
-  <string name="p_rmd_default_random_hours">notif_default_reminder</string>
-
-  <!-- show faces in reminders (aka social reminders) -->
-  <string name="p_rmd_social">p_rmd_social</string>
-
-  <!-- field missed calls preference -->
-  <string name="p_field_missed_calls">field_missed_calls</string>
-  
-  <!-- calendar reminders preference -->
-  <string name="p_calendar_reminders">p_calendar_reminder</string>
-  
-  <!-- show friends view preference -->
-  <string name="p_show_friends_view">show_friends_view</string>
-
-  <!-- force tablets to use phone layout -->
-  <string name="p_force_phone_layout">force_phone_layout</string>
-  
-  <!-- account status section key -->
-  <string name="p_account">account</string>
-
-  <!-- list view section key -->
-  <string name="p_list_view">p_list_view</string>
-  
-  <!-- filters to show -->
-  <string name="p_filters_to_show">p_filters_to_show</string>
-  <string name="p_show_my_tasks_filter">p_show_my_tasks_f</string>
-  <string name="p_show_today_filter">p_show_today_f</string>
-  <string name="p_show_waiting_on_me_filter">p_show_waiting_on_me_f</string>
-  <string name="p_show_recently_modified_filter">p_show_recently_modified_f</string>
-  <string name="p_show_ive_assigned_filter">p_show_assigned_f</string>
-  <string name="p_show_not_in_list_filter">p_show_no_list_f</string>
-  
-  <!-- show quickadd controls -->
-  <string name="p_show_quickadd_controls">p_show_quickadd_controls</string>
-
-  <!-- show comments in task edit -->
-  <string name="p_show_task_edit_comments">p_show_task_edit_comments</string>
-  
-  <!-- show save and cancel buttons in task edit -->
-  <string name="p_save_and_cancel">p_save_and_cancel</string>
-  
-  <!-- menu items to show -->
-  <string name="p_menu_items">p_menu_items</string>
-  <string name="p_show_menu_search">p_show_menu_search</string>
-  <string name="p_show_menu_friends">p_show_menu_friends</string>
-  <string name="p_show_menu_sync">p_show_menu_sync</string>
-  <string name="p_show_menu_sort">p_show_menu_sort</string>
-  
-  <string-array name="TEA_reminder_random_hours">
-    <!-- values (in hours) associated with items above. -->
-    <item>1</item>
-    <item>24</item>
-    <item>168</item>
-    <item>336</item>
-    <item>730</item>
-    <item>1460</item>
-  </string-array>
-  
-  <string-array name="notif_icon_values">
-    <!-- Corresponding to the constants in Preferences.java (do not edit) -->
-    <item>0</item>
-    <item>1</item>
-    <item>2</item>
-  </string-array>
-  
-  <string-array name="EPr_reminder_random_hours">
-    <!-- values (in hours) associated with random reminders above. -->
-    <item>0</item>
-    <item>1</item>
-    <item>24</item>
-    <item>168</item>
-    <item>336</item>
-    <item>730</item>
-    <item>1460</item>
-  </string-array>
-  
-  <string-array name="EPr_quiet_hours_start_values">
-    <!-- quiet_hours_start_values: 24-hour representation of quiet_hour_start -->
-    <item></item>
-    <item>20</item>
-    <item>21</item>
-    <item>22</item>
-    <item>23</item>
-    <item>00</item>
-    <item>01</item>
-    <item>02</item>
-    <item>03</item>
-    <item>04</item>
-    <item>05</item>
-    <item>06</item>
-    <item>07</item>
-    <item>08</item>
-    <item>09</item>
-    <item>10</item>
-    <item>11</item>
-    <item>12</item>
-    <item>13</item>
-    <item>14</item>
-    <item>15</item>
-    <item>16</item>
-    <item>17</item>
-    <item>18</item>
-    <item>19</item>
-  </string-array>        
-  
-  <string-array name="EPr_quiet_hours_end_values">
-    <!-- quiet_hours_end_values: 24-hour representation of quiet_hours_end -->
-    <item>09</item>
-    <item>10</item>
-    <item>11</item>
-    <item>12</item>
-    <item>13</item>
-    <item>14</item>
-    <item>15</item>
-    <item>16</item>
-    <item>17</item>
-    <item>18</item>
-    <item>19</item>
-    <item>20</item>
-    <item>21</item>
-    <item>22</item>
-    <item>23</item>
-    <item>00</item>
-    <item>01</item>
-    <item>02</item>
-    <item>03</item>
-    <item>04</item>
-    <item>05</item>
-    <item>06</item>
-    <item>07</item>
-    <item>08</item>
-  </string-array>
-  
-  <string-array name="EPr_rmd_time_values">
-    <!-- rmd_time_values: 24-hour representation of rmd_time_values -->
-    <item>09</item>
-    <item>10</item>
-    <item>11</item>
-    <item>12</item>
-    <item>13</item>
-    <item>14</item>
-    <item>15</item>
-    <item>16</item>
-    <item>17</item>
-    <item>18</item>
-    <item>19</item>
-    <item>20</item>
-    <item>21</item>
-    <item>22</item>
-    <item>23</item>
-    <item>00</item>
-    <item>01</item>
-    <item>02</item>
-    <item>03</item>
-    <item>04</item>
-    <item>05</item>
-    <item>06</item>
-    <item>07</item>
-    <item>08</item>
-  </string-array>
-  
-  <!-- ======================================================= APPEARANCE == -->
-
-  <string name="p_fontSize">font_size</string>
-  <string name="p_taskRowStyle">p_taskRowStyle</string> <!-- DEPRECATED -->
-  <string name="p_taskRowStyle_v2">p_taskRowStyle_v2</string>
-  <string-array name="EPr_task_row_style_values">
-      <item>0</item>
-      <item>1</item>
-      <item>2</item>
-  </string-array>
-  <string name="p_showNotes">notesVisible</string>
-  <string name="p_beastMode">beastMode</string>
-  <string name="p_transparent_deprecated">transparent</string>
-  <string name="p_theme">theme</string>
-  <string name="p_theme_widget">theme_widget</string>
-  
-  <string name="p_voicePrefSection">voicePrefSection</string>
-  <string name="p_voiceInputEnabled">voiceInputEnabled</string>
-  <string name="p_voiceInputCreatesTask">voiceInputCreatesTask</string>
-  <string name="p_voiceRemindersEnabled">voiceRemindersEnabled</string>
-  
-  <string-array name="EPr_theme_settings">
-    <!-- theme_settings: options for preference menu -->
-    <item>white</item>
-    <item>white-red</item>
-    <item>white-alt</item>
-    <item>black</item>
-    <item>transparent</item>
-    <item>transparent-white</item>
-  </string-array>
-    
-  <string-array name="EPr_theme_widget_settings">
-    <!-- theme_settings: options for preference menu -->
-    <item>same-as-app</item>
-    <item>white</item>
-    <item>white-red</item>
-    <item>white-alt</item>
-    <item>black</item>
-    <item>transparent</item>
-    <item>transparent-white</item>
-    <item>legacy-widget</item>
-  </string-array>
-  
-  <string-array name="EPr_font_size">
-    <!-- font_size: options for preference menu -->
-    <item>10</item>
-    <item>12</item>
-    <item>14</item>
-    <item>16</item>
-    <item>18</item>
-    <item>20</item>
-    <item>22</item>
-    <item>24</item>
-    <item>26</item>
-    <item>28</item>
-    <item>30</item>
-    <item>32</item>
-    <item>36</item>
-    <item>48</item>
-  </string-array>
-  
-  <string name="p_showSmartConfirmation_key">showSmartConfirmation</string>
-  
-  <string name="p_taskRowPrefs">taskRowPrefs</string>
-  
-  <string name="p_fullTaskTitle">fullTaskTitle</string>
-  
-  <string name="p_edit_screen">p_edit_screen</string>
-  
-  <string name="p_time_increment">p_time_increment</string>
-  
-  <string name="p_use_date_shortcuts">p_use_date_shortcuts</string>
-  
-  <string name="p_hide_plus_button">p_hide_plus_button</string>
-  
-  <string name="p_show_timer_shortcut">p_show_timer_shortcut</string>
-  
-  <!-- Configurations -->
-  <string name="p_configurations">p_configurations</string>
-  <string name="p_config_default">p_config_default</string>
-  <string name="p_config_lite">p_config_lite</string>
-  
-  <!-- ========================================================= DEFAULTS == -->
-  
-  <!-- default urgency setting (corresponds to entry in TEA_urgency) -->  
-  <string name="p_default_urgency_key">p_def_urg</string>
-      
-  <string-array name="EPr_default_importance_values">
-    <!-- importance: labels that map EPr_default_importance items to task importance values. -->
-    <item>0</item>
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-  </string-array>
-      
-  <string-array name="EPr_default_urgency_values">
-    <!-- urgency: labels that map EPr_default_urgency items to index in TEA_urgency. -->
-    <item>0</item>
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-    <item>4</item>
-    <item>5</item>
-  </string-array>
-      
-  <string-array name="EPr_default_hideUntil_values">
-    <!-- hideUntil: labels that map EPr_default_hideUntil items to index in TEA_hideUntil. -->
-    <item>0</item>
-    <item>1</item>
-    <item>2</item>
-    <item>3</item>
-  </string-array>
-      
-  <string-array name="EPr_default_reminders_values">
-    <!-- reminders: values that map EPr_default_reminders items to reminder flags. -->
-    <item>0</item>
-    <item>2</item>
-    <item>4</item>
-    <item>6</item>
-  </string-array>
-  
-  <string-array name="EPr_default_reminders_mode_values">
-    <!-- reminders: values that map EPr_default_reminders items to reminder flags. -->
-    <item>0</item>
-    <item>16</item>
-    <item>8</item>
-  </string-array>
-  
-  <!-- default importance setting (corresponds to task setting) -->
-  <string name="p_default_importance_key">p_def_imp</string>
-  
-  <!-- default hide until setting (corresponds to entry in TEA_hideUntil) -->
-  <string name="p_default_hideUntil_key">p_def_hide</string>
-  
-  <!-- default reminders setting (corresponds to reminder flags) -->
-  <string name="p_default_reminders_key">p_def_reminders</string>
-  
-  <!-- default Add To Calendar setting (corresponds to entry in gcal_TEA_addToCalendar) -->
-  <string name="p_default_addtocalendar_key">p_def_addtocalendar</string>
-  
-  <!-- default reminder mode setting (corresponds to entry in TEA_reminder_mode_once, TEA_reminder_mode_five, TEA_reminder_mode_nonstop) -->
-  <string name="p_default_reminders_mode_key">rmd_default_reminder_mode</string>
-  
-  <!-- swipe between lists performance mode setting (DEPRECATED)-->
-  <string name="p_swipe_lists_performance_key">p_swipe_lists_perf</string>
-
-  <string name="p_swipe_lists_enabled">p_swipe_lists_enabled</string>
-  
-  <!-- use new contact picker setting -->
-  <string name="p_use_contact_picker">p_use_contact_picker</string>
-  
-  <!-- on calendar end at dealline if true, start at deadline if false -->
-  <string name="p_end_at_deadline">p_end_at_deadline</string>
-  
-  <!-- whether custom filters are enabled -->
-  <string name="p_use_filters">p_use_filters</string>
-
-  <!-- whether list members header should be shown -->
-  <string name="p_show_list_members">p_show_list_members</string>
-  
-  <string-array name="EPr_default_addtocalendar_values">
-    <!-- addtocalendar: labels that map EPr_default_addtocalendar items to calendar selection in settings. -->
-    <item>-1</item>
-  </string-array>
-  
-  <!-- ============================================================ SYNC == -->
-  
+<resources>
+
+    <string name="fb_app_id">183862944961271</string>
+
+    <!-- ======================================================== REMINDERS == -->
+
+    <!-- whether reminders should appear at all -->
+    <string name="p_rmd_enabled">notif_enabled</string>
+
+    <!-- hour to start quiet hours (inclusive) -->
+    <string name="p_rmd_quietStart">notif_qstart</string>
+
+    <!-- hour to end quiet hours (non-inclusive) -->
+    <string name="p_rmd_quietEnd">notif_qend</string>
+
+    <!-- reminder time when task doesn't have a due time (hour of day) -->
+    <string name="p_rmd_time">reminder_time</string>
+
+    <!-- whether "clear all notifications" clears astrid notifications -->
+    <string name="p_rmd_persistent">notif_annoy</string>
+
+    <!-- whether to max out the notification reminder volume if reminder has setting "ring multiple" or "ring continuous" -->
+    <string name="p_rmd_maxvolume">notif_maxvol</string>
+
+    <!-- whether to vibrate phone when reminder fires -->
+    <string name="p_rmd_vibrate">notif_vibrate</string>
+
+    <!-- ringtone to use for notifications -->
+    <string name="p_rmd_ringtone">notification_ringtone</string>
+
+    <!-- if tts is used for notifications -->
+    <string name="p_rmd_voice">notification_voice</string>
+
+    <!-- icon theme for notifications -->
+    <string name="p_rmd_icon">notif_theme</string>
+
+    <!-- whether astrid nag messages are used -->
+    <string name="p_rmd_nagging">nagging</string>
+
+    <!-- if true / unset, hh:mm dialog. otherwise, days / hours -->
+    <string name="p_rmd_snooze_dialog">snooze_dialog</string>
+
+    <!-- default random reminder setting (in hours) -->
+    <string name="p_rmd_default_random_hours">notif_default_reminder</string>
+
+    <!-- show faces in reminders (aka social reminders) -->
+    <string name="p_rmd_social">p_rmd_social</string>
+
+    <!-- field missed calls preference -->
+    <string name="p_field_missed_calls">field_missed_calls</string>
+
+    <!-- calendar reminders preference -->
+    <string name="p_calendar_reminders">p_calendar_reminder</string>
+
+    <!-- show friends view preference -->
+    <string name="p_show_friends_view">show_friends_view</string>
+
+    <!-- force tablets to use phone layout -->
+    <string name="p_force_phone_layout">force_phone_layout</string>
+
+    <!-- account status section key -->
+    <string name="p_account">account</string>
+
+    <!-- list view section key -->
+    <string name="p_list_view">p_list_view</string>
+
+    <!-- filters to show -->
+    <string name="p_filters_to_show">p_filters_to_show</string>
+    <string name="p_show_my_tasks_filter">p_show_my_tasks_f</string>
+    <string name="p_show_today_filter">p_show_today_f</string>
+    <string name="p_show_waiting_on_me_filter">p_show_waiting_on_me_f</string>
+    <string name="p_show_recently_modified_filter">p_show_recently_modified_f</string>
+    <string name="p_show_ive_assigned_filter">p_show_assigned_f</string>
+    <string name="p_show_not_in_list_filter">p_show_no_list_f</string>
+
+    <!-- show quickadd controls -->
+    <string name="p_show_quickadd_controls">p_show_quickadd_controls</string>
+
+    <!-- show comments in task edit -->
+    <string name="p_show_task_edit_comments">p_show_task_edit_comments</string>
+
+    <!-- show save and cancel buttons in task edit -->
+    <string name="p_save_and_cancel">p_save_and_cancel</string>
+
+    <!-- menu items to show -->
+    <string name="p_menu_items">p_menu_items</string>
+    <string name="p_show_menu_search">p_show_menu_search</string>
+    <string name="p_show_menu_friends">p_show_menu_friends</string>
+    <string name="p_show_menu_sync">p_show_menu_sync</string>
+    <string name="p_show_menu_sort">p_show_menu_sort</string>
+
+    <string-array name="TEA_reminder_random_hours">
+        <!-- values (in hours) associated with items above. -->
+        <item>1</item>
+        <item>24</item>
+        <item>168</item>
+        <item>336</item>
+        <item>730</item>
+        <item>1460</item>
+    </string-array>
+
+    <string-array name="notif_icon_values">
+        <!-- Corresponding to the constants in Preferences.java (do not edit) -->
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <string-array name="EPr_reminder_random_hours">
+        <!-- values (in hours) associated with random reminders above. -->
+        <item>0</item>
+        <item>1</item>
+        <item>24</item>
+        <item>168</item>
+        <item>336</item>
+        <item>730</item>
+        <item>1460</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_start_values">
+        <!-- quiet_hours_start_values: 24-hour representation of quiet_hour_start -->
+        <item></item>
+        <item>20</item>
+        <item>21</item>
+        <item>22</item>
+        <item>23</item>
+        <item>00</item>
+        <item>01</item>
+        <item>02</item>
+        <item>03</item>
+        <item>04</item>
+        <item>05</item>
+        <item>06</item>
+        <item>07</item>
+        <item>08</item>
+        <item>09</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+        <item>16</item>
+        <item>17</item>
+        <item>18</item>
+        <item>19</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_end_values">
+        <!-- quiet_hours_end_values: 24-hour representation of quiet_hours_end -->
+        <item>09</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+        <item>16</item>
+        <item>17</item>
+        <item>18</item>
+        <item>19</item>
+        <item>20</item>
+        <item>21</item>
+        <item>22</item>
+        <item>23</item>
+        <item>00</item>
+        <item>01</item>
+        <item>02</item>
+        <item>03</item>
+        <item>04</item>
+        <item>05</item>
+        <item>06</item>
+        <item>07</item>
+        <item>08</item>
+    </string-array>
+
+    <string-array name="EPr_rmd_time_values">
+        <!-- rmd_time_values: 24-hour representation of rmd_time_values -->
+        <item>09</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+        <item>16</item>
+        <item>17</item>
+        <item>18</item>
+        <item>19</item>
+        <item>20</item>
+        <item>21</item>
+        <item>22</item>
+        <item>23</item>
+        <item>00</item>
+        <item>01</item>
+        <item>02</item>
+        <item>03</item>
+        <item>04</item>
+        <item>05</item>
+        <item>06</item>
+        <item>07</item>
+        <item>08</item>
+    </string-array>
+
+    <!-- ======================================================= APPEARANCE == -->
+
+    <string name="p_fontSize">font_size</string>
+    <string name="p_taskRowStyle">p_taskRowStyle</string>
+    <!-- DEPRECATED -->
+    <string name="p_taskRowStyle_v2">p_taskRowStyle_v2</string>
+    <string-array name="EPr_task_row_style_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+    <string name="p_showNotes">notesVisible</string>
+    <string name="p_beastMode">beastMode</string>
+    <string name="p_transparent_deprecated">transparent</string>
+    <string name="p_theme">theme</string>
+    <string name="p_theme_widget">theme_widget</string>
+
+    <string name="p_voicePrefSection">voicePrefSection</string>
+    <string name="p_voiceInputEnabled">voiceInputEnabled</string>
+    <string name="p_voiceInputCreatesTask">voiceInputCreatesTask</string>
+    <string name="p_voiceRemindersEnabled">voiceRemindersEnabled</string>
+
+    <string-array name="EPr_theme_settings">
+        <!-- theme_settings: options for preference menu -->
+        <item>white</item>
+        <item>white-red</item>
+        <item>white-alt</item>
+        <item>black</item>
+        <item>transparent</item>
+        <item>transparent-white</item>
+    </string-array>
+
+    <string-array name="EPr_theme_widget_settings">
+        <!-- theme_settings: options for preference menu -->
+        <item>same-as-app</item>
+        <item>white</item>
+        <item>white-red</item>
+        <item>white-alt</item>
+        <item>black</item>
+        <item>transparent</item>
+        <item>transparent-white</item>
+        <item>legacy-widget</item>
+    </string-array>
+
+    <string-array name="EPr_font_size">
+        <!-- font_size: options for preference menu -->
+        <item>10</item>
+        <item>12</item>
+        <item>14</item>
+        <item>16</item>
+        <item>18</item>
+        <item>20</item>
+        <item>22</item>
+        <item>24</item>
+        <item>26</item>
+        <item>28</item>
+        <item>30</item>
+        <item>32</item>
+        <item>36</item>
+        <item>48</item>
+    </string-array>
+
+    <string name="p_showSmartConfirmation_key">showSmartConfirmation</string>
+
+    <string name="p_taskRowPrefs">taskRowPrefs</string>
+
+    <string name="p_fullTaskTitle">fullTaskTitle</string>
+
+    <string name="p_edit_screen">p_edit_screen</string>
+
+    <string name="p_time_increment">p_time_increment</string>
+
+    <string name="p_use_date_shortcuts">p_use_date_shortcuts</string>
+
+    <string name="p_hide_plus_button">p_hide_plus_button</string>
+
+    <string name="p_show_timer_shortcut">p_show_timer_shortcut</string>
+
+    <!-- Configurations -->
+    <string name="p_configurations">p_configurations</string>
+    <string name="p_config_default">p_config_default</string>
+    <string name="p_config_lite">p_config_lite</string>
+
+    <!-- ========================================================= DEFAULTS == -->
+
+    <!-- default urgency setting (corresponds to entry in TEA_urgency) -->
+    <string name="p_default_urgency_key">p_def_urg</string>
+
+    <string-array name="EPr_default_importance_values">
+        <!-- importance: labels that map EPr_default_importance items to task importance values. -->
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
+    <string-array name="EPr_default_urgency_values">
+        <!-- urgency: labels that map EPr_default_urgency items to index in TEA_urgency. -->
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+    </string-array>
+
+    <string-array name="EPr_default_hideUntil_values">
+        <!-- hideUntil: labels that map EPr_default_hideUntil items to index in TEA_hideUntil. -->
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
+    <string-array name="EPr_default_reminders_values">
+        <!-- reminders: values that map EPr_default_reminders items to reminder flags. -->
+        <item>0</item>
+        <item>2</item>
+        <item>4</item>
+        <item>6</item>
+    </string-array>
+
+    <string-array name="EPr_default_reminders_mode_values">
+        <!-- reminders: values that map EPr_default_reminders items to reminder flags. -->
+        <item>0</item>
+        <item>16</item>
+        <item>8</item>
+    </string-array>
+
+    <!-- default importance setting (corresponds to task setting) -->
+    <string name="p_default_importance_key">p_def_imp</string>
+
+    <!-- default hide until setting (corresponds to entry in TEA_hideUntil) -->
+    <string name="p_default_hideUntil_key">p_def_hide</string>
+
+    <!-- default reminders setting (corresponds to reminder flags) -->
+    <string name="p_default_reminders_key">p_def_reminders</string>
+
+    <!-- default Add To Calendar setting (corresponds to entry in gcal_TEA_addToCalendar) -->
+    <string name="p_default_addtocalendar_key">p_def_addtocalendar</string>
+
+    <!-- default reminder mode setting (corresponds to entry in TEA_reminder_mode_once, TEA_reminder_mode_five, TEA_reminder_mode_nonstop) -->
+    <string name="p_default_reminders_mode_key">rmd_default_reminder_mode</string>
+
+    <!-- swipe between lists performance mode setting (DEPRECATED)-->
+    <string name="p_swipe_lists_performance_key">p_swipe_lists_perf</string>
+
+    <string name="p_swipe_lists_enabled">p_swipe_lists_enabled</string>
+
+    <!-- use new contact picker setting -->
+    <string name="p_use_contact_picker">p_use_contact_picker</string>
+
+    <!-- on calendar end at dealline if true, start at deadline if false -->
+    <string name="p_end_at_deadline">p_end_at_deadline</string>
+
+    <!-- whether custom filters are enabled -->
+    <string name="p_use_filters">p_use_filters</string>
+
+    <!-- whether list members header should be shown -->
+    <string name="p_show_list_members">p_show_list_members</string>
+
+    <string-array name="EPr_default_addtocalendar_values">
+        <!-- addtocalendar: labels that map EPr_default_addtocalendar items to calendar selection in settings. -->
+        <item>-1</item>
+    </string-array>
+
+    <!-- ============================================================ SYNC == -->
+
     <string-array name="sync_SPr_interval_values">
         <!-- sync_SPr_interval_values: interval in seconds for sync entries (do not edit) -->
         <item>0</item>
@@ -387,8 +388,8 @@
         <item>259200</item>
         <item>604800</item>
     </string-array>
-  
-      <!-- Preference Key (do not translate) -->
+
+    <!-- Preference Key (do not translate) -->
     <string name="sync_SPr_status_key">sync_status</string>
     <!-- Preference Key (do not translate) -->
     <string name="sync_SPr_bgwifi_key">sync_bgwifi</string>
@@ -400,85 +401,87 @@
     <string name="sync_SPr_key_options">sync_options</string>
     <!-- Preference Key (do not translate) -->
     <string name="sync_SPr_key_last_error">sync_last_error</string>
-    
-  <!-- ===========================================================ACTFM == -->
-  <string name="actfm_https_key">actfmHttps</string>
-    
-  <!-- =========================================================== GTASKS == -->
-  
+
+    <!-- ===========================================================ACTFM == -->
+    <string name="actfm_https_key">actfmHttps</string>
+
+    <!-- =========================================================== GTASKS == -->
+
     <string name="gtasks_GPr_interval_key">gtasks_sync_freq</string>
-    
-  <!-- ========================================================== SHARING == -->
-  
+
+    <!-- ========================================================== SHARING == -->
+
     <string name="actfm_APr_interval_key">actfm_sync_freq</string>
 
-  <!-- ======================================================== POWERPACK == -->
-
-  <!-- Anonymous usage statistics -->
-  <string name="p_statistics">statistics</string>
-  
-  <!-- ================================================= NEW USER EXPERIENCE -->
-  <!-- Preference Keys (do not translate) -->
-  <string name="p_showed_add_task_help">showed_add_task_help</string>
-  <string name="p_showed_tap_task_help">showed_tap_task_help</string>
-  <string name="p_showed_lists_help">showed_lists_help</string>
-  <string name="p_showed_list_settings_help">showed_list_settings_help</string>
-  <string name="p_showed_collaborators_help">showed_collaborators_help</string>
-  <string name="p_showed_when_shortcut">showed_when_shortcut</string>
-  <string name="p_showed_when_row">showed_when_row</string>
-  <string name="p_tutorial">tutorial</string>
-  
-  <!-- ============================================================ OTHER == -->
-  
+    <!-- ======================================================== POWERPACK == -->
+
+    <!-- Anonymous usage statistics -->
+    <string name="p_statistics">statistics</string>
+
+    <!-- ================================================= NEW USER EXPERIENCE -->
+    <!-- Preference Keys (do not translate) -->
+    <string name="p_showed_add_task_help">showed_add_task_help</string>
+    <string name="p_showed_tap_task_help">showed_tap_task_help</string>
+    <string name="p_showed_lists_help">showed_lists_help</string>
+    <string name="p_showed_list_settings_help">showed_list_settings_help</string>
+    <string name="p_showed_collaborators_help">showed_collaborators_help</string>
+    <string name="p_showed_when_shortcut">showed_when_shortcut</string>
+    <string name="p_showed_when_row">showed_when_row</string>
+    <string name="p_tutorial">tutorial</string>
+
+    <!-- ============================================================ OTHER == -->
+
     <!-- Preference Key (do not translate) -->
     <string name="backup_BPr_status_key">backup_status</string>
     <!-- Preference Key (do not translate) -->
-    <string name="backup_BPr_auto_key">backup</string>  
-
-  <!-- Default Calendar Preference Key (do not translate) -->
-  <string name="gcal_p_default">default_calendar_id</string>
-  
-  <!-- placeholder string for info about translators (i.e. YOU!) -->
-  <string name="about_translators"></string>
-  
-  <string-array name="TEA_control_sets_beast">
-      <item >@string/TEA_control_who</item>
-      <item >@string/TEA_control_when</item>
-      <item >@string/TEA_control_importance</item>
-      <item >@string/TEA_control_lists</item>
-      <item >@string/TEA_control_notes</item>
-      <item >@string/TEA_control_files</item>
-      <item >@string/TEA_control_more_section</item>
-      <item >@string/TEA_control_reminders</item>
-      <item >@string/TEA_control_timer</item>
-      <item >@string/TEA_control_hidden_section</item>
-  </string-array>
-  
-  <string name="TEA_ctrl_title_pref">TEA_ctrl_title_pref</string> <!-- Deprecated -->
-  <string name="TEA_ctrl_who_pref">TEA_ctrl_who_pref</string>
-  <string name="TEA_ctrl_when_pref">TEA_ctrl_when_pref</string>
-  <string name="TEA_ctrl_more_pref">TEA_ctrl_more_pref</string>
-  <string name="TEA_ctrl_importance_pref">TEA_ctrl_importance_pref</string>
-  <string name="TEA_ctrl_lists_pref">TEA_ctrl_lists_pref</string>
-  <string name="TEA_ctrl_notes_pref">TEA_ctrl_notes_pref</string>
-  <string name="TEA_ctrl_files_pref">TEA_ctrl_files_pref</string>
-  <string name="TEA_ctrl_hide_section_pref">TEA_ctrl_hide_section_pref</string>
-  <string name="TEA_ctrl_reminders_pref">TEA_ctrl_reminders_pref</string>
-  <string name="TEA_ctrl_timer_pref">TEA_ctrl_timer_pref</string>
-  <string name="TEA_ctrl_share_pref">TEA_ctrl_share_pref</string> <!-- Deprecated -->
-      
-  <string-array name="TEA_control_sets_prefs">
-      <item>@string/TEA_ctrl_who_pref</item>
-      <item>@string/TEA_ctrl_when_pref</item>
-      <item>@string/TEA_ctrl_importance_pref</item>
-      <item>@string/TEA_ctrl_lists_pref</item>
-      <item>@string/TEA_ctrl_notes_pref</item>
-      <item>@string/TEA_ctrl_files_pref</item>
-      <item>@string/TEA_ctrl_more_pref</item>
-      <item>@string/TEA_ctrl_reminders_pref</item>
-      <item>@string/TEA_ctrl_timer_pref</item>
-      <item>@string/TEA_ctrl_hide_section_pref</item>
-  </string-array>
-  
-  
+    <string name="backup_BPr_auto_key">backup</string>
+
+    <!-- Default Calendar Preference Key (do not translate) -->
+    <string name="gcal_p_default">default_calendar_id</string>
+
+    <!-- placeholder string for info about translators (i.e. YOU!) -->
+    <string name="about_translators"></string>
+
+    <string-array name="TEA_control_sets_beast">
+        <item>@string/TEA_control_who</item>
+        <item>@string/TEA_control_when</item>
+        <item>@string/TEA_control_importance</item>
+        <item>@string/TEA_control_lists</item>
+        <item>@string/TEA_control_notes</item>
+        <item>@string/TEA_control_files</item>
+        <item>@string/TEA_control_more_section</item>
+        <item>@string/TEA_control_reminders</item>
+        <item>@string/TEA_control_timer</item>
+        <item>@string/TEA_control_hidden_section</item>
+    </string-array>
+
+    <string name="TEA_ctrl_title_pref">TEA_ctrl_title_pref</string>
+    <!-- Deprecated -->
+    <string name="TEA_ctrl_who_pref">TEA_ctrl_who_pref</string>
+    <string name="TEA_ctrl_when_pref">TEA_ctrl_when_pref</string>
+    <string name="TEA_ctrl_more_pref">TEA_ctrl_more_pref</string>
+    <string name="TEA_ctrl_importance_pref">TEA_ctrl_importance_pref</string>
+    <string name="TEA_ctrl_lists_pref">TEA_ctrl_lists_pref</string>
+    <string name="TEA_ctrl_notes_pref">TEA_ctrl_notes_pref</string>
+    <string name="TEA_ctrl_files_pref">TEA_ctrl_files_pref</string>
+    <string name="TEA_ctrl_hide_section_pref">TEA_ctrl_hide_section_pref</string>
+    <string name="TEA_ctrl_reminders_pref">TEA_ctrl_reminders_pref</string>
+    <string name="TEA_ctrl_timer_pref">TEA_ctrl_timer_pref</string>
+    <string name="TEA_ctrl_share_pref">TEA_ctrl_share_pref</string>
+    <!-- Deprecated -->
+
+    <string-array name="TEA_control_sets_prefs">
+        <item>@string/TEA_ctrl_who_pref</item>
+        <item>@string/TEA_ctrl_when_pref</item>
+        <item>@string/TEA_ctrl_importance_pref</item>
+        <item>@string/TEA_ctrl_lists_pref</item>
+        <item>@string/TEA_ctrl_notes_pref</item>
+        <item>@string/TEA_ctrl_files_pref</item>
+        <item>@string/TEA_ctrl_more_pref</item>
+        <item>@string/TEA_ctrl_reminders_pref</item>
+        <item>@string/TEA_ctrl_timer_pref</item>
+        <item>@string/TEA_ctrl_hide_section_pref</item>
+    </string-array>
+
+
 </resources>
diff --git a/astrid/res/values/strings-actfm.xml b/astrid/res/values/strings-actfm.xml
index 7352a3b49..a4be69e90 100644
--- a/astrid/res/values/strings-actfm.xml
+++ b/astrid/res/values/strings-actfm.xml
@@ -4,384 +4,430 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ================================================== general terms == -->
-
-  <!-- People Editing Activity -->    
-  
-  <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
-  <string name="actfm_person_hint">Contact or Email</string>
-  
-  <!-- task sharing dialog: shared with hint -->
-  <string name="actfm_person_or_tag_hint">Contact or Shared List</string>
-
-  <!-- toast on transmit success -->
-
-  <!-- can't rename or delete shared tag message -->
-  
-  <!-- warning before deleting a list you're the owner of -->
-  <string name="actfm_tag_operation_owner_delete">You are the owner of this shared list! If you delete it, it will be deleted for all list members. Are you sure you want to continue?</string>
-
-  <!-- slide 29a: menu item to take a picture -->
-  <string name="actfm_picture_camera">Take a Picture</string>
-
-  <!-- slide 29b: menu item to select from gallery -->
-  <string name="actfm_picture_gallery">Pick from Gallery</string>
-  
-  <!-- menu item to clear picture selection -->
-  <string name="actfm_picture_clear">Clear Picture</string>
-
-  <!-- filter list activity: refresh tags -->
-  
-  <!-- Title for prompt after sharing a task -->
-  <string name="actfm_view_task_title">View Task?</string>
-
-  <!-- Text for prompt after sharing a task -->
-  <string name="actfm_view_task_text">Task was sent to %s! You\'re currently viewing your own tasks. Do you want to view this and other tasks you\'ve assigned?</string>
-  
-  <!-- Ok button for task view prompt -->
-  <string name="actfm_view_task_ok">View Assigned</string>
-      
-  <!-- Cancel button for task view prompt -->
-  <string name="actfm_view_task_cancel">Stay Here</string>
-  
-  <!-- slide 13a: Title for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_title">My Shared Tasks</string>
-  
-  <!-- Empty list for the "My Shared Tasks" filter -->
-  <string name="actfm_my_shared_tasks_empty">No shared tasks</string>
-  
-  <!-- =====================  Friendship connections -->
-  
-  <string name="actfm_friendship_pending">You\'ve sent a friend request to %s!</string>
-
-  <string name="actfm_friendship_blocked">You\'ve blocked %s.</string>
-
-  <string name="actfm_friendship_ignored">You\'ve ignored %s.</string>
-  
-  <string name="actfm_friendship_friends">You\'re friends with %s! Add tasks for them below.</string>
-
-  <string name="actfm_friendship_other_pending">%s wants to be friends with you!</string>
-
-  <string name="actfm_friendship_no_status">Connect with %s to share and see activity on public tasks!</string>
-
-  <string name="actfm_friendship_connect">Add friend</string>
-
-  <string name="actfm_friendship_accept">Accept</string>
-
-  <!-- ================================================== TagViewActivity == -->  
-
-  <!-- Tag View Activity: Add Comment hint -->    
-  <string name="TVA_add_comment">Add a comment...</string>
-
-  <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->    
-  
-  <!-- Tabs for Tag view -->
-  <string-array name="TVA_tabs">
-    <!-- Tab for showing tasks -->
-    <item>Tasks</item>
-    <!-- Tab for showing comments & updates -->
-    <item>Activity</item>
-    <!-- Tab for showing setting -->
-    <item>List Settings</item>
-  </string-array>
-  
-  <!-- Tag View: filtered by assigned to user (%s => user name) -->
-  <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
-  
-  <!-- Tag View: filter by unassigned tasks -->
-  <string name="actfm_TVA_filter_by_unassigned">Unassigned tasks. Tap for all.</string>
-
-  <!-- Tag View: list is private, no members -->
-  <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
-
-  <!-- Tag View Menu: refresh -->
-  <string name="actfm_TVA_menu_refresh">Refresh</string>
-
-  <!-- Tag Settings: tag name label -->
-  <string name="actfm_TVA_tag_label">List</string>
-
-  <!-- Tag Settings: tag owner label -->
-
-  <!-- Tag Settings: tag owner value when there is no owner -->
-
-  <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
-  <string name="actfm_TVA_members_label">Shared With</string>
-  
-  <!-- Tag Settings: list collaborators hint -->
-  <string name="actfm_TVA_members_hint">Share with anyone who has an email address</string>
-
-  <!-- Tag Settings: tag picture -->
-  <string name="actfm_TVA_tag_picture">List Picture</string>
-
-  <!-- slide 25c/28b: Tag Settings: silence notifications label -->
-  <string name="actfm_TVA_silence_label">Silence Notifications</string>
-  
-  <!-- Tag Settings: list icon label -->
-  
-  <!-- slide 25b/27d: Tag Settings: list description label -->
-  <string name="actfm_TVA_tag_description_label">Description</string>
-  
-  <!-- slide 28a: Tag Settings: list settings label -->
-  <string name="actfm_TVA_tag_settings_label">Settings</string>
-
-  <!-- slide 25b: Tag Settings: list description hint -->
-  <string name="actfm_TVA_tag_description_hint">Type a description here</string>
-  
-  <!-- slide 25d: Tag Settings: list name hint -->
-  <string name="actfm_TVA_tag_name_hint">Enter list name</string>
-  
-  <!-- Tag settings: login prompt from share-->
-  <string name="actfm_TVA_login_to_share">You need to be logged in to Astrid.com to share lists! Please log in or make this a private list.</string>
-  
-      
-  <!-- ============================================ edit people dialog == -->
-
-  <!-- task sharing dialog: intro -->
-  <string name="actfm_EPA_intro">Use Astrid to share shopping lists, party plans, or team projects and instantly see when people get stuff done!</string>
-    
-  <!-- task sharing dialog: window title -->
-    
-  <!-- task sharing dialog: save button -->
-  
-  <!-- task sharing dialog: assigned label -->
-  
-  <!-- slide 18a: task sharing dialog: assigned label long version -->
-  <string name="actfm_EPA_assign_label_long">Who should do this?</string>
-  
-  <!-- task sharing dialog: assigned to me -->
-  <string name="actfm_EPA_assign_me">Me</string>
-  
-  <!-- task sharing dialog: anyone -->
-  <string name="actfm_EPA_unassigned">Unassigned</string>
-  
-  <!-- slide 18c: task sharing dialog: choose a contact -->
-  <string name="actfm_EPA_choose_contact">Choose a contact</string>
-  
-  <!-- task sharing dialog: custom email assignment -->
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_share_with">Share with:</string>
-  
-  <!-- task sharing dialog: shared with label -->
-  <string name="actfm_EPA_collaborators_header">Share</string>
-
-      <!-- task sharing dialog: collaborator list name (%s => name of list) -->
-  <string name="actfm_EPA_list">List: %s</string>
-  
-  <!-- task sharing dialog: assigned hint -->
-  
-  <!-- task sharing dialog: message label text -->
-  <string name="actfm_EPA_message_text">Invitation Message:</string>
-  
-  <!-- task sharing dialog: message body -->
-  <string name="actfm_EPA_message_body">Help me get this done!</string>
-  
-  <!-- task sharing dialog: list members section header -->
-  <string name="actfm_EPA_assign_header_members">List Members</string>
-
-  <!-- task sharing dialog: astrid friends section header -->
-  <string name="actfm_EPA_assign_header_friends">Astrid Friends</string>
-
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: message hint -->
-  
-  <!-- task sharing dialog: share with Facebook -->
-  <string name="actfm_EPA_facebook">Facebook</string>
-  
-  <!-- task sharing dialog: share with Twitter -->
-  <string name="actfm_EPA_twitter">Twitter</string>
-
-  <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
-
-  <!-- task sharing dialog: edit people settings saved -->
-
-  <!-- task sharing dialog: invalid email (%s => email) -->
-  <string name="actfm_EPA_invalid_email">Invalid E-mail: %s</string>
-
-  <!-- task sharing dialog: tag not found (%s => tag) -->
-  
-  <!-- task sharing login prompt -->
-  <string name="actfm_EPA_login_to_share">You need to be logged in to Astrid.com to share tasks!</string>
-  
-  <string name="actfm_EPA_login_button">Log in</string>
-  
-  <string name="actfm_EPA_dont_share_button">Don\'t share</string>
-  
-  <string name="actfm_EPA_add_person_to_list_title">Task assigned</string>
-  
-  <string name="actfm_EPA_add_person_to_list">%1$s is not shared on this list. Would you like to add %2$s to this list?</string>
-
-  <string name="actfm_EPA_add_person_to_list_ok">Add to list</string>
-  
-  <string name="actfm_EPA_add_person_to_list_cancel">Don\'t add</string>
-  
-  <string name="actfm_list_owner">(owner)</string>
-  
-  <!-- ========================================= sharing login activity == -->
-
-  <!-- share login: Title -->
-  <string name="actfm_ALA_title">Welcome to Astrid.com!</string>
-
-  <!-- share login: Sharing Description -->
-  <string name="actfm_ALA_body">Astrid.com lets you access your tasks online,
-  share, and delegate with others.</string>
-
-  <!-- share login: Sharing Login FB Prompt -->
-  <string name="actfm_ALA_fb_login">Connect with Facebook</string>
-
-  <!-- share login: Sharing Login GG Prompt -->
-  <string name="actfm_ALA_gg_login">Connect with Google</string>
-  
-  <!-- share login: Quickly log in as <%s -> email> -->
-  <string name="actfm_quick_login">Sign in: %s</string>
-
-  <!-- share login: Reject quick login -->
-  <string name="actfm_quick_login_reject">Not %s?</string>
-
-  <!-- share login: Name -->
-  <string name="actfm_ALA_firstname_label">First Name</string>
-  
-  <!-- share login: Name -->
-  <string name="actfm_ALA_lastname_label">Last Name</string>
-
-  <!-- share login: Email -->
-  <string name="actfm_ALA_email_label">Email</string>
-
-  <!-- share login: Username / Email -->
-
-  <!-- share login: Password -->
-  <string name="actfm_ALA_password_label">Password</string>
-
-  <!-- share login: Sign Up Title -->
-  <string name="actfm_ALA_signup_title">Sign Up</string>
-
-  <!-- share login: Login Title -->
-  <string name="actfm_ALA_login_title">Sign In</string>
-
-  <!-- share login: Google Auth title -->
-  <string name="actfm_GAA_title">Select the Google account you want to use:</string>
-
-  <!-- share login: OAUTH Login Prompt -->
-  <string name="actfm_OLA_prompt">Please log in:</string>
-  
-  <!-- Login error: user exists -->
-  <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
-  
-  <!-- Login error: wrong password -->
-  <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try again.</string>
-  
-  <!-- Forgot password link -->
-  <string name="actfm_ALA_forgot_password">Forgot password?</string>
-  
-  <!-- Forgot password email prompt -->
-  <string name="actfm_ALA_enter_email">Please enter your email</string>
-  
-  <!-- Password reset sent (%s -> email) -->
-  <string name="actfm_ALA_reset_sent">Password reset sent to %s</string>
-  
-  <!-- User already exists - first sync may be slow -->
-  <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your patience!</string>
-  
-  <!-- User not found -->
-  <string name="actfm_ALA_error_user_not_found">User not found by that email. Try signing up instead!</string>
-  
-  <!-- ================================================ Featured Lists -->
-
-  <string name="actfm_feat_list_clone">Copy list</string>
-  
-  <string name="actfm_feat_list_suffix">(Copy)</string>
-
-  <string name="actfm_feat_list_cloning">Copying...</string>
-
-  <string name="actfm_feat_list_clone_success">Success!</string>
-
-  <string name="actfm_feat_list_task_clone_success">Task copied</string>
-
-  <string name="actfm_feat_list_clone_empty">No tasks to copy</string>
-  
-  <!-- ================================================ Synchronization == -->
-      
-  <!-- Indicates the logged in user name. %s -> user's name -->
-  <string name="actfm_status_title_logged_in">Logged in as %s</string>    
-      
-  <!-- Preferences Title: Act.fm -->    
-  <string name="actfm_APr_header">Astrid.com</string>
-  
-  <string name="actfm_https_title">Use HTTPS</string>
-  <string name="actfm_https_enabled">HTTPS enabled (slower)</string>
-  <string name="actfm_https_disabled">HTTPS disabled (faster)</string>
-
-  <!-- title for notification tray after synchronizing -->
-  
-  <!-- text for notification when comments are received -->
-    
-  <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid duplicate tasks and other synchronization issues, 
-      Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You can still import tasks from Google Tasks from the Google Tasks settings page,
-      or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.  
-      Are you sure you want to sync with Astrid.com?</string>
-      
-  <!-- account types -->
-  <string name="actfm_account_type">Account type</string>
-  <string name="actfm_account_info">Account info</string>
-  <string name="actfm_account_info_summary">Status and options</string>
-  <string name="account_type_title_not_logged_in">Sign up for a free account</string>
-  <string name="account_type_summary_not_logged_in">Access tasks online, share lists and delegate</string>
-  
-  
-  <string name="actfm_account_premium">Premium</string>
-  <string name="actfm_account_basic">Basic</string>
-  
-  <string name="actfm_inapp_billing">Upgrade to Premium</string>
-  <string name="actfm_inapp_billing_summary">Attach files, voice backups, premium support &amp; more</string>
-  
-  <!-- Sharing -->
-  <string name="share_with_facebook">Like on Facebook</string>
-  <string name="share_with_twitter">Follow on Twitter</string>
-  <string name="share_with_google">Share on Google+</string>
-  <string name="share_speech_bubble">By sharing, you\'ll help others be more productive!</string>
-  
-  
-  <!-- Sync upgrade messages -->
-  <string name="sync_upgr_both_title">Using Astrid.com + Google without Duplicates</string>
-  <string name="sync_upgr_both_body">Let\'s be honest. Google Tasks is convenient but not as cool as Astrid. To avoid duplicates you can no longer sync with Astrid.com and background sync with Google Tasks at the same time. You can still import your Google Tasks by visiting Settings → Backup &amp; Sync, or downgrade to Google Tasks only sync</string>
-  <string name="sync_upgr_both_btn1">Stick with Astrid</string>
-  <string name="sync_upgr_both_btn2">Downgrade to Google Tasks</string>
-  
-  <string name="sync_upgr_gtasks_only_title">Upgrade to Astrid Sync for Free!</string>
-  <string name="sync_upgr_gtasks_only_body">Access your tasks from all your devices and from Gmail with Astrid.com sync. Upgrade to Astrid.com Sync (you can always go back to Google Tasks - but you won\'t want to)!</string>
-  <string name="sync_upgr_gtasks_only_btn1">Upgrade to Astrid Sync</string>
-  <string name="sync_upgr_gtasks_only_btn2">Stick with Google Tasks</string>
-  
-  <string name="sync_upgr_neither_title">Free backup &amp; Sync!</string>
-  <string name="sync_upgr_neither_body">Don\'t put your to-dos at risk! New and improved Astrid sync to keep and access your tasks from anywhere.</string>
-  <string name="sync_upgr_neither_btn1">Sign up now</string>
-  
-  <string name="sync_upgr_logged_out">You have been logged out of Astrid</string>
-  
-  <string name="actfm_logout_clear_tasks_title">Clear data?</string>
-  <string name="actfm_logout_clear_tasks_body">Would you like to clear your tasks and lists?</string>
-  <string name="actfm_logout_clear_tasks_yes">Clear data</string>
-  <string name="actfm_logout_clear_tasks_no">Keep data</string>
-  
-  <string name="actfm_logged_in_different_user_title">Logging in as different user</string>
-  <string name="actfm_logged_in_different_user_body">Would you like to delete existing phone tasks before syncing?</string>
-  <string name="actfm_logged_in_different_user_keep_data">Keep data</string>
-  <string name="actfm_logged_in_different_user_clear_data">Clear all data</string>
-  <string name="actfm_logged_in_different_user_processing">Processing existing data...</string>
-  
-  <string name="actfm_tag_not_authorized_title">Not authorized</string>
-  <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you may have been removed). Would you like to create a new list with the same name?</string>
-  <string name="actfm_tag_not_authorized_new_list">Create new list</string>
-  <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
-  
-  <string name="actfm_sync_ongoing">Sync ongoing...</string>
-  
-  <string name="EPr_reset_sync_state">Reset sync</string>
-  <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors</string>
-  <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you wish to continue?</string>
-  
+<resources>
+
+    <!-- ================================================== general terms == -->
+
+    <!-- People Editing Activity -->
+
+    <!-- slide 18b/ 25e/ 27c: task sharing dialog: assigned hint -->
+    <string name="actfm_person_hint">Contact or Email</string>
+
+    <!-- task sharing dialog: shared with hint -->
+    <string name="actfm_person_or_tag_hint">Contact or Shared List</string>
+
+    <!-- toast on transmit success -->
+
+    <!-- can't rename or delete shared tag message -->
+
+    <!-- warning before deleting a list you're the owner of -->
+    <string name="actfm_tag_operation_owner_delete">You are the owner of this shared list! If you
+        delete it, it will be deleted for all list members. Are you sure you want to continue?
+    </string>
+
+    <!-- slide 29a: menu item to take a picture -->
+    <string name="actfm_picture_camera">Take a Picture</string>
+
+    <!-- slide 29b: menu item to select from gallery -->
+    <string name="actfm_picture_gallery">Pick from Gallery</string>
+
+    <!-- menu item to clear picture selection -->
+    <string name="actfm_picture_clear">Clear Picture</string>
+
+    <!-- filter list activity: refresh tags -->
+
+    <!-- Title for prompt after sharing a task -->
+    <string name="actfm_view_task_title">View Task?</string>
+
+    <!-- Text for prompt after sharing a task -->
+    <string name="actfm_view_task_text">Task was sent to %s! You\'re currently viewing your own
+        tasks. Do you want to view this and other tasks you\'ve assigned?
+    </string>
+
+    <!-- Ok button for task view prompt -->
+    <string name="actfm_view_task_ok">View Assigned</string>
+
+    <!-- Cancel button for task view prompt -->
+    <string name="actfm_view_task_cancel">Stay Here</string>
+
+    <!-- slide 13a: Title for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_title">My Shared Tasks</string>
+
+    <!-- Empty list for the "My Shared Tasks" filter -->
+    <string name="actfm_my_shared_tasks_empty">No shared tasks</string>
+
+    <!-- =====================  Friendship connections -->
+
+    <string name="actfm_friendship_pending">You\'ve sent a friend request to %s!</string>
+
+    <string name="actfm_friendship_blocked">You\'ve blocked %s.</string>
+
+    <string name="actfm_friendship_ignored">You\'ve ignored %s.</string>
+
+    <string name="actfm_friendship_friends">You\'re friends with %s! Add tasks for them below.
+    </string>
+
+    <string name="actfm_friendship_other_pending">%s wants to be friends with you!</string>
+
+    <string name="actfm_friendship_no_status">Connect with %s to share and see activity on public
+        tasks!
+    </string>
+
+    <string name="actfm_friendship_connect">Add friend</string>
+
+    <string name="actfm_friendship_accept">Accept</string>
+
+    <!-- ================================================== TagViewActivity == -->
+
+    <!-- Tag View Activity: Add Comment hint -->
+    <string name="TVA_add_comment">Add a comment...</string>
+
+    <!-- Tag View Activity: task comment ($1 - user name, $2 - task title) -->
+
+    <!-- Tabs for Tag view -->
+    <string-array name="TVA_tabs">
+        <!-- Tab for showing tasks -->
+        <item>Tasks</item>
+        <!-- Tab for showing comments & updates -->
+        <item>Activity</item>
+        <!-- Tab for showing setting -->
+        <item>List Settings</item>
+    </string-array>
+
+    <!-- Tag View: filtered by assigned to user (%s => user name) -->
+    <string name="actfm_TVA_filtered_by_assign">%s\'s tasks. Tap for all.</string>
+
+    <!-- Tag View: filter by unassigned tasks -->
+    <string name="actfm_TVA_filter_by_unassigned">Unassigned tasks. Tap for all.</string>
+
+    <!-- Tag View: list is private, no members -->
+    <string name="actfm_TVA_no_members_alert">Private: tap to edit or share list</string>
+
+    <!-- Tag View Menu: refresh -->
+    <string name="actfm_TVA_menu_refresh">Refresh</string>
+
+    <!-- Tag Settings: tag name label -->
+    <string name="actfm_TVA_tag_label">List</string>
+
+    <!-- Tag Settings: tag owner label -->
+
+    <!-- Tag Settings: tag owner value when there is no owner -->
+
+    <!-- slide 26a and 27b: Tag Settings: list collaborators label -->
+    <string name="actfm_TVA_members_label">Shared With</string>
+
+    <!-- Tag Settings: list collaborators hint -->
+    <string name="actfm_TVA_members_hint">Share with anyone who has an email address</string>
+
+    <!-- Tag Settings: tag picture -->
+    <string name="actfm_TVA_tag_picture">List Picture</string>
+
+    <!-- slide 25c/28b: Tag Settings: silence notifications label -->
+    <string name="actfm_TVA_silence_label">Silence Notifications</string>
+
+    <!-- Tag Settings: list icon label -->
+
+    <!-- slide 25b/27d: Tag Settings: list description label -->
+    <string name="actfm_TVA_tag_description_label">Description</string>
+
+    <!-- slide 28a: Tag Settings: list settings label -->
+    <string name="actfm_TVA_tag_settings_label">Settings</string>
+
+    <!-- slide 25b: Tag Settings: list description hint -->
+    <string name="actfm_TVA_tag_description_hint">Type a description here</string>
+
+    <!-- slide 25d: Tag Settings: list name hint -->
+    <string name="actfm_TVA_tag_name_hint">Enter list name</string>
+
+    <!-- Tag settings: login prompt from share-->
+    <string name="actfm_TVA_login_to_share">You need to be logged in to Astrid.com to share lists!
+        Please log in or make this a private list.
+    </string>
+
+
+    <!-- ============================================ edit people dialog == -->
+
+    <!-- task sharing dialog: intro -->
+    <string name="actfm_EPA_intro">Use Astrid to share shopping lists, party plans, or team projects
+        and instantly see when people get stuff done!
+    </string>
+
+    <!-- task sharing dialog: window title -->
+
+    <!-- task sharing dialog: save button -->
+
+    <!-- task sharing dialog: assigned label -->
+
+    <!-- slide 18a: task sharing dialog: assigned label long version -->
+    <string name="actfm_EPA_assign_label_long">Who should do this?</string>
+
+    <!-- task sharing dialog: assigned to me -->
+    <string name="actfm_EPA_assign_me">Me</string>
+
+    <!-- task sharing dialog: anyone -->
+    <string name="actfm_EPA_unassigned">Unassigned</string>
+
+    <!-- slide 18c: task sharing dialog: choose a contact -->
+    <string name="actfm_EPA_choose_contact">Choose a contact</string>
+
+    <!-- task sharing dialog: custom email assignment -->
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_share_with">Share with:</string>
+
+    <!-- task sharing dialog: shared with label -->
+    <string name="actfm_EPA_collaborators_header">Share</string>
+
+    <!-- task sharing dialog: collaborator list name (%s => name of list) -->
+    <string name="actfm_EPA_list">List: %s</string>
+
+    <!-- task sharing dialog: assigned hint -->
+
+    <!-- task sharing dialog: message label text -->
+    <string name="actfm_EPA_message_text">Invitation Message:</string>
+
+    <!-- task sharing dialog: message body -->
+    <string name="actfm_EPA_message_body">Help me get this done!</string>
+
+    <!-- task sharing dialog: list members section header -->
+    <string name="actfm_EPA_assign_header_members">List Members</string>
+
+    <!-- task sharing dialog: astrid friends section header -->
+    <string name="actfm_EPA_assign_header_friends">Astrid Friends</string>
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: message hint -->
+
+    <!-- task sharing dialog: share with Facebook -->
+    <string name="actfm_EPA_facebook">Facebook</string>
+
+    <!-- task sharing dialog: share with Twitter -->
+    <string name="actfm_EPA_twitter">Twitter</string>
+
+    <!-- task sharing dialog: # of e-mails sent (%s => # people plural string) -->
+
+    <!-- task sharing dialog: edit people settings saved -->
+
+    <!-- task sharing dialog: invalid email (%s => email) -->
+    <string name="actfm_EPA_invalid_email">Invalid E-mail: %s</string>
+
+    <!-- task sharing dialog: tag not found (%s => tag) -->
+
+    <!-- task sharing login prompt -->
+    <string name="actfm_EPA_login_to_share">You need to be logged in to Astrid.com to share tasks!
+    </string>
+
+    <string name="actfm_EPA_login_button">Log in</string>
+
+    <string name="actfm_EPA_dont_share_button">Don\'t share</string>
+
+    <string name="actfm_EPA_add_person_to_list_title">Task assigned</string>
+
+    <string name="actfm_EPA_add_person_to_list">%1$s is not shared on this list. Would you like to
+        add %2$s to this list?
+    </string>
+
+    <string name="actfm_EPA_add_person_to_list_ok">Add to list</string>
+
+    <string name="actfm_EPA_add_person_to_list_cancel">Don\'t add</string>
+
+    <string name="actfm_list_owner">(owner)</string>
+
+    <!-- ========================================= sharing login activity == -->
+
+    <!-- share login: Title -->
+    <string name="actfm_ALA_title">Welcome to Astrid.com!</string>
+
+    <!-- share login: Sharing Description -->
+    <string name="actfm_ALA_body">Astrid.com lets you access your tasks online,
+        share, and delegate with others.
+    </string>
+
+    <!-- share login: Sharing Login FB Prompt -->
+    <string name="actfm_ALA_fb_login">Connect with Facebook</string>
+
+    <!-- share login: Sharing Login GG Prompt -->
+    <string name="actfm_ALA_gg_login">Connect with Google</string>
+
+    <!-- share login: Quickly log in as <%s -> email> -->
+    <string name="actfm_quick_login">Sign in: %s</string>
+
+    <!-- share login: Reject quick login -->
+    <string name="actfm_quick_login_reject">Not %s?</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_firstname_label">First Name</string>
+
+    <!-- share login: Name -->
+    <string name="actfm_ALA_lastname_label">Last Name</string>
+
+    <!-- share login: Email -->
+    <string name="actfm_ALA_email_label">Email</string>
+
+    <!-- share login: Username / Email -->
+
+    <!-- share login: Password -->
+    <string name="actfm_ALA_password_label">Password</string>
+
+    <!-- share login: Sign Up Title -->
+    <string name="actfm_ALA_signup_title">Sign Up</string>
+
+    <!-- share login: Login Title -->
+    <string name="actfm_ALA_login_title">Sign In</string>
+
+    <!-- share login: Google Auth title -->
+    <string name="actfm_GAA_title">Select the Google account you want to use:</string>
+
+    <!-- share login: OAUTH Login Prompt -->
+    <string name="actfm_OLA_prompt">Please log in:</string>
+
+    <!-- Login error: user exists -->
+    <string name="actfm_ALA_error_user_exists">User already exists. Please sign in instead.</string>
+
+    <!-- Login error: wrong password -->
+    <string name="actfm_ALA_error_wrong_password">Sorry, that password was incorrect. Please try
+        again.
+    </string>
+
+    <!-- Forgot password link -->
+    <string name="actfm_ALA_forgot_password">Forgot password?</string>
+
+    <!-- Forgot password email prompt -->
+    <string name="actfm_ALA_enter_email">Please enter your email</string>
+
+    <!-- Password reset sent (%s -> email) -->
+    <string name="actfm_ALA_reset_sent">Password reset sent to %s</string>
+
+    <!-- User already exists - first sync may be slow -->
+    <string name="actfm_ALA_user_exists_sync_alert">The first sync may take a bit--thanks for your
+        patience!
+    </string>
+
+    <!-- User not found -->
+    <string name="actfm_ALA_error_user_not_found">User not found by that email. Try signing up
+        instead!
+    </string>
+
+    <!-- ================================================ Featured Lists -->
+
+    <string name="actfm_feat_list_clone">Copy list</string>
+
+    <string name="actfm_feat_list_suffix">(Copy)</string>
+
+    <string name="actfm_feat_list_cloning">Copying...</string>
+
+    <string name="actfm_feat_list_clone_success">Success!</string>
+
+    <string name="actfm_feat_list_task_clone_success">Task copied</string>
+
+    <string name="actfm_feat_list_clone_empty">No tasks to copy</string>
+
+    <!-- ================================================ Synchronization == -->
+
+    <!-- Indicates the logged in user name. %s -> user's name -->
+    <string name="actfm_status_title_logged_in">Logged in as %s</string>
+
+    <!-- Preferences Title: Act.fm -->
+    <string name="actfm_APr_header">Astrid.com</string>
+
+    <string name="actfm_https_title">Use HTTPS</string>
+    <string name="actfm_https_enabled">HTTPS enabled (slower)</string>
+    <string name="actfm_https_disabled">HTTPS disabled (faster)</string>
+
+    <!-- title for notification tray after synchronizing -->
+
+    <!-- text for notification when comments are received -->
+
+    <string name="actfm_dual_sync_warning">You currently synchronize with Google Tasks. To avoid
+        duplicate tasks and other synchronization issues,
+        Google Tasks will no longer synchronize when you start synchronizing with Astrid.com. You
+        can still import tasks from Google Tasks from the Google Tasks settings page,
+        or replace Google Tasks in Gmail with Astrid\'s Remind Me Chrome Extension.
+        Are you sure you want to sync with Astrid.com?
+    </string>
+
+    <!-- account types -->
+    <string name="actfm_account_type">Account type</string>
+    <string name="actfm_account_info">Account info</string>
+    <string name="actfm_account_info_summary">Status and options</string>
+    <string name="account_type_title_not_logged_in">Sign up for a free account</string>
+    <string name="account_type_summary_not_logged_in">Access tasks online, share lists and
+        delegate
+    </string>
+
+
+    <string name="actfm_account_premium">Premium</string>
+    <string name="actfm_account_basic">Basic</string>
+
+    <string name="actfm_inapp_billing">Upgrade to Premium</string>
+    <string name="actfm_inapp_billing_summary">Attach files, voice backups, premium support &amp;
+        more
+    </string>
+
+    <!-- Sharing -->
+    <string name="share_with_facebook">Like on Facebook</string>
+    <string name="share_with_twitter">Follow on Twitter</string>
+    <string name="share_with_google">Share on Google+</string>
+    <string name="share_speech_bubble">By sharing, you\'ll help others be more productive!</string>
+
+
+    <!-- Sync upgrade messages -->
+    <string name="sync_upgr_both_title">Using Astrid.com + Google without Duplicates</string>
+    <string name="sync_upgr_both_body">Let\'s be honest. Google Tasks is convenient but not as cool
+        as Astrid. To avoid duplicates you can no longer sync with Astrid.com and background sync
+        with Google Tasks at the same time. You can still import your Google Tasks by visiting
+        Settings → Backup &amp; Sync, or downgrade to Google Tasks only sync
+    </string>
+    <string name="sync_upgr_both_btn1">Stick with Astrid</string>
+    <string name="sync_upgr_both_btn2">Downgrade to Google Tasks</string>
+
+    <string name="sync_upgr_gtasks_only_title">Upgrade to Astrid Sync for Free!</string>
+    <string name="sync_upgr_gtasks_only_body">Access your tasks from all your devices and from Gmail
+        with Astrid.com sync. Upgrade to Astrid.com Sync (you can always go back to Google Tasks -
+        but you won\'t want to)!
+    </string>
+    <string name="sync_upgr_gtasks_only_btn1">Upgrade to Astrid Sync</string>
+    <string name="sync_upgr_gtasks_only_btn2">Stick with Google Tasks</string>
+
+    <string name="sync_upgr_neither_title">Free backup &amp; Sync!</string>
+    <string name="sync_upgr_neither_body">Don\'t put your to-dos at risk! New and improved Astrid
+        sync to keep and access your tasks from anywhere.
+    </string>
+    <string name="sync_upgr_neither_btn1">Sign up now</string>
+
+    <string name="sync_upgr_logged_out">You have been logged out of Astrid</string>
+
+    <string name="actfm_logout_clear_tasks_title">Clear data?</string>
+    <string name="actfm_logout_clear_tasks_body">Would you like to clear your tasks and lists?
+    </string>
+    <string name="actfm_logout_clear_tasks_yes">Clear data</string>
+    <string name="actfm_logout_clear_tasks_no">Keep data</string>
+
+    <string name="actfm_logged_in_different_user_title">Logging in as different user</string>
+    <string name="actfm_logged_in_different_user_body">Would you like to delete existing phone tasks
+        before syncing?
+    </string>
+    <string name="actfm_logged_in_different_user_keep_data">Keep data</string>
+    <string name="actfm_logged_in_different_user_clear_data">Clear all data</string>
+    <string name="actfm_logged_in_different_user_processing">Processing existing data...</string>
+
+    <string name="actfm_tag_not_authorized_title">Not authorized</string>
+    <string name="actfm_tag_not_authorized_body">You are no longer authorized to view list %s (you
+        may have been removed). Would you like to create a new list with the same name?
+    </string>
+    <string name="actfm_tag_not_authorized_new_list">Create new list</string>
+    <string name="actfm_tag_not_authorized_leave_list">Leave list</string>
+
+    <string name="actfm_sync_ongoing">Sync ongoing...</string>
+
+    <string name="EPr_reset_sync_state">Reset sync</string>
+    <string name="EPr_reset_sync_state_summary">Resets some local data to help resolve sync errors
+    </string>
+    <string name="EPr_reset_sync_state_detailed">The next time you sync, your tasks and lists will
+        be changed to mirror what exists on Astrid.com, which may help resolve sync errors. Do you
+        wish to continue?
+    </string>
+
 </resources>
 
diff --git a/astrid/res/values/strings-alarms.xml b/astrid/res/values/strings-alarms.xml
index 0799da1ee..9f4114304 100644
--- a/astrid/res/values/strings-alarms.xml
+++ b/astrid/res/values/strings-alarms.xml
@@ -4,19 +4,19 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    
+<resources>
+
     <!-- Resources for built-in timers plug-in -->
-    
+
     <!-- Task Edit Activity: Container Label -->
     <string name="alarm_ACS_label">Alarms</string>
-    
+
     <!-- Task Edit Activity: Add New Alarm -->
     <string name="alarm_ACS_button">Add an Alarm</string>
-    
+
     <string-array name="reminders_alarm">
-      <!-- reminders related to alarm -->
-      <item>Alarm!</item>
+        <!-- reminders related to alarm -->
+        <item>Alarm!</item>
     </string-array>
-    
+
 </resources>
diff --git a/astrid/res/values/strings-backup.xml b/astrid/res/values/strings-backup.xml
index b637c0d6e..b1bf60f76 100644
--- a/astrid/res/values/strings-backup.xml
+++ b/astrid/res/values/strings-backup.xml
@@ -4,97 +4,98 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    
-  <!-- Resources for built-in backup plug-in -->
-  
-  <!-- ================================================= BackupPreferences == -->
+<resources>
 
-    <!-- slide 33c/48d: Backup Preferences Title -->    
+    <!-- Resources for built-in backup plug-in -->
+
+    <!-- ================================================= BackupPreferences == -->
+
+    <!-- slide 33c/48d: Backup Preferences Title -->
     <string name="backup_BPr_header">Backups</string>
 
-    <!-- slide 48e/50c: Backup: Status Header -->    
+    <!-- slide 48e/50c: Backup: Status Header -->
     <string name="backup_BPr_group_status">Status</string>
-    
-    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->    
+
+    <!-- Backup Status: last backup was a success (%s -> last date). Keep it short! -->
     <string name="backup_status_success">Latest backup:\n%s</string>
-    <!-- Backup Status: last error failed. Keep it short! -->    
+    <!-- Backup Status: last error failed. Keep it short! -->
     <string name="backup_status_failed">Last backup failed</string>
-    <!-- Backup Status: error subtitle -->    
+    <!-- Backup Status: error subtitle -->
     <string name="backup_status_failed_subtitle">(tap to show error)</string>
-    <!-- slide 48a: Backup Status: never backed up -->    
+    <!-- slide 48a: Backup Status: never backed up -->
     <string name="backup_status_never">Never backed up!</string>
 
-    <!-- slide 48f/ 50e: Backup Options Group Label -->    
+    <!-- slide 48f/ 50e: Backup Options Group Label -->
     <string name="backup_BPr_group_options">Options</string>
 
-    <!-- slide 48b: Preference: Automatic Backup Title -->    
+    <!-- slide 48b: Preference: Automatic Backup Title -->
     <string name="backup_BPr_auto_title">Automatic backups</string>
     <!-- Preference: Automatic Backup Description (when disabled) -->
-    <string name="backup_BPr_auto_disabled">Automatic backups disabled</string>    
+    <string name="backup_BPr_auto_disabled">Automatic backups disabled</string>
     <!-- slide 48g: Preference: Automatic Backup Description (when enabled) -->
     <string name="backup_BPr_auto_enabled">Backup will occur daily</string>
-    
+
     <!-- Preference screen restoring Tasks Help -->
     <!-- Preference screen Restoring Tasks Help Dialog Text-->
-    
-    <string name="backup_BPr_cloud_already_logged_in">You already have cloud backup on Astrid.com!</string>
-  
-  <!-- ================================================= BackupActivity == -->
-
-  <!-- slide 48c: backup activity label -->
-  <string name="backup_BAc_label">Manage backups</string>
-
-  <!-- backup activity title -->
-  <string name="backup_BAc_title">Manage your backups</string>
-
-  <!-- backup activity import button -->
-  <string name="backup_BAc_import">Import tasks</string>
-
-  <!-- backup activity export button -->
-  <string name="backup_BAc_export">Export tasks</string>
-  
-  <!-- backup activity cloud (Astrid.com) option -->
-  <string name="backup_BAc_cloud">Click for free cloud backup on Astrid.com</string>
-    
-  <!-- ============================================== Importer / Exporter == -->
-  
-  <!-- Message displayed when error occurs -->
-  <string name="backup_TXI_error">Import error</string>
-    
-  <string name="export_toast">Backed up %1$s to %2$s.</string>
-    
-  <string name="export_toast_no_tasks">No tasks to export.</string>
-  
-  <!-- Progress Dialog Title for exporting -->    
-  <string name="export_progress_title">Exporting...</string>
-  
-  <!-- Backup: Title of Import Summary Dialog -->
-  <string name="import_summary_title">Restore summary</string>
-    
-  <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
-  <string name="import_summary_message">
-File %1$s contained %2$s.\n\n
-%3$s imported,\n
-%4$s already exist\n
-%5$s had errors\n
-  </string>
-  
-  <!-- Progress Dialog Title for importing -->    
-  <string name="import_progress_title">Importing...</string>
-  
-  <!-- Progress Dialog text for import reading task (%d -> task number)-->    
-  <string name="import_progress_read">Reading task %d...</string>
-  
-  <!-- Backup: Dialog when unable to open a file -->  
-  
-  <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
-  <string name="DLG_error_sdcard">Cannot access folder: %s</string>
-  
-  <!-- Backup: Dialog when unable to open SD card in general -->
-  <string name="DLG_error_sdcard_general">Cannot access your SD card!</string>
-    
-  <!-- Backup: File Selector dialog for import -->
-  <string name="import_file_prompt">Select a file to restore</string>    
-        
+
+    <string name="backup_BPr_cloud_already_logged_in">You already have cloud backup on Astrid.com!
+    </string>
+
+    <!-- ================================================= BackupActivity == -->
+
+    <!-- slide 48c: backup activity label -->
+    <string name="backup_BAc_label">Manage backups</string>
+
+    <!-- backup activity title -->
+    <string name="backup_BAc_title">Manage your backups</string>
+
+    <!-- backup activity import button -->
+    <string name="backup_BAc_import">Import tasks</string>
+
+    <!-- backup activity export button -->
+    <string name="backup_BAc_export">Export tasks</string>
+
+    <!-- backup activity cloud (Astrid.com) option -->
+    <string name="backup_BAc_cloud">Click for free cloud backup on Astrid.com</string>
+
+    <!-- ============================================== Importer / Exporter == -->
+
+    <!-- Message displayed when error occurs -->
+    <string name="backup_TXI_error">Import error</string>
+
+    <string name="export_toast">Backed up %1$s to %2$s.</string>
+
+    <string name="export_toast_no_tasks">No tasks to export.</string>
+
+    <!-- Progress Dialog Title for exporting -->
+    <string name="export_progress_title">Exporting...</string>
+
+    <!-- Backup: Title of Import Summary Dialog -->
+    <string name="import_summary_title">Restore summary</string>
+
+    <!-- Backup: Summary message for import. (%s => file name, %s => total # tasks, %s => imported, %s => skipped, %s => errors) -->
+    <string name="import_summary_message">
+        File %1$s contained %2$s.\n\n
+        %3$s imported,\n
+        %4$s already exist\n
+        %5$s had errors\n
+    </string>
+
+    <!-- Progress Dialog Title for importing -->
+    <string name="import_progress_title">Importing...</string>
+
+    <!-- Progress Dialog text for import reading task (%d -> task number)-->
+    <string name="import_progress_read">Reading task %d...</string>
+
+    <!-- Backup: Dialog when unable to open a file -->
+
+    <!-- Backup: Dialog when unable to open SD card folder (%s => folder) -->
+    <string name="DLG_error_sdcard">Cannot access folder: %s</string>
+
+    <!-- Backup: Dialog when unable to open SD card in general -->
+    <string name="DLG_error_sdcard_general">Cannot access your SD card!</string>
+
+    <!-- Backup: File Selector dialog for import -->
+    <string name="import_file_prompt">Select a file to restore</string>
+
 </resources>
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index 18f697e3e..bbc840588 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -4,1022 +4,1096 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- ================================================== AndroidManifest == -->
-
-  <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
-  <string name="app_name">Astrid Tasks</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="read_permission_label">Astrid Permission</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="read_permission_desc">read tasks, display task filters</string>
-  
-  <!-- permission title for READ_TASKS -->
-  <string name="write_permission_label">Astrid Permission</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="write_permission_desc">create new tasks, edit existing tasks</string>
-  
-  <!-- ================================================== Generic Dialogs == -->
-    
-  <!-- question for deleting tasks -->
-  <string name="DLG_delete_this_task_question">Delete this task?</string>
-
-  <!-- question for deleting items (%s => item name) -->
-  <string name="DLG_delete_this_item_question">Delete this item: %s?</string>
-    
-  <!-- Progress dialog shown when upgrading -->
-  <string name="DLG_upgrading">Upgrading your tasks...</string>
-  
-  <!-- Title for dialog selecting a time (hours and minutes) -->
-  <string name="DLG_hour_minutes">Time (hours : minutes)</string>
-  
-  <!-- Dialog for Astrid having a critical update -->
-  <string name="DLG_please_update">Astrid should to be updated to the latest
-  version in the Android market! Please do that before continuing, or wait a 
-  few seconds.</string>
-
-  <!-- Button for going to Market -->
-
-  <!-- Button for accepting EULA -->
-  <string name="DLG_accept">I Accept</string>
-
-  <!-- Button for declining EULA -->
-  <string name="DLG_decline">I Decline</string>
-
-  <!-- EULA title -->
-  <string name="DLG_eula_title">Terms Of Use</string>
-
-  <!-- Progress Dialog generic text -->
-  <string name="DLG_please_wait">Please Wait</string>
-  
-  <!-- Dialog - loading -->
-  <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_more">More</string>
-  
-  <string name="DLG_undo">Undo</string>
-  
-  <string name="DLG_warning">Warning</string>
-  
-  <!-- =============================================================== UI == -->
-  
-  <!-- Label for DateButtons with no value -->
-  <string name="WID_dateButtonUnset">Click to set</string>
-  
-  <!-- String formatter for DateButtons ($D => date, $T => time) -->
-  
-  <!-- String formatter for Disable button -->
-  
-  <!--  ============================================================= notes -->
-  
-  <!-- Note Exposer -->    
-  
-  <!-- Note Exposer / Comments -->    
-  
-  <!-- EditNoteActivity - no comments -->
-  <string name="ENA_no_comments">No activity yet</string>
-    
-  <!-- EditNoteActivity - no username for comment -->
-  <string name="ENA_no_user">Someone</string>
-  
-  <!-- EditNoteActivity - refresh comments -->
-  <string name="ENA_refresh_comments">Refresh Comments</string>
-  
-  <!-- ================================================= TaskListActivity == -->
-  
-  <!-- slide 8b: Task List: Displayed instead of list when no items present -->    
-  <string name="TLA_no_items">You have no tasks! \n Want to add something?</string>
-  
-  <!-- Task List: Displayed instead of list when no items present in people view (%s-> person's name) -->    
-  <string name="TLA_no_items_person">%s has no\ntasks shared with you</string>
-  
-  <!-- Menu: Adjust Sort and Hidden Task Settings -->    
-  <string name="TLA_menu_sort">Sort</string>
-  
-  <!-- Menu: Sync Now -->    
-  <string name="TLA_menu_sync">Sync Now</string>
-  
-  <!-- Menu: Search -->
-  <string name="TLA_menu_search">Search</string>
-  
-  <!-- Menu: Tasks -->
-  <string name="TLA_menu_lists">Lists</string>
-
-  <!-- Menu: Friends -->
-  <string name="TLA_menu_friends">People</string>
-
-  <!-- Menu: Featured Lists -->
-  <string name="TLA_menu_featured_lists">Featured Lists</string>
-
-  <!-- Menu: Suggestions -->
-  <string name="TLA_menu_suggestions">Suggestions</string>
-  
-  <!-- Menu: Tutorial -->
-
-  <!-- Menu: Settings -->    
-  <string name="TLA_menu_settings">Settings</string>
-  
-  <!-- slide 30b: Menu: Support -->
-  <string name="TLA_menu_support">Support</string>
-  
-  <!-- Search Label-->
-  
-  <!-- Window title for displaying Custom Filter -->
-  <string name="TLA_custom">Custom</string>
-  
-  <!-- slide 8d: Quick Add Edit Box Hint-->
-  <string name="TLA_quick_add_hint">Add a task</string>
-  
-  <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
-  <string name="TLA_quick_add_hint_assign">Add something for %s</string>
-  
-  <!-- Notification Volumne notification-->
-  <string name="TLA_notification_volume_low">Notifications are muted. You won\'t be able to hear Astrid!</string>
-  
-  <!-- Notifications disabled warning -->
-  <string name="TLA_notification_disabled">Reminders are disabled! You will not receive any reminders</string>
-  
-  <string-array name="TLA_filters">
-      <item>Active</item>
-      <item>Today</item>
-      <item>Soon</item>
-      <item>Late</item>
-      <item>Done</item>
-      <item>Hidden</item>      
-  </string-array>
-  
-  <!-- Title for confirmation dialog after quick add markup -->
-  <string name="TLA_quickadd_confirm_title">You said, \"%s\"</string>
-  
-  <!-- Text for speech bubble in dialog after quick add markup -->
-  <!-- First string is task title, second is due date, third is priority -->
-  <string name="TLA_quickadd_confirm_speech_bubble">I created a task called \"%1$s\" %2$s at %3$s</string>
-  
-  <string name="TLA_quickadd_confirm_speech_bubble_date">for %s</string>
-  
-  <string name="TLA_quickadd_confirm_hide_helpers">Don\'t display future confirmations</string>
-  
-  
-  <!-- Title for alert on new repeating task. %s-> task title -->
-  <string name="TLA_repeat_scheduled_title">New repeating task %s</string>
-  
-  <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
-  <string name="TLA_repeat_scheduled_speech_bubble">I\'ll remind you about this %s.</string>
-  
-  <string-array name="TLA_priority_strings">
-      <item>highest priority</item>
-      <item>high priority</item>
-      <item>medium priority</item>
-      <item>low priority</item>
-  </string-array>
-  <!-- slide 22a -->
-  <string name="TLA_all_activity">All Activity</string>
-  
-  <!-- ====================================================== TaskAdapter == -->
-  
-  <!-- Format string to indicate task is hidden (%s => task name) -->
-  <string name="TAd_hiddenFormat">%s [hidden]</string>
-  
-  <!-- Format string to indicate task is deleted (%s => task name) -->
-  <string name="TAd_deletedFormat">%s [deleted]</string>
-  
-  <!-- Displayed when adapter is flung (scrolled quickly) -->
-  
-  <!-- slide 22b: indicates task was completed. %s => date or time ago -->
-  <string name="TAd_completed">Finished\n%s</string>
-  
-  <!-- slide 15a: Action Button: edit task -->
-  <string name="TAd_actionEditTask">Edit</string>
-  
-  <!-- Context Item: edit task -->
-  <string name="TAd_contextEditTask">Edit Task</string>
-
-  <!-- Context Item: copy task -->
-  <string name="TAd_contextCopyTask">Copy Task</string>
-
-  <!-- Context Item: delete task -->
-  <string name="TAd_contextDeleteTask">Delete Task</string>
-
-  <!-- Context Item: undelete task -->
-  <string name="TAd_contextUndeleteTask">Undelete Task</string>
-
-  <!-- Context Item: purge task -->
-  <string name="TAd_contextPurgeTask">Purge Task</string>
-  
-  <!-- ============================================== SortSelectionDialog == -->
-  
-  <!-- slide 23a: Sort Selection: dialog title -->    
-  <string name="SSD_title">Sort, Subtasks, and Hidden</string>
-  
-  <!-- slide 23h:  Hidden: title -->
-  <string name="SSD_hidden_title">Hidden Tasks</string>
-  
-  <!-- Hidden Task Selection: show completed tasks -->    
-  <string name="SSD_completed">Show completed tasks</string>
-  
-  <!-- Hidden Task Selection: show hidden tasks -->    
-  <string name="SSD_hidden">Show hidden tasks</string>
-  
-  <!-- Hidden Task Selection: show deleted tasks -->    
-  <string name="SSD_deleted">Show deleted tasks</string>
-  
-  <!-- Sort Selection: drag with subtasks -->
-  <string name="SSD_sort_drag">Manual order with subtasks</string>
-  
-  <!-- slide 23b: Sort Selection: smart sort -->
-  <string name="SSD_sort_auto">Smart sort</string>
-  
-  <!-- slide 23e: Sort Selection: sort by alpha -->
-  <string name="SSD_sort_alpha">By title</string>
-  
-  <!-- slide 23c: Sort Selection: sort by due date -->
-  <string name="SSD_sort_due">By due date</string>
-  
-  <!-- slide 23d: Sort Selection: sort by importance -->
-  <string name="SSD_sort_importance">By priority</string>
-  
-  <!-- slide 23f: Sort Selection: sort by modified date -->
-  <string name="SSD_sort_modified">By last modified</string>
-  
-  <!-- slide 23g: Sort Selection: reverse -->
-  <string name="SSD_sort_reverse">Reverse sort</string>
-  
-  <!-- slide 23j: Sort Button: sort temporarily -->
-  <string name="SSD_save_temp">Just once</string>
-  
-  <!-- slide 23i: Sort Button: sort permanently -->
-  <string name="SSD_save_always">Always</string>
-  
-  <!-- =============================================== FilterListActivity == -->
-  
-  <!-- Astrid Filter Shortcut -->    
-  <string name="FSA_label">List or Filter</string>
-
-  <!-- Filter List Activity Title -->    
-  
-  <!-- Displayed when loading filters -->    
-  
-  <!-- Context Menu: Create Shortcut -->    
-  <string name="FLA_context_shortcut">Create Shortcut On Desktop</string>
-  
-  <!-- Menu: Search -->
-  
-  <!-- Menu: Help -->    
-  
-  <!-- slide 28c: Create Shortcut Dialog Title -->    
-  <string name="FLA_shortcut_dialog_title">Create Desktop Shortcut</string>
-  
-  <!-- Create Shortcut Dialog (asks to name shortcut) -->    
-  <string name="FLA_shortcut_dialog">Name of shortcut:</string>
-  
-  <!-- Search Hint-->
-  <string name="FLA_search_hint">Search For Tasks</string>
-  
-  <!-- Search Filter name (%s => query) -->
-  <string name="FLA_search_filter">Matching \'%s\'</string>
-  
-  <!-- Toast: created shortcut (%s => label) -->
-  <string name="FLA_toast_onCreateShortcut">Created Shortcut: %s</string>
-  
-  <!-- Menu: new filter -->
-  <string name="FLA_new_filter">New Filter</string>
-  
-  <!-- slide 10e: Button: new list -->
-  <string name="FLA_new_list">New List</string>
-  
-  <!-- Alert when creating a shortcut without selecting a filter -->
-  <string name="FLA_no_filter_selected">No filter selected! Please select a filter or list.</string>
-  
-  <!-- ================================================= TaskEditActivity == -->
-  
-  <!-- Title when editing a task (%s => task title) -->
-  
-  <!-- Title when creating a new task -->
-  
-  <!-- Task title label -->
-  
-  <!-- Task when label -->
-  <string name="TEA_when_header_label">When</string>
-  
-  <!-- Task title hint (displayed when edit box is empty) -->
-  <string name="TEA_title_hint">Task name</string>
-  
-  <!-- Task importance label -->
-  <string name="TEA_importance_label">Priority</string>
-  
-  <!-- Task due date hint -->
-  <string name="TEA_deadline_hint">Set due date</string>
-  
-  <!-- Task assigned to string (%s -> assigned person name) -->
-  <string name="TEA_assigned_to">Assigned to %s</string>
-  
-  <!-- Task urgency specific time checkbox -->
-  <string name="TEA_urgency_specific_time">At specific time?</string>
-  
-  <!-- Task urgency specific time title when specific time false -->
-  <string name="TEA_urgency_none">None</string>
-  
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_label">Hide until</string>
-
-  <!-- Task hide until label -->
-  <string name="TEA_hideUntil_display">Hide until %s</string>
-  
-  <!-- Task hide until toast -->
-  <string name="TEA_hideUntil_message">Task will be hidden until %s</string>
-  
-  <!-- Task editing data being loaded label -->
-  <string-array name="TEA_loading"><item>Loading...</item></string-array>
-  
-  <!-- slide 16c: Task note label -->
-  <string name="TEA_note_label">Description</string>
-
-  <!-- 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>
-  
-  <!-- Elapsed time label -->
-  <string name="TEA_elapsedDuration_label">Time already spent</string>
-
-  <!-- Menu: Save -->    
-  <string name="TEA_menu_save">Save Changes</string>
-  
-  <!-- Menu: Don't Save -->
-  <string name="TEA_menu_discard">Don\'t Save</string>
-  
-  <!-- Menu: Delete Task -->
-  <string name="TEA_menu_delete">Delete Task</string>
-  
-  <!-- Menu: Task comments -->
-  <string name="TEA_menu_refresh_comments">Refresh comments</string>
-
-  <string name="TEA_menu_comments">Comments</string>
-  
-   <!-- Toast: task saved with deadline (%s => preposition + time units) -->
-  <string name="TEA_onTaskSave_due">Task Saved: due %s</string>
-  
-  <!-- Toast: task saved without deadlines -->
-  <string name="TEA_onTaskSave_notDue">Task Saved</string>
-  
-  <!-- Toast: task was not saved -->
-  
-  <!-- Toast: task was deleted -->
-  
-  <!-- slide 15b: Task edit tab: activity -->
-  <string name="TEA_tab_activity">Activity</string>
-  
-  <!-- slide 15e:  Task edit tab: more editing settings -->
-  <string name="TEA_tab_more">Details</string>
-  
-  <!-- slide 15d: Task edit tab: web services -->
-  <string name="TEA_tab_web">Ideas</string>
-  
-  <string name="TEA_timer_est">Est. %s</string>
-
-  <string name="TEA_timer_elap">Elapsed %s</string>
-  
-  <string-array name="TEA_urgency">
-      <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
-      <item>No date</item>
-      <item>Specific day</item>
-      <item>Today</item>
-      <item>Tomorrow</item>
-      <item>(day after)</item>
-      <item>Next week</item>
-      <item>In two weeks</item>
-      <item>Next month</item>
-  </string-array>
-  
-  <string name="TEA_no_time">No time</string>
-      
-  <string-array name="TEA_hideUntil">
-      <!-- hideUntil: labels for edit page. -->
-      <item>Never</item>
-      <item>Due date</item>
-      <item>Due time</item>
-      <item>Day before due</item>
-      <item>Week before due</item>
-      <item>Specific day/time</item>
-  </string-array>
-  
-  <!-- Task edit control set descriptors -->
-
-  <!-- slide 9b/35i -->
-  <string name="TEA_control_who">Who</string>
-
-  <!-- slide 9c/ 35a -->
-  <string name="TEA_control_when">When</string>
-  <!-- slide 35b -->
-  <string name="TEA_control_more_section">----Details----</string>
-  <!-- slide 16a/35c -->
-  <string name="TEA_control_importance">Priority</string>  
-  <!-- slide 16b/35d -->
-  <string name="TEA_control_lists">Lists</string>  
-  <!-- slide 16c/35e -->
-  <string name="TEA_control_notes">Description</string>  
-  
-  <string name="TEA_control_files">Files</string>
-
-  <!-- slide 16e / slide 35g-->
-  <string name="TEA_control_reminders">Reminders</string>
-
-  <!-- slide 16f -->
-  <string name="TEA_control_timer">Timer Controls</string>
-  
-  <string name="TEA_control_hidden_section">----Hide Always----</string>
-  
-  <string name="hide_until_prompt">Show in my list</string>
-  
-  <!-- Add Ons tab when no add-ons found -->
-  
-  <!-- Add Ons button -->
-  
-  <!-- More row -->
-  
-  <!-- slide 15c: Text when no activity to show -->
-  <string name="TEA_no_activity">No activity</string>
-  
-  <!-- Text to load more activity -->
-  <string name="TEA_load_more">Load more...</string>
-  
-  <!-- When controls dialog -->
-  <string name="TEA_when_dialog_title">When is this due?</string>
-  
-  
-  <string name="TEA_new_task">New Task</string>
-  
-  <string name="WSV_click_to_load">Tap me to search for ways to get this done!</string>
-  
-  <string name="WSV_not_online">I can do more when connected to the Internet. Please check your connection.</string>
-  
-  <string name="TEA_contact_error">Sorry! We couldn\'t find an email address for the selected contact.</string>
-  
-  <!-- ============================================= IntroductionActivity == -->
-  
-  <!-- slide 1a: Introduction Window title -->
-  
-  <!-- Button to agree to EULA -->
-  
-  <!-- Button to disagree with EULA -->
-  
-  <!-- ===================================================== MissedCallActivity == -->
-  
-  <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
-  <string name="MCA_title"> %1$s\ncalled at %2$s</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_return_call">Call now</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_add_task">Call later</string>
-
-  <!-- Missed call: return call -->
-  <string name="MCA_ignore">Ignore</string>
-  
-  <!-- Missed call: dialog to ignore all missed calls title -->
-  <string name="MCA_ignore_title">Ignore all missed calls?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls body -->
-  <string name="MCA_ignore_body">You\'ve ignored several missed calls. Should Astrid stop asking you about them?</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore all button -->
-  <string name="MCA_ignore_all">Ignore all calls</string>
-
-  <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
-  <string name="MCA_ignore_this">Ignore this call only</string>
-
-  <!-- Missed call: preference title -->
-  <string name="MCA_missed_calls_pref_title">Field missed calls</string>
-
-  <!-- slide 49c: Missed call: preference description -->
-  <string name="MCA_missed_calls_pref_desc_enabled">Astrid will notify you about missed calls and offer to remind you to call back</string>
-  <string name="MCA_missed_calls_pref_desc_disabled">Astrid will not notify you about missed calls</string>
-
-  <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
-  <string name="MCA_task_title_name">Call %1$s back at %2$s</string>
-
-  <!-- Missed call: task title no name (%s -> number)-->
-  <string name="MCA_task_title_no_name">Call %s back</string>
-  
-  <!-- Missed call: schedule dialog title (%s -> name or number)-->
-  <string name="MCA_schedule_dialog_title">Call %s back in...</string>
-  
-  <!-- Missed call speech bubble options -->
-  <string-array name="MCA_dialog_speech_options">
-      <item>It must be nice to be so popular!</item>
-      <item>Yay! People like you!</item>
-      <item>Make their day, give \'em a call!</item>
-      <item>Wouldn\'t you be happy if people called you back?</item>
-      <item>You can do it!</item>
-      <item>You can always send a text...</item>
-  </string-array>
-  
-  
-  <!-- ======================================= Calendar reminder activity == -->
-  
-  <!-- Calendar remindeer ignore button -->
-  <string name="CRA_ignore">Ignore</string>
-  
-  <!-- Calendar event -->
-  <string name="CRA_title">Need a meeting list?</string>
-  
-  <!-- Calendar reminder: dialog to ignore all missed calls title -->
-  <string name="CRA_ignore_title">Ignore all calendar events?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls body -->
-  <string name="CRA_ignore_body">You\'ve ignored several calendar events. Should Astrid stop asking you about them?</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
-  <string name="CRA_ignore_all">Ignore all events</string>
-
-  <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
-  <string name="CRA_ignore_this">Ignore this event only</string>
-  
-  <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
-  <string name="CRA_speech_bubble_start">Looks like %s is starting soon. Want to create a list for action items?</string>
-
-  <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
-  <string name="CRA_speech_bubble_end">Looks like you just finished with %s. Want to create a list for action items?</string>
-  
-  <!-- Calendar reminder: create list button -->
-  <string name="CRA_create_list">Create list</string>
-
-  <!-- Calendar reminder: postpone button -->
-  <string name="CRA_postpone">Maybe afterwards</string>
-  
-  <!-- Calendar reminder: list exists dialog title -->
-  <string name="CRA_list_exists_title">List already exists</string>
-  
-  <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
-  <string name="CRA_list_exists_body">A list named %s already exists. Do you want to use the existing list or create a new one for this event?</string>
-  
-  <!-- Calendar reminder: list exists dialog create new button -->
-  <string name="CRA_create_new">Create new</string>
-
-  <!-- Calendar reminder: list exists dialog use existing button -->
-  <string name="CRA_use_existing">Use existing</string>
-  
-  <!-- Calendar remindr: created list (%s -> list name) -->
-  <string name="CRA_created_list_dialog">I created a list %s.</string>
-  
-  <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
-  <string name="CRA_one_attendee">%s is attending.</string>
-
-  <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
-  <string name="CRA_two_attendees">%1$s and %2$s are attending.</string>
-
-  <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
-  <string name="CRA_many_attendees">%1$s, %2$s, and %3$d others are attending.</string>
-  
-  <!-- Calendar reminder: invitation prompt -->
-  <string name="CRA_invitation_prompt">Want to invite them?</string>
-  
-  <!-- Calendar reminder: preference title -->
-  <string name="CRA_calendar_reminders_pref_title">Calendar assistant</string>
-
-  <!-- Calendar reminder: pref description disabled -->
-  <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid will not remind you about upcoming calendar events</string>
-
-  <!-- Calendar reminder: pref description enabled -->
-  <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid will remind you about upcoming calendar events and prompt you to prepare for them</string>
-  
-  <!-- Calendar reminder: share list title -->
-  <string name="CRA_share_list_title">Share the list?</string>
-  
-  <string name="CRA_invite_attendees">Invite attendees</string>
-
-  <string name="CRA_more_options">More options</string>
-
-  <string name="CRA_dont_invite">No thank you</string>
-
-  <!-- Calendar reminder: share list title when no other attendees exist-->
-  <string name="CRA_list_created_title">List created!</string>
-  
-  <!-- Calendar reminder: default new list name (%s -> event title) -->
-  <string name="CRA_default_list_name">Action Items: %s</string>
-  
-  <!-- ===================================================== HelpActivity == -->
-  
-  <!-- Help: Button to get support from our website -->
-    
-  <!-- ==================================================== UpdateService == -->
-  
-  <!-- Changelog Window Title -->
-  <string name="UpS_changelog_title">What\'s new?</string>
-  
-  <!-- Updates Window Title -->
-  <string name="UpS_updates_title">Latest Astrid News</string>
-  
-  <!-- Updats No Activity to show for offline users -->
-  <string name="UpS_no_activity_log_in">Log in to see a record of\nyour progress as well as\nactivity on shared lists.</string>
-  
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 31g: Preference Window Title -->
-  <string name="EPr_title">Settings</string>
-  
-  <string name="EPr_share_astrid">Share Astrid</string>
-
-  <string name="EPr_share_astrid_summary">Share about Astrid on your favorite social network</string>
-  
-  <!-- slide 46a -->
-  <string name="EPr_deactivated">deactivated</string>
-
-  <!-- slide 30i: Preference Category: Appearance Title -->
-  <string name="EPr_appearance_header">Appearance</string>
-  
-  <!-- Preference Category: Appearance Summary -->
-  <string name="EPr_appearance_summary">Themes, widgets, task rows, edit screen</string>
-  
-  <!-- FAQ Preference title -->
-  <string name="EPr_faq_title">FAQ</string>
-  
-  <!-- Account status preference (%s -> account type) -->
-  <string name="EPr_account_title">Account: %s</string>
-
-  <!-- Support preferences summary -->
-  <string name="EPr_support_summary">Tutorial, FAQ, about</string>
-  
-  <!-- slide 34a: Preference: Task List Font Size Title -->
-  <string name="EPr_fontSize_title">Task list size</string>
-  
-  <!-- Preference: Filters to show pref screen title -->
-  <string name="EPr_filters_to_show_title">Filters to show</string>
-  
-  <!-- slide 32a: Preference: Show confirmation for smart reminders -->
-  <string name="EPr_showSmartConfirmation_title">Show confirmation for smart reminders</string>
-  
-  <!-- slide 34g: Preference: Task List Font Size Description -->                                                                                                                                                  
-  <string name="EPr_fontSize_desc">Font size on the main listing page</string>  
-  
-  <!-- Preferemce: Show task edit confirmation toasts -->
-  
-  <!-- slide 34c: Preference: Task List Show Notes -->
-  <string name="EPr_showNotes_title">Show description in task</string>
-  
-  <!-- Edit screen preference category -->
-  <string name="EPr_edit_screen_options">Edit screen options</string>
-  
-  <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
-  <string name="EPr_beastMode_title">Edit screen order</string>
-  
-  <string name="EPr_beastMode_shortcut">Customize</string>
-  
-  <string name="EPr_time_increment">5 minute increments</string>
-  
-  <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
-  
-  <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
-  
-  <!-- slide 35h -->
-  <string name="EPr_beastMode_desc">Customize the layout of the task edit screen</string>
-  <!-- slide 35j -->
-  <string name="EPr_beastMode_reset">Reset to defaults</string>
-  
-  <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on each row</string>
-      
-  <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
-  <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit screen</string>  
-  <!-- Preference: Task List Show Notes Description (enabled) -->
-  <string name="EPr_showNotes_desc_enabled">Description will always be displayed</string>
-  
-  <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
-  <string name="EPr_compressTaskRows_title">Compact task row</string>
-  <!-- slide 34j -->
-  <string name="EPr_compressTaskRows_desc">Compress task rows to fit title</string>
-  
-  <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
-  <!-- slide 34k-->
-  
-  <!-- slide 34b: Preferences: Wrap task titles to two lines -->
-  <string name="EPr_fullTask_title">Show full task title</string>
-  <string name="EPr_fullTask_desc_enabled">Full task title will be shown</string>
-  <!-- slide 34h -->
-  <string name="EPr_fullTask_desc_disabled">First two lines of task title will be shown</string>
-  
-  <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
-  <string name="EPr_ideaAuto_title">Auto-load ideas tab</string>
-  <!-- slide 32c -->
-  <string name="EPr_ideaAuto_desc_enabled">Web searches for ideas tab will be performed when tab is clicked</string>
-  <string name="EPr_ideaAuto_desc_disabled">Web searches for ideas tab will be performed only when manually requested</string>
-  
-  <!-- Preferences: task row style -->
-  <string-array name="EPr_task_row_styles">
-      <item>Original</item>
-      <item>Simple</item>
-      <item>Title only</item>
-  </string-array>
-  
-  <string-array name="EPr_task_row_style_descriptions">
-      <item>Truncate title to two lines with date on right</item>
-      <item>Truncate title to one line with date and lists below</item>
-      <item>Single line title only</item>
-  </string-array>
-  
-  <!-- task row style title (%s -> style) -->
-  <string name="EPr_task_row_style_title">Row style: %s</string>
-  
-  <!-- Preference: custom filters enabled -->
-  <string name="EPr_use_filters_title">Use filters</string>
-  <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
-
-  <!-- Preference: show list members in shared list -->
-  <string name="EPr_show_list_members_title">Show list members in shared lists</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_simple_input_boxes">Simple text boxes</string>
-
-  <!-- Preference: simple input box style -->
-  <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
-
-  <!-- Preference: don't show plus button until input present -->
-  <string name="EPr_hide_plus_button">Hide plus button</string>
-
-  <!-- Preference: menu items -->
-  <string name="EPr_menu_items">Menu items</string>
-
-  <!-- Preference: list view -->
-  <string name="EPr_list_view">List view</string>
-
-  <!-- Preference: task edit comments -->
-  <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
-  
-  <!-- slide 30f/ 36f: Preference: Theme -->
-  <string name="EPr_theme_title">Color theme</string>
-  <!-- Preference: Theme Description (%s => value) -->
-  <string name="EPr_theme_desc">Currently: %s</string>  
-  <!-- Preference: Theme Description (android 1.6) -->
-  <string name="EPr_theme_desc_unsupported">Setting requires Android 2.0+</string>
-  <!-- slide 32h/ 37b -->
-  <string name="EPr_theme_widget_title">Widget theme</string>
-  
-  <!-- slide 30d/ 34f: Preference screen: all task row settings -->
-  <string name="EPr_taskRowPrefs_title">Task row appearance</string>
-  
-  <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
-  <string name="EPr_use_contact_picker">Use contact picker</string>
-  <!-- slide 49b -->
-  <string name="EPr_use_contact_picker_desc_enabled">The system contact picker option will be displayed in the task assignment window</string>
-  <string name="EPr_use_contact_picker_desc_disabled">The system contact picker option will not be displayed</string>
-
-  <!-- slide 49i: Preferences: Third party addons -->
-  <string name="EPr_third_party_addons">Enable third party add-ons</string>
-  <string name="EPr_third_party_addons_desc_enabled">Third party add-ons will be enabled</string>
-  <!-- slide 49d -->
-  <string name="EPr_third_party_addons_desc_disabled">Third party add-ons will be disabled</string>
-  
-  <!-- Preferences: ideas tab -->
-  <string name="EPr_ideas_tab_enabled">Task ideas</string>
-  <string name="EPr_ideas_tab_description">Get ideas to help you complete tasks</string>
-  
-  <!-- Preferences: calendar event start time -->
-  <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
-  <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
-  <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
-  
-  <string name="EPr_force_phone_layout">Use phone layout</string>
-
-  <string name="EPr_show_featured_lists">Show featured lists</string>
-  
-  <!-- Configurations -->
-  <string name="EPr_configurations_title">Set configuration</string>
-  <string name="EPr_config_default">Default</string>
-  <string name="EPr_config_lite">Astrid Lite</string>
-  
-  <!-- Dialog title when setting preference configuration -->
-  <string name="EPr_config_dialog_title">Set configuration?</string>
-  <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
-  <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
-  
-  <!-- default configuration name for the above dialog -->
-  <string name="EPr_config_dialog_default_id">default</string>
-  
-  <!-- Preference title for showing save and cancel buttons in task edit page -->
-  <string name="EPr_show_save_and_cancel">Show save and cancel </string>
-  
-  
-  <!-- Swipe between lists -->
-  <!-- Preference: swipe between lists performance -->
-  <string name="EPr_swipe_lists_performance_title">Swipe between lists</string>
-  
-  <string-array name="EPr_swipe_lists_performance_mode">
-      <item>No swipe</item>
-      <item>Conserve Memory</item>
-      <item>Normal Performance</item>
-      <item>High Performance</item>
-  </string-array>
-  
-  <string-array name="EPr_swipe_lists_performance_desc">
-  <!-- slide 49a -->
-      <item>Swipe between lists is disabled</item>
-      <item>Slower performance</item>
-      <item>Default setting</item>
-      <item>Uses more system resources</item>
-  </string-array>
-    
-  <string name="swipe_lists_helper_title">Swipe between lists</string>
-  <string name="swipe_lists_helper_header">Swipe left or right to quickly move between lists</string>
-  <string name="swipe_lists_helper_subtitle">Change settings in Settings -> Appearance</string>
-
-  <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
-  
-  <string-array name="EPr_default_reminders_mode">
-      <!-- reminders duration: labels for "Task Defaults" preference item. -->
-      <item>@string/TEA_reminder_mode_once</item>
-      <item>@string/TEA_reminder_mode_five</item>
-      <item>@string/TEA_reminder_mode_nonstop</item>
-  </string-array>
-    
-  <string-array name="EPr_themes">
-    <!-- theme_settings: labels for Theme preference menu -->
-    <!-- slide 36a-->
-    <item>Day - Blue</item>
-    <!-- slide 36b -->
-    <item>Day - Red</item>
-    <!-- slide 36b -->
-    <item>Sky blue</item>
-    <!-- slide 36c -->
-    <item>Night</item>
-    <!-- slide 36d -->
-    <item>Transparent (white text)</item>
-    <!-- slide 36e -->
-    <item>Transparent (black text)</item>
-  </string-array>
-  
-  <string-array name="EPr_themes_widget">
-    <!-- slide 32i / 37a-->
-    <item>Same as app</item>
-    <item>Day - Blue</item>
-    <item>Day - Red</item>
-    <item>Sky blue</item>
-    <item>Night</item>
-    <item>Transparent (white text)</item>
-    <item>Transparent (black text)</item>
-    <item>Old Style</item>
-  </string-array>
-  
-  <!-- ========================================== Task Management Settings == -->
-
-  <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
-  <string name="EPr_manage_header">Manage old tasks</string>
-  <!-- slide 47d -->
-  <string name="EPr_manage_delete_completed">Delete completed tasks</string>
-  <string name="EPr_manage_delete_completed_message">Do you really want to delete all your completed tasks?</string>
-  <!-- slide 47a -->
-  <string name="EPr_manage_delete_completed_summary">Deleted tasks can be undeleted one-by-one</string>
-  <string name="EPr_manage_delete_completed_status">Deleted %d tasks!</string>
-  <!-- slide 47e -->
-  <string name="EPr_manage_purge_deleted">Purge deleted tasks</string>
-  <string name="EPr_manage_purge_deleted_message">Do you really want to purge all your deleted tasks?\n\nThese tasks will be gone forever!</string>
-  <string name="EPr_manage_purge_deleted_status">Purged %d tasks!</string>
-  <!-- slide 47b-->
-  <string name="EPr_manage_purge_deleted_summary">Caution! Purged tasks can\'t be recovered without backup file!</string>
-  <!-- slide 47h-->
-  <string name="EPr_manage_clear_all">Clear all data</string>
-  <string name="EPr_manage_clear_all_message">Delete all tasks and settings in Astrid?\n\nWarning: can\'t be undone!</string>
-
-  <!-- slide 47f -->
-  <string name="EPr_manage_delete_completed_gcal">Delete calendar events for completed tasks</string>
-  <string name="EPr_manage_delete_completed_gcal_message">Do you really want to delete all your events for completed tasks?</string>
-  <string name="EPr_manage_delete_completed_gcal_summary"></string>
-  <string name="EPr_manage_delete_completed_gcal_status">Deleted %d calendar events!</string>
-      
-  <!-- slide 47g-->
-  <string name="EPr_manage_delete_all_gcal">Delete all calendar events for tasks</string>
-  <string name="EPr_manage_delete_all_gcal_message">Do you really want to delete all your events for tasks?</string>
-  <string name="EPr_manage_delete_all_gcal_summary"></string>
-  <string name="EPr_manage_delete_all_gcal_status">Deleted %d calendar events!</string>
-      
-  <!-- ==================================================== AddOnActivity == -->
-  
-  <!-- Add Ons Activity Title -->
-  <string name="AOA_title">Add-ons</string>
-    
-  <!-- Add-on Activity: author for internal authors  -->
-  <string name="AOA_internal_author">Astrid Team</string>
-    
-  <!-- Add-on Activity: installed add-ons tab -->
-  <string name="AOA_tab_installed">Installed</string>
-  
-  <!-- Add-on Activity - available add-ons tab -->
-  <string name="AOA_tab_available">Available</string>
-  
-  <!-- Add-on Activity - free add-ons label -->
-  <string name="AOA_free">Free</string>
-  
-  <!-- Add-on Activity - menu item to visit add-on website -->
-  
-  <!-- Add-on Activity - menu item to visit android market -->
-  
-  <!-- Add-on Activity - when list is empty -->
-  <string name="AOA_no_addons">Empty List!</string>
-  
-  <string name="AOA_ppack_title">Power Pack</string>
-  <string name="AOA_ppack_description">Support Astrid and get more productive with the Power Pack. 4x2 and 4x4 widgets and voice integration. Power up today!</string>
-  <string name="AOA_locale_title">Astrid Locale Plugin</string>
-  <string name="AOA_locale_description">Allows Astrid to make use of the Locale application to send you notifications based on filter conditions. Requires Locale.</string>
-  
-  <!-- ====================================================== TasksWidget == -->
-
-  <!-- Widget text when loading tasks -->
-  <string name="TWi_loading">Loading...</string>
-
-  <!-- Widget configuration activity title: select a filter -->
-  <string name="WCA_title">Select tasks to view...</string>
-  
-  <!-- ======================================================== Waiting on me -->
-
-  <string name="wom_commented">%s commented on your task.</string>
-  <string name="wom_mentioned">%s mentioned you.</string>
-  <string name="wom_assigned">%s assigned this to you.</string>
-  <string name="wom_raised_pri">%s raised the priority.</string>
-  <string name="wom_changed_due">%s changed the due date.</string>
-  <string name="wom_default">%s wants your attention.</string>
-  
-  <string name="wom_dismiss">Dismiss</string>
-  <string name="wom_acknowledge">I\'ve read this</string>
-
-  <!-- ============================================================= About == -->
-  
-  <!-- slide 30h: Title of "About" option in settings -->
-  <string name="p_about">About Astrid</string>
-  
-  <!-- About text (%s => current version)-->
-  <string name="p_about_text">Current version: %s\n\n
-
-Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
-
-  <!-- Title of "Help" option in settings -->
-  <string name="p_help">Support</string>
-  
-  <!-- slide 30c: Title of "Forums" option in settings -->
-  <string name="p_forums">Forums</string>
-  
-  <!-- Title of "Premium" option in settings -->
-  <string name="p_premium">Premium</string>
-  
-  <!-- ============================================================= Misc == -->
-  
-  <string name="feedback_positive_title">Rate Astrid?</string>
-
-  <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star rating?</string>
-
-  <string name="feedback_negative_title">Leave feedback?</string>
-
-  <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
-
-  <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback section--it might not be available on your device.</string>
-  
-  <string name="feedback_positive_button">Rate Astrid</string>
-
-  <string name="feedback_negative_button">Leave feedback</string>
-  
-  <string name="feedback_not_now">Not now</string>
-  
-  <string name="feedback_banner_text">How\'s Astrid working for you?</string>
-  
-  <!-- Displayed when task killer found. %s => name of the application -->
-  <string name="task_killer_help">
-It looks like you are using an app that can kill processes (%s)! If you can,
-add Astrid to the exclusion list so it doesn\'t get killed. Otherwise,
-Astrid might not let you know when your tasks are due.\n
-  </string>
-  
-  <!-- Task killer dialog ok button -->
-  <string name="task_killer_help_ok">I Won\'t Kill Astrid!</string>
-    
-  <!-- Astrid's Android Marketplace title. It never appears in the app itself. -->
-  
-  <!-- Astrid's Android Marketplace description. It never appears in the app itself. -->
-  <string name="marketplace_description">
-Astrid is the much loved open-source todo list / task manager designed to help 
-you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget and more. 
-  </string>
-  
-  <string name="DB_corrupted_title">Corrupted Database</string>
-  
-  <string name="DB_corrupted_body">
-      Uh oh! It looks like you may have a corrupted database. 
-      If you see this error regularly, we suggest you clear all
-      data (Settings->Sync and backup->Manage old tasks->Clear all data) and restore
-      your tasks from a backup (Settings->Sync and backup->Backup->Import tasks) in Astrid.</string>
-      
-  <string name="market_unavailable">Unfortunately the market is not available for your system.</string>
-  
+<resources>
+
+    <!-- ================================================== AndroidManifest == -->
+
+    <!-- slide 32k: Application Name (shown on home screen & in launcher) -->
+    <string name="app_name">Astrid Tasks</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="read_permission_label">Astrid Permission</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="read_permission_desc">read tasks, display task filters</string>
+
+    <!-- permission title for READ_TASKS -->
+    <string name="write_permission_label">Astrid Permission</string>
+
+    <!-- permission description for READ_TASKS -->
+    <string name="write_permission_desc">create new tasks, edit existing tasks</string>
+
+    <!-- ================================================== Generic Dialogs == -->
+
+    <!-- question for deleting tasks -->
+    <string name="DLG_delete_this_task_question">Delete this task?</string>
+
+    <!-- question for deleting items (%s => item name) -->
+    <string name="DLG_delete_this_item_question">Delete this item: %s?</string>
+
+    <!-- Progress dialog shown when upgrading -->
+    <string name="DLG_upgrading">Upgrading your tasks...</string>
+
+    <!-- Title for dialog selecting a time (hours and minutes) -->
+    <string name="DLG_hour_minutes">Time (hours : minutes)</string>
+
+    <!-- Dialog for Astrid having a critical update -->
+    <string name="DLG_please_update">Astrid should to be updated to the latest
+        version in the Android market! Please do that before continuing, or wait a
+        few seconds.
+    </string>
+
+    <!-- Button for going to Market -->
+
+    <!-- Button for accepting EULA -->
+    <string name="DLG_accept">I Accept</string>
+
+    <!-- Button for declining EULA -->
+    <string name="DLG_decline">I Decline</string>
+
+    <!-- EULA title -->
+    <string name="DLG_eula_title">Terms Of Use</string>
+
+    <!-- Progress Dialog generic text -->
+    <string name="DLG_please_wait">Please Wait</string>
+
+    <!-- Dialog - loading -->
+    <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_more">More</string>
+
+    <string name="DLG_undo">Undo</string>
+
+    <string name="DLG_warning">Warning</string>
+
+    <!-- =============================================================== UI == -->
+
+    <!-- Label for DateButtons with no value -->
+    <string name="WID_dateButtonUnset">Click to set</string>
+
+    <!-- String formatter for DateButtons ($D => date, $T => time) -->
+
+    <!-- String formatter for Disable button -->
+
+    <!--  ============================================================= notes -->
+
+    <!-- Note Exposer -->
+
+    <!-- Note Exposer / Comments -->
+
+    <!-- EditNoteActivity - no comments -->
+    <string name="ENA_no_comments">No activity yet</string>
+
+    <!-- EditNoteActivity - no username for comment -->
+    <string name="ENA_no_user">Someone</string>
+
+    <!-- EditNoteActivity - refresh comments -->
+    <string name="ENA_refresh_comments">Refresh Comments</string>
+
+    <!-- ================================================= TaskListActivity == -->
+
+    <!-- slide 8b: Task List: Displayed instead of list when no items present -->
+    <string name="TLA_no_items">You have no tasks! \n Want to add something?</string>
+
+    <!-- Task List: Displayed instead of list when no items present in people view (%s-> person's name) -->
+    <string name="TLA_no_items_person">%s has no\ntasks shared with you</string>
+
+    <!-- Menu: Adjust Sort and Hidden Task Settings -->
+    <string name="TLA_menu_sort">Sort</string>
+
+    <!-- Menu: Sync Now -->
+    <string name="TLA_menu_sync">Sync Now</string>
+
+    <!-- Menu: Search -->
+    <string name="TLA_menu_search">Search</string>
+
+    <!-- Menu: Tasks -->
+    <string name="TLA_menu_lists">Lists</string>
+
+    <!-- Menu: Friends -->
+    <string name="TLA_menu_friends">People</string>
+
+    <!-- Menu: Featured Lists -->
+    <string name="TLA_menu_featured_lists">Featured Lists</string>
+
+    <!-- Menu: Suggestions -->
+    <string name="TLA_menu_suggestions">Suggestions</string>
+
+    <!-- Menu: Tutorial -->
+
+    <!-- Menu: Settings -->
+    <string name="TLA_menu_settings">Settings</string>
+
+    <!-- slide 30b: Menu: Support -->
+    <string name="TLA_menu_support">Support</string>
+
+    <!-- Search Label-->
+
+    <!-- Window title for displaying Custom Filter -->
+    <string name="TLA_custom">Custom</string>
+
+    <!-- slide 8d: Quick Add Edit Box Hint-->
+    <string name="TLA_quick_add_hint">Add a task</string>
+
+    <!-- Quick Add Edit Box Hint for assigning (%s -> name)-->
+    <string name="TLA_quick_add_hint_assign">Add something for %s</string>
+
+    <!-- Notification Volumne notification-->
+    <string name="TLA_notification_volume_low">Notifications are muted. You won\'t be able to hear
+        Astrid!
+    </string>
+
+    <!-- Notifications disabled warning -->
+    <string name="TLA_notification_disabled">Reminders are disabled! You will not receive any
+        reminders
+    </string>
+
+    <string-array name="TLA_filters">
+        <item>Active</item>
+        <item>Today</item>
+        <item>Soon</item>
+        <item>Late</item>
+        <item>Done</item>
+        <item>Hidden</item>
+    </string-array>
+
+    <!-- Title for confirmation dialog after quick add markup -->
+    <string name="TLA_quickadd_confirm_title">You said, \"%s\"</string>
+
+    <!-- Text for speech bubble in dialog after quick add markup -->
+    <!-- First string is task title, second is due date, third is priority -->
+    <string name="TLA_quickadd_confirm_speech_bubble">I created a task called \"%1$s\" %2$s at
+        %3$s
+    </string>
+
+    <string name="TLA_quickadd_confirm_speech_bubble_date">for %s</string>
+
+    <string name="TLA_quickadd_confirm_hide_helpers">Don\'t display future confirmations</string>
+
+
+    <!-- Title for alert on new repeating task. %s-> task title -->
+    <string name="TLA_repeat_scheduled_title">New repeating task %s</string>
+
+    <!-- Speech bubble for when a new repeating task scheduled. %s->repeat interval -->
+    <string name="TLA_repeat_scheduled_speech_bubble">I\'ll remind you about this %s.</string>
+
+    <string-array name="TLA_priority_strings">
+        <item>highest priority</item>
+        <item>high priority</item>
+        <item>medium priority</item>
+        <item>low priority</item>
+    </string-array>
+    <!-- slide 22a -->
+    <string name="TLA_all_activity">All Activity</string>
+
+    <!-- ====================================================== TaskAdapter == -->
+
+    <!-- Format string to indicate task is hidden (%s => task name) -->
+    <string name="TAd_hiddenFormat">%s [hidden]</string>
+
+    <!-- Format string to indicate task is deleted (%s => task name) -->
+    <string name="TAd_deletedFormat">%s [deleted]</string>
+
+    <!-- Displayed when adapter is flung (scrolled quickly) -->
+
+    <!-- slide 22b: indicates task was completed. %s => date or time ago -->
+    <string name="TAd_completed">Finished\n%s</string>
+
+    <!-- slide 15a: Action Button: edit task -->
+    <string name="TAd_actionEditTask">Edit</string>
+
+    <!-- Context Item: edit task -->
+    <string name="TAd_contextEditTask">Edit Task</string>
+
+    <!-- Context Item: copy task -->
+    <string name="TAd_contextCopyTask">Copy Task</string>
+
+    <!-- Context Item: delete task -->
+    <string name="TAd_contextDeleteTask">Delete Task</string>
+
+    <!-- Context Item: undelete task -->
+    <string name="TAd_contextUndeleteTask">Undelete Task</string>
+
+    <!-- Context Item: purge task -->
+    <string name="TAd_contextPurgeTask">Purge Task</string>
+
+    <!-- ============================================== SortSelectionDialog == -->
+
+    <!-- slide 23a: Sort Selection: dialog title -->
+    <string name="SSD_title">Sort, Subtasks, and Hidden</string>
+
+    <!-- slide 23h:  Hidden: title -->
+    <string name="SSD_hidden_title">Hidden Tasks</string>
+
+    <!-- Hidden Task Selection: show completed tasks -->
+    <string name="SSD_completed">Show completed tasks</string>
+
+    <!-- Hidden Task Selection: show hidden tasks -->
+    <string name="SSD_hidden">Show hidden tasks</string>
+
+    <!-- Hidden Task Selection: show deleted tasks -->
+    <string name="SSD_deleted">Show deleted tasks</string>
+
+    <!-- Sort Selection: drag with subtasks -->
+    <string name="SSD_sort_drag">Manual order with subtasks</string>
+
+    <!-- slide 23b: Sort Selection: smart sort -->
+    <string name="SSD_sort_auto">Smart sort</string>
+
+    <!-- slide 23e: Sort Selection: sort by alpha -->
+    <string name="SSD_sort_alpha">By title</string>
+
+    <!-- slide 23c: Sort Selection: sort by due date -->
+    <string name="SSD_sort_due">By due date</string>
+
+    <!-- slide 23d: Sort Selection: sort by importance -->
+    <string name="SSD_sort_importance">By priority</string>
+
+    <!-- slide 23f: Sort Selection: sort by modified date -->
+    <string name="SSD_sort_modified">By last modified</string>
+
+    <!-- slide 23g: Sort Selection: reverse -->
+    <string name="SSD_sort_reverse">Reverse sort</string>
+
+    <!-- slide 23j: Sort Button: sort temporarily -->
+    <string name="SSD_save_temp">Just once</string>
+
+    <!-- slide 23i: Sort Button: sort permanently -->
+    <string name="SSD_save_always">Always</string>
+
+    <!-- =============================================== FilterListActivity == -->
+
+    <!-- Astrid Filter Shortcut -->
+    <string name="FSA_label">List or Filter</string>
+
+    <!-- Filter List Activity Title -->
+
+    <!-- Displayed when loading filters -->
+
+    <!-- Context Menu: Create Shortcut -->
+    <string name="FLA_context_shortcut">Create Shortcut On Desktop</string>
+
+    <!-- Menu: Search -->
+
+    <!-- Menu: Help -->
+
+    <!-- slide 28c: Create Shortcut Dialog Title -->
+    <string name="FLA_shortcut_dialog_title">Create Desktop Shortcut</string>
+
+    <!-- Create Shortcut Dialog (asks to name shortcut) -->
+    <string name="FLA_shortcut_dialog">Name of shortcut:</string>
+
+    <!-- Search Hint-->
+    <string name="FLA_search_hint">Search For Tasks</string>
+
+    <!-- Search Filter name (%s => query) -->
+    <string name="FLA_search_filter">Matching \'%s\'</string>
+
+    <!-- Toast: created shortcut (%s => label) -->
+    <string name="FLA_toast_onCreateShortcut">Created Shortcut: %s</string>
+
+    <!-- Menu: new filter -->
+    <string name="FLA_new_filter">New Filter</string>
+
+    <!-- slide 10e: Button: new list -->
+    <string name="FLA_new_list">New List</string>
+
+    <!-- Alert when creating a shortcut without selecting a filter -->
+    <string name="FLA_no_filter_selected">No filter selected! Please select a filter or list.
+    </string>
+
+    <!-- ================================================= TaskEditActivity == -->
+
+    <!-- Title when editing a task (%s => task title) -->
+
+    <!-- Title when creating a new task -->
+
+    <!-- Task title label -->
+
+    <!-- Task when label -->
+    <string name="TEA_when_header_label">When</string>
+
+    <!-- Task title hint (displayed when edit box is empty) -->
+    <string name="TEA_title_hint">Task name</string>
+
+    <!-- Task importance label -->
+    <string name="TEA_importance_label">Priority</string>
+
+    <!-- Task due date hint -->
+    <string name="TEA_deadline_hint">Set due date</string>
+
+    <!-- Task assigned to string (%s -> assigned person name) -->
+    <string name="TEA_assigned_to">Assigned to %s</string>
+
+    <!-- Task urgency specific time checkbox -->
+    <string name="TEA_urgency_specific_time">At specific time?</string>
+
+    <!-- Task urgency specific time title when specific time false -->
+    <string name="TEA_urgency_none">None</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_label">Hide until</string>
+
+    <!-- Task hide until label -->
+    <string name="TEA_hideUntil_display">Hide until %s</string>
+
+    <!-- Task hide until toast -->
+    <string name="TEA_hideUntil_message">Task will be hidden until %s</string>
+
+    <!-- Task editing data being loaded label -->
+    <string-array name="TEA_loading">
+        <item>Loading...</item>
+    </string-array>
+
+    <!-- slide 16c: Task note label -->
+    <string name="TEA_note_label">Description</string>
+
+    <!-- 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>
+
+    <!-- Elapsed time label -->
+    <string name="TEA_elapsedDuration_label">Time already spent</string>
+
+    <!-- Menu: Save -->
+    <string name="TEA_menu_save">Save Changes</string>
+
+    <!-- Menu: Don't Save -->
+    <string name="TEA_menu_discard">Don\'t Save</string>
+
+    <!-- Menu: Delete Task -->
+    <string name="TEA_menu_delete">Delete Task</string>
+
+    <!-- Menu: Task comments -->
+    <string name="TEA_menu_refresh_comments">Refresh comments</string>
+
+    <string name="TEA_menu_comments">Comments</string>
+
+    <!-- Toast: task saved with deadline (%s => preposition + time units) -->
+    <string name="TEA_onTaskSave_due">Task Saved: due %s</string>
+
+    <!-- Toast: task saved without deadlines -->
+    <string name="TEA_onTaskSave_notDue">Task Saved</string>
+
+    <!-- Toast: task was not saved -->
+
+    <!-- Toast: task was deleted -->
+
+    <!-- slide 15b: Task edit tab: activity -->
+    <string name="TEA_tab_activity">Activity</string>
+
+    <!-- slide 15e:  Task edit tab: more editing settings -->
+    <string name="TEA_tab_more">Details</string>
+
+    <!-- slide 15d: Task edit tab: web services -->
+    <string name="TEA_tab_web">Ideas</string>
+
+    <string name="TEA_timer_est">Est. %s</string>
+
+    <string name="TEA_timer_elap">Elapsed %s</string>
+
+    <string-array name="TEA_urgency">
+        <!-- slide 19: urgency: labels for edit page. item #4 -> auto filled -->
+        <item>No date</item>
+        <item>Specific day</item>
+        <item>Today</item>
+        <item>Tomorrow</item>
+        <item>(day after)</item>
+        <item>Next week</item>
+        <item>In two weeks</item>
+        <item>Next month</item>
+    </string-array>
+
+    <string name="TEA_no_time">No time</string>
+
+    <string-array name="TEA_hideUntil">
+        <!-- hideUntil: labels for edit page. -->
+        <item>Never</item>
+        <item>Due date</item>
+        <item>Due time</item>
+        <item>Day before due</item>
+        <item>Week before due</item>
+        <item>Specific day/time</item>
+    </string-array>
+
+    <!-- Task edit control set descriptors -->
+
+    <!-- slide 9b/35i -->
+    <string name="TEA_control_who">Who</string>
+
+    <!-- slide 9c/ 35a -->
+    <string name="TEA_control_when">When</string>
+    <!-- slide 35b -->
+    <string name="TEA_control_more_section">----Details----</string>
+    <!-- slide 16a/35c -->
+    <string name="TEA_control_importance">Priority</string>
+    <!-- slide 16b/35d -->
+    <string name="TEA_control_lists">Lists</string>
+    <!-- slide 16c/35e -->
+    <string name="TEA_control_notes">Description</string>
+
+    <string name="TEA_control_files">Files</string>
+
+    <!-- slide 16e / slide 35g-->
+    <string name="TEA_control_reminders">Reminders</string>
+
+    <!-- slide 16f -->
+    <string name="TEA_control_timer">Timer Controls</string>
+
+    <string name="TEA_control_hidden_section">----Hide Always----</string>
+
+    <string name="hide_until_prompt">Show in my list</string>
+
+    <!-- Add Ons tab when no add-ons found -->
+
+    <!-- Add Ons button -->
+
+    <!-- More row -->
+
+    <!-- slide 15c: Text when no activity to show -->
+    <string name="TEA_no_activity">No activity</string>
+
+    <!-- Text to load more activity -->
+    <string name="TEA_load_more">Load more...</string>
+
+    <!-- When controls dialog -->
+    <string name="TEA_when_dialog_title">When is this due?</string>
+
+
+    <string name="TEA_new_task">New Task</string>
+
+    <string name="WSV_click_to_load">Tap me to search for ways to get this done!</string>
+
+    <string name="WSV_not_online">I can do more when connected to the Internet. Please check your
+        connection.
+    </string>
+
+    <string name="TEA_contact_error">Sorry! We couldn\'t find an email address for the selected
+        contact.
+    </string>
+
+    <!-- ============================================= IntroductionActivity == -->
+
+    <!-- slide 1a: Introduction Window title -->
+
+    <!-- Button to agree to EULA -->
+
+    <!-- Button to disagree with EULA -->
+
+    <!-- ===================================================== MissedCallActivity == -->
+
+    <!-- Missed call: return call (%1$s -> caller, %2$s -> time of call)-->
+    <string name="MCA_title">%1$s\ncalled at %2$s</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_return_call">Call now</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_add_task">Call later</string>
+
+    <!-- Missed call: return call -->
+    <string name="MCA_ignore">Ignore</string>
+
+    <!-- Missed call: dialog to ignore all missed calls title -->
+    <string name="MCA_ignore_title">Ignore all missed calls?</string>
+
+    <!-- Missed call: dialog to ignore all missed calls body -->
+    <string name="MCA_ignore_body">You\'ve ignored several missed calls. Should Astrid stop asking
+        you about them?
+    </string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore all button -->
+    <string name="MCA_ignore_all">Ignore all calls</string>
+
+    <!-- Missed call: dialog to ignore all missed calls ignore just this button -->
+    <string name="MCA_ignore_this">Ignore this call only</string>
+
+    <!-- Missed call: preference title -->
+    <string name="MCA_missed_calls_pref_title">Field missed calls</string>
+
+    <!-- slide 49c: Missed call: preference description -->
+    <string name="MCA_missed_calls_pref_desc_enabled">Astrid will notify you about missed calls and
+        offer to remind you to call back
+    </string>
+    <string name="MCA_missed_calls_pref_desc_disabled">Astrid will not notify you about missed
+        calls
+    </string>
+
+    <!-- Missed call: task title with name (%1$s -> name, %2$s -> number)-->
+    <string name="MCA_task_title_name">Call %1$s back at %2$s</string>
+
+    <!-- Missed call: task title no name (%s -> number)-->
+    <string name="MCA_task_title_no_name">Call %s back</string>
+
+    <!-- Missed call: schedule dialog title (%s -> name or number)-->
+    <string name="MCA_schedule_dialog_title">Call %s back in...</string>
+
+    <!-- Missed call speech bubble options -->
+    <string-array name="MCA_dialog_speech_options">
+        <item>It must be nice to be so popular!</item>
+        <item>Yay! People like you!</item>
+        <item>Make their day, give \'em a call!</item>
+        <item>Wouldn\'t you be happy if people called you back?</item>
+        <item>You can do it!</item>
+        <item>You can always send a text...</item>
+    </string-array>
+
+
+    <!-- ======================================= Calendar reminder activity == -->
+
+    <!-- Calendar remindeer ignore button -->
+    <string name="CRA_ignore">Ignore</string>
+
+    <!-- Calendar event -->
+    <string name="CRA_title">Need a meeting list?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls title -->
+    <string name="CRA_ignore_title">Ignore all calendar events?</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls body -->
+    <string name="CRA_ignore_body">You\'ve ignored several calendar events. Should Astrid stop
+        asking you about them?
+    </string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore all button -->
+    <string name="CRA_ignore_all">Ignore all events</string>
+
+    <!-- Calendar reminder: dialog to ignore all missed calls ignore just this button -->
+    <string name="CRA_ignore_this">Ignore this event only</string>
+
+    <!-- Calendar reminder: astrid speech bubble when event starting (%s -> event name) -->
+    <string name="CRA_speech_bubble_start">Looks like %s is starting soon. Want to create a list for
+        action items?
+    </string>
+
+    <!-- Calendar reminder: astrid speech bubble when event ending (%s -> event name) -->
+    <string name="CRA_speech_bubble_end">Looks like you just finished with %s. Want to create a list
+        for action items?
+    </string>
+
+    <!-- Calendar reminder: create list button -->
+    <string name="CRA_create_list">Create list</string>
+
+    <!-- Calendar reminder: postpone button -->
+    <string name="CRA_postpone">Maybe afterwards</string>
+
+    <!-- Calendar reminder: list exists dialog title -->
+    <string name="CRA_list_exists_title">List already exists</string>
+
+    <!-- Calendar reminder: list exists dialog body (%s -> list name)-->
+    <string name="CRA_list_exists_body">A list named %s already exists. Do you want to use the
+        existing list or create a new one for this event?
+    </string>
+
+    <!-- Calendar reminder: list exists dialog create new button -->
+    <string name="CRA_create_new">Create new</string>
+
+    <!-- Calendar reminder: list exists dialog use existing button -->
+    <string name="CRA_use_existing">Use existing</string>
+
+    <!-- Calendar remindr: created list (%s -> list name) -->
+    <string name="CRA_created_list_dialog">I created a list %s.</string>
+
+    <!-- Calendar reminder: one attendee (%s -> attendee name or email) -->
+    <string name="CRA_one_attendee">%s is attending.</string>
+
+    <!-- Calendar reminder: two attendees (%s -> attendee name or email) -->
+    <string name="CRA_two_attendees">%1$s and %2$s are attending.</string>
+
+    <!-- Calendar reminder: many attendees (%s -> attendee name or email, %3$d -> how many other people) -->
+    <string name="CRA_many_attendees">%1$s, %2$s, and %3$d others are attending.</string>
+
+    <!-- Calendar reminder: invitation prompt -->
+    <string name="CRA_invitation_prompt">Want to invite them?</string>
+
+    <!-- Calendar reminder: preference title -->
+    <string name="CRA_calendar_reminders_pref_title">Calendar assistant</string>
+
+    <!-- Calendar reminder: pref description disabled -->
+    <string name="CRA_calendar_reminders_pref_desc_disabled">Astrid will not remind you about
+        upcoming calendar events
+    </string>
+
+    <!-- Calendar reminder: pref description enabled -->
+    <string name="CRA_calendar_reminders_pref_desc_enabled">Astrid will remind you about upcoming
+        calendar events and prompt you to prepare for them
+    </string>
+
+    <!-- Calendar reminder: share list title -->
+    <string name="CRA_share_list_title">Share the list?</string>
+
+    <string name="CRA_invite_attendees">Invite attendees</string>
+
+    <string name="CRA_more_options">More options</string>
+
+    <string name="CRA_dont_invite">No thank you</string>
+
+    <!-- Calendar reminder: share list title when no other attendees exist-->
+    <string name="CRA_list_created_title">List created!</string>
+
+    <!-- Calendar reminder: default new list name (%s -> event title) -->
+    <string name="CRA_default_list_name">Action Items: %s</string>
+
+    <!-- ===================================================== HelpActivity == -->
+
+    <!-- Help: Button to get support from our website -->
+
+    <!-- ==================================================== UpdateService == -->
+
+    <!-- Changelog Window Title -->
+    <string name="UpS_changelog_title">What\'s new?</string>
+
+    <!-- Updates Window Title -->
+    <string name="UpS_updates_title">Latest Astrid News</string>
+
+    <!-- Updats No Activity to show for offline users -->
+    <string name="UpS_no_activity_log_in">Log in to see a record of\nyour progress as well
+        as\nactivity on shared lists.
+    </string>
+
+    <!-- ================================================== EditPreferences == -->
+
+    <!-- slide 31g: Preference Window Title -->
+    <string name="EPr_title">Settings</string>
+
+    <string name="EPr_share_astrid">Share Astrid</string>
+
+    <string name="EPr_share_astrid_summary">Share about Astrid on your favorite social network
+    </string>
+
+    <!-- slide 46a -->
+    <string name="EPr_deactivated">deactivated</string>
+
+    <!-- slide 30i: Preference Category: Appearance Title -->
+    <string name="EPr_appearance_header">Appearance</string>
+
+    <!-- Preference Category: Appearance Summary -->
+    <string name="EPr_appearance_summary">Themes, widgets, task rows, edit screen</string>
+
+    <!-- FAQ Preference title -->
+    <string name="EPr_faq_title">FAQ</string>
+
+    <!-- Account status preference (%s -> account type) -->
+    <string name="EPr_account_title">Account: %s</string>
+
+    <!-- Support preferences summary -->
+    <string name="EPr_support_summary">Tutorial, FAQ, about</string>
+
+    <!-- slide 34a: Preference: Task List Font Size Title -->
+    <string name="EPr_fontSize_title">Task list size</string>
+
+    <!-- Preference: Filters to show pref screen title -->
+    <string name="EPr_filters_to_show_title">Filters to show</string>
+
+    <!-- slide 32a: Preference: Show confirmation for smart reminders -->
+    <string name="EPr_showSmartConfirmation_title">Show confirmation for smart reminders</string>
+
+    <!-- slide 34g: Preference: Task List Font Size Description -->
+    <string name="EPr_fontSize_desc">Font size on the main listing page</string>
+
+    <!-- Preferemce: Show task edit confirmation toasts -->
+
+    <!-- slide 34c: Preference: Task List Show Notes -->
+    <string name="EPr_showNotes_title">Show description in task</string>
+
+    <!-- Edit screen preference category -->
+    <string name="EPr_edit_screen_options">Edit screen options</string>
+
+    <!-- slide 30e: Preference: Beast mode (auto-expand edit page) -->
+    <string name="EPr_beastMode_title">Edit screen order</string>
+
+    <string name="EPr_beastMode_shortcut">Customize</string>
+
+    <string name="EPr_time_increment">5 minute increments</string>
+
+    <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
+
+    <string name="EPr_show_timer_shortcut">Show timer shortcut</string>
+
+    <!-- slide 35h -->
+    <string name="EPr_beastMode_desc">Customize the layout of the task edit screen</string>
+    <!-- slide 35j -->
+    <string name="EPr_beastMode_reset">Reset to defaults</string>
+
+    <string name="EPr_beastMode_hint">Customize your task edit screen by dragging the left handle on
+        each row
+    </string>
+
+    <!-- slide 34i: Preference: Task List Show Notes Description (disabled) -->
+    <string name="EPr_showNotes_desc_disabled">Description will be accessible from the task edit
+        screen
+    </string>
+    <!-- Preference: Task List Show Notes Description (enabled) -->
+    <string name="EPr_showNotes_desc_enabled">Description will always be displayed</string>
+
+    <!-- slide 34d: Preferences: Allow task rows to compress to size of task -->
+    <string name="EPr_compressTaskRows_title">Compact task row</string>
+    <!-- slide 34j -->
+    <string name="EPr_compressTaskRows_desc">Compress task rows to fit title</string>
+
+    <!-- slide 34e: Preferences: Use legacy importance and checkbox style -->
+    <!-- slide 34k-->
+
+    <!-- slide 34b: Preferences: Wrap task titles to two lines -->
+    <string name="EPr_fullTask_title">Show full task title</string>
+    <string name="EPr_fullTask_desc_enabled">Full task title will be shown</string>
+    <!-- slide 34h -->
+    <string name="EPr_fullTask_desc_disabled">First two lines of task title will be shown</string>
+
+    <!-- slide 32b: Preferences: Auto-load Ideas Tab -->
+    <string name="EPr_ideaAuto_title">Auto-load ideas tab</string>
+    <!-- slide 32c -->
+    <string name="EPr_ideaAuto_desc_enabled">Web searches for ideas tab will be performed when tab
+        is clicked
+    </string>
+    <string name="EPr_ideaAuto_desc_disabled">Web searches for ideas tab will be performed only when
+        manually requested
+    </string>
+
+    <!-- Preferences: task row style -->
+    <string-array name="EPr_task_row_styles">
+        <item>Original</item>
+        <item>Simple</item>
+        <item>Title only</item>
+    </string-array>
+
+    <string-array name="EPr_task_row_style_descriptions">
+        <item>Truncate title to two lines with date on right</item>
+        <item>Truncate title to one line with date and lists below</item>
+        <item>Single line title only</item>
+    </string-array>
+
+    <!-- task row style title (%s -> style) -->
+    <string name="EPr_task_row_style_title">Row style: %s</string>
+
+    <!-- Preference: custom filters enabled -->
+    <string name="EPr_use_filters_title">Use filters</string>
+    <string name="EPr_use_filters_subtitle">Lets you create custom filters</string>
+
+    <!-- Preference: show list members in shared list -->
+    <string name="EPr_show_list_members_title">Show list members in shared lists</string>
+
+    <!-- Preference: simple input box style -->
+    <string name="EPr_simple_input_boxes">Simple text boxes</string>
+
+    <!-- Preference: simple input box style -->
+    <string name="EPr_show_quickadd_controls">Advanced quickadd controls</string>
+
+    <!-- Preference: don't show plus button until input present -->
+    <string name="EPr_hide_plus_button">Hide plus button</string>
+
+    <!-- Preference: menu items -->
+    <string name="EPr_menu_items">Menu items</string>
+
+    <!-- Preference: list view -->
+    <string name="EPr_list_view">List view</string>
+
+    <!-- Preference: task edit comments -->
+    <string name="EPr_show_task_edit_comments">Show comments in task edit</string>
+
+    <!-- slide 30f/ 36f: Preference: Theme -->
+    <string name="EPr_theme_title">Color theme</string>
+    <!-- Preference: Theme Description (%s => value) -->
+    <string name="EPr_theme_desc">Currently: %s</string>
+    <!-- Preference: Theme Description (android 1.6) -->
+    <string name="EPr_theme_desc_unsupported">Setting requires Android 2.0+</string>
+    <!-- slide 32h/ 37b -->
+    <string name="EPr_theme_widget_title">Widget theme</string>
+
+    <!-- slide 30d/ 34f: Preference screen: all task row settings -->
+    <string name="EPr_taskRowPrefs_title">Task row appearance</string>
+
+    <!-- slide 49g: Preferences: use the system contact picker for task assignment -->
+    <string name="EPr_use_contact_picker">Use contact picker</string>
+    <!-- slide 49b -->
+    <string name="EPr_use_contact_picker_desc_enabled">The system contact picker option will be
+        displayed in the task assignment window
+    </string>
+    <string name="EPr_use_contact_picker_desc_disabled">The system contact picker option will not be
+        displayed
+    </string>
+
+    <!-- slide 49i: Preferences: Third party addons -->
+    <string name="EPr_third_party_addons">Enable third party add-ons</string>
+    <string name="EPr_third_party_addons_desc_enabled">Third party add-ons will be enabled</string>
+    <!-- slide 49d -->
+    <string name="EPr_third_party_addons_desc_disabled">Third party add-ons will be disabled
+    </string>
+
+    <!-- Preferences: ideas tab -->
+    <string name="EPr_ideas_tab_enabled">Task ideas</string>
+    <string name="EPr_ideas_tab_description">Get ideas to help you complete tasks</string>
+
+    <!-- Preferences: calendar event start time -->
+    <string name="EPr_cal_end_or_start_at_due_time">Calendar event time</string>
+    <string name="EPr_cal_end_at_due_time">End calendar events at due time</string>
+    <string name="EPr_cal_start_at_due_time">Start calendar events at due time</string>
+
+    <string name="EPr_force_phone_layout">Use phone layout</string>
+
+    <string name="EPr_show_featured_lists">Show featured lists</string>
+
+    <!-- Configurations -->
+    <string name="EPr_configurations_title">Set configuration</string>
+    <string name="EPr_config_default">Default</string>
+    <string name="EPr_config_lite">Astrid Lite</string>
+
+    <!-- Dialog title when setting preference configuration -->
+    <string name="EPr_config_dialog_title">Set configuration?</string>
+    <!-- Dialog prompt when setting preference configuration (%s -> name of configuration)-->
+    <string name="EPr_config_dialog_text">Reset preferences to the %s configuration?</string>
+
+    <!-- default configuration name for the above dialog -->
+    <string name="EPr_config_dialog_default_id">default</string>
+
+    <!-- Preference title for showing save and cancel buttons in task edit page -->
+    <string name="EPr_show_save_and_cancel">Show save and cancel</string>
+
+
+    <!-- Swipe between lists -->
+    <!-- Preference: swipe between lists performance -->
+    <string name="EPr_swipe_lists_performance_title">Swipe between lists</string>
+
+    <string-array name="EPr_swipe_lists_performance_mode">
+        <item>No swipe</item>
+        <item>Conserve Memory</item>
+        <item>Normal Performance</item>
+        <item>High Performance</item>
+    </string-array>
+
+    <string-array name="EPr_swipe_lists_performance_desc">
+        <!-- slide 49a -->
+        <item>Swipe between lists is disabled</item>
+        <item>Slower performance</item>
+        <item>Default setting</item>
+        <item>Uses more system resources</item>
+    </string-array>
+
+    <string name="swipe_lists_helper_title">Swipe between lists</string>
+    <string name="swipe_lists_helper_header">Swipe left or right to quickly move between lists
+    </string>
+    <string name="swipe_lists_helper_subtitle">Change settings in Settings -> Appearance</string>
+
+    <!-- Format string for displaying the currently selected preference. $1 is name of selected mode, $2 is description -->
+
+    <string-array name="EPr_default_reminders_mode">
+        <!-- reminders duration: labels for "Task Defaults" preference item. -->
+        <item>@string/TEA_reminder_mode_once</item>
+        <item>@string/TEA_reminder_mode_five</item>
+        <item>@string/TEA_reminder_mode_nonstop</item>
+    </string-array>
+
+    <string-array name="EPr_themes">
+        <!-- theme_settings: labels for Theme preference menu -->
+        <!-- slide 36a-->
+        <item>Day - Blue</item>
+        <!-- slide 36b -->
+        <item>Day - Red</item>
+        <!-- slide 36b -->
+        <item>Sky blue</item>
+        <!-- slide 36c -->
+        <item>Night</item>
+        <!-- slide 36d -->
+        <item>Transparent (white text)</item>
+        <!-- slide 36e -->
+        <item>Transparent (black text)</item>
+    </string-array>
+
+    <string-array name="EPr_themes_widget">
+        <!-- slide 32i / 37a-->
+        <item>Same as app</item>
+        <item>Day - Blue</item>
+        <item>Day - Red</item>
+        <item>Sky blue</item>
+        <item>Night</item>
+        <item>Transparent (white text)</item>
+        <item>Transparent (black text)</item>
+        <item>Old Style</item>
+    </string-array>
+
+    <!-- ========================================== Task Management Settings == -->
+
+    <!-- slide 33a/47c: Preference Screen Header: Old Task Management -->
+    <string name="EPr_manage_header">Manage old tasks</string>
+    <!-- slide 47d -->
+    <string name="EPr_manage_delete_completed">Delete completed tasks</string>
+    <string name="EPr_manage_delete_completed_message">Do you really want to delete all your
+        completed tasks?
+    </string>
+    <!-- slide 47a -->
+    <string name="EPr_manage_delete_completed_summary">Deleted tasks can be undeleted one-by-one
+    </string>
+    <string name="EPr_manage_delete_completed_status">Deleted %d tasks!</string>
+    <!-- slide 47e -->
+    <string name="EPr_manage_purge_deleted">Purge deleted tasks</string>
+    <string name="EPr_manage_purge_deleted_message">Do you really want to purge all your deleted
+        tasks?\n\nThese tasks will be gone forever!
+    </string>
+    <string name="EPr_manage_purge_deleted_status">Purged %d tasks!</string>
+    <!-- slide 47b-->
+    <string name="EPr_manage_purge_deleted_summary">Caution! Purged tasks can\'t be recovered
+        without backup file!
+    </string>
+    <!-- slide 47h-->
+    <string name="EPr_manage_clear_all">Clear all data</string>
+    <string name="EPr_manage_clear_all_message">Delete all tasks and settings in Astrid?\n\nWarning:
+        can\'t be undone!
+    </string>
+
+    <!-- slide 47f -->
+    <string name="EPr_manage_delete_completed_gcal">Delete calendar events for completed tasks
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_message">Do you really want to delete all your
+        events for completed tasks?
+    </string>
+    <string name="EPr_manage_delete_completed_gcal_summary"></string>
+    <string name="EPr_manage_delete_completed_gcal_status">Deleted %d calendar events!</string>
+
+    <!-- slide 47g-->
+    <string name="EPr_manage_delete_all_gcal">Delete all calendar events for tasks</string>
+    <string name="EPr_manage_delete_all_gcal_message">Do you really want to delete all your events
+        for tasks?
+    </string>
+    <string name="EPr_manage_delete_all_gcal_summary"></string>
+    <string name="EPr_manage_delete_all_gcal_status">Deleted %d calendar events!</string>
+
+    <!-- ==================================================== AddOnActivity == -->
+
+    <!-- Add Ons Activity Title -->
+    <string name="AOA_title">Add-ons</string>
+
+    <!-- Add-on Activity: author for internal authors  -->
+    <string name="AOA_internal_author">Astrid Team</string>
+
+    <!-- Add-on Activity: installed add-ons tab -->
+    <string name="AOA_tab_installed">Installed</string>
+
+    <!-- Add-on Activity - available add-ons tab -->
+    <string name="AOA_tab_available">Available</string>
+
+    <!-- Add-on Activity - free add-ons label -->
+    <string name="AOA_free">Free</string>
+
+    <!-- Add-on Activity - menu item to visit add-on website -->
+
+    <!-- Add-on Activity - menu item to visit android market -->
+
+    <!-- Add-on Activity - when list is empty -->
+    <string name="AOA_no_addons">Empty List!</string>
+
+    <string name="AOA_ppack_title">Power Pack</string>
+    <string name="AOA_ppack_description">Support Astrid and get more productive with the Power Pack.
+        4x2 and 4x4 widgets and voice integration. Power up today!
+    </string>
+    <string name="AOA_locale_title">Astrid Locale Plugin</string>
+    <string name="AOA_locale_description">Allows Astrid to make use of the Locale application to
+        send you notifications based on filter conditions. Requires Locale.
+    </string>
+
+    <!-- ====================================================== TasksWidget == -->
+
+    <!-- Widget text when loading tasks -->
+    <string name="TWi_loading">Loading...</string>
+
+    <!-- Widget configuration activity title: select a filter -->
+    <string name="WCA_title">Select tasks to view...</string>
+
+    <!-- ======================================================== Waiting on me -->
+
+    <string name="wom_commented">%s commented on your task.</string>
+    <string name="wom_mentioned">%s mentioned you.</string>
+    <string name="wom_assigned">%s assigned this to you.</string>
+    <string name="wom_raised_pri">%s raised the priority.</string>
+    <string name="wom_changed_due">%s changed the due date.</string>
+    <string name="wom_default">%s wants your attention.</string>
+
+    <string name="wom_dismiss">Dismiss</string>
+    <string name="wom_acknowledge">I\'ve read this</string>
+
+    <!-- ============================================================= About == -->
+
+    <!-- slide 30h: Title of "About" option in settings -->
+    <string name="p_about">About Astrid</string>
+
+    <!-- About text (%s => current version)-->
+    <string name="p_about_text">Current version: %s\n\n
+
+        Astrid is open-source and proudly maintained by Todoroo, Inc.
+    </string>
+
+    <!-- Title of "Help" option in settings -->
+    <string name="p_help">Support</string>
+
+    <!-- slide 30c: Title of "Forums" option in settings -->
+    <string name="p_forums">Forums</string>
+
+    <!-- Title of "Premium" option in settings -->
+    <string name="p_premium">Premium</string>
+
+    <!-- ============================================================= Misc == -->
+
+    <string name="feedback_positive_title">Rate Astrid?</string>
+
+    <string name="feedback_positive_body">Glad I\'m helpful! Got a moment to help us with a 5-star
+        rating?
+    </string>
+
+    <string name="feedback_negative_title">Leave feedback?</string>
+
+    <string name="feedback_negative_body">Sorry to hear that we\'re having issues</string>
+
+    <string name="feedback_activity_error">Oops! We weren\'t able to launch the market feedback
+        section--it might not be available on your device.
+    </string>
+
+    <string name="feedback_positive_button">Rate Astrid</string>
+
+    <string name="feedback_negative_button">Leave feedback</string>
+
+    <string name="feedback_not_now">Not now</string>
+
+    <string name="feedback_banner_text">How\'s Astrid working for you?</string>
+
+    <!-- Displayed when task killer found. %s => name of the application -->
+    <string name="task_killer_help">
+        It looks like you are using an app that can kill processes (%s)! If you can,
+        add Astrid to the exclusion list so it doesn\'t get killed. Otherwise,
+        Astrid might not let you know when your tasks are due.\n
+    </string>
+
+    <!-- Task killer dialog ok button -->
+    <string name="task_killer_help_ok">I Won\'t Kill Astrid!</string>
+
+    <!-- Astrid's Android Marketplace title. It never appears in the app itself. -->
+
+    <!-- Astrid's Android Marketplace description. It never appears in the app itself. -->
+    <string name="marketplace_description">
+        Astrid is the much loved open-source todo list / task manager designed to help
+        you get stuff done. It features reminders, tags, sync, Locale plug-in, a widget and more.
+    </string>
+
+    <string name="DB_corrupted_title">Corrupted Database</string>
+
+    <string name="DB_corrupted_body">
+        Uh oh! It looks like you may have a corrupted database.
+        If you see this error regularly, we suggest you clear all
+        data (Settings->Sync and backup->Manage old tasks->Clear all data) and restore
+        your tasks from a backup (Settings->Sync and backup->Backup->Import tasks) in Astrid.
+    </string>
+
+    <string name="market_unavailable">Unfortunately the market is not available for your system.
+    </string>
+
 </resources>
diff --git a/astrid/res/values/strings-defaults.xml b/astrid/res/values/strings-defaults.xml
index 981809979..343278414 100644
--- a/astrid/res/values/strings-defaults.xml
+++ b/astrid/res/values/strings-defaults.xml
@@ -6,92 +6,94 @@
 -->
 <resources>
 
-  <!-- slide 32g: Preference Category: Defaults Title -->
-  <string name="EPr_defaults_header">New task defaults</string>
-  <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
-  
-  <!-- slide 41f:  Preference: Default Urgency Title -->
-  <string name="EPr_default_urgency_title">Default deadline</string>
-  <!-- Preference: Default Urgency Description (%s => setting) -->
-  <string name="EPr_default_urgency_desc">Currently: %s</string>
-  
-  <!-- slide 40a: Preference: Default Importance Title -->
-  <string name="EPr_default_importance_title">Default priority</string>
-  <!-- Preference: Default Importance Description (%s => setting) -->
-  <string name="EPr_default_importance_desc">Currently: %s</string>
-  
-  <!-- slide 42e: Preference: Default Hide Until Title -->
-  <string name="EPr_default_hideUntil_title">Default hide until</string>
-  <!-- Preference: Default Hide Until Description (%s => setting) -->
-  <string name="EPr_default_hideUntil_desc">Currently: %s</string>
-  
-  <!-- slide 43e: Preference: Default Reminders Title -->
-  <string name="EPr_default_reminders_title">Default reminders</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_desc">Currently: %s</string>
-  
-  <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
-  <string name="EPr_default_addtocalendar_title">Default add to calendar</string>
-  <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
-  <string name="EPr_default_addtocalendar_desc_disabled">New tasks will not create an event in the Google Calendar</string>
-  <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
-  <string name="EPr_default_addtocalendar_desc">New tasks will be in the calendar: \"%s\"</string>
-  
-  <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
-  <string name="EPr_default_reminders_mode_title">Default ring/vibrate type</string>
-  <!-- Preference: Default Reminders Description (%s => setting) -->
-  <string name="EPr_default_reminders_mode_desc">Currently: %s</string>
-  
-  <string-array name="EPr_default_importance">
-    <!-- importance: labels for "Task Defaults" preference item. -->
-    <!-- slide 40b -->
-    <item>!!! (Highest)</item>
-    <item>!!</item>
-    <item>!</item>
-    <!-- slide 40c -->
-    <item>o (Lowest)</item>
-  </string-array>
-  
-  <string-array name="EPr_default_urgency">
-    <!-- urgency: labels for "Task Defaults" preference item. -->
-    <!-- slide 41a-->
-    <item>No deadline</item>
-    <!-- slide 41b -->
-    <item>Today</item>
-    <!-- slide 41c-->
-    <item>Tomorrow</item>
-    <!-- slide 41d -->
-    <item>Day after tomorrow</item>
-    <!-- slide 41e -->
-    <item>Next week</item>
-  </string-array>
-  
-  <string-array name="EPr_default_hideUntil">
-    <!-- hideUntil: labels for "Task Defaults" preference item. -->
-    <!-- slide 42a -->
-    <item>Don\'t hide</item>
-    <!-- slide 42b -->
-    <item>Task is due</item>
-    <!-- slide 42c -->
-    <item>Day before due</item>
-    <!-- slide 42d-->
-    <item>Week before due</item>
-  </string-array>
-  
-  <string-array name="EPr_default_reminders">
-    <!-- reminders: labels for "Task Defaults" preference item. -->
-    <!-- slide 43a -->
-    <item>No deadline reminders</item>
-    <!-- slide 43b -->
-    <item>At deadline</item>
-    <!-- slide 43c -->
-    <item>When overdue</item>
-    <!-- slide 43d -->
-    <item>At deadline or overdue</item>
-  </string-array>
-  
-  <string-array name="EPr_default_addtocalendar">
-    <!-- addtocalendar: labels for "Task Defaults" preference item. -->
-    <item>@string/EPr_deactivated</item>
-  </string-array>      
+    <!-- slide 32g: Preference Category: Defaults Title -->
+    <string name="EPr_defaults_header">New task defaults</string>
+    <string name="EPr_defaults_summary">Priority, due date, add to calendar</string>
+
+    <!-- slide 41f:  Preference: Default Urgency Title -->
+    <string name="EPr_default_urgency_title">Default deadline</string>
+    <!-- Preference: Default Urgency Description (%s => setting) -->
+    <string name="EPr_default_urgency_desc">Currently: %s</string>
+
+    <!-- slide 40a: Preference: Default Importance Title -->
+    <string name="EPr_default_importance_title">Default priority</string>
+    <!-- Preference: Default Importance Description (%s => setting) -->
+    <string name="EPr_default_importance_desc">Currently: %s</string>
+
+    <!-- slide 42e: Preference: Default Hide Until Title -->
+    <string name="EPr_default_hideUntil_title">Default hide until</string>
+    <!-- Preference: Default Hide Until Description (%s => setting) -->
+    <string name="EPr_default_hideUntil_desc">Currently: %s</string>
+
+    <!-- slide 43e: Preference: Default Reminders Title -->
+    <string name="EPr_default_reminders_title">Default reminders</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_desc">Currently: %s</string>
+
+    <!-- slide 19a/46c: Preference: Default Add To Calendar Title -->
+    <string name="EPr_default_addtocalendar_title">Default add to calendar</string>
+    <!-- Preference: Default Add To Calendar Setting Description (disabled) -->
+    <string name="EPr_default_addtocalendar_desc_disabled">New tasks will not create an event in the
+        Google Calendar
+    </string>
+    <!-- Preference: Default Add To Calendar Setting Description (%s => setting) -->
+    <string name="EPr_default_addtocalendar_desc">New tasks will be in the calendar: \"%s\"</string>
+
+    <!-- slide 45d: Reminder Mode Preference: Default Reminders Duration -->
+    <string name="EPr_default_reminders_mode_title">Default ring/vibrate type</string>
+    <!-- Preference: Default Reminders Description (%s => setting) -->
+    <string name="EPr_default_reminders_mode_desc">Currently: %s</string>
+
+    <string-array name="EPr_default_importance">
+        <!-- importance: labels for "Task Defaults" preference item. -->
+        <!-- slide 40b -->
+        <item>!!! (Highest)</item>
+        <item>!!</item>
+        <item>!</item>
+        <!-- slide 40c -->
+        <item>o (Lowest)</item>
+    </string-array>
+
+    <string-array name="EPr_default_urgency">
+        <!-- urgency: labels for "Task Defaults" preference item. -->
+        <!-- slide 41a-->
+        <item>No deadline</item>
+        <!-- slide 41b -->
+        <item>Today</item>
+        <!-- slide 41c-->
+        <item>Tomorrow</item>
+        <!-- slide 41d -->
+        <item>Day after tomorrow</item>
+        <!-- slide 41e -->
+        <item>Next week</item>
+    </string-array>
+
+    <string-array name="EPr_default_hideUntil">
+        <!-- hideUntil: labels for "Task Defaults" preference item. -->
+        <!-- slide 42a -->
+        <item>Don\'t hide</item>
+        <!-- slide 42b -->
+        <item>Task is due</item>
+        <!-- slide 42c -->
+        <item>Day before due</item>
+        <!-- slide 42d-->
+        <item>Week before due</item>
+    </string-array>
+
+    <string-array name="EPr_default_reminders">
+        <!-- reminders: labels for "Task Defaults" preference item. -->
+        <!-- slide 43a -->
+        <item>No deadline reminders</item>
+        <!-- slide 43b -->
+        <item>At deadline</item>
+        <!-- slide 43c -->
+        <item>When overdue</item>
+        <!-- slide 43d -->
+        <item>At deadline or overdue</item>
+    </string-array>
+
+    <string-array name="EPr_default_addtocalendar">
+        <!-- addtocalendar: labels for "Task Defaults" preference item. -->
+        <item>@string/EPr_deactivated</item>
+    </string-array>
 </resources>
diff --git a/astrid/res/values/strings-filters.xml b/astrid/res/values/strings-filters.xml
index 9bc5c37ac..5b0641c88 100644
--- a/astrid/res/values/strings-filters.xml
+++ b/astrid/res/values/strings-filters.xml
@@ -4,75 +4,75 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    
+<resources>
+
     <!-- Resources for built-in filter plug-in -->
-    
+
     <!-- ================================================= Filter Exposer == -->
-    
+
     <!-- Active Tasks Filter -->
     <string name="BFE_Active">My Tasks</string>
-    
+
     <!-- Waiting on me filter -->
     <string name="BFE_waiting_on_me">Waiting On Me</string>
-        
+
     <!-- Search Filter -->
-    
+
     <!-- slide 10b: Recently Modified -->
     <string name="BFE_Recent">Recently Modified</string>
-    
+
     <!-- slide 10c: I've assigned -->
     <string name="BFE_Assigned">I\'ve Assigned</string>
-    
+
     <!-- Build Your Own Filter -->
-    
+
     <!-- Saved Filters Header -->
-    
+
     <!-- Saved Filters Context Menu: delete -->
     <string name="BFE_Saved_delete">Delete Filter</string>
 
     <!-- =========================================== CustomFilterActivity == -->
-    
+
     <!-- slide 30d: Build Your Own Filter Activity Title-->
     <string name="CFA_title">Custom Filter</string>
-    
+
     <!-- slide 30e: Filter Name edit box hint (if user types here, filter will be saved) -->
     <string name="CFA_filterName_hint">Name this filter to save it...</string>
-    
+
     <!-- Filter Name default for copied filters (%s => old filter name) -->
-    
+
     <!-- slide 30a: Filter Starting Universe: all tasks -->
     <string name="CFA_universe_all">Active Tasks</string>
-    
+
     <!-- Filter Criteria Type: add (at the begging of title of the criteria) -->
     <string name="CFA_type_add">or</string>
-    
+
     <!-- Filter Criteria Type: subtract (at the begging of title of the criteria) -->
     <string name="CFA_type_subtract">not</string>
-    
+
     <!-- Filter Criteria Type: intersect (at the begging of title of the criteria) -->
     <string name="CFA_type_intersect">also</string>
-    
+
     <!-- Filter Criteria Context Menu: chaining (%s chain type as above) -->
     <string name="CFA_context_chain">%s has criteria</string>
-    
+
     <!-- Filter Criteria Context Menu: delete -->
     <string name="CFA_context_delete">Delete Row</string>
-    
+
     <!-- slide 30b: Filter Screen Help Text -->
     <string name="CFA_help">Long press on items for additional options</string>
-    
+
     <!-- slide 30c: Filter Button: add new -->
     <string name="CFA_button_add">Add Criteria</string>
-    
+
     <!-- slide 30f: Filter Button: view without saving -->
     <string name="CFA_button_view">View</string>
-    
+
     <!-- Filter Button: save & view filter -->
     <string name="CFA_button_save">Save &amp; View</string>
 
     <!-- =========================================== CustomFilterCriteria == -->
-        
+
     <!-- Criteria: due by X - display text (? -> user input) -->
     <string name="CFC_dueBefore_text">Due By: ?</string>
     <!-- Criteria: due by X - name of criteria -->
@@ -87,25 +87,25 @@
         <item>Next Week</item>
         <item>Next Month</item>
     </string-array>
-    
+
     <!-- Criteria: importance - display text (? -> user input)-->
     <string name="CFC_importance_text">Priority at least ?</string>
     <!-- Criteria: importance - name of criteria -->
-    <string name="CFC_importance_name">Priority...</string>        
-    
+    <string name="CFC_importance_name">Priority...</string>
+
     <!-- Criteria: tag - display text (? -> user input) -->
     <string name="CFC_tag_text">List: ?</string>
     <!-- Criteria: tag - name of criteria -->
     <string name="CFC_tag_name">List...</string>
-    
+
     <!-- Criteria: tag_contains - name of criteria -->
     <string name="CFC_tag_contains_name">List name contains...</string>
     <!-- Criteria: tag_contains - text (? -> user input) -->
     <string name="CFC_tag_contains_text">List name contains: ?</string>
-    
+
     <!-- Criteria: title_contains - name of criteria -->
     <string name="CFC_title_contains_name">Title contains...</string>
     <!-- Criteria: title_contains - text (? -> user input) -->
     <string name="CFC_title_contains_text">Title contains: ?</string>
-    
+
 </resources>
diff --git a/astrid/res/values/strings-gcal.xml b/astrid/res/values/strings-gcal.xml
index eb3d961b7..606bd8673 100644
--- a/astrid/res/values/strings-gcal.xml
+++ b/astrid/res/values/strings-gcal.xml
@@ -4,42 +4,42 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-  
-  <!-- Error message for adding to calendar  -->
-  <string name="gcal_TEA_error">Error adding task to calendar!</string>
-
-  <!-- Label for adding task to calendar -->
-
-  <!-- slide 21c: Label for adding task to calendar -->
-  <string name="gcal_TEA_addToCalendar_label">Add to Calendar</string>
-  
-  <!-- Label when calendar event already exists -->
-  <string name="gcal_TEA_showCalendar_label">Open Calendar Event</string>
-  
-  <!-- Toast when unable to open calendar event -->
-  
-  <!-- Toast when calendar event updated because task changed -->
-  <string name="gcal_TEA_calendar_updated">Calendar event also updated!</string>
-  
-  <!-- No calendar label (don't add option) -->
-  <string name="gcal_TEA_nocal">Don\'t add</string>
-  
-  <string name="gcal_TEA_none_selected">To calendar?</string>
-  
-  <string name="gcal_TEA_has_event">Cal event</string>
-  
-  <!-- ======================================================== Calendars == -->
-  
-  <!-- Calendar event name when task is completed (%s => task title) -->
-  <string name="gcal_completed_title">%s (completed)</string>
-
-  <!-- System Default Calendar (displayed if we can't figure out calendars)  -->
-  <string name="gcal_GCP_default">Default Calendar</string>
+    <!-- =============================================== Task Edit Controls == -->
+
+    <!-- Error message for adding to calendar  -->
+    <string name="gcal_TEA_error">Error adding task to calendar!</string>
+
+    <!-- Label for adding task to calendar -->
+
+    <!-- slide 21c: Label for adding task to calendar -->
+    <string name="gcal_TEA_addToCalendar_label">Add to Calendar</string>
+
+    <!-- Label when calendar event already exists -->
+    <string name="gcal_TEA_showCalendar_label">Open Calendar Event</string>
+
+    <!-- Toast when unable to open calendar event -->
+
+    <!-- Toast when calendar event updated because task changed -->
+    <string name="gcal_TEA_calendar_updated">Calendar event also updated!</string>
+
+    <!-- No calendar label (don't add option) -->
+    <string name="gcal_TEA_nocal">Don\'t add</string>
+
+    <string name="gcal_TEA_none_selected">To calendar?</string>
+
+    <string name="gcal_TEA_has_event">Cal event</string>
+
+    <!-- ======================================================== Calendars == -->
+
+    <!-- Calendar event name when task is completed (%s => task title) -->
+    <string name="gcal_completed_title">%s (completed)</string>
+
+    <!-- System Default Calendar (displayed if we can't figure out calendars)  -->
+    <string name="gcal_GCP_default">Default Calendar</string>
 
 
 </resources>
diff --git a/astrid/res/values/strings-gtasks.xml b/astrid/res/values/strings-gtasks.xml
index 43c5b85f4..aa1930255 100644
--- a/astrid/res/values/strings-gtasks.xml
+++ b/astrid/res/values/strings-gtasks.xml
@@ -4,109 +4,129 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 
     <!-- ============================================================= UI == -->
 
     <!-- filters header: GTasks -->
     <string name="gtasks_FEx_header">Google Tasks</string>
-    
+
     <!-- filter category for GTasks lists -->
-    
+
     <!-- filter title for GTasks lists (%s => list name) -->
     <string name="gtasks_FEx_title">Google Tasks: %s</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_creating_list">Creating list...</string>
-    
+
     <!-- dialog prompt for creating a new gtasks list -->
     <string name="gtasks_FEx_create_list_dialog">New List Name:</string>
-    
+
     <!-- error to show when list creation fails -->
     <string name="gtasks_FEx_create_list_error">Error creating new list</string>
-    
+
     <!-- short help title for Gtasks -->
-    
+
     <string name="CFC_gtasks_list_text">In List: ?</string>
 
     <string name="CFC_gtasks_list_name">In GTasks List...</string>
-    
+
     <!-- Message while clearing completed tasks -->
     <string name="gtasks_GTA_clearing">Clearing completed tasks...</string>
-    
+
     <!-- Label for clear completed menu item -->
     <string name="gtasks_GTA_clear_completed">Clear Completed</string>
-        
+
     <!-- ============================================ GtasksLoginActivity == -->
-    
-    <!-- Activity Title: Gtasks Login -->    
 
-    <!-- Instructions: Gtasks login -->    
-    <string name="gtasks_GLA_body">Please log in to Google Tasks Sync (Beta!). Non-migrated Google Apps
-    accounts are currently unsupported.</string>
-    
+    <!-- Activity Title: Gtasks Login -->
+
+    <!-- Instructions: Gtasks login -->
+    <string name="gtasks_GLA_body">Please log in to Google Tasks Sync (Beta!). Non-migrated Google
+        Apps
+        accounts are currently unsupported.
+    </string>
+
     <string name="gtasks_GLA_noaccounts">No available Google accounts to sync with.</string>
 
-    <!-- Instructions: Gtasks further help -->    
+    <!-- Instructions: Gtasks further help -->
     <string name="gtasks_GLA_further_help">To view your tasks with indentation
-    and order preserved, go to the Filters page and select a Google Tasks list.
-    By default, Astrid uses its own sort settings for tasks.</string>
+        and order preserved, go to the Filters page and select a Google Tasks list.
+        By default, Astrid uses its own sort settings for tasks.
+    </string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
 
-    <!-- E-mail Address Label -->    
+    <!-- E-mail Address Label -->
+
+    <!-- Password Label -->
 
-    <!-- Password Label -->    
-    
     <!--  Authenticating toast -->
     <string name="gtasks_GLA_authenticating">Authenticating...</string>
-    
+
     <!-- Google Apps for Domain checkbox -->
 
-    <!-- Error Message when fields aren't filled out -->    
+    <!-- Error Message when fields aren't filled out -->
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
+    <string name="gtasks_GLA_errorAuth">Error authenticating! Please check your username and
+        password in your phone\'s account manager
+    </string>
 
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
-    <string name="gtasks_GLA_errorAuth">Error authenticating! Please check your username and password in your phone\'s account manager</string>
+    <!-- Error Message when we receive an IO Exception -->
+    <string name="gtasks_GLA_errorIOAuth">Sorry, we had trouble communicating with Google servers.
+        Please try again later.
+    </string>
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->
+    <string name="gtasks_GLA_errorAuth_captcha">You may have encountered a captcha.
+        Try logging in from the browser, then come back to try again:
+    </string>
 
-    <!-- Error Message when we receive an IO Exception -->    
-    <string name="gtasks_GLA_errorIOAuth">Sorry, we had trouble communicating with Google servers. Please try again later.</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized multiple times -->    
-    <string name="gtasks_GLA_errorAuth_captcha">You may have encountered a captcha. 
-    Try logging in from the browser, then come back to try again:</string>
-    
     <!-- ============================================== GtasksPreferences == -->
 
-    <!-- GTasks Preferences Title -->    
+    <!-- GTasks Preferences Title -->
     <string name="gtasks_GPr_header">Google Tasks</string>
-    
-    <!-- ================================================ Synchronization == -->    
-    
+
+    <!-- ================================================ Synchronization == -->
+
     <!-- title for notification tray when synchronizing -->
 
     <!-- Error Message when we receive a HTTP 503 error -->
-    <string name="gtasks_error_backend">Google\'s Task API is in beta and has encountered an error. The service may be down, please try again later.</string>
-    
+    <string name="gtasks_error_backend">Google\'s Task API is in beta and has encountered an error.
+        The service may be down, please try again later.
+    </string>
+
     <!-- Error for account not found -->
-    <string name="gtasks_error_accountNotFound">Account %s not found--please log out and log back in from the Google Tasks settings.</string>
-    
+    <string name="gtasks_error_accountNotFound">Account %s not found--please log out and log back in
+        from the Google Tasks settings.
+    </string>
+
     <!-- Error when ping after refreshing token fails -->
-    <string name="gtasks_error_authRefresh">Unable to authenticate with Google Tasks. Please check your account password or try again later.</string>
-    
+    <string name="gtasks_error_authRefresh">Unable to authenticate with Google Tasks. Please check
+        your account password or try again later.
+    </string>
+
     <!-- Error when account manager returns no auth token or throws exception -->
-    <string name="gtasks_error_accountManager">Error in your phone\'s account manager. Please log out and log back in from the Google Tasks settings.</string>
+    <string name="gtasks_error_accountManager">Error in your phone\'s account manager. Please log
+        out and log back in from the Google Tasks settings.
+    </string>
 
     <!-- Error when authorization error happens in background sync -->
-    <string name="gtasks_error_background_sync_auth">Error authenticating in background. Please try initiating a sync while Astrid is running.</string>
-      
+    <string name="gtasks_error_background_sync_auth">Error authenticating in background. Please try
+        initiating a sync while Astrid is running.
+    </string>
+
     <string name="gtasks_import_progress">Importing Google Tasks...</string>
 
-    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you still want to add the task %2$s to it?</string>
+    <string name="gtasks_import_add_to_shared_list">The list %1$s is shared with others! Do you
+        still want to add the task %2$s to it?
+    </string>
 
     <string name="gtasks_import_dlg_title">Google Tasks Import</string>
 
     <string name="gtasks_import_add_task_ok">Add task</string>
 
     <string name="gtasks_import_add_task_cancel">Don\'t add task</string>
-        
+
 </resources>
diff --git a/astrid/res/values/strings-intro.xml b/astrid/res/values/strings-intro.xml
index 4d560e8b8..f4c800c81 100644
--- a/astrid/res/values/strings-intro.xml
+++ b/astrid/res/values/strings-intro.xml
@@ -4,54 +4,56 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- NEW USER EXPERIENCE -->
-  
-  <!-- help bubbles -->
-  <!-- slide 8c: Shown the first time a user sees the task list activity -->
-  <string name="help_popover_add_task">Start by adding a task or two</string>
-
-  <!-- Shown the first time a user adds a task to a list -->  
-  <string name="help_popover_tap_task">Tap task to edit and share</string>
-  
-  <!-- slide 14a: Shown the first time a user sees the list activity -->
-  <string name="help_popover_list_settings">Tap to edit or share this list</string>
-  
-  <!-- slide 26c: Shown the first time a user sees the list settings tab -->
-  <string name="help_popover_collaborators">People you share with can help\nyou build your list or finish tasks</string>
-  
-  <!-- Shown after user adds a task on tablet-->
-  <string name="help_popover_add_lists">Tap to add a list</string>
-  
-  <!-- Shown after a user adds a task on phones -->
-  <string name="help_popover_switch_lists">Tap to add a list or switch between lists</string>
-  
-  
-  
-  <!-- Login activity -->
-  
-  
-  <!-- slide 7b -->
-  <string name="welcome_login_tos_base">By using Astrid you agree to the</string>
-  
-  <string name="welcome_login_tos_link">Terms of Service</string>
-  
-  <!-- slide 7e -->
-  <string name="welcome_login_pw">Sign up</string>
-  
-  <string name="welcome_sign_in">Log in</string>
-
-  <!-- slide 7f -->
-  <string name="welcome_login_later">Later</string>
-  
-  <string name="welcome_login_confirm_later_title">Why not sign in?</string>
-  
-  <string name="welcome_login_confirm_later_ok">I\'ll do it!</string>
-  
-  <string name="welcome_login_confirm_later_cancel">No thanks</string>
-  
-  <string name="welcome_login_confirm_later_dialog">Sign in to get the most out of Astrid! 
-  For free, you get online backup, full synchronization with Astrid.com, the 
-  ability to add tasks via email, and you can even share task lists with friends!</string>
+<resources>
+
+    <!-- NEW USER EXPERIENCE -->
+
+    <!-- help bubbles -->
+    <!-- slide 8c: Shown the first time a user sees the task list activity -->
+    <string name="help_popover_add_task">Start by adding a task or two</string>
+
+    <!-- Shown the first time a user adds a task to a list -->
+    <string name="help_popover_tap_task">Tap task to edit and share</string>
+
+    <!-- slide 14a: Shown the first time a user sees the list activity -->
+    <string name="help_popover_list_settings">Tap to edit or share this list</string>
+
+    <!-- slide 26c: Shown the first time a user sees the list settings tab -->
+    <string name="help_popover_collaborators">People you share with can help\nyou build your list or
+        finish tasks
+    </string>
+
+    <!-- Shown after user adds a task on tablet-->
+    <string name="help_popover_add_lists">Tap to add a list</string>
+
+    <!-- Shown after a user adds a task on phones -->
+    <string name="help_popover_switch_lists">Tap to add a list or switch between lists</string>
+
+
+    <!-- Login activity -->
+
+
+    <!-- slide 7b -->
+    <string name="welcome_login_tos_base">By using Astrid you agree to the</string>
+
+    <string name="welcome_login_tos_link">Terms of Service</string>
+
+    <!-- slide 7e -->
+    <string name="welcome_login_pw">Sign up</string>
+
+    <string name="welcome_sign_in">Log in</string>
+
+    <!-- slide 7f -->
+    <string name="welcome_login_later">Later</string>
+
+    <string name="welcome_login_confirm_later_title">Why not sign in?</string>
+
+    <string name="welcome_login_confirm_later_ok">I\'ll do it!</string>
+
+    <string name="welcome_login_confirm_later_cancel">No thanks</string>
+
+    <string name="welcome_login_confirm_later_dialog">Sign in to get the most out of Astrid!
+        For free, you get online backup, full synchronization with Astrid.com, the
+        ability to add tasks via email, and you can even share task lists with friends!
+    </string>
 </resources>
diff --git a/astrid/res/values/strings-locale.xml b/astrid/res/values/strings-locale.xml
index 65fe83b10..d6744547d 100644
--- a/astrid/res/values/strings-locale.xml
+++ b/astrid/res/values/strings-locale.xml
@@ -4,36 +4,37 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- Resources for built-in locale plug-in -->
-
-  <!-- Locale Alert Editing Window Title -->
-  <string name="locale_edit_alerts_title">Astrid Filter Alert</string>
-  
-  <!-- Locale Window Help -->                                                                                                                                            
-  <string name="locale_edit_intro">Astrid will send you a reminder                                                                                                                                             
-      when you have any tasks in the following filter:</string>
-      
-  <!-- Locale Window Filter Picker UI -->                                                                                                                                        
-      
-  <!-- Locale Window Interval Label -->                                                                                                                                        
-  <string name="locale_interval_label">Limit notifications to:</string>        
-      
-  <!-- Locale Window Interval Values -->                                                                                                                                        
-  <string-array name="locale_interval">
-    <item>once an hour</item>
-    <item>once every six hours</item>
-    <item>once every twelve hours</item>
-    <item>once a day</item>
-    <item>once every three days</item>
-    <item>once a week</item>
-  </string-array>        
-      
-  <!-- Locale Notification text -->                                                                                                                                        
-  <string name="locale_notification">You have $NUM matching: $FILTER</string>     
-      
-  <!-- Locale Plugin was not found, it is required -->
-  <string name="locale_plugin_required">Please install the Astrid Locale plugin!</string>        
-     
+<resources>
+
+    <!-- Resources for built-in locale plug-in -->
+
+    <!-- Locale Alert Editing Window Title -->
+    <string name="locale_edit_alerts_title">Astrid Filter Alert</string>
+
+    <!-- Locale Window Help -->
+    <string name="locale_edit_intro">Astrid will send you a reminder
+        when you have any tasks in the following filter:
+    </string>
+
+    <!-- Locale Window Filter Picker UI -->
+
+    <!-- Locale Window Interval Label -->
+    <string name="locale_interval_label">Limit notifications to:</string>
+
+    <!-- Locale Window Interval Values -->
+    <string-array name="locale_interval">
+        <item>once an hour</item>
+        <item>once every six hours</item>
+        <item>once every twelve hours</item>
+        <item>once a day</item>
+        <item>once every three days</item>
+        <item>once a week</item>
+    </string-array>
+
+    <!-- Locale Notification text -->
+    <string name="locale_notification">You have $NUM matching: $FILTER</string>
+
+    <!-- Locale Plugin was not found, it is required -->
+    <string name="locale_plugin_required">Please install the Astrid Locale plugin!</string>
+
 </resources>
diff --git a/astrid/res/values/strings-opencrx.xml b/astrid/res/values/strings-opencrx.xml
index 66f6719cb..77fc86cc1 100644
--- a/astrid/res/values/strings-opencrx.xml
+++ b/astrid/res/values/strings-opencrx.xml
@@ -4,48 +4,50 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 
     <!-- ====================== Plugin Boilerplate ========================= -->
 
-	<!-- filters header: OpenCRX -->
+    <!-- filters header: OpenCRX -->
     <string name="opencrx_FEx_header">OpenCRX</string>
-    
+
     <!-- filter category for OpenCRX ActivityCreators -->
     <string name="opencrx_FEx_dashboard">Workspaces</string>
-    
+
     <!-- filter category for OpenCRX responsible person -->
     <string name="opencrx_FEx_responsible">Assigned To</string>
-    
+
     <!--  OpenCRX assignedTo filter title (%s => assigned contact) -->
     <string name="opencrx_FEx_responsible_title">Assigned To \'%s\'</string>
-    
+
     <!-- detail for showing tasks created by someone else (%s => person name) -->
     <string name="opencrx_PDE_task_from">from %s</string>
-    
+
     <!-- replacement string for task edit "Notes" when using OpenCRX -->
     <string name="opencrx_TEA_notes">Add a Comment</string>
-    
+
     <string name="opencrx_creator_input_hint">Creator</string>
 
     <string name="opencrx_contact_input_hint">Assigned to</string>
     <!-- ==================================================== Preferences == -->
 
-    <!-- Preferences Title: OpenCRX -->    
+    <!-- Preferences Title: OpenCRX -->
     <string name="opencrx_PPr_header">OpenCRX</string>
 
     <!-- creator title for tasks that are not synchronized -->
     <string name="opencrx_no_creator">(Do Not Synchronize)</string>
 
-	<!-- preference title for default creator -->
+    <!-- preference title for default creator -->
     <string name="opencrx_PPr_defaultcreator_title">Default ActivityCreator</string>
 
     <!-- preference description for default creator (%s -> setting) -->
     <string name="opencrx_PPr_defaultcreator_summary">New activities will be created by: %s</string>
 
     <!-- preference description for default dashboard (when set to 'not synchronized') -->
-    <string name="opencrx_PPr_defaultcreator_summary_none">New activities will not be synchronized by default</string>
-    
+    <string name="opencrx_PPr_defaultcreator_summary_none">New activities will not be synchronized
+        by default
+    </string>
+
     <!--  OpenCRX host and segment group name -->
     <string name="opencrx_group">OpenCRX server</string>
 
@@ -54,81 +56,87 @@
 
     <!--  dialog title for OpenCRX host -->
     <string name="opencrx_host_dialog_title">OpenCRX host</string>
-    
+
     <!--  example for OpenCRX host -->
-    <string name="opencrx_host_summary">For example: <i>mydomain.com</i></string>
-    
+    <string name="opencrx_host_summary">For example:
+        <i>mydomain.com</i>
+    </string>
+
     <!--  preference description for OpenCRX segment -->
     <string name="opencrx_segment_title">Segment</string>
 
     <!--  dialog title for OpenCRX segment -->
     <string name="opencrx_segment_dialog_title">Synchronized segment</string>
-    
+
     <!--  example for OpenCRX segment -->
-    <string name="opencrx_segment_summary">For example: <i>Standard</i></string>
-    
+    <string name="opencrx_segment_summary">For example:
+        <i>Standard</i>
+    </string>
+
     <!--  default value for OpenCRX segment -->
     <string name="opencrx_segment_default">Standard</string>
-    
+
     <!--  preference description for OpenCRX provider -->
     <string name="opencrx_provider_title">Provider</string>
 
     <!--  dialog title for OpenCRX provider -->
     <string name="opencrx_provider_dialog_title">OpenCRX data provider</string>
-    
+
     <!--  example for OpenCRX provider -->
-    <string name="opencrx_provider_summary">For example: <i>CRX</i></string>
-    
+    <string name="opencrx_provider_summary">For example:
+        <i>CRX</i>
+    </string>
+
     <!--  default value for OpenCRX provider -->
     <string name="opencrx_provider_default">CRX</string>
     <!-- ================================================= Login Activity == -->
 
-    <!-- Activity Title: Opencrx Login -->    
+    <!-- Activity Title: Opencrx Login -->
     <string name="opencrx_PLA_title">Log In to OpenCRX</string>
 
-    <!-- Instructions: Opencrx login -->    
+    <!-- Instructions: Opencrx login -->
     <string name="opencrx_PLA_body">Sign in with your OpenCRX account</string>
 
-    <!-- Sign In Button -->    
+    <!-- Sign In Button -->
     <string name="opencrx_PLA_signIn">Sign In</string>
 
-    <!-- Login Label -->    
+    <!-- Login Label -->
     <string name="opencrx_PLA_login">Login</string>
 
-    <!-- Password Label -->    
+    <!-- Password Label -->
     <string name="opencrx_PLA_password">Password</string>
-    
-        <!-- Error Message when fields aren't filled out -->    
+
+    <!-- Error Message when fields aren't filled out -->
     <string name="opencrx_PLA_errorEmpty">Error: fillout all fields</string>
-    
-    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->
     <string name="opencrx_PLA_errorAuth">Error: login or password incorrect!</string>
 
     <!-- ================================================ Synchronization == -->
-        
+
     <!-- title for notification tray after synchronizing -->
     <string name="opencrx_notification_title">OpenCRX</string>
-    
+
     <!-- text for notification tray when synchronizing -->
     <string name="opencrx_notification_text">%s tasks updated / click for more details</string>
-    
+
     <!-- Error msg when io exception  -->
     <string name="opencrx_ioerror">Connection Error! Check your Internet connection.</string>
 
     <!-- opencrx Login not specified-->
     <string name="opencrx_MLA_email_empty">Login was not specified!</string>
-    
+
     <!-- opencrx password not specified-->
     <string name="opencrx_MLA_password_empty">Password was not specified!</string>
-    
+
     <!-- ================================================ labels for layout-elements == -->
-    
+
     <!-- label for task-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_task_assign_label">Assign this task to this person:</string>
-    
+
     <!-- Spinner-item for unassigned tasks on taskeditactivity -->
     <string name="opencrx_TEA_task_unassigned">&lt;Unassigned&gt;</string>
-    
+
     <!-- label for dashboard-assignment spinner on taskeditactivity -->
     <string name="opencrx_TEA_creator_assign_label">Assign this task to this creator:</string>
 
@@ -136,7 +144,7 @@
     <string name="opencrx_TEA_dashboard_default">&lt;Default&gt;</string>
 
     <string name="opencrx_TEA_opencrx_title">OpenCRX Controls</string>
-        
+
     <string name="CFC_opencrx_in_workspace_text">In workspace: ?</string>
 
     <string name="CFC_opencrx_in_workspace_name">In workspace...</string>
diff --git a/astrid/res/values/strings-ppack.xml b/astrid/res/values/strings-ppack.xml
index ede747c53..401b2cf9b 100644
--- a/astrid/res/values/strings-ppack.xml
+++ b/astrid/res/values/strings-ppack.xml
@@ -4,19 +4,23 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
+
+    <!-- ================================================== EditPreferences == -->
+
+    <!-- slide 32j: Preference Category: Power Pack -->
+    <string name="EPr_powerpack_header">Advanced settings</string>
+    <string name="EPr_powerpack_summary">Missed call reminders, voice input and miscellaneous
+        settings
+    </string>
+
+    <!-- slide 32e: Preference: Anonymous User Statistics -->
+    <string name="EPr_statistics_title">Anonymous usage stats</string>
+    <!-- Preference: User Statistics (disabled) -->
+    <string name="EPr_statistics_desc_disabled">No usage data will be reported</string>
+    <!-- slide 32f: Preference: User Statistics (enabled) -->
+    <string name="EPr_statistics_desc_enabled">Help us make Astrid better by sending anonymous usage
+        data
+    </string>
 
-  <!-- ================================================== EditPreferences == -->
-    
-  <!-- slide 32j: Preference Category: Power Pack -->
-  <string name="EPr_powerpack_header">Advanced settings</string>
-  <string name="EPr_powerpack_summary">Missed call reminders, voice input and miscellaneous settings</string>
-  
-  <!-- slide 32e: Preference: Anonymous User Statistics -->
-  <string name="EPr_statistics_title">Anonymous usage stats</string>
-  <!-- Preference: User Statistics (disabled) -->
-  <string name="EPr_statistics_desc_disabled">No usage data will be reported</string>  
-  <!-- slide 32f: Preference: User Statistics (enabled) -->
-  <string name="EPr_statistics_desc_enabled">Help us make Astrid better by sending anonymous usage data</string>
-      
 </resources>
diff --git a/astrid/res/values/strings-premium.xml b/astrid/res/values/strings-premium.xml
index f4b8b8a05..d1fdbe4cd 100644
--- a/astrid/res/values/strings-premium.xml
+++ b/astrid/res/values/strings-premium.xml
@@ -4,90 +4,119 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    
-    <string name="speech_err_network">Network error! Speech recognition requires a network connection to work.</string>
-    <string name="speech_err_no_match">Sorry, I couldn\'t understand that! Please try again.</string>
-    <string name="speech_err_default">Sorry, speech recognition encountered an error. Please try again.</string>
-    
+<resources>
+
+    <string name="speech_err_network">Network error! Speech recognition requires a network
+        connection to work.
+    </string>
+    <string name="speech_err_no_match">Sorry, I couldn\'t understand that! Please try again.
+    </string>
+    <string name="speech_err_default">Sorry, speech recognition encountered an error. Please try
+        again.
+    </string>
+
     <string name="premium_attach_file">Attach a file</string>
     <string name="premium_record_audio">Record a note</string>
     <string name="premium_no_files">No files attached</string>
     <string name="premium_remove_file_confirm">Are you sure? Cannot be undone</string>
-    
+
     <string name="audio_recording_title">Recording Audio</string>
     <string name="audio_stop_recording">Stop Recording</string>
     <string name="audio_speak_now">Speak Now!</string>
     <string name="audio_encoding">Encoding...</string>
     <string name="audio_err_encoding">Error encoding audio</string>
-    <string name="audio_err_playback">Sorry, the system does not support this type of audio file</string>
-    
-    <string name="search_market_audio">No player found to handle that audio type. Would you like to download an audio player from the Android Market?</string>
+    <string name="audio_err_playback">Sorry, the system does not support this type of audio file
+    </string>
+
+    <string name="search_market_audio">No player found to handle that audio type. Would you like to
+        download an audio player from the Android Market?
+    </string>
     <string name="search_market_audio_title">No audio player found</string>
 
-    <string name="search_market_pdf">No PDF reader was found. Would you like to download a PDF reader from the Android Market?</string>
+    <string name="search_market_pdf">No PDF reader was found. Would you like to download a PDF
+        reader from the Android Market?
+    </string>
     <string name="search_market_pdf_title">No PDF reader found</string>
 
-    <string name="search_market_ms">No MS Office reader was found. Would you like to download an MS Office reader from the Android Market?</string>
+    <string name="search_market_ms">No MS Office reader was found. Would you like to download an MS
+        Office reader from the Android Market?
+    </string>
     <string name="search_market_ms_title">No MS Office reader found</string>
-    
-    <string name="file_type_unhandled">Sorry! No application was found to handle this file type.</string>
+
+    <string name="file_type_unhandled">Sorry! No application was found to handle this file type.
+    </string>
     <string name="file_type_unhandled_title">No application found</string>
-    
+
     <string name="file_prefix_image">Image</string>
     <string name="file_prefix_voice">Voice</string>
     <string name="file_browser_up">Up</string>
     <string name="file_browser_title">Choose a file</string>
     <string name="dir_browser_title">Choose a directory</string>
-    <string name="file_browser_err_permissions">Permissions error! Please make sure you have not blocked Astrid from accessing the SD card.</string>
+    <string name="file_browser_err_permissions">Permissions error! Please make sure you have not
+        blocked Astrid from accessing the SD card.
+    </string>
     <string name="file_add_picture">Attach a picture</string>
     <string name="file_add_sdcard">Attach a file from your SD card</string>
     <string name="file_download_title">Download file?</string>
-    <string name="file_download_body">This file has not been downloaded to your SD card. Download now?</string>
+    <string name="file_download_body">This file has not been downloaded to your SD card. Download
+        now?
+    </string>
     <string name="file_download_progress">Downloading...</string>
     <string name="file_err_memory">Image is too large to fit in memory</string>
     <string name="file_err_copy">Error copying file for attachment</string>
     <string name="file_err_download">Error downloading file</string>
-    <string name="file_err_no_directory">Whoops! Looks like the files directory doesn\'t exist. Please choose a directory to save files to in the preferences.</string>
+    <string name="file_err_no_directory">Whoops! Looks like the files directory doesn\'t exist.
+        Please choose a directory to save files to in the preferences.
+    </string>
     <string name="file_err_show">Sorry, the system does not yet support this type of file</string>
-    
+
     <string name="file_dir_dialog_ok">Use this directory</string>
     <string name="file_dir_dialog_default">Reset to default</string>
-    
+
     <string name="p_files_dir">Premium downloads directory</string>
     <!-- Description for file download directory preference. %s -> chosen directory -->
     <string name="p_files_dir_desc">Task attachments saved to: %s</string>
     <string name="p_files_dir_desc_default">Default directory</string>
 
-    
+
     <!-- in app billing -->
     <string name="billing_not_supported_title">Can\'t make purchases</string>
     <string name="billing_not_supported_message">The Market billing
-     service is not available at this time.  You can continue to use this app but you
-     won\'t be able to make purchases.</string>
+        service is not available at this time. You can continue to use this app but you
+        won\'t be able to make purchases.
+    </string>
     <string name="subscriptions_not_supported_title">Can\'t purchase subscriptions</string>
     <string name="subscriptions_not_supported_message">The Market billing
-     service on this device does not support subscriptions at this time. You can subscribe to Astrid Premium at http://astrid.com/premium.</string>
+        service on this device does not support subscriptions at this time. You can subscribe to
+        Astrid Premium at http://astrid.com/premium.
+    </string>
     <string name="cannot_connect_title">Can\'t connect to Market</string>
     <string name="cannot_connect_message">This app cannot connect to Market.
-     Your version of Market may be out of date.
-     You can continue to use this app but you
-     won\'t be able to make purchases.</string>
-    
+        Your version of Market may be out of date.
+        You can continue to use this app but you
+        won\'t be able to make purchases.
+    </string>
+
     <string name="restoring_transactions">Restoring transactions</string>
-    
+
     <string name="subscriptions_learn_more">Learn more</string>
-    
-    <string name="kii_premium_success">Thanks for participating in this offer! Your free month of Astrid Premium is now unlocked.</string>
+
+    <string name="kii_premium_success">Thanks for participating in this offer! Your free month of
+        Astrid Premium is now unlocked.
+    </string>
     <string name="kii_premium_abort">Special offer aborted</string>
     <string name="kii_premium_declined">Special offer declined</string>
-    <string name="kii_premium_error">There was an error processing this offer. Please try again later.</string>
-    
+    <string name="kii_premium_error">There was an error processing this offer. Please try again
+        later.
+    </string>
+
     <string name="premium_offers_title">Special Offer</string>
     <string name="premium_offers_subtitle">Want one month of Astrid Premium for free?</string>
-    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a short video by this sponsor. (They will also require your email address.)</string>
+    <string name="premium_offers_detail">To get one free month of Astrid Premium, you can watch a
+        short video by this sponsor. (They will also require your email address.)
+    </string>
     <string name="premium_offers_start">Get it free!</string>
-    
+
     <string name="premium_billing_title">Astrid Premium</string>
     <string name="premium_buy_month">1 Month</string>
     <string name="premium_buy_year">1 Year</string>
@@ -101,11 +130,21 @@
     <string name="premium_speech_bubble_1">Premium will power up your productivity!</string>
     <string name="premium_speech_bubble_2">Order one year and save 25%!</string>
     <string name="premium_already_subscribed">You are already subscribed to Astrid Premium!</string>
-    <string name="premium_login_prompt">You need to have an Astrid.com account in order to subscribe to premium. Please log in or sign up.</string>
+    <string name="premium_login_prompt">You need to have an Astrid.com account in order to subscribe
+        to premium. Please log in or sign up.
+    </string>
     <string name="premium_success">Thanks for subscribing to Astrid Premium!</string>
-    <string name="premium_success_with_server_error">Thanks for subscribing to Astrid Premium! The new features will be unlocked for you on astrid.com soon, and should be available on your phone right away.</string>
-    <string name="premium_verification_error">The premium subscription for this Google Play account is connected to a different user. To link additional emails to your account, visit astrid.com/users/profile</string>
-    <string name="premium_check_for_purchases">Already purchased premium? Click here to check Google Play for purchase history.</string>
+    <string name="premium_success_with_server_error">Thanks for subscribing to Astrid Premium! The
+        new features will be unlocked for you on astrid.com soon, and should be available on your
+        phone right away.
+    </string>
+    <string name="premium_verification_error">The premium subscription for this Google Play account
+        is connected to a different user. To link additional emails to your account, visit
+        astrid.com/users/profile
+    </string>
+    <string name="premium_check_for_purchases">Already purchased premium? Click here to check Google
+        Play for purchase history.
+    </string>
     <string name="premium_checking_for_purchases">Checking for purchases...</string>
-    
+
 </resources>
diff --git a/astrid/res/values/strings-reminders.xml b/astrid/res/values/strings-reminders.xml
index 3658a19da..aaf3edd14 100644
--- a/astrid/res/values/strings-reminders.xml
+++ b/astrid/res/values/strings-reminders.xml
@@ -4,402 +4,426 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- 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>
-
-  <!-- Task Edit: Reminder alarm clock label -->  
-  <string name="TEA_reminder_alarm_label">Ring/vibrate type</string>
-
-  <!--  slide 45a: Task Edit: Reminder mode: ring once -->  
-  <string name="TEA_reminder_mode_once">Once</string>
-
-  <!-- slide 45b: Task Edit: Reminder mode: ring five times -->  
-  <string name="TEA_reminder_mode_five">Five times</string>
-
-  <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->  
-  <string name="TEA_reminder_mode_nonstop">Until I dismiss alarm</string>
-  
-  <string name="TEA_reminder_when">when</string>
-  
-  <string name="TEA_reminder_due_short">due</string>
-
-  <string name="TEA_reminder_overdue_short">overdue</string>
-
-  <string name="TEA_reminder_randomly_short">randomly</string>
-
-  <string name="TEA_reminder_display_one">Remind me %s</string>
-  
-  <string name="TEA_reminder_display_multiple">Remind %s</string>
-
-  <string-array name="TEA_reminder_random">
-    <!-- random reminder choices for task edit page. -->
-    <item>an hour</item>
-    <item>a day</item>
-    <item>a week</item>
-    <item>in two weeks</item>
-    <item>a month</item>
-    <item>in two months</item>
-  </string-array>
-  
-  <!-- ==================================================== notifications == -->
-  
-  <!-- Name of filter when viewing a reminder -->
-  <string name="rmd_NoA_filter">Reminder!</string>
-  
-  <!-- Reminder: Task was already done -->
-  <string name="rmd_NoA_done">Complete</string>
-  
-  <!-- Reminder: Snooze button (remind again later) -->
-  <string name="rmd_NoA_snooze">Snooze</string>
-  
-  <!-- Reminder: Completed Toast -->
-  <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
-  
-  <!-- Prefix for reminder dialog title -->
-  <string name="rmd_NoA_dlg_title">Reminder:</string>
-  
-  <!-- ==================================================== user reengagement == -->
-
-  <!-- Titles for user reengagement notifications -->
-  <string-array name="rmd_reengage_notif_titles">
-    <item>A note from Astrid</item>
-    <!-- %s -> first name -->
-    <item>Memo for %s.</item> 
-    <item>Your Astrid digest</item>
-    <item>Reminders from Astrid</item>
-  </string-array>
-    
-  <string name="rmd_reengage_name_default">you</string>
-
-  
-  <string name="rmd_reengage_add_tasks">Add a task</string>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs -->
-  <string-array name="rmd_reengage_dialog_options">
-    <item>Time to shorten your to-do list!</item>
-    <item>Dear sir or madam, some tasks await your inspection!</item>
-    <item>Hi there, could you take a look at these?</item>
-    <item>I\'ve got some tasks with your name on them!</item>
-    <item>A fresh batch of tasks for you today!</item>
-    <item>You look fabulous! Ready to get started?</item>
-    <item>A lovely day for getting some work done, I think!</item>
-  </string-array>
-  
-  <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
-  <string-array name="rmd_reengage_dialog_empty_options">
-    <item>Don\'t you want to get organized?</item>
-    <item>I\'m Astrid! I\'m here to help you do more!</item>
-    <item>You look busy! Let me take some of those tasks off of your plate.</item>
-    <item>I can help you keep track of all of the details in your life.</item>
-    <item>You\'re serious about getting more done? So am I!</item>
-    <item>Pleasure to make your acquaintance!</item>
-  </string-array>
-  <!-- ============================================= reminder preferences == -->
-  
-  <!-- slide 33d: Reminder Preference Screen Title -->
-  <string name="rmd_EPr_alerts_header">Reminder settings</string>
-  <string name="rmd_EPr_alerts_summary">Quiet hours, snooze options, persistence level</string>
-    
-  <!-- Reminder Preference: Reminders Enabled Title -->
-  <string name="rmd_EPr_enabled_title">Reminders enabled?</string>
-  <!-- Reminder Preference Reminders Enabled Description (true) -->
-  <string name="rmd_EPr_enabled_desc_true">Reminders are enabled (this is normal)</string>
-  <!-- Reminder Preference Reminders Enabled Description (false) -->
-  <string name="rmd_EPr_enabled_desc_false">Reminders will never appear on your phone</string>  
-    
-  <!-- Reminder Preference: Quiet Hours Start Title -->
-  <string name="rmd_EPr_quiet_hours_start_title">Quiet hours start</string>
-  <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_start_desc">Notifications will be silent after %s.\nNote: vibrations are controlled by the "Vibrate on alert" setting</string>
-  <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
-  <string name="rmd_EPr_quiet_hours_desc_none">Quiet hours is disabled</string>
-  
-  <!-- Reminder Preference: Quiet Hours End Title -->
-  <string name="rmd_EPr_quiet_hours_end_title">Quiet hours end</string>
-  <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
-  <string name="rmd_EPr_quiet_hours_end_desc">Notifications will stop being silent starting at %s</string>
-
-  <!-- Reminder Preference: Default Reminder Title -->
-  <string name="rmd_EPr_rmd_time_title">Default reminder</string>
-  <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
-  <string name="rmd_EPr_rmd_time_desc">Notifications for tasks without due times will appear at %s</string>
-
-  <!-- Reminder Preference: Notification Ringtone Title -->
-  <string name="rmd_EPr_ringtone_title">Notification ringtone</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
-  <string name="rmd_EPr_ringtone_desc_custom">Custom ringtone has been set</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
-  <string name="rmd_EPr_ringtone_desc_silent">Ringtone set to silent</string>
-  <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
-  <string name="rmd_EPr_ringtone_desc_default">Default ringtone will be used</string>
-  
-  <!-- Reminder Preference: Notification Persistence Title -->
-  <string name="rmd_EPr_persistent_title">Notification persistence</string>
-  <!-- Reminder Preference: Notification Persistence Description (true) -->
-  <string name="rmd_EPr_persistent_desc_true">Notifications must be viewed individually to be cleared</string>
-  <!-- Reminder Preference: Notification Persistence Description (false) -->
-  <string name="rmd_EPr_persistent_desc_false">Notifications can be cleared with \"Clear All\" button</string>
-
-  <!-- Reminder Preference: Social Reminders Title -->
-  <string name="rmd_EPr_social_title">Social encouragement</string>
-  <!-- Reminder Preference: Social Reminders Summary (enabled) -->
-  <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for shared tasks</string>
-  <!-- Reminder Preference: Social Reminders Summary (disabled) -->
-  <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you for shared tasks</string>
-  
-  
-  
-  <!-- Reminder Preference: Notification Icon Title -->
-  <!-- Reminder Preference: Notification Icon Description -->
-
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
-  <string name="rmd_EPr_multiple_maxvolume_title">Max volume for multiple-ring reminders</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid will max out the volume for multiple-ring reminders</string>
-  <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
-  <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid will use the system setting for the volume</string>
-
-  <!-- Reminder Preference: Vibrate Title -->
-  <string name="rmd_EPr_vibrate_title">Vibrate on alert</string>
-  <!-- Reminder Preference: Vibrate Description (true) -->
-  <string name="rmd_EPr_vibrate_desc_true">Astrid will vibrate when sending notifications</string>
-  <!-- Reminder Preference: Vibrate Description (false) -->
-  <string name="rmd_EPr_vibrate_desc_false">Astrid will not vibrate when sending notifications</string>
-
-  <!-- Reminder Preference: Nagging Title -->  
-  <string name="rmd_EPr_nagging_title">Astrid encouragements</string>
-  <!-- Reminder Preference: Nagging Description (true) -->
-  <string name="rmd_EPr_nagging_desc_true">Astrid will show up to give you an encouragement during reminders</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_nagging_desc_false">Astrid will not give you any encouragement messages</string>
-
-  <!-- Reminder Preference: Snooze Dialog Title -->  
-  <string name="rmd_EPr_snooze_dialog_title">Snooze dialog HH:MM</string>
-  <!-- Reminder Preference: Snooze Dialog Description (true) -->
-  <string name="rmd_EPr_snooze_dialog_desc_true">Snooze by selecting new snooze time (HH:MM)</string>
-  <!-- Reminder Preference: Nagging Description (false) -->
-  <string name="rmd_EPr_snooze_dialog_desc_false">Snooze by selecting # days/hours to snooze</string>
-  
-  <!-- slide 44g: Reminder Preference: Default Reminders Title -->
-  <string name="rmd_EPr_defaultRemind_title">Random reminders</string>
-  <!-- Reminder Preference: Default Reminders Setting (disabled) -->
-  <string name="rmd_EPr_defaultRemind_desc_disabled">New tasks will have no random reminders</string>
-  <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
-  <string name="rmd_EPr_defaultRemind_desc">New tasks will remind randomly: %s</string>
-  
-  <!-- slide 39a: Defaults Title -->
-  
-  <string-array name="EPr_reminder_random">
-    <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
-    <item>disabled</item>
-    <!-- slide 44b -->
-    <item>hourly</item>
-    <!-- slide 44c -->
-    <item>daily</item>
-    <!-- slide 44d-->
-    <item>weekly</item>
-    <!-- slide 44e-->
-    <item>bi-weekly</item>
-    <!-- slide 44f -->
-    <item>monthly</item>
-    <item>bi-monthly</item>
-  </string-array>
-        
-  <string-array name="EPr_quiet_hours_start">
-    <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don't change the times!. -->
-    <item>disabled</item>
-    <item>8 PM</item>
-    <item>9 PM</item>
-    <item>10 PM</item>
-    <item>11 PM</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
-    <item>9 AM</item>
-    <item>10 AM</item>
-    <item>11 AM</item>
-    <item>12 PM</item>
-    <item>1 PM</item>
-    <item>2 PM</item>
-    <item>3 PM</item>
-    <item>4 PM</item>
-    <item>5 PM</item>
-    <item>6 PM</item>
-    <item>7 PM</item>
-  </string-array>
-  
-  <string-array name="EPr_quiet_hours_end">
-    <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don't change the times! -->
-    <item>9 AM</item>
-    <item>10 AM</item>
-    <item>11 AM</item>
-    <item>12 PM</item>
-    <item>1 PM</item>
-    <item>2 PM</item>
-    <item>3 PM</item>
-    <item>4 PM</item>
-    <item>5 PM</item>
-    <item>6 PM</item>
-    <item>7 PM</item>
-    <item>8 PM</item>
-    <item>9 PM</item>
-    <item>10 PM</item>
-    <item>11 PM</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
-  </string-array>
-  
-  <string-array name="EPr_rmd_time">
-    <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don't change the times! -->
-    <item>9 AM</item>
-    <item>10 AM</item>
-    <item>11 AM</item>
-    <item>12 PM</item>
-    <item>1 PM</item>
-    <item>2 PM</item>
-    <item>3 PM</item>
-    <item>4 PM</item>
-    <item>5 PM</item>
-    <item>6 PM</item>
-    <item>7 PM</item>
-    <item>8 PM</item>
-    <item>9 PM</item>
-    <item>10 PM</item>
-    <item>11 PM</item>
-    <item>12 AM</item>
-    <item>1 AM</item>
-    <item>2 AM</item>
-    <item>3 AM</item>
-    <item>4 AM</item>
-    <item>5 AM</item>
-    <item>6 AM</item>
-    <item>7 AM</item>
-    <item>8 AM</item>
-  </string-array>
-  
-  <!-- =============================================== random reminders == -->
-
-  <string name="reminders_social">These people are counting on you!</string>
-  
-  <string name="reminders_social_one">%s is counting on you!</string>
-  
-  <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
-
-  <string-array name="reminders">
-      <!-- reminders: Make these < 20 chars so the task name is displayed -->
-      <item>Hi there! Have a sec?</item>
-      <item>Can I see you for a sec?</item>
-      <item>Have a few minutes?</item>
-      <item>Did you forget?</item>
-      <item>Excuse me!</item>
-      <item>When you have a minute:</item>
-      <item>On your agenda:</item>
-      <item>Free for a moment?</item>
-      <item>Astrid here!</item>
-      <item>Hi! Can I bug you?</item>
-      <item>A minute of your time?</item>
-      <item>It\'s a great day to</item>
-  </string-array>
-
-  <string-array name="reminders_due">
-      <!-- reminders related to task due date -->
-      <item>Time to work!</item>
-      <item>Due date is here!</item>
-      <item>Ready to start?</item>
-      <item>You said you would do:</item>
-      <item>You\'re supposed to start:</item>
-      <item>Time to start:</item>
-      <item>It\'s time!</item>
-      <item>Excuse me! Time for</item>
-      <item>You free? Time to</item>
-  </string-array>
-
-  <string-array name="reminders_snooze">
-      <!-- reminders related to snooze -->
-      <item>Don\'t be lazy now!</item>
-      <item>Snooze time is up!</item>
-      <item>No more snoozing!</item>
-      <item>Now are you ready?</item>
-      <item>No more postponing!</item>
-  </string-array>
-  
-  <string-array name="reminder_responses">
-      <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
-      <item>I\'ve got something for you!</item> 
-      <item>Ready to put this in the past?</item>
-      <item>Why don\'t you get this done?</item>
-      <item>How about it? Ready tiger?</item>
-      <item>Ready to do this?</item>
-      <item>Can you handle this?</item>
-      <item>You can be happy! Just finish this!</item>
-      <item>I promise you\'ll feel better if you finish this!</item>
-      <item>Won\'t you do this today?</item>
-      <item>Please finish this, I\'m sick of it!</item>
-      <item>Can you finish this? Yes you can!</item>
-      <item>Are you ever going to do this?</item>
-      <item>Feel good about yourself! Let\'s go!</item>
-      <item>I\'m so proud of you! Lets get it done!</item>
-      <item>A little snack after you finish this?</item>
-      <item>Just this one task? Please?</item>
-      <item>Time to shorten your todo list!</item>
-      <item>Are you on Team Order or Team Chaos? Team Order! Let\'s go!</item>
-      <item>Have I mentioned you are awesome recently? Keep it up!</item>
-      <item>A task a day keeps the clutter away... Goodbye clutter!</item>
-      <item>How do you do it?  Wow, I\'m impressed!</item>
-      <item>You can\'t just get by on your good looks. Let\'s get to it!</item>
-      <item>Lovely weather for a job like this, isn\'t it?</item>
-      <item>A spot of tea while you work on this?</item>
-      <item>If only you had already done this, then you could go outside and play.</item>
-      <item>It\'s time. You can\'t put off the inevitable.</item>
-      <item>I die a little every time you ignore me.</item>
-  </string-array>
-
-  <string-array name="postpone_nags">
-      <!-- Astrid's nagging when user clicks postpone -->
-      <item>Please tell me it isn\'t true that you\'re a procrastinator!</item>
-      <item>Doesn\'t being lazy get old sometimes?</item>
-      <item>Somewhere, someone is depending on you to finish this!</item>
-      <item>When you said postpone, you really meant \'I\'m doing this\', right?</item>
-      <item>This is the last time you postpone this, right?</item>
-      <item>Just finish this today, I won\'t tell anyone!</item>
-      <item>Why postpone when you can um... not postpone!</item>
-      <item>You\'ll finish this eventually, I presume?</item>
-      <item>I think you\'re really great! How about not putting this off?</item>
-      <item>Will you be able to achieve your goals if you do that?</item>
-      <item>Postpone, postpone, postpone. When will you change!</item>
-      <item>I\'ve had enough with your excuses! Just do it already!</item>
-      <item>Didn\'t you make that excuse last time?</item>
-      <item>I can\'t help you organize your life if you do that...</item>
-  </string-array>
+<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>
+
+    <!-- Task Edit: Reminder alarm clock label -->
+    <string name="TEA_reminder_alarm_label">Ring/vibrate type</string>
+
+    <!--  slide 45a: Task Edit: Reminder mode: ring once -->
+    <string name="TEA_reminder_mode_once">Once</string>
+
+    <!-- slide 45b: Task Edit: Reminder mode: ring five times -->
+    <string name="TEA_reminder_mode_five">Five times</string>
+
+    <!-- slide 45c: Task Edit: Reminder mode: ring nonstop -->
+    <string name="TEA_reminder_mode_nonstop">Until I dismiss alarm</string>
+
+    <string name="TEA_reminder_when">when</string>
+
+    <string name="TEA_reminder_due_short">due</string>
+
+    <string name="TEA_reminder_overdue_short">overdue</string>
+
+    <string name="TEA_reminder_randomly_short">randomly</string>
+
+    <string name="TEA_reminder_display_one">Remind me %s</string>
+
+    <string name="TEA_reminder_display_multiple">Remind %s</string>
+
+    <string-array name="TEA_reminder_random">
+        <!-- random reminder choices for task edit page. -->
+        <item>an hour</item>
+        <item>a day</item>
+        <item>a week</item>
+        <item>in two weeks</item>
+        <item>a month</item>
+        <item>in two months</item>
+    </string-array>
+
+    <!-- ==================================================== notifications == -->
+
+    <!-- Name of filter when viewing a reminder -->
+    <string name="rmd_NoA_filter">Reminder!</string>
+
+    <!-- Reminder: Task was already done -->
+    <string name="rmd_NoA_done">Complete</string>
+
+    <!-- Reminder: Snooze button (remind again later) -->
+    <string name="rmd_NoA_snooze">Snooze</string>
+
+    <!-- Reminder: Completed Toast -->
+    <string name="rmd_NoA_completed_toast">Congratulations on finishing!</string>
+
+    <!-- Prefix for reminder dialog title -->
+    <string name="rmd_NoA_dlg_title">Reminder:</string>
+
+    <!-- ==================================================== user reengagement == -->
+
+    <!-- Titles for user reengagement notifications -->
+    <string-array name="rmd_reengage_notif_titles">
+        <item>A note from Astrid</item>
+        <!-- %s -> first name -->
+        <item>Memo for %s.</item>
+        <item>Your Astrid digest</item>
+        <item>Reminders from Astrid</item>
+    </string-array>
+
+    <string name="rmd_reengage_name_default">you</string>
+
+
+    <string name="rmd_reengage_add_tasks">Add a task</string>
+
+    <!-- Speech bubble options for astrid in reengagement notifs -->
+    <string-array name="rmd_reengage_dialog_options">
+        <item>Time to shorten your to-do list!</item>
+        <item>Dear sir or madam, some tasks await your inspection!</item>
+        <item>Hi there, could you take a look at these?</item>
+        <item>I\'ve got some tasks with your name on them!</item>
+        <item>A fresh batch of tasks for you today!</item>
+        <item>You look fabulous! Ready to get started?</item>
+        <item>A lovely day for getting some work done, I think!</item>
+    </string-array>
+
+    <!-- Speech bubble options for astrid in reengagement notifs when no tasks present -->
+    <string-array name="rmd_reengage_dialog_empty_options">
+        <item>Don\'t you want to get organized?</item>
+        <item>I\'m Astrid! I\'m here to help you do more!</item>
+        <item>You look busy! Let me take some of those tasks off of your plate.</item>
+        <item>I can help you keep track of all of the details in your life.</item>
+        <item>You\'re serious about getting more done? So am I!</item>
+        <item>Pleasure to make your acquaintance!</item>
+    </string-array>
+    <!-- ============================================= reminder preferences == -->
+
+    <!-- slide 33d: Reminder Preference Screen Title -->
+    <string name="rmd_EPr_alerts_header">Reminder settings</string>
+    <string name="rmd_EPr_alerts_summary">Quiet hours, snooze options, persistence level</string>
+
+    <!-- Reminder Preference: Reminders Enabled Title -->
+    <string name="rmd_EPr_enabled_title">Reminders enabled?</string>
+    <!-- Reminder Preference Reminders Enabled Description (true) -->
+    <string name="rmd_EPr_enabled_desc_true">Reminders are enabled (this is normal)</string>
+    <!-- Reminder Preference Reminders Enabled Description (false) -->
+    <string name="rmd_EPr_enabled_desc_false">Reminders will never appear on your phone</string>
+
+    <!-- Reminder Preference: Quiet Hours Start Title -->
+    <string name="rmd_EPr_quiet_hours_start_title">Quiet hours start</string>
+    <!-- Reminder Preference: Quiet Hours Start Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_start_desc">Notifications will be silent after %s.\nNote:
+        vibrations are controlled by the "Vibrate on alert" setting
+    </string>
+    <!-- Reminder Preference: Quiet Hours Start/End Description (disabled) -->
+    <string name="rmd_EPr_quiet_hours_desc_none">Quiet hours is disabled</string>
+
+    <!-- Reminder Preference: Quiet Hours End Title -->
+    <string name="rmd_EPr_quiet_hours_end_title">Quiet hours end</string>
+    <!-- Reminder Preference: Quiet Hours End Description (%s => time set) -->
+    <string name="rmd_EPr_quiet_hours_end_desc">Notifications will stop being silent starting at
+        %s
+    </string>
+
+    <!-- Reminder Preference: Default Reminder Title -->
+    <string name="rmd_EPr_rmd_time_title">Default reminder</string>
+    <!-- Reminder Preference: Default Reminder Description (%s => time set) -->
+    <string name="rmd_EPr_rmd_time_desc">Notifications for tasks without due times will appear at
+        %s
+    </string>
+
+    <!-- Reminder Preference: Notification Ringtone Title -->
+    <string name="rmd_EPr_ringtone_title">Notification ringtone</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is set) -->
+    <string name="rmd_EPr_ringtone_desc_custom">Custom ringtone has been set</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when silence is set) -->
+    <string name="rmd_EPr_ringtone_desc_silent">Ringtone set to silent</string>
+    <!-- Reminder Preference: Notification Ringtone Description (when custom tone is not set) -->
+    <string name="rmd_EPr_ringtone_desc_default">Default ringtone will be used</string>
+
+    <!-- Reminder Preference: Notification Persistence Title -->
+    <string name="rmd_EPr_persistent_title">Notification persistence</string>
+    <!-- Reminder Preference: Notification Persistence Description (true) -->
+    <string name="rmd_EPr_persistent_desc_true">Notifications must be viewed individually to be
+        cleared
+    </string>
+    <!-- Reminder Preference: Notification Persistence Description (false) -->
+    <string name="rmd_EPr_persistent_desc_false">Notifications can be cleared with \"Clear All\"
+        button
+    </string>
+
+    <!-- Reminder Preference: Social Reminders Title -->
+    <string name="rmd_EPr_social_title">Social encouragement</string>
+    <!-- Reminder Preference: Social Reminders Summary (enabled) -->
+    <string name="rmd_EPr_social_summary_enabled">Reminders will show who is counting on you for
+        shared tasks
+    </string>
+    <!-- Reminder Preference: Social Reminders Summary (disabled) -->
+    <string name="rmd_EPr_social_summary_disabled">Reminders will not show who is counting on you
+        for shared tasks
+    </string>
+
+
+    <!-- Reminder Preference: Notification Icon Title -->
+    <!-- Reminder Preference: Notification Icon Description -->
+
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Title -->
+    <string name="rmd_EPr_multiple_maxvolume_title">Max volume for multiple-ring reminders</string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (true) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_true">Astrid will max out the volume for
+        multiple-ring reminders
+    </string>
+    <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
+    <string name="rmd_EPr_multiple_maxvolume_desc_false">Astrid will use the system setting for the
+        volume
+    </string>
+
+    <!-- Reminder Preference: Vibrate Title -->
+    <string name="rmd_EPr_vibrate_title">Vibrate on alert</string>
+    <!-- Reminder Preference: Vibrate Description (true) -->
+    <string name="rmd_EPr_vibrate_desc_true">Astrid will vibrate when sending notifications</string>
+    <!-- Reminder Preference: Vibrate Description (false) -->
+    <string name="rmd_EPr_vibrate_desc_false">Astrid will not vibrate when sending notifications
+    </string>
+
+    <!-- Reminder Preference: Nagging Title -->
+    <string name="rmd_EPr_nagging_title">Astrid encouragements</string>
+    <!-- Reminder Preference: Nagging Description (true) -->
+    <string name="rmd_EPr_nagging_desc_true">Astrid will show up to give you an encouragement during
+        reminders
+    </string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_nagging_desc_false">Astrid will not give you any encouragement messages
+    </string>
+
+    <!-- Reminder Preference: Snooze Dialog Title -->
+    <string name="rmd_EPr_snooze_dialog_title">Snooze dialog HH:MM</string>
+    <!-- Reminder Preference: Snooze Dialog Description (true) -->
+    <string name="rmd_EPr_snooze_dialog_desc_true">Snooze by selecting new snooze time (HH:MM)
+    </string>
+    <!-- Reminder Preference: Nagging Description (false) -->
+    <string name="rmd_EPr_snooze_dialog_desc_false">Snooze by selecting # days/hours to snooze
+    </string>
+
+    <!-- slide 44g: Reminder Preference: Default Reminders Title -->
+    <string name="rmd_EPr_defaultRemind_title">Random reminders</string>
+    <!-- Reminder Preference: Default Reminders Setting (disabled) -->
+    <string name="rmd_EPr_defaultRemind_desc_disabled">New tasks will have no random reminders
+    </string>
+    <!-- Reminder Preference: Default Reminders Setting (%s => setting) -->
+    <string name="rmd_EPr_defaultRemind_desc">New tasks will remind randomly: %s</string>
+
+    <!-- slide 39a: Defaults Title -->
+
+    <string-array name="EPr_reminder_random">
+        <!-- slide 44a: Reminder Preference: random reminder choices for preference page. -->
+        <item>disabled</item>
+        <!-- slide 44b -->
+        <item>hourly</item>
+        <!-- slide 44c -->
+        <item>daily</item>
+        <!-- slide 44d-->
+        <item>weekly</item>
+        <!-- slide 44e-->
+        <item>bi-weekly</item>
+        <!-- slide 44f -->
+        <item>monthly</item>
+        <item>bi-monthly</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_start">
+        <!-- Reminder Preference: quiet_hours_start: options for preference menu. Translate but don't change the times!. -->
+        <item>disabled</item>
+        <item>8 PM</item>
+        <item>9 PM</item>
+        <item>10 PM</item>
+        <item>11 PM</item>
+        <item>12 AM</item>
+        <item>1 AM</item>
+        <item>2 AM</item>
+        <item>3 AM</item>
+        <item>4 AM</item>
+        <item>5 AM</item>
+        <item>6 AM</item>
+        <item>7 AM</item>
+        <item>8 AM</item>
+        <item>9 AM</item>
+        <item>10 AM</item>
+        <item>11 AM</item>
+        <item>12 PM</item>
+        <item>1 PM</item>
+        <item>2 PM</item>
+        <item>3 PM</item>
+        <item>4 PM</item>
+        <item>5 PM</item>
+        <item>6 PM</item>
+        <item>7 PM</item>
+    </string-array>
+
+    <string-array name="EPr_quiet_hours_end">
+        <!-- Reminder Preference: quiet_hours_end: options for preference menu. Translate but don't change the times! -->
+        <item>9 AM</item>
+        <item>10 AM</item>
+        <item>11 AM</item>
+        <item>12 PM</item>
+        <item>1 PM</item>
+        <item>2 PM</item>
+        <item>3 PM</item>
+        <item>4 PM</item>
+        <item>5 PM</item>
+        <item>6 PM</item>
+        <item>7 PM</item>
+        <item>8 PM</item>
+        <item>9 PM</item>
+        <item>10 PM</item>
+        <item>11 PM</item>
+        <item>12 AM</item>
+        <item>1 AM</item>
+        <item>2 AM</item>
+        <item>3 AM</item>
+        <item>4 AM</item>
+        <item>5 AM</item>
+        <item>6 AM</item>
+        <item>7 AM</item>
+        <item>8 AM</item>
+    </string-array>
+
+    <string-array name="EPr_rmd_time">
+        <!-- Reminder Preference: rmd_time: options for preference menu. Translate but don't change the times! -->
+        <item>9 AM</item>
+        <item>10 AM</item>
+        <item>11 AM</item>
+        <item>12 PM</item>
+        <item>1 PM</item>
+        <item>2 PM</item>
+        <item>3 PM</item>
+        <item>4 PM</item>
+        <item>5 PM</item>
+        <item>6 PM</item>
+        <item>7 PM</item>
+        <item>8 PM</item>
+        <item>9 PM</item>
+        <item>10 PM</item>
+        <item>11 PM</item>
+        <item>12 AM</item>
+        <item>1 AM</item>
+        <item>2 AM</item>
+        <item>3 AM</item>
+        <item>4 AM</item>
+        <item>5 AM</item>
+        <item>6 AM</item>
+        <item>7 AM</item>
+        <item>8 AM</item>
+    </string-array>
+
+    <!-- =============================================== random reminders == -->
+
+    <string name="reminders_social">These people are counting on you!</string>
+
+    <string name="reminders_social_one">%s is counting on you!</string>
+
+    <string name="reminders_social_multiple">%1$s, %2$s, and others are counting on you!</string>
+
+    <string-array name="reminders">
+        <!-- reminders: Make these < 20 chars so the task name is displayed -->
+        <item>Hi there! Have a sec?</item>
+        <item>Can I see you for a sec?</item>
+        <item>Have a few minutes?</item>
+        <item>Did you forget?</item>
+        <item>Excuse me!</item>
+        <item>When you have a minute:</item>
+        <item>On your agenda:</item>
+        <item>Free for a moment?</item>
+        <item>Astrid here!</item>
+        <item>Hi! Can I bug you?</item>
+        <item>A minute of your time?</item>
+        <item>It\'s a great day to</item>
+    </string-array>
+
+    <string-array name="reminders_due">
+        <!-- reminders related to task due date -->
+        <item>Time to work!</item>
+        <item>Due date is here!</item>
+        <item>Ready to start?</item>
+        <item>You said you would do:</item>
+        <item>You\'re supposed to start:</item>
+        <item>Time to start:</item>
+        <item>It\'s time!</item>
+        <item>Excuse me! Time for</item>
+        <item>You free? Time to</item>
+    </string-array>
+
+    <string-array name="reminders_snooze">
+        <!-- reminders related to snooze -->
+        <item>Don\'t be lazy now!</item>
+        <item>Snooze time is up!</item>
+        <item>No more snoozing!</item>
+        <item>Now are you ready?</item>
+        <item>No more postponing!</item>
+    </string-array>
+
+    <string-array name="reminder_responses">
+        <!-- responses to reminder: Astrid says...  (user should answer yes or no)  -->
+        <item>I\'ve got something for you!</item>
+        <item>Ready to put this in the past?</item>
+        <item>Why don\'t you get this done?</item>
+        <item>How about it? Ready tiger?</item>
+        <item>Ready to do this?</item>
+        <item>Can you handle this?</item>
+        <item>You can be happy! Just finish this!</item>
+        <item>I promise you\'ll feel better if you finish this!</item>
+        <item>Won\'t you do this today?</item>
+        <item>Please finish this, I\'m sick of it!</item>
+        <item>Can you finish this? Yes you can!</item>
+        <item>Are you ever going to do this?</item>
+        <item>Feel good about yourself! Let\'s go!</item>
+        <item>I\'m so proud of you! Lets get it done!</item>
+        <item>A little snack after you finish this?</item>
+        <item>Just this one task? Please?</item>
+        <item>Time to shorten your todo list!</item>
+        <item>Are you on Team Order or Team Chaos? Team Order! Let\'s go!</item>
+        <item>Have I mentioned you are awesome recently? Keep it up!</item>
+        <item>A task a day keeps the clutter away... Goodbye clutter!</item>
+        <item>How do you do it? Wow, I\'m impressed!</item>
+        <item>You can\'t just get by on your good looks. Let\'s get to it!</item>
+        <item>Lovely weather for a job like this, isn\'t it?</item>
+        <item>A spot of tea while you work on this?</item>
+        <item>If only you had already done this, then you could go outside and play.</item>
+        <item>It\'s time. You can\'t put off the inevitable.</item>
+        <item>I die a little every time you ignore me.</item>
+    </string-array>
+
+    <string-array name="postpone_nags">
+        <!-- Astrid's nagging when user clicks postpone -->
+        <item>Please tell me it isn\'t true that you\'re a procrastinator!</item>
+        <item>Doesn\'t being lazy get old sometimes?</item>
+        <item>Somewhere, someone is depending on you to finish this!</item>
+        <item>When you said postpone, you really meant \'I\'m doing this\', right?</item>
+        <item>This is the last time you postpone this, right?</item>
+        <item>Just finish this today, I won\'t tell anyone!</item>
+        <item>Why postpone when you can um... not postpone!</item>
+        <item>You\'ll finish this eventually, I presume?</item>
+        <item>I think you\'re really great! How about not putting this off?</item>
+        <item>Will you be able to achieve your goals if you do that?</item>
+        <item>Postpone, postpone, postpone. When will you change!</item>
+        <item>I\'ve had enough with your excuses! Just do it already!</item>
+        <item>Didn\'t you make that excuse last time?</item>
+        <item>I can\'t help you organize your life if you do that...</item>
+    </string-array>
 </resources>
diff --git a/astrid/res/values/strings-repeat.xml b/astrid/res/values/strings-repeat.xml
index 2d5feed26..db986af05 100644
--- a/astrid/res/values/strings-repeat.xml
+++ b/astrid/res/values/strings-repeat.xml
@@ -4,127 +4,134 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <!-- Resources for built-in repeat plug-in -->
-
-  <!-- repeating plugin name -->
-  <string name="repeat_plugin">Repeating Tasks</string>
-  
-  <!-- repeating plugin description -->
-  <string name="repeat_plugin_desc">Allows tasks to repeat</string>
-  
-  <!-- slide 20a: checkbox for turning on/off repeats -->
-  <string name="repeat_enabled">Repeats</string>
-  
-  <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
-  <string name="repeat_every">Every %d</string>
-  
-  <!-- hint when opening repeat interval -->
-  <string name="repeat_interval_prompt">Repeat interval</string>
-  
-  <!-- slide 19b-->
-  <string name="repeat_never">Not repeating</string>
-  <!-- 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>
-    <item>Week(s)</item>
-    <item>Month(s)</item>
-    <item>Hour(s)</item>
-    <item>Minute(s)</item>
-    <item>Year(s)</item>
-  </string-array>
-  
-  <string name="repeat_days">days</string>
-  <string name="repeat_weekdays">weekdays</string>
-  <string name="repeat_weeks">weeks</string>
-  <string name="repeat_months">months</string>
-  <string name="repeat_years">years</string>
-  <string name="repeat_hours">hours</string>
-  <string name="repeat_minutes">minutes</string>
-  
-  <string-array name="repeat_until_shortcuts">
-      <item>Forever</item>
-      <item>Specific Day</item>
-      <item>Today</item>
-      <item>Tomorrow</item>
-      <item>(day after)</item>
-      <item>Next Week</item>
-      <item>In Two Weeks</item>
-      <item>Next Month</item>
-  </string-array>
-  
-  <string name="repeat_until_title">Repeat until...</string>
-  
-  <string name="repeat_keep_going">Keep going</string>
-  
-  <string-array name="repeat_type">
-    <!-- slide 20c: repeat type (date to repeat from) -->
-    <item>from due date</item>
-    <!-- slide 20c -->
-    <item>from completion date</item>
-  </string-array>
-  
-  <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
-  <string name="repeat_detail_byday">$I on $D</string>
-  
-  <!-- task detail for repeat from due date (%s -> interval) -->
-  <string name="repeat_detail_duedate">Every %s</string>
-
-  <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
-  <string name="repeat_detail_duedate_until">Every %1$s\nuntil %2$s</string>
-  
-  <!-- task detail for repeat from completion date (%s -> interval) -->
-  <string name="repeat_detail_completion">%s after completion</string>
-  
-  <!-- text for button when repeating task indefinitely -->
-  <string name="repeat_forever">Repeat forever</string>
-
-  <!-- text for button when repeating task until specified date (%s -> date string) -->
-  <string name="repeat_until">Repeat until %s</string>
-  
-  <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title">Rescheduling task \"%s\"</string>
-
-  <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
-  <string name="repeat_rescheduling_dialog_title_last_time">Completed repeating task \"%s\"</string>
-      
-  <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->  
-  <string name="repeat_rescheduling_dialog_bubble">%1$s I\'ve rescheduled this repeating task from %2$s to %3$s</string>
-  
-  <!-- text for when a repeating task was rescheduled but didn't have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
-  <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s I\'ve rescheduled this repeating task to %2$s</string>
-  
-  <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
-  <string name="repeat_rescheduling_dialog_bubble_last_time">You had this repeating until %1$s, and now you\'re all done. %2$s</string>
-  
-  <string-array name="repeat_encouragement">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>Good job!</item>
-      <item>Wow… I\'m so proud of you!</item>
-      <item>I love when you\'re productive!</item>
-      <item>Doesn\'t it feel good to check something off?</item>
-  </string-array>
-
-  <string-array name="repeat_encouragement_last_time">
-      <!-- Encouragement in rescheduling dialog bubble -->
-      <item>Good job!</item>
-      <item>I\'m so proud of you!</item>
-      <item>I love when you\'re productive!</item>
-  </string-array>
-  
+<resources>
+
+    <!-- Resources for built-in repeat plug-in -->
+
+    <!-- repeating plugin name -->
+    <string name="repeat_plugin">Repeating Tasks</string>
+
+    <!-- repeating plugin description -->
+    <string name="repeat_plugin_desc">Allows tasks to repeat</string>
+
+    <!-- slide 20a: checkbox for turning on/off repeats -->
+    <string name="repeat_enabled">Repeats</string>
+
+    <!-- slide 20b: button for "every x" part of repeat (%d -> repeat value)  -->
+    <string name="repeat_every">Every %d</string>
+
+    <!-- hint when opening repeat interval -->
+    <string name="repeat_interval_prompt">Repeat interval</string>
+
+    <!-- slide 19b-->
+    <string name="repeat_never">Not repeating</string>
+    <!-- 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>
+        <item>Week(s)</item>
+        <item>Month(s)</item>
+        <item>Hour(s)</item>
+        <item>Minute(s)</item>
+        <item>Year(s)</item>
+    </string-array>
+
+    <string name="repeat_days">days</string>
+    <string name="repeat_weekdays">weekdays</string>
+    <string name="repeat_weeks">weeks</string>
+    <string name="repeat_months">months</string>
+    <string name="repeat_years">years</string>
+    <string name="repeat_hours">hours</string>
+    <string name="repeat_minutes">minutes</string>
+
+    <string-array name="repeat_until_shortcuts">
+        <item>Forever</item>
+        <item>Specific Day</item>
+        <item>Today</item>
+        <item>Tomorrow</item>
+        <item>(day after)</item>
+        <item>Next Week</item>
+        <item>In Two Weeks</item>
+        <item>Next Month</item>
+    </string-array>
+
+    <string name="repeat_until_title">Repeat until...</string>
+
+    <string name="repeat_keep_going">Keep going</string>
+
+    <string-array name="repeat_type">
+        <!-- slide 20c: repeat type (date to repeat from) -->
+        <item>from due date</item>
+        <!-- slide 20c -->
+        <item>from completion date</item>
+    </string-array>
+
+    <!-- task detail weekly by day ($I -> interval, i.e. 1 week, $D -> days, i.e. Monday, Tuesday) -->
+    <string name="repeat_detail_byday">$I on $D</string>
+
+    <!-- task detail for repeat from due date (%s -> interval) -->
+    <string name="repeat_detail_duedate">Every %s</string>
+
+    <!-- task detail for repeat until a specific date (%1$s -> interval, %2$s -> finish date)-->
+    <string name="repeat_detail_duedate_until">Every %1$s\nuntil %2$s</string>
+
+    <!-- task detail for repeat from completion date (%s -> interval) -->
+    <string name="repeat_detail_completion">%s after completion</string>
+
+    <!-- text for button when repeating task indefinitely -->
+    <string name="repeat_forever">Repeat forever</string>
+
+    <!-- text for button when repeating task until specified date (%s -> date string) -->
+    <string name="repeat_until">Repeat until %s</string>
+
+    <!-- text for confirmation dialog after repeating a task (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title">Rescheduling task \"%s\"</string>
+
+    <!-- text for confirmation dialog after repeating a task for the last time (%s -> task title)-->
+    <string name="repeat_rescheduling_dialog_title_last_time">Completed repeating task \"%s\"
+    </string>
+
+    <!-- text for when a repeating task was rescheduled (%1$s -> encouragment string, %2$s -> old due date, %3$s -> new due date)-->
+    <string name="repeat_rescheduling_dialog_bubble">%1$s I\'ve rescheduled this repeating task from
+        %2$s to %3$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled but didn't have a due date yet, (%1$s -> encouragement string, %2$s -> new due date) -->
+    <string name="repeat_rescheduling_dialog_bubble_no_date">%1$s I\'ve rescheduled this repeating
+        task to %2$s
+    </string>
+
+    <!-- text for when a repeating task was rescheduled for the last time (%1$s -> repeat end date, %2$s -> encouragement string)-->
+    <string name="repeat_rescheduling_dialog_bubble_last_time">You had this repeating until %1$s,
+        and now you\'re all done. %2$s
+    </string>
+
+    <string-array name="repeat_encouragement">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>Good job!</item>
+        <item>Wow… I\'m so proud of you!</item>
+        <item>I love when you\'re productive!</item>
+        <item>Doesn\'t it feel good to check something off?</item>
+    </string-array>
+
+    <string-array name="repeat_encouragement_last_time">
+        <!-- Encouragement in rescheduling dialog bubble -->
+        <item>Good job!</item>
+        <item>I\'m so proud of you!</item>
+        <item>I love when you\'re productive!</item>
+    </string-array>
+
 </resources>
diff --git a/astrid/res/values/strings-subtasks.xml b/astrid/res/values/strings-subtasks.xml
index b59d9376a..352b392d3 100644
--- a/astrid/res/values/strings-subtasks.xml
+++ b/astrid/res/values/strings-subtasks.xml
@@ -4,12 +4,12 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    
-  <!-- Subtasks Help Introduction -->
-  <string name="subtasks_help_title">Sort and Indent</string>
-  <string name="subtasks_help_1">Tap and hold to move a task</string>
-  <string name="subtasks_help_2">Drag vertically to rearrange</string>
-  <string name="subtasks_help_3">Drag horizontally to indent</string>
-    
+<resources>
+
+    <!-- Subtasks Help Introduction -->
+    <string name="subtasks_help_title">Sort and Indent</string>
+    <string name="subtasks_help_1">Tap and hold to move a task</string>
+    <string name="subtasks_help_2">Drag vertically to rearrange</string>
+    <string name="subtasks_help_3">Drag horizontally to indent</string>
+
 </resources>
diff --git a/astrid/res/values/strings-tags.xml b/astrid/res/values/strings-tags.xml
index 9911566d3..cd0cd0894 100644
--- a/astrid/res/values/strings-tags.xml
+++ b/astrid/res/values/strings-tags.xml
@@ -4,103 +4,109 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 
     <!-- Resources for built-in tag plug-in -->
 
-  <!-- =============================================== Task Edit Controls == -->
-
-  <!-- Tags label -->
-  <string name="TEA_tags_label">Lists</string>
-  
-  <!-- Tags label long version -->
-  <string name="TEA_tags_label_long">Add to lists</string>
- 
-  <!-- Tags hint -->
-  <string name="TEA_tag_hint">New list</string>
-  
-  <!-- Tags dropdown -->
-    
-  <!-- =============================================== Task List Controls == -->
-  
-  <!-- menu item for tags -->
-  
-  <!-- ========================================================== Extras == -->
-  
-  <!-- Context Item: show tag -->
-  
-  <!-- slide 25a: Dialog: new list -->
-  <string name="tag_new_list">New List</string>
-  
-  <!-- Dialog: list saved -->
-  
-  <!-- Dialog: task created without title -->
-  <string name="tag_no_title_error">Please enter a name for this list first!</string>
-  
-  <!-- ========================================================== Filters == -->
-  
-  <!-- filter button to add tag -->
-  <string name="tag_FEx_add_new">New</string>
-  
-  <!-- filter header for tags -->
-  <string name="tag_FEx_header">Lists</string>
-  
-  <!-- filter header for tags user created -->
-  
-  <!-- filter header for tags, shared with user -->
-  
-  <!-- filter header for tags which have no active tasks -->
-  
-  <!-- slide 10d: filter for untagged tasks -->
-  <string name="tag_FEx_untagged">Uncategorized</string>
-  
-  <!-- slide 27a: %s => tag name -->
-
-  <!-- context menu option to rename a tag -->
-  <string name="tag_cm_rename">Rename List</string>
-
-  <!-- context menu option to delete a tag -->
-  <string name="tag_cm_delete">Delete List</string>
-  
-  <!-- context menu option to leave a shared list -->
-  <string name="tag_cm_leave">Leave List</string>
-
-  <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
-  <string name="DLG_delete_this_tag_question">Delete this list: %s? (No tasks will be deleted.)</string>
-  
-  <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
-  <string name="DLG_leave_this_shared_tag_question">Leave this shared list: %s? (No tasks will be deleted.)</string>
-
-  <!-- Dialog to rename tag -->
-  <string name="DLG_rename_this_tag_header">Rename the list %s to:</string>
-
-  <!-- Toast notification that no changes have been made -->
-  <string name="TEA_no_tags_modified">No changes made</string>
-
-  <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_deleted">List %1$s was deleted, affecting %2$d tasks</string>
-  
-  <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
-  <string name="TEA_tags_left">You left shared list %1$s, affecting %2$d tasks</string>
-
-  <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
-  <string name="TEA_tags_renamed">Renamed %1$s with %2$s for %3$d tasks</string>
-  
-  <!-- Tag case migration -->
-  <string name="tag_case_migration_notice">We\'ve noticed that you have some lists that have the same name with different capitalizations. We think you may have intended them to 
-  be the same list, so we\'ve combined the duplicates. Don\'t worry though: the original lists are simply renamed with numbers (e.g. Shopping_1, Shopping_2). If you don\'t want this, you
-  can simply delete the new combined list!</string>
-  
-  <!-- Header for tag settings -->
-  <string name="tag_settings_title">List Settings</string>
-  
-  <!-- Header for tag activity -->
-  <string name="tag_updates_title">Activity: %s</string>
-  
-  <!-- Delete button for tag settings -->
-  <string name="tag_delete_button">Delete list</string>
-  
-  <!-- slide 28d: Leave button for tag settings -->
-  <string name="tag_leave_button">Leave this list</string>
+    <!-- =============================================== Task Edit Controls == -->
+
+    <!-- Tags label -->
+    <string name="TEA_tags_label">Lists</string>
+
+    <!-- Tags label long version -->
+    <string name="TEA_tags_label_long">Add to lists</string>
+
+    <!-- Tags hint -->
+    <string name="TEA_tag_hint">New list</string>
+
+    <!-- Tags dropdown -->
+
+    <!-- =============================================== Task List Controls == -->
+
+    <!-- menu item for tags -->
+
+    <!-- ========================================================== Extras == -->
+
+    <!-- Context Item: show tag -->
+
+    <!-- slide 25a: Dialog: new list -->
+    <string name="tag_new_list">New List</string>
+
+    <!-- Dialog: list saved -->
+
+    <!-- Dialog: task created without title -->
+    <string name="tag_no_title_error">Please enter a name for this list first!</string>
+
+    <!-- ========================================================== Filters == -->
+
+    <!-- filter button to add tag -->
+    <string name="tag_FEx_add_new">New</string>
+
+    <!-- filter header for tags -->
+    <string name="tag_FEx_header">Lists</string>
+
+    <!-- filter header for tags user created -->
+
+    <!-- filter header for tags, shared with user -->
+
+    <!-- filter header for tags which have no active tasks -->
+
+    <!-- slide 10d: filter for untagged tasks -->
+    <string name="tag_FEx_untagged">Uncategorized</string>
+
+    <!-- slide 27a: %s => tag name -->
+
+    <!-- context menu option to rename a tag -->
+    <string name="tag_cm_rename">Rename List</string>
+
+    <!-- context menu option to delete a tag -->
+    <string name="tag_cm_delete">Delete List</string>
+
+    <!-- context menu option to leave a shared list -->
+    <string name="tag_cm_leave">Leave List</string>
+
+    <!-- Dialog to confirm deletion of a tag (%s -> the name of the list to be deleted) -->
+    <string name="DLG_delete_this_tag_question">Delete this list: %s? (No tasks will be deleted.)
+    </string>
+
+    <!-- Dialog to confirm leaving a shared tag (%s -> the name of the shared list to leave) -->
+    <string name="DLG_leave_this_shared_tag_question">Leave this shared list: %s? (No tasks will be
+        deleted.)
+    </string>
+
+    <!-- Dialog to rename tag -->
+    <string name="DLG_rename_this_tag_header">Rename the list %s to:</string>
+
+    <!-- Toast notification that no changes have been made -->
+    <string name="TEA_no_tags_modified">No changes made</string>
+
+    <!-- Toast notification that a tag has been deleted (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_deleted">List %1$s was deleted, affecting %2$d tasks</string>
+
+    <!-- Toast notification that a shared tag has been left (%1$s - list name, %2$d - # tasks) -->
+    <string name="TEA_tags_left">You left shared list %1$s, affecting %2$d tasks</string>
+
+    <!-- Toast notification that a tag has been renamed (%1$s - old name, %2$s - new name, %3$d - # tasks) -->
+    <string name="TEA_tags_renamed">Renamed %1$s with %2$s for %3$d tasks</string>
+
+    <!-- Tag case migration -->
+    <string name="tag_case_migration_notice">We\'ve noticed that you have some lists that have the
+        same name with different capitalizations. We think you may have intended them to
+        be the same list, so we\'ve combined the duplicates. Don\'t worry though: the original lists
+        are simply renamed with numbers (e.g. Shopping_1, Shopping_2). If you don\'t want this, you
+        can simply delete the new combined list!
+    </string>
+
+    <!-- Header for tag settings -->
+    <string name="tag_settings_title">List Settings</string>
+
+    <!-- Header for tag activity -->
+    <string name="tag_updates_title">Activity: %s</string>
+
+    <!-- Delete button for tag settings -->
+    <string name="tag_delete_button">Delete list</string>
+
+    <!-- slide 28d: Leave button for tag settings -->
+    <string name="tag_leave_button">Leave this list</string>
 
 </resources>
diff --git a/astrid/res/values/strings-timers.xml b/astrid/res/values/strings-timers.xml
index 0151348eb..5c992180e 100644
--- a/astrid/res/values/strings-timers.xml
+++ b/astrid/res/values/strings-timers.xml
@@ -4,33 +4,33 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    
+<resources>
+
     <!-- Resources for built-in timers plug-in -->
-    
+
     <!-- Task List: Start Timer button -->
-    
+
     <!-- Task List: Stop Timer button -->
-    
+
     <!-- Android Notification Title (%s => # tasks) -->
     <string name="TPl_notification">Timers Active for %s!</string>
-    
+
     <!-- Filter Header for Timer plugin -->
-    
+
     <!-- Filter for Timed Tasks -->
     <string name="TFE_workingOn">Tasks Being Timed</string>
-    
+
     <!-- Title for TEA -->
     <string name="TEA_timer_controls">Timer</string>
-    
-    
+
+
     <!-- Edit Notes: create comment for when timer is started -->
     <string name="TEA_timer_comment_started">started this task:</string>
-    
+
     <!-- Edit Notes: create comment for when timer is stopped -->
     <string name="TEA_timer_comment_stopped">stopped doing this task:</string>
-    
+
     <!-- Edit Notes: comment to notify how long was spent on task -->
     <string name="TEA_timer_comment_spent">Time spent:</string>
-    
+
 </resources>
diff --git a/astrid/res/values/strings-updates.xml b/astrid/res/values/strings-updates.xml
index e664bd34f..a837fb73a 100644
--- a/astrid/res/values/strings-updates.xml
+++ b/astrid/res/values/strings-updates.xml
@@ -4,23 +4,23 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources>
 
     <!-- Update string from activity codes %1$s - user, %2$s - target name, %3$s - message, %4$s - other_user-->
-    
+
     <!-- NOTE TO TRANSLATORS: things beginning with $link_ are special tokens we use for string formatting.
     Please do not translate this part of the string. -->
-    
+
     <!-- These are still in use -->
     <string name="update_string_default_comment">%1$s commented: %3$s</string>
     <string name="update_string_task_comment">%1$s on $link_task: %3$s</string>
     <string name="update_string_tag_comment">%1$s on %2$s: %3$s</string>
     <string name="update_string_user_self">You</string>
-    
+
     <string name="history_yourself">yourself</string>
     <string name="history_you">you</string>
     <string name="history_a_deleted_user">(a deleted user)</string>
-    
+
     <string name="history_this_list">this list</string>
     <string name="history_this_task">this task</string>
     <string name="history_tag_added">added %1$s to %2$s</string>
@@ -46,9 +46,12 @@
     <string name="history_favorited">favorited %s</string>
     <string name="history_unfavorited">unfavorited %s</string>
     <string name="history_changed_list_picture">change this list\'s picture</string>
-    <string name="history_added_description_characters">added %1$d characters to %2$s description</string>
+    <string name="history_added_description_characters">added %1$d characters to %2$s description
+    </string>
     <string name="history_removed_description">removed %s description</string>
-    <string name="history_removed_description_characters">removed %1$d characters from %2$s description</string>
+    <string name="history_removed_description_characters">removed %1$d characters from %2$s
+        description
+    </string>
     <string name="history_updated_description">updated %s description</string>
     <string name="history_changed_list_owner">changed list owner to %s</string>
     <string name="history_created_this_list">created this list</string>
@@ -71,6 +74,6 @@
     <string name="history_repeat_on">on %s</string>
     <string name="history_repeat_from_completion">after completion</string>
     <string name="history_acknowledged">viewed %s</string>
-    
+
     <string name="history_default">changed %1$s to %2$s</string>
 </resources>
diff --git a/astrid/res/values/strings-voice.xml b/astrid/res/values/strings-voice.xml
index bb1204334..c4b537e34 100644
--- a/astrid/res/values/strings-voice.xml
+++ b/astrid/res/values/strings-voice.xml
@@ -4,39 +4,57 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    
-  <!-- Voice Add Prompt Text -->
-  <string name="voice_create_prompt">Speak to create a task</string>
-  <string name="voice_edit_title_prompt">Speak to set task title</string>
-  <string name="voice_edit_note_prompt">Speak to set task description</string>
-    
-  <!-- Preference: Task List recognition-service is not installed, but available -->
-  <string name="EPr_voiceInputInstall_dlg">Voice-input is not installed.\nDo you want to go to the market and install it?</string>
-  <!-- Preference: Task List recognition-service is not available for this system -->
-  <string name="EPr_voiceInputUnavailable_dlg">Unfortunately voice-input is not available for your system.\nIf possible, please update Android to 2.1 or later.</string>
-  <!-- Preference: Market is not available for this system -->
-  <string name="EPr_marketUnavailable_dlg">Unfortunately the market is not available for your system.\nIf possible, try downloading voice search from another source.</string>
-  <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
-  <string name="EPr_voiceInputEnabled_title">Voice input</string>
-  <!-- slide 38a: Preference: voice button description (true) -->
-  <string name="EPr_voiceInputEnabled_desc_enabled">Voice input button will be displayed in task list page</string>
-  <!-- Preference: voice button description (false) -->
-  <string name="EPr_voiceInputEnabled_desc_disabled">Voice input button will be hidden on task list page</string>
-  <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
-  <string name="EPr_voiceInputCreatesTask_title">Directly create tasks</string>
-  <!-- Preference: Task List Voice-creation description (true) -->
-  <string name="EPr_voiceInputCreatesTask_desc_enabled">Tasks will automatically be created from voice input</string>
-  <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
-  <string name="EPr_voiceInputCreatesTask_desc_disabled">You can edit the task title after voice input finishes</string>
-  <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
-  <string name="EPr_voiceRemindersEnabled_title">Voice reminders</string>
-  <!-- Preference: Voice reminders description (true) -->
-  <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid will speak task names during task reminders</string>
-  <!-- slide 38c: Preference: Voice reminders description (false) -->
-  <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid will sound a ringtone during task reminders</string>    
-  
-  <!-- slide 32d: Preference Category: Voice Title -->
-  <string name="EPr_voice_header">Voice input settings</string>
-    
+<resources>
+
+    <!-- Voice Add Prompt Text -->
+    <string name="voice_create_prompt">Speak to create a task</string>
+    <string name="voice_edit_title_prompt">Speak to set task title</string>
+    <string name="voice_edit_note_prompt">Speak to set task description</string>
+
+    <!-- Preference: Task List recognition-service is not installed, but available -->
+    <string name="EPr_voiceInputInstall_dlg">Voice-input is not installed.\nDo you want to go to the
+        market and install it?
+    </string>
+    <!-- Preference: Task List recognition-service is not available for this system -->
+    <string name="EPr_voiceInputUnavailable_dlg">Unfortunately voice-input is not available for your
+        system.\nIf possible, please update Android to 2.1 or later.
+    </string>
+    <!-- Preference: Market is not available for this system -->
+    <string name="EPr_marketUnavailable_dlg">Unfortunately the market is not available for your
+        system.\nIf possible, try downloading voice search from another source.
+    </string>
+    <!-- slide 38d:  Preference: Task List Show Voice-button if recognition-service is available -->
+    <string name="EPr_voiceInputEnabled_title">Voice input</string>
+    <!-- slide 38a: Preference: voice button description (true) -->
+    <string name="EPr_voiceInputEnabled_desc_enabled">Voice input button will be displayed in task
+        list page
+    </string>
+    <!-- Preference: voice button description (false) -->
+    <string name="EPr_voiceInputEnabled_desc_disabled">Voice input button will be hidden on task
+        list page
+    </string>
+    <!-- slide 38e: Preference: Task List Voice-button directly creates tasks -->
+    <string name="EPr_voiceInputCreatesTask_title">Directly create tasks</string>
+    <!-- Preference: Task List Voice-creation description (true) -->
+    <string name="EPr_voiceInputCreatesTask_desc_enabled">Tasks will automatically be created from
+        voice input
+    </string>
+    <!-- slide 38b: Preference: Task List Voice-creation description (false) -->
+    <string name="EPr_voiceInputCreatesTask_desc_disabled">You can edit the task title after voice
+        input finishes
+    </string>
+    <!-- slide 38f: Preference: Voice reminders if TTS-service is available -->
+    <string name="EPr_voiceRemindersEnabled_title">Voice reminders</string>
+    <!-- Preference: Voice reminders description (true) -->
+    <string name="EPr_voiceRemindersEnabled_desc_enabled">Astrid will speak task names during task
+        reminders
+    </string>
+    <!-- slide 38c: Preference: Voice reminders description (false) -->
+    <string name="EPr_voiceRemindersEnabled_desc_disabled">Astrid will sound a ringtone during task
+        reminders
+    </string>
+
+    <!-- slide 32d: Preference Category: Voice Title -->
+    <string name="EPr_voice_header">Voice input settings</string>
+
 </resources>
diff --git a/astrid/res/values/strings-welcome.xml b/astrid/res/values/strings-welcome.xml
index 4fe99620e..dd90abfe4 100644
--- a/astrid/res/values/strings-welcome.xml
+++ b/astrid/res/values/strings-welcome.xml
@@ -5,54 +5,56 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <resources>
-  
-  <!-- slide 30a-->
-  <string name="welcome_setting">Show tutorial</string>
-  
-  <string name="welcome_title_1">Welcome to Astrid!</string>
-
-  <!-- slide 2a -->
-  <string name="welcome_title_2">Make lists</string>
-
-  <!-- slide 3a-->
-  <string name="welcome_title_3">Switch between lists</string>
-
-  <!-- slide 4a -->
-  <string name="welcome_title_4">Share lists</string>
-
-  <!-- slide 5a -->
-  <string name="welcome_title_5">Divvy up tasks</string>
-
-  <!-- slide 6a -->
-  <string name="welcome_title_6">Provide details</string>
-
-  <!-- slide 7a -->
-  <string name="welcome_title_7">Connect now\nto get started!</string>
-  
-  <string name="welcome_title_7_return">That\'s it!</string>
-  
-  <!-- slide 1b -->
-  <string name="welcome_body_1">The perfect personal to-do list \nthat works great with friends</string>
-
-  <!-- slide 2b-->
-  <string name="welcome_body_2">Great for any list:\nread, watch, buy, visit!</string>
-
-  <!-- slide 3b -->
-  <string name="welcome_body_3">Tap the list title \nto see all your lists</string>
-
-  <!-- slide 4b -->
-  <string name="welcome_body_4">Share lists with \nfriends, housemates,\nor your sweetheart!</string>
-
-  <!-- slide 5b -->
-  <string name="welcome_body_5">Never wonder who\'s\nbringing dessert!</string>
-
-  <!-- slide 6b-->
-  <string name="welcome_body_6">Tap to add description,\nset reminders,\nand much more!</string>
-  <string name="welcome_body_7">Login</string>
-  
-  <string name="welcome_body_7_return">Tap Astrid to return.</string>
-  
-  <!-- slide 1c -->
-  <string name="welcome_next">Next</string>
-  
+
+    <!-- slide 30a-->
+    <string name="welcome_setting">Show tutorial</string>
+
+    <string name="welcome_title_1">Welcome to Astrid!</string>
+
+    <!-- slide 2a -->
+    <string name="welcome_title_2">Make lists</string>
+
+    <!-- slide 3a-->
+    <string name="welcome_title_3">Switch between lists</string>
+
+    <!-- slide 4a -->
+    <string name="welcome_title_4">Share lists</string>
+
+    <!-- slide 5a -->
+    <string name="welcome_title_5">Divvy up tasks</string>
+
+    <!-- slide 6a -->
+    <string name="welcome_title_6">Provide details</string>
+
+    <!-- slide 7a -->
+    <string name="welcome_title_7">Connect now\nto get started!</string>
+
+    <string name="welcome_title_7_return">That\'s it!</string>
+
+    <!-- slide 1b -->
+    <string name="welcome_body_1">The perfect personal to-do list \nthat works great with friends
+    </string>
+
+    <!-- slide 2b-->
+    <string name="welcome_body_2">Great for any list:\nread, watch, buy, visit!</string>
+
+    <!-- slide 3b -->
+    <string name="welcome_body_3">Tap the list title \nto see all your lists</string>
+
+    <!-- slide 4b -->
+    <string name="welcome_body_4">Share lists with \nfriends, housemates,\nor your sweetheart!
+    </string>
+
+    <!-- slide 5b -->
+    <string name="welcome_body_5">Never wonder who\'s\nbringing dessert!</string>
+
+    <!-- slide 6b-->
+    <string name="welcome_body_6">Tap to add description,\nset reminders,\nand much more!</string>
+    <string name="welcome_body_7">Login</string>
+
+    <string name="welcome_body_7_return">Tap Astrid to return.</string>
+
+    <!-- slide 1c -->
+    <string name="welcome_next">Next</string>
+
 </resources>
diff --git a/astrid/res/values/strings-widget.xml b/astrid/res/values/strings-widget.xml
index cb238feb7..c3851331b 100644
--- a/astrid/res/values/strings-widget.xml
+++ b/astrid/res/values/strings-widget.xml
@@ -4,86 +4,95 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    
+<resources>
+
     <string name="widget_mini">- Astrid Mini -</string>
-    
+
     <!-- Resources for power pack widget -->
-    
+
     <string name="PPW_widget_42_label">Old Astrid 4x2</string>
     <string name="PPW_widget_43_label">Old Astrid 4x3</string>
     <string name="PPW_widget_44_label">Old Astrid 4x4</string>
     <string name="PPW_widget_v11_label">- Astrid -</string>
     <string name="PPW_widget_custom_label">Astrid Custom Launcher Premium</string>
     <string name="PPW_widget_custom_launcherpro_label">Astrid Launcher Pro Premium</string>
-    
+
     <string name="PPW_configure_title">Configure Widget</string>
-    
+
     <string name="PPW_color">Widget color</string>
     <string name="PPW_enable_calendar">Show calendar events</string>
     <string name="PPW_disable_encouragements">Hide encouragements</string>
     <string name="PPW_show_dates">Show due dates</string>
     <string name="PPW_filter">Select Filter</string>
-    
+
     <string name="PPW_due">Due:</string>
     <string name="PPW_past_due">Past Due:</string>
-    
-    <string name="PPW_old_astrid_notice">You need at least version 3.6 of 
-    Astrid in order to use this widget. Sorry!</string>
-    
+
+    <string name="PPW_old_astrid_notice">You need at least version 3.6 of
+        Astrid in order to use this widget. Sorry!
+    </string>
+
     <string-array name="PPW_encouragements">
         <!-- general encouragements -->
-    	<item>Hi there!</item>
-    	<item>Have time to finish something?</item>
-    	<item>Gosh, you are looking suave today!</item>
-    	<item>Do something great today!</item>
-    	<item>Make me proud today!</item>
-    	<item>How are you doing today?</item>
+        <item>Hi there!</item>
+        <item>Have time to finish something?</item>
+        <item>Gosh, you are looking suave today!</item>
+        <item>Do something great today!</item>
+        <item>Make me proud today!</item>
+        <item>How are you doing today?</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_tod">
         <!-- encouragements based on time of day -->
-    	<item>Good morning!</item>
-    	<item>Good afternoon!</item>
-    	<item>Good evening!</item>
-    	<item>Late night?</item>
-    	<item>It\'s early, get something done!</item>
-    	<item>Afternoon tea, perhaps?</item>
-    	<item>Enjoy the evening!</item>
-    	<item>Sleep is good for you, you know!</item>
+        <item>Good morning!</item>
+        <item>Good afternoon!</item>
+        <item>Good evening!</item>
+        <item>Late night?</item>
+        <item>It\'s early, get something done!</item>
+        <item>Afternoon tea, perhaps?</item>
+        <item>Enjoy the evening!</item>
+        <item>Sleep is good for you, you know!</item>
     </string-array>
-    
+
     <string-array name="PPW_encouragements_completed">
         <!-- encouragements based on tasks completed (%d => completed) -->
-    	<item>You\'ve already completed %d tasks!</item>
-    	<item>Score in life: %d tasks completed</item>
-    	<item>Smile! You\'ve already finished %d tasks!</item>
+        <item>You\'ve already completed %d tasks!</item>
+        <item>Score in life: %d tasks completed</item>
+        <item>Smile! You\'ve already finished %d tasks!</item>
     </string-array>
-  	<string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet! Shall we?</string>
-        
+    <string name="PPW_encouragements_none_completed">You haven\'t completed very many tasks yet!
+        Shall we?
+    </string>
+
     <string-array name="PPW_colors">
         <item>Black</item>
         <item>White</item>
         <item>Blue</item>
         <item>Translucent</item>
     </string-array>
-    
-    <string name="PPW_widget_dlg_text">This widget is only available to owners of the PowerPack!</string>
+
+    <string name="PPW_widget_dlg_text">This widget is only available to owners of the PowerPack!
+    </string>
     <string name="PPW_widget_dlg_ok">Preview</string>
-    
+
     <string name="PPW_demo_title1">Items on %s will go here</string>
     <string name="PPW_demo_title2">Power Pack includes Premium Widgets...</string>
     <string name="PPW_demo_title3">...voice add and good feelings!</string>
     <string name="PPW_demo_title4">Tap to learn more!</string>
-    
+
     <string name="PPW_info_title">Free Power Pack!</string>
     <string name="PPW_info_signin">Sign in!</string>
     <string name="PPW_info_later">Later</string>
-    <string name="PPW_unlock_howto">Share lists with friends! Unlock the free Power Pack when 3 friends sign up with Astrid.</string>
+    <string name="PPW_unlock_howto">Share lists with friends! Unlock the free Power Pack when 3
+        friends sign up with Astrid.
+    </string>
     <string name="PPW_check_button">Get the Power Pack for free!</string>
     <string name="PPW_check_share_lists">Share lists!</string>
-    <string name="PPW_api_level">Sorry! This widget is only supported on Android 3.0 or higher.</string>
-    
+    <string name="PPW_api_level">Sorry! This widget is only supported on Android 3.0 or higher.
+    </string>
+
     <string name="EPr_widget_enabled_title">Enable/Disable Widgets</string>
-    <string name="PPW_restart_for_enabled_state">You may need to restart your phone for this change to take effect.</string>
+    <string name="PPW_restart_for_enabled_state">You may need to restart your phone for this change
+        to take effect.
+    </string>
 </resources>
diff --git a/astrid/res/values/styles-locale.xml b/astrid/res/values/styles-locale.xml
index 6a71b49f3..867f97be0 100644
--- a/astrid/res/values/styles-locale.xml
+++ b/astrid/res/values/styles-locale.xml
@@ -6,26 +6,26 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-  <!-- Resources for built-in locale plug-in -->
-     
-  <style name="TextAppearance.Locale_Label">                                                                                                                                                                       
-      <item name="android:textSize">16sp</item>                                                                                                                                                                    
-      <item name="android:textColor">@android:color/black</item>                                                                                                                                                   
-  </style>   
-  
-  <!-- Locale filter list styles -->
-  <style name="TextAppearance.LEA_Filter">
-      <item name="android:textSize">14sp</item>
-      <item name="android:textColor">@android:color/white</item>
-  </style>
-  
-  <style name="TextAppearance.LEA_Header" parent="TextAppearance.LEA_Filter">
-      <item name="android:textSize">13sp</item>
-      <item name="android:textColor">#ffdddddd</item>
-  </style>
-  
-  <style name="TextAppearance.LEA_Category" parent="TextAppearance.LEA_Filter">
-      <item name="android:textSize">13sp</item>
-      <item name="android:textStyle">bold|italic</item>
-  </style>
+    <!-- Resources for built-in locale plug-in -->
+
+    <style name="TextAppearance.Locale_Label">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+
+    <!-- Locale filter list styles -->
+    <style name="TextAppearance.LEA_Filter">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">@android:color/white</item>
+    </style>
+
+    <style name="TextAppearance.LEA_Header" parent="TextAppearance.LEA_Filter">
+        <item name="android:textSize">13sp</item>
+        <item name="android:textColor">#ffdddddd</item>
+    </style>
+
+    <style name="TextAppearance.LEA_Category" parent="TextAppearance.LEA_Filter">
+        <item name="android:textSize">13sp</item>
+        <item name="android:textStyle">bold|italic</item>
+    </style>
 </resources>
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index ec545f2ad..6244d4b25 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -7,7 +7,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- ========================================================== General  -->
-    
+
     <style name="Theme" parent="@style/Theme.Sherlock">
         <item name="android:windowBackground">@null</item>
         <item name="asContentBackground">@android:color/black</item>
@@ -45,36 +45,36 @@
         <item name="asReadonlyTaskBackground">#322c19</item>
         <item name="asHeaderTextColor">?attr/asThemeTextColor</item>
         <item name="asHeaderTextColorInverse">?attr/asAbBackgroundColor</item>
-        
+
         <!-- actionbar-styling -->
         <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle</item>
         <item name="actionBarStyle">@style/AstridActionBarStyle</item>
         <item name="vpiTabPageIndicatorStyle">@style/CustomTabPageIndicator</item>
         <item name="vpiTabTextStyle">@style/CustomTabPageIndicator.Text</item>
     </style>
-    
+
     <style name="AstridV11ActionBarStyle" parent="@style/Widget.Sherlock.ActionBar">
         <item name="android:background">@drawable/header_blue</item>
         <item name="android:displayOptions">useLogo|showHome|showTitle</item>
         <item name="android:logo">@drawable/home_button_blue</item>
     </style>
-    
+
     <style name="AstridActionBarStyle" parent="@style/Widget.Sherlock.ActionBar">
         <item name="background">@drawable/header_blue</item>
         <item name="displayOptions">useLogo|showHome|showTitle</item>
         <item name="logo">@drawable/home_button_blue</item>
     </style>
-    
+
     <style name="AstridV11ActionBarStyle.Transparent">
         <item name="android:background">#aa000000</item>
     </style>
-    
+
     <style name="AstridActionBarStyle.Transparent">
         <item name="background">#aa000000</item>
     </style>
-    
+
     <style name="Theme.Transparent" parent="Theme">
-		<item name="asContentBackground">#22000000</item>
+        <item name="asContentBackground">#22000000</item>
         <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle.Transparent</item>
         <item name="actionBarStyle">@style/AstridActionBarStyle.Transparent</item>
         <item name="asQuickaddBackgroundColor">#22000000</item>
@@ -82,13 +82,13 @@
         <item name="asEditRowBackground">@drawable/task_edit_background_transparent_black</item>
         <item name="asWomEditRowBackground">@drawable/task_edit_background_transparent_black</item>
         <item name="asMembersHeaderBackground">@android:color/transparent</item>
-         
+
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowShowWallpaper">true</item>
     </style>
-    
-        
+
+
     <style name="Theme.White" parent="@style/Theme.Sherlock.Light">
         <item name="asContentBackground">@android:color/white</item>
         <item name="asEditBackground">#e5e5e5</item>
@@ -118,24 +118,24 @@
         <item name="asFilterSelectedIcon">@drawable/filter_selected_icon_black</item>
         <item name="asTaskRowSelector">@drawable/task_row_bg_white</item>
         <item name="asReadonlyTaskBackground">#fff6d7</item>
-        
+
         <!-- actionbar-styling -->
         <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle.White</item>
         <item name="actionBarStyle">@style/AstridActionBarStyle.White</item>
     </style>
-    
+
     <style name="AstridV11ActionBarStyle.White">
         <item name="android:background">@drawable/header_red</item>
         <item name="android:displayOptions">useLogo|showHome|showTitle</item>
         <item name="android:logo">@drawable/home_button_red</item>
     </style>
-    
+
     <style name="AstridActionBarStyle.White">
         <item name="background">@drawable/header_red</item>
         <item name="displayOptions">useLogo|showHome|showTitle</item>
         <item name="logo">@drawable/home_button_red</item>
     </style>
-    
+
     <style name="Theme.White.Blue">
         <item name="asAddButtonImg">@drawable/plus_button_dark_blue</item>
         <item name="asMicButtonImg">@drawable/mic_button_dark_blue</item>
@@ -150,12 +150,12 @@
         <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle.White.Blue</item>
         <item name="actionBarStyle">@style/AstridActionBarStyle.White.Blue</item>
     </style>
-    
+
     <style name="AstridV11ActionBarStyle.White.Blue">
         <item name="android:background">@drawable/header_day_blue</item>
         <item name="android:logo">@drawable/home_button_dark_blue</item>
     </style>
-    
+
     <style name="AstridActionBarStyle.White.Blue">
         <item name="background">@drawable/header_day_blue</item>
         <item name="logo">@drawable/home_button_dark_blue</item>
@@ -177,7 +177,7 @@
         <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle.White.Alt</item>
         <item name="actionBarStyle">@style/AstridActionBarStyle.White.Alt</item>
     </style>
-    
+
     <style name="AstridV11ActionBarStyle.White.Alt">
         <item name="android:logo">@drawable/home_button_blue_alt</item>
         <item name="android:background">@drawable/header_blue_alt</item>
@@ -187,7 +187,7 @@
         <item name="logo">@drawable/home_button_blue_alt</item>
         <item name="background">@drawable/header_blue_alt</item>
     </style>
-    
+
     <style name="Theme.TransparentWhite" parent="Theme.White.Blue">
         <item name="asContentBackground">#22000000</item>
         <item name="asQuickaddBackgroundColor">#22000000</item>
@@ -195,30 +195,31 @@
         <item name="asEditRowBackground">@drawable/task_edit_background_transparent_black</item>
         <item name="asWomEditRowBackground">@drawable/task_edit_background_transparent_black</item>
         <item name="asMembersHeaderBackground">@android:color/transparent</item>
-        <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle.White.Blue.Transparent</item> 
-        <item name="actionBarStyle">@style/AstridActionBarStyle.White.Blue.Transparent</item> 
-        
+        <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle.White.Blue.Transparent
+        </item>
+        <item name="actionBarStyle">@style/AstridActionBarStyle.White.Blue.Transparent</item>
+
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowShowWallpaper">true</item>
     </style>
-    
+
     <style name="AstridV11ActionBarStyle.White.Blue.Transparent">
         <item name="android:background">#aa000000</item>
     </style>
-    
+
     <style name="AstridActionBarStyle.White.Blue.Transparent">
         <item name="background">#aa000000</item>
     </style>
-    
+
     <style name="Theme.FullTransparent" parent="@style/Theme.Sherlock">
         <item name="android:windowIsTranslucent">true</item>
-	    <item name="android:windowBackground">@android:color/transparent</item>
-	    <item name="android:windowContentOverlay">@null</item>
-	    <item name="android:backgroundDimEnabled">false</item>
-	    <item name="android:windowIsFloating">true</item>
-	</style>
-    
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:windowIsFloating">true</item>
+    </style>
+
     <style name="Theme.Dialog" parent="@android:style/Theme.Dialog">
         <item name="android:windowBackground">@null</item>
         <item name="asContentBackground">@android:color/black</item>
@@ -235,38 +236,38 @@
         <!-- actionbar-styling -->
         <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle.Dialog</item>
         <item name="actionBarStyle">@style/AstridActionBarStyle.Dialog</item>
-        
+
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowBackground">@drawable/panel_background</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
         <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
         <item name="android:layout_width">fill_parent</item>
-        
+
         <item name="android:windowTitleSize">18dip</item>
         <item name="android:windowTitleStyle">@style/DialogTitle</item>
         <item name="android:windowTitleBackgroundStyle">@style/DialogTitle</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
-        
+
         <item name="windowActionBar">false</item>
         <item name="windowContentOverlay">@null</item>
         <item name="asEditBackground">#101010</item>
         <item name="asEditRowBackground">@drawable/task_edit_background</item>
         <item name="asThemeTextColor">@color/blue_theme_color</item>
     </style>
-    
+
     <style name="AstridV11ActionBarStyle.Dialog">
         <item name="android:background">@drawable/header_background</item>
         <item name="android:displayOptions">useLogo|showHome|showTitle</item>
         <item name="android:logo">@drawable/icon_48</item>
     </style>
-    
+
     <style name="AstridActionBarStyle.Dialog">
         <item name="background">@drawable/header_background</item>
         <item name="displayOptions">useLogo|showHome|showTitle</item>
         <item name="logo">@drawable/icon_48</item>
     </style>
-    
+
     <style name="Theme.Dialog.White">
         <item name="asContentBackground">@android:color/white</item>
         <item name="asHeaderButtonBackground">@drawable/header_button_white</item>
@@ -277,67 +278,67 @@
         <item name="asFilterHeaderBackground">@drawable/edit_titlebar_white</item>
         <item name="asMembersHeaderBackground">#d0d0d0</item>
         <!-- actionbar-styling -->
-        <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle.Dialog.White</item>        
-        <item name="actionBarStyle">@style/AstridActionBarStyle.Dialog.White</item>        
-        
+        <item name="android:actionBarStyle">@style/AstridV11ActionBarStyle.Dialog.White</item>
+        <item name="actionBarStyle">@style/AstridActionBarStyle.Dialog.White</item>
+
         <item name="asEditBackground">#dddddd</item>
         <item name="asEditRowBackground">@drawable/task_edit_background_transparent_white</item>
         <item name="asThemeTextColor">@color/blue_theme_color</item>
     </style>
-    
+
     <style name="AstridV11ActionBarStyle.Dialog.White">
         <item name="android:background">@android:color/white</item>
         <item name="android:displayOptions">useLogo|showHome|showTitle</item>
         <item name="android:logo">@drawable/icon_48</item>
     </style>
-    
+
     <style name="AstridActionBarStyle.Dialog.White">
         <item name="background">@android:color/white</item>
         <item name="displayOptions">useLogo|showHome|showTitle</item>
         <item name="logo">@drawable/icon_48</item>
     </style>
-        
+
     <!--================================================== General == -->
 
     <style name="Content">
         <item name="android:background">?attr/asContentBackground</item>
     </style>
-    
+
     <style name="TEA_Separator">
         <item name="android:background">?android:attr/listDivider</item>
     </style>
-    
+
     <style name="FLA_Separator" parent="TEA_Separator">
     </style>
-    
+
     <style name="TextAppearance" parent="android:TextAppearance">
-        <item name="android:textColor">?attr/asTextColor</item>    
+        <item name="android:textColor">?attr/asTextColor</item>
     </style>
-    
+
     <!-- generic style for labels above edit boxes -->
     <style name="TextAppearance.GEN_EditLabel">
         <!-- <item name="android:textSize">15sp</item>
         <item name="android:textStyle">bold</item> -->
     </style>
-    
-   	<style name="TextAppearance.ActionBar_ListsHeader">
-   	    <item name="android:background">@android:color/transparent</item>
-   	    <item name="android:textColor">?attr/asHeaderTextColor</item>
-   	    <item name="android:textSize">20dip</item>
-   	    <item name="android:textStyle">bold</item>
-   	</style>
-   	
-   	<style name="TextAppearance.ActionBar_ListsHeader.Selected">   	    
-   	    <item name="android:textColor">?attr/asHeaderTextColorInverse</item>
-   	</style>
-   	
+
+    <style name="TextAppearance.ActionBar_ListsHeader">
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:textColor">?attr/asHeaderTextColor</item>
+        <item name="android:textSize">20dip</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="TextAppearance.ActionBar_ListsHeader.Selected">
+        <item name="android:textColor">?attr/asHeaderTextColorInverse</item>
+    </style>
+
     <!--================================================== Custom Dialogs == -->
-    
-     <style name="DialogTitle">
+
+    <style name="DialogTitle">
         <item name="android:textSize">18sp</item>
         <item name="android:background">#323331</item>
     </style>
-    
+
     <style name="ReminderDialog" parent="@android:style/Theme.Dialog">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowNoTitle">true</item>
@@ -348,25 +349,25 @@
         <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
         <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     </style>
-      
+
     <!--=============================================== TaskListActivity == -->
-    
+
     <style name="TextAppearance.TLA_NoItems">
         <item name="android:textSize">20sp</item>
         <item name="android:gravity">center</item>
     </style>
-    
+
     <style name="TextAppearance.TLA_Header">
         <item name="android:textSize">18sp</item>
         <item name="android:gravity">center</item>
-        <item name="android:textColor">#ffffff</item>        
+        <item name="android:textColor">#ffffff</item>
     </style>
-    
+
     <style name="TextAppearance.TLA_Reminder">
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">#000000</item>        
+        <item name="android:textColor">#000000</item>
     </style>
-    
+
     <style name="ListView">
         <item name="android:divider">?attr/asListDividerColor</item>
         <item name="android:dividerHeight">1px</item>
@@ -376,87 +377,87 @@
     </style>
 
     <!-- =============================================== TaskEditActivity == -->
-    
+
     <style name="Content_EditScroll">
         <item name="android:background">?attr/asEditBackground</item>
     </style>
-    
+
     <style name="EditRow">
         <item name="android:background">?attr/asEditRowBackground</item>
     </style>
-    
-   	<style name="EditRowImage">
-   	    <item name="android:layout_width">25dip</item>
-   	    <item name="android:layout_height">25dip</item>
-		<item name="android:layout_marginRight">8dip</item>
-        <item name="android:scaleType">fitCenter</item> 
-   	</style>
-   	
-   	<style name="TextAppearance.EditRowDisplay">
-   	    <item name="android:textColor">?attr/asThemeTextColor</item>
-   	</style>
-
-   	<style name="TextAppearance.TEA_action">
+
+    <style name="EditRowImage">
+        <item name="android:layout_width">25dip</item>
+        <item name="android:layout_height">25dip</item>
+        <item name="android:layout_marginRight">8dip</item>
+        <item name="android:scaleType">fitCenter</item>
+    </style>
+
+    <style name="TextAppearance.EditRowDisplay">
+        <item name="android:textColor">?attr/asThemeTextColor</item>
+    </style>
+
+    <style name="TextAppearance.TEA_action">
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">?attr/asThemeTextColor</item>        
+        <item name="android:textColor">?attr/asThemeTextColor</item>
     </style>
-    
+
     <style name="TextAppearance.GEN_EditLabel.DLG_EditLabel">
     </style>
 
     <style name="TextAppearance.TEA_assigned">
         <item name="android:textSize">18sp</item>
     </style>
-   	
-   	<style name="Theme.WhenDialog">
-   	    <item name="android:windowAnimationStyle">@style/TEA_WhenDialog_Anim</item>
-   	</style>
-    
-   	<style name="Theme.White.WhenDialog">
-   	    <item name="android:windowAnimationStyle">@style/TEA_WhenDialog_Anim</item>
-   	</style>
-   	    
-   	<style name="TEA_WhenDialog_Anim">
-   	    <item name="android:windowEnterAnimation">@anim/slide_left_in</item>
+
+    <style name="Theme.WhenDialog">
+        <item name="android:windowAnimationStyle">@style/TEA_WhenDialog_Anim</item>
+    </style>
+
+    <style name="Theme.White.WhenDialog">
+        <item name="android:windowAnimationStyle">@style/TEA_WhenDialog_Anim</item>
+    </style>
+
+    <style name="TEA_WhenDialog_Anim">
+        <item name="android:windowEnterAnimation">@anim/slide_left_in</item>
         <item name="android:windowExitAnimation">@anim/slide_right_out</item>
-   	</style>
-   	
-   	<style name="TEA_Dialog" parent="@android:style/Theme.Dialog">
-	    <item name="android:windowFrame">@null</item>
-	    <item name="android:windowTitleStyle">@style/TEA_DialogWindowTitle</item>
-	    <item name="android:windowBackground">@drawable/dialog_full_holo_dark</item>
-	    <item name="android:windowIsFloating">true</item>
-	    <item name="android:windowContentOverlay">@null</item>
-	    <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-	    <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
-	    <item name="asTextColor">#ffffff</item>
-	</style>
-	
-   	<style name="TEA_Dialog.White">
-   	    <item name="android:windowBackground">@drawable/dialog_full_holo_light</item>
-   	    <item name="asTextColor">#000000</item>
-   	</style>
-   	
-   	<style name="TEA_Dialog_ICS" parent="@android:style/Theme.Holo.Dialog">
-	    <item name="android:windowFrame">@null</item>
-	    <item name="android:windowTitleStyle">@style/TEA_DialogWindowTitle</item>
-	    <item name="android:windowIsFloating">true</item>
-	    <item name="android:windowContentOverlay">@null</item>
-	    <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-	    <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
-	    <item name="asTextColor">#ffffff</item>   	    
-   	</style>
+    </style>
+
+    <style name="TEA_Dialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowTitleStyle">@style/TEA_DialogWindowTitle</item>
+        <item name="android:windowBackground">@drawable/dialog_full_holo_dark</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
+        <item name="asTextColor">#ffffff</item>
+    </style>
+
+    <style name="TEA_Dialog.White">
+        <item name="android:windowBackground">@drawable/dialog_full_holo_light</item>
+        <item name="asTextColor">#000000</item>
+    </style>
+
+    <style name="TEA_Dialog_ICS" parent="@android:style/Theme.Holo.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowTitleStyle">@style/TEA_DialogWindowTitle</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
+        <item name="asTextColor">#ffffff</item>
+    </style>
 
     <style name="TEA_Dialog_White_ICS" parent="@android:style/Theme.Holo.Light.Dialog">
-	    <item name="android:windowFrame">@null</item>
-	    <item name="android:windowTitleStyle">@style/TEA_DialogWindowTitle</item>
-	    <item name="android:windowIsFloating">true</item>
-	    <item name="android:windowContentOverlay">@null</item>
-	    <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-	    <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
-	    <item name="asTextColor">#000000</item>   	    
-   	</style>
-	
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowTitleStyle">@style/TEA_DialogWindowTitle</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
+        <item name="asTextColor">#000000</item>
+    </style>
+
     <style name="TEA_DialogWindowTitle">
         <item name="android:maxLines">1</item>
         <item name="android:scrollHorizontally">true</item>
@@ -464,26 +465,26 @@
         <item name="android:textStyle">bold</item>
         <item name="android:textColor">?attr/asTextColor</item>
     </style>
-    
+
     <style name="TEA_list_header">
         <item name="android:textColor">?attr/asTextColor</item>
         <item name="android:textSize">18sp</item>
         <item name="android:textStyle">bold</item>
         <item name="android:background">#aaaaaaaa</item>
     </style>
-   	    
+
     <!-- ==================================================== TaskAdapter == -->
 
     <style name="TextAppearance.TAd_ItemTitle">
         <item name="android:textColorLink">#ff88aaff</item>
     </style>
-    
+
     <style name="TextAppearance.TAd_ItemTitle_Completed" parent="TextAppearance.TAd_ItemTitle">
         <item name="android:textColor">#ff555555</item>
     </style>
-    
-    <style name="TextAppearance.TAd_ItemTitle_Deleted" parent="TextAppearance.TAd_ItemTitle" />
-    
+
+    <style name="TextAppearance.TAd_ItemTitle_Deleted" parent="TextAppearance.TAd_ItemTitle"/>
+
     <style name="TextAppearance.TAd_ItemTitle_Overdue" parent="TextAppearance.TAd_ItemTitle">
     </style>
 
@@ -491,15 +492,15 @@
         <item name="android:textColor">?attr/asDetailsColor</item>
         <item name="android:textColorLink">#ff88aaff</item>
     </style>
-    
+
     <style name="TextAppearance.TAd_ItemDueDate" parent="TextAppearance.TAd_ItemDetails">
         <item name="android:textColor">?attr/asDueDateColor</item>
     </style>
-    
+
     <style name="TextAppearance.TAd_ItemDueDate_Overdue" parent="TextAppearance.TAd_ItemDueDate">
         <item name="android:textColor">?attr/asDueDateOverdueColor</item>
     </style>
-    
+
     <style name="TextAppearance.TAd_ItemDueDate_Completed" parent="TextAppearance.TAd_ItemDueDate">
         <item name="android:textColor">?attr/asDueDateCompletedColor</item>
     </style>
@@ -511,37 +512,37 @@
         <item name="android:textStyle">bold</item>
         <item name="android:textColor">?attr/asTextColorInverse</item>
     </style>
-    
+
     <style name="TextAppearance.FLA_Filter_Widget" parent="TextAppearance.FLA_Filter">
         <item name="android:textColor">?attr/asTextColor</item>
     </style>
-    
+
     <style name="TextAppearance.FLA_Filter_Tablet" parent="TextAppearance.FLA_Filter">
         <item name="android:textColor">@android:color/white</item>
     </style>
-    
+
     <style name="TextAppearance.FLA_Button" parent="TextAppearance.FLA_Filter">
         <item name="android:textColor">@color/new_list_button_text</item>
     </style>
-    
+
     <style name="TextAppearance.FLA_Header" parent="TextAppearance.FLA_Filter">
         <item name="android:textColor">?attr/asFilterHeaderColor</item>
     </style>
 
     <!-- ========================================================= Tag Settings == -->
-    
-    <style name="DeleteTag" >
+
+    <style name="DeleteTag">
         <item name="android:textColor">@android:color/white</item>
         <item name="android:textStyle">bold</item>
         <item name="android:background">#d90000</item>
         <item name="android:textSize">16sp</item>
     </style>
-    
+
     <!-- ========================================================= Widget == -->
 
-    <style name="TextAppearance.Widget">                                                                                                                                                                                      
-        <item name="android:textSize">16sp</item>                                                                                                                                                                    
-        <item name="android:textColor">@color/widget_text_color_light</item>                                                                                                                                                   
+    <style name="TextAppearance.Widget">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/widget_text_color_light</item>
     </style>
 
     <!-- ========================================================= ViewPager == -->
@@ -553,25 +554,26 @@
         <item name="radius">5dp</item>
         <item name="centered">true</item>
         <item name="android:background">#333333</item>
-    </style> 
-    
+    </style>
+
     <style name="CustomTabPageIndicator" parent="Widget.TabPageIndicator">
         <item name="android:background">?attr/asEditTabBackground</item>
         <item name="android:paddingLeft">0dip</item>
         <item name="android:paddingRight">0dip</item>
     </style>
+
     <style name="CustomTabPageIndicator.Text" parent="Widget.TabPageIndicator.Text">
-        <item name="android:textColor">?attr/asTextColor</item>                                                                                                                                                              
+        <item name="android:textColor">?attr/asTextColor</item>
         <item name="android:textSize">15sp</item>
         <item name="android:textStyle">normal</item>
         <item name="android:layout_marginLeft">0dip</item>
         <item name="android:layout_marginRight">0dip</item>
     </style>
-    
+
     <!-- ========================================================= Premium == -->
     <style name="TextAppearance.Premium_Billing">
-        <item name="android:textSize">14dip</item>                                                                                                                                                                    
-        <item name="android:textColor">@android:color/black</item> 
+        <item name="android:textSize">14dip</item>
+        <item name="android:textColor">@android:color/black</item>
     </style>
-    
+
 </resources>
diff --git a/astrid/res/xml/filter_list_searchable.xml b/astrid/res/xml/filter_list_searchable.xml
index 08712a8bf..10bc7403f 100644
--- a/astrid/res/xml/filter_list_searchable.xml
+++ b/astrid/res/xml/filter_list_searchable.xml
@@ -6,7 +6,7 @@
 -->
 
 <searchable xmlns:android="http://schemas.android.com/apk/res/android"
-     android:label="@string/app_name"
-     android:hint="@string/FLA_search_hint">
+            android:label="@string/app_name"
+            android:hint="@string/FLA_search_hint">
 </searchable>
  
diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index b3684e365..208c76adb 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -5,199 +5,224 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/EPr_title">
-
-    <PreferenceScreen android:title="@string/EPr_account_title" 
-        android:key="@string/p_account"
-        android:summary="@string/actfm_account_info_summary"/>
-    
-    <PreferenceScreen android:title="@string/p_help" android:summary="@string/EPr_support_summary">
-	    <PreferenceScreen android:title="@string/p_about" android:key="@string/p_about" />
-	    <PreferenceScreen android:title="@string/welcome_setting" android:key="@string/p_tutorial"/>
-	    <PreferenceScreen android:title="@string/EPr_faq_title" android:key="@string/p_help"/>
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/EPr_title">
+
+    <PreferenceScreen
+            android:title="@string/EPr_account_title"
+            android:key="@string/p_account"
+            android:summary="@string/actfm_account_info_summary"/>
+
+    <PreferenceScreen
+            android:title="@string/p_help"
+            android:summary="@string/EPr_support_summary">
+        <PreferenceScreen
+                android:title="@string/p_about"
+                android:key="@string/p_about"/>
+        <PreferenceScreen
+                android:title="@string/welcome_setting"
+                android:key="@string/p_tutorial"/>
+        <PreferenceScreen
+                android:title="@string/EPr_faq_title"
+                android:key="@string/p_help"/>
     </PreferenceScreen>
-    
-    <PreferenceScreen android:title="@string/EPr_share_astrid"
-        android:key="@string/EPr_share_astrid"
-        android:summary="@string/EPr_share_astrid_summary"/>
-    
+
+    <PreferenceScreen
+            android:title="@string/EPr_share_astrid"
+            android:key="@string/EPr_share_astrid"
+            android:summary="@string/EPr_share_astrid_summary"/>
+
     <PreferenceCategory android:title="@string/EPr_title"/>
-    
+
     <PreferenceScreen
-        android:title="@string/EPr_appearance_header"
-        android:summary="@string/EPr_appearance_summary">
-        
+            android:title="@string/EPr_appearance_header"
+            android:summary="@string/EPr_appearance_summary">
+
         <com.todoroo.astrid.ui.MultilineListPreference
-            android:key="@string/p_theme"
-            android:entries="@array/EPr_themes"
-            android:entryValues="@array/EPr_theme_settings"
-            android:title="@string/EPr_theme_title" />
-        
+                android:key="@string/p_theme"
+                android:entries="@array/EPr_themes"
+                android:entryValues="@array/EPr_theme_settings"
+                android:title="@string/EPr_theme_title"/>
+
         <com.todoroo.astrid.ui.MultilineListPreference
-            android:key="@string/p_theme_widget"
-            android:entries="@array/EPr_themes_widget"
-            android:entryValues="@array/EPr_theme_widget_settings"
-            android:title="@string/EPr_theme_widget_title" />
-        
-        <PreferenceScreen android:title="@string/EPr_taskRowPrefs_title" android:key="@string/p_taskRowPrefs">
-        
-	        <com.todoroo.astrid.ui.MultilineListPreference
-	            android:key="@string/p_fontSize"
-	            android:entries="@array/EPr_font_size"
-	            android:entryValues="@array/EPr_font_size"
-	            android:title="@string/EPr_fontSize_title"
-	            android:summary="@string/EPr_fontSize_desc" />
-	        
-	        <com.todoroo.astrid.ui.MultilineListPreference
-	            android:key="@string/p_taskRowStyle_v2"
-	            android:entries="@array/EPr_task_row_styles"
-	            android:entryValues="@array/EPr_task_row_style_values" />
-	        
-	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	            android:key="@string/p_fullTaskTitle"
-	            android:title="@string/EPr_fullTask_title"
-	            android:defaultValue="false" />
-	        
-	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	            android:key="@string/p_showNotes"
-	            android:title="@string/EPr_showNotes_title"
-	            android:defaultValue="false" />
-        
+                android:key="@string/p_theme_widget"
+                android:entries="@array/EPr_themes_widget"
+                android:entryValues="@array/EPr_theme_widget_settings"
+                android:title="@string/EPr_theme_widget_title"/>
+
+        <PreferenceScreen
+                android:title="@string/EPr_taskRowPrefs_title"
+                android:key="@string/p_taskRowPrefs">
+
+            <com.todoroo.astrid.ui.MultilineListPreference
+                    android:key="@string/p_fontSize"
+                    android:entries="@array/EPr_font_size"
+                    android:entryValues="@array/EPr_font_size"
+                    android:title="@string/EPr_fontSize_title"
+                    android:summary="@string/EPr_fontSize_desc"/>
+
+            <com.todoroo.astrid.ui.MultilineListPreference
+                    android:key="@string/p_taskRowStyle_v2"
+                    android:entries="@array/EPr_task_row_styles"
+                    android:entryValues="@array/EPr_task_row_style_values"/>
+
+            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                    android:key="@string/p_fullTaskTitle"
+                    android:title="@string/EPr_fullTask_title"
+                    android:defaultValue="false"/>
+
+            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                    android:key="@string/p_showNotes"
+                    android:title="@string/EPr_showNotes_title"
+                    android:defaultValue="false"/>
+
         </PreferenceScreen>
-        
-        <PreferenceScreen android:title="@string/EPr_edit_screen_options" 
+
+        <PreferenceScreen
+                android:title="@string/EPr_edit_screen_options"
                 android:key="@string/p_edit_screen">
-	        
-	        <PreferenceScreen android:title="@string/EPr_beastMode_title" 
-	            android:key="@string/p_beastMode"/>
-	            
-	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	            android:key="@string/p_show_task_edit_comments"
-	            android:title="@string/EPr_show_task_edit_comments"
-	            android:defaultValue="true"/>
-	        
-	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	            android:key="@string/p_save_and_cancel"
-	            android:title="@string/EPr_show_save_and_cancel"
-	            android:defaultValue="false"/>
-	        
-	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	            android:key="@string/p_use_date_shortcuts"
-	            android:title="@string/EPr_use_date_shortcuts"
-	            android:defaultValue="true"/>
-	        
-	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-                android:key="@string/p_time_increment"
-                android:title="@string/EPr_time_increment"
-                android:defaultValue="true"/>
-	        
-	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	            android:key="@string/p_show_timer_shortcut"
-	            android:title="@string/EPr_show_timer_shortcut"
-	            android:defaultValue="false"/>
-            
+
+            <PreferenceScreen
+                    android:title="@string/EPr_beastMode_title"
+                    android:key="@string/p_beastMode"/>
+
+            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                    android:key="@string/p_show_task_edit_comments"
+                    android:title="@string/EPr_show_task_edit_comments"
+                    android:defaultValue="true"/>
+
+            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                    android:key="@string/p_save_and_cancel"
+                    android:title="@string/EPr_show_save_and_cancel"
+                    android:defaultValue="false"/>
+
+            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                    android:key="@string/p_use_date_shortcuts"
+                    android:title="@string/EPr_use_date_shortcuts"
+                    android:defaultValue="true"/>
+
+            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                    android:key="@string/p_time_increment"
+                    android:title="@string/EPr_time_increment"
+                    android:defaultValue="true"/>
+
+            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                    android:key="@string/p_show_timer_shortcut"
+                    android:title="@string/EPr_show_timer_shortcut"
+                    android:defaultValue="false"/>
+
         </PreferenceScreen>
-        
-        <PreferenceScreen android:title="@string/EPr_list_view" android:key="@string/p_list_view">
-            <PreferenceScreen android:title="@string/EPr_menu_items" android:key="@string/p_menu_items">
-	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	                android:key="@string/p_show_menu_search"
-	                android:title="@string/TLA_menu_search"
-	                android:defaultValue="true" />
-	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	                android:key="@string/p_show_menu_friends"
-	                android:title="@string/TLA_menu_friends"
-	                android:defaultValue="true"/>
-	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	                android:key="@string/p_show_menu_sync"
-	                android:title="@string/TLA_menu_sync"
-	                android:defaultValue="true"/>
-	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	                android:key="@string/p_show_menu_sort"
-	                android:title="@string/TLA_menu_sort"
-	                android:defaultValue="true"/>
-	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-		            android:key="@string/p_use_filters"
-		            android:title="@string/EPr_use_filters_title"
-		            android:summary="@string/EPr_use_filters_subtitle"
-		            android:defaultValue="true"/>
+
+        <PreferenceScreen
+                android:title="@string/EPr_list_view"
+                android:key="@string/p_list_view">
+            <PreferenceScreen
+                    android:title="@string/EPr_menu_items"
+                    android:key="@string/p_menu_items">
+                <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                        android:key="@string/p_show_menu_search"
+                        android:title="@string/TLA_menu_search"
+                        android:defaultValue="true"/>
+                <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                        android:key="@string/p_show_menu_friends"
+                        android:title="@string/TLA_menu_friends"
+                        android:defaultValue="true"/>
+                <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                        android:key="@string/p_show_menu_sync"
+                        android:title="@string/TLA_menu_sync"
+                        android:defaultValue="true"/>
+                <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                        android:key="@string/p_show_menu_sort"
+                        android:title="@string/TLA_menu_sort"
+                        android:defaultValue="true"/>
+                <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                        android:key="@string/p_use_filters"
+                        android:title="@string/EPr_use_filters_title"
+                        android:summary="@string/EPr_use_filters_subtitle"
+                        android:defaultValue="true"/>
+            </PreferenceScreen>
+
+            <PreferenceScreen
+                    android:title="@string/EPr_filters_to_show_title"
+                    android:key="@string/p_filters_to_show">
+                <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                        android:key="@string/p_show_my_tasks_filter"
+                        android:title="@string/BFE_Active"
+                        android:defaultValue="true"
+                        android:enabled="false"/>
+                <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                        android:key="@string/p_show_today_filter"
+                        android:title="@string/today"
+                        android:defaultValue="true"/>
+                <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                        android:key="@string/p_show_waiting_on_me_filter"
+                        android:title="@string/BFE_waiting_on_me"
+                        android:defaultValue="true"/>
+                <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                        android:key="@string/p_show_recently_modified_filter"
+                        android:title="@string/BFE_Recent"
+                        android:defaultValue="true"/>
+                <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                        android:key="@string/p_show_ive_assigned_filter"
+                        android:title="@string/BFE_Assigned"
+                        android:defaultValue="true"/>
+                <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                        android:key="@string/p_show_not_in_list_filter"
+                        android:title="@string/tag_FEx_untagged"
+                        android:defaultValue="true"/>
             </PreferenceScreen>
-        
-	        <PreferenceScreen android:title="@string/EPr_filters_to_show_title" android:key="@string/p_filters_to_show">
-	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	                android:key="@string/p_show_my_tasks_filter"
-	                android:title="@string/BFE_Active"
-	                android:defaultValue="true"
-	                android:enabled="false" />
-	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	                android:key="@string/p_show_today_filter"
-	                android:title="@string/today"
-	                android:defaultValue="true"/>
-	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	                android:key="@string/p_show_waiting_on_me_filter"
-	                android:title="@string/BFE_waiting_on_me"
-	                android:defaultValue="true"/>
-	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	                android:key="@string/p_show_recently_modified_filter"
-	                android:title="@string/BFE_Recent"
-	                android:defaultValue="true"/>
-	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	                android:key="@string/p_show_ive_assigned_filter"
-	                android:title="@string/BFE_Assigned"
-	                android:defaultValue="true"/>
-	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	                android:key="@string/p_show_not_in_list_filter"
-	                android:title="@string/tag_FEx_untagged"
-	                android:defaultValue="true"/>
-	        </PreferenceScreen>
-	        
-	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	            android:key="@string/p_show_quickadd_controls"
-	            android:title="@string/EPr_show_quickadd_controls"
-	            android:defaultValue="true" />
-	        
-	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	                android:key="@string/p_hide_plus_button"
-	                android:title="@string/EPr_hide_plus_button"
-	                android:defaultValue="false"/>
-	        
-	        <CheckBoxPreference
-	            android:key="@string/p_swipe_lists_enabled"
-	            android:title="@string/EPr_swipe_lists_performance_title" 
-	            android:defaultValue="false"/>
-	        
-	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	            android:key="@string/p_show_list_members"
-	            android:title="@string/EPr_show_list_members_title"
-	            android:defaultValue="true"/>
-	        
-	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	            android:key="@string/p_voiceInputEnabled"
-	            android:title="@string/EPr_voiceInputEnabled_title"
-	            android:defaultValue="true" />
+
+            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                    android:key="@string/p_show_quickadd_controls"
+                    android:title="@string/EPr_show_quickadd_controls"
+                    android:defaultValue="true"/>
+
+            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                    android:key="@string/p_hide_plus_button"
+                    android:title="@string/EPr_hide_plus_button"
+                    android:defaultValue="false"/>
+
+            <CheckBoxPreference
+                    android:key="@string/p_swipe_lists_enabled"
+                    android:title="@string/EPr_swipe_lists_performance_title"
+                    android:defaultValue="false"/>
+
+            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                    android:key="@string/p_show_list_members"
+                    android:title="@string/EPr_show_list_members_title"
+                    android:defaultValue="true"/>
+
+            <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                    android:key="@string/p_voiceInputEnabled"
+                    android:title="@string/EPr_voiceInputEnabled_title"
+                    android:defaultValue="true"/>
         </PreferenceScreen>
-        
+
         <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:key="@string/p_showSmartConfirmation_key"
-            android:title="@string/EPr_showSmartConfirmation_title"
-            android:defaultValue="true"/>
-        
+                android:key="@string/p_showSmartConfirmation_key"
+                android:title="@string/EPr_showSmartConfirmation_title"
+                android:defaultValue="true"/>
+
         <CheckBoxPreference
-	        android:title="@string/EPr_force_phone_layout"
-	        android:key="@string/p_force_phone_layout"
-	        android:defaultValue="false"/>
-        
+                android:title="@string/EPr_force_phone_layout"
+                android:key="@string/p_force_phone_layout"
+                android:defaultValue="false"/>
+
         <CheckBoxPreference
-	        android:key="@string/p_use_contact_picker"
-	        android:title="@string/EPr_use_contact_picker"/>
-        
-        <PreferenceScreen android:key="@string/p_configurations" 
-                          android:title="@string/EPr_configurations_title">
-            <PreferenceScreen android:title="@string/EPr_config_default" android:key="@string/p_config_default" />
-            <PreferenceScreen android:title="@string/EPr_config_lite" android:key="@string/p_config_lite"/>    
+                android:key="@string/p_use_contact_picker"
+                android:title="@string/EPr_use_contact_picker"/>
+
+        <PreferenceScreen
+                android:key="@string/p_configurations"
+                android:title="@string/EPr_configurations_title">
+            <PreferenceScreen
+                    android:title="@string/EPr_config_default"
+                    android:key="@string/p_config_default"/>
+            <PreferenceScreen
+                    android:title="@string/EPr_config_lite"
+                    android:key="@string/p_config_lite"/>
         </PreferenceScreen>
-             
+
     </PreferenceScreen>
 
 </PreferenceScreen>
diff --git a/astrid/res/xml/preferences_actfm.xml b/astrid/res/xml/preferences_actfm.xml
index 5e71c9ac1..54e7f0a8a 100644
--- a/astrid/res/xml/preferences_actfm.xml
+++ b/astrid/res/xml/preferences_actfm.xml
@@ -4,56 +4,56 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<PreferenceScreen  
-    xmlns:android="http://schemas.android.com/apk/res/android">  
-    
+<PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android">
+
     <com.todoroo.astrid.ui.MultilinePreference
-        android:key="@string/actfm_account_type"
-        android:title="@string/actfm_account_type"
-        android:enabled="false"/>
-    
+            android:key="@string/actfm_account_type"
+            android:title="@string/actfm_account_type"
+            android:enabled="false"/>
+
     <PreferenceScreen
-        android:key="@string/actfm_inapp_billing"
-        android:title="@string/actfm_inapp_billing"
-        android:summary="@string/actfm_inapp_billing_summary"/>
-    
+            android:key="@string/actfm_inapp_billing"
+            android:title="@string/actfm_inapp_billing"
+            android:summary="@string/actfm_inapp_billing_summary"/>
+
     <PreferenceCategory
-        android:key="@string/sync_SPr_key_options"
-        android:title="@string/sync_SPr_group_options">
-    
-        <com.todoroo.astrid.ui.MultilineListPreference  
-            android:key="@string/actfm_APr_interval_key"  
-            android:entries="@array/sync_SPr_interval_entries"  
-            android:entryValues="@array/sync_SPr_interval_values"  
-            android:title="@string/sync_SPr_interval_title" />
-        
+            android:key="@string/sync_SPr_key_options"
+            android:title="@string/sync_SPr_group_options">
+
+        <com.todoroo.astrid.ui.MultilineListPreference
+                android:key="@string/actfm_APr_interval_key"
+                android:entries="@array/sync_SPr_interval_entries"
+                android:entryValues="@array/sync_SPr_interval_values"
+                android:title="@string/sync_SPr_interval_title"/>
+
         <com.todoroo.astrid.ui.MultilineCheckboxPreference
-            android:key="@string/actfm_https_key"
-            android:title="@string/actfm_https_title"
-            android:defaultValue="false"/>
+                android:key="@string/actfm_https_key"
+                android:title="@string/actfm_https_title"
+                android:defaultValue="false"/>
 
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="@string/sync_SPr_group_status"
-        android:title="@string/sync_SPr_group_status">
-    
+            android:key="@string/sync_SPr_group_status"
+            android:title="@string/sync_SPr_group_status">
+
         <com.todoroo.astrid.ui.MultilinePreference
-            android:layout="@layout/status_preference"
-            android:key="@string/sync_SPr_status_key"  
-            android:textSize="24sp"
-            android:gravity="center"/>
-        
+                android:layout="@layout/status_preference"
+                android:key="@string/sync_SPr_status_key"
+                android:textSize="24sp"
+                android:gravity="center"/>
+
         <com.todoroo.astrid.ui.MultilinePreference
-            android:key="@string/sync_SPr_key_last_error"
-            android:textSize="24sp"
-            android:gravity="center"/>
-        
-            
+                android:key="@string/sync_SPr_key_last_error"
+                android:textSize="24sp"
+                android:gravity="center"/>
+
+
     </PreferenceCategory>
     <com.todoroo.astrid.ui.MultilinePreference
-        android:key="@string/sync_SPr_forget_key"
-        android:title="@string/sync_SPr_forget"
-        android:summary="@string/sync_SPr_forget_description" />
-            
+            android:key="@string/sync_SPr_forget_key"
+            android:title="@string/sync_SPr_forget"
+            android:summary="@string/sync_SPr_forget_description"/>
+
 </PreferenceScreen>  
\ No newline at end of file
diff --git a/astrid/res/xml/preferences_backup.xml b/astrid/res/xml/preferences_backup.xml
index 4cd8433c9..46e2f0d6d 100644
--- a/astrid/res/xml/preferences_backup.xml
+++ b/astrid/res/xml/preferences_backup.xml
@@ -4,40 +4,40 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<PreferenceScreen  
-    xmlns:android="http://schemas.android.com/apk/res/android">  
-       
+<PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android">
+
     <PreferenceCategory
-        android:title="@string/backup_BPr_group_status">
-    
+            android:title="@string/backup_BPr_group_status">
+
         <com.todoroo.astrid.ui.MultilinePreference
-            android:layout="@layout/status_preference"
-            android:key="@string/backup_BPr_status_key"  
-            android:textSize="24sp"
-            android:gravity="center"/>
-        
+                android:layout="@layout/status_preference"
+                android:key="@string/backup_BPr_status_key"
+                android:textSize="24sp"
+                android:gravity="center"/>
+
     </PreferenceCategory>
-            
+
     <PreferenceCategory
-        android:title="@string/backup_BPr_group_options">
-    
-        <com.todoroo.astrid.ui.MultilineCheckboxPreference  
-            android:key="@string/backup_BPr_auto_key"   
-            android:title="@string/backup_BPr_auto_title" 
-            android:defaultValue="true" />
-            
+            android:title="@string/backup_BPr_group_options">
+
+        <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                android:key="@string/backup_BPr_auto_key"
+                android:title="@string/backup_BPr_auto_title"
+                android:defaultValue="true"/>
+
     </PreferenceCategory>
-    
+
     <com.todoroo.astrid.ui.MultilinePreference
-            android:key="@string/backup_BAc_label" 
-            android:title="@string/backup_BAc_label" 
+            android:key="@string/backup_BAc_label"
+            android:title="@string/backup_BAc_label"
             android:textSize="24sp"
             android:gravity="center"/>
-    
+
     <com.todoroo.astrid.ui.MultilinePreference
-        android:key="@string/backup_BAc_cloud"
-        android:title="@string/backup_BAc_cloud"
-        android:textSize="24sp"
-        android:gravity="center" />
-            
+            android:key="@string/backup_BAc_cloud"
+            android:title="@string/backup_BAc_cloud"
+            android:textSize="24sp"
+            android:gravity="center"/>
+
 </PreferenceScreen>  
\ No newline at end of file
diff --git a/astrid/res/xml/preferences_blank.xml b/astrid/res/xml/preferences_blank.xml
index 5549f98d1..94734d88b 100644
--- a/astrid/res/xml/preferences_blank.xml
+++ b/astrid/res/xml/preferences_blank.xml
@@ -5,6 +5,6 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/EPr_title">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/EPr_title">
 </PreferenceScreen>
diff --git a/astrid/res/xml/preferences_defaults.xml b/astrid/res/xml/preferences_defaults.xml
index bde937184..94af6bbc4 100644
--- a/astrid/res/xml/preferences_defaults.xml
+++ b/astrid/res/xml/preferences_defaults.xml
@@ -5,45 +5,45 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/EPr_defaults_header">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/EPr_defaults_header">
     <com.todoroo.astrid.ui.MultilineListPreference
-        android:key="@string/p_default_importance_key"
-        android:entries="@array/EPr_default_importance"
-        android:entryValues="@array/EPr_default_importance_values"
-        android:title="@string/EPr_default_importance_title" />
+            android:key="@string/p_default_importance_key"
+            android:entries="@array/EPr_default_importance"
+            android:entryValues="@array/EPr_default_importance_values"
+            android:title="@string/EPr_default_importance_title"/>
     <com.todoroo.astrid.ui.MultilineListPreference
-        android:key="@string/p_default_urgency_key"
-        android:entries="@array/EPr_default_urgency"
-        android:entryValues="@array/EPr_default_urgency_values"
-        android:title="@string/EPr_default_urgency_title" />
+            android:key="@string/p_default_urgency_key"
+            android:entries="@array/EPr_default_urgency"
+            android:entryValues="@array/EPr_default_urgency_values"
+            android:title="@string/EPr_default_urgency_title"/>
     <com.todoroo.astrid.ui.MultilineListPreference
-        android:key="@string/p_default_hideUntil_key"
-        android:entries="@array/EPr_default_hideUntil"
-        android:entryValues="@array/EPr_default_hideUntil_values"
-        android:title="@string/EPr_default_hideUntil_title" />
+            android:key="@string/p_default_hideUntil_key"
+            android:entries="@array/EPr_default_hideUntil"
+            android:entryValues="@array/EPr_default_hideUntil_values"
+            android:title="@string/EPr_default_hideUntil_title"/>
     <com.todoroo.astrid.ui.MultilineListPreference
-        android:key="@string/p_default_reminders_key"
-        android:entries="@array/EPr_default_reminders"
-        android:entryValues="@array/EPr_default_reminders_values"
-        android:title="@string/EPr_default_reminders_title" />
+            android:key="@string/p_default_reminders_key"
+            android:entries="@array/EPr_default_reminders"
+            android:entryValues="@array/EPr_default_reminders_values"
+            android:title="@string/EPr_default_reminders_title"/>
     <com.todoroo.astrid.ui.MultilineListPreference
-        android:key="@string/p_rmd_default_random_hours"
-        android:title="@string/rmd_EPr_defaultRemind_title"
-        android:entries="@array/EPr_reminder_random"
-        android:entryValues="@array/EPr_reminder_random_hours" />
+            android:key="@string/p_rmd_default_random_hours"
+            android:title="@string/rmd_EPr_defaultRemind_title"
+            android:entries="@array/EPr_reminder_random"
+            android:entryValues="@array/EPr_reminder_random_hours"/>
     <ListPreference
-        android:key="@string/p_default_reminders_mode_key"
-        android:title="@string/EPr_default_reminders_mode_title"
-        android:entries="@array/EPr_default_reminders_mode"
-        android:entryValues="@array/EPr_default_reminders_mode_values" />
+            android:key="@string/p_default_reminders_mode_key"
+            android:title="@string/EPr_default_reminders_mode_title"
+            android:entries="@array/EPr_default_reminders_mode"
+            android:entryValues="@array/EPr_default_reminders_mode_values"/>
     <com.todoroo.astrid.ui.MultilineListPreference
-        android:title="@string/EPr_default_addtocalendar_title"
-        android:key="@string/gcal_p_default"
-        android:entries="@array/EPr_default_addtocalendar"
-        android:entryValues="@array/EPr_default_addtocalendar_values" />
+            android:title="@string/EPr_default_addtocalendar_title"
+            android:key="@string/gcal_p_default"
+            android:entries="@array/EPr_default_addtocalendar"
+            android:entryValues="@array/EPr_default_addtocalendar_values"/>
     <com.todoroo.astrid.ui.MultilineCheckboxPreference
-        android:key="@string/p_voiceInputCreatesTask"
-        android:title="@string/EPr_voiceInputCreatesTask_title"
-        android:defaultValue="false" />
+            android:key="@string/p_voiceInputCreatesTask"
+            android:title="@string/EPr_voiceInputCreatesTask_title"
+            android:defaultValue="false"/>
 </PreferenceScreen>
diff --git a/astrid/res/xml/preferences_gtasks.xml b/astrid/res/xml/preferences_gtasks.xml
index 750e1e7a1..294007d9e 100644
--- a/astrid/res/xml/preferences_gtasks.xml
+++ b/astrid/res/xml/preferences_gtasks.xml
@@ -4,41 +4,41 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<PreferenceScreen  
-    xmlns:android="http://schemas.android.com/apk/res/android">  
-       
+<PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android">
+
     <PreferenceCategory
-        android:key="@string/sync_SPr_group_status"
-        android:title="@string/sync_SPr_group_status">
-    
+            android:key="@string/sync_SPr_group_status"
+            android:title="@string/sync_SPr_group_status">
+
         <com.todoroo.astrid.ui.MultilinePreference
-            android:layout="@layout/status_preference"
-            android:key="@string/sync_SPr_status_key"  
-            android:textSize="24sp"
-            android:gravity="center"/>
-        
+                android:layout="@layout/status_preference"
+                android:key="@string/sync_SPr_status_key"
+                android:textSize="24sp"
+                android:gravity="center"/>
+
         <com.todoroo.astrid.ui.MultilinePreference
-            android:key="@string/sync_SPr_key_last_error"
-            android:textSize="24sp"
-            android:gravity="center"/>
-        
+                android:key="@string/sync_SPr_key_last_error"
+                android:textSize="24sp"
+                android:gravity="center"/>
+
     </PreferenceCategory>
-            
+
     <PreferenceCategory
-        android:key="@string/sync_SPr_key_options"
-        android:title="@string/sync_SPr_group_options">
-    
-        <com.todoroo.astrid.ui.MultilineListPreference  
-            android:key="@string/gtasks_GPr_interval_key"  
-            android:entries="@array/sync_SPr_interval_entries"  
-            android:entryValues="@array/sync_SPr_interval_values"  
-            android:title="@string/sync_SPr_interval_title" />
-    
+            android:key="@string/sync_SPr_key_options"
+            android:title="@string/sync_SPr_group_options">
+
+        <com.todoroo.astrid.ui.MultilineListPreference
+                android:key="@string/gtasks_GPr_interval_key"
+                android:entries="@array/sync_SPr_interval_entries"
+                android:entryValues="@array/sync_SPr_interval_values"
+                android:title="@string/sync_SPr_interval_title"/>
+
         <com.todoroo.astrid.ui.MultilinePreference
-            android:key="@string/sync_SPr_forget_key"
-            android:title="@string/sync_SPr_forget"
-            android:summary="@string/sync_SPr_forget_description" />
-        
+                android:key="@string/sync_SPr_forget_key"
+                android:title="@string/sync_SPr_forget"
+                android:summary="@string/sync_SPr_forget_description"/>
+
     </PreferenceCategory>
-            
+
 </PreferenceScreen>  
\ No newline at end of file
diff --git a/astrid/res/xml/preferences_misc.xml b/astrid/res/xml/preferences_misc.xml
index 3185af34b..61d46dc66 100644
--- a/astrid/res/xml/preferences_misc.xml
+++ b/astrid/res/xml/preferences_misc.xml
@@ -1,34 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/EPr_powerpack_header">
-	<PreferenceScreen
-	    android:title="@string/EPr_powerpack_header"
-	    android:summary="@string/EPr_powerpack_summary">
-	    
-	    <PreferenceScreen android:title="@string/p_files_dir" android:key="@string/p_files_dir" />
-	    
-	    <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	        android:key="@string/p_voiceRemindersEnabled"
-	        android:title="@string/EPr_voiceRemindersEnabled_title"
-	        android:defaultValue="false" />
-	
-	    <CheckBoxPreference
-	        android:key="@string/p_field_missed_calls"
-	        android:title="@string/MCA_missed_calls_pref_title"/>
-	    
-	    <CheckBoxPreference
-	        android:key="@string/p_calendar_reminders"
-	        android:title="@string/CRA_calendar_reminders_pref_title" />
-	    
-	    <CheckBoxPreference
-	        android:title="@string/EPr_cal_end_or_start_at_due_time"
-	        android:key = "@string/p_end_at_deadline" />
-	    
-	    <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	        android:key="@string/p_statistics"
-	        android:title="@string/EPr_statistics_title"
-	        android:defaultValue="true" />   
-	      
-	</PreferenceScreen>
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/EPr_powerpack_header">
+    <PreferenceScreen
+            android:title="@string/EPr_powerpack_header"
+            android:summary="@string/EPr_powerpack_summary">
+
+        <PreferenceScreen
+                android:title="@string/p_files_dir"
+                android:key="@string/p_files_dir"/>
+
+        <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                android:key="@string/p_voiceRemindersEnabled"
+                android:title="@string/EPr_voiceRemindersEnabled_title"
+                android:defaultValue="false"/>
+
+        <CheckBoxPreference
+                android:key="@string/p_field_missed_calls"
+                android:title="@string/MCA_missed_calls_pref_title"/>
+
+        <CheckBoxPreference
+                android:key="@string/p_calendar_reminders"
+                android:title="@string/CRA_calendar_reminders_pref_title"/>
+
+        <CheckBoxPreference
+                android:title="@string/EPr_cal_end_or_start_at_due_time"
+                android:key="@string/p_end_at_deadline"/>
+
+        <com.todoroo.astrid.ui.MultilineCheckboxPreference
+                android:key="@string/p_statistics"
+                android:title="@string/EPr_statistics_title"
+                android:defaultValue="true"/>
+
+    </PreferenceScreen>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/astrid/res/xml/preferences_oldtasks.xml b/astrid/res/xml/preferences_oldtasks.xml
index 29d250f9e..1984f7279 100644
--- a/astrid/res/xml/preferences_oldtasks.xml
+++ b/astrid/res/xml/preferences_oldtasks.xml
@@ -5,36 +5,36 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/EPr_manage_header">
-    
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/EPr_manage_header">
+
     <com.todoroo.astrid.ui.MultilinePreference
-        android:title="@string/EPr_reset_sync_state"
-        android:key="@string/EPr_reset_sync_state"
-        android:summary="@string/EPr_reset_sync_state_summary" />
-    
+            android:title="@string/EPr_reset_sync_state"
+            android:key="@string/EPr_reset_sync_state"
+            android:summary="@string/EPr_reset_sync_state_summary"/>
+
     <com.todoroo.astrid.ui.MultilinePreference
-        android:title="@string/EPr_manage_delete_completed"
-        android:key="@string/EPr_manage_delete_completed" 
-        android:summary="@string/EPr_manage_delete_completed_summary"/>
-        
+            android:title="@string/EPr_manage_delete_completed"
+            android:key="@string/EPr_manage_delete_completed"
+            android:summary="@string/EPr_manage_delete_completed_summary"/>
+
     <com.todoroo.astrid.ui.MultilinePreference
-        android:title="@string/EPr_manage_purge_deleted"
-        android:key="@string/EPr_manage_purge_deleted" 
-        android:summary="@string/EPr_manage_purge_deleted_summary"/>
+            android:title="@string/EPr_manage_purge_deleted"
+            android:key="@string/EPr_manage_purge_deleted"
+            android:summary="@string/EPr_manage_purge_deleted_summary"/>
 
     <com.todoroo.astrid.ui.MultilinePreference
-        android:title="@string/EPr_manage_delete_completed_gcal"
-        android:key="@string/EPr_manage_delete_completed_gcal" 
-        android:summary="@string/EPr_manage_delete_completed_gcal_summary"/>
-        
+            android:title="@string/EPr_manage_delete_completed_gcal"
+            android:key="@string/EPr_manage_delete_completed_gcal"
+            android:summary="@string/EPr_manage_delete_completed_gcal_summary"/>
+
     <com.todoroo.astrid.ui.MultilinePreference
-        android:title="@string/EPr_manage_delete_all_gcal"
-        android:key="@string/EPr_manage_delete_all_gcal" 
-        android:summary="@string/EPr_manage_delete_all_gcal_summary"/>
-        
+            android:title="@string/EPr_manage_delete_all_gcal"
+            android:key="@string/EPr_manage_delete_all_gcal"
+            android:summary="@string/EPr_manage_delete_all_gcal_summary"/>
+
     <Preference
-        android:title="@string/EPr_manage_clear_all"
-        android:key="@string/EPr_manage_clear_all" />
+            android:title="@string/EPr_manage_clear_all"
+            android:key="@string/EPr_manage_clear_all"/>
 
 </PreferenceScreen>
diff --git a/astrid/res/xml/preferences_opencrx.xml b/astrid/res/xml/preferences_opencrx.xml
index bb46a17b0..078bd27f3 100644
--- a/astrid/res/xml/preferences_opencrx.xml
+++ b/astrid/res/xml/preferences_opencrx.xml
@@ -4,69 +4,69 @@
 **
 ** See the file "LICENSE" for the full license governing this code. 
 -->
-<PreferenceScreen  
-    xmlns:android="http://schemas.android.com/apk/res/android">  
-       
+<PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android">
+
     <PreferenceCategory
-        android:title="@string/sync_SPr_group_status">
-    
+            android:title="@string/sync_SPr_group_status">
+
         <com.todoroo.astrid.ui.MultilinePreference
-            android:layout="@layout/status_preference"
-            android:key="@string/sync_SPr_status_key"  
-            android:textSize="24sp"
-            android:gravity="center"/>
-        
+                android:layout="@layout/status_preference"
+                android:key="@string/sync_SPr_status_key"
+                android:textSize="24sp"
+                android:gravity="center"/>
+
     </PreferenceCategory>
-            
+
     <PreferenceCategory
-        android:title="@string/sync_SPr_group_options">
-    
-        <com.todoroo.astrid.ui.MultilineListPreference  
-            android:key="@string/opencrx_PPr_interval_key"  
-            android:entries="@array/sync_SPr_interval_entries"  
-            android:entryValues="@array/sync_SPr_interval_values"  
-            android:title="@string/sync_SPr_interval_title" />
-    
-        <com.todoroo.astrid.ui.MultilineListPreference  
-            android:key="@string/opencrx_PPr_defaultcreator_key"  
-            android:title="@string/opencrx_PPr_defaultcreator_title" />
-            
+            android:title="@string/sync_SPr_group_options">
+
+        <com.todoroo.astrid.ui.MultilineListPreference
+                android:key="@string/opencrx_PPr_interval_key"
+                android:entries="@array/sync_SPr_interval_entries"
+                android:entryValues="@array/sync_SPr_interval_values"
+                android:title="@string/sync_SPr_interval_title"/>
+
+        <com.todoroo.astrid.ui.MultilineListPreference
+                android:key="@string/opencrx_PPr_defaultcreator_key"
+                android:title="@string/opencrx_PPr_defaultcreator_title"/>
+
     </PreferenceCategory>
-    
+
     <PreferenceCategory
-        android:title="@string/opencrx_group">
-        <EditTextPreference 
-        	android:key="@string/opencrx_PPr_host_key" 
-        	android:title="@string/opencrx_host_title"
-        	android:dialogTitle="@string/opencrx_host_dialog_title"
-        	android:summary="@string/opencrx_host_summary"
-        	/>
-        <EditTextPreference 
-        	android:key="@string/opencrx_PPr_segment_key" 
-        	android:title="@string/opencrx_segment_title"
-        	android:dialogTitle="@string/opencrx_segment_dialog_title"
-        	android:summary="@string/opencrx_segment_summary"
-        	android:defaultValue="@string/opencrx_segment_default"
-        	/>
-        <EditTextPreference 
-        	android:key="@string/opencrx_PPr_provider_key" 
-        	android:title="@string/opencrx_provider_title"
-        	android:dialogTitle="@string/opencrx_provider_dialog_title"
-        	android:summary="@string/opencrx_provider_summary"
-        	android:defaultValue="@string/opencrx_provider_default"
-        	/>
+            android:title="@string/opencrx_group">
+        <EditTextPreference
+                android:key="@string/opencrx_PPr_host_key"
+                android:title="@string/opencrx_host_title"
+                android:dialogTitle="@string/opencrx_host_dialog_title"
+                android:summary="@string/opencrx_host_summary"
+                />
+        <EditTextPreference
+                android:key="@string/opencrx_PPr_segment_key"
+                android:title="@string/opencrx_segment_title"
+                android:dialogTitle="@string/opencrx_segment_dialog_title"
+                android:summary="@string/opencrx_segment_summary"
+                android:defaultValue="@string/opencrx_segment_default"
+                />
+        <EditTextPreference
+                android:key="@string/opencrx_PPr_provider_key"
+                android:title="@string/opencrx_provider_title"
+                android:dialogTitle="@string/opencrx_provider_dialog_title"
+                android:summary="@string/opencrx_provider_summary"
+                android:defaultValue="@string/opencrx_provider_default"
+                />
     </PreferenceCategory>
-    
+
     <PreferenceCategory
-        android:title="@string/sync_SPr_group_actions">
+            android:title="@string/sync_SPr_group_actions">
         <com.todoroo.astrid.ui.MultilinePreference
-            android:key="@string/sync_SPr_sync_key"
-            android:title="@string/sync_SPr_sync" />
-    
+                android:key="@string/sync_SPr_sync_key"
+                android:title="@string/sync_SPr_sync"/>
+
         <com.todoroo.astrid.ui.MultilinePreference
-            android:key="@string/sync_SPr_forget_key"
-            android:title="@string/sync_SPr_forget"
-            android:summary="@string/sync_SPr_forget_description" />
+                android:key="@string/sync_SPr_forget_key"
+                android:title="@string/sync_SPr_forget"
+                android:summary="@string/sync_SPr_forget_description"/>
     </PreferenceCategory>
-            
+
 </PreferenceScreen>  
\ No newline at end of file
diff --git a/astrid/res/xml/preferences_reminders.xml b/astrid/res/xml/preferences_reminders.xml
index 4f024a70f..ba1b532f6 100644
--- a/astrid/res/xml/preferences_reminders.xml
+++ b/astrid/res/xml/preferences_reminders.xml
@@ -5,57 +5,57 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/rmd_EPr_alerts_header">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/rmd_EPr_alerts_header">
 
     <com.todoroo.astrid.ui.MultilineListPreference
-        android:key="@string/p_rmd_quietStart"
-        android:entries="@array/EPr_quiet_hours_start"
-        android:entryValues="@array/EPr_quiet_hours_start_values"
-        android:title="@string/rmd_EPr_quiet_hours_start_title"/>
+            android:key="@string/p_rmd_quietStart"
+            android:entries="@array/EPr_quiet_hours_start"
+            android:entryValues="@array/EPr_quiet_hours_start_values"
+            android:title="@string/rmd_EPr_quiet_hours_start_title"/>
     <com.todoroo.astrid.ui.MultilineListPreference
-        android:key="@string/p_rmd_quietEnd"
-        android:entries="@array/EPr_quiet_hours_end"
-        android:entryValues="@array/EPr_quiet_hours_end_values"
-        android:title="@string/rmd_EPr_quiet_hours_end_title"/>
+            android:key="@string/p_rmd_quietEnd"
+            android:entries="@array/EPr_quiet_hours_end"
+            android:entryValues="@array/EPr_quiet_hours_end_values"
+            android:title="@string/rmd_EPr_quiet_hours_end_title"/>
     <com.todoroo.astrid.ui.MultilineListPreference
-        android:key="@string/p_rmd_time"
-        android:entries="@array/EPr_rmd_time"
-        android:entryValues="@array/EPr_rmd_time_values"
-        android:title="@string/rmd_EPr_rmd_time_title"/>
+            android:key="@string/p_rmd_time"
+            android:entries="@array/EPr_rmd_time"
+            android:entryValues="@array/EPr_rmd_time_values"
+            android:title="@string/rmd_EPr_rmd_time_title"/>
     <com.todoroo.astrid.ui.MultilineCheckboxPreference
-        android:key="@string/p_rmd_social"
-        android:title="@string/rmd_EPr_social_title"
-        android:summary="@string/rmd_EPr_social_summary_enabled"
-        android:defaultValue="true"/>
+            android:key="@string/p_rmd_social"
+            android:title="@string/rmd_EPr_social_title"
+            android:summary="@string/rmd_EPr_social_summary_enabled"
+            android:defaultValue="true"/>
     <com.todoroo.astrid.ui.MultilineCheckboxPreference
-        android:key="@string/p_rmd_persistent"
-        android:title="@string/rmd_EPr_persistent_title"/>
+            android:key="@string/p_rmd_persistent"
+            android:title="@string/rmd_EPr_persistent_title"/>
     <com.todoroo.astrid.ui.MultilineCheckboxPreference
-        android:key="@string/p_rmd_maxvolume"
-        android:title="@string/rmd_EPr_multiple_maxvolume_title"
-        android:defaultValue="false"  />
+            android:key="@string/p_rmd_maxvolume"
+            android:title="@string/rmd_EPr_multiple_maxvolume_title"
+            android:defaultValue="false"/>
     <com.todoroo.astrid.ui.MultilineCheckboxPreference
-        android:key="@string/p_rmd_vibrate"
-        android:title="@string/rmd_EPr_vibrate_title"
-        android:defaultValue="true"  />
+            android:key="@string/p_rmd_vibrate"
+            android:title="@string/rmd_EPr_vibrate_title"
+            android:defaultValue="true"/>
     <com.todoroo.astrid.ui.MultilineCheckboxPreference
-       android:key="@string/p_rmd_nagging"
-       android:title="@string/rmd_EPr_nagging_title"
-       android:defaultValue="true"  />
+            android:key="@string/p_rmd_nagging"
+            android:title="@string/rmd_EPr_nagging_title"
+            android:defaultValue="true"/>
     <com.todoroo.astrid.ui.MultilineCheckboxPreference
-       android:key="@string/p_rmd_snooze_dialog"
-       android:title="@string/rmd_EPr_snooze_dialog_title"
-       android:defaultValue="false"  />
+            android:key="@string/p_rmd_snooze_dialog"
+            android:title="@string/rmd_EPr_snooze_dialog_title"
+            android:defaultValue="false"/>
     <RingtonePreference
-        android:key="@string/p_rmd_ringtone"
-        android:title="@string/rmd_EPr_ringtone_title"
-        android:ringtoneType="notification"
-		android:showDefault="true"
-		android:showSilent="true" />
-	<com.todoroo.astrid.ui.MultilineCheckboxPreference
-        android:key="@string/p_rmd_enabled"
-        android:title="@string/rmd_EPr_enabled_title"
-        android:defaultValue="true"/>
-       
+            android:key="@string/p_rmd_ringtone"
+            android:title="@string/rmd_EPr_ringtone_title"
+            android:ringtoneType="notification"
+            android:showDefault="true"
+            android:showSilent="true"/>
+    <com.todoroo.astrid.ui.MultilineCheckboxPreference
+            android:key="@string/p_rmd_enabled"
+            android:title="@string/rmd_EPr_enabled_title"
+            android:defaultValue="true"/>
+
 </PreferenceScreen>
diff --git a/astrid/res/xml/widget_provider_info.xml b/astrid/res/xml/widget_provider_info.xml
index c9889a18c..e5fb5b7f2 100644
--- a/astrid/res/xml/widget_provider_info.xml
+++ b/astrid/res/xml/widget_provider_info.xml
@@ -6,8 +6,8 @@
 -->
 
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:configure="com.todoroo.astrid.widget.TasksWidget$ConfigActivity"
-    android:minWidth="142dip"
-    android:minHeight="142dip"
-    android:updatePeriodMillis="86400000"
-    android:initialLayout="@layout/widget_loading" />
+                    android:configure="com.todoroo.astrid.widget.TasksWidget$ConfigActivity"
+                    android:minWidth="142dip"
+                    android:minHeight="142dip"
+                    android:updatePeriodMillis="86400000"
+                    android:initialLayout="@layout/widget_loading"/>
diff --git a/astrid/src-legacy/com/timsu/astrid/activities/TaskList.java b/astrid/src-legacy/com/timsu/astrid/activities/TaskList.java
index 37b121628..87107bf5a 100644
--- a/astrid/src-legacy/com/timsu/astrid/activities/TaskList.java
+++ b/astrid/src-legacy/com/timsu/astrid/activities/TaskList.java
@@ -10,8 +10,8 @@ import android.content.Intent;
 import android.os.Bundle;
 
 import com.todoroo.andlib.service.ContextManager;
-import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.activity.TaskListActivity;
+import com.todoroo.astrid.activity.TaskListFragment;
 
 /**
  * Legacy task shortcut, takes users to the updated {@link TaskListFragment}.
@@ -19,7 +19,6 @@ import com.todoroo.astrid.activity.TaskListActivity;
  * be able to still launch Astrid.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TaskList extends Activity {
 
@@ -42,6 +41,7 @@ public class TaskList extends Activity {
 
     /**
      * intent: ignored for now
+     *
      * @param intent
      */
     private void launchTaskList(Intent intent) {
diff --git a/astrid/src-legacy/com/timsu/astrid/data/Identifier.java b/astrid/src-legacy/com/timsu/astrid/data/Identifier.java
index 685aa307f..2d91e8434 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/Identifier.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/Identifier.java
@@ -5,7 +5,9 @@
  */
 package com.timsu.astrid.data;
 
-/** Identifier of a single object. Extend this class to create your own */
+/**
+ * Identifier of a single object. Extend this class to create your own
+ */
 public abstract class Identifier {
     private final long id;
 
@@ -23,15 +25,15 @@ public abstract class Identifier {
 
     @Override
     public int hashCode() {
-        return (int)id;
+        return (int) id;
     }
 
     @Override
     public boolean equals(Object o) {
-        if(o == null || o.getClass() != getClass())
+        if (o == null || o.getClass() != getClass())
             return false;
 
-        return ((Identifier)o).getId() == getId();
+        return ((Identifier) o).getId() == getId();
     }
 
     @Override
diff --git a/astrid/src-legacy/com/timsu/astrid/data/LegacyAbstractController.java b/astrid/src-legacy/com/timsu/astrid/data/LegacyAbstractController.java
index 2dda9ac3d..f62d67dae 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/LegacyAbstractController.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/LegacyAbstractController.java
@@ -5,9 +5,6 @@
  */
 package com.timsu.astrid.data;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.Iterator;
-
 import android.content.Context;
 import android.database.Cursor;
 import android.util.Log;
@@ -15,7 +12,12 @@ import android.util.Log;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 
-/** Abstract controller class. Mostly contains some static fields */
+import java.lang.reflect.InvocationTargetException;
+import java.util.Iterator;
+
+/**
+ * Abstract controller class. Mostly contains some static fields
+ */
 @SuppressWarnings("nls")
 abstract public class LegacyAbstractController {
 
@@ -49,6 +51,7 @@ abstract public class LegacyAbstractController {
     }
 
     abstract public void open();
+
     abstract public void close();
 
     // cursor iterator
@@ -72,7 +75,7 @@ abstract public class LegacyAbstractController {
                 cursor.moveToNext();
                 return model;
 
-            // ugh...
+                // ugh...
             } catch (IllegalArgumentException e) {
                 Log.e("CursorIterator", e.toString());
             } catch (SecurityException e) {
diff --git a/astrid/src-legacy/com/timsu/astrid/data/LegacyAbstractModel.java b/astrid/src-legacy/com/timsu/astrid/data/LegacyAbstractModel.java
index d32547170..7673235a4 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/LegacyAbstractModel.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/LegacyAbstractModel.java
@@ -5,13 +5,15 @@
  */
 package com.timsu.astrid.data;
 
-import java.util.Date;
-import java.util.HashMap;
-
 import android.content.ContentValues;
 import android.database.Cursor;
 
-/** A data object backed by a database */
+import java.util.Date;
+import java.util.HashMap;
+
+/**
+ * A data object backed by a database
+ */
 @SuppressWarnings("nls")
 public abstract class LegacyAbstractModel {
 
@@ -23,38 +25,54 @@ public abstract class LegacyAbstractModel {
      * (getDefaultValues)
      */
 
-    /** User set values */
+    /**
+     * User set values
+     */
     protected ContentValues setValues = new ContentValues();
 
-    /** Cached values from database */
+    /**
+     * Cached values from database
+     */
     private final ContentValues values = new ContentValues();
 
-    /** Cursor into the database */
+    /**
+     * Cursor into the database
+     */
     private Cursor cursor = null;
 
     // --- constructors
 
-    /** Construct a model from scratch */
+    /**
+     * Construct a model from scratch
+     */
     public LegacyAbstractModel() {
         // ...
     }
 
-    /** Construct a model from a database object */
+    /**
+     * Construct a model from a database object
+     */
     public LegacyAbstractModel(Cursor cursor) {
         this.cursor = cursor;
     }
 
     // --- data source getters
 
-    /** Get the user-set values for this object */
+    /**
+     * Get the user-set values for this object
+     */
     public ContentValues getSetValues() {
         return setValues;
     }
 
-    /** Get the default values for this object */
+    /**
+     * Get the default values for this object
+     */
     abstract public ContentValues getDefaultValues();
 
-    /** Get a list of all field/value pairs merged across data sources */
+    /**
+     * Get a list of all field/value pairs merged across data sources
+     */
     public ContentValues getMergedValues() {
         ContentValues mergedValues = new ContentValues();
 
@@ -65,7 +83,9 @@ public abstract class LegacyAbstractModel {
         return mergedValues;
     }
 
-    /** Return the database cursor */
+    /**
+     * Return the database cursor
+     */
     public Cursor getCursor() {
         return cursor;
     }
@@ -73,65 +93,66 @@ public abstract class LegacyAbstractModel {
     // --- checking against cached values
 
     protected void putIfChangedFromDatabase(String field, String newValue) {
-        if(!setValues.containsKey(field) && values.containsKey(field)) {
+        if (!setValues.containsKey(field) && values.containsKey(field)) {
             String value = values.getAsString(field);
-            if(value == null) {
-                if(newValue == null)
+            if (value == null) {
+                if (newValue == null)
                     return;
-            } else if(value.equals(newValue))
+            } else if (value.equals(newValue))
                 return;
         }
         setValues.put(field, newValue);
     }
 
     protected void putIfChangedFromDatabase(String field, Long newValue) {
-        if(!setValues.containsKey(field) && values.containsKey(field)) {
+        if (!setValues.containsKey(field) && values.containsKey(field)) {
             Long value = values.getAsLong(field);
-            if(value == null) {
-                if(newValue == null)
+            if (value == null) {
+                if (newValue == null)
                     return;
-            } else if(value.equals(newValue))
+            } else if (value.equals(newValue))
                 return;
         }
         setValues.put(field, newValue);
     }
 
     protected void putIfChangedFromDatabase(String field, Integer newValue) {
-        if(!setValues.containsKey(field) && values.containsKey(field)) {
+        if (!setValues.containsKey(field) && values.containsKey(field)) {
             Integer value = values.getAsInteger(field);
-            if(value == null) {
-                if(newValue == null)
+            if (value == null) {
+                if (newValue == null)
                     return;
-            } else if(value.equals(newValue))
+            } else if (value.equals(newValue))
                 return;
         }
         setValues.put(field, newValue);
     }
 
     protected void putIfChangedFromDatabase(String field, Double newValue) {
-        if(!setValues.containsKey(field) && values.containsKey(field)) {
+        if (!setValues.containsKey(field) && values.containsKey(field)) {
             Double value = values.getAsDouble(field);
-            if(value == null) {
-                if(newValue == null)
+            if (value == null) {
+                if (newValue == null)
                     return;
-            } else if(value.equals(newValue))
+            } else if (value.equals(newValue))
                 return;
         }
         setValues.put(field, newValue);
     }
 
     protected static final HashMap<Class<?>, HashMap<String, Integer>>
-        columnIndexCache = new HashMap<Class<?>, HashMap<String, Integer>>();
+            columnIndexCache = new HashMap<Class<?>, HashMap<String, Integer>>();
+
     private int getColumnIndex(String field) {
         HashMap<String, Integer> classCache;
         classCache = columnIndexCache.get(getClass());
-        if(classCache == null) {
+        if (classCache == null) {
             classCache = new HashMap<String, Integer>();
             columnIndexCache.put(getClass(), classCache);
         }
 
         Integer index = classCache.get(field);
-        if(index == null) {
+        if (index == null) {
             index = cursor.getColumnIndexOrThrow(field);
             classCache.put(field, index);
         }
@@ -142,14 +163,14 @@ public abstract class LegacyAbstractModel {
     // --- data retrieval for the different object types
 
     protected String retrieveString(String field) {
-        if(setValues.containsKey(field))
+        if (setValues.containsKey(field))
             return setValues.getAsString(field);
 
-        if(values.containsKey(field))
+        if (values.containsKey(field))
             return values.getAsString(field);
 
         // if we have a database to hit, do that now
-        if(cursor != null) {
+        if (cursor != null) {
             String value = cursor.getString(getColumnIndex(field));
             values.put(field, value);
             return value;
@@ -157,21 +178,21 @@ public abstract class LegacyAbstractModel {
 
         // do we have defaults?
         ContentValues defaults = getDefaultValues();
-        if(defaults != null && defaults.containsKey(field))
+        if (defaults != null && defaults.containsKey(field))
             return defaults.getAsString(field);
 
         throw new UnsupportedOperationException("Could not read field " + field);
     }
 
     protected Integer retrieveInteger(String field) {
-        if(setValues.containsKey(field))
+        if (setValues.containsKey(field))
             return setValues.getAsInteger(field);
 
-        if(values.containsKey(field))
+        if (values.containsKey(field))
             return values.getAsInteger(field);
 
         // if we have a database to hit, do that now
-        if(cursor != null) {
+        if (cursor != null) {
             try {
                 Integer value = cursor.getInt(getColumnIndex(field));
                 values.put(field, value);
@@ -183,21 +204,21 @@ public abstract class LegacyAbstractModel {
 
         // do we have defaults?
         ContentValues defaults = getDefaultValues();
-        if(defaults != null && defaults.containsKey(field))
+        if (defaults != null && defaults.containsKey(field))
             return defaults.getAsInteger(field);
 
         throw new UnsupportedOperationException("Could not read field " + field);
     }
 
     protected Long retrieveLong(String field) {
-        if(setValues.containsKey(field))
+        if (setValues.containsKey(field))
             return setValues.getAsLong(field);
 
-        if(values.containsKey(field))
+        if (values.containsKey(field))
             return values.getAsLong(field);
 
         // if we have a database to hit, do that now
-        if(cursor != null) {
+        if (cursor != null) {
             Long value = cursor.getLong(getColumnIndex(field));
             values.put(field, value);
             return value;
@@ -205,21 +226,21 @@ public abstract class LegacyAbstractModel {
 
         // do we have defaults?
         ContentValues defaults = getDefaultValues();
-        if(defaults != null && defaults.containsKey(field))
+        if (defaults != null && defaults.containsKey(field))
             return defaults.getAsLong(field);
 
         throw new UnsupportedOperationException("Could not read field " + field);
     }
 
     protected Double retrieveDouble(String field) {
-        if(setValues.containsKey(field))
+        if (setValues.containsKey(field))
             return setValues.getAsDouble(field);
 
-        if(values.containsKey(field))
+        if (values.containsKey(field))
             return values.getAsDouble(field);
 
         // if we have a database to hit, do that now
-        if(cursor != null) {
+        if (cursor != null) {
             Double value = cursor.getDouble(getColumnIndex(field));
             values.put(field, value);
             return value;
@@ -227,7 +248,7 @@ public abstract class LegacyAbstractModel {
 
         // do we have defaults?
         ContentValues defaults = getDefaultValues();
-        if(defaults != null && defaults.containsKey(field))
+        if (defaults != null && defaults.containsKey(field))
             return defaults.getAsDouble(field);
 
         throw new UnsupportedOperationException("Could not read field " + field);
@@ -239,7 +260,7 @@ public abstract class LegacyAbstractModel {
         Long time;
         try {
             time = retrieveLong(field);
-            if(time == null || time == 0)
+            if (time == null || time == 0)
                 return null;
         } catch (NullPointerException e) {
             return null;
diff --git a/astrid/src-legacy/com/timsu/astrid/data/alerts/Alert.java b/astrid/src-legacy/com/timsu/astrid/data/alerts/Alert.java
index 37a9c92a6..606b522a7 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/alerts/Alert.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/alerts/Alert.java
@@ -5,8 +5,6 @@
  */
 package com.timsu.astrid.data.alerts;
 
-import java.util.Date;
-
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -18,36 +16,46 @@ import com.timsu.astrid.data.LegacyAbstractController;
 import com.timsu.astrid.data.LegacyAbstractModel;
 import com.timsu.astrid.data.task.TaskIdentifier;
 
+import java.util.Date;
+
 
-/** A single alert on a task */
+/**
+ * A single alert on a task
+ */
 @SuppressWarnings("nls")
 public class Alert extends LegacyAbstractModel {
 
-    /** Version number of this model */
-    static final int                   VERSION             = 1;
+    /**
+     * Version number of this model
+     */
+    static final int VERSION = 1;
 
     // field names
 
-    public static final String                TASK                = "task";
-    public static final String                DATE                = "date";
+    public static final String TASK = "task";
+    public static final String DATE = "date";
 
-    /** Default values container */
-    private static final ContentValues defaultValues       = new ContentValues();
+    /**
+     * Default values container
+     */
+    private static final ContentValues defaultValues = new ContentValues();
 
     @Override
     public ContentValues getDefaultValues() {
         return defaultValues;
     }
 
-    static String[] FIELD_LIST = new String[] {
-        LegacyAbstractController.KEY_ROWID,
-        TASK,
-        DATE,
+    static String[] FIELD_LIST = new String[]{
+            LegacyAbstractController.KEY_ROWID,
+            TASK,
+            DATE,
     };
 
     // --- database helper
 
-    /** Database Helper manages creating new tables and updating old ones */
+    /**
+     * Database Helper manages creating new tables and updating old ones
+     */
     static class AlertDatabaseHelper extends SQLiteOpenHelper {
         String tableName;
         Context context;
@@ -61,12 +69,12 @@ public class Alert extends LegacyAbstractModel {
         @Override
         public synchronized void onCreate(SQLiteDatabase db) {
             String sql = new StringBuilder().
-            append("CREATE TABLE IF NOT EXISTS ").append(tableName).append(" (").
-                append(LegacyAbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
-                append(TASK).append(" integer not null,").
-                append(DATE).append(" integer not null,").
-                append("unique (").append(TASK).append(",").append(DATE).append(")").
-            append(");").toString();
+                    append("CREATE TABLE IF NOT EXISTS ").append(tableName).append(" (").
+                    append(LegacyAbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
+                    append(TASK).append(" integer not null,").
+                    append(DATE).append(" integer not null,").
+                    append("unique (").append(TASK).append(",").append(DATE).append(")").
+                    append(");").toString();
             db.execSQL(sql);
         }
 
@@ -75,10 +83,10 @@ public class Alert extends LegacyAbstractModel {
             Log.w(getClass().getSimpleName(), "Upgrading database from version " +
                     oldVersion + " to " + newVersion + ".");
 
-            switch(oldVersion) {
-            default:
-                // we don't know how to handle it... show an error
-                Log.e(getClass().getSimpleName(), "Unsupported migration from " + oldVersion + " to " + newVersion);
+            switch (oldVersion) {
+                default:
+                    // we don't know how to handle it... show an error
+                    Log.e(getClass().getSimpleName(), "Unsupported migration from " + oldVersion + " to " + newVersion);
             }
         }
     }
diff --git a/astrid/src-legacy/com/timsu/astrid/data/alerts/AlertController.java b/astrid/src-legacy/com/timsu/astrid/data/alerts/AlertController.java
index b1d80df7a..62fe96134 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/alerts/AlertController.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/alerts/AlertController.java
@@ -5,12 +5,6 @@
  */
 package com.timsu.astrid.data.alerts;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -21,35 +15,47 @@ import com.timsu.astrid.data.LegacyAbstractController;
 import com.timsu.astrid.data.alerts.Alert.AlertDatabaseHelper;
 import com.timsu.astrid.data.task.TaskIdentifier;
 
-/** Controller for Tag-related operations */
+import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Controller for Tag-related operations
+ */
 @SuppressWarnings("nls")
 public class AlertController extends LegacyAbstractController {
 
     private SQLiteDatabase alertDatabase;
 
-    /** Get a cursor to tag identifiers */
+    /**
+     * Get a cursor to tag identifiers
+     */
     public Cursor getTaskAlertsCursor(TaskIdentifier taskId) throws SQLException {
         Cursor cursor = alertDatabase.query(alertsTable,
                 Alert.FIELD_LIST, Alert.TASK + " = ?",
-                new String[] { taskId.idAsString() }, null, null, null);
+                new String[]{taskId.idAsString()}, null, null, null);
         return cursor;
     }
 
-    /** Get a list of alerts for the given task */
+    /**
+     * Get a list of alerts for the given task
+     */
     public List<Date> getTaskAlerts(TaskIdentifier
-            taskId) throws SQLException {
+                                            taskId) throws SQLException {
         List<Date> list = new LinkedList<Date>();
         Cursor cursor = alertDatabase.query(alertsTable,
                 Alert.FIELD_LIST, Alert.TASK + " = ?",
-                new String[] { taskId.idAsString() }, null, null, null);
+                new String[]{taskId.idAsString()}, null, null, null);
 
         try {
-            if(cursor.getCount() == 0)
+            if (cursor.getCount() == 0)
                 return list;
             do {
                 cursor.moveToNext();
                 list.add(new Alert(cursor).getDate());
-            } while(!cursor.isLast());
+            } while (!cursor.isLast());
 
             return list;
         } finally {
@@ -58,20 +64,22 @@ public class AlertController extends LegacyAbstractController {
     }
 
 
-    /** Get a list of alerts that are set for the future */
+    /**
+     * Get a list of alerts that are set for the future
+     */
     public Set<TaskIdentifier> getTasksWithActiveAlerts() throws SQLException {
         Set<TaskIdentifier> list = new HashSet<TaskIdentifier>();
         Cursor cursor = alertDatabase.query(alertsTable,
                 Alert.FIELD_LIST, Alert.DATE + " > ?",
-                new String[] { Long.toString(System.currentTimeMillis()) }, null, null, null);
+                new String[]{Long.toString(System.currentTimeMillis())}, null, null, null);
 
         try {
-            if(cursor.getCount() == 0)
+            if (cursor.getCount() == 0)
                 return list;
             do {
                 cursor.moveToNext();
                 list.add(new Alert(cursor).getTask());
-            } while(!cursor.isLast());
+            } while (!cursor.isLast());
 
             return list;
         } finally {
@@ -79,16 +87,20 @@ public class AlertController extends LegacyAbstractController {
         }
     }
 
-    /** Remove all alerts from the task */
+    /**
+     * Remove all alerts from the task
+     */
     public boolean removeAlerts(TaskIdentifier taskId)
-            throws SQLException{
+            throws SQLException {
         return alertDatabase.delete(alertsTable,
                 String.format("%s = ?",
                         Alert.TASK),
-                new String[] { taskId.idAsString() }) > 0;
+                new String[]{taskId.idAsString()}) > 0;
     }
 
-    /** Add the given tag to the task */
+    /**
+     * Add the given tag to the task
+     */
     public boolean addAlert(TaskIdentifier taskId, Date date)
             throws SQLException {
         ContentValues values = new ContentValues();
@@ -114,7 +126,7 @@ public class AlertController extends LegacyAbstractController {
      * signal the failure
      *
      * @return this (self reference, allowing this to be chained in an
-     *         initialization call)
+     * initialization call)
      * @throws SQLException if the database could be neither opened or created
      */
     @Override
@@ -123,7 +135,9 @@ public class AlertController extends LegacyAbstractController {
                 alertsTable, alertsTable).getWritableDatabase();
     }
 
-    /** Closes database resource */
+    /**
+     * Closes database resource
+     */
     @Override
     public void close() {
         alertDatabase.close();
diff --git a/astrid/src-legacy/com/timsu/astrid/data/enums/Importance.java b/astrid/src-legacy/com/timsu/astrid/data/enums/Importance.java
index b99b18257..7ce942d91 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/enums/Importance.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/enums/Importance.java
@@ -10,43 +10,43 @@ import com.timsu.astrid.R;
 public enum Importance {
     // MOST IMPORTANT
 
-	LEVEL_1(0,
-	        R.color.importance_1,
-	        R.color.task_list_importance_1),
-	LEVEL_2(0,
-	        R.color.importance_2,
-	        R.color.task_list_importance_2),
-	LEVEL_3(0,
-	        R.color.importance_3,
-	        R.color.task_list_importance_3),
-	LEVEL_4(0,
-	        R.color.importance_4,
-	        R.color.task_list_importance_4),
-
-	// LEAST IMPORTANT
-	;
-
-	int label;
-	int color;
-	int taskListColor;
-	public static final Importance DEFAULT = LEVEL_3;
-
-	private Importance(int label, int color, int taskListColor) {
-	    this.label = label;
-	    this.color = color;
-	    this.taskListColor = taskListColor;
-	}
-
-	public int getLabelResource() {
-	    return label;
-	}
-
-	public int getColorResource() {
-	    return color;
-	}
-
-	public int getTaskListColor() {
-	    return taskListColor;
-	}
+    LEVEL_1(0,
+            R.color.importance_1,
+            R.color.task_list_importance_1),
+    LEVEL_2(0,
+            R.color.importance_2,
+            R.color.task_list_importance_2),
+    LEVEL_3(0,
+            R.color.importance_3,
+            R.color.task_list_importance_3),
+    LEVEL_4(0,
+            R.color.importance_4,
+            R.color.task_list_importance_4),
+
+    // LEAST IMPORTANT
+    ;
+
+    int label;
+    int color;
+    int taskListColor;
+    public static final Importance DEFAULT = LEVEL_3;
+
+    private Importance(int label, int color, int taskListColor) {
+        this.label = label;
+        this.color = color;
+        this.taskListColor = taskListColor;
+    }
+
+    public int getLabelResource() {
+        return label;
+    }
+
+    public int getColorResource() {
+        return color;
+    }
+
+    public int getTaskListColor() {
+        return taskListColor;
+    }
 
 }
diff --git a/astrid/src-legacy/com/timsu/astrid/data/enums/RepeatInterval.java b/astrid/src-legacy/com/timsu/astrid/data/enums/RepeatInterval.java
index 3d8e93828..0d54e8368 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/enums/RepeatInterval.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/enums/RepeatInterval.java
@@ -5,25 +5,25 @@
  */
 package com.timsu.astrid.data.enums;
 
-import java.util.Date;
-
 import android.content.res.Resources;
 
+import java.util.Date;
+
 public enum RepeatInterval {
 
-	DAYS(0) {
+    DAYS(0) {
         @Override
         public void offsetDateBy(Date input, int number) {
             input.setDate(input.getDate() + number);
         }
-	},
-	WEEKS(0) {
+    },
+    WEEKS(0) {
         @Override
         public void offsetDateBy(Date input, int number) {
             input.setDate(input.getDate() + 7 * number);
         }
     },
-	MONTHS(0) {
+    MONTHS(0) {
         @Override
         public void offsetDateBy(Date input, int number) {
             input.setMonth(input.getMonth() + number);
@@ -34,9 +34,7 @@ public enum RepeatInterval {
         public void offsetDateBy(Date input, int number) {
             input.setHours(input.getHours() + number);
         }
-    },
-
-	;
+    },;
 
     int label;
 
@@ -48,14 +46,14 @@ public enum RepeatInterval {
         return label;
     }
 
-	abstract public void offsetDateBy(Date input, int number);
+    abstract public void offsetDateBy(Date input, int number);
 
-	public static String[] getLabels(Resources r) {
-	    int intervalCount = RepeatInterval.values().length;
-	    String[] result = new String[intervalCount];
+    public static String[] getLabels(Resources r) {
+        int intervalCount = RepeatInterval.values().length;
+        String[] result = new String[intervalCount];
 
-	    for(int i = 0; i < intervalCount; i++)
-	        result[i] = r.getString(RepeatInterval.values()[i].getLabelResource());
-	    return result;
-	}
+        for (int i = 0; i < intervalCount; i++)
+            result[i] = r.getString(RepeatInterval.values()[i].getLabelResource());
+        return result;
+    }
 }
diff --git a/astrid/src-legacy/com/timsu/astrid/data/sync/SyncDataController.java b/astrid/src-legacy/com/timsu/astrid/data/sync/SyncDataController.java
index e5e644ca3..0883ec49d 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/sync/SyncDataController.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/sync/SyncDataController.java
@@ -5,8 +5,6 @@
  */
 package com.timsu.astrid.data.sync;
 
-import java.util.HashSet;
-
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -20,7 +18,11 @@ import com.timsu.astrid.data.task.AbstractTaskModel;
 import com.timsu.astrid.data.task.TaskIdentifier;
 import com.timsu.astrid.data.task.TaskModelForSync;
 
-/** Controller for Tag-related operations */
+import java.util.HashSet;
+
+/**
+ * Controller for Tag-related operations
+ */
 @SuppressWarnings("nls")
 public class SyncDataController extends LegacyAbstractController {
 
@@ -29,7 +31,9 @@ public class SyncDataController extends LegacyAbstractController {
 
     // --- updated tasks list
 
-    /** Mark all updated tasks as finished synchronizing */
+    /**
+     * Mark all updated tasks as finished synchronizing
+     */
     public boolean clearUpdatedTaskList(int syncServiceId) throws SQLException {
         ContentValues values = new ContentValues();
         values.put(SyncMapping.UPDATED, 0);
@@ -37,7 +41,9 @@ public class SyncDataController extends LegacyAbstractController {
                 SyncMapping.SYNC_SERVICE + " = " + syncServiceId, null) > 0;
     }
 
-    /** Indicate that this task's properties were updated */
+    /**
+     * Indicate that this task's properties were updated
+     */
     public boolean addToUpdatedList(TaskIdentifier taskId) throws SQLException {
         ContentValues values = new ContentValues();
         values.put(SyncMapping.UPDATED, 1);
@@ -46,7 +52,7 @@ public class SyncDataController extends LegacyAbstractController {
     }
 
     public static void taskUpdated(Context context, AbstractTaskModel task) {
-        if(!(task instanceof TaskModelForSync)) {
+        if (!(task instanceof TaskModelForSync)) {
             SyncDataController syncController = new SyncDataController(context);
             syncController.open();
             syncController.addToUpdatedList(task.getTaskIdentifier());
@@ -56,7 +62,9 @@ public class SyncDataController extends LegacyAbstractController {
 
     // --- sync mapping
 
-    /** Get all mappings for the given synchronization service */
+    /**
+     * Get all mappings for the given synchronization service
+     */
     public HashSet<SyncMapping> getSyncMappings(int syncServiceId) throws SQLException {
         HashSet<SyncMapping> list = new HashSet<SyncMapping>();
         Cursor cursor = syncDatabase.query(syncTable,
@@ -65,12 +73,12 @@ public class SyncDataController extends LegacyAbstractController {
                 null, null, null, null);
 
         try {
-            if(cursor.getCount() == 0)
+            if (cursor.getCount() == 0)
                 return list;
             do {
                 cursor.moveToNext();
                 list.add(new SyncMapping(cursor));
-            } while(!cursor.isLast());
+            } while (!cursor.isLast());
 
             return list;
         } finally {
@@ -78,23 +86,25 @@ public class SyncDataController extends LegacyAbstractController {
         }
     }
 
-    /** Get all mappings for specified task for all synchronization services */
+    /**
+     * Get all mappings for specified task for all synchronization services
+     */
     public HashSet<SyncMapping> getSyncMappings(TaskIdentifier taskId)
             throws SQLException {
         HashSet<SyncMapping> list = new HashSet<SyncMapping>();
         Cursor cursor = syncDatabase.query(syncTable,
                 SyncMapping.FIELD_LIST,
                 SyncMapping.TASK + " = ?",
-                new String[] { "" + taskId.getId() },
+                new String[]{"" + taskId.getId()},
                 null, null, null);
 
         try {
-            if(cursor.getCount() == 0)
+            if (cursor.getCount() == 0)
                 return list;
             do {
                 cursor.moveToNext();
                 list.add(new SyncMapping(cursor));
-            } while(!cursor.isLast());
+            } while (!cursor.isLast());
 
             return list;
         } finally {
@@ -102,18 +112,20 @@ public class SyncDataController extends LegacyAbstractController {
         }
     }
 
-    /** Get mapping for given task */
+    /**
+     * Get mapping for given task
+     */
     public SyncMapping getSyncMapping(int syncServiceId, TaskIdentifier taskId)
             throws SQLException {
         Cursor cursor = syncDatabase.query(syncTable,
                 SyncMapping.FIELD_LIST,
                 SyncMapping.SYNC_SERVICE + " = ? AND " +
-                    SyncMapping.TASK + " = ?",
-                new String[] { "" + syncServiceId, "" + taskId.getId() },
+                        SyncMapping.TASK + " = ?",
+                new String[]{"" + syncServiceId, "" + taskId.getId()},
                 null, null, null);
 
         try {
-            if(cursor.getCount() == 0)
+            if (cursor.getCount() == 0)
                 return null;
             cursor.moveToNext();
             return new SyncMapping(cursor);
@@ -122,7 +134,9 @@ public class SyncDataController extends LegacyAbstractController {
         }
     }
 
-    /** Saves the given task to the database. Returns true on success. */
+    /**
+     * Saves the given task to the database. Returns true on success.
+     */
     public boolean saveSyncMapping(SyncMapping mapping) {
         long newRow = syncDatabase.insert(syncTable, SyncMapping.TASK,
                 mapping.getMergedValues());
@@ -132,17 +146,21 @@ public class SyncDataController extends LegacyAbstractController {
         return newRow >= 0;
     }
 
-    /** Deletes the given mapping. Returns true on success */
+    /**
+     * Deletes the given mapping. Returns true on success
+     */
     public boolean deleteSyncMapping(SyncMapping mapping) {
         // was never saved
-        if(mapping.getId() == 0)
+        if (mapping.getId() == 0)
             return false;
 
         return syncDatabase.delete(syncTable, KEY_ROWID + "=" +
                 mapping.getId(), null) > 0;
     }
 
-    /** Deletes the given mapping. Returns true on success */
+    /**
+     * Deletes the given mapping. Returns true on success
+     */
     public boolean deleteAllMappings(int syncServiceId) {
         return syncDatabase.delete(syncTable, SyncMapping.SYNC_SERVICE +
                 "=" + syncServiceId, null) > 0;
@@ -164,7 +182,7 @@ public class SyncDataController extends LegacyAbstractController {
      * signal the failure
      *
      * @return this (self reference, allowing this to be chained in an
-     *         initialization call)
+     * initialization call)
      * @throws SQLException if the database could be neither opened or created
      */
     @Override
@@ -174,10 +192,12 @@ public class SyncDataController extends LegacyAbstractController {
         syncDatabase = helper.getWritableDatabase();
     }
 
-    /** Closes database resource */
+    /**
+     * Closes database resource
+     */
     @Override
     public void close() {
-        if(syncDatabase != null)
+        if (syncDatabase != null)
             syncDatabase.close();
     }
 }
diff --git a/astrid/src-legacy/com/timsu/astrid/data/sync/SyncMapping.java b/astrid/src-legacy/com/timsu/astrid/data/sync/SyncMapping.java
index 0f5a04738..4f5b933be 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/sync/SyncMapping.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/sync/SyncMapping.java
@@ -17,23 +17,30 @@ import com.timsu.astrid.data.LegacyAbstractModel;
 import com.timsu.astrid.data.task.TaskIdentifier;
 
 
-/** A single tag on a task */
+/**
+ * A single tag on a task
+ */
 @SuppressWarnings("nls")
 public class SyncMapping extends LegacyAbstractModel {
 
 
-    /** Version number of this model */
-    static final int                   VERSION             = 1;
+    /**
+     * Version number of this model
+     */
+    static final int VERSION = 1;
 
     // field names
 
-    static final String                TASK          = "task";
-    static final String                SYNC_SERVICE  = "service";
-    static final String                REMOTE_ID     = "remoteId";
-    static final String                UPDATED       = "updated";
+    static final String TASK = "task";
+    static final String SYNC_SERVICE = "service";
+    static final String REMOTE_ID = "remoteId";
+    static final String UPDATED = "updated";
 
-    /** Default values container */
+    /**
+     * Default values container
+     */
     private static final ContentValues defaultValues = new ContentValues();
+
     static {
         defaultValues.put(UPDATED, 0);
     }
@@ -43,17 +50,19 @@ public class SyncMapping extends LegacyAbstractModel {
         return defaultValues;
     }
 
-    static String[] FIELD_LIST = new String[] {
-        LegacyAbstractController.KEY_ROWID,
-        TASK,
-        SYNC_SERVICE,
-        REMOTE_ID,
-        UPDATED,
+    static String[] FIELD_LIST = new String[]{
+            LegacyAbstractController.KEY_ROWID,
+            TASK,
+            SYNC_SERVICE,
+            REMOTE_ID,
+            UPDATED,
     };
 
     // --- database helper
 
-    /** Database Helper manages creating new tables and updating old ones */
+    /**
+     * Database Helper manages creating new tables and updating old ones
+     */
     static class SyncMappingDatabaseHelper extends SQLiteOpenHelper {
         String tableName;
         Context context;
@@ -67,14 +76,14 @@ public class SyncMapping extends LegacyAbstractModel {
         @Override
         public synchronized void onCreate(SQLiteDatabase db) {
             String sql = new StringBuilder().
-            append("CREATE TABLE IF NOT EXISTS ").append(tableName).append(" (").
-                append(LegacyAbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
-                append(TASK).append(" integer not null,").
-                append(SYNC_SERVICE).append(" integer not null,").
-                append(REMOTE_ID).append(" text not null,").
-                append(UPDATED).append(" integer not null,").
-                append("unique (").append(TASK).append(",").append(SYNC_SERVICE).append(")").
-            append(");").toString();
+                    append("CREATE TABLE IF NOT EXISTS ").append(tableName).append(" (").
+                    append(LegacyAbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
+                    append(TASK).append(" integer not null,").
+                    append(SYNC_SERVICE).append(" integer not null,").
+                    append(REMOTE_ID).append(" text not null,").
+                    append(UPDATED).append(" integer not null,").
+                    append("unique (").append(TASK).append(",").append(SYNC_SERVICE).append(")").
+                    append(");").toString();
             db.execSQL(sql);
         }
 
@@ -83,10 +92,10 @@ public class SyncMapping extends LegacyAbstractModel {
             Log.w(getClass().getSimpleName(), "Upgrading database from version " +
                     oldVersion + " to " + newVersion + ".");
 
-            switch(oldVersion) {
-            default:
-                // we don't know how to handle it... show an error
-                Log.e(getClass().getSimpleName(), "Unsupported migration from " + oldVersion + " to " + newVersion);
+            switch (oldVersion) {
+                default:
+                    // we don't know how to handle it... show an error
+                    Log.e(getClass().getSimpleName(), "Unsupported migration from " + oldVersion + " to " + newVersion);
 
             }
         }
diff --git a/astrid/src-legacy/com/timsu/astrid/data/tag/AbstractTagModel.java b/astrid/src-legacy/com/timsu/astrid/data/tag/AbstractTagModel.java
index 50b09dbd3..c15216251 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/tag/AbstractTagModel.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/tag/AbstractTagModel.java
@@ -5,8 +5,6 @@
  */
 package com.timsu.astrid.data.tag;
 
-import java.util.Date;
-
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -17,35 +15,41 @@ import android.util.Log;
 import com.timsu.astrid.data.LegacyAbstractController;
 import com.timsu.astrid.data.LegacyAbstractModel;
 
+import java.util.Date;
+
 
-/** Abstract model of a task. Subclasses implement the getters and setters
+/**
+ * Abstract model of a task. Subclasses implement the getters and setters
  * they are interested in.
  *
  * @author timsu
- *
  */
 @SuppressWarnings("nls")
 public abstract class AbstractTagModel extends LegacyAbstractModel {
 
-    /** Version number of this model */
-    static final int                   VERSION             = 1;
+    /**
+     * Version number of this model
+     */
+    static final int VERSION = 1;
 
     // field names
 
-    static final String                NAME                = "name";
-    static final String                NOTES               = "notes";
+    static final String NAME = "name";
+    static final String NOTES = "notes";
     // reserved fields
-    static final String                ICON                = "icon";
-    static final String                PARENT              = "parent";
-    static final String                FLAGS               = "flags";
-    static final String                LOCATION_LAT        = "locationLat";
-    static final String                LOCATION_LONG       = "locationLong";
-    static final String                NOTIFICATIONS       = "notifications";
+    static final String ICON = "icon";
+    static final String PARENT = "parent";
+    static final String FLAGS = "flags";
+    static final String LOCATION_LAT = "locationLat";
+    static final String LOCATION_LONG = "locationLong";
+    static final String NOTIFICATIONS = "notifications";
     // end reserved fields
-    static final String                CREATION_DATE       = "creationDate";
+    static final String CREATION_DATE = "creationDate";
 
-    /** Default values container */
-    private static final ContentValues defaultValues       = new ContentValues();
+    /**
+     * Default values container
+     */
+    private static final ContentValues defaultValues = new ContentValues();
 
     static {
         defaultValues.put(NAME, "");
@@ -65,7 +69,9 @@ public abstract class AbstractTagModel extends LegacyAbstractModel {
 
     // --- database helper
 
-    /** Database Helper manages creating new tables and updating old ones */
+    /**
+     * Database Helper manages creating new tables and updating old ones
+     */
     static class TagModelDatabaseHelper extends SQLiteOpenHelper {
         String tableName;
         Context context;
@@ -79,18 +85,18 @@ public abstract class AbstractTagModel extends LegacyAbstractModel {
         @Override
         public synchronized void onCreate(SQLiteDatabase db) {
             String sql = new StringBuilder().
-            append("CREATE TABLE IF NOT EXISTS ").append(tableName).append(" (").
-                append(LegacyAbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
-                append(NAME).append(" text unique,").
-                append(NOTES).append(" text,").
-                append(ICON).append(" integer,").
-                append(PARENT).append(" integer,").
-                append(FLAGS).append(" integer,").
-                append(LOCATION_LAT).append(" integer,").
-                append(LOCATION_LONG).append(" integer,").
-                append(NOTIFICATIONS).append(" integer,").
-                append(CREATION_DATE).append(" integer").
-            append(");").toString();
+                    append("CREATE TABLE IF NOT EXISTS ").append(tableName).append(" (").
+                    append(LegacyAbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
+                    append(NAME).append(" text unique,").
+                    append(NOTES).append(" text,").
+                    append(ICON).append(" integer,").
+                    append(PARENT).append(" integer,").
+                    append(FLAGS).append(" integer,").
+                    append(LOCATION_LAT).append(" integer,").
+                    append(LOCATION_LONG).append(" integer,").
+                    append(NOTIFICATIONS).append(" integer,").
+                    append(CREATION_DATE).append(" integer").
+                    append(");").toString();
             db.execSQL(sql);
         }
 
@@ -99,10 +105,10 @@ public abstract class AbstractTagModel extends LegacyAbstractModel {
             Log.w(getClass().getSimpleName(), "Upgrading database from version " +
                     oldVersion + " to " + newVersion + ".");
 
-            switch(oldVersion) {
-            default:
-                // we don't know how to handle it... show an error
-                Log.e(getClass().getSimpleName(), "Unsupported migration from " + oldVersion + " to " + newVersion);
+            switch (oldVersion) {
+                default:
+                    // we don't know how to handle it... show an error
+                    Log.e(getClass().getSimpleName(), "Unsupported migration from " + oldVersion + " to " + newVersion);
             }
         }
     }
@@ -110,7 +116,6 @@ public abstract class AbstractTagModel extends LegacyAbstractModel {
     // --- utility methods
 
 
-
     // --- identifier
 
     private TagIdentifier identifier = null;
@@ -129,7 +134,9 @@ public abstract class AbstractTagModel extends LegacyAbstractModel {
         super();
     }
 
-    /** Read identifier from database */
+    /**
+     * Read identifier from database
+     */
     AbstractTagModel(Cursor cursor) {
         super(cursor);
 
@@ -137,7 +144,9 @@ public abstract class AbstractTagModel extends LegacyAbstractModel {
         setTagIdentifier(new TagIdentifier(id));
     }
 
-    /** Get identifier from argument */
+    /**
+     * Get identifier from argument
+     */
     AbstractTagModel(TagIdentifier identifier, Cursor cursor) {
         super(cursor);
 
@@ -175,8 +184,8 @@ public abstract class AbstractTagModel extends LegacyAbstractModel {
     // --- utility methods
 
     static void putDate(ContentValues cv, String fieldName, Date date) {
-        if(date == null)
-            cv.put(fieldName, (Long)null);
+        if (date == null)
+            cv.put(fieldName, (Long) null);
         else
             cv.put(fieldName, date.getTime());
     }
diff --git a/astrid/src-legacy/com/timsu/astrid/data/tag/TagController.java b/astrid/src-legacy/com/timsu/astrid/data/tag/TagController.java
index 25edc5163..cf8b45e72 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/tag/TagController.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/tag/TagController.java
@@ -5,10 +5,6 @@
  */
 package com.timsu.astrid.data.tag;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -22,7 +18,13 @@ import com.timsu.astrid.data.task.AbstractTaskModel.TaskModelDatabaseHelper;
 import com.timsu.astrid.data.task.TaskIdentifier;
 import com.todoroo.astrid.provider.Astrid2TaskProvider;
 
-/** Controller for Tag-related operations */
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+
+/**
+ * Controller for Tag-related operations
+ */
 @SuppressWarnings("nls")
 @Deprecated
 public class TagController extends LegacyAbstractController {
@@ -31,22 +33,24 @@ public class TagController extends LegacyAbstractController {
 
     // --- tag batch operations
 
-    /** Get a list of all tags */
+    /**
+     * Get a list of all tags
+     */
     public LinkedList<TagModelForView> getAllTags()
             throws SQLException {
         LinkedList<TagModelForView> list = new LinkedList<TagModelForView>();
         Cursor cursor = tagDatabase.query(tagsTable,
-            TagModelForView.FIELD_LIST, null, null, null, null, null, null);
+                TagModelForView.FIELD_LIST, null, null, null, null, null, null);
 
         try {
-	        if(cursor.getCount() == 0)
-	            return list;
-	        do {
-	            cursor.moveToNext();
-	            list.add(new TagModelForView(cursor));
-	        } while(!cursor.isLast());
+            if (cursor.getCount() == 0)
+                return list;
+            do {
+                cursor.moveToNext();
+                list.add(new TagModelForView(cursor));
+            } while (!cursor.isLast());
         } finally {
-        	cursor.close();
+            cursor.close();
         }
 
         return list;
@@ -54,114 +58,121 @@ public class TagController extends LegacyAbstractController {
 
     // --- tag to task map batch operations
 
-    /** Get a list of all tags as an id => tag map */
+    /**
+     * Get a list of all tags as an id => tag map
+     */
     public HashMap<TagIdentifier, TagModelForView> getAllTagsAsMap() throws SQLException {
         HashMap<TagIdentifier, TagModelForView> map = new HashMap<TagIdentifier, TagModelForView>();
-        for(TagModelForView tag : getAllTags())
+        for (TagModelForView tag : getAllTags())
             map.put(tag.getTagIdentifier(), tag);
         return map;
     }
 
-    /** Get a list of tag identifiers for the given task */
+    /**
+     * Get a list of tag identifiers for the given task
+     */
     public LinkedList<TagIdentifier> getTaskTags(TaskIdentifier
-            taskId) throws SQLException {
+                                                         taskId) throws SQLException {
         LinkedList<TagIdentifier> list = new LinkedList<TagIdentifier>();
         Cursor cursor = tagToTaskMapDatabase.query(tagTaskTable,
                 TagToTaskMapping.FIELD_LIST, TagToTaskMapping.TASK + " = ?",
-                new String[] { taskId.idAsString() }, null, null, null);
+                new String[]{taskId.idAsString()}, null, null, null);
 
         try {
-	        if(cursor.getCount() == 0)
-	            return list;
-	        do {
-	            cursor.moveToNext();
-	            list.add(new TagToTaskMapping(cursor).getTag());
-	        } while(!cursor.isLast());
+            if (cursor.getCount() == 0)
+                return list;
+            do {
+                cursor.moveToNext();
+                list.add(new TagToTaskMapping(cursor).getTag());
+            } while (!cursor.isLast());
         } finally {
-        	cursor.close();
+            cursor.close();
         }
 
         return list;
     }
 
-    /** Get a list of task identifiers for the given tag.
+    /**
+     * Get a list of task identifiers for the given tag.
      * This searches for TAGGED tasks only.
-     * Use getUntaggedTasks() to get a list of UNTAGGED tasks **/
+     * Use getUntaggedTasks() to get a list of UNTAGGED tasks *
+     */
     public LinkedList<TaskIdentifier> getTaggedTasks(TagIdentifier tagId)
-    		throws SQLException {
+            throws SQLException {
         LinkedList<TaskIdentifier> list = new LinkedList<TaskIdentifier>();
         Cursor cursor = tagToTaskMapDatabase.query(tagTaskTable,
                 TagToTaskMapping.FIELD_LIST, TagToTaskMapping.TAG + " = ?",
-                new String[] { tagId.idAsString() }, null, null, null);
+                new String[]{tagId.idAsString()}, null, null, null);
 
         try {
-	        if(cursor.getCount() == 0)
-	            return list;
-	        do {
-	            cursor.moveToNext();
-	            list.add(new TagToTaskMapping(cursor).getTask());
-	        } while(!cursor.isLast());
+            if (cursor.getCount() == 0)
+                return list;
+            do {
+                cursor.moveToNext();
+                list.add(new TagToTaskMapping(cursor).getTask());
+            } while (!cursor.isLast());
         } finally {
-        	cursor.close();
+            cursor.close();
         }
 
         return list;
     }
 
-    /** Returns a list of task identifiers in the provided set that are UNtagged.
-     *
+    /**
+     * Returns a list of task identifiers in the provided set that are UNtagged.
+     * <p/>
      * The calling SubActivity must provide the set of tasks, since
      * TagController cannot access the appropriate instance of TaskController.
-     *
+     * <p/>
      * The current implementation is not very efficient, because queries
      * the TagToTask map once for each active task.
-     **/
+     */
     public LinkedList<TaskIdentifier> getUntaggedTasks() throws SQLException {
-    	HashSet<Long> ids = new HashSet<Long>();
+        HashSet<Long> ids = new HashSet<Long>();
 
-    	String[] tagMapColumns = new String[] { TagToTaskMapping.TASK };
-    	Cursor tagMapCursor = tagToTaskMapDatabase.query(tagTaskTable,
-    			tagMapColumns, null, null, TagToTaskMapping.TASK, null,
-    			TagToTaskMapping.TASK + " ASC");
+        String[] tagMapColumns = new String[]{TagToTaskMapping.TASK};
+        Cursor tagMapCursor = tagToTaskMapDatabase.query(tagTaskTable,
+                tagMapColumns, null, null, TagToTaskMapping.TASK, null,
+                TagToTaskMapping.TASK + " ASC");
 
-    	SQLiteDatabase taskDatabase = new TaskModelDatabaseHelper(context,
-    			tasksTable, tasksTable).getReadableDatabase();
-    	String[] taskColumns = new String[] { KEY_ROWID };
-    	Cursor taskCursor = taskDatabase.query(tasksTable, taskColumns,
-    			null, null, null, null, KEY_ROWID + " ASC");
+        SQLiteDatabase taskDatabase = new TaskModelDatabaseHelper(context,
+                tasksTable, tasksTable).getReadableDatabase();
+        String[] taskColumns = new String[]{KEY_ROWID};
+        Cursor taskCursor = taskDatabase.query(tasksTable, taskColumns,
+                null, null, null, null, KEY_ROWID + " ASC");
 
-    	LinkedList<TaskIdentifier> list = new LinkedList<TaskIdentifier>();
+        LinkedList<TaskIdentifier> list = new LinkedList<TaskIdentifier>();
         try {
-        	if(taskCursor.getCount() == 0)
-        		return list;
+            if (taskCursor.getCount() == 0)
+                return list;
 
-        	do {
-        		taskCursor.moveToNext();
+            do {
+                taskCursor.moveToNext();
                 ids.add(taskCursor.getLong(0));
-            } while(!taskCursor.isLast());
+            } while (!taskCursor.isLast());
 
-        	if(tagMapCursor.getCount() > 0) {
-        		do {
-        			tagMapCursor.moveToNext();
+            if (tagMapCursor.getCount() > 0) {
+                do {
+                    tagMapCursor.moveToNext();
                     ids.remove(tagMapCursor.getLong(0));
-                } while(!tagMapCursor.isLast());
-        	}
+                } while (!tagMapCursor.isLast());
+            }
         } finally {
-        	taskCursor.close();
-        	tagMapCursor.close();
-        	taskDatabase.close();
+            taskCursor.close();
+            tagMapCursor.close();
+            taskDatabase.close();
         }
 
-        for(Long id : ids)
-        	list.add(new TaskIdentifier(id));
-    	return list;
+        for (Long id : ids)
+            list.add(new TaskIdentifier(id));
+        return list;
     }
 
 
     // --- single tag operations
 
     public TagIdentifier createTag(String name) throws SQLException {
-        if(name == null)
+        if (name == null)
             throw new NullPointerException("Name can't be null");
 
         TagModelForView newTag = new TagModelForView(name);
@@ -170,11 +181,13 @@ public class TagController extends LegacyAbstractController {
         return new TagIdentifier(row);
     }
 
-    /** Creates or saves the given tag */
+    /**
+     * Creates or saves the given tag
+     */
     public boolean saveTag(AbstractTagModel tag) throws SQLException {
         boolean saveSucessful;
 
-        if(tag.getTagIdentifier() == null) {
+        if (tag.getTagIdentifier() == null) {
             long newRow = tagDatabase.insert(tagsTable, AbstractTagModel.NAME,
                     tag.getMergedValues());
             tag.setTagIdentifier(new TagIdentifier(newRow));
@@ -189,11 +202,13 @@ public class TagController extends LegacyAbstractController {
         return saveSucessful;
     }
 
-    /** Returns a TaskModelForView corresponding to the given Tag Name */
+    /**
+     * Returns a TaskModelForView corresponding to the given Tag Name
+     */
     public TagModelForView fetchTagFromName(String name) throws SQLException {
         Cursor cursor = tagDatabase.query(true, tagsTable,
                 TagModelForView.FIELD_LIST,
-                AbstractTagModel.NAME + " = ?", new String[] {name}, null, null, null, null);
+                AbstractTagModel.NAME + " = ?", new String[]{name}, null, null, null, null);
 
         try {
             if (cursor != null && cursor.getCount() > 0) {
@@ -203,12 +218,14 @@ public class TagController extends LegacyAbstractController {
             }
             return null;
         } finally {
-            if(cursor != null)
+            if (cursor != null)
                 cursor.close();
         }
     }
 
-    /** Returns a TaskModelForView corresponding to the given TagIdentifier */
+    /**
+     * Returns a TaskModelForView corresponding to the given TagIdentifier
+     */
     public TagModelForView fetchTagForView(TagIdentifier tagId) throws SQLException {
         long id = tagId.getId();
         Cursor cursor = tagDatabase.query(true, tagsTable,
@@ -224,15 +241,17 @@ public class TagController extends LegacyAbstractController {
 
             throw new SQLException("Returned empty set!");
         } finally {
-            if(cursor != null)
+            if (cursor != null)
                 cursor.close();
         }
     }
 
-    /** Deletes the tag and removes tag/task mappings */
-    public boolean deleteTag( TagIdentifier tagId)
-            throws SQLException{
-        if(tagToTaskMapDatabase.delete(tagTaskTable,
+    /**
+     * Deletes the tag and removes tag/task mappings
+     */
+    public boolean deleteTag(TagIdentifier tagId)
+            throws SQLException {
+        if (tagToTaskMapDatabase.delete(tagTaskTable,
                 TagToTaskMapping.TAG + " = " + tagId.idAsString(), null) < 0)
             return false;
 
@@ -247,22 +266,26 @@ public class TagController extends LegacyAbstractController {
 
     // --- single tag to task operations
 
-    /** Remove the given tag from the task */
+    /**
+     * Remove the given tag from the task
+     */
     public boolean removeTag(TaskIdentifier taskId, TagIdentifier tagId)
-            throws SQLException{
+            throws SQLException {
 
-    	int res = tagToTaskMapDatabase.delete(tagTaskTable,
+        int res = tagToTaskMapDatabase.delete(tagTaskTable,
                 String.format("%s = ? AND %s = ?",
                         TagToTaskMapping.TAG, TagToTaskMapping.TASK),
-                new String[] { tagId.idAsString(), taskId.idAsString() });
+                new String[]{tagId.idAsString(), taskId.idAsString()});
 
         // notify modification
         Astrid2TaskProvider.notifyDatabaseModification();
 
-    	return res > 0;
+        return res > 0;
     }
 
-    /** Add the given tag to the task */
+    /**
+     * Add the given tag to the task
+     */
     public boolean addTag(TaskIdentifier taskId, TagIdentifier tagId)
             throws SQLException {
         ContentValues values = new ContentValues();
@@ -294,7 +317,7 @@ public class TagController extends LegacyAbstractController {
      * signal the failure
      *
      * @return this (self reference, allowing this to be chained in an
-     *         initialization call)
+     * initialization call)
      * @throws SQLException if the database could be neither opened or created
      */
     @Override
@@ -305,12 +328,14 @@ public class TagController extends LegacyAbstractController {
                 tagsTable, tagsTable).getWritableDatabase();
     }
 
-    /** Closes database resource */
+    /**
+     * Closes database resource
+     */
     @Override
     public void close() {
-        if(tagDatabase != null)
+        if (tagDatabase != null)
             tagDatabase.close();
-        if(tagToTaskMapDatabase != null)
+        if (tagToTaskMapDatabase != null)
             tagToTaskMapDatabase.close();
     }
 }
diff --git a/astrid/src-legacy/com/timsu/astrid/data/tag/TagModelForView.java b/astrid/src-legacy/com/timsu/astrid/data/tag/TagModelForView.java
index 4299ab75a..325aab505 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/tag/TagModelForView.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/tag/TagModelForView.java
@@ -10,13 +10,15 @@ import android.database.Cursor;
 import com.timsu.astrid.data.LegacyAbstractController;
 
 
-/** Tag model for viewing purposes. Contains task name */
+/**
+ * Tag model for viewing purposes. Contains task name
+ */
 @SuppressWarnings("nls")
 public class TagModelForView extends AbstractTagModel {
 
-    static String[] FIELD_LIST = new String[] {
-        LegacyAbstractController.KEY_ROWID,
-        NAME,
+    static String[] FIELD_LIST = new String[]{
+            LegacyAbstractController.KEY_ROWID,
+            NAME,
     };
 
     // negative number, should not conflict with database row #'s
@@ -29,15 +31,16 @@ public class TagModelForView extends AbstractTagModel {
     /**
      * Returns a TagModelForView object to represent "Untagged" tasks,
      * whose Identifier is defined by the static final UNTAGGED_IDENTIFIER.
-     *
+     * <p/>
      * Pass in a string to show the "Untagged" name in the desired language.
+     *
      * @param untaggedLabel
      * @return
      */
     public static TagModelForView getUntaggedModel(String untaggedLabel) {
-    	UNTAGGED_TASKS = new TagModelForView(untaggedLabel);
-    	UNTAGGED_TASKS.setTagIdentifier(UNTAGGED_IDENTIFIER);
-    	return UNTAGGED_TASKS;
+        UNTAGGED_TASKS = new TagModelForView(untaggedLabel);
+        UNTAGGED_TASKS.setTagIdentifier(UNTAGGED_IDENTIFIER);
+        return UNTAGGED_TASKS;
     }
 
     /**
@@ -45,20 +48,24 @@ public class TagModelForView extends AbstractTagModel {
      * tasks.  Set the localized name using getUntaggedModel(String...)
      */
     public static TagModelForView getUntaggedModel() {
-    	UNTAGGED_TASKS.setTagIdentifier(UNTAGGED_IDENTIFIER);
-    	return UNTAGGED_TASKS;
+        UNTAGGED_TASKS.setTagIdentifier(UNTAGGED_IDENTIFIER);
+        return UNTAGGED_TASKS;
     }
 
 
     // --- constructors
 
-    /** Constructor for creating a new model */
+    /**
+     * Constructor for creating a new model
+     */
     TagModelForView(String name) {
         super();
         setName(name);
     }
 
-    /** Constructor for getting an existing model */
+    /**
+     * Constructor for getting an existing model
+     */
     TagModelForView(Cursor cursor) {
         super(cursor);
         getName();
@@ -81,7 +88,7 @@ public class TagModelForView extends AbstractTagModel {
     }
 
     public void toggleHideFromMainList() {
-        if(shouldHideFromMainList())
+        if (shouldHideFromMainList())
             setName(getName().substring(HIDDEN_FROM_MAIN_LIST_PREFIX.length()));
         else
             setName(HIDDEN_FROM_MAIN_LIST_PREFIX + getName());
diff --git a/astrid/src-legacy/com/timsu/astrid/data/tag/TagToTaskMapping.java b/astrid/src-legacy/com/timsu/astrid/data/tag/TagToTaskMapping.java
index 151b22be5..2e32db7c3 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/tag/TagToTaskMapping.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/tag/TagToTaskMapping.java
@@ -17,35 +17,43 @@ import com.timsu.astrid.data.LegacyAbstractModel;
 import com.timsu.astrid.data.task.TaskIdentifier;
 
 
-/** A single tag on a task */
+/**
+ * A single tag on a task
+ */
 @SuppressWarnings("nls")
 public class TagToTaskMapping extends LegacyAbstractModel {
 
-    /** Version number of this model */
-    static final int                   VERSION             = 2;
+    /**
+     * Version number of this model
+     */
+    static final int VERSION = 2;
 
     // field names
 
-    public static final String                TASK                = "task";
-    public static final String                TAG                 = "tag";
+    public static final String TASK = "task";
+    public static final String TAG = "tag";
 
-    /** Default values container */
-    private static final ContentValues defaultValues       = new ContentValues();
+    /**
+     * Default values container
+     */
+    private static final ContentValues defaultValues = new ContentValues();
 
     @Override
     public ContentValues getDefaultValues() {
         return defaultValues;
     }
 
-    static String[] FIELD_LIST = new String[] {
-        LegacyAbstractController.KEY_ROWID,
-        TASK,
-        TAG,
+    static String[] FIELD_LIST = new String[]{
+            LegacyAbstractController.KEY_ROWID,
+            TASK,
+            TAG,
     };
 
     // --- database helper
 
-    /** Database Helper manages creating new tables and updating old ones */
+    /**
+     * Database Helper manages creating new tables and updating old ones
+     */
     static class TagToTaskMappingDatabaseHelper extends SQLiteOpenHelper {
         String tableName;
         Context context;
@@ -59,12 +67,12 @@ public class TagToTaskMapping extends LegacyAbstractModel {
         @Override
         public synchronized void onCreate(SQLiteDatabase db) {
             String sql = new StringBuilder().
-            append("CREATE TABLE IF NOT EXISTS ").append(tableName).append(" (").
-                append(LegacyAbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
-                append(TASK).append(" integer not null,").
-                append(TAG).append(" integer not null,").
-                append("unique (").append(TASK).append(",").append(TAG).append(")").
-            append(");").toString();
+                    append("CREATE TABLE IF NOT EXISTS ").append(tableName).append(" (").
+                    append(LegacyAbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
+                    append(TASK).append(" integer not null,").
+                    append(TAG).append(" integer not null,").
+                    append("unique (").append(TASK).append(",").append(TAG).append(")").
+                    append(");").toString();
             db.execSQL(sql);
         }
 
@@ -73,10 +81,10 @@ public class TagToTaskMapping extends LegacyAbstractModel {
             Log.w(getClass().getSimpleName(), "Upgrading database from version " +
                     oldVersion + " to " + newVersion + ".");
 
-            switch(oldVersion) {
-            default:
-                // we don't know how to handle it... show an error
-                Log.e(getClass().getSimpleName(), "Unsupported migration from " + oldVersion + " to " + newVersion);
+            switch (oldVersion) {
+                default:
+                    // we don't know how to handle it... show an error
+                    Log.e(getClass().getSimpleName(), "Unsupported migration from " + oldVersion + " to " + newVersion);
             }
         }
     }
diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java b/astrid/src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java
index ee2f41b9d..029f71cd7 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java
@@ -5,8 +5,6 @@
  */
 package com.timsu.astrid.data.task;
 
-import java.util.Date;
-
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -20,59 +18,67 @@ import com.timsu.astrid.data.LegacyAbstractModel;
 import com.timsu.astrid.data.enums.Importance;
 import com.timsu.astrid.data.enums.RepeatInterval;
 
+import java.util.Date;
+
 
-/** Abstract model of a task. Subclasses implement the getters and setters
+/**
+ * Abstract model of a task. Subclasses implement the getters and setters
  * they are interested in.
  *
  * @author timsu
- *
  */
 @SuppressWarnings("nls")
 public abstract class AbstractTaskModel extends LegacyAbstractModel {
 
-    /** Version number of this model */
-    static final int        VERSION                = 8;
+    /**
+     * Version number of this model
+     */
+    static final int VERSION = 8;
 
-    public static final int COMPLETE_PERCENTAGE    = 100;
+    public static final int COMPLETE_PERCENTAGE = 100;
 
     // field names
 
-    public static final String     NAME                   = "name";
-    public static final String     NOTES                  = "notes";
-    public static final String     PROGRESS_PERCENTAGE    = "progressPercentage";
-    public static final String     IMPORTANCE             = "importance";
-    public static final String     ESTIMATED_SECONDS      = "estimatedSeconds";
-    public static final String     ELAPSED_SECONDS        = "elapsedSeconds";
-    public static final String     TIMER_START            = "timerStart";
-    public static final String     DEFINITE_DUE_DATE      = "definiteDueDate";
-    public static final String     PREFERRED_DUE_DATE     = "preferredDueDate";
-    public static final String     HIDDEN_UNTIL           = "hiddenUntil";
-    public static final String     POSTPONE_COUNT         = "postponeCount";
-    public static final String     NOTIFICATIONS          = "notifications";
-    public static final String     NOTIFICATION_FLAGS     = "notificationFlags";
-    public static final String     LAST_NOTIFIED          = "lastNotified";
-    public static final String     REPEAT                 = "repeat";
-    public static final String     CREATION_DATE          = "creationDate";
-    public static final String     COMPLETION_DATE        = "completionDate";
-    public static final String     CALENDAR_URI           = "calendarUri";
-    public static final String     FLAGS                  = "flags";
+    public static final String NAME = "name";
+    public static final String NOTES = "notes";
+    public static final String PROGRESS_PERCENTAGE = "progressPercentage";
+    public static final String IMPORTANCE = "importance";
+    public static final String ESTIMATED_SECONDS = "estimatedSeconds";
+    public static final String ELAPSED_SECONDS = "elapsedSeconds";
+    public static final String TIMER_START = "timerStart";
+    public static final String DEFINITE_DUE_DATE = "definiteDueDate";
+    public static final String PREFERRED_DUE_DATE = "preferredDueDate";
+    public static final String HIDDEN_UNTIL = "hiddenUntil";
+    public static final String POSTPONE_COUNT = "postponeCount";
+    public static final String NOTIFICATIONS = "notifications";
+    public static final String NOTIFICATION_FLAGS = "notificationFlags";
+    public static final String LAST_NOTIFIED = "lastNotified";
+    public static final String REPEAT = "repeat";
+    public static final String CREATION_DATE = "creationDate";
+    public static final String COMPLETION_DATE = "completionDate";
+    public static final String CALENDAR_URI = "calendarUri";
+    public static final String FLAGS = "flags";
 
     // reserved fields ---
-    public static final String     BLOCKING_ON            = "blockingOn";
+    public static final String BLOCKING_ON = "blockingOn";
 
     // notification flags
     public static final int NOTIFY_BEFORE_DEADLINE = 1 << 0;
-    public static final int NOTIFY_AT_DEADLINE     = 1 << 1;
-    public static final int NOTIFY_AFTER_DEADLINE  = 1 << 2;
-    public static final int NOTIFY_NONSTOP         = 1 << 3;
+    public static final int NOTIFY_AT_DEADLINE = 1 << 1;
+    public static final int NOTIFY_AFTER_DEADLINE = 1 << 2;
+    public static final int NOTIFY_NONSTOP = 1 << 3;
 
     // other flags
-    public static final int FLAG_SYNC_ON_COMPLETE  = 1 << 0;
+    public static final int FLAG_SYNC_ON_COMPLETE = 1 << 0;
 
-    /** Number of bits to shift repeat value by */
-    public static final int REPEAT_VALUE_OFFSET    = 3;
+    /**
+     * Number of bits to shift repeat value by
+     */
+    public static final int REPEAT_VALUE_OFFSET = 3;
 
-    /** Default values container */
+    /**
+     * Default values container
+     */
     private static final ContentValues defaultValues = new ContentValues();
 
     static {
@@ -93,13 +99,15 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
         defaultValues.put(LAST_NOTIFIED, 0);
         defaultValues.put(REPEAT, 0);
         defaultValues.put(COMPLETION_DATE, 0);
-        defaultValues.put(CALENDAR_URI, (String)null);
+        defaultValues.put(CALENDAR_URI, (String) null);
         defaultValues.put(FLAGS, 0);
     }
 
     // --- database helper
 
-    /** Database Helper manages creating new tables and updating old ones */
+    /**
+     * Database Helper manages creating new tables and updating old ones
+     */
     public static class TaskModelDatabaseHelper extends SQLiteOpenHelper {
         String tableName;
         Context context;
@@ -113,29 +121,29 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
         @Override
         public synchronized void onCreate(SQLiteDatabase db) {
             String sql = new StringBuilder().
-            append("CREATE TABLE IF NOT EXISTS ").append(tableName).append(" (").
-                append(LegacyAbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
-                append(NAME).append(" text not null,").
-                append(NOTES).append(" text not null,").
-                append(PROGRESS_PERCENTAGE).append(" integer not null,").
-                append(IMPORTANCE).append(" integer not null,").
-                append(ESTIMATED_SECONDS).append(" integer,").
-                append(ELAPSED_SECONDS).append(" integer,").
-                append(TIMER_START).append(" integer,").
-                append(DEFINITE_DUE_DATE).append(" integer,").
-                append(PREFERRED_DUE_DATE).append(" integer,").
-                append(HIDDEN_UNTIL).append(" integer,").
-                append(BLOCKING_ON).append(" integer,").
-                append(POSTPONE_COUNT).append(" integer,").
-                append(NOTIFICATIONS).append(" integer,").
-                append(NOTIFICATION_FLAGS).append(" integer,").
-                append(LAST_NOTIFIED).append(" integer,").
-                append(REPEAT).append(" integer,").
-                append(FLAGS).append(" integer,").
-                append(CREATION_DATE).append(" integer,").
-                append(COMPLETION_DATE).append(" integer,").
-                append(CALENDAR_URI).append(" text").
-            append(");").toString();
+                    append("CREATE TABLE IF NOT EXISTS ").append(tableName).append(" (").
+                    append(LegacyAbstractController.KEY_ROWID).append(" integer primary key autoincrement, ").
+                    append(NAME).append(" text not null,").
+                    append(NOTES).append(" text not null,").
+                    append(PROGRESS_PERCENTAGE).append(" integer not null,").
+                    append(IMPORTANCE).append(" integer not null,").
+                    append(ESTIMATED_SECONDS).append(" integer,").
+                    append(ELAPSED_SECONDS).append(" integer,").
+                    append(TIMER_START).append(" integer,").
+                    append(DEFINITE_DUE_DATE).append(" integer,").
+                    append(PREFERRED_DUE_DATE).append(" integer,").
+                    append(HIDDEN_UNTIL).append(" integer,").
+                    append(BLOCKING_ON).append(" integer,").
+                    append(POSTPONE_COUNT).append(" integer,").
+                    append(NOTIFICATIONS).append(" integer,").
+                    append(NOTIFICATION_FLAGS).append(" integer,").
+                    append(LAST_NOTIFIED).append(" integer,").
+                    append(REPEAT).append(" integer,").
+                    append(FLAGS).append(" integer,").
+                    append(CREATION_DATE).append(" integer,").
+                    append(COMPLETION_DATE).append(" integer,").
+                    append(CALENDAR_URI).append(" text").
+                    append(");").toString();
             db.execSQL(sql);
         }
 
@@ -148,111 +156,114 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
 
             // note: we execute sql statements in their own try block to be more
             // graceful if an upgrade dies halfway or something
-            switch(oldVersion) {
-            case 1:
-                sql = new StringBuilder().append("ALTER TABLE ").
-                    append(tableName).append(" ADD COLUMN ").
-                    append(LAST_NOTIFIED).append(" integer").toString();
-                try {
-                    db.execSQL(sql);
-                } catch (Exception e) {
-                    Log.e("astrid", "Error updating table!", e);
-                }
-                sql = new StringBuilder().append("ALTER TABLE ").
-                    append(tableName).append(" ADD COLUMN ").
-                    append(NOTIFICATION_FLAGS).append(" integer").toString();
-                try {
-                    db.execSQL(sql);
-                } catch (Exception e) {
-                    Log.e("astrid", "Error updating table!", e);
-                }
-
-            case 2:
-                sql = new StringBuilder().append("ALTER TABLE ").
-                append(tableName).append(" ADD COLUMN ").
-                append(REPEAT).append(" integer").toString();
-                try {
-                    db.execSQL(sql);
-                } catch (Exception e) {
-                    Log.e("astrid", "Error updating table!", e);
-                }
-
-            case 3:
-                sql = new StringBuilder().append("ALTER TABLE ").
-                append(tableName).append(" ADD COLUMN ").
-                append(CALENDAR_URI).append(" text").toString();
-                try {
-                    db.execSQL(sql);
-                } catch (Exception e) {
-                    Log.e("astrid", "Error updating table!", e);
-                }
-
-            case 4:
-                sql = new StringBuilder().append("ALTER TABLE ").
-                append(tableName).append(" ADD COLUMN ").
-                append(POSTPONE_COUNT).append(" integer").toString();
-                try {
-                    db.execSQL(sql);
-                } catch (Exception e) {
-                    Log.e("astrid", "Error updating table!", e);
-                }
-
-            case 5:
-            case 6:
-                // apparently some people didn't get the flags column
-                // from version 5 to version 6, so we try again
-
-                sql = new StringBuilder().append("ALTER TABLE ").
-                append(tableName).append(" ADD COLUMN ").
-                append(FLAGS).append(" integer").toString();
-                try {
-                    db.execSQL(sql);
-                } catch (Exception e) {
-                    Log.e("astrid", "Error updating table!", e);
-                }
-
-            case 7:
-                // not a real change, but make sure that columns that are null
-                // are converted into zeros, which was my previous assumption
-
-                for(String column : new String[] {
-                        ESTIMATED_SECONDS,
-                        ELAPSED_SECONDS,
-                        TIMER_START,
-                        DEFINITE_DUE_DATE,
-                        PREFERRED_DUE_DATE,
-                        HIDDEN_UNTIL,
-                        POSTPONE_COUNT,
-                        LAST_NOTIFIED,
-                        REPEAT,
-                        CREATION_DATE,
-                        COMPLETION_DATE }) {
-                    sql = String.format("UPDATE %s SET %s = 0 WHERE %s ISNULL",
-                            tableName, column, column);
+            switch (oldVersion) {
+                case 1:
+                    sql = new StringBuilder().append("ALTER TABLE ").
+                            append(tableName).append(" ADD COLUMN ").
+                            append(LAST_NOTIFIED).append(" integer").toString();
+                    try {
+                        db.execSQL(sql);
+                    } catch (Exception e) {
+                        Log.e("astrid", "Error updating table!", e);
+                    }
+                    sql = new StringBuilder().append("ALTER TABLE ").
+                            append(tableName).append(" ADD COLUMN ").
+                            append(NOTIFICATION_FLAGS).append(" integer").toString();
+                    try {
+                        db.execSQL(sql);
+                    } catch (Exception e) {
+                        Log.e("astrid", "Error updating table!", e);
+                    }
+
+                case 2:
+                    sql = new StringBuilder().append("ALTER TABLE ").
+                            append(tableName).append(" ADD COLUMN ").
+                            append(REPEAT).append(" integer").toString();
+                    try {
+                        db.execSQL(sql);
+                    } catch (Exception e) {
+                        Log.e("astrid", "Error updating table!", e);
+                    }
+
+                case 3:
+                    sql = new StringBuilder().append("ALTER TABLE ").
+                            append(tableName).append(" ADD COLUMN ").
+                            append(CALENDAR_URI).append(" text").toString();
                     try {
                         db.execSQL(sql);
                     } catch (Exception e) {
                         Log.e("astrid", "Error updating table!", e);
                     }
-                }
 
-                // --- break point
+                case 4:
+                    sql = new StringBuilder().append("ALTER TABLE ").
+                            append(tableName).append(" ADD COLUMN ").
+                            append(POSTPONE_COUNT).append(" integer").toString();
+                    try {
+                        db.execSQL(sql);
+                    } catch (Exception e) {
+                        Log.e("astrid", "Error updating table!", e);
+                    }
 
-                break;
+                case 5:
+                case 6:
+                    // apparently some people didn't get the flags column
+                    // from version 5 to version 6, so we try again
 
-            default:
-                // we don't know how to handle it... show an error
-                Log.e(getClass().getSimpleName(), "Unsupported migration from " + oldVersion + " to " + newVersion);
+                    sql = new StringBuilder().append("ALTER TABLE ").
+                            append(tableName).append(" ADD COLUMN ").
+                            append(FLAGS).append(" integer").toString();
+                    try {
+                        db.execSQL(sql);
+                    } catch (Exception e) {
+                        Log.e("astrid", "Error updating table!", e);
+                    }
+
+                case 7:
+                    // not a real change, but make sure that columns that are null
+                    // are converted into zeros, which was my previous assumption
+
+                    for (String column : new String[]{
+                            ESTIMATED_SECONDS,
+                            ELAPSED_SECONDS,
+                            TIMER_START,
+                            DEFINITE_DUE_DATE,
+                            PREFERRED_DUE_DATE,
+                            HIDDEN_UNTIL,
+                            POSTPONE_COUNT,
+                            LAST_NOTIFIED,
+                            REPEAT,
+                            CREATION_DATE,
+                            COMPLETION_DATE}) {
+                        sql = String.format("UPDATE %s SET %s = 0 WHERE %s ISNULL",
+                                tableName, column, column);
+                        try {
+                            db.execSQL(sql);
+                        } catch (Exception e) {
+                            Log.e("astrid", "Error updating table!", e);
+                        }
+                    }
+
+                    // --- break point
+
+                    break;
+
+                default:
+                    // we don't know how to handle it... show an error
+                    Log.e(getClass().getSimpleName(), "Unsupported migration from " + oldVersion + " to " + newVersion);
             }
         }
     }
 
     // --- utility methods
 
-    /** Gets task color. Requires definiteDueDate and importance
-     * @param context */
+    /**
+     * Gets task color. Requires definiteDueDate and importance
+     *
+     * @param context
+     */
     protected int getTaskColorResource(Context context) {
-        if(getDefiniteDueDate() != null && getDefiniteDueDate().getTime() <
+        if (getDefiniteDueDate() != null && getDefiniteDueDate().getTime() <
                 System.currentTimeMillis()) {
             return R.color.task_list_overdue;
         } else {
@@ -260,62 +271,66 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
         }
     }
 
-    /** Checks whether task is done. Requires progressPercentage */
+    /**
+     * Checks whether task is done. Requires progressPercentage
+     */
     protected boolean isTaskCompleted() {
         return getProgressPercentage() >= COMPLETE_PERCENTAGE;
     }
 
-    /** Stops the timer & increments elapsed time. Requires timerStart and
-     * elapsedSeconds */
+    /**
+     * Stops the timer & increments elapsed time. Requires timerStart and
+     * elapsedSeconds
+     */
     protected void stopTimerAndUpdateElapsedTime() {
-        if(getTimerStart() == null)
+        if (getTimerStart() == null)
             return;
 
         long start = getTimerStart().getTime();
         setTimerStart(null);
-        long secondsElapsed = (System.currentTimeMillis() - start)/1000;
+        long secondsElapsed = (System.currentTimeMillis() - start) / 1000;
         setElapsedSeconds((int) (getElapsedSeconds() + secondsElapsed));
     }
 
     protected void prefetchData(String[] fields) {
-        for(String field : fields) {
-            if(field.equals(NAME))
+        for (String field : fields) {
+            if (field.equals(NAME))
                 getName();
-            else if(field.equals(NOTES))
+            else if (field.equals(NOTES))
                 getNotes();
-            else if(field.equals(PROGRESS_PERCENTAGE))
+            else if (field.equals(PROGRESS_PERCENTAGE))
                 getProgressPercentage();
-            else if(field.equals(IMPORTANCE))
+            else if (field.equals(IMPORTANCE))
                 getImportance();
-            else if(field.equals(ESTIMATED_SECONDS))
+            else if (field.equals(ESTIMATED_SECONDS))
                 getEstimatedSeconds();
-            else if(field.equals(ELAPSED_SECONDS))
+            else if (field.equals(ELAPSED_SECONDS))
                 getElapsedSeconds();
-            else if(field.equals(TIMER_START))
+            else if (field.equals(TIMER_START))
                 getTimerStart();
-            else if(field.equals(DEFINITE_DUE_DATE))
+            else if (field.equals(DEFINITE_DUE_DATE))
                 getDefiniteDueDate();
-            else if(field.equals(PREFERRED_DUE_DATE))
+            else if (field.equals(PREFERRED_DUE_DATE))
                 getPreferredDueDate();
-            else if(field.equals(HIDDEN_UNTIL))
+            else if (field.equals(HIDDEN_UNTIL))
                 getHiddenUntil();
-            else if(field.equals(BLOCKING_ON))
+            else if (field.equals(BLOCKING_ON))
                 getBlockingOn();
-            else if(field.equals(POSTPONE_COUNT))
+            else if (field.equals(POSTPONE_COUNT))
                 getPostponeCount();
-            else if(field.equals(NOTIFICATIONS))
+            else if (field.equals(NOTIFICATIONS))
                 getNotificationIntervalSeconds();
-            else if(field.equals(CREATION_DATE))
+            else if (field.equals(CREATION_DATE))
                 getCreationDate();
-            else if(field.equals(COMPLETION_DATE))
+            else if (field.equals(COMPLETION_DATE))
                 getCompletionDate();
-            else if(field.equals(NOTIFICATION_FLAGS))
+            else if (field.equals(NOTIFICATION_FLAGS))
                 getNotificationFlags();
-            else if(field.equals(LAST_NOTIFIED))
+            else if (field.equals(LAST_NOTIFIED))
                 getLastNotificationDate();
-            else if(field.equals(REPEAT))
+            else if (field.equals(REPEAT))
                 getRepeat();
-            else if(field.equals(FLAGS))
+            else if (field.equals(FLAGS))
                 getFlags();
         }
     }
@@ -332,7 +347,7 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
         }
 
         public Date shiftDate(Date input) {
-            Date newDate = (Date)input.clone();
+            Date newDate = (Date) input.clone();
             interval.offsetDateBy(newDate, value);
             return newDate;
         }
@@ -347,20 +362,20 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
 
         public static int toSingleField(RepeatInfo repeatInfo) {
             int repeat;
-            if(repeatInfo == null)
+            if (repeatInfo == null)
                 repeat = 0;
             else
                 repeat = (repeatInfo.value << REPEAT_VALUE_OFFSET) +
-                    repeatInfo.interval.ordinal();
+                        repeatInfo.interval.ordinal();
             return repeat;
         }
 
         public static RepeatInfo fromSingleField(int repeat) {
-            if(repeat == 0)
+            if (repeat == 0)
                 return null;
             int value = repeat >> REPEAT_VALUE_OFFSET;
             RepeatInterval interval = RepeatInterval.values()
-                [repeat - (value << REPEAT_VALUE_OFFSET)];
+                    [repeat - (value << REPEAT_VALUE_OFFSET)];
 
             return new RepeatInfo(interval, value);
         }
@@ -385,7 +400,9 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
         super();
     }
 
-    /** Read identifier from database */
+    /**
+     * Read identifier from database
+     */
     AbstractTaskModel(Cursor cursor) {
         super(cursor);
 
@@ -393,7 +410,9 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
         setTaskIdentifier(new TaskIdentifier(id));
     }
 
-    /** Get identifier from argument */
+    /**
+     * Get identifier from argument
+     */
     AbstractTaskModel(TaskIdentifier identifier, Cursor cursor) {
         super(cursor);
 
@@ -421,7 +440,7 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
 
     protected Importance getImportance() {
         Integer value = retrieveInteger(IMPORTANCE);
-        if(value == null)
+        if (value == null)
             return null;
         return Importance.values()[value];
     }
@@ -451,7 +470,7 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
     }
 
     protected boolean isHidden() {
-        if(getHiddenUntil() == null)
+        if (getHiddenUntil() == null)
             return false;
         return getHiddenUntil().getTime() > System.currentTimeMillis();
     }
@@ -466,7 +485,7 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
 
     protected TaskIdentifier getBlockingOn() {
         Long value = retrieveLong(BLOCKING_ON);
-        if(value == null)
+        if (value == null)
             return null;
         return new TaskIdentifier(value);
     }
@@ -489,18 +508,18 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
 
     protected RepeatInfo getRepeat() {
         int repeat = retrieveInteger(REPEAT);
-        if(repeat == 0)
+        if (repeat == 0)
             return null;
         int value = repeat >> REPEAT_VALUE_OFFSET;
         RepeatInterval interval = RepeatInterval.values()
-            [repeat - (value << REPEAT_VALUE_OFFSET)];
+                [repeat - (value << REPEAT_VALUE_OFFSET)];
 
         return new RepeatInfo(interval, value);
     }
 
     protected String getCalendarUri() {
         String uri = retrieveString(CALENDAR_URI);
-        if(uri != null && uri.length() == 0)
+        if (uri != null && uri.length() == 0)
             return null;
         else
             return uri;
@@ -523,7 +542,7 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
     protected void setProgressPercentage(int progressPercentage) {
         putIfChangedFromDatabase(PROGRESS_PERCENTAGE, progressPercentage);
 
-        if(getProgressPercentage() != progressPercentage &&
+        if (getProgressPercentage() != progressPercentage &&
                 progressPercentage == COMPLETE_PERCENTAGE)
             setCompletionDate(new Date());
     }
@@ -557,8 +576,8 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
     }
 
     protected void setBlockingOn(TaskIdentifier blockingOn) {
-        if(blockingOn == null || blockingOn.equals(getTaskIdentifier()))
-            putIfChangedFromDatabase(BLOCKING_ON, (Integer)null);
+        if (blockingOn == null || blockingOn.equals(getTaskIdentifier()))
+            putIfChangedFromDatabase(BLOCKING_ON, (Integer) null);
         else
             putIfChangedFromDatabase(BLOCKING_ON, blockingOn.getId());
     }
@@ -589,11 +608,11 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
 
     protected void setRepeat(RepeatInfo repeatInfo) {
         int repeat;
-        if(repeatInfo == null)
+        if (repeatInfo == null)
             repeat = 0;
         else
             repeat = (repeatInfo.value << REPEAT_VALUE_OFFSET) +
-                repeatInfo.interval.ordinal();
+                    repeatInfo.interval.ordinal();
         putIfChangedFromDatabase(REPEAT, repeat);
     }
 
@@ -608,7 +627,7 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
     // --- utility methods
 
     protected void putDate(String fieldName, Date date) {
-        if(date == null)
+        if (date == null)
             putIfChangedFromDatabase(fieldName, 0);
         else
             putIfChangedFromDatabase(fieldName, date.getTime());
diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskController.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskController.java
index 4e6aa1da5..8e42d3088 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskController.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/task/TaskController.java
@@ -5,11 +5,6 @@
  */
 package com.timsu.astrid.data.task;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -30,11 +25,15 @@ import com.timsu.astrid.data.task.AbstractTaskModel.TaskModelDatabaseHelper;
 import com.todoroo.astrid.provider.Astrid2TaskProvider;
 import com.todoroo.astrid.widget.TasksWidget.WidgetUpdateService;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+
 /**
  * Controller for task-related operations
  *
  * @author timsu
- *
  */
 @Deprecated
 @SuppressWarnings("nls")
@@ -44,7 +43,9 @@ public class TaskController extends LegacyAbstractController {
 
     // --- task list operations
 
-    /** Return a list of all active tasks with notifications */
+    /**
+     * Return a list of all active tasks with notifications
+     */
     public HashSet<TaskModelForNotify> getTasksWithNotifications() {
         HashSet<TaskModelForNotify> list = new HashSet<TaskModelForNotify>();
         Cursor cursor = database.query(tasksTable, TaskModelForNotify.FIELD_LIST,
@@ -55,12 +56,12 @@ public class TaskController extends LegacyAbstractController {
                         AbstractTaskModel.NOTIFICATION_FLAGS), null, null, null, null, null);
 
         try {
-            if(cursor.getCount() == 0)
+            if (cursor.getCount() == 0)
                 return list;
             do {
                 cursor.moveToNext();
                 list.add(new TaskModelForNotify(cursor));
-            } while(!cursor.isLast());
+            } while (!cursor.isLast());
 
             return list;
         } finally {
@@ -68,7 +69,9 @@ public class TaskController extends LegacyAbstractController {
         }
     }
 
-    /** Return a list of all active tasks with deadlines */
+    /**
+     * Return a list of all active tasks with deadlines
+     */
     public ArrayList<TaskModelForNotify> getTasksWithDeadlines() {
         ArrayList<TaskModelForNotify> list = new ArrayList<TaskModelForNotify>();
         Cursor cursor = database.query(tasksTable, TaskModelForNotify.FIELD_LIST,
@@ -79,13 +82,13 @@ public class TaskController extends LegacyAbstractController {
                         AbstractTaskModel.PREFERRED_DUE_DATE), null, null, null, null, null);
 
         try {
-            if(cursor.getCount() == 0)
+            if (cursor.getCount() == 0)
                 return list;
 
             do {
                 cursor.moveToNext();
                 list.add(new TaskModelForNotify(cursor));
-            } while(!cursor.isLast());
+            } while (!cursor.isLast());
 
             return list;
         } finally {
@@ -93,70 +96,84 @@ public class TaskController extends LegacyAbstractController {
         }
     }
 
-    /** Return a list of all of the tasks with progress < COMPLETE_PERCENTAGE */
+    /**
+     * Return a list of all of the tasks with progress < COMPLETE_PERCENTAGE
+     */
     public Cursor getActiveTaskListCursor() {
         return database.query(tasksTable, TaskModelForList.FIELD_LIST,
-            AbstractTaskModel.PROGRESS_PERCENTAGE + " < " +
-                AbstractTaskModel.COMPLETE_PERCENTAGE, null, null, null,
+                AbstractTaskModel.PROGRESS_PERCENTAGE + " < " +
+                        AbstractTaskModel.COMPLETE_PERCENTAGE, null, null, null,
                 null, null);
     }
 
-    /** Return a list of all of the tasks matching selection */
+    /**
+     * Return a list of all of the tasks matching selection
+     */
     public Cursor getMatchingTasksForProvider(String selection,
-                String[] selectionArgs) {
+                                              String[] selectionArgs) {
         return database.query(tasksTable, TaskModelForProvider.FIELD_LIST,
                 selection, selectionArgs, null, null,
                 null, null);
     }
 
-    /** Return a list of all tasks */
+    /**
+     * Return a list of all tasks
+     */
     public Cursor getAllTaskListCursor() {
         return database.query(tasksTable, TaskModelForList.FIELD_LIST,
                 null, null, null, null, null, null);
     }
 
-    /** Return a list of all tasks */
+    /**
+     * Return a list of all tasks
+     */
     public Cursor getBackupTaskListCursor() {
         return database.query(tasksTable, TaskModelForXml.FIELD_LIST,
                 null, null, null, null,
                 null, null);
     }
 
-    /** Delete all completed tasks with date < older than date */
+    /**
+     * Delete all completed tasks with date < older than date
+     */
     public int deleteCompletedTasksOlderThan(Date olderThanDate) {
         return database.delete(tasksTable, String.format("`%s` >= '%d' AND `%s` <= '%d'",
                 AbstractTaskModel.PROGRESS_PERCENTAGE, AbstractTaskModel.COMPLETE_PERCENTAGE,
                 AbstractTaskModel.COMPLETION_DATE, olderThanDate.getTime()), null);
     }
 
-    /** Create a list of tasks from the db cursor given */
+    /**
+     * Create a list of tasks from the db cursor given
+     */
     public ArrayList<TaskModelForList> createTaskListFromCursor(Cursor cursor) {
         ArrayList<TaskModelForList> list = new ArrayList<TaskModelForList>();
 
-        if(cursor.getCount() == 0)
+        if (cursor.getCount() == 0)
             return list;
 
         do {
             cursor.moveToNext();
             list.add(new TaskModelForList(cursor));
-        } while(!cursor.isLast());
+        } while (!cursor.isLast());
 
         return list;
     }
 
-    /** Helper method to take a cursor pointing to a list of id's and generate
-     * a hashset */
+    /**
+     * Helper method to take a cursor pointing to a list of id's and generate
+     * a hashset
+     */
     private HashSet<TaskIdentifier> createTaskIdentifierSet(Cursor cursor) {
         HashSet<TaskIdentifier> list = new HashSet<TaskIdentifier>();
         try {
-            if(cursor.getCount() == 0)
+            if (cursor.getCount() == 0)
                 return list;
 
             do {
                 cursor.moveToNext();
                 list.add(new TaskIdentifier(cursor.getInt(
                         cursor.getColumnIndexOrThrow(KEY_ROWID))));
-            } while(!cursor.isLast());
+            } while (!cursor.isLast());
 
             return list;
         } finally {
@@ -164,46 +181,54 @@ public class TaskController extends LegacyAbstractController {
         }
     }
 
-    /** Get identifiers for all tasks */
+    /**
+     * Get identifiers for all tasks
+     */
     public HashSet<TaskIdentifier> getAllTaskIdentifiers() {
-        Cursor cursor = database.query(tasksTable, new String[] { KEY_ROWID },
+        Cursor cursor = database.query(tasksTable, new String[]{KEY_ROWID},
                 null, null, null, null, null, null);
         return createTaskIdentifierSet(cursor);
     }
 
-    /** Get identifiers for all non-completed tasks */
+    /**
+     * Get identifiers for all non-completed tasks
+     */
     public HashSet<TaskIdentifier> getActiveTaskIdentifiers() {
-        Cursor cursor = database.query(tasksTable, new String[] { KEY_ROWID },
+        Cursor cursor = database.query(tasksTable, new String[]{KEY_ROWID},
                 AbstractTaskModel.PROGRESS_PERCENTAGE + " < " +
-                AbstractTaskModel.COMPLETE_PERCENTAGE, null, null, null, null, null);
+                        AbstractTaskModel.COMPLETE_PERCENTAGE, null, null, null, null, null);
         return createTaskIdentifierSet(cursor);
     }
 
-    /** Get identifiers for all non-completed, non-hidden tasks */
+    /**
+     * Get identifiers for all non-completed, non-hidden tasks
+     */
     public HashSet<TaskIdentifier> getActiveVisibleTaskIdentifiers() {
-        Cursor cursor = database.query(tasksTable, new String[] { KEY_ROWID },
+        Cursor cursor = database.query(tasksTable, new String[]{KEY_ROWID},
                 AbstractTaskModel.PROGRESS_PERCENTAGE + " < " +
-                AbstractTaskModel.COMPLETE_PERCENTAGE + " AND (" +
-                AbstractTaskModel.HIDDEN_UNTIL + " ISNULL OR " + AbstractTaskModel.HIDDEN_UNTIL + " < " +
-                System.currentTimeMillis() + ")", null, null, null, null, null);
+                        AbstractTaskModel.COMPLETE_PERCENTAGE + " AND (" +
+                        AbstractTaskModel.HIDDEN_UNTIL + " ISNULL OR " + AbstractTaskModel.HIDDEN_UNTIL + " < " +
+                        System.currentTimeMillis() + ")", null, null, null, null, null);
         return createTaskIdentifierSet(cursor);
     }
 
 
-    /** Create a weighted list of tasks from the db cursor given */
+    /**
+     * Create a weighted list of tasks from the db cursor given
+     */
     public Cursor getTaskListCursorById(List<TaskIdentifier> idList) {
 
         StringBuilder where = new StringBuilder();
-        for(int i = 0; i < idList.size(); i++) {
+        for (int i = 0; i < idList.size(); i++) {
             where.append(KEY_ROWID);
             where.append("=");
             where.append(idList.get(i).idAsString());
-            if(i < idList.size()-1)
+            if (i < idList.size() - 1)
                 where.append(" OR ");
         }
 
         // hack for empty arrays
-        if(idList.size() == 0)
+        if (idList.size() == 0)
             where.append("0");
 
         return database.query(true, tasksTable,
@@ -213,9 +238,11 @@ public class TaskController extends LegacyAbstractController {
 
     // --- single task operations
 
-    /** Delete the given task */
+    /**
+     * Delete the given task
+     */
     public boolean deleteTask(TaskIdentifier taskId) {
-        if(taskId == null)
+        if (taskId == null)
             throw new UnsupportedOperationException("Cannot delete uncreated task!");
         long id = taskId.getId();
         cleanupTask(taskId, false);
@@ -226,14 +253,15 @@ public class TaskController extends LegacyAbstractController {
         return database.delete(tasksTable, KEY_ROWID + "=" + id, null) > 0;
     }
 
-    /** Saves the given task to the database. Returns true on success.
+    /**
+     * Saves the given task to the database. Returns true on success.
      *
      * @param duringSync set to true when save is part of a synchronize
      */
     public boolean saveTask(AbstractTaskModel task, boolean duringSync) {
         boolean saveSucessful;
 
-        if(task.getTaskIdentifier() == null) {
+        if (task.getTaskIdentifier() == null) {
             long newRow = database.insert(tasksTable, AbstractTaskModel.NAME,
                     task.getMergedValues());
             task.setTaskIdentifier(new TaskIdentifier(newRow));
@@ -243,7 +271,7 @@ public class TaskController extends LegacyAbstractController {
             long id = task.getTaskIdentifier().getId();
             ContentValues values = task.getSetValues();
 
-            if(values.size() == 0) // nothing changed
+            if (values.size() == 0) // nothing changed
                 return true;
 
             onTaskSave(task, values, duringSync);
@@ -252,9 +280,9 @@ public class TaskController extends LegacyAbstractController {
                     KEY_ROWID + "=" + id, null) > 0;
 
             // task was completed
-            if(values.containsKey(AbstractTaskModel.PROGRESS_PERCENTAGE) &&
+            if (values.containsKey(AbstractTaskModel.PROGRESS_PERCENTAGE) &&
                     values.getAsInteger(AbstractTaskModel.PROGRESS_PERCENTAGE)
-                        == AbstractTaskModel.COMPLETE_PERCENTAGE) {
+                            == AbstractTaskModel.COMPLETE_PERCENTAGE) {
                 onTaskCompleted(task, values, duringSync);
             }
 
@@ -262,7 +290,7 @@ public class TaskController extends LegacyAbstractController {
         }
 
         // notify widget that something changed
-        if(saveSucessful) {
+        if (saveSucessful) {
             Intent intent = new Intent(context, WidgetUpdateService.class);
             context.startService(intent);
         }
@@ -282,15 +310,15 @@ public class TaskController extends LegacyAbstractController {
      */
     private void onTaskSave(AbstractTaskModel task, ContentValues values, boolean duringSync) {
         // save task completed date
-        if(values.containsKey(AbstractTaskModel.PROGRESS_PERCENTAGE) &&
+        if (values.containsKey(AbstractTaskModel.PROGRESS_PERCENTAGE) &&
                 values.getAsInteger(AbstractTaskModel.PROGRESS_PERCENTAGE)
-                    == AbstractTaskModel.COMPLETE_PERCENTAGE) {
+                        == AbstractTaskModel.COMPLETE_PERCENTAGE) {
             values.put(AbstractTaskModel.COMPLETION_DATE, System.currentTimeMillis());
         }
 
         // task timer was updated, update notification bar
-        if(values.containsKey(AbstractTaskModel.TIMER_START)) {
-        	// show notification bar if timer was started
+        if (values.containsKey(AbstractTaskModel.TIMER_START)) {
+            // show notification bar if timer was started
 //        	if(values.getAsLong(AbstractTaskModel.TIMER_START) != 0) {
 //        		ReminderService.showTimingNotification(context,
 //        				task.getTaskIdentifier(), task.getName());
@@ -300,16 +328,16 @@ public class TaskController extends LegacyAbstractController {
         }
 
         // due date was updated, update calendar event
-        if((values.containsKey(AbstractTaskModel.DEFINITE_DUE_DATE) ||
+        if ((values.containsKey(AbstractTaskModel.DEFINITE_DUE_DATE) ||
                 values.containsKey(AbstractTaskModel.PREFERRED_DUE_DATE)) &&
                 !values.containsKey(AbstractTaskModel.CALENDAR_URI)) {
             try {
                 Cursor cursor = fetchTaskCursor(task.getTaskIdentifier(),
-                        new String[] { AbstractTaskModel.CALENDAR_URI });
+                        new String[]{AbstractTaskModel.CALENDAR_URI});
                 cursor.moveToFirst();
                 String uriAsString = cursor.getString(0);
                 cursor.close();
-                if(uriAsString != null && uriAsString.length() > 0) {
+                if (uriAsString != null && uriAsString.length() > 0) {
                     ContentResolver cr = context.getContentResolver();
                     Uri uri = Uri.parse(uriAsString);
 
@@ -340,7 +368,7 @@ public class TaskController extends LegacyAbstractController {
     /**
      * Called when this task is set to completed.
      *
-     * @param task task to process
+     * @param task   task to process
      * @param values mutable map of values to save
      */
     private void onTaskCompleted(AbstractTaskModel task, ContentValues values, boolean duringSync) {
@@ -350,15 +378,15 @@ public class TaskController extends LegacyAbstractController {
 
         // handle repeat
         RepeatInfo repeatInfo = model.getRepeat();
-        if(repeatInfo != null) {
+        if (repeatInfo != null) {
             model.repeatTaskBy(context, this, repeatInfo);
             database.update(tasksTable, values, KEY_ROWID + "=" +
-            		task.getTaskIdentifier().getId(), null);
+                    task.getTaskIdentifier().getId(), null);
         }
 
         // handle sync-on-complete
-        if((model.getFlags() & TaskModelForHandlers.FLAG_SYNC_ON_COMPLETE) > 0 &&
-        		!duringSync) {
+        if ((model.getFlags() & TaskModelForHandlers.FLAG_SYNC_ON_COMPLETE) > 0 &&
+                !duringSync) {
 //            Synchronizer synchronizer = new Synchronizer(model.getTaskIdentifier());
 //            synchronizer.synchronize(context, new SynchronizerListener() {
 //                public void onSynchronizerFinished(int numServicesSynced) {
@@ -371,24 +399,26 @@ public class TaskController extends LegacyAbstractController {
         cleanupTask(task.getTaskIdentifier(), repeatInfo != null);
     }
 
-    /** Clean up state from a task. Called when deleting or completing it */
+    /**
+     * Clean up state from a task. Called when deleting or completing it
+     */
     private void cleanupTask(TaskIdentifier taskId, boolean isRepeating) {
         // delete notifications & alarms
 //        ReminderService.deleteAlarm(context, null, taskId.getId());
 
         // delete calendar event if not repeating
-        if(!isRepeating) {
+        if (!isRepeating) {
             try {
-                Cursor cursor = fetchTaskCursor(taskId, new String[] {
-                    AbstractTaskModel.CALENDAR_URI });
+                Cursor cursor = fetchTaskCursor(taskId, new String[]{
+                        AbstractTaskModel.CALENDAR_URI});
                 cursor.moveToFirst();
                 String uri = cursor.getString(0);
                 cursor.close();
-                if(uri != null && uri.length() > 0) {
+                if (uri != null && uri.length() > 0) {
                     ContentResolver cr = context.getContentResolver();
                     cr.delete(Uri.parse(uri), null, null);
                     ContentValues values = new ContentValues();
-                    values.put(AbstractTaskModel.CALENDAR_URI, (String)null);
+                    values.put(AbstractTaskModel.CALENDAR_URI, (String) null);
                     database.update(tasksTable, values, KEY_ROWID + "=" +
                             taskId.getId(), null);
                 }
@@ -398,7 +428,9 @@ public class TaskController extends LegacyAbstractController {
         }
     }
 
-    /** Set last notification date */
+    /**
+     * Set last notification date
+     */
     public boolean setLastNotificationTime(TaskIdentifier taskId, Date date) {
         ContentValues values = new ContentValues();
         values.put(AbstractTaskModel.LAST_NOTIFIED, date.getTime());
@@ -408,7 +440,9 @@ public class TaskController extends LegacyAbstractController {
 
     // --- fetching different models
 
-    /**  Creates a new task and returns the task identifier */
+    /**
+     * Creates a new task and returns the task identifier
+     */
     public TaskModelForEdit createNewTaskForEdit() {
         TaskModelForEdit task = new TaskModelForEdit();
         task.setTaskIdentifier(null);
@@ -416,31 +450,37 @@ public class TaskController extends LegacyAbstractController {
         return task;
     }
 
-    /** Returns a TaskModelForEdit corresponding to the given TaskIdentifier */
+    /**
+     * Returns a TaskModelForEdit corresponding to the given TaskIdentifier
+     */
     public TaskModelForEdit fetchTaskForEdit(Activity activity, TaskIdentifier
             taskId) throws SQLException {
         Cursor cursor = fetchTaskCursor(taskId, TaskModelForEdit.FIELD_LIST);
-        if(cursor == null)
+        if (cursor == null)
             return null;
         activity.startManagingCursor(cursor);
         TaskModelForEdit model = new TaskModelForEdit(taskId, cursor);
         return model;
     }
 
-    /** Returns a TaskModelForList corresponding to the given TaskIdentifier */
+    /**
+     * Returns a TaskModelForList corresponding to the given TaskIdentifier
+     */
     public TaskModelForList fetchTaskForList(TaskIdentifier taskId) throws SQLException {
         Cursor cursor = fetchTaskCursor(taskId, TaskModelForList.FIELD_LIST);
-        if(cursor == null)
+        if (cursor == null)
             return null;
         TaskModelForList model = new TaskModelForList(cursor);
         cursor.close();
         return model;
     }
 
-    /** Returns a TaskModelForXml corresponding to the given TaskIdentifier */
+    /**
+     * Returns a TaskModelForXml corresponding to the given TaskIdentifier
+     */
     public TaskModelForXml fetchTaskForXml(TaskIdentifier taskId) throws SQLException {
         Cursor cursor = fetchTaskCursor(taskId, TaskModelForXml.FIELD_LIST);
-        if(cursor == null)
+        if (cursor == null)
             return null;
         TaskModelForXml model = new TaskModelForXml(cursor);
         cursor.close();
@@ -464,7 +504,9 @@ public class TaskController extends LegacyAbstractController {
         return model;
     }
 
-    /** Returns a TaskModelForReminder corresponding to the given TaskIdentifier */
+    /**
+     * Returns a TaskModelForReminder corresponding to the given TaskIdentifier
+     */
     public TaskModelForReminder fetchTaskForReminder(TaskIdentifier taskId) throws SQLException {
         Cursor cursor = fetchTaskCursor(taskId, TaskModelForReminder.FIELD_LIST);
         TaskModelForReminder model = new TaskModelForReminder(cursor);
@@ -472,7 +514,9 @@ public class TaskController extends LegacyAbstractController {
         return model;
     }
 
-    /** Returns a TaskModelForSync corresponding to the given TaskIdentifier */
+    /**
+     * Returns a TaskModelForSync corresponding to the given TaskIdentifier
+     */
     public TaskModelForSync fetchTaskForSync(TaskIdentifier taskId) throws SQLException {
         Cursor cursor = fetchTaskCursor(taskId, TaskModelForSync.FIELD_LIST);
         TaskModelForSync model = new TaskModelForSync(cursor);
@@ -480,13 +524,15 @@ public class TaskController extends LegacyAbstractController {
         return model;
     }
 
-    /** Returns a TaskModelForView by name */
+    /**
+     * Returns a TaskModelForView by name
+     */
     public TaskModelForSync searchForTaskForSync(String name) throws SQLException {
         Cursor cursor = database.query(true, tasksTable, TaskModelForSync.FIELD_LIST,
                 AbstractTaskModel.NAME + " = ? AND " +
-                    AbstractTaskModel.PROGRESS_PERCENTAGE + " < "+
+                        AbstractTaskModel.PROGRESS_PERCENTAGE + " < " +
                         AbstractTaskModel.COMPLETE_PERCENTAGE,
-                new String[] { name }, null, null, null, null);
+                new String[]{name}, null, null, null, null);
         try {
             if (cursor == null || cursor.getCount() == 0)
                 return null;
@@ -494,12 +540,14 @@ public class TaskController extends LegacyAbstractController {
             TaskModelForSync model = new TaskModelForSync(cursor);
             return model;
         } finally {
-            if(cursor != null)
+            if (cursor != null)
                 cursor.close();
         }
     }
 
-    /** Returns a TaskModelForView corresponding to the given TaskIdentifier */
+    /**
+     * Returns a TaskModelForView corresponding to the given TaskIdentifier
+     */
     public TaskModelForNotify fetchTaskForNotify(TaskIdentifier taskId) throws SQLException {
         Cursor cursor = fetchTaskCursor(taskId, TaskModelForNotify.FIELD_LIST);
         TaskModelForNotify model = new TaskModelForNotify(cursor);
@@ -507,8 +555,10 @@ public class TaskController extends LegacyAbstractController {
         return model;
     }
 
-    /** Moves cursor to the task.
-     * Don't forget to close the cursor when you're done. */
+    /**
+     * Moves cursor to the task.
+     * Don't forget to close the cursor when you're done.
+     */
     private Cursor fetchTaskCursor(TaskIdentifier taskId, String[] fieldList) {
         long id = taskId.getId();
         Cursor cursor = database.query(true, tasksTable, fieldList,
@@ -520,8 +570,10 @@ public class TaskController extends LegacyAbstractController {
         return cursor;
     }
 
-    /** Returns null if unsuccessful, otherwise moves cursor to the task.
-     * Don't forget to close the cursor when you're done. */
+    /**
+     * Returns null if unsuccessful, otherwise moves cursor to the task.
+     * Don't forget to close the cursor when you're done.
+     */
     private Cursor fetchTaskCursor(String name, long creationDate, String[] fieldList) {
         // truncate millis
         final String where = AbstractTaskModel.NAME + " = ? AND "
@@ -529,7 +581,7 @@ public class TaskController extends LegacyAbstractController {
 
         String approximateCreationDate = (creationDate / 1000) + "%";
         Cursor cursor = database.query(true, tasksTable, fieldList,
-                where, new String[] {name, approximateCreationDate}, null, null, null, null);
+                where, new String[]{name, approximateCreationDate}, null, null, null, null);
         if (cursor == null)
             throw new SQLException("Returned empty set!");
 
@@ -541,9 +593,11 @@ public class TaskController extends LegacyAbstractController {
     }
     // --- methods supporting individual features
 
-    /** Returns a TaskModelForView corresponding to the given TaskIdentifier */
+    /**
+     * Returns a TaskModelForView corresponding to the given TaskIdentifier
+     */
     public int fetchTaskPostponeCount(TaskIdentifier taskId) throws SQLException {
-        Cursor cursor = fetchTaskCursor(taskId, new String[] {AbstractTaskModel.POSTPONE_COUNT});
+        Cursor cursor = fetchTaskCursor(taskId, new String[]{AbstractTaskModel.POSTPONE_COUNT});
         try {
             if (cursor == null || cursor.getCount() == 0)
                 return 0;
@@ -552,13 +606,16 @@ public class TaskController extends LegacyAbstractController {
         } catch (Exception e) {
             return 0;
         } finally {
-            if(cursor != null)
+            if (cursor != null)
                 cursor.close();
         }
     }
 
-    /** Updates the alarm for the task identified by the given id
-     * @param taskId */
+    /**
+     * Updates the alarm for the task identified by the given id
+     *
+     * @param taskId
+     */
     public void updateAlarmForTask(TaskIdentifier taskId) throws SQLException {
 //        TaskModelForNotify task = fetchTaskForNotify(taskId);
         AlertController alertController = new AlertController(context);
@@ -569,46 +626,46 @@ public class TaskController extends LegacyAbstractController {
 
     public ArrayList<TaskModelForWidget> getTasksForWidget(String limit) {
 
-    	Cursor cursor = database.query(tasksTable, TaskModelForWidget.FIELD_LIST,
-    	        AbstractTaskModel.PROGRESS_PERCENTAGE + " < " +
-                AbstractTaskModel.COMPLETE_PERCENTAGE + " AND (" +
-                AbstractTaskModel.HIDDEN_UNTIL + " ISNULL OR " + AbstractTaskModel.HIDDEN_UNTIL + " < " +
-                System.currentTimeMillis() + ")", null, null, null,
+        Cursor cursor = database.query(tasksTable, TaskModelForWidget.FIELD_LIST,
+                AbstractTaskModel.PROGRESS_PERCENTAGE + " < " +
+                        AbstractTaskModel.COMPLETE_PERCENTAGE + " AND (" +
+                        AbstractTaskModel.HIDDEN_UNTIL + " ISNULL OR " + AbstractTaskModel.HIDDEN_UNTIL + " < " +
+                        System.currentTimeMillis() + ")", null, null, null,
                 AbstractTaskModel.IMPORTANCE + " * " + (5 * 24 * 3600 * 1000L) +
-                    " + CASE WHEN MAX(pdd, ddd) = 0 THEN " +
-                    (System.currentTimeMillis() + (7 * 24 * 3600 * 1000L)) +
-                    " ELSE (CASE WHEN pdd = 0 THEN ddd ELSE pdd END) END ASC", limit);
+                        " + CASE WHEN MAX(pdd, ddd) = 0 THEN " +
+                        (System.currentTimeMillis() + (7 * 24 * 3600 * 1000L)) +
+                        " ELSE (CASE WHEN pdd = 0 THEN ddd ELSE pdd END) END ASC", limit);
 
-    	try {
+        try {
             ArrayList<TaskModelForWidget> list = new ArrayList<TaskModelForWidget>();
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext())
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext())
                 list.add(new TaskModelForWidget(cursor));
             return list;
-    	} finally {
-    	    cursor.close();
-    	}
+        } finally {
+            cursor.close();
+        }
     }
 
     public ArrayList<TaskModelForProvider> getTasksForProvider(String limit) {
 
-    	Cursor cursor = database.query(tasksTable, TaskModelForProvider.FIELD_LIST,
-    	        AbstractTaskModel.PROGRESS_PERCENTAGE + " < " +
-                AbstractTaskModel.COMPLETE_PERCENTAGE + " AND (" +
-                AbstractTaskModel.HIDDEN_UNTIL + " ISNULL OR " + AbstractTaskModel.HIDDEN_UNTIL + " < " +
-                System.currentTimeMillis() + ")", null, null, null,
+        Cursor cursor = database.query(tasksTable, TaskModelForProvider.FIELD_LIST,
+                AbstractTaskModel.PROGRESS_PERCENTAGE + " < " +
+                        AbstractTaskModel.COMPLETE_PERCENTAGE + " AND (" +
+                        AbstractTaskModel.HIDDEN_UNTIL + " ISNULL OR " + AbstractTaskModel.HIDDEN_UNTIL + " < " +
+                        System.currentTimeMillis() + ")", null, null, null,
                 AbstractTaskModel.IMPORTANCE + " * " + (5 * 24 * 3600 * 1000L) +
-                    " + CASE WHEN MAX(pdd, ddd) = 0 THEN " +
-                    (System.currentTimeMillis() + (7 * 24 * 3600 * 1000L)) +
-                    " ELSE (CASE WHEN pdd = 0 THEN ddd ELSE pdd END) END ASC", limit);
+                        " + CASE WHEN MAX(pdd, ddd) = 0 THEN " +
+                        (System.currentTimeMillis() + (7 * 24 * 3600 * 1000L)) +
+                        " ELSE (CASE WHEN pdd = 0 THEN ddd ELSE pdd END) END ASC", limit);
 
-    	try {
+        try {
             ArrayList<TaskModelForProvider> list = new ArrayList<TaskModelForProvider>();
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext())
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext())
                 list.add(new TaskModelForProvider(cursor));
             return list;
-    	} finally {
-    	    cursor.close();
-    	}
+        } finally {
+            cursor.close();
+        }
     }
 
     // --- boilerplate
@@ -627,7 +684,7 @@ public class TaskController extends LegacyAbstractController {
      * signal the failure
      *
      * @return this (self reference, allowing this to be chained in an
-     *         initialization call)
+     * initialization call)
      * @throws SQLException if the database could be neither opened or created
      */
     @Override
@@ -637,7 +694,9 @@ public class TaskController extends LegacyAbstractController {
         database = databaseHelper.getWritableDatabase();
     }
 
-    /** Closes database resource */
+    /**
+     * Closes database resource
+     */
     @Override
     public void close() {
         database.close();
diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForEdit.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForEdit.java
index f83f81f36..3ba6d7338 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForEdit.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForEdit.java
@@ -5,33 +5,34 @@
  */
 package com.timsu.astrid.data.task;
 
-import java.util.Date;
-
 import android.database.Cursor;
 
 import com.timsu.astrid.data.enums.Importance;
 
+import java.util.Date;
 
 
-/** Fields that you would want to edit in the TaskModel */
+/**
+ * Fields that you would want to edit in the TaskModel
+ */
 public class TaskModelForEdit extends AbstractTaskModel {
 
-    static String[] FIELD_LIST = new String[] {
-        NAME,
-        IMPORTANCE,
-        ESTIMATED_SECONDS,
-        ELAPSED_SECONDS,
-        DEFINITE_DUE_DATE,
-        PREFERRED_DUE_DATE,
-        HIDDEN_UNTIL,
-        BLOCKING_ON,
-        NOTIFICATIONS,
-        NOTIFICATION_FLAGS,
-        LAST_NOTIFIED,
-        PROGRESS_PERCENTAGE,
-        NOTES,
-        REPEAT,
-        CALENDAR_URI,
+    static String[] FIELD_LIST = new String[]{
+            NAME,
+            IMPORTANCE,
+            ESTIMATED_SECONDS,
+            ELAPSED_SECONDS,
+            DEFINITE_DUE_DATE,
+            PREFERRED_DUE_DATE,
+            HIDDEN_UNTIL,
+            BLOCKING_ON,
+            NOTIFICATIONS,
+            NOTIFICATION_FLAGS,
+            LAST_NOTIFIED,
+            PROGRESS_PERCENTAGE,
+            NOTES,
+            REPEAT,
+            CALENDAR_URI,
     };
 
     // --- constructors
diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java
index c68086622..57929fd1a 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java
@@ -5,9 +5,6 @@
  */
 package com.timsu.astrid.data.task;
 
-import java.util.Date;
-import java.util.List;
-
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -15,24 +12,28 @@ import android.database.Cursor;
 import com.timsu.astrid.data.LegacyAbstractController;
 import com.timsu.astrid.data.alerts.AlertController;
 
+import java.util.Date;
+import java.util.List;
 
 
-/** Fields that you would want to read or edit in the onTaskSave and onTaskComplete
- * event handlers */
+/**
+ * Fields that you would want to read or edit in the onTaskSave and onTaskComplete
+ * event handlers
+ */
 public class TaskModelForHandlers extends AbstractTaskModel {
 
-    static String[] FIELD_LIST = new String[] {
-        LegacyAbstractController.KEY_ROWID,
-        REPEAT,
-        DEFINITE_DUE_DATE,
-        PREFERRED_DUE_DATE,
-        HIDDEN_UNTIL,
-        PROGRESS_PERCENTAGE,
-        ESTIMATED_SECONDS,
-        LAST_NOTIFIED,
-        NOTIFICATIONS,
-        NOTIFICATION_FLAGS,
-        FLAGS,
+    static String[] FIELD_LIST = new String[]{
+            LegacyAbstractController.KEY_ROWID,
+            REPEAT,
+            DEFINITE_DUE_DATE,
+            PREFERRED_DUE_DATE,
+            HIDDEN_UNTIL,
+            PROGRESS_PERCENTAGE,
+            ESTIMATED_SECONDS,
+            LAST_NOTIFIED,
+            NOTIFICATIONS,
+            NOTIFICATION_FLAGS,
+            FLAGS,
     };
 
     /**
@@ -45,14 +46,14 @@ public class TaskModelForHandlers extends AbstractTaskModel {
      */
     @SuppressWarnings("deprecation")
     public void repeatTaskBy(Context context, TaskController taskController,
-            RepeatInfo repeatInfo) {
+                             RepeatInfo repeatInfo) {
 
         // move dates back
-        if(getDefiniteDueDate() != null)
+        if (getDefiniteDueDate() != null)
             setDefiniteDueDate(repeatInfo.shiftDate(getDefiniteDueDate()));
-        if(getHiddenUntil() != null)
+        if (getHiddenUntil() != null)
             setHiddenUntil(repeatInfo.shiftDate(getHiddenUntil()));
-        if(getPreferredDueDate() != null)
+        if (getPreferredDueDate() != null)
             setPreferredDueDate(repeatInfo.shiftDate(getPreferredDueDate()));
         setProgressPercentage(0);
 
@@ -60,7 +61,7 @@ public class TaskModelForHandlers extends AbstractTaskModel {
         setElapsedSeconds(0);
 
         // if no deadlines set, create one (so users don't get confused)
-        if(getDefiniteDueDate() == null && getPreferredDueDate() == null)
+        if (getDefiniteDueDate() == null && getPreferredDueDate() == null)
             setPreferredDueDate(repeatInfo.shiftDate(new Date()));
 
         // shift fixed alerts
@@ -68,7 +69,7 @@ public class TaskModelForHandlers extends AbstractTaskModel {
         alertController.open();
         List<Date> alerts = alertController.getTaskAlerts(getTaskIdentifier());
         alertController.removeAlerts(getTaskIdentifier());
-        for(int i = 0; i < alerts.size(); i++) {
+        for (int i = 0; i < alerts.size(); i++) {
             Date newAlert = repeatInfo.shiftDate(alerts.get(i));
             alertController.addAlert(getTaskIdentifier(), newAlert);
             alerts.set(i, newAlert);
@@ -124,6 +125,7 @@ public class TaskModelForHandlers extends AbstractTaskModel {
     public Date getPreferredDueDate() {
         return super.getPreferredDueDate();
     }
+
     @Override
     public int getNotificationFlags() {
         return super.getNotificationFlags();
diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForList.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForList.java
index 0565d0b56..e7611fae2 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForList.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForList.java
@@ -5,83 +5,86 @@
  */
 package com.timsu.astrid.data.task;
 
-import java.util.Date;
-import java.util.HashMap;
-
 import android.content.Context;
 import android.database.Cursor;
 
 import com.timsu.astrid.data.LegacyAbstractController;
 import com.timsu.astrid.data.enums.Importance;
 
+import java.util.Date;
+import java.util.HashMap;
 
 
-/** Fields that you would want to edit in the TaskModel */
+/**
+ * Fields that you would want to edit in the TaskModel
+ */
 public class TaskModelForList extends AbstractTaskModel {
 
-    static String[] FIELD_LIST = new String[] {
-        LegacyAbstractController.KEY_ROWID,
-        NAME,
-        IMPORTANCE,
-        ELAPSED_SECONDS,
-        ESTIMATED_SECONDS,
-        TIMER_START,
-        DEFINITE_DUE_DATE,
-        PREFERRED_DUE_DATE,
-        NOTIFICATIONS,
-        PROGRESS_PERCENTAGE,
-        COMPLETION_DATE,
-        CREATION_DATE,
-        HIDDEN_UNTIL,
-        NOTES,
-        REPEAT,
-        FLAGS,
+    static String[] FIELD_LIST = new String[]{
+            LegacyAbstractController.KEY_ROWID,
+            NAME,
+            IMPORTANCE,
+            ELAPSED_SECONDS,
+            ESTIMATED_SECONDS,
+            TIMER_START,
+            DEFINITE_DUE_DATE,
+            PREFERRED_DUE_DATE,
+            NOTIFICATIONS,
+            PROGRESS_PERCENTAGE,
+            COMPLETION_DATE,
+            CREATION_DATE,
+            HIDDEN_UNTIL,
+            NOTES,
+            REPEAT,
+            FLAGS,
     };
 
     // pre-load the cache for our column keys
     static {
         HashMap<String, Integer> indexCache = new HashMap<String, Integer>();
         columnIndexCache.put(TaskModelForList.class, indexCache);
-        for(int i = 0; i < FIELD_LIST.length; i++)
+        for (int i = 0; i < FIELD_LIST.length; i++)
             indexCache.put(FIELD_LIST[i], i);
     }
 
-    /** Get the weighted score for this task. Smaller is more important */
+    /**
+     * Get the weighted score for this task. Smaller is more important
+     */
     public int getTaskWeight() {
         int weight = 0;
 
         // bubble tasks with timers to the top
-        if(getTimerStart() != null)
+        if (getTimerStart() != null)
             weight -= 10000;
 
         // importance
         weight += getImportance().ordinal() * 80;
 
         // looming absolute deadline
-        if(getDefiniteDueDate() != null) {
+        if (getDefiniteDueDate() != null) {
             int hoursLeft = (int) ((getDefiniteDueDate().getTime() -
-                    System.currentTimeMillis())/1000/3600);
-            if(hoursLeft < 5*24)
-                weight += (hoursLeft - 5*24);
+                    System.currentTimeMillis()) / 1000 / 3600);
+            if (hoursLeft < 5 * 24)
+                weight += (hoursLeft - 5 * 24);
             weight -= 20;
         }
 
         // looming preferred deadline
-        if(getPreferredDueDate() != null) {
+        if (getPreferredDueDate() != null) {
             int hoursLeft = (int) ((getPreferredDueDate().getTime() -
-                    System.currentTimeMillis())/1000/3600);
-            if(hoursLeft < 5*24)
-                weight += (hoursLeft - 5*24)/2;
+                    System.currentTimeMillis()) / 1000 / 3600);
+            if (hoursLeft < 5 * 24)
+                weight += (hoursLeft - 5 * 24) / 2;
             weight -= 10;
         }
 
         // bubble completed tasks to the bottom
-        if(isTaskCompleted()) {
-            if(getCompletionDate() == null)
+        if (isTaskCompleted()) {
+            if (getCompletionDate() == null)
                 weight += 1e6;
             else
-                weight = (int)Math.max(10000 + (System.currentTimeMillis() -
-                    getCompletionDate().getTime()) / 1000, 10000);
+                weight = (int) Math.max(10000 + (System.currentTimeMillis() -
+                        getCompletionDate().getTime()) / 1000, 10000);
             return weight;
         }
 
@@ -93,15 +96,19 @@ public class TaskModelForList extends AbstractTaskModel {
         return super.isHidden();
     }
 
-    /** map of cached display labels */
+    /**
+     * map of cached display labels
+     */
     private final HashMap<Integer, String> displayLabels = new HashMap<Integer, String>();
 
     public String getCachedLabel(int key) {
         return displayLabels.get(key);
     }
+
     public void putCachedLabel(int key, String value) {
         displayLabels.put(key, value);
     }
+
     public void clearCache() {
         displayLabels.clear();
     }
@@ -186,24 +193,24 @@ public class TaskModelForList extends AbstractTaskModel {
     }
 
     @Override
-	public Integer getNotificationIntervalSeconds() {
-		return super.getNotificationIntervalSeconds();
-	}
+    public Integer getNotificationIntervalSeconds() {
+        return super.getNotificationIntervalSeconds();
+    }
 
-	@Override
+    @Override
     public RepeatInfo getRepeat() {
         return super.getRepeat();
     }
 
-	@Override
-	public Date getCreationDate() {
-	    return super.getCreationDate();
-	}
+    @Override
+    public Date getCreationDate() {
+        return super.getCreationDate();
+    }
 
-	@Override
-	public int getFlags() {
-		return super.getFlags();
-	}
+    @Override
+    public int getFlags() {
+        return super.getFlags();
+    }
 
     // --- setters
 
@@ -238,7 +245,7 @@ public class TaskModelForList extends AbstractTaskModel {
 
     @Override
     public void setImportance(Importance importance) {
-    	super.setImportance(importance);
+        super.setImportance(importance);
     }
 
     @Override
diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForNotify.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForNotify.java
index c3e58d4a0..92d9b9c8e 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForNotify.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForNotify.java
@@ -5,27 +5,28 @@
  */
 package com.timsu.astrid.data.task;
 
-import java.util.Date;
-
 import android.database.Cursor;
 
 import com.timsu.astrid.data.LegacyAbstractController;
 
+import java.util.Date;
 
 
-/** Fields that you would want to see in the TaskView activity */
+/**
+ * Fields that you would want to see in the TaskView activity
+ */
 public class TaskModelForNotify extends AbstractTaskModel {
 
-    static String[] FIELD_LIST = new String[] {
-        LegacyAbstractController.KEY_ROWID,
-        ESTIMATED_SECONDS,
-        NOTIFICATIONS,
-        NOTIFICATION_FLAGS,
-        LAST_NOTIFIED,
-        HIDDEN_UNTIL,
-        PROGRESS_PERCENTAGE,
-        DEFINITE_DUE_DATE,
-        PREFERRED_DUE_DATE,
+    static String[] FIELD_LIST = new String[]{
+            LegacyAbstractController.KEY_ROWID,
+            ESTIMATED_SECONDS,
+            NOTIFICATIONS,
+            NOTIFICATION_FLAGS,
+            LAST_NOTIFIED,
+            HIDDEN_UNTIL,
+            PROGRESS_PERCENTAGE,
+            DEFINITE_DUE_DATE,
+            PREFERRED_DUE_DATE,
     };
 
     // --- constructors
diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForProvider.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForProvider.java
index 8061f2e0a..a3656d010 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForProvider.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForProvider.java
@@ -5,28 +5,29 @@
  */
 package com.timsu.astrid.data.task;
 
-import java.util.Date;
-
 import android.content.ContentValues;
 import android.database.Cursor;
 
 import com.timsu.astrid.data.LegacyAbstractController;
 import com.timsu.astrid.data.enums.Importance;
 
+import java.util.Date;
 
 
-/** Fields that you would want to see in the TaskView activity */
+/**
+ * Fields that you would want to see in the TaskView activity
+ */
 @SuppressWarnings("nls")
 public class TaskModelForProvider extends AbstractTaskModel {
 
-    static String[] FIELD_LIST = new String[] {
-        LegacyAbstractController.KEY_ROWID,
-        NAME,
-        IMPORTANCE,
-        PREFERRED_DUE_DATE,
-        DEFINITE_DUE_DATE,
-        "COALESCE(" + PREFERRED_DUE_DATE + ", 0) as pdd",
-        "COALESCE(" + DEFINITE_DUE_DATE + ", 0) as ddd"
+    static String[] FIELD_LIST = new String[]{
+            LegacyAbstractController.KEY_ROWID,
+            NAME,
+            IMPORTANCE,
+            PREFERRED_DUE_DATE,
+            DEFINITE_DUE_DATE,
+            "COALESCE(" + PREFERRED_DUE_DATE + ", 0) as pdd",
+            "COALESCE(" + DEFINITE_DUE_DATE + ", 0) as ddd"
     };
 
     // --- constructors
diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForReminder.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForReminder.java
index d5d2757e0..8b8689d50 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForReminder.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForReminder.java
@@ -5,24 +5,25 @@
  */
 package com.timsu.astrid.data.task;
 
-import java.util.Date;
-
 import android.database.Cursor;
 
 import com.timsu.astrid.data.LegacyAbstractController;
 
+import java.util.Date;
 
 
-/** Fields that you would want to see in the TaskView activity */
+/**
+ * Fields that you would want to see in the TaskView activity
+ */
 public class TaskModelForReminder extends AbstractTaskModel {
 
-    static String[] FIELD_LIST = new String[] {
-        LegacyAbstractController.KEY_ROWID,
-        NAME,
-        NOTIFICATION_FLAGS,
-        HIDDEN_UNTIL,
-        TIMER_START,
-        PROGRESS_PERCENTAGE,
+    static String[] FIELD_LIST = new String[]{
+            LegacyAbstractController.KEY_ROWID,
+            NAME,
+            NOTIFICATION_FLAGS,
+            HIDDEN_UNTIL,
+            TIMER_START,
+            PROGRESS_PERCENTAGE,
     };
 
     // --- constructors
diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForSync.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForSync.java
index cd81c42a9..e9611cdd4 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForSync.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForSync.java
@@ -5,37 +5,38 @@
  */
 package com.timsu.astrid.data.task;
 
-import java.util.Date;
-
 import android.database.Cursor;
 
 import com.timsu.astrid.data.LegacyAbstractController;
 import com.timsu.astrid.data.enums.Importance;
 
+import java.util.Date;
 
 
-/** Fields that you would want to synchronize in the TaskModel */
-public class TaskModelForSync extends AbstractTaskModel  {
-
-    static String[] FIELD_LIST = new String[] {
-        LegacyAbstractController.KEY_ROWID,
-        NAME,
-        IMPORTANCE,
-        ESTIMATED_SECONDS,
-        ELAPSED_SECONDS,
-        DEFINITE_DUE_DATE,
-        PREFERRED_DUE_DATE,
-        HIDDEN_UNTIL,
-        BLOCKING_ON,
-        PROGRESS_PERCENTAGE,
-        CREATION_DATE,
-        COMPLETION_DATE,
-        NOTES,
-        REPEAT,
-        LAST_NOTIFIED,
-        NOTIFICATIONS,
-        NOTIFICATION_FLAGS,
-        FLAGS,
+/**
+ * Fields that you would want to synchronize in the TaskModel
+ */
+public class TaskModelForSync extends AbstractTaskModel {
+
+    static String[] FIELD_LIST = new String[]{
+            LegacyAbstractController.KEY_ROWID,
+            NAME,
+            IMPORTANCE,
+            ESTIMATED_SECONDS,
+            ELAPSED_SECONDS,
+            DEFINITE_DUE_DATE,
+            PREFERRED_DUE_DATE,
+            HIDDEN_UNTIL,
+            BLOCKING_ON,
+            PROGRESS_PERCENTAGE,
+            CREATION_DATE,
+            COMPLETION_DATE,
+            NOTES,
+            REPEAT,
+            LAST_NOTIFIED,
+            NOTIFICATIONS,
+            NOTIFICATION_FLAGS,
+            FLAGS,
     };
 
     // --- constructors
diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForWidget.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForWidget.java
index f12fcccb5..bc73b970e 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForWidget.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForWidget.java
@@ -5,27 +5,28 @@
  */
 package com.timsu.astrid.data.task;
 
-import java.util.Date;
-
 import android.database.Cursor;
 
 import com.timsu.astrid.data.LegacyAbstractController;
 import com.timsu.astrid.data.enums.Importance;
 
+import java.util.Date;
 
 
-/** Fields that you would want to see in the TaskView activity */
+/**
+ * Fields that you would want to see in the TaskView activity
+ */
 @SuppressWarnings("nls")
 public class TaskModelForWidget extends AbstractTaskModel {
 
-    static String[] FIELD_LIST = new String[] {
-        LegacyAbstractController.KEY_ROWID,
-        NAME,
-        IMPORTANCE,
-        PREFERRED_DUE_DATE,
-        DEFINITE_DUE_DATE,
-        "COALESCE(" + PREFERRED_DUE_DATE + ", 0) as pdd",
-        "COALESCE(" + DEFINITE_DUE_DATE + ", 0) as ddd"
+    static String[] FIELD_LIST = new String[]{
+            LegacyAbstractController.KEY_ROWID,
+            NAME,
+            IMPORTANCE,
+            PREFERRED_DUE_DATE,
+            DEFINITE_DUE_DATE,
+            "COALESCE(" + PREFERRED_DUE_DATE + ", 0) as pdd",
+            "COALESCE(" + DEFINITE_DUE_DATE + ", 0) as ddd"
     };
 
     // --- constructors
diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForXml.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForXml.java
index ef70421d7..873e0a352 100644
--- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForXml.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForXml.java
@@ -5,9 +5,6 @@
  */
 package com.timsu.astrid.data.task;
 
-import java.util.Date;
-import java.util.HashMap;
-
 import android.database.Cursor;
 
 import com.timsu.astrid.data.LegacyAbstractController;
@@ -15,10 +12,13 @@ import com.timsu.astrid.data.enums.Importance;
 import com.timsu.astrid.data.enums.RepeatInterval;
 import com.todoroo.astrid.backup.BackupDateUtilities;
 
+import java.util.Date;
+import java.util.HashMap;
+
 @SuppressWarnings("nls")
 public class TaskModelForXml extends AbstractTaskModel {
 
-    static String[] FIELD_LIST = new String[] {
+    static String[] FIELD_LIST = new String[]{
             LegacyAbstractController.KEY_ROWID,
             NAME,
             IMPORTANCE,
@@ -117,71 +117,51 @@ public class TaskModelForXml extends AbstractTaskModel {
 
     public boolean setField(String field, String value) {
         boolean success = true;
-        if(field.equals(NAME)) {
+        if (field.equals(NAME)) {
             setName(value);
-        }
-        else if(field.equals(NOTES)) {
+        } else if (field.equals(NOTES)) {
             setNotes(value);
-        }
-        else if(field.equals(PROGRESS_PERCENTAGE)) {
+        } else if (field.equals(PROGRESS_PERCENTAGE)) {
             setProgressPercentage(Integer.parseInt(value));
-        }
-        else if(field.equals(IMPORTANCE)) {
+        } else if (field.equals(IMPORTANCE)) {
             setImportance(Importance.valueOf(value));
-        }
-        else if(field.equals(ESTIMATED_SECONDS)) {
+        } else if (field.equals(ESTIMATED_SECONDS)) {
             setEstimatedSeconds(Integer.parseInt(value));
-        }
-        else if(field.equals(ELAPSED_SECONDS)) {
+        } else if (field.equals(ELAPSED_SECONDS)) {
             setElapsedSeconds(Integer.parseInt(value));
-        }
-        else if(field.equals(TIMER_START)) {
+        } else if (field.equals(TIMER_START)) {
             setTimerStart(BackupDateUtilities.getDateFromIso8601String(value));
-        }
-        else if(field.equals(DEFINITE_DUE_DATE)) {
+        } else if (field.equals(DEFINITE_DUE_DATE)) {
             setDefiniteDueDate(BackupDateUtilities.getDateFromIso8601String(value));
-        }
-        else if(field.equals(PREFERRED_DUE_DATE)) {
+        } else if (field.equals(PREFERRED_DUE_DATE)) {
             setPreferredDueDate(BackupDateUtilities.getDateFromIso8601String(value));
-        }
-        else if(field.equals(HIDDEN_UNTIL)) {
+        } else if (field.equals(HIDDEN_UNTIL)) {
             setHiddenUntil(BackupDateUtilities.getDateFromIso8601String(value));
-        }
-        else if(field.equals(BLOCKING_ON)) {
+        } else if (field.equals(BLOCKING_ON)) {
             setBlockingOn(new TaskIdentifier(Long.parseLong(value)));
-        }
-        else if(field.equals(POSTPONE_COUNT)) {
+        } else if (field.equals(POSTPONE_COUNT)) {
             setPostponeCount(Integer.parseInt(value));
-        }
-        else if(field.equals(NOTIFICATIONS)) {
+        } else if (field.equals(NOTIFICATIONS)) {
             setNotificationIntervalSeconds(Integer.parseInt(value));
-        }
-        else if(field.equals(CREATION_DATE)) {
+        } else if (field.equals(CREATION_DATE)) {
             setCreationDate(BackupDateUtilities.getDateFromIso8601String(value));
-        }
-        else if(field.equals(COMPLETION_DATE)) {
+        } else if (field.equals(COMPLETION_DATE)) {
             setCompletionDate(BackupDateUtilities.getDateFromIso8601String(value));
-        }
-        else if(field.equals(NOTIFICATION_FLAGS)) {
+        } else if (field.equals(NOTIFICATION_FLAGS)) {
             setNotificationFlags(Integer.parseInt(value));
-        }
-        else if(field.equals(LAST_NOTIFIED)) {
+        } else if (field.equals(LAST_NOTIFIED)) {
             setLastNotificationTime(BackupDateUtilities.getDateFromIso8601String(value));
-        }
-        else if(field.equals(REPEAT_INTERVAL)) {
+        } else if (field.equals(REPEAT_INTERVAL)) {
             try {
                 setRepeatInterval(RepeatInterval.valueOf(value));
             } catch (Exception e) {
                 // bad saving format, old backup
             }
-        }
-        else if(field.equals(REPEAT_VALUE)) {
+        } else if (field.equals(REPEAT_VALUE)) {
             setRepeatValue(Integer.parseInt(value));
-        }
-        else if(field.equals(FLAGS)) {
+        } else if (field.equals(FLAGS)) {
             setFlags(Integer.parseInt(value));
-        }
-        else {
+        } else {
             success = false;
         }
         return success;
diff --git a/astrid/src-legacy/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java b/astrid/src-legacy/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java
index 5a4e64079..c7d8b69a6 100644
--- a/astrid/src-legacy/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java
+++ b/astrid/src-legacy/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java
@@ -5,17 +5,6 @@
  */
 package com.timsu.astrid.utilities;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.xmlpull.v1.XmlSerializer;
-
 import android.content.Context;
 import android.database.Cursor;
 import android.os.Environment;
@@ -35,6 +24,17 @@ import com.timsu.astrid.data.task.TaskIdentifier;
 import com.timsu.astrid.data.task.TaskModelForXml;
 import com.todoroo.astrid.backup.BackupDateUtilities;
 
+import org.xmlpull.v1.XmlSerializer;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+
 @SuppressWarnings({"nls", "deprecation"})
 public class LegacyTasksXmlExporter {
 
@@ -66,7 +66,9 @@ public class LegacyTasksXmlExporter {
     public static final int FILENAME_DATE_BEGIN_INDEX = 5;
     public static final int FILENAME_DATE_END_INDEX = 11;
 
-    /** last version before 3.0, used for XML header */
+    /**
+     * last version before 3.0, used for XML header
+     */
     private static final int LEGACY_VERSION = 137;
 
     public LegacyTasksXmlExporter(boolean isService) {
@@ -82,7 +84,7 @@ public class LegacyTasksXmlExporter {
             throws IOException {
         LinkedList<TagIdentifier> tags = tagController.getTaskTags(task);
         for (TagIdentifier tag : tags) {
-            if(!tagMap.containsKey(tag) || tagMap.get(tag) == null)
+            if (!tagMap.containsKey(tag) || tagMap.get(tag) == null)
                 continue;
             xml.startTag(null, TAG_TAG);
             xml.attribute(null, TAG_ATTR_NAME, tagMap.get(tag).toString());
@@ -115,7 +117,7 @@ public class LegacyTasksXmlExporter {
     private void serializeTasks()
             throws IOException {
         Cursor c = taskController.getBackupTaskListCursor();
-        if (! c.moveToFirst()) {
+        if (!c.moveToFirst()) {
             return; // No tasks.
         }
         do {
@@ -244,7 +246,7 @@ public class LegacyTasksXmlExporter {
     }
 
     private void setOutput(String file) {
-       this.output = file;
+        this.output = file;
     }
 
 //    private final Runnable doBackgroundExport = new Runnable() {
diff --git a/astrid/src/com/commonsware/cwac/merge/MergeAdapter.java b/astrid/src/com/commonsware/cwac/merge/MergeAdapter.java
index 846299d17..3b8e97122 100644
--- a/astrid/src/com/commonsware/cwac/merge/MergeAdapter.java
+++ b/astrid/src/com/commonsware/cwac/merge/MergeAdapter.java
@@ -1,17 +1,17 @@
 /***
-  Copyright (c) 2008-2009 CommonsWare, LLC
-  Portions (c) 2009 Google, Inc.
-  
-  Licensed under the Apache License, Version 2.0 (the "License"); you may
-  not use this file except in compliance with the License. You may obtain
-  a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*/    
+ Copyright (c) 2008-2009 CommonsWare, LLC
+ Portions (c) 2009 Google, Inc.
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may
+ not use this file except in compliance with the License. You may obtain
+ a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
 
 package com.commonsware.cwac.merge;
 
@@ -21,359 +21,368 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ListAdapter;
 import android.widget.SectionIndexer;
+
+import com.commonsware.cwac.sacklist.SackOfViewsAdapter;
+
 import java.util.ArrayList;
 import java.util.List;
-import com.commonsware.cwac.sacklist.SackOfViewsAdapter;
 
 /**
  * Adapter that merges multiple child adapters and views
  * into a single contiguous whole.
- *
+ * <p/>
  * Adapters used as pieces within MergeAdapter must
  * have view type IDs monotonically increasing from 0. Ideally,
  * adapters also have distinct ranges for their row ids, as
  * returned by getItemId().
- *
  */
 public class MergeAdapter extends BaseAdapter implements SectionIndexer {
-  protected ArrayList<ListAdapter> pieces=new ArrayList<ListAdapter>();
-
-  /**
-    * Stock constructor, simply chaining to the superclass.
-    */
-  public MergeAdapter() {
-    super();
-  }
-
-  /**
-    * Adds a new adapter to the roster of things to appear
-    * in the aggregate list.
-    * @param adapter Source for row views for this section
-    */
-  public void addAdapter(ListAdapter adapter) {
-    pieces.add(adapter);
-    adapter.registerDataSetObserver(new CascadeDataSetObserver());
-  }
-
-  /**
-    * Adds a new View to the roster of things to appear
-    * in the aggregate list.
-    * @param view Single view to add
-    */
-  public void addView(View view) {
-    addView(view, false);
-  }
-
-  /**
-    * Adds a new View to the roster of things to appear
-    * in the aggregate list.
-    * @param view Single view to add
-    * @param enabled false if views are disabled, true if enabled
-    */
-  public void addView(View view, boolean enabled) {
-    ArrayList<View> list=new ArrayList<View>(1);
-    
-    list.add(view);
-    
-    addViews(list, enabled);
-  }
-
-  /**
-    * Adds a list of views to the roster of things to appear
-    * in the aggregate list.
-    * @param views List of views to add
-    */
-  public void addViews(List<View> views) {
-    addViews(views, false);
-  }
-
-  /**
-    * Adds a list of views to the roster of things to appear
-    * in the aggregate list.
-    * @param views List of views to add
-    * @param enabled false if views are disabled, true if enabled
-    */
-  public void addViews(List<View> views, boolean enabled) {
-    if (enabled) {
-      addAdapter(new EnabledSackAdapter(views));
-    }
-    else {
-      addAdapter(new SackOfViewsAdapter(views));
-    }
-  }
-  
-  /**
-    * Get the data item associated with the specified
-    * position in the data set.
-    * @param position Position of the item whose data we want
-    */
-  @Override
-  public Object getItem(int position) {
-    for (ListAdapter piece : pieces) {
-      int size=piece.getCount();
-
-      if (position<size) {
-        return(piece.getItem(position));
-      }
-
-      position-=size;
-    }
-    
-    return(null);
-  }
-
-  /**
-    * Get the adapter associated with the specified
-    * position in the data set.
-    * @param position Position of the item whose adapter we want
-    */
-  public ListAdapter getAdapter(int position) {
-    for (ListAdapter piece : pieces) {
-      int size=piece.getCount();
-
-      if (position<size) {
-        return(piece);
-      }
-
-      position-=size;
-    }
-    
-    return(null);
-  }
-
-  /**
-    * How many items are in the data set represented by this
-    * Adapter.
-    */
-  @Override
-  public int getCount() {
-    int total=0;
-    
-    for (ListAdapter piece : pieces) {
-      total+=piece.getCount();
-    }
-    
-    return(total);
-  }
-
-  /**
-    * Returns the number of types of Views that will be
-    * created by getView().
-    */
-  @Override
-  public int getViewTypeCount() {
-    int total=0;
-    
-    for (ListAdapter piece : pieces) {
-      total+=piece.getViewTypeCount();
+    protected ArrayList<ListAdapter> pieces = new ArrayList<ListAdapter>();
+
+    /**
+     * Stock constructor, simply chaining to the superclass.
+     */
+    public MergeAdapter() {
+        super();
     }
-    
-    return(Math.max(total, 1));   // needed for setListAdapter() before content add'
-  }
-
-  /**
-    * Get the type of View that will be created by getView()
-    * for the specified item.
-    * @param position Position of the item whose data we want
-    */
-  @Override
-  public int getItemViewType(int position) {
-    int typeOffset=0;
-    int result=-1;
-    
-    for (ListAdapter piece : pieces) {
-      int size=piece.getCount();
-
-      if (position<size) {
-        result=typeOffset+piece.getItemViewType(position);
-        break;
-      }
-
-      position-=size;
-      typeOffset+=piece.getViewTypeCount();
+
+    /**
+     * Adds a new adapter to the roster of things to appear
+     * in the aggregate list.
+     *
+     * @param adapter Source for row views for this section
+     */
+    public void addAdapter(ListAdapter adapter) {
+        pieces.add(adapter);
+        adapter.registerDataSetObserver(new CascadeDataSetObserver());
     }
 
-    return(result);
-  }
-
-  /**
-    * Are all items in this ListAdapter enabled? If yes it
-    * means all items are selectable and clickable.
-    */
-  @Override
-  public boolean areAllItemsEnabled() {
-    return(false);
-  }
-
-  /**
-    * Returns true if the item at the specified position is
-    * not a separator.
-    * @param position Position of the item whose data we want
-    */
-  @Override
-  public boolean isEnabled(int position) {
-    for (ListAdapter piece : pieces) {
-      int size=piece.getCount();
-
-      if (position<size) {
-        return(piece.isEnabled(position));
-      }
-
-      position-=size;
+    /**
+     * Adds a new View to the roster of things to appear
+     * in the aggregate list.
+     *
+     * @param view Single view to add
+     */
+    public void addView(View view) {
+        addView(view, false);
     }
-    
-    return(false);
-  }
-
-  /**
-    * Get a View that displays the data at the specified
-    * position in the data set.
-    * @param position Position of the item whose data we want
-    * @param convertView View to recycle, if not null
-    * @param parent ViewGroup containing the returned View
-    */
-  @Override
-  public View getView(int position, View convertView,
-                      ViewGroup parent) {
-    for (ListAdapter piece : pieces) {
-      int size=piece.getCount();
-
-      if (position<size) {
-        
-        return(piece.getView(position, convertView, parent));
-      }
-
-      position-=size;
+
+    /**
+     * Adds a new View to the roster of things to appear
+     * in the aggregate list.
+     *
+     * @param view    Single view to add
+     * @param enabled false if views are disabled, true if enabled
+     */
+    public void addView(View view, boolean enabled) {
+        ArrayList<View> list = new ArrayList<View>(1);
+
+        list.add(view);
+
+        addViews(list, enabled);
     }
-    
-    return(null);
-  }
-
-  /**
-    * Get the row id associated with the specified position
-    * in the list.
-    * @param position Position of the item whose data we want
-    */
-  @Override
-  public long getItemId(int position) {
-    for (ListAdapter piece : pieces) {
-      int size=piece.getCount();
-      
-      if (position<size) {
-        return(piece.getItemId(position));
-      }
-
-      position-=size;
+
+    /**
+     * Adds a list of views to the roster of things to appear
+     * in the aggregate list.
+     *
+     * @param views List of views to add
+     */
+    public void addViews(List<View> views) {
+        addViews(views, false);
     }
-    
-    return(-1);
-  }
-  
-  @Override
-  public int getPositionForSection(int section) {
-    int position=0;
-    
-    for (ListAdapter piece : pieces) {
-      if (piece instanceof SectionIndexer) {
-        Object[] sections=((SectionIndexer)piece).getSections();
-        int numSections=0;
-        
-        if (sections!=null) {
-          numSections=sections.length;
-        }
-        
-        if (section<numSections) {
-          return(position+((SectionIndexer)piece).getPositionForSection(section));
-        }
-        else if (sections!=null) {
-          section-=numSections;
+
+    /**
+     * Adds a list of views to the roster of things to appear
+     * in the aggregate list.
+     *
+     * @param views   List of views to add
+     * @param enabled false if views are disabled, true if enabled
+     */
+    public void addViews(List<View> views, boolean enabled) {
+        if (enabled) {
+            addAdapter(new EnabledSackAdapter(views));
+        } else {
+            addAdapter(new SackOfViewsAdapter(views));
         }
-      }
-      
-      position+=piece.getCount();
     }
-    
-    return(0);
-  }
-  
-  @Override
-  public int getSectionForPosition(int position) {
-    int section=0;
-    
-    for (ListAdapter piece : pieces) {
-      int size=piece.getCount();
-      
-      if (position<size) {
-        if (piece instanceof SectionIndexer) {
-          return(section+((SectionIndexer)piece).getSectionForPosition(position));
+
+    /**
+     * Get the data item associated with the specified
+     * position in the data set.
+     *
+     * @param position Position of the item whose data we want
+     */
+    @Override
+    public Object getItem(int position) {
+        for (ListAdapter piece : pieces) {
+            int size = piece.getCount();
+
+            if (position < size) {
+                return (piece.getItem(position));
+            }
+
+            position -= size;
         }
-        
-        return(0);
-      }
-      else {
-        if (piece instanceof SectionIndexer) {
-          Object[] sections=((SectionIndexer)piece).getSections();
-          
-          if (sections!=null) {
-            section+=sections.length;
-          }
+
+        return (null);
+    }
+
+    /**
+     * Get the adapter associated with the specified
+     * position in the data set.
+     *
+     * @param position Position of the item whose adapter we want
+     */
+    public ListAdapter getAdapter(int position) {
+        for (ListAdapter piece : pieces) {
+            int size = piece.getCount();
+
+            if (position < size) {
+                return (piece);
+            }
+
+            position -= size;
         }
-      }
-      
-      position-=size;
+
+        return (null);
     }
-    
-    return(0);
-  }
-  
-  @Override
-  public Object[] getSections() {
-    ArrayList<Object> sections=new ArrayList<Object>();
-    
-    for (ListAdapter piece : pieces) {
-      if (piece instanceof SectionIndexer) {
-        Object[] curSections=((SectionIndexer)piece).getSections();
-        
-        if (curSections!=null) {
-          for (Object section : curSections) {
-            sections.add(section);
-          }
+
+    /**
+     * How many items are in the data set represented by this
+     * Adapter.
+     */
+    @Override
+    public int getCount() {
+        int total = 0;
+
+        for (ListAdapter piece : pieces) {
+            total += piece.getCount();
         }
-      }
+
+        return (total);
     }
-    
-    if (sections.size()==0) {
-      return(null);
+
+    /**
+     * Returns the number of types of Views that will be
+     * created by getView().
+     */
+    @Override
+    public int getViewTypeCount() {
+        int total = 0;
+
+        for (ListAdapter piece : pieces) {
+            total += piece.getViewTypeCount();
+        }
+
+        return (Math.max(total, 1));   // needed for setListAdapter() before content add'
     }
 
-    return(sections.toArray(new Object[0]));
-  }
-  
-  private static class EnabledSackAdapter extends SackOfViewsAdapter {
-    public EnabledSackAdapter(List<View> views) {
-      super(views);
+    /**
+     * Get the type of View that will be created by getView()
+     * for the specified item.
+     *
+     * @param position Position of the item whose data we want
+     */
+    @Override
+    public int getItemViewType(int position) {
+        int typeOffset = 0;
+        int result = -1;
+
+        for (ListAdapter piece : pieces) {
+            int size = piece.getCount();
+
+            if (position < size) {
+                result = typeOffset + piece.getItemViewType(position);
+                break;
+            }
+
+            position -= size;
+            typeOffset += piece.getViewTypeCount();
+        }
+
+        return (result);
     }
-  
+
+    /**
+     * Are all items in this ListAdapter enabled? If yes it
+     * means all items are selectable and clickable.
+     */
     @Override
     public boolean areAllItemsEnabled() {
-      return(true);
+        return (false);
     }
-    
+
+    /**
+     * Returns true if the item at the specified position is
+     * not a separator.
+     *
+     * @param position Position of the item whose data we want
+     */
     @Override
     public boolean isEnabled(int position) {
-      return(true);
+        for (ListAdapter piece : pieces) {
+            int size = piece.getCount();
+
+            if (position < size) {
+                return (piece.isEnabled(position));
+            }
+
+            position -= size;
+        }
+
+        return (false);
     }
-  }
-  
-  private class CascadeDataSetObserver extends DataSetObserver {
+
+    /**
+     * Get a View that displays the data at the specified
+     * position in the data set.
+     *
+     * @param position    Position of the item whose data we want
+     * @param convertView View to recycle, if not null
+     * @param parent      ViewGroup containing the returned View
+     */
+    @Override
+    public View getView(int position, View convertView,
+                        ViewGroup parent) {
+        for (ListAdapter piece : pieces) {
+            int size = piece.getCount();
+
+            if (position < size) {
+
+                return (piece.getView(position, convertView, parent));
+            }
+
+            position -= size;
+        }
+
+        return (null);
+    }
+
+    /**
+     * Get the row id associated with the specified position
+     * in the list.
+     *
+     * @param position Position of the item whose data we want
+     */
+    @Override
+    public long getItemId(int position) {
+        for (ListAdapter piece : pieces) {
+            int size = piece.getCount();
+
+            if (position < size) {
+                return (piece.getItemId(position));
+            }
+
+            position -= size;
+        }
+
+        return (-1);
+    }
+
     @Override
-    public void onChanged() {
-      notifyDataSetChanged();
+    public int getPositionForSection(int section) {
+        int position = 0;
+
+        for (ListAdapter piece : pieces) {
+            if (piece instanceof SectionIndexer) {
+                Object[] sections = ((SectionIndexer) piece).getSections();
+                int numSections = 0;
+
+                if (sections != null) {
+                    numSections = sections.length;
+                }
+
+                if (section < numSections) {
+                    return (position + ((SectionIndexer) piece).getPositionForSection(section));
+                } else if (sections != null) {
+                    section -= numSections;
+                }
+            }
+
+            position += piece.getCount();
+        }
+
+        return (0);
     }
-    
+
     @Override
-    public void onInvalidated() {
-      notifyDataSetInvalidated();
+    public int getSectionForPosition(int position) {
+        int section = 0;
+
+        for (ListAdapter piece : pieces) {
+            int size = piece.getCount();
+
+            if (position < size) {
+                if (piece instanceof SectionIndexer) {
+                    return (section + ((SectionIndexer) piece).getSectionForPosition(position));
+                }
+
+                return (0);
+            } else {
+                if (piece instanceof SectionIndexer) {
+                    Object[] sections = ((SectionIndexer) piece).getSections();
+
+                    if (sections != null) {
+                        section += sections.length;
+                    }
+                }
+            }
+
+            position -= size;
+        }
+
+        return (0);
+    }
+
+    @Override
+    public Object[] getSections() {
+        ArrayList<Object> sections = new ArrayList<Object>();
+
+        for (ListAdapter piece : pieces) {
+            if (piece instanceof SectionIndexer) {
+                Object[] curSections = ((SectionIndexer) piece).getSections();
+
+                if (curSections != null) {
+                    for (Object section : curSections) {
+                        sections.add(section);
+                    }
+                }
+            }
+        }
+
+        if (sections.size() == 0) {
+            return (null);
+        }
+
+        return (sections.toArray(new Object[0]));
+    }
+
+    private static class EnabledSackAdapter extends SackOfViewsAdapter {
+        public EnabledSackAdapter(List<View> views) {
+            super(views);
+        }
+
+        @Override
+        public boolean areAllItemsEnabled() {
+            return (true);
+        }
+
+        @Override
+        public boolean isEnabled(int position) {
+            return (true);
+        }
+    }
+
+    private class CascadeDataSetObserver extends DataSetObserver {
+        @Override
+        public void onChanged() {
+            notifyDataSetChanged();
+        }
+
+        @Override
+        public void onInvalidated() {
+            notifyDataSetInvalidated();
+        }
     }
-  }
 }
\ No newline at end of file
diff --git a/astrid/src/com/commonsware/cwac/merge/MergeSpinnerAdapter.java b/astrid/src/com/commonsware/cwac/merge/MergeSpinnerAdapter.java
index 578ee2a59..a113ffb84 100644
--- a/astrid/src/com/commonsware/cwac/merge/MergeSpinnerAdapter.java
+++ b/astrid/src/com/commonsware/cwac/merge/MergeSpinnerAdapter.java
@@ -5,103 +5,98 @@
  */
 package com.commonsware.cwac.merge;
 
-import java.util.List;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ListAdapter;
 import android.widget.SpinnerAdapter;
 
+import java.util.List;
+
 /**
  * Adapter that merges multiple child adapters into a single
  * contiguous whole to be consumed by a Spinner.
- * 
+ * <p/>
  * Adapters used as pieces within MergeSpinnerAdapter must
  * have view type IDs monotonically increasing from 0.
  * Ideally, adapters also have distinct ranges for their row
  * ids, as returned by getItemId().
- * 
+ * <p/>
  * All Adapters used as pieces within MergeSpinnerAdapter
  * must be properly-configured implementations of
  * SpinnerAdapter (e.g., ArrayAdapter, CursorAdapter).
  */
 public class MergeSpinnerAdapter extends MergeAdapter {
-  /**
-   * Stock constructor, simply chaining to the superclass.
-   */
-  public MergeSpinnerAdapter() {
-    super();
-  }
+    /**
+     * Stock constructor, simply chaining to the superclass.
+     */
+    public MergeSpinnerAdapter() {
+        super();
+    }
 
-  /*
-   * Returns the drop-down View for a given position, by
-   * iterating over the pieces. Assumes that all pieces are
-   * implementations of SpinnerAdapter.
-   * 
-   * @see android.widget.BaseAdapter#getDropDownView(int,
-   * android.view.View, android.view.ViewGroup)
-   */
-  public View getDropDownView(int position, View convertView,
-                              ViewGroup parent) {
-    for (ListAdapter piece : pieces) {
-      int size=piece.getCount();
+    /*
+     * Returns the drop-down View for a given position, by
+     * iterating over the pieces. Assumes that all pieces are
+     * implementations of SpinnerAdapter.
+     *
+     * @see android.widget.BaseAdapter#getDropDownView(int,
+     * android.view.View, android.view.ViewGroup)
+     */
+    public View getDropDownView(int position, View convertView,
+                                ViewGroup parent) {
+        for (ListAdapter piece : pieces) {
+            int size = piece.getCount();
 
-      if (position<size) {
-        return(((SpinnerAdapter)piece).getDropDownView(position,
-                                                       convertView,
-                                                       parent));
-      }
+            if (position < size) {
+                return (((SpinnerAdapter) piece).getDropDownView(position,
+                        convertView,
+                        parent));
+            }
 
-      position-=size;
-    }
+            position -= size;
+        }
 
-    return(null);
-  }
+        return (null);
+    }
 
-  /**
-   * Adds a new View to the roster of things to appear in
-   * the aggregate list.
-   * 
-   * @param view
-   *          Single view to add
-   */
-  public void addView(View view) {
-    throw new RuntimeException("Not supported with MergeSpinnerAdapter");
-  }
+    /**
+     * Adds a new View to the roster of things to appear in
+     * the aggregate list.
+     *
+     * @param view Single view to add
+     */
+    public void addView(View view) {
+        throw new RuntimeException("Not supported with MergeSpinnerAdapter");
+    }
 
-  /**
-   * Adds a new View to the roster of things to appear in
-   * the aggregate list.
-   * 
-   * @param view
-   *          Single view to add
-   * @param enabled
-   *          false if views are disabled, true if enabled
-   */
-  public void addView(View view, boolean enabled) {
-    throw new RuntimeException("Not supported with MergeSpinnerAdapter");
-  }
+    /**
+     * Adds a new View to the roster of things to appear in
+     * the aggregate list.
+     *
+     * @param view    Single view to add
+     * @param enabled false if views are disabled, true if enabled
+     */
+    public void addView(View view, boolean enabled) {
+        throw new RuntimeException("Not supported with MergeSpinnerAdapter");
+    }
 
-  /**
-   * Adds a list of views to the roster of things to appear
-   * in the aggregate list.
-   * 
-   * @param views
-   *          List of views to add
-   */
-  public void addViews(List<View> views) {
-    throw new RuntimeException("Not supported with MergeSpinnerAdapter");
-  }
+    /**
+     * Adds a list of views to the roster of things to appear
+     * in the aggregate list.
+     *
+     * @param views List of views to add
+     */
+    public void addViews(List<View> views) {
+        throw new RuntimeException("Not supported with MergeSpinnerAdapter");
+    }
 
-  /**
-   * Adds a list of views to the roster of things to appear
-   * in the aggregate list.
-   * 
-   * @param views
-   *          List of views to add
-   * @param enabled
-   *          false if views are disabled, true if enabled
-   */
-  public void addViews(List<View> views, boolean enabled) {
-    throw new RuntimeException("Not supported with MergeSpinnerAdapter");
-  }
+    /**
+     * Adds a list of views to the roster of things to appear
+     * in the aggregate list.
+     *
+     * @param views   List of views to add
+     * @param enabled false if views are disabled, true if enabled
+     */
+    public void addViews(List<View> views, boolean enabled) {
+        throw new RuntimeException("Not supported with MergeSpinnerAdapter");
+    }
 }
diff --git a/astrid/src/com/todoroo/astrid/activity/AboutActivity.java b/astrid/src/com/todoroo/astrid/activity/AboutActivity.java
index b8194be1a..32e719cff 100644
--- a/astrid/src/com/todoroo/astrid/activity/AboutActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/AboutActivity.java
@@ -41,12 +41,12 @@ class About {
 
         StringBuilder aboutText = new StringBuilder();
         aboutText.append("<b>").append(r.getString(R.string.app_name)).append("</b><br />").
-            append(r.getString(R.string.p_about_text, versionName).replace("\n", "<br />")).append("<br /><br />").
-            append("<a href='http://github.com/todoroo/astrid'>Source Code</a><br />").
-    		append("<a href='http://astrid.com/privacy'>Privacy Policy</a><br />").
-    		append("<a href='http://astrid.com/terms'>Terms of Use</a><br /><br />").
-    		append("Visit <a href='http://astrid.com'>astrid.com</a> " +
-    				"for more information, to add translations or help make Astrid better!");
+                append(r.getString(R.string.p_about_text, versionName).replace("\n", "<br />")).append("<br /><br />").
+                append("<a href='http://github.com/todoroo/astrid'>Source Code</a><br />").
+                append("<a href='http://astrid.com/privacy'>Privacy Policy</a><br />").
+                append("<a href='http://astrid.com/terms'>Terms of Use</a><br /><br />").
+                append("Visit <a href='http://astrid.com'>astrid.com</a> " +
+                        "for more information, to add translations or help make Astrid better!");
 
         final AlertDialog.Builder d = new AlertDialog.Builder(activity);
 
diff --git a/astrid/src/com/todoroo/astrid/activity/AddOnActivity.java b/astrid/src/com/todoroo/astrid/activity/AddOnActivity.java
index 72e480e78..d00f14381 100644
--- a/astrid/src/com/todoroo/astrid/activity/AddOnActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/AddOnActivity.java
@@ -6,8 +6,6 @@
 package com.todoroo.astrid.activity;
 
 
-import java.util.ArrayList;
-
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -31,15 +29,18 @@ import com.todoroo.astrid.service.AstridDependencyInjector;
 import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.utility.Constants;
 
+import java.util.ArrayList;
+
 /**
  * TODO: fix deprecation or get rid of me
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class AddOnActivity extends SherlockFragmentActivity {
 
-    /** boolean: whether to start on available page */
+    /**
+     * boolean: whether to start on available page
+     */
     public static final String TOKEN_START_WITH_AVAILABLE = "av"; //$NON-NLS-1$
 
     private View installedView;
@@ -69,12 +70,12 @@ public class AddOnActivity extends SherlockFragmentActivity {
         ab.setDisplayHomeAsUpEnabled(true);
         ab.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
         ActionBar.Tab installedTab = ab.newTab().setText("  " + getString(R.string.AOA_tab_installed)) //$NON-NLS-1$
-                                      .setIcon(R.drawable.gl_pencil)
-                                      .setTabListener(new AddOnTabListener(installedView));
+                .setIcon(R.drawable.gl_pencil)
+                .setTabListener(new AddOnTabListener(installedView));
 
         ActionBar.Tab availableTab = ab.newTab().setText("  " + getString(R.string.AOA_tab_available)) //$NON-NLS-1$
-                                                .setIcon(R.drawable.gl_more)
-                                                .setTabListener(new AddOnTabListener(availableView));
+                .setIcon(R.drawable.gl_more)
+                .setTabListener(new AddOnTabListener(availableView));
 
         ab.addTab(availableTab);
         ab.addTab(installedTab);
@@ -120,20 +121,20 @@ public class AddOnActivity extends SherlockFragmentActivity {
 
     private void populate() {
         AddOn[] list = addOnService.getAddOns();
-        if(list == null)
+        if (list == null)
             return;
 
         ArrayList<AddOn> installed = new ArrayList<AddOn>();
         ArrayList<AddOn> available = new ArrayList<AddOn>();
 
-        for(AddOn addOn : list) {
+        for (AddOn addOn : list) {
             if (AddOnService.POWER_PACK_PACKAGE.equals(addOn.getPackageName())) {
                 if (addOnService.hasPowerPack())
                     installed.add(addOn);
                 else if (Constants.MARKET_STRATEGY.generateMarketLink(addOn.getPackageName()) != null)
                     available.add(addOn);
             } else {
-                if(addOnService.isInstalled(addOn))
+                if (addOnService.isInstalled(addOn))
                     installed.add(addOn);
                 else if (Constants.MARKET_STRATEGY.generateMarketLink(addOn.getPackageName()) != null)
                     available.add(addOn);
@@ -143,23 +144,24 @@ public class AddOnActivity extends SherlockFragmentActivity {
 
         ListView installedList = (ListView) installedView.findViewById(R.id.list);
         installedList.setAdapter(new AddOnAdapter(this, true, installed));
-        if(installed.size() > 0)
+        if (installed.size() > 0)
             installedView.findViewById(R.id.empty).setVisibility(View.GONE);
 
         ListView availableList = (ListView) availableView.findViewById(R.id.list);
         availableList.setAdapter(new AddOnAdapter(this, false, available));
-        if(available.size() > 0)
+        if (available.size() > 0)
             availableView.findViewById(R.id.empty).setVisibility(View.GONE);
     }
 
     /**
      * Creates an on click listener
+     *
      * @param activity
-     * @param finish whether to finish activity
+     * @param finish   whether to finish activity
      * @return
      */
     public static DialogInterface.OnClickListener createAddOnClicker(final Activity activity,
-            final boolean finish) {
+                                                                     final boolean finish) {
         return new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
@@ -167,7 +169,7 @@ public class AddOnActivity extends SherlockFragmentActivity {
                         AddOnActivity.class);
                 intent.putExtra(AddOnActivity.TOKEN_START_WITH_AVAILABLE, true);
                 activity.startActivity(intent);
-                if(finish)
+                if (finish)
                     activity.finish();
             }
         };
diff --git a/astrid/src/com/todoroo/astrid/activity/AstridActivity.java b/astrid/src/com/todoroo/astrid/activity/AstridActivity.java
index f4197f89a..ee8631b47 100644
--- a/astrid/src/com/todoroo/astrid/activity/AstridActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/AstridActivity.java
@@ -59,12 +59,11 @@ import com.todoroo.astrid.voice.VoiceRecognizer;
  * to use.
  *
  * @author Arne
- *
  */
 public class AstridActivity extends SherlockFragmentActivity
-    implements FilterListFragment.OnFilterItemClickedListener,
-    TaskListFragment.OnTaskListItemClickedListener,
-    RecognizerApiListener {
+        implements FilterListFragment.OnFilterItemClickedListener,
+        TaskListFragment.OnTaskListItemClickedListener,
+        RecognizerApiListener {
 
     public static final int LAYOUT_SINGLE = 0;
     public static final int LAYOUT_DOUBLE = 1;
@@ -146,7 +145,7 @@ public class AstridActivity extends SherlockFragmentActivity
      * Handles items being clicked from the filterlist-fragment. Return true if item is handled.
      */
     public boolean onFilterItemClicked(FilterListItem item) {
-        if (this instanceof TaskListActivity && (item instanceof Filter) ) {
+        if (this instanceof TaskListActivity && (item instanceof Filter)) {
             ((TaskListActivity) this).setSelectedItem((Filter) item);
         }
         if (item instanceof SearchFilter) {
@@ -157,8 +156,8 @@ public class AstridActivity extends SherlockFragmentActivity
             // If showing both fragments, directly update the tasklist-fragment
             Intent intent = getIntent();
 
-            if(item instanceof Filter) {
-                Filter filter = (Filter)item;
+            if (item instanceof Filter) {
+                Filter filter = (Filter) item;
 
                 Bundle extras = configureIntentAndExtrasWithFilter(intent, filter);
                 if (fragmentLayout == LAYOUT_TRIPLE && getTaskEditFragment() != null) {
@@ -170,9 +169,9 @@ public class AstridActivity extends SherlockFragmentActivity
                 AndroidUtilities.callOverridePendingTransition(this, 0, 0);
                 StatisticsService.reportEvent(StatisticsConstants.FILTER_LIST);
                 return true;
-            } else if(item instanceof IntentFilter) {
+            } else if (item instanceof IntentFilter) {
                 try {
-                    ((IntentFilter)item).intent.send();
+                    ((IntentFilter) item).intent.send();
                 } catch (CanceledException e) {
                     // ignore
                 }
@@ -182,9 +181,9 @@ public class AstridActivity extends SherlockFragmentActivity
     }
 
     protected Bundle configureIntentAndExtrasWithFilter(Intent intent, Filter filter) {
-        if(filter instanceof FilterWithCustomIntent) {
+        if (filter instanceof FilterWithCustomIntent) {
             int lastSelectedList = intent.getIntExtra(FilterListFragment.TOKEN_LAST_SELECTED, 0);
-            intent = ((FilterWithCustomIntent)filter).getCustomIntent();
+            intent = ((FilterWithCustomIntent) filter).getCustomIntent();
             intent.putExtra(FilterListFragment.TOKEN_LAST_SELECTED, lastSelectedList);
         } else {
             intent.putExtra(TaskListFragment.TOKEN_FILTER, filter);
@@ -275,7 +274,7 @@ public class AstridActivity extends SherlockFragmentActivity
             TaskEditFragment editActivity = getTaskEditFragment();
             findViewById(R.id.taskedit_fragment_container).setVisibility(View.VISIBLE);
 
-            if(editActivity == null) {
+            if (editActivity == null) {
                 editActivity = new TaskEditFragment();
                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
                 transaction.add(R.id.taskedit_fragment_container, editActivity, TaskEditFragment.TAG_TASKEDIT_FRAGMENT);
@@ -322,7 +321,7 @@ public class AstridActivity extends SherlockFragmentActivity
     protected void removeFragment(String tag) {
         FragmentManager fm = getSupportFragmentManager();
         Fragment fragment = fm.findFragmentByTag(tag);
-        if(fragment != null) {
+        if (fragment != null) {
             FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
             ft.remove(fragment);
             ft.commit();
@@ -332,7 +331,7 @@ public class AstridActivity extends SherlockFragmentActivity
     protected Fragment setupFragment(String tag, int container, Class<? extends Fragment> cls, boolean createImmediate, boolean replace) {
         final FragmentManager fm = getSupportFragmentManager();
         Fragment fragment = fm.findFragmentByTag(tag);
-        if(fragment == null || replace) {
+        if (fragment == null || replace) {
             Fragment oldFragment = fragment;
             try {
                 fragment = cls.newInstance();
@@ -347,8 +346,7 @@ public class AstridActivity extends SherlockFragmentActivity
                 if (oldFragment != null && replace)
                     ft.remove(oldFragment);
                 ft.add(fragment, tag);
-            }
-            else
+            } else
                 ft.replace(container, fragment, tag);
             ft.commit();
             if (createImmediate)
@@ -387,17 +385,17 @@ public class AstridActivity extends SherlockFragmentActivity
         }
 
         int errorStr = 0;
-        switch(error) {
-        case SpeechRecognizer.ERROR_NETWORK:
-        case SpeechRecognizer.ERROR_NETWORK_TIMEOUT:
-            errorStr = R.string.speech_err_network;
-            break;
-        case SpeechRecognizer.ERROR_NO_MATCH:
-            Toast.makeText(this, R.string.speech_err_no_match, Toast.LENGTH_LONG).show();
-            break;
-        default:
-            errorStr = R.string.speech_err_default;
-            break;
+        switch (error) {
+            case SpeechRecognizer.ERROR_NETWORK:
+            case SpeechRecognizer.ERROR_NETWORK_TIMEOUT:
+                errorStr = R.string.speech_err_network;
+                break;
+            case SpeechRecognizer.ERROR_NO_MATCH:
+                Toast.makeText(this, R.string.speech_err_no_match, Toast.LENGTH_LONG).show();
+                break;
+            default:
+                errorStr = R.string.speech_err_default;
+                break;
         }
 
         if (errorStr > 0)
diff --git a/astrid/src/com/todoroo/astrid/activity/BeastModePreferences.java b/astrid/src/com/todoroo/astrid/activity/BeastModePreferences.java
index 93328b11f..484947caf 100644
--- a/astrid/src/com/todoroo/astrid/activity/BeastModePreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/BeastModePreferences.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.activity;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-
 import android.app.ListActivity;
 import android.content.Context;
 import android.content.res.Resources;
@@ -26,6 +23,9 @@ import com.commonsware.cwac.tlv.TouchListView.DropListener;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.utility.Preferences;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+
 public class BeastModePreferences extends ListActivity {
 
     private TouchListView touchList;
@@ -44,6 +44,7 @@ public class BeastModePreferences extends ListActivity {
     /**
      * Migration for existing users to assert that the "hide always" section divider exists in the preferences.
      * Knowing that this section will always be in the constructed list of controls simplifies the logic a bit.
+     *
      * @param c
      */
     public static void assertHideUntilSectionExists(Context c, long latestSetVersion) {
diff --git a/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java b/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java
index d0588cd0e..0371a26a0 100644
--- a/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java
+++ b/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java
@@ -12,7 +12,7 @@ public class DefaultFilterMode implements FilterModeSpec {
 
     @Override
     public int[] getForbiddenMenuItems() {
-        return new int[] { MainMenuPopover.MAIN_MENU_ITEM_FEATURED_LISTS };
+        return new int[]{MainMenuPopover.MAIN_MENU_ITEM_FEATURED_LISTS};
     }
 
     @Override
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index bdac44030..7509bad04 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -5,12 +5,6 @@
  */
 package com.todoroo.astrid.activity;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map.Entry;
-
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
@@ -72,11 +66,16 @@ import com.todoroo.astrid.voice.VoiceRecognizer;
 import com.todoroo.astrid.welcome.tutorial.WelcomeWalkthrough;
 import com.todoroo.astrid.widget.TasksWidget;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map.Entry;
+
 /**
  * Displays the preference screen for users to edit their preferences
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class EditPreferences extends TodorooPreferenceActivity {
 
@@ -92,9 +91,12 @@ public class EditPreferences extends TodorooPreferenceActivity {
 
     // --- instance variables
 
-    @Autowired private TaskService taskService;
-    @Autowired private AddOnService addOnService;
-    @Autowired private ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    private TaskService taskService;
+    @Autowired
+    private AddOnService addOnService;
+    @Autowired
+    private ActFmPreferenceService actFmPreferenceService;
 
     @Autowired
     private Database database;
@@ -107,6 +109,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
 
     private class SetResultOnPreferenceChangeListener implements OnPreferenceChangeListener {
         private final int resultCode;
+
         public SetResultOnPreferenceChangeListener(int resultCode) {
             this.resultCode = resultCode;
         }
@@ -123,6 +126,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
         private final AstridPreferenceSpec spec;
         private final int nameId;
         private final String statistic;
+
         public SetDefaultsClickListener(AstridPreferenceSpec spec, int nameId, String statistic) {
             this.spec = spec;
             this.nameId = nameId;
@@ -133,14 +137,14 @@ public class EditPreferences extends TodorooPreferenceActivity {
         public boolean onPreferenceClick(Preference preference) {
             DialogUtilities.okCancelDialog(EditPreferences.this, getString(R.string.EPr_config_dialog_title),
                     getString(R.string.EPr_config_dialog_text, getString(nameId)), new OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            spec.resetDefaults();
-                            StatisticsService.reportEvent(statistic);
-                            setResult(RESULT_CODE_PERFORMANCE_PREF_CHANGED);
-                            finish();
-                        }
-                    }, null);
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    spec.resetDefaults();
+                    StatisticsService.reportEvent(statistic);
+                    setResult(RESULT_CODE_PERFORMANCE_PREF_CHANGED);
+                    finish();
+                }
+            }, null);
             return true;
         }
     }
@@ -289,8 +293,10 @@ public class EditPreferences extends TodorooPreferenceActivity {
         findPreference(getString(R.string.p_statistics)).setEnabled(hasPowerPack);
     }
 
-    /** Show about dialog */
-    private void showAbout () {
+    /**
+     * Show about dialog
+     */
+    private void showAbout() {
         String version = "unknown"; //$NON-NLS-1$
         try {
             version = getPackageManager().getPackageInfo(Constants.PACKAGE, 0).versionName;
@@ -328,6 +334,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
     }
 
     private static final HashMap<Class<?>, Integer> PREFERENCE_REQUEST_CODES = new HashMap<Class<?>, Integer>();
+
     static {
         PREFERENCE_REQUEST_CODES.put(SyncProviderPreferences.class, REQUEST_CODE_SYNC);
     }
@@ -339,11 +346,11 @@ public class EditPreferences extends TodorooPreferenceActivity {
                 PackageManager.GET_META_DATA);
         int length = resolveInfoList.size();
         LinkedHashMap<String, ArrayList<Preference>> categoryPreferences =
-            new LinkedHashMap<String, ArrayList<Preference>>();
+                new LinkedHashMap<String, ArrayList<Preference>>();
 
         // Loop through a list of all packages (including plugins, addons)
         // that have a settings action
-        for(int i = 0; i < length; i++) {
+        for (int i = 0; i < length; i++) {
             ResolveInfo resolveInfo = resolveInfoList.get(i);
             final Intent intent = new Intent(AstridApiConstants.ACTION_SETTINGS);
             intent.setClassName(resolveInfo.activityInfo.packageName,
@@ -383,15 +390,15 @@ public class EditPreferences extends TodorooPreferenceActivity {
 
             String category = MetadataHelper.resolveActivityCategoryName(resolveInfo, pm);
 
-            if(!categoryPreferences.containsKey(category))
+            if (!categoryPreferences.containsKey(category))
                 categoryPreferences.put(category, new ArrayList<Preference>());
             ArrayList<Preference> arrayList = categoryPreferences.get(category);
             arrayList.add(preference);
         }
 
-        for(Entry<String, ArrayList<Preference>> entry : categoryPreferences.entrySet()) {
+        for (Entry<String, ArrayList<Preference>> entry : categoryPreferences.entrySet()) {
             if (entry.getKey().equals(getString(R.string.app_name))) {
-                for(Preference preference : entry.getValue())
+                for (Preference preference : entry.getValue())
                     screen.addPreference(preference);
             } else {
                 PreferenceManager manager = getPreferenceManager();
@@ -401,7 +408,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
                     header.setSummary(R.string.SyP_summary);
                 screen.addPreference(header);
 
-                for(Preference preference : entry.getValue())
+                for (Preference preference : entry.getValue())
                     header.addPreference(preference);
             }
 
@@ -411,7 +418,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
 
     @SuppressWarnings("nls")
     private void addDebugPreferences() {
-        if(!Constants.DEBUG)
+        if (!Constants.DEBUG)
             return;
 
         PreferenceCategory group = new PreferenceCategory(this);
@@ -436,7 +443,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
             public boolean onPreferenceClick(Preference p) {
                 database.openForWriting();
                 Task task = new Task();
-                for(int i = 0; i < 100; i++) {
+                for (int i = 0; i < 100; i++) {
                     task.clear();
                     task.setValue(Task.TITLE, Integer.toString(i));
                     taskService.save(task);
@@ -515,44 +522,46 @@ public class EditPreferences extends TodorooPreferenceActivity {
                         e.printStackTrace();
                     }
                     return super.onPreferenceChange(p, newValue);
-                };
+                }
+
+                ;
             });
 
         } else if (r.getString(R.string.p_showNotes).equals(preference.getKey())) {
-            if (value != null && !(Boolean)value)
+            if (value != null && !(Boolean) value)
                 preference.setSummary(R.string.EPr_showNotes_desc_disabled);
             else
                 preference.setSummary(R.string.EPr_showNotes_desc_enabled);
-            if((Boolean)value != Preferences.getBoolean(preference.getKey(), false)) {
+            if ((Boolean) value != Preferences.getBoolean(preference.getKey(), false)) {
                 taskService.clearDetails(Criterion.all);
                 Flags.set(Flags.REFRESH);
             }
-        } else if(r.getString(R.string.p_fullTaskTitle).equals(preference.getKey())) {
+        } else if (r.getString(R.string.p_fullTaskTitle).equals(preference.getKey())) {
             if (value != null && (Boolean) value)
                 preference.setSummary(R.string.EPr_fullTask_desc_enabled);
             else
                 preference.setSummary(R.string.EPr_fullTask_desc_disabled);
         } else if (r.getString(R.string.p_theme).equals(preference.getKey())) {
-            if(AndroidUtilities.getSdkVersion() < 5) {
+            if (AndroidUtilities.getSdkVersion() < 5) {
                 preference.setEnabled(false);
                 preference.setSummary(R.string.EPr_theme_desc_unsupported);
             } else {
                 int index = 0;
-                if(value instanceof String && !TextUtils.isEmpty((String)value))
-                    index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_theme_settings), (String)value);
+                if (value instanceof String && !TextUtils.isEmpty((String) value))
+                    index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_theme_settings), (String) value);
                 if (index < 0)
                     index = 0;
                 preference.setSummary(getString(R.string.EPr_theme_desc,
                         r.getStringArray(R.array.EPr_themes)[index]));
             }
         } else if (r.getString(R.string.p_theme_widget).equals(preference.getKey())) {
-            if(AndroidUtilities.getSdkVersion() < 5) {
+            if (AndroidUtilities.getSdkVersion() < 5) {
                 preference.setEnabled(false);
                 preference.setSummary(R.string.EPr_theme_desc_unsupported);
             } else {
                 int index = 0;
-                if(value instanceof String && !TextUtils.isEmpty((String)value))
-                    index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_theme_widget_settings), (String)value);
+                if (value instanceof String && !TextUtils.isEmpty((String) value))
+                    index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_theme_widget_settings), (String) value);
                 if (index < 0)
                     index = 0;
                 preference.setSummary(getString(R.string.EPr_theme_desc,
@@ -568,17 +577,19 @@ public class EditPreferences extends TodorooPreferenceActivity {
                 dir = r.getString(R.string.p_files_dir_desc_default);
             }
             preference.setSummary(r.getString(R.string.p_files_dir_desc, dir));
-        }
-        else if (booleanPreference(preference, value, R.string.p_statistics,
-                R.string.EPr_statistics_desc_disabled, R.string.EPr_statistics_desc_enabled));
+        } else if (booleanPreference(preference, value, R.string.p_statistics,
+                R.string.EPr_statistics_desc_disabled, R.string.EPr_statistics_desc_enabled)) ;
         else if (booleanPreference(preference, value, R.string.p_field_missed_calls,
-                    R.string.MCA_missed_calls_pref_desc_disabled, R.string.MCA_missed_calls_pref_desc_enabled));
+                R.string.MCA_missed_calls_pref_desc_disabled, R.string.MCA_missed_calls_pref_desc_enabled))
+            ;
         else if (booleanPreference(preference, value, R.string.p_calendar_reminders,
-                    R.string.CRA_calendar_reminders_pref_desc_disabled, R.string.CRA_calendar_reminders_pref_desc_enabled));
+                R.string.CRA_calendar_reminders_pref_desc_disabled, R.string.CRA_calendar_reminders_pref_desc_enabled))
+            ;
         else if (booleanPreference(preference, value, R.string.p_use_contact_picker,
-                    R.string.EPr_use_contact_picker_desc_disabled, R.string.EPr_use_contact_picker_desc_enabled));
+                R.string.EPr_use_contact_picker_desc_disabled, R.string.EPr_use_contact_picker_desc_enabled))
+            ;
         else if (booleanPreference(preference, value, R.string.p_end_at_deadline,
-                    R.string.EPr_cal_end_at_due_time, R.string.EPr_cal_start_at_due_time));
+                R.string.EPr_cal_end_at_due_time, R.string.EPr_cal_start_at_due_time)) ;
         else if (r.getString(R.string.p_swipe_lists_enabled).equals(preference.getKey())) {
             preference.setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED) {
                 @Override
@@ -588,36 +599,34 @@ public class EditPreferences extends TodorooPreferenceActivity {
                     return super.onPreferenceChange(p, newValue);
                 }
             });
-        }
-        else if (r.getString(R.string.p_force_phone_layout).equals(preference.getKey())) {
-             preference.setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED) {
-                 @Override
+        } else if (r.getString(R.string.p_force_phone_layout).equals(preference.getKey())) {
+            preference.setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED) {
+                @Override
                 public boolean onPreferenceChange(Preference p, Object newValue) {
                     Preference swipe = findPreference(getString(R.string.p_swipe_lists_enabled));
                     swipe.setEnabled((Boolean) newValue);
                     return super.onPreferenceChange(p, newValue);
                 }
-             });
-        }
-        else if (r.getString(R.string.p_voiceInputEnabled).equals(preference.getKey())) {
-            if (value != null && !(Boolean)value)
+            });
+        } else if (r.getString(R.string.p_voiceInputEnabled).equals(preference.getKey())) {
+            if (value != null && !(Boolean) value)
                 preference.setSummary(R.string.EPr_voiceInputEnabled_desc_disabled);
             else
                 preference.setSummary(R.string.EPr_voiceInputEnabled_desc_enabled);
-            onVoiceInputStatusChanged(preference, (Boolean)value);
+            onVoiceInputStatusChanged(preference, (Boolean) value);
         } else if (r.getString(R.string.p_voiceRemindersEnabled).equals(preference.getKey())) {
-            if (value != null && !(Boolean)value)
+            if (value != null && !(Boolean) value)
                 preference.setSummary(R.string.EPr_voiceRemindersEnabled_desc_disabled);
             else
                 preference.setSummary(R.string.EPr_voiceRemindersEnabled_desc_enabled);
-            onVoiceReminderStatusChanged(preference, (Boolean)value);
+            onVoiceReminderStatusChanged(preference, (Boolean) value);
         }
     }
 
     protected boolean booleanPreference(Preference preference, Object value,
-            int key, int disabledString, int enabledString) {
-        if(getString(key).equals(preference.getKey())) {
-            if (value != null && !(Boolean)value)
+                                        int key, int disabledString, int enabledString) {
+        if (getString(key).equals(preference.getKey())) {
+            if (value != null && !(Boolean) value)
                 preference.setSummary(disabledString);
             else
                 preference.setSummary(enabledString);
@@ -660,7 +669,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
         findPreference(getString(R.string.p_config_lite)).setOnPreferenceClickListener(
                 new SetDefaultsClickListener(new AstridLitePreferenceSpec(), R.string.EPr_config_lite, StatisticsConstants.PREFS_RESET_LITE));
 
-        int[] menuPrefs = { R.string.p_show_menu_search, R.string.p_show_menu_friends,
+        int[] menuPrefs = {R.string.p_show_menu_search, R.string.p_show_menu_friends,
                 R.string.p_show_menu_sync, R.string.p_show_menu_sort,
         };
         for (int key : menuPrefs) {
@@ -728,7 +737,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
     private void onVoiceReminderStatusChanged(final Preference preference, boolean newValue) {
         try {
             VoiceOutputService.getVoiceOutputInstance();
-            if(newValue)
+            if (newValue)
                 VoiceOutputService.getVoiceOutputInstance().checkIsTTSInstalled();
         } catch (VerifyError e) {
             // doesn't work :(
@@ -738,7 +747,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
     }
 
     private void onVoiceInputStatusChanged(final Preference preference, boolean newValue) {
-        if(!newValue)
+        if (!newValue)
             return;
         int[] excludedSettings = Constants.MARKET_STRATEGY.excludedSettings();
         if (excludedSettings != null && AndroidUtilities.indexOf(excludedSettings, R.string.p_voiceInputEnabled) >= 0)
@@ -752,12 +761,12 @@ public class EditPreferences extends TodorooPreferenceActivity {
                         new OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog,
-                                    int which) {
+                                                int which) {
                                 voiceInputAssistant.showVoiceInputMarketSearch(new OnClickListener() {
                                     @Override
                                     public void onClick(DialogInterface dialog1,
-                                            int which1) {
-                                        ((CheckBoxPreference)preference).setChecked(false);
+                                                        int which1) {
+                                        ((CheckBoxPreference) preference).setChecked(false);
                                     }
                                 });
                             }
@@ -765,18 +774,19 @@ public class EditPreferences extends TodorooPreferenceActivity {
                         new OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog,
-                                    int which) {
-                                ((CheckBoxPreference)preference).setChecked(false);
+                                                int which) {
+                                ((CheckBoxPreference) preference).setChecked(false);
                             }
-                        });
+                        }
+                );
             } else {
                 DialogUtilities.okDialog(this,
                         r.getString(R.string.EPr_voiceInputUnavailable_dlg),
                         new OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog1,
-                                    int which1) {
-                                ((CheckBoxPreference)preference).setChecked(false);
+                                                int which1) {
+                                ((CheckBoxPreference) preference).setChecked(false);
                             }
                         });
             }
diff --git a/astrid/src/com/todoroo/astrid/activity/Eula.java b/astrid/src/com/todoroo/astrid/activity/Eula.java
index d6e791204..a66c683f0 100644
--- a/astrid/src/com/todoroo/astrid/activity/Eula.java
+++ b/astrid/src/com/todoroo/astrid/activity/Eula.java
@@ -40,17 +40,17 @@ import com.todoroo.astrid.service.TaskService;
 public final class Eula {
     public static final String PREFERENCE_EULA_ACCEPTED = "eula.accepted"; //$NON-NLS-1$
 
-    @Autowired TaskService taskService;
+    @Autowired
+    TaskService taskService;
 
     /**
      * Displays the EULA if necessary. This method should be called from the
      * onCreate() method of your main Activity.
      *
-     * @param activity
-     *            The Activity to finish if the user rejects the EULA
+     * @param activity The Activity to finish if the user rejects the EULA
      */
     public static void showEula(final Activity activity) {
-        if(!new Eula().shouldShowEula(activity))
+        if (!new Eula().shouldShowEula(activity))
             return;
 
         final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
@@ -89,21 +89,21 @@ public final class Eula {
     }
 
     private boolean shouldShowEula(Activity activity) {
-        if(Preferences.getBoolean(PREFERENCE_EULA_ACCEPTED, false))
+        if (Preferences.getBoolean(PREFERENCE_EULA_ACCEPTED, false))
             return false;
 
         SharedPreferences p = activity.getSharedPreferences("eula", Activity.MODE_PRIVATE); //$NON-NLS-1$
-        if(p.getBoolean(PREFERENCE_EULA_ACCEPTED, false))
+        if (p.getBoolean(PREFERENCE_EULA_ACCEPTED, false))
             return false;
 
-        if(taskService.countTasks() > 0)
+        if (taskService.countTasks() > 0)
             return false;
         return true;
     }
 
     private static void accept(Activity activity) {
         if (activity instanceof EulaCallback) {
-            ((EulaCallback)activity).eulaAccepted();
+            ((EulaCallback) activity).eulaAccepted();
         }
         Preferences.setBoolean(PREFERENCE_EULA_ACCEPTED, true);
         StatisticsService.reportEvent(StatisticsConstants.EULA_ACCEPTED);
@@ -111,13 +111,14 @@ public final class Eula {
 
     private static void refuse(Activity activity) {
         if (activity instanceof EulaCallback) {
-            ((EulaCallback)activity).eulaRefused();
+            ((EulaCallback) activity).eulaRefused();
         }
         activity.finish();
     }
 
     public static interface EulaCallback {
         public void eulaAccepted();
+
         public void eulaRefused();
     }
 
diff --git a/astrid/src/com/todoroo/astrid/activity/ExpandableListFragment.java b/astrid/src/com/todoroo/astrid/activity/ExpandableListFragment.java
index c2ac2819d..387b41920 100644
--- a/astrid/src/com/todoroo/astrid/activity/ExpandableListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/ExpandableListFragment.java
@@ -24,10 +24,9 @@ import android.widget.TextView;
 
 @SuppressWarnings("nls")
 public class ExpandableListFragment extends Fragment
-    implements OnCreateContextMenuListener,
-    ExpandableListView.OnChildClickListener, ExpandableListView.OnGroupCollapseListener,
-    ExpandableListView.OnGroupExpandListener
-    {
+        implements OnCreateContextMenuListener,
+        ExpandableListView.OnChildClickListener, ExpandableListView.OnGroupCollapseListener,
+        ExpandableListView.OnGroupExpandListener {
 
     static final int INTERNAL_EMPTY_ID = 0x00ff0001;
 
@@ -42,7 +41,7 @@ public class ExpandableListFragment extends Fragment
     final private AdapterView.OnItemClickListener mOnClickListener
             = new AdapterView.OnItemClickListener() {
         public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
-            onListItemClick((ListView)parent, v, position, id);
+            onListItemClick((ListView) parent, v, position, id);
         }
     };
 
@@ -61,7 +60,7 @@ public class ExpandableListFragment extends Fragment
      * is {@link android.R.id#list android.R.id.list} and can optionally
      * have a sibling view id {@link android.R.id#empty android.R.id.empty}
      * that is to be shown when the list is empty.
-     *
+     * <p/>
      * <p>If you are overriding this method with your own custom content,
      * consider including the standard layout {@link android.R.layout#list_content}
      * in your layout file, so that you continue to retain all of the standard
@@ -70,7 +69,7 @@ public class ExpandableListFragment extends Fragment
      */
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
+                             Bundle savedInstanceState) {
         FrameLayout root = new FrameLayout(getActivity());
 
         TextView tv = new TextView(getActivity());
@@ -117,10 +116,10 @@ public class ExpandableListFragment extends Fragment
      * getListView().getItemAtPosition(position) if they need to access the
      * data associated with the selected item.
      *
-     * @param l The ListView where the click happened
-     * @param v The view that was clicked within the ListView
+     * @param l        The ListView where the click happened
+     * @param v        The view that was clicked within the ListView
      * @param position The position of the view in the list
-     * @param id The row id of the item that was clicked
+     * @param id       The row id of the item that was clicked
      */
     public void onListItemClick(ListView l, View v, int position, long id) {
         // override me
@@ -163,10 +162,10 @@ public class ExpandableListFragment extends Fragment
      * group, the group will only be expanded and child subsequently selected if
      * shouldExpandGroup is set to true, otherwise the method will return false.
      *
-     * @param groupPosition The position of the group that contains the child.
-     * @param childPosition The position of the child within the group.
+     * @param groupPosition     The position of the group that contains the child.
+     * @param childPosition     The position of the child within the group.
      * @param shouldExpandGroup Whether the child's group should be expanded if
-     *            it is collapsed.
+     *                          it is collapsed.
      * @return Whether the selection was successfully set on the child.
      */
     public boolean setSelectedChild(int groupPosition, int childPosition, boolean shouldExpandGroup) {
@@ -181,11 +180,13 @@ public class ExpandableListFragment extends Fragment
 
     /**
      * Sets the selection to the specified group.
+     *
      * @param groupPosition The position of the group that should be selected.
      */
     public void setSelectedGroup(int groupPosition) {
         mList.setSelectedGroup(groupPosition);
     }
+
     public long getSelectedId() {
         ensureList();
         return mList.getSelectedId();
@@ -217,7 +218,7 @@ public class ExpandableListFragment extends Fragment
      * Control whether the list is being displayed.  You can make it not
      * displayed if you are waiting for the initial data to show in it.  During
      * this time an indeterminant progress indicator will be shown instead.
-     *
+     * <p/>
      * <p>Applications do not normally need to use this themselves.  The default
      * behavior of ListFragment is to start with the list not being shown, only
      * showing it once an adapter is given with {@link #setListAdapter(ListAdapter)}.
@@ -225,7 +226,7 @@ public class ExpandableListFragment extends Fragment
      * it will be do without the user ever seeing the hidden state.
      *
      * @param shown If true, the list view is shown; if false, the progress
-     * indicator.  The initial value is true.
+     *              indicator.  The initial value is true.
      */
     public void setListShown(boolean shown) {
         setListShown(shown, true);
@@ -244,10 +245,10 @@ public class ExpandableListFragment extends Fragment
      * displayed if you are waiting for the initial data to show in it.  During
      * this time an indeterminant progress indicator will be shown instead.
      *
-     * @param shown If true, the list view is shown; if false, the progress
-     * indicator.  The initial value is true.
+     * @param shown   If true, the list view is shown; if false, the progress
+     *                indicator.  The initial value is true.
      * @param animate If true, an animation will be used to transition to the
-     * new state.
+     *                new state.
      */
     private void setListShown(boolean shown, boolean animate) {
         ensureList();
@@ -286,9 +287,9 @@ public class ExpandableListFragment extends Fragment
             throw new IllegalStateException("Content view not yet created");
         }
         if (root instanceof ExpandableListView) {
-            mList = (ExpandableListView)root;
+            mList = (ExpandableListView) root;
         } else {
-            mStandardEmptyView = (TextView)root.findViewById(INTERNAL_EMPTY_ID);
+            mStandardEmptyView = (TextView) root.findViewById(INTERNAL_EMPTY_ID);
             if (mStandardEmptyView == null) {
                 mEmptyView = root.findViewById(android.R.id.empty);
             }
@@ -297,13 +298,13 @@ public class ExpandableListFragment extends Fragment
                 if (rawListView == null) {
                     throw new RuntimeException(
                             "Your content must have a ExpandableListView whose id attribute is " +
-                            "'android.R.id.list'");
+                                    "'android.R.id.list'");
                 }
                 throw new RuntimeException(
                         "Content has view with id attribute 'android.R.id.list' "
-                        + "that is not a ExpandableListView class");
+                                + "that is not a ExpandableListView class");
             }
-            mList = (ExpandableListView)rawListView;
+            mList = (ExpandableListView) rawListView;
             if (mEmptyView != null) {
                 mList.setEmptyView(mEmptyView);
             }
@@ -322,11 +323,11 @@ public class ExpandableListFragment extends Fragment
 
     public void onContentChanged() {
         View emptyView = getView().findViewById(android.R.id.empty);
-        mList = (ExpandableListView)getView().findViewById(android.R.id.list);
+        mList = (ExpandableListView) getView().findViewById(android.R.id.list);
         if (mList == null) {
             throw new RuntimeException(
                     "Your content must have a ExpandableListView whose id attribute is " +
-                    "'android.R.id.list'");
+                            "'android.R.id.list'");
         }
         if (emptyView != null) {
             mList.setEmptyView(emptyView);
@@ -353,7 +354,7 @@ public class ExpandableListFragment extends Fragment
 
     @Override
     public boolean onChildClick(ExpandableListView parent, View v,
-            int groupPosition, int childPosition, long id) {
+                                int groupPosition, int childPosition, long id) {
         return false;
     }
 }
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java b/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
index b01f04748..4460cd200 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
@@ -63,7 +63,6 @@ import com.todoroo.astrid.welcome.HelpInfoPopover;
  * to filter their task list.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class FilterListFragment extends SherlockListFragment {
 
@@ -86,7 +85,8 @@ public class FilterListFragment extends SherlockListFragment {
 
     // --- instance variables
 
-    @Autowired ExceptionService exceptionService;
+    @Autowired
+    ExceptionService exceptionService;
 
     protected FilterAdapter adapter = null;
 
@@ -100,7 +100,8 @@ public class FilterListFragment extends SherlockListFragment {
      * ======================================================= initialization
      * ====================================================================== */
 
-    /** Container Activity must implement this interface and we ensure
+    /**
+     * Container Activity must implement this interface and we ensure
      * that it does during the onAttach() callback
      */
     public interface OnFilterItemClickedListener {
@@ -134,7 +135,7 @@ public class FilterListFragment extends SherlockListFragment {
      */
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
+                             Bundle savedInstanceState) {
         Activity activity = getActivity();
         int layout = getLayout(activity);
         ViewGroup parent = (ViewGroup) activity.getLayoutInflater().inflate(layout, container, false);
@@ -191,7 +192,7 @@ public class FilterListFragment extends SherlockListFragment {
     public void onResume() {
         super.onResume();
         StatisticsService.sessionStart(getActivity());
-        if(adapter != null)
+        if (adapter != null)
             adapter.registerRecevier();
 
         // also load sync actions
@@ -213,7 +214,7 @@ public class FilterListFragment extends SherlockListFragment {
     public void onPause() {
         StatisticsService.sessionPause();
         super.onPause();
-        if(adapter != null)
+        if (adapter != null)
             adapter.unregisterRecevier();
         try {
             getActivity().unregisterReceiver(refreshReceiver);
@@ -226,7 +227,9 @@ public class FilterListFragment extends SherlockListFragment {
      * ===================================================== populating lists
      * ====================================================================== */
 
-    /** Sets up the coach list adapter */
+    /**
+     * Sets up the coach list adapter
+     */
     protected void setUpList() {
         adapter.setListView(getListView());
         setListAdapter(adapter);
@@ -236,7 +239,7 @@ public class FilterListFragment extends SherlockListFragment {
             getListView().setOnItemLongClickListener(new OnItemLongClickListener() {
                 @Override
                 public boolean onItemLongClick(AdapterView<?> parent, View view,
-                        int position, long id) {
+                                               int position, long id) {
                     // Do stuff
                     final Filter filter = adapter.getItem(position);
                     final String[] labels = filter.contextMenuLabels;
@@ -285,27 +288,27 @@ public class FilterListFragment extends SherlockListFragment {
 
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v,
-            ContextMenuInfo menuInfo) {
+                                    ContextMenuInfo menuInfo) {
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
 
         Filter item = adapter.getItem(info.position);
 
         android.view.MenuItem menuItem;
 
-        if(item instanceof Filter) {
+        if (item instanceof Filter) {
             Filter filter = (Filter) item;
             menuItem = menu.add(0, CONTEXT_MENU_SHORTCUT, 0, R.string.FLA_context_shortcut);
             menuItem.setIntent(ShortcutActivity.createIntent(filter));
         }
 
-        for(int i = 0; i < item.contextMenuLabels.length; i++) {
-            if(item.contextMenuIntents.length <= i)
+        for (int i = 0; i < item.contextMenuLabels.length; i++) {
+            if (item.contextMenuIntents.length <= i)
                 break;
             menuItem = menu.add(0, CONTEXT_MENU_INTENT, 0, item.contextMenuLabels[i]);
             menuItem.setIntent(item.contextMenuIntents[i]);
         }
 
-        if(menu.size() > 0)
+        if (menu.size() > 0)
             menu.setHeaderTitle(item.listingTitle);
     }
 
@@ -316,7 +319,7 @@ public class FilterListFragment extends SherlockListFragment {
      * @param label
      */
     private static void createShortcut(Activity activity, Filter filter, Intent shortcutIntent, String label) {
-        if(label.length() == 0)
+        if (label.length() == 0)
             return;
 
         String defaultImageId = filter.listingTitle;
@@ -342,7 +345,7 @@ public class FilterListFragment extends SherlockListFragment {
 
     public static Bitmap superImposeListIcon(Activity activity, Bitmap listingIcon, String uuid) {
         Bitmap emblem = listingIcon;
-        if(emblem == null)
+        if (emblem == null)
             emblem = ((BitmapDrawable) activity.getResources().getDrawable(
                     TagService.getDefaultImageIDForTag(uuid))).getBitmap();
 
@@ -371,11 +374,11 @@ public class FilterListFragment extends SherlockListFragment {
         // handle my own menus
         switch (item.getItemId()) {
             case CONTEXT_MENU_SHORTCUT: {
-                AdapterContextMenuInfo info = (AdapterContextMenuInfo)item.getMenuInfo();
+                AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
                 final Intent shortcutIntent = item.getIntent();
-                FilterListItem filter = ((FilterAdapter.ViewHolder)info.targetView.getTag()).item;
-                if(filter instanceof Filter)
-                    showCreateShortcutDialog(getActivity(), shortcutIntent, (Filter)filter);
+                FilterListItem filter = ((FilterAdapter.ViewHolder) info.targetView.getTag()).item;
+                if (filter instanceof Filter)
+                    showCreateShortcutDialog(getActivity(), shortcutIntent, (Filter) filter);
 
                 return true;
             }
@@ -394,11 +397,11 @@ public class FilterListFragment extends SherlockListFragment {
     }
 
     public static void showCreateShortcutDialog(final Activity activity, final Intent shortcutIntent,
-            final Filter filter) {
+                                                final Filter filter) {
         FrameLayout frameLayout = new FrameLayout(activity);
         frameLayout.setPadding(10, 0, 10, 0);
         final EditText editText = new EditText(activity);
-        if(filter.listingTitle == null)
+        if (filter.listingTitle == null)
             filter.listingTitle = ""; //$NON-NLS-1$
         editText.setText(filter.listingTitle.
                 replaceAll("\\(\\d+\\)$", "").trim()); //$NON-NLS-1$ //$NON-NLS-2$
@@ -416,7 +419,7 @@ public class FilterListFragment extends SherlockListFragment {
         editText.setOnEditorActionListener(new OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if(actionId == EditorInfo.IME_NULL) {
+                if (actionId == EditorInfo.IME_NULL) {
                     createShortcut.run();
                     return true;
                 }
@@ -425,17 +428,17 @@ public class FilterListFragment extends SherlockListFragment {
         });
 
         new AlertDialog.Builder(activity)
-        .setTitle(R.string.FLA_shortcut_dialog_title)
-        .setMessage(R.string.FLA_shortcut_dialog)
-        .setView(frameLayout)
-        .setIcon(android.R.drawable.ic_dialog_info)
-        .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int which) {
-                createShortcut.run();
-            }
-        })
-        .setNegativeButton(android.R.string.cancel, null)
-        .show().setOwnerActivity(activity);
+                .setTitle(R.string.FLA_shortcut_dialog_title)
+                .setMessage(R.string.FLA_shortcut_dialog)
+                .setView(frameLayout)
+                .setIcon(android.R.drawable.ic_dialog_info)
+                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which) {
+                        createShortcut.run();
+                    }
+                })
+                .setNegativeButton(android.R.string.cancel, null)
+                .show().setOwnerActivity(activity);
     }
 
     public void clear() {
@@ -456,12 +459,11 @@ public class FilterListFragment extends SherlockListFragment {
      * Receiver which receives refresh intents
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     protected class RefreshReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
-            if(intent == null || !AstridApiConstants.BROADCAST_EVENT_REFRESH.equals(intent.getAction()))
+            if (intent == null || !AstridApiConstants.BROADCAST_EVENT_REFRESH.equals(intent.getAction()))
                 return;
 
             Activity activity = getActivity();
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterModeSpec.java b/astrid/src/com/todoroo/astrid/activity/FilterModeSpec.java
index 1b90dbd7b..04e21a3d8 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterModeSpec.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterModeSpec.java
@@ -9,10 +9,15 @@ import com.todoroo.astrid.api.FilterListItem;
 public interface FilterModeSpec {
 
     public int[] getForbiddenMenuItems();
+
     public Class<? extends FilterListFragment> getFilterListClass();
+
     public Filter getDefaultFilter(Context context);
+
     public int getMainMenuIconAttr();
+
     public void onFilterItemClickedCallback(FilterListItem item);
+
     public boolean showComments();
 
 }
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java
index 99a2b7ee2..37104686f 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java
@@ -42,7 +42,7 @@ public class FilterShortcutActivity extends ListActivity {
         adapter.filterStyle = R.style.TextAppearance_FLA_Filter_Widget;
         setListAdapter(adapter);
 
-        Button button = (Button)findViewById(R.id.ok);
+        Button button = (Button) findViewById(R.id.ok);
         button.setOnClickListener(mOnClickListener);
     }
 
@@ -66,7 +66,7 @@ public class FilterShortcutActivity extends ListActivity {
             setResult(RESULT_OK, intent);
             finish();
         }
-   };
+    };
 
     @Override
     protected void onListItemClick(ListView l, View v, int position, long id) {
diff --git a/astrid/src/com/todoroo/astrid/activity/ShareLinkActivity.java b/astrid/src/com/todoroo/astrid/activity/ShareLinkActivity.java
index 9300744e4..641e30736 100644
--- a/astrid/src/com/todoroo/astrid/activity/ShareLinkActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/ShareLinkActivity.java
@@ -14,8 +14,8 @@ import com.todoroo.astrid.ui.QuickAddBar;
 
 /**
  * @author joshuagross
- *
- * Create a new task based on incoming links from the "share" menu
+ *         <p/>
+ *         Create a new task based on incoming links from the "share" menu
  */
 public final class ShareLinkActivity extends TaskListActivity {
 
@@ -26,7 +26,7 @@ public final class ShareLinkActivity extends TaskListActivity {
 
     private static final String TOKEN_LINK_HANDLED = "linkHandled"; //$NON-NLS-1$
 
-    public ShareLinkActivity () {
+    public ShareLinkActivity() {
         super();
         DependencyInjectionService.getInstance().inject(this);
     }
@@ -38,7 +38,7 @@ public final class ShareLinkActivity extends TaskListActivity {
         Intent callerIntent = getIntent();
 
         subject = callerIntent.getStringExtra(Intent.EXTRA_SUBJECT);
-        if(subject == null)
+        if (subject == null)
             subject = ""; //$NON-NLS-1$
     }
 
diff --git a/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java b/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java
index 9c0ddb20a..76add5f91 100644
--- a/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.activity;
 
-import java.util.Map.Entry;
-import java.util.Set;
-
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.ContentValues;
@@ -23,48 +20,66 @@ import com.todoroo.astrid.api.FilterWithCustomIntent;
 import com.todoroo.astrid.api.FilterWithUpdate;
 import com.todoroo.astrid.data.Task;
 
+import java.util.Map.Entry;
+import java.util.Set;
+
 /**
  * This activity is launched when a user opens up a notification from the
  * tray. It launches the appropriate activity based on the passed in parameters.
  *
  * @author timsu
- *
  */
 public class ShortcutActivity extends Activity {
 
     // --- constants
 
-    /** token for passing a task id through extras for viewing a single task */
+    /**
+     * token for passing a task id through extras for viewing a single task
+     */
     public static final String TOKEN_SINGLE_TASK = "id"; //$NON-NLS-1$
 
-    /** token for passing a {@link Filter}'s title through extras */
+    /**
+     * token for passing a {@link Filter}'s title through extras
+     */
     public static final String TOKEN_FILTER_TITLE = "title"; //$NON-NLS-1$
 
-    /** token for passing a {@link Filter}'s sql through extras */
+    /**
+     * token for passing a {@link Filter}'s sql through extras
+     */
     public static final String TOKEN_FILTER_SQL = "sql"; //$NON-NLS-1$
 
-    /** token for passing a {@link Filter}'s values for new tasks through extras as string */
+    /**
+     * token for passing a {@link Filter}'s values for new tasks through extras as string
+     */
     @Deprecated
     public static final String TOKEN_FILTER_VALUES = "v4nt"; //$NON-NLS-1$
 
-    /** token for passing a {@link Filter}'s values for new tasks through extras as exploded ContentValues */
+    /**
+     * token for passing a {@link Filter}'s values for new tasks through extras as exploded ContentValues
+     */
     public static final String TOKEN_FILTER_VALUES_ITEM = "v4ntp_"; //$NON-NLS-1$
 
-    /** token for passing a ComponentNameto launch */
+    /**
+     * token for passing a ComponentNameto launch
+     */
     public static final String TOKEN_CUSTOM_CLASS = "class"; //$NON-NLS-1$
 
-    /** token for passing a image url*/
+    /**
+     * token for passing a image url
+     */
     public static final String TOKEN_IMAGE_URL = "imageUrl"; //$NON-NLS-1$
 
-    /** List of the above constants for searching */
+    /**
+     * List of the above constants for searching
+     */
     private static final String[] CUSTOM_EXTRAS = {
-        TOKEN_SINGLE_TASK,
-        TOKEN_FILTER_TITLE,
-        TOKEN_FILTER_SQL,
-        TOKEN_FILTER_VALUES,
-        TOKEN_FILTER_VALUES_ITEM,
-        TOKEN_CUSTOM_CLASS,
-        TOKEN_IMAGE_URL
+            TOKEN_SINGLE_TASK,
+            TOKEN_FILTER_TITLE,
+            TOKEN_FILTER_SQL,
+            TOKEN_FILTER_VALUES,
+            TOKEN_FILTER_VALUES_ITEM,
+            TOKEN_CUSTOM_CLASS,
+            TOKEN_IMAGE_URL
     };
 
     // --- implementation
@@ -89,37 +104,37 @@ public class ShortcutActivity extends Activity {
 
         Intent taskListIntent = new Intent(this, TaskListActivity.class);
 
-        if(extras != null && extras.containsKey(TaskListActivity.TOKEN_SOURCE))
-                taskListIntent.putExtra(TaskListActivity.TOKEN_SOURCE, extras.getInt(TaskListActivity.TOKEN_SOURCE));
+        if (extras != null && extras.containsKey(TaskListActivity.TOKEN_SOURCE))
+            taskListIntent.putExtra(TaskListActivity.TOKEN_SOURCE, extras.getInt(TaskListActivity.TOKEN_SOURCE));
 
-        if(extras != null && extras.containsKey(TOKEN_CUSTOM_CLASS)) {
+        if (extras != null && extras.containsKey(TOKEN_CUSTOM_CLASS)) {
             taskListIntent.putExtras(intent.getExtras());
         }
 
-        if(extras != null && extras.containsKey(TOKEN_FILTER_SQL)) {
+        if (extras != null && extras.containsKey(TOKEN_FILTER_SQL)) {
             // launched from desktop shortcut, must create a fake filter
             String title = extras.getString(TOKEN_FILTER_TITLE);
             String sql = extras.getString(TOKEN_FILTER_SQL);
             ContentValues values = null;
-            if(extras.containsKey(TOKEN_FILTER_VALUES))
+            if (extras.containsKey(TOKEN_FILTER_VALUES))
                 values = AndroidUtilities.contentValuesFromString(extras.getString(TOKEN_FILTER_VALUES));
             else {
                 values = new ContentValues();
-                for(String key : extras.keySet()) {
-                    if(!key.startsWith(TOKEN_FILTER_VALUES_ITEM))
+                for (String key : extras.keySet()) {
+                    if (!key.startsWith(TOKEN_FILTER_VALUES_ITEM))
                         continue;
 
                     Object value = extras.get(key);
                     key = key.substring(TOKEN_FILTER_VALUES_ITEM.length());
 
                     // assume one of the big 4...
-                    if(value instanceof String)
+                    if (value instanceof String)
                         values.put(key, (String) value);
-                    else if(value instanceof Integer)
+                    else if (value instanceof Integer)
                         values.put(key, (Integer) value);
-                    else if(value instanceof Double)
+                    else if (value instanceof Double)
                         values.put(key, (Double) value);
-                    else if(value instanceof Long)
+                    else if (value instanceof Long)
                         values.put(key, (Long) value);
                     else
                         throw new IllegalStateException("Unsupported bundle type " + value.getClass()); //$NON-NLS-1$
@@ -131,8 +146,7 @@ public class ShortcutActivity extends Activity {
                 if (extras.containsKey(TOKEN_IMAGE_URL)) {
                     filter = new FilterWithUpdate(title, title, sql, values);
                     ((FilterWithUpdate) filter).imageUrl = extras.getString(TOKEN_IMAGE_URL);
-                }
-                else
+                } else
                     filter = new FilterWithCustomIntent(title, title, sql, values);
 
                 Bundle customExtras = new Bundle();
@@ -149,7 +163,7 @@ public class ShortcutActivity extends Activity {
                 filter = new Filter(title, title, sql, values);
             }
             taskListIntent.putExtra(TaskListFragment.TOKEN_FILTER, filter);
-        } else if(extras != null && extras.containsKey(TOKEN_SINGLE_TASK)) {
+        } else if (extras != null && extras.containsKey(TOKEN_SINGLE_TASK)) {
             Filter filter = new Filter(getString(R.string.TLA_custom), getString(R.string.TLA_custom),
                     new QueryTemplate().where(Task.ID.eq(extras.getLong(TOKEN_SINGLE_TASK, -1))), null);
 
@@ -166,9 +180,9 @@ public class ShortcutActivity extends Activity {
         Intent shortcutIntent = new Intent(ContextManager.getContext(),
                 ShortcutActivity.class);
 
-        if(filter instanceof FilterWithCustomIntent) {
-            FilterWithCustomIntent customFilter = ((FilterWithCustomIntent)filter);
-            if(customFilter.customExtras != null)
+        if (filter instanceof FilterWithCustomIntent) {
+            FilterWithCustomIntent customFilter = ((FilterWithCustomIntent) filter);
+            if (customFilter.customExtras != null)
                 shortcutIntent.putExtras(customFilter.customExtras);
             shortcutIntent.putExtra(TOKEN_CUSTOM_CLASS, customFilter.customTaskList.flattenToString());
             if (filter instanceof FilterWithUpdate) {
diff --git a/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java b/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java
index 719db4b6c..952f8dcc4 100644
--- a/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java
@@ -20,7 +20,6 @@ import com.todoroo.astrid.core.SortHelper;
  * Shows the sort / hidden dialog
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class SortSelectionActivity {
 
@@ -30,43 +29,44 @@ public class SortSelectionActivity {
 
     /**
      * Create the dialog
+     *
      * @param activity
      * @return
      */
     public static AlertDialog createDialog(Activity activity, boolean showDragDrop,
-            OnSortSelectedListener listener, int flags, int sort) {
+                                           OnSortSelectedListener listener, int flags, int sort) {
         View body = activity.getLayoutInflater().inflate(R.layout.sort_selection_dialog, null);
 
-        if((flags & SortHelper.FLAG_REVERSE_SORT) > 0)
-            ((CheckBox)body.findViewById(R.id.reverse)).setChecked(true);
-        if((flags & SortHelper.FLAG_SHOW_COMPLETED) > 0)
-            ((CheckBox)body.findViewById(R.id.completed)).setChecked(true);
-        if((flags & SortHelper.FLAG_SHOW_HIDDEN) > 0)
-            ((CheckBox)body.findViewById(R.id.hidden)).setChecked(true);
-        if((flags & SortHelper.FLAG_SHOW_DELETED) > 0)
-            ((CheckBox)body.findViewById(R.id.deleted)).setChecked(true);
+        if ((flags & SortHelper.FLAG_REVERSE_SORT) > 0)
+            ((CheckBox) body.findViewById(R.id.reverse)).setChecked(true);
+        if ((flags & SortHelper.FLAG_SHOW_COMPLETED) > 0)
+            ((CheckBox) body.findViewById(R.id.completed)).setChecked(true);
+        if ((flags & SortHelper.FLAG_SHOW_HIDDEN) > 0)
+            ((CheckBox) body.findViewById(R.id.hidden)).setChecked(true);
+        if ((flags & SortHelper.FLAG_SHOW_DELETED) > 0)
+            ((CheckBox) body.findViewById(R.id.deleted)).setChecked(true);
 
-        if(!showDragDrop)
+        if (!showDragDrop)
             body.findViewById(R.id.sort_drag).setVisibility(View.GONE);
 
-        if(showDragDrop && (flags & SortHelper.FLAG_DRAG_DROP) > 0)
-            ((RadioButton)body.findViewById(R.id.sort_drag)).setChecked(true);
+        if (showDragDrop && (flags & SortHelper.FLAG_DRAG_DROP) > 0)
+            ((RadioButton) body.findViewById(R.id.sort_drag)).setChecked(true);
         else {
-            switch(sort) {
-            case SortHelper.SORT_ALPHA:
-                ((RadioButton)body.findViewById(R.id.sort_alpha)).setChecked(true);
-                break;
-            case SortHelper.SORT_DUE:
-                ((RadioButton)body.findViewById(R.id.sort_due)).setChecked(true);
-                break;
-            case SortHelper.SORT_IMPORTANCE:
-                ((RadioButton)body.findViewById(R.id.sort_importance)).setChecked(true);
-                break;
-            case SortHelper.SORT_MODIFIED:
-                ((RadioButton)body.findViewById(R.id.sort_modified)).setChecked(true);
-                break;
-            default:
-                ((RadioButton)body.findViewById(R.id.sort_smart)).setChecked(true);
+            switch (sort) {
+                case SortHelper.SORT_ALPHA:
+                    ((RadioButton) body.findViewById(R.id.sort_alpha)).setChecked(true);
+                    break;
+                case SortHelper.SORT_DUE:
+                    ((RadioButton) body.findViewById(R.id.sort_due)).setChecked(true);
+                    break;
+                case SortHelper.SORT_IMPORTANCE:
+                    ((RadioButton) body.findViewById(R.id.sort_importance)).setChecked(true);
+                    break;
+                case SortHelper.SORT_MODIFIED:
+                    ((RadioButton) body.findViewById(R.id.sort_modified)).setChecked(true);
+                    break;
+                default:
+                    ((RadioButton) body.findViewById(R.id.sort_smart)).setChecked(true);
             }
         }
 
@@ -78,13 +78,13 @@ public class SortSelectionActivity {
         });
 
         AlertDialog dialog = new AlertDialog.Builder(activity).
-            setTitle(R.string.TLA_menu_sort).
-            setView(body).
-            setPositiveButton(R.string.SSD_save_always,
-                    new DialogOkListener(body, listener, true)).
-            setNegativeButton(R.string.SSD_save_temp,
-                    new DialogOkListener(body, listener, false)).
-            create();
+                setTitle(R.string.TLA_menu_sort).
+                setView(body).
+                setPositiveButton(R.string.SSD_save_always,
+                        new DialogOkListener(body, listener, true)).
+                setNegativeButton(R.string.SSD_save_temp,
+                        new DialogOkListener(body, listener, false)).
+                create();
         dialog.setOwnerActivity(activity);
         return dialog;
     }
@@ -111,24 +111,24 @@ public class SortSelectionActivity {
             int flags = 0;
             int sort = 0;
 
-            if(((CheckBox)body.findViewById(R.id.reverse)).isChecked())
+            if (((CheckBox) body.findViewById(R.id.reverse)).isChecked())
                 flags |= SortHelper.FLAG_REVERSE_SORT;
-            if(((CheckBox)body.findViewById(R.id.completed)).isChecked())
+            if (((CheckBox) body.findViewById(R.id.completed)).isChecked())
                 flags |= SortHelper.FLAG_SHOW_COMPLETED;
-            if(((CheckBox)body.findViewById(R.id.hidden)).isChecked())
+            if (((CheckBox) body.findViewById(R.id.hidden)).isChecked())
                 flags |= SortHelper.FLAG_SHOW_HIDDEN;
-            if(((CheckBox)body.findViewById(R.id.deleted)).isChecked())
+            if (((CheckBox) body.findViewById(R.id.deleted)).isChecked())
                 flags |= SortHelper.FLAG_SHOW_DELETED;
-            if(((RadioButton)body.findViewById(R.id.sort_drag)).isChecked())
+            if (((RadioButton) body.findViewById(R.id.sort_drag)).isChecked())
                 flags |= SortHelper.FLAG_DRAG_DROP;
 
-            if(((RadioButton)body.findViewById(R.id.sort_alpha)).isChecked())
+            if (((RadioButton) body.findViewById(R.id.sort_alpha)).isChecked())
                 sort = SortHelper.SORT_ALPHA;
-            else if(((RadioButton)body.findViewById(R.id.sort_due)).isChecked())
+            else if (((RadioButton) body.findViewById(R.id.sort_due)).isChecked())
                 sort = SortHelper.SORT_DUE;
-            else if(((RadioButton)body.findViewById(R.id.sort_importance)).isChecked())
+            else if (((RadioButton) body.findViewById(R.id.sort_importance)).isChecked())
                 sort = SortHelper.SORT_IMPORTANCE;
-            else if(((RadioButton)body.findViewById(R.id.sort_modified)).isChecked())
+            else if (((RadioButton) body.findViewById(R.id.sort_modified)).isChecked())
                 sort = SortHelper.SORT_MODIFIED;
             else
                 sort = SortHelper.SORT_AUTO;
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index a8b5c80d8..26d9fbe22 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -19,10 +19,10 @@ import com.todoroo.astrid.service.ThemeService;
 
 public class TaskEditActivity extends AstridActivity {
     /**
-	 * @see android.app.Activity#onCreate(Bundle)
-	 */
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
+     * @see android.app.Activity#onCreate(Bundle)
+     */
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
         ThemeService.applyTheme(this);
         ActionBar actionBar = getSupportActionBar();
         if (Preferences.getBoolean(R.string.p_save_and_cancel, false)) {
@@ -35,27 +35,27 @@ public class TaskEditActivity extends AstridActivity {
         }
 
         super.onCreate(savedInstanceState);
-		setContentView(R.layout.task_edit_wrapper_activity);
+        setContentView(R.layout.task_edit_wrapper_activity);
 
-		actionBar.setDisplayHomeAsUpEnabled(true);
-		actionBar.setDisplayShowTitleEnabled(false);
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setDisplayShowTitleEnabled(false);
 
-		actionBar.setDisplayShowCustomEnabled(true);
-		actionBar.setCustomView(R.layout.header_title_view);
-		((TextView) actionBar.getCustomView().findViewById(R.id.title)).setText(R.string.TAd_contextEditTask);
+        actionBar.setDisplayShowCustomEnabled(true);
+        actionBar.setCustomView(R.layout.header_title_view);
+        ((TextView) actionBar.getCustomView().findViewById(R.id.title)).setText(R.string.TAd_contextEditTask);
 
-	}
+    }
 
-	public void updateTitle(boolean isNewTask) {
-	    ActionBar actionBar = getSupportActionBar();
-	    if (actionBar != null) {
-	        TextView title = ((TextView) actionBar.getCustomView().findViewById(R.id.title));
-	        if (ActFmPreferenceService.isPremiumUser())
-	            title.setText(""); //$NON-NLS-1$
-	        else
-	            title.setText(isNewTask ? R.string.TEA_new_task : R.string.TAd_contextEditTask);
-	    }
-	}
+    public void updateTitle(boolean isNewTask) {
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            TextView title = ((TextView) actionBar.getCustomView().findViewById(R.id.title));
+            if (ActFmPreferenceService.isPremiumUser())
+                title.setText(""); //$NON-NLS-1$
+            else
+                title.setText(isNewTask ? R.string.TEA_new_task : R.string.TAd_contextEditTask);
+        }
+    }
 
     /* (non-Javadoc)
      * @see android.support.v4.app.FragmentActivity#onResume()
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
index 25bdc7076..1fbba8efa 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -5,14 +5,6 @@
  */
 package com.todoroo.astrid.activity;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -117,16 +109,23 @@ import com.todoroo.astrid.voice.VoiceInputAssistant;
 import com.todoroo.astrid.voice.VoiceRecognizer;
 import com.viewpagerindicator.TabPageIndicator;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
 /**
  * This activity is responsible for creating new tasks and editing existing
  * ones. It saves a task when it is paused (screen rotated, back button pressed)
  * as long as the task has a title.
  *
  * @author timsu
- *
  */
 public final class TaskEditFragment extends SherlockFragment implements
-ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
+        ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
     public static final String TAG_TASKEDIT_FRAGMENT = "taskedit_fragment"; //$NON-NLS-1$
 
@@ -245,16 +244,24 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
     // --- other instance variables
 
-    /** true if editing started with a new task */
+    /**
+     * true if editing started with a new task
+     */
     private boolean isNewTask = false;
 
-    /** task model */
+    /**
+     * task model
+     */
     Task model = null;
 
-    /** whether task should be saved when this activity exits */
+    /**
+     * whether task should be saved when this activity exits
+     */
     private boolean shouldSaveState = true;
 
-    /** voice assistant for notes-creation */
+    /**
+     * voice assistant for notes-creation
+     */
     private VoiceInputAssistant voiceNoteAssistant;
 
     private EditText notesEditText;
@@ -329,7 +336,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
+                             Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
 
         View v = inflater.inflate(R.layout.task_edit_activity, container, false);
@@ -436,14 +443,16 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     }
 
     private void setCurrentTab(int position) {
-        if(mIndicator == null)
+        if (mIndicator == null)
             return;
 
         mIndicator.setCurrentItem(position);
         mPager.setCurrentItem(position);
     }
 
-    /** Initialize UI components */
+    /**
+     * Initialize UI components
+     */
     private void setUpUIComponents() {
 
         LinearLayout basicControls = (LinearLayout) getView().findViewById(
@@ -692,7 +701,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
      * Initialize task edit page in the background
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     private class TaskEditBackgroundLoader extends Thread {
 
@@ -887,7 +895,9 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         }
     }
 
-    /** Convenience method to populate fields after setting model to null */
+    /**
+     * Convenience method to populate fields after setting model to null
+     */
     public void repopulateFromScratch(Intent intent) {
         model = null;
         uuid = RemoteModel.NO_UUID;
@@ -895,7 +905,9 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         loadMoreContainer();
     }
 
-    /** Populate UI component values from the model */
+    /**
+     * Populate UI component values from the model
+     */
     public void populateFields(Intent intent) {
         loadItem(intent);
 
@@ -915,12 +927,16 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         filesControlSet.readFromTask(model);
     }
 
-    /** Populate UI component values from the model */
+    /**
+     * Populate UI component values from the model
+     */
     private void populateFields() {
         populateFields(getActivity().getIntent());
     }
 
-    /** Save task model from values in UI components */
+    /**
+     * Save task model from values in UI components
+     */
     public void save(boolean onPause) {
         if (title == null)
             return;
@@ -955,7 +971,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
         String processedToast = addDueTimeToToast(toast.toString());
         boolean cancelFinish = peopleControlSet != null
-        && !peopleControlSet.saveSharingSettings(processedToast) && !onPause;
+                && !peopleControlSet.saveSharingSettings(processedToast) && !onPause;
 
         boolean tagsChanged = Flags.check(Flags.TAGS_CHANGED);
         model.putTransitory(TaskService.TRANS_EDIT_SAVE, true);
@@ -980,8 +996,8 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
                     data.putExtra(TOKEN_ASSIGNED_TO_DISPLAY, assignedTo);
                     if (!TextUtils.isEmpty(assignedEmail))
                         data.putExtra(TOKEN_ASSIGNED_TO_EMAIL, assignedEmail);
-                    if (Task.isRealUserId(assignedId));
-                        data.putExtra(TOKEN_ASSIGNED_TO_ID, assignedId);
+                    if (Task.isRealUserId(assignedId)) ;
+                    data.putExtra(TOKEN_ASSIGNED_TO_ID, assignedId);
                 }
                 if (showRepeatAlert) {
                     data.putExtra(TOKEN_NEW_REPEATING_TASK, model);
@@ -1044,6 +1060,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
     /**
      * Helper to remove task edit specific info from activity intent
+     *
      * @param intent
      */
     public static void removeExtrasFromIntent(Intent intent) {
@@ -1110,26 +1127,26 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     protected void deleteButtonClick() {
         new AlertDialog.Builder(getActivity()).setTitle(
                 R.string.DLG_confirm_title).setMessage(
-                        R.string.DLG_delete_this_task_question).setIcon(
-                                android.R.drawable.ic_dialog_alert).setPositiveButton(
-                                        android.R.string.ok, new DialogInterface.OnClickListener() {
-                                            public void onClick(DialogInterface dialog, int which) {
-                                                TimerPlugin.updateTimer(getActivity(), model, false);
-                                                taskService.delete(model);
-                                                shouldSaveState = false;
-
-                                                Activity a = getActivity();
-                                                if (a instanceof TaskEditActivity) {
-                                                    getActivity().setResult(Activity.RESULT_OK);
-                                                    getActivity().onBackPressed();
-                                                } else if (a instanceof TaskListActivity) {
-                                                    discardButtonClick();
-                                                    TaskListFragment tlf = ((TaskListActivity) a).getTaskListFragment();
-                                                    if (tlf != null)
-                                                        tlf.refresh();
-                                                }
-                                            }
-                                        }).setNegativeButton(android.R.string.cancel, null).show();
+                R.string.DLG_delete_this_task_question).setIcon(
+                android.R.drawable.ic_dialog_alert).setPositiveButton(
+                android.R.string.ok, new DialogInterface.OnClickListener() {
+            public void onClick(DialogInterface dialog, int which) {
+                TimerPlugin.updateTimer(getActivity(), model, false);
+                taskService.delete(model);
+                shouldSaveState = false;
+
+                Activity a = getActivity();
+                if (a instanceof TaskEditActivity) {
+                    getActivity().setResult(Activity.RESULT_OK);
+                    getActivity().onBackPressed();
+                } else if (a instanceof TaskListActivity) {
+                    discardButtonClick();
+                    TaskListFragment tlf = ((TaskListActivity) a).getTaskListFragment();
+                    if (tlf != null)
+                        tlf.refresh();
+                }
+            }
+        }).setNegativeButton(android.R.string.cancel, null).show();
     }
 
     private void startAttachFile() {
@@ -1143,7 +1160,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface d, int which) {
-                if(which == 0) {
+                if (which == 0) {
                     ActFmCameraModule.showPictureLauncher(TaskEditFragment.this, null);
                 } else if (which == 1) {
                     Intent attachFile = new Intent(getActivity(), FileExplore.class);
@@ -1154,8 +1171,8 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
         // show a menu of available options
         new AlertDialog.Builder(getActivity())
-        .setAdapter(adapter, listener)
-        .show().setOwnerActivity(getActivity());
+                .setAdapter(adapter, listener)
+                .show().setOwnerActivity(getActivity());
     }
 
     private void startRecordingAudio() {
@@ -1225,36 +1242,36 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-        case MENU_SAVE_ID:
-            saveButtonClick();
-            return true;
-        case MENU_DISCARD_ID:
-            discardButtonClick();
-            return true;
-        case MENU_ATTACH_ID:
-            startAttachFile();
-            return true;
-        case MENU_RECORD_ID:
-            startRecordingAudio();
-            return true;
-        case MENU_COMMENTS_REFRESH_ID: {
-            if (editNotes != null)
-                editNotes.refreshData();
-            return true;
-        }
-        case MENU_SHOW_COMMENTS_ID: {
-            Intent intent = new Intent(getActivity(), CommentsActivity.class);
-            intent.putExtra(TaskCommentsFragment.EXTRA_TASK, model.getId());
-            startActivity(intent);
-            AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_left_in, R.anim.slide_left_out);
-            return true;
-        }
-        case android.R.id.home:
-            if (title.getText().length() == 0)
-                discardButtonClick();
-            else
+            case MENU_SAVE_ID:
                 saveButtonClick();
-            return true;
+                return true;
+            case MENU_DISCARD_ID:
+                discardButtonClick();
+                return true;
+            case MENU_ATTACH_ID:
+                startAttachFile();
+                return true;
+            case MENU_RECORD_ID:
+                startRecordingAudio();
+                return true;
+            case MENU_COMMENTS_REFRESH_ID: {
+                if (editNotes != null)
+                    editNotes.refreshData();
+                return true;
+            }
+            case MENU_SHOW_COMMENTS_ID: {
+                Intent intent = new Intent(getActivity(), CommentsActivity.class);
+                intent.putExtra(TaskCommentsFragment.EXTRA_TASK, model.getId());
+                startActivity(intent);
+                AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_left_in, R.anim.slide_left_out);
+                return true;
+            }
+            case android.R.id.home:
+                if (title.getText().length() == 0)
+                    discardButtonClick();
+                else
+                    saveButtonClick();
+                return true;
         }
 
         return super.onOptionsItemSelected(item);
@@ -1292,7 +1309,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         }
 
         boolean wouldShowComments = actFmPreferenceService.isLoggedIn() && menu.findItem(MENU_COMMENTS_REFRESH_ID) == null;
-        if(wouldShowComments && showEditComments) {
+        if (wouldShowComments && showEditComments) {
             item = menu.add(Menu.NONE, MENU_COMMENTS_REFRESH_ID, Menu.NONE,
                     R.string.ENA_refresh_comments);
             item.setIcon(R.drawable.icn_menu_refresh_dark);
@@ -1395,11 +1412,11 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
     public int getTabForPosition(int position) {
         int tab = TaskEditViewPager.getPageForPosition(position, tabStyle);
-        switch(tab) {
-        case TaskEditViewPager.TAB_SHOW_ACTIVITY:
-            return TAB_VIEW_UPDATES;
-        case TaskEditViewPager.TAB_SHOW_MORE:
-            return TAB_VIEW_MORE;
+        switch (tab) {
+            case TaskEditViewPager.TAB_SHOW_ACTIVITY:
+                return TAB_VIEW_UPDATES;
+            case TaskEditViewPager.TAB_SHOW_MORE:
+                return TAB_VIEW_MORE;
         }
 
         // error experienced
@@ -1409,16 +1426,15 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     /**
      * Returns the correct view for TaskEditViewPager
      *
-     * @param position
-     *            in the horizontal scroll view
+     * @param position in the horizontal scroll view
      */
 
     public View getPageView(int position) {
-        switch(getTabForPosition(position)) {
-        case TAB_VIEW_MORE:
-            return moreControls;
-        case TAB_VIEW_UPDATES:
-            return editNotes;
+        switch (getTabForPosition(position)) {
+            case TAB_VIEW_MORE:
+                return moreControls;
+            case TAB_VIEW_UPDATES:
+                return editNotes;
         }
         return null;
     }
@@ -1427,13 +1443,13 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         int height = 0;
 
         View view = null;
-        switch(getTabForPosition(position)) {
-        case TAB_VIEW_MORE:
-            view = moreControls;
-            break;
-        case TAB_VIEW_UPDATES:
-            view = editNotes;
-            break;
+        switch (getTabForPosition(position)) {
+            case TAB_VIEW_MORE:
+                view = moreControls;
+                break;
+            case TAB_VIEW_UPDATES:
+                view = editNotes;
+                break;
         }
 
         if (view == null || mPager == null) return;
@@ -1441,7 +1457,8 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         int desiredWidth = MeasureSpec.makeMeasureSpec(view.getWidth(),
                 MeasureSpec.AT_MOST);
         view.measure(desiredWidth, MeasureSpec.UNSPECIFIED);
-        height = Math.max(view.getMeasuredHeight(), height);;
+        height = Math.max(view.getMeasuredHeight(), height);
+        ;
         LayoutParams pagerParams = mPager.getLayoutParams();
         if (height > 0 && height != pagerParams.height) {
             pagerParams.height = height;
@@ -1461,7 +1478,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         }
 
         ViewGroup.LayoutParams params = view.getLayoutParams();
-        if(params == null)
+        if (params == null)
             return;
 
         params.height = totalHeight;
@@ -1472,14 +1489,14 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
     // Tab Page listener when page/tab changes
     @Override
     public void onPageScrolled(int position, float positionOffset,
-            int positionOffsetPixels) {
+                               int positionOffsetPixels) {
         return;
     }
 
     @Override
     public void onPageSelected(final int position) {
         setPagerHeightForPosition(position);
-        NestableScrollView scrollView = (NestableScrollView)getView().findViewById(R.id.edit_scroll);
+        NestableScrollView scrollView = (NestableScrollView) getView().findViewById(R.id.edit_scroll);
         scrollView.setScrollabelViews(null);
     }
 
@@ -1490,7 +1507,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
 
     // EditNoteActivity Listener when there are new updates/comments
     @Override
-    public void updatesChanged()  {
+    public void updatesChanged() {
         if (mPager != null && mPager.getCurrentItem() == TAB_VIEW_UPDATES)
             setPagerHeightForPosition(TAB_VIEW_UPDATES);
     }
@@ -1508,13 +1525,12 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
         View child = v;
         ScrollView scrollView = (ScrollView) getView().findViewById(R.id.edit_scroll);
         int top = v.getTop();
-        while (!child.equals(scrollView) ) {
+        while (!child.equals(scrollView)) {
             top += child.getTop();
             ViewParent parentView = child.getParent();
             if (parentView != null && View.class.isInstance(parentView)) {
                 child = (View) parentView;
-            }
-            else {
+            } else {
                 break;
             }
         }
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditViewPager.java b/astrid/src/com/todoroo/astrid/activity/TaskEditViewPager.java
index 1aa00c1a4..21e3a0f35 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditViewPager.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditViewPager.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.activity;
 
-import java.util.ArrayList;
-
 import android.content.Context;
 import android.os.Parcelable;
 import android.support.v4.view.PagerAdapter;
@@ -16,6 +14,8 @@ import android.view.View;
 import com.timsu.astrid.R;
 import com.viewpagerindicator.TitleProvider;
 
+import java.util.ArrayList;
+
 public class TaskEditViewPager extends PagerAdapter implements TitleProvider {
 
     private final String[] titles;
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 1fc8cf34f..ae3f7de42 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.activity;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.animation.LayoutTransition;
 import android.app.Activity;
 import android.app.SearchManager;
@@ -76,16 +72,24 @@ import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.utility.Flags;
 import com.todoroo.astrid.welcome.tutorial.WelcomeWalkthrough;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 public class TaskListActivity extends AstridActivity implements MainMenuListener, OnPageChangeListener {
 
     public static final String TOKEN_SELECTED_FILTER = "selectedFilter"; //$NON-NLS-1$
 
-    /** token for indicating source of TLA launch */
+    /**
+     * token for indicating source of TLA launch
+     */
     public static final String TOKEN_SOURCE = "source"; //$NON-NLS-1$
 
     public static final String TOKEN_SWITCH_TO_FILTER = "newListCreated"; //$NON-NLS-1$
 
-    /** For indicating the new list screen should be launched at fragment setup time */
+    /**
+     * For indicating the new list screen should be launched at fragment setup time
+     */
     public static final String TOKEN_CREATE_NEW_LIST = "createNewList"; //$NON-NLS-1$
     public static final String TOKEN_CREATE_NEW_LIST_MEMBERS = "newListMembers"; //$NON-NLS-1$
     public static final String TOKEN_CREATE_NEW_LIST_NAME = "newListName"; //$NON-NLS-1$
@@ -100,9 +104,11 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
 
     public static final int REQUEST_CODE_RESTART = 10;
 
-    @Autowired private ABTestEventReportingService abTestEventReportingService;
+    @Autowired
+    private ABTestEventReportingService abTestEventReportingService;
 
-    @Autowired private TagMetadataDao tagMetadataDao;
+    @Autowired
+    private TagMetadataDao tagMetadataDao;
 
     private View listsNav;
     private ImageView listsNavDisclosure;
@@ -298,14 +304,13 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
 
     @Override
     protected Bundle configureIntentAndExtrasWithFilter(Intent intent,
-            Filter filter) {
+                                                        Filter filter) {
         Bundle extras = super.configureIntentAndExtrasWithFilter(intent, filter);
         getIntent().putExtra(FILTER_MODE, filterMode);
         return extras;
     }
 
     /**
-     *
      * @param actionBar
      */
     protected void initializeFragments(ActionBar actionBar) {
@@ -319,7 +324,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
             actionBar.getCustomView().findViewById(R.id.list_disclosure_arrow).setVisibility(View.GONE);
             listsNav.setOnClickListener(null);
 
-            if(editFragment != null && editFragment.getVisibility() == View.INVISIBLE) {
+            if (editFragment != null && editFragment.getVisibility() == View.INVISIBLE) {
                 fragmentLayout = LAYOUT_TRIPLE;
                 actionBar.getCustomView().findViewById(R.id.comments).setVisibility(View.GONE);
             } else {
@@ -446,7 +451,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
     private void setListsDropdownSelected(boolean selected) {
         int oldTextColor = lists.getTextColors().getDefaultColor();
         int textStyle = (selected ? R.style.TextAppearance_ActionBar_ListsHeader_Selected :
-            R.style.TextAppearance_ActionBar_ListsHeader);
+                R.style.TextAppearance_ActionBar_ListsHeader);
 
         TypedValue listDisclosure = new TypedValue();
         getTheme().resolveAttribute(R.attr.asListsDisclosure, listDisclosure, false);
@@ -563,7 +568,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
 
     @Override
     public void onPageScrolled(int position, float positionOffset,
-            int positionOffsetPixels) { /* Nothing */ }
+                               int positionOffsetPixels) { /* Nothing */ }
 
     @Override
     public void onPageScrollStateChanged(int state) { /* Nothing */ }
@@ -589,8 +594,8 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
     public void onBackPressed() {
         // manage task edit visibility
         View taskeditFragmentContainer = findViewById(R.id.taskedit_fragment_container);
-        if(taskeditFragmentContainer != null && taskeditFragmentContainer.getVisibility() == View.VISIBLE) {
-            if(fragmentLayout == LAYOUT_DOUBLE) {
+        if (taskeditFragmentContainer != null && taskeditFragmentContainer.getVisibility() == View.VISIBLE) {
+            if (fragmentLayout == LAYOUT_DOUBLE) {
                 if (!commentsVisible)
                     findViewById(R.id.taskedit_fragment_container).setVisibility(View.GONE);
             }
@@ -615,7 +620,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         if ((requestCode == FilterListFragment.REQUEST_NEW_LIST ||
                 requestCode == TaskListFragment.ACTIVITY_REQUEST_NEW_FILTER) &&
                 resultCode == Activity.RESULT_OK) {
-            if(data == null)
+            if (data == null)
                 return;
 
             Filter newList = data.getParcelableExtra(TagSettingsActivity.TOKEN_NEW_FILTER);
@@ -821,23 +826,23 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
     protected void trackActivitySource() {
         switch (getIntent().getIntExtra(TOKEN_SOURCE,
                 Constants.SOURCE_DEFAULT)) {
-        case Constants.SOURCE_NOTIFICATION:
-            StatisticsService.reportEvent(StatisticsConstants.LAUNCH_FROM_NOTIFICATION);
-            break;
-        case Constants.SOURCE_OTHER:
-            StatisticsService.reportEvent(StatisticsConstants.LAUNCH_FROM_OTHER);
-            break;
-        case Constants.SOURCE_PPWIDGET:
-            StatisticsService.reportEvent(StatisticsConstants.LAUNCH_FROM_PPW);
-            break;
-        case Constants.SOURCE_WIDGET:
-            StatisticsService.reportEvent(StatisticsConstants.LAUNCH_FROM_WIDGET);
-            break;
-        case Constants.SOURCE_C2DM:
-            StatisticsService.reportEvent(StatisticsConstants.LAUNCH_FROM_C2DM);
-            break;
-        case Constants.SOURCE_REENGAGEMENT:
-            StatisticsService.reportEvent(StatisticsConstants.LAUNCH_FROM_REENGAGEMENT);
+            case Constants.SOURCE_NOTIFICATION:
+                StatisticsService.reportEvent(StatisticsConstants.LAUNCH_FROM_NOTIFICATION);
+                break;
+            case Constants.SOURCE_OTHER:
+                StatisticsService.reportEvent(StatisticsConstants.LAUNCH_FROM_OTHER);
+                break;
+            case Constants.SOURCE_PPWIDGET:
+                StatisticsService.reportEvent(StatisticsConstants.LAUNCH_FROM_PPW);
+                break;
+            case Constants.SOURCE_WIDGET:
+                StatisticsService.reportEvent(StatisticsConstants.LAUNCH_FROM_WIDGET);
+                break;
+            case Constants.SOURCE_C2DM:
+                StatisticsService.reportEvent(StatisticsConstants.LAUNCH_FROM_C2DM);
+                break;
+            case Constants.SOURCE_REENGAGEMENT:
+                StatisticsService.reportEvent(StatisticsConstants.LAUNCH_FROM_REENGAGEMENT);
         }
         getIntent().putExtra(TOKEN_SOURCE, Constants.SOURCE_DEFAULT); // Only report source once
     }
@@ -851,28 +856,28 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
     public void mainMenuItemSelected(int item, Intent customIntent) {
         TaskListFragment tlf = getTaskListFragment();
         switch (item) {
-        case MainMenuPopover.MAIN_MENU_ITEM_LISTS:
-            if (filterMode == FILTER_MODE_NORMAL)
-                listsNav.performClick();
-            else
-                setFilterMode(FILTER_MODE_NORMAL);
-            return;
-        case MainMenuPopover.MAIN_MENU_ITEM_SEARCH:
-            onSearchRequested();
-            return;
-        case MainMenuPopover.MAIN_MENU_ITEM_FEATURED_LISTS:
-            setFilterMode(FILTER_MODE_FEATURED);
-            return;
-        case MainMenuPopover.MAIN_MENU_ITEM_FRIENDS:
-            setFilterMode(FILTER_MODE_PEOPLE);
-            return;
-        case MainMenuPopover.MAIN_MENU_ITEM_SUGGESTIONS:
-            // Doesn't exist yet
-            return;
-        case MainMenuPopover.MAIN_MENU_ITEM_SETTINGS:
-            if (tlf != null)
-                tlf.showSettings();
-            return;
+            case MainMenuPopover.MAIN_MENU_ITEM_LISTS:
+                if (filterMode == FILTER_MODE_NORMAL)
+                    listsNav.performClick();
+                else
+                    setFilterMode(FILTER_MODE_NORMAL);
+                return;
+            case MainMenuPopover.MAIN_MENU_ITEM_SEARCH:
+                onSearchRequested();
+                return;
+            case MainMenuPopover.MAIN_MENU_ITEM_FEATURED_LISTS:
+                setFilterMode(FILTER_MODE_FEATURED);
+                return;
+            case MainMenuPopover.MAIN_MENU_ITEM_FRIENDS:
+                setFilterMode(FILTER_MODE_PEOPLE);
+                return;
+            case MainMenuPopover.MAIN_MENU_ITEM_SUGGESTIONS:
+                // Doesn't exist yet
+                return;
+            case MainMenuPopover.MAIN_MENU_ITEM_SETTINGS:
+                if (tlf != null)
+                    tlf.showSettings();
+                return;
         }
         tlf.handleOptionsMenuItemSelected(item, customIntent);
     }
@@ -919,16 +924,16 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
     }
 
     private void updateFilterModeSpec(int mode) {
-        switch(mode) {
-        case FILTER_MODE_PEOPLE:
-            filterModeSpec = new PeopleFilterMode();
-            break;
-        case FILTER_MODE_FEATURED:
-            filterModeSpec = new FeaturedListFilterMode();
-            break;
-        case FILTER_MODE_NORMAL:
-        default:
-            filterModeSpec = new DefaultFilterMode();
+        switch (mode) {
+            case FILTER_MODE_PEOPLE:
+                filterModeSpec = new PeopleFilterMode();
+                break;
+            case FILTER_MODE_FEATURED:
+                filterModeSpec = new FeaturedListFilterMode();
+                break;
+            case FILTER_MODE_NORMAL:
+            default:
+                filterModeSpec = new DefaultFilterMode();
         }
     }
 
@@ -940,7 +945,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
         TaskListFragment tlf = getTaskListFragment();
         if (tlf == null)
             return;
-        InputMethodManager imm = (InputMethodManager)getSystemService(
+        InputMethodManager imm = (InputMethodManager) getSystemService(
                 Context.INPUT_METHOD_SERVICE);
         QuickAddBar qab = tlf.quickAddBar;
         if (qab != null)
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
index f93276605..f88603db6 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
@@ -5,11 +5,6 @@
  */
 package com.todoroo.astrid.activity;
 
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.atomic.AtomicReference;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
@@ -116,12 +111,16 @@ import com.todoroo.astrid.welcome.HelpInfoPopover;
 import com.todoroo.astrid.welcome.tutorial.WelcomeWalkthrough;
 import com.todoroo.astrid.widget.TasksWidget;
 
+import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.atomic.AtomicReference;
+
 /**
  * Primary activity for the Bente application. Shows a list of upcoming tasks
  * and a user's coaches.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TaskListFragment extends SherlockListFragment implements OnSortSelectedListener {
 
@@ -161,7 +160,9 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
 
     // --- constants
 
-    /** token for passing a {@link Filter} object through extras */
+    /**
+     * token for passing a {@link Filter} object through extras
+     */
     public static final String TOKEN_FILTER = "filter"; //$NON-NLS-1$
 
     private static final String TOKEN_EXTRAS = "extras"; //$NON-NLS-1$
@@ -174,21 +175,28 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
     @Autowired
     protected TaskService taskService;
 
-    @Autowired MetadataService metadataService;
+    @Autowired
+    MetadataService metadataService;
 
-    @Autowired Database database;
+    @Autowired
+    Database database;
 
-    @Autowired AddOnService addOnService;
+    @Autowired
+    AddOnService addOnService;
 
-    @Autowired UpgradeService upgradeService;
+    @Autowired
+    UpgradeService upgradeService;
 
-    @Autowired TagDataService tagDataService;
+    @Autowired
+    TagDataService tagDataService;
 
-    @Autowired TaskListMetadataDao taskListMetadataDao;
+    @Autowired
+    TaskListMetadataDao taskListMetadataDao;
 
-    @Autowired ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    ActFmPreferenceService actFmPreferenceService;
 
-    private final TaskContextActionExposer[] contextItemExposers = new TaskContextActionExposer[] {
+    private final TaskContextActionExposer[] contextItemExposers = new TaskContextActionExposer[]{
             new ReminderDebugContextActions.MakeNotification(),
             new ReminderDebugContextActions.WhenReminder(),
     };
@@ -229,12 +237,13 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
     /**
      * Instantiates and returns an instance of TaskListFragment (or some subclass). Custom types of
      * TaskListFragment can be created, with the following precedence:
-     *
+     * <p/>
      * --If the filter is of type {@link FilterWithCustomIntent}, the task list type it specifies will be used
      * --Otherwise, the specified customComponent will be used
-     *
+     * <p/>
      * See also: instantiateWithFilterAndExtras(Filter, Bundle) which uses TaskListFragment as the default
      * custom component.
+     *
      * @param filter
      * @param extras
      * @param customComponent
@@ -272,6 +281,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
     /**
      * Convenience method for calling instantiateWithFilterAndExtras(Filter, Bundle, Class<?>) with
      * TaskListFragment as the default component
+     *
      * @param filter
      * @param extras
      * @return
@@ -286,6 +296,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
      */
     public interface OnTaskListItemClickedListener {
         public void onTaskListItemClicked(long taskId);
+
         public void onTaskListItemClicked(long taskId, boolean editable);
     }
 
@@ -304,15 +315,17 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
 
     /**
      * @return view to attach to the body of the task list. must contain two
-     *         elements, a view with id android:id/empty and a list view with id
-     *         android:id/list. It should NOT be attached to root
+     * elements, a view with id android:id/empty and a list view with id
+     * android:id/list. It should NOT be attached to root
      */
     protected View getListBody(ViewGroup root) {
         return getActivity().getLayoutInflater().inflate(
                 R.layout.task_list_body_standard, root, false);
     }
 
-    /** Called when loading up the activity */
+    /**
+     * Called when loading up the activity
+     */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         DependencyInjectionService.getInstance().inject(this);
@@ -331,7 +344,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
      */
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
+                             Bundle savedInstanceState) {
         ViewGroup parent = (ViewGroup) getActivity().getLayoutInflater().inflate(
                 R.layout.task_list_activity, container, false);
         parent.addView(getListBody(parent), 0);
@@ -368,11 +381,11 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
         getListView().setOnItemClickListener(new OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view,
-                    int position, long id) {
+                                    int position, long id) {
                 if (taskAdapter != null) {
-                    TodorooCursor<Task> cursor = (TodorooCursor<Task>)taskAdapter.getItem(position);
+                    TodorooCursor<Task> cursor = (TodorooCursor<Task>) taskAdapter.getItem(position);
                     Task task = new Task(cursor);
-                    if(task.isDeleted())
+                    if (task.isDeleted())
                         return;
 
                     onTaskListItemClicked(id, task.isEditable());
@@ -513,13 +526,13 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
         // --- sort
         if (allowResorting() && Preferences.getBoolean(R.string.p_show_menu_sort, true)) {
             addMenuItem(menu, R.string.TLA_menu_sort,
-                    ThemeService.getDrawable(R.drawable.icn_menu_sort_by_size, isTablet ? ThemeService.FLAG_FORCE_DARK: 0), MENU_SORT_ID, false);
+                    ThemeService.getDrawable(R.drawable.icn_menu_sort_by_size, isTablet ? ThemeService.FLAG_FORCE_DARK : 0), MENU_SORT_ID, false);
         }
 
         // --- new filter
         if (Preferences.getBoolean(R.string.p_use_filters, true))
             addMenuItem(menu, R.string.FLA_new_filter,
-                    ThemeService.getDrawable(R.drawable.icn_menu_filters, isTablet ? ThemeService.FLAG_FORCE_DARK: 0), MENU_NEW_FILTER_ID, false);
+                    ThemeService.getDrawable(R.drawable.icn_menu_filters, isTablet ? ThemeService.FLAG_FORCE_DARK : 0), MENU_NEW_FILTER_ID, false);
 
         // ask about plug-ins
         Intent queryIntent = new Intent(
@@ -807,7 +820,6 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
      * Receiver which receives refresh intents
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     protected class RefreshReceiver extends BroadcastReceiver {
         @Override
@@ -845,7 +857,6 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
      * Receiver which receives detail or decoration intents
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     protected class DetailReceiver extends BroadcastReceiver {
         @Override
@@ -873,7 +884,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if(quickAddBar.onActivityResult(requestCode, resultCode, data))
+        if (quickAddBar.onActivityResult(requestCode, resultCode, data))
             return;
 
         if (requestCode == ACTIVITY_SETTINGS) {
@@ -890,7 +901,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
         super.onActivityResult(requestCode, resultCode, data);
 
         if (!Preferences.getBoolean(R.string.p_showed_add_task_help, false)) {
-            if(!AstridPreferences.canShowPopover())
+            if (!AstridPreferences.canShowPopover())
                 return;
             quickAddBar.getQuickAddBox().postDelayed(new Runnable() {
                 @Override
@@ -907,7 +918,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
     }
 
     public void onScroll(AbsListView view, int firstVisibleItem,
-            int visibleItemCount, int totalItemCount) {
+                         int visibleItemCount, int totalItemCount) {
         // do nothing
     }
 
@@ -949,14 +960,14 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
 
     public static int getTaskRowResource() {
         int rowStyle = Preferences.getIntegerFromString(R.string.p_taskRowStyle_v2, 0);
-        switch(rowStyle) {
-        case 1:
-            return R.layout.task_adapter_row_simple;
-        case 2:
-            return R.layout.task_adapter_row_title_only;
-        case 0:
-        default:
-            return R.layout.task_adapter_row;
+        switch (rowStyle) {
+            case 1:
+                return R.layout.task_adapter_row_simple;
+            case 2:
+                return R.layout.task_adapter_row_title_only;
+            case 0:
+            default:
+                return R.layout.task_adapter_row;
         }
     }
 
@@ -977,14 +988,13 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
 
     public static final String USER_IMAGE_JOIN = "for_images"; // //$NON-NLS-1$
 
-    public  static final String FILE_METADATA_JOIN = "for_actions"; //$NON-NLS-1$
+    public static final String FILE_METADATA_JOIN = "for_actions"; //$NON-NLS-1$
 
 
     /**
      * Fill in the Task List with current items
      *
-     * @param withCustomId
-     *            force task with given custom id to be part of list
+     * @param withCustomId force task with given custom id to be part of list
      */
     public void setUpTaskList() {
         if (filter == null)
@@ -1031,10 +1041,10 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
         String joinedQuery =
                 Join.left(Metadata.TABLE.as(TAGS_METADATA_JOIN),
                         tagsJoinCriterion).toString() //$NON-NLS-1$
-                + Join.left(User.TABLE.as(USER_IMAGE_JOIN),
+                        + Join.left(User.TABLE.as(USER_IMAGE_JOIN),
                         Task.USER_ID.eq(Field.field(USER_IMAGE_JOIN + "." + User.UUID.name))).toString()
-                + Join.left(TaskAttachment.TABLE.as(FILE_METADATA_JOIN), Task.UUID.eq(Field.field(FILE_METADATA_JOIN + "." + TaskAttachment.TASK_UUID.name)))
-                + filter.getSqlQuery();
+                        + Join.left(TaskAttachment.TABLE.as(FILE_METADATA_JOIN), Task.UUID.eq(Field.field(FILE_METADATA_JOIN + "." + TaskAttachment.TASK_UUID.name)))
+                        + filter.getSqlQuery();
 
         sqlQueryTemplate.set(SortHelper.adjustQueryForFlagsAndSort(
                 joinedQuery, sortFlags, sortSort));
@@ -1051,7 +1061,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
         // Peform query
         try {
             return taskService.fetchFiltered(
-                sqlQueryTemplate.get(), null, taskProperties());
+                    sqlQueryTemplate.get(), null, taskProperties());
         } catch (SQLiteException e) {
             // We don't show this error anymore--seems like this can get triggered
             // by a strange bug, but there seems to not be any negative side effect.
@@ -1087,17 +1097,17 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
     }
 
     private void showTaskCreateHelpPopover() {
-        if(!AstridPreferences.canShowPopover())
+        if (!AstridPreferences.canShowPopover())
             return;
         if (!Preferences.getBoolean(R.string.p_showed_add_task_help, false)) {
             Preferences.setBoolean(R.string.p_showed_add_task_help, true);
             HelpInfoPopover.showPopover(getActivity(), quickAddBar.getQuickAddBox(),
-                            R.string.help_popover_add_task, null);
+                    R.string.help_popover_add_task, null);
         }
     }
 
     public void showTaskEditHelpPopover() {
-        if(!AstridPreferences.canShowPopover())
+        if (!AstridPreferences.canShowPopover())
             return;
         if (!Preferences.getBoolean(R.string.p_showed_tap_task_help, false)) {
             quickAddBar.hideKeyboard();
@@ -1126,7 +1136,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
     }
 
     private void showListsHelp() {
-        if(!AstridPreferences.canShowPopover())
+        if (!AstridPreferences.canShowPopover())
             return;
         if (!Preferences.getBoolean(
                 R.string.p_showed_lists_help, false)) {
@@ -1158,8 +1168,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
     /**
      * A task was completed from the task adapter
      *
-     * @param item
-     *            task that was completed
+     * @param item task that was completed
      */
     protected void onTaskCompleted(Task item) {
         if (isInbox)
@@ -1187,7 +1196,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
 
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v,
-            ContextMenuInfo menuInfo) {
+                                    ContextMenuInfo menuInfo) {
         AdapterContextMenuInfo adapterInfo = (AdapterContextMenuInfo) menuInfo;
         Task task = ((ViewHolder) adapterInfo.targetView.getTag()).task;
         if (task.getValue(Task.IS_READONLY) > 0)
@@ -1238,19 +1247,21 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
         return isInbox;
     }
 
-    /** Show a dialog box and delete the task specified */
+    /**
+     * Show a dialog box and delete the task specified
+     */
     private void deleteTask(final Task task) {
         new AlertDialog.Builder(getActivity()).setTitle(
                 R.string.DLG_confirm_title).setMessage(
                 R.string.DLG_delete_this_task_question).setIcon(
                 android.R.drawable.ic_dialog_alert).setPositiveButton(
                 android.R.string.ok, new DialogInterface.OnClickListener() {
-                    public void onClick(DialogInterface dialog, int which) {
-                        onTaskDelete(task);
-                        taskService.delete(task);
-                        loadTaskListContent(true);
-                    }
-                }).setNegativeButton(android.R.string.cancel, null).show();
+            public void onClick(DialogInterface dialog, int which) {
+                onTaskDelete(task);
+                taskService.delete(task);
+                loadTaskListContent(true);
+            }
+        }).setNegativeButton(android.R.string.cancel, null).show();
     }
 
     public void onTaskCreated(Task task) {
@@ -1304,30 +1315,30 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
 
     public boolean handleOptionsMenuItemSelected(int id, Intent intent) {
         Activity activity = getActivity();
-        switch(id) {
-        case MENU_SORT_ID:
-            StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_SORT);
-            if (activity != null) {
-                AlertDialog dialog = SortSelectionActivity.createDialog(
-                        getActivity(), hasDraggableOption(), this, sortFlags, sortSort);
-                dialog.show();
-            }
-            return true;
-        case MENU_SYNC_ID:
-            StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_SYNC);
-            syncActionHelper.performSyncAction();
-            return true;
-        case MENU_ADDON_INTENT_ID:
-            if (activity != null)
-                AndroidUtilities.startExternalIntent(activity, intent,
-                        ACTIVITY_MENU_EXTERNAL);
-            return true;
-        case MENU_NEW_FILTER_ID:
-            if (activity != null) {
-                intent = new Intent(activity, CustomFilterActivity.class);
-                activity.startActivityForResult(intent, ACTIVITY_REQUEST_NEW_FILTER);
+        switch (id) {
+            case MENU_SORT_ID:
+                StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_SORT);
+                if (activity != null) {
+                    AlertDialog dialog = SortSelectionActivity.createDialog(
+                            getActivity(), hasDraggableOption(), this, sortFlags, sortSort);
+                    dialog.show();
+                }
                 return true;
-            }
+            case MENU_SYNC_ID:
+                StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_SYNC);
+                syncActionHelper.performSyncAction();
+                return true;
+            case MENU_ADDON_INTENT_ID:
+                if (activity != null)
+                    AndroidUtilities.startExternalIntent(activity, intent,
+                            ACTIVITY_MENU_EXTERNAL);
+                return true;
+            case MENU_NEW_FILTER_ID:
+                if (activity != null) {
+                    intent = new Intent(activity, CustomFilterActivity.class);
+                    activity.startActivityForResult(intent, ACTIVITY_REQUEST_NEW_FILTER);
+                    return true;
+                }
         }
         return false;
     }
@@ -1345,60 +1356,60 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
             return true;
 
         switch (item.getItemId()) {
-        // --- context menu items
+            // --- context menu items
 
-        case CONTEXT_MENU_BROADCAST_INTENT_ID: {
-            intent = item.getIntent();
-            getActivity().sendBroadcast(intent);
-            return true;
-        }
-        case CONTEXT_MENU_EDIT_TASK_ID: {
-            itemId = item.getGroupId();
-            mListener.onTaskListItemClicked(itemId);
-            return true;
-        }
-        case CONTEXT_MENU_COPY_TASK_ID: {
-            itemId = item.getGroupId();
-            duplicateTask(itemId);
-            return true;
-        }
-        case CONTEXT_MENU_DELETE_TASK_ID: {
-            itemId = item.getGroupId();
-            Task task = taskService.fetchById(itemId, Task.ID, Task.UUID);
-            if (task != null)
-                deleteTask(task);
-            return true;
-        }
-        case CONTEXT_MENU_UNDELETE_TASK_ID: {
-            itemId = item.getGroupId();
-            Task task = new Task();
-            task.setId(itemId);
-            task.setValue(Task.DELETION_DATE, 0L);
-            taskService.save(task);
-            loadTaskListContent(true);
-            return true;
-        }
-        case CONTEXT_MENU_PURGE_TASK_ID: {
-            itemId = item.getGroupId();
-            Task task = new Task();
-            task.setId(itemId);
-            TimerPlugin.updateTimer(getActivity(), task, false);
-            taskService.purge(itemId);
-            loadTaskListContent(true);
-            return true;
-        }
-        default: {
-            if (item.getItemId() < CONTEXT_MENU_PLUGIN_ID_FIRST)
-                return false;
-            if (item.getItemId() - CONTEXT_MENU_PLUGIN_ID_FIRST >= contextItemExposers.length)
-                return false;
+            case CONTEXT_MENU_BROADCAST_INTENT_ID: {
+                intent = item.getIntent();
+                getActivity().sendBroadcast(intent);
+                return true;
+            }
+            case CONTEXT_MENU_EDIT_TASK_ID: {
+                itemId = item.getGroupId();
+                mListener.onTaskListItemClicked(itemId);
+                return true;
+            }
+            case CONTEXT_MENU_COPY_TASK_ID: {
+                itemId = item.getGroupId();
+                duplicateTask(itemId);
+                return true;
+            }
+            case CONTEXT_MENU_DELETE_TASK_ID: {
+                itemId = item.getGroupId();
+                Task task = taskService.fetchById(itemId, Task.ID, Task.UUID);
+                if (task != null)
+                    deleteTask(task);
+                return true;
+            }
+            case CONTEXT_MENU_UNDELETE_TASK_ID: {
+                itemId = item.getGroupId();
+                Task task = new Task();
+                task.setId(itemId);
+                task.setValue(Task.DELETION_DATE, 0L);
+                taskService.save(task);
+                loadTaskListContent(true);
+                return true;
+            }
+            case CONTEXT_MENU_PURGE_TASK_ID: {
+                itemId = item.getGroupId();
+                Task task = new Task();
+                task.setId(itemId);
+                TimerPlugin.updateTimer(getActivity(), task, false);
+                taskService.purge(itemId);
+                loadTaskListContent(true);
+                return true;
+            }
+            default: {
+                if (item.getItemId() < CONTEXT_MENU_PLUGIN_ID_FIRST)
+                    return false;
+                if (item.getItemId() - CONTEXT_MENU_PLUGIN_ID_FIRST >= contextItemExposers.length)
+                    return false;
 
-            AdapterContextMenuInfo adapterInfo = (AdapterContextMenuInfo) item.getMenuInfo();
-            Task task = ((ViewHolder) adapterInfo.targetView.getTag()).task;
-            contextItemExposers[item.getItemId() - CONTEXT_MENU_PLUGIN_ID_FIRST].invoke(task);
+                AdapterContextMenuInfo adapterInfo = (AdapterContextMenuInfo) item.getMenuInfo();
+                Task task = ((ViewHolder) adapterInfo.targetView.getTag()).task;
+                contextItemExposers[item.getItemId() - CONTEXT_MENU_PLUGIN_ID_FIRST].invoke(task);
 
-            return true;
-        }
+                return true;
+            }
         }
     }
 
@@ -1428,12 +1439,12 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
 
     protected void toggleDragDrop(boolean newState) {
         extras.putParcelable(TOKEN_FILTER, filter);
-        if(newState)
-            ((AstridActivity)getActivity()).setupTasklistFragmentWithFilterAndCustomTaskList(filter,
+        if (newState)
+            ((AstridActivity) getActivity()).setupTasklistFragmentWithFilterAndCustomTaskList(filter,
                     extras, SubtasksListFragment.class);
         else {
             filter.setFilterQueryOverride(null);
-            ((AstridActivity)getActivity()).setupTasklistFragmentWithFilterAndCustomTaskList(filter,
+            ((AstridActivity) getActivity()).setupTasklistFragmentWithFilterAndCustomTaskList(filter,
                     extras, TaskListFragment.class);
         }
     }
@@ -1449,7 +1460,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
     @Override
     public void onSortSelected(boolean always, int flags, int sort) {
         boolean manualSettingChanged = SortHelper.isManualSort(sortFlags) !=
-            SortHelper.isManualSort(flags);
+                SortHelper.isManualSort(flags);
 
         sortFlags = flags;
         sortSort = sort;
@@ -1468,7 +1479,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
         }
 
         try {
-            if(manualSettingChanged)
+            if (manualSettingChanged)
                 toggleDragDrop(SortHelper.isManualSort(sortFlags));
             else
                 setUpTaskList();
diff --git a/astrid/src/com/todoroo/astrid/adapter/AddOnAdapter.java b/astrid/src/com/todoroo/astrid/adapter/AddOnAdapter.java
index 42240f5ba..2704a2e55 100644
--- a/astrid/src/com/todoroo/astrid/adapter/AddOnAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/AddOnAdapter.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.adapter;
 
-import java.util.List;
-
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
@@ -28,11 +26,12 @@ import com.todoroo.astrid.data.AddOn;
 import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.utility.Constants;
 
+import java.util.List;
+
 /**
  * Adapter for {@link AddOn}s
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class AddOnAdapter extends ArrayAdapter<AddOn> {
 
@@ -56,7 +55,7 @@ public class AddOnAdapter extends ArrayAdapter<AddOn> {
         @Override
         public void onClick(View v) {
             ButtonTag buttonTag = (ButtonTag) v.getTag();
-            if(buttonTag != null) {
+            if (buttonTag != null) {
                 try {
                     activity.startActivity(buttonTag.intent);
                     StatisticsService.reportEvent("addon-" + buttonTag.event); //$NON-NLS-1$
@@ -69,7 +68,7 @@ public class AddOnAdapter extends ArrayAdapter<AddOn> {
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        if(convertView == null) {
+        if (convertView == null) {
             convertView = inflater.inflate(R.layout.addon_adapter_row, parent, false);
             ViewHolder viewHolder = new ViewHolder();
             viewHolder.icon = (ImageView) convertView.findViewById(R.id.icon);
@@ -83,7 +82,7 @@ public class AddOnAdapter extends ArrayAdapter<AddOn> {
             viewHolder.market.setOnClickListener(intentClickListener);
 
         }
-        ((ViewHolder)convertView.getTag()).item = getItem(position);
+        ((ViewHolder) convertView.getTag()).item = getItem(position);
         initializeView(convertView);
 
         return convertView;
@@ -102,6 +101,7 @@ public class AddOnAdapter extends ArrayAdapter<AddOn> {
     private class ButtonTag {
         String event;
         Intent intent;
+
         public ButtonTag(String message, Intent intent) {
             this.event = message;
             this.intent = intent;
@@ -119,7 +119,7 @@ public class AddOnAdapter extends ArrayAdapter<AddOn> {
 
         // populate buttons
 
-        if(installed) {
+        if (installed) {
             viewHolder.market.setVisibility(View.GONE);
             viewHolder.installedIcon.setVisibility(View.VISIBLE);
         } else {
@@ -133,7 +133,7 @@ public class AddOnAdapter extends ArrayAdapter<AddOn> {
                 viewHolder.market.setTag(new ButtonTag("market-" + item.getPackageName(), //$NON-NLS-1$
                         marketIntent));
                 Drawable icon = getIntentIcon(marketIntent);
-                if(icon == null)
+                if (icon == null)
                     viewHolder.market.setImageResource(
                             android.R.drawable.stat_sys_download);
                 else
@@ -147,7 +147,7 @@ public class AddOnAdapter extends ArrayAdapter<AddOn> {
         List<ResolveInfo> resolveInfoList = pm.queryIntentActivities(intent, 0);
 
         // if options > 1, display open with...
-        if(resolveInfoList.size() > 0) {
+        if (resolveInfoList.size() > 0) {
             return resolveInfoList.get(0).activityInfo.loadIcon(pm);
         }
 
diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
index 7890fb80e..530689143 100644
--- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -5,14 +5,6 @@
  */
 package com.todoroo.astrid.adapter;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.app.PendingIntent.CanceledException;
@@ -65,6 +57,14 @@ import com.todoroo.astrid.tags.TagService;
 import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.utility.ResourceDrawableCache;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public class FilterAdapter extends ArrayAdapter<Filter> {
 
     public static interface FilterDataSourceChangedListener {
@@ -81,33 +81,51 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
     @Autowired
     private TaskService taskService;
 
-    /** parent activity */
+    /**
+     * parent activity
+     */
     protected final Activity activity;
 
     protected final Resources resources;
 
-    /** owner listview */
+    /**
+     * owner listview
+     */
     protected ListView listView;
 
-    /** display metrics for scaling icons */
+    /**
+     * display metrics for scaling icons
+     */
     protected final DisplayMetrics metrics = new DisplayMetrics();
 
-    /** receiver for new filters */
+    /**
+     * receiver for new filters
+     */
     protected final FilterReceiver filterReceiver = new FilterReceiver();
 
-    /** row layout to inflate */
+    /**
+     * row layout to inflate
+     */
     private final int layout;
 
-    /** layout inflater */
+    /**
+     * layout inflater
+     */
     private final LayoutInflater inflater;
 
-    /** whether to skip Filters that launch intents instead of being real filters */
+    /**
+     * whether to skip Filters that launch intents instead of being real filters
+     */
     private final boolean skipIntentFilters;
 
-    /** whether rows are selectable */
+    /**
+     * whether rows are selectable
+     */
     private final boolean selectable;
 
-    /** Pattern for matching filter counts in listing titles */
+    /**
+     * Pattern for matching filter counts in listing titles
+     */
     private final Pattern countPattern = Pattern.compile(".* \\((\\d+)\\)$"); //$NON-NLS-1$
 
     private final HashMap<Filter, Integer> filterCounts;
@@ -127,12 +145,12 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
     private final ThreadPoolExecutor filterExecutor = new ThreadPoolExecutor(0, 1, 1, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
 
     public FilterAdapter(Activity activity, ListView listView,
-            int rowLayout, boolean skipIntentFilters) {
+                         int rowLayout, boolean skipIntentFilters) {
         this(activity, listView, rowLayout, skipIntentFilters, false);
     }
 
     public FilterAdapter(Activity activity, ListView listView,
-            int rowLayout, boolean skipIntentFilters, boolean selectable) {
+                         int rowLayout, boolean skipIntentFilters, boolean selectable) {
         super(activity, 0);
 
         DependencyInjectionService.getInstance().inject(this);
@@ -157,7 +175,7 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
     }
 
     private void offerFilter(final Filter filter) {
-        if(selectable && selection == null)
+        if (selectable && selection == null)
             setSelection(filter);
         filterExecutor.submit(new Runnable() {
             @Override
@@ -165,7 +183,7 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
                 try {
                     int size = -1;
                     Matcher m = countPattern.matcher(filter.listingTitle);
-                    if(m.find()) {
+                    if (m.find()) {
                         String countString = m.group(1);
                         try {
                             size = Integer.parseInt(countString);
@@ -273,20 +291,21 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
 
     /**
      * Create or reuse a view
+     *
      * @param convertView
      * @param parent
      * @return
      */
     protected View newView(View convertView, ViewGroup parent) {
-        if(convertView == null) {
+        if (convertView == null) {
             convertView = inflater.inflate(layout, parent, false);
             ViewHolder viewHolder = new ViewHolder();
             viewHolder.view = convertView;
-            viewHolder.icon = (ImageView)convertView.findViewById(R.id.icon);
-            viewHolder.urlImage = (AsyncImageView)convertView.findViewById(R.id.url_image);
-            viewHolder.name = (TextView)convertView.findViewById(R.id.name);
-            viewHolder.selected = (ImageView)convertView.findViewById(R.id.selected);
-            viewHolder.size = (TextView)convertView.findViewById(R.id.size);
+            viewHolder.icon = (ImageView) convertView.findViewById(R.id.icon);
+            viewHolder.urlImage = (AsyncImageView) convertView.findViewById(R.id.url_image);
+            viewHolder.name = (TextView) convertView.findViewById(R.id.name);
+            viewHolder.selected = (ImageView) convertView.findViewById(R.id.selected);
+            viewHolder.size = (TextView) convertView.findViewById(R.id.size);
             viewHolder.decoration = null;
             convertView.setTag(viewHolder);
         }
@@ -343,6 +362,7 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
 
     /**
      * Sets the selected item to this one
+     *
      * @param picked
      */
     public void setSelection(FilterListItem picked) {
@@ -354,6 +374,7 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
 
     /**
      * Gets the currently selected item
+     *
      * @return null if no item is to be selected
      */
     public FilterListItem getSelection() {
@@ -372,7 +393,6 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
      * Receiver which receives intents to add items to the filter list
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     public class FilterReceiver extends BroadcastReceiver {
         private final List<ResolveInfo> filterExposerList;
@@ -421,18 +441,18 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
 
             for (Parcelable item : filters) {
                 FilterListItem filter = (FilterListItem) item;
-                if(skipIntentFilters && !(filter instanceof Filter ||
-                            filter instanceof FilterListHeader ||
-                            filter instanceof FilterCategory))
+                if (skipIntentFilters && !(filter instanceof Filter ||
+                        filter instanceof FilterListHeader ||
+                        filter instanceof FilterCategory))
                     continue;
-                onReceiveFilter((FilterListItem)item);
+                onReceiveFilter((FilterListItem) item);
 
                 if (filter instanceof FilterCategory) {
                     Filter[] children = ((FilterCategory) filter).children;
                     for (Filter f : children) {
                         addOrLookup(f);
                     }
-                } else if (filter instanceof Filter){
+                } else if (filter instanceof Filter) {
                     addOrLookup((Filter) filter);
                 }
             }
@@ -476,6 +496,7 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
 
     /**
      * Called when an item comes through. Override if you like
+     *
      * @param item
      */
     public void onReceiveFilter(FilterListItem item) {
@@ -488,17 +509,17 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
 
     public void populateView(ViewHolder viewHolder) {
         FilterListItem filter = viewHolder.item;
-        if(filter == null)
+        if (filter == null)
             return;
 
         viewHolder.view.setBackgroundResource(0);
 
-        if(viewHolder.decoration != null) {
-            ((ViewGroup)viewHolder.view).removeView(viewHolder.decoration);
+        if (viewHolder.decoration != null) {
+            ((ViewGroup) viewHolder.view).removeView(viewHolder.decoration);
             viewHolder.decoration = null;
         }
 
-        if(viewHolder.item instanceof FilterListHeader || viewHolder.item instanceof FilterCategory) {
+        if (viewHolder.item instanceof FilterListHeader || viewHolder.item instanceof FilterCategory) {
             viewHolder.name.setTextAppearance(activity, headerStyle);
             viewHolder.name.setShadowLayer(1, 1, 1, Color.BLACK);
         } else {
@@ -511,14 +532,14 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
         viewHolder.urlImage.setVisibility(View.GONE);
         viewHolder.icon.setVisibility(View.GONE);
 
-        if(!nook && filter.listingIcon != null) {
+        if (!nook && filter.listingIcon != null) {
             viewHolder.icon.setVisibility(View.VISIBLE);
             viewHolder.icon.setImageBitmap(filter.listingIcon);
         }
 
         // title / size
         int countInt = -1;
-        if(filterCounts.containsKey(filter) || (!TextUtils.isEmpty(filter.listingTitle) && filter.listingTitle.matches(".* \\(\\d+\\)$"))) { //$NON-NLS-1$
+        if (filterCounts.containsKey(filter) || (!TextUtils.isEmpty(filter.listingTitle) && filter.listingTitle.matches(".* \\(\\d+\\)$"))) { //$NON-NLS-1$
             viewHolder.size.setVisibility(View.VISIBLE);
             String count;
             if (filterCounts.containsKey(filter)) {
@@ -550,11 +571,11 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
             countInt = -1;
         }
 
-        if(countInt == 0 && filter instanceof FilterWithCustomIntent)
+        if (countInt == 0 && filter instanceof FilterWithCustomIntent)
             viewHolder.name.setTextColor(Color.GRAY);
 
         viewHolder.name.getLayoutParams().height = (int) (58 * metrics.density);
-        if(!nook && filter instanceof FilterWithUpdate) {
+        if (!nook && filter instanceof FilterWithUpdate) {
             String defaultImageId = RemoteModel.NO_UUID;
             FilterWithUpdate fwu = (FilterWithUpdate) filter;
             Bundle customExtras = fwu.customExtras;
@@ -565,7 +586,7 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
 
             viewHolder.urlImage.setVisibility(View.VISIBLE);
             viewHolder.urlImage.setDefaultImageDrawable(ResourceDrawableCache.getImageDrawableFromId(resources, TagService.getDefaultImageIDForTag(defaultImageId)));
-            viewHolder.urlImage.setUrl(((FilterWithUpdate)filter).imageUrl);
+            viewHolder.urlImage.setUrl(((FilterWithUpdate) filter).imageUrl);
         }
 
         if (nook) {
@@ -577,51 +598,51 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
             viewHolder.name.setTextColor(filter.color);
 
         // selection
-        if(selection == viewHolder.item) {
+        if (selection == viewHolder.item) {
             viewHolder.selected.setVisibility(View.VISIBLE);
             viewHolder.view.setBackgroundColor(Color.rgb(128, 230, 0));
         } else
             viewHolder.selected.setVisibility(View.GONE);
 
-        if(filter instanceof FilterCategoryWithNewButton)
+        if (filter instanceof FilterCategoryWithNewButton)
             setupCustomHeader(viewHolder, (FilterCategoryWithNewButton) filter);
     }
 
     private void setupCustomHeader(ViewHolder viewHolder, final FilterCategoryWithNewButton filter) {
         Button add = new Button(activity);
         add.setBackgroundResource(R.drawable.filter_btn_background);
-        add.setCompoundDrawablesWithIntrinsicBounds(R.drawable.filter_new,0,0,0);
+        add.setCompoundDrawablesWithIntrinsicBounds(R.drawable.filter_new, 0, 0, 0);
         add.setTextColor(Color.WHITE);
         add.setShadowLayer(1, 1, 1, Color.BLACK);
         add.setText(filter.label);
         add.setFocusable(false);
         RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT,
-                (int)(32 * metrics.density));
+                (int) (32 * metrics.density));
         lp.rightMargin = (int) (4 * metrics.density);
         lp.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
         add.setLayoutParams(lp);
-        ((ViewGroup)viewHolder.view).addView(add);
+        ((ViewGroup) viewHolder.view).addView(add);
         viewHolder.decoration = add;
 
         add.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        try {
-                            filter.intent.send(FilterListFragment.REQUEST_NEW_BUTTON, new PendingIntent.OnFinished() {
-                                @Override
-                                public void onSendFinished(PendingIntent pendingIntent, Intent intent,
-                                        int resultCode, String resultData, Bundle resultExtras) {
-                                    activity.runOnUiThread(new Runnable() {
-                                        public void run() {
-                                            clear();
-                                        }
-                                    });
+            @Override
+            public void onClick(View v) {
+                try {
+                    filter.intent.send(FilterListFragment.REQUEST_NEW_BUTTON, new PendingIntent.OnFinished() {
+                        @Override
+                        public void onSendFinished(PendingIntent pendingIntent, Intent intent,
+                                                   int resultCode, String resultData, Bundle resultExtras) {
+                            activity.runOnUiThread(new Runnable() {
+                                public void run() {
+                                    clear();
                                 }
-                            }, null);
-                        } catch (CanceledException e) {
-                            // do nothing
+                            });
                         }
-                    }
-                });
+                    }, null);
+                } catch (CanceledException e) {
+                    // do nothing
+                }
+            }
+        });
     }
 }
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index 38e68f1a9..a8f7f874e 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -5,17 +5,6 @@
  */
 package com.todoroo.astrid.adapter;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.PendingIntent.CanceledException;
@@ -92,11 +81,21 @@ import com.todoroo.astrid.ui.CheckableImageView;
 import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.utility.ResourceDrawableCache;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicReference;
+
 /**
  * Adapter for displaying a user's tasks as a list
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TaskAdapter extends CursorAdapter implements Filterable {
 
@@ -109,7 +108,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
     public static final String BROADCAST_EXTRA_TASK = "model"; //$NON-NLS-1$
 
     @SuppressWarnings("nls")
-    private static final StringProperty TAGS = new StringProperty(null, "group_concat(nullif(" + TaskListFragment.TAGS_METADATA_JOIN + "." + TaskToTagMetadata.TAG_NAME.name + ", '')"+ ", '  |  ')").as("tags");
+    private static final StringProperty TAGS = new StringProperty(null, "group_concat(nullif(" + TaskListFragment.TAGS_METADATA_JOIN + "." + TaskToTagMetadata.TAG_NAME.name + ", '')" + ", '  |  ')").as("tags");
     @SuppressWarnings("nls")
     private static final LongProperty FILE_ID_PROPERTY = TaskAttachment.ID.cloneAs(TaskListFragment.FILE_METADATA_JOIN, "fileId");
     @SuppressWarnings("nls")
@@ -119,79 +118,81 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
 
     // --- other constants
 
-    /** Properties that need to be read from the action item */
-    public static final Property<?>[] PROPERTIES = new Property<?>[] {
-        Task.ID,
-        Task.UUID,
-        Task.TITLE,
-        Task.IS_READONLY,
-        Task.IS_PUBLIC,
-        Task.IMPORTANCE,
-        Task.DUE_DATE,
-        Task.COMPLETION_DATE,
-        Task.MODIFICATION_DATE,
-        Task.HIDE_UNTIL,
-        Task.DELETION_DATE,
-        Task.DETAILS,
-        Task.ELAPSED_SECONDS,
-        Task.TIMER_START,
-        Task.RECURRENCE,
-        Task.USER_ID,
-        Task.USER,
-        Task.REMINDER_LAST,
-        Task.SOCIAL_REMINDER,
-        PICTURE,
-        HAS_NOTES_PROPERTY, // Whether or not the task has notes
-        TAGS, // Concatenated list of tags
-        FILE_ID_PROPERTY // File id
+    /**
+     * Properties that need to be read from the action item
+     */
+    public static final Property<?>[] PROPERTIES = new Property<?>[]{
+            Task.ID,
+            Task.UUID,
+            Task.TITLE,
+            Task.IS_READONLY,
+            Task.IS_PUBLIC,
+            Task.IMPORTANCE,
+            Task.DUE_DATE,
+            Task.COMPLETION_DATE,
+            Task.MODIFICATION_DATE,
+            Task.HIDE_UNTIL,
+            Task.DELETION_DATE,
+            Task.DETAILS,
+            Task.ELAPSED_SECONDS,
+            Task.TIMER_START,
+            Task.RECURRENCE,
+            Task.USER_ID,
+            Task.USER,
+            Task.REMINDER_LAST,
+            Task.SOCIAL_REMINDER,
+            PICTURE,
+            HAS_NOTES_PROPERTY, // Whether or not the task has notes
+            TAGS, // Concatenated list of tags
+            FILE_ID_PROPERTY // File id
     };
 
-    public static final Property<?>[] BASIC_PROPERTIES = new Property<?>[] {
-        Task.ID,
-        Task.UUID,
-        Task.TITLE,
-        Task.IS_READONLY,
-        Task.IS_PUBLIC,
-        Task.IMPORTANCE,
-        Task.RECURRENCE,
-        Task.COMPLETION_DATE,
-        Task.HIDE_UNTIL,
-        Task.DELETION_DATE
+    public static final Property<?>[] BASIC_PROPERTIES = new Property<?>[]{
+            Task.ID,
+            Task.UUID,
+            Task.TITLE,
+            Task.IS_READONLY,
+            Task.IS_PUBLIC,
+            Task.IMPORTANCE,
+            Task.RECURRENCE,
+            Task.COMPLETION_DATE,
+            Task.HIDE_UNTIL,
+            Task.DELETION_DATE
     };
 
-    public static final int[] IMPORTANCE_RESOURCES = new int[] {
-        R.drawable.check_box_1,
-        R.drawable.check_box_2,
-        R.drawable.check_box_3,
-        R.drawable.check_box_4,
+    public static final int[] IMPORTANCE_RESOURCES = new int[]{
+            R.drawable.check_box_1,
+            R.drawable.check_box_2,
+            R.drawable.check_box_3,
+            R.drawable.check_box_4,
     };
 
-    public static final int[] IMPORTANCE_RESOURCES_CHECKED = new int[] {
-        R.drawable.check_box_checked_1,
-        R.drawable.check_box_checked_2,
-        R.drawable.check_box_checked_3,
-        R.drawable.check_box_checked_4,
+    public static final int[] IMPORTANCE_RESOURCES_CHECKED = new int[]{
+            R.drawable.check_box_checked_1,
+            R.drawable.check_box_checked_2,
+            R.drawable.check_box_checked_3,
+            R.drawable.check_box_checked_4,
     };
 
-    public static final int[] IMPORTANCE_RESOURCES_LARGE = new int[] {
-        R.drawable.check_box_large_1,
-        R.drawable.check_box_large_2,
-        R.drawable.check_box_large_3,
-        R.drawable.check_box_large_4,
+    public static final int[] IMPORTANCE_RESOURCES_LARGE = new int[]{
+            R.drawable.check_box_large_1,
+            R.drawable.check_box_large_2,
+            R.drawable.check_box_large_3,
+            R.drawable.check_box_large_4,
     };
 
-    public static final int[] IMPORTANCE_REPEAT_RESOURCES = new int[] {
-        R.drawable.check_box_repeat_1,
-        R.drawable.check_box_repeat_2,
-        R.drawable.check_box_repeat_3,
-        R.drawable.check_box_repeat_4,
+    public static final int[] IMPORTANCE_REPEAT_RESOURCES = new int[]{
+            R.drawable.check_box_repeat_1,
+            R.drawable.check_box_repeat_2,
+            R.drawable.check_box_repeat_3,
+            R.drawable.check_box_repeat_4,
     };
 
-    public static final int[] IMPORTANCE_REPEAT_RESOURCES_CHECKED = new int[] {
-        R.drawable.check_box_repeat_checked_1,
-        R.drawable.check_box_repeat_checked_2,
-        R.drawable.check_box_repeat_checked_3,
-        R.drawable.check_box_repeat_checked_4,
+    public static final int[] IMPORTANCE_REPEAT_RESOURCES_CHECKED = new int[]{
+            R.drawable.check_box_repeat_checked_1,
+            R.drawable.check_box_repeat_checked_2,
+            R.drawable.check_box_repeat_checked_3,
+            R.drawable.check_box_repeat_checked_4,
     };
 
     private static final Drawable[] IMPORTANCE_DRAWABLES = new Drawable[IMPORTANCE_RESOURCES.length];
@@ -206,7 +207,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
     protected TaskService taskService;
 
     public static int APPLY_LISTENERS_PARENT = 0;
-    public static int APPLY_LISTENERS_ROW_BODY= 1;
+    public static int APPLY_LISTENERS_ROW_BODY = 1;
     public static int APPLY_LISTENERS_NONE = 2;
 
     protected final Context context;
@@ -243,18 +244,14 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
      * Constructor
      *
      * @param fragment
-     * @param resource
-     *            layout resource to inflate
-     * @param c
-     *            database cursor
-     * @param autoRequery
-     *            whether cursor is automatically re-queried on changes
-     * @param onCompletedTaskListener
-     *            task listener. can be null
+     * @param resource                layout resource to inflate
+     * @param c                       database cursor
+     * @param autoRequery             whether cursor is automatically re-queried on changes
+     * @param onCompletedTaskListener task listener. can be null
      */
     public TaskAdapter(TaskListFragment fragment, int resource,
-            Cursor c, AtomicReference<String> query, boolean autoRequery,
-            OnCompletedTaskListener onCompletedTaskListener) {
+                       Cursor c, AtomicReference<String> query, boolean autoRequery,
+                       OnCompletedTaskListener onCompletedTaskListener) {
         super(ContextManager.getContext(), c, autoRequery);
         DependencyInjectionService.getInstance().inject(this);
 
@@ -351,27 +348,29 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
      * =========================================================== view setup
      * ====================================================================== */
 
-    /** Creates a new view for use in the list view */
+    /**
+     * Creates a new view for use in the list view
+     */
     @Override
     public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        ViewGroup view = (ViewGroup)inflater.inflate(resource, parent, false);
+        ViewGroup view = (ViewGroup) inflater.inflate(resource, parent, false);
 
         // create view holder
         ViewHolder viewHolder = new ViewHolder();
         viewHolder.task = new Task();
         viewHolder.view = view;
-        viewHolder.rowBody = (ViewGroup)view.findViewById(R.id.rowBody);
-        viewHolder.nameView = (TextView)view.findViewById(R.id.title);
-        viewHolder.picture = (AsyncImageView)view.findViewById(R.id.picture);
-        viewHolder.pictureBorder = (ImageView)view.findViewById(R.id.pictureBorder);
-        viewHolder.completeBox = (CheckableImageView)view.findViewById(R.id.completeBox);
-        viewHolder.dueDate = (TextView)view.findViewById(R.id.dueDate);
-        viewHolder.tagsView = (TextView)view.findViewById(R.id.tagsDisplay);
-        viewHolder.details1 = (TextView)view.findViewById(R.id.details1);
-        viewHolder.details2 = (TextView)view.findViewById(R.id.details2);
-        viewHolder.taskRow = (LinearLayout)view.findViewById(R.id.task_row);
+        viewHolder.rowBody = (ViewGroup) view.findViewById(R.id.rowBody);
+        viewHolder.nameView = (TextView) view.findViewById(R.id.title);
+        viewHolder.picture = (AsyncImageView) view.findViewById(R.id.picture);
+        viewHolder.pictureBorder = (ImageView) view.findViewById(R.id.pictureBorder);
+        viewHolder.completeBox = (CheckableImageView) view.findViewById(R.id.completeBox);
+        viewHolder.dueDate = (TextView) view.findViewById(R.id.dueDate);
+        viewHolder.tagsView = (TextView) view.findViewById(R.id.tagsDisplay);
+        viewHolder.details1 = (TextView) view.findViewById(R.id.details1);
+        viewHolder.details2 = (TextView) view.findViewById(R.id.details2);
+        viewHolder.taskRow = (LinearLayout) view.findViewById(R.id.task_row);
         viewHolder.taskActionContainer = view.findViewById(R.id.taskActionContainer);
-        viewHolder.taskActionIcon = (ImageView)view.findViewById(R.id.taskActionIcon);
+        viewHolder.taskActionIcon = (ImageView) view.findViewById(R.id.taskActionIcon);
 
         boolean showFullTaskTitle = Preferences.getBoolean(R.string.p_fullTaskTitle, false);
         boolean showNotes = Preferences.getBoolean(R.string.p_showNotes, false);
@@ -386,15 +385,15 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         }
 
         if (showNotes && !simpleLayout && !titleOnlyLayout) {
-            RelativeLayout.LayoutParams taskRowParams = (RelativeLayout.LayoutParams)viewHolder.taskRow.getLayoutParams();
+            RelativeLayout.LayoutParams taskRowParams = (RelativeLayout.LayoutParams) viewHolder.taskRow.getLayoutParams();
             taskRowParams.addRule(RelativeLayout.CENTER_VERTICAL, 0);
         }
 
 
         view.setTag(viewHolder);
-        for(int i = 0; i < view.getChildCount(); i++)
+        for (int i = 0; i < view.getChildCount(); i++)
             view.getChildAt(i).setTag(viewHolder);
-        if(viewHolder.details1 != null)
+        if (viewHolder.details1 != null)
             viewHolder.details1.setTag(viewHolder);
 
         // add UI component listeners
@@ -403,11 +402,13 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         return view;
     }
 
-    /** Populates a view with content */
+    /**
+     * Populates a view with content
+     */
     @Override
     public void bindView(View view, Context context, Cursor c) {
-        TodorooCursor<Task> cursor = (TodorooCursor<Task>)c;
-        ViewHolder viewHolder = ((ViewHolder)view.getTag());
+        TodorooCursor<Task> cursor = (TodorooCursor<Task>) c;
+        ViewHolder viewHolder = ((ViewHolder) view.getTag());
 
         if (!titleOnlyLayout) {
             viewHolder.tagsString = cursor.get(TAGS);
@@ -441,7 +442,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
      * View Holder saves a lot of findViewById lookups.
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     public static class ViewHolder {
         public Task task;
@@ -465,9 +465,11 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         public View[] decorations;
     }
 
-    /** Helper method to set the contents and visibility of each field */
+    /**
+     * Helper method to set the contents and visibility of each field
+     */
     public synchronized void setFieldContentsAndVisibility(View view) {
-        ViewHolder viewHolder = (ViewHolder)view.getTag();
+        ViewHolder viewHolder = (ViewHolder) view.getTag();
         Task task = viewHolder.task;
         if (fontSize < 16 || titleOnlyLayout) {
             viewHolder.rowBody.setMinimumHeight(0);
@@ -483,13 +485,14 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
             viewHolder.view.setBackgroundColor(readonlyBackground);
 
         // name
-        final TextView nameView = viewHolder.nameView; {
+        final TextView nameView = viewHolder.nameView;
+        {
             String nameValue = task.getValue(Task.TITLE);
 
             long hiddenUntil = task.getValue(Task.HIDE_UNTIL);
-            if(task.getValue(Task.DELETION_DATE) > 0)
+            if (task.getValue(Task.DELETION_DATE) > 0)
                 nameValue = resources.getString(R.string.TAd_deletedFormat, nameValue);
-            if(hiddenUntil > DateUtilities.now())
+            if (hiddenUntil > DateUtilities.now())
                 nameValue = resources.getString(R.string.TAd_hiddenFormat, nameValue);
             nameView.setText(nameValue);
         }
@@ -501,12 +504,12 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         float dueDateTextWidth = setupDueDateAndTags(viewHolder, task);
 
         String details;
-        if(viewHolder.details1 != null) {
-            if(taskDetailLoader.containsKey(task.getId()))
+        if (viewHolder.details1 != null) {
+            if (taskDetailLoader.containsKey(task.getId()))
                 details = taskDetailLoader.get(task.getId()).toString();
             else
                 details = task.getValue(Task.DETAILS);
-            if(TextUtils.isEmpty(details) || DETAIL_SEPARATOR.equals(details) || task.isCompleted()) {
+            if (TextUtils.isEmpty(details) || DETAIL_SEPARATOR.equals(details) || task.isCompleted()) {
                 viewHolder.details1.setVisibility(View.GONE);
                 viewHolder.details2.setVisibility(View.GONE);
             } else if (Preferences.getBoolean(R.string.p_showNotes, false)) {
@@ -514,7 +517,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
                 if (details.startsWith(DETAIL_SEPARATOR)) {
                     StringBuffer buffer = new StringBuffer(details);
                     int length = DETAIL_SEPARATOR.length();
-                    while(buffer.lastIndexOf(DETAIL_SEPARATOR, length) == 0)
+                    while (buffer.lastIndexOf(DETAIL_SEPARATOR, length) == 0)
                         buffer.delete(0, length);
                     details = buffer.toString(); //details.substring(DETAIL_SEPARATOR.length());
                 }
@@ -536,7 +539,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
             }
         }
 
-        if(Math.abs(DateUtilities.now() - task.getValue(Task.MODIFICATION_DATE)) < 2000L)
+        if (Math.abs(DateUtilities.now() - task.getValue(Task.MODIFICATION_DATE)) < 2000L)
             mostRecentlyMade = task.getId();
 
     }
@@ -563,17 +566,17 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         viewHolder.completeBox.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
         rightWidth = rightWidth + viewHolder.dueDate.getPaddingRight();
         float left = viewHolder.completeBox.getMeasuredWidth() +
-        ((MarginLayoutParams)viewHolder.completeBox.getLayoutParams()).leftMargin;
+                ((MarginLayoutParams) viewHolder.completeBox.getLayoutParams()).leftMargin;
         int availableWidth = (int) (displayMetrics.widthPixels - left - (rightWidth + 16) * displayMetrics.density);
 
         int i = 0;
-        for(; i < splitDetails.length; i++) {
+        for (; i < splitDetails.length; i++) {
             Spanned spanned = convertToHtml(splitDetails[i] + "  ", detailImageGetter, null);
             prospective.insert(prospective.length(), spanned);
             viewHolder.details1.setText(prospective);
             viewHolder.details1.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
 
-            if(rightWidth > 0 && viewHolder.details1.getMeasuredWidth() > availableWidth)
+            if (rightWidth > 0 && viewHolder.details1.getMeasuredWidth() > availableWidth)
                 break;
 
             actual.insert(actual.length(), spanned);
@@ -581,14 +584,14 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         viewHolder.details1.setText(actual);
         actual.clear();
 
-        if(i >= splitDetails.length) {
+        if (i >= splitDetails.length) {
             viewHolder.details2.setVisibility(View.GONE);
             return;
         } else {
             viewHolder.details2.setVisibility(View.VISIBLE);
         }
 
-        for(; i < splitDetails.length; i++)
+        for (; i < splitDetails.length; i++)
             actual.insert(actual.length(), convertToHtml(splitDetails[i] + "  ", detailImageGetter, null));
         viewHolder.details2.setText(actual);
     }
@@ -602,7 +605,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
      * created.
      */
     protected void addListeners(final View container) {
-        final ViewHolder viewHolder = (ViewHolder)container.getTag();
+        final ViewHolder viewHolder = (ViewHolder) container.getTag();
 
         // check box listener
         OnTouchListener otl = new OnTouchListener() {
@@ -698,7 +701,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
     private final HashMap<String, Spanned> htmlCache = new HashMap<String, Spanned>(8);
 
     private Spanned convertToHtml(String string, ImageGetter imageGetter, TagHandler tagHandler) {
-        if(!htmlCache.containsKey(string)) {
+        if (!htmlCache.containsKey(string)) {
             Spanned html;
             try {
                 html = Html.fromHtml(string, imageGetter, tagHandler);
@@ -715,12 +718,12 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
 
     @SuppressWarnings("nls")
     private String formatDate(long date) {
-        if(dateCache.containsKey(date))
+        if (dateCache.containsKey(date))
             return dateCache.get(date);
 
         String formatString = "%s" + (simpleLayout ? " " : "\n") + "%s";
         String string = DateUtilities.getRelativeDay(fragment.getActivity(), date);
-        if(Task.hasDueTime(date))
+        if (Task.hasDueTime(date))
             string = String.format(formatString, string, //$NON-NLS-1$
                     DateUtilities.getTimeString(fragment.getActivity(), new Date(date)));
 
@@ -746,23 +749,23 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
 
                 Task task = new Task();
 
-                for(fetchCursor.moveToFirst(); !fetchCursor.isAfterLast(); fetchCursor.moveToNext()) {
+                for (fetchCursor.moveToFirst(); !fetchCursor.isAfterLast(); fetchCursor.moveToNext()) {
                     task.clear();
                     task.readFromCursor(fetchCursor);
-                    if(task.isCompleted())
+                    if (task.isCompleted())
                         continue;
 
-                    if(detailsAreRecentAndUpToDate(task)) {
+                    if (detailsAreRecentAndUpToDate(task)) {
                         // even if we are up to date, randomly load a fraction
-                        if(random.nextFloat() < 0.1) {
+                        if (random.nextFloat() < 0.1) {
                             taskDetailLoader.put(task.getId(),
                                     new StringBuilder(task.getValue(Task.DETAILS)));
                             requestNewDetails(task);
-                            if(Constants.DEBUG)
+                            if (Constants.DEBUG)
                                 System.err.println("Refreshing details: " + task.getId()); //$NON-NLS-1$
                         }
                         continue;
-                    } else if(Constants.DEBUG) {
+                    } else if (Constants.DEBUG) {
                         System.err.println("Forced loading of details: " + task.getId() + //$NON-NLS-1$
                                 "\n  details: " + new Date(task.getValue(Task.DETAILS_DATE)) + //$NON-NLS-1$
                                 "\n  modified: " + new Date(task.getValue(Task.MODIFICATION_DATE))); //$NON-NLS-1$
@@ -775,7 +778,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
 
                     requestNewDetails(task);
                 }
-                if(taskDetailLoader.size() > 0) {
+                if (taskDetailLoader.size() > 0) {
                     Activity activity = fragment.getActivity();
                     if (activity != null) {
                         activity.runOnUiThread(new Runnable() {
@@ -795,7 +798,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
 
         private boolean detailsAreRecentAndUpToDate(Task task) {
             return task.getValue(Task.DETAILS_DATE) >= task.getValue(Task.MODIFICATION_DATE) &&
-            !TextUtils.isEmpty(task.getValue(Task.DETAILS));
+                    !TextUtils.isEmpty(task.getValue(Task.DETAILS));
         }
 
         private void addTaskToLoadingArray(Task task) {
@@ -820,12 +823,12 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
      */
     public void addDetails(long id, String detail) {
         final StringBuilder details = taskDetailLoader.get(id);
-        if(details == null)
+        if (details == null)
             return;
-        synchronized(details) {
-            if(details.toString().contains(detail))
+        synchronized (details) {
+            if (details.toString().contains(detail))
                 return;
-            if(details.length() > 0)
+            if (details.length() > 0)
                 details.append(DETAIL_SEPARATOR);
             details.append(detail);
             Task task = new Task();
@@ -848,27 +851,28 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
 
     private final ImageGetter detailImageGetter = new ImageGetter() {
         private final HashMap<Integer, Drawable> cache =
-            new HashMap<Integer, Drawable>(3);
+                new HashMap<Integer, Drawable>(3);
+
         @SuppressWarnings("nls")
         public Drawable getDrawable(String source) {
             int drawable = 0;
-            if(source.equals("silk_clock"))
+            if (source.equals("silk_clock"))
                 drawable = R.drawable.details_alarm;
-            else if(source.equals("silk_tag_pink"))
+            else if (source.equals("silk_tag_pink"))
                 drawable = R.drawable.details_tag;
-            else if(source.equals("silk_date"))
+            else if (source.equals("silk_date"))
                 drawable = R.drawable.details_repeat;
-            else if(source.equals("silk_note"))
+            else if (source.equals("silk_note"))
                 drawable = R.drawable.details_note;
 
             if (drawable == 0)
                 drawable = resources.getIdentifier("drawable/" + source, null, Constants.PACKAGE);
-            if(drawable == 0)
+            if (drawable == 0)
                 return null;
             Drawable d;
-            if(!cache.containsKey(drawable)) {
+            if (!cache.containsKey(drawable)) {
                 d = resources.getDrawable(drawable);
-                d.setBounds(0,0,d.getIntrinsicWidth(),d.getIntrinsicHeight());
+                d.setBounds(0, 0, d.getIntrinsicWidth(), d.getIntrinsicHeight());
                 cache.put(drawable, d);
             } else
                 d = cache.get(drawable);
@@ -898,7 +902,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
      * AddOnManager for TaskDecorations
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     public class DecorationManager extends TaskAdapterAddOnManager<TaskDecoration> {
 
@@ -906,13 +909,14 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
             super(fragment);
         }
 
-        private final TaskDecorationExposer[] exposers = new TaskDecorationExposer[] {
+        private final TaskDecorationExposer[] exposers = new TaskDecorationExposer[]{
                 new TimerDecorationExposer(),
                 new NotesDecorationExposer()
         };
 
         /**
          * Request add-ons for the given task
+         *
          * @return true if cache miss, false if cache hit
          */
         @Override
@@ -920,7 +924,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
             long taskId = viewHolder.task.getId();
 
             Collection<TaskDecoration> list = initialize(taskId);
-            if(list != null) {
+            if (list != null) {
                 draw(viewHolder, taskId, list);
                 return false;
             }
@@ -928,9 +932,9 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
             // request details
             draw(viewHolder, taskId, get(taskId));
 
-            for(TaskDecorationExposer exposer : exposers) {
+            for (TaskDecorationExposer exposer : exposers) {
                 TaskDecoration deco = exposer.expose(viewHolder.task);
-                if(deco != null) {
+                if (deco != null) {
                     addNew(viewHolder.task.getId(), exposer.getAddon(), deco, viewHolder);
                 }
             }
@@ -940,37 +944,37 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
 
         @Override
         protected void draw(ViewHolder viewHolder, long taskId, Collection<TaskDecoration> decorations) {
-            if(decorations == null || viewHolder.task.getId() != taskId)
+            if (decorations == null || viewHolder.task.getId() != taskId)
                 return;
 
             reset(viewHolder, taskId);
-            if(decorations.size() == 0)
+            if (decorations.size() == 0)
                 return;
 
 
             int i = 0;
             boolean colorSet = false;
-            if(viewHolder.decorations == null || viewHolder.decorations.length != decorations.size())
+            if (viewHolder.decorations == null || viewHolder.decorations.length != decorations.size())
                 viewHolder.decorations = new View[decorations.size()];
-            for(TaskDecoration decoration : decorations) {
-                if(decoration.color != 0 && !colorSet) {
+            for (TaskDecoration decoration : decorations) {
+                if (decoration.color != 0 && !colorSet) {
                     colorSet = true;
                     viewHolder.view.setBackgroundColor(decoration.color);
                 }
-                if(decoration.decoration != null) {
+                if (decoration.decoration != null) {
                     View view = decoration.decoration.apply(fragment.getActivity(), viewHolder.taskRow);
                     viewHolder.decorations[i] = view;
-                    switch(decoration.position) {
-                    case TaskDecoration.POSITION_LEFT: {
-                        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(
-                                LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-                        params.addRule(RelativeLayout.BELOW, R.id.completeBox);
-                        view.setLayoutParams(params);
-                        viewHolder.rowBody.addView(view);
-                        break;
-                    }
-                    case TaskDecoration.POSITION_RIGHT:
-                        viewHolder.taskRow.addView(view, viewHolder.taskRow.getChildCount());
+                    switch (decoration.position) {
+                        case TaskDecoration.POSITION_LEFT: {
+                            RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(
+                                    LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+                            params.addRule(RelativeLayout.BELOW, R.id.completeBox);
+                            view.setLayoutParams(params);
+                            viewHolder.rowBody.addView(view);
+                            break;
+                        }
+                        case TaskDecoration.POSITION_RIGHT:
+                            viewHolder.taskRow.addView(view, viewHolder.taskRow.getChildCount());
                     }
                 }
                 i++;
@@ -979,14 +983,14 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
 
         @Override
         protected void reset(ViewHolder viewHolder, long taskId) {
-            if(viewHolder.decorations != null) {
-                for(View view : viewHolder.decorations) {
+            if (viewHolder.decorations != null) {
+                for (View view : viewHolder.decorations) {
                     viewHolder.rowBody.removeView(view);
                     viewHolder.taskRow.removeView(view);
                 }
                 viewHolder.decorations = null;
             }
-            if(viewHolder.task.getId() == mostRecentlyMade)
+            if (viewHolder.task.getId() == mostRecentlyMade)
                 viewHolder.view.setBackgroundColor(Color.argb(30, 150, 150, 150));
             else
                 viewHolder.view.setBackgroundResource(android.R.drawable.list_selector_background);
@@ -1015,7 +1019,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
             v.getLocationOnScreen(location);
             ViewHolder viewHolder = getTagFromCheckBox(v);
 
-            if(Math.abs(location[1] + lastTouchYRawY.getLeft() - lastTouchYRawY.getRight()) > 10) {
+            if (Math.abs(location[1] + lastTouchYRawY.getLeft() - lastTouchYRawY.getRight()) > 10) {
                 viewHolder.completeBox.setChecked(!viewHolder.completeBox.isChecked());
                 return;
             }
@@ -1032,15 +1036,15 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
     };
 
     protected ViewHolder getTagFromCheckBox(View v) {
-        return (ViewHolder)((View)v.getParent()).getTag();
+        return (ViewHolder) ((View) v.getParent()).getTag();
     }
 
     public class TaskRowListener implements OnClickListener {
         @Override
         public void onClick(View v) {
             // expand view (unless deleted)
-            final ViewHolder viewHolder = (ViewHolder)v.getTag();
-            if(viewHolder.task.isDeleted())
+            final ViewHolder viewHolder = (ViewHolder) v.getTag();
+            if (viewHolder.task.isDeleted())
                 return;
 
             long taskId = viewHolder.task.getId();
@@ -1052,14 +1056,15 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
      * Call me when the parent presses trackpad
      */
     public void onTrackpadPressed(View container) {
-        if(container == null)
+        if (container == null)
             return;
 
-        final CheckBox completeBox = ((CheckBox)container.findViewById(R.id.completeBox));
+        final CheckBox completeBox = ((CheckBox) container.findViewById(R.id.completeBox));
         completeBox.performClick();
     }
 
-    /** Helper method to adjust a tasks' appearance if the task is completed or
+    /**
+     * Helper method to adjust a tasks' appearance if the task is completed or
      * uncompleted.
      *
      * @param actionItem
@@ -1074,14 +1079,14 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
         Boolean value = completedItems.get(task.getUuid());
         if (value == null)
             value = completedItems.get(task.getId());
-        if(value != null) {
+        if (value != null) {
             task.setValue(Task.COMPLETION_DATE,
                     value ? DateUtilities.now() : 0);
         }
         boolean state = task.isCompleted();
 
         TextView name = viewHolder.nameView;
-        if(state) {
+        if (state) {
             name.setPaintFlags(name.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
             name.setTextAppearance(activity, R.style.TextAppearance_TAd_ItemTitle_Completed);
         } else {
@@ -1094,11 +1099,11 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
             setupDueDateAndTags(viewHolder, task);
 
             float detailTextSize = Math.max(10, fontSize * 14 / 20);
-            if(viewHolder.details1 != null)
+            if (viewHolder.details1 != null)
                 viewHolder.details1.setTextSize(detailTextSize);
-            if(viewHolder.details2 != null)
+            if (viewHolder.details2 != null)
                 viewHolder.details2.setTextSize(detailTextSize);
-            if(viewHolder.dueDate != null) {
+            if (viewHolder.dueDate != null) {
                 viewHolder.dueDate.setTextSize(detailTextSize);
                 if (simpleLayout)
                     viewHolder.dueDate.setTypeface(null, 0);
@@ -1111,9 +1116,10 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
             paint.setTextSize(detailTextSize);
 
             // image view
-            final AsyncImageView pictureView = viewHolder.picture; {
+            final AsyncImageView pictureView = viewHolder.picture;
+            {
                 if (pictureView != null) {
-                    if(Task.USER_ID_SELF.equals(task.getValue(Task.USER_ID))) {
+                    if (Task.USER_ID_SELF.equals(task.getValue(Task.USER_ID))) {
                         pictureView.setVisibility(View.GONE);
                         if (viewHolder.pictureBorder != null)
                             viewHolder.pictureBorder.setVisibility(View.GONE);
@@ -1147,10 +1153,11 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
     }
 
     private void setupCompleteBox(ViewHolder viewHolder) {
-     // complete box
+        // complete box
         final Task task = viewHolder.task;
         final AsyncImageView pictureView = viewHolder.picture;
-        final CheckableImageView checkBoxView = viewHolder.completeBox; {
+        final CheckableImageView checkBoxView = viewHolder.completeBox;
+        {
             boolean completed = task.isCompleted();
             checkBoxView.setChecked(completed);
             // disable checkbox if task is readonly
@@ -1190,12 +1197,13 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
     private float setupDueDateAndTags(ViewHolder viewHolder, Task task) {
         // due date / completion date
         float dueDateTextWidth = 0;
-        final TextView dueDateView = viewHolder.dueDate; {
+        final TextView dueDateView = viewHolder.dueDate;
+        {
             Activity activity = fragment.getActivity();
             if (activity != null) {
-                if(!task.isCompleted() && task.hasDueDate()) {
+                if (!task.isCompleted() && task.hasDueDate()) {
                     long dueDate = task.getValue(Task.DUE_DATE);
-                    if(task.isOverdue())
+                    if (task.isOverdue())
                         dueDateView.setTextAppearance(activity, R.style.TextAppearance_TAd_ItemDueDate_Overdue);
                     else
                         dueDateView.setTextAppearance(activity, R.style.TextAppearance_TAd_ItemDueDate);
@@ -1203,7 +1211,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
                     dueDateView.setText(dateValue);
                     dueDateTextWidth = paint.measureText(dateValue);
                     dueDateView.setVisibility(View.VISIBLE);
-                } else if(task.isCompleted()) {
+                } else if (task.isCompleted()) {
                     String dateValue = formatDate(task.getValue(Task.COMPLETION_DATE));
                     dueDateView.setText(resources.getString(R.string.TAd_completed, dateValue));
                     dueDateView.setTextAppearance(activity, R.style.TextAppearance_TAd_ItemDueDate_Completed);
@@ -1234,19 +1242,16 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
      * This method is called when user completes a task via check box or other
      * means
      *
-     * @param container
-     *            container for the action item
-     * @param newState
-     *            state that this task should be set to
-     * @param completeBox
-     *            the box that was clicked. can be null
+     * @param container   container for the action item
+     * @param newState    state that this task should be set to
+     * @param completeBox the box that was clicked. can be null
      */
     protected void completeTask(final Task task, final boolean newState) {
-        if(task == null)
+        if (task == null)
             return;
 
         if (newState != task.isCompleted()) {
-            if(onCompletedTaskListener != null)
+            if (onCompletedTaskListener != null)
                 onCompletedTaskListener.onCompletedTask(task, newState);
 
             completedItems.put(task.getUuid(), newState);
@@ -1256,10 +1261,11 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
 
     /**
      * Add a new listener
+     *
      * @param newListener
      */
     public void addOnCompletedTaskListener(final OnCompletedTaskListener newListener) {
-        if(this.onCompletedTaskListener == null)
+        if (this.onCompletedTaskListener == null)
             this.onCompletedTaskListener = newListener;
         else {
             final OnCompletedTaskListener old = this.onCompletedTaskListener;
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskListFragmentPagerAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskListFragmentPagerAdapter.java
index 52381bcb7..f615423ab 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskListFragmentPagerAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskListFragmentPagerAdapter.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.adapter;
 
-import java.util.HashMap;
-
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.support.v4.app.Fragment;
@@ -19,6 +17,8 @@ import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.api.FilterWithCustomIntent;
 import com.todoroo.astrid.subtasks.SubtasksHelper;
 
+import java.util.HashMap;
+
 public class TaskListFragmentPagerAdapter extends FragmentStatePagerAdapter implements FilterDataSourceChangedListener {
 
     private final HashMap<Integer, Fragment> positionToFragment;
@@ -51,6 +51,7 @@ public class TaskListFragmentPagerAdapter extends FragmentStatePagerAdapter impl
 
     /**
      * Lookup the fragment for the specified position
+     *
      * @param position
      * @return
      */
@@ -66,6 +67,7 @@ public class TaskListFragmentPagerAdapter extends FragmentStatePagerAdapter impl
     /**
      * Adds the specified filter to the data source if it doesn't exist,
      * returning the position of that filter regardless
+     *
      * @param filter
      * @return
      */
@@ -83,6 +85,7 @@ public class TaskListFragmentPagerAdapter extends FragmentStatePagerAdapter impl
 
     /**
      * Get the filter at the specified position
+     *
      * @param position
      * @return
      */
diff --git a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
index 11b032742..f05b0d369 100644
--- a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
@@ -5,19 +5,6 @@
  */
 package com.todoroo.astrid.adapter;
 
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -60,13 +47,25 @@ import com.todoroo.astrid.data.User;
 import com.todoroo.astrid.data.UserActivity;
 import com.todoroo.astrid.helper.AsyncImageView;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import edu.mit.mobile.android.imagecache.ImageCache;
 
 /**
  * Adapter for displaying a user's activity
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class UpdateAdapter extends CursorAdapter {
 
@@ -91,36 +90,36 @@ public class UpdateAdapter extends CursorAdapter {
     public static final StringProperty PADDING_PROPERTY = new StringProperty(null, "'0'"); //$NON-NLS-1$
 
     public static final Property<?>[] USER_PROPERTIES = {
-        USER_PICTURE,
-        USER_FIRST_NAME,
-        USER_LAST_NAME,
-        USER_NAME
+            USER_PICTURE,
+            USER_FIRST_NAME,
+            USER_LAST_NAME,
+            USER_NAME
     };
 
     public static final Property<?>[] USER_ACTIVITY_PROPERTIES = {
-        UserActivity.CREATED_AT,
-        UserActivity.UUID,
-        UserActivity.ACTION,
-        UserActivity.MESSAGE,
-        UserActivity.TARGET_ID,
-        UserActivity.TARGET_NAME,
-        UserActivity.PICTURE,
-        UserActivity.USER_UUID,
-        UserActivity.ID,
-        ACTIVITY_TYPE_PROPERTY,
+            UserActivity.CREATED_AT,
+            UserActivity.UUID,
+            UserActivity.ACTION,
+            UserActivity.MESSAGE,
+            UserActivity.TARGET_ID,
+            UserActivity.TARGET_NAME,
+            UserActivity.PICTURE,
+            UserActivity.USER_UUID,
+            UserActivity.ID,
+            ACTIVITY_TYPE_PROPERTY,
     };
 
     public static final Property<?>[] HISTORY_PROPERTIES = {
-        History.CREATED_AT,
-        History.USER_UUID,
-        History.COLUMN,
-        History.TABLE_ID,
-        History.OLD_VALUE,
-        History.NEW_VALUE,
-        History.TASK,
-        History.USER_UUID,
-        History.ID,
-        HISTORY_TYPE_PROPERTY,
+            History.CREATED_AT,
+            History.USER_UUID,
+            History.COLUMN,
+            History.TABLE_ID,
+            History.OLD_VALUE,
+            History.NEW_VALUE,
+            History.TASK,
+            History.USER_UUID,
+            History.ID,
+            HISTORY_TYPE_PROPERTY,
     };
 
 
@@ -143,18 +142,14 @@ public class UpdateAdapter extends CursorAdapter {
      * Constructor
      *
      * @param activity
-     * @param resource
-     *            layout resource to inflate
-     * @param c
-     *            database cursor
-     * @param autoRequery
-     *            whether cursor is automatically re-queried on changes
-     * @param onCompletedTaskListener
-     *            goal listener. can be null
+     * @param resource                layout resource to inflate
+     * @param c                       database cursor
+     * @param autoRequery             whether cursor is automatically re-queried on changes
+     * @param onCompletedTaskListener goal listener. can be null
      */
     public UpdateAdapter(Fragment fragment, int resource,
-            Cursor c, boolean autoRequery,
-            String fromView) {
+                         Cursor c, boolean autoRequery,
+                         String fromView) {
         super(fragment.getActivity(), c, autoRequery);
         DependencyInjectionService.getInstance().inject(this);
 
@@ -209,10 +204,12 @@ public class UpdateAdapter extends CursorAdapter {
         public History history = new History();
     }
 
-    /** Creates a new view for use in the list view */
+    /**
+     * Creates a new view for use in the list view
+     */
     @Override
     public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        ViewGroup view = (ViewGroup)inflater.inflate(resource, parent, false);
+        ViewGroup view = (ViewGroup) inflater.inflate(resource, parent, false);
 
         view.setTag(new ModelHolder());
 
@@ -222,10 +219,12 @@ public class UpdateAdapter extends CursorAdapter {
         return view;
     }
 
-    /** Populates a view with content */
+    /**
+     * Populates a view with content
+     */
     @Override
     public void bindView(View view, Context context, Cursor c) {
-        TodorooCursor<UserActivity> cursor = (TodorooCursor<UserActivity>)c;
+        TodorooCursor<UserActivity> cursor = (TodorooCursor<UserActivity>) c;
         ModelHolder mh = ((ModelHolder) view.getTag());
 
         String type = cursor.getString(TYPE_PROPERTY_INDEX);
@@ -284,7 +283,9 @@ public class UpdateAdapter extends CursorAdapter {
 
     }
 
-    /** Helper method to set the contents and visibility of each field */
+    /**
+     * Helper method to set the contents and visibility of each field
+     */
     public synchronized void setFieldContentsAndVisibility(View view, UserActivity activity, User user, History history, String type) {
         // picture
         if (NameMaps.TABLE_ID_USER_ACTIVITY.equals(type)) {
@@ -296,7 +297,8 @@ public class UpdateAdapter extends CursorAdapter {
     }
 
     private void setupUserActivityRow(View view, UserActivity activity, User user) {
-        final AsyncImageView pictureView = (AsyncImageView)view.findViewById(R.id.picture); {
+        final AsyncImageView pictureView = (AsyncImageView) view.findViewById(R.id.picture);
+        {
             if (user.containsNonNullValue(USER_PICTURE)) {
                 String pictureUrl = user.getPictureUrl(USER_PICTURE, RemoteModel.PICTURE_THUMB);
                 pictureView.setUrl(pictureUrl);
@@ -306,7 +308,8 @@ public class UpdateAdapter extends CursorAdapter {
             pictureView.setVisibility(View.VISIBLE);
         }
 
-        final AsyncImageView commentPictureView = (AsyncImageView)view.findViewById(R.id.comment_picture); {
+        final AsyncImageView commentPictureView = (AsyncImageView) view.findViewById(R.id.comment_picture);
+        {
             String pictureThumb = activity.getPictureUrl(UserActivity.PICTURE, RemoteModel.PICTURE_MEDIUM);
             String pictureFull = activity.getPictureUrl(UserActivity.PICTURE, RemoteModel.PICTURE_LARGE);
             Bitmap updateBitmap = null;
@@ -317,15 +320,17 @@ public class UpdateAdapter extends CursorAdapter {
         }
 
         // name
-        final TextView nameView = (TextView)view.findViewById(R.id.title); {
-            nameView.setText(getUpdateComment((AstridActivity)fragment.getActivity(), activity, user, linkColor, fromView));
+        final TextView nameView = (TextView) view.findViewById(R.id.title);
+        {
+            nameView.setText(getUpdateComment((AstridActivity) fragment.getActivity(), activity, user, linkColor, fromView));
             nameView.setMovementMethod(new LinkMovementMethod());
             nameView.setTextColor(color);
         }
 
 
         // date
-        final TextView date = (TextView)view.findViewById(R.id.date); {
+        final TextView date = (TextView) view.findViewById(R.id.date);
+        {
             CharSequence dateString = DateUtils.getRelativeTimeSpanString(activity.getValue(UserActivity.CREATED_AT),
                     DateUtilities.now(), DateUtils.MINUTE_IN_MILLIS,
                     DateUtils.FORMAT_ABBREV_RELATIVE);
@@ -334,7 +339,8 @@ public class UpdateAdapter extends CursorAdapter {
     }
 
     private void setupHistoryRow(View view, History history, User user) {
-        final AsyncImageView pictureView = (AsyncImageView)view.findViewById(R.id.picture); {
+        final AsyncImageView pictureView = (AsyncImageView) view.findViewById(R.id.picture);
+        {
             if (user.containsNonNullValue(USER_PICTURE)) {
                 String pictureUrl = user.getPictureUrl(USER_PICTURE, RemoteModel.PICTURE_THUMB);
                 pictureView.setUrl(pictureUrl);
@@ -344,15 +350,17 @@ public class UpdateAdapter extends CursorAdapter {
             pictureView.setVisibility(View.VISIBLE);
         }
 
-        final AsyncImageView commentPictureView = (AsyncImageView)view.findViewById(R.id.comment_picture);
+        final AsyncImageView commentPictureView = (AsyncImageView) view.findViewById(R.id.comment_picture);
         commentPictureView.setVisibility(View.GONE);
 
-        final TextView nameView = (TextView)view.findViewById(R.id.title); {
+        final TextView nameView = (TextView) view.findViewById(R.id.title);
+        {
             nameView.setText(getHistoryComment((AstridActivity) fragment.getActivity(), history, user, linkColor, fromView));
             nameView.setTextColor(grayColor);
         }
 
-        final TextView date = (TextView)view.findViewById(R.id.date); {
+        final TextView date = (TextView) view.findViewById(R.id.date);
+        {
             CharSequence dateString = DateUtils.getRelativeTimeSpanString(history.getValue(History.CREATED_AT),
                     DateUtilities.now(), DateUtils.MINUTE_IN_MILLIS,
                     DateUtils.FORMAT_ABBREV_RELATIVE);
@@ -366,7 +374,7 @@ public class UpdateAdapter extends CursorAdapter {
     }
 
     public static void setupImagePopupForCommentView(View view, AsyncImageView commentPictureView, final String pictureThumb, final String pictureFull, final Bitmap updateBitmap,
-            final String message, final Fragment fragment, ImageCache imageCache) {
+                                                     final String message, final Fragment fragment, ImageCache imageCache) {
         if ((!TextUtils.isEmpty(pictureThumb) && !"null".equals(pictureThumb)) || updateBitmap != null) { //$NON-NLS-1$
             commentPictureView.setVisibility(View.VISIBLE);
             if (updateBitmap != null)
@@ -380,7 +388,7 @@ public class UpdateAdapter extends CursorAdapter {
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
-            }  else if (updateBitmap == null) {
+            } else if (updateBitmap == null) {
                 commentPictureView.setUrl(pictureThumb);
             }
 
@@ -412,7 +420,7 @@ public class UpdateAdapter extends CursorAdapter {
         }
     }
 
-    public static String linkify (String string, String linkColor) {
+    public static String linkify(String string, String linkColor) {
         return String.format("<font color=%s>%s</font>", linkColor, string);  //$NON-NLS-1$
     }
 
@@ -697,6 +705,7 @@ public class UpdateAdapter extends CursorAdapter {
     }
 
     private static final HashMap<String, Integer> INTERVAL_LABELS = new HashMap<String, Integer>();
+
     static {
         INTERVAL_LABELS.put("DAILY", R.string.repeat_days); //$NON-NLS-1$
         INTERVAL_LABELS.put("WEEKDAYS", R.string.repeat_weekdays); //$NON-NLS-1$
@@ -708,7 +717,7 @@ public class UpdateAdapter extends CursorAdapter {
     }
 
     @SuppressWarnings("nls")
-    private static final String[] SORTED_WEEKDAYS = { "SU", "MO", "TU", "WE", "TH", "FR", "SA" };
+    private static final String[] SORTED_WEEKDAYS = {"SU", "MO", "TU", "WE", "TH", "FR", "SA"};
 
     @SuppressWarnings("nls")
     private static String getRepeatString(Context context, String value) {
@@ -811,7 +820,8 @@ public class UpdateAdapter extends CursorAdapter {
     }
 
     @SuppressWarnings("nls")
-    private static final String[] PRIORITY_STRINGS = { "!!!", "!!", "!", "o" };
+    private static final String[] PRIORITY_STRINGS = {"!!!", "!!", "!", "o"};
+
     private static String priorityString(int priority) {
         return PRIORITY_STRINGS[priority];
     }
diff --git a/astrid/src/com/todoroo/astrid/api/TaskContextActionExposer.java b/astrid/src/com/todoroo/astrid/api/TaskContextActionExposer.java
index 4f3b20371..2f5fb0b15 100644
--- a/astrid/src/com/todoroo/astrid/api/TaskContextActionExposer.java
+++ b/astrid/src/com/todoroo/astrid/api/TaskContextActionExposer.java
@@ -10,17 +10,16 @@ import com.todoroo.astrid.data.Task;
 
 /**
  * API for exposing context menu items associated with a task.
- *
+ * <p/>
  * Due to the limitations of the Android platform, this is currently
  * internal-use only, though if it can be done well, I would be open to creating
  * an external API. Internal API for exposing task decorations
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public interface TaskContextActionExposer {
 
-    public class TaskContextAction{
+    public class TaskContextAction {
         public int labelResource;
         public Runnable action;
 
@@ -33,14 +32,15 @@ public interface TaskContextActionExposer {
 
     /**
      * Expose context menu item label, or null if item should not be shown
-     * @param task
      *
+     * @param task
      * @return null if no item should be displayed, or string or id
      */
     public Object getLabel(Task task);
 
     /**
      * Call context menu action
+     *
      * @param task
      */
     public void invoke(Task task);
diff --git a/astrid/src/com/todoroo/astrid/api/TaskDecorationExposer.java b/astrid/src/com/todoroo/astrid/api/TaskDecorationExposer.java
index a97a32c9c..8a952706f 100644
--- a/astrid/src/com/todoroo/astrid/api/TaskDecorationExposer.java
+++ b/astrid/src/com/todoroo/astrid/api/TaskDecorationExposer.java
@@ -9,20 +9,19 @@ import com.todoroo.astrid.data.Task;
 
 /**
  * API for exposing decorations displayed in the task list.
- *
+ * <p/>
  * Due to the limitations of the Android platform, this is currently
  * internal-use only, though if it can be done well, I would be open to creating
  * an external API.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public interface TaskDecorationExposer {
 
     /**
      * Expose task decorations for the given task
-     * @param task
      *
+     * @param task
      * @return null if no decorations, or decoration
      */
     public TaskDecoration expose(Task task);
diff --git a/astrid/src/com/todoroo/astrid/billing/AstridPurchaseObserver.java b/astrid/src/com/todoroo/astrid/billing/AstridPurchaseObserver.java
index aa605914a..5e3adcdf1 100644
--- a/astrid/src/com/todoroo/astrid/billing/AstridPurchaseObserver.java
+++ b/astrid/src/com/todoroo/astrid/billing/AstridPurchaseObserver.java
@@ -70,7 +70,7 @@ public abstract class AstridPurchaseObserver extends PurchaseObserver {
 
     @Override
     public void onPurchaseStateChange(PurchaseState purchaseState, final String itemId,
-            int quantity, long purchaseTime, String developerPayload, final String purchaseToken) {
+                                      int quantity, long purchaseTime, String developerPayload, final String purchaseToken) {
         if (BillingConstants.DEBUG) {
             Log.i(TAG, "onPurchaseStateChange() itemId: " + itemId + " " + purchaseState);
         }
@@ -85,50 +85,51 @@ public abstract class AstridPurchaseObserver extends PurchaseObserver {
                     Preferences.setBoolean(ActFmPreferenceService.PREF_LOCAL_PREMIUM, true);
                     if (actFmPreferenceService.isLoggedIn()) {
                         actFmSyncService.updateUserSubscriptionStatus(new Runnable() {
-                            @Override
-                            public void run() { // On Success
-                                Preferences.setBoolean(ActFmPreferenceService.PREF_PREMIUM, true);
-                                mActivity.runOnUiThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        DialogUtilities.okDialog(mActivity, mActivity.getString(R.string.DLG_information_title),
-                                                0, mActivity.getString(R.string.premium_success), new DialogInterface.OnClickListener() {
-                                                    @Override
-                                                    public void onClick(DialogInterface dialog, int which) {
-                                                        mActivity.finish();
-                                                    }
-                                                });
-                                    }
-                                });
-                            }
-                        }, new Runnable() { // On Recoverable error
-                            @Override
-                            public void run() {
-                                mActivity.runOnUiThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        DialogUtilities.okDialog(mActivity, mActivity.getString(R.string.DLG_information_title),
-                                                0, mActivity.getString(R.string.premium_success_with_server_error), new DialogInterface.OnClickListener() {
-                                                    @Override
-                                                    public void onClick(DialogInterface dialog, int which) {
-                                                        mActivity.finish();
-                                                    }
-                                                });
-                                    }
-                                });
-                            }
-                        }, new Runnable() { // On invalid token
-                            @Override
-                            public void run() {
-                                DialogUtilities.okDialog(mActivity, mActivity.getString(R.string.DLG_information_title),
-                                        0, mActivity.getString(R.string.premium_verification_error), new DialogInterface.OnClickListener() {
-                                    @Override
-                                    public void onClick(DialogInterface dialog, int which) {
-                                        mActivity.finish();
-                                    }
-                                });
-                            }
-                        });
+                                                                          @Override
+                                                                          public void run() { // On Success
+                                                                              Preferences.setBoolean(ActFmPreferenceService.PREF_PREMIUM, true);
+                                                                              mActivity.runOnUiThread(new Runnable() {
+                                                                                  @Override
+                                                                                  public void run() {
+                                                                                      DialogUtilities.okDialog(mActivity, mActivity.getString(R.string.DLG_information_title),
+                                                                                              0, mActivity.getString(R.string.premium_success), new DialogInterface.OnClickListener() {
+                                                                                          @Override
+                                                                                          public void onClick(DialogInterface dialog, int which) {
+                                                                                              mActivity.finish();
+                                                                                          }
+                                                                                      });
+                                                                                  }
+                                                                              });
+                                                                          }
+                                                                      }, new Runnable() { // On Recoverable error
+                                                                          @Override
+                                                                          public void run() {
+                                                                              mActivity.runOnUiThread(new Runnable() {
+                                                                                  @Override
+                                                                                  public void run() {
+                                                                                      DialogUtilities.okDialog(mActivity, mActivity.getString(R.string.DLG_information_title),
+                                                                                              0, mActivity.getString(R.string.premium_success_with_server_error), new DialogInterface.OnClickListener() {
+                                                                                          @Override
+                                                                                          public void onClick(DialogInterface dialog, int which) {
+                                                                                              mActivity.finish();
+                                                                                          }
+                                                                                      });
+                                                                                  }
+                                                                              });
+                                                                          }
+                                                                      }, new Runnable() { // On invalid token
+                                                                          @Override
+                                                                          public void run() {
+                                                                              DialogUtilities.okDialog(mActivity, mActivity.getString(R.string.DLG_information_title),
+                                                                                      0, mActivity.getString(R.string.premium_verification_error), new DialogInterface.OnClickListener() {
+                                                                                  @Override
+                                                                                  public void onClick(DialogInterface dialog, int which) {
+                                                                                      mActivity.finish();
+                                                                                  }
+                                                                              });
+                                                                          }
+                                                                      }
+                        );
                     } else {
                         Preferences.setBoolean(BillingConstants.PREF_NEEDS_SERVER_UPDATE, true);
                     }
@@ -148,7 +149,7 @@ public abstract class AstridPurchaseObserver extends PurchaseObserver {
 
     @Override
     public void onRequestPurchaseResponse(RequestPurchase request,
-            ResponseCode responseCode) {
+                                          ResponseCode responseCode) {
         if (BillingConstants.DEBUG) {
             Log.d(TAG, request.mProductId + ": " + responseCode);
         }
@@ -169,7 +170,7 @@ public abstract class AstridPurchaseObserver extends PurchaseObserver {
 
     @Override
     public void onRestoreTransactionsResponse(RestoreTransactions request,
-            ResponseCode responseCode) {
+                                              ResponseCode responseCode) {
         if (responseCode == ResponseCode.RESULT_OK) {
             if (BillingConstants.DEBUG) {
                 Log.d(TAG, "completed RestoreTransactions request");
diff --git a/astrid/src/com/todoroo/astrid/billing/Base64.java b/astrid/src/com/todoroo/astrid/billing/Base64.java
index 077456611..96d18e29a 100644
--- a/astrid/src/com/todoroo/astrid/billing/Base64.java
+++ b/astrid/src/com/todoroo/astrid/billing/Base64.java
@@ -34,84 +34,92 @@ package com.todoroo.astrid.billing;
 /**
  * Base64 converter class. This code is not a complete MIME encoder;
  * it simply converts binary data to base64 data and back.
- *
+ * <p/>
  * <p>Note {@link CharBase64} is a GWT-compatible implementation of this
  * class.
  */
 public class Base64 {
-  /** Specify encoding (value is {@code true}). */
-  public final static boolean ENCODE = true;
-
-  /** Specify decoding (value is {@code false}). */
-  public final static boolean DECODE = false;
-
-  /** The equals sign (=) as a byte. */
-  private final static byte EQUALS_SIGN = (byte) '=';
-
-  /** The new line character (\n) as a byte. */
-  private final static byte NEW_LINE = (byte) '\n';
-
-  /**
-   * The 64 valid Base64 values.
-   */
-  private final static byte[] ALPHABET =
-      {(byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F',
-          (byte) 'G', (byte) 'H', (byte) 'I', (byte) 'J', (byte) 'K',
-          (byte) 'L', (byte) 'M', (byte) 'N', (byte) 'O', (byte) 'P',
-          (byte) 'Q', (byte) 'R', (byte) 'S', (byte) 'T', (byte) 'U',
-          (byte) 'V', (byte) 'W', (byte) 'X', (byte) 'Y', (byte) 'Z',
-          (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e',
-          (byte) 'f', (byte) 'g', (byte) 'h', (byte) 'i', (byte) 'j',
-          (byte) 'k', (byte) 'l', (byte) 'm', (byte) 'n', (byte) 'o',
-          (byte) 'p', (byte) 'q', (byte) 'r', (byte) 's', (byte) 't',
-          (byte) 'u', (byte) 'v', (byte) 'w', (byte) 'x', (byte) 'y',
-          (byte) 'z', (byte) '0', (byte) '1', (byte) '2', (byte) '3',
-          (byte) '4', (byte) '5', (byte) '6', (byte) '7', (byte) '8',
-          (byte) '9', (byte) '+', (byte) '/'};
-
-  /**
-   * The 64 valid web safe Base64 values.
-   */
-  private final static byte[] WEBSAFE_ALPHABET =
-      {(byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F',
-          (byte) 'G', (byte) 'H', (byte) 'I', (byte) 'J', (byte) 'K',
-          (byte) 'L', (byte) 'M', (byte) 'N', (byte) 'O', (byte) 'P',
-          (byte) 'Q', (byte) 'R', (byte) 'S', (byte) 'T', (byte) 'U',
-          (byte) 'V', (byte) 'W', (byte) 'X', (byte) 'Y', (byte) 'Z',
-          (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e',
-          (byte) 'f', (byte) 'g', (byte) 'h', (byte) 'i', (byte) 'j',
-          (byte) 'k', (byte) 'l', (byte) 'm', (byte) 'n', (byte) 'o',
-          (byte) 'p', (byte) 'q', (byte) 'r', (byte) 's', (byte) 't',
-          (byte) 'u', (byte) 'v', (byte) 'w', (byte) 'x', (byte) 'y',
-          (byte) 'z', (byte) '0', (byte) '1', (byte) '2', (byte) '3',
-          (byte) '4', (byte) '5', (byte) '6', (byte) '7', (byte) '8',
-          (byte) '9', (byte) '-', (byte) '_'};
-
-  /**
-   * Translates a Base64 value to either its 6-bit reconstruction value
-   * or a negative number indicating some other meaning.
-   **/
-  private final static byte[] DECODABET = {-9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal  0 -  8
-      -5, -5, // Whitespace: Tab and Linefeed
-      -9, -9, // Decimal 11 - 12
-      -5, // Whitespace: Carriage Return
-      -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 14 - 26
-      -9, -9, -9, -9, -9, // Decimal 27 - 31
-      -5, // Whitespace: Space
-      -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 33 - 42
-      62, // Plus sign at decimal 43
-      -9, -9, -9, // Decimal 44 - 46
-      63, // Slash at decimal 47
-      52, 53, 54, 55, 56, 57, 58, 59, 60, 61, // Numbers zero through nine
-      -9, -9, -9, // Decimal 58 - 60
-      -1, // Equals sign at decimal 61
-      -9, -9, -9, // Decimal 62 - 64
-      0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, // Letters 'A' through 'N'
-      14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, // Letters 'O' through 'Z'
-      -9, -9, -9, -9, -9, -9, // Decimal 91 - 96
-      26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, // Letters 'a' through 'm'
-      39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, // Letters 'n' through 'z'
-      -9, -9, -9, -9, -9 // Decimal 123 - 127
+    /**
+     * Specify encoding (value is {@code true}).
+     */
+    public final static boolean ENCODE = true;
+
+    /**
+     * Specify decoding (value is {@code false}).
+     */
+    public final static boolean DECODE = false;
+
+    /**
+     * The equals sign (=) as a byte.
+     */
+    private final static byte EQUALS_SIGN = (byte) '=';
+
+    /**
+     * The new line character (\n) as a byte.
+     */
+    private final static byte NEW_LINE = (byte) '\n';
+
+    /**
+     * The 64 valid Base64 values.
+     */
+    private final static byte[] ALPHABET =
+            {(byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F',
+                    (byte) 'G', (byte) 'H', (byte) 'I', (byte) 'J', (byte) 'K',
+                    (byte) 'L', (byte) 'M', (byte) 'N', (byte) 'O', (byte) 'P',
+                    (byte) 'Q', (byte) 'R', (byte) 'S', (byte) 'T', (byte) 'U',
+                    (byte) 'V', (byte) 'W', (byte) 'X', (byte) 'Y', (byte) 'Z',
+                    (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e',
+                    (byte) 'f', (byte) 'g', (byte) 'h', (byte) 'i', (byte) 'j',
+                    (byte) 'k', (byte) 'l', (byte) 'm', (byte) 'n', (byte) 'o',
+                    (byte) 'p', (byte) 'q', (byte) 'r', (byte) 's', (byte) 't',
+                    (byte) 'u', (byte) 'v', (byte) 'w', (byte) 'x', (byte) 'y',
+                    (byte) 'z', (byte) '0', (byte) '1', (byte) '2', (byte) '3',
+                    (byte) '4', (byte) '5', (byte) '6', (byte) '7', (byte) '8',
+                    (byte) '9', (byte) '+', (byte) '/'};
+
+    /**
+     * The 64 valid web safe Base64 values.
+     */
+    private final static byte[] WEBSAFE_ALPHABET =
+            {(byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F',
+                    (byte) 'G', (byte) 'H', (byte) 'I', (byte) 'J', (byte) 'K',
+                    (byte) 'L', (byte) 'M', (byte) 'N', (byte) 'O', (byte) 'P',
+                    (byte) 'Q', (byte) 'R', (byte) 'S', (byte) 'T', (byte) 'U',
+                    (byte) 'V', (byte) 'W', (byte) 'X', (byte) 'Y', (byte) 'Z',
+                    (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e',
+                    (byte) 'f', (byte) 'g', (byte) 'h', (byte) 'i', (byte) 'j',
+                    (byte) 'k', (byte) 'l', (byte) 'm', (byte) 'n', (byte) 'o',
+                    (byte) 'p', (byte) 'q', (byte) 'r', (byte) 's', (byte) 't',
+                    (byte) 'u', (byte) 'v', (byte) 'w', (byte) 'x', (byte) 'y',
+                    (byte) 'z', (byte) '0', (byte) '1', (byte) '2', (byte) '3',
+                    (byte) '4', (byte) '5', (byte) '6', (byte) '7', (byte) '8',
+                    (byte) '9', (byte) '-', (byte) '_'};
+
+    /**
+     * Translates a Base64 value to either its 6-bit reconstruction value
+     * or a negative number indicating some other meaning.
+     */
+    private final static byte[] DECODABET = {-9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal  0 -  8
+            -5, -5, // Whitespace: Tab and Linefeed
+            -9, -9, // Decimal 11 - 12
+            -5, // Whitespace: Carriage Return
+            -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 14 - 26
+            -9, -9, -9, -9, -9, // Decimal 27 - 31
+            -5, // Whitespace: Space
+            -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 33 - 42
+            62, // Plus sign at decimal 43
+            -9, -9, -9, // Decimal 44 - 46
+            63, // Slash at decimal 47
+            52, 53, 54, 55, 56, 57, 58, 59, 60, 61, // Numbers zero through nine
+            -9, -9, -9, // Decimal 58 - 60
+            -1, // Equals sign at decimal 61
+            -9, -9, -9, // Decimal 62 - 64
+            0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, // Letters 'A' through 'N'
+            14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, // Letters 'O' through 'Z'
+            -9, -9, -9, -9, -9, -9, // Decimal 91 - 96
+            26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, // Letters 'a' through 'm'
+            39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, // Letters 'n' through 'z'
+            -9, -9, -9, -9, -9 // Decimal 123 - 127
       /*  ,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 128 - 139
         -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 140 - 152
         -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 153 - 165
@@ -122,32 +130,34 @@ public class Base64 {
         -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 218 - 230
         -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 231 - 243
         -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9         // Decimal 244 - 255 */
-      };
-
-  /** The web safe decodabet */
-  private final static byte[] WEBSAFE_DECODABET =
-      {-9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal  0 -  8
-          -5, -5, // Whitespace: Tab and Linefeed
-          -9, -9, // Decimal 11 - 12
-          -5, // Whitespace: Carriage Return
-          -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 14 - 26
-          -9, -9, -9, -9, -9, // Decimal 27 - 31
-          -5, // Whitespace: Space
-          -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 33 - 44
-          62, // Dash '-' sign at decimal 45
-          -9, -9, // Decimal 46-47
-          52, 53, 54, 55, 56, 57, 58, 59, 60, 61, // Numbers zero through nine
-          -9, -9, -9, // Decimal 58 - 60
-          -1, // Equals sign at decimal 61
-          -9, -9, -9, // Decimal 62 - 64
-          0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, // Letters 'A' through 'N'
-          14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, // Letters 'O' through 'Z'
-          -9, -9, -9, -9, // Decimal 91-94
-          63, // Underscore '_' at decimal 95
-          -9, // Decimal 96
-          26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, // Letters 'a' through 'm'
-          39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, // Letters 'n' through 'z'
-          -9, -9, -9, -9, -9 // Decimal 123 - 127
+    };
+
+    /**
+     * The web safe decodabet
+     */
+    private final static byte[] WEBSAFE_DECODABET =
+            {-9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal  0 -  8
+                    -5, -5, // Whitespace: Tab and Linefeed
+                    -9, -9, // Decimal 11 - 12
+                    -5, // Whitespace: Carriage Return
+                    -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 14 - 26
+                    -9, -9, -9, -9, -9, // Decimal 27 - 31
+                    -5, // Whitespace: Space
+                    -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal 33 - 44
+                    62, // Dash '-' sign at decimal 45
+                    -9, -9, // Decimal 46-47
+                    52, 53, 54, 55, 56, 57, 58, 59, 60, 61, // Numbers zero through nine
+                    -9, -9, -9, // Decimal 58 - 60
+                    -1, // Equals sign at decimal 61
+                    -9, -9, -9, // Decimal 62 - 64
+                    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, // Letters 'A' through 'N'
+                    14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, // Letters 'O' through 'Z'
+                    -9, -9, -9, -9, // Decimal 91-94
+                    63, // Underscore '_' at decimal 95
+                    -9, // Decimal 96
+                    26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, // Letters 'a' through 'm'
+                    39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, // Letters 'n' through 'z'
+                    -9, -9, -9, -9, -9 // Decimal 123 - 127
       /*  ,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 128 - 139
         -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 140 - 152
         -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 153 - 165
@@ -158,414 +168,415 @@ public class Base64 {
         -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 218 - 230
         -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 231 - 243
         -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9         // Decimal 244 - 255 */
-      };
+            };
 
-  // Indicates white space in encoding
-  private final static byte WHITE_SPACE_ENC = -5;
-  // Indicates equals sign in encoding
-  private final static byte EQUALS_SIGN_ENC = -1;
+    // Indicates white space in encoding
+    private final static byte WHITE_SPACE_ENC = -5;
+    // Indicates equals sign in encoding
+    private final static byte EQUALS_SIGN_ENC = -1;
 
-  /** Defeats instantiation. */
-  private Base64() {
-  }
+    /**
+     * Defeats instantiation.
+     */
+    private Base64() {
+    }
 
   /* ********  E N C O D I N G   M E T H O D S  ******** */
 
-  /**
-   * Encodes up to three bytes of the array <var>source</var>
-   * and writes the resulting four Base64 bytes to <var>destination</var>.
-   * The source and destination arrays can be manipulated
-   * anywhere along their length by specifying
-   * <var>srcOffset</var> and <var>destOffset</var>.
-   * This method does not check to make sure your arrays
-   * are large enough to accommodate <var>srcOffset</var> + 3 for
-   * the <var>source</var> array or <var>destOffset</var> + 4 for
-   * the <var>destination</var> array.
-   * The actual number of significant bytes in your array is
-   * given by <var>numSigBytes</var>.
-   *
-   * @param source the array to convert
-   * @param srcOffset the index where conversion begins
-   * @param numSigBytes the number of significant bytes in your array
-   * @param destination the array to hold the conversion
-   * @param destOffset the index where output will be put
-   * @param alphabet is the encoding alphabet
-   * @return the <var>destination</var> array
-   * @since 1.3
-   */
-  private static byte[] encode3to4(byte[] source, int srcOffset,
-      int numSigBytes, byte[] destination, int destOffset, byte[] alphabet) {
-    //           1         2         3
-    // 01234567890123456789012345678901 Bit position
-    // --------000000001111111122222222 Array position from threeBytes
-    // --------|    ||    ||    ||    | Six bit groups to index alphabet
-    //          >>18  >>12  >> 6  >> 0  Right shift necessary
-    //                0x3f  0x3f  0x3f  Additional AND
-
-    // Create buffer with zero-padding if there are only one or two
-    // significant bytes passed in the array.
-    // We have to shift left 24 in order to flush out the 1's that appear
-    // when Java treats a value as negative that is cast from a byte to an int.
-    int inBuff =
-        (numSigBytes > 0 ? ((source[srcOffset] << 24) >>> 8) : 0)
-            | (numSigBytes > 1 ? ((source[srcOffset + 1] << 24) >>> 16) : 0)
-            | (numSigBytes > 2 ? ((source[srcOffset + 2] << 24) >>> 24) : 0);
-
-    switch (numSigBytes) {
-      case 3:
-        destination[destOffset] = alphabet[(inBuff >>> 18)];
-        destination[destOffset + 1] = alphabet[(inBuff >>> 12) & 0x3f];
-        destination[destOffset + 2] = alphabet[(inBuff >>> 6) & 0x3f];
-        destination[destOffset + 3] = alphabet[(inBuff) & 0x3f];
-        return destination;
-      case 2:
-        destination[destOffset] = alphabet[(inBuff >>> 18)];
-        destination[destOffset + 1] = alphabet[(inBuff >>> 12) & 0x3f];
-        destination[destOffset + 2] = alphabet[(inBuff >>> 6) & 0x3f];
-        destination[destOffset + 3] = EQUALS_SIGN;
-        return destination;
-      case 1:
-        destination[destOffset] = alphabet[(inBuff >>> 18)];
-        destination[destOffset + 1] = alphabet[(inBuff >>> 12) & 0x3f];
-        destination[destOffset + 2] = EQUALS_SIGN;
-        destination[destOffset + 3] = EQUALS_SIGN;
-        return destination;
-      default:
-        return destination;
-    } // end switch
-  } // end encode3to4
-
-  /**
-   * Encodes a byte array into Base64 notation.
-   * Equivalent to calling
-   * {@code encodeBytes(source, 0, source.length)}
-   *
-   * @param source The data to convert
-   * @since 1.4
-   */
-  public static String encode(byte[] source) {
-    return encode(source, 0, source.length, ALPHABET, true);
-  }
-
-  /**
-   * Encodes a byte array into web safe Base64 notation.
-   *
-   * @param source The data to convert
-   * @param doPadding is {@code true} to pad result with '=' chars
-   *        if it does not fall on 3 byte boundaries
-   */
-  public static String encodeWebSafe(byte[] source, boolean doPadding) {
-    return encode(source, 0, source.length, WEBSAFE_ALPHABET, doPadding);
-  }
-
-  /**
-   * Encodes a byte array into Base64 notation.
-   *
-   * @param source the data to convert
-   * @param off offset in array where conversion should begin
-   * @param len length of data to convert
-   * @param alphabet the encoding alphabet
-   * @param doPadding is {@code true} to pad result with '=' chars
-   * if it does not fall on 3 byte boundaries
-   * @since 1.4
-   */
-  public static String encode(byte[] source, int off, int len, byte[] alphabet,
-      boolean doPadding) {
-    byte[] outBuff = encode(source, off, len, alphabet, Integer.MAX_VALUE);
-    int outLen = outBuff.length;
-
-    // If doPadding is false, set length to truncate '='
-    // padding characters
-    while (doPadding == false && outLen > 0) {
-      if (outBuff[outLen - 1] != '=') {
-        break;
-      }
-      outLen -= 1;
+    /**
+     * Encodes up to three bytes of the array <var>source</var>
+     * and writes the resulting four Base64 bytes to <var>destination</var>.
+     * The source and destination arrays can be manipulated
+     * anywhere along their length by specifying
+     * <var>srcOffset</var> and <var>destOffset</var>.
+     * This method does not check to make sure your arrays
+     * are large enough to accommodate <var>srcOffset</var> + 3 for
+     * the <var>source</var> array or <var>destOffset</var> + 4 for
+     * the <var>destination</var> array.
+     * The actual number of significant bytes in your array is
+     * given by <var>numSigBytes</var>.
+     *
+     * @param source      the array to convert
+     * @param srcOffset   the index where conversion begins
+     * @param numSigBytes the number of significant bytes in your array
+     * @param destination the array to hold the conversion
+     * @param destOffset  the index where output will be put
+     * @param alphabet    is the encoding alphabet
+     * @return the <var>destination</var> array
+     * @since 1.3
+     */
+    private static byte[] encode3to4(byte[] source, int srcOffset,
+                                     int numSigBytes, byte[] destination, int destOffset, byte[] alphabet) {
+        //           1         2         3
+        // 01234567890123456789012345678901 Bit position
+        // --------000000001111111122222222 Array position from threeBytes
+        // --------|    ||    ||    ||    | Six bit groups to index alphabet
+        //          >>18  >>12  >> 6  >> 0  Right shift necessary
+        //                0x3f  0x3f  0x3f  Additional AND
+
+        // Create buffer with zero-padding if there are only one or two
+        // significant bytes passed in the array.
+        // We have to shift left 24 in order to flush out the 1's that appear
+        // when Java treats a value as negative that is cast from a byte to an int.
+        int inBuff =
+                (numSigBytes > 0 ? ((source[srcOffset] << 24) >>> 8) : 0)
+                        | (numSigBytes > 1 ? ((source[srcOffset + 1] << 24) >>> 16) : 0)
+                        | (numSigBytes > 2 ? ((source[srcOffset + 2] << 24) >>> 24) : 0);
+
+        switch (numSigBytes) {
+            case 3:
+                destination[destOffset] = alphabet[(inBuff >>> 18)];
+                destination[destOffset + 1] = alphabet[(inBuff >>> 12) & 0x3f];
+                destination[destOffset + 2] = alphabet[(inBuff >>> 6) & 0x3f];
+                destination[destOffset + 3] = alphabet[(inBuff) & 0x3f];
+                return destination;
+            case 2:
+                destination[destOffset] = alphabet[(inBuff >>> 18)];
+                destination[destOffset + 1] = alphabet[(inBuff >>> 12) & 0x3f];
+                destination[destOffset + 2] = alphabet[(inBuff >>> 6) & 0x3f];
+                destination[destOffset + 3] = EQUALS_SIGN;
+                return destination;
+            case 1:
+                destination[destOffset] = alphabet[(inBuff >>> 18)];
+                destination[destOffset + 1] = alphabet[(inBuff >>> 12) & 0x3f];
+                destination[destOffset + 2] = EQUALS_SIGN;
+                destination[destOffset + 3] = EQUALS_SIGN;
+                return destination;
+            default:
+                return destination;
+        } // end switch
+    } // end encode3to4
+
+    /**
+     * Encodes a byte array into Base64 notation.
+     * Equivalent to calling
+     * {@code encodeBytes(source, 0, source.length)}
+     *
+     * @param source The data to convert
+     * @since 1.4
+     */
+    public static String encode(byte[] source) {
+        return encode(source, 0, source.length, ALPHABET, true);
+    }
+
+    /**
+     * Encodes a byte array into web safe Base64 notation.
+     *
+     * @param source    The data to convert
+     * @param doPadding is {@code true} to pad result with '=' chars
+     *                  if it does not fall on 3 byte boundaries
+     */
+    public static String encodeWebSafe(byte[] source, boolean doPadding) {
+        return encode(source, 0, source.length, WEBSAFE_ALPHABET, doPadding);
     }
 
-    return new String(outBuff, 0, outLen);
-  }
-
-  /**
-   * Encodes a byte array into Base64 notation.
-   *
-   * @param source the data to convert
-   * @param off offset in array where conversion should begin
-   * @param len length of data to convert
-   * @param alphabet is the encoding alphabet
-   * @param maxLineLength maximum length of one line.
-   * @return the BASE64-encoded byte array
-   */
-  public static byte[] encode(byte[] source, int off, int len, byte[] alphabet,
-      int maxLineLength) {
-    int lenDiv3 = (len + 2) / 3; // ceil(len / 3)
-    int len43 = lenDiv3 * 4;
-    byte[] outBuff = new byte[len43 // Main 4:3
-        + (len43 / maxLineLength)]; // New lines
-
-    int d = 0;
-    int e = 0;
-    int len2 = len - 2;
-    int lineLength = 0;
-    for (; d < len2; d += 3, e += 4) {
-
-      // The following block of code is the same as
-      // encode3to4( source, d + off, 3, outBuff, e, alphabet );
-      // but inlined for faster encoding (~20% improvement)
-      int inBuff =
-          ((source[d + off] << 24) >>> 8)
-              | ((source[d + 1 + off] << 24) >>> 16)
-              | ((source[d + 2 + off] << 24) >>> 24);
-      outBuff[e] = alphabet[(inBuff >>> 18)];
-      outBuff[e + 1] = alphabet[(inBuff >>> 12) & 0x3f];
-      outBuff[e + 2] = alphabet[(inBuff >>> 6) & 0x3f];
-      outBuff[e + 3] = alphabet[(inBuff) & 0x3f];
-
-      lineLength += 4;
-      if (lineLength == maxLineLength) {
-        outBuff[e + 4] = NEW_LINE;
-        e++;
-        lineLength = 0;
-      } // end if: end of line
-    } // end for: each piece of array
-
-    if (d < len) {
-      encode3to4(source, d + off, len - d, outBuff, e, alphabet);
-
-      lineLength += 4;
-      if (lineLength == maxLineLength) {
-        // Add a last newline
-        outBuff[e + 4] = NEW_LINE;
-        e++;
-      }
-      e += 4;
+    /**
+     * Encodes a byte array into Base64 notation.
+     *
+     * @param source    the data to convert
+     * @param off       offset in array where conversion should begin
+     * @param len       length of data to convert
+     * @param alphabet  the encoding alphabet
+     * @param doPadding is {@code true} to pad result with '=' chars
+     *                  if it does not fall on 3 byte boundaries
+     * @since 1.4
+     */
+    public static String encode(byte[] source, int off, int len, byte[] alphabet,
+                                boolean doPadding) {
+        byte[] outBuff = encode(source, off, len, alphabet, Integer.MAX_VALUE);
+        int outLen = outBuff.length;
+
+        // If doPadding is false, set length to truncate '='
+        // padding characters
+        while (doPadding == false && outLen > 0) {
+            if (outBuff[outLen - 1] != '=') {
+                break;
+            }
+            outLen -= 1;
+        }
+
+        return new String(outBuff, 0, outLen);
     }
 
-    assert (e == outBuff.length);
-    return outBuff;
-  }
+    /**
+     * Encodes a byte array into Base64 notation.
+     *
+     * @param source        the data to convert
+     * @param off           offset in array where conversion should begin
+     * @param len           length of data to convert
+     * @param alphabet      is the encoding alphabet
+     * @param maxLineLength maximum length of one line.
+     * @return the BASE64-encoded byte array
+     */
+    public static byte[] encode(byte[] source, int off, int len, byte[] alphabet,
+                                int maxLineLength) {
+        int lenDiv3 = (len + 2) / 3; // ceil(len / 3)
+        int len43 = lenDiv3 * 4;
+        byte[] outBuff = new byte[len43 // Main 4:3
+                + (len43 / maxLineLength)]; // New lines
+
+        int d = 0;
+        int e = 0;
+        int len2 = len - 2;
+        int lineLength = 0;
+        for (; d < len2; d += 3, e += 4) {
+
+            // The following block of code is the same as
+            // encode3to4( source, d + off, 3, outBuff, e, alphabet );
+            // but inlined for faster encoding (~20% improvement)
+            int inBuff =
+                    ((source[d + off] << 24) >>> 8)
+                            | ((source[d + 1 + off] << 24) >>> 16)
+                            | ((source[d + 2 + off] << 24) >>> 24);
+            outBuff[e] = alphabet[(inBuff >>> 18)];
+            outBuff[e + 1] = alphabet[(inBuff >>> 12) & 0x3f];
+            outBuff[e + 2] = alphabet[(inBuff >>> 6) & 0x3f];
+            outBuff[e + 3] = alphabet[(inBuff) & 0x3f];
+
+            lineLength += 4;
+            if (lineLength == maxLineLength) {
+                outBuff[e + 4] = NEW_LINE;
+                e++;
+                lineLength = 0;
+            } // end if: end of line
+        } // end for: each piece of array
+
+        if (d < len) {
+            encode3to4(source, d + off, len - d, outBuff, e, alphabet);
+
+            lineLength += 4;
+            if (lineLength == maxLineLength) {
+                // Add a last newline
+                outBuff[e + 4] = NEW_LINE;
+                e++;
+            }
+            e += 4;
+        }
+
+        assert (e == outBuff.length);
+        return outBuff;
+    }
 
 
   /* ********  D E C O D I N G   M E T H O D S  ******** */
 
 
-  /**
-   * Decodes four bytes from array <var>source</var>
-   * and writes the resulting bytes (up to three of them)
-   * to <var>destination</var>.
-   * The source and destination arrays can be manipulated
-   * anywhere along their length by specifying
-   * <var>srcOffset</var> and <var>destOffset</var>.
-   * This method does not check to make sure your arrays
-   * are large enough to accommodate <var>srcOffset</var> + 4 for
-   * the <var>source</var> array or <var>destOffset</var> + 3 for
-   * the <var>destination</var> array.
-   * This method returns the actual number of bytes that
-   * were converted from the Base64 encoding.
-   *
-   *
-   * @param source the array to convert
-   * @param srcOffset the index where conversion begins
-   * @param destination the array to hold the conversion
-   * @param destOffset the index where output will be put
-   * @param decodabet the decodabet for decoding Base64 content
-   * @return the number of decoded bytes converted
-   * @since 1.3
-   */
-  private static int decode4to3(byte[] source, int srcOffset,
-      byte[] destination, int destOffset, byte[] decodabet) {
-    // Example: Dk==
-    if (source[srcOffset + 2] == EQUALS_SIGN) {
-      int outBuff =
-          ((decodabet[source[srcOffset]] << 24) >>> 6)
-              | ((decodabet[source[srcOffset + 1]] << 24) >>> 12);
-
-      destination[destOffset] = (byte) (outBuff >>> 16);
-      return 1;
-    } else if (source[srcOffset + 3] == EQUALS_SIGN) {
-      // Example: DkL=
-      int outBuff =
-          ((decodabet[source[srcOffset]] << 24) >>> 6)
-              | ((decodabet[source[srcOffset + 1]] << 24) >>> 12)
-              | ((decodabet[source[srcOffset + 2]] << 24) >>> 18);
-
-      destination[destOffset] = (byte) (outBuff >>> 16);
-      destination[destOffset + 1] = (byte) (outBuff >>> 8);
-      return 2;
-    } else {
-      // Example: DkLE
-      int outBuff =
-          ((decodabet[source[srcOffset]] << 24) >>> 6)
-              | ((decodabet[source[srcOffset + 1]] << 24) >>> 12)
-              | ((decodabet[source[srcOffset + 2]] << 24) >>> 18)
-              | ((decodabet[source[srcOffset + 3]] << 24) >>> 24);
-
-      destination[destOffset] = (byte) (outBuff >> 16);
-      destination[destOffset + 1] = (byte) (outBuff >> 8);
-      destination[destOffset + 2] = (byte) (outBuff);
-      return 3;
+    /**
+     * Decodes four bytes from array <var>source</var>
+     * and writes the resulting bytes (up to three of them)
+     * to <var>destination</var>.
+     * The source and destination arrays can be manipulated
+     * anywhere along their length by specifying
+     * <var>srcOffset</var> and <var>destOffset</var>.
+     * This method does not check to make sure your arrays
+     * are large enough to accommodate <var>srcOffset</var> + 4 for
+     * the <var>source</var> array or <var>destOffset</var> + 3 for
+     * the <var>destination</var> array.
+     * This method returns the actual number of bytes that
+     * were converted from the Base64 encoding.
+     *
+     * @param source      the array to convert
+     * @param srcOffset   the index where conversion begins
+     * @param destination the array to hold the conversion
+     * @param destOffset  the index where output will be put
+     * @param decodabet   the decodabet for decoding Base64 content
+     * @return the number of decoded bytes converted
+     * @since 1.3
+     */
+    private static int decode4to3(byte[] source, int srcOffset,
+                                  byte[] destination, int destOffset, byte[] decodabet) {
+        // Example: Dk==
+        if (source[srcOffset + 2] == EQUALS_SIGN) {
+            int outBuff =
+                    ((decodabet[source[srcOffset]] << 24) >>> 6)
+                            | ((decodabet[source[srcOffset + 1]] << 24) >>> 12);
+
+            destination[destOffset] = (byte) (outBuff >>> 16);
+            return 1;
+        } else if (source[srcOffset + 3] == EQUALS_SIGN) {
+            // Example: DkL=
+            int outBuff =
+                    ((decodabet[source[srcOffset]] << 24) >>> 6)
+                            | ((decodabet[source[srcOffset + 1]] << 24) >>> 12)
+                            | ((decodabet[source[srcOffset + 2]] << 24) >>> 18);
+
+            destination[destOffset] = (byte) (outBuff >>> 16);
+            destination[destOffset + 1] = (byte) (outBuff >>> 8);
+            return 2;
+        } else {
+            // Example: DkLE
+            int outBuff =
+                    ((decodabet[source[srcOffset]] << 24) >>> 6)
+                            | ((decodabet[source[srcOffset + 1]] << 24) >>> 12)
+                            | ((decodabet[source[srcOffset + 2]] << 24) >>> 18)
+                            | ((decodabet[source[srcOffset + 3]] << 24) >>> 24);
+
+            destination[destOffset] = (byte) (outBuff >> 16);
+            destination[destOffset + 1] = (byte) (outBuff >> 8);
+            destination[destOffset + 2] = (byte) (outBuff);
+            return 3;
+        }
+    } // end decodeToBytes
+
+
+    /**
+     * Decodes data from Base64 notation.
+     *
+     * @param s the string to decode (decoded in default encoding)
+     * @return the decoded data
+     * @since 1.4
+     */
+    public static byte[] decode(String s) throws Base64DecoderException {
+        byte[] bytes = s.getBytes();
+        return decode(bytes, 0, bytes.length);
+    }
+
+    /**
+     * Decodes data from web safe Base64 notation.
+     * Web safe encoding uses '-' instead of '+', '_' instead of '/'
+     *
+     * @param s the string to decode (decoded in default encoding)
+     * @return the decoded data
+     */
+    public static byte[] decodeWebSafe(String s) throws Base64DecoderException {
+        byte[] bytes = s.getBytes();
+        return decodeWebSafe(bytes, 0, bytes.length);
     }
-  } // end decodeToBytes
-
-
-  /**
-   * Decodes data from Base64 notation.
-   *
-   * @param s the string to decode (decoded in default encoding)
-   * @return the decoded data
-   * @since 1.4
-   */
-  public static byte[] decode(String s) throws Base64DecoderException {
-    byte[] bytes = s.getBytes();
-    return decode(bytes, 0, bytes.length);
-  }
-
-  /**
-   * Decodes data from web safe Base64 notation.
-   * Web safe encoding uses '-' instead of '+', '_' instead of '/'
-   *
-   * @param s the string to decode (decoded in default encoding)
-   * @return the decoded data
-   */
-  public static byte[] decodeWebSafe(String s) throws Base64DecoderException {
-    byte[] bytes = s.getBytes();
-    return decodeWebSafe(bytes, 0, bytes.length);
-  }
-
-  /**
-   * Decodes Base64 content in byte array format and returns
-   * the decoded byte array.
-   *
-   * @param source The Base64 encoded data
-   * @return decoded data
-   * @since 1.3
-   * @throws Base64DecoderException
-   */
-  public static byte[] decode(byte[] source) throws Base64DecoderException {
-    return decode(source, 0, source.length);
-  }
-
-  /**
-   * Decodes web safe Base64 content in byte array format and returns
-   * the decoded data.
-   * Web safe encoding uses '-' instead of '+', '_' instead of '/'
-   *
-   * @param source the string to decode (decoded in default encoding)
-   * @return the decoded data
-   */
-  public static byte[] decodeWebSafe(byte[] source)
-      throws Base64DecoderException {
-    return decodeWebSafe(source, 0, source.length);
-  }
-
-  /**
-   * Decodes Base64 content in byte array format and returns
-   * the decoded byte array.
-   *
-   * @param source the Base64 encoded data
-   * @param off    the offset of where to begin decoding
-   * @param len    the length of characters to decode
-   * @return decoded data
-   * @since 1.3
-   * @throws Base64DecoderException
-   */
-  public static byte[] decode(byte[] source, int off, int len)
-      throws Base64DecoderException {
-    return decode(source, off, len, DECODABET);
-  }
-
-  /**
-   * Decodes web safe Base64 content in byte array format and returns
-   * the decoded byte array.
-   * Web safe encoding uses '-' instead of '+', '_' instead of '/'
-   *
-   * @param source the Base64 encoded data
-   * @param off    the offset of where to begin decoding
-   * @param len    the length of characters to decode
-   * @return decoded data
-   */
-  public static byte[] decodeWebSafe(byte[] source, int off, int len)
-      throws Base64DecoderException {
-    return decode(source, off, len, WEBSAFE_DECODABET);
-  }
-
-  /**
-   * Decodes Base64 content using the supplied decodabet and returns
-   * the decoded byte array.
-   *
-   * @param source the Base64 encoded data
-   * @param off the offset of where to begin decoding
-   * @param len the length of characters to decode
-   * @param decodabet the decodabet for decoding Base64 content
-   * @return decoded data
-   */
-  @SuppressWarnings("nls")
-  public static byte[] decode(byte[] source, int off, int len, byte[] decodabet)
-      throws Base64DecoderException {
-    int len34 = len * 3 / 4;
-    byte[] outBuff = new byte[2 + len34]; // Upper limit on size of output
-    int outBuffPosn = 0;
-
-    byte[] b4 = new byte[4];
-    int b4Posn = 0;
-    int i = 0;
-    byte sbiCrop = 0;
-    byte sbiDecode = 0;
-    for (i = 0; i < len; i++) {
-      sbiCrop = (byte) (source[i + off] & 0x7f); // Only the low seven bits
-      sbiDecode = decodabet[sbiCrop];
-
-      if (sbiDecode >= WHITE_SPACE_ENC) { // White space Equals sign or better
-        if (sbiDecode >= EQUALS_SIGN_ENC) {
-          // An equals sign (for padding) must not occur at position 0 or 1
-          // and must be the last byte[s] in the encoded value
-          if (sbiCrop == EQUALS_SIGN) {
-            int bytesLeft = len - i;
-            byte lastByte = (byte) (source[len - 1 + off] & 0x7f);
-            if (b4Posn == 0 || b4Posn == 1) {
-              throw new Base64DecoderException(
-                  "invalid padding byte '=' at byte offset " + i);
-            } else if ((b4Posn == 3 && bytesLeft > 2)
-                || (b4Posn == 4 && bytesLeft > 1)) {
-              throw new Base64DecoderException(
-                  "padding byte '=' falsely signals end of encoded value "
-                      + "at offset " + i);
-            } else if (lastByte != EQUALS_SIGN && lastByte != NEW_LINE) {
-              throw new Base64DecoderException(
-                  "encoded value has invalid trailing byte");
+
+    /**
+     * Decodes Base64 content in byte array format and returns
+     * the decoded byte array.
+     *
+     * @param source The Base64 encoded data
+     * @return decoded data
+     * @throws Base64DecoderException
+     * @since 1.3
+     */
+    public static byte[] decode(byte[] source) throws Base64DecoderException {
+        return decode(source, 0, source.length);
+    }
+
+    /**
+     * Decodes web safe Base64 content in byte array format and returns
+     * the decoded data.
+     * Web safe encoding uses '-' instead of '+', '_' instead of '/'
+     *
+     * @param source the string to decode (decoded in default encoding)
+     * @return the decoded data
+     */
+    public static byte[] decodeWebSafe(byte[] source)
+            throws Base64DecoderException {
+        return decodeWebSafe(source, 0, source.length);
+    }
+
+    /**
+     * Decodes Base64 content in byte array format and returns
+     * the decoded byte array.
+     *
+     * @param source the Base64 encoded data
+     * @param off    the offset of where to begin decoding
+     * @param len    the length of characters to decode
+     * @return decoded data
+     * @throws Base64DecoderException
+     * @since 1.3
+     */
+    public static byte[] decode(byte[] source, int off, int len)
+            throws Base64DecoderException {
+        return decode(source, off, len, DECODABET);
+    }
+
+    /**
+     * Decodes web safe Base64 content in byte array format and returns
+     * the decoded byte array.
+     * Web safe encoding uses '-' instead of '+', '_' instead of '/'
+     *
+     * @param source the Base64 encoded data
+     * @param off    the offset of where to begin decoding
+     * @param len    the length of characters to decode
+     * @return decoded data
+     */
+    public static byte[] decodeWebSafe(byte[] source, int off, int len)
+            throws Base64DecoderException {
+        return decode(source, off, len, WEBSAFE_DECODABET);
+    }
+
+    /**
+     * Decodes Base64 content using the supplied decodabet and returns
+     * the decoded byte array.
+     *
+     * @param source    the Base64 encoded data
+     * @param off       the offset of where to begin decoding
+     * @param len       the length of characters to decode
+     * @param decodabet the decodabet for decoding Base64 content
+     * @return decoded data
+     */
+    @SuppressWarnings("nls")
+    public static byte[] decode(byte[] source, int off, int len, byte[] decodabet)
+            throws Base64DecoderException {
+        int len34 = len * 3 / 4;
+        byte[] outBuff = new byte[2 + len34]; // Upper limit on size of output
+        int outBuffPosn = 0;
+
+        byte[] b4 = new byte[4];
+        int b4Posn = 0;
+        int i = 0;
+        byte sbiCrop = 0;
+        byte sbiDecode = 0;
+        for (i = 0; i < len; i++) {
+            sbiCrop = (byte) (source[i + off] & 0x7f); // Only the low seven bits
+            sbiDecode = decodabet[sbiCrop];
+
+            if (sbiDecode >= WHITE_SPACE_ENC) { // White space Equals sign or better
+                if (sbiDecode >= EQUALS_SIGN_ENC) {
+                    // An equals sign (for padding) must not occur at position 0 or 1
+                    // and must be the last byte[s] in the encoded value
+                    if (sbiCrop == EQUALS_SIGN) {
+                        int bytesLeft = len - i;
+                        byte lastByte = (byte) (source[len - 1 + off] & 0x7f);
+                        if (b4Posn == 0 || b4Posn == 1) {
+                            throw new Base64DecoderException(
+                                    "invalid padding byte '=' at byte offset " + i);
+                        } else if ((b4Posn == 3 && bytesLeft > 2)
+                                || (b4Posn == 4 && bytesLeft > 1)) {
+                            throw new Base64DecoderException(
+                                    "padding byte '=' falsely signals end of encoded value "
+                                            + "at offset " + i);
+                        } else if (lastByte != EQUALS_SIGN && lastByte != NEW_LINE) {
+                            throw new Base64DecoderException(
+                                    "encoded value has invalid trailing byte");
+                        }
+                        break;
+                    }
+
+                    b4[b4Posn++] = sbiCrop;
+                    if (b4Posn == 4) {
+                        outBuffPosn += decode4to3(b4, 0, outBuff, outBuffPosn, decodabet);
+                        b4Posn = 0;
+                    }
+                }
+            } else {
+                throw new Base64DecoderException("Bad Base64 input character at " + i
+                        + ": " + source[i + off] + "(decimal)");
             }
-            break;
-          }
+        }
 
-          b4[b4Posn++] = sbiCrop;
-          if (b4Posn == 4) {
+        // Because web safe encoding allows non padding base64 encodes, we
+        // need to pad the rest of the b4 buffer with equal signs when
+        // b4Posn != 0.  There can be at most 2 equal signs at the end of
+        // four characters, so the b4 buffer must have two or three
+        // characters.  This also catches the case where the input is
+        // padded with EQUALS_SIGN
+        if (b4Posn != 0) {
+            if (b4Posn == 1) {
+                throw new Base64DecoderException("single trailing character at offset "
+                        + (len - 1));
+            }
+            b4[b4Posn++] = EQUALS_SIGN;
             outBuffPosn += decode4to3(b4, 0, outBuff, outBuffPosn, decodabet);
-            b4Posn = 0;
-          }
         }
-      } else {
-        throw new Base64DecoderException("Bad Base64 input character at " + i
-            + ": " + source[i + off] + "(decimal)");
-      }
-    }
 
-    // Because web safe encoding allows non padding base64 encodes, we
-    // need to pad the rest of the b4 buffer with equal signs when
-    // b4Posn != 0.  There can be at most 2 equal signs at the end of
-    // four characters, so the b4 buffer must have two or three
-    // characters.  This also catches the case where the input is
-    // padded with EQUALS_SIGN
-    if (b4Posn != 0) {
-      if (b4Posn == 1) {
-        throw new Base64DecoderException("single trailing character at offset "
-            + (len - 1));
-      }
-      b4[b4Posn++] = EQUALS_SIGN;
-      outBuffPosn += decode4to3(b4, 0, outBuff, outBuffPosn, decodabet);
+        byte[] out = new byte[outBuffPosn];
+        System.arraycopy(outBuff, 0, out, 0, outBuffPosn);
+        return out;
     }
-
-    byte[] out = new byte[outBuffPosn];
-    System.arraycopy(outBuff, 0, out, 0, outBuffPosn);
-    return out;
-  }
 }
diff --git a/astrid/src/com/todoroo/astrid/billing/Base64DecoderException.java b/astrid/src/com/todoroo/astrid/billing/Base64DecoderException.java
index af51d1c0f..d9bae7f3e 100644
--- a/astrid/src/com/todoroo/astrid/billing/Base64DecoderException.java
+++ b/astrid/src/com/todoroo/astrid/billing/Base64DecoderException.java
@@ -20,13 +20,13 @@ package com.todoroo.astrid.billing;
  * @author nelson
  */
 public class Base64DecoderException extends Exception {
-  public Base64DecoderException() {
-    super();
-  }
+    public Base64DecoderException() {
+        super();
+    }
 
-  public Base64DecoderException(String s) {
-    super(s);
-  }
+    public Base64DecoderException(String s) {
+        super(s);
+    }
 
-  private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 }
diff --git a/astrid/src/com/todoroo/astrid/billing/BillingActivity.java b/astrid/src/com/todoroo/astrid/billing/BillingActivity.java
index 8d41e1514..2439f04a8 100644
--- a/astrid/src/com/todoroo/astrid/billing/BillingActivity.java
+++ b/astrid/src/com/todoroo/astrid/billing/BillingActivity.java
@@ -1,7 +1,5 @@
 package com.todoroo.astrid.billing;
 
-import java.util.Locale;
-
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ProgressDialog;
@@ -35,6 +33,8 @@ import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.billing.BillingConstants.ResponseCode;
 import com.todoroo.astrid.service.ThemeService;
 
+import java.util.Locale;
+
 public class BillingActivity extends SherlockFragmentActivity implements AstridPurchaseObserver.RestoreTransactionsListener {
 
     private static final int DIALOG_CANNOT_CONNECT_ID = 1;
@@ -50,7 +50,8 @@ public class BillingActivity extends SherlockFragmentActivity implements AstridP
 
     private ProgressDialog restoreTransactionsDialog;
 
-    @Autowired private ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    private ActFmPreferenceService actFmPreferenceService;
 
 
     @Override
@@ -126,11 +127,11 @@ public class BillingActivity extends SherlockFragmentActivity implements AstridP
             // Prompt to log in, but this shouldn't happen anyways since we hide the entry path to this screen when not logged in
             DialogUtilities.okDialog(this, getString(R.string.premium_login_prompt),
                     new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        finish();
-                    }
-                });
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            finish();
+                        }
+                    });
         } else if (!billingService.checkBillingSupported(BillingConstants.ITEM_TYPE_SUBSCRIPTION)) {
             showDialog(DIALOG_SUBSCRIPTIONS_NOT_SUPPORTED_ID);
         } else if (ActFmPreferenceService.isPremiumUser()) {
@@ -185,7 +186,7 @@ public class BillingActivity extends SherlockFragmentActivity implements AstridP
 
     @SuppressWarnings("nls")
     private void setupText() {
-        int[] bullets = new int[] { R.string.premium_description_1, /* R.string.premium_description_2,*/ R.string.premium_description_3,
+        int[] bullets = new int[]{R.string.premium_description_1, /* R.string.premium_description_2,*/ R.string.premium_description_3,
                 R.string.premium_description_4, R.string.premium_description_5, R.string.premium_description_6
         };
 
@@ -250,17 +251,17 @@ public class BillingActivity extends SherlockFragmentActivity implements AstridP
     @Override
     protected Dialog onCreateDialog(int id) {
         switch (id) {
-        case DIALOG_CANNOT_CONNECT_ID:
-            return createDialog(R.string.cannot_connect_title,
-                    R.string.cannot_connect_message);
-        case DIALOG_BILLING_NOT_SUPPORTED_ID:
-            return createDialog(R.string.billing_not_supported_title,
-                    R.string.billing_not_supported_message);
+            case DIALOG_CANNOT_CONNECT_ID:
+                return createDialog(R.string.cannot_connect_title,
+                        R.string.cannot_connect_message);
+            case DIALOG_BILLING_NOT_SUPPORTED_ID:
+                return createDialog(R.string.billing_not_supported_title,
+                        R.string.billing_not_supported_message);
             case DIALOG_SUBSCRIPTIONS_NOT_SUPPORTED_ID:
                 return createDialog(R.string.subscriptions_not_supported_title,
                         R.string.subscriptions_not_supported_message);
-        default:
-            return null;
+            default:
+                return null;
         }
     }
 
@@ -275,22 +276,22 @@ public class BillingActivity extends SherlockFragmentActivity implements AstridP
 
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(titleId)
-            .setIcon(android.R.drawable.stat_sys_warning)
-            .setMessage(messageId)
-            .setCancelable(false)
-            .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    finish();
-                }
-            })
-            .setNegativeButton(R.string.subscriptions_learn_more, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    Intent intent = new Intent(Intent.ACTION_VIEW, helpUri);
-                    startActivity(intent);
-                }
-            });
+                .setIcon(android.R.drawable.stat_sys_warning)
+                .setMessage(messageId)
+                .setCancelable(false)
+                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        finish();
+                    }
+                })
+                .setNegativeButton(R.string.subscriptions_learn_more, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        Intent intent = new Intent(Intent.ACTION_VIEW, helpUri);
+                        startActivity(intent);
+                    }
+                });
         return builder.create();
     }
 
diff --git a/astrid/src/com/todoroo/astrid/billing/BillingConstants.java b/astrid/src/com/todoroo/astrid/billing/BillingConstants.java
index 464554f22..5643dcae6 100644
--- a/astrid/src/com/todoroo/astrid/billing/BillingConstants.java
+++ b/astrid/src/com/todoroo/astrid/billing/BillingConstants.java
@@ -7,7 +7,9 @@ import com.todoroo.astrid.utility.Constants;
 @SuppressWarnings("nls")
 public class BillingConstants {
 
-    /** This is the action we use to bind to the MarketBillingService. */
+    /**
+     * This is the action we use to bind to the MarketBillingService.
+     */
     public static final String MARKET_BILLING_SERVICE_ACTION = "com.android.vending.billing.MarketBillingService.BIND";
 
     // Intent actions that we send from the BillingReceiver to the
diff --git a/astrid/src/com/todoroo/astrid/billing/BillingReceiver.java b/astrid/src/com/todoroo/astrid/billing/BillingReceiver.java
index 81602c520..50a493ce8 100644
--- a/astrid/src/com/todoroo/astrid/billing/BillingReceiver.java
+++ b/astrid/src/com/todoroo/astrid/billing/BillingReceiver.java
@@ -45,9 +45,10 @@ public class BillingReceiver extends BroadcastReceiver {
      * change. The signedData parameter is a plaintext JSON string that is
      * signed by the server with the developer's private key. The signature
      * for the signed data is passed in the signature parameter.
-     * @param context the context
+     *
+     * @param context    the context
      * @param signedData the (unencrypted) JSON string
-     * @param signature the signature for the signedData
+     * @param signature  the signature for the signedData
      */
     private void purchaseStateChanged(Context context, String signedData, String signature) {
         Intent intent = new Intent(BillingConstants.ACTION_PURCHASE_STATE_CHANGED);
@@ -65,7 +66,7 @@ public class BillingReceiver extends BroadcastReceiver {
      * MarketBillingService directly so it starts the {@link BillingService}, which does the
      * actual work of sending the message.
      *
-     * @param context the context
+     * @param context  the context
      * @param notifyId the notification ID
      */
     private void notify(Context context, String notifyId) {
@@ -79,8 +80,8 @@ public class BillingReceiver extends BroadcastReceiver {
      * This is called when Android Market sends a server response code. The BillingService can
      * then report the status of the response if desired.
      *
-     * @param context the context
-     * @param requestId the request ID that corresponds to a previous request
+     * @param context           the context
+     * @param requestId         the request ID that corresponds to a previous request
      * @param responseCodeIndex the ResponseCode ordinal value for the request
      */
     private void checkResponseCode(Context context, long requestId, int responseCodeIndex) {
diff --git a/astrid/src/com/todoroo/astrid/billing/BillingService.java b/astrid/src/com/todoroo/astrid/billing/BillingService.java
index 491b5095d..6348b5076 100644
--- a/astrid/src/com/todoroo/astrid/billing/BillingService.java
+++ b/astrid/src/com/todoroo/astrid/billing/BillingService.java
@@ -1,9 +1,5 @@
 package com.todoroo.astrid.billing;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.ComponentName;
@@ -20,11 +16,17 @@ import com.todoroo.astrid.billing.BillingConstants.PurchaseState;
 import com.todoroo.astrid.billing.BillingConstants.ResponseCode;
 import com.todoroo.astrid.billing.Security.VerifiedPurchase;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+
 @SuppressWarnings("nls")
 public class BillingService extends Service implements ServiceConnection {
     private static final String TAG = "billing-service";
 
-    /** The service connection to the remote MarketBillingService. */
+    /**
+     * The service connection to the remote MarketBillingService.
+     */
     private static IMarketBillingService mService;
 
     /**
@@ -39,7 +41,7 @@ public class BillingService extends Service implements ServiceConnection {
      * request Id that each request receives when it executes.
      */
     private static HashMap<Long, BillingRequest> mSentRequests =
-        new HashMap<Long, BillingRequest>();
+            new HashMap<Long, BillingRequest>();
 
     /**
      * The base class for all requests that use the MarketBillingService.
@@ -63,6 +65,7 @@ public class BillingService extends Service implements ServiceConnection {
 
         /**
          * Run the request, starting the connection if necessary.
+         *
          * @return true if the request was executed or queued; false if there
          * was an error starting the connection
          */
@@ -81,6 +84,7 @@ public class BillingService extends Service implements ServiceConnection {
 
         /**
          * Try running the request directly if the service is already connected.
+         *
          * @return true if the request ran successfully; false if the service
          * is not connected or there was an error when trying to use it
          */
@@ -109,6 +113,7 @@ public class BillingService extends Service implements ServiceConnection {
          * Called when a remote exception occurs while trying to execute the
          * {@link #run()} method.  The derived class can override this to
          * execute exception-handling code.
+         *
          * @param e the exception
          */
         protected void onRemoteException(RemoteException e) {
@@ -118,6 +123,7 @@ public class BillingService extends Service implements ServiceConnection {
 
         /**
          * The derived class must implement this method.
+         *
          * @throws RemoteException
          */
         abstract protected long run() throws RemoteException;
@@ -125,6 +131,7 @@ public class BillingService extends Service implements ServiceConnection {
         /**
          * This is called when Android Market sends a response code for this
          * request.
+         *
          * @param responseCode the response code
          */
         protected void responseCodeReceived(ResponseCode responseCode) {
@@ -150,21 +157,22 @@ public class BillingService extends Service implements ServiceConnection {
 
     /**
      * Wrapper class that checks if in-app billing is supported.
-     *
+     * <p/>
      * Note: Support for subscriptions implies support for one-time purchases. However, the opposite
      * is not true.
-     *
+     * <p/>
      * Developers may want to perform two checks if both one-time and subscription products are
      * available.
      */
     class CheckBillingSupported extends BillingRequest {
         public String mProductType = null;
 
-        /** Constructor
-         *
+        /**
+         * Constructor
+         * <p/>
          * Note: Support for subscriptions implies support for one-time purchases. However, the
          * opposite is not true.
-         *
+         * <p/>
          * Developers may want to perform two checks if both one-time and subscription products are
          * available.
          *
@@ -202,12 +210,13 @@ public class BillingService extends Service implements ServiceConnection {
         public final String mDeveloperPayload;
         public final String mProductType;
 
-        /** Constructor
+        /**
+         * Constructor
          *
-         * @param itemId  The ID of the item to be purchased. Will be assumed to be a one-time
-         *                purchase.
-         * @param itemType  Either BillingConstants.ITEM_TYPE_INAPP or BillingConstants.ITEM_TYPE_SUBSCRIPTION,
-         *                  indicating the type of item type support is being checked for.
+         * @param itemId           The ID of the item to be purchased. Will be assumed to be a one-time
+         *                         purchase.
+         * @param itemType         Either BillingConstants.ITEM_TYPE_INAPP or BillingConstants.ITEM_TYPE_SUBSCRIPTION,
+         *                         indicating the type of item type support is being checked for.
          * @param developerPayload Optional data.
          */
         public RequestPurchase(String itemId, String itemType, String developerPayload) {
@@ -364,7 +373,8 @@ public class BillingService extends Service implements ServiceConnection {
     /**
      * The {@link BillingReceiver} sends messages to this service using intents.
      * Each intent has an action and some extra arguments specific to that action.
-     * @param intent the intent containing one of the supported actions
+     *
+     * @param intent  the intent containing one of the supported actions
      * @param startId an identifier for the invocation instance of this service
      */
     public void handleCommand(Intent intent, int startId) {
@@ -379,7 +389,7 @@ public class BillingService extends Service implements ServiceConnection {
             confirmNotifications(startId, notifyIds);
         } else if (BillingConstants.ACTION_GET_PURCHASE_INFORMATION.equals(action)) {
             String notifyId = intent.getStringExtra(BillingConstants.NOTIFICATION_ID);
-            getPurchaseInformation(startId, new String[] { notifyId });
+            getPurchaseInformation(startId, new String[]{notifyId});
         } else if (BillingConstants.ACTION_PURCHASE_STATE_CHANGED.equals(action)) {
             String signedData = intent.getStringExtra(BillingConstants.INAPP_SIGNED_DATA);
             String signature = intent.getStringExtra(BillingConstants.INAPP_SIGNATURE);
@@ -396,6 +406,7 @@ public class BillingService extends Service implements ServiceConnection {
     /**
      * Binds to the MarketBillingService and returns true if the bind
      * succeeded.
+     *
      * @return true if the bind succeeded; false otherwise
      */
     private boolean bindToMarketBillingService() {
@@ -421,9 +432,10 @@ public class BillingService extends Service implements ServiceConnection {
 
     /**
      * Checks if in-app billing is supported.
-     * @pram itemType Either BillingConstants.ITEM_TYPE_INAPP or BillingConstants.ITEM_TYPE_SUBSCRIPTION, indicating the
-     *                type of item support is being checked for.
+     *
      * @return true if supported; false otherwise
+     * @pram itemType Either BillingConstants.ITEM_TYPE_INAPP or BillingConstants.ITEM_TYPE_SUBSCRIPTION, indicating the
+     * type of item support is being checked for.
      */
     public boolean checkBillingSupported(String itemType) {
         return new CheckBillingSupported(itemType).runRequest();
@@ -434,11 +446,12 @@ public class BillingService extends Service implements ServiceConnection {
      * the purchase succeeds (or is canceled) the {@link BillingReceiver}
      * receives an intent with the action {@link BillingConstants#ACTION_NOTIFY}.
      * Returns false if there was an error trying to connect to Android Market.
-     * @param productId an identifier for the item being offered for purchase
-     * @param itemType  Either BillingConstants.ITEM_TYPE_INAPP or BillingConstants.ITEM_TYPE_SUBSCRIPTION, indicating
-     *                  the type of item type support is being checked for.
+     *
+     * @param productId        an identifier for the item being offered for purchase
+     * @param itemType         Either BillingConstants.ITEM_TYPE_INAPP or BillingConstants.ITEM_TYPE_SUBSCRIPTION, indicating
+     *                         the type of item type support is being checked for.
      * @param developerPayload a payload that is associated with a given
-     * purchase, if null, no payload is sent
+     *                         purchase, if null, no payload is sent
      * @return false if there was an error connecting to Android Market
      */
     public boolean requestPurchase(String productId, String itemType, String developerPayload) {
@@ -449,6 +462,7 @@ public class BillingService extends Service implements ServiceConnection {
      * Requests transaction information for all managed items. Call this only when the
      * application is first installed or after a database wipe. Do NOT call this
      * every time the application starts up.
+     *
      * @return false if there was an error connecting to Android Market
      */
     public boolean restoreTransactions() {
@@ -461,9 +475,10 @@ public class BillingService extends Service implements ServiceConnection {
      * identifiers back to the MarketBillingService, which ACKs them to the
      * server. Returns false if there was an error trying to connect to the
      * MarketBillingService.
-     * @param startId an identifier for the invocation instance of this service
+     *
+     * @param startId   an identifier for the invocation instance of this service
      * @param notifyIds a list of opaque identifiers associated with purchase
-     * state changes.
+     *                  state changes.
      * @return false if there was an error connecting to Market
      */
     private boolean confirmNotifications(int startId, String[] notifyIds) {
@@ -478,9 +493,9 @@ public class BillingService extends Service implements ServiceConnection {
      * in an intent with the action {@link BillingConstants#ACTION_PURCHASE_STATE_CHANGED}.
      * Returns false if there was an error trying to connect to the MarketBillingService.
      *
-     * @param startId an identifier for the invocation instance of this service
+     * @param startId   an identifier for the invocation instance of this service
      * @param notifyIds a list of opaque identifiers associated with purchase
-     * state changes
+     *                  state changes
      * @return false if there was an error connecting to Android Market
      */
     private boolean getPurchaseInformation(int startId, String[] notifyIds) {
@@ -491,9 +506,10 @@ public class BillingService extends Service implements ServiceConnection {
      * Verifies that the data was signed with the given signature, and calls
      * {@link ResponseHandler#purchaseResponse(Context, PurchaseState, String, String, long)}
      * for each verified purchase.
-     * @param startId an identifier for the invocation instance of this service
+     *
+     * @param startId    an identifier for the invocation instance of this service
      * @param signedData the signed JSON string (signed, not encrypted)
-     * @param signature the signature for the data, signed with the private key
+     * @param signature  the signature for the data, signed with the private key
      */
     private void purchaseStateChanged(int startId, String signedData, String signature) {
         ArrayList<Security.VerifiedPurchase> purchases;
@@ -523,10 +539,11 @@ public class BillingService extends Service implements ServiceConnection {
      * for any purchase state changes.  All purchase state changes are received
      * in the {@link BillingReceiver} and passed to this service, where they are
      * handled in {@link #purchaseStateChanged(int, String, String)}.
-     * @param requestId a number that identifies a request, assigned at the
-     * time the request was made to Android Market
+     *
+     * @param requestId    a number that identifies a request, assigned at the
+     *                     time the request was made to Android Market
      * @param responseCode a response code from Android Market to indicate the state
-     * of the request
+     *                     of the request
      */
     private void checkResponseCode(long requestId, ResponseCode responseCode) {
         BillingRequest request = mSentRequests.get(requestId);
diff --git a/astrid/src/com/todoroo/astrid/billing/PurchaseObserver.java b/astrid/src/com/todoroo/astrid/billing/PurchaseObserver.java
index 39767995e..30ab3685b 100644
--- a/astrid/src/com/todoroo/astrid/billing/PurchaseObserver.java
+++ b/astrid/src/com/todoroo/astrid/billing/PurchaseObserver.java
@@ -2,8 +2,6 @@
 
 package com.todoroo.astrid.billing;
 
-import java.lang.reflect.Method;
-
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.app.PendingIntent.CanceledException;
@@ -18,6 +16,8 @@ import com.todoroo.astrid.billing.BillingConstants.ResponseCode;
 import com.todoroo.astrid.billing.BillingService.RequestPurchase;
 import com.todoroo.astrid.billing.BillingService.RestoreTransactions;
 
+import java.lang.reflect.Method;
+
 /**
  * An interface for observing changes related to purchases. The main application
  * extends this class and registers an instance of that derived class with
@@ -32,8 +32,8 @@ public abstract class PurchaseObserver {
     private final Handler mHandler;
     private Method mStartIntentSender;
     private final Object[] mStartIntentSenderArgs = new Object[5];
-    private static final Class<?>[] START_INTENT_SENDER_SIG = new Class[] {
-        IntentSender.class, Intent.class, int.class, int.class, int.class
+    private static final Class<?>[] START_INTENT_SENDER_SIG = new Class[]{
+            IntentSender.class, Intent.class, int.class, int.class, int.class
     };
 
     public PurchaseObserver(Activity activity, Handler handler) {
@@ -45,6 +45,7 @@ public abstract class PurchaseObserver {
     /**
      * This is the callback that is invoked when Android Market responds to the
      * {@link BillingService#checkBillingSupported()} request.
+     *
      * @param supported true if in-app billing is supported.
      */
     public abstract void onBillingSupported(boolean supported, String type);
@@ -59,14 +60,15 @@ public abstract class PurchaseObserver {
      * update.  The database update is handled in
      * {@link ResponseHandler#purchaseResponse(Context, PurchaseState,
      * String, String, long)}.
+     *
      * @param purchaseState the purchase state of the item
-     * @param itemId a string identifying the item (the "SKU")
-     * @param quantity the current quantity of this item after the purchase
-     * @param purchaseTime the time the product was purchased, in
-     * milliseconds since the epoch (Jan 1, 1970)
+     * @param itemId        a string identifying the item (the "SKU")
+     * @param quantity      the current quantity of this item after the purchase
+     * @param purchaseTime  the time the product was purchased, in
+     *                      milliseconds since the epoch (Jan 1, 1970)
      */
     public abstract void onPurchaseStateChange(PurchaseState purchaseState,
-            String itemId, int quantity, long purchaseTime, String developerPayload, String purchaseToken);
+                                               String itemId, int quantity, long purchaseTime, String developerPayload, String purchaseToken);
 
     /**
      * This is called when we receive a response code from Market for a
@@ -75,23 +77,23 @@ public abstract class PurchaseObserver {
      * {@link #onPurchaseStateChange(PurchaseState, String, int, long)}.
      * This is used for reporting various errors, or if the user backed out
      * and didn't purchase the item.  The possible response codes are:
-     *   RESULT_OK means that the order was sent successfully to the server.
-     *       The onPurchaseStateChange() will be invoked later (with a
-     *       purchase state of PURCHASED or CANCELED) when the order is
-     *       charged or canceled.  This response code can also happen if an
-     *       order for a Market-managed item was already sent to the server.
-     *   RESULT_USER_CANCELED means that the user didn't buy the item.
-     *   RESULT_SERVICE_UNAVAILABLE means that we couldn't connect to the
-     *       Android Market server (for example if the data connection is down).
-     *   RESULT_BILLING_UNAVAILABLE means that in-app billing is not
-     *       supported yet.
-     *   RESULT_ITEM_UNAVAILABLE means that the item this app offered for
-     *       sale does not exist (or is not published) in the server-side
-     *       catalog.
-     *   RESULT_ERROR is used for any other errors (such as a server error).
+     * RESULT_OK means that the order was sent successfully to the server.
+     * The onPurchaseStateChange() will be invoked later (with a
+     * purchase state of PURCHASED or CANCELED) when the order is
+     * charged or canceled.  This response code can also happen if an
+     * order for a Market-managed item was already sent to the server.
+     * RESULT_USER_CANCELED means that the user didn't buy the item.
+     * RESULT_SERVICE_UNAVAILABLE means that we couldn't connect to the
+     * Android Market server (for example if the data connection is down).
+     * RESULT_BILLING_UNAVAILABLE means that in-app billing is not
+     * supported yet.
+     * RESULT_ITEM_UNAVAILABLE means that the item this app offered for
+     * sale does not exist (or is not published) in the server-side
+     * catalog.
+     * RESULT_ERROR is used for any other errors (such as a server error).
      */
     public abstract void onRequestPurchaseResponse(RequestPurchase request,
-            ResponseCode responseCode);
+                                                   ResponseCode responseCode);
 
     /**
      * This is called when we receive a response code from Android Market for a
@@ -99,7 +101,7 @@ public abstract class PurchaseObserver {
      * RESULT_OK means that the request was successfully sent to the server.
      */
     public abstract void onRestoreTransactionsResponse(RestoreTransactions request,
-            ResponseCode responseCode);
+                                                       ResponseCode responseCode);
 
     private void initCompatibilityLayer() {
         try {
@@ -145,12 +147,13 @@ public abstract class PurchaseObserver {
      * Updates the UI after the database has been updated.  This method runs
      * in a background thread so it has to post a Runnable to run on the UI
      * thread.
+     *
      * @param purchaseState the purchase state of the item
-     * @param itemId a string identifying the item
-     * @param quantity the quantity of items in this purchase
+     * @param itemId        a string identifying the item
+     * @param quantity      the quantity of items in this purchase
      */
     void postPurchaseStateChange(final PurchaseState purchaseState, final String itemId,
-            final int quantity, final long purchaseTime, final String developerPayload, final String purchaseToken) {
+                                 final int quantity, final long purchaseTime, final String developerPayload, final String purchaseToken) {
         mHandler.post(new Runnable() {
             @Override
             public void run() {
diff --git a/astrid/src/com/todoroo/astrid/billing/ResponseHandler.java b/astrid/src/com/todoroo/astrid/billing/ResponseHandler.java
index 4321742a7..0a78a8c14 100644
--- a/astrid/src/com/todoroo/astrid/billing/ResponseHandler.java
+++ b/astrid/src/com/todoroo/astrid/billing/ResponseHandler.java
@@ -21,7 +21,7 @@ import com.todoroo.astrid.billing.BillingService.RestoreTransactions;
  * application might also want to forward some responses on to its own server,
  * and that could be done here (in a background thread) but this example does
  * not do that.
- *
+ * <p/>
  * You should modify and obfuscate this code before using it.
  */
 public class ResponseHandler {
@@ -36,6 +36,7 @@ public class ResponseHandler {
 
     /**
      * Registers an observer that updates the UI.
+     *
      * @param observer the observer to register
      */
     public static synchronized void register(PurchaseObserver observer) {
@@ -44,6 +45,7 @@ public class ResponseHandler {
 
     /**
      * Unregisters a previously registered observer.
+     *
      * @param observer the previously registered observer.
      */
     public static synchronized void unregister(PurchaseObserver observer) {
@@ -54,6 +56,7 @@ public class ResponseHandler {
      * Notifies the application of the availability of the MarketBillingService.
      * This method is called in response to the application calling
      * {@link BillingService#checkBillingSupported()}.
+     *
      * @param supported true if in-app billing is supported.
      */
     public static void checkBillingSupportedResponse(boolean supported, String type) {
@@ -68,9 +71,9 @@ public class ResponseHandler {
      * we need to start the activity on the activity stack of the application.
      *
      * @param pendingIntent a PendingIntent that we received from Android Market that
-     *     will create the new buy page activity
-     * @param intent an intent containing a request id in an extra field that
-     *     will be passed to the buy page activity when it is created
+     *                      will create the new buy page activity
+     * @param intent        an intent containing a request id in an extra field that
+     *                      will be passed to the buy page activity when it is created
      */
     public static void buyPageIntentResponse(PendingIntent pendingIntent, Intent intent) {
         if (sPurchaseObserver == null) {
@@ -92,14 +95,15 @@ public class ResponseHandler {
      * the user has purchased an item, in which case the BillingService will
      * also call this method. Finally, this method can be called if the item
      * was refunded.
-     * @param purchaseState the state of the purchase request (PURCHASED,
-     *     CANCELED, or REFUNDED)
-     * @param productId a string identifying a product for sale
-     * @param orderId a string identifying the order
-     * @param purchaseTime the time the product was purchased, in milliseconds
-     *     since the epoch (Jan 1, 1970)
+     *
+     * @param purchaseState    the state of the purchase request (PURCHASED,
+     *                         CANCELED, or REFUNDED)
+     * @param productId        a string identifying a product for sale
+     * @param orderId          a string identifying the order
+     * @param purchaseTime     the time the product was purchased, in milliseconds
+     *                         since the epoch (Jan 1, 1970)
      * @param developerPayload the developer provided "payload" associated with
-     *     the order
+     *                         the order
      */
     public static void purchaseResponse(
             final Context context, final PurchaseState purchaseState, final String productId,
@@ -111,7 +115,7 @@ public class ResponseHandler {
 
                 // This needs to be synchronized because the UI thread can change the
                 // value of sPurchaseObserver.
-                synchronized(ResponseHandler.class) {
+                synchronized (ResponseHandler.class) {
                     if (sPurchaseObserver != null) {
                         sPurchaseObserver.postPurchaseStateChange(
                                 purchaseState, productId, 1, purchaseTime, developerPayload, purchaseToken);
@@ -128,14 +132,15 @@ public class ResponseHandler {
      * the server. This is NOT used for any purchase state changes. All
      * purchase state changes are received in the {@link BillingReceiver} and
      * are handled in {@link Security#verifyPurchase(String, String)}.
-     * @param context the context
-     * @param request the RequestPurchase request for which we received a
-     *     response code
+     *
+     * @param context      the context
+     * @param request      the RequestPurchase request for which we received a
+     *                     response code
      * @param responseCode a response code from Market to indicate the state
-     * of the request
+     *                     of the request
      */
     public static void responseCodeReceived(Context context, RequestPurchase request,
-            ResponseCode responseCode) {
+                                            ResponseCode responseCode) {
         if (sPurchaseObserver != null) {
             sPurchaseObserver.onRequestPurchaseResponse(request, responseCode);
         }
@@ -144,14 +149,15 @@ public class ResponseHandler {
     /**
      * This is called when we receive a response code from Android Market for a
      * RestoreTransactions request.
-     * @param context the context
-     * @param request the RestoreTransactions request for which we received a
-     *     response code
+     *
+     * @param context      the context
+     * @param request      the RestoreTransactions request for which we received a
+     *                     response code
      * @param responseCode a response code from Market to indicate the state
-     *     of the request
+     *                     of the request
      */
     public static void responseCodeReceived(Context context, RestoreTransactions request,
-            ResponseCode responseCode) {
+                                            ResponseCode responseCode) {
         if (sPurchaseObserver != null) {
             sPurchaseObserver.onRestoreTransactionsResponse(request, responseCode);
         }
diff --git a/astrid/src/com/todoroo/astrid/billing/Security.java b/astrid/src/com/todoroo/astrid/billing/Security.java
index d230dbab1..ad3890615 100644
--- a/astrid/src/com/todoroo/astrid/billing/Security.java
+++ b/astrid/src/com/todoroo/astrid/billing/Security.java
@@ -2,16 +2,17 @@
 
 package com.todoroo.astrid.billing;
 
+import com.todoroo.astrid.billing.BillingConstants.PurchaseState;
+
 import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.HashSet;
 
-import com.todoroo.astrid.billing.BillingConstants.PurchaseState;
-
 
 /**
  * This is a stub class
+ *
  * @author Sam
  */
 @SuppressWarnings("nls")
@@ -37,7 +38,7 @@ public class Security {
         public String purchaseToken;
 
         public VerifiedPurchase(PurchaseState purchaseState, String notificationId,
-                String productId, String orderId, long purchaseTime, String developerPayload, String purchaseToken) {
+                                String productId, String orderId, long purchaseTime, String developerPayload, String purchaseToken) {
             this.purchaseState = purchaseState;
             this.notificationId = notificationId;
             this.productId = productId;
@@ -48,7 +49,9 @@ public class Security {
         }
     }
 
-    /** Generates a nonce (a random number used once). */
+    /**
+     * Generates a nonce (a random number used once).
+     */
     public static long generateNonce() {
         long nonce = RANDOM.nextLong();
         sKnownNonces.add(nonce);
diff --git a/astrid/src/com/todoroo/astrid/dao/ABTestEventDao.java b/astrid/src/com/todoroo/astrid/dao/ABTestEventDao.java
index ffcc3dd3e..185f18ecf 100644
--- a/astrid/src/com/todoroo/astrid/dao/ABTestEventDao.java
+++ b/astrid/src/com/todoroo/astrid/dao/ABTestEventDao.java
@@ -29,13 +29,14 @@ public class ABTestEventDao extends DatabaseDao<ABTestEvent> {
     /**
      * Creates the baseline +0 days event (i.e. the first time the user
      * launches the app containing this test)
-     * @param testName - the name of the test
+     *
+     * @param testName    - the name of the test
      * @param testVariant - which option was chosen for this user
-     * @param newUser - are they a new user?
-     * @param activeUser - are they an activated user?
+     * @param newUser     - are they a new user?
+     * @param activeUser  - are they an activated user?
      */
     public void createInitialTestEvent(String testName, String testVariant,
-            boolean newUser, boolean activeUser) {
+                                       boolean newUser, boolean activeUser) {
         ABTestEvent event = new ABTestEvent();
         event.setValue(ABTestEvent.TEST_NAME, testName);
         event.setValue(ABTestEvent.TEST_VARIANT, testVariant);
@@ -49,9 +50,10 @@ public class ABTestEventDao extends DatabaseDao<ABTestEvent> {
 
     /**
      * Only public for unit testing--don't use unless you really mean it!
-     *
+     * <p/>
      * Creates data points for the specified test name, creating one data point
      * for each time interval that hasn't yet been recorded up to the specified one
+     *
      * @param testName
      * @param timeInterval
      */
@@ -108,8 +110,8 @@ public class ABTestEventDao extends DatabaseDao<ABTestEvent> {
                 String testName = event.getValue(ABTestEvent.TEST_NAME);
                 int timeInterval = -1;
                 long days = timeSinceBase / DateUtilities.ONE_DAY;
-                for(int i = 0; i < ABTestEvent.TIME_INTERVALS.length; i++)
-                    if(days >= ABTestEvent.TIME_INTERVALS[i])
+                for (int i = 0; i < ABTestEvent.TIME_INTERVALS.length; i++)
+                    if (days >= ABTestEvent.TIME_INTERVALS[i])
                         timeInterval = ABTestEvent.TIME_INTERVALS[i];
 
                 if (timeInterval > 0)
diff --git a/astrid/src/com/todoroo/astrid/dao/DaoReflectionHelpers.java b/astrid/src/com/todoroo/astrid/dao/DaoReflectionHelpers.java
index 5a35253da..686ac1cf0 100644
--- a/astrid/src/com/todoroo/astrid/dao/DaoReflectionHelpers.java
+++ b/astrid/src/com/todoroo/astrid/dao/DaoReflectionHelpers.java
@@ -1,11 +1,11 @@
 package com.todoroo.astrid.dao;
 
-import java.lang.reflect.Field;
-
 import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.data.Property;
 import com.todoroo.astrid.data.RemoteModel;
 
+import java.lang.reflect.Field;
+
 @SuppressWarnings("nls")
 public class DaoReflectionHelpers {
 
diff --git a/astrid/src/com/todoroo/astrid/dao/Database.java b/astrid/src/com/todoroo/astrid/dao/Database.java
index c99ffd53a..f0c2b04d3 100644
--- a/astrid/src/com/todoroo/astrid/dao/Database.java
+++ b/astrid/src/com/todoroo/astrid/dao/Database.java
@@ -42,7 +42,6 @@ import com.todoroo.astrid.widget.TasksWidget;
  * Database wrapper
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 public class Database extends AbstractDatabase {
@@ -64,27 +63,27 @@ public class Database extends AbstractDatabase {
      * List of table/ If you're adding a new table, add it to this list and
      * also make sure that our SQLite helper does the right thing.
      */
-    public static final Table[] TABLES =  new Table[] {
-        Task.TABLE,
-        Metadata.TABLE,
-        StoreObject.TABLE,
-        TagData.TABLE,
-        Update.TABLE,
-        User.TABLE,
-        UserActivity.TABLE,
-        ABTestEvent.TABLE,
-        TagMetadata.TABLE,
-        History.TABLE,
-        TaskAttachment.TABLE,
-        TaskListMetadata.TABLE,
-        WaitingOnMe.TABLE,
-
-        TaskOutstanding.TABLE,
-        TagOutstanding.TABLE,
-        UserActivityOutstanding.TABLE,
-        TaskAttachmentOutstanding.TABLE,
-        TaskListMetadataOutstanding.TABLE,
-        WaitingOnMeOutstanding.TABLE
+    public static final Table[] TABLES = new Table[]{
+            Task.TABLE,
+            Metadata.TABLE,
+            StoreObject.TABLE,
+            TagData.TABLE,
+            Update.TABLE,
+            User.TABLE,
+            UserActivity.TABLE,
+            ABTestEvent.TABLE,
+            TagMetadata.TABLE,
+            History.TABLE,
+            TaskAttachment.TABLE,
+            TaskListMetadata.TABLE,
+            WaitingOnMe.TABLE,
+
+            TaskOutstanding.TABLE,
+            TagOutstanding.TABLE,
+            UserActivityOutstanding.TABLE,
+            TaskAttachmentOutstanding.TABLE,
+            TaskListMetadataOutstanding.TABLE,
+            WaitingOnMeOutstanding.TABLE
     };
 
     // --- listeners
@@ -125,284 +124,302 @@ public class Database extends AbstractDatabase {
     protected synchronized void onCreateTables() {
         StringBuilder sql = new StringBuilder();
         sql.append("CREATE INDEX IF NOT EXISTS md_tid ON ").
-        append(Metadata.TABLE).append('(').
-        append(Metadata.TASK.name).
-        append(')');
+                append(Metadata.TABLE).append('(').
+                append(Metadata.TASK.name).
+                append(')');
         database.execSQL(sql.toString());
         sql.setLength(0);
 
         sql.append("CREATE INDEX IF NOT EXISTS md_tkid ON ").
-        append(Metadata.TABLE).append('(').
-        append(Metadata.TASK.name).append(',').
-        append(Metadata.KEY.name).
-        append(')');
+                append(Metadata.TABLE).append('(').
+                append(Metadata.TASK.name).append(',').
+                append(Metadata.KEY.name).
+                append(')');
         database.execSQL(sql.toString());
         sql.setLength(0);
 
         sql.append("CREATE INDEX IF NOT EXISTS so_id ON ").
-        append(StoreObject.TABLE).append('(').
-        append(StoreObject.TYPE.name).append(',').
-        append(StoreObject.ITEM.name).
-        append(')');
+                append(StoreObject.TABLE).append('(').
+                append(StoreObject.TYPE.name).append(',').
+                append(StoreObject.ITEM.name).
+                append(')');
         database.execSQL(sql.toString());
         sql.setLength(0);
 
         sql.append("CREATE UNIQUE INDEX IF NOT EXISTS t_rid ON ").
-        append(Task.TABLE).append('(').
-        append(Task.UUID.name).
-        append(')');
+                append(Task.TABLE).append('(').
+                append(Task.UUID.name).
+                append(')');
         database.execSQL(sql.toString());
         sql.setLength(0);
 
         sql.append("CREATE INDEX IF NOT EXISTS hist_tag_id ON ").
-        append(History.TABLE).append('(').
-        append(History.TAG_ID.name).
-        append(')');
+                append(History.TABLE).append('(').
+                append(History.TAG_ID.name).
+                append(')');
         database.execSQL(sql.toString());
         sql.setLength(0);
     }
 
     @Override
-    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="SF_SWITCH_FALLTHROUGH")
+    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "SF_SWITCH_FALLTHROUGH")
     protected synchronized boolean onUpgrade(int oldVersion, int newVersion) {
         SqlConstructorVisitor visitor = new SqlConstructorVisitor();
-        switch(oldVersion) {
-        case 1: {
-            database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
-                    Task.RECURRENCE.accept(visitor, null));
-        }
-        case 2: {
-            for(Property<?> property : new Property<?>[] { Metadata.VALUE2,
-                    Metadata.VALUE3, Metadata.VALUE4, Metadata.VALUE5 })
-                database.execSQL("ALTER TABLE " + Metadata.TABLE.name + " ADD " +
-                        property.accept(visitor, null));
-        }
-        case 3: {
-            database.execSQL(createTableSql(visitor, StoreObject.TABLE.name, StoreObject.PROPERTIES));
-
-            onCreateTables();
-        }
-        case 4: {
-            database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
-                    Task.DETAILS.accept(visitor, null));
-        }
-        case 5: {
-            database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
-                    Task.REMINDER_SNOOZE.accept(visitor, null));
-        }
-        case 6: {
-            database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
-                    Task.DETAILS_DATE.accept(visitor, null));
-        }
-        case 7: {
-            database.execSQL("ALTER TABLE " + Metadata.TABLE.name + " ADD " +
-                    Metadata.CREATION_DATE.accept(visitor, null));
-        }
-        case 8: {
-            // not needed anymore
-        }
-        case 9: try {
-            database.execSQL(createTableSql(visitor, Update.TABLE.name, Update.PROPERTIES));
-            onCreateTables();
-
-            Property<?>[] properties = new Property<?>[] { Task.UUID,
-                    Task.USER_ID };
-
-            for(Property<?> property : properties) {
+        switch (oldVersion) {
+            case 1: {
                 database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
-                        property.accept(visitor, null) + " DEFAULT 0");
+                        Task.RECURRENCE.accept(visitor, null));
             }
+            case 2: {
+                for (Property<?> property : new Property<?>[]{Metadata.VALUE2,
+                        Metadata.VALUE3, Metadata.VALUE4, Metadata.VALUE5})
+                    database.execSQL("ALTER TABLE " + Metadata.TABLE.name + " ADD " +
+                            property.accept(visitor, null));
+            }
+            case 3: {
+                database.execSQL(createTableSql(visitor, StoreObject.TABLE.name, StoreObject.PROPERTIES));
 
-            database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
-                    Task.USER.accept(visitor, null));
-        } catch (SQLiteException e) {
-            Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 10: try {
-            //
-        } catch (SQLiteException e) {
-            Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 11: try {
-            database.execSQL(createTableSql(visitor, TagData.TABLE.name, TagData.PROPERTIES));
-        } catch (SQLiteException e) {
-            Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 12: try {
-            database.execSQL("ALTER TABLE " + Update.TABLE.name + " ADD " +
-                    Update.TAGS.accept(visitor, null));
-        } catch (SQLiteException e) {
-            Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 13: try {
-            database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " +
-                    TagData.MEMBERS.accept(visitor, null));
-            database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " +
-                    TagData.MEMBER_COUNT.accept(visitor, null) + " DEFAULT 0");
-        } catch (SQLiteException e) {
-            Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 14: try {
-            database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " +
-                    TagData.TASK_COUNT.accept(visitor, null) + " DEFAULT 0");
-        } catch (SQLiteException e) {
-            Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 15: try {
-            database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
-                    Task.LAST_SYNC.accept(visitor, null) + " DEFAULT 0");
-        } catch (SQLiteException e) {
-            Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 16: try {
-            database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
-                    Task.CREATOR_ID.accept(visitor, null) + " DEFAULT 0");
-        } catch (SQLiteException e) {
-            Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 17: try {
-            database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " +
-                    TagData.TAG_DESCRIPTION.accept(visitor, null));
-        } catch (SQLiteException e) {
-            Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 18: try {
-            database.execSQL("ALTER TABLE " + Metadata.TABLE.name + " ADD " +
-                    Metadata.VALUE6.accept(visitor, null));
-            database.execSQL("ALTER TABLE " + Metadata.TABLE.name + " ADD " +
-                    Metadata.VALUE7.accept(visitor, null));
-        } catch (SQLiteException e) {
-            Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 19: try {
-            for(Property<?> property : new Property<?>[] { Update.TASK_LOCAL, Update.TAGS_LOCAL })
-                database.execSQL("ALTER TABLE " + Update.TABLE.name + " ADD " +
-                        property.accept(visitor, null));
-            database.execSQL("CREATE INDEX IF NOT EXISTS up_tid ON " +
-                    Update.TABLE + "(" + Update.TASK_LOCAL.name + ")");
-            database.execSQL("CREATE INDEX IF NOT EXISTS up_tid ON " +
-                    Update.TABLE + "(" + Update.TAGS_LOCAL.name + ")");
-
-        } catch (SQLiteException e) {
-            Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 20: try {
-            String tasks = Task.TABLE.name;
-            String id = Task.ID.name;
-            String remoteId = Task.UUID.name;
-
-            // Delete any items that have duplicate remote ids
-            String deleteDuplicates = String.format("DELETE FROM %s WHERE %s IN (SELECT %s.%s FROM %s, %s AS t2 WHERE %s.%s < t2.%s AND %s.%s = t2.%s AND %s.%s > 0 GROUP BY %s.%s)",
-                    tasks, id, tasks, id, tasks, tasks, tasks, id, id, tasks, remoteId, remoteId, tasks, remoteId, tasks, id);
-
-            // Change all items with remote id = 0 to be remote id = NULL
-            String changeZeroes = String.format("UPDATE %s SET %s = NULL WHERE %s = 0", tasks, remoteId, remoteId);
-
-            database.execSQL(deleteDuplicates);
-            database.execSQL(changeZeroes);
-
-            onCreateTables();
-        } catch (SQLiteException e) {
-            Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 21: try {
-            for(Property<?> property : new Property<?>[] { Update.OTHER_USER_ID, Update.OTHER_USER })
-                database.execSQL("ALTER TABLE " + Update.TABLE.name + " ADD " +
-                        property.accept(visitor, null));
-
-        }
-        catch (SQLiteException e) {
-            Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 22: try {
-            database.execSQL(createTableSql(visitor, User.TABLE.name, User.PROPERTIES));
-            onCreateTables();
-        } catch (SQLiteException e) {
-            Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-
-        case 23: try {
-            database.execSQL(createTableSql(visitor, ABTestEvent.TABLE.name, ABTestEvent.PROPERTIES));
-        } catch (SQLiteException e) {
-            Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-
-        case 24: try {
-            database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
-                    Task.REPEAT_UNTIL.accept(visitor, null));
-        } catch (SQLiteException e) {
-            Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-
-        case 25: try {
-            database.execSQL("ALTER TABLE " + User.TABLE.name + " ADD " +
-                    User.STATUS.accept(visitor, null));
-
-            database.execSQL("ALTER TABLE " + User.TABLE.name + " ADD " +
-                    User.PENDING_STATUS.accept(visitor, null));
-        } catch (SQLiteException e) {
-            Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 26: try {
-            database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " +
-                    TagData.TAG_ORDERING.accept(visitor, null));
-        } catch (SQLiteException e) {
-            Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 27: try {
-            database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
-                    Task.SOCIAL_REMINDER.accept(visitor, null));
-        } catch (SQLiteException e) {
-            Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
-        }
-        case 28:
-        case 29:
-            tryExecSQL(createTableSql(visitor, TaskOutstanding.TABLE.name, TaskOutstanding.PROPERTIES));
-            tryExecSQL(createTableSql(visitor, TagOutstanding.TABLE.name, TagOutstanding.PROPERTIES));
-            tryExecSQL(createTableSql(visitor, TaskAttachmentOutstanding.TABLE.name, TagOutstanding.PROPERTIES));
-            tryExecSQL(createTableSql(visitor, TagMetadata.TABLE.name, TagMetadata.PROPERTIES));
-            tryExecSQL(createTableSql(visitor, UserActivity.TABLE.name, UserActivity.PROPERTIES));
-            tryExecSQL(createTableSql(visitor, UserActivityOutstanding.TABLE.name, UserActivityOutstanding.PROPERTIES));
-            tryExecSQL(createTableSql(visitor, TaskAttachment.TABLE.name, TaskAttachment.PROPERTIES));
-            tryExecSQL(createTableSql(visitor, TaskListMetadata.TABLE.name, TaskListMetadata.PROPERTIES));
-            tryExecSQL(createTableSql(visitor, TaskListMetadataOutstanding.TABLE.name, TaskListMetadataOutstanding.PROPERTIES));
-
-            tryExecSQL(addColumnSql(Task.TABLE, Task.PUSHED_AT, visitor, null));
-            tryExecSQL(addColumnSql(Task.TABLE, Task.IS_PUBLIC, visitor, "0"));
-            tryExecSQL(addColumnSql(Task.TABLE, Task.IS_READONLY, visitor, "0"));
-            tryExecSQL(addColumnSql(Task.TABLE, Task.CLASSIFICATION, visitor, null));
-            tryExecSQL(addColumnSql(Task.TABLE, Task.HISTORY_FETCH_DATE, visitor, null));
-            tryExecSQL(addColumnSql(Task.TABLE, Task.ATTACHMENTS_PUSHED_AT, visitor, null));
-            tryExecSQL(addColumnSql(Task.TABLE, Task.USER_ACTIVITIES_PUSHED_AT, visitor, null));
-            tryExecSQL(addColumnSql(TagData.TABLE, TagData.PUSHED_AT, visitor, null));
-            tryExecSQL(addColumnSql(TagData.TABLE, TagData.HISTORY_FETCH_DATE, visitor, null));
-            tryExecSQL(addColumnSql(TagData.TABLE, TagData.TASKS_PUSHED_AT, visitor, null));
-            tryExecSQL(addColumnSql(TagData.TABLE, TagData.METADATA_PUSHED_AT, visitor, null));
-            tryExecSQL(addColumnSql(TagData.TABLE, TagData.USER_ACTIVITIES_PUSHED_AT, visitor, null));
-            tryExecSQL(addColumnSql(Metadata.TABLE, Metadata.DELETION_DATE, visitor, "0"));
-            tryExecSQL(addColumnSql(User.TABLE, User.PUSHED_AT, visitor, null));
-            tryExecSQL(addColumnSql(User.TABLE, User.FIRST_NAME, visitor, null));
-            tryExecSQL(addColumnSql(User.TABLE, User.LAST_NAME, visitor, null));
-
-        case 30:
-            tryExecSQL(createTableSql(visitor, WaitingOnMe.TABLE.name, WaitingOnMe.PROPERTIES));
-            tryExecSQL(createTableSql(visitor, WaitingOnMeOutstanding.TABLE.name, WaitingOnMeOutstanding.PROPERTIES));
-
-        case 31:
-            tryExecSQL(addColumnSql(Task.TABLE, Task.HISTORY_HAS_MORE, visitor, null));
-            tryExecSQL(addColumnSql(TagData.TABLE, TagData.HISTORY_HAS_MORE, visitor, null));
-        case 32:
-            tryExecSQL("DROP TABLE " + History.TABLE.name);
-            tryExecSQL(createTableSql(visitor, History.TABLE.name, History.PROPERTIES));
-            tryExecSQL(addColumnSql(User.TABLE, User.TASKS_PUSHED_AT, visitor, null));
-        case 33:
-            tryExecSQL(addColumnSql(TagData.TABLE, TagData.LAST_AUTOSYNC, visitor, null));
-            tryExecSQL(addColumnSql(User.TABLE, User.LAST_AUTOSYNC, visitor, null));
-
-        case 34:
-            tryExecSQL(addColumnSql(TagData.TABLE, TagData.IS_FOLDER, visitor, null));
-
-        return true;
+                onCreateTables();
+            }
+            case 4: {
+                database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
+                        Task.DETAILS.accept(visitor, null));
+            }
+            case 5: {
+                database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
+                        Task.REMINDER_SNOOZE.accept(visitor, null));
+            }
+            case 6: {
+                database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
+                        Task.DETAILS_DATE.accept(visitor, null));
+            }
+            case 7: {
+                database.execSQL("ALTER TABLE " + Metadata.TABLE.name + " ADD " +
+                        Metadata.CREATION_DATE.accept(visitor, null));
+            }
+            case 8: {
+                // not needed anymore
+            }
+            case 9:
+                try {
+                    database.execSQL(createTableSql(visitor, Update.TABLE.name, Update.PROPERTIES));
+                    onCreateTables();
+
+                    Property<?>[] properties = new Property<?>[]{Task.UUID,
+                            Task.USER_ID};
+
+                    for (Property<?> property : properties) {
+                        database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
+                                property.accept(visitor, null) + " DEFAULT 0");
+                    }
+
+                    database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
+                            Task.USER.accept(visitor, null));
+                } catch (SQLiteException e) {
+                    Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
+                }
+            case 10:
+                try {
+                    //
+                } catch (SQLiteException e) {
+                    Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
+                }
+            case 11:
+                try {
+                    database.execSQL(createTableSql(visitor, TagData.TABLE.name, TagData.PROPERTIES));
+                } catch (SQLiteException e) {
+                    Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
+                }
+            case 12:
+                try {
+                    database.execSQL("ALTER TABLE " + Update.TABLE.name + " ADD " +
+                            Update.TAGS.accept(visitor, null));
+                } catch (SQLiteException e) {
+                    Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
+                }
+            case 13:
+                try {
+                    database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " +
+                            TagData.MEMBERS.accept(visitor, null));
+                    database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " +
+                            TagData.MEMBER_COUNT.accept(visitor, null) + " DEFAULT 0");
+                } catch (SQLiteException e) {
+                    Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
+                }
+            case 14:
+                try {
+                    database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " +
+                            TagData.TASK_COUNT.accept(visitor, null) + " DEFAULT 0");
+                } catch (SQLiteException e) {
+                    Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
+                }
+            case 15:
+                try {
+                    database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
+                            Task.LAST_SYNC.accept(visitor, null) + " DEFAULT 0");
+                } catch (SQLiteException e) {
+                    Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
+                }
+            case 16:
+                try {
+                    database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
+                            Task.CREATOR_ID.accept(visitor, null) + " DEFAULT 0");
+                } catch (SQLiteException e) {
+                    Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
+                }
+            case 17:
+                try {
+                    database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " +
+                            TagData.TAG_DESCRIPTION.accept(visitor, null));
+                } catch (SQLiteException e) {
+                    Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
+                }
+            case 18:
+                try {
+                    database.execSQL("ALTER TABLE " + Metadata.TABLE.name + " ADD " +
+                            Metadata.VALUE6.accept(visitor, null));
+                    database.execSQL("ALTER TABLE " + Metadata.TABLE.name + " ADD " +
+                            Metadata.VALUE7.accept(visitor, null));
+                } catch (SQLiteException e) {
+                    Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
+                }
+            case 19:
+                try {
+                    for (Property<?> property : new Property<?>[]{Update.TASK_LOCAL, Update.TAGS_LOCAL})
+                        database.execSQL("ALTER TABLE " + Update.TABLE.name + " ADD " +
+                                property.accept(visitor, null));
+                    database.execSQL("CREATE INDEX IF NOT EXISTS up_tid ON " +
+                            Update.TABLE + "(" + Update.TASK_LOCAL.name + ")");
+                    database.execSQL("CREATE INDEX IF NOT EXISTS up_tid ON " +
+                            Update.TABLE + "(" + Update.TAGS_LOCAL.name + ")");
+
+                } catch (SQLiteException e) {
+                    Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
+                }
+            case 20:
+                try {
+                    String tasks = Task.TABLE.name;
+                    String id = Task.ID.name;
+                    String remoteId = Task.UUID.name;
+
+                    // Delete any items that have duplicate remote ids
+                    String deleteDuplicates = String.format("DELETE FROM %s WHERE %s IN (SELECT %s.%s FROM %s, %s AS t2 WHERE %s.%s < t2.%s AND %s.%s = t2.%s AND %s.%s > 0 GROUP BY %s.%s)",
+                            tasks, id, tasks, id, tasks, tasks, tasks, id, id, tasks, remoteId, remoteId, tasks, remoteId, tasks, id);
+
+                    // Change all items with remote id = 0 to be remote id = NULL
+                    String changeZeroes = String.format("UPDATE %s SET %s = NULL WHERE %s = 0", tasks, remoteId, remoteId);
+
+                    database.execSQL(deleteDuplicates);
+                    database.execSQL(changeZeroes);
+
+                    onCreateTables();
+                } catch (SQLiteException e) {
+                    Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
+                }
+            case 21:
+                try {
+                    for (Property<?> property : new Property<?>[]{Update.OTHER_USER_ID, Update.OTHER_USER})
+                        database.execSQL("ALTER TABLE " + Update.TABLE.name + " ADD " +
+                                property.accept(visitor, null));
+
+                } catch (SQLiteException e) {
+                    Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
+                }
+            case 22:
+                try {
+                    database.execSQL(createTableSql(visitor, User.TABLE.name, User.PROPERTIES));
+                    onCreateTables();
+                } catch (SQLiteException e) {
+                    Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
+                }
+
+            case 23:
+                try {
+                    database.execSQL(createTableSql(visitor, ABTestEvent.TABLE.name, ABTestEvent.PROPERTIES));
+                } catch (SQLiteException e) {
+                    Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
+                }
+
+            case 24:
+                try {
+                    database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
+                            Task.REPEAT_UNTIL.accept(visitor, null));
+                } catch (SQLiteException e) {
+                    Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
+                }
+
+            case 25:
+                try {
+                    database.execSQL("ALTER TABLE " + User.TABLE.name + " ADD " +
+                            User.STATUS.accept(visitor, null));
+
+                    database.execSQL("ALTER TABLE " + User.TABLE.name + " ADD " +
+                            User.PENDING_STATUS.accept(visitor, null));
+                } catch (SQLiteException e) {
+                    Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
+                }
+            case 26:
+                try {
+                    database.execSQL("ALTER TABLE " + TagData.TABLE.name + " ADD " +
+                            TagData.TAG_ORDERING.accept(visitor, null));
+                } catch (SQLiteException e) {
+                    Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
+                }
+            case 27:
+                try {
+                    database.execSQL("ALTER TABLE " + Task.TABLE.name + " ADD " +
+                            Task.SOCIAL_REMINDER.accept(visitor, null));
+                } catch (SQLiteException e) {
+                    Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e);
+                }
+            case 28:
+            case 29:
+                tryExecSQL(createTableSql(visitor, TaskOutstanding.TABLE.name, TaskOutstanding.PROPERTIES));
+                tryExecSQL(createTableSql(visitor, TagOutstanding.TABLE.name, TagOutstanding.PROPERTIES));
+                tryExecSQL(createTableSql(visitor, TaskAttachmentOutstanding.TABLE.name, TagOutstanding.PROPERTIES));
+                tryExecSQL(createTableSql(visitor, TagMetadata.TABLE.name, TagMetadata.PROPERTIES));
+                tryExecSQL(createTableSql(visitor, UserActivity.TABLE.name, UserActivity.PROPERTIES));
+                tryExecSQL(createTableSql(visitor, UserActivityOutstanding.TABLE.name, UserActivityOutstanding.PROPERTIES));
+                tryExecSQL(createTableSql(visitor, TaskAttachment.TABLE.name, TaskAttachment.PROPERTIES));
+                tryExecSQL(createTableSql(visitor, TaskListMetadata.TABLE.name, TaskListMetadata.PROPERTIES));
+                tryExecSQL(createTableSql(visitor, TaskListMetadataOutstanding.TABLE.name, TaskListMetadataOutstanding.PROPERTIES));
+
+                tryExecSQL(addColumnSql(Task.TABLE, Task.PUSHED_AT, visitor, null));
+                tryExecSQL(addColumnSql(Task.TABLE, Task.IS_PUBLIC, visitor, "0"));
+                tryExecSQL(addColumnSql(Task.TABLE, Task.IS_READONLY, visitor, "0"));
+                tryExecSQL(addColumnSql(Task.TABLE, Task.CLASSIFICATION, visitor, null));
+                tryExecSQL(addColumnSql(Task.TABLE, Task.HISTORY_FETCH_DATE, visitor, null));
+                tryExecSQL(addColumnSql(Task.TABLE, Task.ATTACHMENTS_PUSHED_AT, visitor, null));
+                tryExecSQL(addColumnSql(Task.TABLE, Task.USER_ACTIVITIES_PUSHED_AT, visitor, null));
+                tryExecSQL(addColumnSql(TagData.TABLE, TagData.PUSHED_AT, visitor, null));
+                tryExecSQL(addColumnSql(TagData.TABLE, TagData.HISTORY_FETCH_DATE, visitor, null));
+                tryExecSQL(addColumnSql(TagData.TABLE, TagData.TASKS_PUSHED_AT, visitor, null));
+                tryExecSQL(addColumnSql(TagData.TABLE, TagData.METADATA_PUSHED_AT, visitor, null));
+                tryExecSQL(addColumnSql(TagData.TABLE, TagData.USER_ACTIVITIES_PUSHED_AT, visitor, null));
+                tryExecSQL(addColumnSql(Metadata.TABLE, Metadata.DELETION_DATE, visitor, "0"));
+                tryExecSQL(addColumnSql(User.TABLE, User.PUSHED_AT, visitor, null));
+                tryExecSQL(addColumnSql(User.TABLE, User.FIRST_NAME, visitor, null));
+                tryExecSQL(addColumnSql(User.TABLE, User.LAST_NAME, visitor, null));
+
+            case 30:
+                tryExecSQL(createTableSql(visitor, WaitingOnMe.TABLE.name, WaitingOnMe.PROPERTIES));
+                tryExecSQL(createTableSql(visitor, WaitingOnMeOutstanding.TABLE.name, WaitingOnMeOutstanding.PROPERTIES));
+
+            case 31:
+                tryExecSQL(addColumnSql(Task.TABLE, Task.HISTORY_HAS_MORE, visitor, null));
+                tryExecSQL(addColumnSql(TagData.TABLE, TagData.HISTORY_HAS_MORE, visitor, null));
+            case 32:
+                tryExecSQL("DROP TABLE " + History.TABLE.name);
+                tryExecSQL(createTableSql(visitor, History.TABLE.name, History.PROPERTIES));
+                tryExecSQL(addColumnSql(User.TABLE, User.TASKS_PUSHED_AT, visitor, null));
+            case 33:
+                tryExecSQL(addColumnSql(TagData.TABLE, TagData.LAST_AUTOSYNC, visitor, null));
+                tryExecSQL(addColumnSql(User.TABLE, User.LAST_AUTOSYNC, visitor, null));
+
+            case 34:
+                tryExecSQL(addColumnSql(TagData.TABLE, TagData.IS_FOLDER, visitor, null));
+
+                return true;
         }
 
         return false;
@@ -420,9 +437,9 @@ public class Database extends AbstractDatabase {
     private static String addColumnSql(Table table, Property<?> property, SqlConstructorVisitor visitor, String defaultValue) {
         StringBuilder builder = new StringBuilder();
         builder.append("ALTER TABLE ")
-               .append(table.name)
-               .append(" ADD ")
-               .append(property.accept(visitor, null));
+                .append(table.name)
+                .append(" ADD ")
+                .append(property.accept(visitor, null));
         if (!TextUtils.isEmpty(defaultValue)) {
             builder.append(" DEFAULT ").append(defaultValue);
         }
@@ -444,18 +461,19 @@ public class Database extends AbstractDatabase {
 
     /**
      * Create table generation SQL
+     *
      * @param sql
      * @param tableName
      * @param properties
      * @return
      */
     public String createTableSql(SqlConstructorVisitor visitor,
-            String tableName, Property<?>[] properties) {
+                                 String tableName, Property<?>[] properties) {
         StringBuilder sql = new StringBuilder();
         sql.append("CREATE TABLE IF NOT EXISTS ").append(tableName).append('(').
-        append(AbstractModel.ID_PROPERTY).append(" INTEGER PRIMARY KEY AUTOINCREMENT");
-        for(Property<?> property : properties) {
-            if(AbstractModel.ID_PROPERTY.name.equals(property.name))
+                append(AbstractModel.ID_PROPERTY).append(" INTEGER PRIMARY KEY AUTOINCREMENT");
+        for (Property<?> property : properties) {
+            if (AbstractModel.ID_PROPERTY.name.equals(property.name))
                 continue;
             sql.append(',').append(property.accept(visitor, null));
         }
diff --git a/astrid/src/com/todoroo/astrid/dao/HistoryDao.java b/astrid/src/com/todoroo/astrid/dao/HistoryDao.java
index 1d815fa4c..e21e4aa42 100644
--- a/astrid/src/com/todoroo/astrid/dao/HistoryDao.java
+++ b/astrid/src/com/todoroo/astrid/dao/HistoryDao.java
@@ -29,7 +29,7 @@ public class HistoryDao extends DatabaseDao<History> {
     @Override
     public boolean saveExisting(History item) {
         ContentValues values = item.getSetValues();
-        if(values == null || values.size() == 0)
+        if (values == null || values.size() == 0)
             return false;
         return super.saveExisting(item);
     }
diff --git a/astrid/src/com/todoroo/astrid/dao/MetadataDao.java b/astrid/src/com/todoroo/astrid/dao/MetadataDao.java
index 31da0e6e0..48f1de679 100644
--- a/astrid/src/com/todoroo/astrid/dao/MetadataDao.java
+++ b/astrid/src/com/todoroo/astrid/dao/MetadataDao.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.dao;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-
 import android.content.ContentValues;
 import android.database.Cursor;
 
@@ -37,19 +34,21 @@ import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.tags.TaskToTagMetadata;
 import com.todoroo.astrid.utility.AstridPreferences;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+
 /**
  * Data Access layer for {@link Metadata}-related operations.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class MetadataDao extends DatabaseDao<Metadata> {
 
     @Autowired
     private Database database;
 
-    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="UR_UNINIT_READ")
-	public MetadataDao() {
+    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "UR_UNINIT_READ")
+    public MetadataDao() {
         super(Metadata.class);
         DependencyInjectionService.getInstance().inject(this);
         setDatabase(database);
@@ -62,20 +61,26 @@ public class MetadataDao extends DatabaseDao<Metadata> {
      */
     public static class MetadataCriteria {
 
-    	/** Returns all metadata associated with a given task */
-    	public static Criterion byTask(long taskId) {
-    	    return Metadata.TASK.eq(taskId);
-    	}
+        /**
+         * Returns all metadata associated with a given task
+         */
+        public static Criterion byTask(long taskId) {
+            return Metadata.TASK.eq(taskId);
+        }
 
-    	/** Returns all metadata associated with a given key */
-    	public static Criterion withKey(String key) {
-    	    return Metadata.KEY.eq(key);
-    	}
+        /**
+         * Returns all metadata associated with a given key
+         */
+        public static Criterion withKey(String key) {
+            return Metadata.KEY.eq(key);
+        }
 
-    	/** Returns all metadata associated with a given key */
-    	public static Criterion byTaskAndwithKey(long taskId, String key) {
-    	    return Criterion.and(withKey(key), byTask(taskId));
-    	}
+        /**
+         * Returns all metadata associated with a given key
+         */
+        public static Criterion byTaskAndwithKey(long taskId, String key) {
+            return Criterion.and(withKey(key), byTask(taskId));
+        }
 
     }
 
@@ -85,8 +90,8 @@ public class MetadataDao extends DatabaseDao<Metadata> {
         return super.shouldRecordOutstanding(item) && cv != null &&
                 ((cv.containsKey(Metadata.KEY.name) &&
                         TaskToTagMetadata.KEY.equals(item.getValue(Metadata.KEY))) ||
-                (cv.containsKey(Metadata.DELETION_DATE.name) &&
-                        item.getValue(Metadata.DELETION_DATE) > 0)) &&
+                        (cv.containsKey(Metadata.DELETION_DATE.name) &&
+                                item.getValue(Metadata.DELETION_DATE) > 0)) &&
                 RemoteModelDao.getOutstandingEntryFlag(RemoteModelDao.OUTSTANDING_ENTRY_FLAG_RECORD_OUTSTANDING);
     }
 
@@ -119,14 +124,14 @@ public class MetadataDao extends DatabaseDao<Metadata> {
      * are not identical to those in the metadata list, creates rows that
      * have no match.
      *
-     * @param taskId id of task to perform synchronization on
-     * @param metadata list of new metadata items to save
+     * @param taskId           id of task to perform synchronization on
+     * @param metadata         list of new metadata items to save
      * @param metadataCriteria criteria to load data for comparison from metadata
      */
     public void synchronizeMetadata(long taskId, ArrayList<Metadata> metadata,
-            Criterion metadataCriteria) {
+                                    Criterion metadataCriteria) {
         HashSet<ContentValues> newMetadataValues = new HashSet<ContentValues>();
-        for(Metadata metadatum : metadata) {
+        for (Metadata metadatum : metadata) {
             metadatum.setValue(Metadata.TASK, taskId);
             metadatum.clearValue(Metadata.ID);
             newMetadataValues.add(metadatum.getMergedValues());
@@ -137,14 +142,14 @@ public class MetadataDao extends DatabaseDao<Metadata> {
                 metadataCriteria)));
         try {
             // try to find matches within our metadata list
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 item.readFromCursor(cursor);
                 long id = item.getId();
 
                 // clear item id when matching with incoming values
                 item.clearValue(Metadata.ID);
                 ContentValues itemMergedValues = item.getMergedValues();
-                if(newMetadataValues.contains(itemMergedValues)) {
+                if (newMetadataValues.contains(itemMergedValues)) {
                     newMetadataValues.remove(itemMergedValues);
                     continue;
                 }
@@ -157,7 +162,7 @@ public class MetadataDao extends DatabaseDao<Metadata> {
         }
 
         // everything that remains shall be written
-        for(ContentValues values : newMetadataValues) {
+        for (ContentValues values : newMetadataValues) {
             item.clear();
             item.mergeWith(values);
             persist(item);
@@ -166,11 +171,11 @@ public class MetadataDao extends DatabaseDao<Metadata> {
 
     @Override
     public boolean persist(Metadata item) {
-        if(!item.containsValue(Metadata.CREATION_DATE))
+        if (!item.containsValue(Metadata.CREATION_DATE))
             item.setValue(Metadata.CREATION_DATE, DateUtilities.now());
 
         boolean state = super.persist(item);
-        if(Preferences.getBoolean(AstridPreferences.P_FIRST_LIST, true)) {
+        if (Preferences.getBoolean(AstridPreferences.P_FIRST_LIST, true)) {
             if (state && item.containsNonNullValue(Metadata.KEY) &&
                     item.getValue(Metadata.KEY).equals(TaskToTagMetadata.KEY)) {
                 StatisticsService.reportEvent(StatisticsConstants.USER_FIRST_LIST);
@@ -183,6 +188,7 @@ public class MetadataDao extends DatabaseDao<Metadata> {
 
     /**
      * Fetch all metadata that are unattached to the task
+     *
      * @param database
      * @param properties
      * @return
diff --git a/astrid/src/com/todoroo/astrid/dao/RemoteModelDao.java b/astrid/src/com/todoroo/astrid/dao/RemoteModelDao.java
index 1bac5c2c8..a70eda0bc 100644
--- a/astrid/src/com/todoroo/astrid/dao/RemoteModelDao.java
+++ b/astrid/src/com/todoroo/astrid/dao/RemoteModelDao.java
@@ -14,9 +14,9 @@ import com.todoroo.astrid.helper.UUIDHelper;
  * require UUID generation (i.e., most RemoteModels). The createNew
  * method takes care of automatically generating a new UUID for each newly
  * created model if one doesn't already exist.
- * @author Sam
  *
  * @param <RTYPE>
+ * @author Sam
  */
 public class RemoteModelDao<RTYPE extends RemoteModel> extends DatabaseDao<RTYPE> {
 
@@ -66,6 +66,7 @@ public class RemoteModelDao<RTYPE extends RemoteModel> extends DatabaseDao<RTYPE
 
     /**
      * Fetch a model object by UUID
+     *
      * @param uuid
      * @param properties
      * @return
@@ -79,12 +80,9 @@ public class RemoteModelDao<RTYPE extends RemoteModel> extends DatabaseDao<RTYPE
      * Returns cursor to object corresponding to the given identifier
      *
      * @param database
-     * @param table
-     *            name of table
-     * @param properties
-     *            properties to read
-     * @param id
-     *            id of item
+     * @param table      name of table
+     * @param properties properties to read
+     * @param id         id of item
      * @return
      */
     protected TodorooCursor<RTYPE> fetchItem(String uuid, Property<?>... properties) {
@@ -96,6 +94,7 @@ public class RemoteModelDao<RTYPE extends RemoteModel> extends DatabaseDao<RTYPE
 
     /**
      * Get the local id
+     *
      * @param uuid
      * @return
      */
diff --git a/astrid/src/com/todoroo/astrid/dao/StoreObjectDao.java b/astrid/src/com/todoroo/astrid/dao/StoreObjectDao.java
index fecb3f009..dd295742d 100644
--- a/astrid/src/com/todoroo/astrid/dao/StoreObjectDao.java
+++ b/astrid/src/com/todoroo/astrid/dao/StoreObjectDao.java
@@ -15,15 +15,14 @@ import com.todoroo.astrid.data.StoreObject;
  * Data Access layer for {@link StoreObject}-related operations.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class StoreObjectDao extends DatabaseDao<StoreObject> {
 
     @Autowired
     private Database database;
 
-    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="UR_UNINIT_READ")
-	public StoreObjectDao() {
+    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "UR_UNINIT_READ")
+    public StoreObjectDao() {
         super(StoreObject.class);
         DependencyInjectionService.getInstance().inject(this);
         setDatabase(database);
@@ -36,15 +35,19 @@ public class StoreObjectDao extends DatabaseDao<StoreObject> {
      */
     public static class StoreObjectCriteria {
 
-    	/** Returns all store objects with given type */
-    	public static Criterion byType(String type) {
-    	    return StoreObject.TYPE.eq(type);
-    	}
-
-    	/** Returns store object with type and key */
-    	public static Criterion byTypeAndItem(String type, String item) {
-    	    return Criterion.and(byType(type), StoreObject.ITEM.eq(item));
-    	}
+        /**
+         * Returns all store objects with given type
+         */
+        public static Criterion byType(String type) {
+            return StoreObject.TYPE.eq(type);
+        }
+
+        /**
+         * Returns store object with type and key
+         */
+        public static Criterion byTypeAndItem(String type, String item) {
+            return Criterion.and(byType(type), StoreObject.ITEM.eq(item));
+        }
 
     }
 
diff --git a/astrid/src/com/todoroo/astrid/dao/TagDataDao.java b/astrid/src/com/todoroo/astrid/dao/TagDataDao.java
index d99dc72dc..be023b53d 100644
--- a/astrid/src/com/todoroo/astrid/dao/TagDataDao.java
+++ b/astrid/src/com/todoroo/astrid/dao/TagDataDao.java
@@ -15,14 +15,14 @@ import com.todoroo.astrid.data.TagData;
  * Data Access layer for {@link TagData}-related operations.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TagDataDao extends RemoteModelDao<TagData> {
 
-    @Autowired Database database;
+    @Autowired
+    Database database;
 
-    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="UR_UNINIT_READ")
-	public TagDataDao() {
+    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "UR_UNINIT_READ")
+    public TagDataDao() {
         super(TagData.class);
         DependencyInjectionService.getInstance().inject(this);
         setDatabase(database);
@@ -40,10 +40,12 @@ public class TagDataDao extends RemoteModelDao<TagData> {
      */
     public static class TagDataCriteria {
 
-    	/** @returns tasks by id */
-    	public static Criterion byId(long id) {
-    	    return TagData.ID.eq(id);
-    	}
+        /**
+         * @returns tasks by id
+         */
+        public static Criterion byId(long id) {
+            return TagData.ID.eq(id);
+        }
 
         public static Criterion isTeam() {
             return TagData.IS_TEAM.eq(1);
diff --git a/astrid/src/com/todoroo/astrid/dao/TagMetadataDao.java b/astrid/src/com/todoroo/astrid/dao/TagMetadataDao.java
index b12efd629..7df603b72 100644
--- a/astrid/src/com/todoroo/astrid/dao/TagMetadataDao.java
+++ b/astrid/src/com/todoroo/astrid/dao/TagMetadataDao.java
@@ -5,14 +5,6 @@
  */
 package com.todoroo.astrid.dao;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.content.ContentValues;
 import android.text.TextUtils;
 
@@ -37,36 +29,49 @@ import com.todoroo.astrid.data.TagMetadata;
 import com.todoroo.astrid.data.TagOutstanding;
 import com.todoroo.astrid.tags.TagMemberMetadata;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Data Access layer for {@link Metadata}-related operations.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TagMetadataDao extends DatabaseDao<TagMetadata> {
 
     @Autowired
     private Database database;
 
-    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="UR_UNINIT_READ")
-	public TagMetadataDao() {
+    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "UR_UNINIT_READ")
+    public TagMetadataDao() {
         super(TagMetadata.class);
         DependencyInjectionService.getInstance().inject(this);
         setDatabase(database);
     }
 
     public static class TagMetadataCriteria {
-        /** Returns all metadata associated with a given task */
+        /**
+         * Returns all metadata associated with a given task
+         */
         public static Criterion byTag(String tagUuid) {
             return TagMetadata.TAG_UUID.eq(tagUuid);
         }
 
-        /** Returns all metadata associated with a given key */
+        /**
+         * Returns all metadata associated with a given key
+         */
         public static Criterion withKey(String key) {
             return TagMetadata.KEY.eq(key);
         }
 
-        /** Returns all metadata associated with a given key */
+        /**
+         * Returns all metadata associated with a given key
+         */
         public static Criterion byTagAndWithKey(String tagUuid, String key) {
             return Criterion.and(withKey(key), byTag(tagUuid));
         }
@@ -78,8 +83,8 @@ public class TagMetadataDao extends DatabaseDao<TagMetadata> {
         return super.shouldRecordOutstanding(item) && cv != null &&
                 ((cv.containsKey(TagMetadata.KEY.name) &&
                         TagMemberMetadata.KEY.equals(item.getValue(TagMetadata.KEY))) ||
-                (cv.containsKey(TagMetadata.DELETION_DATE.name) &&
-                        item.getValue(TagMetadata.DELETION_DATE) > 0)) &&
+                        (cv.containsKey(TagMetadata.DELETION_DATE.name) &&
+                                item.getValue(TagMetadata.DELETION_DATE) > 0)) &&
                 RemoteModelDao.getOutstandingEntryFlag(RemoteModelDao.OUTSTANDING_ENTRY_FLAG_RECORD_OUTSTANDING);
     }
 
diff --git a/astrid/src/com/todoroo/astrid/dao/TaskAttachmentDao.java b/astrid/src/com/todoroo/astrid/dao/TaskAttachmentDao.java
index 1c4a9b312..931ebecb0 100644
--- a/astrid/src/com/todoroo/astrid/dao/TaskAttachmentDao.java
+++ b/astrid/src/com/todoroo/astrid/dao/TaskAttachmentDao.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.dao;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.content.ContentValues;
 import android.text.TextUtils;
 
@@ -23,18 +20,21 @@ import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.TaskAttachment;
 import com.todoroo.astrid.data.TaskAttachmentOutstanding;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 /**
  * Data Access layer for {@link TagData}-related operations.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TaskAttachmentDao extends RemoteModelDao<TaskAttachment> {
 
-    @Autowired Database database;
+    @Autowired
+    Database database;
 
-    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="UR_UNINIT_READ")
-	public TaskAttachmentDao() {
+    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "UR_UNINIT_READ")
+    public TaskAttachmentDao() {
         super(TaskAttachment.class);
         DependencyInjectionService.getInstance().inject(this);
         setDatabase(database);
@@ -76,8 +76,8 @@ public class TaskAttachmentDao extends RemoteModelDao<TaskAttachment> {
 
     public boolean taskHasAttachments(String taskUuid) {
         TodorooCursor<TaskAttachment> files = query(Query.select(TaskAttachment.TASK_UUID).where(
-                        Criterion.and(TaskAttachment.TASK_UUID.eq(taskUuid),
-                                TaskAttachment.DELETED_AT.eq(0))).limit(1));
+                Criterion.and(TaskAttachment.TASK_UUID.eq(taskUuid),
+                        TaskAttachment.DELETED_AT.eq(0))).limit(1));
         try {
             return files.getCount() > 0;
         } finally {
diff --git a/astrid/src/com/todoroo/astrid/dao/TaskDao.java b/astrid/src/com/todoroo/astrid/dao/TaskDao.java
index 333fefbec..136d19470 100644
--- a/astrid/src/com/todoroo/astrid/dao/TaskDao.java
+++ b/astrid/src/com/todoroo/astrid/dao/TaskDao.java
@@ -33,7 +33,6 @@ import com.todoroo.astrid.reminders.ReminderService;
  * Data Access layer for {@link Task}-related operations.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TaskDao extends RemoteModelDao<Task> {
 
@@ -43,8 +42,8 @@ public class TaskDao extends RemoteModelDao<Task> {
     @Autowired
     private Database database;
 
-    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="UR_UNINIT_READ")
-	public TaskDao() {
+    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "UR_UNINIT_READ")
+    public TaskDao() {
         super(Task.class);
         DependencyInjectionService.getInstance().inject(this);
         setDatabase(database);
@@ -57,93 +56,125 @@ public class TaskDao extends RemoteModelDao<Task> {
      */
     public static class TaskCriteria {
 
-    	/** @returns tasks by id */
-    	public static Criterion byId(long id) {
-    	    return Task.ID.eq(id);
-    	}
-
-    	/** @return tasks that were deleted */
-    	public static Criterion isDeleted() {
-    	    return Task.DELETION_DATE.neq(0);
-    	}
-
-    	/** @return tasks that were not deleted */
-    	public static Criterion notDeleted() {
-    	    return Task.DELETION_DATE.eq(0);
-    	}
-
-    	/** @return tasks that have not yet been completed or deleted */
-    	public static Criterion activeAndVisible() {
-    	    return Criterion.and(Task.COMPLETION_DATE.eq(0),
-    	            Task.DELETION_DATE.eq(0),
-    	            Task.HIDE_UNTIL.lt(Functions.now()));
-    	}
-
-    	/** @return tasks that have not yet been completed or deleted and are assigned to me */
-    	public static Criterion activeVisibleMine() {
-    	    return Criterion.and(Task.COMPLETION_DATE.eq(0),
-    	            Task.DELETION_DATE.eq(0),
-    	            Task.HIDE_UNTIL.lt(Functions.now()),
-    	            Task.IS_READONLY.eq(0),
-    	            Task.USER_ID.eq(0));
-    	}
-
-    	/** @return tasks that have not yet been completed or deleted */
-    	public static Criterion isActive() {
-    	    return Criterion.and(Task.COMPLETION_DATE.eq(0),
-    	            Task.DELETION_DATE.eq(0));
-    	}
-
-    	/** @return tasks that are due within the next 24 hours */
-    	public static Criterion dueToday() {
-    	    return Criterion.and(TaskCriteria.activeAndVisible(), Task.DUE_DATE.gt(0), Task.DUE_DATE.lt(Functions.fromNow(DateUtilities.ONE_DAY)));
-    	}
-
-    	/** @return tasks that are due within the next 72 hours */
-    	public static Criterion dueSoon() {
-    	    return Criterion.and(TaskCriteria.activeAndVisible(), Task.DUE_DATE.gt(0), Task.DUE_DATE.lt(Functions.fromNow(3 * DateUtilities.ONE_DAY)));
-    	}
-
-    	/** @return tasks that are not hidden at current time */
-    	public static Criterion isVisible() {
-    	    return Task.HIDE_UNTIL.lt(Functions.now());
+        /**
+         * @returns tasks by id
+         */
+        public static Criterion byId(long id) {
+            return Task.ID.eq(id);
+        }
+
+        /**
+         * @return tasks that were deleted
+         */
+        public static Criterion isDeleted() {
+            return Task.DELETION_DATE.neq(0);
+        }
+
+        /**
+         * @return tasks that were not deleted
+         */
+        public static Criterion notDeleted() {
+            return Task.DELETION_DATE.eq(0);
+        }
+
+        /**
+         * @return tasks that have not yet been completed or deleted
+         */
+        public static Criterion activeAndVisible() {
+            return Criterion.and(Task.COMPLETION_DATE.eq(0),
+                    Task.DELETION_DATE.eq(0),
+                    Task.HIDE_UNTIL.lt(Functions.now()));
+        }
+
+        /**
+         * @return tasks that have not yet been completed or deleted and are assigned to me
+         */
+        public static Criterion activeVisibleMine() {
+            return Criterion.and(Task.COMPLETION_DATE.eq(0),
+                    Task.DELETION_DATE.eq(0),
+                    Task.HIDE_UNTIL.lt(Functions.now()),
+                    Task.IS_READONLY.eq(0),
+                    Task.USER_ID.eq(0));
         }
 
-    	/** @return tasks that are hidden at the current time */
-    	public static Criterion isHidden() {
-    	    return Task.HIDE_UNTIL.gt(Functions.now());
-    	}
+        /**
+         * @return tasks that have not yet been completed or deleted
+         */
+        public static Criterion isActive() {
+            return Criterion.and(Task.COMPLETION_DATE.eq(0),
+                    Task.DELETION_DATE.eq(0));
+        }
 
-    	/** @return tasks that have a due date */
-    	public static Criterion hasDeadlines() {
-    	    return Task.DUE_DATE.neq(0);
-    	}
+        /**
+         * @return tasks that are due within the next 24 hours
+         */
+        public static Criterion dueToday() {
+            return Criterion.and(TaskCriteria.activeAndVisible(), Task.DUE_DATE.gt(0), Task.DUE_DATE.lt(Functions.fromNow(DateUtilities.ONE_DAY)));
+        }
 
-        /** @return tasks that are due before a certain unixtime */
+        /**
+         * @return tasks that are due within the next 72 hours
+         */
+        public static Criterion dueSoon() {
+            return Criterion.and(TaskCriteria.activeAndVisible(), Task.DUE_DATE.gt(0), Task.DUE_DATE.lt(Functions.fromNow(3 * DateUtilities.ONE_DAY)));
+        }
+
+        /**
+         * @return tasks that are not hidden at current time
+         */
+        public static Criterion isVisible() {
+            return Task.HIDE_UNTIL.lt(Functions.now());
+        }
+
+        /**
+         * @return tasks that are hidden at the current time
+         */
+        public static Criterion isHidden() {
+            return Task.HIDE_UNTIL.gt(Functions.now());
+        }
+
+        /**
+         * @return tasks that have a due date
+         */
+        public static Criterion hasDeadlines() {
+            return Task.DUE_DATE.neq(0);
+        }
+
+        /**
+         * @return tasks that are due before a certain unixtime
+         */
         public static Criterion dueBeforeNow() {
             return Criterion.and(Task.DUE_DATE.gt(0), Task.DUE_DATE.lt(Functions.now()));
         }
 
-        /** @return tasks that are due after a certain unixtime */
+        /**
+         * @return tasks that are due after a certain unixtime
+         */
         public static Criterion dueAfterNow() {
             return Task.DUE_DATE.gt(Functions.now());
         }
 
-    	/** @return tasks completed before a given unixtime */
-    	public static Criterion completed() {
-    	    return Criterion.and(Task.COMPLETION_DATE.gt(0), Task.COMPLETION_DATE.lt(Functions.now()));
-    	}
+        /**
+         * @return tasks completed before a given unixtime
+         */
+        public static Criterion completed() {
+            return Criterion.and(Task.COMPLETION_DATE.gt(0), Task.COMPLETION_DATE.lt(Functions.now()));
+        }
 
-    	/** @return tasks that have a blank or null title */
-    	@SuppressWarnings("nls")
+        /**
+         * @return tasks that have a blank or null title
+         */
+        @SuppressWarnings("nls")
         public static Criterion hasNoTitle() {
-    	    return Criterion.or(Task.TITLE.isNull(), Task.TITLE.eq(""));
-    	}
+            return Criterion.or(Task.TITLE.isNull(), Task.TITLE.eq(""));
+        }
 
-    	/** Check if a given task belongs to someone else & is read-only */
+        /**
+         * Check if a given task belongs to someone else & is read-only
+         */
         public static Criterion ownedByMe() {
-             return Criterion.and(Task.IS_READONLY.eq(0),
-                     Task.USER_ID.eq(0));
+            return Criterion.and(Task.IS_READONLY.eq(0),
+                    Task.USER_ID.eq(0));
         }
 
     }
@@ -163,7 +194,7 @@ public class TaskDao extends RemoteModelDao<Task> {
     @Override
     public boolean delete(long id) {
         boolean result = super.delete(id);
-        if(!result)
+        if (!result)
             return false;
 
         // delete all metadata
@@ -211,15 +242,15 @@ public class TaskDao extends RemoteModelDao<Task> {
 
     @Override
     public boolean createNew(Task item) {
-        if(!item.containsValue(Task.CREATION_DATE))
+        if (!item.containsValue(Task.CREATION_DATE))
             item.setValue(Task.CREATION_DATE, DateUtilities.now());
         item.setValue(Task.MODIFICATION_DATE, DateUtilities.now());
 
         // set up task defaults
-        if(!item.containsValue(Task.IMPORTANCE))
+        if (!item.containsValue(Task.IMPORTANCE))
             item.setValue(Task.IMPORTANCE, Preferences.getIntegerFromString(
                     R.string.p_default_importance_key, Task.IMPORTANCE_SHOULD_DO));
-        if(!item.containsValue(Task.DUE_DATE)) {
+        if (!item.containsValue(Task.DUE_DATE)) {
             int setting = Preferences.getIntegerFromString(R.string.p_default_urgency_key,
                     Task.URGENCY_NONE);
             item.setValue(Task.DUE_DATE, Task.createDueDate(setting, 0));
@@ -230,7 +261,7 @@ public class TaskDao extends RemoteModelDao<Task> {
 
         ContentValues values = item.getSetValues();
         boolean result = super.createNew(item);
-        if(result) {
+        if (result) {
             afterSave(item, values);
         }
 
@@ -238,7 +269,7 @@ public class TaskDao extends RemoteModelDao<Task> {
     }
 
     public static void createDefaultHideUntil(Task item) {
-        if(!item.containsValue(Task.HIDE_UNTIL)) {
+        if (!item.containsValue(Task.HIDE_UNTIL)) {
             int setting = Preferences.getIntegerFromString(R.string.p_default_hideUntil_key,
                     Task.HIDE_UNTIL_NONE);
             item.setValue(Task.HIDE_UNTIL, item.createHideUntil(setting, 0));
@@ -247,15 +278,16 @@ public class TaskDao extends RemoteModelDao<Task> {
 
     /**
      * Sets default reminders for the given task if reminders are not set
+     *
      * @param item
      */
     public static void setDefaultReminders(Task item) {
-        if(!item.containsValue(Task.REMINDER_PERIOD)) {
+        if (!item.containsValue(Task.REMINDER_PERIOD)) {
             item.setValue(Task.REMINDER_PERIOD, DateUtilities.ONE_HOUR *
                     Preferences.getIntegerFromString(R.string.p_rmd_default_random_hours,
                             0));
         }
-        if(!item.containsValue(Task.REMINDER_FLAGS)) {
+        if (!item.containsValue(Task.REMINDER_FLAGS)) {
             int reminder_flags = Preferences.getIntegerFromString(R.string.p_default_reminders_key,
                     Task.NOTIFY_AT_DEADLINE | Task.NOTIFY_AFTER_DEADLINE) |
                     Preferences.getIntegerFromString(R.string.p_default_reminders_mode_key, 0);
@@ -266,30 +298,30 @@ public class TaskDao extends RemoteModelDao<Task> {
     @Override
     public boolean saveExisting(Task item) {
         ContentValues values = item.getSetValues();
-        if(values == null || values.size() == 0)
+        if (values == null || values.size() == 0)
             return false;
-        if(!TaskApiDao.insignificantChange(values)) {
+        if (!TaskApiDao.insignificantChange(values)) {
             item.setValue(Task.DETAILS, null);
-            if(!values.containsKey(Task.MODIFICATION_DATE.name))
+            if (!values.containsKey(Task.MODIFICATION_DATE.name))
                 item.setValue(Task.MODIFICATION_DATE, DateUtilities.now());
         }
         boolean result = super.saveExisting(item);
-        if(result)
+        if (result)
             afterSave(item, values);
         return result;
     }
 
-    private static final Property<?>[] SQL_CONSTRAINT_MERGE_PROPERTIES = new Property<?>[] {
-        Task.ID,
-        Task.UUID,
-        Task.TITLE,
-        Task.IMPORTANCE,
-        Task.DUE_DATE,
-        Task.CREATION_DATE,
-        Task.DELETION_DATE,
-        Task.NOTES,
-        Task.HIDE_UNTIL,
-        Task.RECURRENCE
+    private static final Property<?>[] SQL_CONSTRAINT_MERGE_PROPERTIES = new Property<?>[]{
+            Task.ID,
+            Task.UUID,
+            Task.TITLE,
+            Task.IMPORTANCE,
+            Task.DUE_DATE,
+            Task.CREATION_DATE,
+            Task.DELETION_DATE,
+            Task.NOTES,
+            Task.HIDE_UNTIL,
+            Task.RECURRENCE
     };
 
     @Override
@@ -309,7 +341,7 @@ public class TaskDao extends RemoteModelDao<Task> {
                 if (tasksWithUUID.getCount() > 0) {
                     Task curr = new Task();
                     for (tasksWithUUID.moveToFirst();
-                            !tasksWithUUID.isAfterLast(); tasksWithUUID.moveToNext()) {
+                         !tasksWithUUID.isAfterLast(); tasksWithUUID.moveToNext()) {
                         curr.readFromCursor(tasksWithUUID);
                         if (curr.getId() == item.getId())
                             continue;
@@ -335,7 +367,7 @@ public class TaskDao extends RemoteModelDao<Task> {
         for (Property<?> p : SQL_CONSTRAINT_MERGE_PROPERTIES) {
             if (p.equals(Task.ID))
                 continue;
-            if(existing.containsNonNullValue(p) != newConflict.containsNonNullValue(p))
+            if (existing.containsNonNullValue(p) != newConflict.containsNonNullValue(p))
                 match = false;
             else if (existing.containsNonNullValue(p) &&
                     !existing.getValue(p).equals(newConflict.getValue(p)))
@@ -357,14 +389,14 @@ public class TaskDao extends RemoteModelDao<Task> {
      * Astrid. Order matters here!
      */
     public static void afterSave(Task task, ContentValues values) {
-        if(values == null)
+        if (values == null)
             return;
 
         task.markSaved();
-        if(values.containsKey(Task.COMPLETION_DATE.name) && task.isCompleted())
+        if (values.containsKey(Task.COMPLETION_DATE.name) && task.isCompleted())
             afterComplete(task, values);
         else {
-            if(values.containsKey(Task.DUE_DATE.name) ||
+            if (values.containsKey(Task.DUE_DATE.name) ||
                     values.containsKey(Task.REMINDER_FLAGS.name) ||
                     values.containsKey(Task.REMINDER_PERIOD.name) ||
                     values.containsKey(Task.REMINDER_LAST.name) ||
@@ -378,16 +410,17 @@ public class TaskDao extends RemoteModelDao<Task> {
 
     /**
      * Send broadcasts on task change (triggers things like task repeats)
-     * @param task task that was saved
+     *
+     * @param task   task that was saved
      * @param values values that were updated
      */
     public static void broadcastTaskSave(Task task, ContentValues values) {
-        if(TaskApiDao.insignificantChange(values))
+        if (TaskApiDao.insignificantChange(values))
             return;
 
-        if(values.containsKey(Task.COMPLETION_DATE.name) && task.isCompleted()) {
+        if (values.containsKey(Task.COMPLETION_DATE.name) && task.isCompleted()) {
             Context context = ContextManager.getContext();
-            if(context != null) {
+            if (context != null) {
                 Intent broadcastIntent;
                 broadcastIntent = new Intent(AstridApiConstants.BROADCAST_EVENT_TASK_COMPLETED);
                 broadcastIntent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, task.getId());
@@ -403,7 +436,7 @@ public class TaskDao extends RemoteModelDao<Task> {
      */
     public static void broadcastTaskChanged() {
         Context context = ContextManager.getContext();
-        if(context != null) {
+        if (context != null) {
             Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_EVENT_TASK_LIST_UPDATED);
             context.sendOrderedBroadcast(broadcastIntent, null);
         }
diff --git a/astrid/src/com/todoroo/astrid/dao/TaskListMetadataDao.java b/astrid/src/com/todoroo/astrid/dao/TaskListMetadataDao.java
index 23725c617..b4b5565fb 100644
--- a/astrid/src/com/todoroo/astrid/dao/TaskListMetadataDao.java
+++ b/astrid/src/com/todoroo/astrid/dao/TaskListMetadataDao.java
@@ -20,14 +20,14 @@ import com.todoroo.astrid.data.TaskListMetadata;
  * Data Access layer for {@link TagData}-related operations.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TaskListMetadataDao extends RemoteModelDao<TaskListMetadata> {
 
-    @Autowired Database database;
+    @Autowired
+    Database database;
 
-    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="UR_UNINIT_READ")
-	public TaskListMetadataDao() {
+    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "UR_UNINIT_READ")
+    public TaskListMetadataDao() {
         super(TaskListMetadata.class);
         DependencyInjectionService.getInstance().inject(this);
         setDatabase(database);
@@ -44,7 +44,7 @@ public class TaskListMetadataDao extends RemoteModelDao<TaskListMetadata> {
         return NameMaps.shouldRecordOutstandingColumnForTable(NameMaps.TABLE_ID_TASK_LIST_METADATA, columnName);
     }
 
-    public TaskListMetadata fetchByTagId(String tagUuid, Property<?>...properties) {
+    public TaskListMetadata fetchByTagId(String tagUuid, Property<?>... properties) {
         TodorooCursor<TaskListMetadata> taskListMetadata = query(Query.select(properties).where(Criterion.or(TaskListMetadata.TAG_UUID.eq(tagUuid),
                 TaskListMetadata.FILTER.eq(tagUuid))));
         taskListMetadata.moveToFirst();
diff --git a/astrid/src/com/todoroo/astrid/dao/UpdateDao.java b/astrid/src/com/todoroo/astrid/dao/UpdateDao.java
index a177ad32a..6a4b1eab4 100644
--- a/astrid/src/com/todoroo/astrid/dao/UpdateDao.java
+++ b/astrid/src/com/todoroo/astrid/dao/UpdateDao.java
@@ -14,15 +14,15 @@ import com.todoroo.astrid.data.Update;
  * Data Access layer for {@link Update}-related operations.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @Deprecated
 public class UpdateDao extends RemoteModelDao<Update> {
 
-    @Autowired Database database;
+    @Autowired
+    Database database;
 
-    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="UR_UNINIT_READ")
-	public UpdateDao() {
+    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "UR_UNINIT_READ")
+    public UpdateDao() {
         super(Update.class);
         DependencyInjectionService.getInstance().inject(this);
         setDatabase(database);
diff --git a/astrid/src/com/todoroo/astrid/dao/UserActivityDao.java b/astrid/src/com/todoroo/astrid/dao/UserActivityDao.java
index b86a6e412..b2ff0afee 100644
--- a/astrid/src/com/todoroo/astrid/dao/UserActivityDao.java
+++ b/astrid/src/com/todoroo/astrid/dao/UserActivityDao.java
@@ -29,7 +29,7 @@ public class UserActivityDao extends RemoteModelDao<UserActivity> {
     @Override
     public boolean saveExisting(UserActivity item) {
         ContentValues values = item.getSetValues();
-        if(values == null || values.size() == 0)
+        if (values == null || values.size() == 0)
             return false;
         return super.saveExisting(item);
     }
diff --git a/astrid/src/com/todoroo/astrid/dao/UserDao.java b/astrid/src/com/todoroo/astrid/dao/UserDao.java
index 7416ddbd3..de96e40a8 100644
--- a/astrid/src/com/todoroo/astrid/dao/UserDao.java
+++ b/astrid/src/com/todoroo/astrid/dao/UserDao.java
@@ -11,9 +11,10 @@ import com.todoroo.astrid.actfm.sync.messages.NameMaps;
 import com.todoroo.astrid.data.User;
 
 public class UserDao extends RemoteModelDao<User> {
-    @Autowired Database database;
+    @Autowired
+    Database database;
 
-    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="UR_UNINIT_READ")
+    @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "UR_UNINIT_READ")
     public UserDao() {
         super(User.class);
         DependencyInjectionService.getInstance().inject(this);
diff --git a/astrid/src/com/todoroo/astrid/data/ABTestEvent.java b/astrid/src/com/todoroo/astrid/data/ABTestEvent.java
index a23ce1d70..fec2c5641 100644
--- a/astrid/src/com/todoroo/astrid/data/ABTestEvent.java
+++ b/astrid/src/com/todoroo/astrid/data/ABTestEvent.java
@@ -19,31 +19,39 @@ import com.todoroo.astrid.api.AstridApiConstants;
 
 /**
  * Model for data points used for tracking user retention in AB tests
- * @author Sam
  *
+ * @author Sam
  */
 @SuppressWarnings("nls")
 public class ABTestEvent extends AbstractModel {
 
-    public static final int[] TIME_INTERVALS = { 0, 1, 3, 7, 14, 21 };
+    public static final int[] TIME_INTERVALS = {0, 1, 3, 7, 14, 21};
 
     // --- table and uri
 
-    /** table for this model */
+    /**
+     * table for this model
+     */
     public static final Table TABLE = new Table("abtestevent", ABTestEvent.class);
 
-    /** content uri for this model */
+    /**
+     * content uri for this model
+     */
     public static final Uri CONTENT_URI = Uri.parse("content://" + AstridApiConstants.API_PACKAGE + "/" +
             TABLE.name);
 
 
     // --- properties
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
-    /** Name of the test -- one of the constant test keys defined in ABOptions */
+    /**
+     * Name of the test -- one of the constant test keys defined in ABOptions
+     */
     public static final StringProperty TEST_NAME = new StringProperty(
             TABLE, "testName");
 
@@ -79,19 +87,24 @@ public class ABTestEvent extends AbstractModel {
     public static final IntegerProperty TIME_INTERVAL = new IntegerProperty(
             TABLE, "timeInterval"); // one of the constants defined above
 
-    /** The actual date on which this data point was recorded. */
+    /**
+     * The actual date on which this data point was recorded.
+     */
     public static final LongProperty DATE_RECORDED = new LongProperty(
             TABLE, "dateRecorded");
 
-    /** Whether or not this data point has been reported to the server */
+    /**
+     * Whether or not this data point has been reported to the server
+     */
     public static final IntegerProperty REPORTED = new IntegerProperty(
             TABLE, "reported"); // 0 if not yet reported, 1 if reported successfully
 
-    /** List of all properties for this model */
+    /**
+     * List of all properties for this model
+     */
     public static final Property<?>[] PROPERTIES = generateProperties(ABTestEvent.class);
 
 
-
     private static final ContentValues defaultValues = new ContentValues();
 
     static {
diff --git a/astrid/src/com/todoroo/astrid/data/AddOn.java b/astrid/src/com/todoroo/astrid/data/AddOn.java
index 051aa490a..15ff6b02b 100644
--- a/astrid/src/com/todoroo/astrid/data/AddOn.java
+++ b/astrid/src/com/todoroo/astrid/data/AddOn.java
@@ -11,7 +11,6 @@ import android.graphics.Bitmap;
  * An add-on installable by Astrid
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class AddOn {
 
@@ -24,7 +23,7 @@ public class AddOn {
     private final Bitmap icon;
 
     public AddOn(boolean free, boolean internal, String title, String author, String description,
-            String packageName, Bitmap icon) {
+                 String packageName, Bitmap icon) {
         this.free = free;
         this.internal = internal;
         this.title = title;
diff --git a/astrid/src/com/todoroo/astrid/helper/AsyncImageView.java b/astrid/src/com/todoroo/astrid/helper/AsyncImageView.java
index 523f5d19f..2f690e351 100644
--- a/astrid/src/com/todoroo/astrid/helper/AsyncImageView.java
+++ b/astrid/src/com/todoroo/astrid/helper/AsyncImageView.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.helper;
 
-import java.io.IOException;
-
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
@@ -16,12 +14,14 @@ import android.util.AttributeSet;
 
 import com.todoroo.andlib.service.ContextManager;
 
+import java.io.IOException;
+
 import edu.mit.mobile.android.imagecache.ImageCache;
 
 /**
  * Subclass of greendroid.widget.AsyncImageView, so that we can cache the image
  * locally when user is offline
- *
+ * <p/>
  * IMPORTANT: cannot load a cached image by setting the url in an xml file.
  * ImageDiskCache object is created after object is loaded from xml
  */
@@ -30,18 +30,22 @@ public class AsyncImageView extends greendroid.widget.AsyncImageView {
     private final ImageCache imageDiskCache;
     private Bitmap cacheImage;
     private String cacheURL = ""; //$NON-NLS-1$
+
     public AsyncImageView(Context context) {
         super(context);
         imageDiskCache = getImageCache();
     }
+
     public AsyncImageView(Context context, AttributeSet set) {
         super(context, set);
         imageDiskCache = getImageCache();
     }
+
     public AsyncImageView(Context context, AttributeSet set, int defStyle) {
         super(context, set, defStyle);
         imageDiskCache = getImageCache();
     }
+
     @Override
     public void setUrl(String url) {
         if (cacheImage != null && cacheURL.equals(url) && !TextUtils.isEmpty(url)) {
@@ -82,7 +86,7 @@ public class AsyncImageView extends greendroid.widget.AsyncImageView {
 
     public static ImageCache getImageCache() {
         if (imageCacheInstance == null) {
-            synchronized(AsyncImageView.class) {
+            synchronized (AsyncImageView.class) {
                 if (imageCacheInstance == null) {
                     try {
                         if (Looper.myLooper() == null)
diff --git a/astrid/src/com/todoroo/astrid/helper/DueDateTimeMigrator.java b/astrid/src/com/todoroo/astrid/helper/DueDateTimeMigrator.java
index 1bfc980f8..64d39ccc8 100644
--- a/astrid/src/com/todoroo/astrid/helper/DueDateTimeMigrator.java
+++ b/astrid/src/com/todoroo/astrid/helper/DueDateTimeMigrator.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.helper;
 
-import java.util.Date;
-
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
@@ -18,9 +16,12 @@ import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.data.SyncFlags;
 import com.todoroo.astrid.data.Task;
 
+import java.util.Date;
+
 public class DueDateTimeMigrator {
 
-    @Autowired TaskDao taskDao;
+    @Autowired
+    TaskDao taskDao;
 
     private static final String PREF_MIGRATED_DUE_TIMES = "migrated_due_times";  //$NON-NLS-1$
     private static final String STRFTIME_FORMAT = "%H:%M:%S"; //$NON-NLS-1$
diff --git a/astrid/src/com/todoroo/astrid/helper/MetadataHelper.java b/astrid/src/com/todoroo/astrid/helper/MetadataHelper.java
index f807a4e26..f1f87d90a 100644
--- a/astrid/src/com/todoroo/astrid/helper/MetadataHelper.java
+++ b/astrid/src/com/todoroo/astrid/helper/MetadataHelper.java
@@ -14,7 +14,7 @@ import android.content.pm.ResolveInfo;
 public class MetadataHelper {
     private static final String CATEGORY_KEY = "category"; //$NON-NLS-1$
 
-    public static String resolveActivityCategoryName (ResolveInfo resolveInfo, PackageManager pm) {
+    public static String resolveActivityCategoryName(ResolveInfo resolveInfo, PackageManager pm) {
         // category - either from metadata, or the application name
         String category = null;
         if (resolveInfo.activityInfo.metaData != null && resolveInfo.activityInfo.metaData.containsKey(CATEGORY_KEY)) {
diff --git a/astrid/src/com/todoroo/astrid/helper/ProgressBarSyncResultCallback.java b/astrid/src/com/todoroo/astrid/helper/ProgressBarSyncResultCallback.java
index 8ee2664d0..a60ed4065 100644
--- a/astrid/src/com/todoroo/astrid/helper/ProgressBarSyncResultCallback.java
+++ b/astrid/src/com/todoroo/astrid/helper/ProgressBarSyncResultCallback.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.helper;
 
-import java.util.concurrent.atomic.AtomicInteger;
-
 import android.app.Activity;
 import android.support.v4.app.Fragment;
 import android.view.View;
@@ -16,6 +14,8 @@ import android.widget.ProgressBar;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.sync.SyncResultCallbackAdapter;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
 public class ProgressBarSyncResultCallback extends SyncResultCallbackAdapter {
 
     private ProgressBar progressBar;
@@ -25,12 +25,12 @@ public class ProgressBarSyncResultCallback extends SyncResultCallbackAdapter {
     private final AtomicInteger providers = new AtomicInteger(0);
 
     public ProgressBarSyncResultCallback(Activity activity, Fragment fragment,
-            int progressBarId, Runnable onFinished) {
+                                         int progressBarId, Runnable onFinished) {
         this.progressBar = (ProgressBar) fragment.getView().findViewById(progressBarId);
         this.activity = activity;
         this.onFinished = onFinished;
 
-        if(progressBar == null)
+        if (progressBar == null)
             progressBar = new ProgressBar(activity);
 
         progressBar.setProgress(0);
@@ -39,7 +39,7 @@ public class ProgressBarSyncResultCallback extends SyncResultCallbackAdapter {
 
     @Override
     public void finished() {
-        if(providers.decrementAndGet() == 0) {
+        if (providers.decrementAndGet() == 0) {
             activity.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
@@ -106,7 +106,7 @@ public class ProgressBarSyncResultCallback extends SyncResultCallbackAdapter {
 
     @Override
     public void started() {
-        if(providers.incrementAndGet() == 1) {
+        if (providers.incrementAndGet() == 1) {
             activity.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
diff --git a/astrid/src/com/todoroo/astrid/helper/SyncActionHelper.java b/astrid/src/com/todoroo/astrid/helper/SyncActionHelper.java
index 1583f257d..c4ccba2ea 100644
--- a/astrid/src/com/todoroo/astrid/helper/SyncActionHelper.java
+++ b/astrid/src/com/todoroo/astrid/helper/SyncActionHelper.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.helper;
 
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
@@ -38,16 +34,19 @@ import com.todoroo.astrid.service.SyncV2Service;
 import com.todoroo.astrid.sync.SyncResultCallback;
 import com.todoroo.astrid.sync.SyncV2Provider;
 
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+
 /**
  * SyncActionHelper is a helper class for encapsulating UI actions
  * responsible for performing sync and prompting user to sign up for a new
  * sync service.
- *
+ * <p/>
  * In order to make this work you need to call register() and unregister() in
  * onResume and onPause, respectively.
  *
  * @author Tim Su <tim@astrid.com>
- *
  */
 public class SyncActionHelper {
 
@@ -63,8 +62,10 @@ public class SyncActionHelper {
 
     protected SyncActionReceiver syncActionReceiver = new SyncActionReceiver();
 
-    @Autowired SyncV2Service syncService;
-    @Autowired ExceptionService exceptionService;
+    @Autowired
+    SyncV2Service syncService;
+    @Autowired
+    ExceptionService exceptionService;
 
     // --- boilerplate
 
@@ -75,13 +76,13 @@ public class SyncActionHelper {
         this.fragment = fragment;
         syncResultCallback = new ProgressBarSyncResultCallback(activity, fragment,
                 R.id.progressBar, new Runnable() {
-                    @Override
-                    public void run() {
-                        ContextManager.getContext().sendBroadcast(
-                                new Intent(
-                                        AstridApiConstants.BROADCAST_EVENT_REFRESH));
-                    }
-                });
+            @Override
+            public void run() {
+                ContextManager.getContext().sendBroadcast(
+                        new Intent(
+                                AstridApiConstants.BROADCAST_EVENT_REFRESH));
+            }
+        });
     }
 
     // --- automatic sync logic
@@ -97,7 +98,6 @@ public class SyncActionHelper {
 
     /**
      * Receiver which receives sync provider intents
-     *
      */
     protected class SyncActionReceiver extends BroadcastReceiver {
         @Override
@@ -233,7 +233,7 @@ public class SyncActionHelper {
      * @param listener
      */
     private <TYPE> void showSyncOptionMenu(TYPE[] items,
-            DialogInterface.OnClickListener listener) {
+                                           DialogInterface.OnClickListener listener) {
         if (items.length == 1) {
             listener.onClick(null, 0);
             return;
diff --git a/astrid/src/com/todoroo/astrid/helper/TaskAdapterAddOnManager.java b/astrid/src/com/todoroo/astrid/helper/TaskAdapterAddOnManager.java
index 3b454c34d..c8436bf5d 100644
--- a/astrid/src/com/todoroo/astrid/helper/TaskAdapterAddOnManager.java
+++ b/astrid/src/com/todoroo/astrid/helper/TaskAdapterAddOnManager.java
@@ -3,12 +3,6 @@
  */
 package com.todoroo.astrid.helper;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 import android.content.Intent;
 import android.support.v4.app.ListFragment;
 import android.widget.ListView;
@@ -17,6 +11,12 @@ import com.todoroo.astrid.adapter.TaskAdapter.ViewHolder;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.data.Task;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 abstract public class TaskAdapterAddOnManager<TYPE> {
 
     private final ListFragment fragment;
@@ -29,19 +29,20 @@ abstract public class TaskAdapterAddOnManager<TYPE> {
     }
 
     private final Map<Long, LinkedHashMap<String, TYPE>> cache =
-        Collections.synchronizedMap(new HashMap<Long, LinkedHashMap<String, TYPE>>(0));
+            Collections.synchronizedMap(new HashMap<Long, LinkedHashMap<String, TYPE>>(0));
 
     // --- interface
 
     /**
      * Request add-ons for the given task
+     *
      * @return true if cache miss, false if cache hit
      */
     public boolean request(ViewHolder viewHolder) {
         long taskId = viewHolder.task.getId();
 
         Collection<TYPE> list = initialize(taskId);
-        if(list != null) {
+        if (list != null) {
             draw(viewHolder, taskId, list);
             return false;
         }
@@ -49,36 +50,44 @@ abstract public class TaskAdapterAddOnManager<TYPE> {
         // request details
         draw(viewHolder, taskId, get(taskId));
         Intent broadcastIntent = createBroadcastIntent(viewHolder.task);
-        if(broadcastIntent != null)
+        if (broadcastIntent != null)
             fragment.getActivity().sendOrderedBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ);
         return true;
     }
 
-    /** creates a broadcast intent for requesting */
+    /**
+     * creates a broadcast intent for requesting
+     */
     abstract protected Intent createBroadcastIntent(Task task);
 
-    /** updates the given view */
+    /**
+     * updates the given view
+     */
     abstract protected void draw(ViewHolder viewHolder, long taskId, Collection<TYPE> list);
 
-    /** resets the view as if there was nothing */
+    /**
+     * resets the view as if there was nothing
+     */
     abstract protected void reset(ViewHolder viewHolder, long taskId);
 
-    /** on receive an intent */
+    /**
+     * on receive an intent
+     */
     public void addNew(long taskId, String addOn, TYPE item, ViewHolder thisViewHolder) {
-        if(item == null)
+        if (item == null)
             return;
 
         Collection<TYPE> cacheList = addIfNotExists(taskId, addOn, item);
-        if(cacheList != null) {
-            if(thisViewHolder != null)
+        if (cacheList != null) {
+            if (thisViewHolder != null)
                 draw(thisViewHolder, taskId, cacheList);
             else {
                 ListView listView = fragment.getListView();
                 // update view if it is visible
                 int length = listView.getChildCount();
-                for(int i = 0; i < length; i++) {
+                for (int i = 0; i < length; i++) {
                     ViewHolder viewHolder = (ViewHolder) listView.getChildAt(i).getTag();
-                    if(viewHolder == null || viewHolder.task.getId() != taskId)
+                    if (viewHolder == null || viewHolder.task.getId() != taskId)
                         continue;
                     draw(viewHolder, taskId, cacheList);
                     break;
@@ -106,11 +115,12 @@ abstract public class TaskAdapterAddOnManager<TYPE> {
     /**
      * Retrieves a list. If it doesn't exist, list is created, but
      * the method will return null
+     *
      * @param taskId
      * @return list if there was already one
      */
     protected synchronized Collection<TYPE> initialize(long taskId) {
-        if(cache.containsKey(taskId) && cache.get(taskId) != null)
+        if (cache.containsKey(taskId) && cache.get(taskId) != null)
             return get(taskId);
         cache.put(taskId, new LinkedHashMap<String, TYPE>(0));
         return null;
@@ -118,16 +128,17 @@ abstract public class TaskAdapterAddOnManager<TYPE> {
 
     /**
      * Adds an item to the cache if it doesn't exist
+     *
      * @param taskId
      * @param item
      * @return iterator if item was added, null if it already existed
      */
     protected synchronized Collection<TYPE> addIfNotExists(long taskId, String addOn,
-            TYPE item) {
+                                                           TYPE item) {
         LinkedHashMap<String, TYPE> list = cache.get(taskId);
-        if(list == null)
+        if (list == null)
             return null;
-        if(list.containsValue(item))
+        if (list.containsValue(item))
             return null;
         list.put(addOn, item);
         return get(taskId);
@@ -135,11 +146,12 @@ abstract public class TaskAdapterAddOnManager<TYPE> {
 
     /**
      * Gets an item at the given index
+     *
      * @param taskId
      * @return
      */
     protected Collection<TYPE> get(long taskId) {
-        if(cache.get(taskId) == null)
+        if (cache.get(taskId) == null)
             return null;
         return cache.get(taskId).values();
     }
diff --git a/astrid/src/com/todoroo/astrid/helper/TaskEditControlSet.java b/astrid/src/com/todoroo/astrid/helper/TaskEditControlSet.java
index 3cffb03c6..434b78194 100644
--- a/astrid/src/com/todoroo/astrid/helper/TaskEditControlSet.java
+++ b/astrid/src/com/todoroo/astrid/helper/TaskEditControlSet.java
@@ -78,6 +78,7 @@ public abstract class TaskEditControlSet {
 
     /**
      * Write data from control set to model
+     *
      * @return text appended to the toast
      */
     public String writeToModel(Task task) {
@@ -89,6 +90,7 @@ public abstract class TaskEditControlSet {
 
     /**
      * Write to model, if initialization logic has been called
+     *
      * @return toast text
      */
     protected abstract String writeToModelAfterInitialized(Task task);
@@ -112,9 +114,9 @@ public abstract class TaskEditControlSet {
         if (ok != null) {
             ok.setBackgroundDrawable(EditDialogOkBackground.getBg(activity.getResources().getColor(themeColor.data)));
             int[][] states = new int[2][];
-            states[0] = new int[] { android.R.attr.state_pressed };
-            states[1] = new int[] { android.R.attr.state_enabled };
-            int[] colors = new int[] { inverseColor.data, activity.getResources().getColor(themeColor.data) };
+            states[0] = new int[]{android.R.attr.state_pressed};
+            states[1] = new int[]{android.R.attr.state_enabled};
+            int[] colors = new int[]{inverseColor.data, activity.getResources().getColor(themeColor.data)};
             ColorStateList csl = new ColorStateList(states, colors);
             ok.setTextColor(csl);
         }
diff --git a/astrid/src/com/todoroo/astrid/helper/TaskListContextMenuExtensionLoader.java b/astrid/src/com/todoroo/astrid/helper/TaskListContextMenuExtensionLoader.java
index 57397dfc2..16d06892f 100644
--- a/astrid/src/com/todoroo/astrid/helper/TaskListContextMenuExtensionLoader.java
+++ b/astrid/src/com/todoroo/astrid/helper/TaskListContextMenuExtensionLoader.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.helper;
 
-import java.util.List;
-
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -14,6 +12,8 @@ import android.content.pm.ResolveInfo;
 
 import com.todoroo.astrid.api.AstridApiConstants;
 
+import java.util.List;
+
 public class TaskListContextMenuExtensionLoader {
 
     public static class ContextMenuItem {
@@ -31,7 +31,7 @@ public class TaskListContextMenuExtensionLoader {
 
         int length = resolveInfoList.size();
         contextMenuItemCache = new ContextMenuItem[length];
-        for(int i = 0; i < length; i++) {
+        for (int i = 0; i < length; i++) {
             ResolveInfo resolveInfo = resolveInfoList.get(i);
 
             ContextMenuItem item = new ContextMenuItem();
diff --git a/astrid/src/com/todoroo/astrid/helper/UUIDHelper.java b/astrid/src/com/todoroo/astrid/helper/UUIDHelper.java
index 9b002b91d..cfb06a4e5 100644
--- a/astrid/src/com/todoroo/astrid/helper/UUIDHelper.java
+++ b/astrid/src/com/todoroo/astrid/helper/UUIDHelper.java
@@ -13,7 +13,8 @@ public class UUIDHelper {
     public static String newUUID() {
         long uuid = 0;
         do {
-            uuid = UUID.randomUUID().getLeastSignificantBits() & 0x7fffffffffffffffL;;
+            uuid = UUID.randomUUID().getLeastSignificantBits() & 0x7fffffffffffffffL;
+            ;
         } while (uuid < MIN_UUID);
         return Long.toString(uuid);
     }
diff --git a/astrid/src/com/todoroo/astrid/legacy/AlarmDatabase.java b/astrid/src/com/todoroo/astrid/legacy/AlarmDatabase.java
index 9a32e3d2c..2584c3916 100644
--- a/astrid/src/com/todoroo/astrid/legacy/AlarmDatabase.java
+++ b/astrid/src/com/todoroo/astrid/legacy/AlarmDatabase.java
@@ -13,7 +13,6 @@ import com.todoroo.andlib.data.Table;
  * Database wrapper
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 public class AlarmDatabase extends AbstractDatabase {
@@ -35,8 +34,8 @@ public class AlarmDatabase extends AbstractDatabase {
      * List of table/ If you're adding a new table, add it to this list and
      * also make sure that our SQLite helper does the right thing.
      */
-    public static final Table[] TABLES =  new Table[] {
-        TransitionalAlarm.TABLE
+    public static final Table[] TABLES = new Table[]{
+            TransitionalAlarm.TABLE
     };
 
     // --- implementation
@@ -66,9 +65,9 @@ public class AlarmDatabase extends AbstractDatabase {
     protected synchronized void onCreateTables() {
         StringBuilder sql = new StringBuilder();
         sql.append("CREATE INDEX IF NOT EXISTS a_task ON ").
-            append(TransitionalAlarm.TABLE).append('(').
+                append(TransitionalAlarm.TABLE).append('(').
                 append(TransitionalAlarm.TASK.name).
-            append(')');
+                append(')');
         database.execSQL(sql.toString());
     }
 
diff --git a/astrid/src/com/todoroo/astrid/legacy/LegacyAlertModel.java b/astrid/src/com/todoroo/astrid/legacy/LegacyAlertModel.java
index b655dcf71..7bd081b55 100644
--- a/astrid/src/com/todoroo/astrid/legacy/LegacyAlertModel.java
+++ b/astrid/src/com/todoroo/astrid/legacy/LegacyAlertModel.java
@@ -5,7 +5,9 @@
  */
 package com.todoroo.astrid.legacy;
 
-/** Legacy alert class */
+/**
+ * Legacy alert class
+ */
 @SuppressWarnings("nls")
 abstract public class LegacyAlertModel {
 
diff --git a/astrid/src/com/todoroo/astrid/legacy/LegacyImportance.java b/astrid/src/com/todoroo/astrid/legacy/LegacyImportance.java
index 8c9c55f0e..d96160068 100644
--- a/astrid/src/com/todoroo/astrid/legacy/LegacyImportance.java
+++ b/astrid/src/com/todoroo/astrid/legacy/LegacyImportance.java
@@ -9,10 +9,10 @@ package com.todoroo.astrid.legacy;
 public enum LegacyImportance {
     // MOST IMPORTANT
 
-	LEVEL_1,
-	LEVEL_2,
-	LEVEL_3,
-	LEVEL_4;
+    LEVEL_1,
+    LEVEL_2,
+    LEVEL_3,
+    LEVEL_4;
 
-	// LEAST IMPORTANT
+    // LEAST IMPORTANT
 }
diff --git a/astrid/src/com/todoroo/astrid/legacy/LegacyRepeatInfo.java b/astrid/src/com/todoroo/astrid/legacy/LegacyRepeatInfo.java
index bacb7ab38..80e03e833 100644
--- a/astrid/src/com/todoroo/astrid/legacy/LegacyRepeatInfo.java
+++ b/astrid/src/com/todoroo/astrid/legacy/LegacyRepeatInfo.java
@@ -8,11 +8,15 @@ package com.todoroo.astrid.legacy;
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 
-/** Legacy repeatInfo class */
+/**
+ * Legacy repeatInfo class
+ */
 public class LegacyRepeatInfo {
-    public static final int REPEAT_VALUE_OFFSET    = 3;
+    public static final int REPEAT_VALUE_OFFSET = 3;
 
-    /** Legacy repeat interval class */
+    /**
+     * Legacy repeat interval class
+     */
     public enum LegacyRepeatInterval {
         DAYS,
         WEEKS,
@@ -37,11 +41,11 @@ public class LegacyRepeatInfo {
     }
 
     public static LegacyRepeatInfo fromSingleField(int repeat) {
-        if(repeat == 0)
+        if (repeat == 0)
             return null;
         int value = repeat >> REPEAT_VALUE_OFFSET;
         LegacyRepeatInterval interval = LegacyRepeatInterval.values()
-        [repeat - (value << REPEAT_VALUE_OFFSET)];
+                [repeat - (value << REPEAT_VALUE_OFFSET)];
 
         return new LegacyRepeatInfo(interval, value);
     }
@@ -49,18 +53,18 @@ public class LegacyRepeatInfo {
     public RRule toRRule() {
         RRule rrule = new RRule();
         rrule.setInterval(getValue());
-        switch(getInterval()) {
-        case DAYS:
-            rrule.setFreq(Frequency.DAILY);
-            break;
-        case WEEKS:
-            rrule.setFreq(Frequency.WEEKLY);
-            break;
-        case MONTHS:
-            rrule.setFreq(Frequency.MONTHLY);
-            break;
-        case HOURS:
-            rrule.setFreq(Frequency.HOURLY);
+        switch (getInterval()) {
+            case DAYS:
+                rrule.setFreq(Frequency.DAILY);
+                break;
+            case WEEKS:
+                rrule.setFreq(Frequency.WEEKLY);
+                break;
+            case MONTHS:
+                rrule.setFreq(Frequency.MONTHLY);
+                break;
+            case HOURS:
+                rrule.setFreq(Frequency.HOURLY);
         }
         return rrule;
     }
diff --git a/astrid/src/com/todoroo/astrid/legacy/LegacyTagModel.java b/astrid/src/com/todoroo/astrid/legacy/LegacyTagModel.java
index 0f751352c..f42b978b3 100644
--- a/astrid/src/com/todoroo/astrid/legacy/LegacyTagModel.java
+++ b/astrid/src/com/todoroo/astrid/legacy/LegacyTagModel.java
@@ -7,7 +7,9 @@ package com.todoroo.astrid.legacy;
 
 import com.timsu.astrid.data.LegacyAbstractModel;
 
-/** Legacy tag model */
+/**
+ * Legacy tag model
+ */
 @SuppressWarnings("nls")
 abstract public class LegacyTagModel extends LegacyAbstractModel {
 
diff --git a/astrid/src/com/todoroo/astrid/legacy/LegacyTaskModel.java b/astrid/src/com/todoroo/astrid/legacy/LegacyTaskModel.java
index ff676b5ea..6393ea3a1 100644
--- a/astrid/src/com/todoroo/astrid/legacy/LegacyTaskModel.java
+++ b/astrid/src/com/todoroo/astrid/legacy/LegacyTaskModel.java
@@ -5,7 +5,9 @@
  */
 package com.todoroo.astrid.legacy;
 
-/** Legacy task class */
+/**
+ * Legacy task class
+ */
 @SuppressWarnings("nls")
 abstract public class LegacyTaskModel {
 
@@ -33,11 +35,11 @@ abstract public class LegacyTaskModel {
 
     // notification flags
     public static final int NOTIFY_BEFORE_DEADLINE = 1 << 0;
-    public static final int NOTIFY_AT_DEADLINE     = 1 << 1;
-    public static final int NOTIFY_AFTER_DEADLINE  = 1 << 2;
-    public static final int NOTIFY_NONSTOP         = 1 << 3;
+    public static final int NOTIFY_AT_DEADLINE = 1 << 1;
+    public static final int NOTIFY_AFTER_DEADLINE = 1 << 2;
+    public static final int NOTIFY_NONSTOP = 1 << 3;
 
     // other flags
-    public static final int FLAG_SYNC_ON_COMPLETE  = 1 << 0;
+    public static final int FLAG_SYNC_ON_COMPLETE = 1 << 0;
 
 }
diff --git a/astrid/src/com/todoroo/astrid/legacy/TransitionalAlarm.java b/astrid/src/com/todoroo/astrid/legacy/TransitionalAlarm.java
index c18be5089..c5eda7de9 100644
--- a/astrid/src/com/todoroo/astrid/legacy/TransitionalAlarm.java
+++ b/astrid/src/com/todoroo/astrid/legacy/TransitionalAlarm.java
@@ -20,7 +20,6 @@ import com.todoroo.astrid.data.Task;
  * Alarms are moved over to metadata
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 public class TransitionalAlarm extends AbstractModel {
@@ -31,35 +30,51 @@ public class TransitionalAlarm extends AbstractModel {
 
     // --- properties
 
-    /** ID */
+    /**
+     * ID
+     */
     public static final LongProperty ID = new LongProperty(
             TABLE, ID_PROPERTY_NAME);
 
-    /** Associated Task */
+    /**
+     * Associated Task
+     */
     public static final LongProperty TASK = new LongProperty(
             TABLE, "task");
 
-    /** Alarm Time */
+    /**
+     * Alarm Time
+     */
     public static final LongProperty TIME = new LongProperty(
             TABLE, "time");
 
-    /** List of all properties for this model */
+    /**
+     * List of all properties for this model
+     */
     public static final Property<?>[] PROPERTIES = generateProperties(TransitionalAlarm.class);
 
     // --- constants
 
-    /** this alarm was already triggered */
+    /**
+     * this alarm was already triggered
+     */
     public static final int TYPE_TRIGGERED = 0;
 
-    /** this alarm is single-shot */
+    /**
+     * this alarm is single-shot
+     */
     public static final int TYPE_SINGLE = 1;
 
-    /** this alarm repeats itself until turned off */
+    /**
+     * this alarm repeats itself until turned off
+     */
     public static final int TYPE_REPEATING = 2;
 
     // --- defaults
 
-    /** Default values container */
+    /**
+     * Default values container
+     */
     private static final ContentValues defaultValues = new ContentValues();
 
     static {
@@ -90,7 +105,9 @@ public class TransitionalAlarm extends AbstractModel {
     @Override
     public long getId() {
         return getIdHelper(ID);
-    };
+    }
+
+    ;
 
     // --- parcelable helpers
 
diff --git a/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java b/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java
index b522b253f..981d3ac46 100644
--- a/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java
+++ b/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.provider;
 
-import java.math.BigInteger;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
 import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.content.Context;
@@ -35,15 +31,18 @@ import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.tags.TagService;
 import com.todoroo.astrid.tags.TagService.Tag;
 
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
 /**
  * This is the legacy Astrid task provider. While it will continue to be
  * supported, note that it does not expose all of the information in
  * Astrid, nor does it support many editing operations.
- *
+ * <p/>
  * See the individual methods for a description of what is returned.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 public class Astrid2TaskProvider extends ContentProvider {
@@ -52,110 +51,110 @@ public class Astrid2TaskProvider extends ContentProvider {
         AstridDependencyInjector.initialize();
     }
 
-	private static final String TAG = "MessageProvider";
+    private static final String TAG = "MessageProvider";
 
-	private static final boolean LOGD = false;
+    private static final boolean LOGD = false;
 
 
-	public static final String AUTHORITY = "com.timsu.astrid.tasksprovider";
+    public static final String AUTHORITY = "com.timsu.astrid.tasksprovider";
 
-	public static final Uri CONTENT_URI = Uri.parse("content://com.timsu.astrid.tasksprovider");
+    public static final Uri CONTENT_URI = Uri.parse("content://com.timsu.astrid.tasksprovider");
 
-	private static final UriMatcher URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
+    private static final UriMatcher URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
 
-	private static final int MAX_NUMBER_OF_TASKS = 100;
+    private static final int MAX_NUMBER_OF_TASKS = 100;
 
-	private final static String NAME = "name";
-	private final static String IMPORTANCE_COLOR = "importance_color";
-	private final static String IDENTIFIER = "identifier";
-	private final static String PREFERRED_DUE_DATE = "preferredDueDate";
-	private final static String DEFINITE_DUE_DATE = "definiteDueDate";
-	private final static String IMPORTANCE = "importance";
-	private final static String ID = "id";
+    private final static String NAME = "name";
+    private final static String IMPORTANCE_COLOR = "importance_color";
+    private final static String IDENTIFIER = "identifier";
+    private final static String PREFERRED_DUE_DATE = "preferredDueDate";
+    private final static String DEFINITE_DUE_DATE = "definiteDueDate";
+    private final static String IMPORTANCE = "importance";
+    private final static String ID = "id";
 
-	// fake property for updating that completes a task
-	private final static String COMPLETED = "completed";
+    // fake property for updating that completes a task
+    private final static String COMPLETED = "completed";
 
-	private final static String TAGS_ID = "tags_id";
+    private final static String TAGS_ID = "tags_id";
 
-	static String[] TASK_FIELD_LIST = new String[] { NAME, IMPORTANCE_COLOR, PREFERRED_DUE_DATE, DEFINITE_DUE_DATE,
-			IMPORTANCE, IDENTIFIER, TAGS_ID };
+    static String[] TASK_FIELD_LIST = new String[]{NAME, IMPORTANCE_COLOR, PREFERRED_DUE_DATE, DEFINITE_DUE_DATE,
+            IMPORTANCE, IDENTIFIER, TAGS_ID};
 
-	static String[] TAGS_FIELD_LIST = new String[] { ID, NAME };
+    static String[] TAGS_FIELD_LIST = new String[]{ID, NAME};
 
-	private static final int URI_TASKS = 0;
-	private static final int URI_TAGS = 1;
+    private static final int URI_TASKS = 0;
+    private static final int URI_TAGS = 1;
 
-	private static final String TAG_SEPARATOR = "|";
+    private static final String TAG_SEPARATOR = "|";
 
-	@Autowired
-	private TaskService taskService;
+    @Autowired
+    private TaskService taskService;
 
-	private static Context ctx = null;
+    private static Context ctx = null;
 
-	static {
-		URI_MATCHER.addURI(AUTHORITY, "tasks", URI_TASKS);
-		URI_MATCHER.addURI(AUTHORITY, "tags", URI_TAGS);
+    static {
+        URI_MATCHER.addURI(AUTHORITY, "tasks", URI_TASKS);
+        URI_MATCHER.addURI(AUTHORITY, "tags", URI_TAGS);
 
-		AstridDependencyInjector.initialize();
-	}
+        AstridDependencyInjector.initialize();
+    }
 
-	public Astrid2TaskProvider() {
-	    try {
-	        DependencyInjectionService.getInstance().inject(this);
-	    } catch (Exception e) {
-	        // can't do anything about this
-	    }
+    public Astrid2TaskProvider() {
+        try {
+            DependencyInjectionService.getInstance().inject(this);
+        } catch (Exception e) {
+            // can't do anything about this
+        }
     }
 
-	@Override
-	public int delete(Uri uri, String selection, String[] selectionArgs) {
-		if (LOGD)
-			Log.d(TAG, "delete");
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        if (LOGD)
+            Log.d(TAG, "delete");
 
-		return 0;
-	}
+        return 0;
+    }
 
-	@Override
-	public String getType(Uri uri) {
-		return null;
-	}
+    @Override
+    public String getType(Uri uri) {
+        return null;
+    }
 
-	@Override
-	public Uri insert(Uri uri, ContentValues values) {
-		return null;
-	}
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        return null;
+    }
 
-	@Override
-	public boolean onCreate() {
-		ctx = getContext();
-		ContextManager.setContext(ctx);
-		return false;
-	}
+    @Override
+    public boolean onCreate() {
+        ctx = getContext();
+        ContextManager.setContext(ctx);
+        return false;
+    }
 
-	/**
-	 * Note: tag id is no longer a real column, so we pass in a UID
-	 * generated from the tag string.
-	 *
-	 * @return two-column cursor: tag id (string) and tag name
-	 */
-	public Cursor getTags() {
+    /**
+     * Note: tag id is no longer a real column, so we pass in a UID
+     * generated from the tag string.
+     *
+     * @return two-column cursor: tag id (string) and tag name
+     */
+    public Cursor getTags() {
 
-		Tag[] tags = TagService.getInstance().getGroupedTags(TagService.GROUPED_TAGS_BY_SIZE,
-		        Criterion.all);
+        Tag[] tags = TagService.getInstance().getGroupedTags(TagService.GROUPED_TAGS_BY_SIZE,
+                Criterion.all);
 
-		MatrixCursor ret = new MatrixCursor(TAGS_FIELD_LIST);
+        MatrixCursor ret = new MatrixCursor(TAGS_FIELD_LIST);
 
-		for (int i = 0; i < tags.length; i++) {
-			Object[] values = new Object[2];
-			values[0] = tagNameToLong(tags[i].tag);
-			values[1] = tags[i].tag;
+        for (int i = 0; i < tags.length; i++) {
+            Object[] values = new Object[2];
+            values[0] = tagNameToLong(tags[i].tag);
+            values[1] = tags[i].tag;
 
-			ret.addRow(values);
-		}
+            ret.addRow(values);
+        }
 
-		return ret;
-	}
+        return ret;
+    }
 
     private long tagNameToLong(String tag) {
         MessageDigest m;
@@ -170,135 +169,135 @@ public class Astrid2TaskProvider extends ContentProvider {
     }
 
     /**
-	 * Cursor with the following columns
-	 * <ol>
-	 * <li>task title, string
-	 * <li>task importance color, int android RGB color
-	 * <li>task due date (was: preferred due date), long millis since epoch
-	 * <li>task due date (was: absolute due date), long millis since epoch
-	 * <li>task importance, integer from 0 to 3 (0 => most important)
-	 * <li>task id, long
-	 * <li>task tags, string tags separated by |
-	 * </ol>
-	 *
-	 * @return cursor as described above
-	 */
-	public Cursor getTasks() {
-
-		MatrixCursor ret = new MatrixCursor(TASK_FIELD_LIST);
-
-		TodorooCursor<Task> cursor = taskService.query(Query.select(Task.ID, Task.TITLE,
-		        Task.IMPORTANCE, Task.DUE_DATE).where(Criterion.and(TaskCriteria.isActive(),
-                        TaskCriteria.isVisible())).
-		        orderBy(SortHelper.defaultTaskOrder()).limit(MAX_NUMBER_OF_TASKS));
-		try {
-    		int[] importanceColors = Task.getImportanceColors(ctx.getResources());
-    		Task task = new Task();
-    		for (int i = 0; i < cursor.getCount(); i++) {
-    			cursor.moveToNext();
-    			task.readFromCursor(cursor);
-
-    			String taskTags = TagService.getInstance().getTagsAsString(task.getId(), TAG_SEPARATOR);
-
-    			Object[] values = new Object[7];
-    			values[0] = task.getValue(Task.TITLE);
-    			values[1] = importanceColors[task.getValue(Task.IMPORTANCE)];
-    			values[2] = task.getValue(Task.DUE_DATE);
-    			values[3] = task.getValue(Task.DUE_DATE);
-    			values[4] = task.getValue(Task.IMPORTANCE);
-    			values[5] = task.getId();
-    			values[6] = taskTags;
-
-    			ret.addRow(values);
-    		}
-		} finally {
-		    cursor.close();
-		}
-
-		return ret;
-	}
-
-	@Override
-	public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
-
-		if (LOGD)
-			Log.d(TAG, "query");
-
-		Cursor cursor;
-		switch (URI_MATCHER.match(uri)) {
-
-		case URI_TASKS:
-			cursor = getTasks();
-			break;
-
-		case URI_TAGS:
-			cursor = getTags();
-			break;
-
-		default:
-			throw new IllegalStateException("Unrecognized URI:" + uri);
-		}
-
-		return cursor;
-	}
-
-	@Override
-	public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-
-		if (LOGD)
-			Log.d(TAG, "update");
-
-      switch (URI_MATCHER.match(uri)) {
-
-        case URI_TASKS:
+     * Cursor with the following columns
+     * <ol>
+     * <li>task title, string
+     * <li>task importance color, int android RGB color
+     * <li>task due date (was: preferred due date), long millis since epoch
+     * <li>task due date (was: absolute due date), long millis since epoch
+     * <li>task importance, integer from 0 to 3 (0 => most important)
+     * <li>task id, long
+     * <li>task tags, string tags separated by |
+     * </ol>
+     *
+     * @return cursor as described above
+     */
+    public Cursor getTasks() {
+
+        MatrixCursor ret = new MatrixCursor(TASK_FIELD_LIST);
+
+        TodorooCursor<Task> cursor = taskService.query(Query.select(Task.ID, Task.TITLE,
+                Task.IMPORTANCE, Task.DUE_DATE).where(Criterion.and(TaskCriteria.isActive(),
+                TaskCriteria.isVisible())).
+                orderBy(SortHelper.defaultTaskOrder()).limit(MAX_NUMBER_OF_TASKS));
+        try {
+            int[] importanceColors = Task.getImportanceColors(ctx.getResources());
             Task task = new Task();
-
-            // map values
-            if(values.containsKey(NAME))
-                task.setValue(Task.TITLE, values.getAsString(NAME));
-            if(values.containsKey(PREFERRED_DUE_DATE))
-                task.setValue(Task.DUE_DATE, values.getAsLong(PREFERRED_DUE_DATE));
-            if(values.containsKey(DEFINITE_DUE_DATE))
-                task.setValue(Task.DUE_DATE, values.getAsLong(DEFINITE_DUE_DATE));
-            if(values.containsKey(IMPORTANCE))
-                task.setValue(Task.IMPORTANCE, values.getAsInteger(IMPORTANCE));
-            if(values.containsKey(COMPLETED)) {
-                task.setValue(Task.COMPLETION_DATE,
-                        values.getAsBoolean(COMPLETED) ? DateUtilities.now() : 0);
-                if(task.isCompleted())
-                    StatisticsService.reportEvent(StatisticsConstants.TASK_COMPLETED_API2);
+            for (int i = 0; i < cursor.getCount(); i++) {
+                cursor.moveToNext();
+                task.readFromCursor(cursor);
+
+                String taskTags = TagService.getInstance().getTagsAsString(task.getId(), TAG_SEPARATOR);
+
+                Object[] values = new Object[7];
+                values[0] = task.getValue(Task.TITLE);
+                values[1] = importanceColors[task.getValue(Task.IMPORTANCE)];
+                values[2] = task.getValue(Task.DUE_DATE);
+                values[3] = task.getValue(Task.DUE_DATE);
+                values[4] = task.getValue(Task.IMPORTANCE);
+                values[5] = task.getId();
+                values[6] = taskTags;
+
+                ret.addRow(values);
             }
+        } finally {
+            cursor.close();
+        }
+
+        return ret;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
 
-            // map selection criteria
-            String criteria = selection.replace(NAME, Task.TITLE.name).
-                replace(PREFERRED_DUE_DATE, Task.DUE_DATE.name).
-                replace(DEFINITE_DUE_DATE, Task.DUE_DATE.name).
-                replace(IDENTIFIER, Task.ID.name).
-                replace(ID, Task.ID.name).
-                replace(IMPORTANCE, Task.IMPORTANCE.name);
+        if (LOGD)
+            Log.d(TAG, "query");
 
-            return taskService.updateBySelection(criteria, selectionArgs, task);
+        Cursor cursor;
+        switch (URI_MATCHER.match(uri)) {
 
-        case URI_TAGS:
-            throw new UnsupportedOperationException("tags updating: not yet");
+            case URI_TASKS:
+                cursor = getTasks();
+                break;
 
-        default:
-            throw new IllegalStateException("Unrecognized URI:" + uri);
+            case URI_TAGS:
+                cursor = getTags();
+                break;
+
+            default:
+                throw new IllegalStateException("Unrecognized URI:" + uri);
         }
-	}
 
-	public static void notifyDatabaseModification() {
+        return cursor;
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+
+        if (LOGD)
+            Log.d(TAG, "update");
+
+        switch (URI_MATCHER.match(uri)) {
+
+            case URI_TASKS:
+                Task task = new Task();
+
+                // map values
+                if (values.containsKey(NAME))
+                    task.setValue(Task.TITLE, values.getAsString(NAME));
+                if (values.containsKey(PREFERRED_DUE_DATE))
+                    task.setValue(Task.DUE_DATE, values.getAsLong(PREFERRED_DUE_DATE));
+                if (values.containsKey(DEFINITE_DUE_DATE))
+                    task.setValue(Task.DUE_DATE, values.getAsLong(DEFINITE_DUE_DATE));
+                if (values.containsKey(IMPORTANCE))
+                    task.setValue(Task.IMPORTANCE, values.getAsInteger(IMPORTANCE));
+                if (values.containsKey(COMPLETED)) {
+                    task.setValue(Task.COMPLETION_DATE,
+                            values.getAsBoolean(COMPLETED) ? DateUtilities.now() : 0);
+                    if (task.isCompleted())
+                        StatisticsService.reportEvent(StatisticsConstants.TASK_COMPLETED_API2);
+                }
+
+                // map selection criteria
+                String criteria = selection.replace(NAME, Task.TITLE.name).
+                        replace(PREFERRED_DUE_DATE, Task.DUE_DATE.name).
+                        replace(DEFINITE_DUE_DATE, Task.DUE_DATE.name).
+                        replace(IDENTIFIER, Task.ID.name).
+                        replace(ID, Task.ID.name).
+                        replace(IMPORTANCE, Task.IMPORTANCE.name);
+
+                return taskService.updateBySelection(criteria, selectionArgs, task);
+
+            case URI_TAGS:
+                throw new UnsupportedOperationException("tags updating: not yet");
+
+            default:
+                throw new IllegalStateException("Unrecognized URI:" + uri);
+        }
+    }
 
-		if (LOGD)
-			Log.d(TAG, "notifyDatabaseModification");
+    public static void notifyDatabaseModification() {
 
-		if(ctx == null)
-		    ctx = ContextManager.getContext();
-		try {
-		    ctx.getContentResolver().notifyChange(CONTENT_URI, null);
-		} catch (Exception e) {
-		    // no context was available
-		}
-	}
+        if (LOGD)
+            Log.d(TAG, "notifyDatabaseModification");
+
+        if (ctx == null)
+            ctx = ContextManager.getContext();
+        try {
+            ctx.getContentResolver().notifyChange(CONTENT_URI, null);
+        } catch (Exception e) {
+            // no context was available
+        }
+    }
 
 }
diff --git a/astrid/src/com/todoroo/astrid/provider/Astrid3ContentProvider.java b/astrid/src/com/todoroo/astrid/provider/Astrid3ContentProvider.java
index 7a399eb30..c17fae12b 100644
--- a/astrid/src/com/todoroo/astrid/provider/Astrid3ContentProvider.java
+++ b/astrid/src/com/todoroo/astrid/provider/Astrid3ContentProvider.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.provider;
 
-import java.util.HashSet;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import android.content.ContentProvider;
 import android.content.ContentResolver;
 import android.content.ContentUris;
@@ -40,32 +36,35 @@ import com.todoroo.astrid.data.TaskApiDao;
 import com.todoroo.astrid.data.UserActivity;
 import com.todoroo.astrid.service.AstridDependencyInjector;
 
+import java.util.HashSet;
+import java.util.Map.Entry;
+import java.util.Set;
+
 /**
  * Astrid 3 Content Provider. There are two ways to use this content provider:
  * <ul>
  * <li>access it directly just like any other content provider
  * <li>use the DAO classes from the Astrid API library
  * </ul>
- * <p>
+ * <p/>
  * The following base URI's are supported:
  * <ul>
  * <li>content://com.todoroo.astrid/tasks - task data ({@link Task})
  * <li>content://com.todoroo.astrid/metadata - task metadata ({@link Metadata})
  * <li>content://com.todoroo.astrid/store - non-task store data ({@link StoreObject})
  * </ul>
- * <p>
+ * <p/>
  * Each URI supports the following components:
  * <ul>
  * <li>/ - operate on all items (insert, delete, update, query)
  * <li>/123 - operate on item id #123 (delete, update, query)
  * <li>/groupby/title - query with SQL "group by" (query)
  * </ul>
- * <p>
+ * <p/>
  * If you are writing a third-party application to access this data, you may
  * also consider using one of the Api DAO objects like {@link TaskApiDao}.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 public class Astrid3ContentProvider extends ContentProvider {
@@ -74,13 +73,19 @@ public class Astrid3ContentProvider extends ContentProvider {
         AstridDependencyInjector.initialize();
     }
 
-    /** URI for making a request over all items */
+    /**
+     * URI for making a request over all items
+     */
     private static final int URI_DIR = 1;
 
-    /** URI for making a request over a single item by id */
+    /**
+     * URI for making a request over a single item by id
+     */
     private static final int URI_ITEM = 2;
 
-    /** URI for making a request over all items grouped by some field */
+    /**
+     * URI for making a request over all items grouped by some field
+     */
     private static final int URI_GROUP = 3;
 
     private static final UriMatcher uriMatcher;
@@ -122,7 +127,7 @@ public class Astrid3ContentProvider extends ContentProvider {
     static {
         uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
 
-        for(Uri uri : new Uri[] { Task.CONTENT_URI, Metadata.CONTENT_URI, StoreObject.CONTENT_URI, UserActivity.CONTENT_URI }) {
+        for (Uri uri : new Uri[]{Task.CONTENT_URI, Metadata.CONTENT_URI, StoreObject.CONTENT_URI, UserActivity.CONTENT_URI}) {
             String authority = AstridApiConstants.API_PACKAGE;
 
             String table = uri.toString();
@@ -145,13 +150,13 @@ public class Astrid3ContentProvider extends ContentProvider {
     @Override
     public String getType(Uri uri) {
         switch (uriMatcher.match(uri)) {
-        case URI_DIR:
-        case URI_GROUP:
-            return "vnd.android.cursor.dir/vnd.astrid";
-        case URI_ITEM:
-            return "vnd.android.cursor/vnd.astrid.item";
-        default:
-            throw new IllegalArgumentException("Unsupported URI " + uri + " (" + uriMatcher.match(uri) + ")");
+            case URI_DIR:
+            case URI_GROUP:
+                return "vnd.android.cursor.dir/vnd.astrid";
+            case URI_ITEM:
+                return "vnd.android.cursor/vnd.astrid.item";
+            default:
+                throw new IllegalArgumentException("Unsupported URI " + uri + " (" + uriMatcher.match(uri) + ")");
         }
     }
 
@@ -161,18 +166,26 @@ public class Astrid3ContentProvider extends ContentProvider {
 
     private class UriHelper<TYPE extends AbstractModel> {
 
-        /** empty model. used for insert */
+        /**
+         * empty model. used for insert
+         */
         public TYPE model;
 
-        /** dao */
+        /**
+         * dao
+         */
         public DatabaseDao<TYPE> dao;
 
-        /** creates from given model */
+        /**
+         * creates from given model
+         */
         public boolean create() {
             return dao.createNew(model);
         }
 
-        /** updates from given model */
+        /**
+         * updates from given model
+         */
         public void update() {
             dao.saveExisting(model);
         }
@@ -180,25 +193,25 @@ public class Astrid3ContentProvider extends ContentProvider {
     }
 
     private UriHelper<?> generateHelper(Uri uri, boolean populateModel) {
-        if(uri.toString().startsWith(Task.CONTENT_URI.toString())) {
+        if (uri.toString().startsWith(Task.CONTENT_URI.toString())) {
             UriHelper<Task> helper = new UriHelper<Task>();
             helper.model = populateModel ? new Task() : null;
             helper.dao = taskDao;
             helper.dao.setDatabase(getDatabase());
             return helper;
-        } else if(uri.toString().startsWith(Metadata.CONTENT_URI.toString())) {
+        } else if (uri.toString().startsWith(Metadata.CONTENT_URI.toString())) {
             UriHelper<Metadata> helper = new UriHelper<Metadata>();
             helper.model = populateModel ? new Metadata() : null;
             helper.dao = metadataDao;
             helper.dao.setDatabase(getDatabase());
             return helper;
-        } else if(uri.toString().startsWith(StoreObject.CONTENT_URI.toString())) {
+        } else if (uri.toString().startsWith(StoreObject.CONTENT_URI.toString())) {
             UriHelper<StoreObject> helper = new UriHelper<StoreObject>();
             helper.model = populateModel ? new StoreObject() : null;
             helper.dao = storeObjectDao;
             helper.dao.setDatabase(getDatabase());
             return helper;
-        } else if(uri.toString().startsWith(UserActivity.CONTENT_URI.toString())) {
+        } else if (uri.toString().startsWith(UserActivity.CONTENT_URI.toString())) {
             UriHelper<UserActivity> helper = new UriHelper<UserActivity>();
             helper.model = populateModel ? new UserActivity() : null;
             helper.dao = userActivityDao;
@@ -214,7 +227,7 @@ public class Astrid3ContentProvider extends ContentProvider {
     }
 
     private AbstractDatabase getDatabase() {
-        if(databaseOverride != null)
+        if (databaseOverride != null)
             return databaseOverride;
         return database;
     }
@@ -225,6 +238,7 @@ public class Astrid3ContentProvider extends ContentProvider {
 
     /**
      * Delete from given table
+     *
      * @return number of rows deleted
      */
     @Override
@@ -232,29 +246,29 @@ public class Astrid3ContentProvider extends ContentProvider {
         UriHelper<?> helper = generateHelper(uri, false);
         switch (uriMatcher.match(uri)) {
 
-        // illegal operations
+            // illegal operations
 
-        case URI_GROUP:
-            throw new IllegalArgumentException("Only the / or /# URI is valid"
-                    + " for deletion.");
+            case URI_GROUP:
+                throw new IllegalArgumentException("Only the / or /# URI is valid"
+                        + " for deletion.");
 
-        // valid operations
+                // valid operations
 
-        case URI_ITEM: {
-            String itemSelector = String.format("%s = '%s'",
-                    AbstractModel.ID_PROPERTY, uri.getPathSegments().get(1));
-            if(TextUtils.isEmpty(selection))
-                selection = itemSelector;
-            else
-                selection = itemSelector + " AND " + selection;
+            case URI_ITEM: {
+                String itemSelector = String.format("%s = '%s'",
+                        AbstractModel.ID_PROPERTY, uri.getPathSegments().get(1));
+                if (TextUtils.isEmpty(selection))
+                    selection = itemSelector;
+                else
+                    selection = itemSelector + " AND " + selection;
 
-        }
+            }
 
-        case URI_DIR:
-            break;
+            case URI_DIR:
+                break;
 
-        default:
-            throw new IllegalArgumentException("Unknown URI " + uri + " (" + uriMatcher.match(uri) + ")");
+            default:
+                throw new IllegalArgumentException("Unknown URI " + uri + " (" + uriMatcher.match(uri) + ")");
         }
 
         return getDatabase().delete(helper.dao.getTable().name, selection, selectionArgs);
@@ -272,28 +286,28 @@ public class Astrid3ContentProvider extends ContentProvider {
         UriHelper<?> helper = generateHelper(uri, true);
         switch (uriMatcher.match(uri)) {
 
-        // illegal operations
+            // illegal operations
 
-        case URI_ITEM:
-        case URI_GROUP:
-            throw new IllegalArgumentException("Only the / URI is valid"
-                    + " for insertion.");
+            case URI_ITEM:
+            case URI_GROUP:
+                throw new IllegalArgumentException("Only the / URI is valid"
+                        + " for insertion.");
 
-        // valid operations
+                // valid operations
 
-        case URI_DIR: {
-            helper.model.mergeWith(values);
-            readTransitoriesFromModelContentValues(helper.model);
-            if(!helper.create())
-                throw new SQLException("Could not insert row into database (constraint failed?)");
+            case URI_DIR: {
+                helper.model.mergeWith(values);
+                readTransitoriesFromModelContentValues(helper.model);
+                if (!helper.create())
+                    throw new SQLException("Could not insert row into database (constraint failed?)");
 
-            Uri newUri = ContentUris.withAppendedId(uri, helper.model.getId());
-            getContext().getContentResolver().notifyChange(newUri, null);
-            return newUri;
-        }
+                Uri newUri = ContentUris.withAppendedId(uri, helper.model.getId());
+                getContext().getContentResolver().notifyChange(newUri, null);
+                return newUri;
+            }
 
-        default:
-            throw new IllegalArgumentException("Unknown URI " + uri);
+            default:
+                throw new IllegalArgumentException("Unknown URI " + uri);
         }
     }
 
@@ -303,40 +317,40 @@ public class Astrid3ContentProvider extends ContentProvider {
 
     @Override
     public int update(Uri uri, ContentValues values, String selection,
-            String[] selectionArgs) {
+                      String[] selectionArgs) {
         UriHelper<?> helper = generateHelper(uri, true);
 
         switch (uriMatcher.match(uri)) {
 
-        // illegal operations
+            // illegal operations
 
-        case URI_GROUP:
-            throw new IllegalArgumentException("Only the / or /# URI is valid"
-                    + " for update.");
+            case URI_GROUP:
+                throw new IllegalArgumentException("Only the / or /# URI is valid"
+                        + " for update.");
 
-        // valid operations
+                // valid operations
 
-        case URI_ITEM: {
-            String itemSelector = String.format("%s = '%s'",
-                    AbstractModel.ID_PROPERTY, uri.getPathSegments().get(1));
-            if(TextUtils.isEmpty(selection))
-                selection = itemSelector;
-            else
-                selection = itemSelector + " AND " + selection;
+            case URI_ITEM: {
+                String itemSelector = String.format("%s = '%s'",
+                        AbstractModel.ID_PROPERTY, uri.getPathSegments().get(1));
+                if (TextUtils.isEmpty(selection))
+                    selection = itemSelector;
+                else
+                    selection = itemSelector + " AND " + selection;
 
-        }
+            }
 
-        case URI_DIR:
-            break;
+            case URI_DIR:
+                break;
 
-        default:
-            throw new IllegalArgumentException("Unknown URI " + uri + " (" + uriMatcher.match(uri) + ")");
+            default:
+                throw new IllegalArgumentException("Unknown URI " + uri + " (" + uriMatcher.match(uri) + ")");
         }
 
-        Cursor cursor = query(uri, new String[] { AbstractModel.ID_PROPERTY.name },
+        Cursor cursor = query(uri, new String[]{AbstractModel.ID_PROPERTY.name},
                 selection, selectionArgs, null);
         try {
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 long id = cursor.getLong(0);
                 helper.model.mergeWith(values);
                 readTransitoriesFromModelContentValues(helper.model);
@@ -357,7 +371,7 @@ public class Astrid3ContentProvider extends ContentProvider {
         if (setValues != null) {
             Set<Entry<String, Object>> entries = setValues.valueSet();
             Set<String> keysToRemove = new HashSet<String>();
-            for (Entry<String, Object> entry: entries) {
+            for (Entry<String, Object> entry : entries) {
                 String key = entry.getKey();
                 if (key.startsWith(AbstractModel.RETAIN_TRANSITORY_PREFIX)) {
                     String newKey = key.substring(AbstractModel.RETAIN_TRANSITORY_PREFIX.length());
@@ -379,14 +393,14 @@ public class Astrid3ContentProvider extends ContentProvider {
 
     /**
      * Query by task.
-     * <p>
+     * <p/>
      * Note that the "sortOrder" field actually can be used to append any
      * sort of clause to your SQL query as long as it is not also the
      * name of a column
      */
     @Override
     public Cursor query(Uri uri, String[] projection, String selection,
-            String[] selectionArgs, String sortOrder) {
+                        String[] selectionArgs, String sortOrder) {
 
         String groupBy = null;
 
@@ -395,17 +409,17 @@ public class Astrid3ContentProvider extends ContentProvider {
         builder.setTables(helper.dao.getTable().name);
 
         switch (uriMatcher.match(uri)) {
-        case URI_GROUP:
-            groupBy = uri.getPathSegments().get(2);
-        case URI_DIR:
-            break;
-        case URI_ITEM:
-            String itemSelector = String.format("%s = '%s'",
-                    AbstractModel.ID_PROPERTY, uri.getPathSegments().get(1));
-            builder.appendWhere(itemSelector);
-            break;
-        default:
-            throw new IllegalArgumentException("Unknown URI " + uri + " (" + uriMatcher.match(uri) + ")");
+            case URI_GROUP:
+                groupBy = uri.getPathSegments().get(2);
+            case URI_DIR:
+                break;
+            case URI_ITEM:
+                String itemSelector = String.format("%s = '%s'",
+                        AbstractModel.ID_PROPERTY, uri.getPathSegments().get(1));
+                builder.appendWhere(itemSelector);
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown URI " + uri + " (" + uriMatcher.match(uri) + ")");
         }
 
         Cursor cursor = builder.query(getDatabase().getDatabase(), projection, selection, selectionArgs, groupBy, null, sortOrder);
diff --git a/astrid/src/com/todoroo/astrid/provider/SqlContentProvider.java b/astrid/src/com/todoroo/astrid/provider/SqlContentProvider.java
index 1477b7f23..8fb31a009 100644
--- a/astrid/src/com/todoroo/astrid/provider/SqlContentProvider.java
+++ b/astrid/src/com/todoroo/astrid/provider/SqlContentProvider.java
@@ -20,13 +20,12 @@ import com.todoroo.astrid.service.AstridDependencyInjector;
 
 /**
  * Non-public-API SQL content provider.
- *
+ * <p/>
  * This provider is dangerous and unsupported, use at your own risk. It allows
  * full SQL queries, which means LIMIT and JOIN in queries. Only SELECT is
  * currently supported.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 public class SqlContentProvider extends ContentProvider {
@@ -72,10 +71,10 @@ public class SqlContentProvider extends ContentProvider {
     @Override
     public String getType(Uri uri) {
         switch (uriMatcher.match(uri)) {
-        case 0:
-            return "vnd.android.cursor.dir/vnd.astrid";
-        default:
-            throw new IllegalArgumentException("Unsupported URI " + uri + " (" + uriMatcher.match(uri) + ")");
+            case 0:
+                return "vnd.android.cursor.dir/vnd.astrid";
+            default:
+                throw new IllegalArgumentException("Unsupported URI " + uri + " (" + uriMatcher.match(uri) + ")");
         }
     }
 
@@ -85,6 +84,7 @@ public class SqlContentProvider extends ContentProvider {
 
     /**
      * Delete from given table
+     *
      * @return number of rows deleted
      */
     @Override
@@ -110,7 +110,7 @@ public class SqlContentProvider extends ContentProvider {
 
     @Override
     public int update(Uri uri, ContentValues values, String selection,
-            String[] selectionArgs) {
+                      String[] selectionArgs) {
         throw new UnsupportedOperationException("unimplemented");
     }
 
@@ -120,14 +120,14 @@ public class SqlContentProvider extends ContentProvider {
 
     /**
      * Query by task.
-     * <p>
+     * <p/>
      * Note that the "sortOrder" field actually can be used to append any
      * sort of clause to your SQL query as long as it is not also the
      * name of a column
      */
     @Override
     public Cursor query(Uri uri, String[] projection, String selection,
-            String[] selectionArgs, String sortOrder) {
+                        String[] selectionArgs, String sortOrder) {
 
         Cursor cursor = database.rawQuery(selection, null);
         return cursor;
diff --git a/astrid/src/com/todoroo/astrid/service/AddOnService.java b/astrid/src/com/todoroo/astrid/service/AddOnService.java
index 949c1a946..967539f0c 100644
--- a/astrid/src/com/todoroo/astrid/service/AddOnService.java
+++ b/astrid/src/com/todoroo/astrid/service/AddOnService.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.service;
 
-import java.util.ArrayList;
-
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.BitmapDrawable;
@@ -18,41 +16,54 @@ import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.data.AddOn;
 import com.todoroo.astrid.utility.Constants;
 
+import java.util.ArrayList;
+
 /**
  * Astrid Service for managing add-ons
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 public class AddOnService {
 
-    /** OEM preference key */
+    /**
+     * OEM preference key
+     */
     private static final String PREF_OEM = "poem";
 
-    /** Astrid Power Pack package */
+    /**
+     * Astrid Power Pack package
+     */
     public static final String POWER_PACK_PACKAGE = "com.todoroo.astrid.ppack";
 
-    /** Astrid Locale package */
+    /**
+     * Astrid Locale package
+     */
     public static final String LOCALE_PACKAGE = "com.todoroo.astrid.locale";
 
-    /** Astrid Power Pack label */
+    /**
+     * Astrid Power Pack label
+     */
     public static final String POWER_PACK_LABEL = "Astrid Power Pack";
 
-    /** Checks whether power pack should be enabled */
+    /**
+     * Checks whether power pack should be enabled
+     */
     public boolean hasPowerPack() {
         if (Preferences.getBoolean(PREF_OEM, false))
             return true;
-        else if(isInstalled(POWER_PACK_PACKAGE, true))
+        else if (isInstalled(POWER_PACK_PACKAGE, true))
             return true;
         return false;
     }
 
-    /** Checks whether locale plugin should be enabled */
+    /**
+     * Checks whether locale plugin should be enabled
+     */
     public boolean hasLocalePlugin() {
         if (Preferences.getBoolean(PREF_OEM, false))
             return true;
-        else if(isInstalled(LOCALE_PACKAGE, true))
+        else if (isInstalled(LOCALE_PACKAGE, true))
             return true;
         return false;
     }
@@ -66,6 +77,7 @@ public class AddOnService {
 
     /**
      * Check whether a given add-on is installed
+     *
      * @param addOn
      * @return
      */
@@ -78,6 +90,7 @@ public class AddOnService {
 
     /**
      * Check whether an external add-on is installed
+     *
      * @param packageName
      * @return
      */
@@ -87,20 +100,21 @@ public class AddOnService {
 
     /**
      * Check whether a given add-on is installed
+     *
      * @param addOn
      * @param internal whether to do api sig check
      * @return
      */
     private boolean isInstalled(String packageName, boolean internal) {
-        if(Constants.PACKAGE.equals(packageName))
+        if (Constants.PACKAGE.equals(packageName))
             return true;
 
         Context context = ContextManager.getContext();
 
         String packageSignature = AndroidUtilities.getSignature(context, packageName);
-        if(packageSignature == null)
+        if (packageSignature == null)
             return false;
-        if(!internal)
+        if (!internal)
             return true;
 
         String astridSignature = AndroidUtilities.getSignature(context, Constants.PACKAGE);
@@ -111,7 +125,7 @@ public class AddOnService {
      * Get one AddOn-descriptor by packageName and title.
      *
      * @param packageName could be Constants.PACKAGE or one of AddOnService-constants
-     * @param title the descriptive title, as in "Astrid Power Pack"
+     * @param title       the descriptive title, as in "Astrid Power Pack"
      * @return the addon-descriptor, if it is available (registered here in getAddOns), otherwise null
      */
     public AddOn getAddOn(String packageName, String title) {
@@ -120,7 +134,7 @@ public class AddOnService {
 
         AddOn addon = null;
         AddOn[] addons = getAddOns();
-        for (int i = 0; i < addons.length ; i++) {
+        for (int i = 0; i < addons.length; i++) {
             if (packageName.equals(addons[i].getPackageName()) && title.equals(addons[i].getTitle())) {
                 addon = addons[i];
             }
@@ -138,17 +152,17 @@ public class AddOnService {
 
         // temporary temporary
         ArrayList<AddOn> list = new ArrayList<AddOn>(3);
-        if(Constants.MARKET_STRATEGY.includesPowerPack())
+        if (Constants.MARKET_STRATEGY.includesPowerPack())
             list.add(new AddOn(false, true, r.getString(R.string.AOA_ppack_title), null,
-                r.getString(R.string.AOA_ppack_description),
-                POWER_PACK_PACKAGE,
-                ((BitmapDrawable)r.getDrawable(R.drawable.icon_pp)).getBitmap()));
+                    r.getString(R.string.AOA_ppack_description),
+                    POWER_PACK_PACKAGE,
+                    ((BitmapDrawable) r.getDrawable(R.drawable.icon_pp)).getBitmap()));
 
-        if(Constants.MARKET_STRATEGY.includesLocalePlugin())
+        if (Constants.MARKET_STRATEGY.includesLocalePlugin())
             list.add(new AddOn(false, true, r.getString(R.string.AOA_locale_title), null,
-                r.getString(R.string.AOA_locale_description),
-                LOCALE_PACKAGE,
-                ((BitmapDrawable)r.getDrawable(R.drawable.icon_locale)).getBitmap()));
+                    r.getString(R.string.AOA_locale_description),
+                    LOCALE_PACKAGE,
+                    ((BitmapDrawable) r.getDrawable(R.drawable.icon_locale)).getBitmap()));
 
         return list.toArray(new AddOn[list.size()]);
     }
diff --git a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java
index 6752433e5..3870991e6 100644
--- a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java
+++ b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.service;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map.Entry;
-
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
@@ -47,6 +43,10 @@ import com.todoroo.astrid.legacy.LegacyTaskModel;
 import com.todoroo.astrid.legacy.TransitionalAlarm;
 import com.todoroo.astrid.tags.TaskToTagMetadata;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map.Entry;
+
 public class Astrid2To3UpgradeHelper {
 
     @Autowired
@@ -92,7 +92,7 @@ public class Astrid2To3UpgradeHelper {
     private static class Astrid2UpgradeHelper extends SQLiteOpenHelper {
 
         public Astrid2UpgradeHelper(Context context, String name,
-                CursorFactory factory, int version) {
+                                    CursorFactory factory, int version) {
             super(context, name, factory, version);
         }
 
@@ -112,12 +112,13 @@ public class Astrid2To3UpgradeHelper {
 
     /**
      * Perform the upgrade from Astrid 3 to 3.1
+     *
      * @param context
      * @param upgradeService
      * @param from
      */
     public void upgrade3To3_1(final Context context, final int from) {
-        if(!checkIfDatabaseExists(context, alertsTable))
+        if (!checkIfDatabaseExists(context, alertsTable))
             return;
 
         database.openForWriting();
@@ -128,21 +129,22 @@ public class Astrid2To3UpgradeHelper {
 
     /**
      * Perform the upgrade from Astrid 2 to Astrid 3
+     *
      * @param context2
      */
     @SuppressWarnings("deprecation")
     public void upgrade2To3(final Context context, final int from) {
 
         // if from < 1 (we don't know what version, and database exists, leave it alone)
-        if(from < 1 && checkIfDatabaseExists(context, database.getName()))
+        if (from < 1 && checkIfDatabaseExists(context, database.getName()))
             return;
 
         // if you don't have a legacy task table, skip this step
-        if(!checkIfDatabaseExists(context, tasksTable))
+        if (!checkIfDatabaseExists(context, tasksTable))
             return;
 
         // else, if there's already a database table, clear it out (!!!)
-        if(checkIfDatabaseExists(context, database.getName()))
+        if (checkIfDatabaseExists(context, database.getName()))
             context.deleteDatabase(database.getName());
         database.openForWriting();
 
@@ -153,7 +155,7 @@ public class Astrid2To3UpgradeHelper {
 
             // --- upgrade tasks table
             HashMap<String, Property<?>> propertyMap =
-                new HashMap<String, Property<?>>();
+                    new HashMap<String, Property<?>>();
             propertyMap.put("_id", Task.ID); //$NON-NLS-1$
             propertyMap.put(LegacyTaskModel.NAME, Task.TITLE);
             propertyMap.put(LegacyTaskModel.NOTES, Task.NOTES);
@@ -197,14 +199,14 @@ public class Astrid2To3UpgradeHelper {
             SharedPreferences prefs = Preferences.getPrefs(context);
             Editor editor = prefs.edit();
             int random = Preferences.getIntegerFromString(R.string.p_rmd_default_random_hours, -1);
-            if(random != -1) {
+            if (random != -1) {
                 // convert days => hours
                 editor.putString(context.getString(R.string.p_rmd_default_random_hours),
                         Integer.toString(random * 24));
             }
         } catch (Exception e) {
             exceptionService.reportError("backup-error", e); //$NON-NLS-1$
-            if(backupFile != null) {
+            if (backupFile != null) {
                 // try to restore the latest XML
                 TasksXmlImporter.importTasks(context, backupFile, null);
             }
@@ -236,8 +238,8 @@ public class Astrid2To3UpgradeHelper {
 
     /**
      * Visitor that reads from a visitor container and writes to the model
-     * @author Tim Su <tim@todoroo.com>
      *
+     * @author Tim Su <tim@todoroo.com>
      */
     @SuppressWarnings("nls")
     protected static final class ColumnUpgradeVisitor implements PropertyVisitor<Void, UpgradeVisitorContainer<?>> {
@@ -262,26 +264,26 @@ public class Astrid2To3UpgradeHelper {
             long value = data.cursor.getLong(data.columnIndex);
 
             // special handling for due date
-            if(property == Task.DUE_DATE) {
+            if (property == Task.DUE_DATE) {
                 long preferredDueDate = data.cursor.getLong(data.cursor.getColumnIndex(LegacyTaskModel.PREFERRED_DUE_DATE));
-                if(value == 0)
+                if (value == 0)
                     value = preferredDueDate;
-                else if(preferredDueDate != 0) {
+                else if (preferredDueDate != 0) {
                     // had both absolute and preferred due dates. write
                     // preferred due date into notes field
-                    if(data.upgradeNotes == null)
+                    if (data.upgradeNotes == null)
                         data.upgradeNotes = new StringBuilder();
                     data.upgradeNotes.append("Goal Deadline: " +
                             DateUtilities.getDateString(ContextManager.getContext(),
                                     new Date(preferredDueDate)));
                 }
-            } else if(property == Task.REMINDER_PERIOD) {
+            } else if (property == Task.REMINDER_PERIOD) {
                 // old period was stored in seconds
                 value *= 1000L;
-            } else if(property == Task.COMPLETION_DATE) {
+            } else if (property == Task.COMPLETION_DATE) {
                 // check if the task was actually completed
                 int progress = data.cursor.getInt(data.cursor.getColumnIndex(LegacyTaskModel.PROGRESS_PERCENTAGE));
-                if(progress < 100)
+                if (progress < 100)
                     value = 0;
             }
 
@@ -294,9 +296,9 @@ public class Astrid2To3UpgradeHelper {
         public Void visitString(Property<String> property, UpgradeVisitorContainer<?> data) {
             String value = data.cursor.getString(data.columnIndex);
 
-            if(property == Task.RECURRENCE) {
+            if (property == Task.RECURRENCE) {
                 LegacyRepeatInfo repeatInfo = LegacyRepeatInfo.fromSingleField(data.cursor.getInt(data.columnIndex));
-                if(repeatInfo == null)
+                if (repeatInfo == null)
                     data.model.setValue(property, "");
                 else {
                     RRule rrule = repeatInfo.toRRule();
@@ -323,10 +325,10 @@ public class Astrid2To3UpgradeHelper {
      */
     @SuppressWarnings("nls")
     private static final <TYPE extends AbstractModel> void upgradeTable(Context context, String legacyTable,
-            HashMap<String, Property<?>> propertyMap, TYPE model,
-            DatabaseDao<TYPE> dao) {
+                                                                        HashMap<String, Property<?>> propertyMap, TYPE model,
+                                                                        DatabaseDao<TYPE> dao) {
 
-        if(!checkIfDatabaseExists(context, legacyTable))
+        if (!checkIfDatabaseExists(context, legacyTable))
             return;
 
         SQLiteDatabase upgradeDb = new Astrid2UpgradeHelper(context, legacyTable,
@@ -337,21 +339,21 @@ public class Astrid2To3UpgradeHelper {
         container.cursor = cursor;
         container.model = model;
         ColumnUpgradeVisitor visitor = new ColumnUpgradeVisitor();
-        for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+        for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
             model.clear();
-            for(Entry<String, Property<?>> entry : propertyMap.entrySet()) {
+            for (Entry<String, Property<?>> entry : propertyMap.entrySet()) {
                 container.columnIndex = cursor.getColumnIndex(entry.getKey());
                 entry.getValue().accept(visitor, container);
             }
 
             // special tweak for adding upgrade notes to tasks
-            if(container.upgradeNotes != null) {
-                if(container.model.getValue(Task.NOTES).length() == 0)
+            if (container.upgradeNotes != null) {
+                if (container.model.getValue(Task.NOTES).length() == 0)
                     container.model.setValue(Task.NOTES, container.upgradeNotes.toString());
                 else {
                     container.model.setValue(Task.NOTES,
                             container.model.getValue(Task.NOTES) + "\n\n" +
-                            container.upgradeNotes);
+                                    container.upgradeNotes);
                 }
                 container.upgradeNotes = null;
             }
@@ -376,7 +378,7 @@ public class Astrid2To3UpgradeHelper {
     private void migrateTagsToMetadata() {
         Context context = ContextManager.getContext();
 
-        if(!checkIfDatabaseExists(context, tagsTable) ||
+        if (!checkIfDatabaseExists(context, tagsTable) ||
                 !checkIfDatabaseExists(context, tagTaskTable))
             return;
 
@@ -390,25 +392,25 @@ public class Astrid2To3UpgradeHelper {
         Cursor mapCursor = null;
         try {
             mapCursor = tagTaskDb.rawQuery("SELECT tag, task FROM " + tagTaskTable +
-                " ORDER BY tag ASC", null);
-            if(tagCursor.getCount() == 0)
+                    " ORDER BY tag ASC", null);
+            if (tagCursor.getCount() == 0)
                 return;
 
             Metadata metadata = new Metadata();
             metadata.setValue(Metadata.KEY, TaskToTagMetadata.KEY);
             long tagId = -1;
             String tag = null;
-            for(mapCursor.moveToFirst(); !mapCursor.isAfterLast(); mapCursor.moveToNext()) {
+            for (mapCursor.moveToFirst(); !mapCursor.isAfterLast(); mapCursor.moveToNext()) {
                 long mapTagId = mapCursor.getLong(0);
 
-                while(mapTagId > tagId && !tagCursor.isLast()) {
+                while (mapTagId > tagId && !tagCursor.isLast()) {
                     tagCursor.moveToNext();
                     tagId = tagCursor.getLong(0);
                     tag = null;
                 }
 
-                if(mapTagId == tagId) {
-                    if(tag == null)
+                if (mapTagId == tagId) {
+                    if (tag == null)
                         tag = tagCursor.getString(1);
                     long task = mapCursor.getLong(1);
                     metadata.setValue(Metadata.TASK, task);
@@ -420,7 +422,7 @@ public class Astrid2To3UpgradeHelper {
             }
         } finally {
             tagCursor.close();
-            if(mapCursor != null)
+            if (mapCursor != null)
                 mapCursor.close();
             tagsDb.close();
             tagTaskDb.close();
@@ -433,7 +435,7 @@ public class Astrid2To3UpgradeHelper {
     private void migrateAlarmsToMetadata() {
         Context context = ContextManager.getContext();
 
-        if(!checkIfDatabaseExists(context, AlarmDatabase.NAME))
+        if (!checkIfDatabaseExists(context, AlarmDatabase.NAME))
             return;
 
         AlarmDatabase alarmsDatabase = new AlarmDatabase();
@@ -442,12 +444,12 @@ public class Astrid2To3UpgradeHelper {
 
         TodorooCursor<TransitionalAlarm> cursor = dao.query(Query.select(TransitionalAlarm.PROPERTIES));
         try {
-            if(cursor.getCount() == 0)
+            if (cursor.getCount() == 0)
                 return;
 
             Metadata metadata = new Metadata();
             metadata.setValue(Metadata.KEY, AlarmFields.METADATA_KEY);
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 long task = cursor.get(TransitionalAlarm.TASK);
                 long time = cursor.get(TransitionalAlarm.TIME);
 
diff --git a/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java b/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java
index b4375d29f..c7461d873 100644
--- a/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java
+++ b/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java
@@ -52,7 +52,6 @@ import com.todoroo.astrid.utility.Constants;
  * and {@link AbstractDependencyInjector}.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class AstridDependencyInjector extends AbstractDependencyInjector {
 
@@ -134,7 +133,7 @@ public class AstridDependencyInjector extends AbstractDependencyInjector {
         injectables.put("tagService", TagService.class);
 
         // these make reference to fields defined above
-        injectables.put("errorReporters", new ErrorReporter[] {
+        injectables.put("errorReporters", new ErrorReporter[]{
                 new AndroidLogReporter(),
         });
     }
@@ -143,10 +142,10 @@ public class AstridDependencyInjector extends AbstractDependencyInjector {
      * Install this service as the default Dependency Injector
      */
     public static void initialize() {
-        if(instance != null)
+        if (instance != null)
             return;
-        synchronized(AstridDependencyInjector.class) {
-            if(instance == null)
+        synchronized (AstridDependencyInjector.class) {
+            if (instance == null)
                 instance = new AstridDependencyInjector();
             DependencyInjectionService.getInstance().addInjector(instance);
         }
diff --git a/astrid/src/com/todoroo/astrid/service/GlobalEventReceiver.java b/astrid/src/com/todoroo/astrid/service/GlobalEventReceiver.java
index ec77c2dce..e02277920 100644
--- a/astrid/src/com/todoroo/astrid/service/GlobalEventReceiver.java
+++ b/astrid/src/com/todoroo/astrid/service/GlobalEventReceiver.java
@@ -20,7 +20,6 @@ import com.todoroo.astrid.utility.Flags;
  * specific activity
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public final class GlobalEventReceiver extends BroadcastReceiver {
 
@@ -33,12 +32,12 @@ public final class GlobalEventReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        if(intent == null)
+        if (intent == null)
             return;
 
         DependencyInjectionService.getInstance().inject(this);
 
-        if(AstridApiConstants.BROADCAST_EVENT_FLUSH_DETAILS.equals(intent.getAction())) {
+        if (AstridApiConstants.BROADCAST_EVENT_FLUSH_DETAILS.equals(intent.getAction())) {
             taskService.clearDetails(Criterion.all);
             Flags.set(Flags.REFRESH);
         }
diff --git a/astrid/src/com/todoroo/astrid/service/MarketStrategy.java b/astrid/src/com/todoroo/astrid/service/MarketStrategy.java
index afe2d293f..e36703c5a 100644
--- a/astrid/src/com/todoroo/astrid/service/MarketStrategy.java
+++ b/astrid/src/com/todoroo/astrid/service/MarketStrategy.java
@@ -48,6 +48,7 @@ public abstract class MarketStrategy {
     /**
      * Most market strategies don't support billing at this time,
      * so we'll make the default false
+     *
      * @return
      */
     public boolean billingSupported() {
@@ -57,6 +58,7 @@ public abstract class MarketStrategy {
     /**
      * Return true if the preference to use the phone layout should be
      * turned on by default (only true for Nook)
+     *
      * @return
      */
     public boolean defaultPhoneLayout() {
@@ -115,16 +117,16 @@ public abstract class MarketStrategy {
          */
         public static boolean isKindleFire() {
             return android.os.Build.MANUFACTURER.equals("Amazon") && //$NON-NLS-1$
-                android.os.Build.MODEL.contains("Kindle"); //$NON-NLS-1$
+                    android.os.Build.MODEL.contains("Kindle"); //$NON-NLS-1$
         }
 
         @Override
         public int[] excludedSettings() {
-            return new int[] {
-                R.string.p_theme_widget,
-                R.string.p_voicePrefSection,
-                R.string.p_end_at_deadline,
-                R.string.p_field_missed_calls
+            return new int[]{
+                    R.string.p_theme_widget,
+                    R.string.p_voicePrefSection,
+                    R.string.p_end_at_deadline,
+                    R.string.p_field_missed_calls
             };
         }
 
@@ -156,17 +158,17 @@ public abstract class MarketStrategy {
 
         @Override
         public int[] excludedSettings() {
-            return new int[] {
-                R.string.p_theme_widget,
-                R.string.p_voicePrefSection,
-                R.string.p_end_at_deadline,
-                R.string.p_field_missed_calls,
-                R.string.p_rmd_vibrate,
-                R.string.gcal_p_default,
-                R.string.p_theme_widget,
-                R.string.p_voiceInputEnabled,
-                R.string.p_voiceInputCreatesTask,
-                R.string.p_use_contact_picker
+            return new int[]{
+                    R.string.p_theme_widget,
+                    R.string.p_voicePrefSection,
+                    R.string.p_end_at_deadline,
+                    R.string.p_field_missed_calls,
+                    R.string.p_rmd_vibrate,
+                    R.string.gcal_p_default,
+                    R.string.p_theme_widget,
+                    R.string.p_voiceInputEnabled,
+                    R.string.p_voiceInputCreatesTask,
+                    R.string.p_use_contact_picker
             };
         }
 
diff --git a/astrid/src/com/todoroo/astrid/service/MetadataService.java b/astrid/src/com/todoroo/astrid/service/MetadataService.java
index 109500432..9b31aedd5 100644
--- a/astrid/src/com/todoroo/astrid/service/MetadataService.java
+++ b/astrid/src/com/todoroo/astrid/service/MetadataService.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.service;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Map.Entry;
-
 import android.content.ContentValues;
 
 import com.todoroo.andlib.data.Property.CountProperty;
@@ -22,11 +18,14 @@ import com.todoroo.astrid.dao.MetadataDao;
 import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
 import com.todoroo.astrid.data.Metadata;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Map.Entry;
+
 /**
  * Service layer for {@link Metadata}-centered activities.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class MetadataService {
 
@@ -49,10 +48,10 @@ public class MetadataService {
     public void cleanup() {
         TodorooCursor<Metadata> cursor = metadataDao.fetchDangling(Metadata.ID);
         try {
-            if(cursor.getCount() == 0)
+            if (cursor.getCount() == 0)
                 return;
 
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 long id = cursor.getLong(0);
                 metadataDao.delete(id);
             }
@@ -63,6 +62,7 @@ public class MetadataService {
 
     /**
      * Query underlying database
+     *
      * @param query
      * @return
      */
@@ -72,6 +72,7 @@ public class MetadataService {
 
     /**
      * Delete from metadata table where rows match a certain condition
+     *
      * @param where
      */
     public int deleteWhere(Criterion where) {
@@ -80,7 +81,8 @@ public class MetadataService {
 
     /**
      * Delete from metadata table where rows match a certain condition
-     * @param where predicate for which rows to update
+     *
+     * @param where    predicate for which rows to update
      * @param metadata values to set
      */
     public int update(Criterion where, Metadata metadata) {
@@ -89,10 +91,11 @@ public class MetadataService {
 
     /**
      * Save a single piece of metadata
+     *
      * @param metadata
      */
     public boolean save(Metadata metadata) {
-        if(!metadata.containsNonNullValue(Metadata.TASK))
+        if (!metadata.containsNonNullValue(Metadata.TASK))
             throw new IllegalArgumentException("metadata needs to be attached to a task: " + metadata.getMergedValues()); //$NON-NLS-1$
 
         return metadataDao.persist(metadata);
@@ -100,23 +103,24 @@ public class MetadataService {
 
     /**
      * Synchronize metadata for given task id
+     *
      * @param id
      * @param metadata
      * @param metadataKeys
      * @return true if there were changes
      */
     public boolean synchronizeMetadata(long taskId, ArrayList<Metadata> metadata,
-            Criterion metadataCriterion, SynchronizeMetadataCallback callback, boolean hardDelete) {
+                                       Criterion metadataCriterion, SynchronizeMetadataCallback callback, boolean hardDelete) {
         boolean dirty = false;
         HashSet<ContentValues> newMetadataValues = new HashSet<ContentValues>();
-        for(Metadata metadatum : metadata) {
+        for (Metadata metadatum : metadata) {
             metadatum.setValue(Metadata.TASK, taskId);
             metadatum.clearValue(Metadata.CREATION_DATE);
             metadatum.clearValue(Metadata.ID);
 
             ContentValues values = metadatum.getMergedValues();
-            for(Entry<String, Object> entry : values.valueSet()) {
-                if(entry.getKey().startsWith("value")) //$NON-NLS-1$
+            for (Entry<String, Object> entry : values.valueSet()) {
+                if (entry.getKey().startsWith("value")) //$NON-NLS-1$
                     values.put(entry.getKey(), entry.getValue().toString());
             }
             newMetadataValues.add(values);
@@ -127,7 +131,7 @@ public class MetadataService {
                 metadataCriterion)));
         try {
             // try to find matches within our metadata list
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 item.readFromCursor(cursor);
                 long id = item.getId();
 
@@ -136,7 +140,7 @@ public class MetadataService {
                 item.clearValue(Metadata.CREATION_DATE);
                 ContentValues itemMergedValues = item.getMergedValues();
 
-                if(newMetadataValues.contains(itemMergedValues)) {
+                if (newMetadataValues.contains(itemMergedValues)) {
                     newMetadataValues.remove(itemMergedValues);
                     continue;
                 }
@@ -159,7 +163,7 @@ public class MetadataService {
         }
 
         // everything that remains shall be written
-        for(ContentValues values : newMetadataValues) {
+        for (ContentValues values : newMetadataValues) {
             item.clear();
             item.setValue(Metadata.CREATION_DATE, DateUtilities.now());
             item.mergeWith(values);
@@ -171,7 +175,7 @@ public class MetadataService {
     }
 
     public boolean synchronizeMetadata(long taskId, ArrayList<Metadata> metadata,
-            Criterion metadataCriterion, boolean hardDelete) {
+                                       Criterion metadataCriterion, boolean hardDelete) {
         return synchronizeMetadata(taskId, metadata, metadataCriterion, null, hardDelete);
     }
 
@@ -192,6 +196,7 @@ public class MetadataService {
 
     /**
      * Deletes the given metadata
+     *
      * @param metadata
      */
     public void delete(Metadata metadata) {
diff --git a/astrid/src/com/todoroo/astrid/service/StartupService.java b/astrid/src/com/todoroo/astrid/service/StartupService.java
index 13ab318a9..5b595a852 100644
--- a/astrid/src/com/todoroo/astrid/service/StartupService.java
+++ b/astrid/src/com/todoroo/astrid/service/StartupService.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.service;
 
-import java.io.File;
-import java.util.List;
-
 import android.Manifest;
 import android.app.Activity;
 import android.app.AlarmManager;
@@ -75,11 +72,13 @@ import com.todoroo.astrid.utility.AstridPreferences;
 import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.widget.TasksWidget.WidgetUpdateService;
 
+import java.io.File;
+import java.util.List;
+
 /**
  * Service which handles jobs that need to be run when Astrid starts up.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class StartupService {
 
@@ -94,39 +93,56 @@ public class StartupService {
 
     // --- application startup
 
-    @Autowired ExceptionService exceptionService;
+    @Autowired
+    ExceptionService exceptionService;
 
-    @Autowired UpgradeService upgradeService;
+    @Autowired
+    UpgradeService upgradeService;
 
-    @Autowired TaskService taskService;
+    @Autowired
+    TaskService taskService;
 
-    @Autowired TaskDao taskDao;
+    @Autowired
+    TaskDao taskDao;
 
-    @Autowired TagDataDao tagDataDao;
+    @Autowired
+    TagDataDao tagDataDao;
 
-    @Autowired UserActivityDao userActivityDao;
+    @Autowired
+    UserActivityDao userActivityDao;
 
-    @Autowired TaskAttachmentDao taskAttachmentDao;
+    @Autowired
+    TaskAttachmentDao taskAttachmentDao;
 
-    @Autowired TaskListMetadataDao taskListMetadataDao;
+    @Autowired
+    TaskListMetadataDao taskListMetadataDao;
 
-    @Autowired WaitingOnMeDao waitingOnMeDao;
+    @Autowired
+    WaitingOnMeDao waitingOnMeDao;
 
-    @Autowired MetadataService metadataService;
+    @Autowired
+    MetadataService metadataService;
 
-    @Autowired Database database;
+    @Autowired
+    Database database;
 
-    @Autowired GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    GtasksPreferenceService gtasksPreferenceService;
 
-    @Autowired ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    ActFmPreferenceService actFmPreferenceService;
 
-    @Autowired GtasksSyncService gtasksSyncService;
+    @Autowired
+    GtasksSyncService gtasksSyncService;
 
-    @Autowired ABChooser abChooser;
+    @Autowired
+    ABChooser abChooser;
 
-    @Autowired ABTests abTests;
+    @Autowired
+    ABTests abTests;
 
-    @Autowired ABTestInvoker abTestInvoker;
+    @Autowired
+    ABTestInvoker abTestInvoker;
 
     /**
      * bit to prevent multiple initializations
@@ -140,15 +156,17 @@ public class StartupService {
         hasStartedUp = true;
     }
 
-    /** Called when this application is started up */
+    /**
+     * Called when this application is started up
+     */
     public synchronized void onStartupApplication(final Activity context) {
-        if(hasStartedUp || context == null)
+        if (hasStartedUp || context == null)
             return;
 
         // sets up context manager
         ContextManager.setContext(context);
 
-        if(!StatisticsService.dontCollectStatistics()) {
+        if (!StatisticsService.dontCollectStatistics()) {
             Crittercism.init(context.getApplicationContext(), Constants.CRITTERCISM_APP_ID);
         }
 
@@ -161,12 +179,12 @@ public class StartupService {
         }
 
         // show notification if reminders are silenced
-        if(context instanceof Activity) {
-            AudioManager audioManager = (AudioManager)context.getSystemService(
-                Context.AUDIO_SERVICE);
-            if(!Preferences.getBoolean(R.string.p_rmd_enabled, true))
+        if (context instanceof Activity) {
+            AudioManager audioManager = (AudioManager) context.getSystemService(
+                    Context.AUDIO_SERVICE);
+            if (!Preferences.getBoolean(R.string.p_rmd_enabled, true))
                 Toast.makeText(context, R.string.TLA_notification_disabled, Toast.LENGTH_LONG).show();
-            else if(audioManager.getStreamVolume(AudioManager.STREAM_NOTIFICATION) == 0)
+            else if (audioManager.getStreamVolume(AudioManager.STREAM_NOTIFICATION) == 0)
                 Toast.makeText(context, R.string.TLA_notification_volume_low, Toast.LENGTH_LONG).show();
         }
 
@@ -204,8 +222,8 @@ public class StartupService {
 
         // invoke upgrade service
         boolean justUpgraded = latestSetVersion != version;
-        if(justUpgraded && version > 0) {
-            if(latestSetVersion > 0) {
+        if (justUpgraded && version > 0) {
+            if (latestSetVersion > 0) {
                 upgradeService.performUpgrade(context, latestSetVersion);
             } else {
                 Preferences.setBoolean(AstridNewSyncMigrator.PREF_SYNC_MIGRATION, true); // New installs should have this flag set up front
@@ -231,7 +249,7 @@ public class StartupService {
         new Thread(new Runnable() {
             public void run() {
                 // start widget updating alarm
-                AlarmManager am = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
+                AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
                 Intent intent = new Intent(context, WidgetUpdateService.class);
                 PendingIntent pendingIntent = PendingIntent.getService(context,
                         0, intent, PendingIntent.FLAG_CANCEL_CURRENT);
@@ -269,7 +287,7 @@ public class StartupService {
         CalendarStartupReceiver.scheduleCalendarAlarms(context, false); // This needs to be after set preference defaults for the purposes of ab testing
 
         // check for task killers
-        if(!Constants.OEM)
+        if (!Constants.OEM)
             showTaskKillerHelp(context);
 
         hasStartedUp = true;
@@ -296,7 +314,7 @@ public class StartupService {
 
     /**
      * @param context
-     * @param e error that was raised
+     * @param e       error that was raised
      */
     public static void handleSQLiteError(Context context, final SQLiteException e) {
         if (context instanceof Activity) {
@@ -329,15 +347,15 @@ public class StartupService {
      */
     private void databaseRestoreIfEmpty(Context context) {
         try {
-            if(AstridPreferences.getCurrentVersion() >= UpgradeService.V3_0_0 &&
+            if (AstridPreferences.getCurrentVersion() >= UpgradeService.V3_0_0 &&
                     !context.getDatabasePath(database.getName()).exists()) {
                 // we didn't have a database! restore latest file
                 File directory = BackupConstants.defaultExportDirectory();
-                if(!directory.exists())
+                if (!directory.exists())
                     return;
                 File[] children = directory.listFiles();
                 AndroidUtilities.sortFilesByDateDesc(children);
-                if(children.length > 0) {
+                if (children.length > 0) {
                     StatisticsService.sessionStart(context);
                     TasksXmlImporter.importTasks(context, children[0].getAbsolutePath(), null);
                     StatisticsService.reportEvent(StatisticsConstants.LOST_TASKS_RESTORED);
@@ -403,20 +421,22 @@ public class StartupService {
 
     /**
      * Show task killer helper
+     *
      * @param context
      */
     private static void showTaskKillerHelp(final Context context) {
-        if(!Preferences.getBoolean(P_TASK_KILLER_HELP, false))
+        if (!Preferences.getBoolean(P_TASK_KILLER_HELP, false))
             return;
 
         // search for task killers. if they exist, show the help!
         PackageManager pm = context.getPackageManager();
         List<PackageInfo> apps = pm
                 .getInstalledPackages(PackageManager.GET_PERMISSIONS);
-        outer: for (PackageInfo app : apps) {
-            if(app == null || app.requestedPermissions == null)
+        outer:
+        for (PackageInfo app : apps) {
+            if (app == null || app.requestedPermissions == null)
                 continue;
-            if(app.packageName.startsWith("com.android")) //$NON-NLS-1$
+            if (app.packageName.startsWith("com.android")) //$NON-NLS-1$
                 continue;
             for (String permission : app.requestedPermissions) {
                 if (Manifest.permission.RESTART_PACKAGES.equals(permission)) {
@@ -424,18 +444,18 @@ public class StartupService {
                     OnClickListener listener = new OnClickListener() {
                         @Override
                         public void onClick(DialogInterface arg0,
-                                int arg1) {
+                                            int arg1) {
                             Preferences.setBoolean(P_TASK_KILLER_HELP, true);
                         }
                     };
 
                     new AlertDialog.Builder(context)
-                    .setTitle(R.string.DLG_information_title)
-                    .setMessage(context.getString(R.string.task_killer_help,
-                            appName))
-                    .setIcon(android.R.drawable.ic_dialog_alert)
-                    .setPositiveButton(R.string.task_killer_help_ok, listener)
-                    .show();
+                            .setTitle(R.string.DLG_information_title)
+                            .setMessage(context.getString(R.string.task_killer_help,
+                                    appName))
+                            .setIcon(android.R.drawable.ic_dialog_alert)
+                            .setPositiveButton(R.string.task_killer_help_ok, listener)
+                            .show();
 
                     break outer;
                 }
diff --git a/astrid/src/com/todoroo/astrid/service/StatisticsService.java b/astrid/src/com/todoroo/astrid/service/StatisticsService.java
index af958ea4c..2968ed594 100644
--- a/astrid/src/com/todoroo/astrid/service/StatisticsService.java
+++ b/astrid/src/com/todoroo/astrid/service/StatisticsService.java
@@ -6,8 +6,6 @@
 
 package com.todoroo.astrid.service;
 
-import java.util.HashMap;
-
 import android.app.Activity;
 import android.content.Context;
 
@@ -16,6 +14,8 @@ import com.timsu.astrid.R;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.utility.Constants;
 
+import java.util.HashMap;
+
 public class StatisticsService {
 
     private static LocalyticsSession localyticsSession;
@@ -26,10 +26,10 @@ public class StatisticsService {
      * @param context
      */
     public static void sessionStart(Context context) {
-        if(dontCollectStatistics())
+        if (dontCollectStatistics())
             return;
 
-        if(localyticsSession != null) {
+        if (localyticsSession != null) {
             localyticsSession.open(); // Multiple calls to open are ok, we just need to make sure it gets reopened after pause
         } else {
             localyticsSession = new LocalyticsSession(context.getApplicationContext(),
@@ -48,10 +48,10 @@ public class StatisticsService {
      * @param context
      */
     public static void sessionStop(Context context) {
-        if(dontCollectStatistics())
+        if (dontCollectStatistics())
             return;
 
-        if(localyticsSession != null)
+        if (localyticsSession != null)
             localyticsSession.upload();
     }
 
@@ -59,16 +59,17 @@ public class StatisticsService {
      * Indicate session was paused
      */
     public static void sessionPause() {
-        if(dontCollectStatistics())
+        if (dontCollectStatistics())
             return;
 
-        if(localyticsSession != null) {
+        if (localyticsSession != null) {
             localyticsSession.close();
         }
     }
 
     /**
      * Indicates an error occurred
+     *
      * @param name
      * @param message
      * @param trace
@@ -79,18 +80,19 @@ public class StatisticsService {
 
     /**
      * Indicates an event should be reported
+     *
      * @param event
      */
     public static void reportEvent(String event, String... attributes) {
-        if(dontCollectStatistics())
+        if (dontCollectStatistics())
             return;
 
-        if(localyticsSession != null) {
-            if(attributes.length > 0) {
+        if (localyticsSession != null) {
+            if (attributes.length > 0) {
                 HashMap<String, String> attrMap = new HashMap<String, String>();
-                for(int i = 1; i < attributes.length; i += 2) {
-                    if(attributes[i] != null)
-                        attrMap.put(attributes[i-1], attributes[i]);
+                for (int i = 1; i < attributes.length; i += 2) {
+                    if (attributes[i] != null)
+                        attrMap.put(attributes[i - 1], attributes[i]);
                 }
                 localyticsSession.tagEvent(event, attrMap);
             } else
diff --git a/astrid/src/com/todoroo/astrid/service/SyncResultCallbackWrapper.java b/astrid/src/com/todoroo/astrid/service/SyncResultCallbackWrapper.java
index f783a1a1d..67b78983a 100644
--- a/astrid/src/com/todoroo/astrid/service/SyncResultCallbackWrapper.java
+++ b/astrid/src/com/todoroo/astrid/service/SyncResultCallbackWrapper.java
@@ -7,21 +7,26 @@ import com.todoroo.astrid.widget.TasksWidget;
 
 public class SyncResultCallbackWrapper implements SyncResultCallback {
     private final SyncResultCallback wrapped;
+
     public SyncResultCallbackWrapper(SyncResultCallback wrap) {
         this.wrapped = wrap;
     }
+
     @Override
     public void incrementMax(int incrementBy) {
         wrapped.incrementMax(incrementBy);
     }
+
     @Override
     public void incrementProgress(int incrementBy) {
         wrapped.incrementProgress(incrementBy);
     }
+
     @Override
     public void started() {
         wrapped.started();
     }
+
     @Override
     public void finished() {
         wrapped.finished();
diff --git a/astrid/src/com/todoroo/astrid/service/SyncV2Service.java b/astrid/src/com/todoroo/astrid/service/SyncV2Service.java
index 7e36288f6..fe998e1cb 100644
--- a/astrid/src/com/todoroo/astrid/service/SyncV2Service.java
+++ b/astrid/src/com/todoroo/astrid/service/SyncV2Service.java
@@ -5,22 +5,21 @@
  */
 package com.todoroo.astrid.service;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import com.todoroo.astrid.actfm.sync.ActFmSyncV2Provider;
 import com.todoroo.astrid.gtasks.sync.GtasksSyncV2Provider;
 import com.todoroo.astrid.service.SyncResultCallbackWrapper.WidgetUpdatingCallbackWrapper;
 import com.todoroo.astrid.sync.SyncResultCallback;
 import com.todoroo.astrid.sync.SyncV2Provider;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 /**
  * SyncV2Service is a simplified synchronization interface for supporting
  * next-generation sync interfaces such as Google Tasks and Astrid.com
  *
  * @author Tim Su <tim@astrid.com>
- *
  */
 public class SyncV2Service {
 
@@ -29,7 +28,7 @@ public class SyncV2Service {
      * there is enough interest, the Astrid team could create an interface
      * for responding to sync requests through this new API.
      */
-    private static final SyncV2Provider[] providers = new SyncV2Provider[] {
+    private static final SyncV2Provider[] providers = new SyncV2Provider[]{
             GtasksSyncV2Provider.getInstance(),
             new ActFmSyncV2Provider(),
     };
@@ -41,8 +40,8 @@ public class SyncV2Service {
      */
     public List<SyncV2Provider> activeProviders() {
         ArrayList<SyncV2Provider> actives = new ArrayList<SyncV2Provider>();
-        for(SyncV2Provider provider : providers) {
-            if(provider.isActive())
+        for (SyncV2Provider provider : providers) {
+            if (provider.isActive())
                 actives.add(provider);
         }
         return Collections.unmodifiableList(actives);
@@ -58,7 +57,7 @@ public class SyncV2Service {
     /**
      * Initiate synchronization of active tasks
      *
-     * @param manual if manual sync
+     * @param manual   if manual sync
      * @param callback result callback
      * @return true if any servide was logged in and initiated a sync
      */
@@ -80,13 +79,13 @@ public class SyncV2Service {
     /**
      * Initiate synchronization of task list
      *
-     * @param list list object
-     * @param manual if manual sync
+     * @param list     list object
+     * @param manual   if manual sync
      * @param callback result callback
      */
     public void synchronizeList(Object list, boolean manual, SyncResultCallback callback) {
-        for(SyncV2Provider provider : providers) {
-            if(provider.isActive())
+        for (SyncV2Provider provider : providers) {
+            if (provider.isActive())
                 provider.synchronizeList(list, manual, new WidgetUpdatingCallbackWrapper(callback));
         }
     }
diff --git a/astrid/src/com/todoroo/astrid/service/TagDataService.java b/astrid/src/com/todoroo/astrid/service/TagDataService.java
index 55b5e59f9..e24904a73 100644
--- a/astrid/src/com/todoroo/astrid/service/TagDataService.java
+++ b/astrid/src/com/todoroo/astrid/service/TagDataService.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.service;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.database.Cursor;
 import android.text.TextUtils;
 
@@ -39,17 +36,22 @@ import com.todoroo.astrid.data.UserActivity;
 import com.todoroo.astrid.tags.TagService;
 import com.todoroo.astrid.tags.TaskToTagMetadata;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 /**
  * Service layer for {@link TagData}-centered activities.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TagDataService {
 
-    @Autowired TagDataDao tagDataDao;
-    @Autowired TaskDao taskDao;
-    @Autowired UserActivityDao userActivityDao;
+    @Autowired
+    TagDataDao tagDataDao;
+    @Autowired
+    TaskDao taskDao;
+    @Autowired
+    UserActivityDao userActivityDao;
 
     public TagDataService() {
         DependencyInjectionService.getInstance().inject(this);
@@ -59,6 +61,7 @@ public class TagDataService {
 
     /**
      * Query underlying database
+     *
      * @param query
      * @return
      */
@@ -68,6 +71,7 @@ public class TagDataService {
 
     /**
      * Save a single piece of metadata
+     *
      * @param metadata
      */
     public boolean save(TagData tagData) {
@@ -75,9 +79,8 @@ public class TagDataService {
     }
 
     /**
-     *
      * @param properties
-     * @param id id
+     * @param id         id
      * @return item, or null if it doesn't exist
      */
     public TagData fetchById(long id, Property<?>... properties) {
@@ -86,12 +89,13 @@ public class TagDataService {
 
     /**
      * Find a tag by name
+     *
      * @return null if doesn't exist
      */
     public TagData getTagByName(String name, Property<?>... properties) {
         TodorooCursor<TagData> cursor = tagDataDao.query(Query.select(properties).where(TagData.NAME.eqCaseInsensitive(name)));
         try {
-            if(cursor.getCount() == 0)
+            if (cursor.getCount() == 0)
                 return null;
             cursor.moveToFirst();
             return new TagData(cursor);
@@ -102,6 +106,7 @@ public class TagDataService {
 
     /**
      * Fetch tag data
+     *
      * @param queryTemplate
      * @param constraint
      * @param properties
@@ -109,22 +114,22 @@ public class TagDataService {
      */
     @SuppressWarnings("nls")
     public TodorooCursor<TagData> fetchFiltered(String queryTemplate, CharSequence constraint,
-            Property<?>... properties) {
+                                                Property<?>... properties) {
         Criterion whereConstraint = null;
-        if(constraint != null)
+        if (constraint != null)
             whereConstraint = Functions.upper(TagData.NAME).like("%" +
                     constraint.toString().toUpperCase() + "%");
 
-        if(queryTemplate == null) {
-            if(whereConstraint == null)
+        if (queryTemplate == null) {
+            if (whereConstraint == null)
                 return tagDataDao.query(Query.select(properties));
             else
                 return tagDataDao.query(Query.select(properties).where(whereConstraint));
         }
 
         String sql;
-        if(whereConstraint != null) {
-            if(!queryTemplate.toUpperCase().contains("WHERE"))
+        if (whereConstraint != null) {
+            if (!queryTemplate.toUpperCase().contains("WHERE"))
                 sql = queryTemplate + " WHERE " + whereConstraint;
             else
                 sql = queryTemplate.replace("WHERE ", "WHERE " + whereConstraint + " AND ");
@@ -142,10 +147,10 @@ public class TagDataService {
             criteria = UserActivity.DELETED_AT.eq(0);
         else
             criteria = Criterion.and(UserActivity.DELETED_AT.eq(0), Criterion.or(
-                Criterion.and(UserActivity.ACTION.eq(UserActivity.ACTION_TAG_COMMENT), UserActivity.TARGET_ID.eq(tagData.getUuid())),
-                Criterion.and(UserActivity.ACTION.eq(UserActivity.ACTION_TASK_COMMENT),
-                        UserActivity.TARGET_ID.in(Query.select(TaskToTagMetadata.TASK_UUID)
-                                .from(Metadata.TABLE).where(Criterion.and(MetadataCriteria.withKey(TaskToTagMetadata.KEY), TaskToTagMetadata.TAG_UUID.eq(tagData.getUuid())))))));
+                    Criterion.and(UserActivity.ACTION.eq(UserActivity.ACTION_TAG_COMMENT), UserActivity.TARGET_ID.eq(tagData.getUuid())),
+                    Criterion.and(UserActivity.ACTION.eq(UserActivity.ACTION_TASK_COMMENT),
+                            UserActivity.TARGET_ID.in(Query.select(TaskToTagMetadata.TASK_UUID)
+                                    .from(Metadata.TABLE).where(Criterion.and(MetadataCriteria.withKey(TaskToTagMetadata.KEY), TaskToTagMetadata.TAG_UUID.eq(tagData.getUuid())))))));
 
         if (extraCriterion != null)
             criteria = Criterion.and(criteria, extraCriterion);
@@ -165,7 +170,7 @@ public class TagDataService {
         return userActivityDao.query(queryForTagData(tagData, criterion, null, UserActivity.PROPERTIES, null).orderBy(Order.desc(UserActivity.CREATED_AT)));
     }
 
-    public Cursor getActivityAndHistoryForTagData(TagData tagData, Criterion extraCriterion, String userTableAlias, Property<?>...userProperties) {
+    public Cursor getActivityAndHistoryForTagData(TagData tagData, Criterion extraCriterion, String userTableAlias, Property<?>... userProperties) {
         Query activityQuery = queryForTagData(tagData, extraCriterion, userTableAlias, UpdateAdapter.USER_ACTIVITY_PROPERTIES, userProperties)
                 .from(UserActivity.TABLE);
 
@@ -193,7 +198,7 @@ public class TagDataService {
             TagData tagData = new TagData();
             if (!cursor.isAfterLast()) {
                 tagData.readFromCursor(cursor);
-                if(!tagData.getValue(TagData.NAME).equals(featObject.getString("name")))
+                if (!tagData.getValue(TagData.NAME).equals(featObject.getString("name")))
                     TagService.getInstance().rename(tagData.getUuid(), featObject.getString("name"), true);
                 cursor.moveToNext();
             }
@@ -208,16 +213,17 @@ public class TagDataService {
 
     /**
      * Return update
+     *
      * @param tagData
      * @return
      */
     public UserActivity getLatestUpdate(TagData tagData) {
-        if(RemoteModel.NO_UUID.equals(tagData.getValue(TagData.UUID)))
+        if (RemoteModel.NO_UUID.equals(tagData.getValue(TagData.UUID)))
             return null;
 
         TodorooCursor<UserActivity> updates = userActivityDao.query(queryForTagData(tagData, null, null, UserActivity.PROPERTIES, null).orderBy(Order.desc(UserActivity.CREATED_AT)).limit(1));
         try {
-            if(updates.getCount() == 0)
+            if (updates.getCount() == 0)
                 return null;
             updates.moveToFirst();
             return new UserActivity(updates);
diff --git a/astrid/src/com/todoroo/astrid/service/TaskService.java b/astrid/src/com/todoroo/astrid/service/TaskService.java
index 5a8fcc08b..38451a202 100644
--- a/astrid/src/com/todoroo/astrid/service/TaskService.java
+++ b/astrid/src/com/todoroo/astrid/service/TaskService.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map.Entry;
-
 import android.content.ContentValues;
 import android.text.TextUtils;
 
@@ -52,12 +48,15 @@ import com.todoroo.astrid.tags.TagService;
 import com.todoroo.astrid.tags.TaskToTagMetadata;
 import com.todoroo.astrid.utility.TitleParser;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map.Entry;
+
 
 /**
  * Service layer for {@link Task}-centered activities.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TaskService {
 
@@ -97,6 +96,7 @@ public class TaskService {
 
     /**
      * Query underlying database
+     *
      * @param query
      * @return
      */
@@ -105,9 +105,8 @@ public class TaskService {
     }
 
     /**
-     *
      * @param properties
-     * @param id id
+     * @param id         id
      * @return item, or null if it doesn't exist
      */
     public Task fetchById(long id, Property<?>... properties) {
@@ -115,7 +114,6 @@ public class TaskService {
     }
 
     /**
-     *
      * @param uuid
      * @param properties
      * @return item, or null if it doesn't exist
@@ -139,7 +137,7 @@ public class TaskService {
      * @param item
      */
     public void setComplete(Task item, boolean completed) {
-        if(completed) {
+        if (completed) {
             item.setValue(Task.COMPLETION_DATE, DateUtilities.now());
 
             long reminderLast = item.getValue(Task.REMINDER_LAST);
@@ -167,9 +165,8 @@ public class TaskService {
      * Create or save the given action item
      *
      * @param item
-     * @param skipHooks
-     *            Whether pre and post hooks should run. This should be set
-     *            to true if tasks are created as part of synchronization
+     * @param skipHooks Whether pre and post hooks should run. This should be set
+     *                  to true if tasks are created as part of synchronization
      */
     public boolean save(Task item) {
         return taskDao.save(item);
@@ -183,27 +180,27 @@ public class TaskService {
      */
     public Task clone(Task task) {
         Task newTask = fetchById(task.getId(), Task.PROPERTIES);
-        if(newTask == null)
+        if (newTask == null)
             return new Task();
         newTask.clearValue(Task.ID);
         newTask.clearValue(Task.UUID);
         TodorooCursor<Metadata> cursor = metadataDao.query(
                 Query.select(Metadata.PROPERTIES).where(MetadataCriteria.byTask(task.getId())));
         try {
-            if(cursor.getCount() > 0) {
+            if (cursor.getCount() > 0) {
                 Metadata metadata = new Metadata();
                 newTask.putTransitory(SyncFlags.GTASKS_SUPPRESS_SYNC, true);
                 taskDao.save(newTask);
                 long newId = newTask.getId();
-                for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+                for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                     metadata.readFromCursor(cursor);
 
-                    if(!metadata.containsNonNullValue(Metadata.KEY))
+                    if (!metadata.containsNonNullValue(Metadata.KEY))
                         continue;
 
-                    if(GtasksMetadata.METADATA_KEY.equals(metadata.getValue(Metadata.KEY)))
+                    if (GtasksMetadata.METADATA_KEY.equals(metadata.getValue(Metadata.KEY)))
                         metadata.setValue(GtasksMetadata.ID, ""); //$NON-NLS-1$
-                    if(OpencrxCoreUtils.OPENCRX_ACTIVITY_METADATA_KEY.equals(metadata.getValue(Metadata.KEY)))
+                    if (OpencrxCoreUtils.OPENCRX_ACTIVITY_METADATA_KEY.equals(metadata.getValue(Metadata.KEY)))
                         metadata.setValue(OpencrxCoreUtils.ACTIVITY_ID, 0L);
 
                     metadata.setValue(Metadata.TASK, newId);
@@ -243,9 +240,9 @@ public class TaskService {
      * @param model
      */
     public void delete(Task item) {
-        if(!item.isSaved())
+        if (!item.isSaved())
             return;
-        else if(item.containsValue(Task.TITLE) && item.getValue(Task.TITLE).length() == 0) {
+        else if (item.containsValue(Task.TITLE) && item.getValue(Task.TITLE).length() == 0) {
             taskDao.delete(item.getId());
             taskOutstandingDao.deleteWhere(TaskOutstanding.ENTITY_ID_PROPERTY.eq(item.getId()));
             item.setId(Task.NO_ID);
@@ -275,10 +272,10 @@ public class TaskService {
         TodorooCursor<Task> cursor = taskDao.query(
                 Query.select(Task.ID).where(TaskCriteria.hasNoTitle()));
         try {
-            if(cursor.getCount() == 0)
+            if (cursor.getCount() == 0)
                 return;
 
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 long id = cursor.getLong(0);
                 taskDao.delete(id);
             }
@@ -289,6 +286,7 @@ public class TaskService {
 
     /**
      * Fetch tasks for the given filter
+     *
      * @param properties
      * @param constraint text constraint, or null
      * @param filter
@@ -296,22 +294,22 @@ public class TaskService {
      */
     @SuppressWarnings("nls")
     public TodorooCursor<Task> fetchFiltered(String queryTemplate, CharSequence constraint,
-            Property<?>... properties) {
+                                             Property<?>... properties) {
         Criterion whereConstraint = null;
-        if(constraint != null)
+        if (constraint != null)
             whereConstraint = Functions.upper(Task.TITLE).like("%" +
                     constraint.toString().toUpperCase() + "%");
 
-        if(queryTemplate == null) {
-            if(whereConstraint == null)
+        if (queryTemplate == null) {
+            if (whereConstraint == null)
                 return taskDao.query(Query.selectDistinct(properties));
             else
                 return taskDao.query(Query.selectDistinct(properties).where(whereConstraint));
         }
 
         String sql;
-        if(whereConstraint != null) {
-            if(!queryTemplate.toUpperCase().contains("WHERE"))
+        if (whereConstraint != null) {
+            if (!queryTemplate.toUpperCase().contains("WHERE"))
                 sql = queryTemplate + " WHERE " + whereConstraint;
             else
                 sql = queryTemplate.replace("WHERE ", "WHERE " + whereConstraint + " AND ");
@@ -358,8 +356,8 @@ public class TaskService {
     /**
      * Clear details cache. Useful if user performs some operation that
      * affects details
-     * @param criterion
      *
+     * @param criterion
      * @return # of affected rows
      */
     public int clearDetails(Criterion criterion) {
@@ -370,16 +368,17 @@ public class TaskService {
 
     /**
      * Update database based on selection and values
+     *
      * @param selection
      * @param selectionArgs
      * @param setValues
      * @return
      */
     public int updateBySelection(String selection, String[] selectionArgs,
-            Task taskValues) {
+                                 Task taskValues) {
         TodorooCursor<Task> cursor = taskDao.rawQuery(selection, selectionArgs, Task.ID);
         try {
-            for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
                 taskValues.setValue(Task.ID, cursor.get(Task.ID));
                 taskDao.save(taskValues);
             }
@@ -391,14 +390,15 @@ public class TaskService {
 
     /**
      * Update all matching a clause to have the values set on template object.
-     * <p>
+     * <p/>
      * Example (updates "joe" => "bob" in metadata value1):
      * {code}
      * Metadata item = new Metadata();
      * item.setValue(Metadata.VALUE1, "bob");
      * update(item, Metadata.VALUE1.eq("joe"));
      * {code}
-     * @param where sql criteria
+     *
+     * @param where    sql criteria
      * @param template set fields on this object in order to set them in the db.
      * @return # of updated items
      */
@@ -408,6 +408,7 @@ public class TaskService {
 
     /**
      * Count tasks overall
+     *
      * @param filter
      * @return
      */
@@ -420,7 +421,9 @@ public class TaskService {
         }
     }
 
-    /** count tasks in a given filter */
+    /**
+     * count tasks in a given filter
+     */
     public int countTasks(Filter filter) {
         String queryTemplate = PermaSql.replacePlaceholders(filter.getSqlQuery());
         TodorooCursor<Task> cursor = query(Query.select(Task.ID).withQueryTemplate(
@@ -434,6 +437,7 @@ public class TaskService {
 
     /**
      * Delete all tasks matching a given criterion
+     *
      * @param all
      */
     public int deleteWhere(Criterion criteria) {
@@ -449,13 +453,14 @@ public class TaskService {
      */
     private void quickAdd(Task task, List<String> tags) {
         save(task);
-        for(String tag : tags) {
+        for (String tag : tags) {
             TagService.getInstance().createLink(task, tag);
         }
     }
 
     /**
      * Parse quick add markup for the given task
+     *
      * @param task
      * @param tags an empty array to apply tags to
      * @return
@@ -466,6 +471,7 @@ public class TaskService {
 
     /**
      * Create an uncompleted copy of this task and edit it
+     *
      * @param itemId
      * @return cloned item id
      */
@@ -504,7 +510,7 @@ public class TaskService {
     /**
      * Create task from the given content values, saving it.
      *
-     * @param task base task to start with
+     * @param task            base task to start with
      * @param values
      * @param title
      * @param taskService
@@ -527,7 +533,8 @@ public class TaskService {
         if (values != null && values.size() > 0) {
             ContentValues forTask = new ContentValues();
             forMetadata = new ContentValues();
-            outer: for (Entry<String, Object> item : values.valueSet()) {
+            outer:
+            for (Entry<String, Object> item : values.valueSet()) {
                 String key = item.getKey();
                 Object value = item.getValue();
                 if (value instanceof String)
diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java
index 1f94616e4..74a369170 100644
--- a/astrid/src/com/todoroo/astrid/service/ThemeService.java
+++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java
@@ -64,11 +64,11 @@ public class ThemeService {
     }
 
     private static int getStyleForSetting(String setting) {
-        if(THEME_BLACK.equals(setting))
+        if (THEME_BLACK.equals(setting))
             return R.style.Theme;
-        else if(THEME_TRANSPARENT.equals(setting))
+        else if (THEME_TRANSPARENT.equals(setting))
             return R.style.Theme_Transparent;
-        else if(THEME_TRANSPARENT_WHITE.equals(setting))
+        else if (THEME_TRANSPARENT_WHITE.equals(setting))
             return R.style.Theme_TransparentWhite;
         else if (THEME_WHITE_RED.equals(setting))
             return R.style.Theme_White;
@@ -80,16 +80,16 @@ public class ThemeService {
 
     public static int getThemeColor() {
         int theme = getTheme();
-        switch(theme) {
-        case R.style.Theme:
-        case R.style.Theme_Transparent:
-            return R.color.blue_theme_color;
-        case R.style.Theme_White:
-        case R.style.Theme_TransparentWhite:
-            return R.color.red_theme_color;
-        case R.style.Theme_White_Blue:
-        default:
-            return R.color.dark_blue_theme_color;
+        switch (theme) {
+            case R.style.Theme:
+            case R.style.Theme_Transparent:
+                return R.color.blue_theme_color;
+            case R.style.Theme_White:
+            case R.style.Theme_TransparentWhite:
+                return R.color.red_theme_color;
+            case R.style.Theme_White_Blue:
+            default:
+                return R.color.dark_blue_theme_color;
         }
     }
 
@@ -147,6 +147,7 @@ public class ThemeService {
 
     /**
      * Only widget config activities should call this (see note on the flag above)
+     *
      * @param forceInvert
      */
     public static void setForceFilterInvert(boolean forceInvert) {
@@ -164,18 +165,18 @@ public class ThemeService {
     public static int getDrawable(int lightDrawable, int alter) {
         int theme = getTheme();
         boolean darkTheme = theme == R.style.Theme || theme == R.style.Theme_Transparent;
-        switch(alter) {
-        case FLAG_FORCE_DARK:
-            darkTheme = true;
-            break;
-        case FLAG_FORCE_LIGHT:
-            darkTheme = false;
-            break;
-        case FLAG_INVERT:
-            darkTheme = !darkTheme;
-            break;
-        default:
-            break;
+        switch (alter) {
+            case FLAG_FORCE_DARK:
+                darkTheme = true;
+                break;
+            case FLAG_FORCE_LIGHT:
+                darkTheme = false;
+                break;
+            case FLAG_INVERT:
+                darkTheme = !darkTheme;
+                break;
+            default:
+                break;
         }
 
         if (lightDrawable == R.drawable.icn_menu_refresh &&
@@ -183,71 +184,71 @@ public class ThemeService {
             return R.drawable.icn_menu_refresh_tablet;
 
         if (theme == R.style.Theme_White_Alt) {
-            switch(lightDrawable) {
-            case R.drawable.ic_menu_save:
-                return R.drawable.ic_menu_save_blue_alt;
-            case R.drawable.ic_menu_close:
-                return R.drawable.ic_menu_close_blue_alt;
-            case R.drawable.ic_menu_mic:
-                return R.drawable.ic_menu_mic_blue_alt;
-            case R.drawable.ic_menu_attach:
-                return R.drawable.ic_menu_attach_blue_alt;
-            case R.drawable.list_settings:
-                return R.drawable.list_settings_white;
+            switch (lightDrawable) {
+                case R.drawable.ic_menu_save:
+                    return R.drawable.ic_menu_save_blue_alt;
+                case R.drawable.ic_menu_close:
+                    return R.drawable.ic_menu_close_blue_alt;
+                case R.drawable.ic_menu_mic:
+                    return R.drawable.ic_menu_mic_blue_alt;
+                case R.drawable.ic_menu_attach:
+                    return R.drawable.ic_menu_attach_blue_alt;
+                case R.drawable.list_settings:
+                    return R.drawable.list_settings_white;
             }
         }
 
-        if(!darkTheme)
+        if (!darkTheme)
             return lightDrawable;
 
 
-        switch(lightDrawable) {
-        case R.drawable.ic_menu_save:
-            return R.drawable.ic_menu_save;
-        case R.drawable.ic_menu_close:
-            return R.drawable.ic_menu_close;
-        case R.drawable.ic_menu_mic:
-            return R.drawable.ic_menu_mic;
-        case R.drawable.ic_menu_attach:
-            return R.drawable.ic_menu_attach;
-        case R.drawable.list_settings:
-            return R.drawable.list_settings;
-        case R.drawable.icn_menu_refresh:
-            return R.drawable.icn_menu_refresh_dark;
-        case R.drawable.icn_menu_filters:
-            return R.drawable.icn_menu_filters_dark;
-        case R.drawable.icn_featured_lists:
-            return R.drawable.icn_featured_lists_dark;
-        case R.drawable.icn_menu_sort_by_size:
-            return R.drawable.icn_menu_sort_by_size_dark;
-        case R.drawable.icn_menu_search:
-            return R.drawable.icn_menu_search_dark;
-        case R.drawable.icn_menu_friends:
-            return R.drawable.icn_menu_friends_dark;
-        case R.drawable.icn_menu_lists:
-            return R.drawable.icn_menu_lists_dark;
-        case R.drawable.icn_menu_plugins:
-            return R.drawable.icn_menu_plugins_dark;
-        case R.drawable.icn_menu_settings:
-            return R.drawable.icn_menu_settings_dark;
-        case R.drawable.icn_menu_support:
-            return R.drawable.icn_menu_support_dark;
-        case R.drawable.icn_menu_tutorial:
-            return R.drawable.icn_menu_tutorial_dark;
-        case R.drawable.filter_assigned:
-            return R.drawable.filter_assigned_dark;
-        case R.drawable.filter_calendar:
-            return R.drawable.filter_calendar_dark;
-        case R.drawable.filter_inbox:
-            return R.drawable.filter_inbox_dark;
-        case R.drawable.waiting_on_me:
-            return R.drawable.waiting_on_me_dark;
-        case R.drawable.filter_pencil:
-            return R.drawable.filter_pencil_dark;
-        case R.drawable.filter_sliders:
-            return R.drawable.filter_sliders_dark;
-        case R.drawable.gl_lists:
-            return R.drawable.gl_lists_dark;
+        switch (lightDrawable) {
+            case R.drawable.ic_menu_save:
+                return R.drawable.ic_menu_save;
+            case R.drawable.ic_menu_close:
+                return R.drawable.ic_menu_close;
+            case R.drawable.ic_menu_mic:
+                return R.drawable.ic_menu_mic;
+            case R.drawable.ic_menu_attach:
+                return R.drawable.ic_menu_attach;
+            case R.drawable.list_settings:
+                return R.drawable.list_settings;
+            case R.drawable.icn_menu_refresh:
+                return R.drawable.icn_menu_refresh_dark;
+            case R.drawable.icn_menu_filters:
+                return R.drawable.icn_menu_filters_dark;
+            case R.drawable.icn_featured_lists:
+                return R.drawable.icn_featured_lists_dark;
+            case R.drawable.icn_menu_sort_by_size:
+                return R.drawable.icn_menu_sort_by_size_dark;
+            case R.drawable.icn_menu_search:
+                return R.drawable.icn_menu_search_dark;
+            case R.drawable.icn_menu_friends:
+                return R.drawable.icn_menu_friends_dark;
+            case R.drawable.icn_menu_lists:
+                return R.drawable.icn_menu_lists_dark;
+            case R.drawable.icn_menu_plugins:
+                return R.drawable.icn_menu_plugins_dark;
+            case R.drawable.icn_menu_settings:
+                return R.drawable.icn_menu_settings_dark;
+            case R.drawable.icn_menu_support:
+                return R.drawable.icn_menu_support_dark;
+            case R.drawable.icn_menu_tutorial:
+                return R.drawable.icn_menu_tutorial_dark;
+            case R.drawable.filter_assigned:
+                return R.drawable.filter_assigned_dark;
+            case R.drawable.filter_calendar:
+                return R.drawable.filter_calendar_dark;
+            case R.drawable.filter_inbox:
+                return R.drawable.filter_inbox_dark;
+            case R.drawable.waiting_on_me:
+                return R.drawable.waiting_on_me_dark;
+            case R.drawable.filter_pencil:
+                return R.drawable.filter_pencil_dark;
+            case R.drawable.filter_sliders:
+                return R.drawable.filter_sliders_dark;
+            case R.drawable.gl_lists:
+                return R.drawable.gl_lists_dark;
         }
 
         throw new RuntimeException("No theme drawable found for " +
@@ -262,6 +263,7 @@ public class ThemeService {
             return resForWhite;
         }
     }
+
     public static int getTaskEditDrawable(int regularDrawable, int lightBlueDrawable) {
         return getDarkVsLight(regularDrawable, lightBlueDrawable, true);
     }
diff --git a/astrid/src/com/todoroo/astrid/service/UpdateMessagePreference.java b/astrid/src/com/todoroo/astrid/service/UpdateMessagePreference.java
index c11b3786f..c304b64ea 100644
--- a/astrid/src/com/todoroo/astrid/service/UpdateMessagePreference.java
+++ b/astrid/src/com/todoroo/astrid/service/UpdateMessagePreference.java
@@ -1,9 +1,5 @@
 package com.todoroo.astrid.service;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
@@ -13,6 +9,10 @@ import android.preference.PreferenceActivity;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.utility.Preferences;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 public class UpdateMessagePreference extends PreferenceActivity {
 
     public static final String TOKEN_PREFS_ARRAY = "prefs_array"; //$NON-NLS-1$
diff --git a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
index 9de9bc28e..3ba409cdd 100644
--- a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java
@@ -5,15 +5,6 @@
  */
 package com.todoroo.astrid.service;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.Intent;
@@ -49,11 +40,19 @@ import com.todoroo.astrid.data.StoreObject;
 import com.todoroo.astrid.gtasks.GtasksPreferenceService;
 import com.todoroo.astrid.utility.Constants;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
 /**
  * Notifies users when there are server updates
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 @SuppressWarnings("nls")
 public class UpdateMessageService {
@@ -62,11 +61,16 @@ public class UpdateMessageService {
 
     private static final String PLUGIN_GTASKS = "gtasks";
 
-    @Autowired protected RestClient restClient;
-    @Autowired private GtasksPreferenceService gtasksPreferenceService;
-    @Autowired private ActFmPreferenceService actFmPreferenceService;
-    @Autowired private AddOnService addOnService;
-    @Autowired private StoreObjectDao storeObjectDao;
+    @Autowired
+    protected RestClient restClient;
+    @Autowired
+    private GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    private ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    private AddOnService addOnService;
+    @Autowired
+    private StoreObjectDao storeObjectDao;
 
     private final Activity activity;
 
@@ -78,11 +82,11 @@ public class UpdateMessageService {
     public void processUpdates() {
         JSONArray updates = checkForUpdates();
 
-        if(updates == null || updates.length() == 0)
+        if (updates == null || updates.length() == 0)
             return;
 
         MessageTuple message = buildUpdateMessage(updates);
-        if(message == null || message.message.length() == 0)
+        if (message == null || message.message.length() == 0)
             return;
 
         displayUpdateDialog(message);
@@ -114,7 +118,7 @@ public class UpdateMessageService {
     }
 
     protected void displayUpdateDialog(final MessageTuple message) {
-        if(activity == null)
+        if (activity == null)
             return;
 
         if (message.linkText.size() > 0) {
@@ -183,7 +187,7 @@ public class UpdateMessageService {
     }
 
     protected MessageTuple buildUpdateMessage(JSONArray updates) {
-        for(int i = 0; i < updates.length(); i++) {
+        for (int i = 0; i < updates.length(); i++) {
             JSONObject update;
             try {
                 update = updates.getJSONObject(i);
@@ -196,14 +200,14 @@ public class UpdateMessageService {
             String plugin = update.optString("plugin", null);
             String notPlugin = update.optString("notplugin", null);
 
-            if(message == null)
+            if (message == null)
                 continue;
-            if(plugin != null) {
-                if(!pluginConditionMatches(plugin))
+            if (plugin != null) {
+                if (!pluginConditionMatches(plugin))
                     continue;
             }
-            if(notPlugin != null) {
-                if(pluginConditionMatches(notPlugin))
+            if (notPlugin != null) {
+                if (pluginConditionMatches(notPlugin))
                     continue;
             }
 
@@ -243,7 +247,7 @@ public class UpdateMessageService {
                 }
             }
 
-            if(messageAlreadySeen(date, message))
+            if (messageAlreadySeen(date, message))
                 continue;
             return toReturn;
         }
@@ -300,21 +304,21 @@ public class UpdateMessageService {
 
     private boolean pluginConditionMatches(String plugin) {
         // handle internal plugin specially
-        if(PLUGIN_GTASKS.equals(plugin))
+        if (PLUGIN_GTASKS.equals(plugin))
             return gtasksPreferenceService.isLoggedIn();
         else
             return addOnService.isInstalled(plugin);
     }
 
     private boolean messageAlreadySeen(String date, String message) {
-        if(date != null)
+        if (date != null)
             message = date + message;
         String hash = AndroidUtilities.md5(message);
 
         TodorooCursor<StoreObject> cursor = storeObjectDao.query(Query.select(StoreObject.ID).
                 where(StoreObjectCriteria.byTypeAndItem(UpdateMessage.TYPE, hash)));
         try {
-            if(cursor.getCount() > 0)
+            if (cursor.getCount() > 0)
                 return true;
         } finally {
             cursor.close();
@@ -338,7 +342,7 @@ public class UpdateMessageService {
                     "actfm=" + (actFmPreferenceService.isLoggedIn() ? "1" : "0") + "&" +
                     "premium=" + (ActFmPreferenceService.isPremiumUser() ? "1" : "0");
             String result = restClient.get(url); //$NON-NLS-1$
-            if(TextUtils.isEmpty(result))
+            if (TextUtils.isEmpty(result))
                 return null;
 
             return new JSONArray(result);
@@ -351,17 +355,23 @@ public class UpdateMessageService {
         }
     }
 
-    /** store object for messages a user has seen */
+    /**
+     * store object for messages a user has seen
+     */
     static class UpdateMessage {
 
-        /** type*/
+        /**
+         * type
+         */
         public static final String TYPE = "update-message"; //$NON-NLS-1$
 
-        /** message contents */
+        /**
+         * message contents
+         */
         public static final StringProperty HASH = new StringProperty(StoreObject.TABLE,
                 StoreObject.ITEM.name);
 
-   }
+    }
 
 
 }
diff --git a/astrid/src/com/todoroo/astrid/service/UpdateScreenFlow.java b/astrid/src/com/todoroo/astrid/service/UpdateScreenFlow.java
index 2bb3eb8cf..27fa45283 100644
--- a/astrid/src/com/todoroo/astrid/service/UpdateScreenFlow.java
+++ b/astrid/src/com/todoroo/astrid/service/UpdateScreenFlow.java
@@ -1,12 +1,12 @@
 package com.todoroo.astrid.service;
 
-import java.util.ArrayList;
-
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.os.Bundle;
 
+import java.util.ArrayList;
+
 public class UpdateScreenFlow extends Activity {
 
     public static final String TOKEN_SCREENS = "token_screens"; //$NON-NLS-1$
diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index fb03e32c0..a380fc0fe 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -141,19 +141,26 @@ public final class UpgradeService {
     public static final int V3_0_0 = 136;
     public static final int V2_14_4 = 135;
 
-    @Autowired Database database;
+    @Autowired
+    Database database;
 
-    @Autowired TaskService taskService;
+    @Autowired
+    TaskService taskService;
 
-    @Autowired MetadataService metadataService;
+    @Autowired
+    MetadataService metadataService;
 
-    @Autowired GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    GtasksPreferenceService gtasksPreferenceService;
 
-    @Autowired ABChooser abChooser;
+    @Autowired
+    ABChooser abChooser;
 
-    @Autowired AddOnService addOnService;
+    @Autowired
+    AddOnService addOnService;
 
-    @Autowired ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    ActFmPreferenceService actFmPreferenceService;
 
     public UpgradeService() {
         DependencyInjectionService.getInstance().inject(this);
@@ -168,17 +175,17 @@ public final class UpgradeService {
      * @param to
      */
     public void performUpgrade(final Activity context, final int from) {
-        if(from == 135)
+        if (from == 135)
             AddOnService.recordOem();
 
-        if(from > 0 && from < V3_8_2) {
-            if(Preferences.getBoolean(R.string.p_transparent_deprecated, false))
+        if (from > 0 && from < V3_8_2) {
+            if (Preferences.getBoolean(R.string.p_transparent_deprecated, false))
                 Preferences.setString(R.string.p_theme, "transparent"); //$NON-NLS-1$
             else
                 Preferences.setString(R.string.p_theme, "black"); //$NON-NLS-1$
         }
 
-        if(from <= V3_9_1_1) {
+        if (from <= V3_9_1_1) {
             actFmPreferenceService.clearLastSyncDate();
         }
 
@@ -192,7 +199,7 @@ public final class UpgradeService {
 
         inlineUpgrades(context, from); // Migrations that are short or don't require launching a separate activity
 
-        if(from < maxWithUpgrade) {
+        if (from < maxWithUpgrade) {
             Intent upgrade = new Intent(context, UpgradeActivity.class);
             upgrade.putExtra(UpgradeActivity.TOKEN_FROM_VERSION, from);
             context.startActivityForResult(upgrade, 0);
@@ -220,16 +227,16 @@ public final class UpgradeService {
                     @Override
                     public void run() {
                         try {
-                            if(from < V3_0_0)
+                            if (from < V3_0_0)
                                 new Astrid2To3UpgradeHelper().upgrade2To3(UpgradeActivity.this, from);
 
-                            if(from < V3_1_0)
+                            if (from < V3_1_0)
                                 new Astrid2To3UpgradeHelper().upgrade3To3_1(UpgradeActivity.this, from);
 
-                            if(from < V3_8_3_1)
+                            if (from < V3_8_3_1)
                                 new TagCaseMigrator().performTagCaseMigration(UpgradeActivity.this);
 
-                            if(from < V3_8_4 && Preferences.getBoolean(R.string.p_showNotes, false))
+                            if (from < V3_8_4 && Preferences.getBoolean(R.string.p_showNotes, false))
                                 taskService.clearDetails(Task.NOTES.neq("")); //$NON-NLS-1$
 
                             if (from < V4_0_6)
@@ -268,7 +275,9 @@ public final class UpgradeService {
                             setResult(AstridActivity.RESULT_RESTART_ACTIVITY);
                             finish();
                         }
-                    };
+                    }
+
+                    ;
                 }.start();
             } else {
                 finished = true;
@@ -315,7 +324,7 @@ public final class UpgradeService {
      */
     @SuppressWarnings("nls")
     public void showChangeLog(Context context, int from) {
-        if(!(context instanceof Activity) || from == 0)
+        if (!(context instanceof Activity) || from == 0)
             return;
 
         Preferences.clear(TagCaseMigrator.PREF_SHOW_MIGRATION_ALERT);
@@ -324,14 +333,14 @@ public final class UpgradeService {
         StringBuilder changeLog = new StringBuilder();
 
         if (from >= V4_6_0 && from < V4_6_4) { // Versions 4.6.4 and 4.6.5 are virtually identical--the former went out to the Amazon store only
-            newVersionString(changeLog, "4.6.5 (4/23/13)", new String[] {
-                 "Improvements to monthly repeating tasks scheduled for the end of the month",
-                 "Minor bugfixes"
+            newVersionString(changeLog, "4.6.5 (4/23/13)", new String[]{
+                    "Improvements to monthly repeating tasks scheduled for the end of the month",
+                    "Minor bugfixes"
             });
         }
 
         if (from < V4_6_3) {
-            newVersionString(changeLog, "4.6.3 (4/15/13)", new String[] {
+            newVersionString(changeLog, "4.6.3 (4/15/13)", new String[]{
                     "BIG RELEASE!",
                     "\"Waiting on me\" shows shared tasks assigned to you or where you were mentioned by name",
                     "Sync fixes for non-english languages and for multiple android devices",
@@ -340,270 +349,270 @@ public final class UpgradeService {
         }
 
         if (from >= V4_6_0 && from < V4_6_2) {
-            newVersionString(changeLog, "4.6.2 (4/10/13)", new String[] {
-                "Fixed a bug that could prevent certain tasks from syncing correctly",
-                "UI improvements"
+            newVersionString(changeLog, "4.6.2 (4/10/13)", new String[]{
+                    "Fixed a bug that could prevent certain tasks from syncing correctly",
+                    "UI improvements"
             });
         }
 
         if (from >= V4_6_0 && from < V4_6_1) {
-            newVersionString(changeLog, "4.6.1 (4/04/13)", new String[] {
-                "Improved design for the task edit page",
-                "Fixed issues with Facebook login",
-                "Several crash fixes"
+            newVersionString(changeLog, "4.6.1 (4/04/13)", new String[]{
+                    "Improved design for the task edit page",
+                    "Fixed issues with Facebook login",
+                    "Several crash fixes"
             });
         }
 
         if (from < V4_6_0) {
-            newVersionString(changeLog, "4.6.0 (4/02/13)", new String[] {
+            newVersionString(changeLog, "4.6.0 (4/02/13)", new String[]{
                     "4.6 is a big step towards FLAWLESS sync with Astrid.com! This update also includes numerous bug fixes and UI improvements. " +
-                    "Note: Simultaneous sync with Google Tasks and Astrid.com is no longer supported. Still want to view your tasks in Gmail? Try Remind Me by Astrid on the Chrome Store."
+                            "Note: Simultaneous sync with Google Tasks and Astrid.com is no longer supported. Still want to view your tasks in Gmail? Try Remind Me by Astrid on the Chrome Store."
             });
         }
 
         if (from >= V4_5_0 && from < V4_5_3) {
-            newVersionString(changeLog, "4.5.3 (2/04/13)", new String[] {
-                "Performance improvements when scrolling in lists",
-                "Some crash fixes"
+            newVersionString(changeLog, "4.5.3 (2/04/13)", new String[]{
+                    "Performance improvements when scrolling in lists",
+                    "Some crash fixes"
             });
         }
 
         if (from >= V4_5_0 && from < V4_5_2) {
-            newVersionString(changeLog, "4.5.2 (1/17/13)", new String[] {
-                "Fixed a crash that could affect some Google Tasks users",
-                "UI polish"
+            newVersionString(changeLog, "4.5.2 (1/17/13)", new String[]{
+                    "Fixed a crash that could affect some Google Tasks users",
+                    "UI polish"
             });
         }
 
         if (from >= V4_5_0 && from < V4_5_1) {
-            newVersionString(changeLog, "4.5.1 (1/16/13)", new String[] {
-                "New 'Titles only' style option for task lists (Settings > Appearance > Task row appearance)",
-                "Bug and crash fixes"
+            newVersionString(changeLog, "4.5.1 (1/16/13)", new String[]{
+                    "New 'Titles only' style option for task lists (Settings > Appearance > Task row appearance)",
+                    "Bug and crash fixes"
             });
         }
 
         if (from < V4_5_0) {
-            newVersionString(changeLog, "4.5.0 (12/19/12)", new String[] {
-                "Several interface and usability enhancements",
-                "Fixed Power Pack display bug affecting certain phones",
-                "Better organized preferences",
-                "New 'Sky Blue' theme",
-                "'Lite mode' preference defaults available in Settings > Appearance > Set configuration",
-                "Minor bug and crash fixes"
+            newVersionString(changeLog, "4.5.0 (12/19/12)", new String[]{
+                    "Several interface and usability enhancements",
+                    "Fixed Power Pack display bug affecting certain phones",
+                    "Better organized preferences",
+                    "New 'Sky Blue' theme",
+                    "'Lite mode' preference defaults available in Settings > Appearance > Set configuration",
+                    "Minor bug and crash fixes"
             });
         }
 
         if (from >= V4_4_4 && from < V4_4_4_1) {
-            newVersionString(changeLog, "4.4.4.1 (12/13/12)", new String[] {
-                "Crash fixes"
+            newVersionString(changeLog, "4.4.4.1 (12/13/12)", new String[]{
+                    "Crash fixes"
             });
         }
 
         if (from >= V4_4 && from < V4_4_4) {
-            newVersionString(changeLog, "4.4.4 (12/12/12)", new String[] {
-                "Manual ordering and subtasks for 'Active Tasks' and 'Today' filters now sync with Astrid.com",
-                "Minor polish and bug fixes"
+            newVersionString(changeLog, "4.4.4 (12/12/12)", new String[]{
+                    "Manual ordering and subtasks for 'Active Tasks' and 'Today' filters now sync with Astrid.com",
+                    "Minor polish and bug fixes"
             });
         }
 
         if (from >= V4_4 && from < V4_4_3) {
-            newVersionString(changeLog, "4.4.3 (11/28/12)", new String[] {
-                "Minor bug fixes"
+            newVersionString(changeLog, "4.4.3 (11/28/12)", new String[]{
+                    "Minor bug fixes"
             });
         }
 
         if (from < V4_4_2) {
-            newVersionString(changeLog, "4.4.2 (11/19/12)", new String[] {
-                "Manual order and subtasks for lists now sync with your Astrid.com account!",
-                "Significant performance improvements to manual ordering and subtasks",
-                "Show assigned user images in the premium widgets",
-                "Minor bug and crash fixes"
+            newVersionString(changeLog, "4.4.2 (11/19/12)", new String[]{
+                    "Manual order and subtasks for lists now sync with your Astrid.com account!",
+                    "Significant performance improvements to manual ordering and subtasks",
+                    "Show assigned user images in the premium widgets",
+                    "Minor bug and crash fixes"
             });
         }
 
         if (from >= V4_4 && from < V4_4_1) {
-            newVersionString(changeLog, "4.4.1 (10/30/12)", new String[] {
-                "Fixed an issue where the calendar assistant could remind you about the wrong events",
-                "Fixed a crash that could occur when swipe between lists is enabled"
+            newVersionString(changeLog, "4.4.1 (10/30/12)", new String[]{
+                    "Fixed an issue where the calendar assistant could remind you about the wrong events",
+                    "Fixed a crash that could occur when swipe between lists is enabled"
             });
         }
 
         if (from < V4_4) {
-            newVersionString(changeLog, "4.4 (10/25/12)", new String[] {
-                "Astrid calendar assistant will help you prepare for meetings! Enable or " +
-                    "disable in Settings -> Premium and misc. settings -> Calendar assistant",
-                "Full Chinese translation",
-                "Widgets will now reflect manual ordering",
-                "Accept pending friend requests from the people view",
-                "Several minor bug and crash fixes"
+            newVersionString(changeLog, "4.4 (10/25/12)", new String[]{
+                    "Astrid calendar assistant will help you prepare for meetings! Enable or " +
+                            "disable in Settings -> Premium and misc. settings -> Calendar assistant",
+                    "Full Chinese translation",
+                    "Widgets will now reflect manual ordering",
+                    "Accept pending friend requests from the people view",
+                    "Several minor bug and crash fixes"
             });
         }
 
         if (from >= V4_3_0 && from < V4_3_4) {
-            newVersionString(changeLog, "4.3.4 (10/2/12)", new String[] {
-                "Magic words in task title now correctly removed when placed in parentheses",
-                "Bug fix for viewing Featured Lists with swipe enabled",
-                "Bug fixes for rare crashes"
+            newVersionString(changeLog, "4.3.4 (10/2/12)", new String[]{
+                    "Magic words in task title now correctly removed when placed in parentheses",
+                    "Bug fix for viewing Featured Lists with swipe enabled",
+                    "Bug fixes for rare crashes"
             });
         }
 
         if (from >= V4_3_0 && from < V4_3_3) {
-            newVersionString(changeLog, "4.3.3 (9/19/12)", new String[] {
-               "Reverse sort works again!",
-               "Swipe between lists is faster",
-               "Option for a new style of task row (Try it: Settings -> Appearance -> Task row appearance and choose \"Simple\")",
-               "A few other small bugs fixed"
+            newVersionString(changeLog, "4.3.3 (9/19/12)", new String[]{
+                    "Reverse sort works again!",
+                    "Swipe between lists is faster",
+                    "Option for a new style of task row (Try it: Settings -> Appearance -> Task row appearance and choose \"Simple\")",
+                    "A few other small bugs fixed"
             });
         }
 
         if (from >= V4_3_0 && from < V4_3_2) {
-            newVersionString(changeLog, "4.3.2 (9/07/12)", new String[] {
-               "Fixed issues with Google Tasks shortcuts"
+            newVersionString(changeLog, "4.3.2 (9/07/12)", new String[]{
+                    "Fixed issues with Google Tasks shortcuts"
             });
         }
 
         if (from >= V4_3_0 && from < V4_3_1) {
-            newVersionString(changeLog, "4.3.1 (9/06/12)", new String[] {
-               "Fixed crashes for Google Tasks users and certain filters",
-               "Added ability to complete shared tasks from list view"
+            newVersionString(changeLog, "4.3.1 (9/06/12)", new String[]{
+                    "Fixed crashes for Google Tasks users and certain filters",
+                    "Added ability to complete shared tasks from list view"
             });
         }
 
         if (from < V4_3_0) {
-            newVersionString(changeLog, "4.3.0 (9/05/12)", new String[] {
-               "Significant performance improvements",
-               "Voice-add now enabled for all users!",
-               "New feature: Featured lists (Enable in Settings -> Appearance)",
-               "New and improved premium widget design",
-               "Redesigned settings page",
-               "Improved translations",
-               "Lots of bug fixes and UI polish"
+            newVersionString(changeLog, "4.3.0 (9/05/12)", new String[]{
+                    "Significant performance improvements",
+                    "Voice-add now enabled for all users!",
+                    "New feature: Featured lists (Enable in Settings -> Appearance)",
+                    "New and improved premium widget design",
+                    "Redesigned settings page",
+                    "Improved translations",
+                    "Lots of bug fixes and UI polish"
             });
         }
 
         if (from >= V4_2_0 && from < V4_2_6) {
-            newVersionString(changeLog, "4.2.6 (8/14/12)", new String[] {
-               "Tablet users can opt to use the single-pane phone layout (Settings -> Astrid Labs)",
-               "Minor polish and bug fixes"
+            newVersionString(changeLog, "4.2.6 (8/14/12)", new String[]{
+                    "Tablet users can opt to use the single-pane phone layout (Settings -> Astrid Labs)",
+                    "Minor polish and bug fixes"
             });
         }
 
         if (from >= V4_2_0 && from < V4_2_5) {
-            newVersionString(changeLog, "4.2.5 (8/13/12)", new String[] {
-               "Improved tablet UX",
-               "More customizable task edit screen",
-               "Add to calendar now starts at task due time (by default)",
-               "Updated translations for several languages",
-               "Numerous bug fixes"
+            newVersionString(changeLog, "4.2.5 (8/13/12)", new String[]{
+                    "Improved tablet UX",
+                    "More customizable task edit screen",
+                    "Add to calendar now starts at task due time (by default)",
+                    "Updated translations for several languages",
+                    "Numerous bug fixes"
             });
         }
 
         if (from >= V4_2_0 && from < V4_2_4) {
-            newVersionString(changeLog, "4.2.4 (7/11/12)", new String[] {
-               "Ability to specify end date on repeating tasks",
-               "Improved sync of comments made while offline",
-               "Crash fixes"
+            newVersionString(changeLog, "4.2.4 (7/11/12)", new String[]{
+                    "Ability to specify end date on repeating tasks",
+                    "Improved sync of comments made while offline",
+                    "Crash fixes"
             });
         }
 
         if (from >= V4_2_0 && from < V4_2_3) {
-            newVersionString(changeLog, "4.2.3 (6/25/12)", new String[] {
-               "Fixes for Google Tasks and Astrid.com sync",
-               "New layout for tablets in portrait mode",
-               "Minor UI polish and bugfixes"
+            newVersionString(changeLog, "4.2.3 (6/25/12)", new String[]{
+                    "Fixes for Google Tasks and Astrid.com sync",
+                    "New layout for tablets in portrait mode",
+                    "Minor UI polish and bugfixes"
             });
         }
 
         if (from >= V4_2_0 && from < V4_2_2_1) {
-            newVersionString(changeLog, "4.2.2.1 (6/13/12)", new String[] {
-               "Fixed a crash affecting the Nook"
+            newVersionString(changeLog, "4.2.2.1 (6/13/12)", new String[]{
+                    "Fixed a crash affecting the Nook"
             });
         }
 
         if (from >= V4_2_0 && from < V4_2_2) {
-            newVersionString(changeLog, "4.2.2 (6/12/12)", new String[] {
-               "Fix for people views displaying the wrong list of tasks",
-               "Fixed a bug with Astrid Smart Sort",
-               "Fixed a bug when adding photo comments"
+            newVersionString(changeLog, "4.2.2 (6/12/12)", new String[]{
+                    "Fix for people views displaying the wrong list of tasks",
+                    "Fixed a bug with Astrid Smart Sort",
+                    "Fixed a bug when adding photo comments"
             });
         }
 
         if (from >= V4_2_0 && from < V4_2_1) {
-            newVersionString(changeLog, "4.2.1 (6/08/12)", new String[] {
-                "Fix for MyTouch 4G Lists",
-                "Fixed a crash when adding tasks with due times to Google Calendar",
-                "Better syncing of the people list",
-                "Minor UI polish and bugfixes"
+            newVersionString(changeLog, "4.2.1 (6/08/12)", new String[]{
+                    "Fix for MyTouch 4G Lists",
+                    "Fixed a crash when adding tasks with due times to Google Calendar",
+                    "Better syncing of the people list",
+                    "Minor UI polish and bugfixes"
             });
         }
 
         if (from < V4_2_0) {
-            newVersionString(changeLog, "4.2.0 (6/05/12)", new String[] {
-                "Support for the Nook",
-                "Fixed crash on large image attachments",
-                "Minor bugfixes"
+            newVersionString(changeLog, "4.2.0 (6/05/12)", new String[]{
+                    "Support for the Nook",
+                    "Fixed crash on large image attachments",
+                    "Minor bugfixes"
             });
         }
 
         if (from >= V4_1_3 && from < V4_1_3_1) {
-            newVersionString(changeLog, "4.1.3.1 (5/18/12)", new String[] {
-                "Fixed reminders for ICS"
+            newVersionString(changeLog, "4.1.3.1 (5/18/12)", new String[]{
+                    "Fixed reminders for ICS"
             });
         }
 
         if (from >= V4_1_2 && from < V4_1_3) {
-            newVersionString(changeLog, "4.1.3 (5/17/12)", new String[] {
-                "Added ability to see shared tasks sorted by friend! Enable or disable " +
-                "in Settings > Astrid Labs",
-                "Fixed desktop shortcuts",
-                "Fixed adding tasks from the Power Pack widget",
-                "Fixed selecting photos on the Kindle Fire",
-                "Various other minor bug and crash fixes"
+            newVersionString(changeLog, "4.1.3 (5/17/12)", new String[]{
+                    "Added ability to see shared tasks sorted by friend! Enable or disable " +
+                            "in Settings > Astrid Labs",
+                    "Fixed desktop shortcuts",
+                    "Fixed adding tasks from the Power Pack widget",
+                    "Fixed selecting photos on the Kindle Fire",
+                    "Various other minor bug and crash fixes"
             });
         }
 
         if (from >= V4_1_1 && from < V4_1_2) {
-            newVersionString(changeLog, "4.1.2 (5/05/12)", new String[] {
-                "Fixed some crashes and minor bugs"
+            newVersionString(changeLog, "4.1.2 (5/05/12)", new String[]{
+                    "Fixed some crashes and minor bugs"
             });
         }
 
         if (from < V4_1_1) {
-            newVersionString(changeLog, "4.1.1 (5/04/12)", new String[] {
+            newVersionString(changeLog, "4.1.1 (5/04/12)", new String[]{
                     "Respond to or set reminders for missed calls. This feature requires a new permission to read " +
-                    "the phone state.",
+                            "the phone state.",
             });
         }
 
         if (from < V4_1_0) {
-            newVersionString(changeLog, "4.1.0 (5/03/12)", new String[] {
-                "Swipe between lists! Swipe left and right to move through your lists. Enable or adjust " +
-                "in Settings > Astrid Labs",
-                "Assign tasks to contacts without typing",
-                "Links to tasks in comments",
-                "Astrid.com sync improvements",
-                "Other minor bugfixes",
+            newVersionString(changeLog, "4.1.0 (5/03/12)", new String[]{
+                    "Swipe between lists! Swipe left and right to move through your lists. Enable or adjust " +
+                            "in Settings > Astrid Labs",
+                    "Assign tasks to contacts without typing",
+                    "Links to tasks in comments",
+                    "Astrid.com sync improvements",
+                    "Other minor bugfixes",
             });
         }
 
         if (from >= V4_0_6 && from < V4_0_6_2) {
-            newVersionString(changeLog, "4.0.6.2 (4/03/12)", new String[] {
-                "Minor fix to backup migration fix to handle deleted tasks as well as completed tasks."
+            newVersionString(changeLog, "4.0.6.2 (4/03/12)", new String[]{
+                    "Minor fix to backup migration fix to handle deleted tasks as well as completed tasks."
             });
         }
 
         if (from >= V4_0_6 && from < V4_0_6_1) {
-            newVersionString(changeLog, "4.0.6.1 (4/03/12)", new String[] {
+            newVersionString(changeLog, "4.0.6.1 (4/03/12)", new String[]{
                     "Fixed a bug where old tasks could become uncompleted. Sorry to those of you" +
-                    " who were affected by this! To recover, you can import your old tasks" +
-                    " from any backup file created before April 3 by clicking Menu -> Settings ->" +
-                    " Backups -> Manage Backups -> Import Tasks. Backup files from April 3 will start" +
-                    " with 'auto.120403'."
+                            " who were affected by this! To recover, you can import your old tasks" +
+                            " from any backup file created before April 3 by clicking Menu -> Settings ->" +
+                            " Backups -> Manage Backups -> Import Tasks. Backup files from April 3 will start" +
+                            " with 'auto.120403'."
             });
         }
 
         if (from < V4_0_6) {
-            newVersionString(changeLog, "4.0.6 (4/02/12)", new String[] {
+            newVersionString(changeLog, "4.0.6 (4/02/12)", new String[]{
                     "Fixes and performance improvements to Astrid.com and Google Tasks sync",
                     "Google TV support! (Beta)",
                     "Fixed a bug that could put duetimes on tasks when changing timezones",
@@ -612,33 +621,33 @@ public final class UpgradeService {
         }
 
         if (from >= V4_0_0 && from < V4_0_5) {
-            newVersionString(changeLog, "4.0.5 (3/22/12)", new String[] {
-               "Better conflict resolution for Astrid.com sync",
-               "Fixes and improvements to Gtasks sync",
-               "Added option to report sync errors in sync preference screen"
+            newVersionString(changeLog, "4.0.5 (3/22/12)", new String[]{
+                    "Better conflict resolution for Astrid.com sync",
+                    "Fixes and improvements to Gtasks sync",
+                    "Added option to report sync errors in sync preference screen"
             });
         }
 
         if (from >= V4_0_0 && from < V4_0_4) {
-            newVersionString(changeLog, "4.0.4 (3/7/12)", new String[] {
-               "Fixed crashes related to error reporting",
-               "Fixed a crash when creating a task from the widget",
-               "Fixed a bug where a manual sync wouldn't always start"
+            newVersionString(changeLog, "4.0.4 (3/7/12)", new String[]{
+                    "Fixed crashes related to error reporting",
+                    "Fixed a crash when creating a task from the widget",
+                    "Fixed a bug where a manual sync wouldn't always start"
             });
         }
 
         if (from >= V4_0_0 && from < V4_0_3) {
-            newVersionString(changeLog, "4.0.3 (3/6/12)", new String[] {
-               "Fix some issues with Google Tasks sync. We're sorry to " +
-                   "everyone who's been having trouble with it!",
-               "Updated translations for Portuguese, Chinese, German, Russian, and Dutch",
-               "Centralize Android's menu key with in-app navigation",
-               "Fixed crashes & improve crash logging",
+            newVersionString(changeLog, "4.0.3 (3/6/12)", new String[]{
+                    "Fix some issues with Google Tasks sync. We're sorry to " +
+                            "everyone who's been having trouble with it!",
+                    "Updated translations for Portuguese, Chinese, German, Russian, and Dutch",
+                    "Centralize Android's menu key with in-app navigation",
+                    "Fixed crashes & improve crash logging",
             });
         }
 
         if (from >= V4_0_0 && from < V4_0_2) {
-            newVersionString(changeLog, "4.0.2 (2/29/12)", new String[] {
+            newVersionString(changeLog, "4.0.2 (2/29/12)", new String[]{
                     "Removed GPS permission - no longer needed",
                     "Fixes for some subtasks issues",
                     "No longer need to run the Crittercism service in the background",
@@ -649,29 +658,29 @@ public final class UpgradeService {
         }
 
         if (from >= V4_0_0 && from < V4_0_1) {
-            newVersionString(changeLog, "4.0.1 (2/23/12)", new String[] {
-               "Fixed a database issue affecting Android 2.1 users",
-               "Fixed a crash when using drag and drop in Google Tasks lists",
-               "Other small bugfixes"
+            newVersionString(changeLog, "4.0.1 (2/23/12)", new String[]{
+                    "Fixed a database issue affecting Android 2.1 users",
+                    "Fixed a crash when using drag and drop in Google Tasks lists",
+                    "Other small bugfixes"
             });
         }
 
         if (from < V4_0_0) {
-            newVersionString(changeLog, "4.0.0 (2/23/12)", new String[] {
-               "Welcome to Astrid 4.0! Here's what's new:",
-               "<b>Subtasks!!!</b><br>Press the Menu key and select 'Sort' to access",
-               "<b>New Look!</b><br>Customize how Astrid looks from the Settings menu",
-               "<b>Task Rabbit!</b><br>Outsource your tasks with the help of trustworthy people",
-               "<b>More Reliable Sync</b><br>Including fixes to Astrid.com and Google Tasks sync",
-               "<b>Tablet version</b><br>Enjoy Astrid on your luxurious Android tablet",
-               "Many bug and usability fixes"
+            newVersionString(changeLog, "4.0.0 (2/23/12)", new String[]{
+                    "Welcome to Astrid 4.0! Here's what's new:",
+                    "<b>Subtasks!!!</b><br>Press the Menu key and select 'Sort' to access",
+                    "<b>New Look!</b><br>Customize how Astrid looks from the Settings menu",
+                    "<b>Task Rabbit!</b><br>Outsource your tasks with the help of trustworthy people",
+                    "<b>More Reliable Sync</b><br>Including fixes to Astrid.com and Google Tasks sync",
+                    "<b>Tablet version</b><br>Enjoy Astrid on your luxurious Android tablet",
+                    "Many bug and usability fixes"
             });
         }
 
         // --- old messages
 
         if (from >= V3_0_0 && from < V3_9_0) {
-            newVersionString(changeLog, "3.9 (12/09/11)", new String[] {
+            newVersionString(changeLog, "3.9 (12/09/11)", new String[]{
                     "Cleaner design (especially the task edit page)!",
                     "Customize the edit page (\"Beast Mode\" in preferences)",
                     "Make shared lists with tasks open to anyone (perfect for potlucks, road trips etc)",
@@ -682,11 +691,11 @@ public final class UpgradeService {
             });
         }
 
-        if(from >= V3_0_0 && from < V3_8_0) {
-            newVersionString(changeLog, "3.8.0 (7/15/11)", new String[] {
+        if (from >= V3_0_0 && from < V3_8_0) {
+            newVersionString(changeLog, "3.8.0 (7/15/11)", new String[]{
                     "Astrid.com: sync & share tasks / lists with others!",
                     "GTasks Sync using Google's official task API! Gtasks users " +
-                        "will need to perform a manual sync to set everything up.",
+                            "will need to perform a manual sync to set everything up.",
                     "Renamed \"Tags\" to \"Lists\" (see blog.astrid.com for details)",
                     "New style for \"Task Edit\" page!",
                     "Purge completed or deleted tasks from settings menu!",
@@ -694,57 +703,57 @@ public final class UpgradeService {
             gtasksPreferenceService.setToken(null);
         }
 
-        if(from >= V3_0_0 && from < V3_7_0) {
-            newVersionString(changeLog, "3.7.0 (2/7/11)", new String[] {
+        if (from >= V3_0_0 && from < V3_7_0) {
+            newVersionString(changeLog, "3.7.0 (2/7/11)", new String[]{
                     "Improved UI for displaying task actions. Tap a task to " +
-                        "bring up actions, tap again to dismiss.",
+                            "bring up actions, tap again to dismiss.",
                     "Task notes can be viewed by tapping the note icon to " +
-                        "the right of the task.",
+                            "the right of the task.",
                     "Added Astrid as 'Send-To' choice in Android Browser and " +
-                        "other apps.",
+                            "other apps.",
                     "Add tags and importance in quick-add, e.g. " +
-                        "\"call mom #family @phone !4\"",
+                            "\"call mom #family @phone !4\"",
                     "Fixed bug with custom filters & tasks being hidden.",
             });
             upgrade3To3_7();
-            if(gtasksPreferenceService.isLoggedIn())
+            if (gtasksPreferenceService.isLoggedIn())
                 taskService.clearDetails(Criterion.all);
             Preferences.setBoolean(Eula.PREFERENCE_EULA_ACCEPTED, true);
         }
-        if(from >= V3_0_0 && from < V3_6_0) {
-            newVersionString(changeLog, "3.6.0 (11/13/10)", new String[] {
+        if (from >= V3_0_0 && from < V3_6_0) {
+            newVersionString(changeLog, "3.6.0 (11/13/10)", new String[]{
                     "Astrid Power Pack is now launched to the Android Market. " +
-                    "New Power Pack features include 4x2 and 4x4 widgets and voice " +
-                    "task reminders and creation. Go to the add-ons page to find out more!",
+                            "New Power Pack features include 4x2 and 4x4 widgets and voice " +
+                            "task reminders and creation. Go to the add-ons page to find out more!",
                     "Fix for Google Tasks: due times got lost on sync, repeating tasks not repeated",
                     "Fix for task alarms not always firing if multiple set",
                     "Fix for various force closes",
             });
             upgrade3To3_6(context);
         }
-        if(from >= V3_0_0 && from < V3_5_0)
-            newVersionString(changeLog, "3.5.0 (10/25/10)", new String[] {
+        if (from >= V3_0_0 && from < V3_5_0)
+            newVersionString(changeLog, "3.5.0 (10/25/10)", new String[]{
                     "Google Tasks Sync (beta!)",
                     "Bug fix with RMilk & new tasks not getting synced",
                     "Fixed Force Closes and other bugs",
             });
-        if(from >= V3_0_0 && from < V3_4_0) {
-            newVersionString(changeLog, "3.4.0 (10/08/10)", new String[] {
+        if (from >= V3_0_0 && from < V3_4_0) {
+            newVersionString(changeLog, "3.4.0 (10/08/10)", new String[]{
                     "End User License Agreement",
                     "Option to disable usage statistics",
                     "Bug fixes with Producteev",
             });
         }
-        if(from >= V3_0_0 && from < V3_3_0)
-            newVersionString(changeLog, "3.3.0 (9/17/10)", new String[] {
+        if (from >= V3_0_0 && from < V3_3_0)
+            newVersionString(changeLog, "3.3.0 (9/17/10)", new String[]{
                     "Fixed some RTM duplicated tasks issues",
                     "UI updates based on your feedback",
                     "Snooze now overrides other alarms",
                     "Added preference option for selecting snooze style",
                     "Hide until: now allows you to pick a specific time",
             });
-        if(from >= V3_0_0 && from < V3_2_0)
-            newVersionString(changeLog, "3.2.0 (8/16/10)", new String[] {
+        if (from >= V3_0_0 && from < V3_2_0)
+            newVersionString(changeLog, "3.2.0 (8/16/10)", new String[]{
                     "Build your own custom filters from the Filter page",
                     "Easy task sorting (in the task list menu)",
                     "Create widgets from any of your filters",
@@ -752,8 +761,8 @@ public final class UpgradeService {
                     "Select tags by drop-down box",
                     "Cosmetic improvements, calendar & sync bug fixes",
             });
-        if(from >= V3_0_0 && from < V3_1_0)
-            newVersionString(changeLog, "3.1.0 (8/9/10)", new String[] {
+        if (from >= V3_0_0 && from < V3_1_0)
+            newVersionString(changeLog, "3.1.0 (8/9/10)", new String[]{
                     "Linkify phone numbers, e-mails, and web pages",
                     "Swipe L => R to go from tasks to filters",
                     "Moved task priority bar to left side",
@@ -763,12 +772,12 @@ public final class UpgradeService {
                     "Also gone: a couple force closes, bugs with repeating tasks",
             });
 
-        if(changeLog.length() == 0)
+        if (changeLog.length() == 0)
             return;
 
         changeLog.append("Enjoy!</body></html>");
         String color = ThemeService.getDialogTextColorString();
-        String changeLogHtml = "<html><body style='color: " + color +"'>" + changeLog;
+        String changeLogHtml = "<html><body style='color: " + color + "'>" + changeLog;
 
         DialogUtilities.htmlDialog(context, changeLogHtml,
                 R.string.UpS_changelog_title);
@@ -776,6 +785,7 @@ public final class UpgradeService {
 
     /**
      * Helper for adding a single version to the changelog
+     *
      * @param changeLog
      * @param version
      * @param changes
@@ -785,7 +795,7 @@ public final class UpgradeService {
         if (Constants.ASTRID_LITE)
             version = "0" + version.substring(1);
         changeLog.append("<font style='text-align: center; color=#ffaa00'><b>Version ").append(version).append(":</b></font><br><ul>");
-        for(String change : changes)
+        for (String change : changes)
             changeLog.append("<li>").append(change).append("</li>\n");
         changeLog.append("</ul>");
     }
@@ -799,9 +809,9 @@ public final class UpgradeService {
     private void upgrade3To3_7() {
         TodorooCursor<Task> t = taskService.query(Query.select(Task.ID, Task.DUE_DATE).where(Task.DUE_DATE.gt(0)));
         Task task = new Task();
-        for(t.moveToFirst(); !t.isAfterLast(); t.moveToNext()) {
+        for (t.moveToFirst(); !t.isAfterLast(); t.moveToNext()) {
             task.readFromCursor(t);
-            if(task.hasDueDate()) {
+            if (task.hasDueDate()) {
                 task.setValue(Task.DUE_DATE, task.getValue(Task.DUE_DATE) / 1000L * 1000L);
                 taskService.save(task);
             }
@@ -811,6 +821,7 @@ public final class UpgradeService {
 
     /**
      * Moves sorting prefs to public pref store
+     *
      * @param context
      */
     private void upgrade3To3_6(final Context context) {
@@ -830,7 +841,7 @@ public final class UpgradeService {
      * for example), this will catch some cases
      */
     public void performSecondaryUpgrade(Context context) {
-        if(!context.getDatabasePath(database.getName()).exists() &&
+        if (!context.getDatabasePath(database.getName()).exists() &&
                 context.getDatabasePath("tasks").exists()) { //$NON-NLS-1$
             new Astrid2To3UpgradeHelper().upgrade2To3(context, 1);
         }
diff --git a/astrid/src/com/todoroo/astrid/service/abtesting/ABChooser.java b/astrid/src/com/todoroo/astrid/service/abtesting/ABChooser.java
index 49716cf3c..f5da460a3 100644
--- a/astrid/src/com/todoroo/astrid/service/abtesting/ABChooser.java
+++ b/astrid/src/com/todoroo/astrid/service/abtesting/ABChooser.java
@@ -5,19 +5,19 @@
  */
 package com.todoroo.astrid.service.abtesting;
 
-import java.util.Random;
-import java.util.Set;
-
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.dao.ABTestEventDao;
 
+import java.util.Random;
+import java.util.Set;
+
 /**
  * Helper class to facilitate A/B testing by randomly choosing an option
  * based on probabilities that can be supplied from local defaults
- * @author Sam Bosley <sam@astrid.com>
  *
+ * @author Sam Bosley <sam@astrid.com>
  */
 public class ABChooser {
 
@@ -72,6 +72,7 @@ public class ABChooser {
 
     /**
      * Returns the chosen option if set or NO_OPTION if unset
+     *
      * @param testKey
      * @return
      */
@@ -82,6 +83,7 @@ public class ABChooser {
     /**
      * Changes the choice of an A/B feature in the preferences. Useful for
      * the feature flipper (can manually override previous choice)
+     *
      * @param testKey
      * @param choiceIndex
      */
diff --git a/astrid/src/com/todoroo/astrid/service/abtesting/ABTestEventReportingService.java b/astrid/src/com/todoroo/astrid/service/abtesting/ABTestEventReportingService.java
index 3f79dee74..1fcc1f87f 100644
--- a/astrid/src/com/todoroo/astrid/service/abtesting/ABTestEventReportingService.java
+++ b/astrid/src/com/todoroo/astrid/service/abtesting/ABTestEventReportingService.java
@@ -5,13 +5,6 @@
  */
 package com.todoroo.astrid.service.abtesting;
 
-import java.io.IOException;
-import java.util.Set;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.content.Context;
 import android.database.sqlite.SQLiteException;
 import android.util.Log;
@@ -28,13 +21,20 @@ import com.todoroo.astrid.service.StartupService;
 import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.service.TaskService;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.Set;
+
 /**
  * Service to manage the reporting of launch events for AB testing.
  * On startup, queries the ABTestEvent database for unreported data
  * points, merges them into the expected JSONArray format, and
  * pushes them to the server.
- * @author Sam
  *
+ * @author Sam
  */
 @SuppressWarnings("nls")
 public final class ABTestEventReportingService {
@@ -88,7 +88,7 @@ public final class ABTestEventReportingService {
     }
 
     private void pushAllUnreportedABTestEvents() {
-        synchronized(ABTestEventReportingService.class) {
+        synchronized (ABTestEventReportingService.class) {
             if (StatisticsService.dontCollectStatistics())
                 return;
             final TodorooCursor<ABTestEvent> unreported = abTestEventDao.query(Query.select(ABTestEvent.PROPERTIES)
diff --git a/astrid/src/com/todoroo/astrid/service/abtesting/ABTestInvoker.java b/astrid/src/com/todoroo/astrid/service/abtesting/ABTestInvoker.java
index c4b93cc65..c1d5d8a86 100644
--- a/astrid/src/com/todoroo/astrid/service/abtesting/ABTestInvoker.java
+++ b/astrid/src/com/todoroo/astrid/service/abtesting/ABTestInvoker.java
@@ -5,10 +5,11 @@
  */
 package com.todoroo.astrid.service.abtesting;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
+import com.todoroo.andlib.service.Autowired;
+import com.todoroo.andlib.service.DependencyInjectionService;
+import com.todoroo.andlib.service.RestClient;
+import com.todoroo.andlib.utility.Preferences;
+import com.todoroo.astrid.service.StatisticsService;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.http.HttpEntity;
@@ -20,21 +21,22 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.todoroo.andlib.service.Autowired;
-import com.todoroo.andlib.service.DependencyInjectionService;
-import com.todoroo.andlib.service.RestClient;
-import com.todoroo.andlib.utility.Preferences;
-import com.todoroo.astrid.service.StatisticsService;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Invoker for communicating with the Astrid Analytics server
- * @author Sam
  *
+ * @author Sam
  */
 @SuppressWarnings("nls")
 public class ABTestInvoker {
 
-    /** NOTE: these values are development values and will not work on production */
+    /**
+     * NOTE: these values are development values and will not work on production
+     */
     private static final String URL = "http://analytics.astrid.com/api/2/";
     public static final String AB_RETENTION_METHOD = "ab_retention";
     public static final String AB_ACTIVATION_METHOD = "ab_activation";
@@ -44,7 +46,8 @@ public class ABTestInvoker {
 
     private static final String PREF_REPORTED_ACQUISITION = "p_reported_acq";
 
-    @Autowired private RestClient restClient;
+    @Autowired
+    private RestClient restClient;
 
     public ABTestInvoker() {
         DependencyInjectionService.getInstance().inject(this);
@@ -70,14 +73,15 @@ public class ABTestInvoker {
 
     /**
      * Posts the payload to the analytics server
+     *
      * @param payload - JSONArray of data points. Created by the
-     * helper method in ABTestReportingService
+     *                helper method in ABTestReportingService
      * @return
      * @throws IOException
      */
     public JSONObject post(String method, JSONArray payload) throws IOException {
         try {
-            HttpEntity postData  = createPostData(payload);
+            HttpEntity postData = createPostData(payload);
             String response = restClient.post(URL + method, postData);
             JSONObject object = new JSONObject(response);
             if (object.getString("status").equals("error")) {
@@ -94,6 +98,7 @@ public class ABTestInvoker {
     /**
      * Converts the JSONArray payload into an HTTPEntity suitable for
      * POSTing.
+     *
      * @param payload
      * @return
      */
@@ -105,8 +110,8 @@ public class ABTestInvoker {
             params.add(new BasicNameValuePair("payload", payload.toString()));
 
         StringBuilder sigBuilder = new StringBuilder();
-        for(NameValuePair entry : params) {
-            if(entry.getValue() == null)
+        for (NameValuePair entry : params) {
+            if (entry.getValue() == null)
                 continue;
 
             String key = entry.getName();
diff --git a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
index 0769bd76e..2019ea04d 100644
--- a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
+++ b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
@@ -5,17 +5,17 @@
  */
 package com.todoroo.astrid.service.abtesting;
 
-import java.util.HashMap;
-import java.util.Set;
-
 import android.content.Context;
 
 import com.todoroo.astrid.utility.Constants;
 
+import java.util.HashMap;
+import java.util.Set;
+
 /**
  * Helper class to define options with their probabilities and descriptions
- * @author Sam Bosley <sam@astrid.com>
  *
+ * @author Sam Bosley <sam@astrid.com>
  */
 public class ABTests {
 
@@ -29,6 +29,7 @@ public class ABTests {
      * to be initialized should go here. This method is called from the startup
      * service before any test choices are made, so it is safe to add
      * tests here. It's also ok if this method is a no-op sometimes.
+     *
      * @param context
      */
     public void externalInit(Context context) {
@@ -37,6 +38,7 @@ public class ABTests {
 
     /**
      * Gets the integer array of weighted probabilities for an option key
+     *
      * @param key
      * @return
      */
@@ -54,6 +56,7 @@ public class ABTests {
 
     /**
      * Gets the string array of option descriptions for an option key
+     *
      * @param key
      * @return
      */
@@ -68,6 +71,7 @@ public class ABTests {
 
     /**
      * Returns the description for a particular choice of the given option
+     *
      * @param testKey
      * @param optionIndex
      * @return
@@ -110,24 +114,22 @@ public class ABTests {
     /**
      * A/B testing options are defined below according to the following spec:
      *
-     * @param testKey = "<key>"
-     * --This key is used to identify the option in the application and in the preferences
-     *
-     * @param newUserProbs = { int, int, ... }
+     * @param testKey           = "<key>"
+     *                          --This key is used to identify the option in the application and in the preferences
+     * @param newUserProbs      = { int, int, ... }
      * @param existingUserProbs = { int, int, ... }
-     * --The different choices in an option correspond to an index in the probability array.
-     * Probabilities are expressed as integers to easily define relative weights. For example,
-     * the array { 1, 2 } would mean option 0 would happen one time for every two occurrences of option 1
-     *
-     * The first array is used for new users and the second is used for existing/upgrading users,
-     * allowing us to specify different distributions for each group.
-     *
-     * (optional)
-     * @param descriptions = { "...", "...", ... }
-     * --A string description of each option. Useful for tagging events. The index of
-     * each description should correspond to the events location in the probability array
-     * (i.e. the arrays should be the same length if this one exists)
-     *
+     *                          --The different choices in an option correspond to an index in the probability array.
+     *                          Probabilities are expressed as integers to easily define relative weights. For example,
+     *                          the array { 1, 2 } would mean option 0 would happen one time for every two occurrences of option 1
+     *                          <p/>
+     *                          The first array is used for new users and the second is used for existing/upgrading users,
+     *                          allowing us to specify different distributions for each group.
+     *                          <p/>
+     *                          (optional)
+     * @param descriptions      = { "...", "...", ... }
+     *                          --A string description of each option. Useful for tagging events. The index of
+     *                          each description should correspond to the events location in the probability array
+     *                          (i.e. the arrays should be the same length if this one exists)
      */
     public void addTest(String testKey, int[] newUserProbs, int[] existingUserProbs, String[] descriptions, boolean appliesToAstridLite) {
         if (!Constants.ASTRID_LITE || (Constants.ASTRID_LITE && appliesToAstridLite)) {
diff --git a/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java b/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java
index 9e30bb9ae..76e49ce61 100644
--- a/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java
+++ b/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.ui;
 
-import java.util.Calendar;
-
 import android.content.Context;
 import android.content.res.Resources;
 import android.text.format.DateUtils;
@@ -23,6 +21,8 @@ import com.timsu.astrid.R;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.Preferences;
 
+import java.util.Calendar;
+
 public class AstridTimePicker extends LinearLayout {
 
     private final ToggleButton noTimeCheck;
@@ -41,7 +41,6 @@ public class AstridTimePicker extends LinearLayout {
     }
 
 
-
     public AstridTimePicker(Context context, AttributeSet attrs) {
         super(context, attrs);
         LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
@@ -94,7 +93,7 @@ public class AstridTimePicker extends LinearLayout {
                 CustomBorderDrawable.customButton(0, 0, cornerRadius, 0, onColorValue, offColorValue, borderColorValue, strokeWidth));
 
         if (!useShortcuts) {
-            View[] pickers = new View[] { hours, minutes };
+            View[] pickers = new View[]{hours, minutes};
             for (View view : pickers) {
                 View v = view.findViewById(R.id.timepicker_input);
                 LayoutParams lp = (LinearLayout.LayoutParams) v.getLayoutParams();
diff --git a/astrid/src/com/todoroo/astrid/ui/CalendarDialog.java b/astrid/src/com/todoroo/astrid/ui/CalendarDialog.java
index a84bff18c..8f123a59e 100644
--- a/astrid/src/com/todoroo/astrid/ui/CalendarDialog.java
+++ b/astrid/src/com/todoroo/astrid/ui/CalendarDialog.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.ui;
 
-import java.util.Date;
-
 import android.app.Dialog;
 import android.content.Context;
 import android.view.View;
@@ -18,53 +16,55 @@ import android.widget.Button;
 import com.timsu.astrid.R;
 import com.todoroo.astrid.ui.CalendarView.OnSelectedDateListener;
 
+import java.util.Date;
+
 public class CalendarDialog extends Dialog implements OnClickListener, OnSelectedDateListener {
 
-	private final Button cancelButton;
-	private Date calendarDate;
+    private final Button cancelButton;
+    private Date calendarDate;
 
-	private final CalendarView calendarView;
+    private final CalendarView calendarView;
 
-	public CalendarDialog(Context context, Date calendarDate) {
-		super(context);
-		this.calendarDate = calendarDate;
-		/** 'Window.FEATURE_NO_TITLE' - Used to hide the title */
-		requestWindowFeature(Window.FEATURE_NO_TITLE);
-		/** Design the dialog in main.xml file */
-		setContentView(R.layout.calendar);
+    public CalendarDialog(Context context, Date calendarDate) {
+        super(context);
+        this.calendarDate = calendarDate;
+        /** 'Window.FEATURE_NO_TITLE' - Used to hide the title */
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        /** Design the dialog in main.xml file */
+        setContentView(R.layout.calendar);
 
-		LayoutParams params = getWindow().getAttributes();
+        LayoutParams params = getWindow().getAttributes();
         params.height = LayoutParams.FILL_PARENT;
         params.width = LayoutParams.FILL_PARENT;
         getWindow().setAttributes((android.view.WindowManager.LayoutParams) params);
 
-		cancelButton = (Button) findViewById(R.id.CancelButton);
+        cancelButton = (Button) findViewById(R.id.CancelButton);
 
-		calendarView = (CalendarView) findViewById(R.id.CalendarView);
-		calendarView.setCalendarDate(calendarDate);
-		calendarView.setOnSelectedDateListener(this);
+        calendarView = (CalendarView) findViewById(R.id.CalendarView);
+        calendarView.setCalendarDate(calendarDate);
+        calendarView.setOnSelectedDateListener(this);
 
-		cancelButton.setOnClickListener(this);
-	}
+        cancelButton.setOnClickListener(this);
+    }
 
-	@Override
-	public void onClick(View v) {
-	    if (v == cancelButton) {
-			cancel();
-		}
-	}
+    @Override
+    public void onClick(View v) {
+        if (v == cancelButton) {
+            cancel();
+        }
+    }
 
-	@Override
-	public void onSelectedDate(Date date) {
-	    calendarDate = date;
-	    dismiss();
-	}
+    @Override
+    public void onSelectedDate(Date date) {
+        calendarDate = date;
+        dismiss();
+    }
 
-	public Date getCalendarDate() {
-		return calendarDate;
-	}
+    public Date getCalendarDate() {
+        return calendarDate;
+    }
 
-	public void setCalendarDate(Date calendarDate) {
-		this.calendarDate = calendarDate;
-	}
+    public void setCalendarDate(Date calendarDate) {
+        this.calendarDate = calendarDate;
+    }
 }
diff --git a/astrid/src/com/todoroo/astrid/ui/CalendarView.java b/astrid/src/com/todoroo/astrid/ui/CalendarView.java
index 337e98059..6bbe25a0d 100644
--- a/astrid/src/com/todoroo/astrid/ui/CalendarView.java
+++ b/astrid/src/com/todoroo/astrid/ui/CalendarView.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.ui;
 
-import java.util.Calendar;
-import java.util.Date;
-
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -32,53 +29,57 @@ import android.view.WindowManager;
 
 import com.timsu.astrid.R;
 
+import java.util.Calendar;
+import java.util.Date;
+
 public class CalendarView extends View {
 
-	private static final int PADDING = 0;
-	private static final int TEXT_PADDING = 2;
-	private final static int CURVE_RADIUS = 0;
-	private final static int TEXT_SIZE = 16;
+    private static final int PADDING = 0;
+    private static final int TEXT_PADDING = 2;
+    private final static int CURVE_RADIUS = 0;
+    private final static int TEXT_SIZE = 16;
     private static final float MONTH_TEXT_SIZE = 22;
     private static final float GESTURE_DELTAX_THRESHOLD = 100;
     private float deltaX;
     private boolean ignoreNextTouch;
 
-	private Paint borderPaint;
-	private Paint calendarNumberRightAlignPaint;
-	private Paint calendarSelectedNumberRightAlignPaint;
-	private Paint backgroundColorPaint;
-	private Paint monthCenterAlignLargePaint;
-	private Paint centerAlignPaint;
-	private Paint rightAlignPaint;
-	private Paint todayCalendarPaint;
-	private Paint selectedCalendarPaint;
-	private Paint dayPaint;
-	private float density;
-
-	private int leftArrowHeight;
-	private int leftArrowWidth;
-	private int rightArrowHeight;
-	private int rightArrowWidth;
-	private int leftArrowX = 0;
-	private int leftArrowY = 0;
-	private int rightArrowX = 0;
-	private int rightArrowY = 0;
-
-	private int[] dayLeftArr;
-	private int[] dayTopArr;
-
-	private float boxWidth;
-	private float boxHeight;
-
-	private Date calendarDate = new Date();
-	private int currentHighlightDay = -1;
-
-	public interface OnSelectedDateListener {
-	    public void onSelectedDate(Date date);
-	}
-	private OnSelectedDateListener onSelectedDateListener;
-
-	public void setOnSelectedDateListener(
+    private Paint borderPaint;
+    private Paint calendarNumberRightAlignPaint;
+    private Paint calendarSelectedNumberRightAlignPaint;
+    private Paint backgroundColorPaint;
+    private Paint monthCenterAlignLargePaint;
+    private Paint centerAlignPaint;
+    private Paint rightAlignPaint;
+    private Paint todayCalendarPaint;
+    private Paint selectedCalendarPaint;
+    private Paint dayPaint;
+    private float density;
+
+    private int leftArrowHeight;
+    private int leftArrowWidth;
+    private int rightArrowHeight;
+    private int rightArrowWidth;
+    private int leftArrowX = 0;
+    private int leftArrowY = 0;
+    private int rightArrowX = 0;
+    private int rightArrowY = 0;
+
+    private int[] dayLeftArr;
+    private int[] dayTopArr;
+
+    private float boxWidth;
+    private float boxHeight;
+
+    private Date calendarDate = new Date();
+    private int currentHighlightDay = -1;
+
+    public interface OnSelectedDateListener {
+        public void onSelectedDate(Date date);
+    }
+
+    private OnSelectedDateListener onSelectedDateListener;
+
+    public void setOnSelectedDateListener(
             OnSelectedDateListener onSelectedDateListener) {
         this.onSelectedDateListener = onSelectedDateListener;
     }
@@ -86,6 +87,7 @@ public class CalendarView extends View {
     /**
      * Constructor.  This version is only needed if you will be instantiating
      * the object manually (not from a layout XML file).
+     *
      * @param context
      */
     public CalendarView(Context context) {
@@ -108,58 +110,58 @@ public class CalendarView extends View {
 
         Resources r = context.getResources();
 
-    	borderPaint = new Paint();
-    	borderPaint.setAntiAlias(true);
-    	borderPaint.setColor(r.getColor(R.color.task_edit_deadline_gray));
-    	borderPaint.setStyle(Style.STROKE);
+        borderPaint = new Paint();
+        borderPaint.setAntiAlias(true);
+        borderPaint.setColor(r.getColor(R.color.task_edit_deadline_gray));
+        borderPaint.setStyle(Style.STROKE);
 
-    	calendarNumberRightAlignPaint = new Paint();
-    	calendarNumberRightAlignPaint.setAntiAlias(true);
-    	calendarNumberRightAlignPaint.setColor(r.getColor(R.color.task_edit_deadline_gray));
-    	calendarNumberRightAlignPaint.setTextSize(TEXT_SIZE * density);
-    	calendarNumberRightAlignPaint.setTextAlign(Paint.Align.RIGHT);
+        calendarNumberRightAlignPaint = new Paint();
+        calendarNumberRightAlignPaint.setAntiAlias(true);
+        calendarNumberRightAlignPaint.setColor(r.getColor(R.color.task_edit_deadline_gray));
+        calendarNumberRightAlignPaint.setTextSize(TEXT_SIZE * density);
+        calendarNumberRightAlignPaint.setTextAlign(Paint.Align.RIGHT);
 
-    	calendarSelectedNumberRightAlignPaint = new Paint();
+        calendarSelectedNumberRightAlignPaint = new Paint();
         calendarSelectedNumberRightAlignPaint.setAntiAlias(true);
         calendarSelectedNumberRightAlignPaint.setColor(Color.WHITE);
         calendarSelectedNumberRightAlignPaint.setTextSize(TEXT_SIZE * density);
         calendarSelectedNumberRightAlignPaint.setTextAlign(Paint.Align.RIGHT);
 
-    	dayPaint = new Paint();
-    	dayPaint.setAntiAlias(true);
-    	dayPaint.setColor(Color.rgb(137, 135, 132));
-
-    	monthCenterAlignLargePaint = new Paint();
-    	monthCenterAlignLargePaint.setAntiAlias(true);
-    	monthCenterAlignLargePaint.setColor(r.getColor(R.color.task_edit_deadline_gray));
-    	monthCenterAlignLargePaint.setTextAlign(Paint.Align.CENTER);
-    	monthCenterAlignLargePaint.setTextSize(MONTH_TEXT_SIZE * density);
-
-    	centerAlignPaint = new Paint();
-    	centerAlignPaint.setAntiAlias(true);
-    	centerAlignPaint.setColor(r.getColor(R.color.task_edit_deadline_gray));
-    	centerAlignPaint.setTextAlign(Paint.Align.CENTER);
-    	centerAlignPaint.setTextSize(TEXT_SIZE * density);
-
-    	rightAlignPaint = new Paint();
-    	rightAlignPaint.setAntiAlias(true);
-    	rightAlignPaint.setColor(r.getColor(R.color.task_edit_deadline_gray));
-    	rightAlignPaint.setTextAlign(Paint.Align.RIGHT);
-    	rightAlignPaint.setTextSize(TEXT_SIZE * density);
-
-    	todayCalendarPaint = new Paint();
-    	todayCalendarPaint.setAntiAlias(true);
-    	todayCalendarPaint.setColor(r.getColor(R.color.task_edit_deadline_gray));
-
-    	TypedValue selectedColor = new TypedValue();
-    	context.getTheme().resolveAttribute(R.attr.asThemeTextColor, selectedColor, false);
-    	selectedCalendarPaint = new Paint();
-    	selectedCalendarPaint.setAntiAlias(true);
-    	selectedCalendarPaint.setColor(r.getColor(selectedColor.data));
-
-    	backgroundColorPaint = new Paint();
-    	backgroundColorPaint.setAntiAlias(true);
-    	backgroundColorPaint.setColor(Color.TRANSPARENT);
+        dayPaint = new Paint();
+        dayPaint.setAntiAlias(true);
+        dayPaint.setColor(Color.rgb(137, 135, 132));
+
+        monthCenterAlignLargePaint = new Paint();
+        monthCenterAlignLargePaint.setAntiAlias(true);
+        monthCenterAlignLargePaint.setColor(r.getColor(R.color.task_edit_deadline_gray));
+        monthCenterAlignLargePaint.setTextAlign(Paint.Align.CENTER);
+        monthCenterAlignLargePaint.setTextSize(MONTH_TEXT_SIZE * density);
+
+        centerAlignPaint = new Paint();
+        centerAlignPaint.setAntiAlias(true);
+        centerAlignPaint.setColor(r.getColor(R.color.task_edit_deadline_gray));
+        centerAlignPaint.setTextAlign(Paint.Align.CENTER);
+        centerAlignPaint.setTextSize(TEXT_SIZE * density);
+
+        rightAlignPaint = new Paint();
+        rightAlignPaint.setAntiAlias(true);
+        rightAlignPaint.setColor(r.getColor(R.color.task_edit_deadline_gray));
+        rightAlignPaint.setTextAlign(Paint.Align.RIGHT);
+        rightAlignPaint.setTextSize(TEXT_SIZE * density);
+
+        todayCalendarPaint = new Paint();
+        todayCalendarPaint.setAntiAlias(true);
+        todayCalendarPaint.setColor(r.getColor(R.color.task_edit_deadline_gray));
+
+        TypedValue selectedColor = new TypedValue();
+        context.getTheme().resolveAttribute(R.attr.asThemeTextColor, selectedColor, false);
+        selectedCalendarPaint = new Paint();
+        selectedCalendarPaint.setAntiAlias(true);
+        selectedCalendarPaint.setColor(r.getColor(selectedColor.data));
+
+        backgroundColorPaint = new Paint();
+        backgroundColorPaint.setAntiAlias(true);
+        backgroundColorPaint.setColor(Color.TRANSPARENT);
 
         setPadding(PADDING, PADDING, PADDING, PADDING);
 
@@ -171,7 +173,7 @@ public class CalendarView extends View {
                     deltaX = 0;
                 }
 
-                if (Math.abs(deltaX) >  GESTURE_DELTAX_THRESHOLD) {
+                if (Math.abs(deltaX) > GESTURE_DELTAX_THRESHOLD) {
                     if (deltaX > 0) {
                         performClick(rightArrowX + rightArrowWidth / 2, rightArrowY + rightArrowHeight / 2);
                     } else {
@@ -206,6 +208,7 @@ public class CalendarView extends View {
 
     /**
      * Determines the width of this view
+     *
      * @param measureSpec A measureSpec packed into an int
      * @return The width of the view, honoring constraints from measureSpec
      */
@@ -224,6 +227,7 @@ public class CalendarView extends View {
 
     /**
      * Determines the height of this view
+     *
      * @param measureSpec A measureSpec packed into an int
      * @return The height of the view, honoring constraints from measureSpec
      */
@@ -271,23 +275,23 @@ public class CalendarView extends View {
         // Month border -- end
 
         // Month left arrow -- Start
-        Bitmap leftArrow = ((BitmapDrawable)getResources().getDrawable(R.drawable.icn_arrow_left)).getBitmap();
-        leftArrowHeight = (int)(leftArrow.getHeight()*density / 2);
-        leftArrowWidth = (int)(leftArrow.getWidth()*density / 2);
+        Bitmap leftArrow = ((BitmapDrawable) getResources().getDrawable(R.drawable.icn_arrow_left)).getBitmap();
+        leftArrowHeight = (int) (leftArrow.getHeight() * density / 2);
+        leftArrowWidth = (int) (leftArrow.getWidth() * density / 2);
         leftArrowX = 5;
-        leftArrowY = 4 + (int)((monthTitleHeight / 2 - leftArrowHeight/2));
-        canvas.drawBitmap(leftArrow, new Rect(0,0,leftArrow.getWidth(),leftArrow.getHeight()),
+        leftArrowY = 4 + (int) ((monthTitleHeight / 2 - leftArrowHeight / 2));
+        canvas.drawBitmap(leftArrow, new Rect(0, 0, leftArrow.getWidth(), leftArrow.getHeight()),
                 new Rect(leftArrowX, leftArrowY, leftArrowX + leftArrowWidth,
                         leftArrowY + leftArrowHeight), null);
         // Month left arrow -- End
 
         // Month right arrow -- Start
-        Bitmap rightArrow = ((BitmapDrawable)getResources().getDrawable(R.drawable.icn_arrow_right)).getBitmap();
-        rightArrowHeight = (int)(rightArrow.getHeight()*density / 2);
-        rightArrowWidth = (int)(rightArrow.getWidth()*density / 2);
-        rightArrowX = (int) (getMeasuredWidth() - (2 * density) - (PADDING*3) - rightArrow.getWidth());
-        rightArrowY = 4 + (int)((monthTitleHeight / 2 - rightArrowHeight/2));
-        canvas.drawBitmap(rightArrow, new Rect(0,0,rightArrow.getWidth(),rightArrow.getHeight()),
+        Bitmap rightArrow = ((BitmapDrawable) getResources().getDrawable(R.drawable.icn_arrow_right)).getBitmap();
+        rightArrowHeight = (int) (rightArrow.getHeight() * density / 2);
+        rightArrowWidth = (int) (rightArrow.getWidth() * density / 2);
+        rightArrowX = (int) (getMeasuredWidth() - (2 * density) - (PADDING * 3) - rightArrow.getWidth());
+        rightArrowY = 4 + (int) ((monthTitleHeight / 2 - rightArrowHeight / 2));
+        canvas.drawBitmap(rightArrow, new Rect(0, 0, rightArrow.getWidth(), rightArrow.getHeight()),
                 new Rect(rightArrowX, rightArrowY, rightArrowX + rightArrowWidth,
                         rightArrowY + rightArrowHeight), null);
         // Month right arrow -- End
@@ -303,9 +307,9 @@ public class CalendarView extends View {
 
         // Day heading -- Start
         int dayLeft = 3;
-        int dayTop = (int)(monthTitleHeight + PADDING * 2);
+        int dayTop = (int) (monthTitleHeight + PADDING * 2);
 
-        boxWidth = (getMeasuredWidth() - (PADDING*2)) / 7.0f;
+        boxWidth = (getMeasuredWidth() - (PADDING * 2)) / 7.0f;
         boxHeight = (int) (((getMeasuredHeight() - (monthTitleHeight) - 16) - (PADDING * 8)) / 7);
 
         float textX = 0;
@@ -313,13 +317,13 @@ public class CalendarView extends View {
 
         int firstDayOfWeek = calendar.getFirstDayOfWeek();
         calendar.set(Calendar.DAY_OF_WEEK, firstDayOfWeek);
-        for(int i = 0; i < 7; i++) {
+        for (int i = 0; i < 7; i++) {
             int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
             String day = DateUtils.getDayOfWeekString(dayOfWeek, DateUtils.LENGTH_SHORT);
             calendar.add(Calendar.DATE, 1);
 
             textX = dayLeft + boxWidth - TEXT_PADDING * 3;
-            textY = dayTop + (boxHeight - boxHeight/8) - TEXT_PADDING * 2;
+            textY = dayTop + (boxHeight - boxHeight / 8) - TEXT_PADDING * 2;
             canvas.drawText(day, textX, textY, rightAlignPaint);
 
             dayLeft += boxWidth;
@@ -330,11 +334,11 @@ public class CalendarView extends View {
         calendar.setTime(getCoercedDate(new Date(), calendarDate)); // Reset the calendar to either today or the specified date
 
         if (currentHighlightDay == -1) {
-        	currentHighlightDay = calendarDate.getTime() == 0 ? 0 : calendar.get(Calendar.DATE);
+            currentHighlightDay = calendarDate.getTime() == 0 ? 0 : calendar.get(Calendar.DATE);
         }
         int today = -1;
         Calendar todayCalendar = Calendar.getInstance();
-        if(calendar.get(Calendar.MONTH) == todayCalendar.get(Calendar.MONTH) &&
+        if (calendar.get(Calendar.MONTH) == todayCalendar.get(Calendar.MONTH) &&
                 calendar.get(Calendar.YEAR) == todayCalendar.get(Calendar.YEAR))
             today = todayCalendar.get(Calendar.DATE);
         int lastDateOfThisMonth = calendar.getActualMaximum(Calendar.DATE);
@@ -342,7 +346,7 @@ public class CalendarView extends View {
         calendar.set(Calendar.DATE, 1);
         // offset for day of week
         int firstDayOfMonth = calendar.get(Calendar.DAY_OF_WEEK) - firstDayOfWeek + Calendar.SUNDAY;
-        if(firstDayOfMonth == 0)
+        if (firstDayOfMonth == 0)
             firstDayOfMonth = 7;
         boolean firstTime = true;
         int dayOfMonth = 1;
@@ -352,64 +356,64 @@ public class CalendarView extends View {
         dayLeftArr = new int[lastDateOfThisMonth];
         dayTopArr = new int[lastDateOfThisMonth];
         for (int i = 1; i <= 6; i++) {
-        	dayLeft = 1;
-	        dayTop += boxHeight + PADDING;
-			for (int j = 1; j <= 7; j++) {
-				if (firstTime && j != firstDayOfMonth) {
-					dayLeft += boxWidth + PADDING;
-					continue;
-				}
-
-				firstTime = false;
-
-				if (dayOfMonth <= lastDateOfThisMonth) {
-					if (currentHighlightDay == dayOfMonth) {
-						colorPaint = selectedCalendarPaint;
-						textPaint = calendarSelectedNumberRightAlignPaint;
-					} else if(today == dayOfMonth) {
-					    colorPaint = todayCalendarPaint;
-					    textPaint = calendarSelectedNumberRightAlignPaint;
-					} else {
-						colorPaint = backgroundColorPaint;
-						textPaint = calendarNumberRightAlignPaint;
-					}
-					dayLeftArr[dayOfMonth-1] = dayLeft;
-					dayTopArr[dayOfMonth-1] = dayTop;
-					rectF.set(dayLeft, dayTop, dayLeft + boxWidth, dayTop + boxHeight);
+            dayLeft = 1;
+            dayTop += boxHeight + PADDING;
+            for (int j = 1; j <= 7; j++) {
+                if (firstTime && j != firstDayOfMonth) {
+                    dayLeft += boxWidth + PADDING;
+                    continue;
+                }
+
+                firstTime = false;
+
+                if (dayOfMonth <= lastDateOfThisMonth) {
+                    if (currentHighlightDay == dayOfMonth) {
+                        colorPaint = selectedCalendarPaint;
+                        textPaint = calendarSelectedNumberRightAlignPaint;
+                    } else if (today == dayOfMonth) {
+                        colorPaint = todayCalendarPaint;
+                        textPaint = calendarSelectedNumberRightAlignPaint;
+                    } else {
+                        colorPaint = backgroundColorPaint;
+                        textPaint = calendarNumberRightAlignPaint;
+                    }
+                    dayLeftArr[dayOfMonth - 1] = dayLeft;
+                    dayTopArr[dayOfMonth - 1] = dayTop;
+                    rectF.set(dayLeft, dayTop, dayLeft + boxWidth, dayTop + boxHeight);
 //					if (j != 1)
 //					    canvas.drawLine(rectF.left, rectF.top, rectF.left, rectF.bottom, borderPaint);
 
-		            rectF.set(dayLeft+1, dayTop, dayLeft + boxWidth - 1, dayTop + boxHeight);
-		            canvas.drawRoundRect(rectF, CURVE_RADIUS, CURVE_RADIUS, colorPaint);
+                    rectF.set(dayLeft + 1, dayTop, dayLeft + boxWidth - 1, dayTop + boxHeight);
+                    canvas.drawRoundRect(rectF, CURVE_RADIUS, CURVE_RADIUS, colorPaint);
 
-		            textX = dayLeft + boxWidth - TEXT_PADDING * 3;
-		            textY = dayTop + calendarNumberRightAlignPaint.getTextSize() + TEXT_PADDING;
-		            canvas.drawText(String.valueOf(dayOfMonth), textX, textY, textPaint);
+                    textX = dayLeft + boxWidth - TEXT_PADDING * 3;
+                    textY = dayTop + calendarNumberRightAlignPaint.getTextSize() + TEXT_PADDING;
+                    canvas.drawText(String.valueOf(dayOfMonth), textX, textY, textPaint);
 
-		            dayLeft += boxWidth + PADDING;
+                    dayLeft += boxWidth + PADDING;
 
-		            dayOfMonth++;
-				}
-			}
-		}
+                    dayOfMonth++;
+                }
+            }
+        }
         // Calendar -- End
     }
 
     @Override
     public boolean onTouchEvent(MotionEvent event) {
-    	switch (event.getAction()) {
-    	case MotionEvent.ACTION_UP:
-    		int x = (int) event.getX();
-            int y = (int) event.getY();
-            performClick(x, y);
-            break;
-    	}
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_UP:
+                int x = (int) event.getX();
+                int y = (int) event.getY();
+                performClick(x, y);
+                break;
+        }
         return true;
     }
 
     private void performClick(int x, int y) {
-    	// System.out.println("---------------------Current x, y : " + x + ", " + y);
-    	// Handle left-right arrow click -- start
+        // System.out.println("---------------------Current x, y : " + x + ", " + y);
+        // Handle left-right arrow click -- start
         if ((x > leftArrowX && x < (leftArrowX + leftArrowWidth * 2))
                 && (y > leftArrowY - leftArrowHeight / 2 && y < (leftArrowY + 3 * leftArrowHeight / 2))) {
             Calendar calendar = Calendar.getInstance();
@@ -423,7 +427,7 @@ public class CalendarView extends View {
             currentHighlightDay = calendar.get(Calendar.DATE);
             this.invalidate();
 
-            if(onSelectedDateListener != null)
+            if (onSelectedDateListener != null)
                 onSelectedDateListener.onSelectedDate(calendarDate);
         } else if ((x > rightArrowX - rightArrowWidth && x < (rightArrowX + rightArrowWidth))
                 && (y > rightArrowY - rightArrowHeight / 2 && y < (rightArrowY + 3 * rightArrowHeight / 2))) {
@@ -438,31 +442,31 @@ public class CalendarView extends View {
             currentHighlightDay = calendar.get(Calendar.DATE);
             this.invalidate();
 
-            if(onSelectedDateListener != null)
+            if (onSelectedDateListener != null)
                 onSelectedDateListener.onSelectedDate(calendarDate);
             // Handle left-right arrow click -- end
-		} else if(dayLeftArr != null) {
-			// Check if clicked on date
-		    if (ignoreNextTouch) {
-		        ignoreNextTouch = false;
-		        return;
-		    }
-			for (int i=0; i<dayLeftArr.length; i++) {
-				if ((x > dayLeftArr[i] && x < dayLeftArr[i]+boxWidth) && (y > dayTopArr[i] && y < dayTopArr[i] + boxHeight)) {
-					currentHighlightDay = i+1;
-					Calendar calendar = Calendar.getInstance();
-					Date today = getToday(calendar);
-					calendar.setTime(getCoercedDate(today, calendarDate));
-					calendar.set(Calendar.DATE, currentHighlightDay);
-
-					calendarDate = calendar.getTime();
-		            this.invalidate();
-
-		            if(onSelectedDateListener != null)
-		                onSelectedDateListener.onSelectedDate(calendarDate);
-				}
-			}
-		}
+        } else if (dayLeftArr != null) {
+            // Check if clicked on date
+            if (ignoreNextTouch) {
+                ignoreNextTouch = false;
+                return;
+            }
+            for (int i = 0; i < dayLeftArr.length; i++) {
+                if ((x > dayLeftArr[i] && x < dayLeftArr[i] + boxWidth) && (y > dayTopArr[i] && y < dayTopArr[i] + boxHeight)) {
+                    currentHighlightDay = i + 1;
+                    Calendar calendar = Calendar.getInstance();
+                    Date today = getToday(calendar);
+                    calendar.setTime(getCoercedDate(today, calendarDate));
+                    calendar.set(Calendar.DATE, currentHighlightDay);
+
+                    calendarDate = calendar.getTime();
+                    this.invalidate();
+
+                    if (onSelectedDateListener != null)
+                        onSelectedDateListener.onSelectedDate(calendarDate);
+                }
+            }
+        }
     }
 
     private Date getToday(Calendar calendar) {
@@ -479,11 +483,11 @@ public class CalendarView extends View {
     }
 
     public Date getCalendarDate() {
-    	return calendarDate;
+        return calendarDate;
     }
 
-	public void setCalendarDate(Date calendarDate) {
-		this.calendarDate = calendarDate;
-		currentHighlightDay = -1;
-	}
+    public void setCalendarDate(Date calendarDate) {
+        this.calendarDate = calendarDate;
+        currentHighlightDay = -1;
+    }
 }
diff --git a/astrid/src/com/todoroo/astrid/ui/CheckableImageView.java b/astrid/src/com/todoroo/astrid/ui/CheckableImageView.java
index 17def2bd6..6b077cbde 100644
--- a/astrid/src/com/todoroo/astrid/ui/CheckableImageView.java
+++ b/astrid/src/com/todoroo/astrid/ui/CheckableImageView.java
@@ -14,7 +14,7 @@ import android.widget.ImageView;
 public class CheckableImageView extends ImageView implements Checkable {
 
     private static final int[] CHECKED_STATE_SET = {
-        android.R.attr.state_checked
+            android.R.attr.state_checked
     };
 
     public CheckableImageView(Context context, AttributeSet attrs) {
diff --git a/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java b/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java
index a2c8fe8e6..ef16b0462 100644
--- a/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java
+++ b/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.ui;
 
-import java.io.InputStream;
-
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.ContentUris;
@@ -39,13 +37,16 @@ import com.todoroo.andlib.sql.Query;
 import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.service.TagDataService;
 
+import java.io.InputStream;
+
 @SuppressWarnings({"nls", "deprecation"})
 public class ContactListAdapter extends CursorAdapter {
 
-    @Autowired TagDataService tagDataService;
+    @Autowired
+    TagDataService tagDataService;
 
-    private static final String[] PEOPLE_PROJECTION = new String[] {
-        Email._ID, Email.CONTACT_ID, ContactsContract.Contacts.DISPLAY_NAME, Email.DATA
+    private static final String[] PEOPLE_PROJECTION = new String[]{
+            Email._ID, Email.CONTACT_ID, ContactsContract.Contacts.DISPLAY_NAME, Email.DATA
     };
 
     private boolean completeSharedTags = false;
@@ -74,10 +75,10 @@ public class ContactListAdapter extends CursorAdapter {
         TextView text2 = (TextView) view.findViewById(android.R.id.text2);
         ImageView imageView = (ImageView) view.findViewById(R.id.icon);
 
-        if(cursor.getColumnNames().length == PEOPLE_PROJECTION.length) {
+        if (cursor.getColumnNames().length == PEOPLE_PROJECTION.length) {
             int name = cursor.getColumnIndexOrThrow(ContactsContract.Contacts.DISPLAY_NAME);
             int email = cursor.getColumnIndexOrThrow(Email.DATA);
-            if(cursor.isNull(name)) {
+            if (cursor.isNull(name)) {
                 text1.setText(cursor.getString(email));
                 text2.setText("");
             } else {
@@ -110,7 +111,7 @@ public class ContactListAdapter extends CursorAdapter {
             uri = params[0];
             InputStream input = ContactsContract.Contacts.openContactPhotoInputStream(mContent, uri);
             if (input == null)
-                 return null;
+                return null;
             return BitmapFactory.decodeStream(input);
         }
 
@@ -118,19 +119,19 @@ public class ContactListAdapter extends CursorAdapter {
         protected void onPostExecute(Bitmap bitmap) {
             if (isCancelled())
                 bitmap = null;
-            if(imageView != null && uri.equals(imageView.getTag()) && bitmap != null)
+            if (imageView != null && uri.equals(imageView.getTag()) && bitmap != null)
                 imageView.setImageBitmap(bitmap);
         }
     }
 
     @Override
     public String convertToString(Cursor cursor) {
-        if(cursor.getColumnIndex(Email.DATA) > -1) {
+        if (cursor.getColumnIndex(Email.DATA) > -1) {
             int name = cursor.getColumnIndexOrThrow(ContactsContract.Contacts.DISPLAY_NAME);
             int email = cursor.getColumnIndexOrThrow(Email.DATA);
-            if(cursor.isNull(name))
+            if (cursor.isNull(name))
                 return cursor.getString(email);
-            return cursor.getString(name) + " <" + cursor.getString(email) +">";
+            return cursor.getString(name) + " <" + cursor.getString(email) + ">";
         } else {
             int name = cursor.getColumnIndexOrThrow(TagData.NAME.name);
             return "#" + cursor.getString(name);
@@ -149,11 +150,11 @@ public class ContactListAdapter extends CursorAdapter {
         Cursor peopleCursor = mContent.query(uri, PEOPLE_PROJECTION,
                 null, null, sort);
 
-        if(!completeSharedTags)
+        if (!completeSharedTags)
             return peopleCursor;
 
         Criterion crit = Criterion.all;
-        if(constraint != null)
+        if (constraint != null)
             crit = Functions.upper(TagData.NAME).like("%" + constraint.toString().toUpperCase() + "%");
         else
             crit = Criterion.none;
@@ -161,7 +162,7 @@ public class ContactListAdapter extends CursorAdapter {
                 where(Criterion.and(TagData.USER_ID.eq(0), TagData.MEMBER_COUNT.gt(0),
                         crit)).orderBy(Order.desc(TagData.NAME)));
 
-        return new MergeCursor(new Cursor[] { tagCursor, peopleCursor });
+        return new MergeCursor(new Cursor[]{tagCursor, peopleCursor});
     }
 
     private final ContentResolver mContent;
@@ -173,7 +174,7 @@ public class ContactListAdapter extends CursorAdapter {
         ContentResolver cr = ContextManager.getContext().getContentResolver();
         ContentValues personValues = new ContentValues();
         ContentValues emailValues = new ContentValues();
-        for(int i = 0; i < 2000; i++) {
+        for (int i = 0; i < 2000; i++) {
             personValues.clear();
             personValues.put(Contacts.People.NAME, "John " + i + " Doe");
             Uri newPersonUri = cr.insert(Contacts.People.CONTENT_URI, personValues);
@@ -186,7 +187,7 @@ public class ContactListAdapter extends CursorAdapter {
                 emailValues.put(Contacts.ContactMethods.TYPE,
                         Contacts.ContactMethods.TYPE_HOME);
                 emailValues.put(Contacts.ContactMethods.DATA,
-                    "john." + i + ".doe@test.com");
+                        "john." + i + ".doe@test.com");
                 cr.insert(emailUri, emailValues);
             }
         }
diff --git a/astrid/src/com/todoroo/astrid/ui/ContactsAutoComplete.java b/astrid/src/com/todoroo/astrid/ui/ContactsAutoComplete.java
index 263a11c87..747b697ac 100644
--- a/astrid/src/com/todoroo/astrid/ui/ContactsAutoComplete.java
+++ b/astrid/src/com/todoroo/astrid/ui/ContactsAutoComplete.java
@@ -20,7 +20,7 @@ public class ContactsAutoComplete extends AutoCompleteTextView {
     private boolean completeTags = false;
 
     public ContactsAutoComplete(final Context context, final AttributeSet attrs,
-            final int defStyle) {
+                                final int defStyle) {
         super(context, attrs, defStyle);
         this.setThreshold(0);
         this.setUpContacts();
@@ -56,7 +56,7 @@ public class ContactsAutoComplete extends AutoCompleteTextView {
     @Override
     protected void performFiltering(final CharSequence text, final int keyCode) {
         String filterText = text.toString().trim();
-        if(allowMultiple) {
+        if (allowMultiple) {
             previous = filterText.substring(0,
                     filterText.lastIndexOf(getSeperator()) + 1);
             filterText = filterText.substring(filterText.lastIndexOf(getSeperator()) + 1);
@@ -71,7 +71,7 @@ public class ContactsAutoComplete extends AutoCompleteTextView {
      */
     @Override
     protected void replaceText(final CharSequence text) {
-        if(allowMultiple)
+        if (allowMultiple)
             super.replaceText(previous + text + getSeperator());
         else
             super.replaceText(text);
diff --git a/astrid/src/com/todoroo/astrid/ui/CustomBorderDrawable.java b/astrid/src/com/todoroo/astrid/ui/CustomBorderDrawable.java
index 3dc1b83e8..72873f8da 100644
--- a/astrid/src/com/todoroo/astrid/ui/CustomBorderDrawable.java
+++ b/astrid/src/com/todoroo/astrid/ui/CustomBorderDrawable.java
@@ -4,6 +4,7 @@
  * See the file "LICENSE" for the full license governing this code.
  */
 package com.todoroo.astrid.ui;
+
 import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.Paint;
@@ -35,9 +36,9 @@ public class CustomBorderDrawable extends ShapeDrawable {
 
         Matrix matrix = new Matrix();
         matrix.setRectToRect(new RectF(0, 0, canvas.getClipBounds().right,
-                    canvas.getClipBounds().bottom),
-                new RectF(strokeWidth/2, strokeWidth/2, canvas.getClipBounds().right - strokeWidth/2,
-                        canvas.getClipBounds().bottom - strokeWidth/2),
+                canvas.getClipBounds().bottom),
+                new RectF(strokeWidth / 2, strokeWidth / 2, canvas.getClipBounds().right - strokeWidth / 2,
+                        canvas.getClipBounds().bottom - strokeWidth / 2),
                 Matrix.ScaleToFit.FILL);
         canvas.concat(matrix);
 
@@ -46,14 +47,14 @@ public class CustomBorderDrawable extends ShapeDrawable {
     }
 
     public static StateListDrawable customButton(int tl, int tr, int br, int bl, int onColor, int offColor, int borderColor, int strokeWidth) {
-        Shape shape = new RoundRectShape(new float[] { tl, tl, tr, tr, br, br, bl, bl}, null, null);
+        Shape shape = new RoundRectShape(new float[]{tl, tl, tr, tr, br, br, bl, bl}, null, null);
         ShapeDrawable sdOn = new CustomBorderDrawable(shape, onColor, borderColor, strokeWidth);
         ShapeDrawable sdOff = new CustomBorderDrawable(shape, offColor, borderColor, strokeWidth);
 
         StateListDrawable stld = new StateListDrawable();
-        stld.addState(new int[] { android.R.attr.state_pressed }, sdOn);
-        stld.addState(new int[] { android.R.attr.state_checked }, sdOn);
-        stld.addState(new int[] { android.R.attr.state_enabled }, sdOff);
+        stld.addState(new int[]{android.R.attr.state_pressed}, sdOn);
+        stld.addState(new int[]{android.R.attr.state_checked}, sdOn);
+        stld.addState(new int[]{android.R.attr.state_enabled}, sdOff);
         return stld;
     }
 }
diff --git a/astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java b/astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java
index 2a346a1a5..f8a4d3c5e 100644
--- a/astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java
+++ b/astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java
@@ -20,6 +20,7 @@ public class DateAndTimeDialog extends Dialog {
 
     public interface DateAndTimeDialogListener {
         public void onDateAndTimeSelected(long date);
+
         public void onDateAndTimeCancelled();
     }
 
diff --git a/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java b/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java
index cff1653a5..ec7fb9d05 100644
--- a/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java
+++ b/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.ui;
 
-import java.util.ArrayList;
-import java.util.Date;
-
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
@@ -27,6 +24,9 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.ui.AstridTimePicker.TimePickerEnabledChangedListener;
 import com.todoroo.astrid.ui.CalendarView.OnSelectedDateListener;
 
+import java.util.ArrayList;
+import java.util.Date;
+
 public class DateAndTimePicker extends LinearLayout {
 
     public interface OnDateChangedListener {
@@ -87,7 +87,7 @@ public class DateAndTimePicker extends LinearLayout {
     public void initializeWithDate(long dateValue) {
         Date date = new Date(dateValue);
         Date forCalendar;
-        if (dateValue> 0)
+        if (dateValue > 0)
             forCalendar = getDateForCalendar(date);
         else
             forCalendar = date;
@@ -149,9 +149,9 @@ public class DateAndTimePicker extends LinearLayout {
         TypedArray t = context.obtainStyledAttributes(attrs, R.styleable.DateAndTimePicker);
         for (int i = 0; i < t.getIndexCount(); i++) {
             int attr = t.getIndex(i);
-            switch(attr) {
-            case R.styleable.DateAndTimePicker_shortcutLabels:
-                arrayResource = t.getResourceId(attr, R.array.TEA_urgency);
+            switch (attr) {
+                case R.styleable.DateAndTimePicker_shortcutLabels:
+                    arrayResource = t.getResourceId(attr, R.array.TEA_urgency);
             }
         }
 
diff --git a/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java b/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java
index 67b343e45..5719d90ba 100644
--- a/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java
+++ b/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.ui;
 
-import java.text.ParseException;
-import java.util.Date;
-
 import android.app.Dialog;
 import android.content.Context;
 import android.content.res.Configuration;
@@ -38,20 +35,29 @@ import com.todoroo.astrid.repeats.RepeatTaskCompleteListener;
 import com.todoroo.astrid.ui.DateAndTimeDialog.DateAndTimeDialogListener;
 import com.todoroo.astrid.utility.Flags;
 
+import java.text.ParseException;
+import java.util.Date;
+
 /**
  * Helper class that creates a dialog to confirm the results of a quick add markup
- * @author Sam
  *
+ * @author Sam
  */
 public class DateChangedAlerts {
 
-    /** Preference key for how many of these helper dialogs we've shown */
+    /**
+     * Preference key for how many of these helper dialogs we've shown
+     */
     public static final String PREF_NUM_HELPERS_SHOWN = "pref_num_date_helpers"; //$NON-NLS-1$
 
-    /** Preference key for whether or not we should show such dialogs */
+    /**
+     * Preference key for whether or not we should show such dialogs
+     */
     public static final int PREF_SHOW_HELPERS = R.string.p_showSmartConfirmation_key;
 
-    /** Start showing the option to hide future notifs after this many confirmation dialogs */
+    /**
+     * Start showing the option to hide future notifs after this many confirmation dialogs
+     */
     public static final int HIDE_CHECKBOX_AFTER_SHOWS = 3;
 
 
@@ -118,7 +124,7 @@ public class DateChangedAlerts {
 
 
     public static final Property<?>[] REPEAT_RESCHEDULED_PROPERTIES =
-            new Property<?>[] {
+            new Property<?>[]{
                     Task.ID,
                     Task.TITLE,
                     Task.DUE_DATE,
@@ -127,7 +133,7 @@ public class DateChangedAlerts {
             };
 
     public static void showRepeatTaskRescheduledDialog(final AstridActivity activity, final Task task,
-            final long oldDueDate, final long newDueDate, final boolean lastTime) {
+                                                       final long oldDueDate, final long newDueDate, final boolean lastTime) {
         if (!Preferences.getBoolean(PREF_SHOW_HELPERS, true))
             return;
 
@@ -180,7 +186,7 @@ public class DateChangedAlerts {
 
         int encouragementResource = lastTime ? R.array.repeat_encouragement_last_time : R.array.repeat_encouragement;
         String[] encouragements = activity.getResources().getStringArray(encouragementResource);
-        String encouragement = encouragements[(int) (Math.random()*encouragements.length)];
+        String encouragement = encouragements[(int) (Math.random() * encouragements.length)];
 
         String speechBubbleText;
         if (lastTime)
@@ -264,7 +270,7 @@ public class DateChangedAlerts {
     @SuppressWarnings("nls")
     private static Spanned constructSpeechBubbleTextForQuickAdd(Context context, Task task) {
         String[] priorityStrings = context.getResources().getStringArray(R.array.TLA_priority_strings);
-        int[] colorsArray = new int[] { R.color.importance_1, R.color.importance_2, R.color.importance_3, R.color.importance_4 };
+        int[] colorsArray = new int[]{R.color.importance_1, R.color.importance_2, R.color.importance_3, R.color.importance_4};
 
         String title = task.getValue(Task.TITLE);
         long date = task.getValue(Task.DUE_DATE);
@@ -300,7 +306,7 @@ public class DateChangedAlerts {
     @SuppressWarnings("nls")
     private static String getRelativeDateAndTimeString(Context context, long date) {
         String dueString = date > 0 ? DateUtilities.getRelativeDay(context, date, false) : "";
-        if(Task.hasDueTime(date))
+        if (Task.hasDueTime(date))
             dueString = String.format("%s at %s", dueString, //$NON-NLS-1$
                     DateUtilities.getTimeString(context, new Date(date)));
         return dueString;
@@ -315,24 +321,24 @@ public class DateChangedAlerts {
                     R.array.repeat_interval);
             String frequency = "";
             Frequency freq = rrule.getFreq();
-            switch(freq) {
-            case DAILY:
-                frequency = dateAbbrev[0].toLowerCase();
-                break;
-            case WEEKLY:
-                frequency = dateAbbrev[1].toLowerCase();
-                break;
-            case MONTHLY:
-                frequency = dateAbbrev[2].toLowerCase();
-                break;
-            case HOURLY:
-                frequency = dateAbbrev[3].toLowerCase();
-                break;
-            case MINUTELY:
-                frequency = dateAbbrev[4].toLowerCase();
-                break;
-            case YEARLY:
-                frequency = dateAbbrev[5].toLowerCase();
+            switch (freq) {
+                case DAILY:
+                    frequency = dateAbbrev[0].toLowerCase();
+                    break;
+                case WEEKLY:
+                    frequency = dateAbbrev[1].toLowerCase();
+                    break;
+                case MONTHLY:
+                    frequency = dateAbbrev[2].toLowerCase();
+                    break;
+                case HOURLY:
+                    frequency = dateAbbrev[3].toLowerCase();
+                    break;
+                case MINUTELY:
+                    frequency = dateAbbrev[4].toLowerCase();
+                    break;
+                case YEARLY:
+                    frequency = dateAbbrev[5].toLowerCase();
             }
 
             if (!TextUtils.isEmpty(frequency)) {
diff --git a/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java b/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java
index bfc1748c2..8b708870a 100644
--- a/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java
@@ -34,7 +34,7 @@ public class DeadlineControlSet extends PopupControlSet {
     private final ImageView image;
 
     public DeadlineControlSet(Activity activity, int viewLayout, int displayViewLayout,
-            RepeatControlSet repeatControlSet, View...extraViews) {
+                              RepeatControlSet repeatControlSet, View... extraViews) {
         super(activity, viewLayout, displayViewLayout, 0);
         this.extraViews = extraViews;
         this.repeatControlSet = repeatControlSet;
diff --git a/astrid/src/com/todoroo/astrid/ui/DeadlineTimePickerDialog.java b/astrid/src/com/todoroo/astrid/ui/DeadlineTimePickerDialog.java
index 1bb5855b1..441863f81 100644
--- a/astrid/src/com/todoroo/astrid/ui/DeadlineTimePickerDialog.java
+++ b/astrid/src/com/todoroo/astrid/ui/DeadlineTimePickerDialog.java
@@ -16,8 +16,6 @@
 
 package com.todoroo.astrid.ui;
 
-import java.util.Calendar;
-
 import android.app.AlertDialog;
 import android.app.TimePickerDialog;
 import android.content.Context;
@@ -35,6 +33,8 @@ import android.widget.TimePicker.OnTimeChangedListener;
 
 import com.timsu.astrid.R;
 
+import java.util.Calendar;
+
 /**
  * A dialog that prompts the user for the time of day using a {@link TimePicker}.
  * This is similar to the Android {@link TimePickerDialog} class
@@ -51,10 +51,10 @@ public class DeadlineTimePickerDialog extends AlertDialog implements OnClickList
     public interface OnDeadlineTimeSetListener {
 
         /**
-         * @param view The view associated with this listener.
-         * @param hasTime whether time is set
+         * @param view      The view associated with this listener.
+         * @param hasTime   whether time is set
          * @param hourOfDay The hour that was set.
-         * @param minute The minute that was set.
+         * @param minute    The minute that was set.
          */
         void onTimeSet(TimePicker view, boolean hasTime, int hourOfDay, int minute);
     }
@@ -74,31 +74,31 @@ public class DeadlineTimePickerDialog extends AlertDialog implements OnClickList
     boolean mIs24HourView;
 
     /**
-     * @param context Parent.
-     * @param callBack How parent is notified.
-     * @param hourOfDay The initial hour.
-     * @param minute The initial minute.
+     * @param context      Parent.
+     * @param callBack     How parent is notified.
+     * @param hourOfDay    The initial hour.
+     * @param minute       The initial minute.
      * @param is24HourView Whether this is a 24 hour view, or AM/PM.
      */
     public DeadlineTimePickerDialog(Context context,
-            OnDeadlineTimeSetListener callBack,
-            int hourOfDay, int minute, boolean is24HourView, boolean hasTime) {
+                                    OnDeadlineTimeSetListener callBack,
+                                    int hourOfDay, int minute, boolean is24HourView, boolean hasTime) {
         this(context, android.R.style.Theme_Dialog,
                 callBack, hourOfDay, minute, is24HourView, hasTime);
     }
 
     /**
-     * @param context Parent.
-     * @param theme the theme to apply to this dialog
-     * @param callBack How parent is notified.
-     * @param hourOfDay The initial hour.
-     * @param minute The initial minute.
+     * @param context      Parent.
+     * @param theme        the theme to apply to this dialog
+     * @param callBack     How parent is notified.
+     * @param hourOfDay    The initial hour.
+     * @param minute       The initial minute.
      * @param is24HourView Whether this is a 24 hour view, or AM/PM.
      */
     public DeadlineTimePickerDialog(Context context,
-            int theme,
-            OnDeadlineTimeSetListener callBack,
-            int hourOfDay, int minute, boolean is24HourView, boolean hasTime) {
+                                    int theme,
+                                    OnDeadlineTimeSetListener callBack,
+                                    int hourOfDay, int minute, boolean is24HourView, boolean hasTime) {
         super(context, theme);
         mCallback = callBack;
         mInitialHourOfDay = hourOfDay;
@@ -121,9 +121,9 @@ public class DeadlineTimePickerDialog extends AlertDialog implements OnClickList
         OnCheckedChangeListener listener = new OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView,
-                    boolean isChecked) {
+                                         boolean isChecked) {
                 mTimePicker.setEnabled(isChecked);
-                if(isChecked)
+                if (isChecked)
                     updateTitle();
                 else
                     setTitle(R.string.TEA_urgency_none);
diff --git a/astrid/src/com/todoroo/astrid/ui/DraggableListView.java b/astrid/src/com/todoroo/astrid/ui/DraggableListView.java
index dc684628c..b13ebc25f 100644
--- a/astrid/src/com/todoroo/astrid/ui/DraggableListView.java
+++ b/astrid/src/com/todoroo/astrid/ui/DraggableListView.java
@@ -59,18 +59,18 @@ public class DraggableListView extends ListView {
     private Point mCoordOffset;  // the difference between screen coordinates and coordinates in this view
 
     // --- drag drawing
-	private ImageView mDragView;
-	private WindowManager mWindowManager;
-	private WindowManager.LayoutParams mWindowParams;
-	private int mUpperBound;
-	private int mLowerBound;
-	private int mHeight;
-	private final Rect mTempRect = new Rect();
-	private Bitmap mDragBitmap;
-	private final int mTouchSlop;
-	private int dragndropBackgroundColor = 0x00000000;
-
-	// --- listeners
+    private ImageView mDragView;
+    private WindowManager mWindowManager;
+    private WindowManager.LayoutParams mWindowParams;
+    private int mUpperBound;
+    private int mLowerBound;
+    private int mHeight;
+    private final Rect mTempRect = new Rect();
+    private Bitmap mDragBitmap;
+    private final int mTouchSlop;
+    private int dragndropBackgroundColor = 0x00000000;
+
+    // --- listeners
     private DragListener mDragListener;
     private DropListener mDropListener;
     private SwipeListener mSwipeListener;
@@ -83,9 +83,9 @@ public class DraggableListView extends ListView {
 
     // --- constructors
 
-	public DraggableListView(Context context, AttributeSet attrs) {
-		this(context, attrs, 0);
-	}
+    public DraggableListView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
 
     public DraggableListView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
@@ -158,7 +158,7 @@ public class DraggableListView extends ListView {
      * Restore size and visibility for all list items
      */
     private void unExpandViews(boolean deletion) {
-        for (int i = 0;; i++) {
+        for (int i = 0; ; i++) {
             View v = getChildAt(i);
             if (v == null) {
                 if (deletion) {
@@ -203,7 +203,7 @@ public class DraggableListView extends ListView {
 
         View first = getChildAt(mFirstDragPos - getFirstVisiblePosition());
 
-        for (int i = 0;; i++) {
+        for (int i = 0; ; i++) {
             View vv = getChildAt(i);
             if (vv == null) {
                 break;
@@ -251,58 +251,56 @@ public class DraggableListView extends ListView {
 
         int action = ev.getAction();
         switch (action) {
-        case MotionEvent.ACTION_UP:
-        case MotionEvent.ACTION_CANCEL:
-            if(mDragging) {
-                stopDragging();
-            } else {
-                if (dragThread != null && mClickListener != null) {
-                    dragThread.interrupt();
-                    dragThread = null;
-                    if (action == MotionEvent.ACTION_UP)
-                        mClickListener.onClick(viewAtPosition());
-                }
-
-                else if (mSwipeListener != null &&
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
+                if (mDragging) {
+                    stopDragging();
+                } else {
+                    if (dragThread != null && mClickListener != null) {
+                        dragThread.interrupt();
+                        dragThread = null;
+                        if (action == MotionEvent.ACTION_UP)
+                            mClickListener.onClick(viewAtPosition());
+                    } else if (mSwipeListener != null &&
                             Math.abs(mTouchCurrentY - mTouchStartY) < MOVEMENT_THRESHOLD) {
-                    int dragPos = pointToPosition((int)mTouchCurrentX, (int)mTouchCurrentY);
-                    if (mTouchCurrentX > mTouchStartX + SWIPE_THRESHOLD)
-                        mSwipeListener.swipeRight(dragPos);
-                    else if (mTouchCurrentX < mTouchStartX - SWIPE_THRESHOLD)
-                        mSwipeListener.swipeLeft(dragPos);
+                        int dragPos = pointToPosition((int) mTouchCurrentX, (int) mTouchCurrentY);
+                        if (mTouchCurrentX > mTouchStartX + SWIPE_THRESHOLD)
+                            mSwipeListener.swipeRight(dragPos);
+                        else if (mTouchCurrentX < mTouchStartX - SWIPE_THRESHOLD)
+                            mSwipeListener.swipeLeft(dragPos);
+                    }
                 }
-            }
 
-            if(dragThread != null) {
-                dragThread.interrupt();
-                dragThread = null;
-            }
+                if (dragThread != null) {
+                    dragThread.interrupt();
+                    dragThread = null;
+                }
 
-            break;
+                break;
 
-        case MotionEvent.ACTION_DOWN:
-            dragThread = new Thread(new DragRunnable(ev));
-            dragThread.start();
-            stopDragging();
+            case MotionEvent.ACTION_DOWN:
+                dragThread = new Thread(new DragRunnable(ev));
+                dragThread.start();
+                stopDragging();
 
-            mTouchStartX = ev.getX();
-            mTouchStartY = ev.getY();
+                mTouchStartX = ev.getX();
+                mTouchStartY = ev.getY();
 
-        case MotionEvent.ACTION_MOVE:
-            if(mDragging)
-                dragView(ev);
+            case MotionEvent.ACTION_MOVE:
+                if (mDragging)
+                    dragView(ev);
 
-            // detect scrolling
-            if(dragThread != null && (Math.abs(mTouchCurrentX - mTouchStartX) > MOVEMENT_THRESHOLD ||
-                    Math.abs(mTouchCurrentY - mTouchStartY) > MOVEMENT_THRESHOLD)) {
-                dragThread.interrupt();
-                dragThread = null;
-            }
+                // detect scrolling
+                if (dragThread != null && (Math.abs(mTouchCurrentX - mTouchStartX) > MOVEMENT_THRESHOLD ||
+                        Math.abs(mTouchCurrentY - mTouchStartY) > MOVEMENT_THRESHOLD)) {
+                    dragThread.interrupt();
+                    dragThread = null;
+                }
 
-            break;
+                break;
         }
 
-        if(mDragging)
+        if (mDragging)
             return true;
 
         return super.onTouchEvent(ev);
@@ -355,7 +353,9 @@ public class DraggableListView extends ListView {
                 // bye!
             }
         }
-    };
+    }
+
+    ;
 
     /**
      * @return true if drag was initiated
@@ -370,11 +370,11 @@ public class DraggableListView extends ListView {
 
         View item = (View) getChildAt(itemNum - getFirstVisiblePosition());
 
-        if(!isDraggableRow(item))
+        if (!isDraggableRow(item))
             return false;
 
         mDragPoint = new Point(x - item.getLeft(), y - item.getTop());
-        mCoordOffset = new Point((int)ev.getRawX() - x, (int)ev.getRawY() - y);
+        mCoordOffset = new Point((int) ev.getRawX() - x, (int) ev.getRawY() - y);
 
         item.setDrawingCacheEnabled(true);
 
@@ -496,15 +496,15 @@ public class DraggableListView extends ListView {
             mDragView = null;
         }
 
-        if(mDragging) {
+        if (mDragging) {
             if (mSwipeListener != null && mDragPos == mFirstDragPos) {
                 if (mTouchCurrentX > mTouchStartX + SWIPE_THRESHOLD)
                     mSwipeListener.swipeRight(mFirstDragPos);
                 else if (mTouchCurrentX < mTouchStartX - SWIPE_THRESHOLD)
                     mSwipeListener.swipeLeft(mFirstDragPos);
-            } else if(mDropListener != null && mDragPos != mFirstDragPos &&
+            } else if (mDropListener != null && mDragPos != mFirstDragPos &&
                     mDragPos >= 0 && mDragPos < getCount()) {
-                if(mFirstDragPos < mDragPos)
+                if (mFirstDragPos < mDragPos)
                     mDragPos++;
                 mDropListener.drop(mFirstDragPos, mDragPos);
             }
diff --git a/astrid/src/com/todoroo/astrid/ui/EditDialogOkBackground.java b/astrid/src/com/todoroo/astrid/ui/EditDialogOkBackground.java
index 695eecebe..b6ebcabbf 100644
--- a/astrid/src/com/todoroo/astrid/ui/EditDialogOkBackground.java
+++ b/astrid/src/com/todoroo/astrid/ui/EditDialogOkBackground.java
@@ -41,8 +41,8 @@ public class EditDialogOkBackground {
         ColorDrawable color = new ColorDrawable(colorValue);
 
         StateListDrawable stld = new StateListDrawable();
-        stld.addState(new int[] { android.R.attr.state_pressed }, color);
-        stld.addState(new int[] { android.R.attr.state_enabled }, d);
+        stld.addState(new int[]{android.R.attr.state_pressed}, color);
+        stld.addState(new int[]{android.R.attr.state_enabled}, d);
         return stld;
     }
 
diff --git a/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java b/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java
index 7da262fce..0a66bd74d 100644
--- a/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java
@@ -53,7 +53,7 @@ public class EditNotesControlSet extends PopupControlSet {
     }
 
     private void linkifyDisplayView() {
-        if(!TextUtils.isEmpty(notesPreview.getText())) {
+        if (!TextUtils.isEmpty(notesPreview.getText())) {
             notesPreview.setLinkTextColor(Color.rgb(100, 160, 255));
             Linkify.addLinks(notesPreview, Linkify.ALL);
         }
@@ -69,8 +69,8 @@ public class EditNotesControlSet extends PopupControlSet {
     protected void additionalDialogSetup() {
         super.additionalDialogSetup();
         dialog.getWindow()
-            .setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
-                    | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+                .setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE
+                        | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
     }
 
     @Override
@@ -88,7 +88,7 @@ public class EditNotesControlSet extends PopupControlSet {
 
     @Override
     protected boolean onOkClick() {
-        InputMethodManager imm = (InputMethodManager)activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+        InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
         imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
         return super.onOkClick();
     }
@@ -96,7 +96,7 @@ public class EditNotesControlSet extends PopupControlSet {
     @Override
     protected void onCancelClick() {
         super.onCancelClick();
-        InputMethodManager imm = (InputMethodManager)activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+        InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
         imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
     }
 
diff --git a/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java b/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java
index 28d0034f6..9949a9775 100644
--- a/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java
@@ -29,8 +29,8 @@ import com.todoroo.astrid.ui.ImportanceControlSet.ImportanceChangedListener;
 
 /**
  * Control set for mapping a Property to an EditText
- * @author Tim Su <tim@todoroo.com>
  *
+ * @author Tim Su <tim@todoroo.com>
  */
 public class EditTitleControlSet extends TaskEditControlSet implements ImportanceChangedListener, RepeatChangedListener {
     private EditText editText;
@@ -117,11 +117,11 @@ public class EditTitleControlSet extends TaskEditControlSet implements Importanc
     private void updateCompleteBox() {
         boolean checked = completeBox.isChecked();
         int[] resourceArray = isRepeating ? (checked ? TaskAdapter.IMPORTANCE_REPEAT_RESOURCES_CHECKED : TaskAdapter.IMPORTANCE_REPEAT_RESOURCES)
-                                          : (checked ? TaskAdapter.IMPORTANCE_RESOURCES_CHECKED : TaskAdapter.IMPORTANCE_RESOURCES);
+                : (checked ? TaskAdapter.IMPORTANCE_RESOURCES_CHECKED : TaskAdapter.IMPORTANCE_RESOURCES);
         int valueToUse = importanceValue;
         if (valueToUse >= resourceArray.length)
             valueToUse = resourceArray.length - 1;
-        if(valueToUse < resourceArray.length) {
+        if (valueToUse < resourceArray.length) {
             if (isRepeating) {
                 completeBox.setImageResource(resourceArray[valueToUse]);
             } else {
diff --git a/astrid/src/com/todoroo/astrid/ui/ErrorCatchingEditText.java b/astrid/src/com/todoroo/astrid/ui/ErrorCatchingEditText.java
index a28300839..2fc281dec 100644
--- a/astrid/src/com/todoroo/astrid/ui/ErrorCatchingEditText.java
+++ b/astrid/src/com/todoroo/astrid/ui/ErrorCatchingEditText.java
@@ -12,7 +12,7 @@ import android.widget.EditText;
 public class ErrorCatchingEditText extends EditText {
 
     public ErrorCatchingEditText(Context context, AttributeSet attrs,
-            int defStyle) {
+                                 int defStyle) {
         super(context, attrs, defStyle);
 
     }
@@ -27,22 +27,22 @@ public class ErrorCatchingEditText extends EditText {
 
     }
 
-	@Override
-	public int getExtendedPaddingTop() {
-	    try {
+    @Override
+    public int getExtendedPaddingTop() {
+        try {
             return super.getExtendedPaddingTop();
         } catch (Exception e) {
             return 0;
         }
-	}
+    }
 
-	@Override
-	public int getExtendedPaddingBottom() {
-	    try {
+    @Override
+    public int getExtendedPaddingBottom() {
+        try {
             return super.getExtendedPaddingBottom();
         } catch (Exception e) {
             return 0;
         }
-	}
+    }
 
 }
diff --git a/astrid/src/com/todoroo/astrid/ui/FeedbackPromptDialogs.java b/astrid/src/com/todoroo/astrid/ui/FeedbackPromptDialogs.java
index b1b3c1a16..c11c84e77 100644
--- a/astrid/src/com/todoroo/astrid/ui/FeedbackPromptDialogs.java
+++ b/astrid/src/com/todoroo/astrid/ui/FeedbackPromptDialogs.java
@@ -21,27 +21,28 @@ public class FeedbackPromptDialogs {
         final String url = positive ? "https://play.google.com/store/apps/details?id=com.timsu.astrid&write_review=true" : "http://weloveastrid.com/problem_astrid_android.html";
 
         d.setAstridTitle(titleRes)
-        .setAstridText(bodyRes)
-        .setButtonText(buttonRes, 0)
-        .setButtonText(R.string.feedback_not_now, 1)
-        .setButtonListeners(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(Intent.ACTION_VIEW,
-                        Uri.parse(url));
-                try {
-                    activity.startActivity(intent);
-                } catch (Exception e) {
-                    Toast.makeText(activity, R.string.feedback_activity_error, Toast.LENGTH_LONG).show();
-                }
-                d.dismiss();
-            }
-        }, new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                d.dismiss();
-            }
-        });
+                .setAstridText(bodyRes)
+                .setButtonText(buttonRes, 0)
+                .setButtonText(R.string.feedback_not_now, 1)
+                .setButtonListeners(new View.OnClickListener() {
+                                        @Override
+                                        public void onClick(View v) {
+                                            Intent intent = new Intent(Intent.ACTION_VIEW,
+                                                    Uri.parse(url));
+                                            try {
+                                                activity.startActivity(intent);
+                                            } catch (Exception e) {
+                                                Toast.makeText(activity, R.string.feedback_activity_error, Toast.LENGTH_LONG).show();
+                                            }
+                                            d.dismiss();
+                                        }
+                                    }, new View.OnClickListener() {
+                                        @Override
+                                        public void onClick(View v) {
+                                            d.dismiss();
+                                        }
+                                    }
+                );
 
         d.show();
     }
diff --git a/astrid/src/com/todoroo/astrid/ui/FragmentPopover.java b/astrid/src/com/todoroo/astrid/ui/FragmentPopover.java
index fcdee5f5a..d7183356b 100644
--- a/astrid/src/com/todoroo/astrid/ui/FragmentPopover.java
+++ b/astrid/src/com/todoroo/astrid/ui/FragmentPopover.java
@@ -5,11 +5,6 @@
  */
 package com.todoroo.astrid.ui;
 
-import greendroid.widget.QuickAction;
-import greendroid.widget.QuickActionWidget;
-
-import java.util.List;
-
 import android.content.Context;
 import android.graphics.Rect;
 import android.util.DisplayMetrics;
@@ -21,6 +16,11 @@ import android.widget.FrameLayout;
 
 import com.timsu.astrid.R;
 
+import java.util.List;
+
+import greendroid.widget.QuickAction;
+import greendroid.widget.QuickActionWidget;
+
 
 public class FragmentPopover extends QuickActionWidget {
 
diff --git a/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java b/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java
index 69aa020dd..6c966a020 100644
--- a/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.ui;
 
-import java.util.Date;
-
 import android.app.Activity;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -25,11 +23,12 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.ui.DateAndTimeDialog.DateAndTimeDialogListener;
 
+import java.util.Date;
+
 /**
  * Control set for specifying when a task should be hidden
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class HideUntilControlSet extends PopupControlSet implements OnItemSelectedListener {
 
@@ -57,7 +56,6 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
      * Container class for urgencies
      *
      * @author Tim Su <tim@todoroo.com>
-     *
      */
     private class HideUntilValue {
         public String label;
@@ -91,12 +89,12 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
         values[4] = new HideUntilValue(labels[4], Task.HIDE_UNTIL_WEEK_BEFORE);
         values[5] = new HideUntilValue(labels[5], Task.HIDE_UNTIL_SPECIFIC_DAY, -1);
 
-        if(specificDate > 0) {
+        if (specificDate > 0) {
             HideUntilValue[] updated = new HideUntilValue[values.length + 1];
-            for(int i = 0; i < values.length; i++)
-                updated[i+1] = values[i];
+            for (int i = 0; i < values.length; i++)
+                updated[i + 1] = values[i];
             Date hideUntilAsDate = new Date(specificDate);
-            if(hideUntilAsDate.getHours() == 0 && hideUntilAsDate.getMinutes() == 0 && hideUntilAsDate.getSeconds() == 0) {
+            if (hideUntilAsDate.getHours() == 0 && hideUntilAsDate.getMinutes() == 0 && hideUntilAsDate.getSeconds() == 0) {
                 updated[0] = new HideUntilValue(DateUtilities.getDateString(activity, new Date(specificDate)),
                         Task.HIDE_UNTIL_SPECIFIC_DAY, specificDate);
                 existingDate = specificDate;
@@ -118,7 +116,7 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
         // if specific date selected, show dialog
         // ... at conclusion of dialog, update our list
         HideUntilValue item = adapter.getItem(position);
-        if(item.date == SPECIFIC_DATE) {
+        if (item.date == SPECIFIC_DATE) {
             customDate = new Date(existingDate == EXISTING_TIME_UNSET ? DateUtilities.now() : existingDate);
             customDate.setSeconds(0);
 
@@ -226,28 +224,28 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
     public void readFromTask(Task task) {
         long date = task.getValue(Task.HIDE_UNTIL);
 
-        Date dueDay = new Date(task.getValue(Task.DUE_DATE)/1000L*1000L);
+        Date dueDay = new Date(task.getValue(Task.DUE_DATE) / 1000L * 1000L);
 
         dueDay.setHours(0);
         dueDay.setMinutes(0);
         dueDay.setSeconds(0);
 
         // For the hide until due case, we need the time component
-        long dueTime = task.getValue(Task.DUE_DATE)/1000L*1000L;
+        long dueTime = task.getValue(Task.DUE_DATE) / 1000L * 1000L;
 
-        if(date == 0) {
+        if (date == 0) {
             selection = 0;
             date = 0;
-        } else if(date == dueDay.getTime()) {
+        } else if (date == dueDay.getTime()) {
             selection = 1;
             date = 0;
-        } else if (date == dueTime){
+        } else if (date == dueTime) {
             selection = 2;
             date = 0;
-        } else if(date + DateUtilities.ONE_DAY == dueDay.getTime()) {
+        } else if (date + DateUtilities.ONE_DAY == dueDay.getTime()) {
             selection = 3;
             date = 0;
-        } else if(date + DateUtilities.ONE_WEEK == dueDay.getTime()) {
+        } else if (date + DateUtilities.ONE_WEEK == dueDay.getTime()) {
             selection = 4;
             date = 0;
         }
@@ -270,10 +268,10 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect
 
     @Override
     protected String writeToModelAfterInitialized(Task task) {
-        if(adapter == null || spinner == null)
+        if (adapter == null || spinner == null)
             return null;
         HideUntilValue item = adapter.getItem(spinner.getSelectedItemPosition());
-        if(item == null)
+        if (item == null)
             return null;
         long value = task.createHideUntil(item.setting, item.date);
         task.setValue(Task.HIDE_UNTIL, value);
diff --git a/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java b/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java
index 6f9174354..425919921 100644
--- a/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.ui;
 
-import java.util.LinkedList;
-import java.util.List;
-
 import android.app.Activity;
 import android.util.DisplayMetrics;
 import android.view.View;
@@ -21,11 +18,13 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.helper.TaskEditControlSet;
 import com.todoroo.astrid.service.ThemeService;
 
+import java.util.LinkedList;
+import java.util.List;
+
 /**
  * Control Set for setting task importance
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class ImportanceControlSet extends TaskEditControlSet {
     private final List<CompoundButton> buttons = new LinkedList<CompoundButton>();
@@ -44,8 +43,8 @@ public class ImportanceControlSet extends TaskEditControlSet {
     }
 
     public void setImportance(Integer i) {
-        for(CompoundButton b : buttons) {
-            if(b.getTag() == i) {
+        for (CompoundButton b : buttons) {
+            if (b.getTag() == i) {
                 b.setChecked(true);
                 b.setBackgroundResource(ThemeService.getDarkVsLight(R.drawable.importance_background_selected, R.drawable.importance_background_selected_dark, false));
             } else {
@@ -60,8 +59,8 @@ public class ImportanceControlSet extends TaskEditControlSet {
     }
 
     public Integer getImportance() {
-        for(CompoundButton b : buttons)
-            if(b.isChecked())
+        for (CompoundButton b : buttons)
+            if (b.isChecked())
                 return (Integer) b.getTag();
         return null;
     }
@@ -85,7 +84,7 @@ public class ImportanceControlSet extends TaskEditControlSet {
         DisplayMetrics metrics = new DisplayMetrics();
         activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
 
-        for(int i = max; i >= min; i--) {
+        for (int i = max; i >= min; i--) {
             final ToggleButton button = new ToggleButton(activity);
             LinearLayout.LayoutParams params;
 
@@ -96,7 +95,7 @@ public class ImportanceControlSet extends TaskEditControlSet {
             StringBuilder label = new StringBuilder();
             if (i == max)
                 label.append('\u25CB');
-            for(int j = Task.IMPORTANCE_LEAST - 1; j >= i; j--)
+            for (int j = Task.IMPORTANCE_LEAST - 1; j >= i; j--)
                 label.append('!');
 
             button.setTextColor(colors[i]);
@@ -106,7 +105,7 @@ public class ImportanceControlSet extends TaskEditControlSet {
 
             button.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View v) {
-                    setImportance((Integer)button.getTag());
+                    setImportance((Integer) button.getTag());
                 }
             });
             button.setTag(i);
@@ -138,7 +137,7 @@ public class ImportanceControlSet extends TaskEditControlSet {
 
     @Override
     protected String writeToModelAfterInitialized(Task task) {
-        if(getImportance() != null)
+        if (getImportance() != null)
             task.setValue(Task.IMPORTANCE, getImportance());
         return null;
     }
diff --git a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
index 3407400cd..2821a738e 100644
--- a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
+++ b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
@@ -36,6 +36,7 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi
 
     public interface MainMenuListener {
         public boolean shouldAddMenuItem(int itemId);
+
         public void mainMenuItemSelected(int item, Intent customIntent);
     }
 
diff --git a/astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java b/astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java
index 79fe304cb..3371e4d9c 100644
--- a/astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java
+++ b/astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.ui;
 
-import java.util.LinkedList;
-import java.util.List;
-
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -21,31 +18,37 @@ import android.widget.TextView;
 
 import com.timsu.astrid.R;
 
-/** Dialog box with an arbitrary number of number pickers */
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Dialog box with an arbitrary number of number pickers
+ */
 public class NNumberPickerDialog extends AlertDialog implements OnClickListener {
 
     public interface OnNNumberPickedListener {
         void onNumbersPicked(int[] number);
     }
 
-    private final List<NumberPicker>      pickers = new LinkedList<NumberPicker>();
+    private final List<NumberPicker> pickers = new LinkedList<NumberPicker>();
     private final OnNNumberPickedListener mCallback;
 
-    /** Instantiate the dialog box.
+    /**
+     * Instantiate the dialog box.
      *
      * @param context
-     * @param callBack callback function to get the numbers you requested
-     * @param title title of the dialog box
+     * @param callBack     callback function to get the numbers you requested
+     * @param title        title of the dialog box
      * @param initialValue initial picker values array
-     * @param incrementBy picker increment by array
-     * @param start picker range start array
-     * @param end picker range end array
-     * @param separators text separating the spinners. whole array, or individual
-     *        elements can be null
+     * @param incrementBy  picker increment by array
+     * @param start        picker range start array
+     * @param end          picker range end array
+     * @param separators   text separating the spinners. whole array, or individual
+     *                     elements can be null
      */
     public NNumberPickerDialog(Context context, OnNNumberPickedListener callBack,
-            String title, int[] initialValue, int[] incrementBy, int[] start,
-            int[] end, String[] separators) {
+                               String title, int[] initialValue, int[] incrementBy, int[] start,
+                               int[] end, String[] separators) {
         super(context);
         mCallback = callBack;
 
@@ -56,7 +59,7 @@ public class NNumberPickerDialog extends AlertDialog implements OnClickListener
                 .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         View view = inflater.inflate(R.layout.n_number_picker_dialog, null);
         setView(view);
-        LinearLayout container = (LinearLayout)view;
+        LinearLayout container = (LinearLayout) view;
 
         setTitle(title);
         LayoutParams npLayout = new LayoutParams(LayoutParams.WRAP_CONTENT,
@@ -64,7 +67,7 @@ public class NNumberPickerDialog extends AlertDialog implements OnClickListener
         npLayout.gravity = 1;
         LayoutParams sepLayout = new LayoutParams(LayoutParams.WRAP_CONTENT,
                 LayoutParams.FILL_PARENT);
-        for(int i = 0; i < incrementBy.length; i++) {
+        for (int i = 0; i < incrementBy.length; i++) {
             NumberPicker np = new NumberPicker(context, null);
             np.setIncrementBy(incrementBy[i]);
             np.setLayoutParams(npLayout);
@@ -74,10 +77,10 @@ public class NNumberPickerDialog extends AlertDialog implements OnClickListener
             container.addView(np);
             pickers.add(np);
 
-            if(separators != null && separators[i] != null) {
+            if (separators != null && separators[i] != null) {
                 TextView text = new TextView(context);
                 text.setText(separators[i]);
-                if(separators[i].length() < 3)
+                if (separators[i].length() < 3)
                     text.setTextSize(48);
                 else
                     text.setTextSize(20);
@@ -93,14 +96,14 @@ public class NNumberPickerDialog extends AlertDialog implements OnClickListener
     }
 
     public void setInitialValues(int[] values) {
-        for(int i = 0; i < pickers.size(); i++)
+        for (int i = 0; i < pickers.size(); i++)
             pickers.get(i).setCurrent(values[i]);
     }
 
     public void onClick(DialogInterface dialog, int which) {
         if (mCallback != null) {
             int[] values = new int[pickers.size()];
-            for(int i = 0; i < pickers.size(); i++) {
+            for (int i = 0; i < pickers.size(); i++) {
                 pickers.get(i).clearFocus();
                 values[i] = pickers.get(i).getCurrent();
             }
diff --git a/astrid/src/com/todoroo/astrid/ui/NestableViewPager.java b/astrid/src/com/todoroo/astrid/ui/NestableViewPager.java
index 5fef6d28b..b2820c5fd 100644
--- a/astrid/src/com/todoroo/astrid/ui/NestableViewPager.java
+++ b/astrid/src/com/todoroo/astrid/ui/NestableViewPager.java
@@ -19,9 +19,9 @@ public class NestableViewPager extends ViewPager {
     /**
      * Prevent horizontal scrolling
      */
-     @Override
+    @Override
     public boolean onInterceptTouchEvent(MotionEvent event) {
-         return false;
+        return false;
     }
 
 }
diff --git a/astrid/src/com/todoroo/astrid/ui/NestedListView.java b/astrid/src/com/todoroo/astrid/ui/NestedListView.java
index 8ffdc75c3..d0af8ab13 100644
--- a/astrid/src/com/todoroo/astrid/ui/NestedListView.java
+++ b/astrid/src/com/todoroo/astrid/ui/NestedListView.java
@@ -10,7 +10,7 @@ import android.view.View;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 
-public class NestedListView extends ListView  {
+public class NestedListView extends ListView {
     private static final int MAXIMUM_LIST_ITEMS_VIEWABLE = 2;
 
 
diff --git a/astrid/src/com/todoroo/astrid/ui/NumberPicker.java b/astrid/src/com/todoroo/astrid/ui/NumberPicker.java
index 374ff6b98..7b82b257f 100644
--- a/astrid/src/com/todoroo/astrid/ui/NumberPicker.java
+++ b/astrid/src/com/todoroo/astrid/ui/NumberPicker.java
@@ -26,12 +26,14 @@ import android.widget.TextView;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 
-@SuppressWarnings({"nls","unused"})
+@SuppressWarnings({"nls", "unused"})
 public class NumberPicker extends LinearLayout implements OnClickListener,
         OnFocusChangeListener, OnLongClickListener {
 
     public interface OnChangedListener {
-        /** return new value */
+        /**
+         * return new value
+         */
         int onChanged(NumberPicker picker, int oldVal, int newVal);
     }
 
@@ -46,9 +48,9 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
      * format().
      */
     public static final NumberPicker.Formatter TWO_DIGIT_FORMATTER = new NumberPicker.Formatter() {
-        final StringBuilder       mBuilder = new StringBuilder();
-        final java.util.Formatter mFmt     = new java.util.Formatter(mBuilder);
-        final Object[]            mArgs    = new Object[1];
+        final StringBuilder mBuilder = new StringBuilder();
+        final java.util.Formatter mFmt = new java.util.Formatter(mBuilder);
+        final Object[] mArgs = new Object[1];
 
         public String toString(int value) {
             mArgs[0] = value;
@@ -59,11 +61,12 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
     };
 
     private int incrementBy = 1;
+
     public void setIncrementBy(int incrementBy) {
         this.incrementBy = incrementBy;
     }
 
-    private final Handler  mHandler;
+    private final Handler mHandler;
     private final Runnable mRunnable = new Runnable() {
         public void run() {
             if (mIncrement) {
@@ -76,27 +79,27 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
         }
     };
 
-    private final LayoutInflater               mInflater;
-    private final EditText                     mText;
-    private final InputFilter                  mInputFilter;
-    private final InputFilter                  mNumberInputFilter;
+    private final LayoutInflater mInflater;
+    private final EditText mText;
+    private final InputFilter mInputFilter;
+    private final InputFilter mNumberInputFilter;
 
-    private final Animation                    mSlideUpOutAnimation;
-    private final Animation                    mSlideUpInAnimation;
-    private final Animation                    mSlideDownOutAnimation;
-    private final Animation                    mSlideDownInAnimation;
+    private final Animation mSlideUpOutAnimation;
+    private final Animation mSlideUpInAnimation;
+    private final Animation mSlideDownOutAnimation;
+    private final Animation mSlideDownInAnimation;
 
-    private String[]                           mDisplayedValues;
-    private int                                mStart;
-    private int                                mEnd;
-    private int                                mCurrent;
-    private int                                mPrevious;
-    private OnChangedListener                  mListener;
-    private Formatter                          mFormatter;
-    private long                               mSpeed              = 60;
+    private String[] mDisplayedValues;
+    private int mStart;
+    private int mEnd;
+    private int mCurrent;
+    private int mPrevious;
+    private OnChangedListener mListener;
+    private Formatter mFormatter;
+    private long mSpeed = 60;
 
-    private boolean                            mIncrement;
-    private boolean                            mDecrement;
+    private boolean mIncrement;
+    private boolean mDecrement;
 
     public NumberPicker(Context context) {
         this(context, null);
@@ -137,7 +140,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
 
         mText = (EditText) findViewById(R.id.timepicker_input);
         mText.setOnFocusChangeListener(this);
-        mText.setFilters(new InputFilter[] { mInputFilter });
+        mText.setFilters(new InputFilter[]{mInputFilter});
 
         // disable keyboard until user requests it
         AndroidUtilities.suppressVirtualKeyboard(mText);
@@ -185,10 +188,8 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
      * Set the range of numbers allowed for the number picker. The current value
      * will be automatically set to the start.
      *
-     * @param start
-     *            the start of the range (inclusive)
-     * @param end
-     *            the end of the range (inclusive)
+     * @param start the start of the range (inclusive)
+     * @param end   the end of the range (inclusive)
      */
     public void setRange(int start, int end) {
         mStart = start;
@@ -202,12 +203,9 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
      * will be automatically set to the start. Also provide a mapping for values
      * used to display to the user.
      *
-     * @param start
-     *            the start of the range (inclusive)
-     * @param end
-     *            the end of the range (inclusive)
-     * @param displayedValues
-     *            the values displayed to the user.
+     * @param start           the start of the range (inclusive)
+     * @param end             the end of the range (inclusive)
+     * @param displayedValues the values displayed to the user.
      */
     public void setRange(int start, int end, String[] displayedValues) {
         mDisplayedValues = displayedValues;
@@ -257,7 +255,8 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
         current = notifyChange(current);
 
         // Wrap around the values if we go past the start or end
-        if (current > mEnd) {;
+        if (current > mEnd) {
+            ;
             current = mStart + (current - mEnd) - 1;
         } else if (current < mStart) {
             current = mEnd - (mStart - current) + 1;
@@ -360,15 +359,15 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
         mDecrement = false;
     }
 
-    private static final char[] DIGIT_CHARACTERS = new char[] { '0', '1', '2',
-        '3', '4', '5', '6', '7', '8', '9'       };
+    private static final char[] DIGIT_CHARACTERS = new char[]{'0', '1', '2',
+            '3', '4', '5', '6', '7', '8', '9'};
 
-    private final NumberPickerButton  mIncrementButton;
-    private final NumberPickerButton  mDecrementButton;
+    private final NumberPickerButton mIncrementButton;
+    private final NumberPickerButton mDecrementButton;
 
     class NumberPickerInputFilter implements InputFilter {
         public CharSequence filter(CharSequence source, int start, int end,
-                Spanned dest, int dstart, int dend) {
+                                   Spanned dest, int dstart, int dend) {
             if (mDisplayedValues == null) {
                 return mNumberInputFilter.filter(source, start, end, dest,
                         dstart, dend);
@@ -376,7 +375,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
             CharSequence filtered = String.valueOf(source.subSequence(start,
                     end));
             String result = String.valueOf(dest.subSequence(0, dstart))
-                + filtered + dest.subSequence(dend, dest.length());
+                    + filtered + dest.subSequence(dend, dest.length());
             String str = String.valueOf(result).toLowerCase();
             for (String val : mDisplayedValues) {
                 val = val.toLowerCase();
@@ -397,7 +396,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
 
         @Override
         public CharSequence filter(CharSequence source, int start, int end,
-                Spanned dest, int dstart, int dend) {
+                                   Spanned dest, int dstart, int dend) {
 
             CharSequence filtered = super.filter(source, start, end, dest,
                     dstart, dend);
@@ -406,7 +405,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
             }
 
             String result = String.valueOf(dest.subSequence(0, dstart))
-                + filtered + dest.subSequence(dend, dest.length());
+                    + filtered + dest.subSequence(dend, dest.length());
 
             if ("".equals(result)) {
                 return result;
@@ -429,9 +428,9 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
             }
         }
 
-		public int getInputType() {
-			return 0;
-		}
+        public int getInputType() {
+            return 0;
+        }
     }
 
     private int getSelectedPos(String str) {
@@ -467,6 +466,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
 
     /**
      * Override the number picker's text
+     *
      * @param text
      */
     public void setText(String text) {
diff --git a/astrid/src/com/todoroo/astrid/ui/NumberPickerButton.java b/astrid/src/com/todoroo/astrid/ui/NumberPickerButton.java
index d32cba4c1..8a8f51812 100644
--- a/astrid/src/com/todoroo/astrid/ui/NumberPickerButton.java
+++ b/astrid/src/com/todoroo/astrid/ui/NumberPickerButton.java
@@ -21,7 +21,7 @@ public class NumberPickerButton extends ImageButton {
     private NumberPicker mNumberPicker;
 
     public NumberPickerButton(Context context, AttributeSet attrs,
-            int defStyle) {
+                              int defStyle) {
         super(context, attrs, defStyle);
     }
 
diff --git a/astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java b/astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java
index 92f523f91..4d2f7be38 100644
--- a/astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java
+++ b/astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java
@@ -20,11 +20,11 @@ public class NumberPickerDialog extends AlertDialog implements OnClickListener {
         void onNumberPicked(NumberPicker view, int number);
     }
 
-    private final NumberPicker           mPicker;
+    private final NumberPicker mPicker;
     private final OnNumberPickedListener mCallback;
 
     public NumberPickerDialog(Context context, OnNumberPickedListener callBack,
-            String title, int initialValue, int incrementBy, int start, int end) {
+                              String title, int initialValue, int incrementBy, int start, int end) {
         super(context);
         mCallback = callBack;
 
diff --git a/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java b/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java
index 6113c220d..25ee531ad 100644
--- a/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java
+++ b/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java
@@ -5,12 +5,6 @@
  */
 package com.todoroo.astrid.ui;
 
-import java.util.HashSet;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
@@ -35,6 +29,12 @@ import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.helper.AsyncImageView;
 import com.todoroo.astrid.utility.ResourceDrawableCache;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashSet;
+
 public class PeopleContainer extends LinearLayout {
 
     private boolean completeTags = false;
@@ -71,44 +71,46 @@ public class PeopleContainer extends LinearLayout {
         return addPerson("", "", false); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
-    /** Adds a tag to the tag field */
+    /**
+     * Adds a tag to the tag field
+     */
     public TextView addPerson(String person, String image, boolean hideRemove) {
         LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
         // check if already exists
-        for(int i = 0; i < getChildCount(); i++) {
+        for (int i = 0; i < getChildCount(); i++) {
             View view = getChildAt(i);
             TextView matching = (TextView) view.findViewById(R.id.text1);
-            if(matching.getText().equals(person))
+            if (matching.getText().equals(person))
                 return matching;
         }
 
         final View tagItem = inflater.inflate(R.layout.contact_edit_row, null);
-        if(person.length() == 0)
+        if (person.length() == 0)
             addView(tagItem, getChildCount());
         else
             addView(tagItem);
-        final ContactsAutoComplete textView = (ContactsAutoComplete)tagItem.
-            findViewById(R.id.text1);
+        final ContactsAutoComplete textView = (ContactsAutoComplete) tagItem.
+                findViewById(R.id.text1);
         textView.setText(person);
         textView.setHint(R.string.actfm_person_hint);
 
-        if(completeTags) {
+        if (completeTags) {
             textView.setCompleteSharedTags(true);
             textView.setHint(R.string.actfm_person_or_tag_hint);
         }
 
-        final ImageButton removeButton = (ImageButton)tagItem.findViewById(R.id.button1);
+        final ImageButton removeButton = (ImageButton) tagItem.findViewById(R.id.button1);
         if (hideRemove)
             removeButton.setVisibility(View.GONE);
         else
             removeButton.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View v) {
                     TextView lastView = getLastTextView();
-                    if(lastView == textView && textView.getText().length() == 0)
+                    if (lastView == textView && textView.getText().length() == 0)
                         return;
 
-                    if(getChildCount() > 1)
+                    if (getChildCount() > 1)
                         removeView(tagItem);
                     else {
                         textView.setText(""); //$NON-NLS-1$
@@ -117,8 +119,8 @@ public class PeopleContainer extends LinearLayout {
                 }
             });
 
-        final AsyncImageView imageView = (AsyncImageView)tagItem.
-            findViewById(R.id.icon);
+        final AsyncImageView imageView = (AsyncImageView) tagItem.
+                findViewById(R.id.icon);
         imageView.setUrl(image);
         if (TextUtils.isEmpty(textView.getText())) {
             imageView.setDefaultImageDrawable(ResourceDrawableCache.getImageDrawableFromId(resources, R.drawable.icn_add_contact));
@@ -135,28 +137,29 @@ public class PeopleContainer extends LinearLayout {
             public void afterTextChanged(Editable s) {
                 //
             }
+
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count,
-                    int after) {
+                                          int after) {
                 //
             }
+
             @SuppressWarnings("nls")
             @Override
             public void onTextChanged(CharSequence s, int start, int before,
-                    int count) {
-                if(count > 0 && getLastTextView() == textView) {
+                                      int count) {
+                if (count > 0 && getLastTextView() == textView) {
                     addPerson("", "", false);
                 }
                 if (TextUtils.isEmpty(textView.getText())) {
                     imageView.setDefaultImageDrawable(ResourceDrawableCache.getImageDrawableFromId(resources, R.drawable.icn_add_contact));
                     removeButton.setVisibility(View.GONE);
-                }
-                else {
+                } else {
                     imageView.setDefaultImageDrawable(ResourceDrawableCache.getImageDrawableFromId(resources, R.drawable.icn_default_person_image));
                     removeButton.setVisibility(View.VISIBLE);
                 }
 
-                if(onAddNewPerson != null)
+                if (onAddNewPerson != null)
                     onAddNewPerson.textChanged(s.toString());
             }
         });
@@ -165,9 +168,9 @@ public class PeopleContainer extends LinearLayout {
             @SuppressWarnings("nls")
             @Override
             public boolean onEditorAction(TextView arg0, int actionId, KeyEvent arg2) {
-                if(actionId != EditorInfo.IME_NULL)
+                if (actionId != EditorInfo.IME_NULL)
                     return false;
-                if(getLastTextView().getText().length() != 0) {
+                if (getLastTextView().getText().length() != 0) {
                     addPerson("", "", false);
                 }
                 return true;
@@ -179,13 +182,14 @@ public class PeopleContainer extends LinearLayout {
 
     /**
      * Get tags container last text view. might be null
+     *
      * @return
      */
     private TextView getLastTextView() {
-        for(int i = getChildCount() - 1; i >= 0; i--) {
+        for (int i = getChildCount() - 1; i >= 0; i--) {
             View lastItem = getChildAt(i);
             TextView lastText = (TextView) lastItem.findViewById(R.id.text1);
-            if(lastText.isEnabled())
+            if (lastText.isEnabled())
                 return lastText;
         }
         return null;
@@ -197,15 +201,14 @@ public class PeopleContainer extends LinearLayout {
     }
 
     /**
-     *
      * @return json array of people
      */
     public JSONArray toJSONArray() {
         JSONArray people = new JSONArray();
-        for(int i = 0; i < getChildCount(); i++) {
+        for (int i = 0; i < getChildCount(); i++) {
             TextView textView = getTextView(i);
             JSONObject person = PeopleContainer.createUserJson(textView);
-            if(person != null) {
+            if (person != null) {
                 String email = person.optString("email"); //$NON-NLS-1$
                 if (email.indexOf('@') != -1)
                     people.put(person);
@@ -216,20 +219,20 @@ public class PeopleContainer extends LinearLayout {
 
     @SuppressWarnings("nls")
     public JSONObject parseSharedWithAndTags(Activity activity, boolean peopleAsJSON) throws
-    JSONException, ParseSharedException {
+            JSONException, ParseSharedException {
         JSONObject sharedWith = new JSONObject();
 
         HashSet<String> addedEmails = new HashSet<String>();
         HashSet<Long> addedIds = new HashSet<Long>();
         JSONArray peopleList = new JSONArray();
-        for(int i = 0; i < getChildCount(); i++) {
+        for (int i = 0; i < getChildCount(); i++) {
             TextView textView = getTextView(i);
             String text = textView.getText().toString();
 
-            if(text.length() == 0)
+            if (text.length() == 0)
                 continue;
 
-            if(text.indexOf('@') == -1 && textView.isEnabled())
+            if (text.indexOf('@') == -1 && textView.isEnabled())
                 throw new ParseSharedException(textView,
                         activity.getString(R.string.actfm_EPA_invalid_email, text));
             if (peopleAsJSON) {
@@ -254,7 +257,7 @@ public class PeopleContainer extends LinearLayout {
                 peopleList.put(text);
             }
         }
-        if(peopleList.length() > 0)
+        if (peopleList.length() > 0)
             sharedWith.put("p", peopleList);
 
         return sharedWith;
@@ -273,11 +276,12 @@ public class PeopleContainer extends LinearLayout {
 
     /**
      * Add people from JSON Array
+     *
      * @param people
      */
     @SuppressWarnings("nls")
     public void fromJSONArray(JSONArray people) throws JSONException {
-        for(int i = 0; i < people.length(); i++) {
+        for (int i = 0; i < people.length(); i++) {
             JSONObject person = people.getJSONObject(i);
             TextView textView = null;
             String imageURL = person.optString("picture", "");
@@ -285,12 +289,12 @@ public class PeopleContainer extends LinearLayout {
             boolean hideRemove = owner;
             String name = "";
 
-            if(person.has("id") && ActFmPreferenceService.userId().equals(person.getString("id"))) {
+            if (person.has("id") && ActFmPreferenceService.userId().equals(person.getString("id"))) {
                 name = Preferences.getStringValue(ActFmPreferenceService.PREF_NAME);
                 hideRemove = true;
-            } else if(!TextUtils.isEmpty(person.optString("name")) && !"null".equals(person.optString("name"))) {
+            } else if (!TextUtils.isEmpty(person.optString("name")) && !"null".equals(person.optString("name"))) {
                 name = person.getString("name");
-            } else if(!TextUtils.isEmpty(person.optString("email")) && !"null".equals(person.optString("email"))) {
+            } else if (!TextUtils.isEmpty(person.optString("email")) && !"null".equals(person.optString("email"))) {
                 name = person.getString("email");
             }
 
@@ -299,7 +303,7 @@ public class PeopleContainer extends LinearLayout {
 
             textView = addPerson(name, imageURL, hideRemove);
 
-            if(textView != null) {
+            if (textView != null) {
                 textView.setTag(person);
                 textView.setEnabled(false);
             }
@@ -308,22 +312,23 @@ public class PeopleContainer extends LinearLayout {
 
     /**
      * Warning: user json may not have a valid email address.
+     *
      * @param textView
      * @return
      */
     @SuppressWarnings("nls")
     public static JSONObject createUserJson(TextView textView) {
-        if(textView.isEnabled() == false)
+        if (textView.isEnabled() == false)
             return (JSONObject) textView.getTag();
 
         String text = textView.getText().toString().trim();
-        if(text.length() == 0)
+        if (text.length() == 0)
             return null;
 
         JSONObject user = new JSONObject();
         int bracket = text.lastIndexOf('<');
         try {
-            if(bracket > -1) {
+            if (bracket > -1) {
                 user.put("name", text.substring(0, bracket - 1).trim());
                 user.put("email", text.substring(bracket + 1, text.length() - 1).trim());
             } else {
diff --git a/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java b/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java
index f7821612b..9843ba18c 100644
--- a/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java
@@ -60,6 +60,7 @@ public abstract class PopupControlSet extends TaskEditControlSet {
             displayView.setOnClickListener(getDisplayClickListener());
         }
     }
+
     @Override
     public View getDisplayView() {
         return displayView;
diff --git a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
index 3818e2456..22e999678 100644
--- a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
+++ b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.ui;
 
-import java.util.HashSet;
-import java.util.concurrent.atomic.AtomicReference;
-
 import android.app.Activity;
 import android.content.ContentValues;
 import android.content.Context;
@@ -65,11 +62,13 @@ import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.utility.Flags;
 import com.todoroo.astrid.voice.VoiceRecognizer;
 
+import java.util.HashSet;
+import java.util.concurrent.atomic.AtomicReference;
+
 /**
  * Quick Add Bar lets you add tasks.
  *
  * @author Tim Su <tim@astrid.com>
- *
  */
 public class QuickAddBar extends LinearLayout {
 
@@ -87,10 +86,14 @@ public class QuickAddBar extends LinearLayout {
 
     private String currentVoiceFile = null;
 
-    @Autowired AddOnService addOnService;
-    @Autowired ExceptionService exceptionService;
-    @Autowired MetadataService metadataService;
-    @Autowired ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    AddOnService addOnService;
+    @Autowired
+    ExceptionService exceptionService;
+    @Autowired
+    MetadataService metadataService;
+    @Autowired
+    ActFmPreferenceService actFmPreferenceService;
     @Autowired
     private TaskAttachmentDao taskAttachmentDao;
 
@@ -112,7 +115,7 @@ public class QuickAddBar extends LinearLayout {
     }
 
     public void initialize(AstridActivity myActivity, TaskListFragment myFragment,
-            final OnTaskListItemClickedListener mListener) {
+                           final OnTaskListItemClickedListener mListener) {
         activity = myActivity;
         fragment = myFragment;
 
@@ -130,7 +133,7 @@ public class QuickAddBar extends LinearLayout {
              */
             @Override
             public boolean onEditorAction(TextView view, int actionId,
-                    KeyEvent event) {
+                                          KeyEvent event) {
                 if (actionId == EditorInfo.IME_NULL
                         && !TextUtils.isEmpty(quickAddBox.getText().toString().trim())) {
                     quickAddTask(quickAddBox.getText().toString(), true);
@@ -286,7 +289,7 @@ public class QuickAddBar extends LinearLayout {
     @SuppressWarnings("nls")
     public Task quickAddTask(String title, boolean selectNewTask) {
         TagData tagData = fragment.getActiveTagData();
-        if(tagData != null && (!tagData.containsNonNullValue(TagData.NAME) ||
+        if (tagData != null && (!tagData.containsNonNullValue(TagData.NAME) ||
                 tagData.getValue(TagData.NAME).length() == 0)) {
             DialogUtilities.okDialog(activity, activity.getString(R.string.tag_no_title_error), null);
             return null;
@@ -348,7 +351,7 @@ public class QuickAddBar extends LinearLayout {
 
             addToCalendar(task, title);
 
-            if(!TextUtils.isEmpty(title))
+            if (!TextUtils.isEmpty(title))
                 fragment.showTaskEditHelpPopover();
 
             if (activity instanceof TaskListActivity && !assignedToMe)
@@ -406,6 +409,7 @@ public class QuickAddBar extends LinearLayout {
     /**
      * Static method to quickly add tasks without all the control set nonsense.
      * Used from the share link activity.
+     *
      * @param title
      * @return
      */
@@ -473,6 +477,7 @@ public class QuickAddBar extends LinearLayout {
     public VoiceRecognizer getVoiceRecognizer() {
         return voiceRecognizer;
     }
+
     public void startVoiceRecognition() {
         if (VoiceRecognizer.speechRecordingAvailable(activity) && currentVoiceFile == null) {
             currentVoiceFile = Long.toString(DateUtilities.now());
@@ -489,7 +494,6 @@ public class QuickAddBar extends LinearLayout {
     }
 
 
-
     public void hideKeyboard() {
         InputMethodManager imm = (InputMethodManager) activity.getSystemService(
                 Context.INPUT_METHOD_SERVICE);
diff --git a/astrid/src/com/todoroo/astrid/ui/RandomReminderControlSet.java b/astrid/src/com/todoroo/astrid/ui/RandomReminderControlSet.java
index c58cafb27..dacd32f9d 100644
--- a/astrid/src/com/todoroo/astrid/ui/RandomReminderControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/RandomReminderControlSet.java
@@ -24,10 +24,11 @@ import com.todoroo.astrid.service.StatisticsService;
  * Control set dealing with random reminder settings
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class RandomReminderControlSet extends TaskEditControlSet {
-    /** default interval for spinner if date is unselected */
+    /**
+     * default interval for spinner if date is unselected
+     */
     private final long DEFAULT_INTERVAL = DateUtilities.ONE_WEEK * 2;
 
     private final CheckBox settingCheckbox;
@@ -43,8 +44,8 @@ public class RandomReminderControlSet extends TaskEditControlSet {
         periodSpinner.setOnItemSelectedListener(new OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> arg0, View arg1,
-                    int arg2, long arg3) {
-                if(periodSpinnerInitialized)
+                                       int arg2, long arg3) {
+                if (periodSpinnerInitialized)
                     settingCheckbox.setChecked(true);
                 periodSpinnerInitialized = true;
             }
@@ -65,7 +66,7 @@ public class RandomReminderControlSet extends TaskEditControlSet {
         // create hour array
         String[] hourStrings = activity.getResources().getStringArray(R.array.TEA_reminder_random_hours);
         hours = new int[hourStrings.length];
-        for(int i = 0; i < hours.length; i++)
+        for (int i = 0; i < hours.length; i++)
             hours[i] = Integer.parseInt(hourStrings[i]);
     }
 
@@ -79,13 +80,13 @@ public class RandomReminderControlSet extends TaskEditControlSet {
         long time = model.getValue(Task.REMINDER_PERIOD);
 
         boolean enabled = time > 0;
-        if(time <= 0) {
+        if (time <= 0) {
             time = DEFAULT_INTERVAL;
         }
 
         int i;
-        for(i = 0; i < hours.length - 1; i++)
-            if(hours[i] * DateUtilities.ONE_HOUR >= time)
+        for (i = 0; i < hours.length - 1; i++)
+            if (hours[i] * DateUtilities.ONE_HOUR >= time)
                 break;
         periodSpinner.setSelection(i);
         settingCheckbox.setChecked(enabled);
@@ -93,7 +94,7 @@ public class RandomReminderControlSet extends TaskEditControlSet {
 
     @Override
     protected String writeToModelAfterInitialized(Task task) {
-        if(settingCheckbox.isChecked()) {
+        if (settingCheckbox.isChecked()) {
             int hourValue = hours[periodSpinner.getSelectedItemPosition()];
             task.setValue(Task.REMINDER_PERIOD, hourValue * DateUtilities.ONE_HOUR);
             if (task.getSetValues().containsKey(Task.REMINDER_PERIOD.name))
diff --git a/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java b/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java
index ac49e3103..fb9d3471e 100644
--- a/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.ui;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import android.app.Activity;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -25,11 +22,13 @@ import com.todoroo.astrid.alarms.AlarmControlSet;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.ThemeService;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Control set dealing with reminder settings
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class ReminderControlSet extends PopupControlSet {
     private CheckBox during, after;
@@ -64,9 +63,9 @@ public class ReminderControlSet extends PopupControlSet {
         after.setChecked((flags &
                 Task.NOTIFY_AFTER_DEADLINE) > 0);
 
-        if((flags & Task.NOTIFY_MODE_NONSTOP) > 0)
+        if ((flags & Task.NOTIFY_MODE_NONSTOP) > 0)
             mode.setSelection(2);
-        else if((flags & Task.NOTIFY_MODE_FIVE) > 0)
+        else if ((flags & Task.NOTIFY_MODE_FIVE) > 0)
             mode.setSelection(1);
         else
             mode.setSelection(0);
@@ -74,15 +73,15 @@ public class ReminderControlSet extends PopupControlSet {
 
     public int getValue() {
         int value = 0;
-        if(during.isChecked())
+        if (during.isChecked())
             value |= Task.NOTIFY_AT_DEADLINE;
-        if(after.isChecked())
+        if (after.isChecked())
             value |= Task.NOTIFY_AFTER_DEADLINE;
 
         value &= ~(Task.NOTIFY_MODE_FIVE | Task.NOTIFY_MODE_NONSTOP);
-        if(mode.getSelectedItemPosition() == 2)
+        if (mode.getSelectedItemPosition() == 2)
             value |= Task.NOTIFY_MODE_NONSTOP;
-        else if(mode.getSelectedItemPosition() == 1)
+        else if (mode.getSelectedItemPosition() == 1)
             value |= Task.NOTIFY_MODE_FIVE;
 
         return value;
@@ -112,7 +111,7 @@ public class ReminderControlSet extends PopupControlSet {
             addViewToBody(extraViews.remove(0));
         }
 
-        String[] list = new String[] {
+        String[] list = new String[]{
                 activity.getString(R.string.TEA_reminder_mode_once),
                 activity.getString(R.string.TEA_reminder_mode_five),
                 activity.getString(R.string.TEA_reminder_mode_nonstop),
@@ -124,7 +123,7 @@ public class ReminderControlSet extends PopupControlSet {
 
             @Override
             public void onItemSelected(AdapterView<?> parent, View view,
-                    int position, long id) {
+                                       int position, long id) {
                 modeDisplay.setText(adapter.getItem(position));
             }
 
diff --git a/astrid/src/com/todoroo/astrid/ui/TaskListFragmentPager.java b/astrid/src/com/todoroo/astrid/ui/TaskListFragmentPager.java
index e4f95d426..d194da2a5 100644
--- a/astrid/src/com/todoroo/astrid/ui/TaskListFragmentPager.java
+++ b/astrid/src/com/todoroo/astrid/ui/TaskListFragmentPager.java
@@ -52,6 +52,7 @@ public class TaskListFragmentPager extends ViewPager {
 
     /**
      * Show the supplied filter, adding it to the data source if it doesn't exist
+     *
      * @param f
      */
     public void showFilter(Filter f) {
@@ -61,6 +62,7 @@ public class TaskListFragmentPager extends ViewPager {
 
     /**
      * Show the filter at the supplied index, with animation
+     *
      * @param index
      */
     public void showFilter(int index) {
@@ -69,6 +71,7 @@ public class TaskListFragmentPager extends ViewPager {
 
     /**
      * Returns the currently showing fragment
+     *
      * @return
      */
     public TaskListFragment getCurrentFragment() {
diff --git a/astrid/src/com/todoroo/astrid/ui/TextViewWithMeasureListener.java b/astrid/src/com/todoroo/astrid/ui/TextViewWithMeasureListener.java
index bcc79387c..72e6f56e7 100644
--- a/astrid/src/com/todoroo/astrid/ui/TextViewWithMeasureListener.java
+++ b/astrid/src/com/todoroo/astrid/ui/TextViewWithMeasureListener.java
@@ -23,7 +23,7 @@ public class TextViewWithMeasureListener extends TextView {
     }
 
     @Override
-    protected void onMeasure (int widthMeasureSpec, int heightMeasureSpec) {
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
         if (listener != null) {
             listener.onTextSizeChanged();
diff --git a/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java b/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java
index 470cc04f9..db7f41697 100644
--- a/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java
@@ -32,7 +32,7 @@ public class TimeDurationControlSet implements OnNNumberPickedListener,
     private final IntegerProperty property;
 
     public TimeDurationControlSet(Activity activity, View view, IntegerProperty property,
-            int timeButtonId, int prefixResource, int titleResource) {
+                                  int timeButtonId, int prefixResource, int titleResource) {
         DependencyInjectionService.getInstance().inject(this);
 
         this.activity = activity;
@@ -40,7 +40,7 @@ public class TimeDurationControlSet implements OnNNumberPickedListener,
         this.titleResource = titleResource;
         this.property = property;
 
-        timeButton = (TextView)view.findViewById(timeButtonId);
+        timeButton = (TextView) view.findViewById(timeButtonId);
         ((View) timeButton.getParent()).setOnClickListener(this);
     }
 
@@ -53,13 +53,13 @@ public class TimeDurationControlSet implements OnNNumberPickedListener,
     }
 
     public void setTimeDuration(Integer timeDurationInSeconds) {
-        if(timeDurationInSeconds == null)
+        if (timeDurationInSeconds == null)
             timeDurationInSeconds = 0;
 
         timeDuration = timeDurationInSeconds;
 
         Resources r = activity.getResources();
-        if(timeDurationInSeconds == 0) {
+        if (timeDurationInSeconds == 0) {
             timeButton.setText(r.getString(R.string.WID_dateButtonUnset));
             return;
         }
@@ -70,24 +70,28 @@ public class TimeDurationControlSet implements OnNNumberPickedListener,
         timeButton.setText(prefix + DateUtils.formatElapsedTime(timeDuration));
         int hours = timeDuration / 3600;
         int minutes = timeDuration / 60 - 60 * hours;
-        initialValues = new int[] { hours, minutes };
+        initialValues = new int[]{hours, minutes};
 
         if (model != null)
             model.setValue(property, timeDuration);
     }
 
-    /** Called when NumberPicker activity is completed */
+    /**
+     * Called when NumberPicker activity is completed
+     */
     public void onNumbersPicked(int[] values) {
         setTimeDuration(values[0] * 3600 + values[1] * 60);
     }
 
-    /** Called when time button is clicked */
+    /**
+     * Called when time button is clicked
+     */
     public void onClick(View v) {
-        if(dialog == null) {
+        if (dialog == null) {
             dialog = new NNumberPickerDialog(activity, this,
                     activity.getResources().getString(titleResource),
-                    new int[] {0, 0}, new int[] {1, 5}, new int[] {0, 0},
-                    new int[] {999, 59}, new String[] {":", null});
+                    new int[]{0, 0}, new int[]{1, 5}, new int[]{0, 0},
+                    new int[]{999, 59}, new String[]{":", null});
             final NumberPicker hourPicker = dialog.getPicker(0);
             final NumberPicker minutePicker = dialog.getPicker(1);
             minutePicker.setFormatter(new NumberPicker.Formatter() {
@@ -99,12 +103,12 @@ public class TimeDurationControlSet implements OnNNumberPickedListener,
             minutePicker.setOnChangeListener(new NumberPicker.OnChangedListener() {
                 @Override
                 public int onChanged(NumberPicker picker, int oldVal, int newVal) {
-                    if(newVal < 0) {
-                        if(hourPicker.getCurrent() == 0)
+                    if (newVal < 0) {
+                        if (hourPicker.getCurrent() == 0)
                             return 0;
                         hourPicker.setCurrent(hourPicker.getCurrent() - 1);
                         return 60 + newVal;
-                    } else if(newVal > 59) {
+                    } else if (newVal > 59) {
                         hourPicker.setCurrent(hourPicker.getCurrent() + 1);
                         return newVal % 60;
                     }
@@ -113,7 +117,7 @@ public class TimeDurationControlSet implements OnNNumberPickedListener,
             });
         }
 
-        if(initialValues != null)
+        if (initialValues != null)
             dialog.setInitialValues(initialValues);
 
         dialog.show();
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridPreferenceSpec.java
index 253535fb0..f8e27eaa7 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridPreferenceSpec.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridPreferenceSpec.java
@@ -8,6 +8,7 @@ import com.todoroo.andlib.utility.Preferences;
 
 public abstract class AstridPreferenceSpec {
     public abstract void setIfUnset();
+
     public abstract void resetDefaults();
 
     protected static void setPreference(SharedPreferences prefs, Editor editor, Resources r, int key, int value, boolean ifUnset) {
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
index c8a33541c..145f6f918 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
@@ -41,7 +41,9 @@ public class AstridPreferences {
 
     public static final String P_SUBTASKS_HELP = "sthelp"; //$NON-NLS-1$
 
-    /** Set preference defaults, if unset. called at startup */
+    /**
+     * Set preference defaults, if unset. called at startup
+     */
     public static void setPreferenceDefaults() {
         AstridPreferenceSpec spec;
         if (Constants.ASTRID_LITE)
@@ -69,6 +71,7 @@ public class AstridPreferences {
 
     /**
      * Reset preferences based on archived AB tests
+     *
      * @param fromVersion
      */
     public static void resetPreferencesFromAbTests(long fromVersion) {
@@ -98,7 +101,9 @@ public class AstridPreferences {
      * ========================================================= public prefs
      * ====================================================================== */
 
-    /** Get publicly readable preferences */
+    /**
+     * Get publicly readable preferences
+     */
     public static SharedPreferences getPublicPrefs(Context context) {
         context = context.getApplicationContext();
         return context.getSharedPreferences(AstridApiConstants.PUBLIC_PREFS,
@@ -109,17 +114,23 @@ public class AstridPreferences {
      * ========================================================= system prefs
      * ====================================================================== */
 
-	/** CurrentVersion: the currently installed version of Astrid */
+    /**
+     * CurrentVersion: the currently installed version of Astrid
+     */
     public static int getCurrentVersion() {
         return Preferences.getInt(P_CURRENT_VERSION, 0);
     }
 
-    /** CurrentVersion: the currently installed version of Astrid */
+    /**
+     * CurrentVersion: the currently installed version of Astrid
+     */
     public static void setCurrentVersion(int version) {
         Preferences.setInt(P_CURRENT_VERSION, version);
     }
 
-    /** The name (e.g. 4.0.1) of the currently installed version of astrid*/
+    /**
+     * The name (e.g. 4.0.1) of the currently installed version of astrid
+     */
     public static String getCurrentVersionName() {
         String versionName = Preferences.getStringValue(P_CURRENT_VERSION_NAME);
         if (versionName == null)
@@ -131,10 +142,12 @@ public class AstridPreferences {
         Preferences.setString(P_CURRENT_VERSION_NAME, versionName);
     }
 
-    /** If true, can show a help popover. If false, another one was recently shown */
+    /**
+     * If true, can show a help popover. If false, another one was recently shown
+     */
     public static boolean canShowPopover() {
         long last = Preferences.getLong(P_LAST_POPOVER, 0);
-        if(System.currentTimeMillis() - last < MIN_POPOVER_TIME)
+        if (System.currentTimeMillis() - last < MIN_POPOVER_TIME)
             return false;
         Preferences.setLong(P_LAST_POPOVER, System.currentTimeMillis());
         return true;
diff --git a/astrid/src/com/todoroo/astrid/utility/Constants.java b/astrid/src/com/todoroo/astrid/utility/Constants.java
index 5eca3be69..2b5817e95 100644
--- a/astrid/src/com/todoroo/astrid/utility/Constants.java
+++ b/astrid/src/com/todoroo/astrid/utility/Constants.java
@@ -66,16 +66,24 @@ public final class Constants {
 
     // --- notification id's
 
-    /** Notification Manager id for sync notifications */
+    /**
+     * Notification Manager id for sync notifications
+     */
     public static final int NOTIFICATION_SYNC = -1;
 
-    /** Notification Manager id for timing */
+    /**
+     * Notification Manager id for timing
+     */
     public static final int NOTIFICATION_TIMER = -2;
 
-    /** Notification Manager id for locale */
+    /**
+     * Notification Manager id for locale
+     */
     public static final int NOTIFICATION_LOCALE = -3;
 
-    /** Notification Manager id for astrid.com */
+    /**
+     * Notification Manager id for astrid.com
+     */
     public static final int NOTIFICATION_ACTFM = -5;
 
     // --- crittercism
diff --git a/astrid/src/com/todoroo/astrid/utility/Entities.java b/astrid/src/com/todoroo/astrid/utility/Entities.java
index 898e8e9ec..65392dea6 100644
--- a/astrid/src/com/todoroo/astrid/utility/Entities.java
+++ b/astrid/src/com/todoroo/astrid/utility/Entities.java
@@ -29,24 +29,23 @@ import java.util.TreeMap;
  * Provides HTML and XML entity utilities.
  * </p>
  *
+ * @author <a href="mailto:alex@purpletech.com">Alexander Day Chaffee</a>
+ * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
+ * @version $Id: Entities.java 2696 2007-06-20 13:24:53Z damencho $
  * @see <a href="http://hotwired.lycos.com/webmonkey/reference/special_characters/">ISO Entities</a>
  * @see <a href="http://www.w3.org/TR/REC-html32#latin1">HTML 3.2 Character Entities for ISO Latin-1</a>
  * @see <a href="http://www.w3.org/TR/REC-html40/sgml/entities.html">HTML 4.0 Character entity references</a>
  * @see <a href="http://www.w3.org/TR/html401/charset.html#h-5.3">HTML 4.01 Character References</a>
  * @see <a href="http://www.w3.org/TR/html401/charset.html#code-position">HTML 4.01 Code positions</a>
- *
- * @author <a href="mailto:alex@purpletech.com">Alexander Day Chaffee</a>
- * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
  * @since 2.0
- * @version $Id: Entities.java 2696 2007-06-20 13:24:53Z damencho $
  */
 @SuppressWarnings({"nls", "rawtypes", "unused"})
 class Entities {
 
     private static final String[][] BASIC_ARRAY = {{"quot", "34"}, // " - double-quote
-        {"amp", "38"}, // & - ampersand
-        {"lt", "60"}, // < - less-than
-        {"gt", "62"}, // > - greater-than
+            {"amp", "38"}, // & - ampersand
+            {"lt", "60"}, // < - less-than
+            {"gt", "62"}, // > - greater-than
     };
 
     private static final String[][] APOS_ARRAY = {{"apos", "39"}, // XML apostrophe
@@ -54,300 +53,300 @@ class Entities {
 
     // package scoped for testing
     static final String[][] ISO8859_1_ARRAY = {{"nbsp", "160"}, // non-breaking space
-        {"iexcl", "161"}, // inverted exclamation mark
-        {"cent", "162"}, // cent sign
-        {"pound", "163"}, // pound sign
-        {"curren", "164"}, // currency sign
-        {"yen", "165"}, // yen sign = yuan sign
-        {"brvbar", "166"}, // broken bar = broken vertical bar
-        {"sect", "167"}, // section sign
-        {"uml", "168"}, // diaeresis = spacing diaeresis
-        {"copy", "169"}, // ? - copyright sign
-        {"ordf", "170"}, // feminine ordinal indicator
-        {"laquo", "171"}, // left-pointing double angle quotation mark = left pointing guillemet
-        {"not", "172"}, // not sign
-        {"shy", "173"}, // soft hyphen = discretionary hyphen
-        {"reg", "174"}, // ? - registered trademark sign
-        {"macr", "175"}, // macron = spacing macron = overline = APL overbar
-        {"deg", "176"}, // degree sign
-        {"plusmn", "177"}, // plus-minus sign = plus-or-minus sign
-        {"sup2", "178"}, // superscript two = superscript digit two = squared
-        {"sup3", "179"}, // superscript three = superscript digit three = cubed
-        {"acute", "180"}, // acute accent = spacing acute
-        {"micro", "181"}, // micro sign
-        {"para", "182"}, // pilcrow sign = paragraph sign
-        {"middot", "183"}, // middle dot = Georgian comma = Greek middle dot
-        {"cedil", "184"}, // cedilla = spacing cedilla
-        {"sup1", "185"}, // superscript one = superscript digit one
-        {"ordm", "186"}, // masculine ordinal indicator
-        {"raquo", "187"}, // right-pointing double angle quotation mark = right pointing guillemet
-        {"frac14", "188"}, // vulgar fraction one quarter = fraction one quarter
-        {"frac12", "189"}, // vulgar fraction one half = fraction one half
-        {"frac34", "190"}, // vulgar fraction three quarters = fraction three quarters
-        {"iquest", "191"}, // inverted question mark = turned question mark
-        {"Agrave", "192"}, // ? - uppercase A, grave accent
-        {"Aacute", "193"}, // ? - uppercase A, acute accent
-        {"Acirc", "194"}, // ? - uppercase A, circumflex accent
-        {"Atilde", "195"}, // ? - uppercase A, tilde
-        {"Auml", "196"}, // ? - uppercase A, umlaut
-        {"Aring", "197"}, // ? - uppercase A, ring
-        {"AElig", "198"}, // ? - uppercase AE
-        {"Ccedil", "199"}, // ? - uppercase C, cedilla
-        {"Egrave", "200"}, // ? - uppercase E, grave accent
-        {"Eacute", "201"}, // ? - uppercase E, acute accent
-        {"Ecirc", "202"}, // ? - uppercase E, circumflex accent
-        {"Euml", "203"}, // ? - uppercase E, umlaut
-        {"Igrave", "204"}, // ? - uppercase I, grave accent
-        {"Iacute", "205"}, // ? - uppercase I, acute accent
-        {"Icirc", "206"}, // ? - uppercase I, circumflex accent
-        {"Iuml", "207"}, // ? - uppercase I, umlaut
-        {"ETH", "208"}, // ? - uppercase Eth, Icelandic
-        {"Ntilde", "209"}, // ? - uppercase N, tilde
-        {"Ograve", "210"}, // ? - uppercase O, grave accent
-        {"Oacute", "211"}, // ? - uppercase O, acute accent
-        {"Ocirc", "212"}, // ? - uppercase O, circumflex accent
-        {"Otilde", "213"}, // ? - uppercase O, tilde
-        {"Ouml", "214"}, // ? - uppercase O, umlaut
-        {"times", "215"}, // multiplication sign
-        {"Oslash", "216"}, // ? - uppercase O, slash
-        {"Ugrave", "217"}, // ? - uppercase U, grave accent
-        {"Uacute", "218"}, // ? - uppercase U, acute accent
-        {"Ucirc", "219"}, // ? - uppercase U, circumflex accent
-        {"Uuml", "220"}, // ? - uppercase U, umlaut
-        {"Yacute", "221"}, // ? - uppercase Y, acute accent
-        {"THORN", "222"}, // ? - uppercase THORN, Icelandic
-        {"szlig", "223"}, // ? - lowercase sharps, German
-        {"agrave", "224"}, // ? - lowercase a, grave accent
-        {"aacute", "225"}, // ? - lowercase a, acute accent
-        {"acirc", "226"}, // ? - lowercase a, circumflex accent
-        {"atilde", "227"}, // ? - lowercase a, tilde
-        {"auml", "228"}, // ? - lowercase a, umlaut
-        {"aring", "229"}, // ? - lowercase a, ring
-        {"aelig", "230"}, // ? - lowercase ae
-        {"ccedil", "231"}, // ? - lowercase c, cedilla
-        {"egrave", "232"}, // ? - lowercase e, grave accent
-        {"eacute", "233"}, // ? - lowercase e, acute accent
-        {"ecirc", "234"}, // ? - lowercase e, circumflex accent
-        {"euml", "235"}, // ? - lowercase e, umlaut
-        {"igrave", "236"}, // ? - lowercase i, grave accent
-        {"iacute", "237"}, // ? - lowercase i, acute accent
-        {"icirc", "238"}, // ? - lowercase i, circumflex accent
-        {"iuml", "239"}, // ? - lowercase i, umlaut
-        {"eth", "240"}, // ? - lowercase eth, Icelandic
-        {"ntilde", "241"}, // ? - lowercase n, tilde
-        {"ograve", "242"}, // ? - lowercase o, grave accent
-        {"oacute", "243"}, // ? - lowercase o, acute accent
-        {"ocirc", "244"}, // ? - lowercase o, circumflex accent
-        {"otilde", "245"}, // ? - lowercase o, tilde
-        {"ouml", "246"}, // ? - lowercase o, umlaut
-        {"divide", "247"}, // division sign
-        {"oslash", "248"}, // ? - lowercase o, slash
-        {"ugrave", "249"}, // ? - lowercase u, grave accent
-        {"uacute", "250"}, // ? - lowercase u, acute accent
-        {"ucirc", "251"}, // ? - lowercase u, circumflex accent
-        {"uuml", "252"}, // ? - lowercase u, umlaut
-        {"yacute", "253"}, // ? - lowercase y, acute accent
-        {"thorn", "254"}, // ? - lowercase thorn, Icelandic
-        {"yuml", "255"}, // ? - lowercase y, umlaut
+            {"iexcl", "161"}, // inverted exclamation mark
+            {"cent", "162"}, // cent sign
+            {"pound", "163"}, // pound sign
+            {"curren", "164"}, // currency sign
+            {"yen", "165"}, // yen sign = yuan sign
+            {"brvbar", "166"}, // broken bar = broken vertical bar
+            {"sect", "167"}, // section sign
+            {"uml", "168"}, // diaeresis = spacing diaeresis
+            {"copy", "169"}, // ? - copyright sign
+            {"ordf", "170"}, // feminine ordinal indicator
+            {"laquo", "171"}, // left-pointing double angle quotation mark = left pointing guillemet
+            {"not", "172"}, // not sign
+            {"shy", "173"}, // soft hyphen = discretionary hyphen
+            {"reg", "174"}, // ? - registered trademark sign
+            {"macr", "175"}, // macron = spacing macron = overline = APL overbar
+            {"deg", "176"}, // degree sign
+            {"plusmn", "177"}, // plus-minus sign = plus-or-minus sign
+            {"sup2", "178"}, // superscript two = superscript digit two = squared
+            {"sup3", "179"}, // superscript three = superscript digit three = cubed
+            {"acute", "180"}, // acute accent = spacing acute
+            {"micro", "181"}, // micro sign
+            {"para", "182"}, // pilcrow sign = paragraph sign
+            {"middot", "183"}, // middle dot = Georgian comma = Greek middle dot
+            {"cedil", "184"}, // cedilla = spacing cedilla
+            {"sup1", "185"}, // superscript one = superscript digit one
+            {"ordm", "186"}, // masculine ordinal indicator
+            {"raquo", "187"}, // right-pointing double angle quotation mark = right pointing guillemet
+            {"frac14", "188"}, // vulgar fraction one quarter = fraction one quarter
+            {"frac12", "189"}, // vulgar fraction one half = fraction one half
+            {"frac34", "190"}, // vulgar fraction three quarters = fraction three quarters
+            {"iquest", "191"}, // inverted question mark = turned question mark
+            {"Agrave", "192"}, // ? - uppercase A, grave accent
+            {"Aacute", "193"}, // ? - uppercase A, acute accent
+            {"Acirc", "194"}, // ? - uppercase A, circumflex accent
+            {"Atilde", "195"}, // ? - uppercase A, tilde
+            {"Auml", "196"}, // ? - uppercase A, umlaut
+            {"Aring", "197"}, // ? - uppercase A, ring
+            {"AElig", "198"}, // ? - uppercase AE
+            {"Ccedil", "199"}, // ? - uppercase C, cedilla
+            {"Egrave", "200"}, // ? - uppercase E, grave accent
+            {"Eacute", "201"}, // ? - uppercase E, acute accent
+            {"Ecirc", "202"}, // ? - uppercase E, circumflex accent
+            {"Euml", "203"}, // ? - uppercase E, umlaut
+            {"Igrave", "204"}, // ? - uppercase I, grave accent
+            {"Iacute", "205"}, // ? - uppercase I, acute accent
+            {"Icirc", "206"}, // ? - uppercase I, circumflex accent
+            {"Iuml", "207"}, // ? - uppercase I, umlaut
+            {"ETH", "208"}, // ? - uppercase Eth, Icelandic
+            {"Ntilde", "209"}, // ? - uppercase N, tilde
+            {"Ograve", "210"}, // ? - uppercase O, grave accent
+            {"Oacute", "211"}, // ? - uppercase O, acute accent
+            {"Ocirc", "212"}, // ? - uppercase O, circumflex accent
+            {"Otilde", "213"}, // ? - uppercase O, tilde
+            {"Ouml", "214"}, // ? - uppercase O, umlaut
+            {"times", "215"}, // multiplication sign
+            {"Oslash", "216"}, // ? - uppercase O, slash
+            {"Ugrave", "217"}, // ? - uppercase U, grave accent
+            {"Uacute", "218"}, // ? - uppercase U, acute accent
+            {"Ucirc", "219"}, // ? - uppercase U, circumflex accent
+            {"Uuml", "220"}, // ? - uppercase U, umlaut
+            {"Yacute", "221"}, // ? - uppercase Y, acute accent
+            {"THORN", "222"}, // ? - uppercase THORN, Icelandic
+            {"szlig", "223"}, // ? - lowercase sharps, German
+            {"agrave", "224"}, // ? - lowercase a, grave accent
+            {"aacute", "225"}, // ? - lowercase a, acute accent
+            {"acirc", "226"}, // ? - lowercase a, circumflex accent
+            {"atilde", "227"}, // ? - lowercase a, tilde
+            {"auml", "228"}, // ? - lowercase a, umlaut
+            {"aring", "229"}, // ? - lowercase a, ring
+            {"aelig", "230"}, // ? - lowercase ae
+            {"ccedil", "231"}, // ? - lowercase c, cedilla
+            {"egrave", "232"}, // ? - lowercase e, grave accent
+            {"eacute", "233"}, // ? - lowercase e, acute accent
+            {"ecirc", "234"}, // ? - lowercase e, circumflex accent
+            {"euml", "235"}, // ? - lowercase e, umlaut
+            {"igrave", "236"}, // ? - lowercase i, grave accent
+            {"iacute", "237"}, // ? - lowercase i, acute accent
+            {"icirc", "238"}, // ? - lowercase i, circumflex accent
+            {"iuml", "239"}, // ? - lowercase i, umlaut
+            {"eth", "240"}, // ? - lowercase eth, Icelandic
+            {"ntilde", "241"}, // ? - lowercase n, tilde
+            {"ograve", "242"}, // ? - lowercase o, grave accent
+            {"oacute", "243"}, // ? - lowercase o, acute accent
+            {"ocirc", "244"}, // ? - lowercase o, circumflex accent
+            {"otilde", "245"}, // ? - lowercase o, tilde
+            {"ouml", "246"}, // ? - lowercase o, umlaut
+            {"divide", "247"}, // division sign
+            {"oslash", "248"}, // ? - lowercase o, slash
+            {"ugrave", "249"}, // ? - lowercase u, grave accent
+            {"uacute", "250"}, // ? - lowercase u, acute accent
+            {"ucirc", "251"}, // ? - lowercase u, circumflex accent
+            {"uuml", "252"}, // ? - lowercase u, umlaut
+            {"yacute", "253"}, // ? - lowercase y, acute accent
+            {"thorn", "254"}, // ? - lowercase thorn, Icelandic
+            {"yuml", "255"}, // ? - lowercase y, umlaut
     };
 
     // http://www.w3.org/TR/REC-html40/sgml/entities.html
     // package scoped for testing
     static final String[][] HTML40_ARRAY = {
-    // <!-- Latin Extended-B -->
-        {"fnof", "402"}, // latin small f with hook = function= florin, U+0192 ISOtech -->
-        // <!-- Greek -->
-        {"Alpha", "913"}, // greek capital letter alpha, U+0391 -->
-        {"Beta", "914"}, // greek capital letter beta, U+0392 -->
-        {"Gamma", "915"}, // greek capital letter gamma,U+0393 ISOgrk3 -->
-        {"Delta", "916"}, // greek capital letter delta,U+0394 ISOgrk3 -->
-        {"Epsilon", "917"}, // greek capital letter epsilon, U+0395 -->
-        {"Zeta", "918"}, // greek capital letter zeta, U+0396 -->
-        {"Eta", "919"}, // greek capital letter eta, U+0397 -->
-        {"Theta", "920"}, // greek capital letter theta,U+0398 ISOgrk3 -->
-        {"Iota", "921"}, // greek capital letter iota, U+0399 -->
-        {"Kappa", "922"}, // greek capital letter kappa, U+039A -->
-        {"Lambda", "923"}, // greek capital letter lambda,U+039B ISOgrk3 -->
-        {"Mu", "924"}, // greek capital letter mu, U+039C -->
-        {"Nu", "925"}, // greek capital letter nu, U+039D -->
-        {"Xi", "926"}, // greek capital letter xi, U+039E ISOgrk3 -->
-        {"Omicron", "927"}, // greek capital letter omicron, U+039F -->
-        {"Pi", "928"}, // greek capital letter pi, U+03A0 ISOgrk3 -->
-        {"Rho", "929"}, // greek capital letter rho, U+03A1 -->
-        // <!-- there is no Sigmaf, and no U+03A2 character either -->
-        {"Sigma", "931"}, // greek capital letter sigma,U+03A3 ISOgrk3 -->
-        {"Tau", "932"}, // greek capital letter tau, U+03A4 -->
-        {"Upsilon", "933"}, // greek capital letter upsilon,U+03A5 ISOgrk3 -->
-        {"Phi", "934"}, // greek capital letter phi,U+03A6 ISOgrk3 -->
-        {"Chi", "935"}, // greek capital letter chi, U+03A7 -->
-        {"Psi", "936"}, // greek capital letter psi,U+03A8 ISOgrk3 -->
-        {"Omega", "937"}, // greek capital letter omega,U+03A9 ISOgrk3 -->
-        {"alpha", "945"}, // greek small letter alpha,U+03B1 ISOgrk3 -->
-        {"beta", "946"}, // greek small letter beta, U+03B2 ISOgrk3 -->
-        {"gamma", "947"}, // greek small letter gamma,U+03B3 ISOgrk3 -->
-        {"delta", "948"}, // greek small letter delta,U+03B4 ISOgrk3 -->
-        {"epsilon", "949"}, // greek small letter epsilon,U+03B5 ISOgrk3 -->
-        {"zeta", "950"}, // greek small letter zeta, U+03B6 ISOgrk3 -->
-        {"eta", "951"}, // greek small letter eta, U+03B7 ISOgrk3 -->
-        {"theta", "952"}, // greek small letter theta,U+03B8 ISOgrk3 -->
-        {"iota", "953"}, // greek small letter iota, U+03B9 ISOgrk3 -->
-        {"kappa", "954"}, // greek small letter kappa,U+03BA ISOgrk3 -->
-        {"lambda", "955"}, // greek small letter lambda,U+03BB ISOgrk3 -->
-        {"mu", "956"}, // greek small letter mu, U+03BC ISOgrk3 -->
-        {"nu", "957"}, // greek small letter nu, U+03BD ISOgrk3 -->
-        {"xi", "958"}, // greek small letter xi, U+03BE ISOgrk3 -->
-        {"omicron", "959"}, // greek small letter omicron, U+03BF NEW -->
-        {"pi", "960"}, // greek small letter pi, U+03C0 ISOgrk3 -->
-        {"rho", "961"}, // greek small letter rho, U+03C1 ISOgrk3 -->
-        {"sigmaf", "962"}, // greek small letter final sigma,U+03C2 ISOgrk3 -->
-        {"sigma", "963"}, // greek small letter sigma,U+03C3 ISOgrk3 -->
-        {"tau", "964"}, // greek small letter tau, U+03C4 ISOgrk3 -->
-        {"upsilon", "965"}, // greek small letter upsilon,U+03C5 ISOgrk3 -->
-        {"phi", "966"}, // greek small letter phi, U+03C6 ISOgrk3 -->
-        {"chi", "967"}, // greek small letter chi, U+03C7 ISOgrk3 -->
-        {"psi", "968"}, // greek small letter psi, U+03C8 ISOgrk3 -->
-        {"omega", "969"}, // greek small letter omega,U+03C9 ISOgrk3 -->
-        {"thetasym", "977"}, // greek small letter theta symbol,U+03D1 NEW -->
-        {"upsih", "978"}, // greek upsilon with hook symbol,U+03D2 NEW -->
-        {"piv", "982"}, // greek pi symbol, U+03D6 ISOgrk3 -->
-        // <!-- General Punctuation -->
-        {"bull", "8226"}, // bullet = black small circle,U+2022 ISOpub -->
-        // <!-- bullet is NOT the same as bullet operator, U+2219 -->
-        {"hellip", "8230"}, // horizontal ellipsis = three dot leader,U+2026 ISOpub -->
-        {"prime", "8242"}, // prime = minutes = feet, U+2032 ISOtech -->
-        {"Prime", "8243"}, // double prime = seconds = inches,U+2033 ISOtech -->
-        {"oline", "8254"}, // overline = spacing overscore,U+203E NEW -->
-        {"frasl", "8260"}, // fraction slash, U+2044 NEW -->
-        // <!-- Letterlike Symbols -->
-        {"weierp", "8472"}, // script capital P = power set= Weierstrass p, U+2118 ISOamso -->
-        {"image", "8465"}, // blackletter capital I = imaginary part,U+2111 ISOamso -->
-        {"real", "8476"}, // blackletter capital R = real part symbol,U+211C ISOamso -->
-        {"trade", "8482"}, // trade mark sign, U+2122 ISOnum -->
-        {"alefsym", "8501"}, // alef symbol = first transfinite cardinal,U+2135 NEW -->
-        // <!-- alef symbol is NOT the same as hebrew letter alef,U+05D0 although the
-        // same glyph could be used to depict both characters -->
-        // <!-- Arrows -->
-        {"larr", "8592"}, // leftwards arrow, U+2190 ISOnum -->
-        {"uarr", "8593"}, // upwards arrow, U+2191 ISOnum-->
-        {"rarr", "8594"}, // rightwards arrow, U+2192 ISOnum -->
-        {"darr", "8595"}, // downwards arrow, U+2193 ISOnum -->
-        {"harr", "8596"}, // left right arrow, U+2194 ISOamsa -->
-        {"crarr", "8629"}, // downwards arrow with corner leftwards= carriage return, U+21B5 NEW -->
-        {"lArr", "8656"}, // leftwards double arrow, U+21D0 ISOtech -->
-        // <!-- ISO 10646 does not say that lArr is the same as the 'is implied by'
-        // arrow but also does not have any other character for that function.
-        // So ? lArr canbe used for 'is implied by' as ISOtech suggests -->
-        {"uArr", "8657"}, // upwards double arrow, U+21D1 ISOamsa -->
-        {"rArr", "8658"}, // rightwards double arrow,U+21D2 ISOtech -->
-        // <!-- ISO 10646 does not say this is the 'implies' character but does not
-        // have another character with this function so ?rArr can be used for
-        // 'implies' as ISOtech suggests -->
-        {"dArr", "8659"}, // downwards double arrow, U+21D3 ISOamsa -->
-        {"hArr", "8660"}, // left right double arrow,U+21D4 ISOamsa -->
-        // <!-- Mathematical Operators -->
-        {"forall", "8704"}, // for all, U+2200 ISOtech -->
-        {"part", "8706"}, // partial differential, U+2202 ISOtech -->
-        {"exist", "8707"}, // there exists, U+2203 ISOtech -->
-        {"empty", "8709"}, // empty set = null set = diameter,U+2205 ISOamso -->
-        {"nabla", "8711"}, // nabla = backward difference,U+2207 ISOtech -->
-        {"isin", "8712"}, // element of, U+2208 ISOtech -->
-        {"notin", "8713"}, // not an element of, U+2209 ISOtech -->
-        {"ni", "8715"}, // contains as member, U+220B ISOtech -->
-        // <!-- should there be a more memorable name than 'ni'? -->
-        {"prod", "8719"}, // n-ary product = product sign,U+220F ISOamsb -->
-        // <!-- prod is NOT the same character as U+03A0 'greek capital letter pi'
-        // though the same glyph might be used for both -->
-        {"sum", "8721"}, // n-ary summation, U+2211 ISOamsb -->
-        // <!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
-        // though the same glyph might be used for both -->
-        {"minus", "8722"}, // minus sign, U+2212 ISOtech -->
-        {"lowast", "8727"}, // asterisk operator, U+2217 ISOtech -->
-        {"radic", "8730"}, // square root = radical sign,U+221A ISOtech -->
-        {"prop", "8733"}, // proportional to, U+221D ISOtech -->
-        {"infin", "8734"}, // infinity, U+221E ISOtech -->
-        {"ang", "8736"}, // angle, U+2220 ISOamso -->
-        {"and", "8743"}, // logical and = wedge, U+2227 ISOtech -->
-        {"or", "8744"}, // logical or = vee, U+2228 ISOtech -->
-        {"cap", "8745"}, // intersection = cap, U+2229 ISOtech -->
-        {"cup", "8746"}, // union = cup, U+222A ISOtech -->
-        {"int", "8747"}, // integral, U+222B ISOtech -->
-        {"there4", "8756"}, // therefore, U+2234 ISOtech -->
-        {"sim", "8764"}, // tilde operator = varies with = similar to,U+223C ISOtech -->
-        // <!-- tilde operator is NOT the same character as the tilde, U+007E,although
-        // the same glyph might be used to represent both -->
-        {"cong", "8773"}, // approximately equal to, U+2245 ISOtech -->
-        {"asymp", "8776"}, // almost equal to = asymptotic to,U+2248 ISOamsr -->
-        {"ne", "8800"}, // not equal to, U+2260 ISOtech -->
-        {"equiv", "8801"}, // identical to, U+2261 ISOtech -->
-        {"le", "8804"}, // less-than or equal to, U+2264 ISOtech -->
-        {"ge", "8805"}, // greater-than or equal to,U+2265 ISOtech -->
-        {"sub", "8834"}, // subset of, U+2282 ISOtech -->
-        {"sup", "8835"}, // superset of, U+2283 ISOtech -->
-        // <!-- note that nsup, 'not a superset of, U+2283' is not covered by the
-        // Symbol font encoding and is not included. Should it be, for symmetry?
-        // It is in ISOamsn --> <!ENTITY nsub", "8836"},
-        // not a subset of, U+2284 ISOamsn -->
-        {"sube", "8838"}, // subset of or equal to, U+2286 ISOtech -->
-        {"supe", "8839"}, // superset of or equal to,U+2287 ISOtech -->
-        {"oplus", "8853"}, // circled plus = direct sum,U+2295 ISOamsb -->
-        {"otimes", "8855"}, // circled times = vector product,U+2297 ISOamsb -->
-        {"perp", "8869"}, // up tack = orthogonal to = perpendicular,U+22A5 ISOtech -->
-        {"sdot", "8901"}, // dot operator, U+22C5 ISOamsb -->
-        // <!-- dot operator is NOT the same character as U+00B7 middle dot -->
-        // <!-- Miscellaneous Technical -->
-        {"lceil", "8968"}, // left ceiling = apl upstile,U+2308 ISOamsc -->
-        {"rceil", "8969"}, // right ceiling, U+2309 ISOamsc -->
-        {"lfloor", "8970"}, // left floor = apl downstile,U+230A ISOamsc -->
-        {"rfloor", "8971"}, // right floor, U+230B ISOamsc -->
-        {"lang", "9001"}, // left-pointing angle bracket = bra,U+2329 ISOtech -->
-        // <!-- lang is NOT the same character as U+003C 'less than' or U+2039 'single left-pointing angle quotation
-        // mark' -->
-        {"rang", "9002"}, // right-pointing angle bracket = ket,U+232A ISOtech -->
-        // <!-- rang is NOT the same character as U+003E 'greater than' or U+203A
-        // 'single right-pointing angle quotation mark' -->
-        // <!-- Geometric Shapes -->
-        {"loz", "9674"}, // lozenge, U+25CA ISOpub -->
-        // <!-- Miscellaneous Symbols -->
-        {"spades", "9824"}, // black spade suit, U+2660 ISOpub -->
-        // <!-- black here seems to mean filled as opposed to hollow -->
-        {"clubs", "9827"}, // black club suit = shamrock,U+2663 ISOpub -->
-        {"hearts", "9829"}, // black heart suit = valentine,U+2665 ISOpub -->
-        {"diams", "9830"}, // black diamond suit, U+2666 ISOpub -->
-
-        // <!-- Latin Extended-A -->
-        {"OElig", "338"}, // -- latin capital ligature OE,U+0152 ISOlat2 -->
-        {"oelig", "339"}, // -- latin small ligature oe, U+0153 ISOlat2 -->
-        // <!-- ligature is a misnomer, this is a separate character in some languages -->
-        {"Scaron", "352"}, // -- latin capital letter S with caron,U+0160 ISOlat2 -->
-        {"scaron", "353"}, // -- latin small letter s with caron,U+0161 ISOlat2 -->
-        {"Yuml", "376"}, // -- latin capital letter Y with diaeresis,U+0178 ISOlat2 -->
-        // <!-- Spacing Modifier Letters -->
-        {"circ", "710"}, // -- modifier letter circumflex accent,U+02C6 ISOpub -->
-        {"tilde", "732"}, // small tilde, U+02DC ISOdia -->
-        // <!-- General Punctuation -->
-        {"ensp", "8194"}, // en space, U+2002 ISOpub -->
-        {"emsp", "8195"}, // em space, U+2003 ISOpub -->
-        {"thinsp", "8201"}, // thin space, U+2009 ISOpub -->
-        {"zwnj", "8204"}, // zero width non-joiner,U+200C NEW RFC 2070 -->
-        {"zwj", "8205"}, // zero width joiner, U+200D NEW RFC 2070 -->
-        {"lrm", "8206"}, // left-to-right mark, U+200E NEW RFC 2070 -->
-        {"rlm", "8207"}, // right-to-left mark, U+200F NEW RFC 2070 -->
-        {"ndash", "8211"}, // en dash, U+2013 ISOpub -->
-        {"mdash", "8212"}, // em dash, U+2014 ISOpub -->
-        {"lsquo", "8216"}, // left single quotation mark,U+2018 ISOnum -->
-        {"rsquo", "8217"}, // right single quotation mark,U+2019 ISOnum -->
-        {"sbquo", "8218"}, // single low-9 quotation mark, U+201A NEW -->
-        {"ldquo", "8220"}, // left double quotation mark,U+201C ISOnum -->
-        {"rdquo", "8221"}, // right double quotation mark,U+201D ISOnum -->
-        {"bdquo", "8222"}, // double low-9 quotation mark, U+201E NEW -->
-        {"dagger", "8224"}, // dagger, U+2020 ISOpub -->
-        {"Dagger", "8225"}, // double dagger, U+2021 ISOpub -->
-        {"permil", "8240"}, // per mille sign, U+2030 ISOtech -->
-        {"lsaquo", "8249"}, // single left-pointing angle quotation mark,U+2039 ISO proposed -->
-        // <!-- lsaquo is proposed but not yet ISO standardized -->
-        {"rsaquo", "8250"}, // single right-pointing angle quotation mark,U+203A ISO proposed -->
-        // <!-- rsaquo is proposed but not yet ISO standardized -->
-        {"euro", "8364"}, // -- euro sign, U+20AC NEW -->
+            // <!-- Latin Extended-B -->
+            {"fnof", "402"}, // latin small f with hook = function= florin, U+0192 ISOtech -->
+            // <!-- Greek -->
+            {"Alpha", "913"}, // greek capital letter alpha, U+0391 -->
+            {"Beta", "914"}, // greek capital letter beta, U+0392 -->
+            {"Gamma", "915"}, // greek capital letter gamma,U+0393 ISOgrk3 -->
+            {"Delta", "916"}, // greek capital letter delta,U+0394 ISOgrk3 -->
+            {"Epsilon", "917"}, // greek capital letter epsilon, U+0395 -->
+            {"Zeta", "918"}, // greek capital letter zeta, U+0396 -->
+            {"Eta", "919"}, // greek capital letter eta, U+0397 -->
+            {"Theta", "920"}, // greek capital letter theta,U+0398 ISOgrk3 -->
+            {"Iota", "921"}, // greek capital letter iota, U+0399 -->
+            {"Kappa", "922"}, // greek capital letter kappa, U+039A -->
+            {"Lambda", "923"}, // greek capital letter lambda,U+039B ISOgrk3 -->
+            {"Mu", "924"}, // greek capital letter mu, U+039C -->
+            {"Nu", "925"}, // greek capital letter nu, U+039D -->
+            {"Xi", "926"}, // greek capital letter xi, U+039E ISOgrk3 -->
+            {"Omicron", "927"}, // greek capital letter omicron, U+039F -->
+            {"Pi", "928"}, // greek capital letter pi, U+03A0 ISOgrk3 -->
+            {"Rho", "929"}, // greek capital letter rho, U+03A1 -->
+            // <!-- there is no Sigmaf, and no U+03A2 character either -->
+            {"Sigma", "931"}, // greek capital letter sigma,U+03A3 ISOgrk3 -->
+            {"Tau", "932"}, // greek capital letter tau, U+03A4 -->
+            {"Upsilon", "933"}, // greek capital letter upsilon,U+03A5 ISOgrk3 -->
+            {"Phi", "934"}, // greek capital letter phi,U+03A6 ISOgrk3 -->
+            {"Chi", "935"}, // greek capital letter chi, U+03A7 -->
+            {"Psi", "936"}, // greek capital letter psi,U+03A8 ISOgrk3 -->
+            {"Omega", "937"}, // greek capital letter omega,U+03A9 ISOgrk3 -->
+            {"alpha", "945"}, // greek small letter alpha,U+03B1 ISOgrk3 -->
+            {"beta", "946"}, // greek small letter beta, U+03B2 ISOgrk3 -->
+            {"gamma", "947"}, // greek small letter gamma,U+03B3 ISOgrk3 -->
+            {"delta", "948"}, // greek small letter delta,U+03B4 ISOgrk3 -->
+            {"epsilon", "949"}, // greek small letter epsilon,U+03B5 ISOgrk3 -->
+            {"zeta", "950"}, // greek small letter zeta, U+03B6 ISOgrk3 -->
+            {"eta", "951"}, // greek small letter eta, U+03B7 ISOgrk3 -->
+            {"theta", "952"}, // greek small letter theta,U+03B8 ISOgrk3 -->
+            {"iota", "953"}, // greek small letter iota, U+03B9 ISOgrk3 -->
+            {"kappa", "954"}, // greek small letter kappa,U+03BA ISOgrk3 -->
+            {"lambda", "955"}, // greek small letter lambda,U+03BB ISOgrk3 -->
+            {"mu", "956"}, // greek small letter mu, U+03BC ISOgrk3 -->
+            {"nu", "957"}, // greek small letter nu, U+03BD ISOgrk3 -->
+            {"xi", "958"}, // greek small letter xi, U+03BE ISOgrk3 -->
+            {"omicron", "959"}, // greek small letter omicron, U+03BF NEW -->
+            {"pi", "960"}, // greek small letter pi, U+03C0 ISOgrk3 -->
+            {"rho", "961"}, // greek small letter rho, U+03C1 ISOgrk3 -->
+            {"sigmaf", "962"}, // greek small letter final sigma,U+03C2 ISOgrk3 -->
+            {"sigma", "963"}, // greek small letter sigma,U+03C3 ISOgrk3 -->
+            {"tau", "964"}, // greek small letter tau, U+03C4 ISOgrk3 -->
+            {"upsilon", "965"}, // greek small letter upsilon,U+03C5 ISOgrk3 -->
+            {"phi", "966"}, // greek small letter phi, U+03C6 ISOgrk3 -->
+            {"chi", "967"}, // greek small letter chi, U+03C7 ISOgrk3 -->
+            {"psi", "968"}, // greek small letter psi, U+03C8 ISOgrk3 -->
+            {"omega", "969"}, // greek small letter omega,U+03C9 ISOgrk3 -->
+            {"thetasym", "977"}, // greek small letter theta symbol,U+03D1 NEW -->
+            {"upsih", "978"}, // greek upsilon with hook symbol,U+03D2 NEW -->
+            {"piv", "982"}, // greek pi symbol, U+03D6 ISOgrk3 -->
+            // <!-- General Punctuation -->
+            {"bull", "8226"}, // bullet = black small circle,U+2022 ISOpub -->
+            // <!-- bullet is NOT the same as bullet operator, U+2219 -->
+            {"hellip", "8230"}, // horizontal ellipsis = three dot leader,U+2026 ISOpub -->
+            {"prime", "8242"}, // prime = minutes = feet, U+2032 ISOtech -->
+            {"Prime", "8243"}, // double prime = seconds = inches,U+2033 ISOtech -->
+            {"oline", "8254"}, // overline = spacing overscore,U+203E NEW -->
+            {"frasl", "8260"}, // fraction slash, U+2044 NEW -->
+            // <!-- Letterlike Symbols -->
+            {"weierp", "8472"}, // script capital P = power set= Weierstrass p, U+2118 ISOamso -->
+            {"image", "8465"}, // blackletter capital I = imaginary part,U+2111 ISOamso -->
+            {"real", "8476"}, // blackletter capital R = real part symbol,U+211C ISOamso -->
+            {"trade", "8482"}, // trade mark sign, U+2122 ISOnum -->
+            {"alefsym", "8501"}, // alef symbol = first transfinite cardinal,U+2135 NEW -->
+            // <!-- alef symbol is NOT the same as hebrew letter alef,U+05D0 although the
+            // same glyph could be used to depict both characters -->
+            // <!-- Arrows -->
+            {"larr", "8592"}, // leftwards arrow, U+2190 ISOnum -->
+            {"uarr", "8593"}, // upwards arrow, U+2191 ISOnum-->
+            {"rarr", "8594"}, // rightwards arrow, U+2192 ISOnum -->
+            {"darr", "8595"}, // downwards arrow, U+2193 ISOnum -->
+            {"harr", "8596"}, // left right arrow, U+2194 ISOamsa -->
+            {"crarr", "8629"}, // downwards arrow with corner leftwards= carriage return, U+21B5 NEW -->
+            {"lArr", "8656"}, // leftwards double arrow, U+21D0 ISOtech -->
+            // <!-- ISO 10646 does not say that lArr is the same as the 'is implied by'
+            // arrow but also does not have any other character for that function.
+            // So ? lArr canbe used for 'is implied by' as ISOtech suggests -->
+            {"uArr", "8657"}, // upwards double arrow, U+21D1 ISOamsa -->
+            {"rArr", "8658"}, // rightwards double arrow,U+21D2 ISOtech -->
+            // <!-- ISO 10646 does not say this is the 'implies' character but does not
+            // have another character with this function so ?rArr can be used for
+            // 'implies' as ISOtech suggests -->
+            {"dArr", "8659"}, // downwards double arrow, U+21D3 ISOamsa -->
+            {"hArr", "8660"}, // left right double arrow,U+21D4 ISOamsa -->
+            // <!-- Mathematical Operators -->
+            {"forall", "8704"}, // for all, U+2200 ISOtech -->
+            {"part", "8706"}, // partial differential, U+2202 ISOtech -->
+            {"exist", "8707"}, // there exists, U+2203 ISOtech -->
+            {"empty", "8709"}, // empty set = null set = diameter,U+2205 ISOamso -->
+            {"nabla", "8711"}, // nabla = backward difference,U+2207 ISOtech -->
+            {"isin", "8712"}, // element of, U+2208 ISOtech -->
+            {"notin", "8713"}, // not an element of, U+2209 ISOtech -->
+            {"ni", "8715"}, // contains as member, U+220B ISOtech -->
+            // <!-- should there be a more memorable name than 'ni'? -->
+            {"prod", "8719"}, // n-ary product = product sign,U+220F ISOamsb -->
+            // <!-- prod is NOT the same character as U+03A0 'greek capital letter pi'
+            // though the same glyph might be used for both -->
+            {"sum", "8721"}, // n-ary summation, U+2211 ISOamsb -->
+            // <!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
+            // though the same glyph might be used for both -->
+            {"minus", "8722"}, // minus sign, U+2212 ISOtech -->
+            {"lowast", "8727"}, // asterisk operator, U+2217 ISOtech -->
+            {"radic", "8730"}, // square root = radical sign,U+221A ISOtech -->
+            {"prop", "8733"}, // proportional to, U+221D ISOtech -->
+            {"infin", "8734"}, // infinity, U+221E ISOtech -->
+            {"ang", "8736"}, // angle, U+2220 ISOamso -->
+            {"and", "8743"}, // logical and = wedge, U+2227 ISOtech -->
+            {"or", "8744"}, // logical or = vee, U+2228 ISOtech -->
+            {"cap", "8745"}, // intersection = cap, U+2229 ISOtech -->
+            {"cup", "8746"}, // union = cup, U+222A ISOtech -->
+            {"int", "8747"}, // integral, U+222B ISOtech -->
+            {"there4", "8756"}, // therefore, U+2234 ISOtech -->
+            {"sim", "8764"}, // tilde operator = varies with = similar to,U+223C ISOtech -->
+            // <!-- tilde operator is NOT the same character as the tilde, U+007E,although
+            // the same glyph might be used to represent both -->
+            {"cong", "8773"}, // approximately equal to, U+2245 ISOtech -->
+            {"asymp", "8776"}, // almost equal to = asymptotic to,U+2248 ISOamsr -->
+            {"ne", "8800"}, // not equal to, U+2260 ISOtech -->
+            {"equiv", "8801"}, // identical to, U+2261 ISOtech -->
+            {"le", "8804"}, // less-than or equal to, U+2264 ISOtech -->
+            {"ge", "8805"}, // greater-than or equal to,U+2265 ISOtech -->
+            {"sub", "8834"}, // subset of, U+2282 ISOtech -->
+            {"sup", "8835"}, // superset of, U+2283 ISOtech -->
+            // <!-- note that nsup, 'not a superset of, U+2283' is not covered by the
+            // Symbol font encoding and is not included. Should it be, for symmetry?
+            // It is in ISOamsn --> <!ENTITY nsub", "8836"},
+            // not a subset of, U+2284 ISOamsn -->
+            {"sube", "8838"}, // subset of or equal to, U+2286 ISOtech -->
+            {"supe", "8839"}, // superset of or equal to,U+2287 ISOtech -->
+            {"oplus", "8853"}, // circled plus = direct sum,U+2295 ISOamsb -->
+            {"otimes", "8855"}, // circled times = vector product,U+2297 ISOamsb -->
+            {"perp", "8869"}, // up tack = orthogonal to = perpendicular,U+22A5 ISOtech -->
+            {"sdot", "8901"}, // dot operator, U+22C5 ISOamsb -->
+            // <!-- dot operator is NOT the same character as U+00B7 middle dot -->
+            // <!-- Miscellaneous Technical -->
+            {"lceil", "8968"}, // left ceiling = apl upstile,U+2308 ISOamsc -->
+            {"rceil", "8969"}, // right ceiling, U+2309 ISOamsc -->
+            {"lfloor", "8970"}, // left floor = apl downstile,U+230A ISOamsc -->
+            {"rfloor", "8971"}, // right floor, U+230B ISOamsc -->
+            {"lang", "9001"}, // left-pointing angle bracket = bra,U+2329 ISOtech -->
+            // <!-- lang is NOT the same character as U+003C 'less than' or U+2039 'single left-pointing angle quotation
+            // mark' -->
+            {"rang", "9002"}, // right-pointing angle bracket = ket,U+232A ISOtech -->
+            // <!-- rang is NOT the same character as U+003E 'greater than' or U+203A
+            // 'single right-pointing angle quotation mark' -->
+            // <!-- Geometric Shapes -->
+            {"loz", "9674"}, // lozenge, U+25CA ISOpub -->
+            // <!-- Miscellaneous Symbols -->
+            {"spades", "9824"}, // black spade suit, U+2660 ISOpub -->
+            // <!-- black here seems to mean filled as opposed to hollow -->
+            {"clubs", "9827"}, // black club suit = shamrock,U+2663 ISOpub -->
+            {"hearts", "9829"}, // black heart suit = valentine,U+2665 ISOpub -->
+            {"diams", "9830"}, // black diamond suit, U+2666 ISOpub -->
+
+            // <!-- Latin Extended-A -->
+            {"OElig", "338"}, // -- latin capital ligature OE,U+0152 ISOlat2 -->
+            {"oelig", "339"}, // -- latin small ligature oe, U+0153 ISOlat2 -->
+            // <!-- ligature is a misnomer, this is a separate character in some languages -->
+            {"Scaron", "352"}, // -- latin capital letter S with caron,U+0160 ISOlat2 -->
+            {"scaron", "353"}, // -- latin small letter s with caron,U+0161 ISOlat2 -->
+            {"Yuml", "376"}, // -- latin capital letter Y with diaeresis,U+0178 ISOlat2 -->
+            // <!-- Spacing Modifier Letters -->
+            {"circ", "710"}, // -- modifier letter circumflex accent,U+02C6 ISOpub -->
+            {"tilde", "732"}, // small tilde, U+02DC ISOdia -->
+            // <!-- General Punctuation -->
+            {"ensp", "8194"}, // en space, U+2002 ISOpub -->
+            {"emsp", "8195"}, // em space, U+2003 ISOpub -->
+            {"thinsp", "8201"}, // thin space, U+2009 ISOpub -->
+            {"zwnj", "8204"}, // zero width non-joiner,U+200C NEW RFC 2070 -->
+            {"zwj", "8205"}, // zero width joiner, U+200D NEW RFC 2070 -->
+            {"lrm", "8206"}, // left-to-right mark, U+200E NEW RFC 2070 -->
+            {"rlm", "8207"}, // right-to-left mark, U+200F NEW RFC 2070 -->
+            {"ndash", "8211"}, // en dash, U+2013 ISOpub -->
+            {"mdash", "8212"}, // em dash, U+2014 ISOpub -->
+            {"lsquo", "8216"}, // left single quotation mark,U+2018 ISOnum -->
+            {"rsquo", "8217"}, // right single quotation mark,U+2019 ISOnum -->
+            {"sbquo", "8218"}, // single low-9 quotation mark, U+201A NEW -->
+            {"ldquo", "8220"}, // left double quotation mark,U+201C ISOnum -->
+            {"rdquo", "8221"}, // right double quotation mark,U+201D ISOnum -->
+            {"bdquo", "8222"}, // double low-9 quotation mark, U+201E NEW -->
+            {"dagger", "8224"}, // dagger, U+2020 ISOpub -->
+            {"Dagger", "8225"}, // double dagger, U+2021 ISOpub -->
+            {"permil", "8240"}, // per mille sign, U+2030 ISOtech -->
+            {"lsaquo", "8249"}, // single left-pointing angle quotation mark,U+2039 ISO proposed -->
+            // <!-- lsaquo is proposed but not yet ISO standardized -->
+            {"rsaquo", "8250"}, // single right-pointing angle quotation mark,U+203A ISO proposed -->
+            // <!-- rsaquo is proposed but not yet ISO standardized -->
+            {"euro", "8364"}, // -- euro sign, U+20AC NEW -->
     };
 
     /**
@@ -393,8 +392,7 @@ class Entities {
      * Fills the specified entities instance with HTML 40 entities.
      * </p>
      *
-     * @param entities
-     *            the instance to be filled.
+     * @param entities the instance to be filled.
      */
     static void fillWithHtml40Entities(Entities entities) {
         entities.addEntities(BASIC_ARRAY);
@@ -408,10 +406,8 @@ class Entities {
          * Add an entry to this entity map.
          * </p>
          *
-         * @param name
-         *            the entity name
-         * @param value
-         *            the entity value
+         * @param name  the entity name
+         * @param value the entity value
          */
         void add(String name, int value);
 
@@ -420,8 +416,7 @@ class Entities {
          * Returns the name of the entity identified by the specified value.
          * </p>
          *
-         * @param value
-         *            the value to locate
+         * @param value the value to locate
          * @return entity name associated with the specified value
          */
         String name(int value);
@@ -431,8 +426,7 @@ class Entities {
          * Returns the value of the entity identified by the specified name.
          * </p>
          *
-         * @param name
-         *            the name to locate
+         * @param name the name to locate
          * @return entity value associated with the specified name
          */
         int value(String name);
@@ -586,8 +580,7 @@ class Entities {
          * Constructs a new instance of <code>ArrayEntityMap</code> specifying the size by which the array should
          * grow.
          *
-         * @param growBy
-         *            array will be initialized to and will grow by this amount
+         * @param growBy array will be initialized to and will grow by this amount
          */
         public ArrayEntityMap(int growBy) {
             this.growBy = growBy;
@@ -608,8 +601,7 @@ class Entities {
         /**
          * Verifies the capacity of the entity array, adjusting the size if necessary.
          *
-         * @param capacity
-         *            size the array should be
+         * @param capacity size the array should be
          */
         protected void ensureCapacity(int capacity) {
             if (capacity > names.length) {
@@ -661,8 +653,7 @@ class Entities {
          * Constructs a new instance of <code>ArrayEntityMap</code> specifying the size by which the underlying array
          * should grow.
          *
-         * @param growBy
-         *            array will be initialized to and will grow by this amount
+         * @param growBy array will be initialized to and will grow by this amount
          */
         public BinaryEntityMap(int growBy) {
             super(growBy);
@@ -672,8 +663,7 @@ class Entities {
          * Performs a binary search of the entity array for the specified key. This method is based on code in
          * {@link java.util.Arrays}.
          *
-         * @param key
-         *            the key to be found
+         * @param key the key to be found
          * @return the index of the entity array matching the specified key
          */
         private int binarySearch(int key) {
@@ -734,8 +724,7 @@ class Entities {
      * Adds entities to this entity.
      * </p>
      *
-     * @param entityArray
-     *            array of entities to be added
+     * @param entityArray array of entities to be added
      */
     public void addEntities(String[][] entityArray) {
         for (int i = 0; i < entityArray.length; ++i) {
@@ -748,10 +737,8 @@ class Entities {
      * Add an entity to this entity.
      * </p>
      *
-     * @param name
-     *            name of the entity
-     * @param value
-     *            vale of the entity
+     * @param name  name of the entity
+     * @param value vale of the entity
      */
     public void addEntity(String name, int value) {
         map.add(name, value);
@@ -762,8 +749,7 @@ class Entities {
      * Returns the name of the entity identified by the specified value.
      * </p>
      *
-     * @param value
-     *            the value to locate
+     * @param value the value to locate
      * @return entity name associated with the specified value
      */
     public String entityName(int value) {
@@ -775,8 +761,7 @@ class Entities {
      * Returns the value of the entity identified by the specified name.
      * </p>
      *
-     * @param name
-     *            the name to locate
+     * @param name the name to locate
      * @return entity value associated with the specified name
      */
     public int entityValue(String name) {
@@ -787,14 +772,13 @@ class Entities {
      * <p>
      * Escapes the characters in a <code>String</code>.
      * </p>
-     *
+     * <p/>
      * <p>
      * For example, if you have called addEntity(&quot;foo&quot;, 0xA1), escape(&quot;\u00A1&quot;) will return
      * &quot;&amp;foo;&quot;
      * </p>
      *
-     * @param str
-     *            The <code>String</code> to escape.
+     * @param str The <code>String</code> to escape.
      * @return A new escaped <code>String</code>.
      */
     public String escape(String str) {
@@ -815,14 +799,10 @@ class Entities {
      * passed.
      * </p>
      *
-     * @param writer
-     *            The <code>Writer</code> to write the results of the escaping to. Assumed to be a non-null value.
-     * @param str
-     *            The <code>String</code> to escape. Assumed to be a non-null value.
-     * @throws IOException
-     *             when <code>Writer</code> passed throws the exception from calls to the {@link Writer#write(int)}
-     *             methods.
-     *
+     * @param writer The <code>Writer</code> to write the results of the escaping to. Assumed to be a non-null value.
+     * @param str    The <code>String</code> to escape. Assumed to be a non-null value.
+     * @throws IOException when <code>Writer</code> passed throws the exception from calls to the {@link Writer#write(int)}
+     *                     methods.
      * @see #escape(String)
      * @see Writer
      */
@@ -851,14 +831,13 @@ class Entities {
      * <p>
      * Unescapes the entities in a <code>String</code>.
      * </p>
-     *
+     * <p/>
      * <p>
      * For example, if you have called addEntity(&quot;foo&quot;, 0xA1), unescape(&quot;&amp;foo;&quot;) will return
      * &quot;\u00A1&quot;
      * </p>
      *
-     * @param str
-     *            The <code>String</code> to escape.
+     * @param str The <code>String</code> to escape.
      * @return A new escaped <code>String</code>.
      */
     public String unescape(String str) {
@@ -894,14 +873,10 @@ class Entities {
      * <code>Writer</code> passed.
      * </p>
      *
-     * @param writer
-     *            The <code>Writer</code> to write the results to; assumed to be non-null.
-     * @param str
-     *            The source <code>String</code> to unescape; assumed to be non-null.
-     * @throws IOException
-     *             when <code>Writer</code> passed throws the exception from calls to the {@link Writer#write(int)}
-     *             methods.
-     *
+     * @param writer The <code>Writer</code> to write the results to; assumed to be non-null.
+     * @param str    The source <code>String</code> to unescape; assumed to be non-null.
+     * @throws IOException when <code>Writer</code> passed throws the exception from calls to the {@link Writer#write(int)}
+     *                     methods.
      * @see #escape(String)
      * @see Writer
      */
@@ -918,15 +893,11 @@ class Entities {
     /**
      * Underlying unescape method that allows the optimisation of not starting from the 0 index again.
      *
-     * @param writer
-     *            The <code>Writer</code> to write the results to; assumed to be non-null.
-     * @param str
-     *            The source <code>String</code> to unescape; assumed to be non-null.
-     * @param firstAmp
-     *            The <code>int</code> index of the first ampersand in the source String.
-     * @throws IOException
-     *             when <code>Writer</code> passed throws the exception from calls to the {@link Writer#write(int)}
-     *             methods.
+     * @param writer   The <code>Writer</code> to write the results to; assumed to be non-null.
+     * @param str      The source <code>String</code> to unescape; assumed to be non-null.
+     * @param firstAmp The <code>int</code> index of the first ampersand in the source String.
+     * @throws IOException when <code>Writer</code> passed throws the exception from calls to the {@link Writer#write(int)}
+     *                     methods.
      */
     private void doUnescape(Writer writer, String str, int firstAmp) throws IOException {
         writer.write(str, 0, firstAmp);
@@ -956,12 +927,12 @@ class Entities {
                             char isHexChar = entityContent.charAt(1);
                             try {
                                 switch (isHexChar) {
-                                    case 'X' :
-                                    case 'x' : {
+                                    case 'X':
+                                    case 'x': {
                                         entityValue = Integer.parseInt(entityContent.substring(2), 16);
                                         break;
                                     }
-                                    default : {
+                                    default: {
                                         entityValue = Integer.parseInt(entityContent.substring(1), 10);
                                     }
                                 }
@@ -993,7 +964,7 @@ class Entities {
 
     /**
      * <p>A hash map that uses primitive ints for the key rather than objects.</p>
-     *
+     * <p/>
      * <p>Note that this class is for internal optimization purposes only, and may
      * not be supported in future releases of Jakarta Commons Lang.  Utilities of
      * this sort may be included in future releases of Jakarta Commons Collections.</p>
@@ -1001,9 +972,9 @@ class Entities {
      * @author Justin Couch
      * @author Alex Chaffee (alex@apache.org)
      * @author Stephen Colebourne
-     * @since 2.0
      * @version $Revision: 2696 $
      * @see java.util.HashMap
+     * @since 2.0
      */
     static class IntHashMap {
 
@@ -1045,10 +1016,10 @@ class Entities {
             /**
              * <p>Create a new entry with the given values.</p>
              *
-             * @param hash The code used to hash the object with
-             * @param key The key used to enter this in the table
+             * @param hash  The code used to hash the object with
+             * @param key   The key used to enter this in the table
              * @param value The value for this key
-             * @param next A reference to the next entry in the table
+             * @param next  A reference to the next entry in the table
              */
             protected Entry(int hash, int key, Object value, Entry next) {
                 this.hash = hash;
@@ -1070,9 +1041,9 @@ class Entities {
          * <p>Constructs a new, empty hashtable with the specified initial capacity
          * and default load factor, which is <code>0.75</code>.</p>
          *
-         * @param  initialCapacity the initial capacity of the hashtable.
+         * @param initialCapacity the initial capacity of the hashtable.
          * @throws IllegalArgumentException if the initial capacity is less
-         *   than zero.
+         *                                  than zero.
          */
         public IntHashMap(int initialCapacity) {
             this(initialCapacity, 0.75f);
@@ -1083,9 +1054,9 @@ class Entities {
          * capacity and the specified load factor.</p>
          *
          * @param initialCapacity the initial capacity of the hashtable.
-         * @param loadFactor the load factor of the hashtable.
-         * @throws IllegalArgumentException  if the initial capacity is less
-         *             than zero, or if the load factor is nonpositive.
+         * @param loadFactor      the load factor of the hashtable.
+         * @throws IllegalArgumentException if the initial capacity is less
+         *                                  than zero, or if the load factor is nonpositive.
          */
         public IntHashMap(int initialCapacity, float loadFactor) {
             super();
@@ -1107,7 +1078,7 @@ class Entities {
         /**
          * <p>Returns the number of keys in this hashtable.</p>
          *
-         * @return  the number of keys in this hashtable.
+         * @return the number of keys in this hashtable.
          */
         public int size() {
             return count;
@@ -1116,8 +1087,8 @@ class Entities {
         /**
          * <p>Tests if this hashtable maps no keys to values.</p>
          *
-         * @return  <code>true</code> if this hashtable maps no keys to values;
-         *          <code>false</code> otherwise.
+         * @return <code>true</code> if this hashtable maps no keys to values;
+         * <code>false</code> otherwise.
          */
         public boolean isEmpty() {
             return count == 0;
@@ -1127,19 +1098,19 @@ class Entities {
          * <p>Tests if some key maps into the specified value in this hashtable.
          * This operation is more expensive than the <code>containsKey</code>
          * method.</p>
-         *
+         * <p/>
          * <p>Note that this method is identical in functionality to containsValue,
          * (which is part of the Map interface in the collections framework).</p>
          *
-         * @param      value   a value to search for.
-         * @return     <code>true</code> if and only if some key maps to the
-         *             <code>value</code> argument in this hashtable as
-         *             determined by the <tt>equals</tt> method;
-         *             <code>false</code> otherwise.
-         * @throws  NullPointerException  if the value is <code>null</code>.
-         * @see        #containsKey(int)
-         * @see        #containsValue(Object)
-         * @see        java.util.Map
+         * @param value a value to search for.
+         * @return <code>true</code> if and only if some key maps to the
+         * <code>value</code> argument in this hashtable as
+         * determined by the <tt>equals</tt> method;
+         * <code>false</code> otherwise.
+         * @throws NullPointerException if the value is <code>null</code>.
+         * @see #containsKey(int)
+         * @see #containsValue(Object)
+         * @see java.util.Map
          */
         public boolean contains(Object value) {
             if (value == null) {
@@ -1147,7 +1118,7 @@ class Entities {
             }
 
             Entry tab[] = table;
-            for (int i = tab.length; i-- > 0;) {
+            for (int i = tab.length; i-- > 0; ) {
                 for (Entry e = tab[i]; e != null; e = e.next) {
                     if (e.value.equals(value)) {
                         return true;
@@ -1160,13 +1131,13 @@ class Entities {
         /**
          * <p>Returns <code>true</code> if this HashMap maps one or more keys
          * to this value.</p>
-         *
+         * <p/>
          * <p>Note that this method is identical in functionality to contains
          * (which predates the Map interface).</p>
          *
          * @param value value whose presence in this HashMap is to be tested.
          * @return boolean <code>true</code> if the value is contained
-         * @see    java.util.Map
+         * @see java.util.Map
          * @since JDK1.2
          */
         public boolean containsValue(Object value) {
@@ -1176,10 +1147,10 @@ class Entities {
         /**
          * <p>Tests if the specified object is a key in this hashtable.</p>
          *
-         * @param  key  possible key.
+         * @param key possible key.
          * @return <code>true</code> if and only if the specified object is a
-         *    key in this hashtable, as determined by the <tt>equals</tt>
-         *    method; <code>false</code> otherwise.
+         * key in this hashtable, as determined by the <tt>equals</tt>
+         * method; <code>false</code> otherwise.
          * @see #contains(Object)
          */
         public boolean containsKey(int key) {
@@ -1197,11 +1168,11 @@ class Entities {
         /**
          * <p>Returns the value to which the specified key is mapped in this map.</p>
          *
-         * @param   key   a key in the hashtable.
-         * @return  the value to which the key is mapped in this hashtable;
-         *          <code>null</code> if the key is not mapped to any value in
-         *          this hashtable.
-         * @see     #put(int, Object)
+         * @param key a key in the hashtable.
+         * @return the value to which the key is mapped in this hashtable;
+         * <code>null</code> if the key is not mapped to any value in
+         * this hashtable.
+         * @see #put(int, Object)
          */
         public Object get(int key) {
             Entry tab[] = table;
@@ -1219,7 +1190,7 @@ class Entities {
          * <p>Increases the capacity of and internally reorganizes this
          * hashtable, in order to accommodate and access its entries more
          * efficiently.</p>
-         *
+         * <p/>
          * <p>This method is called automatically when the number of keys
          * in the hashtable exceeds this hashtable's capacity and load
          * factor.</p>
@@ -1234,8 +1205,8 @@ class Entities {
             threshold = (int) (newCapacity * loadFactor);
             table = newMap;
 
-            for (int i = oldCapacity; i-- > 0;) {
-                for (Entry old = oldMap[i]; old != null;) {
+            for (int i = oldCapacity; i-- > 0; ) {
+                for (Entry old = oldMap[i]; old != null; ) {
                     Entry e = old;
                     old = old.next;
 
@@ -1250,16 +1221,16 @@ class Entities {
          * <p>Maps the specified <code>key</code> to the specified
          * <code>value</code> in this hashtable. The key cannot be
          * <code>null</code>. </p>
-         *
+         * <p/>
          * <p>The value can be retrieved by calling the <code>get</code> method
          * with a key that is equal to the original key.</p>
          *
-         * @param key     the hashtable key.
-         * @param value   the value.
+         * @param key   the hashtable key.
+         * @param value the value.
          * @return the previous value of the specified key in this hashtable,
-         *         or <code>null</code> if it did not have one.
-         * @throws  NullPointerException  if the key is <code>null</code>.
-         * @see     #get(int)
+         * or <code>null</code> if it did not have one.
+         * @throws NullPointerException if the key is <code>null</code>.
+         * @see #get(int)
          */
         public Object put(int key, Object value) {
             // Makes sure the key is not already in the hashtable.
@@ -1292,13 +1263,13 @@ class Entities {
         /**
          * <p>Removes the key (and its corresponding value) from this
          * hashtable.</p>
-         *
+         * <p/>
          * <p>This method does nothing if the key is not present in the
          * hashtable.</p>
          *
-         * @param   key   the key that needs to be removed.
-         * @return  the value to which the key had been mapped in this hashtable,
-         *          or <code>null</code> if the key did not have a mapping.
+         * @param key the key that needs to be removed.
+         * @return the value to which the key had been mapped in this hashtable,
+         * or <code>null</code> if the key did not have a mapping.
          */
         public Object remove(int key) {
             Entry tab[] = table;
@@ -1325,7 +1296,7 @@ class Entities {
          */
         public synchronized void clear() {
             Entry tab[] = table;
-            for (int index = tab.length; --index >= 0;) {
+            for (int index = tab.length; --index >= 0; ) {
                 tab[index] = null;
             }
             count = 0;
diff --git a/astrid/src/com/todoroo/astrid/utility/ResourceDrawableCache.java b/astrid/src/com/todoroo/astrid/utility/ResourceDrawableCache.java
index 166bb9c42..e76ada59e 100644
--- a/astrid/src/com/todoroo/astrid/utility/ResourceDrawableCache.java
+++ b/astrid/src/com/todoroo/astrid/utility/ResourceDrawableCache.java
@@ -9,8 +9,8 @@ import com.todoroo.andlib.service.ContextManager;
 /**
  * This class caches common images based on resource ID to avoid
  * the performance hit from constantly loading them from disk
- * @author Sam
  *
+ * @author Sam
  */
 public class ResourceDrawableCache {
 
@@ -28,43 +28,43 @@ public class ResourceDrawableCache {
     public static Drawable getImageDrawableFromId(Resources r, int resId) {
         if (r == null)
             r = ContextManager.getResources();
-        switch(resId) {
-        case R.drawable.icn_default_person_image:
-            if (ICN_DEFAULT_PERSON_IMAGE == null)
-                ICN_DEFAULT_PERSON_IMAGE = r.getDrawable(resId);
-            return ICN_DEFAULT_PERSON_IMAGE;
-        case R.drawable.icn_anyone:
-            if (ICN_ANYONE == null)
-                ICN_ANYONE = r.getDrawable(resId);
-            return ICN_ANYONE;
-        case R.drawable.icn_anyone_transparent:
-            if (ICN_ANYONE_TRANSPARENT == null)
-                ICN_ANYONE_TRANSPARENT = r.getDrawable(resId);
-            return ICN_ANYONE_TRANSPARENT;
-        case R.drawable.icn_add_contact:
-            if (ICN_ADD_CONTACT == null)
-                ICN_ADD_CONTACT = r.getDrawable(resId);
-            return ICN_ADD_CONTACT;
+        switch (resId) {
+            case R.drawable.icn_default_person_image:
+                if (ICN_DEFAULT_PERSON_IMAGE == null)
+                    ICN_DEFAULT_PERSON_IMAGE = r.getDrawable(resId);
+                return ICN_DEFAULT_PERSON_IMAGE;
+            case R.drawable.icn_anyone:
+                if (ICN_ANYONE == null)
+                    ICN_ANYONE = r.getDrawable(resId);
+                return ICN_ANYONE;
+            case R.drawable.icn_anyone_transparent:
+                if (ICN_ANYONE_TRANSPARENT == null)
+                    ICN_ANYONE_TRANSPARENT = r.getDrawable(resId);
+                return ICN_ANYONE_TRANSPARENT;
+            case R.drawable.icn_add_contact:
+                if (ICN_ADD_CONTACT == null)
+                    ICN_ADD_CONTACT = r.getDrawable(resId);
+                return ICN_ADD_CONTACT;
 
-        case R.drawable.default_list_0:
-            if (DEFAULT_LIST_0 == null)
-                DEFAULT_LIST_0 = r.getDrawable(resId);
-            return DEFAULT_LIST_0;
-        case R.drawable.default_list_1:
-            if (DEFAULT_LIST_1 == null)
-                DEFAULT_LIST_1 = r.getDrawable(resId);
-            return DEFAULT_LIST_1;
-        case R.drawable.default_list_2:
-            if (DEFAULT_LIST_2 == null)
-                DEFAULT_LIST_2 = r.getDrawable(resId);
-            return DEFAULT_LIST_2;
-        case R.drawable.default_list_3:
-            if (DEFAULT_LIST_3 == null)
-                DEFAULT_LIST_3 = r.getDrawable(resId);
-            return DEFAULT_LIST_3;
+            case R.drawable.default_list_0:
+                if (DEFAULT_LIST_0 == null)
+                    DEFAULT_LIST_0 = r.getDrawable(resId);
+                return DEFAULT_LIST_0;
+            case R.drawable.default_list_1:
+                if (DEFAULT_LIST_1 == null)
+                    DEFAULT_LIST_1 = r.getDrawable(resId);
+                return DEFAULT_LIST_1;
+            case R.drawable.default_list_2:
+                if (DEFAULT_LIST_2 == null)
+                    DEFAULT_LIST_2 = r.getDrawable(resId);
+                return DEFAULT_LIST_2;
+            case R.drawable.default_list_3:
+                if (DEFAULT_LIST_3 == null)
+                    DEFAULT_LIST_3 = r.getDrawable(resId);
+                return DEFAULT_LIST_3;
 
-        default:
-            return r.getDrawable(resId);
+            default:
+                return r.getDrawable(resId);
         }
     }
 
diff --git a/astrid/src/com/todoroo/astrid/utility/StringEscapeUtils.java b/astrid/src/com/todoroo/astrid/utility/StringEscapeUtils.java
index 45e4b8c35..113697ff3 100644
--- a/astrid/src/com/todoroo/astrid/utility/StringEscapeUtils.java
+++ b/astrid/src/com/todoroo/astrid/utility/StringEscapeUtils.java
@@ -33,8 +33,8 @@ import java.io.Writer;
  * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
  * @author Phil Steitz
  * @author Pete Gieser
- * @since 2.0
  * @version $Id: StringEscapeUtils.java 2696 2007-06-20 13:24:53Z damencho $
+ * @since 2.0
  */
 @SuppressWarnings({"nls"})
 public class StringEscapeUtils {
@@ -42,31 +42,32 @@ public class StringEscapeUtils {
     /**
      * <p><code>StringEscapeUtils</code> instances should NOT be constructed in
      * standard programming.</p>
-     *
+     * <p/>
      * <p>Instead, the class should be used as:
      * <pre>StringEscapeUtils.escapeJava("foo");</pre></p>
-     *
+     * <p/>
      * <p>This constructor is public to permit tools that require a JavaBean
      * instance to operate.</p>
      */
     public StringEscapeUtils() {
-      super();
+        super();
     }
 
     //-----------------------------------------------------------------------
+
     /**
      * <p>Unescapes a string containing entity escapes to a string
      * containing the actual Unicode characters corresponding to the
      * escapes. Supports HTML 4.0 entities.</p>
-     *
+     * <p/>
      * <p>For example, the string "&amp;lt;Fran&amp;ccedil;ais&amp;gt;"
      * will become "&lt;Fran&ccedil;ais&gt;"</p>
-     *
+     * <p/>
      * <p>If an entity is unrecognized, it is left alone, and inserted
      * verbatim into the result string. e.g. "&amp;gt;&amp;zzzz;x" will
      * become "&gt;&amp;zzzz;x".</p>
      *
-     * @param str  the <code>String</code> to unescape, may be null
+     * @param str the <code>String</code> to unescape, may be null
      * @return a new unescaped <code>String</code>, <code>null</code> if null string input
      * @see #escapeHtml(Writer, String)
      */
@@ -75,7 +76,7 @@ public class StringEscapeUtils {
             return null;
         }
         try {
-            StringWriter writer = new StringWriter ((int)(str.length() * 1.5));
+            StringWriter writer = new StringWriter((int) (str.length() * 1.5));
             unescapeHtml(writer, str);
             return writer.toString();
         } catch (IOException e) {
@@ -90,23 +91,23 @@ public class StringEscapeUtils {
      * <p>Unescapes a string containing entity escapes to a string
      * containing the actual Unicode characters corresponding to the
      * escapes. Supports HTML 4.0 entities.</p>
-     *
+     * <p/>
      * <p>For example, the string "&amp;lt;Fran&amp;ccedil;ais&amp;gt;"
      * will become "&lt;Fran&ccedil;ais&gt;"</p>
-     *
+     * <p/>
      * <p>If an entity is unrecognized, it is left alone, and inserted
      * verbatim into the result string. e.g. "&amp;gt;&amp;zzzz;x" will
      * become "&gt;&amp;zzzz;x".</p>
      *
-     * @param writer  the writer receiving the unescaped string, not null
-     * @param string  the <code>String</code> to unescape, may be null
+     * @param writer the writer receiving the unescaped string, not null
+     * @param string the <code>String</code> to unescape, may be null
      * @throws IllegalArgumentException if the writer is null
-     * @throws IOException if an IOException occurs
+     * @throws IOException              if an IOException occurs
      * @see #escapeHtml(String)
      */
     public static void unescapeHtml(Writer writer, String string) throws IOException {
-        if (writer == null ) {
-            throw new IllegalArgumentException ("The Writer must not be null.");
+        if (writer == null) {
+            throw new IllegalArgumentException("The Writer must not be null.");
         }
         if (string == null) {
             return;
diff --git a/astrid/src/com/todoroo/astrid/utility/SyncMetadataService.java b/astrid/src/com/todoroo/astrid/utility/SyncMetadataService.java
index 8a0d28cf2..4d0bd2ffc 100644
--- a/astrid/src/com/todoroo/astrid/utility/SyncMetadataService.java
+++ b/astrid/src/com/todoroo/astrid/utility/SyncMetadataService.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.utility;
 
-import java.util.ArrayList;
-
 import android.content.Context;
 
 import com.todoroo.andlib.data.Property;
@@ -25,9 +23,13 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.sync.SyncContainer;
 import com.todoroo.astrid.sync.SyncProviderUtilities;
 
+import java.util.ArrayList;
+
 abstract public class SyncMetadataService<TYPE extends SyncContainer> {
 
-    /** metadata key of tag add-on */
+    /**
+     * metadata key of tag add-on
+     */
     public static final String TAG_KEY = "tags-tag"; //$NON-NLS-1$
 
     // --- instance variables
@@ -39,22 +41,34 @@ abstract public class SyncMetadataService<TYPE extends SyncContainer> {
 
     // --- abstract methods
 
-    /** @return metadata key identifying this sync provider's metadata */
+    /**
+     * @return metadata key identifying this sync provider's metadata
+     */
     abstract public String getMetadataKey();
 
-    /** @return sync provider utilities */
+    /**
+     * @return sync provider utilities
+     */
     abstract public SyncProviderUtilities getUtilities();
 
-    /** create a task container based on the given data */
+    /**
+     * create a task container based on the given data
+     */
     abstract public TYPE createContainerFromLocalTask(Task task, ArrayList<Metadata> metadata);
 
-    /** @return criterion for matching all metadata keys that your provider synchronizes */
+    /**
+     * @return criterion for matching all metadata keys that your provider synchronizes
+     */
     abstract public Criterion getMetadataCriteria();
 
-    /** @return criterion for finding local matches of sync container in task database */
+    /**
+     * @return criterion for finding local matches of sync container in task database
+     */
     abstract public Criterion getLocalMatchCriteria(TYPE remoteTask);
 
-    /** @return criterion for matching metadata that indicate remote task exists */
+    /**
+     * @return criterion for matching metadata that indicate remote task exists
+     */
     abstract public Criterion getMetadataWithRemoteId();
 
     // --- implementation
@@ -78,11 +92,12 @@ abstract public class SyncMetadataService<TYPE extends SyncContainer> {
     private TodorooCursor<Metadata> getRemoteTaskMetadata() {
         return metadataDao.query(Query.select(Metadata.TASK).where(
                 Criterion.and(MetadataCriteria.withKey(getMetadataKey()),
-                getMetadataWithRemoteId())).orderBy(Order.asc(Metadata.TASK)));
+                        getMetadataWithRemoteId())).orderBy(Order.asc(Metadata.TASK)));
     }
 
     /**
      * Gets tasks that were created since last sync
+     *
      * @param properties
      * @return
      */
@@ -95,13 +110,14 @@ abstract public class SyncMetadataService<TYPE extends SyncContainer> {
 
     /**
      * Gets tasks that were modified since last sync
+     *
      * @param properties
      * @return null if never sync'd
      */
     public TodorooCursor<Task> getLocallyUpdated(Property<?>... properties) {
         TodorooCursor<Task> tasks;
         long lastSyncDate = getUtilities().getLastSyncDate();
-        if(lastSyncDate == 0)
+        if (lastSyncDate == 0)
             tasks = taskDao.query(Query.select(Task.ID).where(Criterion.none));
         else
             tasks = taskDao.query(Query.select(Task.ID).where(Criterion.and(TaskCriteria.ownedByMe(), Task.MODIFICATION_DATE.gt(lastSyncDate)))
@@ -121,7 +137,7 @@ abstract public class SyncMetadataService<TYPE extends SyncContainer> {
     }
 
     private TodorooCursor<Task> joinWithMetadata(TodorooCursor<Task> tasks,
-            boolean both, Property<?>... properties) {
+                                                 boolean both, Property<?>... properties) {
         try {
             TodorooCursor<Metadata> metadata = getRemoteTaskMetadata();
             try {
@@ -129,8 +145,8 @@ abstract public class SyncMetadataService<TYPE extends SyncContainer> {
                 joinRows(tasks, metadata, matchingRows, both);
 
                 return
-                taskDao.query(Query.select(properties).where(Task.ID.in(
-                        matchingRows.toArray(new Long[matchingRows.size()]))));
+                        taskDao.query(Query.select(properties).where(Task.ID.in(
+                                matchingRows.toArray(new Long[matchingRows.size()]))));
             } finally {
                 metadata.close();
             }
@@ -141,53 +157,55 @@ abstract public class SyncMetadataService<TYPE extends SyncContainer> {
 
     /**
      * Join rows from two cursors on the first column, assuming its an id column
+     *
      * @param left
      * @param right
      * @param matchingRows
-     * @param both - if false, returns rows no right row exists, if true,
-     *        returns rows where both exist
+     * @param both         - if false, returns rows no right row exists, if true,
+     *                     returns rows where both exist
      */
     private static void joinRows(TodorooCursor<?> left,
-            TodorooCursor<?> right, ArrayList<Long> matchingRows,
-            boolean both) {
+                                 TodorooCursor<?> right, ArrayList<Long> matchingRows,
+                                 boolean both) {
 
         left.moveToPosition(-1);
         right.moveToFirst();
 
-        while(true) {
+        while (true) {
             left.moveToNext();
-            if(left.isAfterLast())
+            if (left.isAfterLast())
                 break;
             long leftValue = left.getLong(0);
 
             // advance right until it is equal or bigger
-            while(!right.isAfterLast() && right.getLong(0) < leftValue) {
+            while (!right.isAfterLast() && right.getLong(0) < leftValue) {
                 right.moveToNext();
             }
 
-            if(right.isAfterLast()) {
-                if(!both)
+            if (right.isAfterLast()) {
+                if (!both)
                     matchingRows.add(leftValue);
                 continue;
             }
 
-            if((right.getLong(0) == leftValue) == both)
+            if ((right.getLong(0) == leftValue) == both)
                 matchingRows.add(leftValue);
         }
     }
 
     /**
      * Searches for a local task with same remote id, updates this task's id
+     *
      * @param remoteTask
      */
     public void findLocalMatch(TYPE remoteTask) {
-        if(remoteTask.task.getId() != Task.NO_ID)
+        if (remoteTask.task.getId() != Task.NO_ID)
             return;
         TodorooCursor<Metadata> cursor = metadataDao.query(Query.select(Metadata.TASK).
                 where(Criterion.and(MetadataCriteria.withKey(getMetadataKey()),
                         getLocalMatchCriteria(remoteTask))));
         try {
-            if(cursor.getCount() == 0)
+            if (cursor.getCount() == 0)
                 return;
             cursor.moveToFirst();
             remoteTask.task.setId(cursor.get(Metadata.TASK));
@@ -198,6 +216,7 @@ abstract public class SyncMetadataService<TYPE extends SyncContainer> {
 
     /**
      * Saves a task and its metadata
+     *
      * @param task
      */
     public void saveTaskAndMetadata(TYPE task) {
@@ -209,6 +228,7 @@ abstract public class SyncMetadataService<TYPE extends SyncContainer> {
 
     /**
      * Reads a task and its metadata
+     *
      * @param task
      * @return
      */
@@ -220,7 +240,7 @@ abstract public class SyncMetadataService<TYPE extends SyncContainer> {
                 where(Criterion.and(MetadataCriteria.byTask(task.getId()),
                         getMetadataCriteria())));
         try {
-            for(metadataCursor.moveToFirst(); !metadataCursor.isAfterLast(); metadataCursor.moveToNext()) {
+            for (metadataCursor.moveToFirst(); !metadataCursor.isAfterLast(); metadataCursor.moveToNext()) {
                 metadata.add(new Metadata(metadataCursor));
             }
         } finally {
@@ -232,13 +252,14 @@ abstract public class SyncMetadataService<TYPE extends SyncContainer> {
 
     /**
      * Reads metadata out of a task
+     *
      * @return null if no metadata found
      */
     public Metadata getTaskMetadata(long taskId) {
         TodorooCursor<Metadata> cursor = metadataDao.query(Query.select(Metadata.PROPERTIES).where(
                 MetadataCriteria.byTaskAndwithKey(taskId, getMetadataKey())));
         try {
-            if(cursor.getCount() == 0)
+            if (cursor.getCount() == 0)
                 return null;
             cursor.moveToFirst();
             return new Metadata(cursor);
diff --git a/astrid/src/com/todoroo/astrid/utility/TitleParser.java b/astrid/src/com/todoroo/astrid/utility/TitleParser.java
index 4618a4d56..f612f7c88 100644
--- a/astrid/src/com/todoroo/astrid/utility/TitleParser.java
+++ b/astrid/src/com/todoroo/astrid/utility/TitleParser.java
@@ -5,14 +5,6 @@
  */
 package com.todoroo.astrid.utility;
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import android.text.TextUtils;
 
 import com.google.ical.values.Frequency;
@@ -22,28 +14,37 @@ import com.mdimension.jchronic.Chronic;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.tags.TagService;
 
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 @SuppressWarnings("nls")
 public class TitleParser {
 
     public static boolean parse(Task task, ArrayList<String> tags) {
         boolean markup = false;
         markup = repeatHelper(task) || markup;
-        listHelper(task,tags); // Don't need to know if tags affected things since we don't show alerts for them
+        listHelper(task, tags); // Don't need to know if tags affected things since we don't show alerts for them
         markup = dayHelper(task) || markup;
         markup = priorityHelper(task) || markup;
         return markup;
     }
 
-    public static String trimParenthesis(String pattern){
+    public static String trimParenthesis(String pattern) {
         if (pattern.charAt(0) == '#' || pattern.charAt(0) == '@') {
             pattern = pattern.substring(1);
         }
         if ('(' == pattern.charAt(0)) {
-            String list = pattern.substring(1, pattern.length()-1);
+            String list = pattern.substring(1, pattern.length() - 1);
             return list;
         }
         return pattern;
     }
+
     public static boolean listHelper(Task task, ArrayList<String> tags) {
         String inputText = task.getValue(Task.TITLE);
         Pattern tagPattern = Pattern.compile("(\\s|^)#(\\(.*\\)|[^\\s]+)");
@@ -53,9 +54,9 @@ public class TitleParser {
         Set<String> addedTags = new HashSet<String>();
         TagService tagService = TagService.getInstance();
 
-        while(true) {
+        while (true) {
             Matcher m = tagPattern.matcher(inputText);
-            if(m.find()) {
+            if (m.find()) {
                 result = true;
                 String tag = TitleParser.trimParenthesis(m.group(2));
                 String tagWithCase = tagService.getTagWithCase(tag);
@@ -64,14 +65,14 @@ public class TitleParser {
                 addedTags.add(tagWithCase);
             } else {
                 m = contextPattern.matcher(inputText);
-                if(m.find()) {
+                if (m.find()) {
                     result = true;
                     String tag = TitleParser.trimParenthesis(m.group(2));
                     String tagWithCase = tagService.getTagWithCase(tag);
                     if (!addedTags.contains(tagWithCase))
                         tags.add(tagWithCase);
                     addedTags.add(tagWithCase);
-                } else{
+                } else {
                     break;
                 }
             }
@@ -83,10 +84,10 @@ public class TitleParser {
 
     //helper method for priorityHelper. converts the string to a Task Importance
     private static int strToPriority(String priorityStr) {
-        if (priorityStr!=null)
+        if (priorityStr != null)
             priorityStr.toLowerCase().trim();
         int priority = Task.IMPORTANCE_DO_OR_DIE;
-        if ("0".equals(priorityStr) || "!0".equals(priorityStr) || "least".equals(priorityStr) ||  "lowest".equals(priorityStr))
+        if ("0".equals(priorityStr) || "!0".equals(priorityStr) || "least".equals(priorityStr) || "lowest".equals(priorityStr))
             priority = Task.IMPORTANCE_NONE;
         if ("!".equals(priorityStr) || "!1".equals(priorityStr) || "bang".equals(priorityStr) || "1".equals(priorityStr) || "low".equals(priorityStr))
             priority = Task.IMPORTANCE_SHOULD_DO;
@@ -106,11 +107,11 @@ public class TitleParser {
                 "(?i)()(\\shigh(est)?|\\slow(est)?|\\stop|\\sleast) ?priority$"
         };
         boolean result = false;
-        for (String importanceString:importanceStrings){
+        for (String importanceString : importanceStrings) {
             Pattern importancePattern = Pattern.compile(importanceString);
-            while (true){
+            while (true) {
                 Matcher m = importancePattern.matcher(inputText);
-                if(m.find()) {
+                if (m.find()) {
                     result = true;
                     task.setValue(Task.IMPORTANCE, strToPriority(m.group(2).trim()));
                     int start = m.start() == 0 ? 0 : m.start() + 1;
@@ -127,13 +128,13 @@ public class TitleParser {
     //helper for dayHelper. Converts am/pm to an int 0/1.
     private static int ampmToNumber(String amPmString) {
         int time = Calendar.PM;
-        if (amPmString == null){
+        if (amPmString == null) {
             return time;
         }
         String text = amPmString.toLowerCase().trim();
-        if (text.equals ("am") || text.equals ("a.m") || text.equals("a"))
+        if (text.equals("am") || text.equals("a.m") || text.equals("a"))
             time = Calendar.AM;
-        if (text.equals ("pm") || text.equals ("p.m") || text.equals("p"))
+        if (text.equals("pm") || text.equals("p.m") || text.equals("p"))
             time = Calendar.PM;
         return time;
     }
@@ -158,7 +159,7 @@ public class TitleParser {
     //Handles setting the task's date.
     //Day of week (e.g. Monday, Tuesday,..) is overridden by a set date (e.g. October 23 2013).
     //Vague times (e.g. breakfast, night) are overridden by a set time (9 am, at 10, 17:00)
-    private static boolean dayHelper(Task task ) {
+    private static boolean dayHelper(Task task) {
         if (task.containsNonNullValue(Task.DUE_DATE))
             return false;
         String inputText = task.getValue(Task.TITLE);
@@ -176,7 +177,7 @@ public class TitleParser {
                 "(?i)(\\(|\\b)sun(day(\\)|\\b)|(\\)|\\.))"
         };
 
-        for (String date : daysOfWeek){
+        for (String date : daysOfWeek) {
             Pattern pattern = Pattern.compile(date);
             Matcher m = pattern.matcher(inputText);
             if (m.find()) {
@@ -205,11 +206,11 @@ public class TitleParser {
 
         // m.group(2) = "month"
         //m.group(5) = "day"
-        for (String date: dates) {
+        for (String date : dates) {
             Pattern pattern = Pattern.compile(date);
             Matcher m = pattern.matcher(inputText);
 
-            if (m.find()){
+            if (m.find()) {
                 Calendar dateCal = Chronic.parse(m.group(2)).getBeginCalendar();
                 if (m.group(5) != null) {
                     dateCal.set(Calendar.DAY_OF_MONTH, Integer.parseInt(m.group(5)));
@@ -222,9 +223,9 @@ public class TitleParser {
                 }
                 if (cal == null) {
                     cal = dateCal;
-                } else{
+                } else {
                     cal.set(Calendar.DAY_OF_MONTH, dateCal.get(Calendar.DAY_OF_MONTH));
-                    cal.set(Calendar.MONTH,dateCal.get(Calendar.MONTH) );
+                    cal.set(Calendar.MONTH, dateCal.get(Calendar.MONTH));
                     cal.set(Calendar.YEAR, dateCal.get(Calendar.YEAR));
                 }
                 inputText = removeIfParenthetical(m, inputText);
@@ -234,23 +235,23 @@ public class TitleParser {
         // for dates in the format MM/DD
         Pattern p = Pattern.compile("(?i)(\\(|\\b)(1[0-2]|0?[1-9])(\\/|-)(3[0-1]|[0-2]?[0-9])(\\/|-)?(\\d{4}|\\d{2})?(\\)|\\b)");
         Matcher match = p.matcher(inputText);
-        if (match.find()){
+        if (match.find()) {
             Calendar dCal = Calendar.getInstance();
             setCalendarToDefaultTime(dCal);
             dCal.set(Calendar.MONTH, Integer.parseInt(match.group(2).trim()) - 1);
             dCal.set(Calendar.DAY_OF_MONTH, Integer.parseInt(match.group(4)));
             if (match.group(6) != null && !(match.group(6).trim()).equals("")) {
                 String yearString = match.group(6);
-                if(match.group(6).length() == 2)
+                if (match.group(6).length() == 2)
                     yearString = "20" + match.group(6);
                 dCal.set(Calendar.YEAR, Integer.parseInt(yearString));
             }
 
             if (cal == null) {
                 cal = dCal;
-            } else{
+            } else {
                 cal.set(Calendar.DAY_OF_MONTH, dCal.get(Calendar.DAY_OF_MONTH));
-                cal.set(Calendar.MONTH,dCal.get(Calendar.MONTH));
+                cal.set(Calendar.MONTH, dCal.get(Calendar.MONTH));
                 cal.set(Calendar.YEAR, dCal.get(Calendar.YEAR));
             }
             inputText = removeIfParenthetical(match, inputText);
@@ -303,7 +304,7 @@ public class TitleParser {
                 //m.group(4) holds am/pm
         };
 
-        for (String time : times){
+        for (String time : times) {
             Pattern pattern = Pattern.compile(time);
             Matcher m = pattern.matcher(inputText);
             if (m.find()) {
@@ -321,24 +322,24 @@ public class TitleParser {
                     timeCal.set(Calendar.AM_PM, ampmToNumber(m.group(4)));
 
                 //sets it to the next occurrence of that hour if no am/pm is provided. doesn't include military time
-                if (Integer.parseInt(m.group(2))<= 12 && (m.group(4)==null || (m.group(4).trim()).equals(""))) {
-                    while (timeCal.getTime().getTime() < today.getTime().getTime()){
-                        timeCal.set(Calendar.HOUR_OF_DAY, timeCal.get(Calendar.HOUR_OF_DAY)+12);
+                if (Integer.parseInt(m.group(2)) <= 12 && (m.group(4) == null || (m.group(4).trim()).equals(""))) {
+                    while (timeCal.getTime().getTime() < today.getTime().getTime()) {
+                        timeCal.set(Calendar.HOUR_OF_DAY, timeCal.get(Calendar.HOUR_OF_DAY) + 12);
                     }
                 } else { //if am/pm is provided and the time is in the past, set it to the next day. Military time included.
-                    if (timeCal.get(Calendar.HOUR) !=0 && (timeCal.getTime().getTime() < today.getTime().getTime())) {
+                    if (timeCal.get(Calendar.HOUR) != 0 && (timeCal.getTime().getTime() < today.getTime().getTime())) {
                         timeCal.set(Calendar.DAY_OF_MONTH, timeCal.get(Calendar.DAY_OF_MONTH) + 1);
                     }
-                    if (timeCal.get(Calendar.HOUR) == 0){
+                    if (timeCal.get(Calendar.HOUR) == 0) {
                         timeCal.set(Calendar.HOUR, 12);
                     }
                 }
 
-                if (cal == null){
+                if (cal == null) {
                     cal = timeCal;
                 } else {
                     cal.set(Calendar.HOUR, timeCal.get(Calendar.HOUR));
-                    cal.set(Calendar.MINUTE,timeCal.get(Calendar.MINUTE) );
+                    cal.set(Calendar.MINUTE, timeCal.get(Calendar.MINUTE));
                     cal.set(Calendar.SECOND, timeCal.get(Calendar.SECOND));
                     cal.set(Calendar.AM_PM, timeCal.get(Calendar.AM_PM));
                 }
@@ -346,7 +347,7 @@ public class TitleParser {
             }
         }
 
-        if(cal != null) { //if at least one of the above has been called, write to task. else do nothing.
+        if (cal != null) { //if at least one of the above has been called, write to task. else do nothing.
             if (!TextUtils.isEmpty(inputText))
                 task.setValue(Task.TITLE, inputText);
             if (containsSpecificTime) {
@@ -366,11 +367,11 @@ public class TitleParser {
             return false;
         String inputText = task.getValue(Task.TITLE);
         HashMap<String, Frequency> repeatTimes = new HashMap<String, Frequency>();
-        repeatTimes.put("(?i)\\bevery ?\\w{0,6} days?\\b" , Frequency.DAILY);
-        repeatTimes.put("(?i)\\bevery ?\\w{0,6} ?nights?\\b" , Frequency.DAILY);
-        repeatTimes.put("(?i)\\bevery ?\\w{0,6} ?mornings?\\b" , Frequency.DAILY);
-        repeatTimes.put("(?i)\\bevery ?\\w{0,6} ?evenings?\\b" , Frequency.DAILY);
-        repeatTimes.put("(?i)\\bevery ?\\w{0,6} ?afternoons?\\b" , Frequency.DAILY);
+        repeatTimes.put("(?i)\\bevery ?\\w{0,6} days?\\b", Frequency.DAILY);
+        repeatTimes.put("(?i)\\bevery ?\\w{0,6} ?nights?\\b", Frequency.DAILY);
+        repeatTimes.put("(?i)\\bevery ?\\w{0,6} ?mornings?\\b", Frequency.DAILY);
+        repeatTimes.put("(?i)\\bevery ?\\w{0,6} ?evenings?\\b", Frequency.DAILY);
+        repeatTimes.put("(?i)\\bevery ?\\w{0,6} ?afternoons?\\b", Frequency.DAILY);
         repeatTimes.put("(?i)\\bevery \\w{0,6} ?weeks?\\b", Frequency.WEEKLY);
         repeatTimes.put("(?i)\\bevery \\w{0,6} ?(mon|tues|wednes|thurs|fri|satur|sun)days?\\b", Frequency.WEEKLY);
         repeatTimes.put("(?i)\\bevery \\w{0,6} ?months?\\b", Frequency.MONTHLY);
@@ -378,17 +379,17 @@ public class TitleParser {
 
         HashMap<String, Frequency> repeatTimesIntervalOne = new HashMap<String, Frequency>();
         //pre-determined intervals of 1
-        repeatTimesIntervalOne.put( "(?i)\\bdaily\\b" , Frequency.DAILY);
-        repeatTimesIntervalOne.put( "(?i)\\beveryday\\b" , Frequency.DAILY);
-        repeatTimesIntervalOne.put( "(?i)\\bweekly\\b" , Frequency.WEEKLY);
-        repeatTimesIntervalOne.put( "(?i)\\bmonthly\\b" ,Frequency.MONTHLY);
-        repeatTimesIntervalOne.put( "(?i)\\byearly\\b" , Frequency.YEARLY);
+        repeatTimesIntervalOne.put("(?i)\\bdaily\\b", Frequency.DAILY);
+        repeatTimesIntervalOne.put("(?i)\\beveryday\\b", Frequency.DAILY);
+        repeatTimesIntervalOne.put("(?i)\\bweekly\\b", Frequency.WEEKLY);
+        repeatTimesIntervalOne.put("(?i)\\bmonthly\\b", Frequency.MONTHLY);
+        repeatTimesIntervalOne.put("(?i)\\byearly\\b", Frequency.YEARLY);
 
         Set<String> keys = repeatTimes.keySet();
-        for (String repeatTime : keys){
+        for (String repeatTime : keys) {
             Pattern pattern = Pattern.compile(repeatTime);
             Matcher m = pattern.matcher(inputText);
-            if (m.find()){
+            if (m.find()) {
                 Frequency rtime = repeatTimes.get(repeatTime);
                 RRule rrule = new RRule();
                 rrule.setFreq(rtime);
@@ -398,7 +399,7 @@ public class TitleParser {
             }
         }
 
-        for (String repeatTimeIntervalOne:repeatTimesIntervalOne.keySet()){
+        for (String repeatTimeIntervalOne : repeatTimesIntervalOne.keySet()) {
             Pattern pattern = Pattern.compile(repeatTimeIntervalOne);
             Matcher m = pattern.matcher(inputText);
             if (m.find()) {
@@ -416,21 +417,21 @@ public class TitleParser {
 
     //helper method for repeatHelper.
     private static int findInterval(String inputText) {
-        HashMap<String,Integer> wordsToNum = new HashMap<String, Integer>();
-        String[] words = new String[] {
+        HashMap<String, Integer> wordsToNum = new HashMap<String, Integer>();
+        String[] words = new String[]{
                 "one", "two", "three", "four", "five", "six",
                 "seven", "eight", "nine", "ten", "eleven", "twelve"
         };
-        for(int i = 0; i < words.length; i++) {
-            wordsToNum.put(words[i], i+1);
+        for (int i = 0; i < words.length; i++) {
+            wordsToNum.put(words[i], i + 1);
             wordsToNum.put(Integer.toString(i + 1), i + 1);
         }
-        wordsToNum.put("other" , 2);
+        wordsToNum.put("other", 2);
 
         Pattern pattern = Pattern.compile("(?i)\\bevery (\\w*)\\b");
         int interval = 1;
         Matcher m = pattern.matcher(inputText);
-        if (m.find() && m.group(1)!=null){
+        if (m.find() && m.group(1) != null) {
             String intervalStr = m.group(1);
             if (wordsToNum.containsKey(intervalStr))
                 interval = wordsToNum.get(intervalStr);
@@ -446,7 +447,7 @@ public class TitleParser {
     }
 
     //helper method for DayHelper. Resets the time on the calendar to 00:00:00 am
-    private static void setCalendarToDefaultTime(Calendar cal){
+    private static void setCalendarToDefaultTime(Calendar cal) {
         cal.set(Calendar.HOUR, 0);
         cal.set(Calendar.HOUR_OF_DAY, 0);
         cal.set(Calendar.MINUTE, 0);
diff --git a/astrid/src/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java b/astrid/src/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java
index 576e920a7..c7d16c67c 100644
--- a/astrid/src/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java
+++ b/astrid/src/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java
@@ -3,9 +3,6 @@
  */
 package com.todoroo.astrid.voice;
 
-import java.util.HashMap;
-import java.util.Locale;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -17,9 +14,11 @@ import android.util.Log;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.astrid.voice.VoiceOutputService.VoiceOutputAssistant;
 
+import java.util.HashMap;
+import java.util.Locale;
+
 /**
  * @author Arne Jans
- *
  */
 @SuppressWarnings("nls")
 public class Api6VoiceOutputAssistant implements OnInitListener, VoiceOutputAssistant {
@@ -70,7 +69,7 @@ public class Api6VoiceOutputAssistant implements OnInitListener, VoiceOutputAssi
     }
 
     private void initTTS() {
-        mTts = new TextToSpeech(context, (OnInitListener)this);
+        mTts = new TextToSpeech(context, (OnInitListener) this);
     }
 
     public void queueSpeak(String textToSpeak) {
@@ -101,8 +100,8 @@ public class Api6VoiceOutputAssistant implements OnInitListener, VoiceOutputAssi
             // Try this someday for some interesting results.
             // int result mTts.setLanguage(Locale.FRANCE);
             if (result == TextToSpeech.LANG_MISSING_DATA ||
-                result == TextToSpeech.LANG_NOT_SUPPORTED) {
-               // Language data is missing or the language is not supported.
+                    result == TextToSpeech.LANG_NOT_SUPPORTED) {
+                // Language data is missing or the language is not supported.
                 Log.e(TAG, "Language is not available.");
             } else {
                 // Check the documentation for other possible result codes.
diff --git a/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java b/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java
index eb8b85050..60c9f6eb1 100644
--- a/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java
+++ b/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.voice;
 
-import java.security.InvalidParameterException;
-import java.util.ArrayList;
-
-import junit.framework.Assert;
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.DialogInterface;
@@ -28,12 +24,17 @@ import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.utility.Constants;
 
+import junit.framework.Assert;
+
+import java.security.InvalidParameterException;
+import java.util.ArrayList;
+
 /**
  * This class handles taking voice-input and appends the text to the registered EditText-instance.
  * You can have multiple VoiceInputAssistants per Fragment, just use the additional constructor
  * to specify unique requestCodes for the RecognizerIntent (e.g. VoiceInputAssistant.VOICE_RECOGNITION_REQUEST_CODE+i).
  * If you have only one VoiceInputAssitant on an Fragment, just use the normal constructor.
- * <p>
+ * <p/>
  * You can query voiceinput-capabilities by calling isVoiceInputAvailable() for external checking,
  * but the visibility for the microphone-button specified by the constructor is handled in configureMicrophoneButton(int).
  *
@@ -42,7 +43,9 @@ import com.todoroo.astrid.utility.Constants;
 @SuppressWarnings("nls")
 public class VoiceInputAssistant {
 
-    /** requestcode for activityresult from voicerecognizer-intent */
+    /**
+     * requestcode for activityresult from voicerecognizer-intent
+     */
     public static final int VOICE_RECOGNITION_REQUEST_CODE = 1234;
 
     /**
@@ -71,7 +74,9 @@ public class VoiceInputAssistant {
         return languageModel;
     }
 
-    /** Sets whether voice input will append into field */
+    /**
+     * Sets whether voice input will append into field
+     */
     public void setAppend(boolean append) {
         this.append = append;
     }
@@ -99,9 +104,9 @@ public class VoiceInputAssistant {
      * Creates a new VoiceInputAssistance-instance for use with a specified button and textfield.
      * If you need more than one microphone-button on a given fragment, use the other constructor.
      *
-     * @param fragment the fragment which holds the microphone-buttone and the textField to insert recognized test
+     * @param fragment    the fragment which holds the microphone-buttone and the textField to insert recognized test
      * @param voiceButton the microphone-Button
-     * @param textField the textfield that should get the resulttext
+     * @param textField   the textfield that should get the resulttext
      */
     public VoiceInputAssistant(ImageButton voiceButton) {
         Assert.assertNotNull("A VoiceInputAssistant without a voiceButton makes no sense!", voiceButton);
@@ -116,12 +121,11 @@ public class VoiceInputAssistant {
      * If you only use one microphone-button on a fragment,
      * you can leave it to its default, VOICE_RECOGNITION_REQUEST_CODE.
      *
-     *
      * @param fragment
      * @param voiceButton
      * @param textField
      * @param requestCode has to be unique in a single fragment-context,
-     *   dont use VOICE_RECOGNITION_REQUEST_CODE, this is reserved for the other constructor
+     *                    dont use VOICE_RECOGNITION_REQUEST_CODE, this is reserved for the other constructor
      */
     public VoiceInputAssistant(ImageButton voiceButton, int requestCode) {
         this(voiceButton);
@@ -134,9 +138,9 @@ public class VoiceInputAssistant {
      * Creates a new VoiceInputAssistance-instance for use with a specified button and textfield.
      * If you need more than one microphone-button on a given fragment, use the other constructor.
      *
-     * @param activity the activity which holds the microphone-buttone and the textField to insert recognized test
+     * @param activity    the activity which holds the microphone-buttone and the textField to insert recognized test
      * @param voiceButton the microphone-Button
-     * @param textField the textfield that should get the resulttext
+     * @param textField   the textfield that should get the resulttext
      */
     public VoiceInputAssistant(Activity activity, ImageButton voiceButton) {
         Assert.assertNotNull("Each VoiceInputAssistant must be bound to a activity!", activity);
@@ -153,12 +157,11 @@ public class VoiceInputAssistant {
      * If you only use one microphone-button on a activity,
      * you can leave it to its default, VOICE_RECOGNITION_REQUEST_CODE.
      *
-     *
      * @param activity
      * @param voiceButton
      * @param textField
      * @param requestCode has to be unique in a single fragment-context,
-     *   dont use VOICE_RECOGNITION_REQUEST_CODE, this is reserved for the other constructor
+     *                    dont use VOICE_RECOGNITION_REQUEST_CODE, this is reserved for the other constructor
      */
     public VoiceInputAssistant(Activity activity, ImageButton voiceButton, int requestCode) {
         this(activity, voiceButton);
@@ -193,7 +196,7 @@ public class VoiceInputAssistant {
      * You can check in your fragment if it was really a RecognizerIntent that was handled here,
      * if so, this method returns true. In this case, you should call super.onActivityResult in your
      * fragment.onActivityResult.
-     * <p>
+     * <p/>
      * If this method returns false, then it wasnt a request with a RecognizerIntent, so you can handle
      * these other requests as you need.
      *
@@ -218,9 +221,9 @@ public class VoiceInputAssistant {
                 if (match != null && match.size() > 0 && match.get(0).length() > 0) {
                     String recognizedSpeech = match.get(0);
                     recognizedSpeech = recognizedSpeech.substring(0, 1).toUpperCase() +
-                        recognizedSpeech.substring(1).toLowerCase();
+                            recognizedSpeech.substring(1).toLowerCase();
 
-                    if(append)
+                    if (append)
                         textField.setText((textField.getText() + " " + recognizedSpeech).trim());
                     else
                         textField.setText(recognizedSpeech);
@@ -235,6 +238,7 @@ public class VoiceInputAssistant {
      * Can also be called from Fragment.onActivityResult to simply get the string result
      * of the speech to text, or null if it couldn't be processed. Convenient when you
      * don't have a bunch of UI elements to hook into.
+     *
      * @param activityRequestCode
      * @param resultCode
      * @param data
@@ -250,7 +254,7 @@ public class VoiceInputAssistant {
                 if (match != null && match.size() > 0 && match.get(0).length() > 0) {
                     String recognizedSpeech = match.get(0);
                     recognizedSpeech = recognizedSpeech.substring(0, 1).toUpperCase() +
-                        recognizedSpeech.substring(1).toLowerCase();
+                            recognizedSpeech.substring(1).toLowerCase();
                     return recognizedSpeech;
                 }
             }
@@ -274,7 +278,7 @@ public class VoiceInputAssistant {
 
     public void showVoiceInputMarketSearch(DialogInterface.OnClickListener onFail) {
         String packageName;
-        if(AndroidUtilities.getSdkVersion() <= 7)
+        if (AndroidUtilities.getSdkVersion() <= 7)
             packageName = "com.google.android.voicesearch.x";
         else
             packageName = "com.google.android.voicesearch";
diff --git a/astrid/src/com/todoroo/astrid/voice/VoiceOutputService.java b/astrid/src/com/todoroo/astrid/voice/VoiceOutputService.java
index 250c68f27..eb2588a30 100644
--- a/astrid/src/com/todoroo/astrid/voice/VoiceOutputService.java
+++ b/astrid/src/com/todoroo/astrid/voice/VoiceOutputService.java
@@ -11,12 +11,10 @@ import android.content.Intent;
 import com.todoroo.andlib.utility.AndroidUtilities;
 
 
-
-
 /**
  * All API versions-friendly voice input / output.
- * @author Tim Su <tim@todoroo.com>
  *
+ * @author Tim Su <tim@todoroo.com>
  */
 public class VoiceOutputService {
 
@@ -44,7 +42,7 @@ public class VoiceOutputService {
 
         @Override
         public boolean handleActivityResult(int requestCode, int resultCode,
-                Intent data) {
+                                            Intent data) {
             return false;
         }
 
@@ -61,11 +59,11 @@ public class VoiceOutputService {
     }
 
     public static VoiceOutputAssistant getVoiceOutputInstance() {
-        if(AndroidUtilities.getSdkVersion() >= MIN_TTS_VERSION) {
+        if (AndroidUtilities.getSdkVersion() >= MIN_TTS_VERSION) {
             if (outputAssistant == null)
                 outputAssistant = new Api6VoiceOutputAssistant();
         } else {
-            if(outputAssistant == null)
+            if (outputAssistant == null)
                 outputAssistant = new NullVoiceOutputAssistant();
         }
 
diff --git a/astrid/src/com/todoroo/astrid/voice/VoiceRecognizer.java b/astrid/src/com/todoroo/astrid/voice/VoiceRecognizer.java
index 00bbdef09..907bfeda3 100644
--- a/astrid/src/com/todoroo/astrid/voice/VoiceRecognizer.java
+++ b/astrid/src/com/todoroo/astrid/voice/VoiceRecognizer.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.voice;
 
-import java.io.IOException;
-import java.util.List;
-
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
@@ -29,6 +26,9 @@ import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.utility.Constants;
 
+import java.io.IOException;
+import java.util.List;
+
 @TargetApi(8)
 public class VoiceRecognizer {
 
@@ -63,7 +63,7 @@ public class VoiceRecognizer {
     private static VoiceRecognizer instance = null;
 
     public static VoiceRecognizer instantiateVoiceRecognizer(Context context, RecognizerApiListener listener, ImageButton voiceAddButton) {
-        synchronized(VoiceRecognizer.class) {
+        synchronized (VoiceRecognizer.class) {
             if (instance == null)
                 instance = new VoiceRecognizer();
         }
diff --git a/astrid/src/com/todoroo/astrid/welcome/HelpInfoPopover.java b/astrid/src/com/todoroo/astrid/welcome/HelpInfoPopover.java
index 3224ecc1c..26c035484 100644
--- a/astrid/src/com/todoroo/astrid/welcome/HelpInfoPopover.java
+++ b/astrid/src/com/todoroo/astrid/welcome/HelpInfoPopover.java
@@ -5,11 +5,6 @@
  */
 package com.todoroo.astrid.welcome;
 
-import greendroid.widget.QuickAction;
-import greendroid.widget.QuickActionWidget;
-
-import java.util.List;
-
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Rect;
@@ -21,16 +16,20 @@ import android.widget.TextView;
 import com.timsu.astrid.R;
 import com.todoroo.astrid.utility.AstridPreferences;
 
+import java.util.List;
+
+import greendroid.widget.QuickAction;
+import greendroid.widget.QuickActionWidget;
+
 /**
  * Displays a popover with some help text for first time users.
  *
  * @author Sam Bosley <sam@astrid.com>
- *
  */
 public class HelpInfoPopover extends QuickActionWidget {
 
     public static HelpInfoPopover showPopover(final Activity activity, final View parent,
-            final int textId, OnDismissListener dismissListener) {
+                                              final int textId, OnDismissListener dismissListener) {
         final HelpInfoPopover toShow = new HelpInfoPopover(activity, textId);
         if (dismissListener != null) {
             toShow.setOnDismissListener(dismissListener);
@@ -54,7 +53,7 @@ public class HelpInfoPopover extends QuickActionWidget {
     private HelpInfoPopover(Context context, int textId) {
         super(context);
         setContentView(R.layout.help_popover);
-        TextView message = (TextView)getContentView().findViewById(R.id.gdi_message);
+        TextView message = (TextView) getContentView().findViewById(R.id.gdi_message);
         message.setText(textId);
         setFocusable(false);
         setTouchable(true);
diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
index b5eb183c4..e9ec182b1 100644
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
@@ -26,43 +26,42 @@ import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.utility.Constants;
 import com.viewpagerindicator.TitleProvider;
 
-public class WelcomePagerAdapter extends PagerAdapter implements TitleProvider
-{
-    private int[] images = new int[] {
-        R.drawable.welcome_walkthrough_1,
-        R.drawable.welcome_walkthrough_2,
-        R.drawable.welcome_walkthrough_3,
-        R.drawable.welcome_walkthrough_4,
-        R.drawable.welcome_walkthrough_5,
-        R.drawable.welcome_walkthrough_6,
-        0
+public class WelcomePagerAdapter extends PagerAdapter implements TitleProvider {
+    private int[] images = new int[]{
+            R.drawable.welcome_walkthrough_1,
+            R.drawable.welcome_walkthrough_2,
+            R.drawable.welcome_walkthrough_3,
+            R.drawable.welcome_walkthrough_4,
+            R.drawable.welcome_walkthrough_5,
+            R.drawable.welcome_walkthrough_6,
+            0
     };
-    private int[] title = new int[] {
-        R.string.welcome_title_1,
-        R.string.welcome_title_2,
-        R.string.welcome_title_3,
-        R.string.welcome_title_4,
-        R.string.welcome_title_5,
-        R.string.welcome_title_6,
-        R.string.welcome_title_7,
+    private int[] title = new int[]{
+            R.string.welcome_title_1,
+            R.string.welcome_title_2,
+            R.string.welcome_title_3,
+            R.string.welcome_title_4,
+            R.string.welcome_title_5,
+            R.string.welcome_title_6,
+            R.string.welcome_title_7,
     };
-    private int[] body = new int[] {
-        R.string.welcome_body_1,
-        R.string.welcome_body_2,
-        R.string.welcome_body_3,
-        R.string.welcome_body_4,
-        R.string.welcome_body_5,
-        R.string.welcome_body_6,
-        R.string.welcome_body_7,
+    private int[] body = new int[]{
+            R.string.welcome_body_1,
+            R.string.welcome_body_2,
+            R.string.welcome_body_3,
+            R.string.welcome_body_4,
+            R.string.welcome_body_5,
+            R.string.welcome_body_6,
+            R.string.welcome_body_7,
     };
-    public int[] layouts = new int[] {
-        R.layout.welcome_walkthrough_page,
-        R.layout.welcome_walkthrough_page,
-        R.layout.welcome_walkthrough_page,
-        R.layout.welcome_walkthrough_page,
-        R.layout.welcome_walkthrough_page,
-        R.layout.welcome_walkthrough_page,
-        R.layout.actfm_login_activity,
+    public int[] layouts = new int[]{
+            R.layout.welcome_walkthrough_page,
+            R.layout.welcome_walkthrough_page,
+            R.layout.welcome_walkthrough_page,
+            R.layout.welcome_walkthrough_page,
+            R.layout.welcome_walkthrough_page,
+            R.layout.welcome_walkthrough_page,
+            R.layout.actfm_login_activity,
     };
 
     public int fallbackLoginPage;
@@ -70,7 +69,8 @@ public class WelcomePagerAdapter extends PagerAdapter implements TitleProvider
     private final Context context;
     public Account[] accounts;
     public WelcomeWalkthrough parent;
-    @Autowired ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    ActFmPreferenceService actFmPreferenceService;
 
     public WelcomePagerAdapter(Context context, boolean manual) {
         this.context = context;
@@ -107,10 +107,10 @@ public class WelcomePagerAdapter extends PagerAdapter implements TitleProvider
     }
 
     private void adjustResourcesForLite() {
-        images = new int[] { 0 };
-        title = new int[] { R.string.welcome_title_7 };
-        body = new int[] { R.string.welcome_body_7 };
-        layouts = new int[] { R.layout.actfm_login_activity };
+        images = new int[]{0};
+        title = new int[]{R.string.welcome_title_7};
+        body = new int[]{R.string.welcome_body_7};
+        layouts = new int[]{R.layout.actfm_login_activity};
     }
 
     @Override
diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
index c3f7e5c6d..79d855d63 100644
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
@@ -6,9 +6,6 @@
 
 package com.todoroo.astrid.welcome.tutorial;
 
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerCallback;
@@ -35,6 +32,9 @@ import com.todoroo.astrid.service.StatisticsConstants;
 import com.todoroo.astrid.service.StatisticsService;
 import com.viewpagerindicator.CirclePageIndicator;
 
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
 public class WelcomeWalkthrough extends ActFmLoginActivity {
     private ViewPager mPager;
     private WelcomePagerAdapter mAdapter;
@@ -60,16 +60,17 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
         mAdapter.parent = this;
         accounts = mAdapter.accounts;
 
-        mPager = (ViewPager)findViewById(R.id.pager);
+        mPager = (ViewPager) findViewById(R.id.pager);
         mPager.setAdapter(mAdapter);
 
-        mIndicator = (CirclePageIndicator)findViewById(R.id.indicator);
+        mIndicator = (CirclePageIndicator) findViewById(R.id.indicator);
         mIndicator.setViewPager(mPager);
         if (mAdapter.getCount() <= 1) {
             mIndicator.setVisibility(View.GONE);
         }
 
     }
+
     @Override
     protected int getContentViewResource() {
         return R.layout.welcome_walkthrough;
@@ -80,8 +81,8 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
         return 0;
     }
 
-    public void instantiatePage(int position){
-        if (position == mAdapter.getCount()-1) {
+    public void instantiatePage(int position) {
+        if (position == mAdapter.getCount() - 1) {
             initializeUI();
         }
     }
@@ -119,7 +120,7 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
             }
 
             private void getAuthToken(final String e,
-                    final ProgressDialog pd) {
+                                      final ProgressDialog pd) {
                 final GoogleAccountManager accountManager = new GoogleAccountManager(WelcomeWalkthrough.this);
                 Account a = accountManager.getAccountByName(e);
                 AccountManagerCallback<Bundle> callback = new AccountManagerCallback<Bundle>() {
@@ -148,7 +149,7 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
                                         @Override
                                         public void run() {
                                             int error = e instanceof IOException ? R.string.gtasks_GLA_errorIOAuth :
-                                                R.string.gtasks_GLA_errorAuth;
+                                                    R.string.gtasks_GLA_errorAuth;
                                             Toast.makeText(WelcomeWalkthrough.this,
                                                     error,
                                                     Toast.LENGTH_LONG).show();
@@ -211,8 +212,8 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
         findViewById(R.id.next).setVisibility(
                 position == mAdapter.getCount() - 1 ? View.GONE : View.VISIBLE);
 
-        if(currentPage == mAdapter.getCount() - 1) {
-            if(findViewById(R.id.fb_login) != null) {
+        if (currentPage == mAdapter.getCount() - 1) {
+            if (findViewById(R.id.fb_login) != null) {
                 setupLoginLater();
             } else {
                 OnClickListener done = new OnClickListener() {
@@ -229,7 +230,7 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
                     image.setOnClickListener(done);
             }
         }
-        ((CirclePageIndicator) mIndicator).setVisibility(currentPage == mAdapter.getCount()-1 ? View.GONE : View.VISIBLE);
+        ((CirclePageIndicator) mIndicator).setVisibility(currentPage == mAdapter.getCount() - 1 ? View.GONE : View.VISIBLE);
     }
 
     protected void setupPWLogin() {
@@ -238,7 +239,7 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
     }
 
     protected void setupLoginLater() {
-        TextView loginLater = (TextView)currentView.findViewById(R.id.login_later);
+        TextView loginLater = (TextView) currentView.findViewById(R.id.login_later);
         loginLater.setOnClickListener(loginLaterListener);
         loginLater.setVisibility(View.VISIBLE);
     }
diff --git a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java
index fab7d1489..cd64ab4db 100644
--- a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java
+++ b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java
@@ -67,7 +67,7 @@ public class TasksWidget extends AppWidgetProvider {
 
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager,
-            int[] appWidgetIds) {
+                         int[] appWidgetIds) {
 
         try {
             ContextManager.setContext(context);
@@ -82,6 +82,7 @@ public class TasksWidget extends AppWidgetProvider {
 
     /**
      * Update all widgets
+     *
      * @param id
      */
     public static void updateWidgets(Context context) {
@@ -94,6 +95,7 @@ public class TasksWidget extends AppWidgetProvider {
 
     /**
      * Update widget with the given id
+     *
      * @param id
      */
     public static void updateWidget(Context context, int id) {
@@ -140,13 +142,13 @@ public class TasksWidget extends AppWidgetProvider {
             AppWidgetManager manager = AppWidgetManager.getInstance(this);
 
             int extrasId = AppWidgetManager.INVALID_APPWIDGET_ID;
-            if(intent != null)
+            if (intent != null)
                 extrasId = intent.getIntExtra(EXTRA_WIDGET_ID, extrasId);
-            if(extrasId == AppWidgetManager.INVALID_APPWIDGET_ID) {
+            if (extrasId == AppWidgetManager.INVALID_APPWIDGET_ID) {
                 int[] ids;
                 try {
                     ids = manager.getAppWidgetIds(thisWidget);
-                    for(int id : ids) {
+                    for (int id : ids) {
                         RemoteViews updateViews = buildUpdate(this, id);
                         manager.updateAppWidget(id, updateViews);
                     }
@@ -210,9 +212,9 @@ public class TasksWidget extends AppWidgetProvider {
 
                     textContent = task.getValue(Task.TITLE);
 
-                    if(task.isCompleted())
+                    if (task.isCompleted())
                         textColor = r.getColor(R.color.task_list_done);
-                    else if(task.hasDueDate() && task.isOverdue())
+                    else if (task.hasDueDate() && task.isOverdue())
                         textColor = r.getColor(R.color.task_list_overdue);
 
                     RemoteViews row = new RemoteViews(Constants.PACKAGE, R.layout.widget_row);
@@ -237,14 +239,14 @@ public class TasksWidget extends AppWidgetProvider {
                 // can happen if database is not ready
                 Log.e("WIDGET-UPDATE", "Error updating widget", e);
             } finally {
-                if(cursor != null)
+                if (cursor != null)
                     cursor.close();
             }
 
             Intent listIntent = new Intent(context, TaskListActivity.class);
             String customIntent = Preferences.getStringValue(WidgetConfigActivity.PREF_CUSTOM_INTENT
                     + widgetId);
-            if(customIntent != null) {
+            if (customIntent != null) {
                 String serializedExtras = Preferences.getStringValue(WidgetConfigActivity.PREF_CUSTOM_EXTRAS
                         + widgetId);
                 Bundle extras = AndroidUtilities.bundleFromSerializedString(serializedExtras);
@@ -252,7 +254,7 @@ public class TasksWidget extends AppWidgetProvider {
             }
             listIntent.putExtra(TaskListActivity.TOKEN_SOURCE, Constants.SOURCE_WIDGET);
             listIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-            if(filter != null) {
+            if (filter != null) {
                 listIntent.putExtra(TaskListFragment.TOKEN_FILTER, filter);
                 listIntent.setAction("L" + widgetId + filter.getSqlQuery());
             } else {
@@ -273,13 +275,12 @@ public class TasksWidget extends AppWidgetProvider {
             if (tablet) {
                 editIntent = new Intent(context, TaskListActivity.class);
                 editIntent.putExtra(TaskListActivity.OPEN_TASK, 0L);
-            }
-            else
+            } else
                 editIntent = new Intent(context, TaskEditActivity.class);
 
             editIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
             editIntent.putExtra(TaskEditFragment.OVERRIDE_FINISH_ANIM, false);
-            if(filter != null) {
+            if (filter != null) {
                 editIntent.putExtra(TaskListFragment.TOKEN_FILTER, filter);
                 if (filter.valuesForNewTasks != null) {
                     String values = AndroidUtilities.contentValuesToSerializedString(filter.valuesForNewTasks);
@@ -323,6 +324,7 @@ public class TasksWidget extends AppWidgetProvider {
          * Android 2.1 (level 7) that doesn't allow setting backgrounds on remote views. I know it's lame,
          * but I didn't see a better solution. Alternatively, we could disallow theming widgets on
          * Android 2.1.
+         *
          * @param context
          * @return
          */
@@ -343,7 +345,7 @@ public class TasksWidget extends AppWidgetProvider {
                 views.setInt(R.id.widget_button, "setImageResource", R.drawable.button_plus);
                 views.setViewVisibility(R.id.widget_header_separator, View.GONE);
                 return views;
-            } else if(isDarkTheme()) {
+            } else if (isDarkTheme()) {
                 layout = (theme == R.style.Theme_Transparent ? R.layout.widget_initialized_dark_transparent : R.layout.widget_initialized_dark);
                 titleColor = r.getColor(R.color.widget_text_color_dark);
                 buttonDrawable = R.drawable.plus_button_blue;
@@ -351,7 +353,7 @@ public class TasksWidget extends AppWidgetProvider {
                 layout = R.layout.widget_initialized_red;
                 titleColor = r.getColor(R.color.widget_text_color_light);
                 buttonDrawable = R.drawable.plus_button_red;
-            } else if (theme == R.style.Theme_White_Alt)  {
+            } else if (theme == R.style.Theme_White_Alt) {
                 layout = R.layout.widget_initialized;
                 titleColor = r.getColor(R.color.widget_text_color_light);
                 buttonDrawable = R.drawable.plus_button_blue;
@@ -374,7 +376,7 @@ public class TasksWidget extends AppWidgetProvider {
             DisplayMetrics metrics = new DisplayMetrics();
             display.getMetrics(metrics);
 
-            if(metrics.density <= 0.75)
+            if (metrics.density <= 0.75)
                 return 4;
             else
                 return 5;
@@ -385,13 +387,13 @@ public class TasksWidget extends AppWidgetProvider {
             // base our filter off the inbox filter, replace stuff if we have it
             Filter filter = CoreFilterExposer.buildInboxFilter(getResources());
             String sql = Preferences.getStringValue(WidgetConfigActivity.PREF_SQL + widgetId);
-            if(sql != null)
+            if (sql != null)
                 filter.setSqlQuery(sql);
             String title = Preferences.getStringValue(WidgetConfigActivity.PREF_TITLE + widgetId);
-            if(title != null)
+            if (title != null)
                 filter.title = title;
             String contentValues = Preferences.getStringValue(WidgetConfigActivity.PREF_VALUES + widgetId);
-            if(contentValues != null)
+            if (contentValues != null)
                 filter.valuesForNewTasks = AndroidUtilities.contentValuesFromSerializedString(contentValues);
 
             String customComponent = Preferences.getStringValue(WidgetConfigActivity.PREF_CUSTOM_INTENT
@@ -417,7 +419,7 @@ public class TasksWidget extends AppWidgetProvider {
                     Preferences.setString(WidgetConfigActivity.PREF_TITLE + widgetId, filter.title);
                     ContentValues newTaskValues = filter.valuesForNewTasks;
                     String contentValuesString = null;
-                    if(newTaskValues != null)
+                    if (newTaskValues != null)
                         contentValuesString = AndroidUtilities.contentValuesToSerializedString(newTaskValues);
                     Preferences.setString(WidgetConfigActivity.PREF_VALUES + widgetId, contentValuesString);
                     if (filter instanceof FilterWithCustomIntent) {
diff --git a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java b/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java
index 43321fd57..1cb732c9f 100644
--- a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java
+++ b/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java
@@ -80,7 +80,7 @@ abstract public class WidgetConfigActivity extends ListActivity {
         adapter.filterStyle = R.style.TextAppearance_FLA_Filter_Widget;
         setListAdapter(adapter);
 
-        Button button = (Button)findViewById(R.id.ok);
+        Button button = (Button) findViewById(R.id.ok);
         button.setOnClickListener(mOnClickListener);
 
         StatisticsService.reportEvent(StatisticsConstants.WIDGET_CONFIG);
@@ -102,7 +102,6 @@ abstract public class WidgetConfigActivity extends ListActivity {
     };
 
 
-
     @Override
     protected void onListItemClick(ListView l, View v, int position, long id) {
         super.onListItemClick(l, v, position, id);
@@ -136,29 +135,29 @@ abstract public class WidgetConfigActivity extends ListActivity {
         ThemeService.setForceFilterInvert(false);
     }
 
-    private void saveConfiguration(FilterListItem filterListItem){
+    private void saveConfiguration(FilterListItem filterListItem) {
         DisplayMetrics metrics = new DisplayMetrics();
         getWindowManager().getDefaultDisplay().getMetrics(metrics);
 
         String sql = null, contentValuesString = null, title = null;
 
-        if(filterListItem != null && filterListItem instanceof Filter) {
-            sql = ((Filter)filterListItem).getSqlQuery();
-            ContentValues values = ((Filter)filterListItem).valuesForNewTasks;
-            if(values != null)
+        if (filterListItem != null && filterListItem instanceof Filter) {
+            sql = ((Filter) filterListItem).getSqlQuery();
+            ContentValues values = ((Filter) filterListItem).valuesForNewTasks;
+            if (values != null)
                 contentValuesString = AndroidUtilities.contentValuesToSerializedString(values);
-            title = ((Filter)filterListItem).title;
+            title = ((Filter) filterListItem).title;
         }
 
         Preferences.setString(WidgetConfigActivity.PREF_TITLE + mAppWidgetId, title);
         Preferences.setString(WidgetConfigActivity.PREF_SQL + mAppWidgetId, sql);
         Preferences.setString(WidgetConfigActivity.PREF_VALUES + mAppWidgetId, contentValuesString);
 
-        if(filterListItem instanceof FilterWithCustomIntent) {
-            String flattenedName = ((FilterWithCustomIntent)filterListItem).customTaskList.flattenToString();
+        if (filterListItem instanceof FilterWithCustomIntent) {
+            String flattenedName = ((FilterWithCustomIntent) filterListItem).customTaskList.flattenToString();
             Preferences.setString(WidgetConfigActivity.PREF_CUSTOM_INTENT + mAppWidgetId,
                     flattenedName);
-            String flattenedExtras = AndroidUtilities.bundleToSerializedString(((FilterWithCustomIntent)filterListItem).customExtras);
+            String flattenedExtras = AndroidUtilities.bundleToSerializedString(((FilterWithCustomIntent) filterListItem).customExtras);
             if (flattenedExtras != null)
                 Preferences.setString(WidgetConfigActivity.PREF_CUSTOM_EXTRAS + mAppWidgetId,
                         flattenedExtras);
diff --git a/tests-sync/AndroidManifest.xml b/tests-sync/AndroidManifest.xml
index aa5ec9cb3..57b476318 100644
--- a/tests-sync/AndroidManifest.xml
+++ b/tests-sync/AndroidManifest.xml
@@ -4,22 +4,23 @@
           package="com.todoroo.astrid.sync.tests"
           android:versionCode="1"
           android:versionName="1.0">
-          
-    <uses-sdk android:minSdkVersion="7" />
-      
+
+    <uses-sdk android:minSdkVersion="7"/>
+
     <!-- We add an application tag here just so that we can indicate that
          this package needs to link against the android.test library,
          which is needed when building test cases. -->
     <application android:debuggable="true">
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
     </application>
-    
+
     <!--
     This declares that this application uses the instrumentation test runner targeting
     the package of the parent app.  To run the tests use the command:
     "adb shell am instrument -w com.xxx.xxx.tests/android.test.InstrumentationTestRunner"
     -->
-    <instrumentation android:name="com.zutubi.android.junitreport.JUnitReportTestRunner"
-                     android:targetPackage="com.timsu.astrid"
-                     android:label="Tests for Astrid"/>
+    <instrumentation
+            android:name="com.zutubi.android.junitreport.JUnitReportTestRunner"
+            android:targetPackage="com.timsu.astrid"
+            android:label="Tests for Astrid"/>
 </manifest>
diff --git a/tests-sync/res/layout/main.xml b/tests-sync/res/layout/main.xml
index bc12cd823..e8b651a0a 100644
--- a/tests-sync/res/layout/main.xml
+++ b/tests-sync/res/layout/main.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:orientation="vertical">
 
     <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/hello" />
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/hello"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/tests-sync/src/com/todoroo/astrid/gtasks/GtasksApiTest.java b/tests-sync/src/com/todoroo/astrid/gtasks/GtasksApiTest.java
index 31cd04a26..7a943f145 100644
--- a/tests-sync/src/com/todoroo/astrid/gtasks/GtasksApiTest.java
+++ b/tests-sync/src/com/todoroo/astrid/gtasks/GtasksApiTest.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.gtasks;
 
-import java.util.Date;
-import java.util.List;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerFuture;
@@ -29,6 +26,9 @@ import com.todoroo.astrid.gtasks.api.MoveListRequest;
 import com.todoroo.astrid.gtasks.auth.GtasksTokenValidator;
 import com.todoroo.astrid.test.DatabaseTestCase;
 
+import java.util.Date;
+import java.util.List;
+
 @SuppressWarnings("nls")
 public class GtasksApiTest extends DatabaseTestCase {
 
@@ -39,7 +39,7 @@ public class GtasksApiTest extends DatabaseTestCase {
     private boolean bypassTests = false;
 
     public void testCreateTask() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         Task newTask = new Task();
         String title = "New task";
         newTask.setTitle(title);
@@ -49,7 +49,7 @@ public class GtasksApiTest extends DatabaseTestCase {
     }
 
     public void testUpdateTaskProperties() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         Task newTask = new Task();
         String title = "This title will change";
         newTask.setTitle(title);
@@ -65,7 +65,7 @@ public class GtasksApiTest extends DatabaseTestCase {
     }
 
     public void testTaskDateFormatting2() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         Task newTask = new Task();
         String title = "Due date will change";
         newTask.setTitle(title);
@@ -81,16 +81,16 @@ public class GtasksApiTest extends DatabaseTestCase {
         newTask = service.updateGtask(DEFAULT_LIST, newTask);
         System.err.println("Newtask C: " + newTask.getDue());
 
-       long complete = now + DateUtilities.ONE_DAY;
-       newTask.setCompleted(GtasksApiUtilities.unixTimeToGtasksCompletionTime(complete));
-       System.err.println("Newtask D: " + newTask.getCompleted());
-       newTask.setStatus("completed");
-       newTask = service.updateGtask(DEFAULT_LIST, newTask);
-       System.err.println("Newtask E: " + newTask.getCompleted());
+        long complete = now + DateUtilities.ONE_DAY;
+        newTask.setCompleted(GtasksApiUtilities.unixTimeToGtasksCompletionTime(complete));
+        System.err.println("Newtask D: " + newTask.getCompleted());
+        newTask.setStatus("completed");
+        newTask = service.updateGtask(DEFAULT_LIST, newTask);
+        System.err.println("Newtask E: " + newTask.getCompleted());
     }
 
     public void testTaskDateFormatting() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         Task newTask = new Task();
         String title = "Due date will change";
         newTask.setTitle(title);
@@ -115,7 +115,7 @@ public class GtasksApiTest extends DatabaseTestCase {
     }
 
     public void testTaskDeleted() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         Task newTask = new Task();
         String title = "This task will be deleted";
         newTask.setTitle(title);
@@ -128,7 +128,7 @@ public class GtasksApiTest extends DatabaseTestCase {
     }
 
     public void testTaskMoved() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         Task newTask1 = new Task();
         String title1 = "Task 1";
         newTask1.setTitle(title1);
@@ -161,7 +161,7 @@ public class GtasksApiTest extends DatabaseTestCase {
     }
 
     public void testMoveBetweenLists() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         Task newTask = new Task();
         String title = "This task will move lists";
         newTask.setTitle(title);
@@ -208,7 +208,7 @@ public class GtasksApiTest extends DatabaseTestCase {
     }
 
     public void testCreateList() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         String title1 = "My new list!";
         service.createGtaskList(title1);
         assertNotNull(listWithTitle(title1));
@@ -220,7 +220,7 @@ public class GtasksApiTest extends DatabaseTestCase {
     }
 
     public void testDeleteList() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         String title = "This list will be deleted";
         TaskList t = service.createGtaskList(title);
         assertNotNull(listWithTitle(title));
@@ -230,7 +230,7 @@ public class GtasksApiTest extends DatabaseTestCase {
     }
 
     public void testUpdateListProperties() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         String title1 = "This title will change";
         TaskList t = service.createGtaskList(title1);
         assertNotNull(listWithTitle(title1));
diff --git a/tests-sync/src/com/todoroo/astrid/gtasks/GtasksNewSyncTest.java b/tests-sync/src/com/todoroo/astrid/gtasks/GtasksNewSyncTest.java
index b98160c75..5cc424da1 100644
--- a/tests-sync/src/com/todoroo/astrid/gtasks/GtasksNewSyncTest.java
+++ b/tests-sync/src/com/todoroo/astrid/gtasks/GtasksNewSyncTest.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.gtasks;
 
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.Semaphore;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerFuture;
@@ -36,6 +32,10 @@ import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.sync.SyncResultCallbackAdapter;
 import com.todoroo.astrid.test.DatabaseTestCase;
 
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.Semaphore;
+
 @SuppressWarnings("nls")
 public class GtasksNewSyncTest extends DatabaseTestCase {
 
@@ -47,16 +47,20 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
     private static final String TEST_ACCOUNT = "sync_tester2@astrid.com";
     private static final long TIME_BETWEEN_SYNCS = 3000l;
 
-    @Autowired TaskService taskService;
-    @Autowired MetadataService metadataService;
-    @Autowired GtasksMetadataService gtasksMetadataService;
-    @Autowired GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    TaskService taskService;
+    @Autowired
+    MetadataService metadataService;
+    @Autowired
+    GtasksMetadataService gtasksMetadataService;
+    @Autowired
+    GtasksPreferenceService gtasksPreferenceService;
 
     /*
      * Basic creation tests
      */
     public void testTaskCreatedLocally() {
-        if(bypassTests) return;
+        if (bypassTests) return;
         String title = "Astrid task 1";
         Task localTask = createNewLocalTask(title);
 
@@ -66,7 +70,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
     }
 
     public void testTaskCreatedRemotely() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         String title = "Gtasks task 1";
         com.google.api.services.tasks.model.Task remoteTask = new com.google.api.services.tasks.model.Task();
         remoteTask.setTitle(title);
@@ -81,7 +85,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
      * Title editing tests
      */
     public void testTitleChangedLocally() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         String title = "Astrid task 2";
         Task localTask = createNewLocalTask(title);
 
@@ -105,7 +109,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
     }
 
     public void testTitleChangedRemotely() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         String title = "Astrid task 3";
         Task localTask = createNewLocalTask(title);
 
@@ -129,7 +133,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
     }
 
     public void testDateChangedLocally() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         Task localTask = createLocalTaskForDateTests(" locally");
         String title = localTask.getValue(Task.TITLE);
         long startDate = localTask.getValue(Task.DUE_DATE);
@@ -161,7 +165,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
     }
 
     public void testDateChangedRemotely() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         Task localTask = createLocalTaskForDateTests(" remotely");
         String title = localTask.getValue(Task.TITLE);
         long startDate = localTask.getValue(Task.DUE_DATE);
@@ -195,7 +199,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
     }
 
     public void testDateChangedBoth_ChooseLocal() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         Task localTask = createLocalTaskForDateTests(" remotely");
         String title = localTask.getValue(Task.TITLE);
         long startDate = localTask.getValue(Task.DUE_DATE);
@@ -234,7 +238,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
     }
 
     public void DISABLED_testDateChangedBoth_ChooseRemote() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         Task localTask = createLocalTaskForDateTests(" remotely");
         String title = localTask.getValue(Task.TITLE);
         long startDate = localTask.getValue(Task.DUE_DATE);
@@ -286,7 +290,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
     }
 
     public void testNoteEditedLocally() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         Task localTask = createLocalTaskForNoteTests(" locally");
         String title = localTask.getValue(Task.TITLE);
         String originalNote = localTask.getValue(Task.NOTES);
@@ -312,7 +316,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
     }
 
     public void testNoteEditedRemotely() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         Task localTask = createLocalTaskForNoteTests(" remotely");
         String title = localTask.getValue(Task.TITLE);
         String originalNote = localTask.getValue(Task.NOTES);
@@ -338,7 +342,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
     }
 
     public void DISABLED_testNoteEditedBoth() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         Task localTask = createLocalTaskForNoteTests(" remotely");
         String title = localTask.getValue(Task.TITLE);
         String originalNote = localTask.getValue(Task.NOTES);
@@ -384,7 +388,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
      */
 
     public void testTaskCompletedLocally() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         String title = "Will complete locally";
         Task localTask = createNewLocalTask(title);
 
@@ -407,7 +411,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
     }
 
     public void testTaskCompletedRemotely() throws Exception {
-        if(bypassTests) return;
+        if (bypassTests) return;
         String title = "Will complete remotely";
         Task localTask = createNewLocalTask(title);
 
@@ -486,7 +490,7 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
     }
 
 
-  //Create a new Astrid task and save it to the database
+    //Create a new Astrid task and save it to the database
     private Task createNewLocalTask(String title) {
         Task task = new Task();
         task.setValue(Task.TITLE, title);
@@ -496,17 +500,17 @@ public class GtasksNewSyncTest extends DatabaseTestCase {
 
     //Perform a synchronization
     private void whenInvokeSync() {
-    	final Semaphore sema = new Semaphore(0);
+        final Semaphore sema = new Semaphore(0);
         GtasksSyncV2Provider.getInstance().synchronizeActiveTasks(true, new SyncResultCallbackAdapter() {
-        	@Override
-        	public void finished() {
-        		sema.release();
-        	}
-		});
+            @Override
+            public void finished() {
+                sema.release();
+            }
+        });
         try {
-        	sema.acquire();
+            sema.acquire();
         } catch (InterruptedException e) {
-        	fail("Interrupted while waiting for sync to finish");
+            fail("Interrupted while waiting for sync to finish");
         }
     }
 
diff --git a/tests-sync/src/com/todoroo/astrid/gtasks/GtasksSyncOnSaveTest.java b/tests-sync/src/com/todoroo/astrid/gtasks/GtasksSyncOnSaveTest.java
index 14ec6b746..bbc876d6d 100644
--- a/tests-sync/src/com/todoroo/astrid/gtasks/GtasksSyncOnSaveTest.java
+++ b/tests-sync/src/com/todoroo/astrid/gtasks/GtasksSyncOnSaveTest.java
@@ -5,10 +5,6 @@
  */
 package com.todoroo.astrid.gtasks;
 
-import java.io.IOException;
-import java.util.Date;
-import java.util.List;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerFuture;
@@ -31,12 +27,20 @@ import com.todoroo.astrid.gtasks.sync.GtasksSyncService;
 import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.test.DatabaseTestCase;
 
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+
 public class GtasksSyncOnSaveTest extends DatabaseTestCase {
 
-    @Autowired TaskService taskService;
-    @Autowired GtasksSyncService gtasksSyncService;
-    @Autowired GtasksMetadataService gtasksMetadataService;
-    @Autowired GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    TaskService taskService;
+    @Autowired
+    GtasksSyncService gtasksSyncService;
+    @Autowired
+    GtasksMetadataService gtasksMetadataService;
+    @Autowired
+    GtasksPreferenceService gtasksPreferenceService;
 
     private static GtasksInvoker gtasksService;
     private boolean initialized = false;
@@ -49,7 +53,7 @@ public class GtasksSyncOnSaveTest extends DatabaseTestCase {
 
 
     public void testSyncOnCreate() throws IOException {
-        if(bypassTests) return;
+        if (bypassTests) return;
         performBasicCreation("");
     }
 
@@ -80,7 +84,7 @@ public class GtasksSyncOnSaveTest extends DatabaseTestCase {
     }
 
     public void testSyncOnTitleUpdate() throws IOException {
-        if(bypassTests) return;
+        if (bypassTests) return;
         Task localTask = performBasicCreation("-title will change");
 
         String newTitle = "Title has changed!";
@@ -94,7 +98,7 @@ public class GtasksSyncOnSaveTest extends DatabaseTestCase {
     }
 
     public void testSyncOnDueDateUpdate() throws IOException {
-        if(bypassTests) return;
+        if (bypassTests) return;
         Task localTask = performBasicCreation("-due date will change");
 
         long dueDate = new Date(115, 2, 14).getTime();
@@ -108,7 +112,7 @@ public class GtasksSyncOnSaveTest extends DatabaseTestCase {
     }
 
     public void testSyncOnNotesUpdate() throws IOException {
-        if(bypassTests) return;
+        if (bypassTests) return;
         Task localTask = performBasicCreation("-notes will change");
 
         String notes = "Noted!";
@@ -122,7 +126,7 @@ public class GtasksSyncOnSaveTest extends DatabaseTestCase {
     }
 
     public void testSyncOnCompleted() throws IOException {
-        if(bypassTests) return;
+        if (bypassTests) return;
         Task localTask = performBasicCreation("-will be completed");
 
         long completionDate = (DateUtilities.now() / 1000L) * 1000L;
@@ -137,7 +141,7 @@ public class GtasksSyncOnSaveTest extends DatabaseTestCase {
     }
 
     public void testSyncOnDeleted() throws IOException {
-        if(bypassTests) return;
+        if (bypassTests) return;
         Task localTask = performBasicCreation("-will be deleted");
 
         long deletionDate = DateUtilities.now();
@@ -188,7 +192,7 @@ public class GtasksSyncOnSaveTest extends DatabaseTestCase {
             }
         }
         if (toUse == null) {
-            if(accounts.length == 0) {
+            if (accounts.length == 0) {
                 bypassTests = true;
                 return;
             }
diff --git a/tests-sync/src/com/todoroo/astrid/sync/repeats/AbstractSyncRepeatTests.java b/tests-sync/src/com/todoroo/astrid/sync/repeats/AbstractSyncRepeatTests.java
index 69ed982c2..a61ee29e3 100644
--- a/tests-sync/src/com/todoroo/astrid/sync/repeats/AbstractSyncRepeatTests.java
+++ b/tests-sync/src/com/todoroo/astrid/sync/repeats/AbstractSyncRepeatTests.java
@@ -5,11 +5,6 @@
  */
 package com.todoroo.astrid.sync.repeats;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-
 import android.content.Intent;
 
 import com.google.ical.values.Frequency;
@@ -30,7 +25,11 @@ import com.todoroo.astrid.data.SyncFlags;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.repeats.RepeatTaskCompleteListener;
 import com.todoroo.astrid.test.DatabaseTestCase;
-import com.todoroo.astrid.utility.Flags;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
 
 abstract public class AbstractSyncRepeatTests<REMOTE_MODEL> extends DatabaseTestCase {
 
@@ -49,7 +48,7 @@ abstract public class AbstractSyncRepeatTests<REMOTE_MODEL> extends DatabaseTest
     private void saveAndTriggerRepeatListener(Task task) {
         task.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
         task.putTransitory(SyncFlags.GTASKS_SUPPRESS_SYNC, true);
-        if(task.isSaved())
+        if (task.isSaved())
             taskDao.saveExisting(task);
         else
             taskDao.createNew(task);
@@ -84,7 +83,7 @@ abstract public class AbstractSyncRepeatTests<REMOTE_MODEL> extends DatabaseTest
      * @param remoteModel
      */
     protected long setCompletionDate(boolean completeBefore, Task t,
-            REMOTE_MODEL remoteModel, long dueDate) {
+                                     REMOTE_MODEL remoteModel, long dueDate) {
         long completionDate = DateUtilities.now();
         t.setValue(Task.COMPLETION_DATE, completionDate);
         saveAndTriggerRepeatListener(t);
@@ -93,7 +92,7 @@ abstract public class AbstractSyncRepeatTests<REMOTE_MODEL> extends DatabaseTest
 
     protected void assertTimesMatch(long expectedTime, long newDueDate) {
         assertTrue(String.format("Expected %s, was %s", new Date(expectedTime), new Date(newDueDate)),
-                Math.abs(expectedTime - newDueDate) <= 600000); 
+                Math.abs(expectedTime - newDueDate) <= 600000);
         // Allow a few minutes of variance to account for timing issues in tests
     }
 
@@ -118,7 +117,7 @@ abstract public class AbstractSyncRepeatTests<REMOTE_MODEL> extends DatabaseTest
     }
 
     protected void testRepeating(boolean completeBefore, boolean fromCompletion,
-            RRule rrule, Frequency frequency, String title) {
+                                 RRule rrule, Frequency frequency, String title) {
         Task t = new Task();
         t.setValue(Task.TITLE, title);
         long dueDate = DateUtilities.now() + ((completeBefore ? -1 : 1) * DateUtilities.ONE_DAY * 3);
@@ -129,14 +128,14 @@ abstract public class AbstractSyncRepeatTests<REMOTE_MODEL> extends DatabaseTest
         if (rrule == null) {
             rrule = new RRule();
             rrule.setFreq(frequency);
-            int interval = frequency.equals(Frequency.MINUTELY) ? 100: 2;
+            int interval = frequency.equals(Frequency.MINUTELY) ? 100 : 2;
             rrule.setInterval(interval);
         }
-        
+
         String result = rrule.toIcal();
         if (fromCompletion)
             result = result + ";FROM=COMPLETION";
-        
+
         t.setValue(Task.RECURRENCE, rrule.toIcal());
         taskDao.save(t);
 
@@ -164,7 +163,7 @@ abstract public class AbstractSyncRepeatTests<REMOTE_MODEL> extends DatabaseTest
             long newDueDate = t.getValue(Task.DUE_DATE);
             assertTrue(t.hasDueTime());
 
-            long fromDate = (fromCompletion? completionDate : dueDate);
+            long fromDate = (fromCompletion ? completionDate : dueDate);
             long expectedTime = computeNextDueDateFromDate(fromDate, rrule, fromCompletion);
 
             assertTaskExistsRemotely(t, expectedTime);
@@ -228,7 +227,9 @@ abstract public class AbstractSyncRepeatTests<REMOTE_MODEL> extends DatabaseTest
     }
 
 
-    /** Advanced weekly repeating tests */
+    /**
+     * Advanced weekly repeating tests
+     */
     protected long computeNextDueDateFromDate(long fromDate, RRule rrule, boolean fromCompletion) {
         long expectedTime = fromDate;
         Frequency frequency = rrule.getFreq();
@@ -258,7 +259,7 @@ abstract public class AbstractSyncRepeatTests<REMOTE_MODEL> extends DatabaseTest
             originalCompleteDate.setYear(originalCompleteDate.getYear() + interval);
             expectedTime = originalCompleteDate.getTime();
         }
-        
+
         return Task.createDueDate(Task.URGENCY_SPECIFIC_DAY_TIME, expectedTime);
     }
 
@@ -271,7 +272,9 @@ abstract public class AbstractSyncRepeatTests<REMOTE_MODEL> extends DatabaseTest
     }
 
 
-    /** Tests for repeating from due date */
+    /**
+     * Tests for repeating from due date
+     */
 
     public void testRepeatMinutelyFromDueDateCompleteBefore() {
         testFromDueDate(true, Frequency.MINUTELY, "minutely-before");
@@ -322,7 +325,9 @@ abstract public class AbstractSyncRepeatTests<REMOTE_MODEL> extends DatabaseTest
     }
 
 
-    /** Tests for repeating from completionDate */
+    /**
+     * Tests for repeating from completionDate
+     */
 
     public void testRepeatMinutelyFromCompleteDateCompleteBefore() {
         testFromCompletionDate(true, Frequency.MINUTELY, "minutely-before");
@@ -386,7 +391,6 @@ abstract public class AbstractSyncRepeatTests<REMOTE_MODEL> extends DatabaseTest
     }
 
 
-
     // disabled until test can be fixed
     public void testAdvancedRepeatWeeklyFromDueDateCompleteBefore() {
         testAdvancedWeekly(false, true, "advanced-weekly-before");
diff --git a/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java b/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java
index 2bb199190..fb68b3de0 100644
--- a/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java
+++ b/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSync.java
@@ -5,11 +5,6 @@
  */
 package com.todoroo.astrid.sync.repeats;
 
-import java.io.IOException;
-import java.util.concurrent.Semaphore;
-
-import org.json.JSONObject;
-
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 import com.timsu.astrid.R;
@@ -28,11 +23,19 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.sync.SyncResultCallbackAdapter;
 
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.concurrent.Semaphore;
+
 public class RepeatTestsActFmSync extends AbstractSyncRepeatTests<Task> {
 
-    @Autowired MetadataService metadataService;
-    @Autowired ActFmSyncService actFmSyncService;
-    @Autowired ActFmPreferenceService actFmPreferenceService;
+    @Autowired
+    MetadataService metadataService;
+    @Autowired
+    ActFmSyncService actFmSyncService;
+    @Autowired
+    ActFmPreferenceService actFmPreferenceService;
     protected static ActFmInvoker invoker = null;
 
     private static final String TEST_ACCOUNT = "sync_tester2@astrid.com";
@@ -98,15 +101,15 @@ public class RepeatTestsActFmSync extends AbstractSyncRepeatTests<Task> {
         AndroidUtilities.sleepDeep(3000L);
         final Semaphore sema = new Semaphore(0);
         new ActFmSyncV2Provider().synchronizeActiveTasks(true, new SyncResultCallbackAdapter() {
-        	@Override
-        	public void finished() {
-        		sema.release();
-        	}
-		});
+            @Override
+            public void finished() {
+                sema.release();
+            }
+        });
         try {
-        	sema.acquire();
+            sema.acquire();
         } catch (InterruptedException e) {
-        	fail("Interrupted while waiting for sync to finish");
+            fail("Interrupted while waiting for sync to finish");
         }
         AndroidUtilities.sleepDeep(3000L);
     }
@@ -144,11 +147,11 @@ public class RepeatTestsActFmSync extends AbstractSyncRepeatTests<Task> {
             int interval = 5;
             rrule.setInterval(interval);
         }
-        
+
         String result = rrule.toIcal();
         if (fromCompletion)
             result = result + ";FROM=COMPLETION";
-        
+
         t.setValue(Task.RECURRENCE, rrule.toIcal());
         taskDao.save(t);
 
@@ -166,7 +169,7 @@ public class RepeatTestsActFmSync extends AbstractSyncRepeatTests<Task> {
             cursor.moveToFirst();
             t.readFromCursor(cursor);
 
-            long fromDate = (fromCompletion? completionDate : dueDate);
+            long fromDate = (fromCompletion ? completionDate : dueDate);
             long expectedTime = computeNextDueDateFromDate(fromDate, rrule, fromCompletion);
             long newDueDate = t.getValue(Task.DUE_DATE);
 
diff --git a/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSyncRemote.java b/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSyncRemote.java
index c43553680..5c70bf3c4 100644
--- a/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSyncRemote.java
+++ b/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsActFmSyncRemote.java
@@ -5,21 +5,23 @@
  */
 package com.todoroo.astrid.sync.repeats;
 
-import java.util.ArrayList;
-
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.Task;
 
+import java.util.ArrayList;
+
 public class RepeatTestsActFmSyncRemote extends RepeatTestsActFmSync {
     @Override
     protected long setCompletionDate(boolean completeBefore, Task t,
-            Task remoteModel, long dueDate) {
+                                     Task remoteModel, long dueDate) {
         long completionDate = DateUtilities.now();
 
         ArrayList<Object> params = new ArrayList<Object>();
-        params.add("completed"); params.add(completionDate / 1000L);
+        params.add("completed");
+        params.add(completionDate / 1000L);
 
-        params.add("id"); params.add(remoteModel.getValue(Task.UUID));
+        params.add("id");
+        params.add(remoteModel.getValue(Task.UUID));
         try {
             invoker.invoke("task_save", params.toArray(new Object[params.size()]));
         } catch (Exception e) {
diff --git a/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSync.java b/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSync.java
index 5b7177564..32c7cbd0d 100644
--- a/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSync.java
+++ b/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSync.java
@@ -5,11 +5,6 @@
  */
 package com.todoroo.astrid.sync.repeats;
 
-import java.io.IOException;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.Semaphore;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerFuture;
@@ -36,12 +31,21 @@ import com.todoroo.astrid.gtasks.sync.GtasksSyncV2Provider;
 import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.sync.SyncResultCallbackAdapter;
 
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.Semaphore;
+
 public class RepeatTestsGtasksSync extends AbstractSyncRepeatTests<com.google.api.services.tasks.model.Task> {
 
-    @Autowired MetadataService metadataService;
-    @Autowired GtasksMetadataService gtasksMetadataService;
-    @Autowired GtasksPreferenceService gtasksPreferenceService;
-    @Autowired GtasksSyncService gtasksSyncService;
+    @Autowired
+    MetadataService metadataService;
+    @Autowired
+    GtasksMetadataService gtasksMetadataService;
+    @Autowired
+    GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    GtasksSyncService gtasksSyncService;
 
     private static final String TEST_ACCOUNT = "sync_tester2@astrid.com";
     public static final String DEFAULT_LIST = "@default";
@@ -67,15 +71,15 @@ public class RepeatTestsGtasksSync extends AbstractSyncRepeatTests<com.google.ap
         AndroidUtilities.sleepDeep(3000L);
         final Semaphore sema = new Semaphore(0);
         GtasksSyncV2Provider.getInstance().synchronizeActiveTasks(true, new SyncResultCallbackAdapter() {
-        	@Override
-        	public void finished() {
-        		sema.release();
-        	}
-		});
+            @Override
+            public void finished() {
+                sema.release();
+            }
+        });
         try {
-        	sema.acquire();
+            sema.acquire();
         } catch (InterruptedException e) {
-        	fail("Interrupted while waiting for sync to finish");
+            fail("Interrupted while waiting for sync to finish");
         }
         AndroidUtilities.sleepDeep(3000L);
         gtasksSyncService.waitUntilEmpty();
@@ -90,7 +94,7 @@ public class RepeatTestsGtasksSync extends AbstractSyncRepeatTests<com.google.ap
         com.google.api.services.tasks.model.Task remote = null;
         try {
             remote = gtasksService.getGtask(listId, taskId);
-        } catch (IOException e){
+        } catch (IOException e) {
             e.printStackTrace();
             fail("Exception in gtasks service");
         }
diff --git a/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSyncRemote.java b/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSyncRemote.java
index ab9feaee9..e5e9a81a4 100644
--- a/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSyncRemote.java
+++ b/tests-sync/src/com/todoroo/astrid/sync/repeats/RepeatTestsGtasksSyncRemote.java
@@ -5,22 +5,19 @@
  */
 package com.todoroo.astrid.sync.repeats;
 
-import java.io.IOException;
-import java.util.Date;
-
-import com.google.ical.values.Frequency;
-import com.google.ical.values.RRule;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.gtasks.api.GtasksApiUtilities;
 
+import java.io.IOException;
+
 public class RepeatTestsGtasksSyncRemote extends RepeatTestsGtasksSync {
 
     // Test logic in superclass
 
     @Override
     protected long setCompletionDate(boolean completeBefore, Task t,
-            com.google.api.services.tasks.model.Task remoteModel, long dueDate) {
+                                     com.google.api.services.tasks.model.Task remoteModel, long dueDate) {
         long completionDate;
         if (completeBefore)
             completionDate = dueDate - DateUtilities.ONE_DAY;
diff --git a/tests-sync/src/com/todoroo/astrid/test/DatabaseTestCase.java b/tests-sync/src/com/todoroo/astrid/test/DatabaseTestCase.java
index 66f7f7cf9..e5a8d9a1d 100644
--- a/tests-sync/src/com/todoroo/astrid/test/DatabaseTestCase.java
+++ b/tests-sync/src/com/todoroo/astrid/test/DatabaseTestCase.java
@@ -5,17 +5,16 @@
  */
 package com.todoroo.astrid.test;
 
-import java.io.File;
-
 import com.todoroo.astrid.dao.Database;
 import com.todoroo.astrid.provider.Astrid3ContentProvider;
 import com.todoroo.astrid.service.AstridDependencyInjector;
 
+import java.io.File;
+
 /**
  * Test case that automatically sets up and tears down a test database
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class DatabaseTestCase extends TodorooTestCaseWithInjector {
 
@@ -30,39 +29,40 @@ public class DatabaseTestCase extends TodorooTestCaseWithInjector {
         testInjector.addInjectable("database", database);
     }
 
-	@Override
-	protected void setUp() throws Exception {
-	    // call upstream setup, which invokes dependency injector
-	    super.setUp();
+    @Override
+    protected void setUp() throws Exception {
+        // call upstream setup, which invokes dependency injector
+        super.setUp();
 
-		// empty out test databases
-	    database.clear();
-		database.openForWriting();
+        // empty out test databases
+        database.clear();
+        database.openForWriting();
 
-		Astrid3ContentProvider.setDatabaseOverride(database);
-	}
+        Astrid3ContentProvider.setDatabaseOverride(database);
+    }
 
-	/**
-	 * Helper to delete a database by name
-	 * @param database
-	 */
-	protected void deleteDatabase(String database) {
-	    File db = getContext().getDatabasePath(database);
-	    if(db.exists())
-	        db.delete();
+    /**
+     * Helper to delete a database by name
+     *
+     * @param database
+     */
+    protected void deleteDatabase(String database) {
+        File db = getContext().getDatabasePath(database);
+        if (db.exists())
+            db.delete();
     }
 
     @Override
-	protected void tearDown() throws Exception {
-		database.close();
-		super.tearDown();
-	}
+    protected void tearDown() throws Exception {
+        database.close();
+        super.tearDown();
+    }
 
-	public static class TestDatabase extends Database {
+    public static class TestDatabase extends Database {
         @Override
-	    public String getName() {
-	        return "databasetest";
-	    }
-	}
+        public String getName() {
+            return "databasetest";
+        }
+    }
 
 }
diff --git a/tests-sync/src/com/todoroo/astrid/test/TestDependencyInjector.java b/tests-sync/src/com/todoroo/astrid/test/TestDependencyInjector.java
index c9c73b3b6..5b0a5c2c3 100644
--- a/tests-sync/src/com/todoroo/astrid/test/TestDependencyInjector.java
+++ b/tests-sync/src/com/todoroo/astrid/test/TestDependencyInjector.java
@@ -44,6 +44,7 @@ public class TestDependencyInjector extends AbstractDependencyInjector {
 
     /**
      * Remove an installed TestDependencyInjector
+     *
      * @param string
      */
     public static void deinitialize(TestDependencyInjector instance) {
diff --git a/tests-sync/src/com/todoroo/astrid/test/TestUtilities.java b/tests-sync/src/com/todoroo/astrid/test/TestUtilities.java
index a9a3344dd..abd4bb0ba 100644
--- a/tests-sync/src/com/todoroo/astrid/test/TestUtilities.java
+++ b/tests-sync/src/com/todoroo/astrid/test/TestUtilities.java
@@ -10,7 +10,6 @@ package com.todoroo.astrid.test;
  * Utility methods used in unit tests
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TestUtilities {
 
diff --git a/tests-sync/src/com/todoroo/astrid/test/TodorooTestCase.java b/tests-sync/src/com/todoroo/astrid/test/TodorooTestCase.java
index 110e19d26..5bcfaa786 100644
--- a/tests-sync/src/com/todoroo/astrid/test/TodorooTestCase.java
+++ b/tests-sync/src/com/todoroo/astrid/test/TodorooTestCase.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.test;
 
-import java.util.Locale;
-
 import android.content.res.Configuration;
 import android.test.AndroidTestCase;
 import android.util.DisplayMetrics;
@@ -15,11 +13,12 @@ import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.astrid.service.AstridDependencyInjector;
 
+import java.util.Locale;
+
 /**
  * Base test case for Astrid tests
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TodorooTestCase extends AndroidTestCase {
 
@@ -27,15 +26,15 @@ public class TodorooTestCase extends AndroidTestCase {
         AstridDependencyInjector.initialize();
     }
 
-	@Override
-	protected void setUp() throws Exception {
-	    super.setUp();
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
 
-	    ContextManager.setContext(this.getContext());
-	    AstridDependencyInjector.flush();
-	    DependencyInjectionService.getInstance().inject(this);
-	    setLocale(Locale.ENGLISH);
-	}
+        ContextManager.setContext(this.getContext());
+        AstridDependencyInjector.flush();
+        DependencyInjectionService.getInstance().inject(this);
+        setLocale(Locale.ENGLISH);
+    }
 
     @Override
     protected void tearDown() throws Exception {
@@ -45,11 +44,12 @@ public class TodorooTestCase extends AndroidTestCase {
 
     /**
      * Loop through each locale and call runnable
+     *
      * @param r
      */
     public void forEachLocale(Runnable r) {
         Locale[] locales = Locale.getAvailableLocales();
-        for(Locale locale : locales) {
+        for (Locale locale : locales) {
             setLocale(locale);
 
             r.run();
@@ -58,6 +58,7 @@ public class TodorooTestCase extends AndroidTestCase {
 
     /**
      * Sets locale
+     *
      * @param locale
      */
     private void setLocale(Locale locale) {
diff --git a/tests-sync/src/com/todoroo/astrid/test/TodorooTestCaseWithInjector.java b/tests-sync/src/com/todoroo/astrid/test/TodorooTestCaseWithInjector.java
index aec72eeec..2eea403d1 100644
--- a/tests-sync/src/com/todoroo/astrid/test/TodorooTestCaseWithInjector.java
+++ b/tests-sync/src/com/todoroo/astrid/test/TodorooTestCaseWithInjector.java
@@ -10,7 +10,6 @@ package com.todoroo.astrid.test;
  * Base test case for Astrid tests that need a separate injection context
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 abstract public class TodorooTestCaseWithInjector extends TodorooTestCase {
 
@@ -18,19 +17,19 @@ abstract public class TodorooTestCaseWithInjector extends TodorooTestCase {
 
     abstract protected void addInjectables();
 
-	@Override
-	protected void setUp() throws Exception {
-	    testInjector = TestDependencyInjector.initialize("test");
-	    addInjectables();
+    @Override
+    protected void setUp() throws Exception {
+        testInjector = TestDependencyInjector.initialize("test");
+        addInjectables();
 
-	    super.setUp();
-	}
+        super.setUp();
+    }
 
-	@Override
-	protected void tearDown() throws Exception {
-	    super.tearDown();
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
 
-	    TestDependencyInjector.deinitialize(testInjector);
-	}
+        TestDependencyInjector.deinitialize(testInjector);
+    }
 
 }
diff --git a/tests-sync/src/com/zutubi/android/junitreport/JUnitReportListener.java b/tests-sync/src/com/zutubi/android/junitreport/JUnitReportListener.java
index 4022856fd..bc0042833 100644
--- a/tests-sync/src/com/zutubi/android/junitreport/JUnitReportListener.java
+++ b/tests-sync/src/com/zutubi/android/junitreport/JUnitReportListener.java
@@ -16,11 +16,9 @@
 
 package com.zutubi.android.junitreport;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.Writer;
+import android.content.Context;
+import android.util.Log;
+import android.util.Xml;
 
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;
@@ -29,9 +27,11 @@ import junit.framework.TestListener;
 
 import org.xmlpull.v1.XmlSerializer;
 
-import android.content.Context;
-import android.util.Log;
-import android.util.Xml;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
 
 /**
  * Custom test listener that outputs test results to a single XML file. The file
@@ -67,7 +67,7 @@ public class JUnitReportListener implements TestListener {
 
     // With thanks to org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.
     // Trimmed some entries, added others for Android.
-    private static final String[] DEFAULT_TRACE_FILTERS = new String[] {
+    private static final String[] DEFAULT_TRACE_FILTERS = new String[]{
             "junit.framework.TestCase", "junit.framework.TestResult",
             "junit.framework.TestSuite",
             "junit.framework.Assert.", // don't filter AssertionFailure
@@ -93,11 +93,11 @@ public class JUnitReportListener implements TestListener {
     /**
      * Creates a new listener.
      *
-     * @param context context of the target application under test
+     * @param context        context of the target application under test
      * @param reportFilePath path of the report file to create (under the
-     *            context using {@link Context#openFileOutput(String, int)}).
-     * @param filterTraces if true, stack traces will have common noise (e.g.
-     *            framework methods) omitted for clarity
+     *                       context using {@link Context#openFileOutput(String, int)}).
+     * @param filterTraces   if true, stack traces will have common noise (e.g.
+     *                       framework methods) omitted for clarity
      */
     public JUnitReportListener(Context context, String reportFilePath, boolean filterTraces) {
         this.mContext = context;
@@ -171,7 +171,7 @@ public class JUnitReportListener implements TestListener {
     }
 
     private void recordTestTime() throws IOException {
-        if(!timeAlreadyWritten) {
+        if (!timeAlreadyWritten) {
             timeAlreadyWritten = true;
             mSerializer.attribute("", ATTRIBUTE_TIME,
                     String.format("%.3f", (System.currentTimeMillis() - testStart) / 1000.));
diff --git a/tests-sync/src/com/zutubi/android/junitreport/JUnitReportTestRunner.java b/tests-sync/src/com/zutubi/android/junitreport/JUnitReportTestRunner.java
index 863e17f65..da1142f65 100644
--- a/tests-sync/src/com/zutubi/android/junitreport/JUnitReportTestRunner.java
+++ b/tests-sync/src/com/zutubi/android/junitreport/JUnitReportTestRunner.java
@@ -41,7 +41,7 @@ import android.test.InstrumentationTestRunner;
  * filtered to remove noise such as framework methods (default: true)</li>
  * </ul>
  * These arguments may be specified as follows:
- * 
+ * <p/>
  * <pre>
  * {@code adb shell am instrument -w -e reportFile my-report-file.xml}
  * </pre>
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 02c5d171f..efb007962 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -5,13 +5,13 @@
           android:versionCode="1"
           android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="7" />
+    <uses-sdk android:minSdkVersion="7"/>
 
     <!-- We add an application tag here just so that we can indicate that
          this package needs to link against the android.test library,
          which is needed when building test cases. -->
     <application android:debuggable="true">
-        <uses-library android:name="android.test.runner" />
+        <uses-library android:name="android.test.runner"/>
     </application>
 
     <!--
@@ -19,7 +19,8 @@
     the package of the parent app.  To run the tests use the command:
     "adb shell am instrument -w com.xxx.xxx.tests/android.test.InstrumentationTestRunner"
     -->
-    <instrumentation android:name="com.zutubi.android.junitreport.JUnitReportTestRunner"
-                     android:targetPackage="com.timsu.astrid"
-                     android:label="Tests for Astrid"/>
+    <instrumentation
+            android:name="com.zutubi.android.junitreport.JUnitReportTestRunner"
+            android:targetPackage="com.timsu.astrid"
+            android:label="Tests for Astrid"/>
 </manifest>
diff --git a/tests/src/com/todoroo/andlib/service/DependencyInjectionTests.java b/tests/src/com/todoroo/andlib/service/DependencyInjectionTests.java
index 934585c1f..d43a629a3 100644
--- a/tests/src/com/todoroo/andlib/service/DependencyInjectionTests.java
+++ b/tests/src/com/todoroo/andlib/service/DependencyInjectionTests.java
@@ -5,10 +5,10 @@
  */
 package com.todoroo.andlib.service;
 
-import java.lang.reflect.Field;
-
 import android.test.AndroidTestCase;
 
+import java.lang.reflect.Field;
+
 public class DependencyInjectionTests extends AndroidTestCase {
 
     public void testNoAutowire() {
@@ -25,7 +25,7 @@ public class DependencyInjectionTests extends AndroidTestCase {
 
                     @Override
                     public Object getInjection(Object object, Field field) {
-                        if(field.getName().equals("foo"))
+                        if (field.getName().equals("foo"))
                             return "bar";
                         return null;
                     }
@@ -91,7 +91,7 @@ public class DependencyInjectionTests extends AndroidTestCase {
             }
         };
         service.inject(test);
-        assertNull( test.toString());
+        assertNull(test.toString());
     }
 
     public void testHierarchicalStringInjectionAutowire() {
@@ -110,7 +110,7 @@ public class DependencyInjectionTests extends AndroidTestCase {
 
                     @Override
                     public Object getInjection(Object object, Field field) {
-                        if(field.getName().equals("foo"))
+                        if (field.getName().equals("foo"))
                             return "bar";
                         return null;
                     }
@@ -148,7 +148,7 @@ public class DependencyInjectionTests extends AndroidTestCase {
 
                     @Override
                     public Object getInjection(Object object, Field field) {
-                        if(field.getName().equals("wozzle"))
+                        if (field.getName().equals("wozzle"))
                             return "bar";
                         return null;
                     }
@@ -182,7 +182,7 @@ public class DependencyInjectionTests extends AndroidTestCase {
 
                     @Override
                     public Object getInjection(Object object, Field field) {
-                        if(field.getName().equals("foo"))
+                        if (field.getName().equals("foo"))
                             return "bar";
                         return null;
                     }
@@ -230,9 +230,9 @@ public class DependencyInjectionTests extends AndroidTestCase {
 
                     @Override
                     public Object getInjection(Object object, Field field) {
-                        if(field.getName().equals("foo"))
+                        if (field.getName().equals("foo"))
                             return "gotfoo";
-                        else if(field.getName().equals("bar"))
+                        else if (field.getName().equals("bar"))
                             return "hasbar";
                         return null;
                     }
diff --git a/tests/src/com/todoroo/andlib/service/TestDependencyInjector.java b/tests/src/com/todoroo/andlib/service/TestDependencyInjector.java
index 89ec19ef8..e2ef1efdc 100644
--- a/tests/src/com/todoroo/andlib/service/TestDependencyInjector.java
+++ b/tests/src/com/todoroo/andlib/service/TestDependencyInjector.java
@@ -41,6 +41,7 @@ public class TestDependencyInjector extends AbstractDependencyInjector {
 
     /**
      * Remove an installed TestDependencyInjector
+     *
      * @param string
      */
     public static void deinitialize(TestDependencyInjector instance) {
diff --git a/tests/src/com/todoroo/andlib/sql/QueryTemplateHelperTest.java b/tests/src/com/todoroo/andlib/sql/QueryTemplateHelperTest.java
index 152a07d4e..81660b5a1 100644
--- a/tests/src/com/todoroo/andlib/sql/QueryTemplateHelperTest.java
+++ b/tests/src/com/todoroo/andlib/sql/QueryTemplateHelperTest.java
@@ -83,7 +83,7 @@ public class QueryTemplateHelperTest extends AndroidTestCase {
     public void testRealQueryTemplate() {
         QueryTemplateHelper.queryForContentResolver(
                 new QueryTemplate().where(TaskCriteria.completed()).
-                orderBy(Order.asc(Task.DUE_DATE)).toString(),
+                        orderBy(Order.asc(Task.DUE_DATE)).toString(),
                 selection, order, groupBy);
         assertEquals(TaskCriteria.completed().toString(), selection.toString());
         assertEquals(Order.asc(Task.DUE_DATE).toString(), order.toString());
@@ -93,7 +93,7 @@ public class QueryTemplateHelperTest extends AndroidTestCase {
     public void testRealQueryTemplateTwo() {
         QueryTemplateHelper.queryForContentResolver(
                 new QueryTemplate().where(TaskCriteria.isActive()).
-                orderBy(Order.asc(Task.ELAPSED_SECONDS)).groupBy(Task.NOTES).toString(),
+                        orderBy(Order.asc(Task.ELAPSED_SECONDS)).groupBy(Task.NOTES).toString(),
                 selection, order, groupBy);
         assertEquals(TaskCriteria.isActive().toString(), selection.toString());
         assertEquals(Order.asc(Task.ELAPSED_SECONDS).toString(), order.toString());
@@ -101,5 +101,4 @@ public class QueryTemplateHelperTest extends AndroidTestCase {
     }
 
 
-
 }
diff --git a/tests/src/com/todoroo/andlib/test/SimpleAndroidTest.java b/tests/src/com/todoroo/andlib/test/SimpleAndroidTest.java
index bcf53574a..2c3c3ecc7 100644
--- a/tests/src/com/todoroo/andlib/test/SimpleAndroidTest.java
+++ b/tests/src/com/todoroo/andlib/test/SimpleAndroidTest.java
@@ -5,12 +5,13 @@
  */
 package com.todoroo.andlib.test;
 
-import junit.framework.Assert;
 import android.test.AndroidTestCase;
 
+import junit.framework.Assert;
+
 public class SimpleAndroidTest extends AndroidTestCase {
 
-	public void testSimpleAssert() throws Throwable {
-		Assert.assertTrue(true);
-	}
+    public void testSimpleAssert() throws Throwable {
+        Assert.assertTrue(true);
+    }
 }
diff --git a/tests/src/com/todoroo/andlib/test/TestUtilities.java b/tests/src/com/todoroo/andlib/test/TestUtilities.java
index a7dca44ae..1a4445637 100644
--- a/tests/src/com/todoroo/andlib/test/TestUtilities.java
+++ b/tests/src/com/todoroo/andlib/test/TestUtilities.java
@@ -10,7 +10,6 @@ package com.todoroo.andlib.test;
  * Utility methods used in unit tests
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TestUtilities {
 
diff --git a/tests/src/com/todoroo/andlib/test/TodorooTestCase.java b/tests/src/com/todoroo/andlib/test/TodorooTestCase.java
index 5321ecd36..4c55e54ce 100644
--- a/tests/src/com/todoroo/andlib/test/TodorooTestCase.java
+++ b/tests/src/com/todoroo/andlib/test/TodorooTestCase.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.andlib.test;
 
-import java.util.Locale;
-
 import android.content.res.Configuration;
 import android.test.AndroidTestCase;
 import android.util.DisplayMetrics;
@@ -15,11 +13,12 @@ import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.astrid.service.AstridDependencyInjector;
 
+import java.util.Locale;
+
 /**
  * Base test case for Astrid tests
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class TodorooTestCase extends AndroidTestCase {
 
@@ -27,15 +26,15 @@ public class TodorooTestCase extends AndroidTestCase {
         AstridDependencyInjector.initialize();
     }
 
-	@Override
-	protected void setUp() throws Exception {
-	    super.setUp();
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
 
-	    ContextManager.setContext(this.getContext());
-	    AstridDependencyInjector.flush();
-	    DependencyInjectionService.getInstance().inject(this);
-	    setLocale(Locale.ENGLISH);
-	}
+        ContextManager.setContext(this.getContext());
+        AstridDependencyInjector.flush();
+        DependencyInjectionService.getInstance().inject(this);
+        setLocale(Locale.ENGLISH);
+    }
 
     @Override
     protected void tearDown() throws Exception {
@@ -45,11 +44,12 @@ public class TodorooTestCase extends AndroidTestCase {
 
     /**
      * Loop through each locale and call runnable
+     *
      * @param r
      */
     public void forEachLocale(Runnable r) {
         Locale[] locales = Locale.getAvailableLocales();
-        for(Locale locale : locales) {
+        for (Locale locale : locales) {
             setLocale(locale);
 
             r.run();
@@ -58,6 +58,7 @@ public class TodorooTestCase extends AndroidTestCase {
 
     /**
      * Sets locale
+     *
      * @param locale
      */
     private void setLocale(Locale locale) {
diff --git a/tests/src/com/todoroo/andlib/test/TodorooTestCaseWithInjector.java b/tests/src/com/todoroo/andlib/test/TodorooTestCaseWithInjector.java
index 20b774c3f..18ebab790 100644
--- a/tests/src/com/todoroo/andlib/test/TodorooTestCaseWithInjector.java
+++ b/tests/src/com/todoroo/andlib/test/TodorooTestCaseWithInjector.java
@@ -11,7 +11,6 @@ import com.todoroo.andlib.service.TestDependencyInjector;
  * Base test case for Astrid tests that need a separate injection context
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 abstract public class TodorooTestCaseWithInjector extends TodorooTestCase {
 
@@ -19,19 +18,19 @@ abstract public class TodorooTestCaseWithInjector extends TodorooTestCase {
 
     abstract protected void addInjectables();
 
-	@Override
-	protected void setUp() throws Exception {
-	    testInjector = TestDependencyInjector.initialize("test");
-	    addInjectables();
+    @Override
+    protected void setUp() throws Exception {
+        testInjector = TestDependencyInjector.initialize("test");
+        addInjectables();
 
-	    super.setUp();
-	}
+        super.setUp();
+    }
 
-	@Override
-	protected void tearDown() throws Exception {
-	    super.tearDown();
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
 
-	    TestDependencyInjector.deinitialize(testInjector);
-	}
+        TestDependencyInjector.deinitialize(testInjector);
+    }
 
 }
diff --git a/tests/src/com/todoroo/andlib/test/TranslationTests.java b/tests/src/com/todoroo/andlib/test/TranslationTests.java
index 27b0e107d..b31219725 100644
--- a/tests/src/com/todoroo/andlib/test/TranslationTests.java
+++ b/tests/src/com/todoroo/andlib/test/TranslationTests.java
@@ -6,6 +6,9 @@
 package com.todoroo.andlib.test;
 
 
+import android.content.res.Resources;
+
+import com.timsu.astrid.R;
 
 import java.lang.reflect.Field;
 import java.text.SimpleDateFormat;
@@ -14,17 +17,12 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
-import android.content.res.Resources;
-
-import com.timsu.astrid.R;
-
 /**
  * Tests translations for consistency with the default values. You must
  * extend this class and create it with your own values for strings
  * and arrays.
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 abstract public class TranslationTests extends TodorooTestCase {
 
@@ -50,10 +48,14 @@ abstract public class TranslationTests extends TodorooTestCase {
     private static final class FormatStringData {
         private static final char[] scratch = new char[10];
 
-        /** format characters */
+        /**
+         * format characters
+         */
         public final char[] characters;
 
-        /** the original string */
+        /**
+         * the original string
+         */
         public final String string;
 
         public FormatStringData(String string) {
@@ -61,32 +63,35 @@ abstract public class TranslationTests extends TodorooTestCase {
 
             int pos = -1;
             int count = 0;
-            while(true) {
+            while (true) {
                 pos = string.indexOf('%', ++pos);
-                if(pos++ == -1)
+                if (pos++ == -1)
                     break;
-                if(pos >= string.length())
+                if (pos >= string.length())
                     scratch[count++] = '\0';
                 else
                     scratch[count++] = string.charAt(pos);
             }
             characters = new char[count];
-            for(int i = 0; i < count; i++) {
+            for (int i = 0; i < count; i++) {
                 characters[i] = scratch[i];
             }
         }
 
-        /** test that the characters match */
+        /**
+         * test that the characters match
+         */
         public boolean matches(FormatStringData other) {
-            if(characters.length != other.characters.length)
+            if (characters.length != other.characters.length)
                 return false;
-            outer: for(int i = 0; i < characters.length; i++) {
-                if(Character.isDigit(characters[i])) {
-                    for(int j = 0; j < other.characters.length; j++)
-                        if(characters[i] == other.characters[j])
+            outer:
+            for (int i = 0; i < characters.length; i++) {
+                if (Character.isDigit(characters[i])) {
+                    for (int j = 0; j < other.characters.length; j++)
+                        if (characters[i] == other.characters[j])
                             break outer;
                     return false;
-                } else if(characters[i] != other.characters[i])
+                } else if (characters[i] != other.characters[i])
                     return false;
 
             }
@@ -96,9 +101,9 @@ abstract public class TranslationTests extends TodorooTestCase {
         @Override
         public String toString() {
             StringBuilder value = new StringBuilder("[");
-            for(int i = 0; i < characters.length; i++) {
+            for (int i = 0; i < characters.length; i++) {
                 value.append(characters[i]);
-                if(i < characters.length - 1)
+                if (i < characters.length - 1)
                     value.append(',');
             }
             value.append("]: '").append(string).append('\'');
@@ -149,7 +154,7 @@ abstract public class TranslationTests extends TodorooTestCase {
 
         final StringBuilder failures = new StringBuilder();
 
-        for(int i = 0; i < strings.length; i++) {
+        for (int i = 0; i < strings.length; i++) {
             try {
                 String string = r.getString(strings[i]);
                 formatStrings[i] = new FormatStringData(string);
@@ -164,13 +169,13 @@ abstract public class TranslationTests extends TodorooTestCase {
         forEachLocale(new Runnable() {
             public void run() {
                 Locale locale = r.getConfiguration().locale;
-                for(int i = 0; i < strings.length; i++) {
+                for (int i = 0; i < strings.length; i++) {
                     try {
                         if (strings[i] == R.string.premium_speech_bubble_2) // Special exception--this string contains a % character
                             continue;
                         String string = r.getString(strings[i]);
                         FormatStringData newFS = new FormatStringData(string);
-                        if(!newFS.matches(formatStrings[i])) {
+                        if (!newFS.matches(formatStrings[i])) {
                             String name = r.getResourceName(strings[i]);
                             failures.append(String.format("%s (%s): %s != %s\n",
                                     name, locale.toString(), newFS, formatStrings[i]));
@@ -200,7 +205,7 @@ abstract public class TranslationTests extends TodorooTestCase {
         forEachLocale(new Runnable() {
             public void run() {
                 Locale locale = r.getConfiguration().locale;
-                for(int i = 0; i < dateStrings.length; i++) {
+                for (int i = 0; i < dateStrings.length; i++) {
                     try {
                         String string = r.getString(dateStrings[i]);
                         try {
@@ -232,7 +237,7 @@ abstract public class TranslationTests extends TodorooTestCase {
         final int[] sizes = new int[arrays.length];
         final StringBuilder failures = new StringBuilder();
 
-        for(int i = 0; i < arrays.length; i++) {
+        for (int i = 0; i < arrays.length; i++) {
             try {
                 sizes[i] = r.getStringArray(arrays[i]).length;
             } catch (Resources.NotFoundException e) {
@@ -245,8 +250,8 @@ abstract public class TranslationTests extends TodorooTestCase {
 
         forEachLocale(new Runnable() {
             public void run() {
-                for(int i = 0; i < arrays.length; i++) {
-                    if(sizes[i] == -1)
+                for (int i = 0; i < arrays.length; i++) {
+                    if (sizes[i] == -1)
                         continue;
                     int size;
                     try {
@@ -259,7 +264,7 @@ abstract public class TranslationTests extends TodorooTestCase {
                         continue;
                     }
 
-                    if(size != sizes[i]) {
+                    if (size != sizes[i]) {
                         String name = r.getResourceName(arrays[i]);
                         Locale locale = r.getConfiguration().locale;
                         failures.append(String.format("%s (%s): size %d != %d\n",
@@ -279,9 +284,9 @@ abstract public class TranslationTests extends TodorooTestCase {
     private int errorCount(StringBuilder failures) {
         int count = 0;
         int pos = -1;
-        while(true) {
+        while (true) {
             pos = failures.indexOf("\n", pos + 1);
-            if(pos == -1)
+            if (pos == -1)
                 return count;
             count++;
         }
@@ -293,7 +298,7 @@ abstract public class TranslationTests extends TodorooTestCase {
     public int[] getResourceIds(Class<?> resources) throws Exception {
         Field[] fields = resources.getDeclaredFields();
         List<Integer> ids = new ArrayList<Integer>(fields.length);
-        for(int i = 0; i < fields.length; i++) {
+        for (int i = 0; i < fields.length; i++) {
             try {
                 ids.add(fields[i].getInt(null));
             } catch (Exception e) {
@@ -301,7 +306,7 @@ abstract public class TranslationTests extends TodorooTestCase {
             }
         }
         int[] idsAsIntArray = new int[ids.size()];
-        for(int i = 0; i < ids.size(); i++)
+        for (int i = 0; i < ids.size(); i++)
             idsAsIntArray[i] = ids.get(i);
         return idsAsIntArray;
     }
diff --git a/tests/src/com/todoroo/andlib/utility/DateUtilitiesTest.java b/tests/src/com/todoroo/andlib/utility/DateUtilitiesTest.java
index 044d0c847..659cda067 100644
--- a/tests/src/com/todoroo/andlib/utility/DateUtilitiesTest.java
+++ b/tests/src/com/todoroo/andlib/utility/DateUtilitiesTest.java
@@ -5,13 +5,13 @@
  */
 package com.todoroo.andlib.utility;
 
+import com.todoroo.andlib.test.TodorooTestCase;
+
 import java.text.ParseException;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
 
-import com.todoroo.andlib.test.TodorooTestCase;
-
 public class DateUtilitiesTest extends TodorooTestCase {
 
     public void set24Hour(boolean is24) {
@@ -24,13 +24,13 @@ public class DateUtilitiesTest extends TodorooTestCase {
                 Date d = new Date();
 
                 set24Hour(false);
-                for(int i = 0; i < 24; i++) {
+                for (int i = 0; i < 24; i++) {
                     d.setHours(i);
                     DateUtilities.getTimeString(getContext(), d);
                 }
 
                 set24Hour(true);
-                for(int i = 0; i < 24; i++) {
+                for (int i = 0; i < 24; i++) {
                     d.setHours(i);
                     DateUtilities.getTimeString(getContext(), d);
                 }
@@ -43,7 +43,7 @@ public class DateUtilitiesTest extends TodorooTestCase {
             public void run() {
                 Date d = new Date();
 
-                for(int i = 0; i < 12; i++) {
+                for (int i = 0; i < 12; i++) {
                     d.setMonth(i);
                     DateUtilities.getDateString(getContext(), d);
                 }
@@ -57,7 +57,7 @@ public class DateUtilitiesTest extends TodorooTestCase {
             public void run() {
                 Date d = new Date();
 
-                for(int i = 0; i < 7; i++) {
+                for (int i = 0; i < 7; i++) {
                     d.setDate(i);
                     DateUtilities.getDateStringWithWeekday(getContext(), d);
                 }
diff --git a/tests/src/com/todoroo/astrid/AllTests.java b/tests/src/com/todoroo/astrid/AllTests.java
index 0c715e0da..7a8a9807d 100644
--- a/tests/src/com/todoroo/astrid/AllTests.java
+++ b/tests/src/com/todoroo/astrid/AllTests.java
@@ -16,36 +16,37 @@
 
 package com.todoroo.astrid;
 
+import android.test.suitebuilder.TestSuiteBuilder;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import android.test.suitebuilder.TestSuiteBuilder;
 
 /**
  * A test suite containing all tests for ApiDemos.
- *
+ * <p/>
  * To run all suites found in this apk:
  * $ adb shell am instrument -w \
- *   com.example.android.apis.tests/android.test.InstrumentationTestRunner
- *
+ * com.example.android.apis.tests/android.test.InstrumentationTestRunner
+ * <p/>
  * To run just this suite from the command line:
  * $ adb shell am instrument -w \
- *   -e class com.example.android.apis.AllTests \
- *   com.example.android.apis.tests/android.test.InstrumentationTestRunner
- *
+ * -e class com.example.android.apis.AllTests \
+ * com.example.android.apis.tests/android.test.InstrumentationTestRunner
+ * <p/>
  * To run an individual test case, e.g. {@link com.example.android.apis.os.MorseCodeConverterTest}:
  * $ adb shell am instrument -w \
- *   -e class com.example.android.apis.os.MorseCodeConverterTest \
- *   com.example.android.apis.tests/android.test.InstrumentationTestRunner
- *
+ * -e class com.example.android.apis.os.MorseCodeConverterTest \
+ * com.example.android.apis.tests/android.test.InstrumentationTestRunner
+ * <p/>
  * To run an individual test, e.g. {@link com.example.android.apis.os.MorseCodeConverterTest#testCharacterS()}:
  * $ adb shell am instrument -w \
- *   -e class com.example.android.apis.os.MorseCodeConverterTest#testCharacterS \
- *   com.example.android.apis.tests/android.test.InstrumentationTestRunner
+ * -e class com.example.android.apis.os.MorseCodeConverterTest#testCharacterS \
+ * com.example.android.apis.tests/android.test.InstrumentationTestRunner
  */
 public class AllTests extends TestSuite {
 
     public static Test suite() {
         return new TestSuiteBuilder(AllTests.class)
-            .build();
+                .build();
     }
 }
diff --git a/tests/src/com/todoroo/astrid/backup/BackupServiceTests.java b/tests/src/com/todoroo/astrid/backup/BackupServiceTests.java
index c3f6d7536..fdac9c241 100644
--- a/tests/src/com/todoroo/astrid/backup/BackupServiceTests.java
+++ b/tests/src/com/todoroo/astrid/backup/BackupServiceTests.java
@@ -5,20 +5,20 @@
  */
 package com.todoroo.astrid.backup;
 
-import java.io.File;
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.utility.AndroidUtilities;
+import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.backup.BackupService.BackupDirectorySetting;
 import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
-import com.todoroo.andlib.utility.Preferences;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 public class BackupServiceTests extends DatabaseTestCase {
 
@@ -41,9 +41,9 @@ public class BackupServiceTests extends DatabaseTestCase {
 
         temporaryDirectory = File.createTempFile("backup",
                 Long.toString(System.nanoTime()));
-        if(!(temporaryDirectory.delete()))
+        if (!(temporaryDirectory.delete()))
             throw new IOException("Could not delete temp file: " + temporaryDirectory.getAbsolutePath());
-        if(!(temporaryDirectory.mkdir()))
+        if (!(temporaryDirectory.mkdir()))
             throw new IOException("Could not create temp directory: " + temporaryDirectory.getAbsolutePath());
 
         // make a temporary task
@@ -56,8 +56,8 @@ public class BackupServiceTests extends DatabaseTestCase {
     protected void tearDown() throws Exception {
         super.tearDown();
 
-        if(temporaryDirectory != null) {
-            for(File file : temporaryDirectory.listFiles())
+        if (temporaryDirectory != null) {
+            for (File file : temporaryDirectory.listFiles())
                 file.delete();
             temporaryDirectory.delete();
         }
@@ -71,7 +71,9 @@ public class BackupServiceTests extends DatabaseTestCase {
         Preferences.setBoolean(R.string.backup_BPr_auto_key, setting);
     }
 
-    /** Test backup works */
+    /**
+     * Test backup works
+     */
     public void testBackup() {
         assertEquals(0, temporaryDirectory.list().length);
 
@@ -100,7 +102,9 @@ public class BackupServiceTests extends DatabaseTestCase {
         }
     }
 
-    /** Test no backup */
+    /**
+     * Test no backup
+     */
     public void testNoBackup() {
         assertEquals(0, temporaryDirectory.list().length);
         System.err.println("test no backup");
@@ -145,7 +149,7 @@ public class BackupServiceTests extends DatabaseTestCase {
             myFile.createNewFile();
 
             // create some backup files
-            for(int i = 0; i < 10; i++) {
+            for (int i = 0; i < 10; i++) {
                 DateFormat df = new SimpleDateFormat("MMdd-HHmm");
                 String name = String.format("auto.%02d%s.xml", i, df.format(new Date()));
                 File tempFile = new File(temporaryDirectory, name);
diff --git a/tests/src/com/todoroo/astrid/dao/MetadataDaoTests.java b/tests/src/com/todoroo/astrid/dao/MetadataDaoTests.java
index 9a088f007..30af80bb9 100644
--- a/tests/src/com/todoroo/astrid/dao/MetadataDaoTests.java
+++ b/tests/src/com/todoroo/astrid/dao/MetadataDaoTests.java
@@ -22,8 +22,8 @@ public class MetadataDaoTests extends DatabaseTestCase {
     @Autowired
     TaskDao taskDao;
 
-    public static Property<?>[] KEYS = new Property<?>[] { Metadata.ID,
-            Metadata.KEY };
+    public static Property<?>[] KEYS = new Property<?>[]{Metadata.ID,
+            Metadata.KEY};
 
     /**
      * Test basic creation, fetch, and save
diff --git a/tests/src/com/todoroo/astrid/dao/TaskDaoTests.java b/tests/src/com/todoroo/astrid/dao/TaskDaoTests.java
index e746c31a4..cc5795493 100644
--- a/tests/src/com/todoroo/astrid/dao/TaskDaoTests.java
+++ b/tests/src/com/todoroo/astrid/dao/TaskDaoTests.java
@@ -17,10 +17,10 @@ import com.todoroo.astrid.test.DatabaseTestCase;
 
 public class TaskDaoTests extends DatabaseTestCase {
 
-    public static Property<?>[] IDS = new Property<?>[] { Task.ID };
+    public static Property<?>[] IDS = new Property<?>[]{Task.ID};
 
-    public static Property<?>[] TITLES = new Property<?>[] { Task.ID,
-            Task.TITLE };
+    public static Property<?>[] TITLES = new Property<?>[]{Task.ID,
+            Task.TITLE};
 
     @Autowired
     TaskDao taskDao;
@@ -69,7 +69,7 @@ public class TaskDaoTests extends DatabaseTestCase {
         // check state
         task = taskDao.fetch(happyId, TITLES);
         assertEquals("happy", task.getValue(Task.TITLE));
-        task = taskDao.fetch(sadId,TITLES);
+        task = taskDao.fetch(sadId, TITLES);
         assertEquals("melancholy", task.getValue(Task.TITLE));
     }
 
diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java b/tests/src/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java
index 7712b6bac..bd043775d 100644
--- a/tests/src/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java
+++ b/tests/src/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.gtasks;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -23,9 +20,13 @@ import com.todoroo.astrid.data.Metadata;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class GtasksDetailExposerTest extends DatabaseTestCase {
 
-    @Autowired private GtasksListService gtasksListService;
+    @Autowired
+    private GtasksListService gtasksListService;
     private final GtasksTestPreferenceService preferences = new GtasksTestPreferenceService();
     private final DetailListener detailListener = new DetailListener();
 
@@ -113,7 +114,7 @@ public class GtasksDetailExposerTest extends DatabaseTestCase {
         Task newTask = new Task();
         PluginServices.getTaskService().save(newTask);
         Metadata metadata = GtasksMetadata.createEmptyMetadata(newTask.getId());
-        if(list != null)
+        if (list != null)
             metadata.setValue(GtasksMetadata.LIST_ID, list);
         PluginServices.getMetadataService().save(metadata);
         return task = newTask;
diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java b/tests/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java
index 4a8a7cf51..57cd258d7 100644
--- a/tests/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java
+++ b/tests/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.gtasks;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.google.api.services.tasks.model.TaskList;
 import com.google.api.services.tasks.model.TaskLists;
 import com.todoroo.andlib.service.Autowired;
@@ -17,12 +14,18 @@ import com.todoroo.astrid.data.StoreObject;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @SuppressWarnings("nls")
 public class GtasksIndentActionTest extends DatabaseTestCase {
 
-    @Autowired private GtasksMetadataService gtasksMetadataService;
-    @Autowired private GtasksListService gtasksListService;
-    @Autowired private GtasksTaskListUpdater gtasksTaskListUpdater;
+    @Autowired
+    private GtasksMetadataService gtasksMetadataService;
+    @Autowired
+    private GtasksListService gtasksListService;
+    @Autowired
+    private GtasksTaskListUpdater gtasksTaskListUpdater;
 
     private Task task;
     private StoreObject storeList;
diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java b/tests/src/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java
index 9a12d1c40..9357fb196 100644
--- a/tests/src/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java
+++ b/tests/src/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java
@@ -20,7 +20,8 @@ import com.todoroo.astrid.test.DatabaseTestCase;
 public class GtasksMetadataServiceTest extends DatabaseTestCase {
 
     private final GtasksTestPreferenceService preferences = new GtasksTestPreferenceService();
-    @Autowired private GtasksMetadataService gtasksMetadataService;
+    @Autowired
+    private GtasksMetadataService gtasksMetadataService;
 
     private Task task;
     private Metadata metadata;
@@ -135,7 +136,7 @@ public class GtasksMetadataServiceTest extends DatabaseTestCase {
         task.setValue(Task.TITLE, "cats");
         PluginServices.getTaskService().save(task);
         Metadata metadata = GtasksMetadata.createEmptyMetadata(task.getId());
-        if(id != null)
+        if (id != null)
             metadata.setValue(GtasksMetadata.ID, id);
         metadata.setValue(Metadata.TASK, task.getId());
         PluginServices.getMetadataService().save(metadata);
@@ -162,7 +163,7 @@ public class GtasksMetadataServiceTest extends DatabaseTestCase {
     @Override
     public void setContext(Context context) {
         super.setContext(context);
-        if(!Preferences.isSet(GtasksPreferenceService.PREF_DEFAULT_LIST))
+        if (!Preferences.isSet(GtasksPreferenceService.PREF_DEFAULT_LIST))
             Preferences.setString(GtasksPreferenceService.PREF_DEFAULT_LIST, "list");
     }
 
diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java b/tests/src/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java
index 43fc88ad7..6dd6adc6f 100644
--- a/tests/src/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java
+++ b/tests/src/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.gtasks;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.google.api.services.tasks.model.TaskList;
 import com.google.api.services.tasks.model.TaskLists;
 import com.todoroo.andlib.service.Autowired;
@@ -17,12 +14,18 @@ import com.todoroo.astrid.data.StoreObject;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @SuppressWarnings("nls")
 public class GtasksTaskListUpdaterTest extends DatabaseTestCase {
 
-    @Autowired private GtasksTaskListUpdater gtasksTaskListUpdater;
-    @Autowired private GtasksListService gtasksListService;
-    @Autowired private GtasksMetadataService gtasksMetadataService;
+    @Autowired
+    private GtasksTaskListUpdater gtasksTaskListUpdater;
+    @Autowired
+    private GtasksListService gtasksListService;
+    @Autowired
+    private GtasksMetadataService gtasksMetadataService;
 
     public void testBasicParentComputation() {
         Task[] tasks = givenTasksABCDE();
@@ -88,13 +91,13 @@ public class GtasksTaskListUpdaterTest extends DatabaseTestCase {
         Metadata metadata = gtasksMetadataService.getTaskMetadata(task.getId());
         assertNotNull("metadata was found", metadata);
         assertEquals("order", order, metadata.getValue(GtasksMetadata.ORDER).longValue());
-        assertEquals("indentation", indent, (int)metadata.getValue(GtasksMetadata.INDENT));
+        assertEquals("indentation", indent, (int) metadata.getValue(GtasksMetadata.INDENT));
     }
 
     private void thenExpectMetadataParent(Task task, Task expectedParent) {
         Metadata metadata = gtasksMetadataService.getTaskMetadata(task.getId());
         long parent = metadata.getValue(GtasksMetadata.PARENT_TASK);
-        if(expectedParent == null)
+        if (expectedParent == null)
             assertEquals("Task " + task.getValue(Task.TITLE) + " parent none", 0, parent);
         else
             assertEquals("Task " + task.getValue(Task.TITLE) + " parent " +
@@ -103,7 +106,7 @@ public class GtasksTaskListUpdaterTest extends DatabaseTestCase {
 
     private void thenExpectSibling(Task task, Task expectedSibling) {
         long sibling = gtasksTaskListUpdater.siblings.get(task.getId());
-        if(expectedSibling == null)
+        if (expectedSibling == null)
             assertEquals("Task " + task.getValue(Task.TITLE) + " sibling null", 0L, sibling);
         else
             assertEquals("Task " + task.getValue(Task.TITLE) + " sibling " +
@@ -112,7 +115,7 @@ public class GtasksTaskListUpdaterTest extends DatabaseTestCase {
 
     private void thenExpectParent(Task task, Task expectedParent) {
         long parent = gtasksTaskListUpdater.parents.get(task.getId());
-        if(expectedParent == null)
+        if (expectedParent == null)
             assertEquals("Task " + task.getValue(Task.TITLE) + " parent null", 0L, parent);
         else
             assertEquals("Task " + task.getValue(Task.TITLE) + " parent " +
@@ -138,25 +141,25 @@ public class GtasksTaskListUpdaterTest extends DatabaseTestCase {
     }
 
     private void whenCalculatingOrder() {
-        for(StoreObject list : gtasksListService.getLists())
+        for (StoreObject list : gtasksListService.getLists())
             gtasksTaskListUpdater.correctMetadataForList(list.getValue(GtasksList.REMOTE_ID));
     }
 
 
     /**
      * A
-     *  B
-     *  C
-     *   D
+     * B
+     * C
+     * D
      * E
      */
     private Task[] givenTasksABCDE() {
-        return new Task[] {
-            createTask("A", 0, 0),
-            createTask("B", 1, 1),
-            createTask("C", 2, 1),
-            createTask("D", 3, 2),
-            createTask("E", 4, 0),
+        return new Task[]{
+                createTask("A", 0, 0),
+                createTask("B", 1, 1),
+                createTask("C", 2, 1),
+                createTask("D", 3, 2),
+                createTask("E", 4, 0),
         };
     }
 
@@ -167,9 +170,9 @@ public class GtasksTaskListUpdaterTest extends DatabaseTestCase {
         PluginServices.getTaskService().save(task);
         Metadata metadata = GtasksMetadata.createEmptyMetadata(task.getId());
         metadata.setValue(GtasksMetadata.LIST_ID, "1");
-        if(order != GtasksMetadata.VALUE_UNSET)
+        if (order != GtasksMetadata.VALUE_UNSET)
             metadata.setValue(GtasksMetadata.ORDER, order);
-        if(indent != GtasksMetadata.VALUE_UNSET)
+        if (indent != GtasksMetadata.VALUE_UNSET)
             metadata.setValue(GtasksMetadata.INDENT, indent);
         PluginServices.getMetadataService().save(metadata);
         return task;
diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java b/tests/src/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java
index d9c7e808f..d27e1d71d 100644
--- a/tests/src/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java
+++ b/tests/src/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.gtasks;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.google.api.services.tasks.model.TaskList;
 import com.google.api.services.tasks.model.TaskLists;
 import com.todoroo.andlib.service.Autowired;
@@ -17,12 +14,18 @@ import com.todoroo.astrid.data.StoreObject;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @SuppressWarnings("nls")
 public class GtasksTaskMovingTest extends DatabaseTestCase {
 
-    @Autowired private GtasksListService gtasksListService;
-    @Autowired private GtasksMetadataService gtasksMetadataService;
-    @Autowired private GtasksTaskListUpdater gtasksTaskListUpdater;
+    @Autowired
+    private GtasksListService gtasksListService;
+    @Autowired
+    private GtasksMetadataService gtasksMetadataService;
+    @Autowired
+    private GtasksTaskListUpdater gtasksTaskListUpdater;
 
     private Task A, B, C, D, E, F;
     private StoreObject list;
@@ -224,7 +227,9 @@ public class GtasksTaskMovingTest extends DatabaseTestCase {
 
     // --- helpers
 
-    /** moveTo = null => move to end */
+    /**
+     * moveTo = null => move to end
+     */
     private void whenTriggerMove(Task target, Task moveTo) {
         gtasksTaskListUpdater.moveTo(null, list, target.getId(), moveTo == null ? -1 : moveTo.getId());
         gtasksTaskListUpdater.debugPrint(null, list);
@@ -234,7 +239,7 @@ public class GtasksTaskMovingTest extends DatabaseTestCase {
         Metadata metadata = gtasksMetadataService.getTaskMetadata(task.getId());
         assertNotNull("metadata was found", metadata);
         assertEquals("order", order, metadata.getValue(GtasksMetadata.ORDER).longValue());
-        assertEquals("indentation", indent, (int)metadata.getValue(GtasksMetadata.INDENT));
+        assertEquals("indentation", indent, (int) metadata.getValue(GtasksMetadata.INDENT));
     }
 
     @Override
@@ -255,20 +260,20 @@ public class GtasksTaskMovingTest extends DatabaseTestCase {
 
     /**
      * A
-     *  B
-     *  C
-     *   D
+     * B
+     * C
+     * D
      * E
      * F
      */
     private Task[] givenTasksABCDEF() {
-        Task[] tasks = new Task[] {
-            A = createTask("A", 0, 0),
-            B = createTask("B", 1, 1),
-            C = createTask("C", 2, 1),
-            D = createTask("D", 3, 2),
-            E = createTask("E", 4, 0),
-            F = createTask("F", 5, 0),
+        Task[] tasks = new Task[]{
+                A = createTask("A", 0, 0),
+                B = createTask("B", 1, 1),
+                C = createTask("C", 2, 1),
+                D = createTask("D", 3, 2),
+                E = createTask("E", 4, 0),
+                F = createTask("F", 5, 0),
         };
         gtasksTaskListUpdater.correctMetadataForList("1");
         return tasks;
@@ -280,9 +285,9 @@ public class GtasksTaskMovingTest extends DatabaseTestCase {
         PluginServices.getTaskService().save(task);
         Metadata metadata = GtasksMetadata.createEmptyMetadata(task.getId());
         metadata.setValue(GtasksMetadata.LIST_ID, "1");
-        if(order != GtasksMetadata.VALUE_UNSET)
+        if (order != GtasksMetadata.VALUE_UNSET)
             metadata.setValue(GtasksMetadata.ORDER, order);
-        if(indent != GtasksMetadata.VALUE_UNSET)
+        if (indent != GtasksMetadata.VALUE_UNSET)
             metadata.setValue(GtasksMetadata.INDENT, indent);
         PluginServices.getMetadataService().save(metadata);
         return task;
diff --git a/tests/src/com/todoroo/astrid/model/TaskTests.java b/tests/src/com/todoroo/astrid/model/TaskTests.java
index 05e43d989..12d687c40 100644
--- a/tests/src/com/todoroo/astrid/model/TaskTests.java
+++ b/tests/src/com/todoroo/astrid/model/TaskTests.java
@@ -5,9 +5,6 @@
  */
 package com.todoroo.astrid.model;
 
-import java.util.ArrayList;
-import java.util.TreeSet;
-
 import android.content.ContentValues;
 
 import com.todoroo.andlib.service.Autowired;
@@ -17,12 +14,17 @@ import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.test.DatabaseTestCase;
 import com.todoroo.astrid.utility.AstridPreferences;
 
+import java.util.ArrayList;
+import java.util.TreeSet;
+
 public class TaskTests extends DatabaseTestCase {
 
     @Autowired
     TaskService taskService;
 
-    /** Sanity-check the constants */
+    /**
+     * Sanity-check the constants
+     */
     public void testSanity() {
         assertTrue(Task.IMPORTANCE_DO_OR_DIE < Task.IMPORTANCE_MUST_DO);
         assertTrue(Task.IMPORTANCE_MUST_DO < Task.IMPORTANCE_SHOULD_DO);
@@ -38,7 +40,9 @@ public class TaskTests extends DatabaseTestCase {
                 reminderFlags.size());
     }
 
-    /** Check defaults */
+    /**
+     * Check defaults
+     */
     public void checkDefaults() {
         AstridPreferences.setPreferenceDefaults();
         ContentValues defaults = new Task().getDefaultValues();
@@ -49,7 +53,9 @@ public class TaskTests extends DatabaseTestCase {
         assertTrue(defaults.containsKey(Task.IMPORTANCE.name));
     }
 
-    /** Check task gets a creation date at some point */
+    /**
+     * Check task gets a creation date at some point
+     */
     public void checkCreationDate() {
         Task task = new Task();
         taskService.save(task);
diff --git a/tests/src/com/todoroo/astrid/provider/Astrid3ProviderTests.java b/tests/src/com/todoroo/astrid/provider/Astrid3ProviderTests.java
index f05b4a0dc..a1a5f3f5e 100644
--- a/tests/src/com/todoroo/astrid/provider/Astrid3ProviderTests.java
+++ b/tests/src/com/todoroo/astrid/provider/Astrid3ProviderTests.java
@@ -20,7 +20,7 @@ import com.todoroo.astrid.test.DatabaseTestCase;
 
 public class Astrid3ProviderTests extends DatabaseTestCase {
 
-    String[] PROJECTION = new String[] {
+    String[] PROJECTION = new String[]{
             Task.ID.name,
             Task.TITLE.name,
     };
@@ -34,7 +34,9 @@ public class Astrid3ProviderTests extends DatabaseTestCase {
 
     }
 
-    /** Test CRUD over tasks with the ALL ITEMS cursor */
+    /**
+     * Test CRUD over tasks with the ALL ITEMS cursor
+     */
     public void testAllItemsCrud() {
         ContentResolver resolver = getContext().getContentResolver();
 
@@ -75,7 +77,9 @@ public class Astrid3ProviderTests extends DatabaseTestCase {
         cursor.close();
     }
 
-    /** Test selecting data */
+    /**
+     * Test selecting data
+     */
     public void testSelection() {
         ContentResolver resolver = getContext().getContentResolver();
         Uri uri = Task.CONTENT_URI;
@@ -120,7 +124,9 @@ public class Astrid3ProviderTests extends DatabaseTestCase {
         cursor.close();
     }
 
-    /** Test updating */
+    /**
+     * Test updating
+     */
     public void testUpdating() {
         ContentResolver resolver = getContext().getContentResolver();
 
@@ -136,7 +142,7 @@ public class Astrid3ProviderTests extends DatabaseTestCase {
         values.put(Task.IMPORTANCE.name, Task.IMPORTANCE_MUST_DO);
         resolver.insert(Task.CONTENT_URI, values);
 
-        String[] projection = new String[] {
+        String[] projection = new String[]{
                 Task.ID.name,
                 Task.TITLE.name,
                 Task.IMPORTANCE.name,
@@ -183,7 +189,9 @@ public class Astrid3ProviderTests extends DatabaseTestCase {
         }
     }
 
-    /** Test deleting */
+    /**
+     * Test deleting
+     */
     public void testDeleting() {
         ContentResolver resolver = getContext().getContentResolver();
         Uri allItemsUri = Task.CONTENT_URI;
@@ -242,7 +250,9 @@ public class Astrid3ProviderTests extends DatabaseTestCase {
         }
     }
 
-    /** Test CRUD over SINGLE ITEM uri */
+    /**
+     * Test CRUD over SINGLE ITEM uri
+     */
     public void testSingleItemCrud() {
         ContentResolver resolver = getContext().getContentResolver();
 
@@ -257,7 +267,7 @@ public class Astrid3ProviderTests extends DatabaseTestCase {
         Uri secondUri = resolver.insert(uri, values);
         assertNotSame(firstUri, secondUri);
 
-        String[] storeProjection = new String[] {
+        String[] storeProjection = new String[]{
                 StoreObject.ITEM.name,
         };
 
@@ -287,7 +297,9 @@ public class Astrid3ProviderTests extends DatabaseTestCase {
         cursor.close();
     }
 
-    /** Test GROUP BY uri */
+    /**
+     * Test GROUP BY uri
+     */
     public void testGroupByCrud() {
         ContentResolver resolver = getContext().getContentResolver();
         Uri uri = Task.CONTENT_URI;
@@ -338,7 +350,7 @@ public class Astrid3ProviderTests extends DatabaseTestCase {
         values.put(size.name, "small");
         resolver.insert(uri, values);
 
-        String[] metadataProjection = new String[] { "AVG(" + age + ")" };
+        String[] metadataProjection = new String[]{"AVG(" + age + ")"};
 
         Uri groupBySizeUri = Uri.withAppendedPath(Metadata.CONTENT_URI,
                 AstridApiConstants.GROUP_BY_URI + size.name);
diff --git a/tests/src/com/todoroo/astrid/reminders/NotificationTests.java b/tests/src/com/todoroo/astrid/reminders/NotificationTests.java
index ada98430c..7e49dd83b 100644
--- a/tests/src/com/todoroo/astrid/reminders/NotificationTests.java
+++ b/tests/src/com/todoroo/astrid/reminders/NotificationTests.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.reminders;
 
-import java.util.Date;
-
 import android.app.Notification;
 import android.content.Intent;
 
@@ -19,6 +17,8 @@ import com.todoroo.astrid.dao.TaskDao;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
 
+import java.util.Date;
+
 public class NotificationTests extends DatabaseTestCase {
 
     @Autowired
@@ -39,7 +39,9 @@ public class NotificationTests extends DatabaseTestCase {
         Notifications.setNotificationManager(null);
     }
 
-    /** test that a normal task gets a notification */
+    /**
+     * test that a normal task gets a notification
+     */
     public void testAlarmToNotification() {
         final Task task = new Task();
         task.setValue(Task.TITLE, "rubberduck");
@@ -63,7 +65,9 @@ public class NotificationTests extends DatabaseTestCase {
         assertTrue(triggered.value);
     }
 
-    /** test that a deleted task doesn't get a notification */
+    /**
+     * test that a deleted task doesn't get a notification
+     */
     public void testDeletedTask() {
         final Task task = new Task();
         task.setValue(Task.TITLE, "gooeyduck");
@@ -92,7 +96,9 @@ public class NotificationTests extends DatabaseTestCase {
         new Notifications().onReceive(getContext(), intent);
     }
 
-    /** test that a completed task doesn't get a notification */
+    /**
+     * test that a completed task doesn't get a notification
+     */
     public void testCompletedTask() {
         final Task task = new Task();
         task.setValue(Task.TITLE, "rubberduck");
@@ -121,7 +127,9 @@ public class NotificationTests extends DatabaseTestCase {
         new Notifications().onReceive(getContext(), intent);
     }
 
-    /** test of quiet hours */
+    /**
+     * test of quiet hours
+     */
     public void testQuietHours() {
         final Task task = new Task();
         task.setValue(Task.TITLE, "rubberduck");
@@ -188,6 +196,7 @@ public class NotificationTests extends DatabaseTestCase {
         public void cancel(int id) {
             fail("wtf cance?");
         }
+
         public void cancelAll() {
             fail("wtf cancel all?");
         }
diff --git a/tests/src/com/todoroo/astrid/reminders/ReminderServiceTests.java b/tests/src/com/todoroo/astrid/reminders/ReminderServiceTests.java
index c67eea4d7..a6791ad73 100644
--- a/tests/src/com/todoroo/astrid/reminders/ReminderServiceTests.java
+++ b/tests/src/com/todoroo/astrid/reminders/ReminderServiceTests.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.reminders;
 
-import java.util.Date;
-
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.dao.TaskDao;
@@ -15,6 +13,8 @@ import com.todoroo.astrid.reminders.ReminderService.AlarmScheduler;
 import com.todoroo.astrid.test.DatabaseTestCase;
 import com.todoroo.astrid.utility.AstridPreferences;
 
+import java.util.Date;
+
 public class ReminderServiceTests extends DatabaseTestCase {
 
     ReminderService service;
@@ -37,7 +37,9 @@ public class ReminderServiceTests extends DatabaseTestCase {
         service.setScheduler(original);
     }
 
-    /** tests with no alarms */
+    /**
+     * tests with no alarms
+     */
     public void testNoReminders() {
         service.setScheduler(new NoAlarmExpected());
 
@@ -49,7 +51,9 @@ public class ReminderServiceTests extends DatabaseTestCase {
         service.scheduleAlarm(task);
     }
 
-    /** tests with due date */
+    /**
+     * tests with due date
+     */
     public void testDueDates() {
         service.setScheduler(new AlarmExpected() {
             @Override
@@ -57,7 +61,7 @@ public class ReminderServiceTests extends DatabaseTestCase {
                 if (time == ReminderService.NO_ALARM)
                     return;
                 super.createAlarm(task, time, type);
-                assertEquals((long)task.getValue(Task.DUE_DATE), time);
+                assertEquals((long) task.getValue(Task.DUE_DATE), time);
                 assertEquals(type, ReminderService.TYPE_DUE);
             }
         });
@@ -72,10 +76,12 @@ public class ReminderServiceTests extends DatabaseTestCase {
         // test due date in the future
         task.setValue(Task.DUE_DATE, DateUtilities.now() + DateUtilities.ONE_DAY);
         taskDao.save(task);
-        assertTrue(((AlarmExpected)service.getScheduler()).alarmCreated);
+        assertTrue(((AlarmExpected) service.getScheduler()).alarmCreated);
     }
 
-    /** tests with random */
+    /**
+     * tests with random
+     */
     public void testRandom() {
         // test random
         final Task task = new Task();
@@ -93,10 +99,12 @@ public class ReminderServiceTests extends DatabaseTestCase {
             }
         });
         taskDao.save(task);
-        assertTrue(((AlarmExpected)service.getScheduler()).alarmCreated);
+        assertTrue(((AlarmExpected) service.getScheduler()).alarmCreated);
     }
 
-    /** tests with overdue */
+    /**
+     * tests with overdue
+     */
     public void testOverdue() {
         // test due date in the future
         service.setScheduler(new AlarmExpected() {
@@ -130,7 +138,7 @@ public class ReminderServiceTests extends DatabaseTestCase {
             }
         });
         taskDao.save(task);
-        assertTrue(((AlarmExpected)service.getScheduler()).alarmCreated);
+        assertTrue(((AlarmExpected) service.getScheduler()).alarmCreated);
 
         // test due date in the past, but recently notified
         task.setValue(Task.REMINDER_LAST, DateUtilities.now());
@@ -146,10 +154,12 @@ public class ReminderServiceTests extends DatabaseTestCase {
             }
         });
         taskDao.save(task);
-        assertTrue(((AlarmExpected)service.getScheduler()).alarmCreated);
+        assertTrue(((AlarmExpected) service.getScheduler()).alarmCreated);
     }
 
-    /** tests with multiple */
+    /**
+     * tests with multiple
+     */
     public void testMultipleReminders() {
         // test due date in the future, enable random
         final Task task = new Task();
@@ -169,13 +179,13 @@ public class ReminderServiceTests extends DatabaseTestCase {
             }
         });
         taskDao.save(task);
-        assertTrue(((AlarmExpected)service.getScheduler()).alarmCreated);
+        assertTrue(((AlarmExpected) service.getScheduler()).alarmCreated);
 
         // now set the due date in the past
         task.setValue(Task.DUE_DATE, DateUtilities.now() - DateUtilities.ONE_WEEK);
-        ((AlarmExpected)service.getScheduler()).alarmCreated = false;
+        ((AlarmExpected) service.getScheduler()).alarmCreated = false;
         service.scheduleAlarm(task);
-        assertTrue(((AlarmExpected)service.getScheduler()).alarmCreated);
+        assertTrue(((AlarmExpected) service.getScheduler()).alarmCreated);
 
         // now set the due date before the random
         task.setValue(Task.DUE_DATE, DateUtilities.now() + DateUtilities.ONE_HOUR);
@@ -185,16 +195,18 @@ public class ReminderServiceTests extends DatabaseTestCase {
                 if (time == ReminderService.NO_ALARM)
                     return;
                 super.createAlarm(task, time, type);
-                assertEquals((long)task.getValue(Task.DUE_DATE), time);
+                assertEquals((long) task.getValue(Task.DUE_DATE), time);
                 assertEquals(type, ReminderService.TYPE_DUE);
             }
         });
         taskDao.save(task);
-        assertTrue(((AlarmExpected)service.getScheduler()).alarmCreated);
+        assertTrue(((AlarmExpected) service.getScheduler()).alarmCreated);
     }
 
 
-    /** tests with snooze */
+    /**
+     * tests with snooze
+     */
     public void testSnoozeReminders() {
         // test due date and snooze in the future
         final Task task = new Task();
@@ -214,7 +226,7 @@ public class ReminderServiceTests extends DatabaseTestCase {
             }
         });
         taskDao.save(task);
-        assertTrue(((AlarmExpected)service.getScheduler()).alarmCreated);
+        assertTrue(((AlarmExpected) service.getScheduler()).alarmCreated);
 
         // snooze in the past
         task.setValue(Task.REMINDER_SNOOZE, DateUtilities.now() - DateUtilities.ONE_WEEK);
@@ -230,7 +242,7 @@ public class ReminderServiceTests extends DatabaseTestCase {
             }
         });
         taskDao.save(task);
-        assertTrue(((AlarmExpected)service.getScheduler()).alarmCreated);
+        assertTrue(((AlarmExpected) service.getScheduler()).alarmCreated);
     }
 
 
@@ -238,7 +250,7 @@ public class ReminderServiceTests extends DatabaseTestCase {
 
     public class NoAlarmExpected implements AlarmScheduler {
         public void createAlarm(Task task, long time, int type) {
-            if(time == 0 || time == Long.MAX_VALUE)
+            if (time == 0 || time == Long.MAX_VALUE)
                 return;
             fail("created alarm, no alarm expected (" + type + ": " + new Date(time));
         }
@@ -246,6 +258,7 @@ public class ReminderServiceTests extends DatabaseTestCase {
 
     public class AlarmExpected implements AlarmScheduler {
         public boolean alarmCreated = false;
+
         public void createAlarm(Task task, long time, int type) {
             alarmCreated = true;
         }
diff --git a/tests/src/com/todoroo/astrid/repeats/AdvancedRepeatTests.java b/tests/src/com/todoroo/astrid/repeats/AdvancedRepeatTests.java
index 825f75c82..4dbf5c6dd 100644
--- a/tests/src/com/todoroo/astrid/repeats/AdvancedRepeatTests.java
+++ b/tests/src/com/todoroo/astrid/repeats/AdvancedRepeatTests.java
@@ -5,11 +5,6 @@
  */
 package com.todoroo.astrid.repeats;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 import com.google.ical.values.Weekday;
@@ -18,6 +13,11 @@ import com.todoroo.andlib.test.TodorooTestCase;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.Task;
 
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+
 public class AdvancedRepeatTests extends TodorooTestCase {
 
 
@@ -74,7 +74,9 @@ public class AdvancedRepeatTests extends TodorooTestCase {
 
     // --- due date tests
 
-    /** test multiple days per week - DUE DATE */
+    /**
+     * test multiple days per week - DUE DATE
+     */
     public void testDueDateInPastSingleWeekMultiDay() throws Exception {
 
         buildRRule(1, Frequency.WEEKLY, Weekday.MO, Weekday.WE, Weekday.FR);
@@ -92,7 +94,9 @@ public class AdvancedRepeatTests extends TodorooTestCase {
         assertDueDate(nextDueDate, THIS, Calendar.MONDAY);
     }
 
-    /** test single day repeats - DUE DATE */
+    /**
+     * test single day repeats - DUE DATE
+     */
     public void testDueDateSingleDay() throws Exception {
 
         buildRRule(1, Frequency.WEEKLY, Weekday.MO);
@@ -122,7 +126,9 @@ public class AdvancedRepeatTests extends TodorooTestCase {
         assertDueDate(nextDueDate, NEXT, Calendar.MONDAY);
     }
 
-    /** test multiple days per week - DUE DATE */
+    /**
+     * test multiple days per week - DUE DATE
+     */
     public void testDueDateSingleWeekMultiDay() throws Exception {
 
         buildRRule(1, Frequency.WEEKLY, Weekday.MO, Weekday.WE, Weekday.FR);
@@ -140,7 +146,9 @@ public class AdvancedRepeatTests extends TodorooTestCase {
         assertDueDate(nextDueDate, THIS, Calendar.MONDAY);
     }
 
-    /** test multiple days per week, multiple intervals - DUE DATE */
+    /**
+     * test multiple days per week, multiple intervals - DUE DATE
+     */
     public void testDueDateMultiWeekMultiDay() throws Exception {
 
         buildRRule(2, Frequency.WEEKLY, Weekday.MO, Weekday.WE, Weekday.FR);
@@ -160,10 +168,12 @@ public class AdvancedRepeatTests extends TodorooTestCase {
 
     // --- completion tests
 
-    /** test multiple days per week - COMPLETE DATE */
+    /**
+     * test multiple days per week - COMPLETE DATE
+     */
     public void testCompleteDateSingleWeek() throws Exception {
 
-        for(Weekday wday : Weekday.values()) {
+        for (Weekday wday : Weekday.values()) {
             buildRRule(1, Frequency.WEEKLY, wday);
             computeNextDueDate(true);
             long expected = getDate(DateUtilities.now() + DateUtilities.ONE_DAY, THIS, wday.javaDayNum);
@@ -171,9 +181,9 @@ public class AdvancedRepeatTests extends TodorooTestCase {
             assertDateEquals(nextDueDate, expected);
         }
 
-        for(Weekday wday1 : Weekday.values()) {
-            for(Weekday wday2 : Weekday.values()) {
-                if(wday1 == wday2)
+        for (Weekday wday1 : Weekday.values()) {
+            for (Weekday wday2 : Weekday.values()) {
+                if (wday1 == wday2)
                     continue;
 
                 buildRRule(1, Frequency.WEEKLY, wday1, wday2);
@@ -186,10 +196,12 @@ public class AdvancedRepeatTests extends TodorooTestCase {
         }
     }
 
-    /** test multiple days per week, multiple intervals - COMPLETE DATE */
+    /**
+     * test multiple days per week, multiple intervals - COMPLETE DATE
+     */
     public void testCompleteDateMultiWeek() throws Exception {
 
-        for(Weekday wday : Weekday.values()) {
+        for (Weekday wday : Weekday.values()) {
             buildRRule(2, Frequency.WEEKLY, wday);
             computeNextDueDate(true);
             long expected = getDate(DateUtilities.now() + DateUtilities.ONE_DAY, NEXT, wday.javaDayNum);
@@ -197,9 +209,9 @@ public class AdvancedRepeatTests extends TodorooTestCase {
             assertDateEquals(nextDueDate, expected);
         }
 
-        for(Weekday wday1 : Weekday.values()) {
-            for(Weekday wday2 : Weekday.values()) {
-                if(wday1 == wday2)
+        for (Weekday wday1 : Weekday.values()) {
+            for (Weekday wday2 : Weekday.values()) {
+                if (wday1 == wday2)
                     continue;
 
                 buildRRule(2, Frequency.WEEKLY, wday1, wday2);
@@ -214,7 +226,7 @@ public class AdvancedRepeatTests extends TodorooTestCase {
 
     // --- helpers
 
-    private void computeNextDueDate(boolean fromComplete) throws ParseException{
+    private void computeNextDueDate(boolean fromComplete) throws ParseException {
         nextDueDate = RepeatTaskCompleteListener.computeNextDueDate(task, rrule.toIcal(), fromComplete);
     }
 
@@ -242,7 +254,7 @@ public class AdvancedRepeatTests extends TodorooTestCase {
 
     private void setRRuleDays(RRule rrule, Weekday... weekdays) {
         ArrayList<WeekdayNum> days = new ArrayList<WeekdayNum>();
-        for(Weekday wd : weekdays)
+        for (Weekday wd : weekdays)
             days.add(new WeekdayNum(0, wd));
         rrule.setByDay(days);
     }
@@ -259,7 +271,7 @@ public class AdvancedRepeatTests extends TodorooTestCase {
         c.setTimeInMillis(start);
         int direction = which > 0 ? 1 : -1;
 
-        while(c.get(Calendar.DAY_OF_WEEK) != dayOfWeek) {
+        while (c.get(Calendar.DAY_OF_WEEK) != dayOfWeek) {
             c.add(Calendar.DAY_OF_MONTH, direction);
         }
         c.add(Calendar.DAY_OF_MONTH, (Math.abs(which) - 1) * direction * 7);
diff --git a/tests/src/com/todoroo/astrid/repeats/NewRepeatTests.java b/tests/src/com/todoroo/astrid/repeats/NewRepeatTests.java
index 70de96bc1..ccd0ed682 100644
--- a/tests/src/com/todoroo/astrid/repeats/NewRepeatTests.java
+++ b/tests/src/com/todoroo/astrid/repeats/NewRepeatTests.java
@@ -5,11 +5,6 @@
  */
 package com.todoroo.astrid.repeats;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-
 import android.content.Intent;
 
 import com.google.ical.values.Frequency;
@@ -31,6 +26,11 @@ import com.todoroo.astrid.data.SyncFlags;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+
 public class NewRepeatTests<REMOTE_MODEL> extends DatabaseTestCase {
 
     @Autowired
@@ -47,7 +47,7 @@ public class NewRepeatTests<REMOTE_MODEL> extends DatabaseTestCase {
 
     private void saveAndTriggerRepeatListener(Task task) {
         task.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
-        if(task.isSaved())
+        if (task.isSaved())
             taskDao.saveExisting(task);
         else
             taskDao.createNew(task);
@@ -83,7 +83,7 @@ public class NewRepeatTests<REMOTE_MODEL> extends DatabaseTestCase {
      * @param remoteModel
      */
     protected long setCompletionDate(boolean completeBefore, Task t,
-            REMOTE_MODEL remoteModel, long dueDate) {
+                                     REMOTE_MODEL remoteModel, long dueDate) {
         long completionDate;
         if (completeBefore)
             completionDate = dueDate - DateUtilities.ONE_DAY;
@@ -125,7 +125,7 @@ public class NewRepeatTests<REMOTE_MODEL> extends DatabaseTestCase {
     }
 
     protected void testRepeating(boolean completeBefore, boolean fromCompletion,
-            RRule rrule, Frequency frequency, String title) {
+                                 RRule rrule, Frequency frequency, String title) {
         Task t = new Task();
         t.setValue(Task.TITLE, title);
         long dueDate = DateUtilities.now() + DateUtilities.ONE_DAY * 3;
@@ -174,7 +174,7 @@ public class NewRepeatTests<REMOTE_MODEL> extends DatabaseTestCase {
             long newDueDate = t.getValue(Task.DUE_DATE);
             assertTrue(t.hasDueTime());
 
-            long fromDate = (fromCompletion? completionDate : dueDate);
+            long fromDate = (fromCompletion ? completionDate : dueDate);
             long expectedTime = computeNextDueDateFromDate(fromDate, rrule, fromCompletion);
 
             assertTaskExistsRemotely(t, expectedTime);
@@ -240,7 +240,9 @@ public class NewRepeatTests<REMOTE_MODEL> extends DatabaseTestCase {
     }
 
 
-    /** Advanced weekly repeating tests */
+    /**
+     * Advanced weekly repeating tests
+     */
     protected long computeNextDueDateFromDate(long fromDate, RRule rrule, boolean fromCompletion) {
         long expectedTime = fromDate;
         Frequency frequency = rrule.getFreq();
@@ -282,7 +284,9 @@ public class NewRepeatTests<REMOTE_MODEL> extends DatabaseTestCase {
     }
 
 
-    /** Tests for repeating from due date */
+    /**
+     * Tests for repeating from due date
+     */
 
     public void testRepeatMinutelyFromDueDateCompleteBefore() {
         testFromDueDate(true, Frequency.MINUTELY, "minutely-before");
@@ -333,7 +337,9 @@ public class NewRepeatTests<REMOTE_MODEL> extends DatabaseTestCase {
     }
 
 
-    /** Tests for repeating from completionDate */
+    /**
+     * Tests for repeating from completionDate
+     */
 
     public void testRepeatMinutelyFromCompleteDateCompleteBefore() {
         testFromCompletionDate(true, Frequency.MINUTELY, "minutely-before");
@@ -410,7 +416,6 @@ public class NewRepeatTests<REMOTE_MODEL> extends DatabaseTestCase {
     }
 
 
-
     // disabled until test can be fixed
     public void testAdvancedRepeatWeeklyFromDueDateCompleteBefore() {
         testAdvancedWeeklyFromDueDate(true, "advanced-weekly-before");
diff --git a/tests/src/com/todoroo/astrid/repeats/RepeatAfterCompleteTests.java b/tests/src/com/todoroo/astrid/repeats/RepeatAfterCompleteTests.java
index 0a1baaa3c..fa0c146bb 100644
--- a/tests/src/com/todoroo/astrid/repeats/RepeatAfterCompleteTests.java
+++ b/tests/src/com/todoroo/astrid/repeats/RepeatAfterCompleteTests.java
@@ -5,11 +5,6 @@
  */
 package com.todoroo.astrid.repeats;
 
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.TimeZone;
-
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 import com.google.ical.values.Weekday;
@@ -18,6 +13,11 @@ import com.todoroo.andlib.test.TodorooTestCase;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.data.Task;
 
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.TimeZone;
+
 public class RepeatAfterCompleteTests extends TodorooTestCase {
 
     private Task task;
@@ -37,15 +37,17 @@ public class RepeatAfterCompleteTests extends TodorooTestCase {
     public void testSubDailyFreqs() throws ParseException {
         task.setValue(Task.DUE_DATE, DateUtilities.now() - DateUtilities.ONE_WEEK);
 
-        for(Frequency freq : Frequency.values()) {
+        for (Frequency freq : Frequency.values()) {
             long interval = -1;
-            switch(freq) {
-            case MINUTELY:
-                interval = DateUtilities.ONE_MINUTE; break;
-            case HOURLY:
-                interval = DateUtilities.ONE_HOUR; break;
-            default:
-                continue;
+            switch (freq) {
+                case MINUTELY:
+                    interval = DateUtilities.ONE_MINUTE;
+                    break;
+                case HOURLY:
+                    interval = DateUtilities.ONE_HOUR;
+                    break;
+                default:
+                    continue;
             }
 
             buildRRule(1, freq);
@@ -64,20 +66,24 @@ public class RepeatAfterCompleteTests extends TodorooTestCase {
                 Task.createDueDate(Task.URGENCY_SPECIFIC_DAY,
                         DateUtilities.now() - DateUtilities.ONE_WEEK));
 
-        for(int interval = 1; interval < 7; interval++) {
-            for(Frequency freq : Frequency.values()) {
+        for (int interval = 1; interval < 7; interval++) {
+            for (Frequency freq : Frequency.values()) {
                 long next = DateUtilities.now();
-                switch(freq) {
-                case DAILY:
-                    next += interval * DateUtilities.ONE_DAY; break;
-                case WEEKLY:
-                    next += interval * DateUtilities.ONE_WEEK; break;
-                case MONTHLY:
-                    next = DateUtilities.addCalendarMonthsToUnixtime(next, interval); break;
-                case YEARLY:
-                    next = DateUtilities.addCalendarMonthsToUnixtime(next, interval * 12); break;
-                default:
-                    continue;
+                switch (freq) {
+                    case DAILY:
+                        next += interval * DateUtilities.ONE_DAY;
+                        break;
+                    case WEEKLY:
+                        next += interval * DateUtilities.ONE_WEEK;
+                        break;
+                    case MONTHLY:
+                        next = DateUtilities.addCalendarMonthsToUnixtime(next, interval);
+                        break;
+                    case YEARLY:
+                        next = DateUtilities.addCalendarMonthsToUnixtime(next, interval * 12);
+                        break;
+                    default:
+                        continue;
                 }
 
                 buildRRule(interval, freq);
@@ -123,7 +129,7 @@ public class RepeatAfterCompleteTests extends TodorooTestCase {
 
     private void setRRuleDays(RRule rrule, Weekday... weekdays) {
         ArrayList<WeekdayNum> days = new ArrayList<WeekdayNum>();
-        for(Weekday wd : weekdays)
+        for (Weekday wd : weekdays)
             days.add(new WeekdayNum(0, wd));
         rrule.setByDay(days);
     }
diff --git a/tests/src/com/todoroo/astrid/service/ABTestingServiceTest.java b/tests/src/com/todoroo/astrid/service/ABTestingServiceTest.java
index dcd2651ce..daf890cff 100644
--- a/tests/src/com/todoroo/astrid/service/ABTestingServiceTest.java
+++ b/tests/src/com/todoroo/astrid/service/ABTestingServiceTest.java
@@ -19,9 +19,12 @@ import com.todoroo.astrid.test.DatabaseTestCase;
 
 public class ABTestingServiceTest extends DatabaseTestCase {
 
-    @Autowired ABTestEventDao abTestEventDao;
-    @Autowired ABChooser abChooser;
-    @Autowired ABTests abTests;
+    @Autowired
+    ABTestEventDao abTestEventDao;
+    @Autowired
+    ABChooser abChooser;
+    @Autowired
+    ABTests abTests;
 
     public void testReportInitialEventNewUser() {
         testInitialEvents(true, false);
@@ -65,8 +68,8 @@ public class ABTestingServiceTest extends DatabaseTestCase {
 
         TodorooCursor<ABTestEvent> events = abTestEventDao.query(
                 Query.select(ABTestEvent.PROPERTIES)
-                .where(ABTestEvent.TEST_NAME.eq(TEST_NAME))
-                .orderBy(Order.asc(ABTestEvent.TIME_INTERVAL)));
+                        .where(ABTestEvent.TEST_NAME.eq(TEST_NAME))
+                        .orderBy(Order.asc(ABTestEvent.TIME_INTERVAL)));
         try {
             int maxIntervalIndex = AndroidUtilities.indexOf(ABTestEvent.TIME_INTERVALS, testInterval);
             assertEquals(maxIntervalIndex + 1, events.getCount());
@@ -91,10 +94,10 @@ public class ABTestingServiceTest extends DatabaseTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        abTests.addTest(TEST_NAME, new int[] { 9, 1 } , new int[] { 1, 9 }, TEST_OPTIONS, true);
+        abTests.addTest(TEST_NAME, new int[]{9, 1}, new int[]{1, 9}, TEST_OPTIONS, true);
         Preferences.clear(TEST_NAME);
     }
 
     private static final String TEST_NAME = "test_experiment";
-    private static final String[] TEST_OPTIONS = new String[] { "opt-1", "opt-2" };
+    private static final String[] TEST_OPTIONS = new String[]{"opt-1", "opt-2"};
 }
diff --git a/tests/src/com/todoroo/astrid/service/AstridDependencyInjectorTests.java b/tests/src/com/todoroo/astrid/service/AstridDependencyInjectorTests.java
index 508299a16..443a01783 100644
--- a/tests/src/com/todoroo/astrid/service/AstridDependencyInjectorTests.java
+++ b/tests/src/com/todoroo/astrid/service/AstridDependencyInjectorTests.java
@@ -36,11 +36,13 @@ public class AstridDependencyInjectorTests extends AndroidTestCase {
             @Override
             public Object getObject() {
                 return applicationName;
-            };
+            }
+
+            ;
         };
 
         DependencyInjectionService.getInstance().inject(helper);
-        assertTrue(((String)helper.getObject()).length() > 0);
+        assertTrue(((String) helper.getObject()).length() > 0);
     }
 
     public void testWithClass() {
@@ -52,7 +54,9 @@ public class AstridDependencyInjectorTests extends AndroidTestCase {
             @Override
             public Object getObject() {
                 return taskService;
-            };
+            }
+
+            ;
         };
 
         DependencyInjectionService.getInstance().inject(helper);
@@ -65,7 +69,9 @@ public class AstridDependencyInjectorTests extends AndroidTestCase {
             @Override
             public Object getObject() {
                 return taskService;
-            };
+            }
+
+            ;
         };
 
         DependencyInjectionService.getInstance().inject(helper2);
diff --git a/tests/src/com/todoroo/astrid/service/QuickAddMarkupTest.java b/tests/src/com/todoroo/astrid/service/QuickAddMarkupTest.java
index dcd2cd55f..472075ebd 100644
--- a/tests/src/com/todoroo/astrid/service/QuickAddMarkupTest.java
+++ b/tests/src/com/todoroo/astrid/service/QuickAddMarkupTest.java
@@ -5,13 +5,13 @@
  */
 package com.todoroo.astrid.service;
 
+import com.todoroo.astrid.data.Task;
+import com.todoroo.astrid.test.DatabaseTestCase;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import com.todoroo.astrid.data.Task;
-import com.todoroo.astrid.test.DatabaseTestCase;
-
 public class QuickAddMarkupTest extends DatabaseTestCase {
 
     @Override
@@ -89,7 +89,7 @@ public class QuickAddMarkupTest extends DatabaseTestCase {
     }
 
     private void assertImportanceIs(int importance) {
-        assertEquals(importance, (int)task.getValue(Task.IMPORTANCE));
+        assertEquals(importance, (int) task.getValue(Task.IMPORTANCE));
     }
 
 }
diff --git a/tests/src/com/todoroo/astrid/service/TitleParserTest.java b/tests/src/com/todoroo/astrid/service/TitleParserTest.java
index c925cceb6..bed5e37d4 100644
--- a/tests/src/com/todoroo/astrid/service/TitleParserTest.java
+++ b/tests/src/com/todoroo/astrid/service/TitleParserTest.java
@@ -6,10 +6,6 @@
 package com.todoroo.astrid.service;
 
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-
 import com.google.ical.values.Frequency;
 import com.google.ical.values.RRule;
 import com.timsu.astrid.R;
@@ -18,6 +14,10 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
 import com.todoroo.astrid.utility.TitleParser;
 
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+
 public class TitleParserTest extends DatabaseTestCase {
 
     @Override
@@ -27,142 +27,145 @@ public class TitleParserTest extends DatabaseTestCase {
     }
 
 
+    /**
+     * test that completing a task w/ no regular expressions creates a simple task with no date, no repeat, no lists
+     */
+    public void testNoRegexes() throws Exception {
+        TaskService taskService = new TaskService();
+        Task task = new Task();
+        Task nothing = new Task();
+        task.setValue(Task.TITLE, "Jog");
+        taskService.save(task);
+        assertFalse(task.hasDueTime());
+        assertFalse(task.hasDueDate());
+        assertEquals(task.getValue(Task.RECURRENCE), nothing.getValue(Task.RECURRENCE));
+    }
+
+    /**
+     * Tests correct date is parsed *
+     */
+    public void testMonthDate() {
+        TaskService taskService = new TaskService();
+        Task task = new Task();
+        String[] titleMonthStrings = {
+                "Jan.", "January",
+                "Feb.", "February",
+                "Mar.", "March",
+                "Apr.", "April",
+                "May", "May",
+                "Jun.", "June",
+                "Jul.", "July",
+                "Aug.", "August",
+                "Sep.", "September",
+                "Oct.", "October",
+                "Nov.", "November",
+                "Dec.", "December"
+        };
+        for (int i = 0; i < 23; i++) {
+            String testTitle = "Jog on " + titleMonthStrings[i] + " 12.";
+            insertTitleAddTask(testTitle, task, taskService);
+            Date date = new Date(task.getValue(Task.DUE_DATE));
+            assertEquals(date.getMonth(), i / 2);
+            assertEquals(date.getDate(), 12);
+        }
+    }
+
+    public void testMonthSlashDay() {
+        TaskService taskService = new TaskService();
+        Task task = new Task();
+        for (int i = 1; i < 13; i++) {
+            String testTitle = "Jog on " + i + "/12/13";
+            insertTitleAddTask(testTitle, task, taskService);
+            Date date = new Date(task.getValue(Task.DUE_DATE));
+            assertEquals(date.getMonth(), i - 1);
+            assertEquals(date.getDate(), 12);
+            assertEquals(date.getYear(), 113);
+        }
+    }
+
+    public void testArmyTime() {
+        TaskService taskService = new TaskService();
+        Task task = new Task();
+        String testTitle = "Jog on 23:21.";
+        insertTitleAddTask(testTitle, task, taskService);
+        Date date = new Date(task.getValue(Task.DUE_DATE));
+        assertEquals(date.getMinutes(), 21);
+        assertEquals(date.getHours(), 23);
+    }
+
+    public void test_AM_PM() {
+        TaskService taskService = new TaskService();
+        Task task = new Task();
+        String testTitle = "Jog at 8:33 PM.";
+        insertTitleAddTask(testTitle, task, taskService);
+        Date date = new Date(task.getValue(Task.DUE_DATE));
+        assertEquals(date.getMinutes(), 33);
+        assertEquals(date.getHours(), 20);
+    }
 
-  /** test that completing a task w/ no regular expressions creates a simple task with no date, no repeat, no lists*/
-  public void testNoRegexes() throws Exception{
-      TaskService taskService = new TaskService();
-      Task task = new Task();
-      Task nothing = new Task();
-      task.setValue(Task.TITLE, "Jog");
-      taskService.save(task);
-      assertFalse(task.hasDueTime());
-      assertFalse(task.hasDueDate());
-      assertEquals(task.getValue(Task.RECURRENCE), nothing.getValue(Task.RECURRENCE));
-  }
-
-  /** Tests correct date is parsed **/
-  public void testMonthDate() {
-      TaskService taskService = new TaskService();
-      Task task = new Task();
-      String[] titleMonthStrings = {
-              "Jan.", "January",
-              "Feb.", "February",
-              "Mar.", "March",
-              "Apr.", "April",
-              "May", "May",
-              "Jun.", "June",
-              "Jul.", "July",
-              "Aug.", "August",
-              "Sep.", "September",
-              "Oct.", "October",
-              "Nov.", "November",
-              "Dec.", "December"
-      };
-      for (int i = 0; i < 23; i++) {
-          String testTitle = "Jog on " + titleMonthStrings[i] + " 12.";
-          insertTitleAddTask(testTitle, task, taskService);
-          Date date = new Date(task.getValue(Task.DUE_DATE));
-          assertEquals(date.getMonth(), i/2);
-          assertEquals(date.getDate(), 12);
-      }
-  }
-
-  public void testMonthSlashDay() {
-      TaskService taskService = new TaskService();
-      Task task = new Task();
-      for (int i = 1; i < 13; i++) {
-          String testTitle = "Jog on " + i + "/12/13";
-          insertTitleAddTask(testTitle, task, taskService);
-          Date date = new Date(task.getValue(Task.DUE_DATE));
-          assertEquals(date.getMonth(), i-1);
-          assertEquals(date.getDate(), 12);
-          assertEquals(date.getYear(), 113);
-      }
-  }
-
-  public void testArmyTime() {
-      TaskService taskService = new TaskService();
-      Task task = new Task();
-      String testTitle = "Jog on 23:21.";
-      insertTitleAddTask(testTitle, task, taskService);
-      Date date = new Date(task.getValue(Task.DUE_DATE));
-      assertEquals(date.getMinutes(), 21);
-      assertEquals(date.getHours(), 23);
-  }
-
-  public void test_AM_PM() {
-      TaskService taskService = new TaskService();
-      Task task = new Task();
-      String testTitle = "Jog at 8:33 PM.";
-      insertTitleAddTask(testTitle, task, taskService);
-      Date date = new Date(task.getValue(Task.DUE_DATE));
-      assertEquals(date.getMinutes(), 33);
-      assertEquals(date.getHours(), 20);
-  }
-
-  public void test_at_hour() {
-      TaskService taskService = new TaskService();
-      Task task = new Task();
-      String testTitle = "Jog at 8 PM.";
-      insertTitleAddTask(testTitle, task, taskService);
-      Date date = new Date(task.getValue(Task.DUE_DATE));
-      assertEquals(date.getMinutes(), 0);
-      assertEquals(date.getHours(), 20);
-  }
-
-  public void test_oclock_AM() {
-      TaskService taskService = new TaskService();
-      Task task = new Task();
-      String testTitle = "Jog at 8 o'clock AM.";
-      insertTitleAddTask(testTitle, task, taskService);
-      Date date = new Date(task.getValue(Task.DUE_DATE));
-      assertEquals(date.getMinutes(), 0);
-      assertEquals(date.getHours(), 8);
-  }
-
-  public void test_several_forms_of_eight() {
-      TaskService taskService = new TaskService();
-      Task task = new Task();
-      String[] testTitles = {
-              "Jog 8 AM",
-              "Jog 8 o'clock AM",
-              "at 8:00 AM"
-      };
-      for (String testTitle: testTitles) {
-          insertTitleAddTask(testTitle, task, taskService);
-          Date date = new Date(task.getValue(Task.DUE_DATE));
-          assertEquals(date.getMinutes(), 0);
-          assertEquals(date.getHours(), 8);
-      }
-  }
-
-  public void test_several_forms_of_1230PM() {
-      TaskService taskService = new TaskService();
-      Task task = new Task();
-      String[] testTitles = {
-              "Jog 12:30 PM",
-              "at 12:30 PM",
-              "Do something on 12:30 PM",
-              "Jog at 12:30 PM Friday"
-
-      };
-      for (String testTitle: testTitles) {
-          insertTitleAddTask(testTitle, task, taskService);
-          Date date = new Date(task.getValue(Task.DUE_DATE));
-          assertEquals(date.getMinutes(), 30);
-          assertEquals(date.getHours(), 12);
-      }
-  }
-
-  private void insertTitleAddTask(String title, Task task, TaskService taskService) {
-      task.clear();
-      task.setValue(Task.TITLE, title);
-      TaskService.createWithValues(task, null, title);
-  }
-
-
-   // ----------------Days begin----------------//
-    public void testDays() throws Exception{
+    public void test_at_hour() {
+        TaskService taskService = new TaskService();
+        Task task = new Task();
+        String testTitle = "Jog at 8 PM.";
+        insertTitleAddTask(testTitle, task, taskService);
+        Date date = new Date(task.getValue(Task.DUE_DATE));
+        assertEquals(date.getMinutes(), 0);
+        assertEquals(date.getHours(), 20);
+    }
+
+    public void test_oclock_AM() {
+        TaskService taskService = new TaskService();
+        Task task = new Task();
+        String testTitle = "Jog at 8 o'clock AM.";
+        insertTitleAddTask(testTitle, task, taskService);
+        Date date = new Date(task.getValue(Task.DUE_DATE));
+        assertEquals(date.getMinutes(), 0);
+        assertEquals(date.getHours(), 8);
+    }
+
+    public void test_several_forms_of_eight() {
+        TaskService taskService = new TaskService();
+        Task task = new Task();
+        String[] testTitles = {
+                "Jog 8 AM",
+                "Jog 8 o'clock AM",
+                "at 8:00 AM"
+        };
+        for (String testTitle : testTitles) {
+            insertTitleAddTask(testTitle, task, taskService);
+            Date date = new Date(task.getValue(Task.DUE_DATE));
+            assertEquals(date.getMinutes(), 0);
+            assertEquals(date.getHours(), 8);
+        }
+    }
+
+    public void test_several_forms_of_1230PM() {
+        TaskService taskService = new TaskService();
+        Task task = new Task();
+        String[] testTitles = {
+                "Jog 12:30 PM",
+                "at 12:30 PM",
+                "Do something on 12:30 PM",
+                "Jog at 12:30 PM Friday"
+
+        };
+        for (String testTitle : testTitles) {
+            insertTitleAddTask(testTitle, task, taskService);
+            Date date = new Date(task.getValue(Task.DUE_DATE));
+            assertEquals(date.getMinutes(), 30);
+            assertEquals(date.getHours(), 12);
+        }
+    }
+
+    private void insertTitleAddTask(String title, Task task, TaskService taskService) {
+        task.clear();
+        task.setValue(Task.TITLE, title);
+        TaskService.createWithValues(task, null, title);
+    }
+
+
+    // ----------------Days begin----------------//
+    public void testDays() throws Exception {
         Calendar today = Calendar.getInstance();
         TaskService taskService = new TaskService();
         Task task = new Task();
@@ -171,7 +174,7 @@ public class TitleParserTest extends DatabaseTestCase {
         task.setValue(Task.TITLE, title);
         TaskService.createWithValues(task, null, title);
         Date date = new Date(task.getValue(Task.DUE_DATE));
-        assertEquals(date.getDay()+1, today.get(Calendar.DAY_OF_WEEK));
+        assertEquals(date.getDay() + 1, today.get(Calendar.DAY_OF_WEEK));
         //Calendar starts 1-6, date.getDay() starts at 0
 
         task = new Task();
@@ -179,7 +182,7 @@ public class TitleParserTest extends DatabaseTestCase {
         task.setValue(Task.TITLE, title);
         TaskService.createWithValues(task, null, title);
         date = new Date(task.getValue(Task.DUE_DATE));
-        assertEquals((date.getDay()+1) % 7, (today.get(Calendar.DAY_OF_WEEK)+1) % 7);
+        assertEquals((date.getDay() + 1) % 7, (today.get(Calendar.DAY_OF_WEEK) + 1) % 7);
 
         String[] days = {
                 "sunday",
@@ -200,29 +203,32 @@ public class TitleParserTest extends DatabaseTestCase {
                 "sat."
         };
 
-        for (int i = 1; i <= 6; i++){
+        for (int i = 1; i <= 6; i++) {
             task = new Task();
-            title = "Jog "+ days[i];
+            title = "Jog " + days[i];
             task.setValue(Task.TITLE, title);
             TaskService.createWithValues(task, null, title);
             date = new Date(task.getValue(Task.DUE_DATE));
             assertEquals(date.getDay(), i);
 
             task = new Task();
-            title = "Jog "+ abrevDays[i];
+            title = "Jog " + abrevDays[i];
             task.setValue(Task.TITLE, title);
             TaskService.createWithValues(task, null, title);
             date = new Date(task.getValue(Task.DUE_DATE));
             assertEquals(date.getDay(), i);
         }
 
-        }
+    }
 
     //----------------Days end----------------//
 
 
     //----------------Priority begin----------------//
-    /** tests all words using priority 0 */
+
+    /**
+     * tests all words using priority 0
+     */
     public void testPriority0() throws Exception {
         String[] acceptedStrings = {
                 "priority 0",
@@ -231,19 +237,19 @@ public class TitleParserTest extends DatabaseTestCase {
                 "bang 0"
         };
         Task task = new Task();
-        for (String acceptedString:acceptedStrings){
+        for (String acceptedString : acceptedStrings) {
             task = new Task();
             String title = "Jog " + acceptedString;
             task.setValue(Task.TITLE, title); //test at end of task. should set importance.
             TaskService.createWithValues(task, null, title);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_LEAST);
+            assertEquals((int) task.getValue(Task.IMPORTANCE), (int) Task.IMPORTANCE_LEAST);
         }
-        for (String acceptedString:acceptedStrings){
+        for (String acceptedString : acceptedStrings) {
             task = new Task();
             String title = acceptedString + " jog";
             task.setValue(Task.TITLE, title); //test at beginning of task. should not set importance.
             TaskService.createWithValues(task, null, title);
-            assertNotSame((int)task.getValue(Task.IMPORTANCE),(int)Task.IMPORTANCE_LEAST);
+            assertNotSame((int) task.getValue(Task.IMPORTANCE), (int) Task.IMPORTANCE_LEAST);
         }
     }
 
@@ -260,27 +266,27 @@ public class TitleParserTest extends DatabaseTestCase {
         };
         TaskService taskService = new TaskService();
         Task task = new Task();
-        for (String acceptedStringAtEnd:acceptedStringsAtEnd){
+        for (String acceptedStringAtEnd : acceptedStringsAtEnd) {
             task = new Task();
             task.setValue(Task.TITLE, "Jog " + acceptedStringAtEnd); //test at end of task. should set importance.
             taskService.save(task);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_SHOULD_DO);
+            assertEquals((int) task.getValue(Task.IMPORTANCE), (int) Task.IMPORTANCE_SHOULD_DO);
         }
-        for (String acceptedStringAtEnd:acceptedStringsAtEnd){
+        for (String acceptedStringAtEnd : acceptedStringsAtEnd) {
             task = new Task();
             task.setValue(Task.TITLE, acceptedStringAtEnd + " jog"); //test at beginning of task. should not set importance.
             taskService.save(task);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_SHOULD_DO);
+            assertEquals((int) task.getValue(Task.IMPORTANCE), (int) Task.IMPORTANCE_SHOULD_DO);
         }
-        for (String acceptedStringAnywhere:acceptedStringsAnywhere){
+        for (String acceptedStringAnywhere : acceptedStringsAnywhere) {
             task = new Task();
             task.setValue(Task.TITLE, "Jog " + acceptedStringAnywhere); //test at end of task. should set importance.
             taskService.save(task);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_SHOULD_DO);
+            assertEquals((int) task.getValue(Task.IMPORTANCE), (int) Task.IMPORTANCE_SHOULD_DO);
 
             task.setValue(Task.TITLE, acceptedStringAnywhere + " jog"); //test at beginning of task. should set importance.
             taskService.save(task);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_SHOULD_DO);
+            assertEquals((int) task.getValue(Task.IMPORTANCE), (int) Task.IMPORTANCE_SHOULD_DO);
         }
     }
 
@@ -297,30 +303,30 @@ public class TitleParserTest extends DatabaseTestCase {
         };
         TaskService taskService = new TaskService();
         Task task = new Task();
-        for (String acceptedStringAtEnd:acceptedStringsAtEnd){
+        for (String acceptedStringAtEnd : acceptedStringsAtEnd) {
             task = new Task();
             String title = "Jog " + acceptedStringAtEnd;
             task.setValue(Task.TITLE, title); //test at end of task. should set importance.
             TaskService.createWithValues(task, null, title);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_MUST_DO);
+            assertEquals((int) task.getValue(Task.IMPORTANCE), (int) Task.IMPORTANCE_MUST_DO);
 
             task = new Task();
             title = acceptedStringAtEnd + " jog";
             task.setValue(Task.TITLE, title); //test at beginning of task. should not set importance.
             TaskService.createWithValues(task, null, title);
-            assertNotSame((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_MUST_DO);
+            assertNotSame((int) task.getValue(Task.IMPORTANCE), (int) Task.IMPORTANCE_MUST_DO);
         }
-        for (String acceptedStringAnywhere:acceptedStringsAnywhere){
+        for (String acceptedStringAnywhere : acceptedStringsAnywhere) {
             task = new Task();
             String title = "Jog " + acceptedStringAnywhere;
             task.setValue(Task.TITLE, title); //test at end of task. should set importance.
             TaskService.createWithValues(task, null, title);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_MUST_DO);
+            assertEquals((int) task.getValue(Task.IMPORTANCE), (int) Task.IMPORTANCE_MUST_DO);
 
             title = acceptedStringAnywhere + " jog";
             task.setValue(Task.TITLE, title); //test at beginning of task. should set importance.
             TaskService.createWithValues(task, null, title);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_MUST_DO);
+            assertEquals((int) task.getValue(Task.IMPORTANCE), (int) Task.IMPORTANCE_MUST_DO);
         }
     }
 
@@ -340,40 +346,42 @@ public class TitleParserTest extends DatabaseTestCase {
         };
         TaskService taskService = new TaskService();
         Task task = new Task();
-        for (String acceptedStringAtEnd:acceptedStringsAtEnd){
+        for (String acceptedStringAtEnd : acceptedStringsAtEnd) {
             task = new Task();
             String title = "Jog " + acceptedStringAtEnd;
             task.setValue(Task.TITLE, title); //test at end of task. should set importance.
             TaskService.createWithValues(task, null, title);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_DO_OR_DIE);
+            assertEquals((int) task.getValue(Task.IMPORTANCE), (int) Task.IMPORTANCE_DO_OR_DIE);
 
             task = new Task();
             title = acceptedStringAtEnd + " jog";
             task.setValue(Task.TITLE, title); //test at beginning of task. should not set importance.
             TaskService.createWithValues(task, null, title);
-            assertNotSame((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_DO_OR_DIE);
+            assertNotSame((int) task.getValue(Task.IMPORTANCE), (int) Task.IMPORTANCE_DO_OR_DIE);
         }
-        for (String acceptedStringAnywhere:acceptedStringsAnywhere){
+        for (String acceptedStringAnywhere : acceptedStringsAnywhere) {
             task = new Task();
             String title = "Jog " + acceptedStringAnywhere;
             task.setValue(Task.TITLE, title); //test at end of task. should set importance.
             TaskService.createWithValues(task, null, title);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_DO_OR_DIE);
+            assertEquals((int) task.getValue(Task.IMPORTANCE), (int) Task.IMPORTANCE_DO_OR_DIE);
 
             title = acceptedStringAnywhere + " jog";
             task.setValue(Task.TITLE, title); //test at beginning of task. should set importance.
             TaskService.createWithValues(task, null, title);
-            assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_DO_OR_DIE);
+            assertEquals((int) task.getValue(Task.IMPORTANCE), (int) Task.IMPORTANCE_DO_OR_DIE);
         }
     }
 
 
-
     //----------------Priority end----------------//
 
 
     //----------------Repeats begin----------------//
-    /** test daily repeat from due date, but with no due date set */
+
+    /**
+     * test daily repeat from due date, but with no due date set
+     */
     public void testDailyWithNoDueDate() throws Exception {
         Task task = new Task();
         String title = "Jog daily";
@@ -393,7 +401,7 @@ public class TitleParserTest extends DatabaseTestCase {
         assertFalse(task.hasDueTime());
         assertFalse(task.hasDueDate());
 
-        for (int i = 1; i <= 12; i++){
+        for (int i = 1; i <= 12; i++) {
             title = "Jog every " + i + " days.";
             task.setValue(Task.TITLE, title);
             rrule.setInterval(i);
@@ -406,7 +414,9 @@ public class TitleParserTest extends DatabaseTestCase {
 
     }
 
-    /** test weekly repeat from due date, with no due date & time set */
+    /**
+     * test weekly repeat from due date, with no due date & time set
+     */
     public void testWeeklyWithNoDueDate() throws Exception {
         TaskService taskService = new TaskService();
         Task task = new Task();
@@ -427,7 +437,7 @@ public class TitleParserTest extends DatabaseTestCase {
         assertFalse(task.hasDueTime());
         assertFalse(task.hasDueDate());
 
-        for (int i = 1; i <= 12; i++){
+        for (int i = 1; i <= 12; i++) {
             title = "Jog every " + i + " weeks";
             task.setValue(Task.TITLE, title);
             rrule.setInterval(i);
@@ -439,7 +449,9 @@ public class TitleParserTest extends DatabaseTestCase {
         }
     }
 
-    /** test hourly repeat from due date, with no due date but no time */
+    /**
+     * test hourly repeat from due date, with no due date but no time
+     */
     public void testMonthlyFromNoDueDate() throws Exception {
         Task task = new Task();
         String title = "Jog monthly";
@@ -459,7 +471,7 @@ public class TitleParserTest extends DatabaseTestCase {
         assertFalse(task.hasDueTime());
         assertFalse(task.hasDueDate());
 
-        for (int i = 1; i <= 12; i++){
+        for (int i = 1; i <= 12; i++) {
             title = "Jog every " + i + " months";
             task.setValue(Task.TITLE, title);
             rrule.setInterval(i);
@@ -490,7 +502,7 @@ public class TitleParserTest extends DatabaseTestCase {
         assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
         assertTrue(task.hasDueDate());
 
-        for (int i = 1; i <= 12; i++){
+        for (int i = 1; i <= 12; i++) {
             title = "Jog every " + i + " days starting from today";
             task.setValue(Task.TITLE, title);
             rrule.setInterval(i);
@@ -520,7 +532,7 @@ public class TitleParserTest extends DatabaseTestCase {
         assertEquals(task.getValue(Task.RECURRENCE), rrule.toIcal());
         assertTrue(task.hasDueDate());
 
-        for (int i = 1; i <= 12; i++){
+        for (int i = 1; i <= 12; i++) {
             title = "Jog every " + i + " weeks starting from today";
             task.setValue(Task.TITLE, title);
             rrule.setInterval(i);
@@ -535,7 +547,10 @@ public class TitleParserTest extends DatabaseTestCase {
 
 
     //----------------Tags begin----------------//
-    /** tests all words using priority 0 */
+
+    /**
+     * tests all words using priority 0
+     */
     public void testTagsPound() throws Exception {
         String[] acceptedStrings = {
                 "#tag",
@@ -554,7 +569,9 @@ public class TitleParserTest extends DatabaseTestCase {
         }
     }
 
-    /** tests all words using priority 0 */
+    /**
+     * tests all words using priority 0
+     */
     public void testTagsAt() throws Exception {
         String[] acceptedStrings = {
                 "@tag",
@@ -569,12 +586,11 @@ public class TitleParserTest extends DatabaseTestCase {
             ArrayList<String> tags = new ArrayList<String>();
             TitleParser.listHelper(task, tags);
             String tag = TitleParser.trimParenthesis(acceptedString);
-            assertTrue("testTagsAt failed for string: " + acceptedString+ " for tags: " + tags.toString(), tags.contains(tag));
+            assertTrue("testTagsAt failed for string: " + acceptedString + " for tags: " + tags.toString(), tags.contains(tag));
         }
     }
 
 
-
     //----------------Priority end----------------//
 
 
diff --git a/tests/src/com/todoroo/astrid/service/UpdateMessageServiceTest.java b/tests/src/com/todoroo/astrid/service/UpdateMessageServiceTest.java
index 375c1be70..e293e9067 100644
--- a/tests/src/com/todoroo/astrid/service/UpdateMessageServiceTest.java
+++ b/tests/src/com/todoroo/astrid/service/UpdateMessageServiceTest.java
@@ -5,12 +5,6 @@
  */
 package com.todoroo.astrid.service;
 
-import java.io.IOException;
-
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.json.JSONArray;
-
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.RestClient;
 import com.todoroo.astrid.dao.StoreObjectDao;
@@ -19,10 +13,18 @@ import com.todoroo.astrid.gtasks.GtasksPreferenceService;
 import com.todoroo.astrid.test.DatabaseTestCase;
 import com.todoroo.astrid.utility.Constants;
 
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+import org.json.JSONArray;
+
+import java.io.IOException;
+
 public class UpdateMessageServiceTest extends DatabaseTestCase {
 
-    @Autowired private StoreObjectDao storeObjectDao;
-    @Autowired private GtasksPreferenceService gtasksPreferenceService;
+    @Autowired
+    private StoreObjectDao storeObjectDao;
+    @Autowired
+    private GtasksPreferenceService gtasksPreferenceService;
 
     public void testNoUpdates() {
         clearLatestUpdates();
@@ -288,7 +290,9 @@ public class UpdateMessageServiceTest extends DatabaseTestCase {
         storeObjectDao.deleteWhere(StoreObjectCriteria.byType(UpdateMessageService.UpdateMessage.TYPE));
     }
 
-    /** helper test class */
+    /**
+     * helper test class
+     */
     abstract public class TestUpdateMessageService extends UpdateMessageService {
 
         public TestUpdateMessageService() {
@@ -316,7 +320,7 @@ public class UpdateMessageServiceTest extends DatabaseTestCase {
         @Override
         protected MessageTuple buildUpdateMessage(JSONArray updates) {
             MessageTuple message = super.buildUpdateMessage(updates);
-            if(message == null || message.message.length() == 0)
+            if (message == null || message.message.length() == 0)
                 onEmptyMessage();
             return message;
         }
diff --git a/tests/src/com/todoroo/astrid/subtasks/SubtasksHelperTest.java b/tests/src/com/todoroo/astrid/subtasks/SubtasksHelperTest.java
index 7467cbb28..b2e9ca944 100644
--- a/tests/src/com/todoroo/astrid/subtasks/SubtasksHelperTest.java
+++ b/tests/src/com/todoroo/astrid/subtasks/SubtasksHelperTest.java
@@ -34,7 +34,7 @@ public class SubtasksHelperTest extends SubtasksTestCase {
         F = createTask("F", "5"); // Local id 6
     }
 
-    private static final String[] EXPECTED_ORDER = { "-1", "1", "2", "3", "4", "5", "6" };
+    private static final String[] EXPECTED_ORDER = {"-1", "1", "2", "3", "4", "5", "6"};
 
     public void testOrderedIdArray() {
         String[] ids = SubtasksHelper.getStringIdArray(DEFAULT_SERIALIZED_TREE);
@@ -47,6 +47,7 @@ public class SubtasksHelperTest extends SubtasksTestCase {
     // Default order: "[-1, [1, 2, [3, 4]], 5, 6]"
 
     private static String EXPECTED_REMOTE = "[\"-1\", [\"6\", \"4\", [\"3\", \"1\"]], \"2\", \"5\"]".replaceAll("\\s", "");
+
     public void testLocalToRemoteIdMapping() {
         String mapped = SubtasksHelper.convertTreeToRemoteIds(DEFAULT_SERIALIZED_TREE).replaceAll("\\s", "");
         assertEquals(EXPECTED_REMOTE, mapped);
diff --git a/tests/src/com/todoroo/astrid/subtasks/SubtasksMigrationTest.java b/tests/src/com/todoroo/astrid/subtasks/SubtasksMigrationTest.java
index cb657917e..0c54ef549 100644
--- a/tests/src/com/todoroo/astrid/subtasks/SubtasksMigrationTest.java
+++ b/tests/src/com/todoroo/astrid/subtasks/SubtasksMigrationTest.java
@@ -37,7 +37,7 @@ public class SubtasksMigrationTest extends SubtasksTestCase {
         Metadata m = new Metadata();
         m.setValue(Metadata.KEY, SubtasksMetadata.METADATA_KEY);
         m.setValue(Metadata.TASK, taskId);
-        String tagString = (tagData == null ? SubtasksMetadata.LIST_ACTIVE_TASKS : "td:"+tagData.getId());
+        String tagString = (tagData == null ? SubtasksMetadata.LIST_ACTIVE_TASKS : "td:" + tagData.getId());
         m.setValue(SubtasksMetadata.TAG, tagString);
         m.setValue(SubtasksMetadata.ORDER, order);
         m.setValue(SubtasksMetadata.INDENT, indent);
diff --git a/tests/src/com/todoroo/astrid/subtasks/SubtasksTestCase.java b/tests/src/com/todoroo/astrid/subtasks/SubtasksTestCase.java
index 98dc4af8a..599fba760 100644
--- a/tests/src/com/todoroo/astrid/subtasks/SubtasksTestCase.java
+++ b/tests/src/com/todoroo/astrid/subtasks/SubtasksTestCase.java
@@ -10,8 +10,8 @@ import com.todoroo.astrid.test.DatabaseTestCase;
 
 /**
  * Contains useful methods common to all subtasks tests
- * @author Sam
  *
+ * @author Sam
  */
 public class SubtasksTestCase extends DatabaseTestCase {
 
diff --git a/tests/src/com/todoroo/astrid/sync/AstridNewSyncMigrationTest.java b/tests/src/com/todoroo/astrid/sync/AstridNewSyncMigrationTest.java
index 0b1194e41..9acbd53a7 100644
--- a/tests/src/com/todoroo/astrid/sync/AstridNewSyncMigrationTest.java
+++ b/tests/src/com/todoroo/astrid/sync/AstridNewSyncMigrationTest.java
@@ -1,7 +1,5 @@
 package com.todoroo.astrid.sync;
 
-import java.util.ArrayList;
-
 import android.text.TextUtils;
 
 import com.todoroo.andlib.data.Property;
@@ -22,147 +20,149 @@ import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.tags.TaskToTagMetadata;
 
+import java.util.ArrayList;
+
 public class AstridNewSyncMigrationTest extends NewSyncTestCase {
 
-	private static final LongProperty TASK_REMOTE_ID_FIELD = new LongProperty(Task.TABLE, RemoteModel.UUID_PROPERTY_NAME);
-	private static final LongProperty TAG_REMOTE_ID_FIELD = new LongProperty(TagData.TABLE, RemoteModel.UUID_PROPERTY_NAME);
-	
-	@Autowired
-	private MetadataDao metadataDao;
-	
-	public void testAstridSyncMigration() {
-		setupOldDatabase();
-		Preferences.setBoolean(AstridNewSyncMigrator.PREF_SYNC_MIGRATION, false);
-		new AstridNewSyncMigrator().performMigration();
-		assertAllModelsHaveUUID();
-		assertAllTagsHaveTagData();
-		assertAllMetadataHasAllFields();
-	}
-	
-	private void setupOldDatabase() {
-		// Init 5 unsynced tasks and tags
-		for (int i = 1; i <= 5; i++) {
-			Task task = createTask("Task " + i, true);
-			task.setValue(TASK_REMOTE_ID_FIELD, null);
-			taskDao.save(task);
-			
-			TagData tag = createTagData("Tag " + i, true);
-			tag.setValue(TAG_REMOTE_ID_FIELD, null);
-			tagDataDao.saveExisting(tag);
-		}
-		
-		Metadata m = new Metadata();
-		m.setValue(Metadata.KEY, TaskToTagMetadata.KEY);
-		m.setValue(Metadata.TASK, 1L);
-		m.setValue(TaskToTagMetadata.TAG_NAME, "Tag 1");
-		m.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
-		metadataDao.createNew(m);
-		m.clear();
-		
-		m.setValue(Metadata.KEY, TaskToTagMetadata.KEY);
-		m.setValue(Metadata.TASK, 2L);
-		m.setValue(TaskToTagMetadata.TAG_NAME, "New tag");
-		m.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
-		metadataDao.createNew(m);
-		m.clear();
-		
-		m.setValue(Metadata.KEY, TaskToTagMetadata.KEY);
-		m.setValue(Metadata.TASK, 3L);
-		m.setValue(TaskToTagMetadata.TAG_NAME, "Tag 3");
-		m.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
-		metadataDao.createNew(m);
-		m.clear();
-
-		m.setValue(Metadata.KEY, TaskToTagMetadata.KEY);
-		m.setValue(Metadata.TASK, 3L);
-		m.setValue(TaskToTagMetadata.TAG_NAME, "Tag 4");
-		m.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
-		metadataDao.createNew(m);
-		m.clear();
-
-		m.setValue(Metadata.KEY, TaskToTagMetadata.KEY);
-		m.setValue(Metadata.TASK, 5L);
-		m.setValue(TaskToTagMetadata.TAG_NAME, "Tag 1");
-		m.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
-		metadataDao.createNew(m);
-		m.clear();
-
-		m.setValue(Metadata.KEY, TaskToTagMetadata.KEY);
-		m.setValue(Metadata.TASK, 5L);
-		m.setValue(TaskToTagMetadata.TAG_NAME, "Tag 5");
-		m.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
-		metadataDao.createNew(m);
-
-		m.setValue(Metadata.KEY, TaskToTagMetadata.KEY);
-		m.setValue(Metadata.TASK, 5L);
-		m.setValue(TaskToTagMetadata.TAG_NAME, "New tag 2");
-		m.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
-		metadataDao.createNew(m);
-		
-		// State (task: tags)
-		// Task 1: Tag 1
-		// Task 2: New tag
-		// Task 3: Tag 3, Tag 4
-		// Task 4: (nothing)
-		// Task 5: Tag 5, New tag 2
-	}
-	
-	private void assertAllModelsHaveUUID() {
-		assertUUIDs(Task.TABLE, new Task(), taskDao, Task.ID, Task.UUID);
-		assertUUIDs(TagData.TABLE, new TagData(), tagDataDao, TagData.ID, TagData.UUID);
-	}
-	
-	private <TYPE extends RemoteModel> void assertUUIDs(Table table, TYPE instance, RemoteModelDao<TYPE> dao, Property<?>... properties) {
-		TodorooCursor<TYPE> cursor = dao.query(Query.select(properties).from(table));
-		try {
-			for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
-				instance.clear();
-				instance.readPropertiesFromCursor(cursor);
-				String uuid = instance.getValue(RemoteModel.UUID_PROPERTY);
-				if (uuid == null || RemoteModel.NO_UUID.equals(uuid)) {
-					fail(instance.getClass().getName() + " " + instance.getId() + " didn't have a uuid");
-				}
-			}
-		} finally {
-			cursor.close();
-		}
-	}
-	
-	private void assertAllTagsHaveTagData() {
-		ArrayList<String> names = new ArrayList<String>();
- 		for (int i = 1; i <= 5; i++) {
-			String name = "Tag " + i;
-			names.add(name);
-		}
-		names.add("New tag");
-		names.add("New tag 2");
-		
-		String[] namesArray = names.toArray(new String[names.size()]);
-		TodorooCursor<TagData> tagData = tagDataDao.query(Query.select(TagData.NAME).where(TagData.NAME.in(namesArray)));
-		try {
-			assertEquals(namesArray.length, tagData.getCount());
-		} finally {
-			tagData.close();
-		}
-		
-		
-	}
-	
-	private void assertAllMetadataHasAllFields() {
-		TodorooCursor<Metadata> tagMetadata = metadataDao.query(Query.select(Metadata.PROPERTIES)
-				.where(MetadataCriteria.withKey(TaskToTagMetadata.KEY)));
-		try {
-			assertEquals(tagMetadata.getCount(), 7);
-			Metadata m = new Metadata();
-			for (tagMetadata.moveToFirst(); !tagMetadata.isAfterLast(); tagMetadata.moveToNext()) {
-				m.readFromCursor(tagMetadata);
-				assertTrue(!TextUtils.isEmpty(m.getValue(TaskToTagMetadata.TAG_NAME)));
-				assertTrue(!RemoteModel.NO_UUID.equals(m.getValue(TaskToTagMetadata.TASK_UUID)));
-				assertTrue(!RemoteModel.NO_UUID.equals(m.getValue(TaskToTagMetadata.TAG_UUID)));
-			}
-		} finally {
-			tagMetadata.close();
-		}
-	}
-	
+    private static final LongProperty TASK_REMOTE_ID_FIELD = new LongProperty(Task.TABLE, RemoteModel.UUID_PROPERTY_NAME);
+    private static final LongProperty TAG_REMOTE_ID_FIELD = new LongProperty(TagData.TABLE, RemoteModel.UUID_PROPERTY_NAME);
+
+    @Autowired
+    private MetadataDao metadataDao;
+
+    public void testAstridSyncMigration() {
+        setupOldDatabase();
+        Preferences.setBoolean(AstridNewSyncMigrator.PREF_SYNC_MIGRATION, false);
+        new AstridNewSyncMigrator().performMigration();
+        assertAllModelsHaveUUID();
+        assertAllTagsHaveTagData();
+        assertAllMetadataHasAllFields();
+    }
+
+    private void setupOldDatabase() {
+        // Init 5 unsynced tasks and tags
+        for (int i = 1; i <= 5; i++) {
+            Task task = createTask("Task " + i, true);
+            task.setValue(TASK_REMOTE_ID_FIELD, null);
+            taskDao.save(task);
+
+            TagData tag = createTagData("Tag " + i, true);
+            tag.setValue(TAG_REMOTE_ID_FIELD, null);
+            tagDataDao.saveExisting(tag);
+        }
+
+        Metadata m = new Metadata();
+        m.setValue(Metadata.KEY, TaskToTagMetadata.KEY);
+        m.setValue(Metadata.TASK, 1L);
+        m.setValue(TaskToTagMetadata.TAG_NAME, "Tag 1");
+        m.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
+        metadataDao.createNew(m);
+        m.clear();
+
+        m.setValue(Metadata.KEY, TaskToTagMetadata.KEY);
+        m.setValue(Metadata.TASK, 2L);
+        m.setValue(TaskToTagMetadata.TAG_NAME, "New tag");
+        m.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
+        metadataDao.createNew(m);
+        m.clear();
+
+        m.setValue(Metadata.KEY, TaskToTagMetadata.KEY);
+        m.setValue(Metadata.TASK, 3L);
+        m.setValue(TaskToTagMetadata.TAG_NAME, "Tag 3");
+        m.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
+        metadataDao.createNew(m);
+        m.clear();
+
+        m.setValue(Metadata.KEY, TaskToTagMetadata.KEY);
+        m.setValue(Metadata.TASK, 3L);
+        m.setValue(TaskToTagMetadata.TAG_NAME, "Tag 4");
+        m.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
+        metadataDao.createNew(m);
+        m.clear();
+
+        m.setValue(Metadata.KEY, TaskToTagMetadata.KEY);
+        m.setValue(Metadata.TASK, 5L);
+        m.setValue(TaskToTagMetadata.TAG_NAME, "Tag 1");
+        m.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
+        metadataDao.createNew(m);
+        m.clear();
+
+        m.setValue(Metadata.KEY, TaskToTagMetadata.KEY);
+        m.setValue(Metadata.TASK, 5L);
+        m.setValue(TaskToTagMetadata.TAG_NAME, "Tag 5");
+        m.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
+        metadataDao.createNew(m);
+
+        m.setValue(Metadata.KEY, TaskToTagMetadata.KEY);
+        m.setValue(Metadata.TASK, 5L);
+        m.setValue(TaskToTagMetadata.TAG_NAME, "New tag 2");
+        m.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
+        metadataDao.createNew(m);
+
+        // State (task: tags)
+        // Task 1: Tag 1
+        // Task 2: New tag
+        // Task 3: Tag 3, Tag 4
+        // Task 4: (nothing)
+        // Task 5: Tag 5, New tag 2
+    }
+
+    private void assertAllModelsHaveUUID() {
+        assertUUIDs(Task.TABLE, new Task(), taskDao, Task.ID, Task.UUID);
+        assertUUIDs(TagData.TABLE, new TagData(), tagDataDao, TagData.ID, TagData.UUID);
+    }
+
+    private <TYPE extends RemoteModel> void assertUUIDs(Table table, TYPE instance, RemoteModelDao<TYPE> dao, Property<?>... properties) {
+        TodorooCursor<TYPE> cursor = dao.query(Query.select(properties).from(table));
+        try {
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+                instance.clear();
+                instance.readPropertiesFromCursor(cursor);
+                String uuid = instance.getValue(RemoteModel.UUID_PROPERTY);
+                if (uuid == null || RemoteModel.NO_UUID.equals(uuid)) {
+                    fail(instance.getClass().getName() + " " + instance.getId() + " didn't have a uuid");
+                }
+            }
+        } finally {
+            cursor.close();
+        }
+    }
+
+    private void assertAllTagsHaveTagData() {
+        ArrayList<String> names = new ArrayList<String>();
+        for (int i = 1; i <= 5; i++) {
+            String name = "Tag " + i;
+            names.add(name);
+        }
+        names.add("New tag");
+        names.add("New tag 2");
+
+        String[] namesArray = names.toArray(new String[names.size()]);
+        TodorooCursor<TagData> tagData = tagDataDao.query(Query.select(TagData.NAME).where(TagData.NAME.in(namesArray)));
+        try {
+            assertEquals(namesArray.length, tagData.getCount());
+        } finally {
+            tagData.close();
+        }
+
+
+    }
+
+    private void assertAllMetadataHasAllFields() {
+        TodorooCursor<Metadata> tagMetadata = metadataDao.query(Query.select(Metadata.PROPERTIES)
+                .where(MetadataCriteria.withKey(TaskToTagMetadata.KEY)));
+        try {
+            assertEquals(tagMetadata.getCount(), 7);
+            Metadata m = new Metadata();
+            for (tagMetadata.moveToFirst(); !tagMetadata.isAfterLast(); tagMetadata.moveToNext()) {
+                m.readFromCursor(tagMetadata);
+                assertTrue(!TextUtils.isEmpty(m.getValue(TaskToTagMetadata.TAG_NAME)));
+                assertTrue(!RemoteModel.NO_UUID.equals(m.getValue(TaskToTagMetadata.TASK_UUID)));
+                assertTrue(!RemoteModel.NO_UUID.equals(m.getValue(TaskToTagMetadata.TAG_UUID)));
+            }
+        } finally {
+            tagMetadata.close();
+        }
+    }
+
 }
diff --git a/tests/src/com/todoroo/astrid/sync/ConstructOutstandingFromMasterTest.java b/tests/src/com/todoroo/astrid/sync/ConstructOutstandingFromMasterTest.java
index b8ed807e1..758bae7cc 100644
--- a/tests/src/com/todoroo/astrid/sync/ConstructOutstandingFromMasterTest.java
+++ b/tests/src/com/todoroo/astrid/sync/ConstructOutstandingFromMasterTest.java
@@ -13,41 +13,41 @@ import com.todoroo.astrid.tags.TaskToTagMetadata;
 
 public class ConstructOutstandingFromMasterTest extends NewSyncTestCase {
 
-	public void testConstructOutstandingConstructsOutstanding() {
-		Task t = createTask(true);
-		Metadata m = TaskToTagMetadata.newTagMetadata(t.getId(), t.getUuid(), "Tag", "2");
-		m.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
-		metadataDao.createNew(m);
-		TodorooCursor<TaskOutstanding> to = taskOutstandingDao.query(Query.select(TaskOutstanding.PROPERTIES));
-		try {
-			assertEquals(0, to.getCount());
-		} finally {
-			to.close();
-		}
+    public void testConstructOutstandingConstructsOutstanding() {
+        Task t = createTask(true);
+        Metadata m = TaskToTagMetadata.newTagMetadata(t.getId(), t.getUuid(), "Tag", "2");
+        m.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
+        metadataDao.createNew(m);
+        TodorooCursor<TaskOutstanding> to = taskOutstandingDao.query(Query.select(TaskOutstanding.PROPERTIES));
+        try {
+            assertEquals(0, to.getCount());
+        } finally {
+            to.close();
+        }
 
-		new ConstructTaskOutstandingTableFromMasterTable(NameMaps.TABLE_ID_TASKS, taskDao, taskOutstandingDao, metadataDao, Task.CREATION_DATE).execute();
+        new ConstructTaskOutstandingTableFromMasterTable(NameMaps.TABLE_ID_TASKS, taskDao, taskOutstandingDao, metadataDao, Task.CREATION_DATE).execute();
 
-		Property<?>[] syncable = NameMaps.syncableProperties(NameMaps.TABLE_ID_TASKS);
-		for (Property<?> p : syncable) {
-			to = taskOutstandingDao.query(Query.select(TaskOutstanding.PROPERTIES).where(TaskOutstanding.COLUMN_STRING.eq(p.name)));
-			try {
-				assertEquals(1, to.getCount());
-				to.moveToFirst();
-				String value = t.getValue(p).toString();
-				assertEquals(value, to.get(TaskOutstanding.VALUE_STRING));
-			} finally {
-				to.close();
-			}
-		}
+        Property<?>[] syncable = NameMaps.syncableProperties(NameMaps.TABLE_ID_TASKS);
+        for (Property<?> p : syncable) {
+            to = taskOutstandingDao.query(Query.select(TaskOutstanding.PROPERTIES).where(TaskOutstanding.COLUMN_STRING.eq(p.name)));
+            try {
+                assertEquals(1, to.getCount());
+                to.moveToFirst();
+                String value = t.getValue(p).toString();
+                assertEquals(value, to.get(TaskOutstanding.VALUE_STRING));
+            } finally {
+                to.close();
+            }
+        }
 
-		to = taskOutstandingDao.query(Query.select(TaskOutstanding.PROPERTIES).where(TaskOutstanding.COLUMN_STRING.eq(NameMaps.TAG_ADDED_COLUMN)));
-		try {
-		    assertEquals(1, to.getCount());
-		    to.moveToFirst();
-		    assertEquals("2", to.get(TaskOutstanding.VALUE_STRING));
-		} finally {
-		    to.close();
-		}
-	}
+        to = taskOutstandingDao.query(Query.select(TaskOutstanding.PROPERTIES).where(TaskOutstanding.COLUMN_STRING.eq(NameMaps.TAG_ADDED_COLUMN)));
+        try {
+            assertEquals(1, to.getCount());
+            to.moveToFirst();
+            assertEquals("2", to.get(TaskOutstanding.VALUE_STRING));
+        } finally {
+            to.close();
+        }
+    }
 
 }
diff --git a/tests/src/com/todoroo/astrid/sync/NewSyncTestCase.java b/tests/src/com/todoroo/astrid/sync/NewSyncTestCase.java
index 9527509ec..5aae4715c 100644
--- a/tests/src/com/todoroo/astrid/sync/NewSyncTestCase.java
+++ b/tests/src/com/todoroo/astrid/sync/NewSyncTestCase.java
@@ -13,60 +13,60 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
 
 public class NewSyncTestCase extends DatabaseTestCase {
-	@Autowired
-	protected TaskDao taskDao;
-	@Autowired
-	protected TagDataDao tagDataDao;
+    @Autowired
+    protected TaskDao taskDao;
+    @Autowired
+    protected TagDataDao tagDataDao;
 
-	@Autowired
-	protected TaskOutstandingDao taskOutstandingDao;
-	@Autowired
-	protected TagOutstandingDao tagOutstandingDao;
+    @Autowired
+    protected TaskOutstandingDao taskOutstandingDao;
+    @Autowired
+    protected TagOutstandingDao tagOutstandingDao;
 
-	@Autowired
-	protected MetadataDao metadataDao;
+    @Autowired
+    protected MetadataDao metadataDao;
 
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		RemoteModelDao.setOutstandingEntryFlags(RemoteModelDao.OUTSTANDING_ENTRY_FLAG_RECORD_OUTSTANDING);
-	}
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        RemoteModelDao.setOutstandingEntryFlags(RemoteModelDao.OUTSTANDING_ENTRY_FLAG_RECORD_OUTSTANDING);
+    }
 
-	protected Task createTask(String title, boolean suppress) {
-		Task task = new Task();
-		task.setValue(Task.TITLE, title);
-		task.setValue(Task.IMPORTANCE, SYNC_TASK_IMPORTANCE);
+    protected Task createTask(String title, boolean suppress) {
+        Task task = new Task();
+        task.setValue(Task.TITLE, title);
+        task.setValue(Task.IMPORTANCE, SYNC_TASK_IMPORTANCE);
 
-		if (suppress)
-			task.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
-		taskDao.createNew(task);
-		return task;
-	}
+        if (suppress)
+            task.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
+        taskDao.createNew(task);
+        return task;
+    }
 
-	protected Task createTask() {
-		return createTask(false);
-	}
+    protected Task createTask() {
+        return createTask(false);
+    }
 
-	public static final String SYNC_TASK_TITLE = "new title";
-	public static final int SYNC_TASK_IMPORTANCE = Task.IMPORTANCE_MUST_DO;
+    public static final String SYNC_TASK_TITLE = "new title";
+    public static final int SYNC_TASK_IMPORTANCE = Task.IMPORTANCE_MUST_DO;
 
-	protected Task createTask(boolean suppress) {
-		return createTask(SYNC_TASK_TITLE, suppress);
-	}
+    protected Task createTask(boolean suppress) {
+        return createTask(SYNC_TASK_TITLE, suppress);
+    }
 
-	protected TagData createTagData(String name, boolean suppress) {
-		TagData tag = new TagData();
-		tag.setValue(TagData.NAME, name);
+    protected TagData createTagData(String name, boolean suppress) {
+        TagData tag = new TagData();
+        tag.setValue(TagData.NAME, name);
 
-		tagDataDao.createNew(tag);
-		return tag;
-	}
+        tagDataDao.createNew(tag);
+        return tag;
+    }
 
-	protected TagData createTagData() {
-		return createTagData(false);
-	}
+    protected TagData createTagData() {
+        return createTagData(false);
+    }
 
-	protected TagData createTagData(boolean suppress) {
-		return createTagData("new tag", suppress);
-	}
+    protected TagData createTagData(boolean suppress) {
+        return createTagData("new tag", suppress);
+    }
 }
diff --git a/tests/src/com/todoroo/astrid/sync/SyncMessageTest.java b/tests/src/com/todoroo/astrid/sync/SyncMessageTest.java
index 71adb9d94..8e92209af 100644
--- a/tests/src/com/todoroo/astrid/sync/SyncMessageTest.java
+++ b/tests/src/com/todoroo/astrid/sync/SyncMessageTest.java
@@ -1,8 +1,5 @@
 package com.todoroo.astrid.sync;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
@@ -17,156 +14,160 @@ import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.TaskOutstanding;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 
 public class SyncMessageTest extends NewSyncTestCase {
 
-	public void testTaskChangesHappenedConstructor() {
-		Task t = createTask();
-		try {
-			ChangesHappened<?, ?> changes = ChangesHappened.instantiateChangesHappened(t.getId(), ModelType.TYPE_TASK);
-			assertNotNull(changes.serializeToJSON(null));
-			assertTrue(changes.getChanges().size() > 0);
-			assertFalse(RemoteModel.NO_UUID.equals(changes.getUUID()));
-			assertEquals(t.getValue(Task.UUID), changes.getUUID());
-		} catch (Exception e) {
-			fail("ChangesHappened constructor threw exception " + e);
-		}
-	}
-
-	private static final String MAKE_CHANGES_TITLE = "Made changes to title";
-	private JSONObject getMakeChanges(String... extraChanges) throws JSONException {
-		JSONObject makeChanges = new JSONObject();
-		makeChanges.put("type", ServerToClientMessage.TYPE_MAKE_CHANGES);
-		makeChanges.put("table", NameMaps.TABLE_ID_TASKS);
-
-		JSONObject changes = new JSONObject();
-		changes.put("title", MAKE_CHANGES_TITLE);
-		changes.put("importance", Task.IMPORTANCE_DO_OR_DIE);
-		if (extraChanges != null) {
-			for (int i = 0; i < extraChanges.length - 1; i+=2) {
-				String key = extraChanges[i];
-				String value = extraChanges[i + 1];
-				changes.put(key, value);
-			}
-		}
-
-		makeChanges.put("changes", changes);
-		return makeChanges;
-	}
-
-	public void testMakeChangesMakesChanges() {
-		Task t = createTask();
-		try {
-			JSONObject makeChanges = getMakeChanges();
-			makeChanges.put("uuid", t.getValue(Task.UUID));
-
-			ServerToClientMessage message = ServerToClientMessage.instantiateMessage(makeChanges);
-			message.processMessage(null);
-
-			t = taskDao.fetch(t.getId(), Task.TITLE, Task.IMPORTANCE);
-			assertEquals(MAKE_CHANGES_TITLE, t.getValue(Task.TITLE));
-			assertEquals(Task.IMPORTANCE_DO_OR_DIE, t.getValue(Task.IMPORTANCE).intValue());
-		} catch (JSONException e) {
-			e.printStackTrace();
-			fail("JSONException");
-		}
-	}
-
-	public void testMakeChangesMakesNewTasks() {
-		try {
-			JSONObject makeChanges = getMakeChanges();
-			makeChanges.put("uuid", "1");
-			ServerToClientMessage message = ServerToClientMessage.instantiateMessage(makeChanges);
-			message.processMessage(null);
-
-			TodorooCursor<Task> cursor = taskDao.query(Query.select(Task.ID, Task.UUID, Task.TITLE, Task.IMPORTANCE).where(Task.UUID.eq("1")));
-			try {
-				assertEquals(1, cursor.getCount());
-				cursor.moveToFirst();
-				Task t = new Task(cursor);
-
-				assertEquals(MAKE_CHANGES_TITLE, t.getValue(Task.TITLE));
-				assertEquals(Task.IMPORTANCE_DO_OR_DIE, t.getValue(Task.IMPORTANCE).intValue());
-				assertEquals("1", t.getValue(Task.UUID));
-			} finally {
-				cursor.close();
-			}
-
-		} catch (JSONException e) {
-			e.printStackTrace();
-			fail("JSONException");
-		}
-	}
-
-	public void testMakeChangesWithUuidCollision() {
-		Task t = createTask();
-		String oldUuid = t.getUuid();
-		try {
-			String newUuid = oldUuid + "blorp";
-			JSONObject makeChanges = getMakeChanges("uuid", newUuid);
-			makeChanges.put("uuid", oldUuid);
-			ServerToClientMessage message = ServerToClientMessage.instantiateMessage(makeChanges);
-			message.processMessage(null);
-
-			TodorooCursor<Task> cursor = taskDao.query(Query.select(Task.UUID).where(Task.UUID.eq(newUuid)));
-			try {
-				assertEquals(1, cursor.getCount());
-			} finally {
-				cursor.close();
-			}
-
-			cursor = taskDao.query(Query.select(Task.UUID).where(Task.UUID.eq(oldUuid)));
-			try {
-				assertEquals(0, cursor.getCount());
-			} finally {
-				cursor.close();
-			}
-		} catch (JSONException e) {
-			e.printStackTrace();
-			fail("JSONException");
-		}
-	}
-
-	public void testReplayOutstandingEntries() {
-		Task t = createTask();
-
-		t.setValue(Task.TITLE, "change title");
-		t.setValue(Task.IMPORTANCE, Task.IMPORTANCE_NONE);
-		t.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
-		taskDao.save(t);
-
-		new ReplayOutstandingEntries<Task, TaskOutstanding>(Task.class, NameMaps.TABLE_ID_TASKS, taskDao, taskOutstandingDao, false).execute();
-
-		t = taskDao.fetch(t.getId(), Task.TITLE, Task.IMPORTANCE);
-		assertEquals(SYNC_TASK_TITLE, t.getValue(Task.TITLE));
-		assertEquals(SYNC_TASK_IMPORTANCE, t.getValue(Task.IMPORTANCE).intValue());
-	}
-
-	public void testUserMigratedUpdatesUserIds() {
-	    Task t = createTask("Someone else's", true);
-	    TagData td = createTagData("Someone else's tag", true);
-
-	    t.setValue(Task.USER_ID, "1");
-	    taskDao.save(t);
-	    td.setValue(TagData.USER_ID, "1");
-	    tagDataDao.saveExisting(td);
-
-	    JSONObject userMigrated = new JSONObject();
-	    try {
-	        userMigrated.put("type", ServerToClientMessage.TYPE_USER_MIGRATED);
-	        userMigrated.put("new_user_id", "1");
-	    } catch (JSONException e) {
-	        fail("JSONException");
-	    }
-
-	    ServerToClientMessage message = ServerToClientMessage.instantiateMessage(userMigrated);
-	    message.processMessage(null);
-
-	    t = taskDao.fetch(t.getId(), Task.USER_ID);
-	    td = tagDataDao.fetch(td.getId(), TagData.USER_ID);
-	    assertEquals("1", ActFmPreferenceService.userId());
-	    assertEquals(Task.USER_ID_SELF, t.getValue(Task.USER_ID));
-	    assertEquals(Task.USER_ID_SELF, td.getValue(TagData.USER_ID));
-	}
+    public void testTaskChangesHappenedConstructor() {
+        Task t = createTask();
+        try {
+            ChangesHappened<?, ?> changes = ChangesHappened.instantiateChangesHappened(t.getId(), ModelType.TYPE_TASK);
+            assertNotNull(changes.serializeToJSON(null));
+            assertTrue(changes.getChanges().size() > 0);
+            assertFalse(RemoteModel.NO_UUID.equals(changes.getUUID()));
+            assertEquals(t.getValue(Task.UUID), changes.getUUID());
+        } catch (Exception e) {
+            fail("ChangesHappened constructor threw exception " + e);
+        }
+    }
+
+    private static final String MAKE_CHANGES_TITLE = "Made changes to title";
+
+    private JSONObject getMakeChanges(String... extraChanges) throws JSONException {
+        JSONObject makeChanges = new JSONObject();
+        makeChanges.put("type", ServerToClientMessage.TYPE_MAKE_CHANGES);
+        makeChanges.put("table", NameMaps.TABLE_ID_TASKS);
+
+        JSONObject changes = new JSONObject();
+        changes.put("title", MAKE_CHANGES_TITLE);
+        changes.put("importance", Task.IMPORTANCE_DO_OR_DIE);
+        if (extraChanges != null) {
+            for (int i = 0; i < extraChanges.length - 1; i += 2) {
+                String key = extraChanges[i];
+                String value = extraChanges[i + 1];
+                changes.put(key, value);
+            }
+        }
+
+        makeChanges.put("changes", changes);
+        return makeChanges;
+    }
+
+    public void testMakeChangesMakesChanges() {
+        Task t = createTask();
+        try {
+            JSONObject makeChanges = getMakeChanges();
+            makeChanges.put("uuid", t.getValue(Task.UUID));
+
+            ServerToClientMessage message = ServerToClientMessage.instantiateMessage(makeChanges);
+            message.processMessage(null);
+
+            t = taskDao.fetch(t.getId(), Task.TITLE, Task.IMPORTANCE);
+            assertEquals(MAKE_CHANGES_TITLE, t.getValue(Task.TITLE));
+            assertEquals(Task.IMPORTANCE_DO_OR_DIE, t.getValue(Task.IMPORTANCE).intValue());
+        } catch (JSONException e) {
+            e.printStackTrace();
+            fail("JSONException");
+        }
+    }
+
+    public void testMakeChangesMakesNewTasks() {
+        try {
+            JSONObject makeChanges = getMakeChanges();
+            makeChanges.put("uuid", "1");
+            ServerToClientMessage message = ServerToClientMessage.instantiateMessage(makeChanges);
+            message.processMessage(null);
+
+            TodorooCursor<Task> cursor = taskDao.query(Query.select(Task.ID, Task.UUID, Task.TITLE, Task.IMPORTANCE).where(Task.UUID.eq("1")));
+            try {
+                assertEquals(1, cursor.getCount());
+                cursor.moveToFirst();
+                Task t = new Task(cursor);
+
+                assertEquals(MAKE_CHANGES_TITLE, t.getValue(Task.TITLE));
+                assertEquals(Task.IMPORTANCE_DO_OR_DIE, t.getValue(Task.IMPORTANCE).intValue());
+                assertEquals("1", t.getValue(Task.UUID));
+            } finally {
+                cursor.close();
+            }
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+            fail("JSONException");
+        }
+    }
+
+    public void testMakeChangesWithUuidCollision() {
+        Task t = createTask();
+        String oldUuid = t.getUuid();
+        try {
+            String newUuid = oldUuid + "blorp";
+            JSONObject makeChanges = getMakeChanges("uuid", newUuid);
+            makeChanges.put("uuid", oldUuid);
+            ServerToClientMessage message = ServerToClientMessage.instantiateMessage(makeChanges);
+            message.processMessage(null);
+
+            TodorooCursor<Task> cursor = taskDao.query(Query.select(Task.UUID).where(Task.UUID.eq(newUuid)));
+            try {
+                assertEquals(1, cursor.getCount());
+            } finally {
+                cursor.close();
+            }
+
+            cursor = taskDao.query(Query.select(Task.UUID).where(Task.UUID.eq(oldUuid)));
+            try {
+                assertEquals(0, cursor.getCount());
+            } finally {
+                cursor.close();
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+            fail("JSONException");
+        }
+    }
+
+    public void testReplayOutstandingEntries() {
+        Task t = createTask();
+
+        t.setValue(Task.TITLE, "change title");
+        t.setValue(Task.IMPORTANCE, Task.IMPORTANCE_NONE);
+        t.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
+        taskDao.save(t);
+
+        new ReplayOutstandingEntries<Task, TaskOutstanding>(Task.class, NameMaps.TABLE_ID_TASKS, taskDao, taskOutstandingDao, false).execute();
+
+        t = taskDao.fetch(t.getId(), Task.TITLE, Task.IMPORTANCE);
+        assertEquals(SYNC_TASK_TITLE, t.getValue(Task.TITLE));
+        assertEquals(SYNC_TASK_IMPORTANCE, t.getValue(Task.IMPORTANCE).intValue());
+    }
+
+    public void testUserMigratedUpdatesUserIds() {
+        Task t = createTask("Someone else's", true);
+        TagData td = createTagData("Someone else's tag", true);
+
+        t.setValue(Task.USER_ID, "1");
+        taskDao.save(t);
+        td.setValue(TagData.USER_ID, "1");
+        tagDataDao.saveExisting(td);
+
+        JSONObject userMigrated = new JSONObject();
+        try {
+            userMigrated.put("type", ServerToClientMessage.TYPE_USER_MIGRATED);
+            userMigrated.put("new_user_id", "1");
+        } catch (JSONException e) {
+            fail("JSONException");
+        }
+
+        ServerToClientMessage message = ServerToClientMessage.instantiateMessage(userMigrated);
+        message.processMessage(null);
+
+        t = taskDao.fetch(t.getId(), Task.USER_ID);
+        td = tagDataDao.fetch(td.getId(), TagData.USER_ID);
+        assertEquals("1", ActFmPreferenceService.userId());
+        assertEquals(Task.USER_ID_SELF, t.getValue(Task.USER_ID));
+        assertEquals(Task.USER_ID_SELF, td.getValue(TagData.USER_ID));
+    }
 
 }
diff --git a/tests/src/com/todoroo/astrid/sync/SyncModelTest.java b/tests/src/com/todoroo/astrid/sync/SyncModelTest.java
index 40c52ec0b..00e71e67c 100644
--- a/tests/src/com/todoroo/astrid/sync/SyncModelTest.java
+++ b/tests/src/com/todoroo/astrid/sync/SyncModelTest.java
@@ -11,96 +11,96 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.TaskOutstanding;
 
 public class SyncModelTest extends NewSyncTestCase {
-	
-	public void testCreateTaskMakesUuid() {
-		Task task = createTask();
-		assertFalse(RemoteModel.NO_UUID.equals(task.getValue(Task.UUID)));
-	}
 
-	public void testCreateTagMakesUuid() {
-		TagData tag = createTagData();
-		assertFalse(RemoteModel.NO_UUID.equals(tag.getValue(TagData.UUID)));	
-	}
-	
-	public void testChangeTaskMakesOutstandingEntries() {
-		Task task = createTask();
-		String newTitle = "changing task title";
-		task.setValue(Task.TITLE, newTitle);
-		
-		taskDao.save(task);
-		TodorooCursor<TaskOutstanding> cursor = taskOutstandingDao.query(Query.select(TaskOutstanding.PROPERTIES)
-				.where(Criterion.and(TaskOutstanding.TASK_ID.eq(task.getId()),
-						TaskOutstanding.COLUMN_STRING.eq(Task.TITLE.name),
-						TaskOutstanding.VALUE_STRING.eq(newTitle))));
-		try {
-			assertTrue(cursor.getCount() > 0);
-		} finally {
-			cursor.close();
-		}
-	}
-	
-	public void testUpdateMakesAllOutstandingEntries() {
-		String title = "Task Important";
-		createTask(title, true);
-		createTask("Task Not Important", true);
-		createTask(title, true);
-		
-		Task template = new Task();
-		template.setValue(Task.IMPORTANCE, Task.IMPORTANCE_DO_OR_DIE);
-		
-		taskDao.update(Task.TITLE.eq(title), template);
-		
-		TodorooCursor<TaskOutstanding> cursor = taskOutstandingDao.query(Query.select(TaskOutstanding.PROPERTIES));
-		try {
-			assertEquals(2, cursor.getCount());
-			TaskOutstanding to = new TaskOutstanding();
-			for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
-				to.readPropertiesFromCursor(cursor);
-				assertEquals(Task.IMPORTANCE.name, to.getValue(TaskOutstanding.COLUMN_STRING));
-				assertEquals(Task.IMPORTANCE_DO_OR_DIE, Integer.parseInt(to.getValue(TaskOutstanding.VALUE_STRING)));
-			}
-		} finally {
-			cursor.close();
-		}
-	}
-	
-	public void testChangeTagMakesOutstandingEntries() {
-		TagData tag = createTagData();
-		String newName = "changing tag name";
-		tag.setValue(TagData.NAME, newName);
-		
-		tagDataDao.saveExisting(tag);
-		TodorooCursor<TagOutstanding> cursor = tagOutstandingDao.query(Query.select(TagOutstanding.PROPERTIES)
-				.where(Criterion.and(TagOutstanding.TAG_DATA_ID.eq(tag.getId()),
-						TagOutstanding.COLUMN_STRING.eq(TagData.NAME.name),
-						TagOutstanding.VALUE_STRING.eq(newName))));
-		try {
-			assertTrue(cursor.getCount() > 0);
-		} finally {
-			cursor.close();
-		}
-	}
-	
-	public void testSuppressionFlagSuppressesOutstandingEntries() {
-		Task task = createTask(true);
-		TodorooCursor<TagOutstanding> cursor = tagOutstandingDao.query(Query.select(TagOutstanding.PROPERTIES)
-				.where(TagOutstanding.TAG_DATA_ID.eq(task.getId())));
-		try {
-			assertEquals(0, cursor.getCount());
-		} finally {
-			cursor.close();
-		}
-		
-		task.setValue(Task.TITLE, "new title");
-		task.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
-		taskDao.save(task);
-		
-		cursor = tagOutstandingDao.query(Query.select(TagOutstanding.PROPERTIES)
-				.where(TagOutstanding.TAG_DATA_ID.eq(task.getId())));
-		try {
-			assertEquals(0, cursor.getCount());
-		} finally {
-			cursor.close();
-		}
-	}
+    public void testCreateTaskMakesUuid() {
+        Task task = createTask();
+        assertFalse(RemoteModel.NO_UUID.equals(task.getValue(Task.UUID)));
+    }
+
+    public void testCreateTagMakesUuid() {
+        TagData tag = createTagData();
+        assertFalse(RemoteModel.NO_UUID.equals(tag.getValue(TagData.UUID)));
+    }
+
+    public void testChangeTaskMakesOutstandingEntries() {
+        Task task = createTask();
+        String newTitle = "changing task title";
+        task.setValue(Task.TITLE, newTitle);
+
+        taskDao.save(task);
+        TodorooCursor<TaskOutstanding> cursor = taskOutstandingDao.query(Query.select(TaskOutstanding.PROPERTIES)
+                .where(Criterion.and(TaskOutstanding.TASK_ID.eq(task.getId()),
+                        TaskOutstanding.COLUMN_STRING.eq(Task.TITLE.name),
+                        TaskOutstanding.VALUE_STRING.eq(newTitle))));
+        try {
+            assertTrue(cursor.getCount() > 0);
+        } finally {
+            cursor.close();
+        }
+    }
+
+    public void testUpdateMakesAllOutstandingEntries() {
+        String title = "Task Important";
+        createTask(title, true);
+        createTask("Task Not Important", true);
+        createTask(title, true);
+
+        Task template = new Task();
+        template.setValue(Task.IMPORTANCE, Task.IMPORTANCE_DO_OR_DIE);
+
+        taskDao.update(Task.TITLE.eq(title), template);
+
+        TodorooCursor<TaskOutstanding> cursor = taskOutstandingDao.query(Query.select(TaskOutstanding.PROPERTIES));
+        try {
+            assertEquals(2, cursor.getCount());
+            TaskOutstanding to = new TaskOutstanding();
+            for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+                to.readPropertiesFromCursor(cursor);
+                assertEquals(Task.IMPORTANCE.name, to.getValue(TaskOutstanding.COLUMN_STRING));
+                assertEquals(Task.IMPORTANCE_DO_OR_DIE, Integer.parseInt(to.getValue(TaskOutstanding.VALUE_STRING)));
+            }
+        } finally {
+            cursor.close();
+        }
+    }
+
+    public void testChangeTagMakesOutstandingEntries() {
+        TagData tag = createTagData();
+        String newName = "changing tag name";
+        tag.setValue(TagData.NAME, newName);
+
+        tagDataDao.saveExisting(tag);
+        TodorooCursor<TagOutstanding> cursor = tagOutstandingDao.query(Query.select(TagOutstanding.PROPERTIES)
+                .where(Criterion.and(TagOutstanding.TAG_DATA_ID.eq(tag.getId()),
+                        TagOutstanding.COLUMN_STRING.eq(TagData.NAME.name),
+                        TagOutstanding.VALUE_STRING.eq(newName))));
+        try {
+            assertTrue(cursor.getCount() > 0);
+        } finally {
+            cursor.close();
+        }
+    }
+
+    public void testSuppressionFlagSuppressesOutstandingEntries() {
+        Task task = createTask(true);
+        TodorooCursor<TagOutstanding> cursor = tagOutstandingDao.query(Query.select(TagOutstanding.PROPERTIES)
+                .where(TagOutstanding.TAG_DATA_ID.eq(task.getId())));
+        try {
+            assertEquals(0, cursor.getCount());
+        } finally {
+            cursor.close();
+        }
+
+        task.setValue(Task.TITLE, "new title");
+        task.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true);
+        taskDao.save(task);
+
+        cursor = tagOutstandingDao.query(Query.select(TagOutstanding.PROPERTIES)
+                .where(TagOutstanding.TAG_DATA_ID.eq(task.getId())));
+        try {
+            assertEquals(0, cursor.getCount());
+        } finally {
+            cursor.close();
+        }
+    }
 }
diff --git a/tests/src/com/todoroo/astrid/test/AstridTranslationTests.java b/tests/src/com/todoroo/astrid/test/AstridTranslationTests.java
index 822077c69..04608b8c2 100644
--- a/tests/src/com/todoroo/astrid/test/AstridTranslationTests.java
+++ b/tests/src/com/todoroo/astrid/test/AstridTranslationTests.java
@@ -6,14 +6,13 @@
 package com.todoroo.astrid.test;
 
 
-
-import java.util.Locale;
-
 import android.content.res.Resources;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.test.TranslationTests;
 
+import java.util.Locale;
+
 public class AstridTranslationTests extends TranslationTests {
 
     @Override
@@ -28,21 +27,22 @@ public class AstridTranslationTests extends TranslationTests {
 
     @Override
     public int[] getDateFormatStrings() {
-        return new int[] {
+        return new int[]{
                 //
         };
     }
 
     /**
      * check if string contains contains substrings
+     *
      * @param string
      * @param contains
      * @return
      */
     public void contains(Resources r, int resource, StringBuilder failures, String... contains) {
         String string = r.getString(resource);
-        for(String contain : contains)
-            if(!string.contains(contain)) {
+        for (String contain : contains)
+            if (!string.contains(contain)) {
                 Locale locale = r.getConfiguration().locale;
                 String name = r.getResourceName(resource);
                 failures.append(String.format("%s: %s did not contain: %s\n",
diff --git a/tests/src/com/todoroo/astrid/test/DatabaseTestCase.java b/tests/src/com/todoroo/astrid/test/DatabaseTestCase.java
index f8b0def93..74c0e0053 100644
--- a/tests/src/com/todoroo/astrid/test/DatabaseTestCase.java
+++ b/tests/src/com/todoroo/astrid/test/DatabaseTestCase.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.test;
 
-import java.io.File;
-
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.test.TodorooTestCaseWithInjector;
 import com.todoroo.astrid.dao.Database;
@@ -14,11 +12,12 @@ import com.todoroo.astrid.legacy.AlarmDatabase;
 import com.todoroo.astrid.provider.ProviderTestUtilities;
 import com.todoroo.astrid.service.AstridDependencyInjector;
 
+import java.io.File;
+
 /**
  * Test case that automatically sets up and tears down a test database
  *
  * @author Tim Su <tim@todoroo.com>
- *
  */
 public class DatabaseTestCase extends TodorooTestCaseWithInjector {
 
@@ -33,46 +32,47 @@ public class DatabaseTestCase extends TodorooTestCaseWithInjector {
         testInjector.addInjectable("database", database);
     }
 
-	@Override
-	protected void setUp() throws Exception {
-	    // call upstream setup, which invokes dependency injector
-	    super.setUp();
+    @Override
+    protected void setUp() throws Exception {
+        // call upstream setup, which invokes dependency injector
+        super.setUp();
 
-		// empty out test databases
-	    assertNotNull(ContextManager.getContext());
-	    database.clear();
-		database.openForWriting();
+        // empty out test databases
+        assertNotNull(ContextManager.getContext());
+        database.clear();
+        database.openForWriting();
 
-		ProviderTestUtilities.setDatabaseOverride(database);
-	}
+        ProviderTestUtilities.setDatabaseOverride(database);
+    }
 
-	/**
-	 * Helper to delete a database by name
-	 * @param toDelete
-	 */
-	protected void deleteDatabase(String toDelete) {
-	    File db = getContext().getDatabasePath(toDelete);
-	    if(db.exists())
-	        db.delete();
+    /**
+     * Helper to delete a database by name
+     *
+     * @param toDelete
+     */
+    protected void deleteDatabase(String toDelete) {
+        File db = getContext().getDatabasePath(toDelete);
+        if (db.exists())
+            db.delete();
     }
 
     @Override
-	protected void tearDown() throws Exception {
-		database.close();
-		super.tearDown();
-	}
+    protected void tearDown() throws Exception {
+        database.close();
+        super.tearDown();
+    }
 
-	public static class TestDatabase extends Database {
+    public static class TestDatabase extends Database {
         @Override
-	    public String getName() {
-	        return "databasetest";
-	    }
-	}
+        public String getName() {
+            return "databasetest";
+        }
+    }
 
-	public static class TestAlarmsDatabase extends AlarmDatabase {
-	    @Override
+    public static class TestAlarmsDatabase extends AlarmDatabase {
+        @Override
         public String getName() {
-	        return "alarmstest";
-	    }
-	}
+            return "alarmstest";
+        }
+    }
 }
diff --git a/tests/src/com/zutubi/android/junitreport/Compatibility.java b/tests/src/com/zutubi/android/junitreport/Compatibility.java
index 9cd552683..d4bb76c55 100644
--- a/tests/src/com/zutubi/android/junitreport/Compatibility.java
+++ b/tests/src/com/zutubi/android/junitreport/Compatibility.java
@@ -1,12 +1,12 @@
 package com.zutubi.android.junitreport;
 
-import java.io.File;
-import java.lang.reflect.Method;
-
 import android.content.Context;
 import android.os.Environment;
 import android.util.Log;
 
+import java.io.File;
+import java.lang.reflect.Method;
+
 /**
  * Utilities for backwards-compatibility with early Android versions.
  */
@@ -14,6 +14,7 @@ public final class Compatibility {
     private static final String LOG_TAG = Compatibility.class.getSimpleName();
 
     private static final Method METHOD_GET_EXTERNAL_FILES_DIR;
+
     static {
         Method method = null;
         try {
@@ -34,11 +35,11 @@ public final class Compatibility {
      * A backwards-compatible version of {@link Context#getExternalFilesDir(String)}
      * which falls back to using {@link Environment#getExternalStorageDirectory()}
      * on API 7 and below.
-     * 
+     *
      * @param context context to get the external files directory for
-     * @param type the type of files directory to return (may be null)
+     * @param type    the type of files directory to return (may be null)
      * @return the path of the directory holding application files on external
-     *         storage, or null if external storage cannot be accessed
+     * storage, or null if external storage cannot be accessed
      */
     public static File getExternalFilesDir(final Context context, final String type) {
         if (METHOD_GET_EXTERNAL_FILES_DIR == null) {
diff --git a/tests/src/com/zutubi/android/junitreport/JUnitReportListener.java b/tests/src/com/zutubi/android/junitreport/JUnitReportListener.java
index 5b74de3de..d4a5e4467 100644
--- a/tests/src/com/zutubi/android/junitreport/JUnitReportListener.java
+++ b/tests/src/com/zutubi/android/junitreport/JUnitReportListener.java
@@ -16,13 +16,9 @@
 
 package com.zutubi.android.junitreport;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.Locale;
+import android.content.Context;
+import android.util.Log;
+import android.util.Xml;
 
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;
@@ -31,31 +27,35 @@ import junit.framework.TestListener;
 
 import org.xmlpull.v1.XmlSerializer;
 
-import android.content.Context;
-import android.util.Log;
-import android.util.Xml;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.Locale;
 
 /**
  * Custom test listener that outputs test results to XML files. The files
  * use a similar format to the Ant JUnit task XML formatter, with a few of
  * caveats:
  * <ul>
- *   <li>
- *     By default, multiple suites are all placed in a single file under a root
- *     &lt;testsuites&gt; element.  In multiFile mode a separate file is
- *     created for each suite, which may be more compatible with existing
- *     tools.
- *   </li>
- *   <li>
- *     Redundant information about the number of nested cases within a suite is
- *     omitted.
- *   </li>
- *   <li>
- *     Durations are omitted from suites.
- *   </li>
- *   <li>
- *     Neither standard output nor system properties are included.
- *   </li>
+ * <li>
+ * By default, multiple suites are all placed in a single file under a root
+ * &lt;testsuites&gt; element.  In multiFile mode a separate file is
+ * created for each suite, which may be more compatible with existing
+ * tools.
+ * </li>
+ * <li>
+ * Redundant information about the number of nested cases within a suite is
+ * omitted.
+ * </li>
+ * <li>
+ * Durations are omitted from suites.
+ * </li>
+ * <li>
+ * Neither standard output nor system properties are included.
+ * </li>
  * </ul>
  * The differences mainly revolve around making this reporting as lightweight as
  * possible. The report is streamed as the tests run, making it impossible to,
@@ -83,7 +83,7 @@ public class JUnitReportListener implements TestListener {
 
     // With thanks to org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.
     // Trimmed some entries, added others for Android.
-    private static final String[] DEFAULT_TRACE_FILTERS = new String[] {
+    private static final String[] DEFAULT_TRACE_FILTERS = new String[]{
             "junit.framework.TestCase", "junit.framework.TestResult",
             "junit.framework.TestSuite",
             "junit.framework.Assert.", // don't filter AssertionFailure
@@ -111,15 +111,15 @@ public class JUnitReportListener implements TestListener {
     /**
      * Creates a new listener.
      *
-     * @param context context of the test application
+     * @param context       context of the test application
      * @param targetContext context of the application under test
-     * @param reportFile name of the report file(s) to create
-     * @param reportDir  path of the directory under which to write files
-     *                  (may be null in which case files are written under
-     *                  the context using {@link Context#openFileOutput(String, int)}).
-     * @param filterTraces if true, stack traces will have common noise (e.g.
-     *            framework methods) omitted for clarity
-     * @param multiFile if true, use a separate file for each test suite
+     * @param reportFile    name of the report file(s) to create
+     * @param reportDir     path of the directory under which to write files
+     *                      (may be null in which case files are written under
+     *                      the context using {@link Context#openFileOutput(String, int)}).
+     * @param filterTraces  if true, stack traces will have common noise (e.g.
+     *                      framework methods) omitted for clarity
+     * @param multiFile     if true, use a separate file for each test suite
      */
     public JUnitReportListener(Context context, Context targetContext, String reportFile, String reportDir, boolean filterTraces, boolean multiFile) {
         Log.i(LOG_TAG, "Listener created with arguments:\n" +
diff --git a/tests/src/com/zutubi/android/junitreport/JUnitReportTestRunner.java b/tests/src/com/zutubi/android/junitreport/JUnitReportTestRunner.java
index 65c2c0e4f..66b0d0166 100644
--- a/tests/src/com/zutubi/android/junitreport/JUnitReportTestRunner.java
+++ b/tests/src/com/zutubi/android/junitreport/JUnitReportTestRunner.java
@@ -67,7 +67,7 @@ public class JUnitReportTestRunner extends InstrumentationTestRunner {
     private static final String DEFAULT_MULTI_REPORT_FILE = "junit-report-" + JUnitReportListener.TOKEN_SUITE + ".xml";
 
     private static final String LOG_TAG = JUnitReportTestRunner.class.getSimpleName();
-    
+
     private JUnitReportListener mListener;
     private String mReportFile;
     private String mReportDir;
@@ -94,8 +94,7 @@ public class JUnitReportTestRunner extends InstrumentationTestRunner {
         super.onCreate(arguments);
     }
 
-    private boolean getBooleanArgument(Bundle arguments, String name, boolean defaultValue)
-    {
+    private boolean getBooleanArgument(Bundle arguments, String name, boolean defaultValue) {
         String value = arguments.getString(name);
         if (value == null) {
             return defaultValue;
@@ -106,7 +105,7 @@ public class JUnitReportTestRunner extends InstrumentationTestRunner {
 
     /**
      * Subclass and override this if you want to use a different TestRunner type.
-     * 
+     *
      * @return the test runner to use
      */
     protected AndroidTestRunner makeAndroidTestRunner() {